Revert "CLOUDP-333877: create stub for atlas cli commands streams workspaces …"

This reverts commit fbf4387.

Author: Waybo26

internal/cli/streams/instance/create.go

@@ -38,19 +38,16 @@ type CreateOpts struct {
 	cli.ProjectOpts
 	cli.OutputOpts
 	cli.InputOpts
-	name        string
-	provider    string
-	region      string
-	tier        string
-	defaultTier string
-	maxTierSize string
-	store       StreamsCreator
+	name     string
+	provider string
+	region   string
+	tier     string
+	store    StreamsCreator
 }
 
 const (
-	createTemplate  = "Atlas Streams Processor Instance '{{.Name}}' successfully created.\n"
-	createWorkspace = "Atlas Streams Processor Workspace '{{.Name}}' successfully created.\n"
-	defaultTier     = "SP30"
+	createTemplate = "Atlas Streams Processor Instance '{{.Name}}' successfully created.\n"
+	defaultTier    = "SP30"
 )
 
 func (opts *CreateOpts) Run() error {
@@ -127,46 +124,3 @@ func CreateBuilder() *cobra.Command {
 
 	return cmd
 }
-
-func WorkspaceCreateBuilder() *cobra.Command {
-	opts := &CreateOpts{}
-	cmd := &cobra.Command{
-		Use:   "create <name>",
-		Short: "Create an Atlas Stream Processing workspace for your project",
-		Long:  `To get started quickly, specify a name, a cloud provider, and a region to configure an Atlas Stream Processing workspace.` + fmt.Sprintf(usage.RequiredRole, "Project Owner"),
-		Example: `  # Deploy an Atlas Stream Processing workspace called myProcessor for the project with the ID 5e2211c17a3e5a48f5497de3:
-  atlas streams instance create myProcessor --projectId 5e2211c17a3e5a48f5497de3 --provider AWS --region VIRGINIA_USA --tier SP10 --defaultTier SP30 --maxTierSize SP50`,
-		Args: require.ExactArgs(1),
-		Annotations: map[string]string{
-			"nameDesc": "Name of the Atlas Stream Processing workspace. After creation, you can't change the name of the workspace. The name can contain ASCII letters, numbers, and hyphens.",
-			"output":   createWorkspace,
-		},
-		PreRunE: func(cmd *cobra.Command, args []string) error {
-			opts.name = args[0]
-
-			return opts.PreRunE(
-				opts.ValidateProjectID,
-				opts.initStore(cmd.Context()),
-				opts.InitOutput(cmd.OutOrStdout(), createWorkspace),
-			)
-		},
-		RunE: func(_ *cobra.Command, _ []string) error {
-			return opts.Run()
-		},
-	}
-
-	cmd.Flags().StringVar(&opts.provider, flag.Provider, "AWS", usage.StreamsProvider)
-	cmd.Flags().StringVarP(&opts.region, flag.Region, flag.RegionShort, "", usage.StreamsRegion)
-
-	opts.AddProjectOptsFlags(cmd)
-	opts.AddOutputOptFlags(cmd)
-
-	cmd.Flags().StringVar(&opts.tier, flag.Tier, "SP30", usage.StreamsWorkspaceTier)
-	cmd.Flags().StringVar(&opts.defaultTier, flag.DefaultTier, "", usage.StreamsWorkspaceDefaultTier)
-	cmd.Flags().StringVar(&opts.maxTierSize, flag.MaxTierSize, "", usage.StreamsWorkspaceMaxTierSize)
-
-	_ = cmd.MarkFlagRequired(flag.Provider)
-	_ = cmd.MarkFlagRequired(flag.Region)
-
-	return cmd
-}

internal/cli/streams/instance/create_test.go

@@ -98,73 +98,4 @@ func TestCreateOpts_Run(t *testing.T) {
 		t.Log(buf.String())
 		test.VerifyOutputTemplate(t, createTemplate, expected)
 	})
