Skip to content

Commit 3699cae

Browse files
Upgrade terraform-provider-aws to v5.89.0 (#5266)
This PR was generated via `$ upgrade-provider pulumi/pulumi-aws --kind=provider`. Plenty of manual changes: - Adjusted some strings in replacements.json to omit notes about write-only resources. - Removed the `fixUpVpclatticeResourceconfigurationExample` doc edit as it's fixed upstream. - Specified ComputeID for a few resources missing IDs - Adjusted `0002-Add-S3-legacy-bucket-to-resources.patch` to remove a deleted DiffCustomizer. The upstream PR claims this is now handled in "wrappers". - Adjusted `0027-Do-not-compute-tags_all-at-TF-level.patch` to remove the patch to the now deleted `SetTagsDiff` function. - Adjusted `0085-Remove-ephemeral-resources.patch` to remove patches to now deleted validators. - Added `0086-fix-import.patch` - this just deletes an import which is unused. - Added `0087-patch-tags-for-nepture-graph-and-rds-shard-group.patch` - this patches the `tags_all` attributes of two new resources. - Added `0088-patch-tagsAll-diff-wrapper.patch` - this patches the new wrapper tags handler in the same way the previous `SetTagsDiff` was patched. --- - Upgrading terraform-provider-aws from 5.88.0 to 5.89.0. Fixes #5251
1 parent be2becc commit 3699cae

File tree

322 files changed

+18724
-1323
lines changed

Some content is hidden

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

322 files changed

+18724
-1323
lines changed

examples/go.mod

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

examples/go.sum

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

patches/0002-Add-S3-legacy-bucket-to-resources.patch

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ scheme for registration: see
1414
https://github.com/hashicorp/terraform-provider-aws/pull/29717.
1515

1616
diff --git a/internal/provider/provider.go b/internal/provider/provider.go
17-
index ae5740506d..0c1b1e86ab 100644
17+
index 19c9cd7190..3ad50b93e8 100644
1818
--- a/internal/provider/provider.go
1919
+++ b/internal/provider/provider.go
2020
@@ -14,6 +14,8 @@ import (
@@ -39,10 +39,10 @@ index ae5740506d..0c1b1e86ab 100644
3939
provider.ConfigureContextFunc = func(ctx context.Context, d *schema.ResourceData) (interface{}, diag.Diagnostics) {
4040
diff --git a/internal/service/s3legacy/bucket_legacy.go b/internal/service/s3legacy/bucket_legacy.go
4141
new file mode 100644
42-
index 0000000000..cd2a293a73
42+
index 0000000000..1c19c2a4c1
4343
--- /dev/null
4444
+++ b/internal/service/s3legacy/bucket_legacy.go
45-
@@ -0,0 +1,3030 @@
45+
@@ -0,0 +1,3028 @@
4646
+package s3legacy
4747
+
4848
+import (
@@ -710,8 +710,6 @@ index 0000000000..cd2a293a73
710710
+ "tags": tftags.TagsSchema(),
711711
+ "tags_all": tftags.TagsSchemaTrulyComputed(),
712712
+ },
713-
+
714-
+ CustomizeDiff: verify.SetTagsDiff,
715713
+ }
716714
+}
717715
+

patches/0003-Marks-SSE-Configuration-as-Computed-for-Legacy-S3-Bu.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ appears in pulumi as `aws.s3.Bucket` and is likely the default version of
1010
the Bucket resource that users will use.
1111

1212
diff --git a/internal/service/s3legacy/bucket_legacy.go b/internal/service/s3legacy/bucket_legacy.go
13-
index cd2a293a73..b1dc400249 100644
13+
index 1c19c2a4c1..d3d589b04a 100644
1414
--- a/internal/service/s3legacy/bucket_legacy.go
1515
+++ b/internal/service/s3legacy/bucket_legacy.go
1616
@@ -572,6 +572,7 @@ func ResourceBucketLegacy() *schema.Resource {

patches/0004-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 535382eae7..cdb46cd777 100644
8+
index 6ebd16412c..53794a2d43 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+
@@ -66,7 +66,7 @@ func resourceBucketObject() *schema.Resource {
1212
Computed: true,
1313
},
1414
names.AttrBucket: {
@@ -17,7 +17,7 @@ index 535382eae7..cdb46cd777 100644
1717
Type: schema.TypeString,
1818
Required: true,
1919
ForceNew: true,
20-
@@ -127,7 +127,7 @@ func resourceBucketObject() *schema.Resource {
20+
@@ -123,7 +123,7 @@ func resourceBucketObject() *schema.Resource {
2121
Default: false,
2222
},
2323
names.AttrKey: {
@@ -26,7 +26,7 @@ index 535382eae7..cdb46cd777 100644
2626
Type: schema.TypeString,
2727
Required: true,
2828
ForceNew: true,
29-
@@ -193,7 +193,9 @@ func resourceBucketObject() *schema.Resource {
29+
@@ -189,7 +189,9 @@ func resourceBucketObject() *schema.Resource {
3030
},
3131
},
3232

patches/0006-Workaround-SSM-Parameter-tier-bug.patch

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@ Subject: [PATCH] Workaround SSM Parameter tier bug
77
- Disable diff suppression & counteractions
88

99
diff --git a/internal/service/ssm/parameter.go b/internal/service/ssm/parameter.go
10-
index cdd10c474f..1a37dd6a69 100644
10+
index e605c7ea1e..b5fccc0112 100644
1111
--- a/internal/service/ssm/parameter.go
1212
+++ b/internal/service/ssm/parameter.go
13-
@@ -106,15 +106,17 @@ func resourceParameter() *schema.Resource {
13+
@@ -102,15 +102,17 @@ func resourceParameter() *schema.Resource {
1414
names.AttrTags: tftags.TagsSchema(),
1515
names.AttrTagsAll: tftags.TagsSchemaComputed(),
1616
"tier": {
@@ -35,7 +35,7 @@ index cdd10c474f..1a37dd6a69 100644
3535
},
3636
},
3737
names.AttrType: {
38-
@@ -369,6 +371,14 @@ func resourceParameterUpdate(ctx context.Context, d *schema.ResourceData, meta i
38+
@@ -364,6 +366,14 @@ func resourceParameterUpdate(ctx context.Context, d *schema.ResourceData, meta i
3939
Value: aws.String(value),
4040
}
4141

patches/0007-Add-EKS-cluster-certificate_authorities-plural.patch

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ Subject: [PATCH] Add EKS cluster certificate_authorities (plural)
55

66

77
diff --git a/internal/service/eks/cluster.go b/internal/service/eks/cluster.go
8-
index c0f792399f..c2b5a975a9 100644
8+
index bcf8897c6f..421b97b5e0 100644
99
--- a/internal/service/eks/cluster.go
1010
+++ b/internal/service/eks/cluster.go
11-
@@ -122,9 +122,24 @@ func resourceCluster() *schema.Resource {
11+
@@ -121,9 +121,24 @@ func resourceCluster() *schema.Resource {
1212
ForceNew: true,
1313
Default: true,
1414
},
@@ -33,7 +33,7 @@ index c0f792399f..c2b5a975a9 100644
3333
Elem: &schema.Resource{
3434
Schema: map[string]*schema.Schema{
3535
"data": {
36-
@@ -628,6 +643,13 @@ func resourceClusterRead(ctx context.Context, d *schema.ResourceData, meta inter
36+
@@ -627,6 +642,13 @@ func resourceClusterRead(ctx context.Context, d *schema.ResourceData, meta inter
3737
}
3838
d.Set(names.AttrARN, cluster.Arn)
3939
d.Set("bootstrap_self_managed_addons", d.Get("bootstrap_self_managed_addons"))

patches/0009-Add-ECR-credentials_data_source.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ Subject: [PATCH] Add ECR credentials_data_source
55

66

77
diff --git a/internal/provider/provider.go b/internal/provider/provider.go
8-
index 0c1b1e86ab..0bfc5c6e30 100644
8+
index 3ad50b93e8..af639c4dbf 100644
99
--- a/internal/provider/provider.go
1010
+++ b/internal/provider/provider.go
1111
@@ -14,6 +14,8 @@ import (

patches/0014-add-matchmaking-configuration-72.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ Subject: [PATCH] add matchmaking configuration (#72)
1010
* add resource docs
1111

1212
diff --git a/internal/provider/provider.go b/internal/provider/provider.go
13-
index 0bfc5c6e30..bf08af0363 100644
13+
index af639c4dbf..8629a299bb 100644
1414
--- a/internal/provider/provider.go
1515
+++ b/internal/provider/provider.go
1616
@@ -16,6 +16,7 @@ import (

0 commit comments

Comments
 (0)