using map[string]string and moved Secrets.New outside of Walk

Signed-off-by: Richard Jones <richard@dagger.io>
This commit is contained in:
Richard Jones 2022-01-31 18:37:31 -07:00
parent f6a71b95cf
commit d2472c57c7
No known key found for this signature in database
GPG Key ID: CFB3A382EB166F4C

View File

@ -48,32 +48,30 @@ func (c *transformSecretTask) Run(ctx context.Context, pctx *plancontext.Context
return nil, errors.New(errStr)
}
type pathSecret struct {
path cue.Path
secret *plancontext.Secret
}
var pathsSecrets []pathSecret
pathToSecrets := make(map[string]string)
// users could yaml.Unmarshal(input) and return a map
// or yaml.Unmarshal(input).someKey and return a string
// walk will ensure we convert every leaf
functionPathSelectors := function.Path().Selectors()
function.Lookup("output").Walk(nil, func(v *compiler.Value) {
if v.Kind() == cue.StringKind {
plaintext, _ := v.String()
secret := pctx.Secrets.New(plaintext)
newLeafSelectors := v.Path().Selectors()[len(functionPathSelectors):]
newLeafSelectors = append(newLeafSelectors, cue.Str("contents"))
newLeafPath := cue.MakePath(newLeafSelectors...)
pathsSecrets = append(pathsSecrets, pathSecret{newLeafPath, secret})
p := newLeafPath.String()
pathToSecrets[p] = plaintext
}
})
output := compiler.NewValue()
for _, ps := range pathsSecrets {
output.FillPath(ps.path, ps.secret.MarshalCUE())
for p, s := range pathToSecrets {
secret := pctx.Secrets.New(s)
output.FillPath(cue.ParsePath(p), secret.MarshalCUE())
}
return output, nil