Skip to content

Commit ba976ea

Browse files
corymhallcorymhall
authored
Upgrade terraform-provider-aws to v6.5.0 (#5700)
fixes #5688
1 parent 9294eba commit ba976ea

File tree

338 files changed

+25113
-2254
lines changed

Some content is hidden

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

338 files changed

+25113
-2254
lines changed

‎examples/go.mod‎

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

‎examples/go.sum‎

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

‎examples/iam-policy-document/doc-go/go.sum‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -148,6 +148,7 @@ github.com/pulumi/appdash v0.0.0-20231130102222-75f619a67231 h1:vkHw5I/plNdTr435
148148
github.com/pulumi/appdash v0.0.0-20231130102222-75f619a67231/go.mod h1:murToZ2N9hNJzewjHBgfFdXhZKjY3z5cYC1VXk+lbFE=
149149
github.com/pulumi/esc v0.14.2 h1:xHpjJXzKs1hk/QPpgwe1Rmif3VWA0QcZ7jDvTFYX/jM=
150150
github.com/pulumi/esc v0.14.2/go.mod h1:0dNzCWIiRUmdfFrhHdeBzU4GiDPBhSfpeWDNApZwZ08=
151+
github.com/pulumi/pulumi-aws/sdk/v7 v7.0.0 h1:xEp48UEBpCfbY1e0bAILQQljrU7J3+rzgpDlCYIdynk=
151152
github.com/pulumi/pulumi-aws/sdk/v7 v7.0.0/go.mod h1:+H62XwnzP7yBbBt+ytoZNwcZjdjCJA7tRP5zNdcDuMw=
152153
github.com/pulumi/pulumi/sdk/v3 v3.175.0 h1:vANFQOpWjJFCuVBim7AfOM3hHnNHgjJ8NlVwG1qezd4=
153154
github.com/pulumi/pulumi/sdk/v3 v3.175.0/go.mod h1:AD2BrIxFG4wdCLCFODrOasXhURwrD/8hHrwBcjzyU9Y=

‎examples/webserver-go/go.sum‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -148,6 +148,7 @@ github.com/pulumi/appdash v0.0.0-20231130102222-75f619a67231 h1:vkHw5I/plNdTr435
148148
github.com/pulumi/appdash v0.0.0-20231130102222-75f619a67231/go.mod h1:murToZ2N9hNJzewjHBgfFdXhZKjY3z5cYC1VXk+lbFE=
149149
github.com/pulumi/esc v0.14.2 h1:xHpjJXzKs1hk/QPpgwe1Rmif3VWA0QcZ7jDvTFYX/jM=
150150
github.com/pulumi/esc v0.14.2/go.mod h1:0dNzCWIiRUmdfFrhHdeBzU4GiDPBhSfpeWDNApZwZ08=
151+
github.com/pulumi/pulumi-aws/sdk/v7 v7.0.0 h1:xEp48UEBpCfbY1e0bAILQQljrU7J3+rzgpDlCYIdynk=
151152
github.com/pulumi/pulumi-aws/sdk/v7 v7.0.0/go.mod h1:+H62XwnzP7yBbBt+ytoZNwcZjdjCJA7tRP5zNdcDuMw=
152153
github.com/pulumi/pulumi/sdk/v3 v3.175.0 h1:vANFQOpWjJFCuVBim7AfOM3hHnNHgjJ8NlVwG1qezd4=
153154
github.com/pulumi/pulumi/sdk/v3 v3.175.0/go.mod h1:AD2BrIxFG4wdCLCFODrOasXhURwrD/8hHrwBcjzyU9Y=

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ 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 5a33db78f5..13f5c0b92b 100644
9+
index c7b7bcf738..02b638e9fa 100644
1010
--- a/internal/service/wafv2/schemas.go
1111
+++ b/internal/service/wafv2/schemas.go
1212
@@ -56,15 +56,15 @@ func ruleGroupRootStatementSchema(level int) *schema.Schema {

‎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 d0fcaa8121..9b4ceb0880 100644
10+
index 6734506c5a..b98c7783f3 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+
@@ -610,9 +610,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/0009-Change-default-descriptions-to-Managed-by-Pulumi.patch‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -70,10 +70,10 @@ index 96abcbecf9..bfec91c499 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 90041e2c7e..745d363e63 100644
73+
index 9d9710cdc4..15b4d08469 100644
7474
--- a/internal/service/ec2/vpc_security_group.go
7575
+++ b/internal/service/ec2/vpc_security_group.go
76-
@@ -69,7 +69,7 @@ func resourceSecurityGroup() *schema.Resource {
76+
@@ -68,7 +68,7 @@ func resourceSecurityGroup() *schema.Resource {
7777
Type: schema.TypeString,
7878
Optional: true,
7979
ForceNew: true,
@@ -278,10 +278,10 @@ 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 b88a844ac1..280ef73af5 100644
281+
index 720fa883f3..5a8ac76bf6 100644
282282
--- a/internal/service/route53/record.go
283283
+++ b/internal/service/route53/record.go
284-
@@ -438,7 +438,7 @@ func resourceRecordCreate(ctx context.Context, d *schema.ResourceData, meta any)
284+
@@ -360,7 +360,7 @@ func resourceRecordCreate(ctx context.Context, d *schema.ResourceData, meta any)
285285
ResourceRecordSet: expandResourceRecordSet(d, aws.ToString(zoneRecord.HostedZone.Name)),
286286
},
287287
},
@@ -290,7 +290,7 @@ index b88a844ac1..280ef73af5 100644
290290
},
291291
HostedZoneId: aws.String(cleanZoneID(aws.ToString(zoneRecord.HostedZone.Id))),
292292
}
293-
@@ -748,7 +748,7 @@ func resourceRecordUpdate(ctx context.Context, d *schema.ResourceData, meta any)
293+
@@ -662,7 +662,7 @@ func resourceRecordUpdate(ctx context.Context, d *schema.ResourceData, meta any)
294294
ResourceRecordSet: expandResourceRecordSet(d, aws.ToString(zoneRecord.HostedZone.Name)),
295295
},
296296
},
@@ -299,7 +299,7 @@ index b88a844ac1..280ef73af5 100644
299299
},
300300
HostedZoneId: aws.String(cleanZoneID(aws.ToString(zoneRecord.HostedZone.Id))),
301301
}
302-
@@ -815,7 +815,7 @@ func resourceRecordDelete(ctx context.Context, d *schema.ResourceData, meta any)
302+
@@ -720,7 +720,7 @@ func resourceRecordDelete(ctx context.Context, d *schema.ResourceData, meta any)
303303
ResourceRecordSet: rec,
304304
},
305305
},

