Add --no-wait option to azd down command

cli/azd/cmd/down.go

@@ -25,6 +25,7 @@ import (
 type downFlags struct {
 	forceDelete bool
 	purgeDelete bool
+	noWait      bool
 	global      *internal.GlobalCommandOptions
 	internal.EnvFlag
 }
@@ -38,6 +39,12 @@ func (i *downFlags) Bind(local *pflag.FlagSet, global *internal.GlobalCommandOpt
 		//nolint:lll
 		"Does not require confirmation before it permanently deletes resources that are soft-deleted by default (for example, key vaults).",
 	)
+	local.BoolVar(
+		&i.noWait,
+		"no-wait",
+		false,
+		"Does not wait for the destroy operation to complete before returning. Note: When used with --purge, the command will still wait for purge operations to complete.",
+	)
 	i.EnvFlag.Bind(local, global)
 	i.global = global
 }
@@ -109,14 +116,25 @@ func (a *downAction) Run(ctx context.Context) (*actions.ActionResult, error) {
 		a.console.WarnForFeature(ctx, azapi.FeatureDeploymentStacks)
 	}
 
-	destroyOptions := provisioning.NewDestroyOptions(a.flags.forceDelete, a.flags.purgeDelete)
+	destroyOptions := provisioning.NewDestroyOptions(a.flags.forceDelete, a.flags.purgeDelete, a.flags.noWait)
 	if _, err := a.provisionManager.Destroy(ctx, destroyOptions); err != nil {
 		return nil, fmt.Errorf("deleting infrastructure: %w", err)
 	}
 
+	var header string
+	if a.flags.noWait {
+		if a.flags.purgeDelete {
+			header = "Azure resources are being deleted and purged. Waiting for purge operations to complete..."
+		} else {
+			header = "Azure resource deletion has started and is continuing in the background."
+		}
+	} else {
+		header = fmt.Sprintf("Your application was removed from Azure in %s.", ux.DurationAsText(since(startTime)))
+	}
+
 	return &actions.ActionResult{
 		Message: &actions.ResultMessage{
-			Header: fmt.Sprintf("Your application was removed from Azure in %s.", ux.DurationAsText(since(startTime))),
+			Header: header,
 		},
 	}, nil
 }
@@ -134,5 +152,6 @@ func getCmdDownHelpFooter(*cobra.Command) string {
 		"Forcibly delete all applications resources without confirmation.": output.WithHighLightFormat("azd down --force"),
 		"Permanently delete resources that are soft-deleted by default," +
 			" without confirmation.": output.WithHighLightFormat("azd down --purge"),
+		"Start the delete process but do not wait for it to complete.": output.WithHighLightFormat("azd down --no-wait"),
 	})
 }

cli/azd/internal/vsrpc/environment_service.go

@@ -173,7 +173,7 @@ func (s *environmentService) DeleteEnvironmentAsync(
 		}
 
 		// Enable force and purge options
