From fb9ad40a8c164a2b3eca055e2b5eafb516f49da9 Mon Sep 17 00:00:00 2001 From: Mohsin Zaidi <2236875+smrz2001@users.noreply.github.com> Date: Tue, 9 Jan 2024 17:36:32 -0500 Subject: [PATCH] fix: allow environment to be accepted as input to workflow (#56) --- cd/manager/jobs/workflow.go | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/cd/manager/jobs/workflow.go b/cd/manager/jobs/workflow.go index cac2fc4..9ae560a 100644 --- a/cd/manager/jobs/workflow.go +++ b/cd/manager/jobs/workflow.go @@ -35,9 +35,14 @@ func GitHubWorkflowJob(jobState job.JobState, db manager.Database, notifs manage } else { // Add the job ID to the inputs, so we can track the right workflow corresponding to this job. workflow.Inputs[job.WorkflowJobParam_JobId] = jobState.JobId - // Set the environment so that the workflow knows which environment to target + env := os.Getenv(manager.EnvVar_Env) - workflow.Inputs[job.WorkflowJobParam_Environment] = env + // If a target environment has not been specified, use the current environment. + if inputEnv, found := workflow.Inputs[job.WorkflowJobParam_Environment].(string); found { + workflow.Inputs[job.WorkflowJobParam_Environment] = inputEnv + } else { + workflow.Inputs[job.WorkflowJobParam_Environment] = env + } var httpClient *http.Client = nil if accessToken, found := os.LookupEnv("GITHUB_ACCESS_TOKEN"); found {