Skip to content

Commit a2b15e7

Browse files
corymhallcorymhall
authored
Upgrade terraform-provider-aws to v5.100.0 (#5605)
Upgrades upstream to v5.100.0 #### New resources: - `amp/workspaceConfiguration.WorkspaceConfiguration` - `dsql/cluster.Cluster` - `dsql/clusterPeering.ClusterPeering` - `s3control/directoryBucketAccessPointScope.DirectoryBucketAccessPointScope` - `vpc/routeServer.RouteServer` - `vpc/routeServerEndpoint.RouteServerEndpoint` - `vpc/routeServerPeer.RouteServerPeer` - `vpc/routeServerPropagation.RouteServerPropagation` - `vpc/routeServerVpcAssociation.RouteServerVpcAssociation` - `workspaces/webDataProtectionSettings.WebDataProtectionSettings` - `workspaces/webIpAccessSettings.WebIpAccessSettings` - `workspaces/webUserAccessLoggingSettings.WebUserAccessLoggingSettings` - `workspacesweb/browserSettings.BrowserSettings` - `workspacesweb/dataProtectionSettings.DataProtectionSettings` - `workspacesweb/ipAccessSettings.IpAccessSettings` - `workspacesweb/networkSettings.NetworkSettings` - `workspacesweb/userAccessLoggingSettings.UserAccessLoggingSettings` - `workspacesweb/userSettings.UserSettings` fixes #5602
1 parent d08a0bc commit a2b15e7

File tree

811 files changed

+91124
-11595
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

811 files changed

+91124
-11595
lines changed

‎CONTRIBUTING.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ git branch upstream-v5.60.0 && git checkout upstream-v5.60.0
6464
# if patch_computed_only edited anything in ./upstream, commit it
6565
(cd ./upstream && go build ./...) # verify everything builds
6666
# add commits as needed to make it build
67-
./scripts/upstream.sh format_patches
67+
./scripts/upstream.sh check_in
6868
git add ./patches && git commit -m "Update patches for v5.60.0"
6969
(cd upstream && git reset --hard v5.60.0)
7070
git add ./upstream && git commit -m "Move upstream to v5.60.0"

‎examples/go.mod‎

Lines changed: 109 additions & 108 deletions
Large diffs are not rendered by default.

‎examples/go.sum‎

Lines changed: 216 additions & 210 deletions
Large diffs are not rendered by default.

‎patches/0012-Revert-WAF-schema-changes.patch‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,15 @@ Subject: [PATCH] Revert WAF schema changes
66
- This causes far too many types to be generated downstream.
77

88
diff --git a/internal/service/wafv2/schemas.go b/internal/service/wafv2/schemas.go
9-
index 5f298cb084..e14ffab06e 100644
9+
index c5784ceb8b..74eeb57a09 100644
1010
--- a/internal/service/wafv2/schemas.go
1111
+++ b/internal/service/wafv2/schemas.go
12-
@@ -56,14 +56,14 @@ func ruleGroupRootStatementSchema(level int) *schema.Schema {
12+
@@ -56,15 +56,15 @@ func ruleGroupRootStatementSchema(level int) *schema.Schema {
1313
MaxItems: 1,
1414
Elem: &schema.Resource{
1515
Schema: map[string]*schema.Schema{
1616
- "and_statement": statementSchema(level),
17+
"asn_match_statement": asnMatchStatementSchema(),
1718
+ "and_statement": statementSchema(level - 1),
1819
"byte_match_statement": byteMatchStatementSchema(),
1920
"geo_match_statement": geoMatchStatementSchema(),

‎patches/0042-Revert-r-aws_db_proxy-Change-auth-from-TypeList-to-T.patch‎

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -392,14 +392,41 @@ index 884f83084b..0856302c30 100644
392392
recovery_window_in_days = 0
393393
}
394394

395-
@@ -952,46 +954,18 @@ resource "aws_secretsmanager_secret_version" "test2" {
395+
@@ -952,18 +954,18 @@ resource "aws_secretsmanager_secret_version" "test2" {
396396
secret_id = aws_secretsmanager_secret.test2.id
397397
secret_string = "{\"username\":\"db_user\",\"password\":\"db_user_password\"}"
398398
}
399399
-`, rName, nName))
400+
+`, rName, nName)
401+
}
402+
403+
-func testAccProxyConfig_tags1(rName, tagKey1, tagValue1 string) string {
404+
- return acctest.ConfigCompose(testAccProxyConfig_base(rName), fmt.Sprintf(`
405+
+func testAccProxyConfig_tags(rName, key, value string) string {
406+
+ return acctest.ConfigCompose(testAccProxyBaseConfig(rName), fmt.Sprintf(`
407+
resource "aws_db_proxy" "test" {
408+
depends_on = [
409+
aws_secretsmanager_secret_version.test,
410+
aws_iam_role_policy.test
411+
]
412+
413+
- name = %[1]q
414+
+ name = "%[1]s"
415+
engine_family = "MYSQL"
416+
role_arn = aws_iam_role.test.arn
417+
vpc_security_group_ids = [aws_security_group.test.id]
418+
@@ -977,37 +979,8 @@ resource "aws_db_proxy" "test" {
419+
}
420+
421+
tags = {
422+
- %[2]q = %[3]q
423+
+ %[2]s = "%[3]s"
424+
}
425+
}
426+
-`, rName, tagKey1, tagValue1))
400427
-}
401428
-
402-
-func testAccProxyConfig_tags1(rName, tagKey1, tagValue1 string) string {
429+
-func testAccProxyConfig_tags2(rName, tagKey1, tagValue1, tagKey2, tagValue2 string) string {
403430
- return acctest.ConfigCompose(testAccProxyConfig_base(rName), fmt.Sprintf(`
404431
-resource "aws_db_proxy" "test" {
405432
- depends_on = [
@@ -422,36 +449,9 @@ index 884f83084b..0856302c30 100644
422449
-
423450
- tags = {
424451
- %[2]q = %[3]q
452+
- %[4]q = %[5]q
425453
- }
426454
-}
427-
-`, rName, tagKey1, tagValue1))
428-
+`, rName, nName)
429-
}
430-
431-
-func testAccProxyConfig_tags2(rName, tagKey1, tagValue1, tagKey2, tagValue2 string) string {
432-
- return acctest.ConfigCompose(testAccProxyConfig_base(rName), fmt.Sprintf(`
433-
+func testAccProxyConfig_tags(rName, key, value string) string {
434-
+ return acctest.ConfigCompose(testAccProxyBaseConfig(rName), fmt.Sprintf(`
435-
resource "aws_db_proxy" "test" {
436-
depends_on = [
437-
aws_secretsmanager_secret_version.test,
438-
aws_iam_role_policy.test
439-
]
440-
441-
- name = %[1]q
442-
+ name = "%[1]s"
443-
engine_family = "MYSQL"
444-
role_arn = aws_iam_role.test.arn
445-
vpc_security_group_ids = [aws_security_group.test.id]
446-
@@ -1005,9 +979,8 @@ resource "aws_db_proxy" "test" {
447-
}
448-
449-
tags = {
450-
- %[2]q = %[3]q
451-
- %[4]q = %[5]q
452-
+ %[2]s = "%[3]s"
453-
}
454-
}
455455
-`, rName, tagKey1, tagValue1, tagKey2, tagValue2))
456456
+`, rName, key, value))
457457
}

‎patches/0047-Adapt-gamelift-matchmaking-resources.patch‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -645,7 +645,7 @@ index 4295987ae6..7554a3029c 100644
645645
return nil
646646
}
647647
diff --git a/names/data/names_data.hcl b/names/data/names_data.hcl
648-
index 8d960dcf5f..e4db58913a 100644
648+
index abd7b1428c..5b28d97898 100644
649649
--- a/names/data/names_data.hcl
650650
+++ b/names/data/names_data.hcl
651651
@@ -3688,7 +3688,8 @@ service "fsx" {

‎patches/0059-Apply-tags-patches.patch‎

Lines changed: 177 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -500,6 +500,19 @@ index 1046d96871..3f8448d649 100644
500500

501501
"use_dedicated_replication_server": schema.BoolAttribute{
502502
Required: true,
503+
diff --git a/internal/service/dsql/cluster.go b/internal/service/dsql/cluster.go
504+
index fb8dba4308..376bab42b9 100644
505+
--- a/internal/service/dsql/cluster.go
506+
+++ b/internal/service/dsql/cluster.go
507+
@@ -81,7 +81,7 @@ func (r *clusterResource) Schema(ctx context.Context, request resource.SchemaReq
508+
},
509+
},
510+
names.AttrTags: tftags.TagsAttribute(),
511+
- names.AttrTagsAll: tftags.TagsAttributeComputedOnly(),
512+
+ names.AttrTagsAll: tftags.TagsAttribute(),
513+
"vpc_endpoint_service_name": schema.StringAttribute{
514+
Computed: true,
515+
PlanModifiers: []planmodifier.String{
503516
diff --git a/internal/service/ec2/ec2_capacity_block_reservation.go b/internal/service/ec2/ec2_capacity_block_reservation.go
504517
index 2dc713e4eb..9a7973fba8 100644
505518
--- a/internal/service/ec2/ec2_capacity_block_reservation.go
@@ -539,6 +552,45 @@ index 0dde8cfc90..56c79690c3 100644
539552
names.AttrVPCID: schema.StringAttribute{
540553
Optional: true,
541554
PlanModifiers: []planmodifier.String{
555+
diff --git a/internal/service/ec2/vpc_route_server.go b/internal/service/ec2/vpc_route_server.go
556+
index 91c16ea2f4..8f5205d64c 100644
557+
--- a/internal/service/ec2/vpc_route_server.go
558+
+++ b/internal/service/ec2/vpc_route_server.go
559+
@@ -93,7 +93,7 @@ func (r *vpcRouteServerResource) Schema(ctx context.Context, request resource.Sc
560+
Computed: true,
561+
},
562+
names.AttrTags: tftags.TagsAttribute(),
563+
- names.AttrTagsAll: tftags.TagsAttributeComputedOnly(),
564+
+ names.AttrTagsAll: tftags.TagsAttribute(),
565+
},
566+
Blocks: map[string]schema.Block{
567+
names.AttrTimeouts: timeouts.Block(ctx, timeouts.Opts{
568+
diff --git a/internal/service/ec2/vpc_route_server_endpoint.go b/internal/service/ec2/vpc_route_server_endpoint.go
569+
index b3dfca1164..c95a0d7b9d 100644
570+
--- a/internal/service/ec2/vpc_route_server_endpoint.go
571+
+++ b/internal/service/ec2/vpc_route_server_endpoint.go
572+
@@ -76,7 +76,7 @@ func (r *vpcRouteServerEndpointResource) Schema(ctx context.Context, request res
573+
},
574+
},
575+
names.AttrTags: tftags.TagsAttribute(),
576+
- names.AttrTagsAll: tftags.TagsAttributeComputedOnly(),
577+
+ names.AttrTagsAll: tftags.TagsAttribute(),
578+
names.AttrVPCID: schema.StringAttribute{
579+
Computed: true,
580+
PlanModifiers: []planmodifier.String{
581+
diff --git a/internal/service/ec2/vpc_route_server_peer.go b/internal/service/ec2/vpc_route_server_peer.go
582+
index 2cd4f45489..01bc7e7462 100644
583+
--- a/internal/service/ec2/vpc_route_server_peer.go
584+
+++ b/internal/service/ec2/vpc_route_server_peer.go
585+
@@ -87,7 +87,7 @@ func (r *vpcRouteServerPeerResource) Schema(ctx context.Context, req resource.Sc
586+
},
587+
},
588+
names.AttrTags: tftags.TagsAttribute(),
589+
- names.AttrTagsAll: tftags.TagsAttributeComputedOnly(),
590+
+ names.AttrTagsAll: tftags.TagsAttribute(),
591+
names.AttrSubnetID: schema.StringAttribute{
592+
Computed: true,
593+
PlanModifiers: []planmodifier.String{
542594
diff --git a/internal/service/ec2/vpc_security_group_ingress_rule.go b/internal/service/ec2/vpc_security_group_ingress_rule.go
543595
index 21eeddfa6b..bff0a2da9f 100644
544596
--- a/internal/service/ec2/vpc_security_group_ingress_rule.go
@@ -696,12 +748,12 @@ index d69e4e44c8..d1a6eae711 100644
696748
}
697749
}
698750
diff --git a/internal/service/logs/delivery.go b/internal/service/logs/delivery.go
699-
index d749138f74..29e6891331 100644
751+
index 41f168bd38..493e488fb5 100644
700752
--- a/internal/service/logs/delivery.go
701753
+++ b/internal/service/logs/delivery.go
702754
@@ -93,7 +93,7 @@ func (r *deliveryResource) Schema(ctx context.Context, request resource.SchemaRe
703755
},
704-
"s3_delivery_configuration": framework.ResourceOptionalComputedListOfObjectsAttribute[s3DeliveryConfigurationModel](ctx, 1, s3DeliveryConfigurationListOptions, listplanmodifier.UseStateForUnknown()),
756+
"s3_delivery_configuration": framework.ResourceOptionalComputedListOfObjectsAttribute(ctx, 1, s3DeliveryConfigurationListOptions, listplanmodifier.UseStateForUnknown()),
705757
names.AttrTags: tftags.TagsAttribute(),
706758
- names.AttrTagsAll: tftags.TagsAttributeComputedOnly(),
707759
+ names.AttrTagsAll: tftags.TagsAttribute(),
@@ -851,19 +903,45 @@ index f773ee50a0..48008bd8bf 100644
851903
names.AttrVPCID: schema.StringAttribute{
852904
Computed: true,
853905
PlanModifiers: []planmodifier.String{
906+
diff --git a/internal/service/notifications/notification_configuration.go b/internal/service/notifications/notification_configuration.go
907+
index 7777c71500..b809182b00 100644
908+
--- a/internal/service/notifications/notification_configuration.go
909+
+++ b/internal/service/notifications/notification_configuration.go
910+
@@ -71,7 +71,7 @@ func (r *notificationConfigurationResource) Schema(ctx context.Context, request
911+
},
912+
},
913+
names.AttrTags: tftags.TagsAttribute(),
914+
- names.AttrTagsAll: tftags.TagsAttributeComputedOnly(),
915+
+ names.AttrTagsAll: tftags.TagsAttribute(),
916+
},
917+
}
918+
}
919+
diff --git a/internal/service/notificationscontacts/email_contact.go b/internal/service/notificationscontacts/email_contact.go
920+
index 7339d1d7a0..0724844b46 100644
921+
--- a/internal/service/notificationscontacts/email_contact.go
922+
+++ b/internal/service/notificationscontacts/email_contact.go
923+
@@ -67,7 +67,7 @@ func (r *emailContactResource) Schema(ctx context.Context, request resource.Sche
924+
},
925+
},
926+
names.AttrTags: tftags.TagsAttribute(),
927+
- names.AttrTagsAll: tftags.TagsAttributeComputedOnly(),
928+
+ names.AttrTagsAll: tftags.TagsAttribute(),
929+
},
930+
}
931+
}
854932
diff --git a/internal/service/opensearchserverless/collection.go b/internal/service/opensearchserverless/collection.go
855-
index 30ecec3d52..072b191ce2 100644
933+
index 778cbbd09f..c7d79754dd 100644
856934
--- a/internal/service/opensearchserverless/collection.go
857935
+++ b/internal/service/opensearchserverless/collection.go
858-
@@ -120,7 +120,7 @@ func (r *resourceCollection) Schema(ctx context.Context, req resource.SchemaRequ
936+
@@ -126,7 +126,7 @@ func (r *resourceCollection) Schema(ctx context.Context, req resource.SchemaRequ
859937
},
860938
},
861939
names.AttrTags: tftags.TagsAttribute(),
862940
- names.AttrTagsAll: tftags.TagsAttributeComputedOnly(),
863941
+ names.AttrTagsAll: tftags.TagsAttribute(),
864942
names.AttrType: schema.StringAttribute{
865-
Optional: true,
866-
Computed: true,
943+
Description: "Type of collection. One of `SEARCH`, `TIMESERIES`, or `VECTORSEARCH`. Defaults to `TIMESERIES`.",
944+
Optional: true,
867945
diff --git a/internal/service/osis/pipeline.go b/internal/service/osis/pipeline.go
868946
index f39ac603c9..88f515d1f9 100644
869947
--- a/internal/service/osis/pipeline.go
@@ -930,10 +1008,10 @@ index 6fe1f2daa7..8684b9a0d2 100644
9301008
}
9311009
}
9321010
diff --git a/internal/service/pinpointsmsvoicev2/phone_number.go b/internal/service/pinpointsmsvoicev2/phone_number.go
933-
index b95bd9ddbb..40ec333341 100644
1011+
index 3ccd54966b..75b597de3d 100644
9341012
--- a/internal/service/pinpointsmsvoicev2/phone_number.go
9351013
+++ b/internal/service/pinpointsmsvoicev2/phone_number.go
936-
@@ -120,7 +120,7 @@ func (r *phoneNumberResource) Schema(ctx context.Context, request resource.Schem
1014+
@@ -126,7 +126,7 @@ func (r *phoneNumberResource) Schema(ctx context.Context, request resource.Schem
9371015
Default: booldefault.StaticBool(false),
9381016
},
9391017
names.AttrTags: tftags.TagsAttribute(),
@@ -1332,6 +1410,19 @@ index 07d7145722..0822d5d68a 100644
13321410
},
13331411
Blocks: map[string]schema.Block{
13341412
"error_report_configuration": schema.ListNestedBlock{
1413+
diff --git a/internal/service/verifiedpermissions/policy_store.go b/internal/service/verifiedpermissions/policy_store.go
1414+
index 6ac7fcb7a3..6c098b6f70 100644
1415+
--- a/internal/service/verifiedpermissions/policy_store.go
1416+
+++ b/internal/service/verifiedpermissions/policy_store.go
1417+
@@ -63,7 +63,7 @@ func (r *resourcePolicyStore) Schema(ctx context.Context, request resource.Schem
1418+
},
1419+
},
1420+
names.AttrTags: tftags.TagsAttribute(),
1421+
- names.AttrTagsAll: tftags.TagsAttributeComputedOnly(),
1422+
+ names.AttrTagsAll: tftags.TagsAttribute(),
1423+
},
1424+
Blocks: map[string]schema.Block{
1425+
"validation_settings": schema.ListNestedBlock{
13351426
diff --git a/internal/service/vpclattice/resource_configuration.go b/internal/service/vpclattice/resource_configuration.go
13361427
index 29937b2a74..fce607c87d 100644
13371428
--- a/internal/service/vpclattice/resource_configuration.go
@@ -1384,3 +1475,81 @@ index f343ca3b29..70db910245 100644
13841475
},
13851476
Blocks: map[string]schema.Block{
13861477
names.AttrTimeouts: timeouts.Block(ctx, timeouts.Opts{
1478+
diff --git a/internal/service/workspacesweb/browser_settings.go b/internal/service/workspacesweb/browser_settings.go
1479+
index 940e8e952d..f6cd293311 100644
1480+
--- a/internal/service/workspacesweb/browser_settings.go
1481+
+++ b/internal/service/workspacesweb/browser_settings.go
1482+
@@ -81,7 +81,7 @@ func (r *browserSettingsResource) Schema(ctx context.Context, request resource.S
1483+
},
1484+
},
1485+
names.AttrTags: tftags.TagsAttribute(),
1486+
- names.AttrTagsAll: tftags.TagsAttributeComputedOnly(),
1487+
+ names.AttrTagsAll: tftags.TagsAttribute(),
1488+
},
1489+
}
1490+
}
1491+
diff --git a/internal/service/workspacesweb/data_protection_settings.go b/internal/service/workspacesweb/data_protection_settings.go
1492+
index f1286e65ec..8a60f605d0 100644
1493+
--- a/internal/service/workspacesweb/data_protection_settings.go
1494+
+++ b/internal/service/workspacesweb/data_protection_settings.go
1495+
@@ -93,7 +93,7 @@ func (r *dataProtectionSettingsResource) Schema(ctx context.Context, request res
1496+
},
1497+
},
1498+
names.AttrTags: tftags.TagsAttribute(),
1499+
- names.AttrTagsAll: tftags.TagsAttributeComputedOnly(),
1500+
+ names.AttrTagsAll: tftags.TagsAttribute(),
1501+
},
1502+
Blocks: map[string]schema.Block{
1503+
"inline_redaction_configuration": schema.ListNestedBlock{
1504+
diff --git a/internal/service/workspacesweb/ip_access_settings.go b/internal/service/workspacesweb/ip_access_settings.go
1505+
index 082a73cf2f..f6d93d3e9e 100644
1506+
--- a/internal/service/workspacesweb/ip_access_settings.go
1507+
+++ b/internal/service/workspacesweb/ip_access_settings.go
1508+
@@ -92,7 +92,7 @@ func (r *ipAccessSettingsResource) Schema(ctx context.Context, request resource.
1509+
},
1510+
},
1511+
names.AttrTags: tftags.TagsAttribute(),
1512+
- names.AttrTagsAll: tftags.TagsAttributeComputedOnly(),
1513+
+ names.AttrTagsAll: tftags.TagsAttribute(),
1514+
},
1515+
Blocks: map[string]schema.Block{
1516+
"ip_rule": schema.ListNestedBlock{
1517+
diff --git a/internal/service/workspacesweb/network_settings.go b/internal/service/workspacesweb/network_settings.go
1518+
index 432fef097f..ce4a47ec03 100644
1519+
--- a/internal/service/workspacesweb/network_settings.go
1520+
+++ b/internal/service/workspacesweb/network_settings.go
1521+
@@ -79,7 +79,7 @@ func (r *networkSettingsResource) Schema(ctx context.Context, request resource.S
1522+
},
1523+
},
1524+
names.AttrTags: tftags.TagsAttribute(),
1525+
- names.AttrTagsAll: tftags.TagsAttributeComputedOnly(),
1526+
+ names.AttrTagsAll: tftags.TagsAttribute(),
1527+
names.AttrVPCID: schema.StringAttribute{
1528+
Required: true,
1529+
},
1530+
diff --git a/internal/service/workspacesweb/user_access_logging_settings.go b/internal/service/workspacesweb/user_access_logging_settings.go
1531+
index aa9b5a1abb..21cdb47b72 100644
1532+
--- a/internal/service/workspacesweb/user_access_logging_settings.go
1533+
+++ b/internal/service/workspacesweb/user_access_logging_settings.go
1534+
@@ -58,7 +58,7 @@ func (r *userAccessLoggingSettingsResource) Schema(ctx context.Context, request
1535+
Required: true,
1536+
},
1537+
names.AttrTags: tftags.TagsAttribute(),
1538+
- names.AttrTagsAll: tftags.TagsAttributeComputedOnly(),
1539+
+ names.AttrTagsAll: tftags.TagsAttribute(),
1540+
"user_access_logging_settings_arn": schema.StringAttribute{
1541+
Computed: true,
1542+
PlanModifiers: []planmodifier.String{
1543+
diff --git a/internal/service/workspacesweb/user_settings.go b/internal/service/workspacesweb/user_settings.go
1544+
index 1b9ce94e67..061ccc1aa9 100644
1545+
--- a/internal/service/workspacesweb/user_settings.go
1546+
+++ b/internal/service/workspacesweb/user_settings.go
1547+
@@ -110,7 +110,7 @@ func (r *userSettingsResource) Schema(ctx context.Context, request resource.Sche
1548+
Required: true,
1549+
},
1550+
names.AttrTags: tftags.TagsAttribute(),
1551+
- names.AttrTagsAll: tftags.TagsAttributeComputedOnly(),
1552+
+ names.AttrTagsAll: tftags.TagsAttribute(),
1553+
"upload_allowed": schema.StringAttribute{
1554+
CustomType: fwtypes.StringEnumType[awstypes.EnabledType](),
1555+
Required: true,

0 commit comments

Comments
 (0)