feat: Update Resource Policy resource to GA - to be merged after upstream GA (#3276)

maastha · web-flow · commit a9e6cd707388 · 2025-04-15T16:00:01.000+01:00
diff --git a/.changelog/3276.txt b/.changelog/3276.txt
@@ -0,0 +1,11 @@
+```release-note:note
+resource/mongodbatlas_resource_policy: Enables usage without preview environment flag
+```
+
+```release-note:note
+data-source/mongodbatlas_resource_policy: Enables usage without preview environment flag
+```
+
+```release-note:note
+data-source/mongodbatlas_resource_policies: Enables usage without preview environment flag
+```
diff --git a/.github/workflows/acceptance-tests-runner.yml b/.github/workflows/acceptance-tests-runner.yml
@@ -984,7 +984,6 @@ jobs:
           MONGODB_ATLAS_PUBLIC_KEY: ${{ secrets.mongodb_atlas_rp_public_key }}
           MONGODB_ATLAS_PRIVATE_KEY:  ${{ secrets.mongodb_atlas_rp_private_key }}
           MONGODB_ATLAS_LAST_VERSION: ${{ needs.get-provider-version.outputs.provider_version }}
-          MONGODB_ATLAS_ENABLE_PREVIEW: "true"
           ACCTEST_PACKAGES: |
             ./internal/service/resourcepolicy
         run: make testacc
diff --git a/docs/data-sources/resource_policies.md b/docs/data-sources/resource_policies.md
@@ -2,10 +2,6 @@
 
 `mongodbatlas_resource_policies` returns all resource policies in an organization.
 
--> **NOTE**: Resource Policies are currently in Public Preview. To use this feature, you must take the following actions:
-1. Enable the `Atlas Resource Policies` Preview Feature in your organization (contact [MongoDB Support](https://www.mongodb.com/services/support)).
-2. Enable the [Preview Features](https://github.com/mongodb/terraform-provider-mongodbatlas?tab=readme-ov-file#preview-features) when running `terraform` commands.
-
 ## Example Usages
 ```terraform
 resource "mongodbatlas_resource_policy" "project_ip_access_list" {
diff --git a/docs/data-sources/resource_policy.md b/docs/data-sources/resource_policy.md
@@ -2,10 +2,6 @@
 
 `mongodbatlas_resource_policy` describes a resource policy in an organization.
 
--> **NOTE**: Resource Policies are currently in Public Preview. To use this feature, you must take the following actions:
-1. Enable the `Atlas Resource Policies` Preview Feature in your organization (contact [MongoDB Support](https://www.mongodb.com/services/support)).
-2. Enable the [Preview Features](https://github.com/mongodb/terraform-provider-mongodbatlas?tab=readme-ov-file#preview-features) when running `terraform` commands.
-
 ## Example Usages
 ```terraform
 resource "mongodbatlas_resource_policy" "project_ip_access_list" {
diff --git a/docs/resources/resource_policy.md b/docs/resources/resource_policy.md
@@ -2,10 +2,6 @@
 
 `mongodbatlas_resource_policy` provides a Resource Policy resource. The resource lets you create, edit and delete resource policies to prevent misconfigurations and reduce the need for corrective interventions in your organization.
 
--> **NOTE**: Resource Policies are currently in Public Preview. To use this feature, you must take the following actions:
-1. Enable the `Atlas Resource Policies` Preview Feature in your organization (contact [MongoDB Support](https://www.mongodb.com/services/support)).
-2. Enable the [Preview Features](https://github.com/mongodb/terraform-provider-mongodbatlas?tab=readme-ov-file#preview-features) when running `terraform` commands.
-
 
 ## Example Usages
 
diff --git a/examples/mongodbatlas_resource_policy/README.md b/examples/mongodbatlas_resource_policy/README.md
@@ -1,11 +1,6 @@
 # MongoDB Atlas Provider -- Atlas Resource Policy
 This example creates three different resource policies in an organization.
 
-**NOTE**: Resource Policies are currently in Public Preview. To use this feature, you must take the following actions:
-1. Enable the `Atlas Resource Policies` Preview Feature in your organization (contact [MongoDB Support](https://www.mongodb.com/services/support)).
-2. Enable the [Preview Features](../../README.md#preview-features) when running `terraform` commands.
-
-
 Variables Required to be set:
 - `public_key`: Atlas public key
 - `private_key`: Atlas  private key
diff --git a/internal/provider/provider.go b/internal/provider/provider.go
@@ -456,14 +456,13 @@ func (p *MongodbtlasProvider) DataSources(context.Context) []func() datasource.D
 		flexsnapshot.PluralDataSource,
 		flexrestorejob.DataSource,
 		flexrestorejob.PluralDataSource,
+		resourcepolicy.DataSource,
+		resourcepolicy.PluralDataSource,
 	}
 	if config.PreviewProviderV2AdvancedCluster() {
 		dataSources = append(dataSources, advancedclustertpf.DataSource, advancedclustertpf.PluralDataSource)
 	}
-	previewDataSources := []func() datasource.DataSource{
-		resourcepolicy.DataSource,
-		resourcepolicy.PluralDataSource,
-	} // Data sources not yet in GA
+	previewDataSources := []func() datasource.DataSource{} // Data sources not yet in GA
 	if providerEnablePreview {
 		dataSources = append(dataSources, previewDataSources...)
 	}
@@ -486,13 +485,12 @@ func (p *MongodbtlasProvider) Resources(context.Context) []func() resource.Resou
 		mongodbemployeeaccessgrant.Resource,
 		streamprivatelinkendpoint.Resource,
 		flexcluster.Resource,
+		resourcepolicy.Resource,
 	}
 	if config.PreviewProviderV2AdvancedCluster() {
 		resources = append(resources, advancedclustertpf.Resource)
 	}
-	previewResources := []func() resource.Resource{
-		resourcepolicy.Resource,
-	} // Resources not yet in GA
+	previewResources := []func() resource.Resource{} // Resources not yet in GA
 	if providerEnablePreview {
 		resources = append(resources, previewResources...)
 	}
diff --git a/templates/data-sources/resource_policies.md.tmpl b/templates/data-sources/resource_policies.md.tmpl
@@ -2,10 +2,6 @@
 
 `{{.Name}}` returns all resource policies in an organization.
 
--> **NOTE**: Resource Policies are currently in Public Preview. To use this feature, you must take the following actions:
-1. Enable the `Atlas Resource Policies` Preview Feature in your organization (contact [MongoDB Support](https://www.mongodb.com/services/support)).
-2. Enable the [Preview Features](https://github.com/mongodb/terraform-provider-mongodbatlas?tab=readme-ov-file#preview-features) when running `terraform` commands.
-
 ## Example Usages
 {{ tffile (printf "examples/mongodbatlas_resource_policy/main.tf" )}}
 
diff --git a/templates/data-sources/resource_policy.md.tmpl b/templates/data-sources/resource_policy.md.tmpl
@@ -2,10 +2,6 @@
 
 `{{.Name}}` describes a resource policy in an organization.
 
--> **NOTE**: Resource Policies are currently in Public Preview. To use this feature, you must take the following actions:
-1. Enable the `Atlas Resource Policies` Preview Feature in your organization (contact [MongoDB Support](https://www.mongodb.com/services/support)).
-2. Enable the [Preview Features](https://github.com/mongodb/terraform-provider-mongodbatlas?tab=readme-ov-file#preview-features) when running `terraform` commands.
-
 ## Example Usages
 {{ tffile (printf "examples/%s/main.tf" .Name )}}
 
diff --git a/templates/resources/resource_policy.md.tmpl b/templates/resources/resource_policy.md.tmpl
@@ -2,10 +2,6 @@
 
 `{{.Name}}` provides a Resource Policy resource. The resource lets you create, edit and delete resource policies to prevent misconfigurations and reduce the need for corrective interventions in your organization.
 
--> **NOTE**: Resource Policies are currently in Public Preview. To use this feature, you must take the following actions:
-1. Enable the `Atlas Resource Policies` Preview Feature in your organization (contact [MongoDB Support](https://www.mongodb.com/services/support)).
-2. Enable the [Preview Features](https://github.com/mongodb/terraform-provider-mongodbatlas?tab=readme-ov-file#preview-features) when running `terraform` commands.
-
 
 ## Example Usages
 

Original file line number	Diff line number	Diff line change
`@@ -456,14 +456,13 @@ func (p *MongodbtlasProvider) DataSources(context.Context) []func() datasource.D`
`456`	`456`	`flexsnapshot.PluralDataSource,`
`457`	`457`	`flexrestorejob.DataSource,`
`458`	`458`	`flexrestorejob.PluralDataSource,`
	`459`	`+ resourcepolicy.DataSource,`
	`460`	`+ resourcepolicy.PluralDataSource,`
`459`	`461`	`}`
`460`	`462`	`if config.PreviewProviderV2AdvancedCluster() {`
`461`	`463`	`dataSources = append(dataSources, advancedclustertpf.DataSource, advancedclustertpf.PluralDataSource)`
`462`	`464`	`}`
`463`		`- previewDataSources := []func() datasource.DataSource{`
`464`		`- resourcepolicy.DataSource,`
`465`		`- resourcepolicy.PluralDataSource,`
`466`		`- } // Data sources not yet in GA`
	`465`	`+ previewDataSources := []func() datasource.DataSource{} // Data sources not yet in GA`
`467`	`466`	`if providerEnablePreview {`
`468`	`467`	`dataSources = append(dataSources, previewDataSources...)`
`469`	`468`	`}`
`@@ -486,13 +485,12 @@ func (p *MongodbtlasProvider) Resources(context.Context) []func() resource.Resou`
`486`	`485`	`mongodbemployeeaccessgrant.Resource,`
`487`	`486`	`streamprivatelinkendpoint.Resource,`
`488`	`487`	`flexcluster.Resource,`
	`488`	`+ resourcepolicy.Resource,`
`489`	`489`	`}`
`490`	`490`	`if config.PreviewProviderV2AdvancedCluster() {`
`491`	`491`	`resources = append(resources, advancedclustertpf.Resource)`
`492`	`492`	`}`
`493`		`- previewResources := []func() resource.Resource{`
`494`		`- resourcepolicy.Resource,`
`495`		`- } // Resources not yet in GA`
	`493`	`+ previewResources := []func() resource.Resource{} // Resources not yet in GA`
`496`	`494`	`if providerEnablePreview {`
`497`	`495`	`resources = append(resources, previewResources...)`
`498`	`496`	`}`