Skip to content

Commit

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

---

- Upgrading terraform-provider-aws from 5.28.0  to 5.29.0.
	Fixes #3073
  • Loading branch information
guineveresaenger authored Dec 2, 2023
1 parent 08345fd commit 3adb3ac
Show file tree
Hide file tree
Showing 105 changed files with 1,431 additions and 818 deletions.
219 changes: 111 additions & 108 deletions examples/go.mod

Large diffs are not rendered by default.

438 changes: 222 additions & 216 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/29] Add TagsSchemaTrulyComputed definition
Subject: [PATCH 01/30] 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/29] Conns user agent
Subject: [PATCH 02/30] Conns user agent

Replace the useragent used for AWS client connections with a
Pulumi-flavoured one.
Expand Down
2 changes: 1 addition & 1 deletion 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/29] Add S3 legacy bucket to resources
Subject: [PATCH 03/30] 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 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/29] Marks SSE Configuration as Computed for Legacy S3
Subject: [PATCH 04/30] 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/29] De-deprecate bucket_object
Subject: [PATCH 05/30] 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/29] Remove lakeformation catalog_resource default
Subject: [PATCH 06/30] 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/29] Workaround SSM Parameter tier bug
Subject: [PATCH 07/30] 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/29] Add EKS cluster certificate_authorities (plural)
Subject: [PATCH 08/30] 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/29] Workaround Autoscaling launch_configuration
Subject: [PATCH 09/30] Workaround Autoscaling launch_configuration
associate_public_ip_address

- Disable computation of property until fixed.
Expand Down
2 changes: 1 addition & 1 deletion patches/0010-Add-ECR-credentials_data_source.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:36:34 +0000
Subject: [PATCH 10/29] Add ECR credentials_data_source
Subject: [PATCH 10/30] Add ECR credentials_data_source


diff --git a/internal/provider/provider.go b/internal/provider/provider.go
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/29] Add custom appautoscaling examples
Subject: [PATCH 11/30] 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/29] Add dedicated_host docs
Subject: [PATCH 12/30] 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/29] Revert WAF schema changes
Subject: [PATCH 13/30] 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/29] Catch cty panic in new
Subject: [PATCH 14/30] Catch cty panic in new
resourceTopicSubscriptionCustomizeDiff.

The root cause is not fully understood yet but this might unblock us.
Expand Down
2 changes: 1 addition & 1 deletion 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/29] add matchmaking configuration (#72)
Subject: [PATCH 15/30] add matchmaking configuration (#72)

* add matchmaking configuration
* add matchmaking rule set
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/29] Reverts patches to S3BucketLegacy and GameLift
Subject: [PATCH 16/30] 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/29] Revert "Update endpointHashIPAddress"
Subject: [PATCH 17/30] 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/29] Fixup gamelift context
Subject: [PATCH 18/30] Fixup gamelift context


