fix: panic in prepareMetricScope (#6720)

Signed-off-by: Saravanan Balasubramanian <sarabala1979@gmail.com>
argoproj · Sep 13, 2021 · 82e4082 · 82e4082
1 parent 808d897
commit 82e4082
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/workflow/controller/steps.go b/workflow/controller/steps.go
@@ -502,7 +502,11 @@ func (woc *wfOperationCtx) prepareMetricScope(node *wfv1.NodeStatus) (map[string
 	if node.Inputs != nil {
 		for _, param := range node.Inputs.Parameters {
 			key := fmt.Sprintf("inputs.parameters.%s", param.Name)
-			localScope[key] = param.Value.String()
+			if param.Value == nil {
+				localScope[key] = ""
+			} else {
+				localScope[key] = param.Value.String()
+			}
 		}
 	}
 
@@ -515,7 +519,11 @@ func (woc *wfOperationCtx) prepareMetricScope(node *wfv1.NodeStatus) (map[string
 		}
 		for _, param := range node.Outputs.Parameters {
 			key := fmt.Sprintf("outputs.parameters.%s", param.Name)
-			localScope[key] = param.Value.String()
+			if param.Value == nil {
+				localScope[key] = ""
+			} else {
+				localScope[key] = param.Value.String()
+			}
 		}
 	}
 

diff --git a/workflow/controller/steps_test.go b/workflow/controller/steps_test.go
@@ -135,6 +135,8 @@ func TestResourceDurationMetric(t *testing.T) {
       id: many-items-z26lj-3491220632
       name: many-items-z26lj[0].sleep(4:four)
       outputs:
+        parameters:
+        - name: pipeline_tid
         artifacts:
         - archiveLogs: true
           name: main-logs