fix: avoid nil pointer dereference. Fixes argoproj#9269 (argoproj#9787)

Signed-off-by: mikutas <23391543+mikutas@users.noreply.github.com> Signed-off-by: juchao <juchao@coscene.io>
juchaosong · Nov 3, 2022 · 2d4c075 · 2d4c075
1 parent d9e3e02
commit 2d4c075
Showing 1 changed file with 3 additions and 4 deletions.
diff --git a/workflow/controller/operator.go b/workflow/controller/operator.go
@@ -572,9 +572,6 @@ func (woc *wfOperationCtx) setGlobalParameters(executionParameters wfv1.Argument
 		woc.globalParams[common.GlobalVarWorkflowParameters] = string(workflowParameters)
 	}
 	for _, param := range executionParameters.Parameters {
-		if param.Value == nil && param.ValueFrom == nil {
-			return fmt.Errorf("either value or valueFrom must be specified in order to set global parameter %s", param.Name)
-		}
 		if param.ValueFrom != nil && param.ValueFrom.ConfigMapKeyRef != nil {
 			cmValue, err := common.GetConfigMapValue(woc.controller.configMapInformer, woc.wf.ObjectMeta.Namespace, param.ValueFrom.ConfigMapKeyRef.Name, param.ValueFrom.ConfigMapKeyRef.Key)
 			if err != nil {
@@ -587,8 +584,10 @@ func (woc *wfOperationCtx) setGlobalParameters(executionParameters wfv1.Argument
 			} else {
 				woc.globalParams["workflow.parameters."+param.Name] = cmValue
 			}
-		} else {
+		} else if param.Value != nil {
 			woc.globalParams["workflow.parameters."+param.Name] = param.Value.String()
+		} else {
+			return fmt.Errorf("either value or valueFrom must be specified in order to set global parameter %s", param.Name)
 		}
 	}
 	if woc.wf.Status.Outputs != nil {