Skip to content

Commit 24650f3

Browse files
guineveresaengerguineveresaenger
authored
Upgrade terraform-provider-aws to v6.10.0 (#5778)
This PR was generated via `$ upgrade-provider pulumi/pulumi-aws`. --- - Upgrading terraform-provider-aws from 6.9.0 to 6.10.0. Fixes #5769 - Upgrading pulumi-terraform-bridge from v3.111.0 to v3.112.0.
1 parent e56fefc commit 24650f3

File tree

167 files changed

+6221
-2435
lines changed

Some content is hidden

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

167 files changed

+6221
-2435
lines changed

‎examples/go.mod‎

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

‎examples/go.sum‎

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

‎patches/0003-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 ff807fcd1a..8172c43228 100644
10+
index e3d66c4e7e..091a07c9e4 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/0009-Change-default-descriptions-to-Managed-by-Pulumi.patch‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ index 5397965c94..698aac72ea 100644
8383
},
8484
"egress": securityGroupRuleSetNestedBlock,
8585
diff --git a/internal/service/elasticache/parameter_group.go b/internal/service/elasticache/parameter_group.go
86-
index 6111d73148..0e0313b090 100644
86+
index a13e4addce..f2936b7076 100644
8787
--- a/internal/service/elasticache/parameter_group.go
8888
+++ b/internal/service/elasticache/parameter_group.go
8989
@@ -50,7 +50,7 @@ func resourceParameterGroup() *schema.Resource {
@@ -174,7 +174,7 @@ index 5d4d3b06a1..10c61ec591 100644
174174
names.AttrFamily: {
175175
Type: schema.TypeString,
176176
diff --git a/internal/service/neptune/parameter_group.go b/internal/service/neptune/parameter_group.go
177-
index 5ff105eec1..b67e6b51ea 100644
177+
index 7fa8c36e68..da48a33379 100644
178178
--- a/internal/service/neptune/parameter_group.go
179179
+++ b/internal/service/neptune/parameter_group.go
180180
@@ -54,7 +54,7 @@ func resourceParameterGroup() *schema.Resource {
@@ -200,7 +200,7 @@ index d756af75db..d448de5134 100644
200200
names.AttrName: {
201201
Type: schema.TypeString,
202202
diff --git a/internal/service/rds/cluster_parameter_group.go b/internal/service/rds/cluster_parameter_group.go
203-
index 956c92fe3c..3ffe853168 100644
203+
index 4c55067d08..6dcade3a40 100644
204204
--- a/internal/service/rds/cluster_parameter_group.go
205205
+++ b/internal/service/rds/cluster_parameter_group.go
206206
@@ -50,7 +50,7 @@ func resourceClusterParameterGroup() *schema.Resource {
@@ -213,7 +213,7 @@ index 956c92fe3c..3ffe853168 100644
213213
names.AttrFamily: {
214214
Type: schema.TypeString,
215215
diff --git a/internal/service/rds/option_group.go b/internal/service/rds/option_group.go
216-
index a4d34b1c1d..abd15452c9 100644
216+
index 821c3163eb..ec05c24246 100644
217217
--- a/internal/service/rds/option_group.go
218218
+++ b/internal/service/rds/option_group.go
219219
@@ -126,7 +126,7 @@ func resourceOptionGroup() *schema.Resource {
@@ -226,7 +226,7 @@ index a4d34b1c1d..abd15452c9 100644
226226
names.AttrSkipDestroy: {
227227
Type: schema.TypeBool,
228228
diff --git a/internal/service/rds/parameter_group.go b/internal/service/rds/parameter_group.go
229-
index adc7878d25..8e77e7e330 100644
229+
index 100bd3bae4..d9d02aea42 100644
230230
--- a/internal/service/rds/parameter_group.go
231231
+++ b/internal/service/rds/parameter_group.go
232232
@@ -53,7 +53,7 @@ func resourceParameterGroup() *schema.Resource {
@@ -278,7 +278,7 @@ index 7117c8e061..0fa362cf95 100644
278278
names.AttrName: {
279279
Type: schema.TypeString,
280280
diff --git a/internal/service/route53/record.go b/internal/service/route53/record.go
281-
index 720fa883f3..5a8ac76bf6 100644
281+
index 10b95ec0c7..9dba775273 100644
282282
--- a/internal/service/route53/record.go
283283
+++ b/internal/service/route53/record.go
284284
@@ -360,7 +360,7 @@ func resourceRecordCreate(ctx context.Context, d *schema.ResourceData, meta any)

‎patches/0013-Disable-retry-for-KMS-access-denied-in-lambda.patch‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,10 +45,10 @@ index 0000000000..79867519db
4545
+ }
4646
+}
4747
diff --git a/internal/service/lambda/service_package_gen.go b/internal/service/lambda/service_package_gen.go
48-
index 3cdbabc991..65170d20cd 100644
48+
index 2b58c7182a..19b6f32bb1 100644
4949
--- a/internal/service/lambda/service_package_gen.go
5050
+++ b/internal/service/lambda/service_package_gen.go
51-
@@ -209,6 +209,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) (
51+
@@ -218,6 +218,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) (
5252
}
5353
},
5454
withExtraOptions(ctx, p, config),

‎patches/0017-non-idempotent-sns-topic-creation.patch‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ Subject: [PATCH] non-idempotent sns topic creation
55

66

77
diff --git a/internal/service/sns/topic.go b/internal/service/sns/topic.go
8-
index 7f39305a82..1b97fccfe4 100644
8+
index 67b01a1c90..75cfaf877a 100644
99
--- a/internal/service/sns/topic.go
1010
+++ b/internal/service/sns/topic.go
1111
@@ -10,6 +10,7 @@ import (

‎patches/0019-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
}

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

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12402,6 +12402,9 @@
1240212402
},
1240312403
"encryption_configuration": {
1240412404
"maxItemsOne": false
12405+
},
12406+
"image_tag_mutability_exclusion_filter": {
12407+
"maxItemsOne": false
1240512408
}
1240612409
}
1240712410
},
@@ -16576,6 +16579,9 @@
1657616579
"network_interface": {
1657716580
"maxItemsOne": false
1657816581
},
16582+
"primary_network_interface": {
16583+
"maxItemsOne": true
16584+
},
1657916585
"private_dns_name_options": {
1658016586
"maxItemsOne": true
1658116587
},
@@ -161907,6 +161913,9 @@
161907161913
"network_interface": {
161908161914
"maxItemsOne": false
161909161915
},
161916+
"primary_network_interface": {
161917+
"maxItemsOne": false
161918+
},
161910161919
"private_dns_name_options": {
161911161920
"maxItemsOne": true
161912161921
},
@@ -233866,6 +233875,9 @@
233866233875
"image_scanning_configuration": {
233867233876
"maxItemsOne": false
233868233877
},
233878+
"image_tag_mutability_exclusion_filter": {
233879+
"maxItemsOne": false
233880+
},
233869233881
"most_recent_image_tags": {
233870233882
"maxItemsOne": false
233871233883
}
@@ -233880,6 +233892,9 @@
233880233892
},
233881233893
"encryption_configuration": {
233882233894
"maxItemsOne": false
233895+
},
233896+
"image_tag_mutability_exclusion_filter": {
233897+
"maxItemsOne": false
233883233898
}
233884233899
}
233885233900
},

0 commit comments

Comments
 (0)