Skip to content

Commit d016bb1

Browse files
authored
Upgrade terraform-provider-aws to v6.34.0 (#6207)
This PR was generated via `$ upgrade-provider pulumi/pulumi-aws --kind=provider --target-bridge-version=latest --target-version=6.34.0 --allow-missing-docs=false`. --- - Upgrading terraform-provider-aws from 6.33.0 to 6.34.0. Fixes #6201
1 parent e7bf484 commit d016bb1

387 files changed

Lines changed: 76809 additions & 46371 deletions

File tree

Some content is hidden

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

examples/go.mod

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

examples/go.sum

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

patches/0001-De-deprecate-bucket_object.patch

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ Subject: [PATCH] De-deprecate bucket_object
55

66

77
diff --git a/internal/service/s3/bucket_object.go b/internal/service/s3/bucket_object.go
8-
index 60a9cbe4556..8d6e04534a3 100644
8+
index 7efe093c299..01445edca4f 100644
99
--- a/internal/service/s3/bucket_object.go
1010
+++ b/internal/service/s3/bucket_object.go
11-
@@ -70,7 +70,7 @@ func resourceBucketObject() *schema.Resource {
11+
@@ -69,7 +69,7 @@ func resourceBucketObject() *schema.Resource {
1212
Computed: true,
1313
},
1414
names.AttrBucket: {
@@ -17,7 +17,7 @@ index 60a9cbe4556..8d6e04534a3 100644
1717
Type: schema.TypeString,
1818
Required: true,
1919
ForceNew: true,
20-
@@ -127,7 +127,7 @@ func resourceBucketObject() *schema.Resource {
20+
@@ -126,7 +126,7 @@ func resourceBucketObject() *schema.Resource {
2121
Default: false,
2222
},
2323
names.AttrKey: {
@@ -26,7 +26,7 @@ index 60a9cbe4556..8d6e04534a3 100644
2626
Type: schema.TypeString,
2727
Required: true,
2828
ForceNew: true,
29-
@@ -193,7 +193,9 @@ func resourceBucketObject() *schema.Resource {
29+
@@ -192,7 +192,9 @@ func resourceBucketObject() *schema.Resource {
3030
},
3131
},
3232

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 cf84d70d4f5..06a4b4731ae 100644
10+
index 2508363cca3..19297652355 100644
1111
--- a/internal/service/autoscaling/launch_configuration.go
1212
+++ b/internal/service/autoscaling/launch_configuration.go
1313
@@ -54,7 +54,8 @@ func resourceLaunchConfiguration() *schema.Resource {

patches/0007-Catch-cty-panic-in-new-resourceTopicSubscriptionCust.patch

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@ Subject: [PATCH] Catch cty panic in new
77
The root cause is not fully understood yet but this might unblock us.
88

99
diff --git a/internal/service/sns/topic_subscription.go b/internal/service/sns/topic_subscription.go
10-
index 5d12a207cea..fa4a39518b3 100644
10+
index 2533abb3dc2..3349a024194 100644
1111
--- a/internal/service/sns/topic_subscription.go
1212
+++ b/internal/service/sns/topic_subscription.go
13-
@@ -612,9 +612,11 @@ func normalizeTopicSubscriptionDeliveryPolicy(policy string) ([]byte, error) {
13+
@@ -608,9 +608,11 @@ func normalizeTopicSubscriptionDeliveryPolicy(policy string) ([]byte, error) {
1414

1515
func resourceTopicSubscriptionCustomizeDiff(_ context.Context, diff *schema.ResourceDiff, _ any) error {
1616
hasPolicy := diff.Get("filter_policy").(string) != ""

patches/0008-Revert-Update-endpointHashIPAddress.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ This commit causes never-converging diffs due to incorrect use of
99
a computed property in hashing.
1010

1111
diff --git a/internal/service/route53resolver/endpoint.go b/internal/service/route53resolver/endpoint.go
12-
index 23e8ca41012..9731cb94133 100644
12+
index b29de6b79aa..74322d35676 100644
1313
--- a/internal/service/route53resolver/endpoint.go
1414
+++ b/internal/service/route53resolver/endpoint.go
1515
@@ -465,7 +465,7 @@ func waitEndpointDeleted(ctx context.Context, conn *route53resolver.Client, id s

patches/0009-Change-default-descriptions-to-Managed-by-Pulumi.patch

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ index 55f8a970767..71d670839f8 100644
7070
names.AttrName: {
7171
Type: schema.TypeString,
7272
diff --git a/internal/service/ec2/vpc_security_group.go b/internal/service/ec2/vpc_security_group.go
73-
index a8807bb5e84..9d3478cfb5f 100644
73+
index 68c5c178d80..45d4d940cf8 100644
7474
--- a/internal/service/ec2/vpc_security_group.go
7575
+++ b/internal/service/ec2/vpc_security_group.go
7676
@@ -71,7 +71,7 @@ func resourceSecurityGroup() *schema.Resource {
@@ -122,7 +122,7 @@ index 26fdaa0486d..9e181066e6c 100644
122122
"hls_ingest": {
123123
Type: schema.TypeList,
124124
diff --git a/internal/service/memorydb/cluster.go b/internal/service/memorydb/cluster.go
125-
index 81669ef3933..4d438fa01a9 100644
125+
index 46df7b330c5..b4bcd2fcbde 100644
126126
--- a/internal/service/memorydb/cluster.go
127127
+++ b/internal/service/memorydb/cluster.go
128128
@@ -79,7 +79,7 @@ func resourceCluster() *schema.Resource {
@@ -135,7 +135,7 @@ index 81669ef3933..4d438fa01a9 100644
135135
"engine_patch_version": {
136136
Type: schema.TypeString,
137137
diff --git a/internal/service/memorydb/parameter_group.go b/internal/service/memorydb/parameter_group.go
138-
index 2366b6a5c23..aceb572bcf9 100644
138+
index e386a7ef140..d06f2f36009 100644
139139
--- a/internal/service/memorydb/parameter_group.go
140140
+++ b/internal/service/memorydb/parameter_group.go
141141
@@ -53,7 +53,7 @@ func resourceParameterGroup() *schema.Resource {
@@ -148,7 +148,7 @@ index 2366b6a5c23..aceb572bcf9 100644
148148
names.AttrFamily: {
149149
Type: schema.TypeString,
150150
diff --git a/internal/service/memorydb/subnet_group.go b/internal/service/memorydb/subnet_group.go
151-
index d057970ab64..a3737fd5b86 100644
151+
index 3f2b826344b..7c72b1605cb 100644
152152
--- a/internal/service/memorydb/subnet_group.go
153153
+++ b/internal/service/memorydb/subnet_group.go
154154
@@ -48,7 +48,7 @@ func resourceSubnetGroup() *schema.Resource {

patches/0015-Allow-creating-lambdas-without-code-related-properti.patch

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ Subject: [PATCH] Allow creating lambdas without code related properties
55

66

77
diff --git a/internal/service/lambda/function.go b/internal/service/lambda/function.go
8-
index eea9ae4d262..32187e5599e 100644
8+
index 129dcd71b7d..b28c35e40ad 100644
99
--- a/internal/service/lambda/function.go
1010
+++ b/internal/service/lambda/function.go
11-
@@ -237,9 +237,9 @@ func resourceFunction() *schema.Resource {
11+
@@ -235,9 +235,9 @@ func resourceFunction() *schema.Resource {
1212
},
1313
},
1414
"filename": {
@@ -21,7 +21,7 @@ index eea9ae4d262..32187e5599e 100644
2121
},
2222
"function_name": {
2323
Type: schema.TypeString,
24-
@@ -300,9 +300,9 @@ func resourceFunction() *schema.Resource {
24+
@@ -298,9 +298,9 @@ func resourceFunction() *schema.Resource {
2525
},
2626
},
2727
"image_uri": {
@@ -34,7 +34,7 @@ index eea9ae4d262..32187e5599e 100644
3434
},
3535
"invoke_arn": {
3636
Type: schema.TypeString,
37-
@@ -423,10 +423,10 @@ func resourceFunction() *schema.Resource {
37+
@@ -421,10 +421,10 @@ func resourceFunction() *schema.Resource {
3838
ValidateDiagFunc: enum.Validate[awstypes.Runtime](),
3939
},
4040
names.AttrS3Bucket: {

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

Lines changed: 3 additions & 3 deletions
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 ac488bddd74..9aaabbee7ed 100644
8+
index 7977d1a10e9..95aaf5594bb 100644
99
--- a/internal/service/sns/topic.go
1010
+++ b/internal/service/sns/topic.go
1111
@@ -12,6 +12,7 @@ import (
@@ -16,7 +16,7 @@ index ac488bddd74..9aaabbee7ed 100644
1616
"time"
1717

1818
"github.com/YakDriver/regexache"
19-
@@ -235,6 +236,12 @@ func resourceTopic() *schema.Resource {
19+
@@ -233,6 +234,12 @@ func resourceTopic() *schema.Resource {
2020
}
2121
}
2222

@@ -29,7 +29,7 @@ index ac488bddd74..9aaabbee7ed 100644
2929
func resourceTopicCreate(ctx context.Context, d *schema.ResourceData, meta any) diag.Diagnostics {
3030
var diags diag.Diagnostics
3131
conn := meta.(*conns.AWSClient).SNSClient(ctx)
32-
@@ -263,6 +270,28 @@ func resourceTopicCreate(ctx context.Context, d *schema.ResourceData, meta any)
32+
@@ -261,6 +268,28 @@ func resourceTopicCreate(ctx context.Context, d *schema.ResourceData, meta any)
3333
delete(attributes, topicAttributeNameFIFOThroughputScope)
3434
}
3535

patches/0020-Parallelize-Lambda-Function-resource-operations.patch

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,18 +10,18 @@ We think this was an optimization for a special edge case that
1010
drastically worsens the UX for the majority of users.
1111

1212
diff --git a/internal/service/lambda/function.go b/internal/service/lambda/function.go
13-
index 32187e5599e..62582d5855a 100644
13+
index b28c35e40ad..67ee9f305a5 100644
1414
--- a/internal/service/lambda/function.go
1515
+++ b/internal/service/lambda/function.go
16-
@@ -39,7 +39,6 @@ import (
16+
@@ -38,7 +38,6 @@ import (
1717

1818
const (
1919
FunctionVersionLatest = "$LATEST"
2020
- mutexKey = `aws_lambda_function`
2121
listVersionsMaxItems = 10000
2222
)
2323

24-
@@ -613,11 +612,6 @@ func resourceFunctionCreate(ctx context.Context, d *schema.ResourceData, meta an
24+
@@ -611,11 +610,6 @@ func resourceFunctionCreate(ctx context.Context, d *schema.ResourceData, meta an
2525
}
2626

2727
if v, ok := d.GetOk("filename"); ok {
@@ -33,7 +33,7 @@ index 32187e5599e..62582d5855a 100644
3333
zipFile, err := tfio.ReadFileContents(v.(string))
3434

3535
if err != nil {
36-
@@ -1155,11 +1149,6 @@ func resourceFunctionUpdate(ctx context.Context, d *schema.ResourceData, meta an
36+
@@ -995,11 +989,6 @@ func resourceFunctionUpdate(ctx context.Context, d *schema.ResourceData, meta an
3737
}
3838

3939
if v, ok := d.GetOk("filename"); ok {

0 commit comments

Comments
 (0)