-		destroyOptions := provisioning.NewDestroyOptions(true, true)
+		destroyOptions := provisioning.NewDestroyOptions(true, true, false)
 		_, err = c.provisionManager.Destroy(ctx, destroyOptions)
 		if errors.Is(err, infra.ErrDeploymentsNotFound) || errors.Is(err, infra.ErrDeploymentResourcesNotFound) {
 			_ = observer.OnNext(ctx, newInfoProgressMessage("No Azure resources were found"))

cli/azd/pkg/devcenter/provision_provider_test.go

@@ -392,7 +392,7 @@ func Test_ProvisionProvider_Destroy(t *testing.T) {
 			Return(outputParams, nil)
 
 		provider := newProvisionProviderForTest(t, mockContext, config, env, manager)
-		destroyOptions := provisioning.NewDestroyOptions(true, true)
+		destroyOptions := provisioning.NewDestroyOptions(true, true, false)
 		result, err := provider.Destroy(*mockContext.Context, destroyOptions)
 		require.NoError(t, err)
 		require.NotNil(t, result)
@@ -419,7 +419,7 @@ func Test_ProvisionProvider_Destroy(t *testing.T) {
 		mockdevcentersdk.MockDeleteEnvironment(mockContext, config.Project, config.User, env.Name(), nil)
 
 		provider := newProvisionProviderForTest(t, mockContext, config, env, nil)
-		destroyOptions := provisioning.NewDestroyOptions(true, true)
+		destroyOptions := provisioning.NewDestroyOptions(true, true, false)
 		result, err := provider.Destroy(*mockContext.Context, destroyOptions)
 		require.Error(t, err)
 		require.Nil(t, result)

cli/azd/pkg/infra/provisioning/bicep/bicep_provider_test.go

@@ -193,7 +193,7 @@ func TestBicepDestroy(t *testing.T) {
 
 		infraProvider := createBicepProvider(t, mockContext)
 
-		destroyOptions := provisioning.NewDestroyOptions(false, false)
+		destroyOptions := provisioning.NewDestroyOptions(false, false, false)
 		destroyResult, err := infraProvider.Destroy(*mockContext.Context, destroyOptions)
 
 		require.Nil(t, err)
@@ -212,7 +212,7 @@ func TestBicepDestroy(t *testing.T) {
 
 		infraProvider := createBicepProvider(t, mockContext)
 
-		destroyOptions := provisioning.NewDestroyOptions(true, true)
+		destroyOptions := provisioning.NewDestroyOptions(true, true, false)
 		destroyResult, err := infraProvider.Destroy(*mockContext.Context, destroyOptions)
 
 		require.Nil(t, err)

cli/azd/pkg/infra/provisioning/manager.go

@@ -295,6 +295,35 @@ func (m *Manager) Preview(ctx context.Context) (*DeployPreviewResult, error) {
 
 // Destroys the Azure infrastructure for the specified project
 func (m *Manager) Destroy(ctx context.Context, options DestroyOptions) (*DestroyResult, error) {
+	// If noWait is true but purge is also true, we need to perform the operation synchronously
+	// to ensure purge operations complete, which prevents issues when running azd up later
+	if options.NoWait() && !options.Purge() {
+		// Create a new context that won't be cancelled when the parent context is done
+		newCtx := context.Background()
+		// Run the destroy operation in a goroutine and don't wait for it to complete
+		go func() {
+			destroyResult, err := m.provider.Destroy(newCtx, options)
+			if err != nil {
+				// Just log the error since we can't return it
+				return
+			}
+
+			// Remove any outputs from the template from the environment since destroying the infrastructure
+			// invalidated them all.
+			for _, key := range destroyResult.InvalidatedEnvKeys {
+				m.env.DotenvDelete(key)
+			}
+
+			// Update environment files to remove invalid infrastructure parameters
+			_ = m.envManager.Save(newCtx, m.env)
+		}()
+
+		// Return immediately with an empty result
+		return &DestroyResult{
+			InvalidatedEnvKeys: []string{},
+		}, nil
+	}
+
 	destroyResult, err := m.provider.Destroy(ctx, options)
 	if err != nil {
 		return nil, fmt.Errorf("error deleting Azure resources: %w", err)

cli/azd/pkg/infra/provisioning/manager_test.go

@@ -178,7 +178,7 @@ func TestManagerDestroyWithPositiveConfirmation(t *testing.T) {
 	err := mgr.Initialize(*mockContext.Context, "", provisioning.Options{Provider: "test"})
 	require.NoError(t, err)
 
-	destroyOptions := provisioning.NewDestroyOptions(false, false)
+	destroyOptions := provisioning.NewDestroyOptions(false, false, false)
 	destroyResult, err := mgr.Destroy(*mockContext.Context, destroyOptions)
 
 	require.NotNil(t, destroyResult)
@@ -214,7 +214,7 @@ func TestManagerDestroyWithNegativeConfirmation(t *testing.T) {
 	err := mgr.Initialize(*mockContext.Context, "", provisioning.Options{Provider: "test"})
 	require.NoError(t, err)
 
-	destroyOptions := provisioning.NewDestroyOptions(false, false)
+	destroyOptions := provisioning.NewDestroyOptions(false, false, false)
 	destroyResult, err := mgr.Destroy(*mockContext.Context, destroyOptions)
 
 	require.Nil(t, destroyResult)

cli/azd/pkg/infra/provisioning/options.go

@@ -34,6 +34,8 @@ type DestroyOptions struct {
 	force bool
 	// Whether or not to purge any key vaults associated with the deployment
 	purge bool
+	// Whether or not to start the deletion and return immediately without waiting for completion
+	noWait bool
 }
 
 type StateOptions struct {
@@ -55,14 +57,19 @@ func (o *DestroyOptions) Purge() bool {
 	return o.purge
 }
 
+func (o *DestroyOptions) NoWait() bool {
+	return o.noWait
+}
+
 func (o *DestroyOptions) Force() bool {
 	return o.force
 }
 
-func NewDestroyOptions(force bool, purge bool) DestroyOptions {
+func NewDestroyOptions(force bool, purge bool, noWait bool) DestroyOptions {
 	return DestroyOptions{
-		force: force,
-		purge: purge,
+		force:  force,
+		purge:  purge,
+		noWait: noWait,
 	}
 }
 

cli/azd/pkg/infra/provisioning/options_test.go

@@ -0,0 +1,24 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+package provisioning
+
+import (
+	"testing"
+
+	"github.com/stretchr/testify/require"
+)
+
+func TestNewDestroyOptions(t *testing.T) {
+	options := NewDestroyOptions(true, true, true)
+
+	require.True(t, options.Force())
+	require.True(t, options.Purge())
+	require.True(t, options.NoWait())
+
+	options = NewDestroyOptions(false, false, false)
+
+	require.False(t, options.Force())
+	require.False(t, options.Purge())
+	require.False(t, options.NoWait())
+}

cli/azd/pkg/infra/provisioning/terraform/terraform_provider_test.go

@@ -66,7 +66,7 @@ func TestTerraformDestroy(t *testing.T) {
 	prepareDestroyMocks(mockContext.CommandRunner)
 
 	infraProvider := createTerraformProvider(t, mockContext)
-	destroyOptions := provisioning.NewDestroyOptions(false, false)
+	destroyOptions := provisioning.NewDestroyOptions(false, false, false)
 	destroyResult, err := infraProvider.Destroy(*mockContext.Context, destroyOptions)
 
 	require.Nil(t, err)