INTMDB-858: Move mongodbatlas_cluster_outage_simulation acceptance tests to use cloud-dev (#1217)

andreaangiolillo · web-flow · commit 2d55098c1fa4 · 2023-06-13T13:56:26.000+01:00
diff --git a/.github/workflows/acceptance-tests.yml b/.github/workflows/acceptance-tests.yml
@@ -0,0 +1,60 @@
+name: 'Acceptance Tests'
+
+on:
+  workflow_dispatch: {}
+  workflow_call: 
+    inputs:
+      parent-event-name: # we want to run the cluster_outage_simulation acceptance tests when the worflow is run in master (push)
+        required: true
+        type: string
+
+jobs:
+  authorize:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: octokit/request-action@v2.1.7
+        with:
+          route: GET /repos/:repository/collaborators/${{ github.actor }}
+          repository: ${{ github.repository }}
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+  
+  change-detection:
+    needs: [ authorize ]
+    runs-on: ubuntu-latest
+    permissions:
+      pull-requests: read
+      repository-projects: read
+    outputs:
+      cluster_outage_simulation: ${{ steps.filter.outputs.cluster_outage_simulation }}
+    steps:
+    - uses: actions/checkout@v3
+      if: ${{ github.event_name == 'push' }}
+    - uses: dorny/paths-filter@v2
+      id: filter
+      with:
+        filters: |
+          cluster_outage_simulation:
+            - 'mongodbatlas/**cluster_outage_simulation**.go'
+
+  cluster_outage_simulation:
+    needs: [ change-detection ]
+    if: ${{ needs.change-detection.outputs.cluster_outage_simulation == 'true' || github.event_name == 'workflow_dispatch' || inputs.parent-event-name == 'push' }}
+    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 }}
+          TF_ACC: 1
+          TF_LOG: DEBUG
+          TEST_REGEX: "^TestAccOutageSimulationCluster"
+        run: make testacc
diff --git a/.github/workflows/code-health.yml b/.github/workflows/code-health.yml
@@ -4,7 +4,8 @@ on:
   push:
     branches:
       - master
-  pull_request:
+  pull_request: {}
+  workflow_dispatch: {}
 
 jobs:
   build:
@@ -40,19 +41,36 @@ jobs:
         uses: actions/setup-go@v4
         with:
           go-version: "1.20"
-      - name: website lint
-        run: make tools && make website-lint
-      - name: actionlint
-        run: make tools && actionlint -verbose -color
       - name: golangci-lint
         uses: golangci/golangci-lint-action@v3.4.0
         with:
           version: v1.52.2
           args: --timeout 9m0s
+  website-lint:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+      - name: Install Go
+        uses: actions/setup-go@v4
+        with:
+          go-version: "1.20"
+      - name: website lint
+        run: make tools && make website-lint
   shellcheck:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
       - name: Run ShellCheck
         uses: bewuethr/shellcheck-action@v2
+  call-accettance-tests-workflow:
+    needs: [build, lint, shellcheck, unit-test, website-lint]
+    secrets: inherit
+    permissions:
+      contents: write
+      pull-requests: read
+      repository-projects: read
+    uses: ./.github/workflows/acceptance-tests.yml
+    with:
+      parent-event-name: ${{ github.event_name }}
 
diff --git a/GNUmakefile b/GNUmakefile
@@ -15,7 +15,7 @@ GITTAG=$(shell git describe --always --tags)
 VERSION=$(GITTAG:v%=%)
 LINKER_FLAGS=-s -w -X 'github.com/mongodb/terraform-provider-mongodbatlas/version.ProviderVersion=${VERSION}'
 
-GOLANGCI_VERSION=v1.46.2
+GOLANGCI_VERSION=v1.52.2
 
 export PATH := $(shell go env GOPATH)/bin:$(PATH)
 export SHELL := env PATH=$(PATH) /bin/bash
@@ -37,7 +37,7 @@ test: fmtcheck
 .PHONY: testacc
 testacc: fmtcheck
 	@$(eval VERSION=acc)
