fix: revert all backup changes (#3665)

Author: blva

test/e2e/atlas/atlas_e2e_test_generator_test.go

@@ -45,7 +45,6 @@ type atlasE2ETestGenerator struct {
 	enableBackup  bool
 	firstProcess  *atlasv2.ApiHostViewAtlas
 	t             *testing.T
-	flexName      string
 }
 
 // Log formats its arguments using default formatting, analogous to Println,
@@ -242,14 +241,14 @@ func (g *atlasE2ETestGenerator) generateFlexCluster() {
 	}
 
 	var err error
-	g.flexName, err = deployFlexClusterForProject(g.projectID)
+	g.clusterName, err = deployFlexClusterForProject(g.projectID)
 	if err != nil {
 		g.t.Fatalf("unexpected error deploying flex cluster: %v", err)
 	}
-	g.t.Logf("flexClusterName=%s", g.flexName)
+	g.t.Logf("flexClusterName=%s", g.clusterName)
 
 	g.t.Cleanup(func() {
-		_ = deleteClusterForProject(g.projectID, g.flexName)
+		_ = deleteClusterForProject(g.projectID, g.clusterName)
 	})
 }
 

test/e2e/atlas/backup_flex_test.go

@@ -107,7 +107,7 @@ func TestFlexBackup(t *testing.T) {
 			"--snapshotId",
 			snapshotID,
 			"--targetClusterName",
-			g.flexName,
+			g.clusterName,
 			"--targetProjectId",
 			g.projectID,
 			"-o=json")
@@ -182,7 +182,7 @@ func TestFlexBackup(t *testing.T) {
 			"--snapshotId",
 			snapshotID,
 			"--targetClusterName",
-			g.flexName,
+			g.clusterName,
 			"--targetProjectId",
 			g.projectID,
 			"-o=json")
@@ -216,14 +216,14 @@ func TestFlexBackup(t *testing.T) {
 		cmd := exec.Command(cliPath,
 			clustersEntity,
 			"delete",
-			g.flexName,
+			g.clusterName,
 			"--force",
 			"--watch")
 		cmd.Env = os.Environ()
 		resp, err := e2e.RunAndGetStdOut(cmd)
 		require.NoError(t, err, string(resp))
 
-		expected := fmt.Sprintf("Deleting cluster '%s'Cluster deleted\n", g.flexName)
+		expected := fmt.Sprintf("Deleting cluster '%s'Cluster deleted\n", g.clusterName)
 		assert.Equal(t, expected, string(resp))
 	})
 }