Confirm before automatically setting a new environment as the default

cli/azd/cmd/env.go

@@ -881,8 +881,47 @@ func (en *envNewAction) Run(ctx context.Context) (*actions.ActionResult, error)
 		return nil, fmt.Errorf("creating new environment: %w", err)
 	}
 
-	if err := en.azdCtx.SetProjectState(azdcontext.ProjectState{DefaultEnvironment: env.Name()}); err != nil {
-		return nil, fmt.Errorf("saving default environment: %w", err)
+	envs, err := en.envManager.List(ctx)
+	if err != nil {
+		return nil, fmt.Errorf("listing environments: %w", err)
+	}
+
+	if len(envs) == 1 {
+		// If this is the only environment, set it as the default environment
+		if err := en.azdCtx.SetProjectState(azdcontext.ProjectState{DefaultEnvironment: env.Name()}); err != nil {
+			return nil, fmt.Errorf("saving default environment: %w", err)
+		}
+		en.console.Message(ctx,
+			fmt.Sprintf("New environment '%s' was set as default", env.Name()),
+		)
+	} else {
+		// Ask the user if they want to set the new environment as the default environment
+		msg := fmt.Sprintf("Set new environment '%s' as default environment?", env.Name())
+		shouldSetDefault, promptErr := en.console.Confirm(ctx, input.ConsoleOptions{
+			Message:      msg,
+			DefaultValue: true,
+		})
+
+		if promptErr != nil {
+			return nil, fmt.Errorf("prompting to set environment '%s' as default environment: %w", env.Name(), promptErr)
+		}
+
+		if shouldSetDefault {
+			if err := en.azdCtx.SetProjectState(azdcontext.ProjectState{DefaultEnvironment: env.Name()}); err != nil {
+				return nil, fmt.Errorf("saving default environment: %w", err)
+			}
+			en.console.Message(ctx,
+				fmt.Sprintf("\nNew environment '%s' created and set as default", env.Name()),
+			)
+		} else {
+			defaultEnvironment, err := en.azdCtx.GetDefaultEnvironmentName()
+			if err != nil {
+				return nil, fmt.Errorf("get default environment: %w", err)
+			}
+			en.console.Message(ctx,
+				fmt.Sprintf("\nNew env '%s' created, default environment remains '%s'", env.Name(), defaultEnvironment),
+			)
+		}
 	}
 
 	return nil, nil

cli/azd/pkg/environment/manager.go

@@ -178,8 +178,46 @@ func (m *manager) LoadOrInitInteractive(ctx context.Context, environmentName str
 			return nil, err
 		}
 
-		if err := m.azdContext.SetProjectState(azdcontext.ProjectState{DefaultEnvironment: env.Name()}); err != nil {
-			return nil, fmt.Errorf("saving default environment: %w", err)
+		envs, err := m.List(ctx)
+		if err != nil {
+			return nil, fmt.Errorf("listing environments: %w", err)
+		}
+		// If this is the only environment, set it as the default environment
+		if len(envs) == 1 {
+			if err := m.azdContext.SetProjectState(azdcontext.ProjectState{DefaultEnvironment: env.Name()}); err != nil {
+				return nil, fmt.Errorf("saving default environment: %w", err)
+			}
+			m.console.Message(ctx,
+				fmt.Sprintf("\nNew environment '%s' created and set as default", env.Name()),
+			)
+		} else {
+			// Ask the user if they want to set the new environment as the default environment
+			msg := fmt.Sprintf("Set new environment '%s' as default environment?", env.Name())
+			shouldSetDefault, promptErr := m.console.Confirm(ctx, input.ConsoleOptions{
+				Message:      msg,
+				DefaultValue: true,
+			})
+
+			if promptErr != nil {
+				return nil, fmt.Errorf("prompting to set environment '%s' as default environment: %w", env.Name(), promptErr)
+			}
+
+			if shouldSetDefault {
+				if err := m.azdContext.SetProjectState(azdcontext.ProjectState{DefaultEnvironment: env.Name()}); err != nil {
+					return nil, fmt.Errorf("saving default environment: %w", err)
+				}
+				m.console.Message(ctx,
+					fmt.Sprintf("\nNew environment '%s' created and set as default.", env.Name()),
+				)
+			} else {
+				defaultEnvironment, err := m.azdContext.GetDefaultEnvironmentName()
+				if err != nil {
+					return nil, fmt.Errorf("get default environment: %w", err)
+				}
+				m.console.Message(ctx,
+					fmt.Sprintf("\nNew env '%s' created, default environment remains '%s'.", env.Name(), defaultEnvironment),
+				)
+			}
 		}
 	}
 

cli/azd/pkg/environment/manager_test.go

@@ -80,6 +80,10 @@ func Test_EnvManager_PromptEnvironmentName(t *testing.T) {
 			return strings.Contains(options.Message, "would you like to create it?")
 		}).Respond(true)
 
