From 9c328c6559aea48eeef26893c29d0dae0174ffd5 Mon Sep 17 00:00:00 2001 From: Florian Stadler Date: Tue, 14 May 2024 12:20:48 +0200 Subject: [PATCH] Update patches --- patches/0004-De-deprecate-bucket_object.patch | 6 +- ...keformation-catalog_resource-default.patch | 4 +- ...06-Workaround-SSM-Parameter-tier-bug.patch | 4 +- ...uster-certificate_authorities-plural.patch | 4 +- ...caling-launch_configuration-associat.patch | 12 +-- patches/0012-Revert-WAF-schema-changes.patch | 4 +- ...in-new-resourceTopicSubscriptionCust.patch | 4 +- ...-Revert-Update-endpointHashIPAddress.patch | 6 +- ...lt-descriptions-to-Managed-by-Pulumi.patch | 98 +++++++++---------- ...target-group-read-to-workaround-2517.patch | 2 +- ...26-Restore-S3ConnURICleaningDisabled.patch | 10 +- ...-Do-not-compute-tags_all-at-TF-level.patch | 44 ++++----- ...r-implement-default_addons_to_remove.patch | 2 +- .../0031-Fix-job-queue-sdkv2-migration.patch | 2 +- ...h_computed_only.sh-to-patch-eks-pod_.patch | 12 +-- ...x-tags_all-Computed-for-PF-resources.patch | 22 ++--- ...etry-for-KMS-access-denied-in-lambda.patch | 15 +-- ...to-not-retry-after-LimitExceededExce.patch | 4 +- patches/0038-Restore-legacy-bucket.patch | 32 +++--- .../0039-Patch-osis_pipeline-tags-flags.patch | 2 +- ...l-request-35678-from-hashicorp-b-elb.patch | 10 +- ...l-request-35671-from-hashicorp-b-lb-.patch | 14 +-- ...ambdas-without-code-related-properti.patch | 2 +- ...ags_all-of-aws_bedrock_provisioned_m.patch | 4 +- ...curitylake_subscriber-tags_all-patch.patch | 6 +- ...e_version-Fix-bugs-with-default-only.patch | 10 +- ...h-tags-ComputedOnly-for-m2-resources.patch | 4 +- patches/0048-restore-ECRConn.patch | 8 +- patches/0050-restore-ecr-NewConn.patch | 2 +- patches/0051-update-apn-info.patch | 4 +- ...52-non-idempotent-sns-topic-creation.patch | 2 +- ...ionDays-in-aws_controltower_landing_.patch | 4 +- ...proxy-Change-auth-from-TypeList-to-T.patch | 44 +++++---- ...aws_directory_service_directory-Read.patch | 4 +- ...tedOnly-on-bedrockagent-and-other-mo.patch | 16 +-- ...strategy-of-Batch-JobDefinitions-cau.patch | 2 +- 36 files changed, 214 insertions(+), 211 deletions(-) diff --git a/patches/0004-De-deprecate-bucket_object.patch b/patches/0004-De-deprecate-bucket_object.patch index fbb2c195516..ed82875f1a7 100644 --- a/patches/0004-De-deprecate-bucket_object.patch +++ b/patches/0004-De-deprecate-bucket_object.patch @@ -5,13 +5,13 @@ Subject: [PATCH] De-deprecate bucket_object diff --git a/internal/service/s3/bucket_object.go b/internal/service/s3/bucket_object.go -index 59702972dc..03c4dec17c 100644 +index 36c4378a5a..18307157af 100644 --- a/internal/service/s3/bucket_object.go +++ b/internal/service/s3/bucket_object.go @@ -68,7 +68,7 @@ func resourceBucketObject() *schema.Resource { Computed: true, }, - "bucket": { + names.AttrBucket: { - Deprecated: "Use the aws_s3_object resource instead", + // FORK: Stack72 removed the deprecation warning as it was misleading for Pulumi users Type: schema.TypeString, @@ -20,7 +20,7 @@ index 59702972dc..03c4dec17c 100644 @@ -125,7 +125,7 @@ func resourceBucketObject() *schema.Resource { Default: false, }, - "key": { + names.AttrKey: { - Deprecated: "Use the aws_s3_object resource instead", + // FORK: Stack72 removed the deprecation warning as it was misleading for Pulumi users Type: schema.TypeString, diff --git a/patches/0005-Remove-lakeformation-catalog_resource-default.patch b/patches/0005-Remove-lakeformation-catalog_resource-default.patch index b9160c1433d..de76dad5c41 100644 --- a/patches/0005-Remove-lakeformation-catalog_resource-default.patch +++ b/patches/0005-Remove-lakeformation-catalog_resource-default.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Remove lakeformation catalog_resource default diff --git a/internal/service/lakeformation/permissions.go b/internal/service/lakeformation/permissions.go -index 01efd94424..eedc5e5a46 100644 +index 6d4243be8a..cada2dfb17 100644 --- a/internal/service/lakeformation/permissions.go +++ b/internal/service/lakeformation/permissions.go -@@ -42,8 +42,8 @@ func ResourcePermissions() *schema.Resource { +@@ -43,8 +43,8 @@ func ResourcePermissions() *schema.Resource { ValidateFunc: verify.ValidAccountID, }, "catalog_resource": { diff --git a/patches/0006-Workaround-SSM-Parameter-tier-bug.patch b/patches/0006-Workaround-SSM-Parameter-tier-bug.patch index 9b8694a23bc..e7a4807fa2b 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 4b267ceccb..b47638308f 100644 +index e63aea86d0..9ea46bb099 100644 --- a/internal/service/ssm/parameter.go +++ b/internal/service/ssm/parameter.go @@ -95,15 +95,17 @@ func ResourceParameter() *schema.Resource { @@ -34,7 +34,7 @@ index 4b267ceccb..b47638308f 100644 + //return false }, }, - "type": { + names.AttrType: { @@ -319,11 +321,13 @@ func resourceParameterUpdate(ctx context.Context, d *schema.ResourceData, meta i AllowedPattern: aws.String(d.Get("allowed_pattern").(string)), } diff --git a/patches/0007-Add-EKS-cluster-certificate_authorities-plural.patch b/patches/0007-Add-EKS-cluster-certificate_authorities-plural.patch index d7d3846bf64..bcb951055b7 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 518deaaef2..6f4ddd9ea4 100644 +index 2826bc48f2..6a9b729b3b 100644 --- a/internal/service/eks/cluster.go +++ b/internal/service/eks/cluster.go @@ -83,9 +83,24 @@ func resourceCluster() *schema.Resource { @@ -36,7 +36,7 @@ index 518deaaef2..6f4ddd9ea4 100644 @@ -418,6 +433,13 @@ func resourceClusterRead(ctx context.Context, d *schema.ResourceData, meta inter return sdkdiag.AppendErrorf(diags, "setting access_config: %s", err) } - d.Set("arn", cluster.Arn) + d.Set(names.AttrARN, cluster.Arn) + + // FORK: Stack72: Renamed certificate_authority list to be certificate_authorities and map in the Pulumi provider + if err := d.Set("certificate_authorities", flattenCertificate(cluster.CertificateAuthority)); err != nil { diff --git a/patches/0008-Workaround-Autoscaling-launch_configuration-associat.patch b/patches/0008-Workaround-Autoscaling-launch_configuration-associat.patch index 6bab59ea3ec..410066c8c39 100644 --- a/patches/0008-Workaround-Autoscaling-launch_configuration-associat.patch +++ b/patches/0008-Workaround-Autoscaling-launch_configuration-associat.patch @@ -7,10 +7,10 @@ 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 4c8e2b6bf8..feb96a6076 100644 +index 5070e8bde4..48008f0b18 100644 --- a/internal/service/autoscaling/launch_configuration.go +++ b/internal/service/autoscaling/launch_configuration.go -@@ -50,7 +50,8 @@ func resourceLaunchConfiguration() *schema.Resource { +@@ -51,7 +51,8 @@ func resourceLaunchConfiguration() *schema.Resource { "associate_public_ip_address": { Type: schema.TypeBool, Optional: true, @@ -20,17 +20,17 @@ index 4c8e2b6bf8..feb96a6076 100644 ForceNew: true, }, "ebs_block_device": { -@@ -317,16 +318,19 @@ func resourceLaunchConfigurationCreate(ctx context.Context, d *schema.ResourceDa +@@ -318,16 +319,19 @@ func resourceLaunchConfigurationCreate(ctx context.Context, d *schema.ResourceDa - lcName := create.Name(d.Get("name").(string), d.Get("name_prefix").(string)) + lcName := create.Name(d.Get(names.AttrName).(string), d.Get(names.AttrNamePrefix).(string)) input := autoscaling.CreateLaunchConfigurationInput{ - EbsOptimized: aws.Bool(d.Get("ebs_optimized").(bool)), - ImageId: aws.String(d.Get("image_id").(string)), -- InstanceType: aws.String(d.Get("instance_type").(string)), +- InstanceType: aws.String(d.Get(names.AttrInstanceType).(string)), - LaunchConfigurationName: aws.String(lcName), + EbsOptimized: aws.Bool(d.Get("ebs_optimized").(bool)), + ImageId: aws.String(d.Get("image_id").(string)), -+ InstanceType: aws.String(d.Get("instance_type").(string)), ++ InstanceType: aws.String(d.Get(names.AttrInstanceType).(string)), + LaunchConfigurationName: aws.String(lcName), + AssociatePublicIpAddress: aws.Bool(d.Get("associate_public_ip_address").(bool)), } diff --git a/patches/0012-Revert-WAF-schema-changes.patch b/patches/0012-Revert-WAF-schema-changes.patch index 32876afb3fa..ba835581fcb 100644 --- a/patches/0012-Revert-WAF-schema-changes.patch +++ b/patches/0012-Revert-WAF-schema-changes.patch @@ -6,10 +6,10 @@ 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 7204e55609..e78107146b 100644 +index 2487eee5f3..e5c68fd5e9 100644 --- a/internal/service/wafv2/schemas.go +++ b/internal/service/wafv2/schemas.go -@@ -52,14 +52,14 @@ func ruleGroupRootStatementSchema(level int) *schema.Schema { +@@ -54,14 +54,14 @@ func ruleGroupRootStatementSchema(level int) *schema.Schema { MaxItems: 1, Elem: &schema.Resource{ Schema: map[string]*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 2007ec59c09..a81d12679ec 100644 --- a/patches/0013-Catch-cty-panic-in-new-resourceTopicSubscriptionCust.patch +++ b/patches/0013-Catch-cty-panic-in-new-resourceTopicSubscriptionCust.patch @@ -7,10 +7,10 @@ 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 e19c8d30cb..c36f56b5ae 100644 +index 0bfae0a063..4ccb818aba 100644 --- a/internal/service/sns/topic_subscription.go +++ b/internal/service/sns/topic_subscription.go -@@ -539,9 +539,11 @@ func normalizeTopicSubscriptionDeliveryPolicy(policy string) ([]byte, error) { +@@ -540,9 +540,11 @@ func normalizeTopicSubscriptionDeliveryPolicy(policy string) ([]byte, error) { func resourceTopicSubscriptionCustomizeDiff(_ context.Context, diff *schema.ResourceDiff, _ interface{}) error { hasPolicy := diff.Get("filter_policy").(string) != "" diff --git a/patches/0016-Revert-Update-endpointHashIPAddress.patch b/patches/0016-Revert-Update-endpointHashIPAddress.patch index 41e2cd61cb3..ed54d9703eb 100644 --- a/patches/0016-Revert-Update-endpointHashIPAddress.patch +++ b/patches/0016-Revert-Update-endpointHashIPAddress.patch @@ -9,15 +9,15 @@ 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 e909b8e462..5676bcff4e 100644 +index 7866fd640c..a95a97ed5b 100644 --- a/internal/service/route53resolver/endpoint.go +++ b/internal/service/route53resolver/endpoint.go @@ -430,7 +430,7 @@ func waitEndpointDeleted(ctx context.Context, conn *route53resolver.Route53Resol func endpointHashIPAddress(v interface{}) int { var buf bytes.Buffer m := v.(map[string]interface{}) -- buf.WriteString(fmt.Sprintf("%s-%s-", m["subnet_id"].(string), m["ip"].(string))) -+ buf.WriteString(fmt.Sprintf("%s-", m["subnet_id"].(string))) +- buf.WriteString(fmt.Sprintf("%s-%s-", m[names.AttrSubnetID].(string), m["ip"].(string))) ++ buf.WriteString(fmt.Sprintf("%s-", m[names.AttrSubnetID].(string))) return create.StringHashcode(buf.String()) } 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 913e80bed30..3f61a3f0a03 100644 --- a/patches/0018-Change-default-descriptions-to-Managed-by-Pulumi.patch +++ b/patches/0018-Change-default-descriptions-to-Managed-by-Pulumi.patch @@ -5,24 +5,24 @@ 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 f877edde6f..007456ebf8 100644 +index f68c242fe0..c7be2c51b7 100644 --- a/internal/service/apigateway/api_key.go +++ b/internal/service/apigateway/api_key.go @@ -55,7 +55,7 @@ func resourceAPIKey() *schema.Resource { - "description": { + names.AttrDescription: { Type: schema.TypeString, Optional: true, - Default: "Managed by Terraform", + Default: "Managed by Pulumi", }, - "enabled": { + names.AttrEnabled: { Type: schema.TypeBool, diff --git a/internal/service/appsync/api_key.go b/internal/service/appsync/api_key.go -index 154306cde7..e3c6189ab2 100644 +index fbdf814b82..ae8e490533 100644 --- a/internal/service/appsync/api_key.go +++ b/internal/service/appsync/api_key.go -@@ -35,7 +35,7 @@ func ResourceAPIKey() *schema.Resource { - "description": { +@@ -36,7 +36,7 @@ func ResourceAPIKey() *schema.Resource { + names.AttrDescription: { Type: schema.TypeString, Optional: true, - Default: "Managed by Terraform", @@ -31,11 +31,11 @@ index 154306cde7..e3c6189ab2 100644 "api_id": { Type: schema.TypeString, diff --git a/internal/service/cloudfront/origin_access_control.go b/internal/service/cloudfront/origin_access_control.go -index 4fb70de716..03bc2ac3c7 100644 +index 837e79c057..8fc8280900 100644 --- a/internal/service/cloudfront/origin_access_control.go +++ b/internal/service/cloudfront/origin_access_control.go -@@ -37,7 +37,7 @@ func resourceOriginAccessControl() *schema.Resource { - "description": { +@@ -38,7 +38,7 @@ func resourceOriginAccessControl() *schema.Resource { + names.AttrDescription: { Type: schema.TypeString, Optional: true, - Default: "Managed by Terraform", @@ -44,7 +44,7 @@ index 4fb70de716..03bc2ac3c7 100644 }, "etag": { diff --git a/internal/service/docdb/cluster_parameter_group.go b/internal/service/docdb/cluster_parameter_group.go -index a1af860ca7..1db92c7f3f 100644 +index 959a97abd7..f7587ff9ab 100644 --- a/internal/service/docdb/cluster_parameter_group.go +++ b/internal/service/docdb/cluster_parameter_group.go @@ -48,7 +48,7 @@ func ResourceClusterParameterGroup() *schema.Resource { @@ -57,20 +57,20 @@ index a1af860ca7..1db92c7f3f 100644 "family": { Type: schema.TypeString, diff --git a/internal/service/docdb/subnet_group.go b/internal/service/docdb/subnet_group.go -index 6970e2c917..9644b1a733 100644 +index 333fe4befa..b706339eea 100644 --- a/internal/service/docdb/subnet_group.go +++ b/internal/service/docdb/subnet_group.go @@ -45,7 +45,7 @@ func ResourceSubnetGroup() *schema.Resource { - "description": { + names.AttrDescription: { Type: schema.TypeString, Optional: true, - Default: "Managed by Terraform", + Default: "Managed by Pulumi", }, - "name": { + names.AttrName: { Type: schema.TypeString, diff --git a/internal/service/ec2/vpc_security_group.go b/internal/service/ec2/vpc_security_group.go -index 3d022369db..c88eebf5be 100644 +index d2f71a3305..c650bee4bf 100644 --- a/internal/service/ec2/vpc_security_group.go +++ b/internal/service/ec2/vpc_security_group.go @@ -66,7 +66,7 @@ func ResourceSecurityGroup() *schema.Resource { @@ -83,7 +83,7 @@ index 3d022369db..c88eebf5be 100644 }, "egress": securityGroupRuleSetNestedBlock, diff --git a/internal/service/elasticache/parameter_group.go b/internal/service/elasticache/parameter_group.go -index 5db5edf801..8cc3d84313 100644 +index efd59ed47e..dfe5a0f410 100644 --- a/internal/service/elasticache/parameter_group.go +++ b/internal/service/elasticache/parameter_group.go @@ -49,7 +49,7 @@ func resourceParameterGroup() *schema.Resource { @@ -229,24 +229,24 @@ index 0000000000..f587fcbcce + return diags +} diff --git a/internal/service/elasticache/subnet_group.go b/internal/service/elasticache/subnet_group.go -index d0ccfcef0f..a2a5cda65f 100644 +index b00bb973e4..daa2df4791 100644 --- a/internal/service/elasticache/subnet_group.go +++ b/internal/service/elasticache/subnet_group.go @@ -48,7 +48,7 @@ func resourceSubnetGroup() *schema.Resource { - "description": { + names.AttrDescription: { Type: schema.TypeString, Optional: true, - Default: "Managed by Terraform", + Default: "Managed by Pulumi", }, - "name": { + names.AttrName: { Type: schema.TypeString, diff --git a/internal/service/mediapackage/channel.go b/internal/service/mediapackage/channel.go -index 74bb15b961..b89c7980f3 100644 +index cec42b0ab5..e1ce46856e 100644 --- a/internal/service/mediapackage/channel.go +++ b/internal/service/mediapackage/channel.go @@ -51,7 +51,7 @@ func ResourceChannel() *schema.Resource { - "description": { + names.AttrDescription: { Type: schema.TypeString, Optional: true, - Default: "Managed by Terraform", @@ -255,11 +255,11 @@ index 74bb15b961..b89c7980f3 100644 "hls_ingest": { Type: schema.TypeList, diff --git a/internal/service/memorydb/cluster.go b/internal/service/memorydb/cluster.go -index 5cc41d41a5..76702cb008 100644 +index 55d3637a4e..465e394512 100644 --- a/internal/service/memorydb/cluster.go +++ b/internal/service/memorydb/cluster.go @@ -73,7 +73,7 @@ func ResourceCluster() *schema.Resource { - "description": { + names.AttrDescription: { Type: schema.TypeString, Optional: true, - Default: "Managed by Terraform", @@ -268,7 +268,7 @@ index 5cc41d41a5..76702cb008 100644 "engine_patch_version": { Type: schema.TypeString, diff --git a/internal/service/memorydb/parameter_group.go b/internal/service/memorydb/parameter_group.go -index 6a00a65414..4f6e17d0fc 100644 +index 877c845404..5be6fa78a8 100644 --- a/internal/service/memorydb/parameter_group.go +++ b/internal/service/memorydb/parameter_group.go @@ -51,7 +51,7 @@ func ResourceParameterGroup() *schema.Resource { @@ -281,20 +281,20 @@ index 6a00a65414..4f6e17d0fc 100644 "family": { Type: schema.TypeString, diff --git a/internal/service/memorydb/subnet_group.go b/internal/service/memorydb/subnet_group.go -index 539b58f81f..bc15c792e8 100644 +index 314802c87e..9bd9633a92 100644 --- a/internal/service/memorydb/subnet_group.go +++ b/internal/service/memorydb/subnet_group.go @@ -46,7 +46,7 @@ func ResourceSubnetGroup() *schema.Resource { - "description": { + names.AttrDescription: { Type: schema.TypeString, Optional: true, - Default: "Managed by Terraform", + Default: "Managed by Pulumi", }, - "name": { + names.AttrName: { Type: schema.TypeString, diff --git a/internal/service/neptune/cluster_parameter_group.go b/internal/service/neptune/cluster_parameter_group.go -index fc811f78a6..6bdc216d7e 100644 +index 2807e14fea..18be05a952 100644 --- a/internal/service/neptune/cluster_parameter_group.go +++ b/internal/service/neptune/cluster_parameter_group.go @@ -48,7 +48,7 @@ func ResourceClusterParameterGroup() *schema.Resource { @@ -307,7 +307,7 @@ index fc811f78a6..6bdc216d7e 100644 "family": { Type: schema.TypeString, diff --git a/internal/service/neptune/parameter_group.go b/internal/service/neptune/parameter_group.go -index 6b3466f4d2..4fe2595102 100644 +index e438ed4cb6..95d1b3f345 100644 --- a/internal/service/neptune/parameter_group.go +++ b/internal/service/neptune/parameter_group.go @@ -52,7 +52,7 @@ func ResourceParameterGroup() *schema.Resource { @@ -320,20 +320,20 @@ index 6b3466f4d2..4fe2595102 100644 "family": { Type: schema.TypeString, diff --git a/internal/service/neptune/subnet_group.go b/internal/service/neptune/subnet_group.go -index 359047d7ab..acc8ff375e 100644 +index fc60010e7d..0b213b1bf7 100644 --- a/internal/service/neptune/subnet_group.go +++ b/internal/service/neptune/subnet_group.go @@ -44,7 +44,7 @@ func ResourceSubnetGroup() *schema.Resource { - "description": { + names.AttrDescription: { Type: schema.TypeString, Optional: true, - Default: "Managed by Terraform", + Default: "Managed by Pulumi", }, - "name": { + names.AttrName: { Type: schema.TypeString, diff --git a/internal/service/rds/cluster_parameter_group.go b/internal/service/rds/cluster_parameter_group.go -index a66785b727..f27440d36c 100644 +index f116ad37e4..c8b59e9363 100644 --- a/internal/service/rds/cluster_parameter_group.go +++ b/internal/service/rds/cluster_parameter_group.go @@ -50,7 +50,7 @@ func ResourceClusterParameterGroup() *schema.Resource { @@ -346,7 +346,7 @@ index a66785b727..f27440d36c 100644 "family": { Type: schema.TypeString, diff --git a/internal/service/rds/option_group.go b/internal/service/rds/option_group.go -index 7336c50e7a..431e2d47b9 100644 +index 76678ca094..774986d77b 100644 --- a/internal/service/rds/option_group.go +++ b/internal/service/rds/option_group.go @@ -123,7 +123,7 @@ func ResourceOptionGroup() *schema.Resource { @@ -359,7 +359,7 @@ index 7336c50e7a..431e2d47b9 100644 names.AttrTags: tftags.TagsSchema(), names.AttrTagsAll: tftags.TagsSchemaComputed(), diff --git a/internal/service/rds/parameter_group.go b/internal/service/rds/parameter_group.go -index 227dae6935..5c46cc3fb9 100644 +index 546903e074..fcdea229c6 100644 --- a/internal/service/rds/parameter_group.go +++ b/internal/service/rds/parameter_group.go @@ -51,7 +51,7 @@ func ResourceParameterGroup() *schema.Resource { @@ -694,20 +694,20 @@ index 0000000000..54d4e61495 + return create.StringHashcode(buf.String()) +} diff --git a/internal/service/rds/subnet_group.go b/internal/service/rds/subnet_group.go -index 66b981fa2f..0334e3d8fd 100644 +index dfc4040034..e044b6a8cf 100644 --- a/internal/service/rds/subnet_group.go +++ b/internal/service/rds/subnet_group.go @@ -47,7 +47,7 @@ func resourceSubnetGroup() *schema.Resource { - "description": { + names.AttrDescription: { Type: schema.TypeString, Optional: true, - Default: "Managed by Terraform", + Default: "Managed by Pulumi", }, - "name": { + names.AttrName: { Type: schema.TypeString, diff --git a/internal/service/redshift/parameter_group.go b/internal/service/redshift/parameter_group.go -index d12705aa23..d3231d0cb2 100644 +index 32c6f92b44..aa4eda9830 100644 --- a/internal/service/redshift/parameter_group.go +++ b/internal/service/redshift/parameter_group.go @@ -50,7 +50,7 @@ func resourceParameterGroup() *schema.Resource { @@ -1017,23 +1017,23 @@ index 0000000000..47b5d7cda2 + return ingress +} diff --git a/internal/service/redshift/subnet_group.go b/internal/service/redshift/subnet_group.go -index 0703821ac6..b175faacaf 100644 +index 2d1a8f8bcb..47c939f356 100644 --- a/internal/service/redshift/subnet_group.go +++ b/internal/service/redshift/subnet_group.go @@ -45,7 +45,7 @@ func resourceSubnetGroup() *schema.Resource { - "description": { + names.AttrDescription: { Type: schema.TypeString, Optional: true, - Default: "Managed by Terraform", + Default: "Managed by Pulumi", }, - "name": { + names.AttrName: { Type: schema.TypeString, diff --git a/internal/service/route53/record.go b/internal/service/route53/record.go -index e938feac80..c1659dad30 100644 +index c46f2480be..99b65c9466 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 +@@ -361,7 +361,7 @@ func resourceRecordCreate(ctx context.Context, d *schema.ResourceData, meta inte // retry for us since Route53 sometimes returns errors about another // operation happening at the same time. changeBatch := &route53.ChangeBatch{ @@ -1042,7 +1042,7 @@ index e938feac80..c1659dad30 100644 Changes: []*route53.Change{ { Action: aws.String(action), -@@ -663,7 +663,7 @@ func resourceRecordUpdate(ctx context.Context, d *schema.ResourceData, meta inte +@@ -664,7 +664,7 @@ func resourceRecordUpdate(ctx context.Context, d *schema.ResourceData, meta inte // StateChangeConf for this to retry for us since Route53 sometimes returns // errors about another operation happening at the same time. changeBatch := &route53.ChangeBatch{ @@ -1051,7 +1051,7 @@ index e938feac80..c1659dad30 100644 Changes: []*route53.Change{ { Action: aws.String(route53.ChangeActionDelete), -@@ -734,7 +734,7 @@ func resourceRecordDelete(ctx context.Context, d *schema.ResourceData, meta inte +@@ -735,7 +735,7 @@ func resourceRecordDelete(ctx context.Context, d *schema.ResourceData, meta inte // Change batch for deleting changeBatch := &route53.ChangeBatch{ @@ -1061,7 +1061,7 @@ index e938feac80..c1659dad30 100644 { Action: aws.String(route53.ChangeActionDelete), diff --git a/internal/service/route53/zone.go b/internal/service/route53/zone.go -index d2e20f6dda..b9e1bf2bfe 100644 +index 3ffc464eae..55d4aa852c 100644 --- a/internal/service/route53/zone.go +++ b/internal/service/route53/zone.go @@ -59,7 +59,7 @@ func ResourceZone() *schema.Resource { @@ -1074,10 +1074,10 @@ index d2e20f6dda..b9e1bf2bfe 100644 }, "delegation_set_id": { diff --git a/internal/service/route53/zone_association.go b/internal/service/route53/zone_association.go -index e17fa7c445..fb9e5b7304 100644 +index b35f1a2241..82766fec83 100644 --- a/internal/service/route53/zone_association.go +++ b/internal/service/route53/zone_association.go -@@ -76,7 +76,7 @@ func resourceZoneAssociationCreate(ctx context.Context, d *schema.ResourceData, +@@ -77,7 +77,7 @@ func resourceZoneAssociationCreate(ctx context.Context, d *schema.ResourceData, VPCId: aws.String(vpcID), VPCRegion: aws.String(vpcRegion), }, @@ -1086,7 +1086,7 @@ index e17fa7c445..fb9e5b7304 100644 } output, err := conn.AssociateVPCWithHostedZoneWithContext(ctx, input) -@@ -179,7 +179,7 @@ func resourceZoneAssociationDelete(ctx context.Context, d *schema.ResourceData, +@@ -180,7 +180,7 @@ func resourceZoneAssociationDelete(ctx context.Context, d *schema.ResourceData, VPCId: aws.String(vpcID), VPCRegion: aws.String(vpcRegion), }, 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 1b5f908cb47..02fa28489e5 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 1fb5b0c727..bc3ce3efe5 100644 +index 44c9641bce..f5c2ba0fdb 100644 --- a/internal/service/elbv2/target_group.go +++ b/internal/service/elbv2/target_group.go @@ -568,15 +568,15 @@ func resourceTargetGroupRead(ctx context.Context, d *schema.ResourceData, meta i diff --git a/patches/0026-Restore-S3ConnURICleaningDisabled.patch b/patches/0026-Restore-S3ConnURICleaningDisabled.patch index fd487a1c56b..43ed89efe82 100644 --- a/patches/0026-Restore-S3ConnURICleaningDisabled.patch +++ b/patches/0026-Restore-S3ConnURICleaningDisabled.patch @@ -5,18 +5,18 @@ Subject: [PATCH] Restore S3ConnURICleaningDisabled diff --git a/internal/conns/awsclient.go b/internal/conns/awsclient.go -index e9ce0525da..deadff7071 100644 +index da71bbcb51..408e309eb3 100644 --- a/internal/conns/awsclient.go +++ b/internal/conns/awsclient.go -@@ -24,6 +24,7 @@ import ( - kms_sdkv1 "github.com/aws/aws-sdk-go/service/kms" +@@ -22,6 +22,7 @@ import ( + efs_sdkv1 "github.com/aws/aws-sdk-go/service/efs" opsworks_sdkv1 "github.com/aws/aws-sdk-go/service/opsworks" rds_sdkv1 "github.com/aws/aws-sdk-go/service/rds" + s3_sdkv1 "github.com/aws/aws-sdk-go/service/s3" baselogging "github.com/hashicorp/aws-sdk-go-base/v2/logging" "github.com/hashicorp/terraform-provider-aws/internal/errs" tftags "github.com/hashicorp/terraform-provider-aws/internal/tags" -@@ -166,6 +167,13 @@ func (c *AWSClient) S3UsePathStyle(context.Context) bool { +@@ -144,6 +145,13 @@ func (c *AWSClient) S3UsePathStyle(context.Context) bool { return c.s3UsePathStyle } @@ -30,7 +30,7 @@ index e9ce0525da..deadff7071 100644 // SetHTTPClient sets the http.Client used for AWS API calls. // To have effect it must be called before the AWS SDK v1 Session is created. func (c *AWSClient) SetHTTPClient(_ context.Context, httpClient *http.Client) { -@@ -231,7 +239,7 @@ func (c *AWSClient) DefaultKMSKeyPolicy(context.Context) string { +@@ -209,7 +217,7 @@ func (c *AWSClient) DefaultKMSKeyPolicy(context.Context) string { "Resource": "*" } ] 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 1d0b0263fc4..49f9371c075 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 @@ -36,7 +36,7 @@ index 6415ce2355..c80c01b8d1 100644 } } else { diff --git a/internal/service/appconfig/environment.go b/internal/service/appconfig/environment.go -index 122fc2306f..79ad4807ad 100644 +index a6bf0eb823..8eebe8e047 100644 --- a/internal/service/appconfig/environment.go +++ b/internal/service/appconfig/environment.go @@ -104,7 +104,7 @@ func (r *resourceEnvironment) Schema(ctx context.Context, request resource.Schem @@ -49,7 +49,7 @@ index 122fc2306f..79ad4807ad 100644 Blocks: map[string]schema.Block{ "monitor": schema.SetNestedBlock{ diff --git a/internal/service/auditmanager/assessment.go b/internal/service/auditmanager/assessment.go -index 0a27df1500..d2f9ecb1e4 100644 +index 075d3b1d92..96ba1964f3 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 0a27df1500..d2f9ecb1e4 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 01631e3e96..75d963c13c 100644 +index 854451a990..be2c1d6f99 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 01631e3e96..75d963c13c 100644 Optional: true, }, diff --git a/internal/service/auditmanager/framework.go b/internal/service/auditmanager/framework.go -index 942630acae..45b72fc158 100644 +index ffa236c568..5733dd6110 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 942630acae..45b72fc158 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 cdf43cd997..039f8d1f27 100644 +index 0ed0652413..2d331ac4ed 100644 --- a/internal/service/batch/job_queue.go +++ b/internal/service/batch/job_queue.go @@ -109,7 +109,7 @@ func (r *resourceJobQueue) Schema(ctx context.Context, request resource.SchemaRe @@ -101,7 +101,7 @@ index cdf43cd997..039f8d1f27 100644 } diff --git a/internal/service/batch/job_queue_schema.go b/internal/service/batch/job_queue_schema.go -index 8b11271ab7..0ded1f6052 100644 +index b9291e0ff2..47ef9307a3 100644 --- a/internal/service/batch/job_queue_schema.go +++ b/internal/service/batch/job_queue_schema.go @@ -58,7 +58,7 @@ func jobQueueSchema0(ctx context.Context) schema.Schema { @@ -112,9 +112,9 @@ index 8b11271ab7..0ded1f6052 100644 + names.AttrTagsAll: tftags.TagsAttribute(), }, Blocks: map[string]schema.Block{ - "timeouts": timeouts.Block(ctx, timeouts.Opts{ + 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 069f416fc3..d6cc1710d5 100644 +index 8ea4e9e322..e2a85fb87a 100644 --- a/internal/service/ec2/ec2_instance_connect_endpoint.go +++ b/internal/service/ec2/ec2_instance_connect_endpoint.go @@ -117,7 +117,7 @@ func (r *instanceConnectEndpointResource) Schema(ctx context.Context, req resour @@ -123,11 +123,11 @@ index 069f416fc3..d6cc1710d5 100644 names.AttrTags: tftags.TagsAttribute(), - names.AttrTagsAll: tftags.TagsAttributeComputedOnly(), + names.AttrTagsAll: tftags.TagsAttribute(), - "vpc_id": schema.StringAttribute{ + names.AttrVPCID: schema.StringAttribute{ 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 b26759afad..5aaa95f7c6 100644 +index f126ed2755..f093404590 100644 --- a/internal/service/ec2/vpc_security_group_ingress_rule.go +++ b/internal/service/ec2/vpc_security_group_ingress_rule.go @@ -225,7 +225,7 @@ func (r *securityGroupRuleResource) Schema(ctx context.Context, request resource @@ -140,7 +140,7 @@ index b26759afad..5aaa95f7c6 100644 Optional: true, Validators: []validator.Int64{ diff --git a/internal/service/lexv2models/bot.go b/internal/service/lexv2models/bot.go -index fc553b56bc..997a513b50 100644 +index 95c069c72f..bb4bcf390e 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 fc553b56bc..997a513b50 100644 ElementType: types.StringType, Optional: true, diff --git a/internal/service/opensearchserverless/collection.go b/internal/service/opensearchserverless/collection.go -index 01941ffc56..41dd298709 100644 +index ecec56b129..637bbc3595 100644 --- a/internal/service/opensearchserverless/collection.go +++ b/internal/service/opensearchserverless/collection.go @@ -123,7 +123,7 @@ func (r *resourceCollection) Schema(ctx context.Context, req resource.SchemaRequ @@ -162,11 +162,11 @@ index 01941ffc56..41dd298709 100644 names.AttrTags: tftags.TagsAttribute(), - names.AttrTagsAll: tftags.TagsAttributeComputedOnly(), + names.AttrTagsAll: tftags.TagsAttribute(), - "type": schema.StringAttribute{ + names.AttrType: schema.StringAttribute{ Optional: true, Computed: true, diff --git a/internal/service/quicksight/namespace.go b/internal/service/quicksight/namespace.go -index 3fc8abec7a..08ad530a09 100644 +index 32592f6895..99110518cf 100644 --- a/internal/service/quicksight/namespace.go +++ b/internal/service/quicksight/namespace.go @@ -93,7 +93,7 @@ func (r *resourceNamespace) Schema(ctx context.Context, req resource.SchemaReque @@ -177,9 +177,9 @@ index 3fc8abec7a..08ad530a09 100644 + names.AttrTagsAll: tftags.TagsAttribute(), }, Blocks: map[string]schema.Block{ - "timeouts": timeouts.Block(ctx, timeouts.Opts{ + names.AttrTimeouts: timeouts.Block(ctx, timeouts.Opts{ diff --git a/internal/service/quicksight/vpc_connection.go b/internal/service/quicksight/vpc_connection.go -index 6009a572b9..88eb0c4fab 100644 +index 5cc12584dd..a847623e07 100644 --- a/internal/service/quicksight/vpc_connection.go +++ b/internal/service/quicksight/vpc_connection.go @@ -142,7 +142,7 @@ func (r *resourceVPCConnection) Schema(ctx context.Context, req resource.SchemaR @@ -190,9 +190,9 @@ index 6009a572b9..88eb0c4fab 100644 + names.AttrTagsAll: tftags.TagsAttribute(), }, Blocks: map[string]schema.Block{ - "timeouts": timeouts.Block(ctx, timeouts.Opts{ + names.AttrTimeouts: timeouts.Block(ctx, timeouts.Opts{ diff --git a/internal/service/resourceexplorer2/index.go b/internal/service/resourceexplorer2/index.go -index 915ab417d8..f4bdfa2f55 100644 +index 011191840f..8e90530806 100644 --- a/internal/service/resourceexplorer2/index.go +++ b/internal/service/resourceexplorer2/index.go @@ -56,7 +56,7 @@ func (r *resourceIndex) Schema(ctx context.Context, request resource.SchemaReque @@ -201,11 +201,11 @@ index 915ab417d8..f4bdfa2f55 100644 names.AttrTags: tftags.TagsAttribute(), - names.AttrTagsAll: tftags.TagsAttributeComputedOnly(), + names.AttrTagsAll: tftags.TagsAttribute(), - "type": schema.StringAttribute{ + names.AttrType: schema.StringAttribute{ CustomType: fwtypes.StringEnumType[awstypes.IndexType](), Required: true, diff --git a/internal/service/resourceexplorer2/view.go b/internal/service/resourceexplorer2/view.go -index 782b3a6fbc..6da4886ecc 100644 +index 56e257f3d0..fddc928d9b 100644 --- a/internal/service/resourceexplorer2/view.go +++ b/internal/service/resourceexplorer2/view.go @@ -76,7 +76,7 @@ func (r *resourceView) Schema(ctx context.Context, request resource.SchemaReques @@ -218,7 +218,7 @@ index 782b3a6fbc..6da4886ecc 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 33d374f4e2..b2e1c97096 100644 +index 8d2e3d7876..3c56693234 100644 --- a/internal/service/workspaces/connection_alias.go +++ b/internal/service/workspaces/connection_alias.go @@ -82,7 +82,7 @@ func (r *resourceConnectionAlias) Schema(ctx context.Context, req resource.Schem @@ -229,7 +229,7 @@ index 33d374f4e2..b2e1c97096 100644 + names.AttrTagsAll: tftags.TagsAttribute(), }, Blocks: map[string]schema.Block{ - "timeouts": timeouts.Block(ctx, timeouts.Opts{ + names.AttrTimeouts: timeouts.Block(ctx, timeouts.Opts{ diff --git a/internal/verify/diff.go b/internal/verify/diff.go index 0bc956a747..e0636e99ce 100644 --- a/internal/verify/diff.go 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 7edee81327e..dcf518a52ad 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 6f4ddd9ea4..79110331b4 100644 +index 6a9b729b3b..9f440d5c82 100644 --- a/internal/service/eks/cluster.go +++ b/internal/service/eks/cluster.go @@ -118,6 +118,13 @@ func resourceCluster() *schema.Resource { diff --git a/patches/0031-Fix-job-queue-sdkv2-migration.patch b/patches/0031-Fix-job-queue-sdkv2-migration.patch index 96776194ce9..b6bc13e3a74 100644 --- a/patches/0031-Fix-job-queue-sdkv2-migration.patch +++ b/patches/0031-Fix-job-queue-sdkv2-migration.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Fix job queue sdkv2 migration diff --git a/internal/service/batch/job_queue_schema.go b/internal/service/batch/job_queue_schema.go -index 0ded1f6052..90de7f202f 100644 +index 47ef9307a3..ad5621bdb0 100644 --- a/internal/service/batch/job_queue_schema.go +++ b/internal/service/batch/job_queue_schema.go @@ -93,6 +93,7 @@ func upgradeJobQueueResourceStateV0toV1(ctx context.Context, req resource.Upgrad diff --git a/patches/0033-Run-scripts-patch_computed_only.sh-to-patch-eks-pod_.patch b/patches/0033-Run-scripts-patch_computed_only.sh-to-patch-eks-pod_.patch index 49de83bdc4f..043969e8172 100644 --- a/patches/0033-Run-scripts-patch_computed_only.sh-to-patch-eks-pod_.patch +++ b/patches/0033-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 31b2fbe18f..aa6820adf4 100644 +index e4c13754ab..cb4258a1e8 100644 --- a/internal/service/docdbelastic/cluster.go +++ b/internal/service/docdbelastic/cluster.go @@ -127,7 +127,7 @@ func (r *resourceCluster) Schema(ctx context.Context, _ resource.SchemaRequest, @@ -15,11 +15,11 @@ index 31b2fbe18f..aa6820adf4 100644 names.AttrTags: tftags.TagsAttribute(), - names.AttrTagsAll: tftags.TagsAttributeComputedOnly(), + names.AttrTagsAll: tftags.TagsAttribute(), - "vpc_security_group_ids": schema.SetAttribute{ + names.AttrVPCSecurityGroupIDs: schema.SetAttribute{ ElementType: types.StringType, Optional: true, diff --git a/internal/service/eks/pod_identity_association.go b/internal/service/eks/pod_identity_association.go -index e4f57d15e7..672d9018c5 100644 +index 421077d389..f8dc17e1cd 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 e4f57d15e7..672d9018c5 100644 } } diff --git a/internal/service/s3control/access_grant.go b/internal/service/s3control/access_grant.go -index f2963c92a6..d93b539ff2 100644 +index 1b74019099..6a3a6e512d 100644 --- a/internal/service/s3control/access_grant.go +++ b/internal/service/s3control/access_grant.go @@ -103,7 +103,7 @@ func (r *accessGrantResource) Schema(ctx context.Context, request resource.Schem @@ -45,7 +45,7 @@ index f2963c92a6..d93b539ff2 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 8adcc8ce67..ceb5336ce9 100644 +index 7fca401a6e..b4cc558fa4 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 8adcc8ce67..ceb5336ce9 100644 } } diff --git a/internal/service/s3control/access_grants_location.go b/internal/service/s3control/access_grants_location.go -index f45d59078b..bead9b4bb9 100644 +index a8e540e057..bb01d64ffb 100644 --- a/internal/service/s3control/access_grants_location.go +++ b/internal/service/s3control/access_grants_location.go @@ -84,7 +84,7 @@ func (r *accessGrantsLocationResource) Schema(ctx context.Context, request resou diff --git a/patches/0035-Fix-tags_all-Computed-for-PF-resources.patch b/patches/0035-Fix-tags_all-Computed-for-PF-resources.patch index ce213b292ad..fcfb99c1f01 100644 --- a/patches/0035-Fix-tags_all-Computed-for-PF-resources.patch +++ b/patches/0035-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 ec150135d2..4daad4c761 100644 +index 29f90c64dd..51792e106a 100644 --- a/internal/service/amp/scraper.go +++ b/internal/service/amp/scraper.go @@ -83,7 +83,7 @@ func (r *scraperResource) Schema(ctx context.Context, req resource.SchemaRequest @@ -18,7 +18,7 @@ index ec150135d2..4daad4c761 100644 Blocks: map[string]schema.Block{ "destination": schema.ListNestedBlock{ diff --git a/internal/service/bedrock/custom_model.go b/internal/service/bedrock/custom_model.go -index 88557aa20f..4d01c25a06 100644 +index 847c0b502c..92471c512d 100644 --- a/internal/service/bedrock/custom_model.go +++ b/internal/service/bedrock/custom_model.go @@ -137,7 +137,7 @@ func (r *customModelResource) Schema(ctx context.Context, request resource.Schem @@ -31,7 +31,7 @@ index 88557aa20f..4d01c25a06 100644 CustomType: fwtypes.NewListNestedObjectTypeOf[customModelTrainingMetricsModel](ctx), Computed: true, diff --git a/internal/service/codeguruprofiler/profiling_group.go b/internal/service/codeguruprofiler/profiling_group.go -index 130998fa1b..dadc35736d 100644 +index 9b0e8fb993..9ec78ba066 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 130998fa1b..dadc35736d 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 a1fab400f6..75e31e8b48 100644 +index d5433bb59f..eb44a26c94 100644 --- a/internal/service/elasticache/serverless_cache.go +++ b/internal/service/elasticache/serverless_cache.go @@ -176,7 +176,7 @@ func (r *serverlessCacheResource) Schema(ctx context.Context, request resource.S @@ -57,7 +57,7 @@ index a1fab400f6..75e31e8b48 100644 Optional: true, }, diff --git a/internal/service/rekognition/collection.go b/internal/service/rekognition/collection.go -index 11242d1636..ea24792626 100644 +index 0c1741f00e..7e1945e19a 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 11242d1636..ea24792626 100644 } diff --git a/internal/service/securityhub/automation_rule.go b/internal/service/securityhub/automation_rule.go -index b60ec79697..add8d30c09 100644 +index 55e3862237..6b980dbd16 100644 --- a/internal/service/securityhub/automation_rule.go +++ b/internal/service/securityhub/automation_rule.go @@ -75,7 +75,7 @@ func (r *automationRuleResource) Schema(ctx context.Context, request resource.Sc @@ -83,10 +83,10 @@ index b60ec79697..add8d30c09 100644 Blocks: map[string]schema.Block{ "actions": schema.SetNestedBlock{ diff --git a/internal/service/securitylake/data_lake.go b/internal/service/securitylake/data_lake.go -index f74c1b2850..3a95d706f4 100644 +index d1e5ca71a2..b540cada6f 100644 --- a/internal/service/securitylake/data_lake.go +++ b/internal/service/securitylake/data_lake.go -@@ -72,7 +72,7 @@ func (r *dataLakeResource) Schema(ctx context.Context, request resource.SchemaRe +@@ -75,7 +75,7 @@ func (r *dataLakeResource) Schema(ctx context.Context, request resource.SchemaRe }, "s3_bucket_arn": framework.ARNAttributeComputedOnly(), names.AttrTags: tftags.TagsAttribute(), @@ -96,7 +96,7 @@ index f74c1b2850..3a95d706f4 100644 Blocks: map[string]schema.Block{ "configuration": schema.ListNestedBlock{ diff --git a/internal/service/ssmcontacts/rotation.go b/internal/service/ssmcontacts/rotation.go -index b515434073..f4bc4a8514 100644 +index cd69312af3..46c02f005b 100644 --- a/internal/service/ssmcontacts/rotation.go +++ b/internal/service/ssmcontacts/rotation.go @@ -70,7 +70,7 @@ func (r *resourceRotation) Schema(ctx context.Context, request resource.SchemaRe @@ -109,7 +109,7 @@ index b515434073..f4bc4a8514 100644 Required: true, }, diff --git a/internal/service/ssoadmin/application.go b/internal/service/ssoadmin/application.go -index 0b54f3f5fe..5b44651943 100644 +index 0312e9def5..b409c3cd34 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 0b54f3f5fe..5b44651943 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 98d5a67198..2490c56c3a 100644 +index e0e72b63f8..f61a6263c3 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/0036-Disable-retry-for-KMS-access-denied-in-lambda.patch b/patches/0036-Disable-retry-for-KMS-access-denied-in-lambda.patch index 52b6ec0546c..3de14cea25f 100644 --- a/patches/0036-Disable-retry-for-KMS-access-denied-in-lambda.patch +++ b/patches/0036-Disable-retry-for-KMS-access-denied-in-lambda.patch @@ -6,10 +6,10 @@ 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..6f36351b82 +index 0000000000..54f6aac15a --- /dev/null +++ b/internal/service/lambda/service_package_extra.go -@@ -0,0 +1,38 @@ +@@ -0,0 +1,39 @@ +package lambda + +import ( @@ -20,6 +20,7 @@ index 0000000000..6f36351b82 + lambda_sdkv2 "github.com/aws/aws-sdk-go-v2/service/lambda" + tfawserr_sdkv2 "github.com/hashicorp/aws-sdk-go-base/v2/tfawserr" + "github.com/hashicorp/terraform-provider-aws/internal/conns" ++ "github.com/hashicorp/terraform-provider-aws/names" +) + +// Customize lambda retries. @@ -42,14 +43,14 @@ index 0000000000..6f36351b82 + return aws_sdkv2.UnknownTernary // Delegate + }) + return lambda_sdkv2.NewFromConfig(cfg, func(o *lambda_sdkv2.Options) { -+ if endpoint := config["endpoint"].(string); endpoint != "" { ++ if endpoint := config[names.AttrEndpoint].(string); endpoint != "" { + o.BaseEndpoint = aws_sdkv2.String(endpoint) + } + o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws_sdkv2.RetryerV2), retry) + }), nil +} diff --git a/internal/service/lambda/service_package_gen.go b/internal/service/lambda/service_package_gen.go -index 9437623666..741067f98f 100644 +index c127b05200..0f67e0aa4c 100644 --- a/internal/service/lambda/service_package_gen.go +++ b/internal/service/lambda/service_package_gen.go @@ -5,8 +5,6 @@ package lambda @@ -70,7 +71,7 @@ index 9437623666..741067f98f 100644 - cfg := *(config["aws_sdkv2_config"].(*aws_sdkv2.Config)) - - return lambda_sdkv2.NewFromConfig(cfg, func(o *lambda_sdkv2.Options) { -- if endpoint := config["endpoint"].(string); endpoint != "" { +- if endpoint := config[names.AttrEndpoint].(string); endpoint != "" { - o.BaseEndpoint = aws_sdkv2.String(endpoint) - } - }), nil @@ -80,12 +81,12 @@ index 9437623666..741067f98f 100644 return &servicePackage{} } diff --git a/names/data/names_data.csv b/names/data/names_data.csv -index c0ee031d37..a573761b55 100644 +index 3d567e120f..fae484a898 100644 --- a/names/data/names_data.csv +++ b/names/data/names_data.csv @@ -218,7 +218,7 @@ kinesis-video-media,kinesisvideomedia,kinesisvideomedia,kinesisvideomedia,,kines kinesis-video-signaling,kinesisvideosignaling,kinesisvideosignalingchannels,kinesisvideosignaling,,kinesisvideosignaling,,kinesisvideosignalingchannels,KinesisVideoSignaling,KinesisVideoSignalingChannels,,1,,,aws_kinesisvideosignaling_,,kinesisvideosignaling_,Kinesis Video Signaling,Amazon,,x,,,,,Kinesis Video Signaling,,, - kms,kms,kms,kms,,kms,,,KMS,KMS,,1,,,aws_kms_,,kms_,KMS (Key Management),AWS,,,,,,,KMS,ListKeys,, + kms,kms,kms,kms,,kms,,,KMS,KMS,,,2,,aws_kms_,,kms_,KMS (Key Management),AWS,,,,,,,KMS,ListKeys,, lakeformation,lakeformation,lakeformation,lakeformation,,lakeformation,,,LakeFormation,LakeFormation,,,2,,aws_lakeformation_,,lakeformation_,Lake Formation,AWS,,,,,,,LakeFormation,ListResources,, -lambda,lambda,lambda,lambda,,lambda,,,Lambda,Lambda,,,2,,aws_lambda_,,lambda_,Lambda,AWS,,,,,,,Lambda,ListFunctions,, +lambda,lambda,lambda,lambda,,lambda,,,Lambda,Lambda,x,,2,,aws_lambda_,,lambda_,Lambda,AWS,,,,,,,Lambda,ListFunctions,, diff --git a/patches/0037-Patch-ACM-retry-to-not-retry-after-LimitExceededExce.patch b/patches/0037-Patch-ACM-retry-to-not-retry-after-LimitExceededExce.patch index 04ceba6e705..8f0841bd93d 100644 --- a/patches/0037-Patch-ACM-retry-to-not-retry-after-LimitExceededExce.patch +++ b/patches/0037-Patch-ACM-retry-to-not-retry-after-LimitExceededExce.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Patch ACM retry to not retry after LimitExceededException diff --git a/internal/service/acm/service_package_gen.go b/internal/service/acm/service_package_gen.go -index dbd2989c62..949496c395 100644 +index b75c973f68..91dd8f2621 100644 --- a/internal/service/acm/service_package_gen.go +++ b/internal/service/acm/service_package_gen.go @@ -6,7 +6,9 @@ import ( @@ -20,7 +20,7 @@ index dbd2989c62..949496c395 100644 "github.com/hashicorp/terraform-provider-aws/internal/types" "github.com/hashicorp/terraform-provider-aws/names" @@ -60,6 +62,14 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( - if endpoint := config["endpoint"].(string); endpoint != "" { + if endpoint := config[names.AttrEndpoint].(string); endpoint != "" { o.BaseEndpoint = aws_sdkv2.String(endpoint) } + diff --git a/patches/0038-Restore-legacy-bucket.patch b/patches/0038-Restore-legacy-bucket.patch index e67dddc621e..638381f7109 100644 --- a/patches/0038-Restore-legacy-bucket.patch +++ b/patches/0038-Restore-legacy-bucket.patch @@ -5,19 +5,19 @@ Subject: [PATCH] Restore legacy bucket diff --git a/go.mod b/go.mod -index 584683670d..821e7359c7 100644 +index f7338de564..3f9b489de7 100644 --- a/go.mod +++ b/go.mod -@@ -178,6 +178,7 @@ require ( +@@ -182,6 +182,7 @@ require ( github.com/gertd/go-pluralize v0.2.1 github.com/google/go-cmp v0.6.0 github.com/hashicorp/aws-cloudformation-resource-schema-sdk-go v0.22.0 + github.com/hashicorp/aws-sdk-go-base v1.1.0 - github.com/hashicorp/aws-sdk-go-base/v2 v2.0.0-beta.52 - github.com/hashicorp/aws-sdk-go-base/v2/awsv1shim/v2 v2.0.0-beta.53 + github.com/hashicorp/aws-sdk-go-base/v2 v2.0.0-beta.53 + github.com/hashicorp/aws-sdk-go-base/v2/awsv1shim/v2 v2.0.0-beta.54 github.com/hashicorp/awspolicyequivalence v1.6.0 diff --git a/go.sum b/go.sum -index 0784e00350..32203a41bd 100644 +index 7f379a2faa..ff9fe2ce20 100644 --- a/go.sum +++ b/go.sum @@ -22,6 +22,7 @@ github.com/apparentlymart/go-textseg/v15 v15.0.0 h1:uYvfpb3DyLSCGWnctWKGj857c6ew @@ -25,10 +25,10 @@ index 0784e00350..32203a41bd 100644 github.com/armon/go-radix v1.0.0 h1:F4z6KzEeeQIMeLFa97iZU6vupzoecKdU5TX24SNppXI= github.com/armon/go-radix v1.0.0/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8= +github.com/aws/aws-sdk-go v1.31.9/go.mod h1:5zCpMtNQVjRREroY7sYe8lOMRSxkhG6MZveU8YkpAk0= - github.com/aws/aws-sdk-go v1.52.0 h1:ptgek/4B2v/ljsjYSEvLQ8LTD+SQyrqhOOWvHc/VGPI= - github.com/aws/aws-sdk-go v1.52.0/go.mod h1:LF8svs817+Nz+DmiMQKTO3ubZ/6IaTpq3TjupRn3Eqk= + github.com/aws/aws-sdk-go v1.52.5 h1:m2lty5v9sHm1J3lhA43hJql+yKZudF09qzab0Ag9chM= + github.com/aws/aws-sdk-go v1.52.5/go.mod h1:LF8svs817+Nz+DmiMQKTO3ubZ/6IaTpq3TjupRn3Eqk= github.com/aws/aws-sdk-go-v2 v1.26.1 h1:5554eUqIYVWpU0YmeeYZ0wU64H2VLBs8TlhRB2L+EkA= -@@ -419,6 +420,7 @@ github.com/go-logr/logr v1.4.1 h1:pKouT5E8xu9zeFC39JXRDukb6JFQPXM5p5I91188VAQ= +@@ -427,6 +428,7 @@ github.com/go-logr/logr v1.4.1 h1:pKouT5E8xu9zeFC39JXRDukb6JFQPXM5p5I91188VAQ= github.com/go-logr/logr v1.4.1/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag= github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE= @@ -36,16 +36,16 @@ index 0784e00350..32203a41bd 100644 github.com/go-test/deep v1.1.0 h1:WOcxcdHcvdgThNXjw0t76K42FXTU7HpNQWHpA2HHNlg= github.com/go-test/deep v1.1.0/go.mod h1:5C2ZWiW0ErCdrYzpqxLbTX7MG14M9iiw8DgHncVwcsE= github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da h1:oI5xCqsCo564l8iNU+DwB5epxmsaqB+rhGL0m5jtYqE= -@@ -438,6 +440,8 @@ github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= +@@ -446,6 +448,8 @@ github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/hashicorp/aws-cloudformation-resource-schema-sdk-go v0.22.0 h1:N2V/ooY+BPQwwN3qPRIztByR8mWN6IqgULqVzGoUlog= github.com/hashicorp/aws-cloudformation-resource-schema-sdk-go v0.22.0/go.mod h1:HAmscHyzSOfB1Dr16KLc177KNbn83wscnZC+N7WyaM8= +github.com/hashicorp/aws-sdk-go-base v1.1.0 h1:27urM3JAp6v+Oj/Ea5ULZwuFPK9cO1RUdEpV+rNdSAc= +github.com/hashicorp/aws-sdk-go-base v1.1.0/go.mod h1:2fRjWDv3jJBeN6mVWFHV6hFTNeFBx2gpDLQaZNxUVAY= - github.com/hashicorp/aws-sdk-go-base/v2 v2.0.0-beta.52 h1:bKvTdvF3jNgDt4rHDk55BxYnyofFVJhXHMj+RBRUmc0= - github.com/hashicorp/aws-sdk-go-base/v2 v2.0.0-beta.52/go.mod h1:YlwqmXqrK6MNTtW1cCjPFkoc3plCT939B+Yjmq+/DBc= - github.com/hashicorp/aws-sdk-go-base/v2/awsv1shim/v2 v2.0.0-beta.53 h1:hrcewXLBw48wZc6fe7blETM94eTwzTouQ4zWqQvjVwU= -@@ -513,6 +517,7 @@ github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99/go.mod h1:1lJo3i + github.com/hashicorp/aws-sdk-go-base/v2 v2.0.0-beta.53 h1:jgOMbQlypMpUMaqYJotjT7ERSMvQP00Mppgjgh8lNt8= + github.com/hashicorp/aws-sdk-go-base/v2 v2.0.0-beta.53/go.mod h1:nvpXIeF0ANfZ7sMssXKSSR3pyXfksajxoC2tl4jjN08= + github.com/hashicorp/aws-sdk-go-base/v2/awsv1shim/v2 v2.0.0-beta.54 h1:raRbM2Wynqv0Nyhe7AwVnFgb2roGSvpSUeQKxEg8Lts= +@@ -521,6 +525,7 @@ github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99/go.mod h1:1lJo3i github.com/jessevdk/go-flags v1.4.0/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI= github.com/jhump/protoreflect v1.15.1 h1:HUMERORf3I3ZdX05WaQ6MIpd/NJ434hTp5YiKgfCL6c= github.com/jhump/protoreflect v1.15.1/go.mod h1:jD/2GMKKE6OqX8qTjhADU1e6DShO+gavG9e0Q693nKo= @@ -53,7 +53,7 @@ index 0784e00350..32203a41bd 100644 github.com/jmespath/go-jmespath v0.4.0 h1:BEgLn5cpjn8UN1mAw4NjwDrS35OdebyEtFe+9YPoQUg= github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo= github.com/jmespath/go-jmespath/internal/testify v1.5.1 h1:shLQSRRSCCPj3f2gpwzGwWFoC7ycTf1rcQZHOlsJ6N8= -@@ -625,6 +630,7 @@ golang.org/x/mod v0.15.0 h1:SernR4v+D55NyBH2QiEQrlBAnj1ECL6AGrA5+dPaMY8= +@@ -633,6 +638,7 @@ golang.org/x/mod v0.15.0 h1:SernR4v+D55NyBH2QiEQrlBAnj1ECL6AGrA5+dPaMY8= golang.org/x/mod v0.15.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= @@ -62,10 +62,10 @@ index 0784e00350..32203a41bd 100644 golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= golang.org/x/net v0.2.0/go.mod h1:KqCZLdyyvdV855qA2rE3GC2aiw5xGR5TEjj8smXukLY= diff --git a/internal/conns/awsclient.go b/internal/conns/awsclient.go -index deadff7071..6310023478 100644 +index 408e309eb3..abf1b5a23d 100644 --- a/internal/conns/awsclient.go +++ b/internal/conns/awsclient.go -@@ -167,6 +167,10 @@ func (c *AWSClient) S3UsePathStyle(context.Context) bool { +@@ -145,6 +145,10 @@ func (c *AWSClient) S3UsePathStyle(context.Context) bool { return c.s3UsePathStyle } diff --git a/patches/0039-Patch-osis_pipeline-tags-flags.patch b/patches/0039-Patch-osis_pipeline-tags-flags.patch index 10848c782d2..126af272add 100644 --- a/patches/0039-Patch-osis_pipeline-tags-flags.patch +++ b/patches/0039-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 1ea6d661dd..1bbc11eaf9 100644 +index 96f9722fca..fc44162dfb 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/0040-Revert-Merge-pull-request-35678-from-hashicorp-b-elb.patch b/patches/0040-Revert-Merge-pull-request-35678-from-hashicorp-b-elb.patch index 1750563b240..94214f6425d 100644 --- a/patches/0040-Revert-Merge-pull-request-35678-from-hashicorp-b-elb.patch +++ b/patches/0040-Revert-Merge-pull-request-35678-from-hashicorp-b-elb.patch @@ -21,7 +21,7 @@ index 106f298c02..0000000000 -resource/aws_lb_listener_rule: Fixes unexpected diff when using `action` parameters which don't match the `type`. -``` diff --git a/internal/service/elbv2/listener.go b/internal/service/elbv2/listener.go -index 5b358cc768..159d62abf7 100644 +index d47935f910..e1bd664c4f 100644 --- a/internal/service/elbv2/listener.go +++ b/internal/service/elbv2/listener.go @@ -75,10 +75,9 @@ func ResourceListener() *schema.Resource { @@ -108,7 +108,7 @@ index 5b358cc768..159d62abf7 100644 + Optional: true, + ValidateFunc: verify.ValidARN, }, - "type": { + names.AttrType: { Type: schema.TypeString, @@ -397,21 +393,6 @@ func ResourceListener() *schema.Resource { } @@ -124,7 +124,7 @@ index 5b358cc768..159d62abf7 100644 - } - return false - }) -- at := k[:i+1] + "type" +- at := k[:i+1] + names.AttrType - return awstypes.ActionTypeEnum(d.Get(at).(string)) != t - } -} @@ -133,7 +133,7 @@ index 5b358cc768..159d62abf7 100644 var diags diag.Diagnostics conn := meta.(*conns.AWSClient).ELBV2Client(ctx) diff --git a/internal/service/elbv2/listener_rule.go b/internal/service/elbv2/listener_rule.go -index 424c9f24f3..cf2d9e9e71 100644 +index 239c0c940d..00064312b9 100644 --- a/internal/service/elbv2/listener_rule.go +++ b/internal/service/elbv2/listener_rule.go @@ -11,7 +11,6 @@ import ( @@ -228,7 +228,7 @@ index 424c9f24f3..cf2d9e9e71 100644 - } - return false - }) -- at := k[:i+1] + "type" +- at := k[:i+1] + names.AttrType - return awstypes.ActionTypeEnum(d.Get(at).(string)) != t - } -} diff --git a/patches/0041-Revert-Merge-pull-request-35671-from-hashicorp-b-lb-.patch b/patches/0041-Revert-Merge-pull-request-35671-from-hashicorp-b-lb-.patch index c6f722d1bdc..ebbfe5a5abf 100644 --- a/patches/0041-Revert-Merge-pull-request-35671-from-hashicorp-b-lb-.patch +++ b/patches/0041-Revert-Merge-pull-request-35671-from-hashicorp-b-lb-.patch @@ -29,7 +29,7 @@ index 7c9da01c62..0000000000 -resource/aws_lb_listener_rule: Was incorrectly reporting conflicting `action[].target_group_arn` when `ignore_changes` was set. -``` diff --git a/internal/service/elbv2/listener.go b/internal/service/elbv2/listener.go -index 159d62abf7..dd0eaddc43 100644 +index e1bd664c4f..c89f978124 100644 --- a/internal/service/elbv2/listener.go +++ b/internal/service/elbv2/listener.go @@ -214,11 +214,9 @@ func ResourceListener() *schema.Resource { @@ -67,7 +67,7 @@ index 159d62abf7..dd0eaddc43 100644 - } - return &awstypes.TargetGroupStickinessConfig{ - Enabled: aws.Bool(tfMap["enabled"].(bool)), + Enabled: aws.Bool(tfMap[names.AttrEnabled].(bool)), - DurationSeconds: duration, + DurationSeconds: aws.Int32(int32(tfMap["duration"].(int))), } @@ -85,8 +85,8 @@ index 159d62abf7..dd0eaddc43 100644 - for i, action := range actions { + for i, action := range Actions { m := map[string]interface{}{ - "type": string(action.Type), - "order": aws.ToInt32(action.Order), + names.AttrType: string(action.Type), + "order": aws.ToInt32(action.Order), @@ -957,7 +949,11 @@ func flattenLbListenerActions(d *schema.ResourceData, attrName string, actions [ switch action.Type { @@ -187,10 +187,10 @@ index 159d62abf7..dd0eaddc43 100644 - } -} diff --git a/internal/service/elbv2/listener_data_source.go b/internal/service/elbv2/listener_data_source.go -index a209c9338b..c9ec31a266 100644 +index 6748be0f47..9fac77e331 100644 --- a/internal/service/elbv2/listener_data_source.go +++ b/internal/service/elbv2/listener_data_source.go -@@ -338,7 +338,7 @@ func dataSourceListenerRead(ctx context.Context, d *schema.ResourceData, meta in +@@ -339,7 +339,7 @@ func dataSourceListenerRead(ctx context.Context, d *schema.ResourceData, meta in sort.Slice(listener.DefaultActions, func(i, j int) bool { return aws.ToInt32(listener.DefaultActions[i].Order) < aws.ToInt32(listener.DefaultActions[j].Order) }) @@ -200,7 +200,7 @@ index a209c9338b..c9ec31a266 100644 } d.Set("load_balancer_arn", listener.LoadBalancerArn) diff --git a/internal/service/elbv2/listener_rule.go b/internal/service/elbv2/listener_rule.go -index cf2d9e9e71..3b63032c21 100644 +index 00064312b9..e18c5b0479 100644 --- a/internal/service/elbv2/listener_rule.go +++ b/internal/service/elbv2/listener_rule.go @@ -99,11 +99,9 @@ func ResourceListenerRule() *schema.Resource { diff --git a/patches/0042-Allow-creating-lambdas-without-code-related-properti.patch b/patches/0042-Allow-creating-lambdas-without-code-related-properti.patch index 714895c476a..d86b694f32e 100644 --- a/patches/0042-Allow-creating-lambdas-without-code-related-properti.patch +++ b/patches/0042-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 c14d48b379..e4f6f4c56f 100644 +index dae874f691..bb6e0eb19a 100644 --- a/internal/service/lambda/function.go +++ b/internal/service/lambda/function.go @@ -167,7 +167,7 @@ func resourceFunction() *schema.Resource { diff --git a/patches/0043-Do-not-Compute-tags_all-of-aws_bedrock_provisioned_m.patch b/patches/0043-Do-not-Compute-tags_all-of-aws_bedrock_provisioned_m.patch index bf9035a2953..a6b6aec00a8 100644 --- a/patches/0043-Do-not-Compute-tags_all-of-aws_bedrock_provisioned_m.patch +++ b/patches/0043-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 70ad188cdd..df2c5b1737 100644 +index 9dbc65efef..666f31194a 100644 --- a/internal/service/bedrock/provisioned_model_throughput.go +++ b/internal/service/bedrock/provisioned_model_throughput.go @@ -85,7 +85,7 @@ func (r *resourceProvisionedModelThroughput) Schema(ctx context.Context, request @@ -17,4 +17,4 @@ index 70ad188cdd..df2c5b1737 100644 + names.AttrTagsAll: tftags.TagsAttribute(), }, Blocks: map[string]schema.Block{ - "timeouts": timeouts.Block(ctx, timeouts.Opts{ + names.AttrTimeouts: timeouts.Block(ctx, timeouts.Opts{ diff --git a/patches/0045-securitylake_subscriber-tags_all-patch.patch b/patches/0045-securitylake_subscriber-tags_all-patch.patch index 00840ff49a0..7198b4d6088 100644 --- a/patches/0045-securitylake_subscriber-tags_all-patch.patch +++ b/patches/0045-securitylake_subscriber-tags_all-patch.patch @@ -5,10 +5,10 @@ Subject: [PATCH] securitylake_subscriber tags_all patch diff --git a/internal/service/securitylake/subscriber.go b/internal/service/securitylake/subscriber.go -index 39cd7b84ed..5dc325333a 100644 +index 7e0abbcd26..27f0f7b033 100644 --- a/internal/service/securitylake/subscriber.go +++ b/internal/service/securitylake/subscriber.go -@@ -96,7 +96,7 @@ func (r *subscriberResource) Schema(ctx context.Context, request resource.Schema +@@ -99,7 +99,7 @@ func (r *subscriberResource) Schema(ctx context.Context, request resource.Schema }, names.AttrID: framework.IDAttribute(), names.AttrTags: tftags.TagsAttribute(), @@ -16,4 +16,4 @@ index 39cd7b84ed..5dc325333a 100644 + names.AttrTagsAll: tftags.TagsAttribute(), }, Blocks: map[string]schema.Block{ - "source": schema.ListNestedBlock{ + "source": schema.SetNestedBlock{ diff --git a/patches/0046-Revert-rds-engine_version-Fix-bugs-with-default-only.patch b/patches/0046-Revert-rds-engine_version-Fix-bugs-with-default-only.patch index 90aedfb02be..1f4d6a90ec7 100644 --- a/patches/0046-Revert-rds-engine_version-Fix-bugs-with-default-only.patch +++ b/patches/0046-Revert-rds-engine_version-Fix-bugs-with-default-only.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Revert "rds/engine_version: Fix bugs with default only flag" diff --git a/internal/service/rds/engine_version_data_source.go b/internal/service/rds/engine_version_data_source.go -index a370148391..3b593585f5 100644 +index 9a8404e8f8..925fd1f341 100644 --- a/internal/service/rds/engine_version_data_source.go +++ b/internal/service/rds/engine_version_data_source.go @@ -11,7 +11,6 @@ import ( @@ -16,7 +16,7 @@ index a370148391..3b593585f5 100644 "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" "github.com/hashicorp/terraform-provider-aws/internal/conns" -@@ -215,27 +214,37 @@ func dataSourceEngineVersionRead(ctx context.Context, d *schema.ResourceData, me +@@ -216,27 +215,37 @@ func dataSourceEngineVersionRead(ctx context.Context, d *schema.ResourceData, me input.EngineVersion = aws.String(v.(string)) } @@ -35,7 +35,7 @@ index a370148391..3b593585f5 100644 - if v, ok := d.GetOk("default_only"); ok { - input.DefaultOnly = aws.Bool(v.(bool)) -+ if _, ok := d.GetOk("version"); ok && !defaultOnlySet { ++ if _, ok := d.GetOk(names.AttrVersion); ok && !defaultOnlySet { + input.DefaultOnly = nil + } + @@ -57,7 +57,7 @@ index a370148391..3b593585f5 100644 - "preferred_major_targets", - "preferred_upgrade_targets", - "preferred_versions", -- "version", +- names.AttrVersion, - }) { - input.DefaultOnly = aws.Bool(true) + if _, ok := d.GetOk("preferred_versions"); ok && !defaultOnlySet { @@ -69,7 +69,7 @@ index a370148391..3b593585f5 100644 } log.Printf("[DEBUG] Reading RDS engine versions: %v", input) -@@ -473,25 +482,3 @@ func sortEngineVersions(engineVersions []*rds.DBEngineVersion) { +@@ -474,25 +483,3 @@ func sortEngineVersions(engineVersions []*rds.DBEngineVersion) { return version.LessThanWithTime(engineVersions[i].CreateTime, engineVersions[j].CreateTime, aws.StringValue(engineVersions[i].EngineVersion), aws.StringValue(engineVersions[j].EngineVersion)) }) } diff --git a/patches/0047-Patch-tags-ComputedOnly-for-m2-resources.patch b/patches/0047-Patch-tags-ComputedOnly-for-m2-resources.patch index 801572b5e05..5d56b320efc 100644 --- a/patches/0047-Patch-tags-ComputedOnly-for-m2-resources.patch +++ b/patches/0047-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 f6998fab42..5db8ceb815 100644 +index e9b1dc0494..4953913350 100644 --- a/internal/service/m2/application.go +++ b/internal/service/m2/application.go @@ -103,7 +103,7 @@ func (r *applicationResource) Schema(ctx context.Context, request resource.Schem @@ -18,7 +18,7 @@ index f6998fab42..5db8ceb815 100644 Blocks: map[string]schema.Block{ "definition": schema.ListNestedBlock{ diff --git a/internal/service/m2/environment.go b/internal/service/m2/environment.go -index ea74ae2cd4..e96fe875c1 100644 +index 637d83b7a2..5f33812bfe 100644 --- a/internal/service/m2/environment.go +++ b/internal/service/m2/environment.go @@ -173,7 +173,7 @@ func (r *environmentResource) Schema(ctx context.Context, request resource.Schem diff --git a/patches/0048-restore-ECRConn.patch b/patches/0048-restore-ECRConn.patch index 198acc39b35..8167beda20b 100644 --- a/patches/0048-restore-ECRConn.patch +++ b/patches/0048-restore-ECRConn.patch @@ -5,18 +5,18 @@ Subject: [PATCH] restore ECRConn diff --git a/internal/conns/awsclient_gen.go b/internal/conns/awsclient_gen.go -index 3dac23527e..6c8d7f517f 100644 +index ede8ee662b..4c19ed26cb 100644 --- a/internal/conns/awsclient_gen.go +++ b/internal/conns/awsclient_gen.go -@@ -186,6 +186,7 @@ import ( +@@ -188,6 +188,7 @@ import ( + dlm_sdkv1 "github.com/aws/aws-sdk-go/service/dlm" docdb_sdkv1 "github.com/aws/aws-sdk-go/service/docdb" - dynamodb_sdkv1 "github.com/aws/aws-sdk-go/service/dynamodb" ec2_sdkv1 "github.com/aws/aws-sdk-go/service/ec2" + ecr_sdkv1 "github.com/aws/aws-sdk-go/service/ecr" ecs_sdkv1 "github.com/aws/aws-sdk-go/service/ecs" efs_sdkv1 "github.com/aws/aws-sdk-go/service/efs" elasticache_sdkv1 "github.com/aws/aws-sdk-go/service/elasticache" -@@ -590,6 +591,10 @@ func (c *AWSClient) EC2Client(ctx context.Context) *ec2_sdkv2.Client { +@@ -586,6 +587,10 @@ func (c *AWSClient) EC2Client(ctx context.Context) *ec2_sdkv2.Client { return errs.Must(client[*ec2_sdkv2.Client](ctx, c, names.EC2, make(map[string]any))) } diff --git a/patches/0050-restore-ecr-NewConn.patch b/patches/0050-restore-ecr-NewConn.patch index 556241bb9c2..56ea4224df0 100644 --- a/patches/0050-restore-ecr-NewConn.patch +++ b/patches/0050-restore-ecr-NewConn.patch @@ -5,7 +5,7 @@ Subject: [PATCH] restore ecr NewConn diff --git a/internal/service/ecr/service_package_gen.go b/internal/service/ecr/service_package_gen.go -index 5c55049ad5..a5f6e621d1 100644 +index 01f450f46c..8b46cd0ff6 100644 --- a/internal/service/ecr/service_package_gen.go +++ b/internal/service/ecr/service_package_gen.go @@ -7,6 +7,9 @@ import ( diff --git a/patches/0051-update-apn-info.patch b/patches/0051-update-apn-info.patch index 13d1acd49e3..08a90c0c06d 100644 --- a/patches/0051-update-apn-info.patch +++ b/patches/0051-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 7e5d33e094..f93514e1f6 100644 +index d8e96106e0..42dd3de4e6 100644 --- a/internal/conns/config.go +++ b/internal/conns/config.go @@ -23,7 +23,6 @@ import ( @@ -16,7 +16,7 @@ index 7e5d33e094..f93514e1f6 100644 ) type Config struct { -@@ -74,10 +73,10 @@ func (c *Config) ConfigureProvider(ctx context.Context, client *AWSClient) (*AWS +@@ -77,10 +76,10 @@ func (c *Config) ConfigureProvider(ctx context.Context, client *AWSClient) (*AWS AccessKey: c.AccessKey, AllowedAccountIds: c.AllowedAccountIds, APNInfo: &awsbase.APNInfo{ diff --git a/patches/0052-non-idempotent-sns-topic-creation.patch b/patches/0052-non-idempotent-sns-topic-creation.patch index 850827fb8ac..6e89fdaedd8 100644 --- a/patches/0052-non-idempotent-sns-topic-creation.patch +++ b/patches/0052-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 17c78c35c1..0d2e35b695 100644 +index b9a8e0b2f7..a1f83415f1 100644 --- a/internal/service/sns/topic.go +++ b/internal/service/sns/topic.go @@ -9,6 +9,7 @@ import ( diff --git a/patches/0053-Normalize-retentionDays-in-aws_controltower_landing_.patch b/patches/0053-Normalize-retentionDays-in-aws_controltower_landing_.patch index f94fd36be2b..23e2d54d6aa 100644 --- a/patches/0053-Normalize-retentionDays-in-aws_controltower_landing_.patch +++ b/patches/0053-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 1491a3dbf6..7ef2910ff7 100644 +index c2f2830b9c..299e7653c1 100644 --- a/internal/service/controltower/landing_zone.go +++ b/internal/service/controltower/landing_zone.go @@ -5,8 +5,10 @@ package controltower @@ -49,7 +49,7 @@ index 1491a3dbf6..7ef2910ff7 100644 - }, + StateFunc: resourceLandingZoneManfiestStateFunc, }, - "version": { + names.AttrVersion: { Type: schema.TypeString, @@ -328,3 +326,80 @@ func flattenLandingZoneDriftStatusSummary(apiObject *types.LandingZoneDriftStatu diff --git a/patches/0054-Revert-r-aws_db_proxy-Change-auth-from-TypeList-to-T.patch b/patches/0054-Revert-r-aws_db_proxy-Change-auth-from-TypeList-to-T.patch index b0f2fd5e28a..d148d8392c1 100644 --- a/patches/0054-Revert-r-aws_db_proxy-Change-auth-from-TypeList-to-T.patch +++ b/patches/0054-Revert-r-aws_db_proxy-Change-auth-from-TypeList-to-T.patch @@ -7,7 +7,7 @@ Subject: [PATCH] Revert "r/aws_db_proxy: Change `auth` from `TypeList` to This reverts commit 2db643f461c058fb7a9e9940afef240016412050. diff --git a/internal/service/rds/proxy.go b/internal/service/rds/proxy.go -index 4c8527952c..4371869bf1 100644 +index 95832131a9..b5fb2a3cd7 100644 --- a/internal/service/rds/proxy.go +++ b/internal/service/rds/proxy.go @@ -19,7 +19,6 @@ import ( @@ -31,22 +31,22 @@ index 4c8527952c..4371869bf1 100644 }, }, }, -- Set: sdkv2.SimpleSchemaSetFunc("auth_scheme", "description", "iam_auth", "secret_arn", "username"), +- Set: sdkv2.SimpleSchemaSetFunc("auth_scheme", names.AttrDescription, "iam_auth", "secret_arn", "username"), }, "debug_logging": { Type: schema.TypeBool, @@ -148,7 +146,7 @@ func resourceProxyCreate(ctx context.Context, d *schema.ResourceData, meta inter - name := d.Get("name").(string) + name := d.Get(names.AttrName).(string) input := &rds.CreateDBProxyInput{ - Auth: expandUserAuthConfigs(d.Get("auth").(*schema.Set).List()), + Auth: expandUserAuthConfigs(d.Get("auth").([]interface{})), DBProxyName: aws.String(name), EngineFamily: types.EngineFamily(d.Get("engine_family").(string)), - RoleArn: aws.String(d.Get("role_arn").(string)), + RoleArn: aws.String(d.Get(names.AttrRoleARN).(string)), @@ -225,7 +223,7 @@ func resourceProxyUpdate(ctx context.Context, d *schema.ResourceData, meta inter - if d.HasChangesExcept("tags", "tags_all") { - oName, nName := d.GetChange("name") + if d.HasChangesExcept(names.AttrTags, names.AttrTagsAll) { + oName, nName := d.GetChange(names.AttrName) input := &rds.ModifyDBProxyInput{ - Auth: expandUserAuthConfigs(d.Get("auth").(*schema.Set).List()), + Auth: expandUserAuthConfigs(d.Get("auth").([]interface{})), @@ -54,7 +54,7 @@ index 4c8527952c..4371869bf1 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 6fbd15502d..bc3d3fadbd 100644 +index a9d7b8c690..b59ea1afc6 100644 --- a/internal/service/rds/proxy_test.go +++ b/internal/service/rds/proxy_test.go @@ -40,28 +40,24 @@ func TestAccRDSProxy_basic(t *testing.T) { @@ -64,14 +64,14 @@ index 6fbd15502d..bc3d3fadbd 100644 - Check: resource.ComposeAggregateTestCheckFunc( + Check: resource.ComposeTestCheckFunc( testAccCheckProxyExists(ctx, resourceName, &v), - resource.TestCheckResourceAttr(resourceName, "name", rName), + resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), resource.TestCheckResourceAttr(resourceName, "engine_family", "MYSQL"), - acctest.MatchResourceAttrRegionalARN(resourceName, "arn", "rds", regexache.MustCompile(`db-proxy:.+`)), + acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "rds", regexache.MustCompile(`db-proxy:.+`)), resource.TestCheckResourceAttr(resourceName, "auth.#", "1"), - resource.TestCheckTypeSetElemNestedAttrs(resourceName, "auth.*", map[string]string{ - "auth_scheme": "SECRETS", - "client_password_auth_type": "MYSQL_NATIVE_PASSWORD", -- "description": "test", +- names.AttrDescription: "test", - "iam_auth": "DISABLED", - }), + resource.TestCheckResourceAttr(resourceName, "auth.0.auth_scheme", "SECRETS"), @@ -79,16 +79,18 @@ index 6fbd15502d..bc3d3fadbd 100644 + resource.TestCheckResourceAttr(resourceName, "auth.0.iam_auth", "DISABLED"), + resource.TestCheckResourceAttr(resourceName, "auth.0.client_password_auth_type", "MYSQL_NATIVE_PASSWORD"), resource.TestCheckResourceAttr(resourceName, "debug_logging", "false"), -- resource.TestMatchResourceAttr(resourceName, "endpoint", regexache.MustCompile(`^[\w\-\.]+\.rds\.amazonaws\.com$`)), +- resource.TestMatchResourceAttr(resourceName, names.AttrEndpoint, regexache.MustCompile(`^[\w\-\.]+\.rds\.amazonaws\.com$`)), resource.TestCheckResourceAttr(resourceName, "idle_client_timeout", "1800"), - resource.TestCheckResourceAttr(resourceName, "require_tls", "true"), - resource.TestCheckResourceAttrPair(resourceName, "role_arn", "aws_iam_role.test", "arn"), + resource.TestCheckResourceAttrPair(resourceName, names.AttrRoleARN, "aws_iam_role.test", names.AttrARN), - resource.TestCheckResourceAttr(resourceName, "tags.%", "0"), + resource.TestCheckResourceAttr(resourceName, "require_tls", "true"), resource.TestCheckResourceAttr(resourceName, "vpc_subnet_ids.#", "2"), - resource.TestCheckTypeSetElemAttrPair(resourceName, "vpc_subnet_ids.*", "aws_subnet.test.0", "id"), - resource.TestCheckTypeSetElemAttrPair(resourceName, "vpc_subnet_ids.*", "aws_subnet.test.1", "id"), +- resource.TestCheckTypeSetElemAttrPair(resourceName, "vpc_subnet_ids.*", "aws_subnet.test.0", names.AttrID), +- resource.TestCheckTypeSetElemAttrPair(resourceName, "vpc_subnet_ids.*", "aws_subnet.test.1", names.AttrID), - ), ++ resource.TestCheckTypeSetElemAttrPair(resourceName, "vpc_subnet_ids.*", "aws_subnet.test.0", "id"), ++ resource.TestCheckTypeSetElemAttrPair(resourceName, "vpc_subnet_ids.*", "aws_subnet.test.1", "id"), + resource.TestMatchResourceAttr(resourceName, "endpoint", regexache.MustCompile(`^[\w\-\.]+\.rds\.amazonaws\.com$`))), }, { @@ -99,7 +101,7 @@ index 6fbd15502d..bc3d3fadbd 100644 testAccCheckProxyExists(ctx, resourceName, &dbProxy), - resource.TestCheckResourceAttr(resourceName, "auth.#", "1"), - resource.TestCheckTypeSetElemNestedAttrs(resourceName, "auth.*", map[string]string{ -- "description": "test", +- names.AttrDescription: "test", - }), + resource.TestCheckResourceAttr(resourceName, "auth.0.description", "test"), ), @@ -111,7 +113,7 @@ index 6fbd15502d..bc3d3fadbd 100644 testAccCheckProxyExists(ctx, resourceName, &dbProxy), - resource.TestCheckResourceAttr(resourceName, "auth.#", "1"), - resource.TestCheckTypeSetElemNestedAttrs(resourceName, "auth.*", map[string]string{ -- "description": description, +- names.AttrDescription: description, - }), + resource.TestCheckResourceAttr(resourceName, "auth.0.description", description), ), @@ -146,8 +148,8 @@ index 6fbd15502d..bc3d3fadbd 100644 Check: resource.ComposeTestCheckFunc( testAccCheckProxyExists(ctx, resourceName, &dbProxy), - resource.TestCheckResourceAttr(resourceName, "auth.#", "1"), -- resource.TestCheckTypeSetElemAttrPair(resourceName, "auth.*.secret_arn", "aws_secretsmanager_secret.test", "arn"), -+ resource.TestCheckResourceAttrPair(resourceName, "auth.0.secret_arn", "aws_secretsmanager_secret.test", "arn"), +- resource.TestCheckTypeSetElemAttrPair(resourceName, "auth.*.secret_arn", "aws_secretsmanager_secret.test", names.AttrARN), ++ resource.TestCheckResourceAttrPair(resourceName, "auth.0.secret_arn", "aws_secretsmanager_secret.test", names.AttrARN), ), }, { @@ -156,9 +158,9 @@ index 6fbd15502d..bc3d3fadbd 100644 Check: resource.ComposeTestCheckFunc( testAccCheckProxyExists(ctx, resourceName, &dbProxy), - resource.TestCheckResourceAttr(resourceName, "auth.#", "2"), -- resource.TestCheckTypeSetElemAttrPair(resourceName, "auth.*.secret_arn", "aws_secretsmanager_secret.test", "arn"), -- resource.TestCheckTypeSetElemAttrPair(resourceName, "auth.*.secret_arn", "aws_secretsmanager_secret.test2", "arn"), -+ resource.TestCheckResourceAttrPair(resourceName, "auth.0.secret_arn", "aws_secretsmanager_secret.test2", "arn"), +- resource.TestCheckTypeSetElemAttrPair(resourceName, "auth.*.secret_arn", "aws_secretsmanager_secret.test", names.AttrARN), +- resource.TestCheckTypeSetElemAttrPair(resourceName, "auth.*.secret_arn", "aws_secretsmanager_secret.test2", names.AttrARN), ++ resource.TestCheckResourceAttrPair(resourceName, "auth.0.secret_arn", "aws_secretsmanager_secret.test2", names.AttrARN), ), }, }, diff --git a/patches/0055-Fix-panic-in-aws_directory_service_directory-Read.patch b/patches/0055-Fix-panic-in-aws_directory_service_directory-Read.patch index cf438002273..352ef280b8a 100644 --- a/patches/0055-Fix-panic-in-aws_directory_service_directory-Read.patch +++ b/patches/0055-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 33252ddb7d..9d283612cb 100644 +index af5fbf492d..0141904161 100644 --- a/internal/service/ds/directory.go +++ b/internal/service/ds/directory.go @@ -295,6 +295,11 @@ func resourceDirectoryRead(ctx context.Context, d *schema.ResourceData, meta int @@ -28,7 +28,7 @@ index 33252ddb7d..9d283612cb 100644 @@ -315,10 +320,16 @@ func resourceDirectoryRead(ctx context.Context, d *schema.ResourceData, meta int d.Set("edition", dir.Edition) d.Set("enable_sso", dir.SsoEnabled) - d.Set("name", dir.Name) + d.Set(names.AttrName, dir.Name) + if aws.StringValue(dir.Type) == directoryservice.DirectoryTypeAdconnector { d.Set("security_group_id", dir.ConnectSettings.SecurityGroupId) diff --git a/patches/0056-Patch-tags-ComputedOnly-on-bedrockagent-and-other-mo.patch b/patches/0056-Patch-tags-ComputedOnly-on-bedrockagent-and-other-mo.patch index d266ae41316..30ef7bbf5a1 100644 --- a/patches/0056-Patch-tags-ComputedOnly-on-bedrockagent-and-other-mo.patch +++ b/patches/0056-Patch-tags-ComputedOnly-on-bedrockagent-and-other-mo.patch @@ -5,12 +5,12 @@ 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 b11cdf3f1e..1a3a356b14 100644 +index 0055c1bb19..c3d5cd90b2 100644 --- a/internal/service/bcmdataexports/export.go +++ b/internal/service/bcmdataexports/export.go @@ -168,7 +168,7 @@ func (r *resourceExport) Schema(ctx context.Context, req resource.SchemaRequest, Attributes: map[string]schema.Attribute{ - "id": framework.IDAttribute(), + names.AttrID: framework.IDAttribute(), names.AttrTags: tftags.TagsAttribute(), - names.AttrTagsAll: tftags.TagsAttributeComputedOnly(), + names.AttrTagsAll: tftags.TagsAttribute(), @@ -18,7 +18,7 @@ index b11cdf3f1e..1a3a356b14 100644 Blocks: map[string]schema.Block{ "export": schema.ListNestedBlock{ diff --git a/internal/service/bedrockagent/agent.go b/internal/service/bedrockagent/agent.go -index b25cc44032..24265c2b01 100644 +index 152acf0653..6ad3dc1bad 100644 --- a/internal/service/bedrockagent/agent.go +++ b/internal/service/bedrockagent/agent.go @@ -144,7 +144,7 @@ func (r *agentResource) Schema(ctx context.Context, request resource.SchemaReque @@ -29,9 +29,9 @@ index b25cc44032..24265c2b01 100644 + names.AttrTagsAll: tftags.TagsAttribute(), }, Blocks: map[string]schema.Block{ - "timeouts": timeouts.Block(ctx, timeouts.Opts{ + names.AttrTimeouts: timeouts.Block(ctx, timeouts.Opts{ diff --git a/internal/service/bedrockagent/agent_alias.go b/internal/service/bedrockagent/agent_alias.go -index 2af0e6ce90..8b9b75bf95 100644 +index 193035bbd0..a87fbfd16c 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 @@ -42,9 +42,9 @@ index 2af0e6ce90..8b9b75bf95 100644 + names.AttrTagsAll: tftags.TagsAttribute(), }, Blocks: map[string]schema.Block{ - "timeouts": timeouts.Block(ctx, timeouts.Opts{ + names.AttrTimeouts: timeouts.Block(ctx, timeouts.Opts{ diff --git a/internal/service/bedrockagent/knowledge_base.go b/internal/service/bedrockagent/knowledge_base.go -index a2c0e6a0c9..1a339667f9 100644 +index 47f166f409..3136f1be3a 100644 --- a/internal/service/bedrockagent/knowledge_base.go +++ b/internal/service/bedrockagent/knowledge_base.go @@ -88,7 +88,7 @@ func (r *knowledgeBaseResource) Schema(ctx context.Context, request resource.Sch @@ -57,7 +57,7 @@ index a2c0e6a0c9..1a339667f9 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 5bc7b2eaa4..bb8df48612 100644 +index dbeaa5d05a..b193b6a5a8 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/0057-Fix-empty-retry_strategy-of-Batch-JobDefinitions-cau.patch b/patches/0057-Fix-empty-retry_strategy-of-Batch-JobDefinitions-cau.patch index 4463c1a9d2a..ddb860d57a3 100644 --- a/patches/0057-Fix-empty-retry_strategy-of-Batch-JobDefinitions-cau.patch +++ b/patches/0057-Fix-empty-retry_strategy-of-Batch-JobDefinitions-cau.patch @@ -12,7 +12,7 @@ This patch fixes that by adding the missing nil checks for the retry strategy. diff --git a/internal/service/batch/job_definition.go b/internal/service/batch/job_definition.go -index d1b5102162..a6a9c190c8 100644 +index 99706cb551..a18114f1c3 100644 --- a/internal/service/batch/job_definition.go +++ b/internal/service/batch/job_definition.go @@ -528,12 +528,12 @@ func needsJobDefUpdate(d *schema.ResourceDiff) bool {