Upgrade upstream to v4.67.0

- Add patch to elbv2 target_group to fix #2517

upstream-patches/0001-Add-TagsSchemaTrulyComputed-definition.patch

@@ -1,7 +1,7 @@
-From 862b6949de0c8860ec69d00a26873ee623ff8492 Mon Sep 17 00:00:00 2001
+From 3df2e1142a8c675ef7a5ea5dda02dbd67a8677f0 Mon Sep 17 00:00:00 2001
 From: Daniel Bradley <[email protected]>
 Date: Fri, 4 Nov 2022 16:49:08 +0000
-Subject: [PATCH 01/27] Add TagsSchemaTrulyComputed definition
+Subject: [PATCH 01/28] Add TagsSchemaTrulyComputed definition
 
 ---
  internal/tags/tags.go | 8 ++++++++

upstream-patches/0002-Conns-user-agent.patch

@@ -1,7 +1,7 @@
-From 7d8810b34667d9b517aeb2220ba6e89798428264 Mon Sep 17 00:00:00 2001
+From d51bc817155ea38ceffa9089e1164c7fd9da6f50 Mon Sep 17 00:00:00 2001
 From: Daniel Bradley <[email protected]>
 Date: Fri, 4 Nov 2022 17:03:31 +0000
-Subject: [PATCH 02/27] Conns user agent
+Subject: [PATCH 02/28] Conns user agent
 
 Replace the useragent used for AWS client connections with a
 Pulumi-flavoured one.

upstream-patches/0003-Add-S3-legacy-bucket-to-resources.patch

@@ -1,7 +1,7 @@
-From af7df1cad4b55af806989a9a49bd8f21c0f77354 Mon Sep 17 00:00:00 2001
+From 0e4273c577190cca8dd29bd0624e37ac446972a6 Mon Sep 17 00:00:00 2001
 From: Daniel Bradley <[email protected]>
 Date: Fri, 4 Nov 2022 17:05:11 +0000
-Subject: [PATCH 03/27] Add S3 legacy bucket to resources
+Subject: [PATCH 03/28] Add S3 legacy bucket to resources
 
 This preserves the old S3 Resource in the SDK, by duplicating the code
 as a new service (in internal/service/s3legacy), and making an explicit
@@ -41,38 +41,38 @@ https://github.com/hashicorp/terraform-provider-aws/pull/29717.
  create mode 100644 website/docs/r/s3_bucket_legacy.html.markdown
 
 diff --git a/go.mod b/go.mod
-index 8f8aa8ecb5..e92f3ebfe3 100644
+index 74290b92ee..316165efc8 100644
 --- a/go.mod
 +++ b/go.mod
