Skip to content

Disabling secret extra vars and converting survey secret vars to env vars #3510

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
virys99 wants to merge 2 commits into
base: develop
Choose a base branch
from
+17 −18
Open

Disabling secret extra vars and converting survey secret vars to env vars #3510

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0c61371
Disable secret extra vars
virys99 Dec 7, 2025
fd6f004
Change secret survay vars to env vars
virys99 Dec 7, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 15 additions & 17 deletions services/tasks/LocalJob.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ package tasks
import (
"encoding/json"
"fmt"
"maps"
"os"
"strings"

Expand Down Expand Up @@ -118,23 +117,13 @@ func (t *LocalJob) getEnvironmentExtraVars(username string, incomingVersion *str

func (t *LocalJob) getEnvironmentExtraVarsJSON(username string, incomingVersion *string) (str string, err error) {
extraVars := make(map[string]any)
extraSecretVars := make(map[string]any)

if t.Environment.JSON != "" {
err = json.Unmarshal([]byte(t.Environment.JSON), &extraVars)
if err != nil {
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)

Expand Down Expand Up @@ -187,6 +176,15 @@ func (t *LocalJob) getEnvironmentENV() (res []string, err error) {
}
}

if t.Secret != "" {
err = json.Unmarshal([]byte(t.Secret), &environmentVars)
if err != nil {
return
}
}

t.Secret = "{}"

for key, val := range environmentVars {
res = append(res, fmt.Sprintf("%s=%s", key, val))
}
Expand Down Expand Up @@ -449,12 +447,12 @@ func (t *LocalJob) getPlaybookArgs(username string, incomingVersion *string) (ar
args = append(args, "--extra-vars", extraVars)
}

for _, secret := range t.Environment.Secrets {
if secret.Type != db.EnvironmentSecretVar {
continue
}
args = append(args, "--extra-vars", fmt.Sprintf("%s=%s", secret.Name, secret.Secret))
}
//for _, secret := range t.Environment.Secrets {
// if secret.Type != db.EnvironmentSecretVar {
// continue
// }
// args = append(args, "--extra-vars", fmt.Sprintf("%s=%s", secret.Name, secret.Secret))
//}

templateArgs, taskArgs, err := t.getCLIArgs()
if err != nil {
Expand Down
3 changes: 2 additions & 1 deletion web/src/components/EnvironmentForm.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -239,6 +239,7 @@
<pre>{{ item.secret_storage_key_prefix }}*</pre>
</div>

<!--
<div>
<v-subheader class="px-0">
{{ $t('extraVariables') }}
Expand Down Expand Up @@ -311,7 +312,7 @@
</template>
</v-data-table>
</div>

-->
<div>
<v-subheader class="px-0 mt-4">
{{ $t('environmentVariables') }}
Expand Down
Loading