From bbd070bddc84172545b11096a500d01b083d7998 Mon Sep 17 00:00:00 2001 From: Neal Date: Tue, 8 Jun 2021 12:14:26 -0500 Subject: [PATCH] fix: use tmp for empty name check (#180) --- yaml/secret.go | 11 +++++++++-- yaml/testdata/secret.yml | 2 ++ 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/yaml/secret.go b/yaml/secret.go index 77e83cb3..37038400 100644 --- a/yaml/secret.go +++ b/yaml/secret.go @@ -75,9 +75,14 @@ func (s *SecretSlice) UnmarshalYAML(unmarshal func(interface{}) error) error { return err } + tmp := SecretSlice{} + // iterate through each element in the secret slice for _, secret := range *secretSlice { - // implicitly set `key` field if empty + if len(secret.Name) == 0 { + continue + } + if secret.Origin.Empty() && len(secret.Key) == 0 { secret.Key = secret.Name } @@ -114,10 +119,12 @@ func (s *SecretSlice) UnmarshalYAML(unmarshal func(interface{}) error) error { if !secret.Origin.Empty() && strings.EqualFold(secret.Origin.Pull, "false") { secret.Origin.Pull = constants.PullNotPresent } + + tmp = append(tmp, secret) } // overwrite existing SecretSlice - *s = *secretSlice + *s = tmp return nil } diff --git a/yaml/testdata/secret.yml b/yaml/testdata/secret.yml index e885339c..322096d9 100644 --- a/yaml/testdata/secret.yml +++ b/yaml/testdata/secret.yml @@ -1,4 +1,6 @@ --- +- source: foo + target: bar - name: foo key: bar engine: native