From dd30109f7a22c6aece4db45c24987ae871c50d2e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 8 Sep 2022 10:35:13 -0500 Subject: [PATCH 1/4] Chore(deps): Bump github.com/gruntwork-io/terratest (#825) Bumps [github.com/gruntwork-io/terratest](https://github.com/gruntwork-io/terratest) from 0.40.20 to 0.40.21. - [Release notes](https://github.com/gruntwork-io/terratest/releases) - [Commits](https://github.com/gruntwork-io/terratest/compare/v0.40.20...v0.40.21) --- updated-dependencies: - dependency-name: github.com/gruntwork-io/terratest dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index b4b650003c..a1b46223f2 100644 --- a/go.mod +++ b/go.mod @@ -4,7 +4,7 @@ go 1.17 require ( github.com/go-test/deep v1.0.8 - github.com/gruntwork-io/terratest v0.40.20 + github.com/gruntwork-io/terratest v0.40.21 github.com/hashicorp/terraform-plugin-sdk/v2 v2.20.0 github.com/hashicorp/terraform-provider-google v1.20.1-0.20210625223728-379bcb41c06b github.com/mongodb-forks/digest v1.0.4 diff --git a/go.sum b/go.sum index 865028b68d..45528816ad 100644 --- a/go.sum +++ b/go.sum @@ -618,8 +618,8 @@ github.com/grpc-ecosystem/grpc-gateway v1.12.1/go.mod h1:8XEsbTttt/W+VvjtQhLACqC github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw= github.com/gruntwork-io/go-commons v0.8.0 h1:k/yypwrPqSeYHevLlEDmvmgQzcyTwrlZGRaxEM6G0ro= github.com/gruntwork-io/go-commons v0.8.0/go.mod h1:gtp0yTtIBExIZp7vyIV9I0XQkVwiQZze678hvDXof78= -github.com/gruntwork-io/terratest v0.40.20 h1:pco6s3b62h2Yd13N+HvHQVTAk3aPRz4sdoVwErPCBzQ= -github.com/gruntwork-io/terratest v0.40.20/go.mod h1:JGeIGgLbxbG9/Oqm06z6YXVr76CfomdmLkV564qov+8= +github.com/gruntwork-io/terratest v0.40.21 h1:BYN/CamnMIHPFqE2Jh+XwaFT0RSZhnlBCOXeImxWrBQ= +github.com/gruntwork-io/terratest v0.40.21/go.mod h1:JGeIGgLbxbG9/Oqm06z6YXVr76CfomdmLkV564qov+8= github.com/hashicorp/aws-sdk-go-base v0.7.1 h1:7s/aR3hFn74tYPVihzDyZe7y/+BorN70rr9ZvpV3j3o= github.com/hashicorp/aws-sdk-go-base v0.7.1/go.mod h1:2fRjWDv3jJBeN6mVWFHV6hFTNeFBx2gpDLQaZNxUVAY= github.com/hashicorp/consul/api v1.1.0/go.mod h1:VmuI/Lkw1nC05EYQWNKwWGbkg+FbDBtguAZLlVdkD9Q= From 321e80c6fbae5e7b508c24636cba020de19f396c Mon Sep 17 00:00:00 2001 From: admin <33664051+martinstibbe@users.noreply.github.com> Date: Thu, 8 Sep 2022 13:48:49 -0500 Subject: [PATCH 2/4] INTMDB-354: [Terraform] Update docs around what requires an API key access list --- website/docs/index.html.markdown | 1 + website/docs/r/cloud_backup_schedule.html.markdown | 2 ++ website/docs/r/cloud_backup_snapshot.html.markdown | 1 + website/docs/r/cloud_backup_snapshot_restore_job.html.markdown | 1 + 4 files changed, 5 insertions(+) diff --git a/website/docs/index.html.markdown b/website/docs/index.html.markdown index fe7bf579d6..9d2c46c930 100644 --- a/website/docs/index.html.markdown +++ b/website/docs/index.html.markdown @@ -36,6 +36,7 @@ The [MongoDB Atlas documentation](https://docs.atlas.mongodb.com/tutorial/manage **IP access list**: Some API resources, such as backup resources, require an IP access list by default. We highly suggest that you add an IP access list as soon as possible. See [Require IP Access List for Public API](https://docs.atlas.mongodb.com/tutorial/manage-organization-settings/#require-ip-access-list-for-public-api) for more info. +**API Key List**: Some API resources such as Organization API Access List Entries, Cloud Backup Restores, Cloud Backup Snapshots, Cloud Backup Schedules, Legacy Backups, require an API Key list to utilize this feature. See [Resources that require API Key List](https://www.mongodb.com/docs/atlas/configure-api-access/#use-api-resources-that-require-an-access-list) ## Authenticate the Provider The MongoDB Atlas provider offers a flexible means of providing credentials for authentication. diff --git a/website/docs/r/cloud_backup_schedule.html.markdown b/website/docs/r/cloud_backup_schedule.html.markdown index ceb62f3672..de4a0a7751 100644 --- a/website/docs/r/cloud_backup_schedule.html.markdown +++ b/website/docs/r/cloud_backup_schedule.html.markdown @@ -12,6 +12,8 @@ description: |- -> **NOTE:** Groups and projects are synonymous terms. You may find `groupId` in the official documentation. +-> **API Key List**: Some API resources require an API Key list to utilize this feature. See [Resources that require API Key List](https://www.mongodb.com/docs/atlas/configure-api-access/#use-api-resources-that-require-an-access-list) for details + In the Terraform MongoDB Atlas Provider 1.0.0 we have re-architected the way in which Cloud Backup Policies are manged with Terraform to significantly reduce the complexity. Due to this change we've provided multiple examples below to help express how this new resource functions. diff --git a/website/docs/r/cloud_backup_snapshot.html.markdown b/website/docs/r/cloud_backup_snapshot.html.markdown index 5e34ff9646..cb989561dc 100644 --- a/website/docs/r/cloud_backup_snapshot.html.markdown +++ b/website/docs/r/cloud_backup_snapshot.html.markdown @@ -13,6 +13,7 @@ On-demand snapshots happen immediately, unlike scheduled snapshots which occur a -> **NOTE:** Groups and projects are synonymous terms. You may find `groupId` in the official documentation. +-> **API Key List**: Some API resources require an API Key list to utilize this feature. See [Resources that require API Key List](https://www.mongodb.com/docs/atlas/configure-api-access/#use-api-resources-that-require-an-access-list) for details ## Example Usage ```terraform diff --git a/website/docs/r/cloud_backup_snapshot_restore_job.html.markdown b/website/docs/r/cloud_backup_snapshot_restore_job.html.markdown index 46a72ec17f..ad8d9d35b1 100644 --- a/website/docs/r/cloud_backup_snapshot_restore_job.html.markdown +++ b/website/docs/r/cloud_backup_snapshot_restore_job.html.markdown @@ -19,6 +19,7 @@ description: |- -> **NOTE:** Groups and projects are synonymous terms. You may find `groupId` in the official documentation. +-> **API Key List**: Some API resources require an API Key list to utilize this feature. See [Resources that require API Key List](https://www.mongodb.com/docs/atlas/configure-api-access/#use-api-resources-that-require-an-access-list) for details ## Example Usage ### Example automated delivery type. From 0433f7e8da201265a3bc680e2edd5b755086b97d Mon Sep 17 00:00:00 2001 From: admin <33664051+martinstibbe@users.noreply.github.com> Date: Thu, 8 Sep 2022 20:05:48 -0500 Subject: [PATCH 3/4] Expand detail in documentation for API key list --- website/docs/index.html.markdown | 4 +--- website/docs/r/cloud_backup_schedule.html.markdown | 2 +- website/docs/r/cloud_backup_snapshot.html.markdown | 2 +- .../docs/r/cloud_backup_snapshot_restore_job.html.markdown | 2 +- 4 files changed, 4 insertions(+), 6 deletions(-) diff --git a/website/docs/index.html.markdown b/website/docs/index.html.markdown index 9d2c46c930..2709b13c58 100644 --- a/website/docs/index.html.markdown +++ b/website/docs/index.html.markdown @@ -34,9 +34,7 @@ The [MongoDB Atlas documentation](https://docs.atlas.mongodb.com/tutorial/manage **Role**: If unsure of which role level to grant your key, we suggest creating an organization API Key with an Organization Owner role. This ensures that you have sufficient access for all actions. -**IP access list**: Some API resources, such as backup resources, require an IP access list by default. We highly suggest that you add an IP access list as soon as possible. See [Require IP Access List for Public API](https://docs.atlas.mongodb.com/tutorial/manage-organization-settings/#require-ip-access-list-for-public-api) for more info. - -**API Key List**: Some API resources such as Organization API Access List Entries, Cloud Backup Restores, Cloud Backup Snapshots, Cloud Backup Schedules, Legacy Backups, require an API Key list to utilize this feature. See [Resources that require API Key List](https://www.mongodb.com/docs/atlas/configure-api-access/#use-api-resources-that-require-an-access-list) +**API Key Access List**: Some Atlas API resources such as Cloud Backup Restores, Cloud Backup Snapshots, and Cloud Backup Schedules **require** an Atlas API Key Access List to utilize these feature. Hence, if using Terraform, or any other programmatic control, to manage these resources you must have the IP address or CIDR block that the connection is coming from added to the Atlas API Key Access List of the Atlas API key you are using. See [Resources that require API Key List](https://www.mongodb.com/docs/atlas/configure-api-access/#use-api-resources-that-require-an-access-list) ## Authenticate the Provider The MongoDB Atlas provider offers a flexible means of providing credentials for authentication. diff --git a/website/docs/r/cloud_backup_schedule.html.markdown b/website/docs/r/cloud_backup_schedule.html.markdown index de4a0a7751..b06300db21 100644 --- a/website/docs/r/cloud_backup_schedule.html.markdown +++ b/website/docs/r/cloud_backup_schedule.html.markdown @@ -12,7 +12,7 @@ description: |- -> **NOTE:** Groups and projects are synonymous terms. You may find `groupId` in the official documentation. --> **API Key List**: Some API resources require an API Key list to utilize this feature. See [Resources that require API Key List](https://www.mongodb.com/docs/atlas/configure-api-access/#use-api-resources-that-require-an-access-list) for details +-> **API Key Access List**: This resource requires an Atlas API Access Key List to utilize this feature. This means to manage this resources you must have the IP address or CIDR block that the Terraform connection is coming from added to the Atlas API Key Access List of the Atlas API key you are using. See [Resources that require API Key List](https://www.mongodb.com/docs/atlas/configure-api-access/#use-api-resources-that-require-an-access-list) for details. In the Terraform MongoDB Atlas Provider 1.0.0 we have re-architected the way in which Cloud Backup Policies are manged with Terraform to significantly reduce the complexity. Due to this change we've provided multiple examples below to help express how this new resource functions. diff --git a/website/docs/r/cloud_backup_snapshot.html.markdown b/website/docs/r/cloud_backup_snapshot.html.markdown index cb989561dc..af40911276 100644 --- a/website/docs/r/cloud_backup_snapshot.html.markdown +++ b/website/docs/r/cloud_backup_snapshot.html.markdown @@ -13,7 +13,7 @@ On-demand snapshots happen immediately, unlike scheduled snapshots which occur a -> **NOTE:** Groups and projects are synonymous terms. You may find `groupId` in the official documentation. --> **API Key List**: Some API resources require an API Key list to utilize this feature. See [Resources that require API Key List](https://www.mongodb.com/docs/atlas/configure-api-access/#use-api-resources-that-require-an-access-list) for details +-> **API Key Access List**: This resource requires an Atlas API Access Key List to utilize this feature. This means to manage this resources you must have the IP address or CIDR block that the Terraform connection is coming from added to the Atlas API Key Access List of the Atlas API key you are using. See [Resources that require API Key List](https://www.mongodb.com/docs/atlas/configure-api-access/#use-api-resources-that-require-an-access-list) for details. ## Example Usage ```terraform diff --git a/website/docs/r/cloud_backup_snapshot_restore_job.html.markdown b/website/docs/r/cloud_backup_snapshot_restore_job.html.markdown index ad8d9d35b1..7948d647ec 100644 --- a/website/docs/r/cloud_backup_snapshot_restore_job.html.markdown +++ b/website/docs/r/cloud_backup_snapshot_restore_job.html.markdown @@ -19,7 +19,7 @@ description: |- -> **NOTE:** Groups and projects are synonymous terms. You may find `groupId` in the official documentation. --> **API Key List**: Some API resources require an API Key list to utilize this feature. See [Resources that require API Key List](https://www.mongodb.com/docs/atlas/configure-api-access/#use-api-resources-that-require-an-access-list) for details +-> **API Key Access List**: This resource requires an Atlas API Access Key List to utilize this feature. This means to manage this resources you must have the IP address or CIDR block that the Terraform connection is coming from added to the Atlas API Key Access List of the Atlas API key you are using. See [Resources that require API Key List](https://www.mongodb.com/docs/atlas/configure-api-access/#use-api-resources-that-require-an-access-list) for details. ## Example Usage ### Example automated delivery type. From 3714f358e680a588f3406d65796b77ec31e9623e Mon Sep 17 00:00:00 2001 From: admin <33664051+martinstibbe@users.noreply.github.com> Date: Thu, 8 Sep 2022 20:09:49 -0500 Subject: [PATCH 4/4] Add additional resources that require API Key access list --- website/docs/r/cloud_backup_snapshot_export_bucket.html.markdown | 1 + website/docs/r/cloud_backup_snapshot_export_job.html.markdown | 1 + 2 files changed, 2 insertions(+) diff --git a/website/docs/r/cloud_backup_snapshot_export_bucket.html.markdown b/website/docs/r/cloud_backup_snapshot_export_bucket.html.markdown index e3f46f56fe..49c395f43c 100644 --- a/website/docs/r/cloud_backup_snapshot_export_bucket.html.markdown +++ b/website/docs/r/cloud_backup_snapshot_export_bucket.html.markdown @@ -12,6 +12,7 @@ description: |- -> **NOTE:** Groups and projects are synonymous terms. You may find `groupId` in the official documentation. +**API Key Access List**: Some Atlas API resources such as Cloud Backup Restores, Cloud Backup Snapshots, and Cloud Backup Schedules **require** an Atlas API Key Access List to utilize these feature. Hence, if using Terraform, or any other programmatic control, to manage these resources you must have the IP address or CIDR block that the connection is coming from added to the Atlas API Key Access List of the Atlas API key you are using. See [Resources that require API Key List](https://www.mongodb.com/docs/atlas/configure-api-access/#use-api-resources-that-require-an-access-list) ## Example Usage ```terraform diff --git a/website/docs/r/cloud_backup_snapshot_export_job.html.markdown b/website/docs/r/cloud_backup_snapshot_export_job.html.markdown index ba77d235ba..3b3303462c 100644 --- a/website/docs/r/cloud_backup_snapshot_export_job.html.markdown +++ b/website/docs/r/cloud_backup_snapshot_export_job.html.markdown @@ -12,6 +12,7 @@ description: |- -> **NOTE:** Groups and projects are synonymous terms. You may find `groupId` in the official documentation. +**API Key Access List**: Some Atlas API resources such as Cloud Backup Restores, Cloud Backup Snapshots, and Cloud Backup Schedules **require** an Atlas API Key Access List to utilize these feature. Hence, if using Terraform, or any other programmatic control, to manage these resources you must have the IP address or CIDR block that the connection is coming from added to the Atlas API Key Access List of the Atlas API key you are using. See [Resources that require API Key List](https://www.mongodb.com/docs/atlas/configure-api-access/#use-api-resources-that-require-an-access-list) ## Example Usage ```terraform