Merge pull request #5925 from devtron-labs/auto-ci-trigger-fix

gireesh-naidu · web-flow · commit 22a5d34bd866 · 2024-09-30T15:47:25.000+05:30
fix: nil ptr fix in copying extraEnvVars
diff --git a/pkg/pipeline/CiService.go b/pkg/pipeline/CiService.go
@@ -310,6 +310,9 @@ func (impl *CiServiceImpl) TriggerCiPipeline(trigger types.Trigger) (int, error)
 		impl.Logger.Errorw("error in getting gitTrigger env data for stage", "gitTriggers", savedCiWf.GitTriggers, "err", err)
 		return 0, err
 	}
+	if trigger.ExtraEnvironmentVariables == nil {
+		trigger.ExtraEnvironmentVariables = make(map[string]string)
+	}
 	maps.Copy(trigger.ExtraEnvironmentVariables, gitTriggerEnvVariables)
 
 	workflowRequest, err := impl.buildWfRequestForCiPipeline(pipeline, trigger, ciMaterials, savedCiWf, ciWorkflowConfig, ciPipelineScripts, preCiSteps, postCiSteps, refPluginsData, isJob)

Original file line number	Diff line number	Diff line change
`@@ -310,6 +310,9 @@ func (impl *CiServiceImpl) TriggerCiPipeline(trigger types.Trigger) (int, error)`
`310`	`310`	`impl.Logger.Errorw("error in getting gitTrigger env data for stage", "gitTriggers", savedCiWf.GitTriggers, "err", err)`
`311`	`311`	`return 0, err`
`312`	`312`	`}`
	`313`	`+ if trigger.ExtraEnvironmentVariables == nil {`
	`314`	`+ trigger.ExtraEnvironmentVariables = make(map[string]string)`
	`315`	`+ }`
`313`	`316`	`maps.Copy(trigger.ExtraEnvironmentVariables, gitTriggerEnvVariables)`
`314`	`317`
`315`	`318`	`workflowRequest, err := impl.buildWfRequestForCiPipeline(pipeline, trigger, ciMaterials, savedCiWf, ciWorkflowConfig, ciPipelineScripts, preCiSteps, postCiSteps, refPluginsData, isJob)`