CLOUDP-229230: Search nodes e2e tests (#2654)

jeroenvervaeke · web-flow · commit 06a9115427ea · 2024-02-21T14:01:07.000Z
diff --git a/build/ci/evergreen.yml b/build/ci/evergreen.yml
@@ -785,6 +785,24 @@ tasks:
           MCLI_OPS_MANAGER_URL: ${mcli_cloud_gov_ops_manager_url}
           MCLI_SERVICE: cloudgov
           E2E_TAGS: atlas,search
+  - name: atlas_search_nodes_e2e
+    tags: ["e2e","clusters","atlas"]
+    must_have_test_results: true
+    depends_on:
+      - name: atlas_clusters_flags_e2e
+        variant: "e2e_atlas_clusters"
+        patch_optional: true
+    commands:
+      - func: "install gotestsum"
+      - func: "e2e test"
+        vars:
+          MCLI_ORG_ID: ${atlas_org_id}
+          MCLI_PROJECT_ID: ${atlas_project_id}
+          MCLI_PRIVATE_API_KEY: ${atlas_private_api_key}
+          MCLI_PUBLIC_API_KEY: ${atlas_public_api_key}
+          MCLI_OPS_MANAGER_URL: ${mcli_ops_manager_url}
+          MCLI_SERVICE: cloud
+          E2E_TAGS: atlas,search_nodes
   # Private endpoints can be flaky when multiple tests run concurrently so keeping this out of the PR suite
   - name: atlas_private_endpoint_e2e
     tags: ["e2e","networking","atlas"]
diff --git a/docs/atlascli/command/atlas-clusters-search-nodes-delete.txt b/docs/atlascli/command/atlas-clusters-search-nodes-delete.txt
@@ -41,6 +41,10 @@ Options
      - string
      - true
      - Name of the cluster.
+   * - --force
+     - 
+     - false
+     - Flag that indicates whether to skip the confirmation prompt before proceeding with the requested action.
    * - -h, --help
      - 
      - false
diff --git a/internal/cli/atlas/search/nodes/create.go b/internal/cli/atlas/search/nodes/create.go
@@ -26,6 +26,7 @@ import (
 	"github.com/mongodb/mongodb-atlas-cli/internal/usage"
 	"github.com/spf13/afero"
 	"github.com/spf13/cobra"
+	"go.mongodb.org/atlas-sdk/v20231115007/admin"
 )
 
 type CreateOpts struct {
@@ -64,10 +65,12 @@ func (opts *CreateOpts) Run() error {
 	}
 
 	if opts.EnableWatch {
-		if _, err := opts.Watch(opts.watcher); err != nil {
+		watchResult, err := opts.Watch(opts.watcher)
+		if err != nil {
 			return err
 		}
 		opts.Template = createWatchTemplate
+		r = watchResult.(*admin.ApiSearchDeploymentResponse)
 	}
 
 	return opts.Print(r)
@@ -78,7 +81,7 @@ func (opts *CreateOpts) watcher() (any, bool, error) {
 	if err != nil {
 		return nil, false, err
 	}
-	return nil, *res.StateName == stateIdle, nil
+	return res, *res.StateName == stateIdle, nil
 }
 
 // atlas clusters search nodes create [--clusterName clusterName] [--file filePath].
diff --git a/internal/cli/atlas/search/nodes/delete.go b/internal/cli/atlas/search/nodes/delete.go
@@ -113,6 +113,7 @@ func DeleteBuilder() *cobra.Command {
 
 	cmd.Flags().BoolVarP(&opts.EnableWatch, flag.EnableWatch, flag.EnableWatchShort, false, usage.EnableWatchDefault)
 	cmd.Flags().UintVar(&opts.Timeout, flag.WatchTimeout, 0, usage.WatchTimeout)
+	cmd.Flags().BoolVar(&opts.Confirm, flag.Force, false, usage.Force)
 
 	// Global flags
 	cmd.Flags().StringVar(&opts.ProjectID, flag.ProjectID, "", usage.ProjectID)
diff --git a/internal/cli/atlas/search/nodes/update.go b/internal/cli/atlas/search/nodes/update.go
@@ -26,6 +26,7 @@ import (
 	"github.com/mongodb/mongodb-atlas-cli/internal/usage"
 	"github.com/spf13/afero"
 	"github.com/spf13/cobra"
+	"go.mongodb.org/atlas-sdk/v20231115007/admin"
 )
 
 type UpdateOpts struct {
@@ -60,10 +61,12 @@ func (opts *UpdateOpts) Run() error {
 	}
 
 	if opts.EnableWatch {
-		if _, err := opts.Watch(opts.watcher); err != nil {
+		watchResult, err := opts.Watch(opts.watcher)
+		if err != nil {
 			return err
 		}
 		opts.Template = updateWatchTemplate
+		r = watchResult.(*admin.ApiSearchDeploymentResponse)
 	}
 
 	return opts.Print(r)
@@ -74,7 +77,7 @@ func (opts *UpdateOpts) watcher() (any, bool, error) {
 	if err != nil {
 		return nil, false, err
 	}
-	return nil, *res.StateName == stateIdle, nil
+	return res, *res.StateName == stateIdle, nil
 }
 
 // atlas clusters search nodes update [--clusterName clusterName] [--file filePath].
diff --git a/test/README.md b/test/README.md
@@ -94,6 +94,10 @@
 | `cluster search index describe`             | Y         |           |           | Y         | N     | N     |
 | `cluster search index list`                 | Y         |           |           | Y         | N     | N     |
 | `cluster search index update`               | Y         |           |           | Y         | N     | N     |
+| `cluster search nodes list`                 | Y         |           |           | Y         | N     | N     |
+| `cluster search nodes create`               | Y         |           |           | Y         | N     | N     |
+| `cluster search nodes update`               | Y         |           |           | Y         | N     | N     |
+| `cluster search nodes delete`               | Y         |           |           | Y         | N     | N     |
 | `cluster advancedSettings describe`         | Y         |           |           | Y         | N     | N     |
 | `cluster advancedSettings update`           | Y         |           |           | Y         | N     | N     |
 | `dbrole create`                             | Y         |           |           | Y         |       |       |
diff --git a/test/e2e/atlas/atlas_e2e_test_generator_test.go b/test/e2e/atlas/atlas_e2e_test_generator_test.go
@@ -46,6 +46,7 @@ type atlasE2ETestGenerator struct {
 	teamUser       string
 	dbUser         string
 	tier           string
+	mDBVer         string
 	dataFedName    string
 	enableBackup   bool
 	firstProcess   *atlasv2.ApiHostViewAtlas
@@ -333,7 +334,11 @@ func (g *atlasE2ETestGenerator) generateCluster() {
 		g.tier = e2eTier()
 	}
 
-	g.clusterName, g.clusterRegion, err = deployClusterForProject(g.projectID, g.tier, g.enableBackup)
+	if g.mDBVer == "" {
+		g.mDBVer = e2eMDBVer
+	}
+
+	g.clusterName, g.clusterRegion, err = deployClusterForProject(g.projectID, g.tier, g.mDBVer, g.enableBackup)
 	if err != nil {
 		g.Logf("projectID=%q, clusterName=%q", g.projectID, g.clusterName)
 		g.t.Errorf("unexpected error deploying cluster: %v", err)
diff --git a/test/e2e/atlas/helper_test.go b/test/e2e/atlas/helper_test.go
@@ -42,6 +42,7 @@ const (
 	metricsEntity                = "metrics"
 	searchEntity                 = "search"
 	indexEntity                  = "index"
+	nodesEntity                  = "nodes"
 	datafederationEntity         = "datafederation"
 	datalakePipelineEntity       = "datalakepipeline"
 	alertsEntity                 = "alerts"
@@ -246,7 +247,7 @@ func deleteServerlessInstanceForProject(t *testing.T, cliPath, projectID, cluste
 	_ = watchServerlessInstanceForProject(projectID, clusterName)
 }
 
-func deployClusterForProject(projectID, tier string, enableBackup bool) (string, string, error) {
+func deployClusterForProject(projectID, tier, mDBVersion string, enableBackup bool) (string, string, error) {
 	cliPath, err := e2e.AtlasCLIBin()
 	if err != nil {
 		return "", "", err
@@ -263,7 +264,7 @@ func deployClusterForProject(projectID, tier string, enableBackup bool) (string,
 		clustersEntity,
 		"create",
 		clusterName,
-		"--mdbVersion", e2eMDBVer,
+		"--mdbVersion", mDBVersion,
 		"--region", region,
 		"--tier", tier,
 		"--provider", e2eClusterProvider,
diff --git a/test/e2e/atlas/search_nodes_spec.json b/test/e2e/atlas/search_nodes_spec.json
@@ -0,0 +1,8 @@
+{
+    "specs": [
+        {
+            "instanceSize": "S30_LOWCPU_NVME",
+            "nodeCount": 2
+        }
+    ]
+}
diff --git a/test/e2e/atlas/search_nodes_spec_update.json b/test/e2e/atlas/search_nodes_spec_update.json
@@ -0,0 +1,8 @@
+{
+    "specs": [
+        {
+            "instanceSize": "S20_HIGHCPU_NVME",
+            "nodeCount": 3
+        }
+    ]
+}
diff --git a/test/e2e/atlas/search_nodes_test.go b/test/e2e/atlas/search_nodes_test.go
@@ -0,0 +1,203 @@
+// Copyright 2024 MongoDB Inc
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//go:build e2e || (atlas && search_nodes)
+
+package atlas_test
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+	"os"
+	"os/exec"
+	"strings"
+	"testing"
+
+	"github.com/mongodb/mongodb-atlas-cli/test/e2e"
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
+	atlasv2 "go.mongodb.org/atlas-sdk/v20231115007/admin"
+)
+
+const minSearchNodesMDBVersion = "6.0"
+
+func TestSearchNodes(t *testing.T) {
+	cliPath, err := e2e.AtlasCLIBin()
+	req := require.New(t)
+	req.NoError(err)
+
+	g := newAtlasE2ETestGenerator(t)
+	g.generateProject("searchNodes")
+	g.tier = tierM10
+	g.mDBVer = minSearchNodesMDBVersion
+	g.generateCluster()
+
+	t.Run("Verify no search node setup yet", func(t *testing.T) {
+		cmd := exec.Command(cliPath,
+			clustersEntity,
+			searchEntity,
+			nodesEntity,
+			"list",
+			"--clusterName", g.clusterName,
+			"--projectId", g.projectID,
+			"-o=json",
+		)
+
+		resp, err := cmd.CombinedOutput()
+		respStr := string(resp)
+
+		require.Error(t, err, respStr)
+		require.Contains(t, respStr, "ATLAS_FTS_DEPLOYMENT_DOES_NOT_EXIST", respStr)
+	})
+
+	t.Run("Create search node", func(t *testing.T) {
+		cmd := exec.Command(cliPath,
+			clustersEntity,
+			searchEntity,
+			nodesEntity,
+			"create",
+			"--clusterName", g.clusterName,
+			"--projectId", g.projectID,
+			"--file", "search_nodes_spec.json",
+			"-w",
+			"-o=json",
+		)
+
+		cmd.Env = os.Environ()
+		resp, err := cmd.CombinedOutput()
+		resp = bytes.TrimLeft(resp, ".")
+
+		require.NoError(t, err, resp)
+		var searchNode atlasv2.ApiSearchDeploymentResponse
+		require.NoError(t, json.Unmarshal(resp, &searchNode))
+
+		assert.Equal(t, g.projectID, searchNode.GetGroupId())
+		assert.Equal(t, []atlasv2.ApiSearchDeploymentSpec{
+			{
+				InstanceSize: "S30_LOWCPU_NVME",
+				NodeCount:    2,
+			},
+		}, searchNode.GetSpecs())
+	})
+
+	t.Run("List + verify created", func(t *testing.T) {
+		cmd := exec.Command(cliPath,
+			clustersEntity,
+			searchEntity,
+			nodesEntity,
+			"list",
+			"--clusterName", g.clusterName,
+			"--projectId", g.projectID,
+			"-o=json",
+		)
+
+		cmd.Env = os.Environ()
+		resp, err := cmd.CombinedOutput()
+		resp = bytes.TrimLeft(resp, ".")
+
+		require.NoError(t, err, resp)
+		var searchNode atlasv2.ApiSearchDeploymentResponse
+		require.NoError(t, json.Unmarshal(resp, &searchNode))
+
+		assert.Equal(t, g.projectID, searchNode.GetGroupId())
+		assert.Equal(t, []atlasv2.ApiSearchDeploymentSpec{
+			{
+				InstanceSize: "S30_LOWCPU_NVME",
+				NodeCount:    2,
+			},
+		}, searchNode.GetSpecs())
+	})
+
+	t.Run("Update search node", func(t *testing.T) {
+		cmd := exec.Command(cliPath,
+			clustersEntity,
+			searchEntity,
+			nodesEntity,
+			"update",
+			"--clusterName", g.clusterName,
+			"--projectId", g.projectID,
+			"--file", "search_nodes_spec_update.json",
+			"-w",
+			"-o=json",
+		)
+
+		cmd.Env = os.Environ()
+		resp, err := cmd.CombinedOutput()
+		resp = bytes.TrimLeft(resp, ".")
+
+		require.NoError(t, err, resp)
+		var searchNode atlasv2.ApiSearchDeploymentResponse
+		require.NoError(t, json.Unmarshal(resp, &searchNode))
+
+		assert.Equal(t, g.projectID, searchNode.GetGroupId())
+		assert.Equal(t, []atlasv2.ApiSearchDeploymentSpec{
+			{
+				InstanceSize: "S20_HIGHCPU_NVME",
+				NodeCount:    3,
+			},
+		}, searchNode.GetSpecs())
+	})
+
+	t.Run("List + verify updated", func(t *testing.T) {
+		cmd := exec.Command(cliPath,
+			clustersEntity,
+			searchEntity,
+			nodesEntity,
+			"list",
+			"--clusterName", g.clusterName,
+			"--projectId", g.projectID,
+			"-o=json",
+		)
+
+		cmd.Env = os.Environ()
+		resp, err := cmd.CombinedOutput()
+		resp = bytes.TrimLeft(resp, ".")
+
+		require.NoError(t, err, resp)
+		var searchNode atlasv2.ApiSearchDeploymentResponse
+		require.NoError(t, json.Unmarshal(resp, &searchNode))
+
+		assert.Equal(t, g.projectID, searchNode.GetGroupId())
+		assert.Equal(t, []atlasv2.ApiSearchDeploymentSpec{
+			{
+				InstanceSize: "S20_HIGHCPU_NVME",
+				NodeCount:    3,
+			},
+		}, searchNode.GetSpecs())
+	})
+
+	t.Run("Delete search nodes", func(t *testing.T) {
+		cmd := exec.Command(cliPath,
+			clustersEntity,
+			searchEntity,
+			nodesEntity,
+			"delete",
+			"--clusterName", g.clusterName,
+			"--projectId", g.projectID,
+			"--force",
+			"-w",
+			"-o=json",
+		)
+
+		cmd.Env = os.Environ()
+		resp, err := cmd.CombinedOutput()
+		respStr := strings.TrimLeft(string(resp), ".")
+
+		require.NoError(t, err, respStr)
+
+		expected := fmt.Sprintf("\"%s\"\n", g.clusterName)
+		assert.Equal(t, expected, respStr)
+	})
+}

Original file line number	Diff line number	Diff line change
`@@ -26,6 +26,7 @@ import (`
`26`	`26`	`"github.com/mongodb/mongodb-atlas-cli/internal/usage"`
`27`	`27`	`"github.com/spf13/afero"`
`28`	`28`	`"github.com/spf13/cobra"`
	`29`	`+ "go.mongodb.org/atlas-sdk/v20231115007/admin"`
`29`	`30`	`)`
`30`	`31`
`31`	`32`	`type CreateOpts struct {`
`@@ -64,10 +65,12 @@ func (opts *CreateOpts) Run() error {`
`64`	`65`	`}`
`65`	`66`
`66`	`67`	`if opts.EnableWatch {`
`67`		`- if _, err := opts.Watch(opts.watcher); err != nil {`
	`68`	`+ watchResult, err := opts.Watch(opts.watcher)`
	`69`	`+ if err != nil {`
`68`	`70`	`return err`
`69`	`71`	`}`
`70`	`72`	`opts.Template = createWatchTemplate`
	`73`	`+ r = watchResult.(*admin.ApiSearchDeploymentResponse)`
`71`	`74`	`}`
`72`	`75`
`73`	`76`	`return opts.Print(r)`
`@@ -78,7 +81,7 @@ func (opts *CreateOpts) watcher() (any, bool, error) {`
`78`	`81`	`if err != nil {`
`79`	`82`	`return nil, false, err`
`80`	`83`	`}`
`81`		`- return nil, *res.StateName == stateIdle, nil`
	`84`	`+ return res, *res.StateName == stateIdle, nil`
`82`	`85`	`}`
`83`	`86`
`84`	`87`	`// atlas clusters search nodes create [--clusterName clusterName] [--file filePath].`