Skip to content

Commit

Permalink
upstream v5.54.1 (#4087)
Browse files Browse the repository at this point in the history
- **Moving ./upstream to v5.54.1**
- **Update patches**
- **./scripts/tidy-all.sh**
- **./script/patch_computed_only.sh**
- **Add mod mappings for new resources**
- **Regenerate SDK**
- **Regenerate schema**

closes #4084
  • Loading branch information
flostadler authored Jun 18, 2024
1 parent 5f48e07 commit 9ecfa37
Show file tree
Hide file tree
Showing 256 changed files with 23,340 additions and 1,523 deletions.
397 changes: 201 additions & 196 deletions examples/go.mod

Large diffs are not rendered by default.

793 changes: 402 additions & 391 deletions examples/go.sum

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@ Subject: [PATCH] Workaround Autoscaling launch_configuration
- Disable computation of property until fixed.

diff --git a/internal/service/autoscaling/launch_configuration.go b/internal/service/autoscaling/launch_configuration.go
index d988c9bdc0..9740c2a57c 100644
index a46c4b4b27..d6fe751162 100644
--- a/internal/service/autoscaling/launch_configuration.go
+++ b/internal/service/autoscaling/launch_configuration.go
@@ -51,7 +51,8 @@ func resourceLaunchConfiguration() *schema.Resource {
@@ -52,7 +52,8 @@ func resourceLaunchConfiguration() *schema.Resource {
"associate_public_ip_address": {
Type: schema.TypeBool,
Optional: true,
Expand All @@ -20,7 +20,7 @@ index d988c9bdc0..9740c2a57c 100644
ForceNew: true,
},
"ebs_block_device": {
@@ -318,16 +319,19 @@ func resourceLaunchConfigurationCreate(ctx context.Context, d *schema.ResourceDa
@@ -319,16 +320,19 @@ func resourceLaunchConfigurationCreate(ctx context.Context, d *schema.ResourceDa

lcName := create.Name(d.Get(names.AttrName).(string), d.Get(names.AttrNamePrefix).(string))
input := autoscaling.CreateLaunchConfigurationInput{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@ Subject: [PATCH] Catch cty panic in new
The root cause is not fully understood yet but this might unblock us.

diff --git a/internal/service/sns/topic_subscription.go b/internal/service/sns/topic_subscription.go
index 048654b937..0664e05d84 100644
index dcef58b233..c4cf612a34 100644
--- a/internal/service/sns/topic_subscription.go
+++ b/internal/service/sns/topic_subscription.go
@@ -540,9 +540,11 @@ func normalizeTopicSubscriptionDeliveryPolicy(policy string) ([]byte, error) {
@@ -545,9 +545,11 @@ func normalizeTopicSubscriptionDeliveryPolicy(policy string) ([]byte, error) {

func resourceTopicSubscriptionCustomizeDiff(_ context.Context, diff *schema.ResourceDiff, _ interface{}) error {
hasPolicy := diff.Get("filter_policy").(string) != ""
Expand Down
4 changes: 2 additions & 2 deletions patches/0016-Revert-Update-endpointHashIPAddress.patch
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@ This commit causes never-converging diffs due to incorrect use of
a computed property in hashing.

diff --git a/internal/service/route53resolver/endpoint.go b/internal/service/route53resolver/endpoint.go
index 2531180774..68f1b30fb1 100644
index 36d7a6477b..62449e6e0f 100644
--- a/internal/service/route53resolver/endpoint.go
+++ b/internal/service/route53resolver/endpoint.go
@@ -430,7 +430,7 @@ func waitEndpointDeleted(ctx context.Context, conn *route53resolver.Route53Resol
@@ -435,7 +435,7 @@ func waitEndpointDeleted(ctx context.Context, conn *route53resolver.Route53Resol
func endpointHashIPAddress(v interface{}) int {
var buf bytes.Buffer
m := v.(map[string]interface{})
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,10 +44,10 @@ index 837e79c057..8fc8280900 100644
},
"etag": {
diff --git a/internal/service/docdb/cluster_parameter_group.go b/internal/service/docdb/cluster_parameter_group.go
index 31466da183..d36339e1dc 100644
index d530b2a85c..c14f298606 100644
--- a/internal/service/docdb/cluster_parameter_group.go
+++ b/internal/service/docdb/cluster_parameter_group.go
@@ -48,7 +48,7 @@ func ResourceClusterParameterGroup() *schema.Resource {
@@ -50,7 +50,7 @@ func ResourceClusterParameterGroup() *schema.Resource {
Type: schema.TypeString,
Optional: true,
ForceNew: true,
Expand All @@ -57,10 +57,10 @@ index 31466da183..d36339e1dc 100644
names.AttrFamily: {
Type: schema.TypeString,
diff --git a/internal/service/docdb/subnet_group.go b/internal/service/docdb/subnet_group.go
index 333fe4befa..b706339eea 100644
index 70a69db303..5f1045af17 100644
--- a/internal/service/docdb/subnet_group.go
+++ b/internal/service/docdb/subnet_group.go
@@ -45,7 +45,7 @@ func ResourceSubnetGroup() *schema.Resource {
@@ -46,7 +46,7 @@ func ResourceSubnetGroup() *schema.Resource {
names.AttrDescription: {
Type: schema.TypeString,
Optional: true,
Expand Down Expand Up @@ -359,7 +359,7 @@ index 0eba392459..397bac3d54 100644
names.AttrTags: tftags.TagsSchema(),
names.AttrTagsAll: tftags.TagsSchemaComputed(),
diff --git a/internal/service/rds/parameter_group.go b/internal/service/rds/parameter_group.go
index 56d433437d..a5fa723e39 100644
index b870ffe2bc..9c72bc5fd1 100644
--- a/internal/service/rds/parameter_group.go
+++ b/internal/service/rds/parameter_group.go
@@ -52,7 +52,7 @@ func ResourceParameterGroup() *schema.Resource {
Expand Down Expand Up @@ -1061,7 +1061,7 @@ index aeef59b958..abac8702c5 100644
HostedZoneId: aws.String(zoneID),
}
diff --git a/internal/service/route53/zone.go b/internal/service/route53/zone.go
index 10dc7c543b..9f5c076bf7 100644
index 15edc9f2af..db519dc744 100644
--- a/internal/service/route53/zone.go
+++ b/internal/service/route53/zone.go
@@ -53,7 +53,7 @@ func resourceZone() *schema.Resource {
Expand Down
2 changes: 1 addition & 1 deletion patches/0027-Do-not-compute-tags_all-at-TF-level.patch
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ index e8e1a272eb..a4a1625554 100644
Blocks: map[string]schema.Block{
names.AttrTimeouts: timeouts.Block(ctx, timeouts.Opts{
diff --git a/internal/service/ec2/ec2_instance_connect_endpoint.go b/internal/service/ec2/ec2_instance_connect_endpoint.go
index f1a198c2d9..25016470af 100644
index 90273f5fb2..7eb040c4e2 100644
--- a/internal/service/ec2/ec2_instance_connect_endpoint.go
+++ b/internal/service/ec2/ec2_instance_connect_endpoint.go
@@ -118,7 +118,7 @@ func (r *instanceConnectEndpointResource) Schema(ctx context.Context, req resour
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ index 6b8ecf2c57..72d8c48672 100644
return &servicePackage{}
}
diff --git a/names/data/names_data.csv b/names/data/names_data.csv
index da7ff7f983..fefa624383 100644
index e36b7a9a0c..ebe0f7ed17 100644
--- a/names/data/names_data.csv
+++ b/names/data/names_data.csv
@@ -218,7 +218,7 @@ kinesis-video-media,kinesisvideomedia,kinesisvideomedia,kinesisvideomedia,,kines
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ Subject: [PATCH] Patch ACM retry to not retry after LimitExceededException


diff --git a/internal/service/acm/service_package_gen.go b/internal/service/acm/service_package_gen.go
index 7ca15d3ae4..85744c2eee 100644
index cd3c01f9c9..b993553de2 100644
--- a/internal/service/acm/service_package_gen.go
+++ b/internal/service/acm/service_package_gen.go
@@ -6,8 +6,10 @@ import (
Expand All @@ -20,7 +20,7 @@ index 7ca15d3ae4..85744c2eee 100644
"github.com/hashicorp/terraform-provider-aws/internal/conns"
"github.com/hashicorp/terraform-provider-aws/internal/types"
"github.com/hashicorp/terraform-provider-aws/names"
@@ -69,6 +71,14 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) (
@@ -73,6 +75,14 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) (
o.EndpointOptions.UseFIPSEndpoint = aws_sdkv2.FIPSEndpointStateDisabled
}
}
Expand Down
16 changes: 8 additions & 8 deletions patches/0038-Restore-legacy-bucket.patch
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ Subject: [PATCH] Restore legacy bucket


diff --git a/go.mod b/go.mod
index ef0bb73901..654b4ceead 100644
index 57846f59c0..7fb556ab81 100644
--- a/go.mod
+++ b/go.mod
@@ -194,6 +194,7 @@ require (
@@ -199,6 +199,7 @@ require (
github.com/gertd/go-pluralize v0.2.1
github.com/google/go-cmp v0.6.0
github.com/hashicorp/aws-cloudformation-resource-schema-sdk-go v0.23.0
Expand All @@ -17,18 +17,18 @@ index ef0bb73901..654b4ceead 100644
github.com/hashicorp/aws-sdk-go-base/v2/awsv1shim/v2 v2.0.0-beta.54
github.com/hashicorp/awspolicyequivalence v1.6.0
diff --git a/go.sum b/go.sum
index 4f342a97f5..11035e85c7 100644
index e5dab74913..94e4b1d8b7 100644
--- a/go.sum
+++ b/go.sum
@@ -451,6 +451,7 @@ github.com/go-logr/logr v1.4.1 h1:pKouT5E8xu9zeFC39JXRDukb6JFQPXM5p5I91188VAQ=
@@ -461,6 +461,7 @@ github.com/go-logr/logr v1.4.1 h1:pKouT5E8xu9zeFC39JXRDukb6JFQPXM5p5I91188VAQ=
github.com/go-logr/logr v1.4.1/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY=
github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag=
github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE=
+github.com/go-sql-driver/mysql v1.5.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg=
github.com/go-test/deep v1.1.0 h1:WOcxcdHcvdgThNXjw0t76K42FXTU7HpNQWHpA2HHNlg=
github.com/go-test/deep v1.1.0/go.mod h1:5C2ZWiW0ErCdrYzpqxLbTX7MG14M9iiw8DgHncVwcsE=
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da h1:oI5xCqsCo564l8iNU+DwB5epxmsaqB+rhGL0m5jtYqE=
@@ -470,6 +471,8 @@ github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
@@ -480,6 +481,8 @@ github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
github.com/hashicorp/aws-cloudformation-resource-schema-sdk-go v0.23.0 h1:l16/Vrl0+x+HjHJWEjcKPwHYoxN9EC78gAFXKlH6m84=
github.com/hashicorp/aws-cloudformation-resource-schema-sdk-go v0.23.0/go.mod h1:HAmscHyzSOfB1Dr16KLc177KNbn83wscnZC+N7WyaM8=
Expand All @@ -37,16 +37,16 @@ index 4f342a97f5..11035e85c7 100644
github.com/hashicorp/aws-sdk-go-base/v2 v2.0.0-beta.53 h1:jgOMbQlypMpUMaqYJotjT7ERSMvQP00Mppgjgh8lNt8=
github.com/hashicorp/aws-sdk-go-base/v2 v2.0.0-beta.53/go.mod h1:nvpXIeF0ANfZ7sMssXKSSR3pyXfksajxoC2tl4jjN08=
github.com/hashicorp/aws-sdk-go-base/v2/awsv1shim/v2 v2.0.0-beta.54 h1:raRbM2Wynqv0Nyhe7AwVnFgb2roGSvpSUeQKxEg8Lts=
@@ -545,6 +548,7 @@ github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99/go.mod h1:1lJo3i
@@ -555,6 +558,7 @@ github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99/go.mod h1:1lJo3i
github.com/jessevdk/go-flags v1.4.0/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI=
github.com/jhump/protoreflect v1.15.1 h1:HUMERORf3I3ZdX05WaQ6MIpd/NJ434hTp5YiKgfCL6c=
github.com/jhump/protoreflect v1.15.1/go.mod h1:jD/2GMKKE6OqX8qTjhADU1e6DShO+gavG9e0Q693nKo=
+github.com/jmespath/go-jmespath v0.3.0/go.mod h1:9QtRXoHjLGCJ5IBSaohpXITPlowMeeYCZ7fLUTSywik=
github.com/jmespath/go-jmespath v0.4.0 h1:BEgLn5cpjn8UN1mAw4NjwDrS35OdebyEtFe+9YPoQUg=
github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo=
github.com/jmespath/go-jmespath/internal/testify v1.5.1 h1:shLQSRRSCCPj3f2gpwzGwWFoC7ycTf1rcQZHOlsJ6N8=
@@ -657,6 +661,7 @@ golang.org/x/mod v0.16.0 h1:QX4fJ0Rr5cPQCF7O9lh9Se4pmwfwskqZfq5moyldzic=
golang.org/x/mod v0.16.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
@@ -667,6 +671,7 @@ golang.org/x/mod v0.17.0 h1:zY54UmvipHiNd+pm+m0x9KhZ9hl1/7QNMyxXbc6ICqA=
golang.org/x/mod v0.17.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -187,10 +187,10 @@ index ec53bee87d..5dec03955e 100644
- }
-}
diff --git a/internal/service/elbv2/listener_data_source.go b/internal/service/elbv2/listener_data_source.go
index 20d1c424e1..2531ae0355 100644
index dc7221f163..c64e80e7e3 100644
--- a/internal/service/elbv2/listener_data_source.go
+++ b/internal/service/elbv2/listener_data_source.go
@@ -339,7 +339,7 @@ func dataSourceListenerRead(ctx context.Context, d *schema.ResourceData, meta in
@@ -340,7 +340,7 @@ func dataSourceListenerRead(ctx context.Context, d *schema.ResourceData, meta in
sort.Slice(listener.DefaultActions, func(i, j int) bool {
return aws.ToInt32(listener.DefaultActions[i].Order) < aws.ToInt32(listener.DefaultActions[j].Order)
})
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ Subject: [PATCH] Allow creating lambdas without code related properties


diff --git a/internal/service/lambda/function.go b/internal/service/lambda/function.go
index 28f37eb277..dfa2e97fa3 100644
index 4d25e0e549..ac27e24a03 100644
--- a/internal/service/lambda/function.go
+++ b/internal/service/lambda/function.go
@@ -172,9 +172,9 @@ func resourceFunction() *schema.Resource {
Expand Down
8 changes: 4 additions & 4 deletions patches/0047-restore-ECRConn.patch
Original file line number Diff line number Diff line change
Expand Up @@ -5,18 +5,18 @@ Subject: [PATCH] restore ECRConn


diff --git a/internal/conns/awsclient_gen.go b/internal/conns/awsclient_gen.go
index 7ff63b248b..11f9c75de5 100644
index fa56803e05..673dc98e1a 100644
--- a/internal/conns/awsclient_gen.go
+++ b/internal/conns/awsclient_gen.go
@@ -195,6 +195,7 @@ import (
@@ -198,6 +198,7 @@ import (
directconnect_sdkv1 "github.com/aws/aws-sdk-go/service/directconnect"
directoryservice_sdkv1 "github.com/aws/aws-sdk-go/service/directoryservice"
docdb_sdkv1 "github.com/aws/aws-sdk-go/service/docdb"
ec2_sdkv1 "github.com/aws/aws-sdk-go/service/ec2"
+ ecr_sdkv1 "github.com/aws/aws-sdk-go/service/ecr"
ecs_sdkv1 "github.com/aws/aws-sdk-go/service/ecs"
efs_sdkv1 "github.com/aws/aws-sdk-go/service/efs"
elasticache_sdkv1 "github.com/aws/aws-sdk-go/service/elasticache"
@@ -590,6 +591,10 @@ func (c *AWSClient) EC2Client(ctx context.Context) *ec2_sdkv2.Client {
@@ -591,6 +592,10 @@ func (c *AWSClient) EC2Client(ctx context.Context) *ec2_sdkv2.Client {
return errs.Must(client[*ec2_sdkv2.Client](ctx, c, names.EC2, make(map[string]any)))
}

Expand Down
2 changes: 1 addition & 1 deletion patches/0051-non-idempotent-sns-topic-creation.patch
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ Subject: [PATCH] non-idempotent sns topic creation


diff --git a/internal/service/sns/topic.go b/internal/service/sns/topic.go
index 71cc3dcab3..ca542a6467 100644
index ce64108d08..7d73e7e572 100644
--- a/internal/service/sns/topic.go
+++ b/internal/service/sns/topic.go
@@ -9,6 +9,7 @@ import (
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ We think this was an optimization for a special edge case that
drastically worsens the UX for the majority of users.

diff --git a/internal/service/lambda/function.go b/internal/service/lambda/function.go
index dfa2e97fa3..0145922945 100644
index ac27e24a03..192bb39a99 100644
--- a/internal/service/lambda/function.go
+++ b/internal/service/lambda/function.go
@@ -36,7 +36,6 @@ import (
Expand Down
71 changes: 71 additions & 0 deletions patches/0061-Fix-tags_all-Computed-for-PF-resources.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,71 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Florian Stadler <[email protected]>
Date: Tue, 18 Jun 2024 10:24:51 +0200
Subject: [PATCH] Fix tags_all Computed for PF resources


diff --git a/internal/service/appfabric/app_authorization.go b/internal/service/appfabric/app_authorization.go
index 8b8f2091ec..9781507561 100644
--- a/internal/service/appfabric/app_authorization.go
+++ b/internal/service/appfabric/app_authorization.go
@@ -112,7 +112,7 @@ func (r *appAuthorizationResource) Schema(ctx context.Context, request resource.
},
},
names.AttrTags: tftags.TagsAttribute(),
- names.AttrTagsAll: tftags.TagsAttributeComputedOnly(),
+ names.AttrTagsAll: tftags.TagsAttribute(),
"updated_at": schema.StringAttribute{
CustomType: timetypes.RFC3339Type{},
Computed: true,
diff --git a/internal/service/appfabric/app_bundle.go b/internal/service/appfabric/app_bundle.go
index 98a55920b8..e1085f4cc4 100644
--- a/internal/service/appfabric/app_bundle.go
+++ b/internal/service/appfabric/app_bundle.go
@@ -58,7 +58,7 @@ func (r *appBundleResource) Schema(ctx context.Context, request resource.SchemaR
},
names.AttrID: framework.IDAttribute(),
names.AttrTags: tftags.TagsAttribute(),
- names.AttrTagsAll: tftags.TagsAttributeComputedOnly(),
+ names.AttrTagsAll: tftags.TagsAttribute(),
},
}
}
diff --git a/internal/service/ec2/ec2_capacity_block_reservation.go b/internal/service/ec2/ec2_capacity_block_reservation.go
index eecf8cf1a9..e27245f1fd 100644
--- a/internal/service/ec2/ec2_capacity_block_reservation.go
+++ b/internal/service/ec2/ec2_capacity_block_reservation.go
@@ -150,7 +150,7 @@ func (r *resourceCapacityBlockReservation) Schema(ctx context.Context, _ resourc
},
},
names.AttrTags: tftags.TagsAttribute(),
- names.AttrTagsAll: tftags.TagsAttributeComputedOnly(),
+ names.AttrTagsAll: tftags.TagsAttribute(),
"tenancy": schema.StringAttribute{
Computed: true,
PlanModifiers: []planmodifier.String{
diff --git a/internal/service/fms/resource_set.go b/internal/service/fms/resource_set.go
index 8722e6a2b6..09293cdecc 100644
--- a/internal/service/fms/resource_set.go
+++ b/internal/service/fms/resource_set.go
@@ -103,7 +103,7 @@ func (r *resourceResourceSet) Schema(ctx context.Context, req resource.SchemaReq
names.AttrID: framework.IDAttribute(),
names.AttrARN: framework.ARNAttributeComputedOnly(),
names.AttrTags: tftags.TagsAttribute(),
- names.AttrTagsAll: tftags.TagsAttributeComputedOnly(),
+ names.AttrTagsAll: tftags.TagsAttribute(),
},
Blocks: map[string]schema.Block{
"resource_set": resourceSetLNB,
diff --git a/internal/service/guardduty/malware_protection_plan.go b/internal/service/guardduty/malware_protection_plan.go
index efe2773748..c48b5ff4aa 100644
--- a/internal/service/guardduty/malware_protection_plan.go
+++ b/internal/service/guardduty/malware_protection_plan.go
@@ -88,7 +88,7 @@ func (r *resourceMalwareProtectionPlan) Schema(ctx context.Context, req resource
Computed: true,
},
names.AttrTags: tftags.TagsAttribute(),
- names.AttrTagsAll: tftags.TagsAttributeComputedOnly(),
+ names.AttrTagsAll: tftags.TagsAttribute(),
},
Blocks: map[string]schema.Block{
"protected_resource": schema.ListNestedBlock{
Loading

0 comments on commit 9ecfa37

Please sign in to comment.