INTMDB-878: [Terraform] Improve acceptance test setup to run in paral…

…lel & against cloud-dev - Network (#1260)
mongodb · Jun 21, 2023 · d9b0e42 · d9b0e42
1 parent f0dd3bc
commit d9b0e42
Show file tree

Hide file tree

Showing 17 changed files with 280 additions and 690 deletions.
diff --git a/.github/workflows/acceptance-tests.yml b/.github/workflows/acceptance-tests.yml
@@ -25,6 +25,8 @@ jobs:
       backup_snapshots: ${{ steps.filter.outputs.backup_snapshots }}
       backup_schedule: ${{ steps.filter.outputs.backup_schedule }}
       project: ${{ steps.filter.outputs.project }}
+      serverless: ${{ steps.filter.outputs.serverless }}
+      network: ${{ steps.filter.outputs.network }}
     steps:
     - uses: actions/checkout@v3
       if: ${{ github.event_name == 'push' ||  github.event_name == 'workflow_dispatch' || github.event_name == 'schedule'}}
@@ -50,6 +52,12 @@ jobs:
           project:
             - 'mongodbatlas/**project**.go'
             - 'mongodbatlas/**access_list**.go'
+          serverless:
+            - 'mongodbatlas/**_serverless**.go' 
+          network:
+            - 'mongodbatlas/**_network**.go'  
+            - 'mongodbatlas/**_privatelink**.go' 
+            - 'mongodbatlas/**_private_endpoint**.go'       
 
   cluster_outage_simulation:
     needs: [ change-detection ]
@@ -257,3 +265,55 @@ jobs:
               PARALLEL_GO_TEST: 20
               TEST_REGEX: "^TestAccProject"
             run: make testacc
+  serverless:
+    needs: [ change-detection ]
+    if: ${{ needs.change-detection.outputs.serverless == 'true' || github.event_name == 'workflow_dispatch' || github.event_name == 'schedule' }}
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+      - name: Set up Go
+        uses: actions/setup-go@v4
+        with:
+          go-version: "1.20"
+      - name: Acceptance Tests
+        env:
+          MONGODB_ATLAS_PUBLIC_KEY: ${{ secrets.MONGODB_ATLAS_PUBLIC_KEY_CLOUD_DEV }}
+          MONGODB_ATLAS_PRIVATE_KEY: ${{ secrets.MONGODB_ATLAS_PRIVATE_KEY_CLOUD_DEV }}
+          MONGODB_ATLAS_ORG_ID: ${{ vars.MONGODB_ATLAS_ORG_ID_CLOUD_DEV }}
+          MONGODB_ATLAS_BASE_URL: ${{ vars.MONGODB_ATLAS_BASE_URL }}
+          SKIP_TEST_EXTERNAL_CREDENTIALS: ${{ vars.SKIP_TEST_EXTERNAL_CREDENTIALS }}
+          ACCTEST_TIMEOUT: ${{ vars.ACCTEST_TIMEOUT }}
+          TF_LOG: ${{ vars.LOG_LEVEL }}
+          TF_ACC: 1
+          PARALLEL_GO_TEST: 20
+          TEST_REGEX: "^TestAccServerless"
+        run: make testacc
+  network:
+    needs: [ change-detection ]
+    if: ${{ needs.change-detection.outputs.network == 'true' || github.event_name == 'workflow_dispatch' || github.event_name == 'schedule' }}
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+      - name: Set up Go
+        uses: actions/setup-go@v4
+        with:
+          go-version: "1.20"
+      - name: Acceptance Tests
+        env:
+          MONGODB_ATLAS_PUBLIC_KEY: ${{ secrets.MONGODB_ATLAS_PUBLIC_KEY_CLOUD_DEV_NETWORK }}
+          MONGODB_ATLAS_PRIVATE_KEY: ${{ secrets.MONGODB_ATLAS_PRIVATE_KEY_CLOUD_DEV_NETWORK }}
+          MONGODB_ATLAS_ORG_ID: ${{ vars.MONGODB_ATLAS_ORG_ID_CLOUD_DEV_NETWORK }}
+          MONGODB_ATLAS_PROJECT_ID: ${{ vars.MONGODB_ATLAS_PROJECT_ID_CLOUD_DEV_NETWORK }}
+          MONGODB_ATLAS_BASE_URL: ${{ vars.MONGODB_ATLAS_BASE_URL }}
+          SKIP_TEST_EXTERNAL_CREDENTIALS: ${{ vars.SKIP_TEST_EXTERNAL_CREDENTIALS }}
+          MONGODB_ATLAS_ENABLE_BETA: ${{ vars.MONGODB_ATLAS_ENABLE_BETA }}
+          MONGODB_ATLAS_ENDPOINT_ID: ${{ vars.MONGODB_ATLAS_AWS_ENDPOINT_ID_NETWORK }} 
+          ACCTEST_TIMEOUT: ${{ vars.ACCTEST_TIMEOUT }}
+          AWS_REGION: ${{ vars.AWS_REGION }}
+          TF_LOG: ${{ vars.LOG_LEVEL }}
+          TF_ACC: 1
+          PARALLEL_GO_TEST: 20
+          TEST_REGEX: "^TestAccNetwork"
+        run: make testacc
diff --git a/.github/workflows/automated-test-acceptances.yml b/.github/workflows/automated-test-acceptances.yml
@@ -84,36 +84,6 @@ jobs:
           ACCTEST_TIMEOUT: ${{ vars.ACCTEST_TIMEOUT }}
           TEST_REGEX: "^TestAccConfig"
         run: make testacc
-
-  acceptance-tests-network:
-    if: ${{ github.event.label.name == 'run-testacc' || github.event.label.name == 'run-testacc-project-network' || github.ref == 'refs/heads/master' }}
-    needs: [ authorize ]
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v3
-      - name: Set up Go
-        uses: actions/setup-go@v4
-        with:
-          go-version: "1.20"
-      - name: Acceptance Tests
-        env:
-          MONGODB_ATLAS_PUBLIC_KEY: ${{ secrets.MONGODB_ATLAS_PUBLIC_KEY }}
-          MONGODB_ATLAS_PRIVATE_KEY: ${{ secrets.MONGODB_ATLAS_PRIVATE_KEY }}
-          MONGODB_ATLAS_PROJECT_ID: ${{ secrets.MONGODB_ATLAS_PROJECT_ID }}
-          MONGODB_ATLAS_ORG_ID: ${{ secrets.MONGODB_ATLAS_ORG_ID }}
-          MONGODB_ATLAS_DB_USERNAME: ${{ secrets.MONGODB_ATLAS_DB_USERNAME }}
-          MONGODB_ATLAS_TEAMS_IDS: ${{ secrets.MONGODB_ATLAS_TEAMS_IDS }}
-          CA_CERT: ${{ secrets.CA_CERT }}
-          MONGODB_ATLAS_API_KEYS_IDS: ${{ secrets.MONGODB_ATLAS_API_KEYS_IDS }}
-          MONGODB_ATLAS_NETWORK_PROJECT_ID: ${{ secrets.MONGODB_ATLAS_NETWORK_PROJECT_ID }}
-          SKIP_TEST_EXTERNAL_CREDENTIALS: ${{ vars.SKIP_TEST_EXTERNAL_CREDENTIALS }}
-          SKIP_TEST: ${{ vars.SKIP_TEST }}
-          AWS_REGION: ${{ vars.AWS_REGION }}
-          MONGODB_ATLAS_ENABLE_BETA: ${{ vars.MONGODB_ATLAS_ENABLE_BETA }}
-          ACCTEST_TIMEOUT: ${{ vars.ACCTEST_TIMEOUT }}
-          TEST_REGEX: "^TestAccNetwork"
-        run: make testacc
 
   acceptance-tests-gov:
     if: ${{ github.event.label.name == 'run-testacc-gov' }}

diff --git a/mongodbatlas/data_source_mongodbatlas_network_container_test.go b/mongodbatlas/data_source_mongodbatlas_network_container_test.go
diff --git a/mongodbatlas/data_source_mongodbatlas_network_containers_test.go b/mongodbatlas/data_source_mongodbatlas_network_containers_test.go
diff --git a/mongodbatlas/data_source_mongodbatlas_private_endpoint_regional_mode_test.go b/mongodbatlas/data_source_mongodbatlas_private_endpoint_regional_mode_test.go
@@ -13,7 +13,7 @@ import (
 
 func TestAccNetworkDSPrivateEndpointRegionalMode_basic(t *testing.T) {
 	resourceName := "mongodbatlas_private_endpoint_regional_mode.test"
-	projectID := os.Getenv("MONGODB_ATLAS_NETWORK_PROJECT_ID")
+	projectID := os.Getenv("MONGODB_ATLAS_PROJECT_ID")
 
 	resource.Test(t, resource.TestCase{
 		PreCheck:          func() { testAccPreCheck(t) },