From de47e6af89957cd1117857eb6e73a608757dcded Mon Sep 17 00:00:00 2001 From: jordanstephens Date: Thu, 23 Apr 2026 16:47:36 -0700 Subject: [PATCH] remove playground from interactive provider selection and from option list --- src/cmd/cli/command/commands.go | 4 ++-- src/pkg/cli/client/provider_id.go | 4 ++-- src/pkg/stacks/selector_test.go | 8 ++++---- src/pkg/stacks/wizard.go | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/cmd/cli/command/commands.go b/src/cmd/cli/command/commands.go index 0cb625658..c13565409 100644 --- a/src/cmd/cli/command/commands.go +++ b/src/cmd/cli/command/commands.go @@ -149,10 +149,10 @@ func SetupCommands(version string) { RootCmd.PersistentFlags().StringVar(&global.FabricAddr, "cluster", global.FabricAddr, "Defang cluster to connect to") RootCmd.PersistentFlags().MarkHidden("cluster") // only for Defang use RootCmd.PersistentFlags().Var(&global.Tenant, "workspace", "workspace to use") - RootCmd.PersistentFlags().VarP(&global.Stack.Provider, "provider", "P", fmt.Sprintf(`bring-your-own-cloud provider; one of %v`, client.AllProviders())) + RootCmd.PersistentFlags().VarP(&global.Stack.Provider, "provider", "P", fmt.Sprintf(`bring-your-own-cloud provider; one of %v`, client.ByocProviders())) RootCmd.RegisterFlagCompletionFunc("provider", func(cmd *cobra.Command, args []string, toComplete string) ([]string, cobra.ShellCompDirective) { var completions []cobra.Completion - for _, provider := range client.AllProviders() { + for _, provider := range client.ByocProviders() { completions = append(completions, provider.String()) } return completions, cobra.ShellCompDirectiveNoFileComp diff --git a/src/pkg/cli/client/provider_id.go b/src/pkg/cli/client/provider_id.go index 75932da49..1c8d00d9f 100644 --- a/src/pkg/cli/client/provider_id.go +++ b/src/pkg/cli/client/provider_id.go @@ -27,8 +27,8 @@ var allProviders = []ProviderID{ // ProviderAzure, } -func AllProviders() []ProviderID { - return allProviders[1:] // skip "auto" +func ByocProviders() []ProviderID { + return allProviders[2:] // skip "auto" and "defang" } func (p ProviderID) String() string { diff --git a/src/pkg/stacks/selector_test.go b/src/pkg/stacks/selector_test.go index 188ab61a4..e27a99e6b 100644 --- a/src/pkg/stacks/selector_test.go +++ b/src/pkg/stacks/selector_test.go @@ -183,7 +183,7 @@ func TestStackSelector_SelectStack_CreateNewStack(t *testing.T) { mockEC.On("RequestEnum", ctx, "Select a stack", "stack", expectedOptions).Return(CreateNewStack, nil) // Mock wizard parameter collection - provider selection - providerOptions := []string{"Defang Playground", "AWS", "DigitalOcean", "Google Cloud Platform"} + providerOptions := []string{"AWS", "DigitalOcean", "Google Cloud Platform"} mockEC.On("RequestEnum", ctx, "Where do you want to deploy?", "provider", providerOptions).Return("AWS", nil) // Mock wizard parameter collection - region selection (default is us-west-2 for AWS) @@ -259,7 +259,7 @@ func TestStackSelector_SelectStack_NoExistingStacks(t *testing.T) { mockSM.On("List", ctx).Return([]ListItem{}, nil) // Mock wizard parameter collection - provider selection - providerOptions := []string{"Defang Playground", "AWS", "DigitalOcean", "Google Cloud Platform"} + providerOptions := []string{"AWS", "DigitalOcean", "Google Cloud Platform"} mockEC.On("RequestEnum", ctx, "Where do you want to deploy?", "provider", providerOptions).Return("AWS", nil) // Mock wizard parameter collection - region selection @@ -418,7 +418,7 @@ func TestStackSelector_SelectStack_WizardError(t *testing.T) { mockEC.On("RequestEnum", ctx, "Select a stack", "stack", expectedOptions).Return(CreateNewStack, nil) // Mock wizard parameter collection - provider selection fails - providerOptions := []string{"Defang Playground", "AWS", "DigitalOcean", "Google Cloud Platform"} + providerOptions := []string{"AWS", "DigitalOcean", "Google Cloud Platform"} mockEC.On("RequestEnum", ctx, "Where do you want to deploy?", "provider", providerOptions).Return("", errors.New("user cancelled wizard")) selector := NewSelector(mockEC, mockSM) @@ -455,7 +455,7 @@ func TestStackSelector_SelectStack_CreateStackError(t *testing.T) { mockEC.On("RequestEnum", ctx, "Select a stack", "stack", expectedOptions).Return(CreateNewStack, nil) // Mock wizard parameter collection - provider selection - providerOptions := []string{"Defang Playground", "AWS", "DigitalOcean", "Google Cloud Platform"} + providerOptions := []string{"AWS", "DigitalOcean", "Google Cloud Platform"} mockEC.On("RequestEnum", ctx, "Where do you want to deploy?", "provider", providerOptions).Return("AWS", nil) // Mock wizard parameter collection - region selection diff --git a/src/pkg/stacks/wizard.go b/src/pkg/stacks/wizard.go index e572712fd..e031182eb 100644 --- a/src/pkg/stacks/wizard.go +++ b/src/pkg/stacks/wizard.go @@ -46,7 +46,7 @@ func (w *Wizard) CollectRemainingParameters(ctx context.Context, params *Paramet if params.Provider == client.ProviderAuto || params.Provider == "" { var providerNames []string - for _, p := range client.AllProviders() { + for _, p := range client.ByocProviders() { providerNames = append(providerNames, p.Name()) } providerName, err := w.ec.RequestEnum(