-@@ -44,6 +44,7 @@ require (
- 	github.com/beevik/etree v1.1.0
+@@ -49,6 +49,7 @@ require (
+ 	github.com/beevik/etree v1.1.4
  	github.com/google/go-cmp v0.5.9
  	github.com/hashicorp/aws-cloudformation-resource-schema-sdk-go v0.20.0
 +	github.com/hashicorp/aws-sdk-go-base v1.1.0
  	github.com/hashicorp/aws-sdk-go-base/v2 v2.0.0-beta.25
  	github.com/hashicorp/aws-sdk-go-base/v2/awsv1shim/v2 v2.0.0-beta.26
  	github.com/hashicorp/awspolicyequivalence v1.6.0
 diff --git a/go.sum b/go.sum
-index 8b26e92a76..e71bc5acd6 100644
+index 003d839f59..dcf760eb87 100644
 --- a/go.sum
 +++ b/go.sum
 @@ -21,6 +21,7 @@ github.com/apparentlymart/go-textseg/v13 v13.0.0/go.mod h1:ZK2fH7c4NqDTLtiYLvIkE
  github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310 h1:BUAU3CGlLvorLI26FmByPp2eC2qla6E1Tw+scpcg/to=
  github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8=
  github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5/go.mod h1:wHh0iHkYZB8zMSxRWpUBQtwG5a7fFgvEO+odwuTv2gs=
 +github.com/aws/aws-sdk-go v1.31.9/go.mod h1:5zCpMtNQVjRREroY7sYe8lOMRSxkhG6MZveU8YkpAk0=
- github.com/aws/aws-sdk-go v1.44.251 h1:unCIT7a/BkYvJ/43D0Ts/0aRbWDMQM0SUzBtdsKPwCg=
- github.com/aws/aws-sdk-go v1.44.251/go.mod h1:aVsgQcEevwlmQ7qHE9I3h+dtQgpqhFB+i8Phjh7fkwI=
+ github.com/aws/aws-sdk-go v1.44.261 h1:PcTMX/QVk+P3yh2n34UzuXDF5FS2z5Lse2bt+r3IpU4=
+ github.com/aws/aws-sdk-go v1.44.261/go.mod h1:aVsgQcEevwlmQ7qHE9I3h+dtQgpqhFB+i8Phjh7fkwI=
  github.com/aws/aws-sdk-go-v2 v1.17.4/go.mod h1:uzbQtefpm44goOPmdKyAlXSNcwlRgF3ePWVW6EtJvvw=
-@@ -159,6 +160,7 @@ github.com/go-git/go-billy/v5 v5.3.1/go.mod h1:pmpqyWchKfYfrkb/UVH4otLvyi/5gJlGI
+@@ -169,6 +170,7 @@ github.com/go-git/go-billy/v5 v5.3.1/go.mod h1:pmpqyWchKfYfrkb/UVH4otLvyi/5gJlGI
  github.com/go-git/go-git-fixtures/v4 v4.2.1/go.mod h1:K8zd3kDUAykwTdDCr+I0per6Y6vMiRR/nnVTBtavnB0=
  github.com/go-git/go-git/v5 v5.4.2 h1:BXyZu9t0VkbiHtqrsvdq39UDhGJTl1h55VW6CSC4aY4=
  github.com/go-git/go-git/v5 v5.4.2/go.mod h1:gQ1kArt6d+n+BGd+/B/I74HwRTLhth2+zti4ihgckDc=
 +github.com/go-sql-driver/mysql v1.5.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg=
  github.com/go-test/deep v1.0.3 h1:ZrJSEWsXzPOxaZnFteGEfooLba+ju3FYIbOrS+rQd68=
  github.com/golang/protobuf v1.1.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
  github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
-@@ -177,6 +179,8 @@ github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I=
+@@ -187,6 +189,8 @@ github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I=
  github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
  github.com/hashicorp/aws-cloudformation-resource-schema-sdk-go v0.20.0 h1:xc1OYpWvNo6dhnzemfjwtbNxeu3Ag4Wr6yT8BOo0/q0=
  github.com/hashicorp/aws-cloudformation-resource-schema-sdk-go v0.20.0/go.mod h1:cdTE6F2pCKQobug+RqRaQp7Kz9hIEqiSvpPmb6E5G1w=
@@ -81,15 +81,15 @@ index 8b26e92a76..e71bc5acd6 100644
  github.com/hashicorp/aws-sdk-go-base/v2 v2.0.0-beta.25 h1:C/rKj4J49TzpuWZG8FCzTJeMHB5YjeIE7/RyanYfrYA=
  github.com/hashicorp/aws-sdk-go-base/v2 v2.0.0-beta.25/go.mod h1:wzIwDL7rJ5Eb/PsdohG3Mpd/Gfy6wo07XytpTpTdQ0M=
  github.com/hashicorp/aws-sdk-go-base/v2/awsv1shim/v2 v2.0.0-beta.26 h1:6Vs31BbjeG4oRO/MdvAO6XWOfv1HxcVbXJq8nwYr1cw=
-@@ -246,6 +250,7 @@ github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99/go.mod h1:1lJo3i
+@@ -256,6 +260,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/jessevdk/go-flags v1.5.0/go.mod h1:Fw0T6WPc1dYxT4mKEZRfG5kJhaTDP9pj1c2EWnYs/m4=
  github.com/jhump/protoreflect v1.6.0 h1:h5jfMVslIg6l29nsMs0D8Wj17RDVdNYti0vDN/PZZoE=
 +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=
-@@ -367,6 +372,7 @@ golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
+@@ -377,6 +382,7 @@ golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
  golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
  golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks=
  golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=

upstream-patches/0004-Marks-SSE-Configuration-as-Computed-for-Legacy-S3-Bu.patch

@@ -1,7 +1,7 @@
-From 3b0a35169b6e8b497ec369d35a9568ce4341efe9 Mon Sep 17 00:00:00 2001
+From 8171d74b3ed2e40a76d2de7fa923124b2bfd75c0 Mon Sep 17 00:00:00 2001
 From: Kyle Pitzen <[email protected]>
 Date: Thu, 9 Mar 2023 09:47:49 -0600
-Subject: [PATCH 04/27] Marks SSE Configuration as Computed for Legacy S3
+Subject: [PATCH 04/28] Marks SSE Configuration as Computed for Legacy S3
  Bucket
 
 In January, AWS enabled SSE by default for all new S3 buckets.

upstream-patches/0005-De-deprecate-bucket_object.patch

@@ -1,7 +1,7 @@
-From cdd1ad9376f93090e8bbc8b66d6b35a852e7d8ce Mon Sep 17 00:00:00 2001
+From ab24f5f14290f866a4dad10a01335050190a68a8 Mon Sep 17 00:00:00 2001
 From: Daniel Bradley <[email protected]>
 Date: Fri, 4 Nov 2022 17:06:11 +0000
-Subject: [PATCH 05/27] De-deprecate bucket_object
+Subject: [PATCH 05/28] De-deprecate bucket_object
 
 ---
  internal/service/s3/bucket_object.go | 4 ++--

upstream-patches/0006-Remove-lakeformation-catalog_resource-default.patch

@@ -1,7 +1,7 @@
-From 112d17b90c473aebaff823573e220df554b8e610 Mon Sep 17 00:00:00 2001
+From 020c73a3f641d94a6d40570b670ccb83d27a0172 Mon Sep 17 00:00:00 2001
 From: Daniel Bradley <[email protected]>
 Date: Fri, 4 Nov 2022 17:08:23 +0000
-Subject: [PATCH 06/27] Remove lakeformation catalog_resource default
+Subject: [PATCH 06/28] Remove lakeformation catalog_resource default
 
 ---
  internal/service/lakeformation/permissions.go | 4 ++--

upstream-patches/0007-Workaround-SSM-Parameter-tier-bug.patch

@@ -1,7 +1,7 @@
-From a22e6360cf13af0e82b4a271b19a9b3c8f6d7a1a Mon Sep 17 00:00:00 2001
+From 5367aa3507217845325a307a1347176cd4e66932 Mon Sep 17 00:00:00 2001
 From: Daniel Bradley <[email protected]>
 Date: Fri, 4 Nov 2022 17:24:42 +0000
-Subject: [PATCH 07/27] Workaround SSM Parameter tier bug
+Subject: [PATCH 07/28] Workaround SSM Parameter tier bug
 
 - Disable "computed".
 - Disable diff suppression & counteractions

upstream-patches/0008-Add-EKS-cluster-default_addons_to_remove.patch

@@ -1,7 +1,7 @@
-From e2278c0ac41f8d371f95aa18c710ac5d6a4939bc Mon Sep 17 00:00:00 2001
+From 59d4b280e3580802cf260142c4af0060415007dc Mon Sep 17 00:00:00 2001
 From: Daniel Bradley <[email protected]>
 Date: Fri, 4 Nov 2022 17:31:27 +0000
-Subject: [PATCH 08/27] Add EKS cluster default_addons_to_remove
+Subject: [PATCH 08/28] Add EKS cluster default_addons_to_remove
 
 ---
  internal/service/eks/cluster.go               |   7 +

upstream-patches/0009-Add-EKS-cluster-certificate_authorities-plural.patch

@@ -1,7 +1,7 @@
-From 0d1912190abe33fe8b71758a5b4f79fdcd964a02 Mon Sep 17 00:00:00 2001
+From 73f06ce561f0995e3125c331b6d54f115f570e1b Mon Sep 17 00:00:00 2001
 From: Daniel Bradley <[email protected]>
 Date: Fri, 4 Nov 2022 17:32:49 +0000
-Subject: [PATCH 09/27] Add EKS cluster certificate_authorities (plural)
+Subject: [PATCH 09/28] Add EKS cluster certificate_authorities (plural)
 
 ---
  internal/service/eks/cluster.go | 22 ++++++++++++++++++++++

upstream-patches/0010-Workaround-Autoscaling-launch_configuration-associat.patch

@@ -1,7 +1,7 @@
-From e1bc35e427d7da3d9127e9af411783f6aaa6cb25 Mon Sep 17 00:00:00 2001
+From 550a8f6fe20558228784b6effab8a4982cb2804d Mon Sep 17 00:00:00 2001
 From: Daniel Bradley <[email protected]>
 Date: Fri, 4 Nov 2022 17:34:56 +0000
-Subject: [PATCH 10/27] Workaround Autoscaling launch_configuration
+Subject: [PATCH 10/28] Workaround Autoscaling launch_configuration
  associate_public_ip_address
 
 - Disable computation of property until fixed.

upstream-patches/0011-Add-ECR-credentials_data_source.patch

@@ -1,7 +1,7 @@
-From 1af084893a9b09200911fb72db48bfd9773504c4 Mon Sep 17 00:00:00 2001
+From 8ec4e7860622e832ccee359b73144b49a06f8ad8 Mon Sep 17 00:00:00 2001
 From: Daniel Bradley <[email protected]>
 Date: Fri, 4 Nov 2022 17:36:34 +0000
-Subject: [PATCH 11/27] Add ECR credentials_data_source
+Subject: [PATCH 11/28] Add ECR credentials_data_source
 
 ---
  internal/provider/provider.go                 |  6 +-

upstream-patches/0012-Revert-framework-conversions.patch

@@ -1,7 +1,7 @@
-From 6df816a2a9d4e8a7a136c4264284d5d5044c78f7 Mon Sep 17 00:00:00 2001
+From 8c615ed64cfd6b95694acdf42483d347cc43bbc9 Mon Sep 17 00:00:00 2001
 From: Daniel Bradley <[email protected]>
 Date: Fri, 4 Nov 2022 17:42:19 +0000
-Subject: [PATCH 12/27] Revert framework conversions
+Subject: [PATCH 12/28] Revert framework conversions
 
 This commit reverts resources and data sources that were ported to the
 plugin framework, back to their previous implementation. The upstream

upstream-patches/0013-Add-custom-appautoscaling-examples.patch

@@ -1,18 +1,18 @@
-From a52619f5863c7dbb698a5ee2ac5975fab9c0b5b7 Mon Sep 17 00:00:00 2001
+From 32c1611f331b9dae69bf199ed0f2f950721c73d1 Mon Sep 17 00:00:00 2001
 From: Daniel Bradley <[email protected]>
 Date: Wed, 9 Nov 2022 17:37:35 +0000
-Subject: [PATCH 13/27] Add custom appautoscaling examples
+Subject: [PATCH 13/28] Add custom appautoscaling examples
 
 ---
  .../r/appautoscaling_policy.html.markdown     | 28 +++++++++++++++++++
  .../r/appautoscaling_target.html.markdown     | 12 ++++++++
  2 files changed, 40 insertions(+)
 
 diff --git a/website/docs/r/appautoscaling_policy.html.markdown b/website/docs/r/appautoscaling_policy.html.markdown
-index b281e542ae..9b1a7483d2 100644
+index ac28f00413..7a3a2f194a 100644
 --- a/website/docs/r/appautoscaling_policy.html.markdown
 +++ b/website/docs/r/appautoscaling_policy.html.markdown
-@@ -116,6 +116,34 @@ resource "aws_appautoscaling_policy" "replicas" {
+@@ -196,6 +196,34 @@ resource "aws_appautoscaling_policy" "example" {
  }
  ```
 
@@ -48,10 +48,10 @@ index b281e542ae..9b1a7483d2 100644
 
  The following arguments are supported:
 diff --git a/website/docs/r/appautoscaling_target.html.markdown b/website/docs/r/appautoscaling_target.html.markdown
-index 7060afc3b7..8cc3132712 100644
+index 62d4093dfd..c6c126ee73 100644
 --- a/website/docs/r/appautoscaling_target.html.markdown
 +++ b/website/docs/r/appautoscaling_target.html.markdown
-@@ -62,6 +62,18 @@ resource "aws_appautoscaling_target" "replicas" {
+@@ -82,6 +82,18 @@ resource "aws_appautoscaling_target" "ecs_target" {
  }
  ```
 

upstream-patches/0014-Add-dedicated_host-docs.patch

@@ -1,7 +1,7 @@
-From 5a710cb372c56adb439358b18923527183919ea5 Mon Sep 17 00:00:00 2001
+From eb521bffe146e9c3b4874709e42550c949c4281c Mon Sep 17 00:00:00 2001
 From: Daniel Bradley <[email protected]>
 Date: Tue, 15 Nov 2022 10:08:05 +0000
-Subject: [PATCH 14/27] Add dedicated_host docs
+Subject: [PATCH 14/28] Add dedicated_host docs
 
 ---
  website/docs/d/dedicated_host.html.markdown | 75 +++++++++++++++++++++

upstream-patches/0015-Revert-WAF-schema-changes.patch

@@ -1,7 +1,7 @@
-From f89a1425b4bbb6f34166d0a8eff4aca29e08f23f Mon Sep 17 00:00:00 2001
+From f3d4ee60bc40130f2ab9e93337a46c6228699bc3 Mon Sep 17 00:00:00 2001
 From: Daniel Bradley <[email protected]>
 Date: Tue, 15 Nov 2022 13:59:57 +0000
-Subject: [PATCH 15/27] Revert WAF schema changes
+Subject: [PATCH 15/28] Revert WAF schema changes
 
 - This causes far too many types to be generated downstream.
 ---

upstream-patches/0016-Un-deprecate-RDS-instance-name.patch

@@ -1,7 +1,7 @@
-From e3b72d8a627126d0c6e556a29d345cef810ab873 Mon Sep 17 00:00:00 2001
+From 4c2a4481f558cd1f0037482050338c28c09da8b9 Mon Sep 17 00:00:00 2001
 From: Daniel Bradley <[email protected]>
 Date: Thu, 17 Nov 2022 09:55:46 +0000
-Subject: [PATCH 16/27] Un-deprecate RDS instance name
+Subject: [PATCH 16/28] Un-deprecate RDS instance name
 
 We don't have a good migration story yet so this just adds noise for users.
 
@@ -11,7 +11,7 @@ Reference: https://github.com/pulumi/pulumi-aws/issues/2203
  1 file changed, 4 insertions(+), 5 deletions(-)
 
 diff --git a/internal/service/rds/instance.go b/internal/service/rds/instance.go
-index 6973a477a1..e2a6673940 100644
+index 9ee36fd86e..eb26a7b9d5 100644
 --- a/internal/service/rds/instance.go
 +++ b/internal/service/rds/instance.go
 @@ -385,11 +385,10 @@ func ResourceInstance() *schema.Resource {

upstream-patches/0017-Catch-cty-panic-in-new-resourceTopicSubscriptionCust.patch

@@ -1,7 +1,7 @@
-From 7e27d0ba0007ae2451511529d0259a75011e9057 Mon Sep 17 00:00:00 2001
+From 522a4e7c12ffd63261a06141b4e3480784e398a2 Mon Sep 17 00:00:00 2001
 From: Thomas Kappler <[email protected]>
 Date: Thu, 1 Dec 2022 10:56:32 -0800
-Subject: [PATCH 17/27] Catch cty panic in new
+Subject: [PATCH 17/28] Catch cty panic in new
  resourceTopicSubscriptionCustomizeDiff.
 
 The root cause is not fully understood yet but this might unblock us.

upstream-patches/0018-add-matchmaking-configuration-72.patch

@@ -1,7 +1,7 @@
-From 7147d4f0a7fd7733a35cddb7ae5d0878117efeae Mon Sep 17 00:00:00 2001
+From eeb2132cb072dadb31aa0f14531bdeb814c13276 Mon Sep 17 00:00:00 2001
 From: Lee Briggs <[email protected]>
 Date: Wed, 21 Dec 2022 12:23:59 -0800
-Subject: [PATCH 18/27] add matchmaking configuration (#72)
+Subject: [PATCH 18/28] add matchmaking configuration (#72)
 
 * add matchmaking configuration
 * add matchmaking rule set

upstream-patches/0019-fix-Adding-back-in-removeAddons.patch

@@ -1,7 +1,7 @@
-From 97d8c879a7e93911d020baaa96f1ed78e6f3d2b4 Mon Sep 17 00:00:00 2001
+From dd11f5457c405abc74a0a0e781492f9f2a0eee04 Mon Sep 17 00:00:00 2001
 From: Richard Shade <[email protected]>
 Date: Fri, 6 Jan 2023 15:31:22 -0600
-Subject: [PATCH 19/27] fix: Adding back in removeAddons
+Subject: [PATCH 19/28] fix: Adding back in removeAddons
 
 ---
  internal/service/eks/cluster.go | 4 ++++

upstream-patches/0020-Reverts-patches-to-S3BucketLegacy-and-GameLift.patch

@@ -1,7 +1,7 @@
-From e9c8641729a2583a22a98a35c596f08336e5d973 Mon Sep 17 00:00:00 2001
+From 4593987f6d6288bebdfa38c447e7a771cd0afb63 Mon Sep 17 00:00:00 2001
 From: Kyle Pitzen <[email protected]>
 Date: Fri, 27 Jan 2023 09:37:43 -0600
-Subject: [PATCH 20/27] Reverts patches to S3BucketLegacy and GameLift
+Subject: [PATCH 20/28] Reverts patches to S3BucketLegacy and GameLift
 
 Previously, we were pulling along patches which removed a few simplifications
 to waiters in AWS GameLift, and a newer patch which plumbed through context.Context

upstream-patches/0021-Revert-Update-endpointHashIPAddress.patch

@@ -1,7 +1,7 @@
-From c13c320f7400259f6a7b02fcd36263910ddbee4e Mon Sep 17 00:00:00 2001
+From 4aa915dd508daebd0a87d7c1ee834a6fcdcc63b4 Mon Sep 17 00:00:00 2001
 From: Thomas Kappler <[email protected]>
 Date: Fri, 3 Feb 2023 17:31:18 -0800
-Subject: [PATCH 21/27] Revert "Update endpointHashIPAddress"
+Subject: [PATCH 21/28] Revert "Update endpointHashIPAddress"
 
 This reverts commit 2197a6c2c7a0ff306cec3432acb9f5680866f034.
 

upstream-patches/0022-Fixup-eks-formatting.patch

@@ -1,7 +1,7 @@
-From 1c4c5da038033c341f6a5a3ebdd8b191f7f86842 Mon Sep 17 00:00:00 2001
+From cf22aebd3b395e24a0dadbbcb735bc93c77ede32 Mon Sep 17 00:00:00 2001
 From: Daniel Bradley <[email protected]>
 Date: Thu, 9 Mar 2023 14:50:36 +0000
-Subject: [PATCH 22/27] Fixup eks formatting
+Subject: [PATCH 22/28] Fixup eks formatting
 
 ---
  internal/service/eks/wait.go | 6 +++---

upstream-patches/0023-Fixup-gamelift-context.patch

@@ -1,7 +1,7 @@
-From d12fdcb6021e34d92c160df81c0df538cedd36ce Mon Sep 17 00:00:00 2001
+From c5f22aa4cf708198ab27036ddbf42aa3b1c90131 Mon Sep 17 00:00:00 2001
 From: Daniel Bradley <[email protected]>
 Date: Thu, 9 Mar 2023 14:50:51 +0000
-Subject: [PATCH 23/27] Fixup gamelift context
+Subject: [PATCH 23/28] Fixup gamelift context
 
 ---
  internal/service/gamelift/matchmaking_configuration.go | 2 +-

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

@@ -1,7 +1,7 @@
-From 99d2fdd3ee5567a6118b6dc9376c02011bc42710 Mon Sep 17 00:00:00 2001
+From 42e925f4c29a6fd1fa4951db4865c855a5f2b4a9 Mon Sep 17 00:00:00 2001
 From: Daniel Bradley <[email protected]>
 Date: Tue, 28 Feb 2023 15:19:24 +0000
-Subject: [PATCH 24/27] Change default descriptions to "Managed by Pulumi"
+Subject: [PATCH 24/28] Change default descriptions to "Managed by Pulumi"
 
 ---
  internal/service/apigateway/api_key.go               | 2 +-
@@ -138,10 +138,10 @@ index 22d907b7d4..f587fcbcce 100644
  			"name": {
  				Type:     schema.TypeString,
 diff --git a/internal/service/elasticache/subnet_group.go b/internal/service/elasticache/subnet_group.go
-index 1322823aae..709ecbe12f 100644
+index 80cbca91e9..64822098f8 100644
 --- a/internal/service/elasticache/subnet_group.go
 +++ b/internal/service/elasticache/subnet_group.go
-@@ -41,7 +41,7 @@ func ResourceSubnetGroup() *schema.Resource {
+@@ -42,7 +42,7 @@ func ResourceSubnetGroup() *schema.Resource {
  			"description": {
  				Type:     schema.TypeString,
  				Optional: true,

upstream-patches/0025-remove-required-elements-from-schema-and-fix-tests-7.patch

@@ -1,7 +1,7 @@
-From 74c3a4360fb100e5258142a4c6f7477d39382018 Mon Sep 17 00:00:00 2001
+From 31ce3e680fea68d5822d3a2070aae87692f39ce7 Mon Sep 17 00:00:00 2001
 From: Daniel Bradley <[email protected]>
 Date: Tue, 28 Mar 2023 19:54:00 +0100
-Subject: [PATCH 25/27] remove required elements from schema and fix tests
+Subject: [PATCH 25/28] remove required elements from schema and fix tests
  (#77)
 
 Co-authored-by: Lee Briggs <[email protected]>

upstream-patches/0026-Revert-Framework-conversions.patch

@@ -1,7 +1,7 @@
-From 1fd9f19c4b5b0af1f7a2e7c7b17babe5aaeffe6e Mon Sep 17 00:00:00 2001
+From eb0002b3efd5584c9b5e92855522c5c6472cfdfd Mon Sep 17 00:00:00 2001
 From: Thomas Kappler <[email protected]>
 Date: Tue, 28 Mar 2023 15:09:00 -0700
-Subject: [PATCH 26/27] Revert Framework conversions
+Subject: [PATCH 26/28] Revert Framework conversions
 
 https://github.com/hashicorp/terraform-provider-aws/tree/main/internal/service/cognitoidp
 
@@ -94,7 +94,7 @@ index 5e86dd274e..052b7ed81e 100644
  		computeoptimizer.ServicePackage,
  		configservice.ServicePackage,
 diff --git a/internal/service/cognitoidp/managed_user_pool_client.go b/internal/service/cognitoidp/managed_user_pool_client.go
-index 4732b88af5..f00ff49a83 100644
+index e29cdd9663..9063f6faf0 100644
 --- a/internal/service/cognitoidp/managed_user_pool_client.go
 +++ b/internal/service/cognitoidp/managed_user_pool_client.go
 @@ -1,3 +1,5 @@
@@ -189,7 +189,7 @@ index efa1eb0564..b3012c5001 100644
 +// 	return UpdateTags(ctx, meta.(*conns.AWSClient).CognitoIDPConn(), identifier, oldTags, newTags)
 +// }
 diff --git a/internal/service/cognitoidp/user_pool_client.go b/internal/service/cognitoidp/user_pool_client.go
-index 57d5e4090b..2f4198dfd0 100644
+index e3231f4db0..c380e97977 100644
 --- a/internal/service/cognitoidp/user_pool_client.go
 +++ b/internal/service/cognitoidp/user_pool_client.go
 @@ -1,3 +1,5 @@