diff --git a/internal/service/gamelift/matchmaking_configuration.go b/internal/service/gamelift/matchmaking_configuration.go
Expand Down
22 changes: 11 additions & 11 deletions patches/0019-Change-default-descriptions-to-Managed-by-Pulumi.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, 28 Feb 2023 15:19:24 +0000
Subject: [PATCH 19/29] Change default descriptions to "Managed by Pulumi"
Subject: [PATCH 19/30] 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 @@ -31,7 +31,7 @@ index 154306cde7..e3c6189ab2 100644
"api_id": {
Type: schema.TypeString,
diff --git a/internal/service/cloudfront/origin_access_control.go b/internal/service/cloudfront/origin_access_control.go
index 6812593087..18de58a8a7 100644
index e9743af534..0400dba7fa 100644
--- a/internal/service/cloudfront/origin_access_control.go
+++ b/internal/service/cloudfront/origin_access_control.go
@@ -37,7 +37,7 @@ func ResourceOriginAccessControl() *schema.Resource {
Expand All @@ -44,10 +44,10 @@ index 6812593087..18de58a8a7 100644
},
"etag": {
diff --git a/internal/service/docdb/cluster_parameter_group.go b/internal/service/docdb/cluster_parameter_group.go
index 435e139674..6f923a8ed0 100644
index a1af860ca7..1db92c7f3f 100644
--- a/internal/service/docdb/cluster_parameter_group.go
+++ b/internal/service/docdb/cluster_parameter_group.go
@@ -50,7 +50,7 @@ func ResourceClusterParameterGroup() *schema.Resource {
@@ -48,7 +48,7 @@ func ResourceClusterParameterGroup() *schema.Resource {
Type: schema.TypeString,
Optional: true,
ForceNew: true,
Expand Down Expand Up @@ -294,10 +294,10 @@ index f8739b158d..b0c862290d 100644
"name": {
Type: schema.TypeString,
diff --git a/internal/service/neptune/cluster_parameter_group.go b/internal/service/neptune/cluster_parameter_group.go
index 7a4f6d707b..aea15d9cce 100644
index 4085c20b4f..993effd88f 100644
--- a/internal/service/neptune/cluster_parameter_group.go
+++ b/internal/service/neptune/cluster_parameter_group.go
@@ -49,7 +49,7 @@ func ResourceClusterParameterGroup() *schema.Resource {
@@ -48,7 +48,7 @@ func ResourceClusterParameterGroup() *schema.Resource {
Type: schema.TypeString,
Optional: true,
ForceNew: true,
Expand All @@ -307,20 +307,20 @@ index 7a4f6d707b..aea15d9cce 100644
"family": {
Type: schema.TypeString,
diff --git a/internal/service/neptune/parameter_group.go b/internal/service/neptune/parameter_group.go
index 634e4f17cc..4572e60174 100644
index 6b3466f4d2..4fe2595102 100644
--- a/internal/service/neptune/parameter_group.go
+++ b/internal/service/neptune/parameter_group.go
@@ -61,7 +61,7 @@ func ResourceParameterGroup() *schema.Resource {
@@ -52,7 +52,7 @@ func ResourceParameterGroup() *schema.Resource {
Type: schema.TypeString,
Optional: true,
ForceNew: true,
- Default: "Managed by Terraform",
+ Default: "Managed by Pulumi",
},
"parameter": {
Type: schema.TypeSet,
"family": {
Type: schema.TypeString,
diff --git a/internal/service/neptune/subnet_group.go b/internal/service/neptune/subnet_group.go
index be08ae2bf4..3bfb5db0d6 100644
index 359047d7ab..acc8ff375e 100644
--- a/internal/service/neptune/subnet_group.go
+++ b/internal/service/neptune/subnet_group.go
@@ -44,7 +44,7 @@ func ResourceSubnetGroup() *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: Daniel Bradley <[email protected]>
Date: Tue, 28 Mar 2023 19:54:00 +0100
Subject: [PATCH 20/29] remove required elements from schema and fix tests
Subject: [PATCH 20/30] 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/29] Temp remove cognito_identity_pool_roles_attachment
Subject: [PATCH 21/30] Temp remove cognito_identity_pool_roles_attachment
example beacuse of flaky translation


Expand Down
2 changes: 1 addition & 1 deletion patches/0022-Fix-elbv2-target-group-read.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, 12 May 2023 10:55:42 +0100
Subject: [PATCH 22/29] Fix elbv2 target group read
Subject: [PATCH 22/30] Fix elbv2 target group read

Workaround for https://github.com/pulumi/pulumi-aws/issues/2517
Don't return single empty map. Return empty list instead.
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/29] Fix spurrious json diff for redrive_policy
Subject: [PATCH 23/30] 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/29] Provide context to conns
Subject: [PATCH 24/30] 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/29] Match the "tags" behavior of other resources
Subject: [PATCH 25/30] 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/29] move shim logic to upstream as a patch
Subject: [PATCH 26/30] 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/29] Restore S3ConnURICleaningDisabled
Subject: [PATCH 27/30] Restore S3ConnURICleaningDisabled


diff --git a/internal/conns/awsclient.go b/internal/conns/awsclient.go
Expand Down
7 changes: 3 additions & 4 deletions 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/29] Do not compute tags_all at TF level
Subject: [PATCH 28/30] Do not compute tags_all at TF level


diff --git a/internal/framework/base.go b/internal/framework/base.go
Expand Down Expand Up @@ -232,18 +232,17 @@ index 33d374f4e2..b2e1c97096 100644
Blocks: map[string]schema.Block{
"timeouts": timeouts.Block(ctx, timeouts.Opts{
diff --git a/internal/verify/diff.go b/internal/verify/diff.go
index 5e9c779a28..87a57e6076 100644
index db152ada7c..ae851b099a 100644
--- a/internal/verify/diff.go
+++ b/internal/verify/diff.go
@@ -5,103 +5,14 @@ package verify
@@ -5,102 +5,13 @@ package verify

import (
"context"
- "fmt"
"strings"
"time"

"github.com/aws/aws-sdk-go/aws"
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
- "github.com/hashicorp/terraform-provider-aws/internal/conns"
- tftags "github.com/hashicorp/terraform-provider-aws/internal/tags"
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/29] aws_eks_cluster: implement default_addons_to_remove
Subject: [PATCH 29/30] aws_eks_cluster: implement default_addons_to_remove


diff --git a/internal/service/eks/cluster.go b/internal/service/eks/cluster.go
Expand Down
2 changes: 2 additions & 0 deletions provider/cmd/pulumi-resource-aws/bridge-metadata.json
Original file line number Diff line number Diff line change
Expand Up @@ -232472,6 +232472,7 @@
"skipFinalSnapshot": "skip_final_snapshot",
"snapshotIdentifier": "snapshot_identifier",
"storageEncrypted": "storage_encrypted",
"storageType": "storage_type",
"tagsAll": "tags_all",
"vpcSecurityGroupIds": "vpc_security_group_ids"
},
Expand Down Expand Up @@ -245011,6 +245012,7 @@
"storageEncrypted": "storage_encrypted"
},
"aws:neptune/parameterGroup:ParameterGroup": {
"namePrefix": "name_prefix",
"parameters": "parameter",
"tagsAll": "tags_all"
},
Expand Down
Loading

0 comments on commit 3adb3ac

Please sign in to comment.