Promote layered provisioning to beta (#6169)

* remove feature flag and document feature

* update feature stages

* update figspec

Author: weikanglim

cli/azd/cmd/down.go

@@ -55,7 +55,7 @@ func newDownFlags(cmd *cobra.Command, global *internal.GlobalCommandOptions) *do
 
 func newDownCmd() *cobra.Command {
 	cmd := &cobra.Command{
-		Use:   "down",
+		Use:   "down [<layer>]",
 		Short: "Delete your project's Azure resources.",
 	}
 	cmd.Args = cobra.MaximumNArgs(1)
@@ -114,15 +114,6 @@ func (a *downAction) Run(ctx context.Context) (*actions.ActionResult, error) {
 		a.console.WarnForFeature(ctx, azapi.FeatureDeploymentStacks)
 	}
 
-	if len(infra.Options.Layers) > 1 {
-		if !a.alphaFeatureManager.IsEnabled(featLayers) {
-			return nil, fmt.Errorf(
-				"Layered provisioning is not enabled. Run '%s' to enable it.", alpha.GetEnableCommand(featLayers))
-		}
-
-		a.console.WarnForFeature(ctx, featLayers)
-	}
-
 	downLayer := ""
 	if len(a.args) > 0 {
 		downLayer = a.args[0]
@@ -168,7 +159,10 @@ func (a *downAction) Run(ctx context.Context) (*actions.ActionResult, error) {
 func getCmdDownHelpDescription(*cobra.Command) string {
 	return generateCmdHelpDescription(fmt.Sprintf(
 		"Delete Azure resources for an application. Running %s will not delete application"+
-			" files on your local machine.", output.WithHighLightFormat("azd down")), nil)
+			" files on your local machine.", output.WithHighLightFormat("azd down")), []string{
+		"When <layer> is specified, only deletes resources for the given layer." +
+			" When omitted, deletes resources for all layers defined in the project.",
+	})
 }
 
 func getCmdDownHelpFooter(*cobra.Command) string {

cli/azd/cmd/env.go

@@ -927,8 +927,6 @@ func (en *envNewAction) Run(ctx context.Context) (*actions.ActionResult, error)
 	return nil, nil
 }
 
-var featLayers = alpha.MustFeatureKey("layers")
-
 type envRefreshFlags struct {
 	hint   string
 	layer  string
@@ -939,7 +937,6 @@ type envRefreshFlags struct {
 func (er *envRefreshFlags) Bind(local *pflag.FlagSet, global *internal.GlobalCommandOptions) {
 	local.StringVarP(&er.hint, "hint", "", "", "Hint to help identify the environment to refresh")
 	local.StringVarP(&er.layer, "layer", "", "", "Provisioning layer to refresh the environment from.")
-	_ = local.MarkHidden("layer") // alpha: featLayers
 
 	er.EnvFlag.Bind(local, global)
 	er.global = global
@@ -1053,15 +1050,6 @@ func (ef *envRefreshAction) Run(ctx context.Context) (*actions.ActionResult, err
 	}
 	defer func() { _ = infra.Cleanup() }()
 
-	if len(infra.Options.Layers) > 1 {
-		if !ef.alphaFeatureManager.IsEnabled(featLayers) {
-			return nil,
-				fmt.Errorf("Layered provisioning is not enabled. Run '%s' to enable it.", alpha.GetEnableCommand(featLayers))
-		}
-
-		ef.console.WarnForFeature(ctx, featLayers)
-	}
-
 	layers := infra.Options.GetLayers()
 	if ef.flags.layer != "" {
 		layerOpt, err := infra.Options.GetLayer(ef.flags.layer)

cli/azd/cmd/pipeline.go

@@ -174,16 +174,6 @@ func (p *pipelineConfigAction) Run(ctx context.Context) (*actions.ActionResult,
 		Title: fmt.Sprintf("Configure your %s pipeline", pipelineProviderName),
 	})
 
-	if len(infra.Options.Layers) > 0 {
-		if !p.alphaFeatureManager.IsEnabled(featLayers) {
-			return nil, fmt.Errorf(
-				"Layered provisioning is not enabled. Run '%s' to enable it.",
-				alpha.GetEnableCommand(featLayers))
-		}
-
-		p.console.WarnForFeature(ctx, featLayers)
-	}
-
 	layers := infra.Options.GetLayers()
 	allParameters := []provisioning.Parameter{}
 

cli/azd/cmd/testdata/TestFigSpec.ts

@@ -402,6 +402,10 @@ const completionSpec: Fig.Spec = {
 					isDangerous: true,
 				},
 			],
+			args: {
+				name: 'layer',
+				isOptional: true,
+			},
 		},
 		{
 			name: ['env'],
@@ -494,6 +498,15 @@ const completionSpec: Fig.Spec = {
 							},
 							],
 						},
+						{
+							name: ['--layer'],
+							description: 'Provisioning layer to refresh the environment from.',
+							args: [
+							{
+								name: 'layer',
+							},
+							],
+						},
 					],
 					args: {
 						name: 'environment',
@@ -1268,6 +1281,10 @@ const completionSpec: Fig.Spec = {
 					description: 'Preview changes to Azure resources.',
 				},
 			],
+			args: {
+				name: 'layer',
+				isOptional: true,
+			},
 		},
 		{
 			name: ['publish'],

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

@@ -0,0 +1,16 @@
+
+This extension provides custom commands for building AI applications using Azure Developer CLI.
+
+Usage
+  azd ai builder [flags]
+
+Global Flags
+    -C, --cwd string 	: Sets the current working directory.
+        --debug      	: Enables debugging and diagnostics logging.
+        --docs       	: Opens the documentation for azd ai builder in your web browser.
+    -h, --help       	: Gets help for builder.
+        --no-prompt  	: Accepts the default value instead of prompting, or it fails if there is no default.
+
+Find a bug? Want to let us know how we're doing? Fill out this brief survey: https://aka.ms/azure-dev/hats.
+
+

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

@@ -0,0 +1,21 @@
+
+This extension provides custom commands for building AI applications using Azure Developer CLI.
+
+Usage
+  azd ai [command]
+
+Available Commands
+  builder	: This extension provides custom commands for building AI applications using Azure Developer CLI.
+
+Global Flags
+    -C, --cwd string 	: Sets the current working directory.
+        --debug      	: Enables debugging and diagnostics logging.
+        --docs       	: Opens the documentation for azd ai in your web browser.
+    -h, --help       	: Gets help for ai.
+        --no-prompt  	: Accepts the default value instead of prompting, or it fails if there is no default.
+
+Use azd ai [command] --help to view examples and more information about a specific command.
+
+Find a bug? Want to let us know how we're doing? Fill out this brief survey: https://aka.ms/azure-dev/hats.
+
+

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

@@ -0,0 +1,16 @@
+
+This extension configures GitHub Copilot Coding Agent access to Azure
+
+Usage
+  azd coding-agent [flags]
+
+Global Flags
+    -C, --cwd string 	: Sets the current working directory.
+        --debug      	: Enables debugging and diagnostics logging.
+        --docs       	: Opens the documentation for azd coding-agent in your web browser.
+    -h, --help       	: Gets help for coding-agent.
+        --no-prompt  	: Accepts the default value instead of prompting, or it fails if there is no default.
+
+Find a bug? Want to let us know how we're doing? Fill out this brief survey: https://aka.ms/azure-dev/hats.
+
+

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

@@ -1,8 +1,10 @@
 
 Delete Azure resources for an application. Running azd down will not delete application files on your local machine.
 
+When <layer> is specified, only deletes resources for the given layer. When omitted, deletes resources for all layers defined in the project.
+
 Usage
-  azd down [flags]
+  azd down [<layer>] [flags]
 
 Flags
     -e, --environment string 	: The name of the environment to use.

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

@@ -7,6 +7,7 @@ Usage
 Flags
     -e, --environment string 	: The name of the environment to use.
         --hint string        	: Hint to help identify the environment to refresh
+        --layer string       	: Provisioning layer to refresh the environment from.
 
 Global Flags
     -C, --cwd string 	: Sets the current working directory.

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

@@ -6,8 +6,10 @@ This command prompts you to input the following:
   • Azure location: The Azure location where your resources will be deployed.
   • Azure subscription: The Azure subscription where your resources will be deployed.
 
+When <layer> is specified, only provisions resources for the given layer. When omitted, provisions resources for all layers defined in the project.
+
 Usage
-  azd provision [flags]
+  azd provision [<layer>] [flags]
 
 Flags
     -e, --environment string 	: The name of the environment to use.