kjuulh/dagger
Archived
1
0
Fork 0
Code Issues 1 Pull Requests 1 Projects Releases Wiki Activity

Merge pull request #1502 from talentedmrjones/refactor-transform-secret-data-race

Browse Source 
moved FillPath outside of Walk
This commit is contained in:
Andrea Luzzardi 2022-01-25 16:36:14 -08:00 committed by GitHub
commit 6ce362be5d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
plan/task/transformsecret.go
View File

@ -48,7 +48,13 @@ func (c *transformSecretTask) Run(ctx context.Context, pctx *plancontext.Context
return nil, errors.New(errStr) return nil, errors.New(errStr)
} }
output := compiler.NewValue() type pathSecret struct {
path cue.Path
secret *plancontext.Secret
}
var pathsSecrets []pathSecret
// users could yaml.Unmarshal(input) and return a map // users could yaml.Unmarshal(input) and return a map
// or yaml.Unmarshal(input).someKey and return a string // or yaml.Unmarshal(input).someKey and return a string
// walk will ensure we convert every leaf // walk will ensure we convert every leaf
@ -60,9 +66,15 @@ func (c *transformSecretTask) Run(ctx context.Context, pctx *plancontext.Context
newLeafSelectors := v.Path().Selectors()[len(functionPathSelectors):] newLeafSelectors := v.Path().Selectors()[len(functionPathSelectors):]
newLeafSelectors = append(newLeafSelectors, cue.Str("contents")) newLeafSelectors = append(newLeafSelectors, cue.Str("contents"))
newLeafPath := cue.MakePath(newLeafSelectors...) newLeafPath := cue.MakePath(newLeafSelectors...)
output.FillPath(newLeafPath, secret.MarshalCUE()) pathsSecrets = append(pathsSecrets, pathSecret{newLeafPath, secret})
} }
}) })
output := compiler.NewValue()
for _, ps := range pathsSecrets {
output.FillPath(ps.path, ps.secret.MarshalCUE())
}
return output, nil return output, nil
} }