Upgrade upstream to v5.63.1

patches/0023-Provide-context-to-conns.patch

@@ -26,139 +26,6 @@ index b6e19a7283..9176fa0a16 100644
 
  	registryID := d.Get("registry_id").(string)
  	log.Printf("[DEBUG] Reading ECR repository credentials %s", registryID)
-diff --git a/internal/service/elasticache/security_group.go b/internal/service/elasticache/security_group.go
-deleted file mode 100644
-index f587fcbcce..0000000000
---- a/internal/service/elasticache/security_group.go
-+++ /dev/null
-@@ -1,127 +0,0 @@
--package elasticache
--
--import (
--	"context"
--	"log"
--	"time"
--
--	"github.com/aws/aws-sdk-go/aws"
--	"github.com/aws/aws-sdk-go/service/elasticache"
--	"github.com/hashicorp/aws-sdk-go-base/v2/awsv1shim/v2/tfawserr"
--	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
--	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/retry"
--	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
--	"github.com/hashicorp/terraform-provider-aws/internal/conns"
--	"github.com/hashicorp/terraform-provider-aws/internal/errs/sdkdiag"
--	"github.com/hashicorp/terraform-provider-aws/internal/tfresource"
--)
--
--// @SDKResource("aws_elasticache_security_group")
--func ResourceSecurityGroup() *schema.Resource {
--	return &schema.Resource{
--		CreateWithoutTimeout: resourceSecurityGroupCreate,
--		ReadWithoutTimeout:   resourceSecurityGroupRead,
--		DeleteWithoutTimeout: resourceSecurityGroupDelete,
--		Importer: &schema.ResourceImporter{
--			StateContext: schema.ImportStatePassthroughContext,
--		},
--
--		Schema: map[string]*schema.Schema{
--			"description": {
--				Type:     schema.TypeString,
--				Optional: true,
--				ForceNew: true,
--				Default:  "Managed by Pulumi",
--			},
--			"name": {
--				Type:     schema.TypeString,
--				Required: true,
--				ForceNew: true,
--			},
--			"security_group_names": {
--				Type:     schema.TypeSet,
--				Required: true,
--				ForceNew: true,
--				Elem:     &schema.Schema{Type: schema.TypeString},
--				Set:      schema.HashString,
--			},
--		},
--
--		DeprecationMessage: `With the retirement of EC2-Classic the aws_elasticache_security_group resource has been deprecated and will be removed in a future version.`,
--	}
--}
--
--func resourceSecurityGroupCreate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics {
--	var diags diag.Diagnostics
--	return sdkdiag.AppendErrorf(diags, `with the retirement of EC2-Classic no new ElastiCache Security Groups can be created`)
--}
--
--func resourceSecurityGroupRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics {
--	var diags diag.Diagnostics
--	conn := meta.(*conns.AWSClient).ElastiCacheConn()
--	req := &elasticache.DescribeCacheSecurityGroupsInput{
--		CacheSecurityGroupName: aws.String(d.Id()),
--	}
--
--	res, err := conn.DescribeCacheSecurityGroupsWithContext(ctx, req)
--	if err != nil {
--		return sdkdiag.AppendErrorf(diags, "reading ElastiCache Cache Security Group (%s): %s", d.Id(), err)
--	}
--	if len(res.CacheSecurityGroups) == 0 {
--		return sdkdiag.AppendErrorf(diags, "reading ElastiCache Cache Security Group (%s): empty response", d.Id())
--	}
--
--	var group *elasticache.CacheSecurityGroup
--	for _, g := range res.CacheSecurityGroups {
--		if aws.StringValue(g.CacheSecurityGroupName) == d.Id() {
--			group = g
--		}
--	}
--	if group == nil {
--		return sdkdiag.AppendErrorf(diags, "reading ElastiCache Cache Security Group (%s): not found", d.Id())
--	}
--
--	d.Set("name", group.CacheSecurityGroupName)
--	d.Set("description", group.Description)
--
--	sgNames := make([]string, 0, len(group.EC2SecurityGroups))
--	for _, sg := range group.EC2SecurityGroups {
--		sgNames = append(sgNames, *sg.EC2SecurityGroupName)
--	}
--	d.Set("security_group_names", sgNames)
--
--	return diags
--}
--
--func resourceSecurityGroupDelete(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics {
--	var diags diag.Diagnostics
--	conn := meta.(*conns.AWSClient).ElastiCacheConn()
--
--	log.Printf("[DEBUG] Cache security group delete: %s", d.Id())
--
--	err := retry.RetryContext(ctx, 5*time.Minute, func() *retry.RetryError {
--		_, err := conn.DeleteCacheSecurityGroupWithContext(ctx, &elasticache.DeleteCacheSecurityGroupInput{
--			CacheSecurityGroupName: aws.String(d.Id()),
--		})
--
--		if tfawserr.ErrCodeEquals(err, "InvalidCacheSecurityGroupState", "DependencyViolation") {
--			return retry.RetryableError(err)
--		}
--
--		if err != nil {
--			return retry.RetryableError(err)
--		}
--
--		return nil
--	})
--
--	if tfresource.TimedOut(err) {
--		_, err = conn.DeleteCacheSecurityGroupWithContext(ctx, &elasticache.DeleteCacheSecurityGroupInput{
--			CacheSecurityGroupName: aws.String(d.Id()),
--		})
--	}
--	if err != nil {
--		return sdkdiag.AppendErrorf(diags, "deleting ElastiCache Cache Security Group (%s): %s", d.Id(), err)
--	}
--	return diags
--}
 diff --git a/internal/service/gamelift/matchmaking_configuration.go b/internal/service/gamelift/matchmaking_configuration.go
 index 4a0ccf149d..72f7d31d85 100644
 --- a/internal/service/gamelift/matchmaking_configuration.go
@@ -275,37 +142,6 @@ index 54b86a0426..d9f2424b7a 100644
  	log.Printf("[INFO] Deleting GameLift Matchmaking Rule Set: %s", d.Id())
  	_, err := conn.DeleteMatchmakingRuleSet(&gamelift.DeleteMatchmakingRuleSetInput{
  		Name: aws.String(d.Id()),
-diff --git a/internal/service/redshift/security_group.go b/internal/service/redshift/security_group.go
-index 47b5d7cda2..050fee663a 100644
---- a/internal/service/redshift/security_group.go
-+++ b/internal/service/redshift/security_group.go
-@@ -119,7 +119,7 @@ func resourceSecurityGroupRead(ctx context.Context, d *schema.ResourceData, meta
-
- func resourceSecurityGroupUpdate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics {
- 	var diags diag.Diagnostics
--	conn := meta.(*conns.AWSClient).RedshiftConn()
-+	conn := meta.(*conns.AWSClient).RedshiftConn(ctx)
-
- 	if d.HasChange("ingress") {
- 		o, n := d.GetChange("ingress")
-@@ -162,7 +162,7 @@ func resourceSecurityGroupUpdate(ctx context.Context, d *schema.ResourceData, me
-
- func resourceSecurityGroupDelete(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics {
- 	var diags diag.Diagnostics
--	conn := meta.(*conns.AWSClient).RedshiftConn()
-+	conn := meta.(*conns.AWSClient).RedshiftConn(ctx)
-
- 	log.Printf("[DEBUG] Redshift Security Group destroy: %v", d.Id())
- 	opts := redshift.DeleteClusterSecurityGroupInput{
-@@ -183,7 +183,7 @@ func resourceSecurityGroupDelete(ctx context.Context, d *schema.ResourceData, me
- }
-
- func resourceSecurityGroupRetrieve(ctx context.Context, d *schema.ResourceData, meta interface{}) (*redshift.ClusterSecurityGroup, error) {
--	conn := meta.(*conns.AWSClient).RedshiftConn()
-+	conn := meta.(*conns.AWSClient).RedshiftConn(ctx)
-
- 	opts := redshift.DescribeClusterSecurityGroupsInput{
- 		ClusterSecurityGroupName: aws.String(d.Id()),
 diff --git a/internal/service/s3legacy/bucket_legacy.go b/internal/service/s3legacy/bucket_legacy.go
 index 69cdf81c1e..575767763b 100644
 --- a/internal/service/s3legacy/bucket_legacy.go

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 f2a8e40182..f4d8ef520e 100644
+index 4818e47550..665a6004d3 100644
 --- a/internal/conns/awsclient.go
 +++ b/internal/conns/awsclient.go
-@@ -19,6 +19,7 @@ import (
- 	aws_sdkv1 "github.com/aws/aws-sdk-go/aws"
+@@ -17,6 +17,7 @@ import (
+ 	apigatewayv2_types "github.com/aws/aws-sdk-go-v2/service/apigatewayv2/types"
+ 	s3_sdkv2 "github.com/aws/aws-sdk-go-v2/service/s3"
  	session_sdkv1 "github.com/aws/aws-sdk-go/aws/session"
- 	opsworks_sdkv1 "github.com/aws/aws-sdk-go/service/opsworks"
 +	s3_sdkv1 "github.com/aws/aws-sdk-go/service/s3"
  	baselogging "github.com/hashicorp/aws-sdk-go-base/v2/logging"
  	"github.com/hashicorp/terraform-plugin-log/tflog"
  	"github.com/hashicorp/terraform-provider-aws/internal/errs"
-@@ -112,6 +113,13 @@ func (c *AWSClient) S3UsePathStyle(context.Context) bool {
+@@ -100,6 +101,13 @@ func (c *AWSClient) S3UsePathStyle(context.Context) bool {
  	return c.s3UsePathStyle
  }
 
@@ -30,7 +30,7 @@ index f2a8e40182..f4d8ef520e 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) {
-@@ -177,7 +185,7 @@ func (c *AWSClient) DefaultKMSKeyPolicy(context.Context) string {
+@@ -165,7 +173,7 @@ func (c *AWSClient) DefaultKMSKeyPolicy(context.Context) string {
  			"Resource": "*"
  		}
  	]

patches/0027-Do-not-compute-tags_all-at-TF-level.patch

@@ -88,10 +88,10 @@ index ffa236c568..5733dd6110 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 6a3347c16c..daad08c471 100644
+index 1e958241e4..e8c996ca8d 100644
 --- a/internal/service/batch/job_queue.go
 +++ b/internal/service/batch/job_queue.go
-@@ -95,7 +95,7 @@ func (r *jobQueueResource) Schema(ctx context.Context, request resource.SchemaRe
+@@ -96,7 +96,7 @@ func (r *jobQueueResource) Schema(ctx context.Context, request resource.SchemaRe
  				},
  			},
  			names.AttrTags:    tftags.TagsAttribute(),
@@ -101,7 +101,7 @@ index 6a3347c16c..daad08c471 100644
  		Blocks: map[string]schema.Block{
  			names.AttrTimeouts: timeouts.Block(ctx, timeouts.Opts{
 diff --git a/internal/service/batch/job_queue_migrate.go b/internal/service/batch/job_queue_migrate.go
-index 4c20570739..2338b2a656 100644
+index c3d766b67d..5120ff20b5 100644
 --- a/internal/service/batch/job_queue_migrate.go
 +++ b/internal/service/batch/job_queue_migrate.go
 @@ -39,7 +39,7 @@ func jobQueueSchema0(ctx context.Context) schema.Schema {

patches/0034-Fix-tags_all-Computed-for-PF-resources.patch

@@ -96,7 +96,7 @@ index 9ff71fe5d7..faba601773 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 a9bf12da5f..05403ea048 100644
+index 0425a8a97f..8c5b93a1b8 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

patches/0037-Restore-legacy-bucket.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Restore legacy bucket
 
 
 diff --git a/go.mod b/go.mod
-index bf320606b6..c0c3b81ffc 100644
+index c15001cae4..c055a4fd65 100644
 --- a/go.mod
 +++ b/go.mod
-@@ -247,6 +247,7 @@ require (
+@@ -251,6 +251,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.23.0
@@ -17,18 +17,18 @@ index bf320606b6..c0c3b81ffc 100644
  	github.com/hashicorp/aws-sdk-go-base/v2/awsv1shim/v2 v2.0.0-beta.55
  	github.com/hashicorp/awspolicyequivalence v1.6.0
 diff --git a/go.sum b/go.sum
-index 577bb88f9f..3d4c9c102b 100644
+index 5abfa42f42..7a6022f91b 100644
 --- a/go.sum
 +++ b/go.sum
-@@ -557,6 +557,7 @@ github.com/go-logr/logr v1.4.1 h1:pKouT5E8xu9zeFC39JXRDukb6JFQPXM5p5I91188VAQ=
+@@ -565,6 +565,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=
 +github.com/go-sql-driver/mysql v1.5.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg=
  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=
-@@ -576,6 +577,8 @@ github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
+@@ -584,6 +585,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.23.0 h1:l16/Vrl0+x+HjHJWEjcKPwHYoxN9EC78gAFXKlH6m84=
  github.com/hashicorp/aws-cloudformation-resource-schema-sdk-go v0.23.0/go.mod h1:HAmscHyzSOfB1Dr16KLc177KNbn83wscnZC+N7WyaM8=
@@ -37,15 +37,15 @@ index 577bb88f9f..3d4c9c102b 100644
  github.com/hashicorp/aws-sdk-go-base/v2 v2.0.0-beta.54 h1:O37FpbmkDSmSPgukMJLAzJzo5WBSFQx0iwn4PlY6BKI=
  github.com/hashicorp/aws-sdk-go-base/v2 v2.0.0-beta.54/go.mod h1:TJ+Mz49cn0zKURLX5haphWDbmGWz15OsEiLp1CcXDwY=
  github.com/hashicorp/aws-sdk-go-base/v2/awsv1shim/v2 v2.0.0-beta.55 h1:7izXD15MCmPcWbKJ5qAwcSlnWvTwkioIJkq0+OJIJG0=
-@@ -653,6 +656,7 @@ github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99/go.mod h1:1lJo3i
+@@ -661,6 +664,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=
 +github.com/jmespath/go-jmespath v0.3.0/go.mod h1:9QtRXoHjLGCJ5IBSaohpXITPlowMeeYCZ7fLUTSywik=
  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=
-@@ -765,6 +769,7 @@ golang.org/x/mod v0.20.0 h1:utOm6MM3R3dnawAiJgn0y+xvuYRsm1RKM/4giyfDgV0=
+@@ -773,6 +777,7 @@ golang.org/x/mod v0.20.0 h1:utOm6MM3R3dnawAiJgn0y+xvuYRsm1RKM/4giyfDgV0=
  golang.org/x/mod v0.20.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=
@@ -54,10 +54,10 @@ index 577bb88f9f..3d4c9c102b 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 f4d8ef520e..44b7bedd57 100644
+index 665a6004d3..8f90fa3350 100644
 --- a/internal/conns/awsclient.go
 +++ b/internal/conns/awsclient.go
-@@ -113,6 +113,10 @@ func (c *AWSClient) S3UsePathStyle(context.Context) bool {
+@@ -101,6 +101,10 @@ func (c *AWSClient) S3UsePathStyle(context.Context) bool {
  	return c.s3UsePathStyle
  }
 

patches/0044-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 8cc66cce0a..cb5d50fc52 100644
+index 27a5cb2552..573d25951e 100644
 --- a/internal/conns/awsclient_gen.go
 +++ b/internal/conns/awsclient_gen.go
-@@ -232,6 +232,7 @@ import (
+@@ -236,6 +236,7 @@ import (
  	workspacesweb_sdkv2 "github.com/aws/aws-sdk-go-v2/service/workspacesweb"
  	xray_sdkv2 "github.com/aws/aws-sdk-go-v2/service/xray"
  	connect_sdkv1 "github.com/aws/aws-sdk-go/service/connect"
 +	ecr_sdkv1 "github.com/aws/aws-sdk-go/service/ecr"
  	elasticsearchservice_sdkv1 "github.com/aws/aws-sdk-go/service/elasticsearchservice"
  	emr_sdkv1 "github.com/aws/aws-sdk-go/service/emr"
  	imagebuilder_sdkv1 "github.com/aws/aws-sdk-go/service/imagebuilder"
-@@ -582,6 +583,10 @@ func (c *AWSClient) EC2Client(ctx context.Context) *ec2_sdkv2.Client {
+@@ -581,6 +582,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)))
  }
 

patches/0057-Fix-tags_all-Computed-for-PF-resources.patch

@@ -57,7 +57,7 @@ index 8722e6a2b6..09293cdecc 100644
  		Blocks: map[string]schema.Block{
  			"resource_set": resourceSetLNB,
 diff --git a/internal/service/guardduty/malware_protection_plan.go b/internal/service/guardduty/malware_protection_plan.go
-index 540f3a58f5..80ce86a332 100644
+index baaefd4d50..873f7b2eed 100644
 --- a/internal/service/guardduty/malware_protection_plan.go
 +++ b/internal/service/guardduty/malware_protection_plan.go
 @@ -88,7 +88,7 @@ func (r *resourceMalwareProtectionPlan) Schema(ctx context.Context, req resource

patches/0062-Patch-tags_all-Computed-for-chatbot-timestreaminflux.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Patch tags_all Computed for chatbot, timestreaminfluxdb
 
 
 diff --git a/internal/service/chatbot/slack_channel_configuration.go b/internal/service/chatbot/slack_channel_configuration.go
-index edd34ca88f..97e8afe082 100644
+index e3bdde8a19..01495c8171 100644
 --- a/internal/service/chatbot/slack_channel_configuration.go
 +++ b/internal/service/chatbot/slack_channel_configuration.go
 @@ -104,7 +104,7 @@ func (r *slackChannelConfigurationResource) Schema(ctx context.Context, request

patches/0064-Adapt-gamelift-matchmaking-resources.patch

@@ -244,7 +244,7 @@ index 0000000000..dc4c9b2230
 +	return defaultResolver.EndpointFor(service, region, opts...)
 +}
 diff --git a/names/data/names_data.hcl b/names/data/names_data.hcl
-index ffacb154d8..1ce9328e2c 100644
+index 4c4c37a182..034cf46c12 100644
 --- a/names/data/names_data.hcl
 +++ b/names/data/names_data.hcl
 @@ -4146,7 +4146,7 @@ service "gamelift" {