fix: azd down returns error instead of prompting init steps when no environment exists #6850
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -19,6 +19,7 @@ import ( | |
| inf "github.com/azure/azure-dev/cli/azd/pkg/infra" | ||
| "github.com/azure/azure-dev/cli/azd/pkg/infra/provisioning" | ||
| "github.com/azure/azure-dev/cli/azd/pkg/input" | ||
| "github.com/azure/azure-dev/cli/azd/pkg/lazy" | ||
| "github.com/azure/azure-dev/cli/azd/pkg/output" | ||
| "github.com/azure/azure-dev/cli/azd/pkg/output/ux" | ||
| "github.com/azure/azure-dev/cli/azd/pkg/project" | ||
|
|
@@ -64,38 +65,38 @@ func newDownCmd() *cobra.Command { | |
| } | ||
|
|
||
| type downAction struct { | ||
| flags *downFlags | ||
| args []string | ||
| lazyProvisionManager *lazy.Lazy[*provisioning.Manager] | ||
| importManager *project.ImportManager | ||
| lazyEnv *lazy.Lazy[*environment.Environment] | ||
| envManager environment.Manager | ||
| console input.Console | ||
| projectConfig *project.ProjectConfig | ||
| alphaFeatureManager *alpha.FeatureManager | ||
| } | ||
|
|
||
| func newDownAction( | ||
| args []string, | ||
| flags *downFlags, | ||
| lazyProvisionManager *lazy.Lazy[*provisioning.Manager], | ||
| lazyEnv *lazy.Lazy[*environment.Environment], | ||
| envManager environment.Manager, | ||
| projectConfig *project.ProjectConfig, | ||
| console input.Console, | ||
| alphaFeatureManager *alpha.FeatureManager, | ||
| importManager *project.ImportManager, | ||
| ) actions.Action { | ||
| return &downAction{ | ||
| flags: flags, | ||
| lazyProvisionManager: lazyProvisionManager, | ||
| lazyEnv: lazyEnv, | ||
| envManager: envManager, | ||
| console: console, | ||
| projectConfig: projectConfig, | ||
| importManager: importManager, | ||
| alphaFeatureManager: alphaFeatureManager, | ||
| args: args, | ||
| } | ||
| } | ||
|
|
||
|
|
@@ -108,6 +109,27 @@ func (a *downAction) Run(ctx context.Context) (*actions.ActionResult, error) { | |
|
|
||
| startTime := time.Now() | ||
|
|
||
| // Check if there are any environments before proceeding | ||
|
vhvb1989 marked this conversation as resolved.
Outdated
|
||
| envList, err := a.envManager.List(ctx) | ||
| if err != nil { | ||
| return nil, fmt.Errorf("listing environments: %w", err) | ||
| } | ||
| if len(envList) == 0 { | ||
|
vhvb1989 marked this conversation as resolved.
Outdated
|
||
| return nil, errors.New("no environments found. Run \"azd init\" or \"azd env new\" to create one") | ||
| } | ||
|
vhvb1989 marked this conversation as resolved.
Outdated
vhvb1989 marked this conversation as resolved.
Outdated
|
||
|
|
||
| // Get the environment non-interactively (respects -e flag or default environment) | ||
| env, err := a.lazyEnv.GetValue() | ||
| if err != nil { | ||
|
vhvb1989 marked this conversation as resolved.
vhvb1989 marked this conversation as resolved.
|
||
| return nil, err | ||
| } | ||
|
|
||
| // Get the provisioning manager (resolved lazily to avoid premature env prompts) | ||
| provisionManager, err := a.lazyProvisionManager.GetValue() | ||
| if err != nil { | ||
| return nil, fmt.Errorf("getting provisioning manager: %w", err) | ||
| } | ||
|
|
||
|
Contributor
There was a problem hiding this comment. [High]
Per @vhvb1989's earlier review comment,
Contributor
Author
There was a problem hiding this comment. Fixed in d8c9ec5. Changed |
||
| infra, err := a.importManager.ProjectInfrastructure(ctx, a.projectConfig) | ||
| if err != nil { | ||
| return nil, err | ||
|
|
@@ -141,12 +163,12 @@ func (a *downAction) Run(ctx context.Context) (*actions.ActionResult, error) { | |
| } | ||
|
|
||
| layer.Mode = provisioning.ModeDestroy | ||
| if err := provisionManager.Initialize(ctx, a.projectConfig.Path, layer); err != nil { | ||
| return nil, fmt.Errorf("initializing provisioning manager: %w", err) | ||
| } | ||
|
|
||
| destroyOptions := provisioning.NewDestroyOptions(a.flags.forceDelete, a.flags.purgeDelete) | ||
| _, err := provisionManager.Destroy(ctx, destroyOptions) | ||
| if errors.Is(err, inf.ErrDeploymentsNotFound) || errors.Is(err, inf.ErrDeploymentResourcesNotFound) { | ||
| a.console.MessageUxItem(ctx, &ux.DoneMessage{Message: "No Azure resources were found."}) | ||
| } else if err != nil { | ||
|
|
@@ -155,7 +177,7 @@ func (a *downAction) Run(ctx context.Context) (*actions.ActionResult, error) { | |
| } | ||
|
|
||
| // Invalidate cache after successful down so azd show will refresh | ||
| if err := a.envManager.InvalidateEnvCache(ctx, env.Name()); err != nil { | ||
| log.Printf("warning: failed to invalidate state cache: %v", err) | ||
| } | ||
|
|
||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,55 @@ | ||
| // Copyright (c) Microsoft Corporation. All rights reserved. | ||
| // Licensed under the MIT License. | ||
|
|
||
| package cmd | ||
|
|
||
| import ( | ||
| "context" | ||
| "testing" | ||
|
|
||
| "github.com/azure/azure-dev/cli/azd/pkg/alpha" | ||
| "github.com/azure/azure-dev/cli/azd/pkg/environment" | ||
| "github.com/azure/azure-dev/cli/azd/pkg/infra/provisioning" | ||
| "github.com/azure/azure-dev/cli/azd/pkg/lazy" | ||
| "github.com/azure/azure-dev/cli/azd/pkg/project" | ||
| "github.com/azure/azure-dev/cli/azd/test/mocks" | ||
| "github.com/azure/azure-dev/cli/azd/test/mocks/mockenv" | ||
| "github.com/stretchr/testify/mock" | ||
| "github.com/stretchr/testify/require" | ||
| ) | ||
|
|
||
| func Test_DownAction_NoEnvironments_ReturnsError(t *testing.T) { | ||
| mockContext := mocks.NewMockContext(context.Background()) | ||
|
|
||
| envManager := &mockenv.MockEnvManager{} | ||
| envManager.On("List", mock.Anything). | ||
| Return([]*environment.Description{}, nil) | ||
|
|
||
| lazyEnv := lazy.NewLazy(func() (*environment.Environment, error) { | ||
| return environment.New("test-env"), nil | ||
| }) | ||
|
|
||
| lazyProvisionManager := lazy.NewLazy(func() (*provisioning.Manager, error) { | ||
|
vhvb1989 marked this conversation as resolved.
Outdated
|
||
| return nil, nil | ||
| }) | ||
|
|
||
| alphaManager := alpha.NewFeaturesManagerWithConfig(nil) | ||
|
|
||
| action := newDownAction( | ||
| []string{}, | ||
| &downFlags{}, | ||
| lazyProvisionManager, | ||
| lazyEnv, | ||
| envManager, | ||
| &project.ProjectConfig{}, | ||
| mockContext.Console, | ||
| alphaManager, | ||
| project.NewImportManager(nil), | ||
| ) | ||
|
|
||
| _, err := action.Run(*mockContext.Context) | ||
| require.Error(t, err) | ||
| require.Contains(t, err.Error(), "no environments found") | ||
|
|
||
| envManager.AssertExpectations(t) | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.