Merge pull request #26 from puzzle/secret

change registry login to secret, fixes #21
puzzle · Jul 17, 2024 · 03b5661 · 03b5661
2 parents ccc3b0e + 569d603
commit 03b5661
Show file tree

Hide file tree

Showing 6 changed files with 59 additions and 11 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -5,7 +5,7 @@ on:
 
 env:
   # The Dagger CLI uses the DAGGER_CLOUD_TOKEN environment variable to authenticate with Dagger Cloud
-  DAGGER_CLOUD_TOKEN: ${{ secrets.DAGGER_CLOUD_TOKEN}}
+  DAGGER_CLOUD_TOKEN: ${{ secrets.DAGGER_CLOUD_TOKEN }}
 
 jobs:
   build:
@@ -19,3 +19,16 @@ jobs:
         run: dagger functions -m helm/
       - name: Run module tests
         run: dagger -m examples/ call all
+      - name: Run module integration tests
+        env:
+          TEST_HELM_REGISTRY_URL: ${{ secrets.TEST_HELM_REGISTRY_URL }}
+          TEST_HELM_REGISTRY_REPOSITORY: ${{ secrets.TEST_HELM_REGISTRY_REPOSITORY }}
+          TEST_HELM_REGISTRY_HELM_USER: ${{ secrets.TEST_HELM_REGISTRY_HELM_USER }}
+          TEST_HELM_REGISTRY_HELM_PASSWORD: ${{ secrets.TEST_HELM_REGISTRY_HELM_PASSWORD }}
+        run: |
+            dagger -m examples/ \
+              call package-push \
+              --registry ${TEST_HELM_REGISTRY_URL} \
+              --repository ${TEST_HELM_REGISTRY_REPOSITORY} \
+              --username ${TEST_HELM_REGISTRY_HELM_USER} \
+              --password env:TEST_HELM_REGISTRY_HELM_PASSWORD
diff --git a/ci/main.go b/ci/main.go
@@ -12,8 +12,7 @@ import (
 
 type Ci struct{}
 
-// Build and publish image from Dockerfile using a build context directory
-// in a different location than the current working directory
+// Build helm image used in the helm module.
 func (m *Ci) Build(
 	ctx context.Context,
 ) (*dagger.Container) {
@@ -38,6 +37,7 @@ func (m *Ci) Build(
 		})
 }
 
+// Build and publish helm image used in the helm module.
 func (m *Ci) Publish(
 	ctx context.Context,
 	// URL of the registry

diff --git a/examples/main.go b/examples/main.go
@@ -40,6 +40,35 @@ func (m *Examples) Version(
 	return nil
 }
 
+func (h *Examples) PackagePush(
+	// method call context
+	ctx context.Context,
+	// URL of the registry
+	registry string,
+	// name of the repository
+	repository string,
+	// registry login username
+	username string,
+	// registry login password
+	password *Secret,
+) error {
+	//	dagger call package-push \
+	//	  --registry registry.puzzle.ch \
+	//	  --repository helm \
+	//	  --username $REGISTRY_HELM_USER \
+	//	  --password env:REGISTRY_HELM_PASSWORD \
+	//	  --directory ./examples/testdata/mychart/
+
+	// directory that contains the Helm Chart
+	directory := dag.CurrentModule().Source().Directory("testdata/mychart/")
+	_, err := dag.Helm().PackagePush(ctx, directory, registry, repository, username, password)
+
+	if err != nil {
+		return err
+	}
+
+	return nil
+}
 
 func (m *Examples) Test(
 	// method call context

diff --git a/examples/testdata/mychart/Chart.yaml b/examples/testdata/mychart/Chart.yaml
@@ -1,5 +1,5 @@
 apiVersion: v2
-name: mychart
+name: dagger-module-helm-test
 description: A Helm chart for Kubernetes
 
 # A chart can be either an 'application' or a 'library' chart.

diff --git a/examples/testdata/mychart/tests/deployment_test.yaml b/examples/testdata/mychart/tests/deployment_test.yaml
@@ -10,7 +10,7 @@ tests:
           of: Deployment
       - matchRegex:
           path: metadata.name
-          pattern: -mychart
+          pattern: -dagger-module-helm-test
       - equal:
           path: spec.template.spec.containers[0].image
           value: nginx:latest
diff --git a/helm/dagger/main.go b/helm/dagger/main.go
@@ -8,6 +8,7 @@ package main
 
 import (
 	"context"
+	"dagger/helm/internal/dagger"
 	"fmt"
 	"os"
 	"strings"
@@ -23,7 +24,7 @@ type PushOpts struct {
 	Repository string `yaml:"repository"`
 	Oci        bool   `yaml:"oci"`
 	Username   string `yaml:"username"`
-	Password   string
+	Password   *dagger.Secret
 }
 
 func (p PushOpts) getChartFqdn(name string) string {
@@ -71,9 +72,9 @@ func (h *Helm) Version(
 //	dagger call package-push \
 //	  --registry registry.puzzle.ch \
 //	  --repository helm \
-//	  --username REGISTRY_HELM_USER \
-//	  --password REGISTRY_HELM_PASSWORD \
-//	  --directory ./mychart/
+//	  --username $REGISTRY_HELM_USER \
+//	  --password env:REGISTRY_HELM_PASSWORD \
+//	  --directory ./examples/testdata/mychart/
 func (h *Helm) PackagePush(
 	// method call context
 	ctx context.Context,
@@ -86,7 +87,7 @@ func (h *Helm) PackagePush(
 	// registry login username
 	username string,
 	// registry login password
-	password string,
+	password *dagger.Secret,
 ) (bool, error) {
 	opts := PushOpts{
 		Registry:   registry,
@@ -115,7 +116,12 @@ func (h *Helm) PackagePush(
 
 	name = strings.TrimSpace(name)
 
-	c, err = c.WithExec([]string{"helm", "registry", "login", opts.Registry, "-u", opts.Username, "-p", opts.Password}).Sync(ctx)
+	c, err = c.
+		WithEnvVariable("REGISTRY_URL", opts.Registry).
+		WithEnvVariable("REGISTRY_USERNAME", opts.Username).
+		WithSecretVariable("REGISTRY_PASSWORD", opts.Password).
+		WithExec([]string{"sh", "-c", `echo ${REGISTRY_PASSWORD} | helm registry login ${REGISTRY_URL} --username ${REGISTRY_USERNAME} --password-stdin`}).
+		Sync(ctx)
 	if err != nil {
 		return false, err
 	}