Skip to content

deprecate playground #2074

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
jordanstephens wants to merge 1 commit into
base: main
Choose a base branch
from
+9 −9
Draft

deprecate playground #2074

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/cmd/cli/command/commands.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions src/pkg/cli/client/provider_id.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
8 changes: 4 additions & 4 deletions src/pkg/stacks/selector_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/pkg/stacks/wizard.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down
Loading