Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade terraform-provider-aws to v5.27.0 #3056

Merged
merged 4 commits into from
Nov 29, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
210 changes: 108 additions & 102 deletions examples/go.mod

Large diffs are not rendered by default.

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

Replace the useragent used for AWS client connections with a
Pulumi-flavoured one.
Expand Down
6 changes: 3 additions & 3 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/30] Add S3 legacy bucket to resources
Subject: [PATCH 03/29] 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,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 0bcb6d6a98..2bc27a3348 100644
index 58adbcd531..97abd08352 100644
--- a/internal/provider/provider.go
+++ b/internal/provider/provider.go
@@ -13,6 +13,8 @@ import (
Expand All @@ -26,7 +26,7 @@ index 0bcb6d6a98..2bc27a3348 100644
"github.com/aws/aws-sdk-go-v2/feature/ec2/imds"
"github.com/aws/aws-sdk-go/aws/endpoints"
awsbase "github.com/hashicorp/aws-sdk-go-base/v2"
@@ -237,7 +239,9 @@ func New(ctx context.Context) (*schema.Provider, error) {
@@ -249,7 +251,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/30] Marks SSE Configuration as Computed for Legacy S3
Subject: [PATCH 04/29] Marks SSE Configuration as Computed for Legacy S3
Bucket

In January, AWS enabled SSE by default for all new S3 buckets.
Expand Down
4 changes: 2 additions & 2 deletions patches/0005-De-deprecate-bucket_object.patch
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:06:11 +0000
Subject: [PATCH 05/30] De-deprecate bucket_object
Subject: [PATCH 05/29] De-deprecate bucket_object


diff --git a/internal/service/s3/bucket_object.go b/internal/service/s3/bucket_object.go
index 1a6fadf590..f596e3a8b4 100644
index 9327008686..a3765c60a1 100644
--- a/internal/service/s3/bucket_object.go
+++ b/internal/service/s3/bucket_object.go
@@ -63,7 +63,7 @@ func ResourceBucketObject() *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: Fri, 4 Nov 2022 17:08:23 +0000
Subject: [PATCH 06/30] Remove lakeformation catalog_resource default
Subject: [PATCH 06/29] 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/30] Workaround SSM Parameter tier bug
Subject: [PATCH 07/29] Workaround SSM Parameter tier bug

- Disable "computed".
- Disable diff suppression & counteractions
Expand Down
4 changes: 2 additions & 2 deletions patches/0010-Add-ECR-credentials_data_source.patch
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ Subject: [PATCH 10/29] Add ECR credentials_data_source