‎patches/0011-Fix-elbv2-target-group-read-to-workaround-2517.patch‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ Subject: [PATCH] Fix elbv2 target group read to workaround #2517
55

66

77
diff --git a/internal/service/elbv2/target_group.go b/internal/service/elbv2/target_group.go
8-
index 27a7f5e3c9..08bf64d0e3 100644
8+
index 8a2b6c9920..4082d6490f 100644
99
--- a/internal/service/elbv2/target_group.go
1010
+++ b/internal/service/elbv2/target_group.go
11-
@@ -634,19 +634,19 @@ func resourceTargetGroupRead(ctx context.Context, d *schema.ResourceData, meta a
11+
@@ -633,19 +633,19 @@ func resourceTargetGroupRead(ctx context.Context, d *schema.ResourceData, meta a
1212
return sdkdiag.AppendErrorf(diags, "reading ELBv2 Target Group (%s) attributes: %s", d.Id(), err)
1313
}
1414

@@ -32,7 +32,7 @@ index 27a7f5e3c9..08bf64d0e3 100644
3232
return sdkdiag.AppendErrorf(diags, "setting target_health_state: %s", err)
3333
}
3434

35-
@@ -1518,3 +1518,13 @@ func targetGroupRuntimeValidation(d *schema.ResourceData, diags *diag.Diagnostic
35+
@@ -1517,3 +1517,13 @@ func targetGroupRuntimeValidation(d *schema.ResourceData, diags *diag.Diagnostic
3636
}
3737
}
3838
}

‎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 c7e6b298ad..f62e83f1be 100644
8+
index 25e7f38b11..f6047aefdf 100644
99
--- a/internal/service/sns/topic.go
1010
+++ b/internal/service/sns/topic.go
1111
@@ -10,6 +10,7 @@ import (
@@ -16,7 +16,7 @@ index c7e6b298ad..f62e83f1be 100644
1616
"time"
1717

1818
"github.com/YakDriver/regexache"
19-
@@ -265,6 +266,12 @@ func resourceTopic() *schema.Resource {
19+
@@ -263,6 +264,12 @@ func resourceTopic() *schema.Resource {
2020
}
2121
}
2222

@@ -29,7 +29,7 @@ index c7e6b298ad..f62e83f1be 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-
@@ -293,6 +300,28 @@ func resourceTopicCreate(ctx context.Context, d *schema.ResourceData, meta any)
32+
@@ -291,6 +298,28 @@ func resourceTopicCreate(ctx context.Context, d *schema.ResourceData, meta any)
3333
delete(attributes, topicAttributeNameFIFOThroughputScope)
3434
}
3535

‎patches/0025-Handle-cases-where-region-is-not-a-string.patch‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@ https://github.com/pulumi/pulumi-terraform-bridge/issues/2281. TF sets
99
not exist at all in `RawState` or it could be `nil`.
1010

1111
diff --git a/internal/provider/sdkv2/provider.go b/internal/provider/sdkv2/provider.go
12-
index e98d8fe5f9..def19143b6 100644
12+
index f6b44b7c2b..79fdfb07e0 100644
1313
--- a/internal/provider/sdkv2/provider.go
1414
+++ b/internal/provider/sdkv2/provider.go
15-
@@ -737,7 +737,9 @@ func (p *sdkProvider) initialize(ctx context.Context) (map[string]conns.ServiceP
15+
@@ -745,7 +745,9 @@ func (p *sdkProvider) initialize(ctx context.Context) (map[string]conns.ServiceP
1616

1717
if isRegionOverrideEnabled && getAttribute != nil {
1818
if region, ok := getAttribute(names.AttrRegion); ok {

0 commit comments

Comments
 (0)