Merge remote-tracking branch 'origin/master' into CLOUDP-320243-dev-2.0.0

Author: AgustinBettati

.changelog/3636.txt

@@ -0,0 +1,7 @@
+```release-note:enhancement
+resource/mongodbatlas_encryption_at_rest: Supports role_id in google_cloud_kms_config
+```
+
+```release-note:enhancement
+data-source/mongodbatlas_encryption_at_rest: Supports role_id in google_cloud_kms_config
+```

.changelog/3637.txt

@@ -0,0 +1,7 @@
+```release-note:enhancement
+resource/mongodbatlas_cloud_provider_access_setup: Adds support for GCP as a Cloud Provider.
+```
+
+```release-note:enhancement
+data-source/mongodbatlas_cloud_provider_access_setup: Adds support for GCP as a Cloud Provider.
+```

.changelog/3639.txt

@@ -0,0 +1,3 @@
+```release-note:enhancement
+resource/mongodbatlas_cloud_provider_access_authorization: Supports GCP cloud provider
+```

.changelog/3644.txt

@@ -0,0 +1,3 @@
+```release-note:enhancement
+resource/mongodbatlas_cloud_provider_access_setup: Adds long running operation support for GCP
+```

.changelog/3646.txt

@@ -0,0 +1,3 @@
+```release-note:enhancement
+resource/mongodbatlas_cloud_provider_access_authorization: Changes to `project_id` or `role_id` will now result in the destruction and recreation of the authorization resource
+```

.github/workflows/code-health.yml

@@ -55,7 +55,7 @@ jobs:
       - name: golangci-lint
         uses: golangci/golangci-lint-action@4afd733a84b1f43292c63897423277bb7f4313a9
         with:
-          version: v2.3.1 # Also update GOLANGCI_VERSION variable in GNUmakefile when updating this version
+          version: v2.4.0 # Also update GOLANGCI_VERSION variable in GNUmakefile when updating this version
       - name: actionlint
         run: |
           make tools

.github/workflows/pull-request-lint.yml

@@ -17,7 +17,7 @@ jobs:
     permissions:
       pull-requests: write # Needed by sticky-pull-request-comment
     steps:
-      - uses: amannn/action-semantic-pull-request@7f33ba792281b034f64e96f4c0b5496782dd3b37
+      - uses: amannn/action-semantic-pull-request@48f256284bd46cdaab1048c3721360e808335d50
         id: lint_pr_title
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

CHANGELOG.md

@@ -1,5 +1,15 @@
 ## (Unreleased)
 
