Skip to content

Commit

Permalink
Upstream v5.44.0 (#3792)
Browse files Browse the repository at this point in the history
This change updates pulumi-aws to the v5.44.0 version of the upstream
provider.

See upstream release notes for the detailed list of changes:
[hashicorp/terraform-provider-aws@v5.44.0
(release)](https://github.com/hashicorp/terraform-provider-aws/releases/tag/v5.44.0)
  • Loading branch information
corymhall committed Apr 11, 2024
1 parent 1eaf9df commit c1939a0
Show file tree
Hide file tree
Showing 343 changed files with 17,695 additions and 2,138 deletions.
334 changes: 168 additions & 166 deletions examples/go.mod

Large diffs are not rendered by default.

670 changes: 338 additions & 332 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 <daniel@pulumi.com>
Date: Fri, 4 Nov 2022 16:49:08 +0000
Subject: [PATCH 01/48] Add TagsSchemaTrulyComputed definition
Subject: [PATCH 01/51] Add TagsSchemaTrulyComputed definition


diff --git a/internal/tags/tags.go b/internal/tags/tags.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 <daniel@pulumi.com>
Date: Fri, 4 Nov 2022 17:05:11 +0000
Subject: [PATCH 03/48] Add S3 legacy bucket to resources
Subject: [PATCH 02/51] 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
34 changes: 0 additions & 34 deletions patches/0002-Conns-user-agent.patch

This file was deleted.

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 <kpitzen@pulumi.com>
Date: Thu, 9 Mar 2023 09:47:49 -0600
Subject: [PATCH 04/48] Marks SSE Configuration as Computed for Legacy S3
Subject: [PATCH 03/51] Marks SSE Configuration as Computed for Legacy S3
Bucket

In January, AWS enabled SSE by default for all new S3 buckets.
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 <daniel@pulumi.com>
Date: Fri, 4 Nov 2022 17:06:11 +0000
Subject: [PATCH 05/48] De-deprecate bucket_object
Subject: [PATCH 04/51] 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,11 +1,11 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Daniel Bradley <daniel@pulumi.com>
Date: Fri, 4 Nov 2022 17:08:23 +0000
Subject: [PATCH 06/48] Remove lakeformation catalog_resource default
Subject: [PATCH 05/51] Remove lakeformation catalog_resource default


diff --git a/internal/service/lakeformation/permissions.go b/internal/service/lakeformation/permissions.go
index 7bec89f0bd..d478310a18 100644
index 01efd94424..eedc5e5a46 100644
--- a/internal/service/lakeformation/permissions.go
+++ b/internal/service/lakeformation/permissions.go
@@ -42,8 +42,8 @@ func ResourcePermissions() *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 <daniel@pulumi.com>
Date: Fri, 4 Nov 2022 17:24:42 +0000
Subject: [PATCH 07/48] Workaround SSM Parameter tier bug
Subject: [PATCH 06/51] 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 <daniel@pulumi.com>
Date: Fri, 4 Nov 2022 17:32:49 +0000
Subject: [PATCH 08/48] Add EKS cluster certificate_authorities (plural)
Subject: [PATCH 07/51] 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 <daniel@pulumi.com>
Date: Fri, 4 Nov 2022 17:34:56 +0000
Subject: [PATCH 09/48] Workaround Autoscaling launch_configuration
Subject: [PATCH 08/51] Workaround Autoscaling launch_configuration
associate_public_ip_address

- Disable computation of property until fixed.
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 <daniel@pulumi.com>
Date: Fri, 4 Nov 2022 17:36:34 +0000
Subject: [PATCH 10/48] Add ECR credentials_data_source
Subject: [PATCH 09/51] Add ECR credentials_data_source


diff --git a/internal/provider/provider.go b/internal/provider/provider.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 <daniel@pulumi.com>
Date: Wed, 9 Nov 2022 17:37:35 +0000
Subject: [PATCH 11/48] Add custom appautoscaling examples
Subject: [PATCH 10/51] Add custom appautoscaling examples


diff --git a/website/docs/r/appautoscaling_policy.html.markdown b/website/docs/r/appautoscaling_policy.html.markdown
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 <daniel@pulumi.com>
Date: Tue, 15 Nov 2022 10:08:05 +0000
Subject: [PATCH 12/48] Add dedicated_host docs
Subject: [PATCH 11/51] Add dedicated_host docs


diff --git a/website/docs/d/dedicated_host.html.markdown b/website/docs/d/dedicated_host.html.markdown
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Daniel Bradley <daniel@pulumi.com>
Date: Tue, 15 Nov 2022 13:59:57 +0000
Subject: [PATCH 13/48] Revert WAF schema changes
Subject: [PATCH 12/51] Revert WAF schema changes

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

diff --git a/internal/service/wafv2/schemas.go b/internal/service/wafv2/schemas.go
index 129dd5b5cc..011ebdeeeb 100644
index 7204e55609..e78107146b 100644
--- a/internal/service/wafv2/schemas.go
+++ b/internal/service/wafv2/schemas.go
@@ -52,14 +52,14 @@ func ruleGroupRootStatementSchema(level int) *schema.Schema {
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 <tkappler@gmail.com>
Date: Thu, 1 Dec 2022 10:56:32 -0800
Subject: [PATCH 14/48] Catch cty panic in new
Subject: [PATCH 13/51] Catch cty panic in new
resourceTopicSubscriptionCustomizeDiff.

The root cause is not fully understood yet but this might unblock us.
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: Lee Briggs <jaxxstorm@users.noreply.github.com>
Date: Wed, 21 Dec 2022 12:23:59 -0800
Subject: [PATCH 15/48] add matchmaking configuration (#72)
Subject: [PATCH 14/51] 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 <kpitzen@pulumi.com>
Date: Fri, 27 Jan 2023 09:37:43 -0600
Subject: [PATCH 16/48] Reverts patches to S3BucketLegacy and GameLift
Subject: [PATCH 15/51] 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
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 <tkappler@pulumi.com>
Date: Fri, 3 Feb 2023 17:31:18 -0800
Subject: [PATCH 17/48] Revert "Update endpointHashIPAddress"
Subject: [PATCH 16/51] Revert "Update endpointHashIPAddress"

This reverts commit 2197a6c2c7a0ff306cec3432acb9f5680866f034.

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 <daniel@pulumi.com>
Date: Thu, 9 Mar 2023 14:50:51 +0000
Subject: [PATCH 18/48] Fixup gamelift context
Subject: [PATCH 17/51] 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 <daniel@pulumi.com>
Date: Tue, 28 Feb 2023 15:19:24 +0000
Subject: [PATCH 19/48] Change default descriptions to "Managed by Pulumi"
Subject: [PATCH 18/51] 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 @@ -1030,7 +1030,7 @@ index 0299067dea..b47d987426 100644
"name": {
Type: schema.TypeString,
diff --git a/internal/service/route53/record.go b/internal/service/route53/record.go
index 804d43ea28..989e905765 100644
index e938feac80..c1659dad30 100644
--- a/internal/service/route53/record.go
+++ b/internal/service/route53/record.go
@@ -360,7 +360,7 @@ func resourceRecordCreate(ctx context.Context, d *schema.ResourceData, meta inte
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 <daniel.dbphoto@gmail.com>
Date: Tue, 28 Mar 2023 19:54:00 +0100
Subject: [PATCH 20/48] remove required elements from schema and fix tests
Subject: [PATCH 19/51] remove required elements from schema and fix tests
(#77)

Co-authored-by: Lee Briggs <lee@leebriggs.co.uk>
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 <anton@pulumi.com>
Date: Mon, 24 Apr 2023 10:36:36 -0400
Subject: [PATCH 21/48] Temp remove cognito_identity_pool_roles_attachment
Subject: [PATCH 20/51] 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 <anton@pulumi.com>
Date: Fri, 19 Jan 2024 17:36:47 -0500
Subject: [PATCH 22/48] Fix elbv2 target group read to workaround #2517
Subject: [PATCH 21/51] 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 <ramon@pulumi.com>
Date: Thu, 18 May 2023 15:21:33 -0700
Subject: [PATCH 23/48] Fix spurrious json diff for redrive_policy
Subject: [PATCH 22/51] Fix spurrious json diff for redrive_policy

We need to normalize the json input to compare agasint the one stored
in state.
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 <ian@wahbe.com>
Date: Mon, 10 Jul 2023 11:51:24 +0200
Subject: [PATCH 24/48] Provide context to conns
Subject: [PATCH 23/51] 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 <ian@wahbe.com>
Date: Wed, 2 Aug 2023 14:12:03 +0200
Subject: [PATCH 25/48] Match the "tags" behavior of other resources
Subject: [PATCH 24/51] 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
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 <guinevere@pulumi.com>
Date: Wed, 6 Sep 2023 10:43:30 -0700
Subject: [PATCH 26/48] move shim logic to upstream as a patch
Subject: [PATCH 25/51] move shim logic to upstream as a patch


diff --git a/shim/shim.go b/shim/shim.go
Expand Down
Original file line number Diff line number Diff line change
@@ -1,37 +1,36 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Anton Tayanovskyy <anton@pulumi.com>
Date: Mon, 25 Sep 2023 15:22:30 -0400
Subject: [PATCH 27/48] Restore S3ConnURICleaningDisabled
From: corymhall <43035978+corymhall@users.noreply.github.com>
Date: Tue, 9 Apr 2024 15:24:26 -0400
Subject: [PATCH 26/51] Restore S3ConnURICleaningDisabled


diff --git a/internal/conns/awsclient.go b/internal/conns/awsclient.go
index ada1079a05..4982003ad2 100644
index bef13bbc88..73b2147f73 100644
--- a/internal/conns/awsclient.go
+++ b/internal/conns/awsclient.go
@@ -16,6 +16,8 @@ import (
s3_sdkv2 "github.com/aws/aws-sdk-go-v2/service/s3"
session_sdkv1 "github.com/aws/aws-sdk-go/aws/session"
apigatewayv2_sdkv1 "github.com/aws/aws-sdk-go/service/apigatewayv2"
+ mediaconvert_sdkv1 "github.com/aws/aws-sdk-go/service/mediaconvert"
@@ -23,6 +23,7 @@ import (
kms_sdkv1 "github.com/aws/aws-sdk-go/service/kms"
opsworks_sdkv1 "github.com/aws/aws-sdk-go/service/opsworks"
rds_sdkv1 "github.com/aws/aws-sdk-go/service/rds"
+ s3_sdkv1 "github.com/aws/aws-sdk-go/service/s3"
baselogging "github.com/hashicorp/aws-sdk-go-base/v2/logging"
"github.com/hashicorp/terraform-provider-aws/internal/errs"
tftags "github.com/hashicorp/terraform-provider-aws/internal/tags"
@@ -99,6 +101,13 @@ func (c *AWSClient) S3UsePathStyle(context.Context) bool {
@@ -165,6 +166,13 @@ func (c *AWSClient) S3UsePathStyle(context.Context) bool {
return c.s3UsePathStyle
}

+func (client *AWSClient) S3ConnURICleaningDisabled(ctx context.Context) *s3_sdkv1.S3 {
+ config := client.S3Conn(ctx).Config
+ config.DisableRestProtocolURICleaning = aws_sdkv2.Bool(true)
+
+ return s3_sdkv1.New(client.Session.Copy(&config))
+ return s3_sdkv1.New(client.session.Copy(&config))
+}
+
// SetHTTPClient sets the http.Client used for AWS API calls.
// To have effect it must be called before the AWS SDK v1 Session is created.
func (c *AWSClient) SetHTTPClient(_ context.Context, httpClient *http.Client) {
@@ -164,7 +173,7 @@ func (c *AWSClient) DefaultKMSKeyPolicy(context.Context) string {
@@ -230,7 +238,7 @@ func (c *AWSClient) DefaultKMSKeyPolicy(context.Context) string {
"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: Anton Tayanovskyy <anton@pulumi.com>
Date: Mon, 6 Nov 2023 11:17:16 -0500
Subject: [PATCH 28/48] Do not compute tags_all at TF level
Subject: [PATCH 27/51] Do not compute tags_all at TF level


diff --git a/internal/framework/base.go b/internal/framework/base.go
Expand All @@ -22,7 +22,7 @@ index d1c4c7d1ab..3e51e53f87 100644
if request.Plan.Raw.IsNull() {
return
diff --git a/internal/provider/fwprovider/provider.go b/internal/provider/fwprovider/provider.go
index 027b39dd43..07c0c9ce31 100644
index 6415ce2355..c80c01b8d1 100644
--- a/internal/provider/fwprovider/provider.go
+++ b/internal/provider/fwprovider/provider.go
@@ -430,8 +430,8 @@ func (p *fwprovider) Resources(ctx context.Context) []func() resource.Resource {
Expand All @@ -37,7 +37,7 @@ index 027b39dd43..07c0c9ce31 100644
}
} else {
diff --git a/internal/service/appconfig/environment.go b/internal/service/appconfig/environment.go
index e5ca16ef49..e7e2bbc9ba 100644
index 96ee77124c..ef427103a2 100644
--- a/internal/service/appconfig/environment.go
+++ b/internal/service/appconfig/environment.go
@@ -105,7 +105,7 @@ func (r *resourceEnvironment) Schema(ctx context.Context, request resource.Schem
Expand Down Expand Up @@ -89,10 +89,10 @@ index 942630acae..45b72fc158 100644
Blocks: map[string]schema.Block{
"control_sets": schema.SetNestedBlock{
diff --git a/internal/service/batch/job_queue.go b/internal/service/batch/job_queue.go
index 728e0ffa3c..67e2411288 100644
index 015d8aa916..f026b6da0c 100644
--- a/internal/service/batch/job_queue.go
+++ b/internal/service/batch/job_queue.go
@@ -109,7 +109,7 @@ func (r *resourceJobQueue) Schema(ctx context.Context, request resource.SchemaRe
@@ -110,7 +110,7 @@ func (r *resourceJobQueue) Schema(ctx context.Context, request resource.SchemaRe
},
},
names.AttrTags: tftags.TagsAttribute(),
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 <anton@pulumi.com>
Date: Wed, 15 Nov 2023 11:53:09 -0500
Subject: [PATCH 29/48] aws_eks_cluster: implement default_addons_to_remove
Subject: [PATCH 28/51] 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 <anton@pulumi.com>
Date: Wed, 29 Nov 2023 17:23:09 -0500
Subject: [PATCH 30/48] Fix markTagsAllNotComputedForResources to recognize
Subject: [PATCH 29/51] Fix markTagsAllNotComputedForResources to recognize
SchemaFunc


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 <anton@pulumi.com>
Date: Thu, 30 Nov 2023 14:28:37 -0500
Subject: [PATCH 31/48] Optimize startup performance
Subject: [PATCH 30/51] Optimize startup performance


diff --git a/internal/provider/provider.go b/internal/provider/provider.go
Expand Down

0 comments on commit c1939a0

Please sign in to comment.