+		mockContext.Console.WhenConfirm(func(options input.ConsoleOptions) bool {
+			return strings.Contains(options.Message, "Would you like to set the new environment")
+		}).Respond(true)
+
 		mockContext.Console.WhenPrompt(func(options input.ConsoleOptions) bool {
 			return true
 		}).SetError(errors.New("prompt should not be called for valid environment name"))
@@ -106,6 +110,10 @@ func Test_EnvManager_PromptEnvironmentName(t *testing.T) {
 			return true
 		}).Respond(expected)
 
+		mockContext.Console.WhenConfirm(func(options input.ConsoleOptions) bool {
+			return strings.Contains(options.Message, "Would you like to set the new environment")
+		}).Respond(true)
+
 		envManager := createEnvManagerForManagerTest(t, mockContext)
 		env, err := envManager.LoadOrInitInteractive(*mockContext.Context, "")
 

cli/azd/test/functional/env_refresh_test.go

@@ -53,7 +53,7 @@ func Test_CLI_EnvRefresh_NoBicep(t *testing.T) {
 	require.NoError(t, os.Rename(infraPath, infraPathHidden))
 
 	// Reuse same environment name
-	_, err = cli.RunCommandWithStdIn(ctx, envName+"\n", "env", "refresh")
+	_, err = cli.RunCommandWithStdIn(ctx, envName+"\ny\n", "env", "refresh")
 	require.NoError(t, err)
 
 	env, err := envFromAzdRoot(ctx, dir, envName)

cli/azd/test/functional/env_test.go

@@ -125,7 +125,7 @@ func Test_CLI_Env_Management(t *testing.T) {
 	envName3 := randomEnvName()
 	_, _ = cli.RunCommandWithStdIn(
 		ctx,
-		"Create a new environment\n"+envName3+"\n",
+		"Create a new environment\n"+envName3+"\ny\n",
 		cmdNeedingEnv...)
 	environmentList = envList(ctx, t, cli)
 	require.Len(t, environmentList, 3)
@@ -333,10 +333,10 @@ func envNew(ctx context.Context, t *testing.T, cli *azdcli.CLI, envName string,
 
 	if usePrompt {
 		runArgs := append(defaultArgs, args...)
-		_, err := cli.RunCommandWithStdIn(ctx, envName+"\n", runArgs...)
+		_, err := cli.RunCommandWithStdIn(ctx, envName+"\ny\n", runArgs...)
 		require.NoError(t, err)
 	} else {
-		runArgs := append(defaultArgs, envName, "--subscription", cfg.SubscriptionID, "-l", cfg.Location)
+		runArgs := append(defaultArgs, envName, "--no-prompt", "--subscription", cfg.SubscriptionID, "-l", cfg.Location)
 		runArgs = append(runArgs, args...)
 		_, err := cli.RunCommand(ctx, runArgs...)
 		require.NoError(t, err)