diff --git a/examples/go.mod b/examples/go.mod index 8f14599b3e..bd6b4ab87e 100644 --- a/examples/go.mod +++ b/examples/go.mod @@ -455,7 +455,6 @@ require ( github.com/pulumi/esc v0.10.0 // indirect github.com/pulumi/inflector v0.1.1 // indirect github.com/pulumi/pulumi-java/pkg v0.19.0 // indirect - github.com/pulumi/pulumi-terraform-bridge/pf v0.49.0 // indirect github.com/pulumi/pulumi-yaml v1.12.0 // indirect github.com/pulumi/schema-tools v0.1.2 // indirect github.com/pulumi/terraform-diff-reader v0.0.2 // indirect diff --git a/examples/go.sum b/examples/go.sum index c9b6534124..5b1af77d4b 100644 --- a/examples/go.sum +++ b/examples/go.sum @@ -2460,8 +2460,6 @@ github.com/pulumi/providertest v0.1.3 h1:GpNKRy/haNjRHiUA9bi4diU4Op2zf3axYXbga5A github.com/pulumi/providertest v0.1.3/go.mod h1:GcsqEGgSngwaNOD+kICJPIUQlnA911fGBU8HDlJvVL0= github.com/pulumi/pulumi-java/pkg v0.19.0 h1:T9kkGUQJV7UTxenw08m3txsgQkNVnZZxvn1zCcNjaE8= github.com/pulumi/pulumi-java/pkg v0.19.0/go.mod h1:YKYYFEb3Jvzf/dDJo0xOeEkIfBAMkkkdhXulauvEjmc= -github.com/pulumi/pulumi-terraform-bridge/pf v0.49.0 h1:GJ20wQxz5dYbOWdDyDp1E3SuuTuLVdBpnp70FJ+VVpQ= -github.com/pulumi/pulumi-terraform-bridge/pf v0.49.0/go.mod h1:zDdNBSsrNhUxyeX1MrXr/O71DBpWMFZ8dGIGV0Pbj0c= github.com/pulumi/pulumi-terraform-bridge/v3 v3.98.0 h1:FpoJNeqICq0p0IlSs1vOvHarp7uVPMMeTXF321T075k= github.com/pulumi/pulumi-terraform-bridge/v3 v3.98.0/go.mod h1:q0QIquTDad7QvzdLmT31bzISahN1XrnGF/w/vIsxlX0= github.com/pulumi/pulumi-yaml v1.12.0 h1:ThJP+EBqeJyCnS6w6/PwcEFOT5o112qv0lObhefmFCk= diff --git a/patches/0001-Add-TagsSchemaTrulyComputed-definition.patch b/patches/0001-Add-TagsSchemaTrulyComputed-definition.patch index a84be7aedb..8f5d86d243 100644 --- a/patches/0001-Add-TagsSchemaTrulyComputed-definition.patch +++ b/patches/0001-Add-TagsSchemaTrulyComputed-definition.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add TagsSchemaTrulyComputed definition diff --git a/internal/tags/tags.go b/internal/tags/tags.go -index 40c06bb057..247a01bba3 100644 +index 40c06bb057f..247a01bba3c 100644 --- a/internal/tags/tags.go +++ b/internal/tags/tags.go @@ -37,3 +37,11 @@ var TagsSchemaForceNew = sync.OnceValue(func() *schema.Schema { diff --git a/patches/0002-Add-S3-legacy-bucket-to-resources.patch b/patches/0002-Add-S3-legacy-bucket-to-resources.patch index 2da8379adc..490bf58cb3 100644 --- a/patches/0002-Add-S3-legacy-bucket-to-resources.patch +++ b/patches/0002-Add-S3-legacy-bucket-to-resources.patch @@ -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 b048f661fe..b6521d3f55 100644 +index b048f661fe8..b6521d3f55f 100644 --- a/internal/provider/provider.go +++ b/internal/provider/provider.go @@ -14,6 +14,8 @@ import ( @@ -39,7 +39,7 @@ index b048f661fe..b6521d3f55 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 0000000000..cd2a293a73 +index 00000000000..cd2a293a73e --- /dev/null +++ b/internal/service/s3legacy/bucket_legacy.go @@ -0,0 +1,3030 @@ @@ -3075,7 +3075,7 @@ index 0000000000..cd2a293a73 +} diff --git a/internal/service/s3legacy/enum.go b/internal/service/s3legacy/enum.go new file mode 100644 -index 0000000000..2e9caaae18 +index 00000000000..2e9caaae188 --- /dev/null +++ b/internal/service/s3legacy/enum.go @@ -0,0 +1,32 @@ @@ -3113,7 +3113,7 @@ index 0000000000..2e9caaae18 +} diff --git a/internal/service/s3legacy/errors.go b/internal/service/s3legacy/errors.go new file mode 100644 -index 0000000000..af03bdf5aa +index 00000000000..af03bdf5aab --- /dev/null +++ b/internal/service/s3legacy/errors.go @@ -0,0 +1,8 @@ @@ -3127,7 +3127,7 @@ index 0000000000..af03bdf5aa +) diff --git a/internal/service/s3legacy/generate.go b/internal/service/s3legacy/generate.go new file mode 100644 -index 0000000000..8e0b62b3da +index 00000000000..8e0b62b3dad --- /dev/null +++ b/internal/service/s3legacy/generate.go @@ -0,0 +1,4 @@ @@ -3137,7 +3137,7 @@ index 0000000000..8e0b62b3da +package s3legacy diff --git a/internal/service/s3legacy/hosted_zones.go b/internal/service/s3legacy/hosted_zones.go new file mode 100644 -index 0000000000..a94403b066 +index 00000000000..a94403b066a --- /dev/null +++ b/internal/service/s3legacy/hosted_zones.go @@ -0,0 +1,45 @@ @@ -3188,7 +3188,7 @@ index 0000000000..a94403b066 +} diff --git a/internal/service/s3legacy/object.go b/internal/service/s3legacy/object.go new file mode 100644 -index 0000000000..f44b435af6 +index 00000000000..f44b435af68 --- /dev/null +++ b/internal/service/s3legacy/object.go @@ -0,0 +1,177 @@ @@ -3371,7 +3371,7 @@ index 0000000000..f44b435af6 +} diff --git a/internal/service/s3legacy/retry.go b/internal/service/s3legacy/retry.go new file mode 100644 -index 0000000000..dcf7e39759 +index 00000000000..dcf7e397596 --- /dev/null +++ b/internal/service/s3legacy/retry.go @@ -0,0 +1,30 @@ @@ -3407,7 +3407,7 @@ index 0000000000..dcf7e39759 +} diff --git a/internal/service/s3legacy/tags.go b/internal/service/s3legacy/tags.go new file mode 100644 -index 0000000000..669813747b +index 00000000000..669813747ba --- /dev/null +++ b/internal/service/s3legacy/tags.go @@ -0,0 +1,174 @@ @@ -3587,7 +3587,7 @@ index 0000000000..669813747b +} diff --git a/internal/service/s3legacy/tags_gen.go b/internal/service/s3legacy/tags_gen.go new file mode 100644 -index 0000000000..c65bacf65d +index 00000000000..c65bacf65d9 --- /dev/null +++ b/internal/service/s3legacy/tags_gen.go @@ -0,0 +1,38 @@ @@ -3631,7 +3631,7 @@ index 0000000000..c65bacf65d +} diff --git a/internal/service/s3legacy/wait.go b/internal/service/s3legacy/wait.go new file mode 100644 -index 0000000000..7a548d8d6d +index 00000000000..7a548d8d6db --- /dev/null +++ b/internal/service/s3legacy/wait.go @@ -0,0 +1,18 @@ diff --git a/patches/0003-Marks-SSE-Configuration-as-Computed-for-Legacy-S3-Bu.patch b/patches/0003-Marks-SSE-Configuration-as-Computed-for-Legacy-S3-Bu.patch index 8897ab70d2..bb9aed9caf 100644 --- a/patches/0003-Marks-SSE-Configuration-as-Computed-for-Legacy-S3-Bu.patch +++ b/patches/0003-Marks-SSE-Configuration-as-Computed-for-Legacy-S3-Bu.patch @@ -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 cd2a293a73..b1dc400249 100644 +index cd2a293a73e..b1dc400249c 100644 --- a/internal/service/s3legacy/bucket_legacy.go +++ b/internal/service/s3legacy/bucket_legacy.go @@ -572,6 +572,7 @@ func ResourceBucketLegacy() *schema.Resource { diff --git a/patches/0004-De-deprecate-bucket_object.patch b/patches/0004-De-deprecate-bucket_object.patch index f85075db78..40898dd3e7 100644 --- a/patches/0004-De-deprecate-bucket_object.patch +++ b/patches/0004-De-deprecate-bucket_object.patch @@ -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 535382eae7..cdb46cd777 100644 +index 535382eae74..cdb46cd7773 100644 --- a/internal/service/s3/bucket_object.go +++ b/internal/service/s3/bucket_object.go @@ -70,7 +70,7 @@ func resourceBucketObject() *schema.Resource { diff --git a/patches/0005-Remove-lakeformation-catalog_resource-default.patch b/patches/0005-Remove-lakeformation-catalog_resource-default.patch index c72ee87668..9f4d8fc7c2 100644 --- a/patches/0005-Remove-lakeformation-catalog_resource-default.patch +++ b/patches/0005-Remove-lakeformation-catalog_resource-default.patch @@ -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 f05de48b13..f22ab6cb01 100644 +index f05de48b130..f22ab6cb01d 100644 --- a/internal/service/lakeformation/permissions.go +++ b/internal/service/lakeformation/permissions.go @@ -44,8 +44,8 @@ func ResourcePermissions() *schema.Resource { diff --git a/patches/0006-Workaround-SSM-Parameter-tier-bug.patch b/patches/0006-Workaround-SSM-Parameter-tier-bug.patch index d982d38fb1..da4f9c0cdb 100644 --- a/patches/0006-Workaround-SSM-Parameter-tier-bug.patch +++ b/patches/0006-Workaround-SSM-Parameter-tier-bug.patch @@ -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 a5fe04fa27..f8d9fca060 100644 +index a5fe04fa270..f8d9fca0603 100644 --- a/internal/service/ssm/parameter.go +++ b/internal/service/ssm/parameter.go @@ -93,15 +93,17 @@ func resourceParameter() *schema.Resource { diff --git a/patches/0007-Add-EKS-cluster-certificate_authorities-plural.patch b/patches/0007-Add-EKS-cluster-certificate_authorities-plural.patch index 7a9bd3a089..f5b421d2f1 100644 --- a/patches/0007-Add-EKS-cluster-certificate_authorities-plural.patch +++ b/patches/0007-Add-EKS-cluster-certificate_authorities-plural.patch @@ -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 c0f792399f..c2b5a975a9 100644 +index c0f792399f6..c2b5a975a98 100644 --- a/internal/service/eks/cluster.go +++ b/internal/service/eks/cluster.go @@ -122,9 +122,24 @@ func resourceCluster() *schema.Resource { diff --git a/patches/0008-Workaround-Autoscaling-launch_configuration-associat.patch b/patches/0008-Workaround-Autoscaling-launch_configuration-associat.patch index aa1d85e7b4..c61a628eaa 100644 --- a/patches/0008-Workaround-Autoscaling-launch_configuration-associat.patch +++ b/patches/0008-Workaround-Autoscaling-launch_configuration-associat.patch @@ -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 a46c4b4b27..d6fe751162 100644 +index a46c4b4b276..d6fe751162d 100644 --- a/internal/service/autoscaling/launch_configuration.go +++ b/internal/service/autoscaling/launch_configuration.go @@ -52,7 +52,8 @@ func resourceLaunchConfiguration() *schema.Resource { diff --git a/patches/0009-Add-ECR-credentials_data_source.patch b/patches/0009-Add-ECR-credentials_data_source.patch index 2356a78f89..0c43df5394 100644 --- a/patches/0009-Add-ECR-credentials_data_source.patch +++ b/patches/0009-Add-ECR-credentials_data_source.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add ECR credentials_data_source diff --git a/internal/provider/provider.go b/internal/provider/provider.go -index b6521d3f55..c7c3935b94 100644 +index b6521d3f55f..c7c3935b946 100644 --- a/internal/provider/provider.go +++ b/internal/provider/provider.go @@ -14,6 +14,8 @@ import ( @@ -31,7 +31,7 @@ index b6521d3f55..c7c3935b94 100644 }, diff --git a/internal/service/ecr/credentials_data_source.go b/internal/service/ecr/credentials_data_source.go new file mode 100644 -index 0000000000..b6e19a7283 +index 00000000000..b6e19a72839 --- /dev/null +++ b/internal/service/ecr/credentials_data_source.go @@ -0,0 +1,68 @@ @@ -105,7 +105,7 @@ index 0000000000..b6e19a7283 +} 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 0000000000..f0f875399e +index 00000000000..f0f875399e0 --- /dev/null +++ b/internal/service/ecr/credentials_data_source_test.go @@ -0,0 +1,37 @@ diff --git a/patches/0010-Add-custom-appautoscaling-examples.patch b/patches/0010-Add-custom-appautoscaling-examples.patch index c28496c204..614336dfc1 100644 --- a/patches/0010-Add-custom-appautoscaling-examples.patch +++ b/patches/0010-Add-custom-appautoscaling-examples.patch @@ -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 10307ebf61..642fd54cec 100644 +index 10307ebf616..642fd54cec3 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" { @@ -44,7 +44,7 @@ index 10307ebf61..642fd54cec 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 18b00b2d4a..7acfb13f10 100644 +index 18b00b2d4a9..7acfb13f10b 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" { diff --git a/patches/0011-Add-dedicated_host-docs.patch b/patches/0011-Add-dedicated_host-docs.patch index dbd3453e9d..58963af8c8 100644 --- a/patches/0011-Add-dedicated_host-docs.patch +++ b/patches/0011-Add-dedicated_host-docs.patch @@ -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 0000000000..9473a00c59 +index 00000000000..9473a00c591 --- /dev/null +++ b/website/docs/d/dedicated_host.html.markdown @@ -0,0 +1,75 @@ @@ -87,7 +87,7 @@ index 0000000000..9473a00c59 +``` diff --git a/website/docs/r/dedicated_host.html.markdown b/website/docs/r/dedicated_host.html.markdown new file mode 100644 -index 0000000000..01845aa221 +index 00000000000..01845aa221c --- /dev/null +++ b/website/docs/r/dedicated_host.html.markdown @@ -0,0 +1,71 @@ diff --git a/patches/0012-Revert-WAF-schema-changes.patch b/patches/0012-Revert-WAF-schema-changes.patch index 6ff046706a..01908854b1 100644 --- a/patches/0012-Revert-WAF-schema-changes.patch +++ b/patches/0012-Revert-WAF-schema-changes.patch @@ -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 8ac8b8d534..65f810be49 100644 +index 8ac8b8d5342..65f810be491 100644 --- a/internal/service/wafv2/schemas.go +++ b/internal/service/wafv2/schemas.go @@ -56,14 +56,14 @@ func ruleGroupRootStatementSchema(level int) *schema.Schema { diff --git a/patches/0013-Catch-cty-panic-in-new-resourceTopicSubscriptionCust.patch b/patches/0013-Catch-cty-panic-in-new-resourceTopicSubscriptionCust.patch index 25573c4e2a..36f7988444 100644 --- a/patches/0013-Catch-cty-panic-in-new-resourceTopicSubscriptionCust.patch +++ b/patches/0013-Catch-cty-panic-in-new-resourceTopicSubscriptionCust.patch @@ -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 dcef58b233..c4cf612a34 100644 +index dcef58b2333..c4cf612a344 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) { diff --git a/patches/0014-add-matchmaking-configuration-72.patch b/patches/0014-add-matchmaking-configuration-72.patch index b9e7387117..51828f61e1 100644 --- a/patches/0014-add-matchmaking-configuration-72.patch +++ b/patches/0014-add-matchmaking-configuration-72.patch @@ -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 c7c3935b94..30ebfcf0f3 100644 +index c7c3935b946..30ebfcf0f30 100644 --- a/internal/provider/provider.go +++ b/internal/provider/provider.go @@ -16,6 +16,7 @@ import ( @@ -33,7 +33,7 @@ index c7c3935b94..30ebfcf0f3 100644 diff --git a/internal/service/gamelift/matchmaking_configuration.go b/internal/service/gamelift/matchmaking_configuration.go new file mode 100644 -index 0000000000..0a7c8ea635 +index 00000000000..0a7c8ea635d --- /dev/null +++ b/internal/service/gamelift/matchmaking_configuration.go @@ -0,0 +1,386 @@ @@ -425,7 +425,7 @@ index 0000000000..0a7c8ea635 +} diff --git a/internal/service/gamelift/matchmaking_configuration_test.go b/internal/service/gamelift/matchmaking_configuration_test.go new file mode 100644 -index 0000000000..94c9a8c29b +index 00000000000..94c9a8c29bd --- /dev/null +++ b/internal/service/gamelift/matchmaking_configuration_test.go @@ -0,0 +1,267 @@ @@ -698,7 +698,7 @@ index 0000000000..94c9a8c29b +} diff --git a/internal/service/gamelift/matchmaking_rule_set.go b/internal/service/gamelift/matchmaking_rule_set.go new file mode 100644 -index 0000000000..28d15ecf5e +index 00000000000..28d15ecf5ea --- /dev/null +++ b/internal/service/gamelift/matchmaking_rule_set.go @@ -0,0 +1,163 @@ @@ -867,7 +867,7 @@ index 0000000000..28d15ecf5e +} 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 0000000000..9dbf039588 +index 00000000000..9dbf0395884 --- /dev/null +++ b/internal/service/gamelift/matchmaking_rule_set_test.go @@ -0,0 +1,138 @@ @@ -1011,7 +1011,7 @@ index 0000000000..9dbf039588 +} 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 0000000000..2d411ad301 +index 00000000000..2d411ad301c --- /dev/null +++ b/website/docs/r/gamelift_matchmaking_configuration.html.markdown @@ -0,0 +1,106 @@ @@ -1123,7 +1123,7 @@ index 0000000000..2d411ad301 +``` 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 0000000000..28013532bf +index 00000000000..28013532bf1 --- /dev/null +++ b/website/docs/r/gamelift_matchmaking_rule_set.html.markdown @@ -0,0 +1,52 @@ diff --git a/patches/0015-Reverts-patches-to-S3BucketLegacy-and-GameLift.patch b/patches/0015-Reverts-patches-to-S3BucketLegacy-and-GameLift.patch index b1bcf0bb45..ae4552d268 100644 --- a/patches/0015-Reverts-patches-to-S3BucketLegacy-and-GameLift.patch +++ b/patches/0015-Reverts-patches-to-S3BucketLegacy-and-GameLift.patch @@ -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 0a7c8ea635..d8ee20dc65 100644 +index 0a7c8ea635d..d8ee20dc65c 100644 --- a/internal/service/gamelift/matchmaking_configuration.go +++ b/internal/service/gamelift/matchmaking_configuration.go @@ -2,13 +2,13 @@ package gamelift @@ -162,7 +162,7 @@ index 0a7c8ea635..d8ee20dc65 100644 return nil diff --git a/internal/service/gamelift/matchmaking_rule_set.go b/internal/service/gamelift/matchmaking_rule_set.go -index 28d15ecf5e..8c1189199f 100644 +index 28d15ecf5ea..8c1189199fb 100644 --- a/internal/service/gamelift/matchmaking_rule_set.go +++ b/internal/service/gamelift/matchmaking_rule_set.go @@ -2,12 +2,12 @@ package gamelift @@ -300,7 +300,7 @@ index 28d15ecf5e..8c1189199f 100644 return nil diff --git a/internal/service/s3legacy/bucket_legacy.go b/internal/service/s3legacy/bucket_legacy.go -index b1dc400249..0e1e17baa3 100644 +index b1dc400249c..0e1e17baa33 100644 --- a/internal/service/s3legacy/bucket_legacy.go +++ b/internal/service/s3legacy/bucket_legacy.go @@ -20,6 +20,7 @@ import ( @@ -891,7 +891,7 @@ index b1dc400249..0e1e17baa3 100644 func() (interface{}, error) { return conn.PutBucketEncryption(i) diff --git a/internal/service/s3legacy/wait.go b/internal/service/s3legacy/wait.go -index 7a548d8d6d..9031539c19 100644 +index 7a548d8d6db..9031539c196 100644 --- a/internal/service/s3legacy/wait.go +++ b/internal/service/s3legacy/wait.go @@ -13,6 +13,6 @@ const ( diff --git a/patches/0016-Revert-Update-endpointHashIPAddress.patch b/patches/0016-Revert-Update-endpointHashIPAddress.patch index e3843a1464..aa8197d0de 100644 --- a/patches/0016-Revert-Update-endpointHashIPAddress.patch +++ b/patches/0016-Revert-Update-endpointHashIPAddress.patch @@ -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 f9ecbc7cc8..842ebac62c 100644 +index f9ecbc7cc8a..842ebac62c9 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 diff --git a/patches/0017-Fixup-gamelift-context.patch b/patches/0017-Fixup-gamelift-context.patch index f813dfc75c..e99ba7f9f3 100644 --- a/patches/0017-Fixup-gamelift-context.patch +++ b/patches/0017-Fixup-gamelift-context.patch @@ -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 d8ee20dc65..e17f71e6b6 100644 +index d8ee20dc65c..e17f71e6b66 100644 --- a/internal/service/gamelift/matchmaking_configuration.go +++ b/internal/service/gamelift/matchmaking_configuration.go @@ -148,7 +148,7 @@ func ResourceMatchMakingConfiguration() *schema.Resource { @@ -18,7 +18,7 @@ index d8ee20dc65..e17f71e6b6 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 8c1189199f..254c96efc6 100644 +index 8c1189199fb..254c96efc6e 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 { diff --git a/patches/0018-Change-default-descriptions-to-Managed-by-Pulumi.patch b/patches/0018-Change-default-descriptions-to-Managed-by-Pulumi.patch index ceca2b707b..3a4d923e87 100644 --- a/patches/0018-Change-default-descriptions-to-Managed-by-Pulumi.patch +++ b/patches/0018-Change-default-descriptions-to-Managed-by-Pulumi.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Change default descriptions to "Managed by Pulumi" diff --git a/internal/service/apigateway/api_key.go b/internal/service/apigateway/api_key.go -index 1bc1374a31..9bc6fba23e 100644 +index 1bc1374a310..9bc6fba23ec 100644 --- a/internal/service/apigateway/api_key.go +++ b/internal/service/apigateway/api_key.go @@ -55,7 +55,7 @@ func resourceAPIKey() *schema.Resource { @@ -18,7 +18,7 @@ index 1bc1374a31..9bc6fba23e 100644 names.AttrEnabled: { Type: schema.TypeBool, diff --git a/internal/service/appsync/api_key.go b/internal/service/appsync/api_key.go -index fbdca7da91..9cdc01f8ec 100644 +index fbdca7da916..9cdc01f8ec0 100644 --- a/internal/service/appsync/api_key.go +++ b/internal/service/appsync/api_key.go @@ -49,7 +49,7 @@ func resourceAPIKey() *schema.Resource { @@ -31,7 +31,7 @@ index fbdca7da91..9cdc01f8ec 100644 "expires": { Type: schema.TypeString, diff --git a/internal/service/cloudfront/origin_access_control.go b/internal/service/cloudfront/origin_access_control.go -index 837e79c057..8fc8280900 100644 +index 837e79c0571..8fc82809004 100644 --- a/internal/service/cloudfront/origin_access_control.go +++ b/internal/service/cloudfront/origin_access_control.go @@ -38,7 +38,7 @@ func resourceOriginAccessControl() *schema.Resource { @@ -44,7 +44,7 @@ index 837e79c057..8fc8280900 100644 }, "etag": { diff --git a/internal/service/docdb/cluster_parameter_group.go b/internal/service/docdb/cluster_parameter_group.go -index 8a99e5b047..361c39f731 100644 +index 8a99e5b0479..361c39f731e 100644 --- a/internal/service/docdb/cluster_parameter_group.go +++ b/internal/service/docdb/cluster_parameter_group.go @@ -50,7 +50,7 @@ func resourceClusterParameterGroup() *schema.Resource { @@ -57,7 +57,7 @@ index 8a99e5b047..361c39f731 100644 names.AttrFamily: { Type: schema.TypeString, diff --git a/internal/service/docdb/subnet_group.go b/internal/service/docdb/subnet_group.go -index 5466936547..526c40e604 100644 +index 54669365473..526c40e604d 100644 --- a/internal/service/docdb/subnet_group.go +++ b/internal/service/docdb/subnet_group.go @@ -46,7 +46,7 @@ func resourceSubnetGroup() *schema.Resource { @@ -70,7 +70,7 @@ index 5466936547..526c40e604 100644 names.AttrName: { Type: schema.TypeString, diff --git a/internal/service/ec2/vpc_security_group.go b/internal/service/ec2/vpc_security_group.go -index 82b8dae6e7..a89db0b86d 100644 +index 82b8dae6e72..a89db0b86da 100644 --- a/internal/service/ec2/vpc_security_group.go +++ b/internal/service/ec2/vpc_security_group.go @@ -69,7 +69,7 @@ func resourceSecurityGroup() *schema.Resource { @@ -83,7 +83,7 @@ index 82b8dae6e7..a89db0b86d 100644 }, "egress": securityGroupRuleSetNestedBlock, diff --git a/internal/service/elasticache/parameter_group.go b/internal/service/elasticache/parameter_group.go -index 5a265a26d8..ecc1f2d6ac 100644 +index 5a265a26d89..ecc1f2d6acf 100644 --- a/internal/service/elasticache/parameter_group.go +++ b/internal/service/elasticache/parameter_group.go @@ -49,7 +49,7 @@ func resourceParameterGroup() *schema.Resource { @@ -96,7 +96,7 @@ index 5a265a26d8..ecc1f2d6ac 100644 names.AttrFamily: { Type: schema.TypeString, diff --git a/internal/service/elasticache/subnet_group.go b/internal/service/elasticache/subnet_group.go -index 89920a47e3..71f4a900d7 100644 +index 89920a47e3f..71f4a900d74 100644 --- a/internal/service/elasticache/subnet_group.go +++ b/internal/service/elasticache/subnet_group.go @@ -48,7 +48,7 @@ func resourceSubnetGroup() *schema.Resource { @@ -109,7 +109,7 @@ index 89920a47e3..71f4a900d7 100644 names.AttrName: { Type: schema.TypeString, diff --git a/internal/service/mediapackage/channel.go b/internal/service/mediapackage/channel.go -index 961d1f0438..710fd0b998 100644 +index 961d1f04380..710fd0b998f 100644 --- a/internal/service/mediapackage/channel.go +++ b/internal/service/mediapackage/channel.go @@ -51,7 +51,7 @@ func ResourceChannel() *schema.Resource { @@ -122,7 +122,7 @@ index 961d1f0438..710fd0b998 100644 "hls_ingest": { Type: schema.TypeList, diff --git a/internal/service/memorydb/cluster.go b/internal/service/memorydb/cluster.go -index f3a35c84e5..1e3027048a 100644 +index f3a35c84e5e..1e3027048a3 100644 --- a/internal/service/memorydb/cluster.go +++ b/internal/service/memorydb/cluster.go @@ -79,7 +79,7 @@ func resourceCluster() *schema.Resource { @@ -135,7 +135,7 @@ index f3a35c84e5..1e3027048a 100644 "engine_patch_version": { Type: schema.TypeString, diff --git a/internal/service/memorydb/parameter_group.go b/internal/service/memorydb/parameter_group.go -index 625357ac1b..c10f1daa43 100644 +index 625357ac1b2..c10f1daa43a 100644 --- a/internal/service/memorydb/parameter_group.go +++ b/internal/service/memorydb/parameter_group.go @@ -54,7 +54,7 @@ func resourceParameterGroup() *schema.Resource { @@ -148,7 +148,7 @@ index 625357ac1b..c10f1daa43 100644 names.AttrFamily: { Type: schema.TypeString, diff --git a/internal/service/memorydb/subnet_group.go b/internal/service/memorydb/subnet_group.go -index b01015569f..1e3d84acfa 100644 +index b01015569fa..1e3d84acfa1 100644 --- a/internal/service/memorydb/subnet_group.go +++ b/internal/service/memorydb/subnet_group.go @@ -49,7 +49,7 @@ func resourceSubnetGroup() *schema.Resource { @@ -161,7 +161,7 @@ index b01015569f..1e3d84acfa 100644 names.AttrName: { Type: schema.TypeString, diff --git a/internal/service/neptune/cluster_parameter_group.go b/internal/service/neptune/cluster_parameter_group.go -index b31cd660ef..8ec5d31fae 100644 +index b31cd660ef4..8ec5d31faed 100644 --- a/internal/service/neptune/cluster_parameter_group.go +++ b/internal/service/neptune/cluster_parameter_group.go @@ -49,7 +49,7 @@ func resourceClusterParameterGroup() *schema.Resource { @@ -174,7 +174,7 @@ index b31cd660ef..8ec5d31fae 100644 names.AttrFamily: { Type: schema.TypeString, diff --git a/internal/service/neptune/parameter_group.go b/internal/service/neptune/parameter_group.go -index df81d7c11b..518b7c2f11 100644 +index df81d7c11bb..518b7c2f117 100644 --- a/internal/service/neptune/parameter_group.go +++ b/internal/service/neptune/parameter_group.go @@ -55,7 +55,7 @@ func resourceParameterGroup() *schema.Resource { @@ -187,7 +187,7 @@ index df81d7c11b..518b7c2f11 100644 names.AttrFamily: { Type: schema.TypeString, diff --git a/internal/service/neptune/subnet_group.go b/internal/service/neptune/subnet_group.go -index 1d97895eea..45e74ae9ce 100644 +index 1d97895eeaa..45e74ae9ce8 100644 --- a/internal/service/neptune/subnet_group.go +++ b/internal/service/neptune/subnet_group.go @@ -45,7 +45,7 @@ func resourceSubnetGroup() *schema.Resource { @@ -200,7 +200,7 @@ index 1d97895eea..45e74ae9ce 100644 names.AttrName: { Type: schema.TypeString, diff --git a/internal/service/rds/cluster_parameter_group.go b/internal/service/rds/cluster_parameter_group.go -index 28a4a0c6ae..26112e8db5 100644 +index 28a4a0c6ae0..26112e8db51 100644 --- a/internal/service/rds/cluster_parameter_group.go +++ b/internal/service/rds/cluster_parameter_group.go @@ -51,7 +51,7 @@ func resourceClusterParameterGroup() *schema.Resource { @@ -213,7 +213,7 @@ index 28a4a0c6ae..26112e8db5 100644 names.AttrFamily: { Type: schema.TypeString, diff --git a/internal/service/rds/option_group.go b/internal/service/rds/option_group.go -index d19358fa76..b13859ab8e 100644 +index d19358fa76e..b13859ab8e3 100644 --- a/internal/service/rds/option_group.go +++ b/internal/service/rds/option_group.go @@ -127,7 +127,7 @@ func resourceOptionGroup() *schema.Resource { @@ -226,7 +226,7 @@ index d19358fa76..b13859ab8e 100644 names.AttrSkipDestroy: { Type: schema.TypeBool, diff --git a/internal/service/rds/parameter_group.go b/internal/service/rds/parameter_group.go -index 0e4ca3f870..c1e331f54f 100644 +index 0e4ca3f870e..c1e331f54fa 100644 --- a/internal/service/rds/parameter_group.go +++ b/internal/service/rds/parameter_group.go @@ -53,7 +53,7 @@ func resourceParameterGroup() *schema.Resource { @@ -239,7 +239,7 @@ index 0e4ca3f870..c1e331f54f 100644 names.AttrFamily: { Type: schema.TypeString, diff --git a/internal/service/rds/subnet_group.go b/internal/service/rds/subnet_group.go -index 646add5ad8..2731f4e425 100644 +index 646add5ad81..2731f4e425b 100644 --- a/internal/service/rds/subnet_group.go +++ b/internal/service/rds/subnet_group.go @@ -48,7 +48,7 @@ func resourceSubnetGroup() *schema.Resource { @@ -252,7 +252,7 @@ index 646add5ad8..2731f4e425 100644 names.AttrName: { Type: schema.TypeString, diff --git a/internal/service/redshift/parameter_group.go b/internal/service/redshift/parameter_group.go -index 0552e455d6..d413e1baf8 100644 +index 0552e455d6d..d413e1baf83 100644 --- a/internal/service/redshift/parameter_group.go +++ b/internal/service/redshift/parameter_group.go @@ -51,7 +51,7 @@ func resourceParameterGroup() *schema.Resource { @@ -265,7 +265,7 @@ index 0552e455d6..d413e1baf8 100644 names.AttrFamily: { Type: schema.TypeString, diff --git a/internal/service/redshift/subnet_group.go b/internal/service/redshift/subnet_group.go -index d95746d343..47390e9d5b 100644 +index d95746d3432..47390e9d5b6 100644 --- a/internal/service/redshift/subnet_group.go +++ b/internal/service/redshift/subnet_group.go @@ -46,7 +46,7 @@ func resourceSubnetGroup() *schema.Resource { @@ -278,7 +278,7 @@ index d95746d343..47390e9d5b 100644 names.AttrName: { Type: schema.TypeString, diff --git a/internal/service/route53/record.go b/internal/service/route53/record.go -index c190462b1f..580e21ede5 100644 +index c190462b1f4..580e21ede58 100644 --- a/internal/service/route53/record.go +++ b/internal/service/route53/record.go @@ -360,7 +360,7 @@ func resourceRecordCreate(ctx context.Context, d *schema.ResourceData, meta inte @@ -309,7 +309,7 @@ index c190462b1f..580e21ede5 100644 HostedZoneId: aws.String(zoneID), } diff --git a/internal/service/route53/zone.go b/internal/service/route53/zone.go -index 400486c2e4..74417dc9cb 100644 +index 400486c2e41..74417dc9cb0 100644 --- a/internal/service/route53/zone.go +++ b/internal/service/route53/zone.go @@ -52,7 +52,7 @@ func resourceZone() *schema.Resource { @@ -322,7 +322,7 @@ index 400486c2e4..74417dc9cb 100644 }, "delegation_set_id": { diff --git a/internal/service/route53/zone_association.go b/internal/service/route53/zone_association.go -index 6bf4c1ef12..19c08a7250 100644 +index 6bf4c1ef12f..19c08a72502 100644 --- a/internal/service/route53/zone_association.go +++ b/internal/service/route53/zone_association.go @@ -74,7 +74,7 @@ func resourceZoneAssociationCreate(ctx context.Context, d *schema.ResourceData, diff --git a/patches/0019-remove-required-elements-from-schema-and-fix-tests-7.patch b/patches/0019-remove-required-elements-from-schema-and-fix-tests-7.patch index 67570f9e5d..41d4358a49 100644 --- a/patches/0019-remove-required-elements-from-schema-and-fix-tests-7.patch +++ b/patches/0019-remove-required-elements-from-schema-and-fix-tests-7.patch @@ -6,7 +6,7 @@ Subject: [PATCH] remove required elements from schema and fix tests (#77) Co-authored-by: Lee Briggs diff --git a/internal/service/gamelift/matchmaking_configuration.go b/internal/service/gamelift/matchmaking_configuration.go -index e17f71e6b6..4a0ccf149d 100644 +index e17f71e6b66..4a0ccf149dc 100644 --- a/internal/service/gamelift/matchmaking_configuration.go +++ b/internal/service/gamelift/matchmaking_configuration.go @@ -29,7 +29,7 @@ func ResourceMatchMakingConfiguration() *schema.Resource { @@ -42,7 +42,7 @@ index e17f71e6b6..4a0ccf149d 100644 return nil diff --git a/internal/service/gamelift/matchmaking_configuration_test.go b/internal/service/gamelift/matchmaking_configuration_test.go -index 94c9a8c29b..339f9dd6df 100644 +index 94c9a8c29bd..339f9dd6dfa 100644 --- a/internal/service/gamelift/matchmaking_configuration_test.go +++ b/internal/service/gamelift/matchmaking_configuration_test.go @@ -1,6 +1,7 @@ @@ -169,7 +169,7 @@ index 94c9a8c29b..339f9dd6df 100644 }) diff --git a/internal/service/gamelift/matchmaking_rule_set.go b/internal/service/gamelift/matchmaking_rule_set.go -index 254c96efc6..54b86a0426 100644 +index 254c96efc6e..54b86a0426a 100644 --- a/internal/service/gamelift/matchmaking_rule_set.go +++ b/internal/service/gamelift/matchmaking_rule_set.go @@ -119,11 +119,11 @@ func resourceMatchmakingRuleSetRead(ctx context.Context, d *schema.ResourceData, @@ -187,7 +187,7 @@ index 254c96efc6..54b86a0426 100644 return nil diff --git a/internal/service/gamelift/matchmaking_rule_set_test.go b/internal/service/gamelift/matchmaking_rule_set_test.go -index 9dbf039588..061e93f186 100644 +index 9dbf0395884..061e93f186b 100644 --- a/internal/service/gamelift/matchmaking_rule_set_test.go +++ b/internal/service/gamelift/matchmaking_rule_set_test.go @@ -1,6 +1,7 @@ diff --git a/patches/0020-Temp-remove-cognito_identity_pool_roles_attachment-e.patch b/patches/0020-Temp-remove-cognito_identity_pool_roles_attachment-e.patch index 868c10ed8f..c33e0a673a 100644 --- a/patches/0020-Temp-remove-cognito_identity_pool_roles_attachment-e.patch +++ b/patches/0020-Temp-remove-cognito_identity_pool_roles_attachment-e.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Temp remove cognito_identity_pool_roles_attachment example diff --git a/website/docs/r/cognito_identity_pool_roles_attachment.html.markdown b/website/docs/r/cognito_identity_pool_roles_attachment.html.markdown -index 23c0000bb6..d56a26e5f0 100644 +index 23c0000bb68..d56a26e5f0b 100644 --- a/website/docs/r/cognito_identity_pool_roles_attachment.html.markdown +++ b/website/docs/r/cognito_identity_pool_roles_attachment.html.markdown @@ -12,87 +12,6 @@ Provides an AWS Cognito Identity Pool Roles Attachment. diff --git a/patches/0021-Fix-elbv2-target-group-read-to-workaround-2517.patch b/patches/0021-Fix-elbv2-target-group-read-to-workaround-2517.patch index 5ee91dbdc0..b1e83199e8 100644 --- a/patches/0021-Fix-elbv2-target-group-read-to-workaround-2517.patch +++ b/patches/0021-Fix-elbv2-target-group-read-to-workaround-2517.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Fix elbv2 target group read to workaround #2517 diff --git a/internal/service/elbv2/target_group.go b/internal/service/elbv2/target_group.go -index 4ebb52c2eb..80fc8ed5b1 100644 +index 4ebb52c2eb6..80fc8ed5b16 100644 --- a/internal/service/elbv2/target_group.go +++ b/internal/service/elbv2/target_group.go @@ -635,19 +635,19 @@ func resourceTargetGroupRead(ctx context.Context, d *schema.ResourceData, meta i diff --git a/patches/0022-Fix-spurrious-json-diff-for-redrive_policy.patch b/patches/0022-Fix-spurrious-json-diff-for-redrive_policy.patch index 1d2c75b27a..321a4f920a 100644 --- a/patches/0022-Fix-spurrious-json-diff-for-redrive_policy.patch +++ b/patches/0022-Fix-spurrious-json-diff-for-redrive_policy.patch @@ -9,7 +9,7 @@ in state. Fix for https://github.com/pulumi/pulumi-aws/issues/2307. diff --git a/internal/service/sqs/queue_redrive_policy.go b/internal/service/sqs/queue_redrive_policy.go -index 3d871cf4d7..30ced084d0 100644 +index 3d871cf4d7e..30ced084d0d 100644 --- a/internal/service/sqs/queue_redrive_policy.go +++ b/internal/service/sqs/queue_redrive_policy.go @@ -32,9 +32,10 @@ func resourceQueueRedrivePolicy() *schema.Resource { diff --git a/patches/0023-Provide-context-to-conns.patch b/patches/0023-Provide-context-to-conns.patch index 0d314882f6..5997dceaed 100644 --- a/patches/0023-Provide-context-to-conns.patch +++ b/patches/0023-Provide-context-to-conns.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Provide context to conns diff --git a/internal/service/ecr/credentials_data_source.go b/internal/service/ecr/credentials_data_source.go -index b6e19a7283..9176fa0a16 100644 +index b6e19a72839..9176fa0a161 100644 --- a/internal/service/ecr/credentials_data_source.go +++ b/internal/service/ecr/credentials_data_source.go @@ -1,6 +1,7 @@ @@ -27,7 +27,7 @@ index b6e19a7283..9176fa0a16 100644 registryID := d.Get("registry_id").(string) log.Printf("[DEBUG] Reading ECR repository credentials %s", registryID) diff --git a/internal/service/gamelift/matchmaking_configuration.go b/internal/service/gamelift/matchmaking_configuration.go -index 4a0ccf149d..72f7d31d85 100644 +index 4a0ccf149dc..72f7d31d857 100644 --- a/internal/service/gamelift/matchmaking_configuration.go +++ b/internal/service/gamelift/matchmaking_configuration.go @@ -146,7 +146,7 @@ func ResourceMatchMakingConfiguration() *schema.Resource { @@ -85,7 +85,7 @@ index 4a0ccf149d..72f7d31d85 100644 _, err := conn.DeleteMatchmakingConfiguration(&gamelift.DeleteMatchmakingConfigurationInput{ Name: aws.String(d.Id()), diff --git a/internal/service/gamelift/matchmaking_rule_set.go b/internal/service/gamelift/matchmaking_rule_set.go -index 54b86a0426..d9f2424b7a 100644 +index 54b86a0426a..d9f2424b7a3 100644 --- a/internal/service/gamelift/matchmaking_rule_set.go +++ b/internal/service/gamelift/matchmaking_rule_set.go @@ -58,7 +58,7 @@ func ResourceMatchmakingRuleSet() *schema.Resource { @@ -143,7 +143,7 @@ index 54b86a0426..d9f2424b7a 100644 _, err := conn.DeleteMatchmakingRuleSet(&gamelift.DeleteMatchmakingRuleSetInput{ Name: aws.String(d.Id()), diff --git a/internal/service/s3legacy/bucket_legacy.go b/internal/service/s3legacy/bucket_legacy.go -index 0e1e17baa3..dc93531e67 100644 +index 0e1e17baa33..dc93531e67c 100644 --- a/internal/service/s3legacy/bucket_legacy.go +++ b/internal/service/s3legacy/bucket_legacy.go @@ -673,7 +673,7 @@ func ResourceBucketLegacy() *schema.Resource { diff --git a/patches/0024-Match-the-tags-behavior-of-other-resources.patch b/patches/0024-Match-the-tags-behavior-of-other-resources.patch index 51b53456f2..783301e678 100644 --- a/patches/0024-Match-the-tags-behavior-of-other-resources.patch +++ b/patches/0024-Match-the-tags-behavior-of-other-resources.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Match the "tags" behavior of other resources diff --git a/internal/service/s3legacy/bucket_legacy.go b/internal/service/s3legacy/bucket_legacy.go -index dc93531e67..1da08293c4 100644 +index dc93531e67c..1da08293c49 100644 --- a/internal/service/s3legacy/bucket_legacy.go +++ b/internal/service/s3legacy/bucket_legacy.go @@ -31,6 +31,7 @@ import ( diff --git a/patches/0025-move-shim-logic-to-upstream-as-a-patch.patch b/patches/0025-move-shim-logic-to-upstream-as-a-patch.patch index bcccdba0cd..52f1fc2d4d 100644 --- a/patches/0025-move-shim-logic-to-upstream-as-a-patch.patch +++ b/patches/0025-move-shim-logic-to-upstream-as-a-patch.patch @@ -6,7 +6,7 @@ Subject: [PATCH] move shim logic to upstream as a patch diff --git a/shim/shim.go b/shim/shim.go new file mode 100644 -index 0000000000..2af7c06925 +index 00000000000..2af7c069252 --- /dev/null +++ b/shim/shim.go @@ -0,0 +1,36 @@ diff --git a/patches/0026-Restore-S3ConnURICleaningDisabled.patch b/patches/0026-Restore-S3ConnURICleaningDisabled.patch index 9d1b9582ad..f15c278259 100644 --- a/patches/0026-Restore-S3ConnURICleaningDisabled.patch +++ b/patches/0026-Restore-S3ConnURICleaningDisabled.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Restore S3ConnURICleaningDisabled diff --git a/internal/conns/awsclient_extra.go b/internal/conns/awsclient_extra.go new file mode 100644 -index 0000000000..96c809fc47 +index 00000000000..96c809fc475 --- /dev/null +++ b/internal/conns/awsclient_extra.go @@ -0,0 +1,22 @@ diff --git a/patches/0027-Do-not-compute-tags_all-at-TF-level.patch b/patches/0027-Do-not-compute-tags_all-at-TF-level.patch index 2c4fe408ed..87430bd601 100644 --- a/patches/0027-Do-not-compute-tags_all-at-TF-level.patch +++ b/patches/0027-Do-not-compute-tags_all-at-TF-level.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Do not compute tags_all at TF level diff --git a/internal/framework/resource_with_configure.go b/internal/framework/resource_with_configure.go -index 6ece15b4f4..89844a1233 100644 +index 6ece15b4f4e..89844a12330 100644 --- a/internal/framework/resource_with_configure.go +++ b/internal/framework/resource_with_configure.go @@ -30,6 +30,11 @@ func (r *ResourceWithConfigure) Configure(_ context.Context, request resource.Co @@ -21,7 +21,7 @@ index 6ece15b4f4..89844a1233 100644 if request.Plan.Raw.IsNull() { return diff --git a/internal/provider/fwprovider/provider.go b/internal/provider/fwprovider/provider.go -index c6408919dd..e57aa07e8f 100644 +index c6408919ddf..e57aa07e8f8 100644 --- a/internal/provider/fwprovider/provider.go +++ b/internal/provider/fwprovider/provider.go @@ -435,8 +435,8 @@ func (p *fwprovider) Resources(ctx context.Context) []func() resource.Resource { @@ -36,7 +36,7 @@ index c6408919dd..e57aa07e8f 100644 } } else { diff --git a/internal/service/appconfig/environment.go b/internal/service/appconfig/environment.go -index 78e0e9656d..ef2377b287 100644 +index 78e0e9656d2..ef2377b2874 100644 --- a/internal/service/appconfig/environment.go +++ b/internal/service/appconfig/environment.go @@ -103,7 +103,7 @@ func (r *resourceEnvironment) Schema(ctx context.Context, request resource.Schem @@ -49,7 +49,7 @@ index 78e0e9656d..ef2377b287 100644 Blocks: map[string]schema.Block{ "monitor": schema.SetNestedBlock{ diff --git a/internal/service/auditmanager/assessment.go b/internal/service/auditmanager/assessment.go -index 459438b54d..05a49d1f51 100644 +index 459438b54d6..05a49d1f511 100644 --- a/internal/service/auditmanager/assessment.go +++ b/internal/service/auditmanager/assessment.go @@ -95,7 +95,7 @@ func (r *resourceAssessment) Schema(ctx context.Context, req resource.SchemaRequ @@ -62,7 +62,7 @@ index 459438b54d..05a49d1f51 100644 Blocks: map[string]schema.Block{ "assessment_reports_destination": schema.ListNestedBlock{ diff --git a/internal/service/auditmanager/control.go b/internal/service/auditmanager/control.go -index 2204efea5a..7c4d78f993 100644 +index 2204efea5ab..7c4d78f993b 100644 --- a/internal/service/auditmanager/control.go +++ b/internal/service/auditmanager/control.go @@ -67,7 +67,7 @@ func (r *resourceControl) Schema(ctx context.Context, req resource.SchemaRequest @@ -75,7 +75,7 @@ index 2204efea5a..7c4d78f993 100644 Optional: true, }, diff --git a/internal/service/auditmanager/framework.go b/internal/service/auditmanager/framework.go -index bd15eca435..1733d9a441 100644 +index bd15eca4358..1733d9a4416 100644 --- a/internal/service/auditmanager/framework.go +++ b/internal/service/auditmanager/framework.go @@ -69,7 +69,7 @@ func (r *resourceFramework) Schema(ctx context.Context, req resource.SchemaReque @@ -88,7 +88,7 @@ index bd15eca435..1733d9a441 100644 Blocks: map[string]schema.Block{ "control_sets": schema.SetNestedBlock{ diff --git a/internal/service/batch/job_queue.go b/internal/service/batch/job_queue.go -index fc193b631b..74497d80ff 100644 +index fc193b631bb..74497d80ff5 100644 --- a/internal/service/batch/job_queue.go +++ b/internal/service/batch/job_queue.go @@ -97,7 +97,7 @@ func (r *jobQueueResource) Schema(ctx context.Context, request resource.SchemaRe @@ -101,7 +101,7 @@ index fc193b631b..74497d80ff 100644 Blocks: map[string]schema.Block{ names.AttrTimeouts: timeouts.Block(ctx, timeouts.Opts{ diff --git a/internal/service/batch/job_queue_migrate.go b/internal/service/batch/job_queue_migrate.go -index 3d442ce442..d4c8454958 100644 +index 3d442ce4420..d4c84549589 100644 --- a/internal/service/batch/job_queue_migrate.go +++ b/internal/service/batch/job_queue_migrate.go @@ -39,7 +39,7 @@ func jobQueueSchema0(ctx context.Context) schema.Schema { @@ -114,7 +114,7 @@ index 3d442ce442..d4c8454958 100644 Blocks: map[string]schema.Block{ names.AttrTimeouts: timeouts.Block(ctx, timeouts.Opts{ diff --git a/internal/service/ec2/ec2_instance_connect_endpoint.go b/internal/service/ec2/ec2_instance_connect_endpoint.go -index 737b09ac5a..f966d8ed3e 100644 +index 737b09ac5a5..f966d8ed3e7 100644 --- a/internal/service/ec2/ec2_instance_connect_endpoint.go +++ b/internal/service/ec2/ec2_instance_connect_endpoint.go @@ -118,7 +118,7 @@ func (r *instanceConnectEndpointResource) Schema(ctx context.Context, req resour @@ -127,7 +127,7 @@ index 737b09ac5a..f966d8ed3e 100644 Computed: true, PlanModifiers: []planmodifier.String{ diff --git a/internal/service/ec2/vpc_security_group_ingress_rule.go b/internal/service/ec2/vpc_security_group_ingress_rule.go -index 7f4a4c5f04..972c372323 100644 +index 7f4a4c5f043..972c3723231 100644 --- a/internal/service/ec2/vpc_security_group_ingress_rule.go +++ b/internal/service/ec2/vpc_security_group_ingress_rule.go @@ -228,7 +228,7 @@ func (r *securityGroupRuleResource) Schema(ctx context.Context, request resource @@ -140,7 +140,7 @@ index 7f4a4c5f04..972c372323 100644 Optional: true, Validators: []validator.Int64{ diff --git a/internal/service/lexv2models/bot.go b/internal/service/lexv2models/bot.go -index 75e5b7f1b9..8de291d05f 100644 +index 75e5b7f1b9e..8de291d05f3 100644 --- a/internal/service/lexv2models/bot.go +++ b/internal/service/lexv2models/bot.go @@ -82,7 +82,7 @@ func (r *resourceBot) Schema(ctx context.Context, req resource.SchemaRequest, re @@ -153,7 +153,7 @@ index 75e5b7f1b9..8de291d05f 100644 ElementType: types.StringType, Optional: true, diff --git a/internal/service/opensearchserverless/collection.go b/internal/service/opensearchserverless/collection.go -index e2dfcda3c8..e524fcad2d 100644 +index e2dfcda3c8e..e524fcad2d5 100644 --- a/internal/service/opensearchserverless/collection.go +++ b/internal/service/opensearchserverless/collection.go @@ -124,7 +124,7 @@ func (r *resourceCollection) Schema(ctx context.Context, req resource.SchemaRequ @@ -166,7 +166,7 @@ index e2dfcda3c8..e524fcad2d 100644 Optional: true, Computed: true, diff --git a/internal/service/quicksight/namespace.go b/internal/service/quicksight/namespace.go -index 404f657e01..ceb29112cf 100644 +index 404f657e010..ceb29112cf4 100644 --- a/internal/service/quicksight/namespace.go +++ b/internal/service/quicksight/namespace.go @@ -98,7 +98,7 @@ func (r *namespaceResource) Schema(ctx context.Context, req resource.SchemaReque @@ -179,7 +179,7 @@ index 404f657e01..ceb29112cf 100644 Blocks: map[string]schema.Block{ names.AttrTimeouts: timeouts.Block(ctx, timeouts.Opts{ diff --git a/internal/service/quicksight/vpc_connection.go b/internal/service/quicksight/vpc_connection.go -index 8607c6dc0d..eb2e74d1d6 100644 +index 8607c6dc0dd..eb2e74d1d60 100644 --- a/internal/service/quicksight/vpc_connection.go +++ b/internal/service/quicksight/vpc_connection.go @@ -141,7 +141,7 @@ func (r *vpcConnectionResource) Schema(ctx context.Context, req resource.SchemaR @@ -192,7 +192,7 @@ index 8607c6dc0d..eb2e74d1d6 100644 Blocks: map[string]schema.Block{ names.AttrTimeouts: timeouts.Block(ctx, timeouts.Opts{ diff --git a/internal/service/resourceexplorer2/index.go b/internal/service/resourceexplorer2/index.go -index ff89093f18..f8fd12370f 100644 +index ff89093f18d..f8fd12370f0 100644 --- a/internal/service/resourceexplorer2/index.go +++ b/internal/service/resourceexplorer2/index.go @@ -58,7 +58,7 @@ func (r *indexResource) Schema(ctx context.Context, request resource.SchemaReque @@ -205,7 +205,7 @@ index ff89093f18..f8fd12370f 100644 CustomType: fwtypes.StringEnumType[awstypes.IndexType](), Required: true, diff --git a/internal/service/resourceexplorer2/view.go b/internal/service/resourceexplorer2/view.go -index 414ac271d1..9172d35477 100644 +index 414ac271d1c..9172d354778 100644 --- a/internal/service/resourceexplorer2/view.go +++ b/internal/service/resourceexplorer2/view.go @@ -81,7 +81,7 @@ func (r *viewResource) Schema(ctx context.Context, request resource.SchemaReques @@ -218,7 +218,7 @@ index 414ac271d1..9172d35477 100644 Blocks: map[string]schema.Block{ "filters": schema.ListNestedBlock{ diff --git a/internal/service/workspaces/connection_alias.go b/internal/service/workspaces/connection_alias.go -index 789e374885..d5a771ce81 100644 +index 789e3748850..d5a771ce81e 100644 --- a/internal/service/workspaces/connection_alias.go +++ b/internal/service/workspaces/connection_alias.go @@ -75,7 +75,7 @@ func (r *connectionAliasResource) Schema(ctx context.Context, request resource.S @@ -231,7 +231,7 @@ index 789e374885..d5a771ce81 100644 Blocks: map[string]schema.Block{ names.AttrTimeouts: timeouts.Block(ctx, timeouts.Opts{ diff --git a/internal/verify/diff.go b/internal/verify/diff.go -index afffb80b4a..afb980ec65 100644 +index afffb80b4a9..afb980ec65b 100644 --- a/internal/verify/diff.go +++ b/internal/verify/diff.go @@ -22,6 +22,11 @@ import ( @@ -247,7 +247,7 @@ index afffb80b4a..afb980ec65 100644 ignoreTagsConfig := meta.(*conns.AWSClient).IgnoreTagsConfig(ctx) diff --git a/shim/shim.go b/shim/shim.go -index 2af7c06925..ce64074bfd 100644 +index 2af7c069252..ce64074bfd4 100644 --- a/shim/shim.go +++ b/shim/shim.go @@ -20,6 +20,9 @@ func NewUpstreamProvider(ctx context.Context) (UpstreamProvider, error) { diff --git a/patches/0028-aws_eks_cluster-implement-default_addons_to_remove.patch b/patches/0028-aws_eks_cluster-implement-default_addons_to_remove.patch index 046a15a2aa..c9e2bf19aa 100644 --- a/patches/0028-aws_eks_cluster-implement-default_addons_to_remove.patch +++ b/patches/0028-aws_eks_cluster-implement-default_addons_to_remove.patch @@ -5,7 +5,7 @@ Subject: [PATCH] aws_eks_cluster: implement default_addons_to_remove diff --git a/internal/service/eks/cluster.go b/internal/service/eks/cluster.go -index c2b5a975a9..0440141a4b 100644 +index c2b5a975a98..0440141a4ba 100644 --- a/internal/service/eks/cluster.go +++ b/internal/service/eks/cluster.go @@ -183,6 +183,13 @@ func resourceCluster() *schema.Resource { @@ -37,7 +37,7 @@ index c2b5a975a9..0440141a4b 100644 func resourceClusterRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { diff --git a/internal/service/eks/cluster_addon_removal.go b/internal/service/eks/cluster_addon_removal.go new file mode 100644 -index 0000000000..681579735e +index 00000000000..681579735e6 --- /dev/null +++ b/internal/service/eks/cluster_addon_removal.go @@ -0,0 +1,141 @@ diff --git a/patches/0029-Fix-markTagsAllNotComputedForResources-to-recognize-.patch b/patches/0029-Fix-markTagsAllNotComputedForResources-to-recognize-.patch index 1a5fe1cd48..cc6e709146 100644 --- a/patches/0029-Fix-markTagsAllNotComputedForResources-to-recognize-.patch +++ b/patches/0029-Fix-markTagsAllNotComputedForResources-to-recognize-.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Fix markTagsAllNotComputedForResources to recognize diff --git a/shim/shim.go b/shim/shim.go -index ce64074bfd..e24e53fe17 100644 +index ce64074bfd4..e24e53fe17f 100644 --- a/shim/shim.go +++ b/shim/shim.go @@ -2,6 +2,7 @@ package shim diff --git a/patches/0030-Optimize-startup-performance.patch b/patches/0030-Optimize-startup-performance.patch index 6dfc9baa96..577e57e1f9 100644 --- a/patches/0030-Optimize-startup-performance.patch +++ b/patches/0030-Optimize-startup-performance.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Optimize startup performance diff --git a/internal/provider/provider.go b/internal/provider/provider.go -index 30ebfcf0f3..4c83f4bb1c 100644 +index 30ebfcf0f30..4c83f4bb1c4 100644 --- a/internal/provider/provider.go +++ b/internal/provider/provider.go @@ -317,7 +317,7 @@ func New(ctx context.Context) (*schema.Provider, error) { @@ -28,7 +28,7 @@ index 30ebfcf0f3..4c83f4bb1c 100644 // Ensure that the schema look OK. diff --git a/internal/provider/provider_tagcheck.go b/internal/provider/provider_tagcheck.go new file mode 100644 -index 0000000000..8cea6059ba +index 00000000000..8cea6059ba2 --- /dev/null +++ b/internal/provider/provider_tagcheck.go @@ -0,0 +1,37 @@ @@ -70,7 +70,7 @@ index 0000000000..8cea6059ba + return r.SchemaMap() +} diff --git a/shim/shim.go b/shim/shim.go -index e24e53fe17..3378f955bb 100644 +index e24e53fe17f..3378f955bb9 100644 --- a/shim/shim.go +++ b/shim/shim.go @@ -17,7 +17,7 @@ type UpstreamProvider struct { diff --git a/patches/0031-DisableTagSchemaCheck-for-PF-provider.patch b/patches/0031-DisableTagSchemaCheck-for-PF-provider.patch index ea5d6684cb..748ea6807d 100644 --- a/patches/0031-DisableTagSchemaCheck-for-PF-provider.patch +++ b/patches/0031-DisableTagSchemaCheck-for-PF-provider.patch @@ -5,7 +5,7 @@ Subject: [PATCH] DisableTagSchemaCheck for PF provider diff --git a/internal/provider/fwprovider/provider.go b/internal/provider/fwprovider/provider.go -index e57aa07e8f..a64bcd031d 100644 +index e57aa07e8f8..a64bcd031da 100644 --- a/internal/provider/fwprovider/provider.go +++ b/internal/provider/fwprovider/provider.go @@ -422,8 +422,7 @@ func (p *fwprovider) Resources(ctx context.Context) []func() resource.Resource { @@ -20,7 +20,7 @@ index e57aa07e8f..a64bcd031d 100644 if v.IsComputed() { diff --git a/internal/provider/fwprovider/provider_tagscheck.go b/internal/provider/fwprovider/provider_tagscheck.go new file mode 100644 -index 0000000000..f790acb4e2 +index 00000000000..f790acb4e25 --- /dev/null +++ b/internal/provider/fwprovider/provider_tagscheck.go @@ -0,0 +1,43 @@ @@ -68,7 +68,7 @@ index 0000000000..f790acb4e2 + return &resp +} diff --git a/shim/shim.go b/shim/shim.go -index 3378f955bb..b94f722d26 100644 +index 3378f955bb9..b94f722d26c 100644 --- a/shim/shim.go +++ b/shim/shim.go @@ -17,6 +17,7 @@ type UpstreamProvider struct { diff --git a/patches/0032-Run-scripts-patch_computed_only.sh-to-patch-eks-pod_.patch b/patches/0032-Run-scripts-patch_computed_only.sh-to-patch-eks-pod_.patch index d2814888b9..9c64f0b2e0 100644 --- a/patches/0032-Run-scripts-patch_computed_only.sh-to-patch-eks-pod_.patch +++ b/patches/0032-Run-scripts-patch_computed_only.sh-to-patch-eks-pod_.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Run scripts/patch_computed_only.sh to patch diff --git a/internal/service/docdbelastic/cluster.go b/internal/service/docdbelastic/cluster.go -index a8cdeec386..6d8306a0a9 100644 +index a8cdeec386a..6d8306a0a97 100644 --- a/internal/service/docdbelastic/cluster.go +++ b/internal/service/docdbelastic/cluster.go @@ -147,7 +147,7 @@ func (r *resourceCluster) Schema(ctx context.Context, _ resource.SchemaRequest, @@ -19,7 +19,7 @@ index a8cdeec386..6d8306a0a9 100644 CustomType: fwtypes.SetOfStringType, Optional: true, diff --git a/internal/service/eks/pod_identity_association.go b/internal/service/eks/pod_identity_association.go -index ce583fa5c4..9fdeea49d8 100644 +index ce583fa5c40..9fdeea49d87 100644 --- a/internal/service/eks/pod_identity_association.go +++ b/internal/service/eks/pod_identity_association.go @@ -105,7 +105,7 @@ func (r *podIdentityAssociationResource) Schema(ctx context.Context, req resourc @@ -32,7 +32,7 @@ index ce583fa5c4..9fdeea49d8 100644 } } diff --git a/internal/service/s3control/access_grant.go b/internal/service/s3control/access_grant.go -index 4f7e38caed..c3e235d110 100644 +index 4f7e38caed8..c3e235d110c 100644 --- a/internal/service/s3control/access_grant.go +++ b/internal/service/s3control/access_grant.go @@ -102,7 +102,7 @@ func (r *accessGrantResource) Schema(ctx context.Context, request resource.Schem @@ -45,7 +45,7 @@ index 4f7e38caed..c3e235d110 100644 Blocks: map[string]schema.Block{ "access_grants_location_configuration": schema.ListNestedBlock{ diff --git a/internal/service/s3control/access_grants_instance.go b/internal/service/s3control/access_grants_instance.go -index 24ce989902..7643c9f867 100644 +index 24ce989902a..7643c9f8671 100644 --- a/internal/service/s3control/access_grants_instance.go +++ b/internal/service/s3control/access_grants_instance.go @@ -82,7 +82,7 @@ func (r *accessGrantsInstanceResource) Schema(ctx context.Context, request resou @@ -58,7 +58,7 @@ index 24ce989902..7643c9f867 100644 } } diff --git a/internal/service/s3control/access_grants_location.go b/internal/service/s3control/access_grants_location.go -index e29fdacea7..ebfe15e942 100644 +index e29fdacea73..ebfe15e9420 100644 --- a/internal/service/s3control/access_grants_location.go +++ b/internal/service/s3control/access_grants_location.go @@ -83,7 +83,7 @@ func (r *accessGrantsLocationResource) Schema(ctx context.Context, request resou diff --git a/patches/0033-Fail-fast-when-PF-resources-are-dropped.patch b/patches/0033-Fail-fast-when-PF-resources-are-dropped.patch index b008afbd52..a575278c36 100644 --- a/patches/0033-Fail-fast-when-PF-resources-are-dropped.patch +++ b/patches/0033-Fail-fast-when-PF-resources-are-dropped.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Fail fast when PF resources are dropped diff --git a/internal/provider/fwprovider/provider.go b/internal/provider/fwprovider/provider.go -index a64bcd031d..0d730c8ea4 100644 +index a64bcd031da..0d730c8ea43 100644 --- a/internal/provider/fwprovider/provider.go +++ b/internal/provider/fwprovider/provider.go @@ -453,9 +453,8 @@ func (p *fwprovider) Resources(ctx context.Context) []func() resource.Resource { diff --git a/patches/0034-Fix-tags_all-Computed-for-PF-resources.patch b/patches/0034-Fix-tags_all-Computed-for-PF-resources.patch index fe968d4648..46720243b5 100644 --- a/patches/0034-Fix-tags_all-Computed-for-PF-resources.patch +++ b/patches/0034-Fix-tags_all-Computed-for-PF-resources.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Fix tags_all Computed for PF resources diff --git a/internal/service/amp/scraper.go b/internal/service/amp/scraper.go -index b6d8c71ef7..f78c4502b0 100644 +index b6d8c71ef73..f78c4502b0e 100644 --- a/internal/service/amp/scraper.go +++ b/internal/service/amp/scraper.go @@ -84,7 +84,7 @@ func (r *scraperResource) Schema(ctx context.Context, req resource.SchemaRequest @@ -18,7 +18,7 @@ index b6d8c71ef7..f78c4502b0 100644 Blocks: map[string]schema.Block{ names.AttrDestination: schema.ListNestedBlock{ diff --git a/internal/service/bedrock/custom_model.go b/internal/service/bedrock/custom_model.go -index 7d1bbff332..0b7cdf8f23 100644 +index 7d1bbff3328..0b7cdf8f235 100644 --- a/internal/service/bedrock/custom_model.go +++ b/internal/service/bedrock/custom_model.go @@ -139,7 +139,7 @@ func (r *customModelResource) Schema(ctx context.Context, request resource.Schem @@ -31,7 +31,7 @@ index 7d1bbff332..0b7cdf8f23 100644 "validation_metrics": framework.ResourceComputedListOfObjectAttribute[validatorMetricModel](ctx), }, diff --git a/internal/service/codeguruprofiler/profiling_group.go b/internal/service/codeguruprofiler/profiling_group.go -index 6e8d8de302..af48127242 100644 +index 6e8d8de302c..af481272426 100644 --- a/internal/service/codeguruprofiler/profiling_group.go +++ b/internal/service/codeguruprofiler/profiling_group.go @@ -73,7 +73,7 @@ func (r *resourceProfilingGroup) Schema(ctx context.Context, req resource.Schema @@ -44,7 +44,7 @@ index 6e8d8de302..af48127242 100644 Blocks: map[string]schema.Block{ "agent_orchestration_config": schema.ListNestedBlock{ diff --git a/internal/service/elasticache/serverless_cache.go b/internal/service/elasticache/serverless_cache.go -index bb7f36bf1e..fe8ed6366b 100644 +index bb7f36bf1ea..fe8ed6366b7 100644 --- a/internal/service/elasticache/serverless_cache.go +++ b/internal/service/elasticache/serverless_cache.go @@ -181,7 +181,7 @@ func (r *serverlessCacheResource) Schema(ctx context.Context, request resource.S @@ -57,7 +57,7 @@ index bb7f36bf1e..fe8ed6366b 100644 Optional: true, }, diff --git a/internal/service/rekognition/collection.go b/internal/service/rekognition/collection.go -index a9bb3bb327..9f68386f3a 100644 +index a9bb3bb3278..9f68386f3a8 100644 --- a/internal/service/rekognition/collection.go +++ b/internal/service/rekognition/collection.go @@ -77,7 +77,7 @@ func (r *resourceCollection) Schema(ctx context.Context, req resource.SchemaRequ @@ -70,7 +70,7 @@ index a9bb3bb327..9f68386f3a 100644 } diff --git a/internal/service/securityhub/automation_rule.go b/internal/service/securityhub/automation_rule.go -index 979de8b5bd..4c1f5dc706 100644 +index 979de8b5bd9..4c1f5dc7065 100644 --- a/internal/service/securityhub/automation_rule.go +++ b/internal/service/securityhub/automation_rule.go @@ -78,7 +78,7 @@ func (r *automationRuleResource) Schema(ctx context.Context, request resource.Sc @@ -83,7 +83,7 @@ index 979de8b5bd..4c1f5dc706 100644 Blocks: map[string]schema.Block{ names.AttrActions: schema.SetNestedBlock{ diff --git a/internal/service/securitylake/data_lake.go b/internal/service/securitylake/data_lake.go -index 43fdbadef0..c894d522a4 100644 +index 43fdbadef0f..c894d522a4f 100644 --- a/internal/service/securitylake/data_lake.go +++ b/internal/service/securitylake/data_lake.go @@ -75,7 +75,7 @@ func (r *dataLakeResource) Schema(ctx context.Context, request resource.SchemaRe @@ -96,7 +96,7 @@ index 43fdbadef0..c894d522a4 100644 Blocks: map[string]schema.Block{ names.AttrConfiguration: schema.ListNestedBlock{ diff --git a/internal/service/ssmcontacts/rotation.go b/internal/service/ssmcontacts/rotation.go -index 11948143a7..e8f145f886 100644 +index 11948143a78..e8f145f886b 100644 --- a/internal/service/ssmcontacts/rotation.go +++ b/internal/service/ssmcontacts/rotation.go @@ -72,7 +72,7 @@ func (r *resourceRotation) Schema(ctx context.Context, request resource.SchemaRe @@ -109,7 +109,7 @@ index 11948143a7..e8f145f886 100644 Required: true, }, diff --git a/internal/service/ssoadmin/application.go b/internal/service/ssoadmin/application.go -index 63a02f6ed6..ae5c3b3b8a 100644 +index 63a02f6ed6b..ae5c3b3b8a4 100644 --- a/internal/service/ssoadmin/application.go +++ b/internal/service/ssoadmin/application.go @@ -96,7 +96,7 @@ func (r *resourceApplication) Schema(ctx context.Context, req resource.SchemaReq @@ -122,7 +122,7 @@ index 63a02f6ed6..ae5c3b3b8a 100644 Blocks: map[string]schema.Block{ "portal_options": schema.ListNestedBlock{ diff --git a/internal/service/ssoadmin/trusted_token_issuer.go b/internal/service/ssoadmin/trusted_token_issuer.go -index 2d53c30eb3..cac1815b0f 100644 +index 2d53c30eb35..cac1815b0f9 100644 --- a/internal/service/ssoadmin/trusted_token_issuer.go +++ b/internal/service/ssoadmin/trusted_token_issuer.go @@ -86,7 +86,7 @@ func (r *resourceTrustedTokenIssuer) Schema(ctx context.Context, req resource.Sc diff --git a/patches/0035-Disable-retry-for-KMS-access-denied-in-lambda.patch b/patches/0035-Disable-retry-for-KMS-access-denied-in-lambda.patch index 8c3a69a6d9..f6f0664e31 100644 --- a/patches/0035-Disable-retry-for-KMS-access-denied-in-lambda.patch +++ b/patches/0035-Disable-retry-for-KMS-access-denied-in-lambda.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Disable retry for KMS access denied in lambda diff --git a/internal/service/lambda/service_package_extra.go b/internal/service/lambda/service_package_extra.go new file mode 100644 -index 0000000000..79867519db +index 00000000000..79867519db5 --- /dev/null +++ b/internal/service/lambda/service_package_extra.go @@ -0,0 +1,34 @@ @@ -45,7 +45,7 @@ index 0000000000..79867519db + } +} diff --git a/internal/service/lambda/service_package_gen.go b/internal/service/lambda/service_package_gen.go -index 08cd796328..178d5ba23e 100644 +index 08cd796328f..178d5ba23ea 100644 --- a/internal/service/lambda/service_package_gen.go +++ b/internal/service/lambda/service_package_gen.go @@ -160,6 +160,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( diff --git a/patches/0036-Patch-ACM-retry-to-not-retry-after-LimitExceededExce.patch b/patches/0036-Patch-ACM-retry-to-not-retry-after-LimitExceededExce.patch index 64dd90c24a..ec59306f9e 100644 --- a/patches/0036-Patch-ACM-retry-to-not-retry-after-LimitExceededExce.patch +++ b/patches/0036-Patch-ACM-retry-to-not-retry-after-LimitExceededExce.patch @@ -7,7 +7,7 @@ Subject: [PATCH] Patch ACM retry to not retry after LimitExceededException diff --git a/internal/service/acm/service_package_extra.go b/internal/service/acm/service_package_extra.go new file mode 100644 -index 0000000000..b432bed386 +index 00000000000..b432bed386e --- /dev/null +++ b/internal/service/acm/service_package_extra.go @@ -0,0 +1,21 @@ @@ -33,7 +33,7 @@ index 0000000000..b432bed386 + } +} diff --git a/internal/service/acm/service_package_gen.go b/internal/service/acm/service_package_gen.go -index 90c139864a..da16c6a6b5 100644 +index 90c139864a7..da16c6a6b59 100644 --- a/internal/service/acm/service_package_gen.go +++ b/internal/service/acm/service_package_gen.go @@ -63,6 +63,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( diff --git a/patches/0037-Restore-legacy-bucket.patch b/patches/0037-Restore-legacy-bucket.patch index 4cf7f006a8..58b2cc7ee6 100644 --- a/patches/0037-Restore-legacy-bucket.patch +++ b/patches/0037-Restore-legacy-bucket.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Restore legacy bucket diff --git a/internal/provider/provider.go b/internal/provider/provider.go -index 4c83f4bb1c..2ec4c986be 100644 +index 4c83f4bb1c4..2ec4c986be4 100644 --- a/internal/provider/provider.go +++ b/internal/provider/provider.go @@ -17,7 +17,6 @@ import ( @@ -36,7 +36,7 @@ index 4c83f4bb1c..2ec4c986be 100644 diff --git a/internal/provider/service_packages_all.go b/internal/provider/service_packages_all.go new file mode 100644 -index 0000000000..51ca53f883 +index 00000000000..51ca53f883b --- /dev/null +++ b/internal/provider/service_packages_all.go @@ -0,0 +1,12 @@ @@ -54,7 +54,7 @@ index 0000000000..51ca53f883 +} diff --git a/internal/service/s3/service_package_bwcompat.go b/internal/service/s3/service_package_bwcompat.go new file mode 100644 -index 0000000000..4278d1e70a +index 00000000000..4278d1e70ae --- /dev/null +++ b/internal/service/s3/service_package_bwcompat.go @@ -0,0 +1,57 @@ @@ -116,7 +116,7 @@ index 0000000000..4278d1e70a + return conn, nil +} diff --git a/internal/service/s3legacy/bucket_legacy.go b/internal/service/s3legacy/bucket_legacy.go -index 1da08293c4..76ce85df25 100644 +index 1da08293c49..76ce85df25f 100644 --- a/internal/service/s3legacy/bucket_legacy.go +++ b/internal/service/s3legacy/bucket_legacy.go @@ -19,7 +19,6 @@ import ( @@ -146,7 +146,7 @@ index 1da08293c4..76ce85df25 100644 arn := arn.ARN{ diff --git a/internal/service/s3legacy/object.go b/internal/service/s3legacy/object.go -index f44b435af6..58f6e95d83 100644 +index f44b435af68..58f6e95d83c 100644 --- a/internal/service/s3legacy/object.go +++ b/internal/service/s3legacy/object.go @@ -2,10 +2,10 @@ package s3legacy @@ -163,7 +163,7 @@ index f44b435af6..58f6e95d83 100644 // DeleteAllObjectVersions deletes all versions of a specified key from an S3 bucket. diff --git a/internal/service/s3legacy/retry.go b/internal/service/s3legacy/retry.go -index dcf7e39759..f578947ae6 100644 +index dcf7e397596..f578947ae6b 100644 --- a/internal/service/s3legacy/retry.go +++ b/internal/service/s3legacy/retry.go @@ -1,10 +1,10 @@ @@ -181,7 +181,7 @@ index dcf7e39759..f578947ae6 100644 // FORK: Adding the retryOnAWSCode to the fork for the old AWS S3 Logic diff --git a/internal/service/s3legacy/service_package.go b/internal/service/s3legacy/service_package.go new file mode 100644 -index 0000000000..5d2ea27364 +index 00000000000..5d2ea27364e --- /dev/null +++ b/internal/service/s3legacy/service_package.go @@ -0,0 +1,78 @@ @@ -264,7 +264,7 @@ index 0000000000..5d2ea27364 +// }), nil +// } diff --git a/internal/service/s3legacy/tags.go b/internal/service/s3legacy/tags.go -index 669813747b..b727c54640 100644 +index 669813747ba..b727c546400 100644 --- a/internal/service/s3legacy/tags.go +++ b/internal/service/s3legacy/tags.go @@ -11,7 +11,6 @@ import ( @@ -277,7 +277,7 @@ index 669813747b..b727c54640 100644 "github.com/hashicorp/terraform-provider-aws/internal/tfresource" diff --git a/internal/service/s3legacy/tfawserr_shim.go b/internal/service/s3legacy/tfawserr_shim.go new file mode 100644 -index 0000000000..b8b0660d7a +index 00000000000..b8b0660d7a2 --- /dev/null +++ b/internal/service/s3legacy/tfawserr_shim.go @@ -0,0 +1,40 @@ diff --git a/patches/0038-Patch-osis_pipeline-tags-flags.patch b/patches/0038-Patch-osis_pipeline-tags-flags.patch index 2b4d615408..8f3aef7c15 100644 --- a/patches/0038-Patch-osis_pipeline-tags-flags.patch +++ b/patches/0038-Patch-osis_pipeline-tags-flags.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Patch osis_pipeline tags flags diff --git a/internal/service/osis/pipeline.go b/internal/service/osis/pipeline.go -index 38c3e79eee..ab46177b40 100644 +index 38c3e79eeed..ab46177b407 100644 --- a/internal/service/osis/pipeline.go +++ b/internal/service/osis/pipeline.go @@ -100,7 +100,7 @@ func (r *pipelineResource) Schema(ctx context.Context, request resource.SchemaRe diff --git a/patches/0039-Allow-creating-lambdas-without-code-related-properti.patch b/patches/0039-Allow-creating-lambdas-without-code-related-properti.patch index dc0e8fad91..149811ce52 100644 --- a/patches/0039-Allow-creating-lambdas-without-code-related-properti.patch +++ b/patches/0039-Allow-creating-lambdas-without-code-related-properti.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Allow creating lambdas without code related properties diff --git a/internal/service/lambda/function.go b/internal/service/lambda/function.go -index 5126ae9dd5..6f372e18a6 100644 +index 5126ae9dd51..6f372e18a6d 100644 --- a/internal/service/lambda/function.go +++ b/internal/service/lambda/function.go @@ -172,9 +172,9 @@ func resourceFunction() *schema.Resource { diff --git a/patches/0040-Do-not-Compute-tags_all-of-aws_bedrock_provisioned_m.patch b/patches/0040-Do-not-Compute-tags_all-of-aws_bedrock_provisioned_m.patch index 84a1398ae7..53d407a4e9 100644 --- a/patches/0040-Do-not-Compute-tags_all-of-aws_bedrock_provisioned_m.patch +++ b/patches/0040-Do-not-Compute-tags_all-of-aws_bedrock_provisioned_m.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Do not Compute tags_all of diff --git a/internal/service/bedrock/provisioned_model_throughput.go b/internal/service/bedrock/provisioned_model_throughput.go -index 792d41b9fd..d308ef4566 100644 +index 792d41b9fd4..d308ef4566f 100644 --- a/internal/service/bedrock/provisioned_model_throughput.go +++ b/internal/service/bedrock/provisioned_model_throughput.go @@ -86,7 +86,7 @@ func (r *resourceProvisionedModelThroughput) Schema(ctx context.Context, request diff --git a/patches/0041-fix-legacy-bucket-context.patch b/patches/0041-fix-legacy-bucket-context.patch index 9460fe26c4..a01cd61a38 100644 --- a/patches/0041-fix-legacy-bucket-context.patch +++ b/patches/0041-fix-legacy-bucket-context.patch @@ -5,7 +5,7 @@ Subject: [PATCH] fix legacy bucket context diff --git a/internal/service/s3legacy/bucket_legacy.go b/internal/service/s3legacy/bucket_legacy.go -index 76ce85df25..2fed6dc3e3 100644 +index 76ce85df25f..2fed6dc3e39 100644 --- a/internal/service/s3legacy/bucket_legacy.go +++ b/internal/service/s3legacy/bucket_legacy.go @@ -903,7 +903,7 @@ func resourceBucketLegacyRead(ctx context.Context, d *schema.ResourceData, meta diff --git a/patches/0042-securitylake_subscriber-tags_all-patch.patch b/patches/0042-securitylake_subscriber-tags_all-patch.patch index 6e7634a11d..e3c6195be5 100644 --- a/patches/0042-securitylake_subscriber-tags_all-patch.patch +++ b/patches/0042-securitylake_subscriber-tags_all-patch.patch @@ -5,7 +5,7 @@ Subject: [PATCH] securitylake_subscriber tags_all patch diff --git a/internal/service/securitylake/subscriber.go b/internal/service/securitylake/subscriber.go -index a1bbedb7eb..9b560564ef 100644 +index a1bbedb7ebc..9b560564ef5 100644 --- a/internal/service/securitylake/subscriber.go +++ b/internal/service/securitylake/subscriber.go @@ -99,7 +99,7 @@ func (r *subscriberResource) Schema(ctx context.Context, request resource.Schema diff --git a/patches/0043-Patch-tags-ComputedOnly-for-m2-resources.patch b/patches/0043-Patch-tags-ComputedOnly-for-m2-resources.patch index 78bc12a19d..2380080193 100644 --- a/patches/0043-Patch-tags-ComputedOnly-for-m2-resources.patch +++ b/patches/0043-Patch-tags-ComputedOnly-for-m2-resources.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Patch tags ComputedOnly for m2 resources diff --git a/internal/service/m2/application.go b/internal/service/m2/application.go -index 9aa103e5bb..c3b73b02de 100644 +index 9aa103e5bbc..c3b73b02dea 100644 --- a/internal/service/m2/application.go +++ b/internal/service/m2/application.go @@ -105,7 +105,7 @@ func (r *applicationResource) Schema(ctx context.Context, request resource.Schem @@ -18,7 +18,7 @@ index 9aa103e5bb..c3b73b02de 100644 Blocks: map[string]schema.Block{ "definition": schema.ListNestedBlock{ diff --git a/internal/service/m2/environment.go b/internal/service/m2/environment.go -index b279fc058c..1c77bdd439 100644 +index b279fc058c4..1c77bdd4396 100644 --- a/internal/service/m2/environment.go +++ b/internal/service/m2/environment.go @@ -174,7 +174,7 @@ func (r *environmentResource) Schema(ctx context.Context, request resource.Schem diff --git a/patches/0044-restore-ECRConn.patch b/patches/0044-restore-ECRConn.patch index b1db035334..0bcb0110fa 100644 --- a/patches/0044-restore-ECRConn.patch +++ b/patches/0044-restore-ECRConn.patch @@ -5,7 +5,7 @@ Subject: [PATCH] restore ECRConn diff --git a/internal/conns/awsclient_extra.go b/internal/conns/awsclient_extra.go -index 96c809fc47..57bf4c7c94 100644 +index 96c809fc475..57bf4c7c944 100644 --- a/internal/conns/awsclient_extra.go +++ b/internal/conns/awsclient_extra.go @@ -6,7 +6,10 @@ package conns diff --git a/patches/0045-update-testing-types.patch b/patches/0045-update-testing-types.patch index fb927226af..101ccc7622 100644 --- a/patches/0045-update-testing-types.patch +++ b/patches/0045-update-testing-types.patch @@ -5,7 +5,7 @@ Subject: [PATCH] update testing types diff --git a/internal/service/ecr/credentials_data_source_test.go b/internal/service/ecr/credentials_data_source_test.go -index f0f875399e..eef205d103 100644 +index f0f875399e0..eef205d1036 100644 --- a/internal/service/ecr/credentials_data_source_test.go +++ b/internal/service/ecr/credentials_data_source_test.go @@ -5,14 +5,16 @@ import ( @@ -35,7 +35,7 @@ index f0f875399e..eef205d103 100644 -`, acctest.RandInt()) +`, sdkacctest.RandInt()) diff --git a/internal/service/gamelift/matchmaking_configuration_test.go b/internal/service/gamelift/matchmaking_configuration_test.go -index 339f9dd6df..6453fa75a0 100644 +index 339f9dd6dfa..6453fa75a0c 100644 --- a/internal/service/gamelift/matchmaking_configuration_test.go +++ b/internal/service/gamelift/matchmaking_configuration_test.go @@ -9,9 +9,10 @@ import ( @@ -87,7 +87,7 @@ index 339f9dd6df..6453fa75a0 100644 name := rs.Primary.Attributes["name"] out, err := conn.DescribeMatchmakingConfigurationsWithContext(ctx, &gamelift.DescribeMatchmakingConfigurationsInput{ diff --git a/internal/service/gamelift/matchmaking_rule_set_test.go b/internal/service/gamelift/matchmaking_rule_set_test.go -index 061e93f186..4295987ae6 100644 +index 061e93f186b..4295987ae67 100644 --- a/internal/service/gamelift/matchmaking_rule_set_test.go +++ b/internal/service/gamelift/matchmaking_rule_set_test.go @@ -10,7 +10,7 @@ import ( diff --git a/patches/0046-restore-ecr-NewConn.patch b/patches/0046-restore-ecr-NewConn.patch index 53ba8fbe6c..45db60f4ec 100644 --- a/patches/0046-restore-ecr-NewConn.patch +++ b/patches/0046-restore-ecr-NewConn.patch @@ -6,7 +6,7 @@ Subject: [PATCH] restore ecr NewConn diff --git a/internal/service/ecr/service_package_extra.go b/internal/service/ecr/service_package_extra.go new file mode 100644 -index 0000000000..7175d0cb71 +index 00000000000..7175d0cb71b --- /dev/null +++ b/internal/service/ecr/service_package_extra.go @@ -0,0 +1,16 @@ diff --git a/patches/0047-update-apn-info.patch b/patches/0047-update-apn-info.patch index b7e066c4ab..de6dc4c6d0 100644 --- a/patches/0047-update-apn-info.patch +++ b/patches/0047-update-apn-info.patch @@ -5,7 +5,7 @@ Subject: [PATCH] update apn info diff --git a/internal/conns/config.go b/internal/conns/config.go -index 771456c71f..2f807a732e 100644 +index 771456c71f7..2f807a732e1 100644 --- a/internal/conns/config.go +++ b/internal/conns/config.go @@ -23,7 +23,6 @@ import ( diff --git a/patches/0048-non-idempotent-sns-topic-creation.patch b/patches/0048-non-idempotent-sns-topic-creation.patch index 60ceed88e6..3700abab50 100644 --- a/patches/0048-non-idempotent-sns-topic-creation.patch +++ b/patches/0048-non-idempotent-sns-topic-creation.patch @@ -5,7 +5,7 @@ Subject: [PATCH] non-idempotent sns topic creation diff --git a/internal/service/sns/topic.go b/internal/service/sns/topic.go -index 4829f6aaa7..18895e43f4 100644 +index 4829f6aaa7d..18895e43f40 100644 --- a/internal/service/sns/topic.go +++ b/internal/service/sns/topic.go @@ -9,6 +9,7 @@ import ( diff --git a/patches/0049-Normalize-retentionDays-in-aws_controltower_landing_.patch b/patches/0049-Normalize-retentionDays-in-aws_controltower_landing_.patch index e432767346..2d9babf7e0 100644 --- a/patches/0049-Normalize-retentionDays-in-aws_controltower_landing_.patch +++ b/patches/0049-Normalize-retentionDays-in-aws_controltower_landing_.patch @@ -14,7 +14,7 @@ According to https://docs.aws.amazon.com/controltower/latest/userguide/lz-api-la preferred one. diff --git a/internal/service/controltower/landing_zone.go b/internal/service/controltower/landing_zone.go -index de5706bba9..c213c677f8 100644 +index de5706bba98..c213c677f80 100644 --- a/internal/service/controltower/landing_zone.go +++ b/internal/service/controltower/landing_zone.go @@ -5,8 +5,10 @@ package controltower @@ -134,7 +134,7 @@ index de5706bba9..c213c677f8 100644 +} diff --git a/internal/service/controltower/landing_zone_internals_test.go b/internal/service/controltower/landing_zone_internals_test.go new file mode 100644 -index 0000000000..7c97e09ce2 +index 00000000000..7c97e09ce2a --- /dev/null +++ b/internal/service/controltower/landing_zone_internals_test.go @@ -0,0 +1,50 @@ diff --git a/patches/0050-Revert-r-aws_db_proxy-Change-auth-from-TypeList-to-T.patch b/patches/0050-Revert-r-aws_db_proxy-Change-auth-from-TypeList-to-T.patch index 293e071e30..957be2afc8 100644 --- a/patches/0050-Revert-r-aws_db_proxy-Change-auth-from-TypeList-to-T.patch +++ b/patches/0050-Revert-r-aws_db_proxy-Change-auth-from-TypeList-to-T.patch @@ -10,7 +10,7 @@ Beyond a mechanical revert, during v5.74.0 release resolution there were some co resolved in favor of upstream. diff --git a/internal/service/rds/proxy.go b/internal/service/rds/proxy.go -index 008ebc180f..c326774548 100644 +index 008ebc180ff..c326774548c 100644 --- a/internal/service/rds/proxy.go +++ b/internal/service/rds/proxy.go @@ -19,7 +19,6 @@ import ( @@ -57,7 +57,7 @@ index 008ebc180f..c326774548 100644 DebugLogging: aws.Bool(d.Get("debug_logging").(bool)), NewDBProxyName: aws.String(nName.(string)), diff --git a/internal/service/rds/proxy_test.go b/internal/service/rds/proxy_test.go -index 884f83084b..0856302c30 100644 +index 884f83084b8..0856302c30f 100644 --- a/internal/service/rds/proxy_test.go +++ b/internal/service/rds/proxy_test.go @@ -40,12 +40,13 @@ func TestAccRDSProxy_basic(t *testing.T) { diff --git a/patches/0051-Fix-panic-in-aws_directory_service_directory-Read.patch b/patches/0051-Fix-panic-in-aws_directory_service_directory-Read.patch index 89b92773fc..7ac5bf033e 100644 --- a/patches/0051-Fix-panic-in-aws_directory_service_directory-Read.patch +++ b/patches/0051-Fix-panic-in-aws_directory_service_directory-Read.patch @@ -10,7 +10,7 @@ One case where this seems to happen (but difficult to reproduce) is importing a https://github.com/pulumi/pulumi-aws/issues/1152 diff --git a/internal/service/ds/directory.go b/internal/service/ds/directory.go -index 641208f519..ac46bd960b 100644 +index 641208f5196..ac46bd960bc 100644 --- a/internal/service/ds/directory.go +++ b/internal/service/ds/directory.go @@ -300,6 +300,11 @@ func resourceDirectoryRead(ctx context.Context, d *schema.ResourceData, meta int @@ -42,7 +42,7 @@ index 641208f519..ac46bd960b 100644 d.Set(names.AttrSize, dir.Size) diff --git a/internal/service/ds/directory_internal_test.go b/internal/service/ds/directory_internal_test.go new file mode 100644 -index 0000000000..a5107ef3e1 +index 00000000000..a5107ef3e13 --- /dev/null +++ b/internal/service/ds/directory_internal_test.go @@ -0,0 +1,22 @@ diff --git a/patches/0052-Patch-tags-ComputedOnly-on-bedrockagent-and-other-mo.patch b/patches/0052-Patch-tags-ComputedOnly-on-bedrockagent-and-other-mo.patch index d61d1eb3ab..b09d851510 100644 --- a/patches/0052-Patch-tags-ComputedOnly-on-bedrockagent-and-other-mo.patch +++ b/patches/0052-Patch-tags-ComputedOnly-on-bedrockagent-and-other-mo.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Patch tags ComputedOnly on bedrockagent and other modules diff --git a/internal/service/bcmdataexports/export.go b/internal/service/bcmdataexports/export.go -index 18133c7439..ea9f2d088f 100644 +index 18133c74399..ea9f2d088fb 100644 --- a/internal/service/bcmdataexports/export.go +++ b/internal/service/bcmdataexports/export.go @@ -170,7 +170,7 @@ func (r *resourceExport) Schema(ctx context.Context, req resource.SchemaRequest, @@ -18,7 +18,7 @@ index 18133c7439..ea9f2d088f 100644 Blocks: map[string]schema.Block{ "export": schema.ListNestedBlock{ diff --git a/internal/service/bedrockagent/agent.go b/internal/service/bedrockagent/agent.go -index ffd7430856..2ddfed3ebd 100644 +index ffd74308562..2ddfed3ebdd 100644 --- a/internal/service/bedrockagent/agent.go +++ b/internal/service/bedrockagent/agent.go @@ -170,7 +170,7 @@ func (r *agentResource) Schema(ctx context.Context, request resource.SchemaReque @@ -31,7 +31,7 @@ index ffd7430856..2ddfed3ebd 100644 Blocks: map[string]schema.Block{ names.AttrTimeouts: timeouts.Block(ctx, timeouts.Opts{ diff --git a/internal/service/bedrockagent/agent_alias.go b/internal/service/bedrockagent/agent_alias.go -index 2572b9419c..185d0ca643 100644 +index 2572b9419c9..185d0ca643e 100644 --- a/internal/service/bedrockagent/agent_alias.go +++ b/internal/service/bedrockagent/agent_alias.go @@ -97,7 +97,7 @@ func (r *agentAliasResource) Schema(ctx context.Context, request resource.Schema @@ -44,7 +44,7 @@ index 2572b9419c..185d0ca643 100644 Blocks: map[string]schema.Block{ names.AttrTimeouts: timeouts.Block(ctx, timeouts.Opts{ diff --git a/internal/service/bedrockagent/knowledge_base.go b/internal/service/bedrockagent/knowledge_base.go -index b243a08bca..3fa7be7051 100644 +index b243a08bca4..3fa7be70517 100644 --- a/internal/service/bedrockagent/knowledge_base.go +++ b/internal/service/bedrockagent/knowledge_base.go @@ -89,7 +89,7 @@ func (r *knowledgeBaseResource) Schema(ctx context.Context, request resource.Sch @@ -57,7 +57,7 @@ index b243a08bca..3fa7be7051 100644 CustomType: timetypes.RFC3339Type{}, Computed: true, diff --git a/internal/service/globalaccelerator/cross_account_attachment.go b/internal/service/globalaccelerator/cross_account_attachment.go -index 2f9aef10f4..ad4a7584b8 100644 +index 2f9aef10f49..ad4a7584b8f 100644 --- a/internal/service/globalaccelerator/cross_account_attachment.go +++ b/internal/service/globalaccelerator/cross_account_attachment.go @@ -72,7 +72,7 @@ func (r *crossAccountAttachmentResource) Schema(ctx context.Context, request res diff --git a/patches/0053-Fix-tags_all-Computed-for-aws_datazone_domain.patch b/patches/0053-Fix-tags_all-Computed-for-aws_datazone_domain.patch index 13c39e93a0..9fddfb9abb 100644 --- a/patches/0053-Fix-tags_all-Computed-for-aws_datazone_domain.patch +++ b/patches/0053-Fix-tags_all-Computed-for-aws_datazone_domain.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Fix tags_all Computed for aws_datazone_domain diff --git a/internal/service/datazone/domain.go b/internal/service/datazone/domain.go -index 4331ce4396..e28275fd83 100644 +index 4331ce43967..e28275fd831 100644 --- a/internal/service/datazone/domain.go +++ b/internal/service/datazone/domain.go @@ -98,7 +98,7 @@ func (r *resourceDomain) Schema(ctx context.Context, req resource.SchemaRequest, diff --git a/patches/0054-Parallelize-Lambda-Function-resource-operations.patch b/patches/0054-Parallelize-Lambda-Function-resource-operations.patch index 4c69e01d7b..1df3cb96ee 100644 --- a/patches/0054-Parallelize-Lambda-Function-resource-operations.patch +++ b/patches/0054-Parallelize-Lambda-Function-resource-operations.patch @@ -10,7 +10,7 @@ We think this was an optimization for a special edge case that drastically worsens the UX for the majority of users. diff --git a/internal/service/lambda/function.go b/internal/service/lambda/function.go -index 6f372e18a6..94285306ef 100644 +index 6f372e18a6d..94285306ef7 100644 --- a/internal/service/lambda/function.go +++ b/internal/service/lambda/function.go @@ -36,7 +36,6 @@ import ( diff --git a/patches/0055-Create-Logging-Middleware-for-Lambda-service-that-do.patch b/patches/0055-Create-Logging-Middleware-for-Lambda-service-that-do.patch index 5e742fbdb2..07ef0fc6bf 100644 --- a/patches/0055-Create-Logging-Middleware-for-Lambda-service-that-do.patch +++ b/patches/0055-Create-Logging-Middleware-for-Lambda-service-that-do.patch @@ -13,7 +13,7 @@ calls. diff --git a/internal/service/lambda/request_response_logger.go b/internal/service/lambda/request_response_logger.go new file mode 100644 -index 0000000000..737faef4a7 +index 00000000000..737faef4a73 --- /dev/null +++ b/internal/service/lambda/request_response_logger.go @@ -0,0 +1,109 @@ @@ -127,7 +127,7 @@ index 0000000000..737faef4a7 + return out, metadata, err +} diff --git a/internal/service/lambda/service_package_extra.go b/internal/service/lambda/service_package_extra.go -index 79867519db..f58db8ce42 100644 +index 79867519db5..f58db8ce421 100644 --- a/internal/service/lambda/service_package_extra.go +++ b/internal/service/lambda/service_package_extra.go @@ -5,6 +5,7 @@ import ( diff --git a/patches/0056-Fix-tags_all-Computed-for-PF-resources.patch b/patches/0056-Fix-tags_all-Computed-for-PF-resources.patch index 597542b03d..96fc49c82e 100644 --- a/patches/0056-Fix-tags_all-Computed-for-PF-resources.patch +++ b/patches/0056-Fix-tags_all-Computed-for-PF-resources.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Fix tags_all Computed for PF resources diff --git a/internal/service/paymentcryptography/key.go b/internal/service/paymentcryptography/key.go -index 0124fc8627..27f405de7c 100644 +index 0124fc86278..27f405de7ca 100644 --- a/internal/service/paymentcryptography/key.go +++ b/internal/service/paymentcryptography/key.go @@ -117,7 +117,7 @@ func (r *resourceKey) Schema(ctx context.Context, request resource.SchemaRequest diff --git a/patches/0057-Fix-tags_all-Computed-for-PF-resources.patch b/patches/0057-Fix-tags_all-Computed-for-PF-resources.patch index 806753ca2f..b22b9aed8c 100644 --- a/patches/0057-Fix-tags_all-Computed-for-PF-resources.patch +++ b/patches/0057-Fix-tags_all-Computed-for-PF-resources.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Fix tags_all Computed for PF resources diff --git a/internal/service/appfabric/app_authorization.go b/internal/service/appfabric/app_authorization.go -index 4a13fe036e..716e2c75a6 100644 +index 4a13fe036e1..716e2c75a61 100644 --- a/internal/service/appfabric/app_authorization.go +++ b/internal/service/appfabric/app_authorization.go @@ -109,7 +109,7 @@ func (r *appAuthorizationResource) Schema(ctx context.Context, request resource. @@ -18,7 +18,7 @@ index 4a13fe036e..716e2c75a6 100644 CustomType: timetypes.RFC3339Type{}, Computed: true, diff --git a/internal/service/appfabric/app_bundle.go b/internal/service/appfabric/app_bundle.go -index 3bca6523df..aae9b30c5f 100644 +index 3bca6523df8..aae9b30c5f4 100644 --- a/internal/service/appfabric/app_bundle.go +++ b/internal/service/appfabric/app_bundle.go @@ -61,7 +61,7 @@ func (r *appBundleResource) Schema(ctx context.Context, request resource.SchemaR @@ -31,7 +31,7 @@ index 3bca6523df..aae9b30c5f 100644 } } diff --git a/internal/service/ec2/ec2_capacity_block_reservation.go b/internal/service/ec2/ec2_capacity_block_reservation.go -index d769858434..2c255a5dcc 100644 +index d7698584344..2c255a5dcc0 100644 --- a/internal/service/ec2/ec2_capacity_block_reservation.go +++ b/internal/service/ec2/ec2_capacity_block_reservation.go @@ -146,7 +146,7 @@ func (r *capacityBlockReservationResource) Schema(ctx context.Context, _ resourc @@ -44,7 +44,7 @@ index d769858434..2c255a5dcc 100644 Computed: true, PlanModifiers: []planmodifier.String{ diff --git a/internal/service/fms/resource_set.go b/internal/service/fms/resource_set.go -index 3f27edc87f..38b96593e8 100644 +index 3f27edc87fb..38b96593e82 100644 --- a/internal/service/fms/resource_set.go +++ b/internal/service/fms/resource_set.go @@ -105,7 +105,7 @@ func (r *resourceResourceSet) Schema(ctx context.Context, req resource.SchemaReq @@ -57,7 +57,7 @@ index 3f27edc87f..38b96593e8 100644 Blocks: map[string]schema.Block{ "resource_set": resourceSetLNB, diff --git a/internal/service/guardduty/malware_protection_plan.go b/internal/service/guardduty/malware_protection_plan.go -index f7b9d00088..eb1883c627 100644 +index f7b9d00088a..eb1883c627a 100644 --- a/internal/service/guardduty/malware_protection_plan.go +++ b/internal/service/guardduty/malware_protection_plan.go @@ -87,7 +87,7 @@ func (r *resourceMalwareProtectionPlan) Schema(ctx context.Context, req resource diff --git a/patches/0058-Fix-tags_all-Computed-for-PF-resources.patch b/patches/0058-Fix-tags_all-Computed-for-PF-resources.patch index d63a63ce46..b8b8adc24a 100644 --- a/patches/0058-Fix-tags_all-Computed-for-PF-resources.patch +++ b/patches/0058-Fix-tags_all-Computed-for-PF-resources.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Fix tags_all Computed for PF resources diff --git a/internal/service/drs/replication_configuration_template.go b/internal/service/drs/replication_configuration_template.go -index 976dba4ac1..648f2b5003 100644 +index 976dba4ac18..648f2b50030 100644 --- a/internal/service/drs/replication_configuration_template.go +++ b/internal/service/drs/replication_configuration_template.go @@ -103,7 +103,7 @@ func (r *replicationConfigurationTemplateResource) Schema(ctx context.Context, r @@ -18,7 +18,7 @@ index 976dba4ac1..648f2b5003 100644 "use_dedicated_replication_server": schema.BoolAttribute{ Required: true, diff --git a/internal/service/elasticache/reserved_cache_node.go b/internal/service/elasticache/reserved_cache_node.go -index c2ed403da0..794d9302ca 100644 +index c2ed403da01..794d9302caf 100644 --- a/internal/service/elasticache/reserved_cache_node.go +++ b/internal/service/elasticache/reserved_cache_node.go @@ -113,7 +113,7 @@ func (r *resourceReservedCacheNode) Schema(ctx context.Context, request resource @@ -31,7 +31,7 @@ index c2ed403da0..794d9302ca 100644 Computed: true, }, diff --git a/internal/service/pinpointsmsvoicev2/opt_out_list.go b/internal/service/pinpointsmsvoicev2/opt_out_list.go -index 9ed0e93e62..ba7a696501 100644 +index 9ed0e93e62d..ba7a696501c 100644 --- a/internal/service/pinpointsmsvoicev2/opt_out_list.go +++ b/internal/service/pinpointsmsvoicev2/opt_out_list.go @@ -62,7 +62,7 @@ func (r *optOutListResource) Schema(ctx context.Context, request resource.Schema @@ -44,7 +44,7 @@ index 9ed0e93e62..ba7a696501 100644 } } diff --git a/internal/service/pinpointsmsvoicev2/phone_number.go b/internal/service/pinpointsmsvoicev2/phone_number.go -index e68971a30d..68d4fd3447 100644 +index e68971a30d9..68d4fd34476 100644 --- a/internal/service/pinpointsmsvoicev2/phone_number.go +++ b/internal/service/pinpointsmsvoicev2/phone_number.go @@ -124,7 +124,7 @@ func (r *phoneNumberResource) Schema(ctx context.Context, request resource.Schem diff --git a/patches/0059-Patch-tags-ComputedOnly-for-appfabric-networkmonitor.patch b/patches/0059-Patch-tags-ComputedOnly-for-appfabric-networkmonitor.patch index 263d847e28..5658cd5772 100644 --- a/patches/0059-Patch-tags-ComputedOnly-for-appfabric-networkmonitor.patch +++ b/patches/0059-Patch-tags-ComputedOnly-for-appfabric-networkmonitor.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Patch tags ComputedOnly for appfabric, networkmonitor, diff --git a/internal/service/appfabric/ingestion.go b/internal/service/appfabric/ingestion.go -index a8c231c98b..5ab0190384 100644 +index a8c231c98b5..5ab01903840 100644 --- a/internal/service/appfabric/ingestion.go +++ b/internal/service/appfabric/ingestion.go @@ -81,7 +81,7 @@ func (r *ingestionResource) Schema(ctx context.Context, request resource.SchemaR @@ -19,7 +19,7 @@ index a8c231c98b..5ab0190384 100644 Required: true, Validators: []validator.String{ diff --git a/internal/service/appfabric/ingestion_destination.go b/internal/service/appfabric/ingestion_destination.go -index 0bd92bba6b..6bdbed0689 100644 +index 0bd92bba6b3..6bdbed06895 100644 --- a/internal/service/appfabric/ingestion_destination.go +++ b/internal/service/appfabric/ingestion_destination.go @@ -85,7 +85,7 @@ func (r *ingestionDestinationResource) Schema(ctx context.Context, request resou @@ -32,7 +32,7 @@ index 0bd92bba6b..6bdbed0689 100644 Blocks: map[string]schema.Block{ "destination_configuration": schema.ListNestedBlock{ diff --git a/internal/service/networkfirewall/tls_inspection_configuration.go b/internal/service/networkfirewall/tls_inspection_configuration.go -index 713684155c..e99aa43c39 100644 +index 713684155c5..e99aa43c394 100644 --- a/internal/service/networkfirewall/tls_inspection_configuration.go +++ b/internal/service/networkfirewall/tls_inspection_configuration.go @@ -118,7 +118,7 @@ func (r *tlsInspectionConfigurationResource) Schema(ctx context.Context, request @@ -45,7 +45,7 @@ index 713684155c..e99aa43c39 100644 "update_token": schema.StringAttribute{ Computed: true, diff --git a/internal/service/networkmonitor/monitor.go b/internal/service/networkmonitor/monitor.go -index 83bf8577da..fba50e09bc 100644 +index 83bf8577dac..fba50e09bcf 100644 --- a/internal/service/networkmonitor/monitor.go +++ b/internal/service/networkmonitor/monitor.go @@ -74,7 +74,7 @@ func (r *monitorResource) Schema(ctx context.Context, request resource.SchemaReq @@ -58,7 +58,7 @@ index 83bf8577da..fba50e09bc 100644 } } diff --git a/internal/service/networkmonitor/probe.go b/internal/service/networkmonitor/probe.go -index 8fefba9ca3..598cca0f80 100644 +index 8fefba9ca3e..598cca0f802 100644 --- a/internal/service/networkmonitor/probe.go +++ b/internal/service/networkmonitor/probe.go @@ -109,7 +109,7 @@ func (r *probeResource) Schema(ctx context.Context, request resource.SchemaReque diff --git a/patches/0060-Fix-resourceMatchmakingConfigurationUpdate.patch b/patches/0060-Fix-resourceMatchmakingConfigurationUpdate.patch index 147f653fcd..825213c301 100644 --- a/patches/0060-Fix-resourceMatchmakingConfigurationUpdate.patch +++ b/patches/0060-Fix-resourceMatchmakingConfigurationUpdate.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Fix resourceMatchmakingConfigurationUpdate diff --git a/internal/service/gamelift/matchmaking_configuration.go b/internal/service/gamelift/matchmaking_configuration.go -index 72f7d31d85..89ecad9db0 100644 +index 72f7d31d857..89ecad9db08 100644 --- a/internal/service/gamelift/matchmaking_configuration.go +++ b/internal/service/gamelift/matchmaking_configuration.go @@ -309,7 +309,7 @@ func resourceMatchmakingConfigurationUpdate(ctx context.Context, d *schema.Resou diff --git a/patches/0061-Patch-ComputedOnly-for-rekognition-stream_processor.patch b/patches/0061-Patch-ComputedOnly-for-rekognition-stream_processor.patch index 84a335c9ae..9d2b6728ed 100644 --- a/patches/0061-Patch-ComputedOnly-for-rekognition-stream_processor.patch +++ b/patches/0061-Patch-ComputedOnly-for-rekognition-stream_processor.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Patch ComputedOnly for rekognition/stream_processor diff --git a/internal/service/rekognition/stream_processor.go b/internal/service/rekognition/stream_processor.go -index ee87c84573..9a730f5391 100644 +index ee87c845736..9a730f53911 100644 --- a/internal/service/rekognition/stream_processor.go +++ b/internal/service/rekognition/stream_processor.go @@ -136,7 +136,7 @@ func (r *resourceStreamProcessor) Schema(ctx context.Context, req resource.Schem diff --git a/patches/0062-Patch-tags_all-Computed-for-chatbot-timestreaminflux.patch b/patches/0062-Patch-tags_all-Computed-for-chatbot-timestreaminflux.patch index 93e3a00250..4af2cf9a7e 100644 --- a/patches/0062-Patch-tags_all-Computed-for-chatbot-timestreaminflux.patch +++ b/patches/0062-Patch-tags_all-Computed-for-chatbot-timestreaminflux.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Patch tags_all Computed for chatbot, timestreaminfluxdb diff --git a/internal/service/chatbot/slack_channel_configuration.go b/internal/service/chatbot/slack_channel_configuration.go -index a878965774..3ea3c705c3 100644 +index a878965774f..3ea3c705c3c 100644 --- a/internal/service/chatbot/slack_channel_configuration.go +++ b/internal/service/chatbot/slack_channel_configuration.go @@ -105,7 +105,7 @@ func (r *slackChannelConfigurationResource) Schema(ctx context.Context, request @@ -18,7 +18,7 @@ index a878965774..3ea3c705c3 100644 Optional: true, Computed: true, diff --git a/internal/service/chatbot/teams_channel_configuration.go b/internal/service/chatbot/teams_channel_configuration.go -index c472864a12..2db6c0504a 100644 +index c472864a124..2db6c0504ac 100644 --- a/internal/service/chatbot/teams_channel_configuration.go +++ b/internal/service/chatbot/teams_channel_configuration.go @@ -102,7 +102,7 @@ func (r *teamsChannelConfigurationResource) Schema(ctx context.Context, request @@ -31,7 +31,7 @@ index c472864a12..2db6c0504a 100644 Required: true, }, diff --git a/internal/service/timestreaminfluxdb/db_instance.go b/internal/service/timestreaminfluxdb/db_instance.go -index 9f97622504..baf1fae1b5 100644 +index 9f97622504e..baf1fae1b5d 100644 --- a/internal/service/timestreaminfluxdb/db_instance.go +++ b/internal/service/timestreaminfluxdb/db_instance.go @@ -188,7 +188,7 @@ func (r *resourceDBInstance) Schema(ctx context.Context, req resource.SchemaRequ diff --git a/patches/0063-Patch-tags_all-computed-for-aws_rds_integration.patch b/patches/0063-Patch-tags_all-computed-for-aws_rds_integration.patch index 08da667b1b..972e9ce77a 100644 --- a/patches/0063-Patch-tags_all-computed-for-aws_rds_integration.patch +++ b/patches/0063-Patch-tags_all-computed-for-aws_rds_integration.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Patch tags_all computed for aws_rds_integration diff --git a/internal/service/rds/integration.go b/internal/service/rds/integration.go -index 8304fb4c06..c751c5ad19 100644 +index 8304fb4c06a..c751c5ad198 100644 --- a/internal/service/rds/integration.go +++ b/internal/service/rds/integration.go @@ -100,7 +100,7 @@ func (r *integrationResource) Schema(ctx context.Context, request resource.Schem diff --git a/patches/0064-Adapt-gamelift-matchmaking-resources.patch b/patches/0064-Adapt-gamelift-matchmaking-resources.patch index e9c8dda657..8a6f31345d 100644 --- a/patches/0064-Adapt-gamelift-matchmaking-resources.patch +++ b/patches/0064-Adapt-gamelift-matchmaking-resources.patch @@ -7,7 +7,7 @@ Upstream has made changes that do not allow a resource to use both sdkv1 & sdkv2 resources. This updates the gamelift resources to v2. diff --git a/internal/service/gamelift/matchmaking_configuration.go b/internal/service/gamelift/matchmaking_configuration.go -index 89ecad9db0..5811f1f884 100644 +index 89ecad9db08..5811f1f8849 100644 --- a/internal/service/gamelift/matchmaking_configuration.go +++ b/internal/service/gamelift/matchmaking_configuration.go @@ -5,17 +5,20 @@ import ( @@ -255,7 +255,7 @@ index 89ecad9db0..5811f1f884 100644 for _, awsProperty := range awsProperties { property := map[string]string{ diff --git a/internal/service/gamelift/matchmaking_configuration_test.go b/internal/service/gamelift/matchmaking_configuration_test.go -index 6453fa75a0..a5394fb536 100644 +index 6453fa75a0c..a5394fb536b 100644 --- a/internal/service/gamelift/matchmaking_configuration_test.go +++ b/internal/service/gamelift/matchmaking_configuration_test.go @@ -6,8 +6,8 @@ import ( @@ -428,7 +428,7 @@ index 6453fa75a0..a5394fb536 100644 resource "aws_gamelift_game_session_queue" "test" { name = %[2]q diff --git a/internal/service/gamelift/matchmaking_rule_set.go b/internal/service/gamelift/matchmaking_rule_set.go -index d9f2424b7a..5b34ab8669 100644 +index d9f2424b7a3..5b34ab8669b 100644 --- a/internal/service/gamelift/matchmaking_rule_set.go +++ b/internal/service/gamelift/matchmaking_rule_set.go @@ -4,18 +4,20 @@ import ( @@ -539,7 +539,7 @@ index d9f2424b7a..5b34ab8669 100644 } if err != nil { diff --git a/internal/service/gamelift/matchmaking_rule_set_test.go b/internal/service/gamelift/matchmaking_rule_set_test.go -index 4295987ae6..7554a3029c 100644 +index 4295987ae67..7554a3029ca 100644 --- a/internal/service/gamelift/matchmaking_rule_set_test.go +++ b/internal/service/gamelift/matchmaking_rule_set_test.go @@ -6,20 +6,21 @@ import ( @@ -645,7 +645,7 @@ index 4295987ae6..7554a3029c 100644 return nil } diff --git a/names/data/names_data.hcl b/names/data/names_data.hcl -index f1c599be53..79517f2f61 100644 +index f1c599be532..79517f2f617 100644 --- a/names/data/names_data.hcl +++ b/names/data/names_data.hcl @@ -3882,7 +3882,8 @@ service "fsx" { diff --git a/patches/0065-Patch-Tags-for-bedrock-and-pinpoint.patch b/patches/0065-Patch-Tags-for-bedrock-and-pinpoint.patch index 656648ef66..8ba35adffb 100644 --- a/patches/0065-Patch-Tags-for-bedrock-and-pinpoint.patch +++ b/patches/0065-Patch-Tags-for-bedrock-and-pinpoint.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Patch Tags for bedrock and pinpoint diff --git a/internal/service/bedrock/guardrail.go b/internal/service/bedrock/guardrail.go -index 7d83ca812a..a9abb0d2ee 100644 +index 7d83ca812a6..a9abb0d2ee9 100644 --- a/internal/service/bedrock/guardrail.go +++ b/internal/service/bedrock/guardrail.go @@ -122,7 +122,7 @@ func (r *resourceGuardrail) Schema(ctx context.Context, req resource.SchemaReque @@ -18,7 +18,7 @@ index 7d83ca812a..a9abb0d2ee 100644 Computed: true, PlanModifiers: []planmodifier.String{ diff --git a/internal/service/pinpoint/email_template.go b/internal/service/pinpoint/email_template.go -index e20b0d1c10..dd70f5a417 100644 +index e20b0d1c103..dd70f5a4171 100644 --- a/internal/service/pinpoint/email_template.go +++ b/internal/service/pinpoint/email_template.go @@ -63,7 +63,7 @@ func (r *resourceEmailTemplate) Schema(ctx context.Context, req resource.SchemaR diff --git a/patches/0066-Legacy-bucket-Read-now-sets-acl-and-force_destroy-de.patch b/patches/0066-Legacy-bucket-Read-now-sets-acl-and-force_destroy-de.patch index bfabbd5115..90444a5729 100644 --- a/patches/0066-Legacy-bucket-Read-now-sets-acl-and-force_destroy-de.patch +++ b/patches/0066-Legacy-bucket-Read-now-sets-acl-and-force_destroy-de.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Legacy bucket Read now sets acl and force_destroy defaults diff --git a/internal/service/s3legacy/bucket_legacy.go b/internal/service/s3legacy/bucket_legacy.go -index 2fed6dc3e3..2e2ffe77b0 100644 +index 2fed6dc3e39..2e2ffe77b0a 100644 --- a/internal/service/s3legacy/bucket_legacy.go +++ b/internal/service/s3legacy/bucket_legacy.go @@ -34,6 +34,10 @@ import ( diff --git a/patches/0067-Add-pluralized-lifecycle_policies-to-EFS-file-system.patch b/patches/0067-Add-pluralized-lifecycle_policies-to-EFS-file-system.patch index a7680db7c2..748a04630c 100644 --- a/patches/0067-Add-pluralized-lifecycle_policies-to-EFS-file-system.patch +++ b/patches/0067-Add-pluralized-lifecycle_policies-to-EFS-file-system.patch @@ -12,7 +12,7 @@ version to only return at most one element we're able to fix this panic without introducing breaking changes. diff --git a/internal/service/efs/file_system_data_source.go b/internal/service/efs/file_system_data_source.go -index 680f0fb3cc..a4ed1a053a 100644 +index 680f0fb3ccd..a4ed1a053a8 100644 --- a/internal/service/efs/file_system_data_source.go +++ b/internal/service/efs/file_system_data_source.go @@ -63,6 +63,28 @@ func dataSourceFileSystem() *schema.Resource { diff --git a/patches/0068-Fix-tags_all-Computed-for-aws_backup_logically_air_g.patch b/patches/0068-Fix-tags_all-Computed-for-aws_backup_logically_air_g.patch index a6e523f15b..8ebc838afd 100644 --- a/patches/0068-Fix-tags_all-Computed-for-aws_backup_logically_air_g.patch +++ b/patches/0068-Fix-tags_all-Computed-for-aws_backup_logically_air_g.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Fix tags_all Computed for diff --git a/internal/service/backup/logically_air_gapped_vault.go b/internal/service/backup/logically_air_gapped_vault.go -index 6363263403..820d6a6c59 100644 +index 6363263403b..820d6a6c59a 100644 --- a/internal/service/backup/logically_air_gapped_vault.go +++ b/internal/service/backup/logically_air_gapped_vault.go @@ -88,7 +88,7 @@ func (r *logicallyAirGappedVaultResource) Schema(ctx context.Context, request re diff --git a/patches/0069-Patch-ComputedOnly-for-route53profiles-and-more.patch b/patches/0069-Patch-ComputedOnly-for-route53profiles-and-more.patch index 23b139da35..8565495bf5 100644 --- a/patches/0069-Patch-ComputedOnly-for-route53profiles-and-more.patch +++ b/patches/0069-Patch-ComputedOnly-for-route53profiles-and-more.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Patch ComputedOnly for route53profiles and more diff --git a/internal/service/backup/restore_testing_plan.go b/internal/service/backup/restore_testing_plan.go -index 7d9155b5f0..c93f05adc5 100644 +index 7d9155b5f0d..c93f05adc54 100644 --- a/internal/service/backup/restore_testing_plan.go +++ b/internal/service/backup/restore_testing_plan.go @@ -89,7 +89,7 @@ func (r *restoreTestingPlanResource) Schema(ctx context.Context, request resourc @@ -18,7 +18,7 @@ index 7d9155b5f0..c93f05adc5 100644 Blocks: map[string]schema.Block{ "recovery_point_selection": schema.ListNestedBlock{ diff --git a/internal/service/pinpointsmsvoicev2/configuration_set.go b/internal/service/pinpointsmsvoicev2/configuration_set.go -index b4bd9f9d39..61334ec528 100644 +index b4bd9f9d399..61334ec5280 100644 --- a/internal/service/pinpointsmsvoicev2/configuration_set.go +++ b/internal/service/pinpointsmsvoicev2/configuration_set.go @@ -75,7 +75,7 @@ func (r *configurationSetResource) Schema(ctx context.Context, request resource. @@ -31,7 +31,7 @@ index b4bd9f9d39..61334ec528 100644 } } diff --git a/internal/service/route53profiles/association.go b/internal/service/route53profiles/association.go -index ed90c77ffa..748ef5cbf8 100644 +index ed90c77ffae..748ef5cbf82 100644 --- a/internal/service/route53profiles/association.go +++ b/internal/service/route53profiles/association.go @@ -113,7 +113,7 @@ func (r *resourceAssociation) Schema(ctx context.Context, req resource.SchemaReq @@ -44,7 +44,7 @@ index ed90c77ffa..748ef5cbf8 100644 Blocks: map[string]schema.Block{ names.AttrTimeouts: timeouts.Block(ctx, timeouts.Opts{ diff --git a/internal/service/route53profiles/profile.go b/internal/service/route53profiles/profile.go -index b65485fd1b..529f1589f8 100644 +index b65485fd1b2..529f1589f85 100644 --- a/internal/service/route53profiles/profile.go +++ b/internal/service/route53profiles/profile.go @@ -94,7 +94,7 @@ func (r *resourceProfile) Schema(ctx context.Context, req resource.SchemaRequest diff --git a/patches/0070-Adjust-matchmaking_configuration-resource-IgnoreTags.patch b/patches/0070-Adjust-matchmaking_configuration-resource-IgnoreTags.patch index 12b9336a66..6cbe1a6bb0 100644 --- a/patches/0070-Adjust-matchmaking_configuration-resource-IgnoreTags.patch +++ b/patches/0070-Adjust-matchmaking_configuration-resource-IgnoreTags.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Adjust matchmaking_configuration resource IgnoreTagsConfig diff --git a/internal/service/gamelift/matchmaking_configuration.go b/internal/service/gamelift/matchmaking_configuration.go -index 5811f1f884..3af285382c 100644 +index 5811f1f8849..3af285382cd 100644 --- a/internal/service/gamelift/matchmaking_configuration.go +++ b/internal/service/gamelift/matchmaking_configuration.go @@ -206,7 +206,7 @@ func resourceMatchmakingConfigurationCreate(ctx context.Context, d *schema.Resou diff --git a/patches/0071-Restore-conns-factory-for-SDKv1-Go-clients-used-by-p.patch b/patches/0071-Restore-conns-factory-for-SDKv1-Go-clients-used-by-p.patch index 6925f503fe..b189e5cb16 100644 --- a/patches/0071-Restore-conns-factory-for-SDKv1-Go-clients-used-by-p.patch +++ b/patches/0071-Restore-conns-factory-for-SDKv1-Go-clients-used-by-p.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Restore conns factory for SDKv1 Go clients used by patches diff --git a/internal/conns/awsclient_extra.go b/internal/conns/awsclient_extra.go -index 57bf4c7c94..09b4279db3 100644 +index 57bf4c7c944..09b4279db3a 100644 --- a/internal/conns/awsclient_extra.go +++ b/internal/conns/awsclient_extra.go @@ -5,9 +5,12 @@ package conns diff --git a/patches/0072-Patch-imagebuilder-and-resiliencehub-tagging.patch b/patches/0072-Patch-imagebuilder-and-resiliencehub-tagging.patch index 8ce09b7d87..e9dccb637d 100644 --- a/patches/0072-Patch-imagebuilder-and-resiliencehub-tagging.patch +++ b/patches/0072-Patch-imagebuilder-and-resiliencehub-tagging.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Patch imagebuilder and resiliencehub tagging diff --git a/internal/service/imagebuilder/lifecycle_policy.go b/internal/service/imagebuilder/lifecycle_policy.go -index de77993cb4..aba05a03c0 100644 +index de77993cb4f..aba05a03c0a 100644 --- a/internal/service/imagebuilder/lifecycle_policy.go +++ b/internal/service/imagebuilder/lifecycle_policy.go @@ -89,7 +89,7 @@ func (r *lifecyclePolicyResource) Schema(ctx context.Context, request resource.S @@ -18,7 +18,7 @@ index de77993cb4..aba05a03c0 100644 Blocks: map[string]schema.Block{ "policy_detail": schema.SetNestedBlock{ diff --git a/internal/service/resiliencehub/resiliency_policy.go b/internal/service/resiliencehub/resiliency_policy.go -index 9f349c81ff..4feca02f5e 100644 +index 9f349c81ffb..4feca02f5e0 100644 --- a/internal/service/resiliencehub/resiliency_policy.go +++ b/internal/service/resiliencehub/resiliency_policy.go @@ -130,7 +130,7 @@ func (r *resourceResiliencyPolicy) Schema(ctx context.Context, req resource.Sche diff --git a/patches/0073-Restore-AWS-Go-SDK-v1-session.patch b/patches/0073-Restore-AWS-Go-SDK-v1-session.patch index a33d79e6d8..9ef94e144c 100644 --- a/patches/0073-Restore-AWS-Go-SDK-v1-session.patch +++ b/patches/0073-Restore-AWS-Go-SDK-v1-session.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Restore AWS Go SDK v1 session diff --git a/internal/conns/awsclient.go b/internal/conns/awsclient.go -index 0d4c6c6d6c..1adf9943c4 100644 +index 0d4c6c6d6c7..1adf9943c40 100644 --- a/internal/conns/awsclient.go +++ b/internal/conns/awsclient.go @@ -305,6 +305,7 @@ func (c *AWSClient) apiClientConfig(ctx context.Context, servicePackageName stri diff --git a/patches/0074-Patch-out-PF-tags-for-ssmquicksetup.patch b/patches/0074-Patch-out-PF-tags-for-ssmquicksetup.patch index 1087c29888..97ea26896b 100644 --- a/patches/0074-Patch-out-PF-tags-for-ssmquicksetup.patch +++ b/patches/0074-Patch-out-PF-tags-for-ssmquicksetup.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Patch out PF tags for ssmquicksetup diff --git a/internal/service/ssmquicksetup/configuration_manager.go b/internal/service/ssmquicksetup/configuration_manager.go -index 34b650949e..572dfae156 100644 +index 34b650949e3..572dfae156c 100644 --- a/internal/service/ssmquicksetup/configuration_manager.go +++ b/internal/service/ssmquicksetup/configuration_manager.go @@ -79,7 +79,7 @@ func (r *resourceConfigurationManager) Schema(ctx context.Context, req resource. diff --git a/patches/0075-Patch-computed-only-tags-for-iot-billing_group.patch b/patches/0075-Patch-computed-only-tags-for-iot-billing_group.patch index e0df313da9..845cf017b2 100644 --- a/patches/0075-Patch-computed-only-tags-for-iot-billing_group.patch +++ b/patches/0075-Patch-computed-only-tags-for-iot-billing_group.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Patch computed only tags for iot/billing_group diff --git a/internal/service/iot/billing_group.go b/internal/service/iot/billing_group.go -index 90d64baff5..dd84f3acb3 100644 +index 90d64baff5a..dd84f3acb33 100644 --- a/internal/service/iot/billing_group.go +++ b/internal/service/iot/billing_group.go @@ -75,7 +75,7 @@ func (r *resourceBillingGroup) Schema(ctx context.Context, request resource.Sche diff --git a/patches/0076-Fix-tags_all-Computed-for-aws_vpc_block_public_acces.patch b/patches/0076-Fix-tags_all-Computed-for-aws_vpc_block_public_acces.patch index 74890eab59..0e2469d832 100644 --- a/patches/0076-Fix-tags_all-Computed-for-aws_vpc_block_public_acces.patch +++ b/patches/0076-Fix-tags_all-Computed-for-aws_vpc_block_public_acces.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Fix tags_all Computed for diff --git a/internal/service/ec2/vpc_block_public_access_exclusion.go b/internal/service/ec2/vpc_block_public_access_exclusion.go -index cb828701ab..b05fb21336 100644 +index cb828701ab5..b05fb21336b 100644 --- a/internal/service/ec2/vpc_block_public_access_exclusion.go +++ b/internal/service/ec2/vpc_block_public_access_exclusion.go @@ -71,7 +71,7 @@ func (r *vpcBlockPublicAccessExclusionResource) Schema(ctx context.Context, requ diff --git a/patches/0077-Fix-tags_all-Computed-for-CodeConnections-Host-and-C.patch b/patches/0077-Fix-tags_all-Computed-for-CodeConnections-Host-and-C.patch index c688586ec7..48b6cf0b12 100644 --- a/patches/0077-Fix-tags_all-Computed-for-CodeConnections-Host-and-C.patch +++ b/patches/0077-Fix-tags_all-Computed-for-CodeConnections-Host-and-C.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Fix tags_all Computed for CodeConnections Host and Connection diff --git a/internal/service/codeconnections/connection.go b/internal/service/codeconnections/connection.go -index 1beba6fd2c..0b8e5597e5 100644 +index 1beba6fd2c3..0b8e5597e55 100644 --- a/internal/service/codeconnections/connection.go +++ b/internal/service/codeconnections/connection.go @@ -108,7 +108,7 @@ func (r *connectionResource) Schema(ctx context.Context, req resource.SchemaRequ @@ -18,7 +18,7 @@ index 1beba6fd2c..0b8e5597e5 100644 Blocks: map[string]schema.Block{ names.AttrTimeouts: timeouts.Block(ctx, timeouts.Opts{ diff --git a/internal/service/codeconnections/host.go b/internal/service/codeconnections/host.go -index 2f086c0465..d4adfd7f28 100644 +index 2f086c0465b..d4adfd7f282 100644 --- a/internal/service/codeconnections/host.go +++ b/internal/service/codeconnections/host.go @@ -87,7 +87,7 @@ func (r *hostResource) Schema(ctx context.Context, req resource.SchemaRequest, r diff --git a/patches/0078-Fix-tags_all-Computed-for-PF-resources.patch b/patches/0078-Fix-tags_all-Computed-for-PF-resources.patch index d935c36f2a..4f31881e52 100644 --- a/patches/0078-Fix-tags_all-Computed-for-PF-resources.patch +++ b/patches/0078-Fix-tags_all-Computed-for-PF-resources.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Fix tags_all Computed for PF resources diff --git a/internal/service/bedrock/inference_profile.go b/internal/service/bedrock/inference_profile.go -index eb2348bc68..305435e1b7 100644 +index eb2348bc68f..305435e1b7f 100644 --- a/internal/service/bedrock/inference_profile.go +++ b/internal/service/bedrock/inference_profile.go @@ -119,7 +119,7 @@ func (r *resourceInferenceProfile) Schema(ctx context.Context, req resource.Sche @@ -18,7 +18,7 @@ index eb2348bc68..305435e1b7 100644 Blocks: map[string]schema.Block{ "model_source": schema.ListNestedBlock{ diff --git a/internal/service/logs/anomaly_detector.go b/internal/service/logs/anomaly_detector.go -index 788672e044..e637e203c3 100644 +index 788672e044f..e637e203c33 100644 --- a/internal/service/logs/anomaly_detector.go +++ b/internal/service/logs/anomaly_detector.go @@ -95,7 +95,7 @@ func (r *resourceAnomalyDetector) Schema(ctx context.Context, req resource.Schem @@ -31,7 +31,7 @@ index 788672e044..e637e203c3 100644 } } diff --git a/internal/service/servicecatalogappregistry/application.go b/internal/service/servicecatalogappregistry/application.go -index 2844029f5c..735bfe81bb 100644 +index 2844029f5c8..735bfe81bb5 100644 --- a/internal/service/servicecatalogappregistry/application.go +++ b/internal/service/servicecatalogappregistry/application.go @@ -70,7 +70,7 @@ func (r *resourceApplication) Schema(ctx context.Context, req resource.SchemaReq @@ -44,7 +44,7 @@ index 2844029f5c..735bfe81bb 100644 } } diff --git a/internal/service/servicecatalogappregistry/attribute_group.go b/internal/service/servicecatalogappregistry/attribute_group.go -index e1719b8cfa..4e28fbd51a 100644 +index e1719b8cfa1..4e28fbd51a4 100644 --- a/internal/service/servicecatalogappregistry/attribute_group.go +++ b/internal/service/servicecatalogappregistry/attribute_group.go @@ -76,7 +76,7 @@ func (r *resourceAttributeGroup) Schema(ctx context.Context, req resource.Schema diff --git a/patches/0079-Speed-up-providerlint-by-re-using-build-cache-and-ig.patch b/patches/0079-Speed-up-providerlint-by-re-using-build-cache-and-ig.patch index 95a0a05ded..3105de016d 100644 --- a/patches/0079-Speed-up-providerlint-by-re-using-build-cache-and-ig.patch +++ b/patches/0079-Speed-up-providerlint-by-re-using-build-cache-and-ig.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Speed up providerlint by re-using build cache and ignoring diff --git a/GNUmakefile b/GNUmakefile -index 9b4adecff8..32137c8919 100644 +index 9b4adecff8d..32137c89195 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -326,9 +326,10 @@ prereq-go: ## If $(GO_VER) is not installed, install it diff --git a/patches/0080-Fix-tags_all-Computed-for-PF-resources.patch b/patches/0080-Fix-tags_all-Computed-for-PF-resources.patch index f4500544f6..ba52063d7e 100644 --- a/patches/0080-Fix-tags_all-Computed-for-PF-resources.patch +++ b/patches/0080-Fix-tags_all-Computed-for-PF-resources.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Fix tags_all Computed for PF resources diff --git a/internal/service/apigateway/domain_name_access_association.go b/internal/service/apigateway/domain_name_access_association.go -index c194533973..6b6c868158 100644 +index c1945339731..6b6c8681583 100644 --- a/internal/service/apigateway/domain_name_access_association.go +++ b/internal/service/apigateway/domain_name_access_association.go @@ -74,7 +74,7 @@ func (r *domainNameAccessAssociationResource) Schema(ctx context.Context, reques @@ -18,7 +18,7 @@ index c194533973..6b6c868158 100644 } } diff --git a/internal/service/cloudfront/vpc_origin.go b/internal/service/cloudfront/vpc_origin.go -index c5ccae5b51..b3eb73bb75 100644 +index c5ccae5b51a..b3eb73bb756 100644 --- a/internal/service/cloudfront/vpc_origin.go +++ b/internal/service/cloudfront/vpc_origin.go @@ -60,7 +60,7 @@ func (r *vpcOriginResource) Schema(ctx context.Context, request resource.SchemaR @@ -31,7 +31,7 @@ index c5ccae5b51..b3eb73bb75 100644 Blocks: map[string]schema.Block{ "vpc_origin_endpoint_config": schema.ListNestedBlock{ diff --git a/internal/service/memorydb/multi_region_cluster.go b/internal/service/memorydb/multi_region_cluster.go -index 42b0fc1d42..e3b5b68ca0 100644 +index 42b0fc1d42e..e3b5b68ca07 100644 --- a/internal/service/memorydb/multi_region_cluster.go +++ b/internal/service/memorydb/multi_region_cluster.go @@ -126,7 +126,7 @@ func (r *multiRegionClusterResource) Schema(ctx context.Context, request resourc @@ -44,7 +44,7 @@ index 42b0fc1d42..e3b5b68ca0 100644 Optional: true, Computed: true, diff --git a/internal/service/networkmanager/dx_gateway_attachment.go b/internal/service/networkmanager/dx_gateway_attachment.go -index 508ce646c3..23637d8c5e 100644 +index 508ce646c35..23637d8c5eb 100644 --- a/internal/service/networkmanager/dx_gateway_attachment.go +++ b/internal/service/networkmanager/dx_gateway_attachment.go @@ -111,7 +111,7 @@ func (r *directConnectGatewayAttachmentResource) Schema(ctx context.Context, req @@ -57,7 +57,7 @@ index 508ce646c3..23637d8c5e 100644 Blocks: map[string]schema.Block{ names.AttrTimeouts: timeouts.Block(ctx, timeouts.Opts{ diff --git a/internal/service/rds/cluster_snapshot_copy.go b/internal/service/rds/cluster_snapshot_copy.go -index f9044db1ed..db79f0c198 100644 +index f9044db1ed7..db79f0c198d 100644 --- a/internal/service/rds/cluster_snapshot_copy.go +++ b/internal/service/rds/cluster_snapshot_copy.go @@ -146,7 +146,7 @@ func (r *resourceClusterSnapshotCopy) Schema(ctx context.Context, req resource.S diff --git a/provider/cmd/pulumi-resource-aws/schema.json b/provider/cmd/pulumi-resource-aws/schema.json index ab3860afa4..2631a8b259 100644 --- a/provider/cmd/pulumi-resource-aws/schema.json +++ b/provider/cmd/pulumi-resource-aws/schema.json @@ -2128,6 +2128,9 @@ }, "aws:alb/getListenerMutualAuthentication:getListenerMutualAuthentication": { "properties": { + "advertiseTrustStoreCaNames": { + "type": "string" + }, "ignoreClientCertificateExpiry": { "type": "boolean" }, @@ -2140,6 +2143,7 @@ }, "type": "object", "required": [ + "advertiseTrustStoreCaNames", "ignoreClientCertificateExpiry", "mode", "trustStoreArn" @@ -94160,6 +94164,9 @@ }, "aws:lb/getListenerMutualAuthentication:getListenerMutualAuthentication": { "properties": { + "advertiseTrustStoreCaNames": { + "type": "string" + }, "ignoreClientCertificateExpiry": { "type": "boolean" }, @@ -94172,6 +94179,7 @@ }, "type": "object", "required": [ + "advertiseTrustStoreCaNames", "ignoreClientCertificateExpiry", "mode", "trustStoreArn" diff --git a/sdk/dotnet/Alb/Outputs/GetListenerMutualAuthenticationResult.cs b/sdk/dotnet/Alb/Outputs/GetListenerMutualAuthenticationResult.cs index 4ab78a52e0..214cd9688c 100644 --- a/sdk/dotnet/Alb/Outputs/GetListenerMutualAuthenticationResult.cs +++ b/sdk/dotnet/Alb/Outputs/GetListenerMutualAuthenticationResult.cs @@ -13,18 +13,22 @@ namespace Pulumi.Aws.Alb.Outputs [OutputType] public sealed class GetListenerMutualAuthenticationResult { + public readonly string AdvertiseTrustStoreCaNames; public readonly bool IgnoreClientCertificateExpiry; public readonly string Mode; public readonly string TrustStoreArn; [OutputConstructor] private GetListenerMutualAuthenticationResult( + string advertiseTrustStoreCaNames, + bool ignoreClientCertificateExpiry, string mode, string trustStoreArn) { + AdvertiseTrustStoreCaNames = advertiseTrustStoreCaNames; IgnoreClientCertificateExpiry = ignoreClientCertificateExpiry; Mode = mode; TrustStoreArn = trustStoreArn; diff --git a/sdk/dotnet/LB/Outputs/GetListenerMutualAuthenticationResult.cs b/sdk/dotnet/LB/Outputs/GetListenerMutualAuthenticationResult.cs index f2b33c18fb..ed2b58302c 100644 --- a/sdk/dotnet/LB/Outputs/GetListenerMutualAuthenticationResult.cs +++ b/sdk/dotnet/LB/Outputs/GetListenerMutualAuthenticationResult.cs @@ -13,18 +13,22 @@ namespace Pulumi.Aws.LB.Outputs [OutputType] public sealed class GetListenerMutualAuthenticationResult { + public readonly string AdvertiseTrustStoreCaNames; public readonly bool IgnoreClientCertificateExpiry; public readonly string Mode; public readonly string TrustStoreArn; [OutputConstructor] private GetListenerMutualAuthenticationResult( + string advertiseTrustStoreCaNames, + bool ignoreClientCertificateExpiry, string mode, string trustStoreArn) { + AdvertiseTrustStoreCaNames = advertiseTrustStoreCaNames; IgnoreClientCertificateExpiry = ignoreClientCertificateExpiry; Mode = mode; TrustStoreArn = trustStoreArn; diff --git a/sdk/go/aws/alb/pulumiTypes.go b/sdk/go/aws/alb/pulumiTypes.go index 9f22d33293..418871427a 100644 --- a/sdk/go/aws/alb/pulumiTypes.go +++ b/sdk/go/aws/alb/pulumiTypes.go @@ -7083,6 +7083,7 @@ func (o GetListenerDefaultActionRedirectArrayOutput) Index(i pulumi.IntInput) Ge } type GetListenerMutualAuthentication struct { + AdvertiseTrustStoreCaNames string `pulumi:"advertiseTrustStoreCaNames"` IgnoreClientCertificateExpiry bool `pulumi:"ignoreClientCertificateExpiry"` Mode string `pulumi:"mode"` TrustStoreArn string `pulumi:"trustStoreArn"` @@ -7100,6 +7101,7 @@ type GetListenerMutualAuthenticationInput interface { } type GetListenerMutualAuthenticationArgs struct { + AdvertiseTrustStoreCaNames pulumi.StringInput `pulumi:"advertiseTrustStoreCaNames"` IgnoreClientCertificateExpiry pulumi.BoolInput `pulumi:"ignoreClientCertificateExpiry"` Mode pulumi.StringInput `pulumi:"mode"` TrustStoreArn pulumi.StringInput `pulumi:"trustStoreArn"` @@ -7156,6 +7158,10 @@ func (o GetListenerMutualAuthenticationOutput) ToGetListenerMutualAuthentication return o } +func (o GetListenerMutualAuthenticationOutput) AdvertiseTrustStoreCaNames() pulumi.StringOutput { + return o.ApplyT(func(v GetListenerMutualAuthentication) string { return v.AdvertiseTrustStoreCaNames }).(pulumi.StringOutput) +} + func (o GetListenerMutualAuthenticationOutput) IgnoreClientCertificateExpiry() pulumi.BoolOutput { return o.ApplyT(func(v GetListenerMutualAuthentication) bool { return v.IgnoreClientCertificateExpiry }).(pulumi.BoolOutput) } diff --git a/sdk/go/aws/lb/pulumiTypes.go b/sdk/go/aws/lb/pulumiTypes.go index a76789e10f..1e75761d88 100644 --- a/sdk/go/aws/lb/pulumiTypes.go +++ b/sdk/go/aws/lb/pulumiTypes.go @@ -7083,6 +7083,7 @@ func (o GetListenerDefaultActionRedirectArrayOutput) Index(i pulumi.IntInput) Ge } type GetListenerMutualAuthentication struct { + AdvertiseTrustStoreCaNames string `pulumi:"advertiseTrustStoreCaNames"` IgnoreClientCertificateExpiry bool `pulumi:"ignoreClientCertificateExpiry"` Mode string `pulumi:"mode"` TrustStoreArn string `pulumi:"trustStoreArn"` @@ -7100,6 +7101,7 @@ type GetListenerMutualAuthenticationInput interface { } type GetListenerMutualAuthenticationArgs struct { + AdvertiseTrustStoreCaNames pulumi.StringInput `pulumi:"advertiseTrustStoreCaNames"` IgnoreClientCertificateExpiry pulumi.BoolInput `pulumi:"ignoreClientCertificateExpiry"` Mode pulumi.StringInput `pulumi:"mode"` TrustStoreArn pulumi.StringInput `pulumi:"trustStoreArn"` @@ -7156,6 +7158,10 @@ func (o GetListenerMutualAuthenticationOutput) ToGetListenerMutualAuthentication return o } +func (o GetListenerMutualAuthenticationOutput) AdvertiseTrustStoreCaNames() pulumi.StringOutput { + return o.ApplyT(func(v GetListenerMutualAuthentication) string { return v.AdvertiseTrustStoreCaNames }).(pulumi.StringOutput) +} + func (o GetListenerMutualAuthenticationOutput) IgnoreClientCertificateExpiry() pulumi.BoolOutput { return o.ApplyT(func(v GetListenerMutualAuthentication) bool { return v.IgnoreClientCertificateExpiry }).(pulumi.BoolOutput) } diff --git a/sdk/java/src/main/java/com/pulumi/aws/alb/outputs/GetListenerMutualAuthentication.java b/sdk/java/src/main/java/com/pulumi/aws/alb/outputs/GetListenerMutualAuthentication.java index f4f1ae08a8..fa51672939 100644 --- a/sdk/java/src/main/java/com/pulumi/aws/alb/outputs/GetListenerMutualAuthentication.java +++ b/sdk/java/src/main/java/com/pulumi/aws/alb/outputs/GetListenerMutualAuthentication.java @@ -11,11 +11,15 @@ @CustomType public final class GetListenerMutualAuthentication { + private String advertiseTrustStoreCaNames; private Boolean ignoreClientCertificateExpiry; private String mode; private String trustStoreArn; private GetListenerMutualAuthentication() {} + public String advertiseTrustStoreCaNames() { + return this.advertiseTrustStoreCaNames; + } public Boolean ignoreClientCertificateExpiry() { return this.ignoreClientCertificateExpiry; } @@ -35,17 +39,27 @@ public static Builder builder(GetListenerMutualAuthentication defaults) { } @CustomType.Builder public static final class Builder { + private String advertiseTrustStoreCaNames; private Boolean ignoreClientCertificateExpiry; private String mode; private String trustStoreArn; public Builder() {} public Builder(GetListenerMutualAuthentication defaults) { Objects.requireNonNull(defaults); + this.advertiseTrustStoreCaNames = defaults.advertiseTrustStoreCaNames; this.ignoreClientCertificateExpiry = defaults.ignoreClientCertificateExpiry; this.mode = defaults.mode; this.trustStoreArn = defaults.trustStoreArn; } + @CustomType.Setter + public Builder advertiseTrustStoreCaNames(String advertiseTrustStoreCaNames) { + if (advertiseTrustStoreCaNames == null) { + throw new MissingRequiredPropertyException("GetListenerMutualAuthentication", "advertiseTrustStoreCaNames"); + } + this.advertiseTrustStoreCaNames = advertiseTrustStoreCaNames; + return this; + } @CustomType.Setter public Builder ignoreClientCertificateExpiry(Boolean ignoreClientCertificateExpiry) { if (ignoreClientCertificateExpiry == null) { @@ -72,6 +86,7 @@ public Builder trustStoreArn(String trustStoreArn) { } public GetListenerMutualAuthentication build() { final var _resultValue = new GetListenerMutualAuthentication(); + _resultValue.advertiseTrustStoreCaNames = advertiseTrustStoreCaNames; _resultValue.ignoreClientCertificateExpiry = ignoreClientCertificateExpiry; _resultValue.mode = mode; _resultValue.trustStoreArn = trustStoreArn; diff --git a/sdk/java/src/main/java/com/pulumi/aws/lb/outputs/GetListenerMutualAuthentication.java b/sdk/java/src/main/java/com/pulumi/aws/lb/outputs/GetListenerMutualAuthentication.java index c70f6b70f5..f844b11ca4 100644 --- a/sdk/java/src/main/java/com/pulumi/aws/lb/outputs/GetListenerMutualAuthentication.java +++ b/sdk/java/src/main/java/com/pulumi/aws/lb/outputs/GetListenerMutualAuthentication.java @@ -11,11 +11,15 @@ @CustomType public final class GetListenerMutualAuthentication { + private String advertiseTrustStoreCaNames; private Boolean ignoreClientCertificateExpiry; private String mode; private String trustStoreArn; private GetListenerMutualAuthentication() {} + public String advertiseTrustStoreCaNames() { + return this.advertiseTrustStoreCaNames; + } public Boolean ignoreClientCertificateExpiry() { return this.ignoreClientCertificateExpiry; } @@ -35,17 +39,27 @@ public static Builder builder(GetListenerMutualAuthentication defaults) { } @CustomType.Builder public static final class Builder { + private String advertiseTrustStoreCaNames; private Boolean ignoreClientCertificateExpiry; private String mode; private String trustStoreArn; public Builder() {} public Builder(GetListenerMutualAuthentication defaults) { Objects.requireNonNull(defaults); + this.advertiseTrustStoreCaNames = defaults.advertiseTrustStoreCaNames; this.ignoreClientCertificateExpiry = defaults.ignoreClientCertificateExpiry; this.mode = defaults.mode; this.trustStoreArn = defaults.trustStoreArn; } + @CustomType.Setter + public Builder advertiseTrustStoreCaNames(String advertiseTrustStoreCaNames) { + if (advertiseTrustStoreCaNames == null) { + throw new MissingRequiredPropertyException("GetListenerMutualAuthentication", "advertiseTrustStoreCaNames"); + } + this.advertiseTrustStoreCaNames = advertiseTrustStoreCaNames; + return this; + } @CustomType.Setter public Builder ignoreClientCertificateExpiry(Boolean ignoreClientCertificateExpiry) { if (ignoreClientCertificateExpiry == null) { @@ -72,6 +86,7 @@ public Builder trustStoreArn(String trustStoreArn) { } public GetListenerMutualAuthentication build() { final var _resultValue = new GetListenerMutualAuthentication(); + _resultValue.advertiseTrustStoreCaNames = advertiseTrustStoreCaNames; _resultValue.ignoreClientCertificateExpiry = ignoreClientCertificateExpiry; _resultValue.mode = mode; _resultValue.trustStoreArn = trustStoreArn; diff --git a/sdk/nodejs/types/output.ts b/sdk/nodejs/types/output.ts index e13bbe11ac..3a1ea90704 100644 --- a/sdk/nodejs/types/output.ts +++ b/sdk/nodejs/types/output.ts @@ -381,6 +381,7 @@ export namespace alb { } export interface GetListenerMutualAuthentication { + advertiseTrustStoreCaNames: string; ignoreClientCertificateExpiry: boolean; mode: string; trustStoreArn: string; @@ -47832,6 +47833,7 @@ export namespace lb { } export interface GetListenerMutualAuthentication { + advertiseTrustStoreCaNames: string; ignoreClientCertificateExpiry: boolean; mode: string; trustStoreArn: string; diff --git a/sdk/python/pulumi_aws/alb/outputs.py b/sdk/python/pulumi_aws/alb/outputs.py index 0455828923..04eef86530 100644 --- a/sdk/python/pulumi_aws/alb/outputs.py +++ b/sdk/python/pulumi_aws/alb/outputs.py @@ -2796,13 +2796,20 @@ def status_code(self) -> str: @pulumi.output_type class GetListenerMutualAuthenticationResult(dict): def __init__(__self__, *, + advertise_trust_store_ca_names: str, ignore_client_certificate_expiry: bool, mode: str, trust_store_arn: str): + pulumi.set(__self__, "advertise_trust_store_ca_names", advertise_trust_store_ca_names) pulumi.set(__self__, "ignore_client_certificate_expiry", ignore_client_certificate_expiry) pulumi.set(__self__, "mode", mode) pulumi.set(__self__, "trust_store_arn", trust_store_arn) + @property + @pulumi.getter(name="advertiseTrustStoreCaNames") + def advertise_trust_store_ca_names(self) -> str: + return pulumi.get(self, "advertise_trust_store_ca_names") + @property @pulumi.getter(name="ignoreClientCertificateExpiry") def ignore_client_certificate_expiry(self) -> bool: diff --git a/sdk/python/pulumi_aws/lb/outputs.py b/sdk/python/pulumi_aws/lb/outputs.py index ee1470be78..f77988bd72 100644 --- a/sdk/python/pulumi_aws/lb/outputs.py +++ b/sdk/python/pulumi_aws/lb/outputs.py @@ -2811,13 +2811,20 @@ def status_code(self) -> str: @pulumi.output_type class GetListenerMutualAuthenticationResult(dict): def __init__(__self__, *, + advertise_trust_store_ca_names: str, ignore_client_certificate_expiry: bool, mode: str, trust_store_arn: str): + pulumi.set(__self__, "advertise_trust_store_ca_names", advertise_trust_store_ca_names) pulumi.set(__self__, "ignore_client_certificate_expiry", ignore_client_certificate_expiry) pulumi.set(__self__, "mode", mode) pulumi.set(__self__, "trust_store_arn", trust_store_arn) + @property + @pulumi.getter(name="advertiseTrustStoreCaNames") + def advertise_trust_store_ca_names(self) -> str: + return pulumi.get(self, "advertise_trust_store_ca_names") + @property @pulumi.getter(name="ignoreClientCertificateExpiry") def ignore_client_certificate_expiry(self) -> bool: diff --git a/upstream b/upstream index ba4eee9c51..ec6555ce8d 160000 --- a/upstream +++ b/upstream @@ -1 +1 @@ -Subproject commit ba4eee9c51077476f4b8986156572f758e486013 +Subproject commit ec6555ce8d44ce5661811b3877f10fe9e379bccd