From 5ca5f8a7297a4f4ef68ef5179a0457d4489043de Mon Sep 17 00:00:00 2001
From: Helder Correia <174525+helderco@users.noreply.github.com>
Date: Thu, 3 Mar 2022 14:58:30 -0100
Subject: [PATCH] Add #TrimSecret task

Signed-off-by: Helder Correia <174525+helderco@users.noreply.github.com>
---
 pkg/dagger.io/dagger/secrets.cue      | 11 +++++++
 plan/task/trimsecret.go               | 31 ++++++++++++++++++++
 tests/tasks.bats                      | 10 +++++--
 tests/tasks/trimsecret/trimsecret.cue | 42 +++++++++++++++++++++++++++
 4 files changed, 92 insertions(+), 2 deletions(-)
 create mode 100644 plan/task/trimsecret.go
 create mode 100644 tests/tasks/trimsecret/trimsecret.cue

diff --git a/pkg/dagger.io/dagger/secrets.cue b/pkg/dagger.io/dagger/secrets.cue
index 3db760c5..07b2b99c 100644
--- a/pkg/dagger.io/dagger/secrets.cue
+++ b/pkg/dagger.io/dagger/secrets.cue
@@ -27,3 +27,14 @@ package dagger
 	// Contents of the secret
 	output: #Secret
 }
+
+// Trim leading and trailing space characters from a secret
+#TrimSecret: {
+	$dagger: task: _name: "TrimSecret"
+
+	// Original secret
+	input: #Secret
+
+	// New trimmed secret
+	output: #Secret
+}
diff --git a/plan/task/trimsecret.go b/plan/task/trimsecret.go
new file mode 100644
index 00000000..f4441d9d
--- /dev/null
+++ b/plan/task/trimsecret.go
@@ -0,0 +1,31 @@
+package task
+
+import (
+	"context"
+	"strings"
+
+	"go.dagger.io/dagger/compiler"
+	"go.dagger.io/dagger/plancontext"
+	"go.dagger.io/dagger/solver"
+)
+
+func init() {
+	Register("TrimSecret", func() Task { return &trimSecretTask{} })
+}
+
+type trimSecretTask struct {
+}
+
+func (t *trimSecretTask) Run(ctx context.Context, pctx *plancontext.Context, s solver.Solver, v *compiler.Value) (*compiler.Value, error) {
+	input, err := pctx.Secrets.FromValue(v.Lookup("input"))
+	if err != nil {
+		return nil, err
+	}
+
+	plaintext := strings.TrimSpace(input.PlainText())
+	secret := pctx.Secrets.New(plaintext)
+
+	return compiler.NewValue().FillFields(map[string]interface{}{
+		"output": secret.MarshalCUE(),
+	})
+}
diff --git a/tests/tasks.bats b/tests/tasks.bats
index 48475701..b26a6c4e 100644
--- a/tests/tasks.bats
+++ b/tests/tasks.bats
@@ -32,7 +32,7 @@ setup() {
 @test "task: #WriteFile failure: different contents" {
     cd "$TESTDIR"/tasks/writefile
     run "$DAGGER" up ./writefile_failure_diff_contents.cue
-    assert_failure 
+    assert_failure
 }
 
 @test "task: #Exec" {
@@ -102,7 +102,7 @@ setup() {
 
     run "$DAGGER" up ./subdir_invalid_path.cue
     assert_failure
-    
+
     run "$DAGGER" up ./subdir_invalid_exec.cue
     assert_failure
 }
@@ -134,6 +134,12 @@ setup() {
     "$DAGGER" up ./newsecret.cue
 }
 
+@test "task: #TrimSecret" {
+    cd "$TESTDIR"/tasks/trimsecret
+
+    "$DAGGER" up ./trimsecret.cue
+}
+
 @test "task: #Source" {
     cd "$TESTDIR"/tasks/source
     "$DAGGER" up ./source.cue
diff --git a/tests/tasks/trimsecret/trimsecret.cue b/tests/tasks/trimsecret/trimsecret.cue
new file mode 100644
index 00000000..f4b02f9c
--- /dev/null
+++ b/tests/tasks/trimsecret/trimsecret.cue
@@ -0,0 +1,42 @@
+package main
+
+import (
+	"dagger.io/dagger"
+)
+
+dagger.#Plan & {
+	actions: {
+		image: dagger.#Pull & {
+			source: "alpine:3.15.0@sha256:e7d88de73db3d3fd9b2d63aa7f447a10fd0220b7cbf39803c803f2af9ba256b3"
+		}
+
+		generate: dagger.#Exec & {
+			input: image.output
+			args: ["sh", "-c", "echo ' test ' > /secret"]
+		}
+
+		load: dagger.#NewSecret & {
+			input:     generate.output
+			trimSpace: false
+			path:      "/secret"
+		}
+
+		trim: dagger.#TrimSecret & {
+			input: load.output
+		}
+
+		verify: dagger.#Exec & {
+			input: image.output
+			mounts: secret: {
+				dest:     "/run/secrets/test"
+				contents: trim.output
+			}
+			args: [
+				"sh", "-c",
+				#"""
+					test "$(cat /run/secrets/test)" = "test"
+					"""#,
+			]
+		}
+	}
+}