Implement modifications for engine.#Pull, engine.#Push, docker.#Push, docker.#Pull

Signed-off-by: guillaume <guillaume.derouville@gmail.com>

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
-	}]
+	}
 
 	// Root filesystem of downloaded image
 	output: #FS

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/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