Merge #11354

11354: Fix default answer for AskOne prompt r=Frassle a=Frassle

<!--- 
Thanks so much for your contribution! If this is your first time contributing, please ensure that you have read the [CONTRIBUTING](https://github.com/pulumi/pulumi/blob/master/CONTRIBUTING.md) documentation.
-->

# Description

<!--- Please include a summary of the change and which issue is fixed. Please also include relevant motivation and context. -->

Fixes #11334

## Checklist

<!--- Please provide details if the checkbox below is to be left unchecked. -->
- [ ] I have added tests that prove my fix is effective or that my feature works
<!--- 
User-facing changes require a CHANGELOG entry.
-->
- [x] I have run `make changelog` and committed the `changelog/pending/<file>` documenting my change
<!--
If the change(s) in this PR is a modification of an existing call to the Pulumi Service,
then the service should honor older versions of the CLI where this change would not exist.
You must then bump the API version in /pkg/backend/httpstate/client/api.go, as well as add
it to the service.
-->
- [ ] Yes, there are changes in this PR that warrants bumping the Pulumi Service API version
  <!-- `@Pulumi` employees: If yes, you must submit corresponding changes in the service repo. -->


Co-authored-by: Fraser Waters <fraser@pulumi.com>

changelog/pending/20221115--cli--fix-stack-selection-prompt.yaml

@@ -0,0 +1,4 @@
+changes:
+- type: fix
+  scope: cli
+  description: Fix stack selection prompt.

pkg/cmd/pulumi/util.go

@@ -347,23 +347,28 @@ func chooseStack(ctx context.Context,
 	}
 	sort.Strings(options)
 
+	// If a stack is already selected, make that the default.
+	var defaultOption string
+	currStack, currErr := state.CurrentStack(ctx, b)
+	contract.IgnoreError(currErr)
+	if currStack != nil {
+		defaultOption = currStack.Ref().String()
+	}
+
 	// If we are offering to create a new stack, add that to the end of the list.
 	const newOption = "<create a new stack>"
 	if offerNew {
 		options = append(options, newOption)
+		// If we're offering the option to make a new stack AND we don't have a default current stack then
+		// make the new option the default
+		if defaultOption == "" {
+			defaultOption = newOption
+		}
 	} else if len(options) == 0 {
 		// If no options are available, we can't offer a choice!
 		return nil, errors.New("this command requires a stack, but there are none")
 	}
 
-	// If a stack is already selected, make that the default.
-	var current string
-	currStack, currErr := state.CurrentStack(ctx, b)
-	contract.IgnoreError(currErr)
-	if currStack != nil {
-		current = currStack.Ref().String()
-	}
-
 	// Customize the prompt a little bit (and disable color since it doesn't match our scheme).
 	surveycore.DisableColor = true
 	message := "\rPlease choose a stack"
@@ -378,7 +383,7 @@ func chooseStack(ctx context.Context,
 	if err = survey.AskOne(&survey.Select{
 		Message: message,
 		Options: options,
-		Default: current,
+		Default: defaultOption,
 	}, &option, surveyIcons(opts.Color)); err != nil {
 		return nil, errors.New(chooseStackErr)
 	}