Upstream v5.74.0 (#4714)

Upgrade upstream to v5.74.0 New resources: opensearch/authorizeVpcEndpointAccess.AuthorizeVpcEndpointAccess ssm/quicksetupConfigurationManager.QuicksetupConfigurationManager New functions: lb/getListenerRule.getListenerRule Fixes #4707
pulumi · Nov 6, 2024 · 7471984 · 7471984
1 parent 03de9a6
commit 7471984
Show file tree

Hide file tree

Showing 457 changed files with 31,682 additions and 2,393 deletions.
diff --git a/examples/go.mod b/examples/go.mod
diff --git a/examples/go.sum b/examples/go.sum
diff --git a/patches/0004-De-deprecate-bucket_object.patch b/patches/0004-De-deprecate-bucket_object.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] De-deprecate bucket_object
 
 
 diff --git a/internal/service/s3/bucket_object.go b/internal/service/s3/bucket_object.go
-index 631a49255c..f20c66ca2e 100644
+index 535382eae7..cdb46cd777 100644
 --- a/internal/service/s3/bucket_object.go
 +++ b/internal/service/s3/bucket_object.go
 @@ -70,7 +70,7 @@ func resourceBucketObject() *schema.Resource {

diff --git a/patches/0005-Remove-lakeformation-catalog_resource-default.patch b/patches/0005-Remove-lakeformation-catalog_resource-default.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Remove lakeformation catalog_resource default
 
 
 diff --git a/internal/service/lakeformation/permissions.go b/internal/service/lakeformation/permissions.go
-index add4416c3c..628fde7fc9 100644
+index 4ba6a90c17..58ad735363 100644
 --- a/internal/service/lakeformation/permissions.go
 +++ b/internal/service/lakeformation/permissions.go
 @@ -43,8 +43,8 @@ func ResourcePermissions() *schema.Resource {

diff --git 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 36cbda1200..b90aba433c 100644
+index b0c38464ec..918c12e0e2 100644
 --- a/internal/service/eks/cluster.go
 +++ b/internal/service/eks/cluster.go
 @@ -98,9 +98,24 @@ func resourceCluster() *schema.Resource {
@@ -33,7 +33,7 @@ index 36cbda1200..b90aba433c 100644
  				Elem: &schema.Resource{
  					Schema: map[string]*schema.Schema{
  						"data": {
-@@ -456,6 +471,13 @@ func resourceClusterRead(ctx context.Context, d *schema.ResourceData, meta inter
+@@ -473,6 +488,13 @@ func resourceClusterRead(ctx context.Context, d *schema.ResourceData, meta inter
  	}
  	d.Set(names.AttrARN, cluster.Arn)
  	d.Set("bootstrap_self_managed_addons", d.Get("bootstrap_self_managed_addons"))

diff --git a/patches/0018-Change-default-descriptions-to-Managed-by-Pulumi.patch b/patches/0018-Change-default-descriptions-to-Managed-by-Pulumi.patch
@@ -5,10 +5,10 @@ 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 d878a367ea..94cd5d3191 100644
+index 1bc1374a31..9bc6fba23e 100644
 --- a/internal/service/apigateway/api_key.go
 +++ b/internal/service/apigateway/api_key.go
-@@ -56,7 +56,7 @@ func resourceAPIKey() *schema.Resource {
+@@ -55,7 +55,7 @@ func resourceAPIKey() *schema.Resource {
  			names.AttrDescription: {
  				Type:     schema.TypeString,
  				Optional: true,
@@ -44,10 +44,10 @@ index 837e79c057..8fc8280900 100644
  			},
  			"etag": {
 diff --git a/internal/service/docdb/cluster_parameter_group.go b/internal/service/docdb/cluster_parameter_group.go
-index 910dec1a1b..c67bc4cfde 100644
+index 8a99e5b047..361c39f731 100644
 --- a/internal/service/docdb/cluster_parameter_group.go
 +++ b/internal/service/docdb/cluster_parameter_group.go
-@@ -50,7 +50,7 @@ func ResourceClusterParameterGroup() *schema.Resource {
+@@ -50,7 +50,7 @@ func resourceClusterParameterGroup() *schema.Resource {
  				Type:     schema.TypeString,
  				Optional: true,
  				ForceNew: true,
@@ -57,10 +57,10 @@ index 910dec1a1b..c67bc4cfde 100644
  			names.AttrFamily: {
  				Type:     schema.TypeString,
 diff --git a/internal/service/docdb/subnet_group.go b/internal/service/docdb/subnet_group.go
-index 70a69db303..5f1045af17 100644
+index 5466936547..526c40e604 100644
 --- a/internal/service/docdb/subnet_group.go
 +++ b/internal/service/docdb/subnet_group.go
-@@ -46,7 +46,7 @@ func ResourceSubnetGroup() *schema.Resource {
+@@ -46,7 +46,7 @@ func resourceSubnetGroup() *schema.Resource {
  			names.AttrDescription: {
  				Type:     schema.TypeString,
  				Optional: true,
@@ -70,7 +70,7 @@ index 70a69db303..5f1045af17 100644
  			names.AttrName: {
  				Type:          schema.TypeString,
 diff --git a/internal/service/ec2/vpc_security_group.go b/internal/service/ec2/vpc_security_group.go
-index 044afe933a..aeb16673fc 100644
+index 90c2074895..aac8fcca0a 100644
 --- a/internal/service/ec2/vpc_security_group.go
 +++ b/internal/service/ec2/vpc_security_group.go
 @@ -69,7 +69,7 @@ func resourceSecurityGroup() *schema.Resource {
@@ -83,7 +83,7 @@ index 044afe933a..aeb16673fc 100644
  			},
  			"egress":  securityGroupRuleSetNestedBlock,
 diff --git a/internal/service/elasticache/parameter_group.go b/internal/service/elasticache/parameter_group.go
-index c4ae847827..182682ea9f 100644
+index 5a265a26d8..ecc1f2d6ac 100644
 --- a/internal/service/elasticache/parameter_group.go
 +++ b/internal/service/elasticache/parameter_group.go
 @@ -49,7 +49,7 @@ func resourceParameterGroup() *schema.Resource {
@@ -96,7 +96,7 @@ index c4ae847827..182682ea9f 100644
  			names.AttrFamily: {
  				Type:     schema.TypeString,
 diff --git a/internal/service/elasticache/subnet_group.go b/internal/service/elasticache/subnet_group.go
-index b261327be5..69e49f74c9 100644
+index 89920a47e3..71f4a900d7 100644
 --- a/internal/service/elasticache/subnet_group.go
 +++ b/internal/service/elasticache/subnet_group.go
 @@ -48,7 +48,7 @@ func resourceSubnetGroup() *schema.Resource {
@@ -252,7 +252,7 @@ index 646add5ad8..2731f4e425 100644
  			names.AttrName: {
  				Type:          schema.TypeString,
 diff --git a/internal/service/redshift/parameter_group.go b/internal/service/redshift/parameter_group.go
-index 77b03bfca4..6491b60f07 100644
+index 54483a2277..7136f7ee2e 100644
 --- a/internal/service/redshift/parameter_group.go
 +++ b/internal/service/redshift/parameter_group.go
 @@ -51,7 +51,7 @@ func resourceParameterGroup() *schema.Resource {
@@ -265,7 +265,7 @@ index 77b03bfca4..6491b60f07 100644
  			names.AttrFamily: {
  				Type:     schema.TypeString,
 diff --git a/internal/service/redshift/subnet_group.go b/internal/service/redshift/subnet_group.go
-index 6812406afa..bc44534a05 100644
+index f1663cad7c..5b92c74913 100644
 --- a/internal/service/redshift/subnet_group.go
 +++ b/internal/service/redshift/subnet_group.go
 @@ -46,7 +46,7 @@ func resourceSubnetGroup() *schema.Resource {
@@ -278,7 +278,7 @@ index 6812406afa..bc44534a05 100644
  			names.AttrName: {
  				Type:     schema.TypeString,
 diff --git a/internal/service/route53/record.go b/internal/service/route53/record.go
-index e845687f06..87e1dd26d3 100644
+index c190462b1f..580e21ede5 100644
 --- a/internal/service/route53/record.go
 +++ b/internal/service/route53/record.go
 @@ -360,7 +360,7 @@ func resourceRecordCreate(ctx context.Context, d *schema.ResourceData, meta inte
@@ -309,10 +309,10 @@ index e845687f06..87e1dd26d3 100644
  		HostedZoneId: aws.String(zoneID),
  	}
 diff --git a/internal/service/route53/zone.go b/internal/service/route53/zone.go
-index 940e3bf78d..626ad3f819 100644
+index b7e095ce90..daacde5227 100644
 --- a/internal/service/route53/zone.go
 +++ b/internal/service/route53/zone.go
-@@ -53,7 +53,7 @@ func resourceZone() *schema.Resource {
+@@ -52,7 +52,7 @@ func resourceZone() *schema.Resource {
  			names.AttrComment: {
  				Type:         schema.TypeString,
  				Optional:     true,

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
@@ -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 e0f83077a4..1d9f9561b3 100644
+index 4ebb52c2eb..80fc8ed5b1 100644
 --- a/internal/service/elbv2/target_group.go
 +++ b/internal/service/elbv2/target_group.go
 @@ -635,19 +635,19 @@ func resourceTargetGroupRead(ctx context.Context, d *schema.ResourceData, meta i

diff --git a/patches/0026-Restore-S3ConnURICleaningDisabled.patch b/patches/0026-Restore-S3ConnURICleaningDisabled.patch
@@ -5,16 +5,16 @@ Subject: [PATCH] Restore S3ConnURICleaningDisabled
 
 
 diff --git a/internal/conns/awsclient.go b/internal/conns/awsclient.go
-index 9425b4a16d..ddfe9d8849 100644
+index 8f0be78764..627fbb1da1 100644
 --- a/internal/conns/awsclient.go
 +++ b/internal/conns/awsclient.go
-@@ -182,7 +182,7 @@ func (c *AWSClient) DefaultKMSKeyPolicy(context.Context) string {
+@@ -208,7 +208,7 @@ func (c *AWSClient) DefaultKMSKeyPolicy(ctx context.Context) string {
  			"Resource": "*"
  		}
  	]
 -}	
 +}
- `, c.Partition, c.AccountID)
+ `, c.Partition(ctx), c.AccountID)
  }
 
 diff --git a/internal/conns/awsclient_extra.go b/internal/conns/awsclient_extra.go

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
@@ -21,10 +21,10 @@ index 6ece15b4f4..89844a1233 100644
  	if request.Plan.Raw.IsNull() {
  		return
 diff --git a/internal/provider/fwprovider/provider.go b/internal/provider/fwprovider/provider.go
-index c29a9f9b7d..3eebe2feb9 100644
+index f175ebbf31..38b5b238ff 100644
 --- a/internal/provider/fwprovider/provider.go
 +++ b/internal/provider/fwprovider/provider.go
-@@ -430,8 +430,8 @@ func (p *fwprovider) Resources(ctx context.Context) []func() resource.Resource {
+@@ -431,8 +431,8 @@ func (p *fwprovider) Resources(ctx context.Context) []func() resource.Resource {
  					continue
  				}
  				if v, ok := schemaResponse.Schema.Attributes[names.AttrTagsAll]; ok {
@@ -36,10 +36,10 @@ index c29a9f9b7d..3eebe2feb9 100644
  					}
  				} else {
 diff --git a/internal/service/appconfig/environment.go b/internal/service/appconfig/environment.go
-index cb03ee76b7..81f90a7e70 100644
+index 78e0e9656d..ef2377b287 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
+@@ -103,7 +103,7 @@ func (r *resourceEnvironment) Schema(ctx context.Context, request resource.Schem
  				},
  			},
  			names.AttrTags:    tftags.TagsAttribute(),
@@ -88,10 +88,10 @@ index bd15eca435..1733d9a441 100644
  		Blocks: map[string]schema.Block{
  			"control_sets": schema.SetNestedBlock{
 diff --git a/internal/service/batch/job_queue.go b/internal/service/batch/job_queue.go
-index 768e0c55b8..709da2cef4 100644
+index fc193b631b..74497d80ff 100644
 --- a/internal/service/batch/job_queue.go
 +++ b/internal/service/batch/job_queue.go
-@@ -96,7 +96,7 @@ func (r *jobQueueResource) Schema(ctx context.Context, request resource.SchemaRe
+@@ -97,7 +97,7 @@ func (r *jobQueueResource) Schema(ctx context.Context, request resource.SchemaRe
  				},
  			},
  			names.AttrTags:    tftags.TagsAttribute(),
@@ -127,7 +127,7 @@ index 737b09ac5a..f966d8ed3e 100644
  				Computed: true,
  				PlanModifiers: []planmodifier.String{
 diff --git a/internal/service/ec2/vpc_security_group_ingress_rule.go b/internal/service/ec2/vpc_security_group_ingress_rule.go
-index 1d3452cb18..6e9fbce878 100644
+index ffecce9792..04b1831152 100644
 --- a/internal/service/ec2/vpc_security_group_ingress_rule.go
 +++ b/internal/service/ec2/vpc_security_group_ingress_rule.go
 @@ -228,7 +228,7 @@ func (r *securityGroupRuleResource) Schema(ctx context.Context, request resource
@@ -140,10 +140,10 @@ index 1d3452cb18..6e9fbce878 100644
  				Optional: true,
  				Validators: []validator.Int64{
 diff --git a/internal/service/lexv2models/bot.go b/internal/service/lexv2models/bot.go
-index eb9c6f256f..912546358c 100644
+index 75e5b7f1b9..8de291d05f 100644
 --- a/internal/service/lexv2models/bot.go
 +++ b/internal/service/lexv2models/bot.go
-@@ -83,7 +83,7 @@ func (r *resourceBot) Schema(ctx context.Context, req resource.SchemaRequest, re
+@@ -82,7 +82,7 @@ func (r *resourceBot) Schema(ctx context.Context, req resource.SchemaRequest, re
  				Required:   true,
  			},
  			names.AttrTags:    tftags.TagsAttribute(),

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
@@ -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 b90aba433c..4d019a7431 100644
+index 918c12e0e2..a9e2a87c29 100644
 --- a/internal/service/eks/cluster.go
 +++ b/internal/service/eks/cluster.go
 @@ -133,6 +133,13 @@ func resourceCluster() *schema.Resource {
@@ -22,7 +22,7 @@ index b90aba433c..4d019a7431 100644
  			"enabled_cluster_log_types": {
  				Type:     schema.TypeSet,
  				Optional: true,
-@@ -439,7 +446,11 @@ func resourceClusterCreate(ctx context.Context, d *schema.ResourceData, meta int
+@@ -456,7 +463,11 @@ func resourceClusterCreate(ctx context.Context, d *schema.ResourceData, meta int
  		return sdkdiag.AppendErrorf(diags, "waiting for EKS Cluster (%s) create: %s", d.Id(), err)
  	}
 

diff --git a/patches/0031-DisableTagSchemaCheck-for-PF-provider.patch b/patches/0031-DisableTagSchemaCheck-for-PF-provider.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] DisableTagSchemaCheck for PF provider
 
 
 diff --git a/internal/provider/fwprovider/provider.go b/internal/provider/fwprovider/provider.go
-index 3eebe2feb9..fe269c207c 100644
+index 38b5b238ff..c1ffe2f355 100644
 --- a/internal/provider/fwprovider/provider.go
 +++ b/internal/provider/fwprovider/provider.go
-@@ -417,8 +417,7 @@ func (p *fwprovider) Resources(ctx context.Context) []func() resource.Resource {
+@@ -418,8 +418,7 @@ func (p *fwprovider) Resources(ctx context.Context) []func() resource.Resource {
  			if v.Tags != nil {
  				// The resource has opted in to transparent tagging.
  				// Ensure that the schema look OK.

diff --git a/patches/0033-Fail-fast-when-PF-resources-are-dropped.patch b/patches/0033-Fail-fast-when-PF-resources-are-dropped.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Fail fast when PF resources are dropped
 
 
 diff --git a/internal/provider/fwprovider/provider.go b/internal/provider/fwprovider/provider.go
-index fe269c207c..5eb34590fd 100644
+index c1ffe2f355..5395503dde 100644
 --- a/internal/provider/fwprovider/provider.go
 +++ b/internal/provider/fwprovider/provider.go
-@@ -448,9 +448,8 @@ func (p *fwprovider) Resources(ctx context.Context) []func() resource.Resource {
+@@ -449,9 +449,8 @@ func (p *fwprovider) Resources(ctx context.Context) []func() resource.Resource {
  	}
 
  	if err := errors.Join(errs...); err != nil {

diff --git a/patches/0034-Fix-tags_all-Computed-for-PF-resources.patch b/patches/0034-Fix-tags_all-Computed-for-PF-resources.patch
@@ -96,10 +96,10 @@ index 2a36dacdc9..56e99b5bc8 100644
  		Blocks: map[string]schema.Block{
  			names.AttrConfiguration: schema.ListNestedBlock{
 diff --git a/internal/service/ssmcontacts/rotation.go b/internal/service/ssmcontacts/rotation.go
-index 65e308761c..e3660e9b72 100644
+index 11948143a7..e8f145f886 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
+@@ -72,7 +72,7 @@ func (r *resourceRotation) Schema(ctx context.Context, request resource.SchemaRe
  				Optional:   true,
  			},
  			names.AttrTags:    tftags.TagsAttribute(),
@@ -122,7 +122,7 @@ index 63a02f6ed6..ae5c3b3b8a 100644
  		Blocks: map[string]schema.Block{
  			"portal_options": schema.ListNestedBlock{
 diff --git a/internal/service/ssoadmin/trusted_token_issuer.go b/internal/service/ssoadmin/trusted_token_issuer.go
-index c54807a8eb..b34e6641c7 100644
+index 2d53c30eb3..cac1815b0f 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/0037-Restore-legacy-bucket.patch b/patches/0037-Restore-legacy-bucket.patch
@@ -116,7 +116,7 @@ index 0000000000..4278d1e70a
 +	return conn, nil
 +}
 diff --git a/internal/service/s3legacy/bucket_legacy.go b/internal/service/s3legacy/bucket_legacy.go
-index 007c2f2dc1..40fd0b7be2 100644
+index 007c2f2dc1..b5b4c0477f 100644
 --- a/internal/service/s3legacy/bucket_legacy.go
 +++ b/internal/service/s3legacy/bucket_legacy.go
 @@ -19,7 +19,6 @@ import (
@@ -136,7 +136,16 @@ index 007c2f2dc1..40fd0b7be2 100644
  	"github.com/hashicorp/terraform-provider-aws/internal/verify"
  )
 
-@@ -1393,7 +1392,7 @@ func resourceBucketLegacyRead(ctx context.Context, d *schema.ResourceData, meta
+@@ -1309,7 +1308,7 @@ func resourceBucketLegacyRead(ctx context.Context, d *schema.ResourceData, meta
+ 	conf, err := readS3ObjectLockConfigurationLegacy(conn, d.Id())
+
+ 	// Object lock not supported in all partitions (extra guard, also guards in read func)
+-	if err != nil && (meta.(*conns.AWSClient).Partition == endpoints.AwsPartitionID || meta.(*conns.AWSClient).Partition == endpoints.AwsUsGovPartitionID) {
++	if err != nil && (meta.(*conns.AWSClient).Partition(ctx) == endpoints.AwsPartitionID || meta.(*conns.AWSClient).Partition(ctx) == endpoints.AwsUsGovPartitionID) {
+ 		return diag.Errorf("error getting S3 Bucket Object Lock configuration: %s", err)
+ 	}
+
+@@ -1393,11 +1392,11 @@ func resourceBucketLegacyRead(ctx context.Context, d *schema.ResourceData, meta
  	}
 
  	if inContext, ok := tftags.FromContext(ctx); ok {
@@ -145,6 +154,11 @@ index 007c2f2dc1..40fd0b7be2 100644
  	}
 
  	arn := arn.ARN{
+-		Partition: meta.(*conns.AWSClient).Partition,
++		Partition: meta.(*conns.AWSClient).Partition(ctx),
+ 		Service:   "s3",
+ 		Resource:  d.Id(),
+ 	}.String()
 diff --git a/internal/service/s3legacy/object.go b/internal/service/s3legacy/object.go
 index f44b435af6..58f6e95d83 100644
 --- a/internal/service/s3legacy/object.go

diff --git a/patches/0039-Allow-creating-lambdas-without-code-related-properti.patch b/patches/0039-Allow-creating-lambdas-without-code-related-properti.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Allow creating lambdas without code related properties
 
 
 diff --git a/internal/service/lambda/function.go b/internal/service/lambda/function.go
-index 8cbc84239c..cd8f37d3cd 100644
+index cf1b3489ae..61d92d337b 100644
 --- a/internal/service/lambda/function.go
 +++ b/internal/service/lambda/function.go
-@@ -171,9 +171,9 @@ func resourceFunction() *schema.Resource {
+@@ -172,9 +172,9 @@ func resourceFunction() *schema.Resource {
  				},
  			},
  			"filename": {
@@ -21,7 +21,7 @@ index 8cbc84239c..cd8f37d3cd 100644
  			},
  			"function_name": {
  				Type:         schema.TypeString,
-@@ -210,9 +210,9 @@ func resourceFunction() *schema.Resource {
+@@ -211,9 +211,9 @@ func resourceFunction() *schema.Resource {
  				},
  			},
  			"image_uri": {
@@ -34,7 +34,7 @@ index 8cbc84239c..cd8f37d3cd 100644
  			},
  			"invoke_arn": {
  				Type:     schema.TypeString,
-@@ -324,10 +324,10 @@ func resourceFunction() *schema.Resource {
+@@ -325,10 +325,10 @@ func resourceFunction() *schema.Resource {
  				ValidateDiagFunc: enum.Validate[awstypes.Runtime](),
  			},
  			names.AttrS3Bucket: {

diff --git a/patches/0041-fix-legacy-bucket-context.patch b/patches/0041-fix-legacy-bucket-context.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] fix legacy bucket context
 
 
 diff --git a/internal/service/s3legacy/bucket_legacy.go b/internal/service/s3legacy/bucket_legacy.go
-index 40fd0b7be2..e6470bb576 100644
+index b5b4c0477f..b0003ae2b3 100644
 --- a/internal/service/s3legacy/bucket_legacy.go
 +++ b/internal/service/s3legacy/bucket_legacy.go
 @@ -903,7 +903,7 @@ func resourceBucketLegacyRead(ctx context.Context, d *schema.ResourceData, meta

diff --git a/patches/0047-update-apn-info.patch b/patches/0047-update-apn-info.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] update apn info
 
 
 diff --git a/internal/conns/config.go b/internal/conns/config.go
-index 3c1521b6f4..3e02bd18e9 100644
+index 7f7a5afc0e..572660dc92 100644
 --- a/internal/conns/config.go
 +++ b/internal/conns/config.go
 @@ -23,7 +23,6 @@ import (