chore: Allows use of preview provider 2.0.0 (#3133)

* remove advanced_cluster_tpf_move test group

* remove allowPreviewProviderV2AdvancedCluster and related

* remove safety-net test, no needed any more

Author: lantoli

.github/workflows/acceptance-tests-runner.yml

@@ -397,9 +397,7 @@ jobs:
         with:
           terraform_version: ${{ inputs.terraform_version }}
           terraform_wrapper: false  
-      - name: Prepare new advanced_cluster
-        run: make tools enable-preview-provider-v2  
-      - name: Unit tests # delete after allowPreviewProviderV2AdvancedCluster is removed
+      - name: Unit tests
         run: go test -v ./internal/testutil/acc/advanced_cluster_preview_provider_v2_test.go
       - name: Mocked Acceptance Tests
         env:
@@ -415,39 +413,7 @@ jobs:
             ./internal/service/advancedcluster
             ./internal/service/advancedclustertpf
         run: make testacc
-
-  advanced_cluster_tpf_move:
-    needs: [ change-detection, get-provider-version ]
-    if: ${{ (needs.change-detection.outputs.advanced_cluster_tpf == 'true' || inputs.test_group == 'advanced_cluster_tpf') && inputs.terraform_version == '1.10.x' && inputs.reduced_tests == false }}
-    env:
-      MONGODB_ATLAS_PREVIEW_PROVIDER_V2_ADVANCED_CLUSTER: 'true'
-    strategy:
-      max-parallel: 2
-      fail-fast: false
-      matrix:
-        terraform_version: ['1.8.x', '1.9.x'] # TF supported versions for MoveState apart from latest one, 1.10.x
-    name: advanced_cluster_tpf_move-${{ matrix.terraform_version }}
-    runs-on: ubuntu-latest
-    permissions: {}
-    steps:
-      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
-        with:
-          ref: ${{ inputs.ref || github.ref }}
-      - uses: actions/setup-go@f111f3307d8850f501ac008e886eec1fd1932a34
-        with:
-          go-version-file: 'go.mod'
-      - uses: hashicorp/setup-terraform@b9cd54a3c349d3f38e8881555d616ced269862dd
-        with:
-          terraform_version: ${{ matrix.terraform_version }}
-          terraform_wrapper: false  
-      - name: Prepare new advanced_cluster
-        run: make tools enable-preview-provider-v2  
-      - name: Acceptance Tests
-        env:
-          ACCTEST_REGEX_RUN: '^TestAccAdvancedCluster_move'
-          ACCTEST_PACKAGES: ./internal/service/advancedclustertpf
-        run: make testacc
-      
+ 
   assume_role:
     needs: [ change-detection, get-provider-version ]
     if: ${{ needs.change-detection.outputs.assume_role == 'true' || inputs.test_group == 'assume_role' }}

Makefile

@@ -191,10 +191,6 @@ check-changelog-entry-file: ## Check a changelog entry file in a PR
 jira-release-version: ## Update Jira version in a release
 	go run ./tools/jira-release-version/*.go
 
-.PHONY: enable-preview-provider-v2
-enable-preview-provider-v2: ## Enable Preview Provider V2
-	make change-lines filename=./internal/config/preview_provider_v2.go find="allowPreviewProviderV2AdvancedCluster = false" new="allowPreviewProviderV2AdvancedCluster = true"
-
 .PHONY: delete-lines ${filename} ${delete}
 delete-lines:
 	rm -f file.tmp

contributing/testing-best-practices.md

@@ -72,7 +72,7 @@ Acceptance and migration tests can reuse projects and clusters in order to be mo
 **Experimental** framework for hooking into the HTTP Client used by the Terraform provider and capture/replay traffic.
 - Works by mutating a `terraform-plugin-testing/helper/resource.TestCase`
 - Limited to `TestAccMockable*` tests in [`resource_advanced_cluster_test.go`](../internal/service/advancedcluster/resource_advanced_cluster_test.go):
-  - Remember to run `make enable-preview-provider-v2` and `export MONGODB_ATLAS_PREVIEW_PROVIDER_V2_ADVANCED_CLUSTER=true` for the TPF implementation to be used and the tests to work.
+  - Remember to run `export MONGODB_ATLAS_PREVIEW_PROVIDER_V2_ADVANCED_CLUSTER=true` for the TPF implementation to be used and the tests to work.
 - Enabled test cases should always be named with `TestAccMockable` prefix, e.g.: `TestAccMockableAdvancedCluster_tenantUpgrade`
 - To create a new `TestAccMockable` you would need to (see [example commit](https://github.com/mongodb/terraform-provider-mongodbatlas/commit/939244fcab95eca9c4c93993fc1b5118ab8bfddb#diff-f9c590f9ffc351d041a26ff474f91404ff394cbfb83f1e135b415998476ca62aR128))
   - (1) Write the normal acceptance test

internal/config/preview_provider_v2.go

@@ -6,11 +6,10 @@ import (
 )
 
 const PreviewProviderV2AdvancedClusterEnvVar = "MONGODB_ATLAS_PREVIEW_PROVIDER_V2_ADVANCED_CLUSTER"
-const allowPreviewProviderV2AdvancedCluster = false // Don't allow in master branch yet, not in const block to allow automatic change
 
 // Environment variable is read only once to avoid possible changes during runtime
 var previewProviderV2AdvancedCluster, _ = strconv.ParseBool(os.Getenv(PreviewProviderV2AdvancedClusterEnvVar))
 
 func PreviewProviderV2AdvancedCluster() bool {
-	return allowPreviewProviderV2AdvancedCluster && previewProviderV2AdvancedCluster
+	return previewProviderV2AdvancedCluster
 }