Update patches

patches/0004-De-deprecate-bucket_object.patch

@@ -5,23 +5,27 @@ 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..64e78dd1d2 100644
 --- a/internal/service/s3/bucket_object.go
 +++ b/internal/service/s3/bucket_object.go
-@@ -68,7 +68,7 @@ func resourceBucketObject() *schema.Resource {
+@@ -67,8 +67,8 @@ func resourceBucketObject() *schema.Resource {
+ 				Type:     schema.TypeString,
  				Computed: true,
  			},
- 			"bucket": {
+-			names.AttrBucket: {
 -				Deprecated:   "Use the aws_s3_object resource instead",
++			"bucket": {
 +				// FORK: Stack72 removed the deprecation warning as it was misleading for Pulumi users
  				Type:         schema.TypeString,
  				Required:     true,
  				ForceNew:     true,
-@@ -125,7 +125,7 @@ func resourceBucketObject() *schema.Resource {
+@@ -124,8 +124,8 @@ func resourceBucketObject() *schema.Resource {
+ 				Optional: true,
  				Default:  false,
  			},
- 			"key": {
+-			names.AttrKey: {
 -				Deprecated:   "Use the aws_s3_object resource instead",
++			"key": {
 +				// FORK: Stack72 removed the deprecation warning as it was misleading for Pulumi users
  				Type:         schema.TypeString,
  				Required:     true,

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": {

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)),
  		}

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..ce0653ff4a 100644
 --- a/internal/service/eks/cluster.go
 +++ b/internal/service/eks/cluster.go
 @@ -83,9 +83,24 @@ func resourceCluster() *schema.Resource {
@@ -33,10 +33,12 @@ index 518deaaef2..6f4ddd9ea4 100644
  				Elem: &schema.Resource{
  					Schema: map[string]*schema.Schema{
  						"data": {
-@@ -418,6 +433,13 @@ func resourceClusterRead(ctx context.Context, d *schema.ResourceData, meta inter
+@@ -417,7 +432,14 @@ func resourceClusterRead(ctx context.Context, d *schema.ResourceData, meta inter
+ 	if err := d.Set("access_config", flattenAccessConfigResponse(cluster.AccessConfig, bootstrapClusterCreatorAdminPermissions)); err != nil {
  		return sdkdiag.AppendErrorf(diags, "setting access_config: %s", err)
  	}
- 	d.Set("arn", cluster.Arn)
+-	d.Set(names.AttrARN, cluster.Arn)
++	d.Set("arn", 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 {

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..0480ce2b04 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,13 +20,13 @@ 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)),

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{

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) != ""

patches/0016-Revert-Update-endpointHashIPAddress.patch

@@ -9,14 +9,14 @@ 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..af4e943c23 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-%s-", m[names.AttrSubnetID].(string), m["ip"].(string)))
 +	buf.WriteString(fmt.Sprintf("%s-", m["subnet_id"].(string)))
  	return create.StringHashcode(buf.String())
  }