Skip to content

Commit 38337cb

Browse files
t0yv0t0yv0
authored
upstream v5.99.1 (#5576)
Upgrades upstream to v5.99.1 Fixes #5569 **New resources**: ``` notifications/channelAssociation.ChannelAssociation notifications/contactsEmailContact.ContactsEmailContact notifications/eventRule.EventRule notifications/notificationConfiguration.NotificationConfiguration notifications/notificationHub.NotificationHub quicksight/accountSettings.AccountSettings workspaces/webBrowserSettings.WebBrowserSettings workspaces/webNetworkSettings.WebNetworkSettings workspaces/webUserSettings.WebUserSettings ```
1 parent 198dd59 commit 38337cb

File tree

707 files changed

+32105
-1561
lines changed

Some content is hidden

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

707 files changed

+32105
-1561
lines changed

‎examples/go.mod‎

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

‎examples/go.sum‎

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

‎patches/0008-Workaround-Autoscaling-launch_configuration-associat.patch‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ Subject: [PATCH] Workaround Autoscaling launch_configuration
77
- Disable computation of property until fixed.
88

99
diff --git a/internal/service/autoscaling/launch_configuration.go b/internal/service/autoscaling/launch_configuration.go
10-
index 371d056e19..e8b98161aa 100644
10+
index ff807fcd1a..8172c43228 100644
1111
--- a/internal/service/autoscaling/launch_configuration.go
1212
+++ b/internal/service/autoscaling/launch_configuration.go
1313
@@ -52,7 +52,8 @@ func resourceLaunchConfiguration() *schema.Resource {

‎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,41 +392,14 @@ index 884f83084b..0856302c30 100644
392392
recovery_window_in_days = 0
393393
}
394394

395-
@@ -952,18 +954,18 @@ resource "aws_secretsmanager_secret_version" "test2" {
395+
@@ -952,46 +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))
427400
-}
428401
-
429-
-func testAccProxyConfig_tags2(rName, tagKey1, tagValue1, tagKey2, tagValue2 string) string {
402+
-func testAccProxyConfig_tags1(rName, tagKey1, tagValue1 string) string {
430403
- return acctest.ConfigCompose(testAccProxyConfig_base(rName), fmt.Sprintf(`
431404
-resource "aws_db_proxy" "test" {
432405
- depends_on = [
@@ -449,9 +422,36 @@ index 884f83084b..0856302c30 100644
449422
-
450423
- tags = {
451424
- %[2]q = %[3]q
452-
- %[4]q = %[5]q
453425
- }
454426
-}
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/0053-Speed-up-providerlint-by-re-using-build-cache-and-ig.patch‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@ Subject: [PATCH] Speed up providerlint by re-using build cache and ignoring
66

77

88
diff --git a/GNUmakefile b/GNUmakefile
9-
index b11b86879c..7bba29bffd 100644
9+
index 4bb415c3c0..c9be33e6cf 100644
1010
--- a/GNUmakefile
1111
+++ b/GNUmakefile
12-
@@ -347,9 +347,10 @@ prereq-go: ## If $(GO_VER) is not installed, install it
12+
@@ -357,9 +357,10 @@ prereq-go: ## If $(GO_VER) is not installed, install it
1313

1414
provider-lint: ## [CI] ProviderLint Checks / providerlint
1515
@echo "make: ProviderLint Checks / providerlint..."

‎patches/0060-Patch-workspacesweb-etc-tags_all-attributes.patch‎

Lines changed: 84 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,84 @@
1+
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
2+
From: Anton Tayanovskyy <[email protected]>
3+
Date: Mon, 2 Jun 2025 13:51:55 -0400
4+
Subject: [PATCH] Patch workspacesweb etc tags_all attributes
5+
6+
7+
diff --git a/internal/service/notifications/notification_configuration.go b/internal/service/notifications/notification_configuration.go
8+
index 7777c71500..b809182b00 100644
9+
--- a/internal/service/notifications/notification_configuration.go
10+
+++ b/internal/service/notifications/notification_configuration.go
11+
@@ -71,7 +71,7 @@ func (r *notificationConfigurationResource) Schema(ctx context.Context, request
12+
},
13+
},
14+
names.AttrTags: tftags.TagsAttribute(),
15+
- names.AttrTagsAll: tftags.TagsAttributeComputedOnly(),
16+
+ names.AttrTagsAll: tftags.TagsAttribute(),
17+
},
18+
}
19+
}
20+
diff --git a/internal/service/notificationscontacts/email_contact.go b/internal/service/notificationscontacts/email_contact.go
21+
index 7339d1d7a0..0724844b46 100644
22+
--- a/internal/service/notificationscontacts/email_contact.go
23+
+++ b/internal/service/notificationscontacts/email_contact.go
24+
@@ -67,7 +67,7 @@ func (r *emailContactResource) Schema(ctx context.Context, request resource.Sche
25+
},
26+
},
27+
names.AttrTags: tftags.TagsAttribute(),
28+
- names.AttrTagsAll: tftags.TagsAttributeComputedOnly(),
29+
+ names.AttrTagsAll: tftags.TagsAttribute(),
30+
},
31+
}
32+
}
33+
diff --git a/internal/service/verifiedpermissions/policy_store.go b/internal/service/verifiedpermissions/policy_store.go
34+
index 6ac7fcb7a3..6c098b6f70 100644
35+
--- a/internal/service/verifiedpermissions/policy_store.go
36+
+++ b/internal/service/verifiedpermissions/policy_store.go
37+
@@ -63,7 +63,7 @@ func (r *resourcePolicyStore) Schema(ctx context.Context, request resource.Schem
38+
},
39+
},
40+
names.AttrTags: tftags.TagsAttribute(),
41+
- names.AttrTagsAll: tftags.TagsAttributeComputedOnly(),
42+
+ names.AttrTagsAll: tftags.TagsAttribute(),
43+
},
44+
Blocks: map[string]schema.Block{
45+
"validation_settings": schema.ListNestedBlock{
46+
diff --git a/internal/service/workspacesweb/browser_settings.go b/internal/service/workspacesweb/browser_settings.go
47+
index 940e8e952d..f6cd293311 100644
48+
--- a/internal/service/workspacesweb/browser_settings.go
49+
+++ b/internal/service/workspacesweb/browser_settings.go
50+
@@ -81,7 +81,7 @@ func (r *browserSettingsResource) Schema(ctx context.Context, request resource.S
51+
},
52+
},
53+
names.AttrTags: tftags.TagsAttribute(),
54+
- names.AttrTagsAll: tftags.TagsAttributeComputedOnly(),
55+
+ names.AttrTagsAll: tftags.TagsAttribute(),
56+
},
57+
}
58+
}
59+
diff --git a/internal/service/workspacesweb/network_settings.go b/internal/service/workspacesweb/network_settings.go
60+
index 432fef097f..ce4a47ec03 100644
61+
--- a/internal/service/workspacesweb/network_settings.go
62+
+++ b/internal/service/workspacesweb/network_settings.go
63+
@@ -79,7 +79,7 @@ func (r *networkSettingsResource) Schema(ctx context.Context, request resource.S
64+
},
65+
},
66+
names.AttrTags: tftags.TagsAttribute(),
67+
- names.AttrTagsAll: tftags.TagsAttributeComputedOnly(),
68+
+ names.AttrTagsAll: tftags.TagsAttribute(),
69+
names.AttrVPCID: schema.StringAttribute{
70+
Required: true,
71+
},
72+
diff --git a/internal/service/workspacesweb/user_settings.go b/internal/service/workspacesweb/user_settings.go
73+
index 1b9ce94e67..061ccc1aa9 100644
74+
--- a/internal/service/workspacesweb/user_settings.go
75+
+++ b/internal/service/workspacesweb/user_settings.go
76+
@@ -110,7 +110,7 @@ func (r *userSettingsResource) Schema(ctx context.Context, request resource.Sche
77+
Required: true,
78+
},
79+
names.AttrTags: tftags.TagsAttribute(),
80+
- names.AttrTagsAll: tftags.TagsAttributeComputedOnly(),
81+
+ names.AttrTagsAll: tftags.TagsAttribute(),
82+
"upload_allowed": schema.StringAttribute{
83+
CustomType: fwtypes.StringEnumType[awstypes.EnabledType](),
84+
Required: true,

‎provider/cmd/pulumi-resource-aws/bridge-metadata.json‎

Lines changed: 100 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -176,6 +176,9 @@
176176
"ipam_pools": {
177177
"maxItemsOne": true
178178
},
179+
"minimum_load_balancer_capacity": {
180+
"maxItemsOne": true
181+
},
179182
"security_groups": {
180183
"maxItemsOne": false
181184
},
@@ -18509,6 +18512,9 @@
1850918512
"ipam_pools": {
1851018513
"maxItemsOne": true
1851118514
},
18515+
"minimum_load_balancer_capacity": {
18516+
"maxItemsOne": true
18517+
},
1851218518
"security_groups": {
1851318519
"maxItemsOne": false
1851418520
},
@@ -27076,6 +27082,31 @@
2707627082
"current": "aws:networkmonitor/probe:Probe",
2707727083
"majorVersion": 6
2707827084
},
27085+
"aws_notifications_channel_association": {
27086+
"current": "aws:notifications/channelAssociation:ChannelAssociation",
27087+
"majorVersion": 6
27088+
},
27089+
"aws_notifications_event_rule": {
27090+
"current": "aws:notifications/eventRule:EventRule",
27091+
"majorVersion": 6,
27092+
"fields": {
27093+
"regions": {
27094+
"maxItemsOne": false
27095+
}
27096+
}
27097+
},
27098+
"aws_notifications_notification_configuration": {
27099+
"current": "aws:notifications/notificationConfiguration:NotificationConfiguration",
27100+
"majorVersion": 6
27101+
},
27102+
"aws_notifications_notification_hub": {
27103+
"current": "aws:notifications/notificationHub:NotificationHub",
27104+
"majorVersion": 6
27105+
},
27106+
"aws_notificationscontacts_email_contact": {
27107+
"current": "aws:notifications/contactsEmailContact:ContactsEmailContact",
27108+
"majorVersion": 6
27109+
},
2707927110
"aws_oam_link": {
2708027111
"current": "aws:oam/link:Link",
2708127112
"majorVersion": 6,
@@ -28723,6 +28754,10 @@
2872328754
}
2872428755
}
2872528756
},
28757+
"aws_quicksight_account_settings": {
28758+
"current": "aws:quicksight/accountSettings:AccountSettings",
28759+
"majorVersion": 6
28760+
},
2872628761
"aws_quicksight_account_subscription": {
2872728762
"current": "aws:quicksight/accountSubscription:AccountSubscription",
2872828763
"majorVersion": 6,
@@ -226354,6 +226389,62 @@
226354226389
}
226355226390
}
226356226391
},
226392+
"aws_workspacesweb_browser_settings": {
226393+
"current": "aws:workspaces/webBrowserSettings:WebBrowserSettings",
226394+
"majorVersion": 6,
226395+
"fields": {
226396+
"associated_portal_arns": {
226397+
"maxItemsOne": false
226398+
}
226399+
}
226400+
},
226401+
"aws_workspacesweb_network_settings": {
226402+
"current": "aws:workspaces/webNetworkSettings:WebNetworkSettings",
226403+
"majorVersion": 6,
226404+
"fields": {
226405+
"associated_portal_arns": {
226406+
"maxItemsOne": false
226407+
},
226408+
"security_group_ids": {
226409+
"maxItemsOne": false
226410+
},
226411+
"subnet_ids": {
226412+
"maxItemsOne": false
226413+
}
226414+
}
226415+
},
226416+
"aws_workspacesweb_user_settings": {
226417+
"current": "aws:workspaces/webUserSettings:WebUserSettings",
226418+
"majorVersion": 6,
226419+
"fields": {
226420+
"associated_portal_arns": {
226421+
"maxItemsOne": false
226422+
},
226423+
"cookie_synchronization_configuration": {
226424+
"maxItemsOne": true,
226425+
"elem": {
226426+
"fields": {
226427+
"allowlist": {
226428+
"maxItemsOne": false
226429+
},
226430+
"blocklist": {
226431+
"maxItemsOne": false
226432+
}
226433+
}
226434+
}
226435+
},
226436+
"toolbar_configuration": {
226437+
"maxItemsOne": true,
226438+
"elem": {
226439+
"fields": {
226440+
"hidden_toolbar_items": {
226441+
"maxItemsOne": false
226442+
}
226443+
}
226444+
}
226445+
}
226446+
}
226447+
},
226357226448
"aws_xray_encryption_config": {
226358226449
"current": "aws:xray/encryptionConfig:EncryptionConfig",
226359226450
"majorVersion": 6
@@ -282291,6 +282382,11 @@
282291282382
"aws:networkmanager/vpcAttachment:VpcAttachment": 0,
282292282383
"aws:networkmonitor/monitor:Monitor": 1,
282293282384
"aws:networkmonitor/probe:Probe": 1,
282385+
"aws:notifications/channelAssociation:ChannelAssociation": 1,
282386+
"aws:notifications/contactsEmailContact:ContactsEmailContact": 1,
282387+
"aws:notifications/eventRule:EventRule": 1,
282388+
"aws:notifications/notificationConfiguration:NotificationConfiguration": 1,
282389+
"aws:notifications/notificationHub:NotificationHub": 1,
282294282390
"aws:oam/link:Link": 0,
282295282391
"aws:oam/sink:Sink": 0,
282296282392
"aws:oam/sinkPolicy:SinkPolicy": 0,
@@ -282355,6 +282451,7 @@
282355282451
"aws:qbusiness/application:Application": 1,
282356282452
"aws:qldb/ledger:Ledger": 0,
282357282453
"aws:qldb/stream:Stream": 0,
282454+
"aws:quicksight/accountSettings:AccountSettings": 1,
282358282455
"aws:quicksight/accountSubscription:AccountSubscription": 0,
282359282456
"aws:quicksight/analysis:Analysis": 0,
282360282457
"aws:quicksight/dashboard:Dashboard": 0,
@@ -282803,6 +282900,9 @@
282803282900
"aws:workspaces/connectionAlias:ConnectionAlias": 1,
282804282901
"aws:workspaces/directory:Directory": 0,
282805282902
"aws:workspaces/ipGroup:IpGroup": 0,
282903+
"aws:workspaces/webBrowserSettings:WebBrowserSettings": 1,
282904+
"aws:workspaces/webNetworkSettings:WebNetworkSettings": 1,
282905+
"aws:workspaces/webUserSettings:WebUserSettings": 1,
282806282906
"aws:workspaces/workspace:Workspace": 0,
282807282907
"aws:xray/encryptionConfig:EncryptionConfig": 0,
282808282908
"aws:xray/group:Group": 0,

‎provider/cmd/pulumi-resource-aws/runtime-bridge-metadata.json‎

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)