fix

Author: fmenezes

test/e2e/atlas_e2e_test_generator_test.go

@@ -93,7 +93,7 @@ func (g *atlasE2ETestGenerator) generateProject(prefix string) {
 		g.t.Fatal("projectID not created")
 	}
 
-	if g.skipCleanup() {
+	if skipCleanup() {
 		return
 	}
 
@@ -117,7 +117,7 @@ func (g *atlasE2ETestGenerator) generateFlexCluster() {
 	}
 	g.t.Logf("flexClusterName=%s", g.clusterName)
 
-	if g.skipCleanup() {
+	if skipCleanup() {
 		return
 	}
 
@@ -155,7 +155,7 @@ func (g *atlasE2ETestGenerator) generateCluster() {
 	}
 	g.t.Logf("clusterName=%s", g.clusterName)
 
-	if g.skipCleanup() {
+	if skipCleanup() {
 		return
 	}
 
@@ -274,7 +274,7 @@ func (g *atlasE2ETestGenerator) runCommand(args ...string) ([]byte, error) {
 	return RunAndGetStdOut(cmd)
 }
 
-func (*atlasE2ETestGenerator) skipCleanup() bool {
+func skipCleanup() bool {
 	return isTrue(os.Getenv("E2E_SKIP_CLEANUP"))
 }
 

test/e2e/backup_export_jobs_test.go

@@ -219,6 +219,10 @@ func TestExportJobs(t *testing.T) {
 		require.NoError(t, err, string(resp))
 	})
 
+	if skipCleanup() {
+		return
+	}
+
 	t.Run("Watch snapshot deletion", func(t *testing.T) {
 		cmd := exec.Command(cliPath,
 			backupsEntity,

test/e2e/backup_restores_test.go

@@ -216,6 +216,10 @@ func TestRestores(t *testing.T) {
 		require.NoError(t, err, string(resp))
 	})
 
+	if skipCleanup() {
+		return
+	}
+
 	t.Run("Watch snapshot deletion", func(t *testing.T) {
 		cmd := exec.Command(cliPath,
 			backupsEntity,

test/e2e/backup_snapshot_test.go

@@ -147,6 +147,10 @@ func TestSnapshots(t *testing.T) {
 		require.NoError(t, err, string(resp))
 	})
 
+	if skipCleanup() {
+		return
+	}
+
 	t.Run("Watch deletion", func(t *testing.T) {
 		cmd := exec.Command(cliPath,
 			backupsEntity,

test/e2e/clusters_file_test.go

@@ -181,6 +181,10 @@ func TestClustersFile(t *testing.T) {
 		assert.Equal(t, expected, string(resp))
 	})
 
+	if skipCleanup() {
+		return
+	}
+
 	t.Run("Watch deletion", func(t *testing.T) {
 		cmd := exec.Command(cliPath,
 			clustersEntity,

test/e2e/clusters_m0_test.go

@@ -113,6 +113,10 @@ func TestClustersM0Flags(t *testing.T) {
 		a.Equal(expected, string(resp))
 	})
 
+	if skipCleanup() {
+		return
+	}
+
 	t.Run("Watch", func(t *testing.T) {
 		cmd := exec.Command(cliPath,
 			clustersEntity,

test/e2e/clusters_sharded_test.go

@@ -82,6 +82,10 @@ func TestShardedCluster(t *testing.T) {
 		assert.Equal(t, expected, string(resp))
 	})
 
+	if skipCleanup() {
+		return
+	}
+
 	t.Run("Watch deletion", func(t *testing.T) {
 		cmd := exec.Command(cliPath,
 			clustersEntity,

test/e2e/private_endpoint_test.go

@@ -133,6 +133,10 @@ func TestPrivateEndpointsAWS(t *testing.T) {
 		assert.Equal(t, expected, string(resp))
 	})
 
+	if skipCleanup() {
+		return
+	}
+
 	t.Run("Watch", func(t *testing.T) {
 		cmd := exec.Command(cliPath,
 			privateEndpointsEntity,
@@ -255,6 +259,10 @@ func TestPrivateEndpointsAzure(t *testing.T) {
 		assert.Equal(t, expected, string(resp))
 	})
 
+	if skipCleanup() {
+		return
+	}
+
 	t.Run("Watch", func(t *testing.T) {
 		cmd := exec.Command(cliPath,
 			privateEndpointsEntity,
@@ -381,6 +389,10 @@ func TestPrivateEndpointsGCP(t *testing.T) {
 		assert.Equal(t, expected, string(resp))
 	})
 
+	if skipCleanup() {
+		return
+	}
+
 	t.Run("Watch", func(t *testing.T) {
 		cmd := exec.Command(cliPath,
 			privateEndpointsEntity,

test/e2e/serverless_test.go

@@ -151,6 +151,10 @@ func TestServerless(t *testing.T) {
 		a.Equal(expected, string(resp))
 	})
 
+	if skipCleanup() {
+		return
+	}
+
 	t.Run("Watch deletion", func(t *testing.T) {
 		cmd := exec.Command(cliPath,
 			serverlessEntity,