fix(controller): Fix panic in addParamToGlobalScope (argoproj#6485)

* bug: Fix workflow controller panic in addParamToGlobalScope fixes argoproj#6478 Signed-off-by: William Van Hevelingen <[email protected]> * Add test coverage Signed-off-by: William Van Hevelingen <[email protected]> * Add assertion to the test Signed-off-by: William Van Hevelingen <[email protected]> * Rerun tests Signed-off-by: William Van Hevelingen <[email protected]> * lint Signed-off-by: William Van Hevelingen <[email protected]> Co-authored-by: Saravanan Balasubramanian <[email protected]>
eriadam · Aug 9, 2021 · 3d5ac9b · 3d5ac9b
1 parent d1d96b0
commit 3d5ac9b
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 1 deletion.
diff --git a/workflow/util/util.go b/workflow/util/util.go
@@ -475,7 +475,7 @@ func AddParamToGlobalScope(wf *wfv1.Workflow, log *log.Entry, param wfv1.Paramet
  wfUpdated = true
  } else {
  prevVal := wf.Status.Outputs.Parameters[index].Value
- if prevVal == nil || *prevVal != *param.Value {
+ if prevVal == nil || (param.Value != nil && *prevVal != *param.Value) {
  log.Infof("overwriting %s: '%s' -> '%s'", paramName, wf.Status.Outputs.Parameters[index].Value, param.Value)
  wf.Status.Outputs.Parameters[index].Value = param.Value
  wfUpdated = true

diff --git a/workflow/util/util_test.go b/workflow/util/util_test.go
@@ -322,6 +322,31 @@ func TestStopWorkflowByNodeName(t *testing.T) {
  assert.Equal(t, wfv1.NodeFailed, wf.Status.Nodes.FindByDisplayName("approve").Phase)
 }
 
+// Regression test for #6478
+func TestAddParamToGlobalScopeValueNil(t *testing.T) {
+ paramValue := wfv1.AnyString("test")
+ wf := wfv1.Workflow{
+ Status: wfv1.WorkflowStatus{
+ Outputs: &wfv1.Outputs{
+ Parameters: []wfv1.Parameter{
+ {
+ Name: "test",
+ Value: &paramValue,
+ GlobalName: "global_output_param",
+ },
+ },
+ },
+ },
+ }
+
+ p := AddParamToGlobalScope(&wf, nil, wfv1.Parameter{
+ Name: "test",
+ Value: nil,
+ GlobalName: "test",
+ })
+ assert.False(t, p)
+}
+
 var susWorkflow = `
 apiVersion: argoproj.io/v1alpha1
 kind: Workflow