diff --git a/internal/provider/provider.go b/internal/provider/provider.go
index 2bc27a3348..29feaebfbd 100644
index 97abd08352..496bf6af0d 100644
--- a/internal/provider/provider.go
+++ b/internal/provider/provider.go
@@ -13,6 +13,8 @@ import (
Expand All @@ -17,7 +17,7 @@ index 2bc27a3348..29feaebfbd 100644
"github.com/hashicorp/terraform-provider-aws/internal/service/s3legacy"

"github.com/aws/aws-sdk-go-v2/feature/ec2/imds"
@@ -238,7 +240,10 @@ func New(ctx context.Context) (*schema.Provider, error) {
@@ -250,7 +252,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
4 changes: 2 additions & 2 deletions patches/0015-add-matchmaking-configuration-72.patch
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ Subject: [PATCH 15/29] add matchmaking configuration (#72)
* add resource docs

diff --git a/internal/provider/provider.go b/internal/provider/provider.go
index 29feaebfbd..8d16810a17 100644
index 496bf6af0d..60554782a2 100644
--- a/internal/provider/provider.go
+++ b/internal/provider/provider.go
@@ -15,6 +15,7 @@ import (
Expand All @@ -21,7 +21,7 @@ index 29feaebfbd..8d16810a17 100644
"github.com/hashicorp/terraform-provider-aws/internal/service/s3legacy"

"github.com/aws/aws-sdk-go-v2/feature/ec2/imds"
@@ -246,6 +247,9 @@ func New(ctx context.Context) (*schema.Provider, error) {
@@ -258,6 +259,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
Expand Up @@ -70,10 +70,10 @@ index 6970e2c917..9644b1a733 100644
"name": {
Type: schema.TypeString,
diff --git a/internal/service/ec2/vpc_security_group.go b/internal/service/ec2/vpc_security_group.go
index 48be193e59..e3a4359db9 100644
index 4ac9f81739..f25a8b53cb 100644
--- a/internal/service/ec2/vpc_security_group.go
+++ b/internal/service/ec2/vpc_security_group.go
@@ -63,7 +63,7 @@ func ResourceSecurityGroup() *schema.Resource {
@@ -66,7 +66,7 @@ func ResourceSecurityGroup() *schema.Resource {
Type: schema.TypeString,
Optional: true,
ForceNew: true,
Expand Down
4 changes: 2 additions & 2 deletions patches/0022-Fix-elbv2-target-group-read.patch
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@ Workaround for https://github.com/pulumi/pulumi-aws/issues/2517
Don't return single empty map. Return empty list instead.

diff --git a/internal/service/elbv2/target_group.go b/internal/service/elbv2/target_group.go
index 3c510e710b..26903193f9 100644
index b873c0bcf4..3c709e94a5 100644
--- a/internal/service/elbv2/target_group.go
+++ b/internal/service/elbv2/target_group.go
@@ -1201,6 +1201,12 @@ func flattenTargetGroupFailover(attributes []*elbv2.TargetGroupAttribute) []inte
@@ -1221,6 +1221,12 @@ func flattenTargetGroupFailover(attributes []*elbv2.TargetGroupAttribute) []inte
}
}

Expand Down
4 changes: 2 additions & 2 deletions patches/0027-Restore-S3ConnURICleaningDisabled.patch
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ Subject: [PATCH 27/29] Restore S3ConnURICleaningDisabled


diff --git a/internal/conns/awsclient.go b/internal/conns/awsclient.go
index b1f8680be8..0a6f434326 100644
index 05e58080b5..0c0f1952be 100644
--- a/internal/conns/awsclient.go
+++ b/internal/conns/awsclient.go
@@ -11,10 +11,12 @@ import (
Expand All @@ -21,7 +21,7 @@ index b1f8680be8..0a6f434326 100644
baselogging "github.com/hashicorp/aws-sdk-go-base/v2/logging"
tftags "github.com/hashicorp/terraform-provider-aws/internal/tags"
"github.com/hashicorp/terraform-provider-aws/names"
@@ -72,6 +74,13 @@ func (client *AWSClient) S3UsePathStyle() bool {
@@ -76,6 +78,13 @@ func (client *AWSClient) S3UsePathStyle() bool {
return client.s3UsePathStyle
}

Expand Down
16 changes: 8 additions & 8 deletions patches/0028-Do-not-compute-tags_all-at-TF-level.patch
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,10 @@ index 34065d9285..5225f639af 100644
if request.Plan.Raw.IsNull() {
return
diff --git a/internal/provider/fwprovider/provider.go b/internal/provider/fwprovider/provider.go
index 85a814022b..b119e21c46 100644
index 6dbe55dfd5..acde512855 100644
--- a/internal/provider/fwprovider/provider.go
+++ b/internal/provider/fwprovider/provider.go
@@ -413,8 +413,8 @@ func (p *fwprovider) Resources(ctx context.Context) []func() resource.Resource {
@@ -421,8 +421,8 @@ func (p *fwprovider) Resources(ctx context.Context) []func() resource.Resource {
continue
}
if v, ok := schemaResponse.Schema.Attributes[names.AttrTagsAll]; ok {
Expand Down Expand Up @@ -141,18 +141,18 @@ index 0b867c6616..0bf0c7ec63 100644
Optional: true,
Validators: []validator.Int64{
diff --git a/internal/service/lexv2models/bot.go b/internal/service/lexv2models/bot.go
index d806a8c907..ce0d41325e 100644
index fc553b56bc..997a513b50 100644
--- a/internal/service/lexv2models/bot.go
+++ b/internal/service/lexv2models/bot.go
@@ -78,7 +78,7 @@ func (r *resourceBot) Schema(ctx context.Context, req resource.SchemaRequest, re
},
@@ -82,7 +82,7 @@ func (r *resourceBot) Schema(ctx context.Context, req resource.SchemaRequest, re
Required: true,
},
names.AttrTags: tftags.TagsAttribute(),
- names.AttrTagsAll: tftags.TagsAttributeComputedOnly(),
+ names.AttrTagsAll: tftags.TagsAttribute(),
"role_arn": schema.StringAttribute{
CustomType: fwtypes.ARNType,
Required: true,
"test_bot_alias_tags": schema.MapAttribute{
ElementType: types.StringType,
Optional: true,
diff --git a/internal/service/opensearchserverless/collection.go b/internal/service/opensearchserverless/collection.go
index e661616cd7..7744b48ac4 100644
--- a/internal/service/opensearchserverless/collection.go
Expand Down
Loading
Loading