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

fix: nil ptr fix in copying extraEnvVars
devtron-labs · Oct 2, 2024 · e17c52e · e17c52e
1 parent 0b51ad3
commit e17c52e
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/pkg/pipeline/CiService.go b/pkg/pipeline/CiService.go
@@ -315,6 +315,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)