-
Notifications
You must be signed in to change notification settings - Fork 158
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Upgrade TF provider to 5.38.0 (#3509)
fixes #3465 Produced with `go run github.com/pulumi/upgrade-provider@main pulumi/pulumi-aws --kind=provider` and some manual adjustments to the patches. I had to adjust the following: 0039(conflict) - some go package versions in the legacy bucket 0042 and 0043(conflicts) - I removed the tests from the patches to avoid conflicts without affecting runtime 0046 is new, triggered by compilation errors - One of the functions used in the legacy bucket changed its signature to include the context, so we had to adjust the call site.
- Loading branch information
1 parent
67e3db4
commit afd835a
Showing
277 changed files
with
11,831 additions
and
5,338 deletions.
There are no files selected for viewing
Large diffs are not rendered by default.
Oops, something went wrong.
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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/45] Add TagsSchemaTrulyComputed definition | ||
Subject: [PATCH 01/46] Add TagsSchemaTrulyComputed definition | ||
|
||
|
||
diff --git a/internal/tags/tags.go b/internal/tags/tags.go | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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/45] Conns user agent | ||
Subject: [PATCH 02/46] Conns user agent | ||
|
||
Replace the useragent used for AWS client connections with a | ||
Pulumi-flavoured one. | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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/45] Add S3 legacy bucket to resources | ||
Subject: [PATCH 03/46] 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 | ||
|
@@ -14,7 +14,7 @@ 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 ee399ccb86..d598106496 100644 | ||
index 068e5c092d..d2039e809c 100644 | ||
--- a/internal/provider/provider.go | ||
+++ b/internal/provider/provider.go | ||
@@ -13,6 +13,8 @@ import ( | ||
|
@@ -26,7 +26,7 @@ index ee399ccb86..d598106496 100644 | |
"github.com/aws/aws-sdk-go-v2/feature/ec2/imds" | ||
awsbase "github.com/hashicorp/aws-sdk-go-base/v2" | ||
"github.com/hashicorp/go-cty/cty" | ||
@@ -250,7 +252,9 @@ func New(ctx context.Context) (*schema.Provider, error) { | ||
@@ -255,7 +257,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), | ||
|
2 changes: 1 addition & 1 deletion
2
patches/0004-Marks-SSE-Configuration-as-Computed-for-Legacy-S3-Bu.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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/45] Marks SSE Configuration as Computed for Legacy S3 | ||
Subject: [PATCH 04/46] Marks SSE Configuration as Computed for Legacy S3 | ||
Bucket | ||
|
||
In January, AWS enabled SSE by default for all new S3 buckets. | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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/45] De-deprecate bucket_object | ||
Subject: [PATCH 05/46] De-deprecate bucket_object | ||
|
||
|
||
diff --git a/internal/service/s3/bucket_object.go b/internal/service/s3/bucket_object.go | ||
|
2 changes: 1 addition & 1 deletion
2
patches/0006-Remove-lakeformation-catalog_resource-default.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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/45] Remove lakeformation catalog_resource default | ||
Subject: [PATCH 06/46] Remove lakeformation catalog_resource default | ||
|
||
|
||
diff --git a/internal/service/lakeformation/permissions.go b/internal/service/lakeformation/permissions.go | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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/45] Workaround SSM Parameter tier bug | ||
Subject: [PATCH 07/46] Workaround SSM Parameter tier bug | ||
|
||
- Disable "computed". | ||
- Disable diff suppression & counteractions | ||
|
2 changes: 1 addition & 1 deletion
2
patches/0008-Add-EKS-cluster-certificate_authorities-plural.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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/45] Add EKS cluster certificate_authorities (plural) | ||
Subject: [PATCH 08/46] Add EKS cluster certificate_authorities (plural) | ||
|
||
|
||
diff --git a/internal/service/eks/cluster.go b/internal/service/eks/cluster.go | ||
|
2 changes: 1 addition & 1 deletion
2
patches/0009-Workaround-Autoscaling-launch_configuration-associat.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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/45] Workaround Autoscaling launch_configuration | ||
Subject: [PATCH 09/46] Workaround Autoscaling launch_configuration | ||
associate_public_ip_address | ||
|
||
- Disable computation of property until fixed. | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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 <[email protected]> | ||
Date: Fri, 4 Nov 2022 17:36:34 +0000 | ||
Subject: [PATCH 10/45] Add ECR credentials_data_source | ||
Subject: [PATCH 10/46] Add ECR credentials_data_source | ||
|
||
|
||
diff --git a/internal/provider/provider.go b/internal/provider/provider.go | ||
index d598106496..1232b8f26d 100644 | ||
index d2039e809c..4966db7b24 100644 | ||
--- a/internal/provider/provider.go | ||
+++ b/internal/provider/provider.go | ||
@@ -13,6 +13,8 @@ import ( | ||
|
@@ -17,7 +17,7 @@ index d598106496..1232b8f26d 100644 | |
"github.com/hashicorp/terraform-provider-aws/internal/service/s3legacy" | ||
|
||
"github.com/aws/aws-sdk-go-v2/feature/ec2/imds" | ||
@@ -251,7 +253,10 @@ func New(ctx context.Context) (*schema.Provider, error) { | ||
@@ -256,7 +258,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. | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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/45] Add custom appautoscaling examples | ||
Subject: [PATCH 11/46] Add custom appautoscaling examples | ||
|
||
|
||
diff --git a/website/docs/r/appautoscaling_policy.html.markdown b/website/docs/r/appautoscaling_policy.html.markdown | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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/45] Add dedicated_host docs | ||
Subject: [PATCH 12/46] Add dedicated_host docs | ||
|
||
|
||
diff --git a/website/docs/d/dedicated_host.html.markdown b/website/docs/d/dedicated_host.html.markdown | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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/45] Revert WAF schema changes | ||
Subject: [PATCH 13/46] Revert WAF schema changes | ||
|
||
- This causes far too many types to be generated downstream. | ||
|
||
|
2 changes: 1 addition & 1 deletion
2
patches/0014-Catch-cty-panic-in-new-resourceTopicSubscriptionCust.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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/45] Catch cty panic in new | ||
Subject: [PATCH 14/46] Catch cty panic in new | ||
resourceTopicSubscriptionCustomizeDiff. | ||
|
||
The root cause is not fully understood yet but this might unblock us. | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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/45] add matchmaking configuration (#72) | ||
Subject: [PATCH 15/46] add matchmaking configuration (#72) | ||
|
||
* add matchmaking configuration | ||
* add matchmaking rule set | ||
|
@@ -10,7 +10,7 @@ Subject: [PATCH 15/45] add matchmaking configuration (#72) | |
* add resource docs | ||
|
||
diff --git a/internal/provider/provider.go b/internal/provider/provider.go | ||
index 1232b8f26d..201a64cf7a 100644 | ||
index 4966db7b24..80baa2e10f 100644 | ||
--- a/internal/provider/provider.go | ||
+++ b/internal/provider/provider.go | ||
@@ -15,6 +15,7 @@ import ( | ||
|
@@ -21,7 +21,7 @@ index 1232b8f26d..201a64cf7a 100644 | |
"github.com/hashicorp/terraform-provider-aws/internal/service/s3legacy" | ||
|
||
"github.com/aws/aws-sdk-go-v2/feature/ec2/imds" | ||
@@ -259,6 +260,9 @@ func New(ctx context.Context) (*schema.Provider, error) { | ||
@@ -264,6 +265,9 @@ func New(ctx context.Context) (*schema.Provider, error) { | ||
|
||
ResourcesMap: map[string]*schema.Resource{ | ||
"aws_s3_bucket_legacy": s3legacy.ResourceBucketLegacy(), | ||
|
2 changes: 1 addition & 1 deletion
2
patches/0016-Reverts-patches-to-S3BucketLegacy-and-GameLift.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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/45] Reverts patches to S3BucketLegacy and GameLift | ||
Subject: [PATCH 16/46] 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 | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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/45] Revert "Update endpointHashIPAddress" | ||
Subject: [PATCH 17/46] Revert "Update endpointHashIPAddress" | ||
|
||
This reverts commit 2197a6c2c7a0ff306cec3432acb9f5680866f034. | ||
|
||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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/45] Fixup gamelift context | ||
Subject: [PATCH 18/46] Fixup gamelift context | ||
|
||
|
||
diff --git a/internal/service/gamelift/matchmaking_configuration.go b/internal/service/gamelift/matchmaking_configuration.go | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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/45] Change default descriptions to "Managed by Pulumi" | ||
Subject: [PATCH 19/46] Change default descriptions to "Managed by Pulumi" | ||
|
||
|
||
diff --git a/internal/service/apigateway/api_key.go b/internal/service/apigateway/api_key.go | ||
|
@@ -229,10 +229,10 @@ index 0000000000..f587fcbcce | |
+ return diags | ||
+} | ||
diff --git a/internal/service/elasticache/subnet_group.go b/internal/service/elasticache/subnet_group.go | ||
index 47ffb9fa19..448999b3b4 100644 | ||
index d0ccfcef0f..a2a5cda65f 100644 | ||
--- a/internal/service/elasticache/subnet_group.go | ||
+++ b/internal/service/elasticache/subnet_group.go | ||
@@ -45,7 +45,7 @@ func ResourceSubnetGroup() *schema.Resource { | ||
@@ -48,7 +48,7 @@ func resourceSubnetGroup() *schema.Resource { | ||
"description": { | ||
Type: schema.TypeString, | ||
Optional: true, | ||
|
@@ -294,7 +294,7 @@ index 539b58f81f..bc15c792e8 100644 | |
"name": { | ||
Type: schema.TypeString, | ||
diff --git a/internal/service/neptune/cluster_parameter_group.go b/internal/service/neptune/cluster_parameter_group.go | ||
index 4085c20b4f..993effd88f 100644 | ||
index fc811f78a6..6bdc216d7e 100644 | ||
--- a/internal/service/neptune/cluster_parameter_group.go | ||
+++ b/internal/service/neptune/cluster_parameter_group.go | ||
@@ -48,7 +48,7 @@ func ResourceClusterParameterGroup() *schema.Resource { | ||
|
@@ -333,7 +333,7 @@ index 359047d7ab..acc8ff375e 100644 | |
"name": { | ||
Type: schema.TypeString, | ||
diff --git a/internal/service/rds/cluster_parameter_group.go b/internal/service/rds/cluster_parameter_group.go | ||
index 1a8c89f656..126e6879bd 100644 | ||
index a66785b727..f27440d36c 100644 | ||
--- a/internal/service/rds/cluster_parameter_group.go | ||
+++ b/internal/service/rds/cluster_parameter_group.go | ||
@@ -50,7 +50,7 @@ func ResourceClusterParameterGroup() *schema.Resource { | ||
|
2 changes: 1 addition & 1 deletion
2
patches/0020-remove-required-elements-from-schema-and-fix-tests-7.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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/45] remove required elements from schema and fix tests | ||
Subject: [PATCH 20/46] remove required elements from schema and fix tests | ||
(#77) | ||
|
||
Co-authored-by: Lee Briggs <[email protected]> | ||
|
2 changes: 1 addition & 1 deletion
2
patches/0021-Temp-remove-cognito_identity_pool_roles_attachment-e.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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/45] Temp remove cognito_identity_pool_roles_attachment | ||
Subject: [PATCH 21/46] Temp remove cognito_identity_pool_roles_attachment | ||
example beacuse of flaky translation | ||
|
||
|
||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,14 +1,14 @@ | ||
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/45] Fix elbv2 target group read to workaround #2517 | ||
Subject: [PATCH 22/46] Fix elbv2 target group read to workaround #2517 | ||
|
||
|
||
diff --git a/internal/service/elbv2/target_group.go b/internal/service/elbv2/target_group.go | ||
index 179497a48b..ad1fc3232e 100644 | ||
index 2ff5a14f0f..8f20da9ca9 100644 | ||
--- a/internal/service/elbv2/target_group.go | ||
+++ b/internal/service/elbv2/target_group.go | ||
@@ -562,15 +562,15 @@ func resourceTargetGroupRead(ctx context.Context, d *schema.ResourceData, meta i | ||
@@ -568,15 +568,15 @@ func resourceTargetGroupRead(ctx context.Context, d *schema.ResourceData, meta i | ||
return sdkdiag.AppendErrorf(diags, "reading ELBv2 Target Group (%s) attributes: %s", d.Id(), err) | ||
} | ||
|
||
|
@@ -27,7 +27,7 @@ index 179497a48b..ad1fc3232e 100644 | |
return sdkdiag.AppendErrorf(diags, "setting target_health_state: %s", err) | ||
} | ||
|
||
@@ -1340,3 +1340,13 @@ func targetGroupRuntimeValidation(d *schema.ResourceData, diags *diag.Diagnostic | ||
@@ -1346,3 +1346,13 @@ func targetGroupRuntimeValidation(d *schema.ResourceData, diags *diag.Diagnostic | ||
} | ||
} | ||
} | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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/45] Fix spurrious json diff for redrive_policy | ||
Subject: [PATCH 23/46] Fix spurrious json diff for redrive_policy | ||
|
||
We need to normalize the json input to compare agasint the one stored | ||
in state. | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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/45] Provide context to conns | ||
Subject: [PATCH 24/46] Provide context to conns | ||
|
||
|
||
diff --git a/internal/service/ecr/credentials_data_source.go b/internal/service/ecr/credentials_data_source.go | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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/45] Match the "tags" behavior of other resources | ||
Subject: [PATCH 25/46] Match the "tags" behavior of other resources | ||
|
||
|
||
diff --git a/internal/service/s3legacy/bucket_legacy.go b/internal/service/s3legacy/bucket_legacy.go | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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/45] move shim logic to upstream as a patch | ||
Subject: [PATCH 26/46] move shim logic to upstream as a patch | ||
|
||
|
||
diff --git a/shim/shim.go b/shim/shim.go | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,23 +1,23 @@ | ||
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/45] Restore S3ConnURICleaningDisabled | ||
Subject: [PATCH 27/46] Restore S3ConnURICleaningDisabled | ||
|
||
|
||
diff --git a/internal/conns/awsclient.go b/internal/conns/awsclient.go | ||
index ba065efc2d..344c1df114 100644 | ||
index ada1079a05..4982003ad2 100644 | ||
--- a/internal/conns/awsclient.go | ||
+++ b/internal/conns/awsclient.go | ||
@@ -16,6 +16,8 @@ import ( | ||
endpoints_sdkv1 "github.com/aws/aws-sdk-go/aws/endpoints" | ||
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" | ||
+ 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" | ||
@@ -101,6 +103,13 @@ func (c *AWSClient) S3UsePathStyle() bool { | ||
@@ -99,6 +101,13 @@ func (c *AWSClient) S3UsePathStyle(context.Context) bool { | ||
return c.s3UsePathStyle | ||
} | ||
|
||
|
@@ -30,8 +30,8 @@ index ba065efc2d..344c1df114 100644 | |
+ | ||
// 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(httpClient *http.Client) { | ||
@@ -166,7 +175,7 @@ func (c *AWSClient) DefaultKMSKeyPolicy() string { | ||
func (c *AWSClient) SetHTTPClient(_ context.Context, httpClient *http.Client) { | ||
@@ -164,7 +173,7 @@ func (c *AWSClient) DefaultKMSKeyPolicy(context.Context) string { | ||
"Resource": "*" | ||
} | ||
] | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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/45] Do not compute tags_all at TF level | ||
Subject: [PATCH 28/46] Do not compute tags_all at TF level | ||
|
||
|
||
diff --git a/internal/framework/base.go b/internal/framework/base.go | ||
|
@@ -22,10 +22,10 @@ index 94dbf5e792..494a2effba 100644 | |
if request.Plan.Raw.IsNull() { | ||
return | ||
diff --git a/internal/provider/fwprovider/provider.go b/internal/provider/fwprovider/provider.go | ||
index 6dbe55dfd5..acde512855 100644 | ||
index 963d905424..be3bc32ec2 100644 | ||
--- a/internal/provider/fwprovider/provider.go | ||
+++ b/internal/provider/fwprovider/provider.go | ||
@@ -421,8 +421,8 @@ func (p *fwprovider) Resources(ctx context.Context) []func() resource.Resource { | ||
@@ -425,8 +425,8 @@ func (p *fwprovider) Resources(ctx context.Context) []func() resource.Resource { | ||
continue | ||
} | ||
if v, ok := schemaResponse.Schema.Attributes[names.AttrTagsAll]; ok { | ||
|
Oops, something went wrong.