+ENHANCEMENTS:
+
+* data-source/mongodbatlas_cloud_provider_access_setup: Adds support for GCP as a Cloud Provider. ([#3637](https://github.com/mongodb/terraform-provider-mongodbatlas/pull/3637))
+* data-source/mongodbatlas_encryption_at_rest: Supports role_id in google_cloud_kms_config ([#3636](https://github.com/mongodb/terraform-provider-mongodbatlas/pull/3636))
+* resource/mongodbatlas_cloud_provider_access_authorization: Changes to `project_id` or `role_id` will now result in the destruction and recreation of the authorization resource ([#3646](https://github.com/mongodb/terraform-provider-mongodbatlas/pull/3646))
+* resource/mongodbatlas_cloud_provider_access_authorization: Supports GCP cloud provider ([#3639](https://github.com/mongodb/terraform-provider-mongodbatlas/pull/3639))
+* resource/mongodbatlas_cloud_provider_access_setup: Adds long running operation support for GCP ([#3644](https://github.com/mongodb/terraform-provider-mongodbatlas/pull/3644))
+* resource/mongodbatlas_cloud_provider_access_setup: Adds support for GCP as a Cloud Provider. ([#3637](https://github.com/mongodb/terraform-provider-mongodbatlas/pull/3637))
+* resource/mongodbatlas_encryption_at_rest: Supports role_id in google_cloud_kms_config ([#3636](https://github.com/mongodb/terraform-provider-mongodbatlas/pull/3636))
+
 ## 1.40.0 (August 21, 2025)
 
 ENHANCEMENTS:

Makefile

@@ -16,7 +16,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=v2.3.1 # Also update golangci-lint GH action in code-health.yml when updating this version
+GOLANGCI_VERSION=v2.4.0 # Also update golangci-lint GH action in code-health.yml when updating this version
 
 export PATH := $(shell go env GOPATH)/bin:$(PATH)
 export SHELL := env PATH=$(PATH) /bin/bash

docs/data-sources/cloud_provider_access_setup.md

@@ -4,7 +4,7 @@ subcategory: "Cloud Provider Access"
 
 # Data Source: mongodbatlas_cloud_provider_access_setup
 
-`mongodbatlas_cloud_provider_access_setup` allows you to get a single role for a provider access role setup, currently only AWS and Azure are supported.
+`mongodbatlas_cloud_provider_access_setup` allows you to get a single role for a provider access role setup. Supported providers: AWS, AZURE and GCP.
 
 -> **NOTE:** Groups and projects are synonymous terms. You may find `groupId` in the official documentation.
 
@@ -40,27 +40,43 @@ data "mongodbatlas_cloud_provider_access_setup" "single_setup" {
    role_id = mongodbatlas_cloud_provider_access_setup.test_role.role_id
 }
 ```
+
+## Example Usage with GCP
+
+```terraform
+resource "mongodbatlas_cloud_provider_access_setup" "test_role" {
+   project_id    = "64259ee860c43338194b0f8e"
+   provider_name = "GCP"
+}
+
+data "mongodbatlas_cloud_provider_access_setup" "single_setup" {
+   project_id    = mongodbatlas_cloud_provider_access_setup.test_role.project_id
+   provider_name = mongodbatlas_cloud_provider_access_setup.test_role.provider_name
+   role_id       = mongodbatlas_cloud_provider_access_setup.test_role.role_id
+}
+```
+
 ## Argument Reference
 
 * `project_id` - (Required) The unique ID for the project to get all Cloud Provider Access 
-* `provider_name` - (Required) cloud provider name, currently only AWS is supported
-* `role_id` - (Required) unique role id among all the aws roles provided by mongodb atlas 
+* `provider_name` - (Required) cloud provider name. Supported values: `AWS`, `AZURE`, and `GCP`.
+* `role_id` - (Required) unique role id among all the roles provided by MongoDB Atlas. 
 
 ## Attributes Reference
 
 In addition to all arguments above, the following attributes are exported:
 
 * `id`              - Autogenerated Unique ID for this data source.
-* `aws`           - aws related role information
-    * `atlas_assumed_role_external_id` - Unique external ID Atlas uses when assuming the IAM role in your AWS account.
-    * `atlas_aws_account_arn`          - ARN associated with the Atlas AWS account used to assume IAM roles in your AWS account.
 * `aws_config`           - aws related role information
     * `atlas_assumed_role_external_id` - Unique external ID Atlas uses when assuming the IAM role in your AWS account.
     * `atlas_aws_account_arn`          - ARN associated with the Atlas AWS account used to assume IAM roles in your AWS account.
 * `azure_config` - azure related configurations 
    * `atlas_azure_app_id` - Azure Active Directory Application ID of Atlas.
    * `service_principal_id`- UUID string that identifies the Azure Service Principal.
    * `tenant_id`          - UUID String that identifies the Azure Active Directory Tenant ID.
+ * `gcp_config` - gcp related configurations
+   * `status` - The status of the GCP cloud provider access setup. See [MongoDB Atlas API](https://www.mongodb.com/docs/api/doc/atlas-admin-api-v2/operation/operation-getgroupcloudprovideraccess#operation-getgroupcloudprovideraccess-200-body-application-vnd-atlas-2023-01-01-json-gcp-object-status).
+   * `service_account_for_atlas` - The GCP service account email that Atlas uses.
 * `created_date`  - Date on which this role was created.
 * `last_updated_date`                - Date and time when this Azure Service Principal was last updated. This parameter expresses its value in the ISO 8601 timestamp format in UTC.