Support for buildArgs on Docker builds

cli/azd/pkg/exec/command_runner.go

@@ -10,7 +10,6 @@ import (
 	"os"
 	"os/exec"
 	"path/filepath"
-	"regexp"
 	"runtime"
 	"strings"
 )
@@ -135,8 +134,8 @@ func (r *commandRunner) Run(ctx context.Context, args RunArgs) (RunResult, error
 
 	logTitle.WriteString(fmt.Sprintf("Run exec: '%s %s' ",
 		args.Cmd,
-		redactSensitiveData(
-			strings.Join(redactSensitiveArgs(args.Args, args.SensitiveData), " "))))
+		RedactSensitiveData(
+			strings.Join(RedactSensitiveArgs(args.Args, args.SensitiveData), " "))))
 
 	debugLogEnabled := r.debugLogging
 	if args.DebugLogging != nil {
@@ -174,13 +173,13 @@ func (r *commandRunner) Run(ctx context.Context, args RunArgs) (RunResult, error
 		}
 	} else {
 		if debugLogEnabled {
-			logStdOut := strings.TrimSuffix(redactSensitiveData(stdout.String()), "\n")
+			logStdOut := strings.TrimSuffix(RedactSensitiveData(stdout.String()), "\n")
 			if len(logStdOut) > 0 {
 				logBody.WriteString(fmt.Sprintf(
 					"-------------------------------------stdout-------------------------------------------\n%s\n",
 					logStdOut))
 			}
-			logStdErr := strings.TrimSuffix(redactSensitiveData(stderr.String()), "\n")
+			logStdErr := strings.TrimSuffix(RedactSensitiveData(stderr.String()), "\n")
 			if len(logStdErr) > 0 {
 				logBody.WriteString(fmt.Sprintf(
 					"-------------------------------------stderr-------------------------------------------\n%s\n",
@@ -317,56 +316,3 @@ func newCmdTree(ctx context.Context, cmd string, args []string, useShell bool, i
 		Cmd:            exec.Command(shellName, allArgs...),
 	}, nil
 }
-
-type redactData struct {
-	matchString   *regexp.Regexp
-	replaceString string
-}
-
-const cRedacted = "<redacted>"
-
-func redactSensitiveArgs(args []string, sensitiveDataMatch []string) []string {
-	if len(sensitiveDataMatch) == 0 {
-		return args
-	}
-	redactedArgs := make([]string, len(args))
-	for i, arg := range args {
-		redacted := arg
-		for _, sensitiveData := range sensitiveDataMatch {
-			redacted = strings.ReplaceAll(redacted, sensitiveData, cRedacted)
-		}
-		redactedArgs[i] = redacted
-	}
-	return redactedArgs
-}
-
-func redactSensitiveData(msg string) string {
-	var regexpRedactRules = map[string]redactData{
-		"access token": {
-			regexp.MustCompile("\"accessToken\": \".*\""),
-			"\"accessToken\": \"" + cRedacted + "\"",
-		},
-		"deployment token": {
-			regexp.MustCompile(`--deployment-token \S+`),
-			"--deployment-token " + cRedacted,
-		},
-		"username": {
-			regexp.MustCompile(`--username \S+`),
-			"--username " + cRedacted,
-		},
-		"password": {
-			regexp.MustCompile(`--password \S+`),
-			"--password " + cRedacted,
-		},
-		"kubectl-from-literal": {
-			regexp.MustCompile(`--from-literal=([^=]+)=(\S+)`),
-			"--from-literal=$1=" + cRedacted,
-		},
-	}
-
-	for _, redactRule := range regexpRedactRules {
-		regMatchString := redactRule.matchString
-		msg = regMatchString.ReplaceAllString(msg, redactRule.replaceString)
-	}
-	return msg
-}

cli/azd/pkg/exec/sanitizer.go

@@ -0,0 +1,63 @@
+package exec
+
+import (
+	"regexp"
+	"strings"
+)
+
+type redactData struct {
+	matchString   *regexp.Regexp
+	replaceString string
+}
+
+const cRedacted = "<redacted>"
+
+func RedactSensitiveArgs(args []string, sensitiveDataMatch []string) []string {
+	if len(sensitiveDataMatch) == 0 {
+		return args
+	}
+	redactedArgs := make([]string, len(args))
+	for i, arg := range args {
+		redacted := arg
+		for _, sensitiveData := range sensitiveDataMatch {
+			redacted = strings.ReplaceAll(redacted, sensitiveData, cRedacted)
+		}
+		redactedArgs[i] = redacted
+	}
+	return redactedArgs
+}
+
+func RedactSensitiveData(msg string) string {
+	var regexpRedactRules = map[string]redactData{
+		"access token": {
+			regexp.MustCompile("\"accessToken\": \".*\""),
+			"\"accessToken\": \"" + cRedacted + "\"",
+		},
+		"deployment token": {
+			regexp.MustCompile(`--deployment-token \S+`),
+			"--deployment-token " + cRedacted,
+		},
+		"username": {
+			regexp.MustCompile(`--username \S+`),
+			"--username " + cRedacted,
+		},
+		"password": {
+			regexp.MustCompile(`--password \S+`),
+			"--password " + cRedacted,
+		},
+		"kubectl-from-literal": {
+			regexp.MustCompile(`--from-literal=([^=]+)=(\S+)`),
+			"--from-literal=$1=" + cRedacted,
+		},
+		"combined-arg": {
+			regexp.MustCompile(`(.*)=(\S+)`),
+			"$1=" + cRedacted,
+		},
+	}
+
+	for _, redactRule := range regexpRedactRules {
+		regMatchString := redactRule.matchString
+		msg = regMatchString.ReplaceAllString(msg, redactRule.replaceString)
+	}
+	return msg
+}

cli/azd/pkg/exec/util_test.go

@@ -208,7 +208,7 @@ func TestRedactSensitiveData(t *testing.T) {
 
 	for _, test := range tests {
 		t.Run(test.scenario, func(t *testing.T) {
-			actual := redactSensitiveData(test.input)
+			actual := RedactSensitiveData(test.input)
 			require.Equal(t, test.expected, actual)
 		})
 	}

cli/azd/pkg/project/framework_service_docker.go

@@ -13,16 +13,18 @@ import (
 
 	"github.com/azure/azure-dev/cli/azd/pkg/async"
 	"github.com/azure/azure-dev/cli/azd/pkg/environment"
+	"github.com/azure/azure-dev/cli/azd/pkg/exec"
 	"github.com/azure/azure-dev/cli/azd/pkg/output"
 	"github.com/azure/azure-dev/cli/azd/pkg/tools"
 	"github.com/azure/azure-dev/cli/azd/pkg/tools/docker"
 )
 
 type DockerProjectOptions struct {
-	Path     string           `json:"path"`
-	Context  string           `json:"context"`
-	Platform string           `json:"platform"`
-	Tag      ExpandableString `json:"tag"`
+	Path      string           `json:"path"`
+	Context   string           `json:"context"`
+	Platform  string           `json:"platform"`
+	Tag       ExpandableString `json:"tag"`
+	BuildArgs []string         `json:"buildArgs"`
 }
 
 type dockerBuildResult struct {
@@ -127,12 +129,18 @@ func (p *dockerProject) Build(
 		func(task *async.TaskContextWithProgress[*ServiceBuildResult, ServiceProgress]) {
 			dockerOptions := getDockerOptionsWithDefaults(serviceConfig.Docker)
 
+			buildArgs := []string{}
+			for _, arg := range dockerOptions.BuildArgs {
+				buildArgs = append(buildArgs, exec.RedactSensitiveData(arg))
+			}
+
 			log.Printf(
-				"building image for service %s, cwd: %s, path: %s, context: %s)",
+				"building image for service %s, cwd: %s, path: %s, context: %s, buildArgs: %s)",
 				serviceConfig.Name,
 				serviceConfig.Path(),
 				dockerOptions.Path,
 				dockerOptions.Context,
+				buildArgs,
 			)
 
 			imageName := fmt.Sprintf(
@@ -150,6 +158,7 @@ func (p *dockerProject) Build(
 				dockerOptions.Platform,
 				dockerOptions.Context,
 				imageName,
+				dockerOptions.BuildArgs,
 			)
 			if err != nil {
 				task.SetError(fmt.Errorf("building container: %s at %s: %w", serviceConfig.Name, dockerOptions.Context, err))

cli/azd/pkg/tools/docker/docker.go

@@ -25,6 +25,7 @@ type Docker interface {
 		platform string,
 		buildContext string,
 		name string,
+		buildArgs []string,
 	) (string, error)
 	Tag(ctx context.Context, cwd string, imageName string, tag string) error
 	Push(ctx context.Context, cwd string, tag string) error
@@ -67,6 +68,7 @@ func (d *docker) Build(
 	platform string,
 	buildContext string,
 	tagName string,
+	buildArgs []string,
 ) (string, error) {
 	if strings.TrimSpace(platform) == "" {
 		platform = DefaultPlatform
@@ -82,6 +84,10 @@ func (d *docker) Build(
 		args = append(args, "-t", tagName)
 	}
 
+	for _, arg := range buildArgs {
+		args = append(args, "--build-arg", arg)
+	}
+
 	args = append(args, buildContext)
 
 	res, err := d.executeCommand(ctx, cwd, args...)