-	TF_ACC=1 go test $(TEST) -run '$(TEST_REGEX)' -v -parallel 5 $(TESTARGS) -timeout $(ACCTEST_TIMEOUT) -cover -ldflags="$(LINKER_FLAGS)"
+	TF_ACC=1 go test $(TEST) -run '$(TEST_REGEX)' -v -parallel 20 $(TESTARGS) -timeout $(ACCTEST_TIMEOUT) -cover -ldflags="$(LINKER_FLAGS)"
 
 .PHONY: testaccgov
 testaccgov: fmtcheck
diff --git a/mongodbatlas/data_source_mongodbatlas_cluster_outage_simulation_test.go b/mongodbatlas/data_source_mongodbatlas_cluster_outage_simulation_test.go
@@ -19,7 +19,7 @@ func TestAccOutageSimulationClusterDS_SingleRegion_basic(t *testing.T) {
 	)
 
 	resource.ParallelTest(t, resource.TestCase{
-		PreCheck:          func() { testAccPreCheck(t) },
+		PreCheck:          func() { testAccPreCheckBasic(t) },
 		ProviderFactories: testAccProviderFactories,
 		CheckDestroy:      testAccCheckMongoDBAtlasClusterOutageSimulationDestroy,
 		Steps: []resource.TestStep{
@@ -38,6 +38,35 @@ func TestAccOutageSimulationClusterDS_SingleRegion_basic(t *testing.T) {
 	})
 }
 
+func TestAccOutageSimulationClusterDS_MultiRegion_basic(t *testing.T) {
+	SkipTestExtCred(t)
+	var (
+		dataSourceName = "data.mongodbatlas_cluster_outage_simulation.test"
+		orgID          = os.Getenv("MONGODB_ATLAS_ORG_ID")
+		projectName    = acctest.RandomWithPrefix("test-acc-project")
+		clusterName    = acctest.RandomWithPrefix("test-acc-cluster")
+	)
+
+	resource.ParallelTest(t, resource.TestCase{
+		PreCheck:          func() { testAccPreCheckBasic(t) },
+		ProviderFactories: testAccProviderFactories,
+		CheckDestroy:      testAccCheckMongoDBAtlasClusterOutageSimulationDestroy,
+		Steps: []resource.TestStep{
+			{
+				Config: testAccDataSourceMongoDBAtlasClusterOutageSimulationConfigDSMultiRegion(projectName, orgID, clusterName),
+				Check: resource.ComposeTestCheckFunc(
+					resource.TestCheckResourceAttr(dataSourceName, "cluster_name", clusterName),
+					resource.TestCheckResourceAttrSet(dataSourceName, "project_id"),
+					resource.TestCheckResourceAttrSet(dataSourceName, "outage_filters.#"),
+					resource.TestCheckResourceAttrSet(dataSourceName, "start_request_date"),
+					resource.TestCheckResourceAttrSet(dataSourceName, "simulation_id"),
+					resource.TestCheckResourceAttrSet(dataSourceName, "state"),
+				),
+			},
+		},
+	})
+}
+
 func testAccDataSourceMongoDBAtlasClusterOutageSimulationConfigDSSingleRegion(projectName, orgID, clusterName string) string {
 	return fmt.Sprintf(`
 	resource "mongodbatlas_project" "outage_project" {
@@ -73,35 +102,6 @@ func testAccDataSourceMongoDBAtlasClusterOutageSimulationConfigDSSingleRegion(pr
 	`, projectName, orgID, clusterName)
 }
 
-func TestAccOutageSimulationClusterDS_MultiRegion_basic(t *testing.T) {
-	SkipTestExtCred(t)
-	var (
-		dataSourceName = "data.mongodbatlas_cluster_outage_simulation.test"
-		orgID          = os.Getenv("MONGODB_ATLAS_ORG_ID")
-		projectName    = acctest.RandomWithPrefix("test-acc-project")
-		clusterName    = acctest.RandomWithPrefix("test-acc-cluster")
-	)
-
-	resource.ParallelTest(t, resource.TestCase{
-		PreCheck:          func() { testAccPreCheck(t) },
-		ProviderFactories: testAccProviderFactories,
-		CheckDestroy:      testAccCheckMongoDBAtlasClusterOutageSimulationDestroy,
-		Steps: []resource.TestStep{
-			{
-				Config: testAccDataSourceMongoDBAtlasClusterOutageSimulationConfigDSMultiRegion(projectName, orgID, clusterName),
-				Check: resource.ComposeTestCheckFunc(
-					resource.TestCheckResourceAttr(dataSourceName, "cluster_name", clusterName),
-					resource.TestCheckResourceAttrSet(dataSourceName, "project_id"),
-					resource.TestCheckResourceAttrSet(dataSourceName, "outage_filters.#"),
-					resource.TestCheckResourceAttrSet(dataSourceName, "start_request_date"),
-					resource.TestCheckResourceAttrSet(dataSourceName, "simulation_id"),
-					resource.TestCheckResourceAttrSet(dataSourceName, "state"),
-				),
-			},
-		},
-	})
-}
-
 func testAccDataSourceMongoDBAtlasClusterOutageSimulationConfigDSMultiRegion(projectName, orgID, clusterName string) string {
 	return fmt.Sprintf(`
 	resource "mongodbatlas_project" "outage_project" {
diff --git a/mongodbatlas/provider_test.go b/mongodbatlas/provider_test.go
@@ -48,6 +48,14 @@ func testAccPreCheck(tb testing.TB) {
 	}
 }
 
+func testAccPreCheckBasic(tb testing.TB) {
+	if os.Getenv("MONGODB_ATLAS_PUBLIC_KEY") == "" ||
+		os.Getenv("MONGODB_ATLAS_PRIVATE_KEY") == "" ||
+		os.Getenv("MONGODB_ATLAS_ORG_ID") == "" {
+		tb.Fatal("`MONGODB_ATLAS_PUBLIC_KEY`, `MONGODB_ATLAS_PRIVATE_KEY`, and `MONGODB_ATLAS_ORG_ID` must be set for acceptance testing")
+	}
+}
+
 func testAccPreCheckGov(tb testing.TB) {
 	if os.Getenv("MONGODB_ATLAS_PUBLIC_KEY") == "" ||
 		os.Getenv("MONGODB_ATLAS_PRIVATE_KEY") == "" ||
diff --git a/mongodbatlas/resource_mongodbatlas_cluster_outage_simulation_test.go b/mongodbatlas/resource_mongodbatlas_cluster_outage_simulation_test.go
@@ -21,7 +21,7 @@ func TestAccOutageSimulationCluster_SingleRegion_basic(t *testing.T) {
 	)
 
 	resource.ParallelTest(t, resource.TestCase{
-		PreCheck:          func() { testAccPreCheck(t) },
+		PreCheck:          func() { testAccPreCheckBasic(t) },
 		ProviderFactories: testAccProviderFactories,
 		CheckDestroy:      testAccCheckMongoDBAtlasClusterOutageSimulationDestroy,
 		Steps: []resource.TestStep{
@@ -40,33 +40,6 @@ func TestAccOutageSimulationCluster_SingleRegion_basic(t *testing.T) {
 	})
 }
 
-func testAccDataSourceMongoDBAtlasClusterOutageSimulationConfigSingleRegion(projectName, orgID, clusterName string) string {
-	return fmt.Sprintf(`
-	resource "mongodbatlas_project" "outage_project" {
-		name   = "%s"
-		org_id = "%s"
-	}
-
-	resource "mongodbatlas_cluster" "atlas_cluster" {
-		project_id                  = mongodbatlas_project.outage_project.id
-   		provider_name               = "AWS"
-   		name                        = "%s"
-   		backing_provider_name       = "AWS"
-   		provider_region_name        = "US_EAST_1"
-   		provider_instance_size_name = "M10"
-	  }
-
-	  resource "mongodbatlas_cluster_outage_simulation" "test_outage" {
-		project_id = mongodbatlas_project.outage_project.id
-		cluster_name = mongodbatlas_cluster.atlas_cluster.name
-		 outage_filters {
-		  cloud_provider = "AWS"
-		  region_name    = "US_EAST_1"
-		}
-	}
-	`, projectName, orgID, clusterName)
-}
-
 func TestAccOutageSimulationCluster_MultiRegion_basic(t *testing.T) {
 	SkipTestExtCred(t)
 	var (
@@ -77,7 +50,7 @@ func TestAccOutageSimulationCluster_MultiRegion_basic(t *testing.T) {
 	)
 
 	resource.ParallelTest(t, resource.TestCase{
-		PreCheck:          func() { testAccPreCheck(t) },
+		PreCheck:          func() { testAccPreCheckBasic(t) },
 		ProviderFactories: testAccProviderFactories,
 		CheckDestroy:      testAccCheckMongoDBAtlasClusterOutageSimulationDestroy,
 		Steps: []resource.TestStep{
@@ -96,6 +69,33 @@ func TestAccOutageSimulationCluster_MultiRegion_basic(t *testing.T) {
 	})
 }
 
+func testAccDataSourceMongoDBAtlasClusterOutageSimulationConfigSingleRegion(projectName, orgID, clusterName string) string {
+	return fmt.Sprintf(`
+	resource "mongodbatlas_project" "outage_project" {
+		name   = "%s"
+		org_id = "%s"
+	}
+
+	resource "mongodbatlas_cluster" "atlas_cluster" {
+		project_id                  = mongodbatlas_project.outage_project.id
+   		provider_name               = "AWS"
+   		name                        = "%s"
+   		backing_provider_name       = "AWS"
+   		provider_region_name        = "US_EAST_1"
+   		provider_instance_size_name = "M10"
+	  }
+
+	  resource "mongodbatlas_cluster_outage_simulation" "test_outage" {
+		project_id = mongodbatlas_project.outage_project.id
+		cluster_name = mongodbatlas_cluster.atlas_cluster.name
+		 outage_filters {
+		  cloud_provider = "AWS"
+		  region_name    = "US_EAST_1"
+		}
+	}
+	`, projectName, orgID, clusterName)
+}
+
 func testAccDataSourceMongoDBAtlasClusterOutageSimulationConfigMultiRegion(projectName, orgID, clusterName string) string {
 	return fmt.Sprintf(`
 	resource "mongodbatlas_project" "outage_project" {
diff --git a/website/docs/r/federated_database_instance.html.markdown b/website/docs/r/federated_database_instance.html.markdown
@@ -180,4 +180,4 @@ In addition to all arguments above, the following attributes are exported:
   $ terraform import mongodbatlas_federated_database_instance.example 1112222b3bf99403840e8934--test--s3-test
   ```
 
-See [MongoDB Atlas API](https://www.mongodb.com/docs/atlas/reference/api-resources-spec/#tag/Data-Federation) Documentation for more information.
+See [MongoDB Atlas API](https://www.mongodb.com/docs/atlas/reference/api-resources-spec/#tag/Data-Federation) Documentation for more information.

Original file line number	Diff line number	Diff line change
`@@ -48,6 +48,14 @@ func testAccPreCheck(tb testing.TB) {`
`48`	`48`	`}`
`49`	`49`	`}`
`50`	`50`
	`51`	`+func testAccPreCheckBasic(tb testing.TB) {`
	`52`	`+ if os.Getenv("MONGODB_ATLAS_PUBLIC_KEY") == "" \|\|`
	`53`	`+ os.Getenv("MONGODB_ATLAS_PRIVATE_KEY") == "" \|\|`
	`54`	`+ os.Getenv("MONGODB_ATLAS_ORG_ID") == "" {`
	`55`	+ tb.Fatal("`MONGODB_ATLAS_PUBLIC_KEY`, `MONGODB_ATLAS_PRIVATE_KEY`, and `MONGODB_ATLAS_ORG_ID` must be set for acceptance testing")
	`56`	`+ }`
	`57`	`+}`
	`58`	`+`
`51`	`59`	`func testAccPreCheckGov(tb testing.TB) {`
`52`	`60`	`if os.Getenv("MONGODB_ATLAS_PUBLIC_KEY") == "" \|\|`
`53`	`61`	`os.Getenv("MONGODB_ATLAS_PRIVATE_KEY") == "" \|\|`