feat(gcpsecrets): add trim_nl parameter (#432)

Signed-off-by: Zadkiel AHARONIAN <[email protected]>
helmfile · Jun 21, 2024 · d0702b4 · d0702b4
1 parent 2a4e64c
commit d0702b4
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 2 deletions.
diff --git a/README.md b/README.md
@@ -395,6 +395,7 @@ Examples:
 
 - `ref+gcpsecrets://PROJECT/SECRET[?version=VERSION]`
 - `ref+gcpsecrets://PROJECT/SECRET[?version=VERSION]#/yaml_or_json_key/in/secret`
+- `ref+gcpsecrets://PROJECT/SECRET[?version=VERSION][&fallback=valuewhenkeyisnotfound][&optional=true][&trim_nl=true]#/yaml_or_json_key/in/secret`
 
 Examples:
 

diff --git a/pkg/providers/gcpsecrets/gcpsecrets.go b/pkg/providers/gcpsecrets/gcpsecrets.go
@@ -14,18 +14,20 @@ import (
 	"github.com/helmfile/vals/pkg/api"
 )
 
-// Format: ref+gcpsecrets://project/mykey[?version=VERSION][&fallback=value=valuewhenkeyisnotfound][&optional=true]#/yaml_or_json_key/in/secret
+// Format: ref+gcpsecrets://project/mykey[?version=VERSION][&fallback=valuewhenkeyisnotfound][&optional=true][&trim_nl=true]#/yaml_or_json_key/in/secret
 type provider struct {
 	version  string
 	optional bool
 	fallback *string
+	trim_nl  bool
 }
 
 func New(cfg api.StaticConfig) *provider {
 	p := &provider{
 		version:  "latest",
 		optional: false,
 		fallback: nil,
+		trim_nl:  false,
 	}
 	if v := cfg.String("version"); v != "" {
 		p.version = v
@@ -36,6 +38,9 @@ func New(cfg api.StaticConfig) *provider {
 	if v := cfg.String("fallback_value"); cfg.Exists("fallback_value") {
 		p.fallback = &v
 	}
+	if v := cfg.String("trim_nl"); v != "" {
+		p.trim_nl, _ = strconv.ParseBool(v)
+	}
 	return p
 }
 
@@ -80,5 +85,10 @@ func (p *provider) getSecret(ctx context.Context, key string) ([]byte, error) {
 
 		return nil, fmt.Errorf("failed to get secret: %w", err)
 	}
-	return secret.GetPayload().GetData(), nil
+
+	buf := secret.GetPayload().GetData()
+	if p.trim_nl {
+		buf = []byte(strings.TrimSuffix(string(buf), "\n"))
+	}
+	return buf, nil
 }
diff --git a/vals_gcpsecrets_test.go b/vals_gcpsecrets_test.go
@@ -148,6 +148,23 @@ func TestValues_GCPSecretsManager(t *testing.T) {
 				},
 			},
 		},
+		{
+			"trim_nl string",
+			map[string]string{"valstestvar": "foo: bar\n"},
+			map[string]interface{}{
+				"provider": map[string]interface{}{
+					"name":    "gcpsecrets",
+					"version": "latest",
+					"type":    "string",
+					"path":    projectId,
+					"trim_nl": true,
+				},
+				"inline": map[string]interface{}{
+					"valstestvar": "valstestvar",
+				},
+			},
+			map[string]interface{}{"valstestvar": "foo: bar"},
+		},
 	}
 
 	for i := range tests {