Skip to content

Commit 65c6e95

Browse files
authored
fix(engine): env ascode with many secrets (#5839)
Signed-off-by: Yvonnick Esnault <[email protected]>
1 parent 1f88624 commit 65c6e95

File tree

1 file changed

+12
-9
lines changed

1 file changed

+12
-9
lines changed

engine/api/environment/environment_parser.go

+12-9
Original file line numberDiff line numberDiff line change
@@ -73,26 +73,29 @@ func ParseAndImport(ctx context.Context, db gorpmapper.SqlExecutorWithTx, proj s
7373
envSecrets := make([]sdk.Variable, 0)
7474

7575
//Compute variables
76-
for p, v := range eenv.Values {
77-
switch v.Type {
76+
for p := range eenv.Values {
77+
value := eenv.Values[p].Value
78+
vtype := eenv.Values[p].Type
79+
80+
switch vtype {
7881
case "":
79-
v.Type = sdk.StringVariable
82+
vtype = sdk.StringVariable
8083
case sdk.SecretVariable:
81-
secret, err := decryptFunc(db, proj.ID, v.Value)
84+
secret, err := decryptFunc(db, proj.ID, value)
8285
if err != nil {
8386
return env, nil, nil, sdk.WrapError(err, "Unable to decrypt secret variable")
8487
}
85-
v.Value = secret
88+
value = secret
8689
}
8790

88-
vv := sdk.EnvironmentVariable{Name: p, Type: v.Type, Value: v.Value, EnvironmentID: env.ID}
91+
vv := sdk.EnvironmentVariable{Name: p, Type: vtype, Value: value, EnvironmentID: env.ID}
8992
env.Variables = append(env.Variables, vv)
9093

91-
if v.Type == sdk.SecretVariable {
94+
if vtype == sdk.SecretVariable {
9295
envSecrets = append(envSecrets, sdk.Variable{
9396
Name: fmt.Sprintf("cds.env.%s", vv.Name),
94-
Type: v.Type,
95-
Value: v.Value,
97+
Type: vtype,
98+
Value: value,
9699
})
97100
}
98101
}

0 commit comments

Comments
 (0)