diff --git a/services/tasks/LocalJob.go b/services/tasks/LocalJob.go index 1495ea95b..4d95cba0a 100644 --- a/services/tasks/LocalJob.go +++ b/services/tasks/LocalJob.go @@ -67,6 +67,7 @@ func (t *LocalJob) SetCommit(hash, message string) { func (t *LocalJob) getEnvironmentExtraVars(username string, incomingVersion *string) (extraVars map[string]any, err error) { extraVars = make(map[string]any) + extraSecretVars := make(map[string]any) if t.Environment.JSON != "" { err = json.Unmarshal([]byte(t.Environment.JSON), &extraVars) @@ -74,6 +75,15 @@ func (t *LocalJob) getEnvironmentExtraVars(username string, incomingVersion *str return } } + if t.Secret != "" { + err = json.Unmarshal([]byte(t.Secret), &extraSecretVars) + if err != nil { + return + } + } + t.Secret = "{}" + + maps.Copy(extraVars, extraSecretVars) taskDetails := make(map[string]any)