CLOUDP-131043: Delete atlas projects on a cron job (#1391)

* CLOUDP-131043: Delete atlas projects on a cron job

* Keep deleting on defer

* Add missing continue

Author: fmenezes

build/ci/evergreen.yml

@@ -349,8 +349,7 @@ tasks:
       - command: shell.exec
         type: test
         params:
-          env:
-            XDG_CONFIG_HOME: ${go_base_path}${workdir}
+          <<: *go_options
           script: |
             set -Eeou pipefail
             mkdir "$XDG_CONFIG_HOME/mongocli"
@@ -1270,6 +1269,44 @@ tasks:
           E2E_TAGS: atlas,backup
           E2E_CLOUD_ROLE_ID: ${e2e_cloud_role_id}
           E2E_TEST_BUCKET: ${e2e_test_bucket}
+  - name: atlas_cleanup_e2e
+    tags: [ "e2e","cleanup" ]
+    must_have_test_results: true
+    depends_on:
+      - name: compile
+        variant: "code_health"
+        patch_optional: true
+    commands:
+      - func: "clone"
+      - 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,cleanup
+  - name: atlas_gov_cleanup_e2e
+    tags: [ "e2e","cleanup" ]
+    must_have_test_results: true
+    depends_on:
+      - name: compile
+        variant: "code_health"
+        patch_optional: true
+    commands:
+      - func: "clone"
+      - func: "install gotestsum"
+      - func: "e2e test"
+        vars:
+          MCLI_ORG_ID: ${atlas_gov_org_id}
+          MCLI_PROJECT_ID: ${atlas_gov_project_id}
+          MCLI_PRIVATE_API_KEY: ${atlas_gov_private_api_key}
+          MCLI_PUBLIC_API_KEY: ${atlas_gov_public_api_key}
+          MCLI_OPS_MANAGER_URL: ${mcli_cloud_gov_ops_manager_url}
+          MCLI_SERVICE: cloudgov
+          E2E_TAGS: atlas,cleanup
 buildvariants:
   - name: code_health
     display_name: "Code Health"
@@ -1391,6 +1428,17 @@ buildvariants:
       go_base_path: ""
     tasks:
       - name: ".e2e .clusters .cloudmanager"
+  - name: e2e_cleanup
+    display_name: "E2E Cleanup Resources"
+    run_on:
+      - rhel80-small
+    expansions:
+      go_root: "/opt/golang/go1.18"
+      go_bin: "/opt/golang/go1.18/bin"
+      go_base_path: ""
+    tasks:
+      - name: ".e2e .cleanup"
+        cron: "0 2 * * *" # 2am daily
   - name: e2e_ops_manager_44
     display_name: "E2E Ops Manager 4.4 Tests"
     run_on:

internal/store/store.go

@@ -289,7 +289,7 @@ response:
 %v %v
 %v
 %v
-`, resp.Request.Method, resp.Request.URL.Path, resp.Proto, resp.Status, respHeaders, string(resp.Raw))
+`, resp.Request.Method, resp.Request.URL.String(), resp.Proto, resp.Status, respHeaders, string(resp.Raw))
 	})
 	s.client = c
 	return nil

test/e2e/atlas/atlas_e2e_test_generator_test.go

@@ -76,24 +76,26 @@ func (g *atlasE2ETestGenerator) generateProject(prefix string) {
 	}
 
 	g.t.Cleanup(func() {
-		g.deleteProjectWithRetry()
+		deleteProjectWithRetry(g.t, g.projectID)
 	})
 }
 
-func (g *atlasE2ETestGenerator) deleteProjectWithRetry() {
-	var attempts int
-	for attempts = 1; attempts <= maxRetryAttempts; attempts++ {
-		if e := deleteProject(g.projectID); e != nil {
-			g.t.Logf("%d/%d attempts - trying again in %d seconds: unexpected error while deleting the project '%s': %v", attempts, maxRetryAttempts, sleepTimeInSeconds, g.projectID, e)
+func deleteProjectWithRetry(t *testing.T, projectID string) {
+	t.Helper()
+	deleted := false
+	for attempts := 1; attempts <= maxRetryAttempts; attempts++ {
+		if e := deleteProject(projectID); e != nil {
+			t.Logf("%d/%d attempts - trying again in %d seconds: unexpected error while deleting the project '%s': %v", attempts, maxRetryAttempts, sleepTimeInSeconds, projectID, e)
 			time.Sleep(sleepTimeInSeconds * time.Second)
 		} else {
-			g.t.Logf("project '%s' successfully deleted", g.projectID)
+			t.Logf("project '%s' successfully deleted", projectID)
+			deleted = true
 			break
 		}
 	}
 
-	if attempts > maxRetryAttempts {
-		g.t.Fatalf("we could not delete the project '%s' (projectId: '%s')", g.projectName, g.projectID)
+	if !deleted {
+		t.Errorf("we could not delete the project '%s'", projectID)
 	}
 }
 

test/e2e/atlas/cleanup_test.go

@@ -0,0 +1,58 @@
+// Copyright 2020 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 && cleanup)
+
+package atlas_test
+
+import (
+	"encoding/json"
+	"fmt"
+	"os"
+	"testing"
+
+	"github.com/mongodb/mongodb-atlas-cli/test/e2e"
+	"github.com/stretchr/testify/require"
+	"go.mongodb.org/atlas/mongodbatlas"
+	exec "golang.org/x/sys/execabs"
+)
+
+func TestCleanup(t *testing.T) {
+	req := require.New(t)
+	cliPath, err := e2e.AtlasCLIBin()
+	req.NoError(err)
+
+	cmd := exec.Command(cliPath,
+		projectEntity,
+		"list",
+		"-o=json")
+	cmd.Env = os.Environ()
+	resp, err := cmd.CombinedOutput()
+	req.NoError(err, resp)
+
+	var projects mongodbatlas.Projects
+	err = json.Unmarshal(resp, &projects)
+	req.NoError(err)
+
+	for _, project := range projects.Results {
+		if project.ID == os.Getenv("MCLI_PROJECT_ID") {
+			fmt.Println("skipping project", project.ID)
+			continue
+		}
+		t.Run("Project "+project.ID, func(t *testing.T) {
+			deleteProjectWithRetry(t, project.ID)
+		})
+	}
+
+	fmt.Println(projects)
+}