-
-	t.Run("stream workspaces create --tier", func(t *testing.T) {
-		buf := new(bytes.Buffer)
-		opts := &CreateOpts{
-			store:    mockStore,
-			name:     "ExampleStreamWorkspaces",
-			provider: "AWS",
-			region:   "VIRGINIA_USA",
-			tier:     "SP30",
-		}
-		opts.ProjectID = testProjectID
-
-		expected := &atlasv2.StreamsTenant{
-			Name:              &opts.name,
-			GroupId:           &opts.ProjectID,
-			DataProcessRegion: &atlasv2.StreamsDataProcessRegion{CloudProvider: "AWS", Region: "VIRGINIA_USA"},
-			StreamConfig: &atlasv2.StreamConfig{
-				Tier: &opts.tier,
-			},
-		}
-
-		mockStore.
-			EXPECT().
-			CreateStream(opts.ProjectID, expected).
-			Return(expected, nil).
-			Times(1)
-
-		if err := opts.Run(); err != nil {
-			t.Fatalf("Run() unexpected error: %v", err)
-		}
-		t.Log(buf.String())
-		test.VerifyOutputTemplate(t, createWorkspace, expected)
-	})
-
-	// Testing the parsing of flags but not passing into StreamConfig object
-	t.Run("stream workspaces create --tier --defaultTier --maxTierSize", func(t *testing.T) {
-		buf := new(bytes.Buffer)
-		opts := &CreateOpts{
-			store:       mockStore,
-			name:        "ExampleStreamWorkspaces",
-			provider:    "AWS",
-			region:      "VIRGINIA_USA",
-			tier:        "SP30",
-			defaultTier: "SP30",
-			maxTierSize: "SP50",
-		}
-		opts.ProjectID = testProjectID
-
-		expected := &atlasv2.StreamsTenant{
-			Name:              &opts.name,
-			GroupId:           &opts.ProjectID,
-			DataProcessRegion: &atlasv2.StreamsDataProcessRegion{CloudProvider: "AWS", Region: "VIRGINIA_USA"},
-			StreamConfig: &atlasv2.StreamConfig{
-				Tier: &opts.tier,
-			},
-		}
-
-		mockStore.
-			EXPECT().
-			CreateStream(opts.ProjectID, expected).
-			Return(expected, nil).
-			Times(1)
-
-		if err := opts.Run(); err != nil {
-			t.Fatalf("Run() unexpected error: %v", err)
-		}
-		t.Log(buf.String())
-		test.VerifyOutputTemplate(t, createWorkspace, expected)
-	})
 }

internal/cli/streams/instance/workspaces.go

@@ -51,8 +51,6 @@ const (
 	MembersShort                                  = "m"                                             // MembersShort flag
 	ShardsShort                                   = "s"                                             // ShardsShort flag
 	Tier                                          = "tier"                                          // Tier flag
-	DefaultTier                                   = "defaultTier"                                   // DefaultTier flag
-	MaxTierSize                                   = "maxTierSize"                                   // MaxTierSize flag
 	Forever                                       = "forever"                                       // Forever flag
 	ForeverShort                                  = "F"                                             // ForeverShort flag
 	DiskSizeGB                                    = "diskSizeGB"                                    // DiskSizeGB flag

internal/flag/flags.go

@@ -242,13 +242,9 @@ dbName and collection are required only for built-in roles.`
 	StreamsRegion                                 = "Human-readable label that identifies the physical location of your Atlas Stream Processing instance. The region can affect network latency and performance if it is far from your source or sink. For AWS, region name must be in the following format: VIRGINIA_USA. For a list of valid values, see https://www.mongodb.com/docs/atlas/reference/amazon-aws/#std-label-aws-stream-processing-regions. For Azure, region name must be in the following format: eastus. For a list of valid values, see https://www.mongodb.com/docs/atlas/reference/microsoft-azure/#std-label-azure-stream-processing-regions."
 	StreamsProvider                               = "Cloud service provider that applies to the provisioned Atlas Stream Processing instance. Valid values are AWS or AZURE."
 	StreamsInstance                               = "Name of your Atlas Stream Processing instance."
-	StreamsWorkspace                              = "Name of your Atlas Stream Procesing workspace."
 	StreamsConnectionFilename                     = "Path to a JSON configuration file that defines an Atlas Stream Processing connection. Note: Unsupported fields in the JSON file are ignored."
 	StreamsPrivateLinkFilename                    = "Path to a JSON configuration file that defines an Atlas Stream Processing PrivateLink endpoint. Note: Unsupported fields in the JSON file are ignored."
 	StreamsInstanceTier                           = "Tier for your Stream Instance."
-	StreamsWorkspaceTier                          = "Tier for your Stream Workspace."
-	StreamsWorkspaceDefaultTier                   = "Default Tier for your Stream Workspace."
-	StreamsWorkspaceMaxTierSize                   = "Max Tier Size for your Stream Workspace."
 	WithoutDefaultAlertSettings                   = "Flag that creates the new project without the default alert settings enabled. This flag defaults to false. This option is useful if you create projects programmatically and want to create your own alerts instead of using the default alert settings."
 	FormatOut                                     = "Output format. Valid values are json, json-path, go-template, or go-template-file. To see the full output, use the -o json option."
 	TargetClusterName                             = "Name of the target cluster. For use only with automated restore jobs. You must specify a targetClusterName for automated restores."