Skip to content

Commit

Permalink
Upgrade terraform-provider-aws to v5.37.0 (#3458)
Browse files Browse the repository at this point in the history
This PR was generated via `$ upgrade-provider pulumi/pulumi-aws`.

edited to add: 

- contains some minor patch fixes, including one for `panic: tags_all
attribute must not be Computed`
- maps `db` onto the `rds` mod for automapping
- as a result, this maps `db_parameter_group` data source into the `rds`
mod, [as done with the corresponding
resource](https://github.com/pulumi/pulumi-aws/blob/master/provider/resources.go#L3061)

---

- Upgrading terraform-provider-aws from 5.36.0  to 5.37.0.
	Fixes #3440
  • Loading branch information
guineveresaenger authored Feb 22, 2024
1 parent 93747ac commit d936c98
Show file tree
Hide file tree
Showing 401 changed files with 26,289 additions and 2,520 deletions.
307 changes: 156 additions & 151 deletions examples/go.mod

Large diffs are not rendered by default.

614 changes: 312 additions & 302 deletions examples/go.sum

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion patches/0001-Add-TagsSchemaTrulyComputed-definition.patch
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Daniel Bradley <[email protected]>
Date: Fri, 4 Nov 2022 16:49:08 +0000
Subject: [PATCH 01/41] Add TagsSchemaTrulyComputed definition
Subject: [PATCH 01/45] Add TagsSchemaTrulyComputed definition


diff --git a/internal/tags/tags.go b/internal/tags/tags.go
Expand Down
2 changes: 1 addition & 1 deletion patches/0002-Conns-user-agent.patch
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Daniel Bradley <[email protected]>
Date: Fri, 4 Nov 2022 17:03:31 +0000
Subject: [PATCH 02/41] Conns user agent
Subject: [PATCH 02/45] Conns user agent

Replace the useragent used for AWS client connections with a
Pulumi-flavoured one.
Expand Down
10 changes: 5 additions & 5 deletions patches/0003-Add-S3-legacy-bucket-to-resources.patch
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Daniel Bradley <[email protected]>
Date: Fri, 4 Nov 2022 17:05:11 +0000
Subject: [PATCH 03/41] Add S3 legacy bucket to resources
Subject: [PATCH 03/45] Add S3 legacy bucket to resources

This preserves the old S3 Resource in the SDK, by duplicating the code
as a new service (in internal/service/s3legacy), and making an explicit
Expand All @@ -14,19 +14,19 @@ scheme for registration: see
https://github.com/hashicorp/terraform-provider-aws/pull/29717.

diff --git a/internal/provider/provider.go b/internal/provider/provider.go
index 6c8f39dedc..78f3e1985d 100644
index ee399ccb86..d598106496 100644
--- a/internal/provider/provider.go
+++ b/internal/provider/provider.go
@@ -12,6 +12,8 @@ import (
@@ -13,6 +13,8 @@ import (

"github.com/YakDriver/regexache"
"github.com/aws/aws-sdk-go-v2/aws"
+ "github.com/hashicorp/terraform-provider-aws/internal/service/s3legacy"
+
"github.com/aws/aws-sdk-go-v2/feature/ec2/imds"
awsbase "github.com/hashicorp/aws-sdk-go-base/v2"
"github.com/hashicorp/terraform-plugin-log/tflog"
@@ -248,7 +250,9 @@ func New(ctx context.Context) (*schema.Provider, error) {
"github.com/hashicorp/go-cty/cty"
@@ -250,7 +252,9 @@ func New(ctx context.Context) (*schema.Provider, error) {
// should use the @SDKDataSource and @SDKResource function-level annotations
// rather than adding directly to these maps.
DataSourcesMap: make(map[string]*schema.Resource),
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Kyle Pitzen <[email protected]>
Date: Thu, 9 Mar 2023 09:47:49 -0600
Subject: [PATCH 04/41] Marks SSE Configuration as Computed for Legacy S3
Subject: [PATCH 04/45] Marks SSE Configuration as Computed for Legacy S3
Bucket

In January, AWS enabled SSE by default for all new S3 buckets.
Expand Down
2 changes: 1 addition & 1 deletion patches/0005-De-deprecate-bucket_object.patch
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Daniel Bradley <[email protected]>
Date: Fri, 4 Nov 2022 17:06:11 +0000
Subject: [PATCH 05/41] De-deprecate bucket_object
Subject: [PATCH 05/45] De-deprecate bucket_object


diff --git a/internal/service/s3/bucket_object.go b/internal/service/s3/bucket_object.go
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Daniel Bradley <[email protected]>
Date: Fri, 4 Nov 2022 17:08:23 +0000
Subject: [PATCH 06/41] Remove lakeformation catalog_resource default
Subject: [PATCH 06/45] Remove lakeformation catalog_resource default


diff --git a/internal/service/lakeformation/permissions.go b/internal/service/lakeformation/permissions.go
Expand Down
2 changes: 1 addition & 1 deletion patches/0007-Workaround-SSM-Parameter-tier-bug.patch
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Daniel Bradley <[email protected]>
Date: Fri, 4 Nov 2022 17:24:42 +0000
Subject: [PATCH 07/41] Workaround SSM Parameter tier bug
Subject: [PATCH 07/45] Workaround SSM Parameter tier bug

- Disable "computed".
- Disable diff suppression & counteractions
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Daniel Bradley <[email protected]>
Date: Fri, 4 Nov 2022 17:32:49 +0000
Subject: [PATCH 08/41] Add EKS cluster certificate_authorities (plural)
Subject: [PATCH 08/45] Add EKS cluster certificate_authorities (plural)


diff --git a/internal/service/eks/cluster.go b/internal/service/eks/cluster.go
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Daniel Bradley <[email protected]>
Date: Fri, 4 Nov 2022 17:34:56 +0000
Subject: [PATCH 09/41] Workaround Autoscaling launch_configuration
Subject: [PATCH 09/45] Workaround Autoscaling launch_configuration
associate_public_ip_address

- Disable computation of property until fixed.
Expand Down
8 changes: 4 additions & 4 deletions patches/0010-Add-ECR-credentials_data_source.patch
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Daniel Bradley <[email protected]>
Date: Fri, 4 Nov 2022 17:36:34 +0000
Subject: [PATCH 10/41] Add ECR credentials_data_source
Subject: [PATCH 10/45] Add ECR credentials_data_source


diff --git a/internal/provider/provider.go b/internal/provider/provider.go
index 78f3e1985d..86047574ce 100644
index d598106496..1232b8f26d 100644
--- a/internal/provider/provider.go
+++ b/internal/provider/provider.go
@@ -12,6 +12,8 @@ import (
@@ -13,6 +13,8 @@ import (

"github.com/YakDriver/regexache"
"github.com/aws/aws-sdk-go-v2/aws"
Expand All @@ -17,7 +17,7 @@ index 78f3e1985d..86047574ce 100644
"github.com/hashicorp/terraform-provider-aws/internal/service/s3legacy"

"github.com/aws/aws-sdk-go-v2/feature/ec2/imds"
@@ -249,7 +251,10 @@ func New(ctx context.Context) (*schema.Provider, error) {
@@ -251,7 +253,10 @@ func New(ctx context.Context) (*schema.Provider, error) {
// Data sources and resources implemented using Terraform Plugin SDK
// should use the @SDKDataSource and @SDKResource function-level annotations
// rather than adding directly to these maps.
Expand Down
2 changes: 1 addition & 1 deletion patches/0011-Add-custom-appautoscaling-examples.patch
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Daniel Bradley <[email protected]>
Date: Wed, 9 Nov 2022 17:37:35 +0000
Subject: [PATCH 11/41] Add custom appautoscaling examples
Subject: [PATCH 11/45] Add custom appautoscaling examples


diff --git a/website/docs/r/appautoscaling_policy.html.markdown b/website/docs/r/appautoscaling_policy.html.markdown
Expand Down
2 changes: 1 addition & 1 deletion patches/0012-Add-dedicated_host-docs.patch
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Daniel Bradley <[email protected]>
Date: Tue, 15 Nov 2022 10:08:05 +0000
Subject: [PATCH 12/41] Add dedicated_host docs
Subject: [PATCH 12/45] Add dedicated_host docs


diff --git a/website/docs/d/dedicated_host.html.markdown b/website/docs/d/dedicated_host.html.markdown
Expand Down
2 changes: 1 addition & 1 deletion patches/0013-Revert-WAF-schema-changes.patch
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Daniel Bradley <[email protected]>
Date: Tue, 15 Nov 2022 13:59:57 +0000
Subject: [PATCH 13/41] Revert WAF schema changes
Subject: [PATCH 13/45] Revert WAF schema changes

- This causes far too many types to be generated downstream.

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Thomas Kappler <[email protected]>
Date: Thu, 1 Dec 2022 10:56:32 -0800
Subject: [PATCH 14/41] Catch cty panic in new
Subject: [PATCH 14/45] Catch cty panic in new
resourceTopicSubscriptionCustomizeDiff.

The root cause is not fully understood yet but this might unblock us.
Expand Down
8 changes: 4 additions & 4 deletions patches/0015-add-matchmaking-configuration-72.patch
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Lee Briggs <[email protected]>
Date: Wed, 21 Dec 2022 12:23:59 -0800
Subject: [PATCH 15/41] add matchmaking configuration (#72)
Subject: [PATCH 15/45] add matchmaking configuration (#72)

* add matchmaking configuration
* add matchmaking rule set
Expand All @@ -10,18 +10,18 @@ Subject: [PATCH 15/41] add matchmaking configuration (#72)
* add resource docs

diff --git a/internal/provider/provider.go b/internal/provider/provider.go
index 86047574ce..f87981e88d 100644
index 1232b8f26d..201a64cf7a 100644
--- a/internal/provider/provider.go
+++ b/internal/provider/provider.go
@@ -14,6 +14,7 @@ import (
@@ -15,6 +15,7 @@ import (
"github.com/aws/aws-sdk-go-v2/aws"

"github.com/hashicorp/terraform-provider-aws/internal/service/ecr"
+ "github.com/hashicorp/terraform-provider-aws/internal/service/gamelift"
"github.com/hashicorp/terraform-provider-aws/internal/service/s3legacy"

"github.com/aws/aws-sdk-go-v2/feature/ec2/imds"
@@ -257,6 +258,9 @@ func New(ctx context.Context) (*schema.Provider, error) {
@@ -259,6 +260,9 @@ func New(ctx context.Context) (*schema.Provider, error) {

ResourcesMap: map[string]*schema.Resource{
"aws_s3_bucket_legacy": s3legacy.ResourceBucketLegacy(),
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Kyle Pitzen <[email protected]>
Date: Fri, 27 Jan 2023 09:37:43 -0600
Subject: [PATCH 16/41] Reverts patches to S3BucketLegacy and GameLift
Subject: [PATCH 16/45] Reverts patches to S3BucketLegacy and GameLift

Previously, we were pulling along patches which removed a few simplifications
to waiters in AWS GameLift, and a newer patch which plumbed through context.Context
Expand Down
2 changes: 1 addition & 1 deletion patches/0017-Revert-Update-endpointHashIPAddress.patch
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Thomas Kappler <[email protected]>
Date: Fri, 3 Feb 2023 17:31:18 -0800
Subject: [PATCH 17/41] Revert "Update endpointHashIPAddress"
Subject: [PATCH 17/45] Revert "Update endpointHashIPAddress"

This reverts commit 2197a6c2c7a0ff306cec3432acb9f5680866f034.

Expand Down
2 changes: 1 addition & 1 deletion patches/0018-Fixup-gamelift-context.patch
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Daniel Bradley <[email protected]>
Date: Thu, 9 Mar 2023 14:50:51 +0000
Subject: [PATCH 18/41] Fixup gamelift context
Subject: [PATCH 18/45] Fixup gamelift context


diff --git a/internal/service/gamelift/matchmaking_configuration.go b/internal/service/gamelift/matchmaking_configuration.go
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Daniel Bradley <[email protected]>
Date: Tue, 28 Feb 2023 15:19:24 +0000
Subject: [PATCH 19/41] Change default descriptions to "Managed by Pulumi"
Subject: [PATCH 19/45] Change default descriptions to "Managed by Pulumi"


diff --git a/internal/service/apigateway/api_key.go b/internal/service/apigateway/api_key.go
Expand Down Expand Up @@ -694,10 +694,10 @@ index 0000000000..54d4e61495
+ return create.StringHashcode(buf.String())
+}
diff --git a/internal/service/rds/subnet_group.go b/internal/service/rds/subnet_group.go
index cd51dc7f12..226201363e 100644
index 66b981fa2f..0334e3d8fd 100644
--- a/internal/service/rds/subnet_group.go
+++ b/internal/service/rds/subnet_group.go
@@ -43,7 +43,7 @@ func ResourceSubnetGroup() *schema.Resource {
@@ -47,7 +47,7 @@ func resourceSubnetGroup() *schema.Resource {
"description": {
Type: schema.TypeString,
Optional: true,
Expand Down Expand Up @@ -1030,10 +1030,10 @@ index 0299067dea..b47d987426 100644
"name": {
Type: schema.TypeString,
diff --git a/internal/service/route53/record.go b/internal/service/route53/record.go
index 2e9ca234f9..598808d204 100644
index 804d43ea28..989e905765 100644
--- a/internal/service/route53/record.go
+++ b/internal/service/route53/record.go
@@ -307,7 +307,7 @@ func resourceRecordCreate(ctx context.Context, d *schema.ResourceData, meta inte
@@ -360,7 +360,7 @@ func resourceRecordCreate(ctx context.Context, d *schema.ResourceData, meta inte
// retry for us since Route53 sometimes returns errors about another
// operation happening at the same time.
changeBatch := &route53.ChangeBatch{
Expand All @@ -1042,7 +1042,7 @@ index 2e9ca234f9..598808d204 100644
Changes: []*route53.Change{
{
Action: aws.String(action),
@@ -583,7 +583,7 @@ func resourceRecordUpdate(ctx context.Context, d *schema.ResourceData, meta inte
@@ -663,7 +663,7 @@ func resourceRecordUpdate(ctx context.Context, d *schema.ResourceData, meta inte
// StateChangeConf for this to retry for us since Route53 sometimes returns
// errors about another operation happening at the same time.
changeBatch := &route53.ChangeBatch{
Expand All @@ -1051,7 +1051,7 @@ index 2e9ca234f9..598808d204 100644
Changes: []*route53.Change{
{
Action: aws.String(route53.ChangeActionDelete),
@@ -654,7 +654,7 @@ func resourceRecordDelete(ctx context.Context, d *schema.ResourceData, meta inte
@@ -734,7 +734,7 @@ func resourceRecordDelete(ctx context.Context, d *schema.ResourceData, meta inte

// Change batch for deleting
changeBatch := &route53.ChangeBatch{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Daniel Bradley <[email protected]>
Date: Tue, 28 Mar 2023 19:54:00 +0100
Subject: [PATCH 20/41] remove required elements from schema and fix tests
Subject: [PATCH 20/45] remove required elements from schema and fix tests
(#77)

Co-authored-by: Lee Briggs <[email protected]>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Anton Tayanovskyy <[email protected]>
Date: Mon, 24 Apr 2023 10:36:36 -0400
Subject: [PATCH 21/41] Temp remove cognito_identity_pool_roles_attachment
Subject: [PATCH 21/45] Temp remove cognito_identity_pool_roles_attachment
example beacuse of flaky translation


Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Anton Tayanovskyy <[email protected]>
Date: Fri, 19 Jan 2024 17:36:47 -0500
Subject: [PATCH 22/41] Fix elbv2 target group read to workaround #2517
Subject: [PATCH 22/45] Fix elbv2 target group read to workaround #2517


diff --git a/internal/service/elbv2/target_group.go b/internal/service/elbv2/target_group.go
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Ramon Quitales <[email protected]>
Date: Thu, 18 May 2023 15:21:33 -0700
Subject: [PATCH 23/41] Fix spurrious json diff for redrive_policy
Subject: [PATCH 23/45] Fix spurrious json diff for redrive_policy

We need to normalize the json input to compare agasint the one stored
in state.
Expand Down
2 changes: 1 addition & 1 deletion patches/0024-Provide-context-to-conns.patch
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Ian Wahbe <[email protected]>
Date: Mon, 10 Jul 2023 11:51:24 +0200
Subject: [PATCH 24/41] Provide context to conns
Subject: [PATCH 24/45] Provide context to conns


diff --git a/internal/service/ecr/credentials_data_source.go b/internal/service/ecr/credentials_data_source.go
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Ian Wahbe <[email protected]>
Date: Wed, 2 Aug 2023 14:12:03 +0200
Subject: [PATCH 25/41] Match the "tags" behavior of other resources
Subject: [PATCH 25/45] Match the "tags" behavior of other resources


diff --git a/internal/service/s3legacy/bucket_legacy.go b/internal/service/s3legacy/bucket_legacy.go
Expand Down
2 changes: 1 addition & 1 deletion patches/0026-move-shim-logic-to-upstream-as-a-patch.patch
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Guinevere Saenger <[email protected]>
Date: Wed, 6 Sep 2023 10:43:30 -0700
Subject: [PATCH 26/41] move shim logic to upstream as a patch
Subject: [PATCH 26/45] move shim logic to upstream as a patch


diff --git a/shim/shim.go b/shim/shim.go
Expand Down
2 changes: 1 addition & 1 deletion patches/0027-Restore-S3ConnURICleaningDisabled.patch
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Anton Tayanovskyy <[email protected]>
Date: Mon, 25 Sep 2023 15:22:30 -0400
Subject: [PATCH 27/41] Restore S3ConnURICleaningDisabled
Subject: [PATCH 27/45] Restore S3ConnURICleaningDisabled


diff --git a/internal/conns/awsclient.go b/internal/conns/awsclient.go
Expand Down
2 changes: 1 addition & 1 deletion patches/0028-Do-not-compute-tags_all-at-TF-level.patch
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Anton Tayanovskyy <[email protected]>
Date: Mon, 6 Nov 2023 11:17:16 -0500
Subject: [PATCH 28/41] Do not compute tags_all at TF level
Subject: [PATCH 28/45] Do not compute tags_all at TF level


diff --git a/internal/framework/base.go b/internal/framework/base.go
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Anton Tayanovskyy <[email protected]>
Date: Wed, 15 Nov 2023 11:53:09 -0500
Subject: [PATCH 29/41] aws_eks_cluster: implement default_addons_to_remove
Subject: [PATCH 29/45] aws_eks_cluster: implement default_addons_to_remove


diff --git a/internal/service/eks/cluster.go b/internal/service/eks/cluster.go
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Anton Tayanovskyy <[email protected]>
Date: Wed, 29 Nov 2023 17:23:09 -0500
Subject: [PATCH 30/41] Fix markTagsAllNotComputedForResources to recognize
Subject: [PATCH 30/45] Fix markTagsAllNotComputedForResources to recognize
SchemaFunc


Expand Down
Loading

0 comments on commit d936c98

Please sign in to comment.