Separate publishing to container registries with new azd publish command

cli/azd/.vscode/cspell.yaml

@@ -3,6 +3,7 @@ words:
   - azcloud
   - azdext
   - azurefd
+  - azcontainerregistry
   - backoff
   - Canonicalize
   - chinacloudapi

cli/azd/cmd/root.go

@@ -292,6 +292,25 @@ func NewRootCmd(
 		UseMiddleware("hooks", middleware.NewHooksMiddleware).
 		UseMiddleware("extensions", middleware.NewExtensionsMiddleware)
 
+	root.
+		Add("publish", &actions.ActionDescriptorOptions{
+			Command:        cmd.NewPublishCmd(),
+			FlagsResolver:  cmd.NewPublishFlags,
+			ActionResolver: cmd.NewPublishAction,
+			OutputFormats:  []output.Format{output.JsonFormat, output.NoneFormat},
+			DefaultFormat:  output.NoneFormat,
+			HelpOptions: actions.ActionHelpOptions{
+				Description: cmd.GetCmdPublishHelpDescription,
+				Footer:      cmd.GetCmdPublishHelpFooter,
+			},
+			GroupingOptions: actions.CommandGroupOptions{
+				RootLevelHelp: actions.CmdGroupAzure,
+			},
+			RequireLogin: true,
+		}).
+		UseMiddleware("hooks", middleware.NewHooksMiddleware).
+		UseMiddleware("extensions", middleware.NewExtensionsMiddleware)
+
 	root.
 		Add("up", &actions.ActionDescriptorOptions{
 			Command:        newUpCmd(),

cli/azd/cmd/testdata/TestUsage-azd-deploy.snap

@@ -11,6 +11,7 @@ Usage
 Flags
         --all                 	: Deploys all services that are listed in azure.yaml
     -e, --environment string  	: The name of the environment to use.
+        --force-publish       	: Forcibly publishes service, overwriting any existing published artifacts.
         --from-package string 	: Deploys the packaged service located at the provided path. Supports zipped file packages (file path) or container images (image tag).
 
 Global Flags

cli/azd/cmd/testdata/TestUsage-azd-publish.snap

@@ -0,0 +1,38 @@
+
+Publish a service to a container registry.
+
+  • Supports Container App services only.
+  • Target registry set by AZURE_CONTAINER_REGISTRY_ENDPOINT environment variable or docker.registry in azure.yaml.
+  • Use '--from-package' to publish an existing container image, otherwise azd automatically packages the container image before publishing.
+
+Usage
+  azd publish <service> [flags]
+
+Flags
+        --all                 	: Deploys all services that are listed in azure.yaml
+    -e, --environment string  	: The name of the environment to use.
+        --from-package string 	: Publishes the service from a container image (image tag).
+        --image string        	: Specifies a custom image name for the container published to the registry.
+        --tag string          	: Specifies a custom tag for the container image published to the registry.
+
+Global Flags
+    -C, --cwd string 	: Sets the current working directory.
+        --debug      	: Enables debugging and diagnostics logging.
+        --docs       	: Opens the documentation for azd publish in your web browser.
+    -h, --help       	: Gets help for publish.
+        --no-prompt  	: Accepts the default value instead of prompting, or it fails if there is no default.
+
+Examples
+  Publish all services in the current project.
+    azd publish --all
+
+  Publish the service named 'api' from a previously generated package.
+    azd publish api --from-package <image-tag>
+
+  Publish the service named 'api' with image name 'app/api' and tag 'prod'.
+    azd publish api --image app/api --tag prod
+
+  Publish the service named 'api'.
+    azd publish api
+
+

cli/azd/cmd/testdata/TestUsage-azd.snap

@@ -14,6 +14,7 @@ Commands
     deploy    	: Deploy your project code to Azure.
     down      	: Delete your project's Azure resources.
     provision 	: Provision Azure resources for your project.
+    publish   	: Publish a service to a container registry.
 
   Manage and show settings
     completion	: Generate shell completion scripts.

cli/azd/internal/cmd/deploy.go

@@ -33,10 +33,11 @@ import (
 )
 
 type DeployFlags struct {
-	ServiceName string
-	All         bool
-	fromPackage string
-	global      *internal.GlobalCommandOptions
+	ServiceName  string
+	All          bool
+	fromPackage  string
+	forcePublish bool
+	global       *internal.GlobalCommandOptions
 	*internal.EnvFlag
 }
 
@@ -77,6 +78,12 @@ func (d *DeployFlags) bindCommon(local *pflag.FlagSet, global *internal.GlobalCo
 		//nolint:lll
 		"Deploys the packaged service located at the provided path. Supports zipped file packages (file path) or container images (image tag).",
 	)
+	local.BoolVar(
+		&d.forcePublish,
+		"force-publish",
+		false,
+		"Forcibly publishes service, overwriting any existing published artifacts.",
+	)
 }
 
 func (d *DeployFlags) SetCommon(envFlag *internal.EnvFlag) {
@@ -251,28 +258,55 @@ func (da *DeployAction) Run(ctx context.Context) (*actions.ActionResult, error)
 		}
 
 		var packageResult *project.ServicePackageResult
+		var publishResult *project.ServicePublishResult
+		var publishOptions *project.PublishOptions
+
 		if da.flags.fromPackage != "" {
 			// --from-package set, skip packaging
 			packageResult = &project.ServicePackageResult{
 				PackagePath: da.flags.fromPackage,
 			}
+
+			publishOptions = &project.PublishOptions{
+				Overwrite: da.flags.forcePublish,
+			}
 		} else {
 			//  --from-package not set, automatically package the application
 			packageResult, err = async.RunWithProgress(
 				func(packageProgress project.ServiceProgress) {
-					progressMessage := fmt.Sprintf("Deploying service %s (%s)", svc.Name, packageProgress.Message)
+					progressMessage := fmt.Sprintf("Packaging service %s (%s)", svc.Name, packageProgress.Message)
 					da.console.ShowSpinner(ctx, progressMessage, input.Step)
 				},
 				func(progress *async.Progress[project.ServiceProgress]) (*project.ServicePackageResult, error) {
 					return da.serviceManager.Package(ctx, svc, nil, progress, nil)
 				},
 			)
 
-			// do not stop progress here as next step is to deploy
+			// do not stop progress here as next step is to publish
 			if err != nil {
 				da.console.StopSpinner(ctx, stepMessage, input.StepFailed)
 				return nil, err
 			}
+
+			publishOptions = &project.PublishOptions{
+				Overwrite: true,
+			}
+		}
+
+		publishResult, err = async.RunWithProgress(
+			func(publishProgress project.ServiceProgress) {
+				progressMessage := fmt.Sprintf("Publishing service %s (%s)", svc.Name, publishProgress.Message)
+				da.console.ShowSpinner(ctx, progressMessage, input.Step)
+			},
+			func(progress *async.Progress[project.ServiceProgress]) (*project.ServicePublishResult, error) {
+				return da.serviceManager.Publish(ctx, svc, packageResult, progress, publishOptions)
+			},
+		)
+
+		// do not stop progress here as next step is to deploy
+		if err != nil {
+			da.console.StopSpinner(ctx, stepMessage, input.StepFailed)
+			return nil, err
 		}
 
 		deployResult, err := async.RunWithProgress(
@@ -281,7 +315,7 @@ func (da *DeployAction) Run(ctx context.Context) (*actions.ActionResult, error)
 				da.console.ShowSpinner(ctx, progressMessage, input.Step)
 			},
 			func(progress *async.Progress[project.ServiceProgress]) (*project.ServiceDeployResult, error) {
-				return da.serviceManager.Deploy(ctx, svc, packageResult, progress)
+				return da.serviceManager.Deploy(ctx, svc, packageResult, publishResult, progress)
 			},
 		)