Skip to content

Commit

Permalink
Remove aws.iam.Role inlinePolicies deprecation (#4769)
Browse files Browse the repository at this point in the history
This change removes aws.iam.Role inlinePolicies deprecation until Pulumi
can support exclusive management resources better. In addition,
managedPolicyArns deprecation removal is moved from a patch to regular
code.

The deprecation removal affects SDK generators only - documentation may
still indicate that this is deprecated.

Context: #4654
  • Loading branch information
t0yv0 authored Nov 14, 2024
1 parent 0e03d6a commit d13c832
Show file tree
Hide file tree
Showing 87 changed files with 259 additions and 316 deletions.
2 changes: 1 addition & 1 deletion patches/0001-Add-TagsSchemaTrulyComputed-definition.patch
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ Subject: [PATCH] Add TagsSchemaTrulyComputed definition


diff --git a/internal/tags/tags.go b/internal/tags/tags.go
index 40c06bb057f..247a01bba3c 100644
index 40c06bb057..247a01bba3 100644
--- a/internal/tags/tags.go
+++ b/internal/tags/tags.go
@@ -37,3 +37,11 @@ var TagsSchemaForceNew = sync.OnceValue(func() *schema.Schema {
Expand Down
22 changes: 11 additions & 11 deletions patches/0002-Add-S3-legacy-bucket-to-resources.patch
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ scheme for registration: see
https://github.com/hashicorp/terraform-provider-aws/pull/29717.

diff --git a/internal/provider/provider.go b/internal/provider/provider.go
index b048f661fe8..b6521d3f55f 100644
index b048f661fe..b6521d3f55 100644
--- a/internal/provider/provider.go
+++ b/internal/provider/provider.go
@@ -14,6 +14,8 @@ import (
Expand All @@ -39,7 +39,7 @@ index b048f661fe8..b6521d3f55f 100644
provider.ConfigureContextFunc = func(ctx context.Context, d *schema.ResourceData) (interface{}, diag.Diagnostics) {
diff --git a/internal/service/s3legacy/bucket_legacy.go b/internal/service/s3legacy/bucket_legacy.go
new file mode 100644
index 00000000000..fd117b29714
index 0000000000..fd117b2971
--- /dev/null
+++ b/internal/service/s3legacy/bucket_legacy.go
@@ -0,0 +1,3030 @@
Expand Down Expand Up @@ -3075,7 +3075,7 @@ index 00000000000..fd117b29714
+}
diff --git a/internal/service/s3legacy/enum.go b/internal/service/s3legacy/enum.go
new file mode 100644
index 00000000000..2e9caaae188
index 0000000000..2e9caaae18
--- /dev/null
+++ b/internal/service/s3legacy/enum.go
@@ -0,0 +1,32 @@
Expand Down Expand Up @@ -3113,7 +3113,7 @@ index 00000000000..2e9caaae188
+}
diff --git a/internal/service/s3legacy/errors.go b/internal/service/s3legacy/errors.go
new file mode 100644
index 00000000000..af03bdf5aab
index 0000000000..af03bdf5aa
--- /dev/null
+++ b/internal/service/s3legacy/errors.go
@@ -0,0 +1,8 @@
Expand All @@ -3127,7 +3127,7 @@ index 00000000000..af03bdf5aab
+)
diff --git a/internal/service/s3legacy/generate.go b/internal/service/s3legacy/generate.go
new file mode 100644
index 00000000000..8e0b62b3dad
index 0000000000..8e0b62b3da
--- /dev/null
+++ b/internal/service/s3legacy/generate.go
@@ -0,0 +1,4 @@
Expand All @@ -3137,7 +3137,7 @@ index 00000000000..8e0b62b3dad
+package s3legacy
diff --git a/internal/service/s3legacy/hosted_zones.go b/internal/service/s3legacy/hosted_zones.go
new file mode 100644
index 00000000000..a94403b066a
index 0000000000..a94403b066
--- /dev/null
+++ b/internal/service/s3legacy/hosted_zones.go
@@ -0,0 +1,45 @@
Expand Down Expand Up @@ -3188,7 +3188,7 @@ index 00000000000..a94403b066a
+}
diff --git a/internal/service/s3legacy/object.go b/internal/service/s3legacy/object.go
new file mode 100644
index 00000000000..f44b435af68
index 0000000000..f44b435af6
--- /dev/null
+++ b/internal/service/s3legacy/object.go
@@ -0,0 +1,177 @@
Expand Down Expand Up @@ -3371,7 +3371,7 @@ index 00000000000..f44b435af68
+}
diff --git a/internal/service/s3legacy/retry.go b/internal/service/s3legacy/retry.go
new file mode 100644
index 00000000000..dcf7e397596
index 0000000000..dcf7e39759
--- /dev/null
+++ b/internal/service/s3legacy/retry.go
@@ -0,0 +1,30 @@
Expand Down Expand Up @@ -3407,7 +3407,7 @@ index 00000000000..dcf7e397596
+}
diff --git a/internal/service/s3legacy/tags.go b/internal/service/s3legacy/tags.go
new file mode 100644
index 00000000000..669813747ba
index 0000000000..669813747b
--- /dev/null
+++ b/internal/service/s3legacy/tags.go
@@ -0,0 +1,174 @@
Expand Down Expand Up @@ -3587,7 +3587,7 @@ index 00000000000..669813747ba
+}
diff --git a/internal/service/s3legacy/tags_gen.go b/internal/service/s3legacy/tags_gen.go
new file mode 100644
index 00000000000..c65bacf65d9
index 0000000000..c65bacf65d
--- /dev/null
+++ b/internal/service/s3legacy/tags_gen.go
@@ -0,0 +1,38 @@
Expand Down Expand Up @@ -3631,7 +3631,7 @@ index 00000000000..c65bacf65d9
+}
diff --git a/internal/service/s3legacy/wait.go b/internal/service/s3legacy/wait.go
new file mode 100644
index 00000000000..7a548d8d6db
index 0000000000..7a548d8d6d
--- /dev/null
+++ b/internal/service/s3legacy/wait.go
@@ -0,0 +1,18 @@
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ appears in pulumi as `aws.s3.Bucket` and is likely the default version of
the Bucket resource that users will use.

