rename schema v2 names

Author: lantoli

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

@@ -390,9 +390,9 @@ jobs:
           terraform_version: ${{ inputs.terraform_version }}
           terraform_wrapper: false  
       - name: Prepare new advanced_cluster
-        run: make tools enable-advancedclustertpf  
-      - name: Unit tests # delete after allowAdvancedClusterV2Schema is removed
-        run: go test -v ./internal/testutil/acc/advanced_cluster_schema_v2_test.go
+        run: make tools enable-preview-provider-v2  
+      - name: Unit tests # delete after allowPreviewProviderV2 is removed
+        run: go test -v ./internal/testutil/acc/advanced_cluster_preview_provider_v2_test.go
       - name: Mocked Acceptance Tests
         env:
           ACCTEST_REGEX_RUN: '^TestAccMockable'
@@ -433,7 +433,7 @@ jobs:
           terraform_version: ${{ matrix.terraform_version }}
           terraform_wrapper: false  
       - name: Prepare new advanced_cluster
-        run: make tools enable-advancedclustertpf  
+        run: make tools enable-preview-provider-v2  
       - name: Acceptance Tests
         env:
           ACCTEST_REGEX_RUN: '^TestAccAdvancedCluster_move'

Makefile

@@ -191,9 +191,9 @@ 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-advancedclustertpf
-enable-advancedclustertpf: ## Enable Advanced Cluster V2 Schema
-	make change-lines filename=./internal/config/advanced_cluster_v2_schema.go find="allowAdvancedClusterV2Schema = false" new="allowAdvancedClusterV2Schema = true"
+.PHONY: enable-preview-provider-v2
+enable-preview-provider-v2: ## Enable Preview Provider V2
+	make change-lines filename=./internal/config/advanced_cluster_preview_provider_v2.go find="allowPreviewProviderV2 = false" new="allowPreviewProviderV2 = true"
 
 .PHONY: delete-lines ${filename} ${delete}
 delete-lines:

contributing/testing-best-practices.md

@@ -74,7 +74,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-advancedclustertpf` and `export MONGODB_ATLAS_PREVIEW_PROVIDER_V2_ENABLED=true` for the TPF implementation to be used and the tests to work.
+  - Remember to run `make enable-preview-provider-v2` and `export MONGODB_ATLAS_PREVIEW_PROVIDER_V2_ENABLED=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/advanced_cluster_v2_schema.go

@@ -0,0 +1,16 @@
+package config
+
+import (
+	"os"
+	"strconv"
+)
+
+const PreviewProviderV2EnvVar = "MONGODB_ATLAS_PREVIEW_PROVIDER_V2_ENABLED"
+const allowPreviewProviderV2 = true // 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 previewProviderV2, _ = strconv.ParseBool(os.Getenv(PreviewProviderV2EnvVar))
+
+func PreviewProviderV2() bool {
+	return allowPreviewProviderV2 && previewProviderV2
+}

internal/config/preview_provider_v2.go

@@ -8,6 +8,6 @@ import (
 )
 
 func TestAdvancedClusterV2Schema_notEnabled(t *testing.T) {
-	t.Setenv(config.AdvancedClusterV2SchemaEnvVar, "true")
-	assert.False(t, config.AdvancedClusterV2Schema(), "AdvancedClusterV2Schema can't be enabled yet")
+	t.Setenv(config.PreviewProviderV2EnvVar, "true")
+	assert.False(t, config.PreviewProviderV2(), "PreviewProviderV2 can't be enabled yet")
 }

internal/config/advanced_cluster_v2_schema_test.go renamed to internal/config/preview_provider_v2_test.go

@@ -451,7 +451,7 @@ func (p *MongodbtlasProvider) DataSources(context.Context) []func() datasource.D
 		streamprivatelinkendpoint.DataSource,
 		streamprivatelinkendpoint.PluralDataSource,
 	}
-	if config.AdvancedClusterV2Schema() {
+	if config.PreviewProviderV2() {
 		dataSources = append(dataSources, advancedclustertpf.DataSource, advancedclustertpf.PluralDataSource)
 	}
 	previewDataSources := []func() datasource.DataSource{
@@ -482,7 +482,7 @@ func (p *MongodbtlasProvider) Resources(context.Context) []func() resource.Resou
 		mongodbemployeeaccessgrant.Resource,
 		streamprivatelinkendpoint.Resource,
 	}
-	if config.AdvancedClusterV2Schema() {
+	if config.PreviewProviderV2() {
 		resources = append(resources, advancedclustertpf.Resource)
 	}
 	previewResources := []func() resource.Resource{

internal/provider/provider.go

@@ -213,7 +213,7 @@ func getDataSourcesMap() map[string]*schema.Resource {
 		"mongodbatlas_shared_tier_snapshot":                                         sharedtier.DataSourceSnapshot(),
 		"mongodbatlas_shared_tier_snapshots":                                        sharedtier.PluralDataSourceSnapshot(),
 	}
-	if !config.AdvancedClusterV2Schema() {
+	if !config.PreviewProviderV2() {
 		dataSourcesMap["mongodbatlas_advanced_cluster"] = advancedcluster.DataSource()
 		dataSourcesMap["mongodbatlas_advanced_clusters"] = advancedcluster.PluralDataSource()
 	}
@@ -268,7 +268,7 @@ func getResourcesMap() map[string]*schema.Resource {
 		"mongodbatlas_serverless_instance":                                         serverlessinstance.Resource(),
 		"mongodbatlas_cluster_outage_simulation":                                   clusteroutagesimulation.Resource(),
 	}
-	if !config.AdvancedClusterV2Schema() {
+	if !config.PreviewProviderV2() {
 		resourcesMap["mongodbatlas_advanced_cluster"] = advancedcluster.Resource()
 	}
 	return resourcesMap