Upgrade terraform-provider-aws to v6.22.0

patches/0001-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 84953e82f4b..03538985788 100644
+index 18121bed696..43619799a34 100644
 --- a/internal/service/s3/bucket_object.go
 +++ b/internal/service/s3/bucket_object.go
 @@ -67,7 +67,7 @@ func resourceBucketObject() *schema.Resource {

patches/0003-Workaround-Autoscaling-launch_configuration-associat.patch

@@ -7,7 +7,7 @@ Subject: [PATCH] Workaround Autoscaling launch_configuration
 - Disable computation of property until fixed.
 
 diff --git a/internal/service/autoscaling/launch_configuration.go b/internal/service/autoscaling/launch_configuration.go
-index 370b7b8630f..7917761fad5 100644
+index db237b0f2ad..f66659a28eb 100644
 --- a/internal/service/autoscaling/launch_configuration.go
 +++ b/internal/service/autoscaling/launch_configuration.go
 @@ -52,7 +52,8 @@ func resourceLaunchConfiguration() *schema.Resource {

patches/0009-Change-default-descriptions-to-Managed-by-Pulumi.patch

@@ -44,7 +44,7 @@ index 08ea92079f6..ad0004ee9e9 100644
  			},
  			"etag": {
 diff --git a/internal/service/docdb/cluster_parameter_group.go b/internal/service/docdb/cluster_parameter_group.go
-index d76992a040b..245a84586a2 100644
+index b34937813ae..0d639a6263c 100644
 --- a/internal/service/docdb/cluster_parameter_group.go
 +++ b/internal/service/docdb/cluster_parameter_group.go
 @@ -49,7 +49,7 @@ func resourceClusterParameterGroup() *schema.Resource {

patches/0011-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 d5b051f0e2d..bbdc4750c42 100644
+index b5b46900e74..8a9f0cb5c9b 100644
 --- a/internal/service/elbv2/target_group.go
 +++ b/internal/service/elbv2/target_group.go
 @@ -633,19 +633,19 @@ func resourceTargetGroupRead(ctx context.Context, d *schema.ResourceData, meta a

patches/0016-update-apn-info.patch

@@ -5,18 +5,18 @@ Subject: [PATCH] update apn info
 
 
 diff --git a/internal/conns/config.go b/internal/conns/config.go
-index 6c47241c115..c983abba23f 100644
+index 90f85d5a691..552107e5bb3 100644
 --- a/internal/conns/config.go
 +++ b/internal/conns/config.go
-@@ -22,7 +22,6 @@ import (
- 	"github.com/hashicorp/terraform-provider-aws/internal/errs/sdkdiag"
+@@ -23,7 +23,6 @@ import (
  	tftags "github.com/hashicorp/terraform-provider-aws/internal/tags"
+ 	"github.com/hashicorp/terraform-provider-aws/internal/tags/tagpolicy"
  	"github.com/hashicorp/terraform-provider-aws/names"
 -	"github.com/hashicorp/terraform-provider-aws/version"
  )
 
  type Config struct {
-@@ -76,10 +75,10 @@ func (c *Config) ConfigureProvider(ctx context.Context, client *AWSClient) (*AWS
+@@ -78,10 +77,10 @@ func (c *Config) ConfigureProvider(ctx context.Context, client *AWSClient) (*AWS
  		AccessKey:         c.AccessKey,
  		AllowedAccountIds: c.AllowedAccountIds,
  		APNInfo: &awsbase.APNInfo{

patches/0025-Adding-APN-1.1-marketplace-identifier-to-User-Agent-.patch

@@ -6,10 +6,10 @@ Subject: [PATCH] Adding APN 1.1 marketplace identifier to User Agent request
 
 
 diff --git a/internal/conns/config.go b/internal/conns/config.go
-index c983abba23f..72a00696165 100644
+index 552107e5bb3..0c91ca7137b 100644
 --- a/internal/conns/config.go
 +++ b/internal/conns/config.go
-@@ -79,6 +79,7 @@ func (c *Config) ConfigureProvider(ctx context.Context, client *AWSClient) (*AWS
+@@ -81,6 +81,7 @@ func (c *Config) ConfigureProvider(ctx context.Context, client *AWSClient) (*AWS
  			Products: []awsbase.UserAgentProduct{
  				{Name: "Pulumi", Version: "1.0"},
  				{Name: "Pulumi-Aws", Version: c.TerraformVersion, Comment: "+https://pulumi.com"},