diff --git a/internal/service/s3legacy/bucket_legacy.go b/internal/service/s3legacy/bucket_legacy.go
index fd117b29714..56eed6e0f04 100644
index fd117b2971..56eed6e0f0 100644
--- a/internal/service/s3legacy/bucket_legacy.go
+++ b/internal/service/s3legacy/bucket_legacy.go
@@ -572,6 +572,7 @@ func ResourceBucketLegacy() *schema.Resource {
Expand Down
2 changes: 1 addition & 1 deletion patches/0004-De-deprecate-bucket_object.patch
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ Subject: [PATCH] De-deprecate bucket_object


diff --git a/internal/service/s3/bucket_object.go b/internal/service/s3/bucket_object.go
index 535382eae74..cdb46cd7773 100644
index 535382eae7..cdb46cd777 100644
--- a/internal/service/s3/bucket_object.go
+++ b/internal/service/s3/bucket_object.go
@@ -70,7 +70,7 @@ func resourceBucketObject() *schema.Resource {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ Subject: [PATCH] Remove lakeformation catalog_resource default


diff --git a/internal/service/lakeformation/permissions.go b/internal/service/lakeformation/permissions.go
index 48ff32d5a54..06523ef2da6 100644
index 48ff32d5a5..06523ef2da 100644
--- a/internal/service/lakeformation/permissions.go
+++ b/internal/service/lakeformation/permissions.go
@@ -44,8 +44,8 @@ func ResourcePermissions() *schema.Resource {
Expand Down
2 changes: 1 addition & 1 deletion patches/0006-Workaround-SSM-Parameter-tier-bug.patch
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ Subject: [PATCH] Workaround SSM Parameter tier bug
- Disable diff suppression & counteractions

diff --git a/internal/service/ssm/parameter.go b/internal/service/ssm/parameter.go
index a5fe04fa270..f8d9fca0603 100644
index a5fe04fa27..f8d9fca060 100644
--- a/internal/service/ssm/parameter.go
+++ b/internal/service/ssm/parameter.go
@@ -93,15 +93,17 @@ func resourceParameter() *schema.Resource {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ Subject: [PATCH] Add EKS cluster certificate_authorities (plural)


diff --git a/internal/service/eks/cluster.go b/internal/service/eks/cluster.go
index b0c38464ece..918c12e0e20 100644
index b0c38464ec..918c12e0e2 100644
--- a/internal/service/eks/cluster.go
+++ b/internal/service/eks/cluster.go
@@ -98,9 +98,24 @@ func resourceCluster() *schema.Resource {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ Subject: [PATCH] Workaround Autoscaling launch_configuration
- Disable computation of property until fixed.

diff --git a/internal/service/autoscaling/launch_configuration.go b/internal/service/autoscaling/launch_configuration.go
index a46c4b4b276..d6fe751162d 100644
index a46c4b4b27..d6fe751162 100644
--- a/internal/service/autoscaling/launch_configuration.go
+++ b/internal/service/autoscaling/launch_configuration.go
@@ -52,7 +52,8 @@ func resourceLaunchConfiguration() *schema.Resource {
Expand Down
6 changes: 3 additions & 3 deletions patches/0009-Add-ECR-credentials_data_source.patch
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ Subject: [PATCH] Add ECR credentials_data_source


diff --git a/internal/provider/provider.go b/internal/provider/provider.go
index b6521d3f55f..c7c3935b946 100644
index b6521d3f55..c7c3935b94 100644
--- a/internal/provider/provider.go
+++ b/internal/provider/provider.go
@@ -14,6 +14,8 @@ import (
Expand All @@ -31,7 +31,7 @@ index b6521d3f55f..c7c3935b946 100644
},
diff --git a/internal/service/ecr/credentials_data_source.go b/internal/service/ecr/credentials_data_source.go
new file mode 100644
index 00000000000..b6e19a72839
index 0000000000..b6e19a7283
--- /dev/null
+++ b/internal/service/ecr/credentials_data_source.go
@@ -0,0 +1,68 @@
Expand Down Expand Up @@ -105,7 +105,7 @@ index 00000000000..b6e19a72839
+}
diff --git a/internal/service/ecr/credentials_data_source_test.go b/internal/service/ecr/credentials_data_source_test.go
new file mode 100644
index 00000000000..f0f875399e0
index 0000000000..f0f875399e
--- /dev/null
+++ b/internal/service/ecr/credentials_data_source_test.go
@@ -0,0 +1,37 @@
Expand Down
4 changes: 2 additions & 2 deletions patches/0010-Add-custom-appautoscaling-examples.patch
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ Subject: [PATCH] Add custom appautoscaling examples


diff --git a/website/docs/r/appautoscaling_policy.html.markdown b/website/docs/r/appautoscaling_policy.html.markdown
index 10307ebf616..642fd54cec3 100644
index 10307ebf61..642fd54cec 100644
--- a/website/docs/r/appautoscaling_policy.html.markdown
+++ b/website/docs/r/appautoscaling_policy.html.markdown
@@ -196,6 +196,34 @@ resource "aws_appautoscaling_policy" "example" {
Expand Down Expand Up @@ -44,7 +44,7 @@ index 10307ebf616..642fd54cec3 100644

This resource supports the following arguments:
diff --git a/website/docs/r/appautoscaling_target.html.markdown b/website/docs/r/appautoscaling_target.html.markdown
index 18b00b2d4a9..7acfb13f10b 100644
index 18b00b2d4a..7acfb13f10 100644
--- a/website/docs/r/appautoscaling_target.html.markdown
+++ b/website/docs/r/appautoscaling_target.html.markdown
@@ -82,6 +82,18 @@ resource "aws_appautoscaling_target" "ecs_target" {
Expand Down
4 changes: 2 additions & 2 deletions patches/0011-Add-dedicated_host-docs.patch
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ Subject: [PATCH] Add dedicated_host docs

diff --git a/website/docs/d/dedicated_host.html.markdown b/website/docs/d/dedicated_host.html.markdown
new file mode 100644
index 00000000000..9473a00c591
index 0000000000..9473a00c59
--- /dev/null
+++ b/website/docs/d/dedicated_host.html.markdown
@@ -0,0 +1,75 @@
Expand Down Expand Up @@ -87,7 +87,7 @@ index 00000000000..9473a00c591
+```
diff --git a/website/docs/r/dedicated_host.html.markdown b/website/docs/r/dedicated_host.html.markdown
new file mode 100644
index 00000000000..01845aa221c
index 0000000000..01845aa221
--- /dev/null
+++ b/website/docs/r/dedicated_host.html.markdown
@@ -0,0 +1,71 @@
Expand Down
2 changes: 1 addition & 1 deletion patches/0012-Revert-WAF-schema-changes.patch
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ Subject: [PATCH] Revert WAF schema changes
- This causes far too many types to be generated downstream.

diff --git a/internal/service/wafv2/schemas.go b/internal/service/wafv2/schemas.go
index 8ac8b8d5342..65f810be491 100644
index 8ac8b8d534..65f810be49 100644
--- a/internal/service/wafv2/schemas.go
+++ b/internal/service/wafv2/schemas.go
@@ -56,14 +56,14 @@ func ruleGroupRootStatementSchema(level int) *schema.Schema {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ Subject: [PATCH] Catch cty panic in new
The root cause is not fully understood yet but this might unblock us.

diff --git a/internal/service/sns/topic_subscription.go b/internal/service/sns/topic_subscription.go
index dcef58b2333..c4cf612a344 100644
index dcef58b233..c4cf612a34 100644
--- a/internal/service/sns/topic_subscription.go
+++ b/internal/service/sns/topic_subscription.go
@@ -545,9 +545,11 @@ func normalizeTopicSubscriptionDeliveryPolicy(policy string) ([]byte, error) {
Expand Down
14 changes: 7 additions & 7 deletions patches/0014-add-matchmaking-configuration-72.patch
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ Subject: [PATCH] add matchmaking configuration (#72)
* add resource docs

diff --git a/internal/provider/provider.go b/internal/provider/provider.go
index c7c3935b946..30ebfcf0f30 100644
index c7c3935b94..30ebfcf0f3 100644
--- a/internal/provider/provider.go
+++ b/internal/provider/provider.go
@@ -16,6 +16,7 @@ import (
Expand All @@ -33,7 +33,7 @@ index c7c3935b946..30ebfcf0f30 100644

diff --git a/internal/service/gamelift/matchmaking_configuration.go b/internal/service/gamelift/matchmaking_configuration.go
new file mode 100644
index 00000000000..0a7c8ea635d
index 0000000000..0a7c8ea635
--- /dev/null
+++ b/internal/service/gamelift/matchmaking_configuration.go
@@ -0,0 +1,386 @@
Expand Down Expand Up @@ -425,7 +425,7 @@ index 00000000000..0a7c8ea635d
+}
diff --git a/internal/service/gamelift/matchmaking_configuration_test.go b/internal/service/gamelift/matchmaking_configuration_test.go
new file mode 100644
index 00000000000..94c9a8c29bd
index 0000000000..94c9a8c29b
--- /dev/null
+++ b/internal/service/gamelift/matchmaking_configuration_test.go
@@ -0,0 +1,267 @@
Expand Down Expand Up @@ -698,7 +698,7 @@ index 00000000000..94c9a8c29bd
+}
diff --git a/internal/service/gamelift/matchmaking_rule_set.go b/internal/service/gamelift/matchmaking_rule_set.go
new file mode 100644
index 00000000000..28d15ecf5ea
index 0000000000..28d15ecf5e
--- /dev/null
+++ b/internal/service/gamelift/matchmaking_rule_set.go
@@ -0,0 +1,163 @@
Expand Down Expand Up @@ -867,7 +867,7 @@ index 00000000000..28d15ecf5ea
+}
diff --git a/internal/service/gamelift/matchmaking_rule_set_test.go b/internal/service/gamelift/matchmaking_rule_set_test.go
new file mode 100644
index 00000000000..9dbf0395884
index 0000000000..9dbf039588
--- /dev/null
+++ b/internal/service/gamelift/matchmaking_rule_set_test.go
@@ -0,0 +1,138 @@
Expand Down Expand Up @@ -1011,7 +1011,7 @@ index 00000000000..9dbf0395884
+}
diff --git a/website/docs/r/gamelift_matchmaking_configuration.html.markdown b/website/docs/r/gamelift_matchmaking_configuration.html.markdown
new file mode 100644
index 00000000000..2d411ad301c
index 0000000000..2d411ad301
--- /dev/null
+++ b/website/docs/r/gamelift_matchmaking_configuration.html.markdown
@@ -0,0 +1,106 @@
Expand Down Expand Up @@ -1123,7 +1123,7 @@ index 00000000000..2d411ad301c
+```
diff --git a/website/docs/r/gamelift_matchmaking_rule_set.html.markdown b/website/docs/r/gamelift_matchmaking_rule_set.html.markdown
new file mode 100644
index 00000000000..28013532bf1
index 0000000000..28013532bf
--- /dev/null
+++ b/website/docs/r/gamelift_matchmaking_rule_set.html.markdown
@@ -0,0 +1,52 @@
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ This PR reverts our patches which will prevent future merge conflicts, and updat
call sites to plumb through the proper Context objects.

diff --git a/internal/service/gamelift/matchmaking_configuration.go b/internal/service/gamelift/matchmaking_configuration.go
index 0a7c8ea635d..d8ee20dc65c 100644
index 0a7c8ea635..d8ee20dc65 100644
--- a/internal/service/gamelift/matchmaking_configuration.go
+++ b/internal/service/gamelift/matchmaking_configuration.go
@@ -2,13 +2,13 @@ package gamelift
Expand Down Expand Up @@ -162,7 +162,7 @@ index 0a7c8ea635d..d8ee20dc65c 100644

return nil
diff --git a/internal/service/gamelift/matchmaking_rule_set.go b/internal/service/gamelift/matchmaking_rule_set.go
index 28d15ecf5ea..8c1189199fb 100644
index 28d15ecf5e..8c1189199f 100644
--- a/internal/service/gamelift/matchmaking_rule_set.go
+++ b/internal/service/gamelift/matchmaking_rule_set.go
@@ -2,12 +2,12 @@ package gamelift
Expand Down Expand Up @@ -300,7 +300,7 @@ index 28d15ecf5ea..8c1189199fb 100644

return nil
diff --git a/internal/service/s3legacy/bucket_legacy.go b/internal/service/s3legacy/bucket_legacy.go
index 56eed6e0f04..69cdf81c1e3 100644
index 56eed6e0f0..69cdf81c1e 100644
--- a/internal/service/s3legacy/bucket_legacy.go
+++ b/internal/service/s3legacy/bucket_legacy.go
@@ -20,6 +20,7 @@ import (
Expand Down Expand Up @@ -895,7 +895,7 @@ index 56eed6e0f04..69cdf81c1e3 100644
func() (interface{}, error) {
return conn.PutBucketEncryption(i)
diff --git a/internal/service/s3legacy/wait.go b/internal/service/s3legacy/wait.go
index 7a548d8d6db..9031539c196 100644
index 7a548d8d6d..9031539c19 100644
--- a/internal/service/s3legacy/wait.go
+++ b/internal/service/s3legacy/wait.go
@@ -13,6 +13,6 @@ const (
Expand Down
2 changes: 1 addition & 1 deletion patches/0016-Revert-Update-endpointHashIPAddress.patch
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ This commit causes never-converging diffs due to incorrect use of
a computed property in hashing.

diff --git a/internal/service/route53resolver/endpoint.go b/internal/service/route53resolver/endpoint.go
index f9ecbc7cc8a..842ebac62c9 100644
index f9ecbc7cc8..842ebac62c 100644
--- a/internal/service/route53resolver/endpoint.go
+++ b/internal/service/route53resolver/endpoint.go
@@ -439,7 +439,7 @@ func waitEndpointDeleted(ctx context.Context, conn *route53resolver.Client, id s
Expand Down
4 changes: 2 additions & 2 deletions patches/0017-Fixup-gamelift-context.patch
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ Subject: [PATCH] Fixup gamelift context


diff --git a/internal/service/gamelift/matchmaking_configuration.go b/internal/service/gamelift/matchmaking_configuration.go
index d8ee20dc65c..e17f71e6b66 100644
index d8ee20dc65..e17f71e6b6 100644
--- a/internal/service/gamelift/matchmaking_configuration.go
+++ b/internal/service/gamelift/matchmaking_configuration.go
@@ -148,7 +148,7 @@ func ResourceMatchMakingConfiguration() *schema.Resource {
Expand All @@ -18,7 +18,7 @@ index d8ee20dc65c..e17f71e6b66 100644
input := gamelift.CreateMatchmakingConfigurationInput{
AcceptanceRequired: aws.Bool(d.Get("acceptance_required").(bool)),
diff --git a/internal/service/gamelift/matchmaking_rule_set.go b/internal/service/gamelift/matchmaking_rule_set.go
index 8c1189199fb..254c96efc6e 100644
index 8c1189199f..254c96efc6 100644
--- a/internal/service/gamelift/matchmaking_rule_set.go
+++ b/internal/service/gamelift/matchmaking_rule_set.go
@@ -60,7 +60,7 @@ func ResourceMatchmakingRuleSet() *schema.Resource {
Expand Down
Loading

0 comments on commit d13c832

Please sign in to comment.