Merge pull request #1534 from grouville/reconcile-auth

Reconcile docker.#Push.auth and engine.#Push.auth

pkg/dagger.io/dagger/engine/image.cue

@@ -14,11 +14,10 @@ package engine
 	config: #ImageConfig
 
 	// Authentication
-	auth: [...{
+	auth?: {
-		target:   string
 		username: string
-		secret:   string | #Secret
+		secret:   #Secret
-	}]
+	}
 
 	// Complete ref of the pushed image, including digest
 	result: #Ref
@@ -68,11 +67,10 @@ package engine
 	source: #Ref
 
 	// Authentication
-	auth: [...{
+	auth?: {
-		target:   string
 		username: string
-		secret:   string | #Secret
+		secret:   #Secret
-	}]
+	}
 
 	// Root filesystem of downloaded image
 	output: #FS
@@ -98,11 +96,10 @@ package engine
 	}
 
 	// Authentication
-	auth: [...{
+	auth: [registry=string]: {
-		target:   string
 		username: string
-		secret:   string | #Secret
+		secret:   #Secret
-	}]
+	}
 
 	platforms?: [...string]
 	target?: string

pkg/universe.dagger.io/docker/pull.cue

@@ -12,18 +12,16 @@ import (
 	source: #Ref
 
 	// Registry authentication
-	// Key must be registry address, for example "index.docker.io"
+	auth?: {
-	auth: [registry=string]: {
 		username: string
 		secret:   dagger.#Secret
 	}
 
 	_op: engine.#Pull & {
 		"source": source
-		"auth": [ for target, creds in auth {
+		if auth != _|_ {
-			"target": target
+			"auth": auth
-			creds
+		}
-		}]
 	}
 
 	// Downloaded image

pkg/universe.dagger.io/docker/push.cue

@@ -14,8 +14,7 @@ import (
 	result: #Ref & _push.result
 
 	// Registry authentication
-	// Key must be registry address
+	auth?: {
-	auth: [registry=string]: {
 		username: string
 		secret:   dagger.#Secret
 	}
@@ -25,10 +24,9 @@ import (
 
 	_push: engine.#Push & {
 		"dest": dest
-		"auth": [ for target, creds in auth {
+		if auth != _|_ {
-			"target": target
+			"auth": auth
-			creds
+		}
-		}]
 		input:  image.rootfs
 		config: image.config
 	}

plan/task/auth.go

@@ -6,7 +6,6 @@ import (
 )
 
 type authValue struct {
-	Target   string
 	Username string
 	Secret   *plancontext.Secret
 }
@@ -14,41 +13,23 @@ type authValue struct {
 // Decodes an auth field value
 //
 // Cue format:
-//   auth: [...{
+//   auth: {
-//     target:   string
 //     username: string
 //     secret:   string | #Secret
-//   }]
+//   }
-func decodeAuthValue(pctx *plancontext.Context, v *compiler.Value) ([]*authValue, error) {
+func decodeAuthValue(pctx *plancontext.Context, v *compiler.Value) (*authValue, error) {
-	vals, err := v.List()
-	if err != nil {
-		return nil, err
-	}
-
-	authVals := []*authValue{}
-	for _, val := range vals {
 	authVal := authValue{}
-
+	username, err := v.Lookup("username").String()
-		target, err := val.Lookup("target").String()
-		if err != nil {
-			return nil, err
-		}
-		authVal.Target = target
-
-		username, err := val.Lookup("username").String()
 	if err != nil {
 		return nil, err
 	}
 	authVal.Username = username
 
-		secret, err := pctx.Secrets.FromValue(val.Lookup("secret"))
+	secret, err := pctx.Secrets.FromValue(v.Lookup("secret"))
 	if err != nil {
 		return nil, err
 	}
 	authVal.Secret = secret
 
-		authVals = append(authVals, &authVal)
+	return &authVal, nil
-	}
-
-	return authVals, nil
 }

plan/task/dockerfile.go

@@ -30,15 +30,24 @@ type dockerfileTask struct {
 
 func (t *dockerfileTask) Run(ctx context.Context, pctx *plancontext.Context, s solver.Solver, v *compiler.Value) (*compiler.Value, error) {
 	lg := log.Ctx(ctx)
-
+	auths, err := v.Lookup("auth").Fields()
-	// Read auth info
-	auth, err := decodeAuthValue(pctx, v.Lookup("auth"))
 	if err != nil {
 		return nil, err
 	}
-	for _, a := range auth {
+
-		s.AddCredentials(a.Target, a.Username, a.Secret.PlainText())
+	for _, auth := range auths {
-		lg.Debug().Str("target", a.Target).Msg("add target credentials")
+		// Read auth info
+		a, err := decodeAuthValue(pctx, auth.Value)
+		if err != nil {
+			return nil, err
+		}
+		// Extract registry target from dest
+		target, err := solver.ParseAuthHost(auth.Label())
+		if err != nil {
+			return nil, err
+		}
+		s.AddCredentials(target, a.Username, a.Secret.PlainText())
+		lg.Debug().Str("target", target).Msg("add target credentials")
 	}
 
 	source, err := pctx.FS.FromValue(v.Lookup("source"))

plan/task/pull.go

@@ -28,13 +28,18 @@ func (c *pullTask) Run(ctx context.Context, pctx *plancontext.Context, s solver.
 	}
 
 	// Read auth info
-	auth, err := decodeAuthValue(pctx, v.Lookup("auth"))
+	if auth := v.Lookup("auth"); auth.Exists() {
+		a, err := decodeAuthValue(pctx, auth)
 		if err != nil {
 			return nil, err
 		}
-	for _, a := range auth {
+		// Extract registry target from source
-		s.AddCredentials(a.Target, a.Username, a.Secret.PlainText())
+		target, err := solver.ParseAuthHost(rawRef)
-		lg.Debug().Str("target", a.Target).Msg("add target credentials")
+		if err != nil {
+			return nil, err
+		}
+		s.AddCredentials(target, a.Username, a.Secret.PlainText())
+		lg.Debug().Str("target", target).Msg("add target credentials")
 	}
 
 	ref, err := reference.ParseNormalizedNamed(rawRef)

plan/task/push.go

@@ -36,13 +36,19 @@ func (c *pushTask) Run(ctx context.Context, pctx *plancontext.Context, s solver.
 	dest = reference.TagNameOnly(dest)
 
 	// Read auth info
-	auth, err := decodeAuthValue(pctx, v.Lookup("auth"))
+	if auth := v.Lookup("auth"); auth.Exists() {
+		// Read auth info
+		a, err := decodeAuthValue(pctx, auth)
 		if err != nil {
 			return nil, err
 		}
-	for _, a := range auth {
+		// Extract registry target from dest
-		s.AddCredentials(a.Target, a.Username, a.Secret.PlainText())
+		target, err := solver.ParseAuthHost(rawDest)
-		lg.Debug().Str("target", a.Target).Msg("add target credentials")
+		if err != nil {
+			return nil, err
+		}
+		s.AddCredentials(target, a.Username, a.Secret.PlainText())
+		lg.Debug().Str("target", target).Msg("add target credentials")
 	}
 
 	// Get input state

solver/registryauth.go

@@ -51,7 +51,7 @@ func (a *RegistryAuthProvider) Credentials(ctx context.Context, req *bkauth.Cred
 	defer a.m.RUnlock()
 
 	for authHost, auth := range a.credentials {
-		u, err := parseAuthHost(authHost)
+		u, err := ParseAuthHost(authHost)
 		if err != nil {
 			return nil, err
 		}
@@ -65,7 +65,7 @@ func (a *RegistryAuthProvider) Credentials(ctx context.Context, req *bkauth.Cred
 
 // Parsing function based on splitReposSearchTerm
 // "github.com/docker/docker/registry"
-func parseAuthHost(host string) (string, error) {
+func ParseAuthHost(host string) (string, error) {
 	host = strings.TrimPrefix(host, "http://")
 	host = strings.TrimPrefix(host, "https://")
 	host = strings.TrimSuffix(host, "/")

solver/registryauth_test.go

@@ -257,7 +257,7 @@ func TestParseAuthHost(t *testing.T) {
 
 	successRefs := []output{}
 	for _, scase := range scases {
-		named, err := parseAuthHost(scase.Host)
+		named, err := ParseAuthHost(scase.Host)
 		if err != nil {
 			t.Fatalf("Invalid normalized reference for [%q]. Got %q", scase, err)
 		}
@@ -273,7 +273,7 @@ func TestParseAuthHost(t *testing.T) {
 	}
 
 	for _, fcase := range fcases {
-		named, err := parseAuthHost(fcase.Host)
+		named, err := ParseAuthHost(fcase.Host)
 		if err == nil {
 			t.Fatalf("Invalid normalized reference for [%q]. Expected failure for %q", fcase, named)
 		}

tests/tasks/dockerfile/build_auth.cue

@@ -22,12 +22,10 @@ engine.#Plan & {
 
 		build: engine.#Dockerfile & {
 			source: inputs.directories.testdata.contents
-			auth: [{
+			auth: "daggerio/ci-test:private-pull": {
-				target:   "daggerio/ci-test:private-pull"
 				username: "daggertest"
-
 				secret:   sopsSecrets.output.DOCKERHUB_TOKEN.contents
-			}]
+			}
 			dockerfile: contents: """
 				FROM daggerio/ci-test:private-pull@sha256:c74f1b1166784193ea6c8f9440263b9be6cae07dfe35e32a5df7a31358ac2060
 				"""

tests/tasks/pull/pull_auth.cue

@@ -19,11 +19,10 @@ engine.#Plan & {
 
 		pull: engine.#Pull & {
 			source: "daggerio/ci-test:private-pull@sha256:c74f1b1166784193ea6c8f9440263b9be6cae07dfe35e32a5df7a31358ac2060"
-			auth: [{
+			auth: {
-				target:   "daggerio/ci-test:private-pull"
 				username: "daggertest"
 				secret:   sopsSecrets.output.DOCKERHUB_TOKEN.contents
-			}]
+			}
 		} & {
 			// assert result
 			digest: "sha256:c74f1b1166784193ea6c8f9440263b9be6cae07dfe35e32a5df7a31358ac2060"

tests/tasks/push/push.cue

@@ -12,11 +12,10 @@ engine.#Plan & {
 		args: ["-d", "../../secrets_sops.yaml"]
 	}
 
-	#auth: [{
+	#auth: {
-		target:   "daggerio/ci-test:private-pull"
 		username: "daggertest"
 		secret:   actions.sopsSecrets.output.DOCKERHUB_TOKEN.contents
-	}]
+	}
 
 	actions: {