Upgrade terraform provider aws to v5.18.0 (#2827)

Unfortunately
8a12083
did not really happen as the commit didn't include ./upstream and
patches changes due to human error.

I've reopened 5.17.0 upgrade ticket. The provider actually remains on
5.16.2 right now.

For the same reasons of go.sum conflict as in
#2817 upgrade-provider
continues unable to process these upgrades. I've started the process
manually here again for v5.16.2..v5.18.0.

Unfortunately we have a new problem here, upstream no longer compiles:

```
go build -v all                                                 
github.com/hashicorp/terraform-provider-aws/internal/service/s3legacy
# github.com/hashicorp/terraform-provider-aws/internal/service/s3legacy
internal/service/s3legacy/bucket_legacy.go:1425:35: meta.(*conns.AWSClient).S3ConnURICleaningDisabled undefined (type *conns.AWSClient has no field or method S3ConnURICleaningDisabled)
```

We will need another patch here to carefully test deletion on the S3
bucket legacy.

When complete it would be fixing:

- #2812
- #2822

patches/0001-Add-TagsSchemaTrulyComputed-definition.patch

@@ -1,4 +1,4 @@
-From 009fe6e399f5fa31f75deb8aae3e6b1949dbb6b1 Mon Sep 17 00:00:00 2001
+From e0acd427bffa91ffdd5e1603a3064b8e7cf3300f Mon Sep 17 00:00:00 2001
 From: Daniel Bradley <[email protected]>
 Date: Fri, 4 Nov 2022 16:49:08 +0000
 Subject: [PATCH 01/29] Add TagsSchemaTrulyComputed definition
@@ -24,5 +24,5 @@ index 12d3b9013e..bc9e14fc19 100644
 +	}
 +}
 -- 
-2.41.0
+2.39.2 (Apple Git-143)
 

patches/0002-Conns-user-agent.patch

@@ -1,4 +1,4 @@
-From 473d2ad185ac402ca13b24b75619304a68b970b0 Mon Sep 17 00:00:00 2001
+From 3a0068c3be5228186afeec85841012577de7bc41 Mon Sep 17 00:00:00 2001
 From: Daniel Bradley <[email protected]>
 Date: Fri, 4 Nov 2022 17:03:31 +0000
 Subject: [PATCH 02/29] Conns user agent
@@ -36,5 +36,5 @@ index 954266ba7a..404a654792 100644
  	}
  }
 -- 
-2.41.0
+2.39.2 (Apple Git-143)
 

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

@@ -1,4 +1,4 @@
-From e14abc584f95100d86baece969d2ce04de601409 Mon Sep 17 00:00:00 2001
+From 25fa0be5a15fadd12e37e9f8d76a40f7db2d2ae2 Mon Sep 17 00:00:00 2001
 From: Daniel Bradley <[email protected]>
 Date: Fri, 4 Nov 2022 17:05:11 +0000
 Subject: [PATCH 03/29] Add S3 legacy bucket to resources
@@ -41,10 +41,10 @@ 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 35413c5d11..1e27adb219 100644
+index 49665be6ae..5b939d8958 100644
 --- a/go.mod
 +++ b/go.mod
-@@ -71,6 +71,7 @@ require (
+@@ -74,6 +74,7 @@ require (
  	github.com/beevik/etree v1.2.0
  	github.com/google/go-cmp v0.5.9
  	github.com/hashicorp/aws-cloudformation-resource-schema-sdk-go v0.21.0
@@ -53,26 +53,26 @@ index 35413c5d11..1e27adb219 100644
  	github.com/hashicorp/aws-sdk-go-base/v2/awsv1shim/v2 v2.0.0-beta.36
  	github.com/hashicorp/awspolicyequivalence v1.6.0
 diff --git a/go.sum b/go.sum
-index 23d2539af1..c2bfa77af8 100644
+index 34a30545f4..32465c3a2c 100644
 --- a/go.sum
 +++ b/go.sum
 @@ -22,6 +22,7 @@ github.com/apparentlymart/go-textseg/v15 v15.0.0/go.mod h1:K8XmNZdhEBkdlyDdvbmms
  github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8=
  github.com/armon/go-radix v1.0.0 h1:F4z6KzEeeQIMeLFa97iZU6vupzoecKdU5TX24SNppXI=
  github.com/armon/go-radix v1.0.0/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8=
 +github.com/aws/aws-sdk-go v1.31.9/go.mod h1:5zCpMtNQVjRREroY7sYe8lOMRSxkhG6MZveU8YkpAk0=
- github.com/aws/aws-sdk-go v1.45.6 h1:Y2isQQBZsnO15dzUQo9YQRThtHgrV200XCH05BRHVJI=
- github.com/aws/aws-sdk-go v1.45.6/go.mod h1:aVsgQcEevwlmQ7qHE9I3h+dtQgpqhFB+i8Phjh7fkwI=
- github.com/aws/aws-sdk-go-v2 v1.20.1/go.mod h1:NU06lETsFm8fUC6ZjhgDpVBcGZTFQ6XM+LZWZxMI4ac=
-@@ -219,6 +220,7 @@ github.com/frankban/quicktest v1.14.6/go.mod h1:4ptaffx2x8+WTWXmUCuVU6aPUX1/Mz7z
+ github.com/aws/aws-sdk-go v1.45.14 h1:/IPMEh9oelbK7506fdMHkbV9mq4a6f5aeiy9OT0PRKw=
+ github.com/aws/aws-sdk-go v1.45.14/go.mod h1:aVsgQcEevwlmQ7qHE9I3h+dtQgpqhFB+i8Phjh7fkwI=
+ github.com/aws/aws-sdk-go-v2 v1.21.0 h1:gMT0IW+03wtYJhRqTVYn0wLzwdnK9sRMcxmtfGzRdJc=
+@@ -214,6 +215,7 @@ github.com/frankban/quicktest v1.14.6/go.mod h1:4ptaffx2x8+WTWXmUCuVU6aPUX1/Mz7z
  github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 h1:+zs/tPmkDkHx3U66DAb0lQFJrpS6731Oaa12ikc+DiI=
  github.com/go-git/go-billy/v5 v5.4.1 h1:Uwp5tDRkPr+l/TnbHOQzp+tmJfLceOlbVucgpTz8ix4=
  github.com/go-git/go-git/v5 v5.8.1 h1:Zo79E4p7TRk0xoRgMq0RShiTHGKcKI4+DI6BfJc/Q+A=
 +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=
-@@ -238,6 +240,8 @@ github.com/google/uuid v1.3.1 h1:KjJaJ9iWZ3jOFZIf1Lqf4laDRCasjl0BCmnEGxkdLb4=
+@@ -233,6 +235,8 @@ github.com/google/uuid v1.3.1 h1:KjJaJ9iWZ3jOFZIf1Lqf4laDRCasjl0BCmnEGxkdLb4=
  github.com/google/uuid v1.3.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
  github.com/hashicorp/aws-cloudformation-resource-schema-sdk-go v0.21.0 h1:IUypt/TbXiJBkBbE3926CgnjD8IltAitdn7Yive61DY=
  github.com/hashicorp/aws-cloudformation-resource-schema-sdk-go v0.21.0/go.mod h1:cdTE6F2pCKQobug+RqRaQp7Kz9hIEqiSvpPmb6E5G1w=
@@ -81,15 +81,15 @@ index 23d2539af1..c2bfa77af8 100644
  github.com/hashicorp/aws-sdk-go-base/v2 v2.0.0-beta.35 h1:07rX0OEHNSmD4TXQzHcVnaZJGYXaSaJR4ZhN8/bBRY4=
  github.com/hashicorp/aws-sdk-go-base/v2 v2.0.0-beta.35/go.mod h1:cR5oVK+h10mSG4T9eHaBAYfacxUlYI5vNfJuIRMGfMA=
  github.com/hashicorp/aws-sdk-go-base/v2/awsv1shim/v2 v2.0.0-beta.36 h1:xfEmtc8kXanlT5O9m1xqYXJRgsz5m1uBzeAFcq5wBh4=
-@@ -309,6 +313,7 @@ github.com/imdario/mergo v0.3.15/go.mod h1:WBLT9ZmE3lPoWsEzCh9LPo3TiwVN+ZKEjmz+h
+@@ -304,6 +308,7 @@ github.com/imdario/mergo v0.3.15/go.mod h1:WBLT9ZmE3lPoWsEzCh9LPo3TiwVN+ZKEjmz+h
  github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 h1:BQSFePA1RWJOlocH6Fxy8MmwDt+yVQYULKfN0RoTN8A=
  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/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=
-@@ -425,6 +430,7 @@ golang.org/x/mod v0.12.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
+@@ -420,6 +425,7 @@ golang.org/x/mod v0.12.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=
@@ -4318,5 +4318,5 @@ index 0000000000..529368067d
 +
 +The `policy` argument is not imported and will be deprecated in a future version of the provider. Use the `aws_s3_bucket_policy` resource to manage the S3 Bucket Policy instead.
 -- 
-2.41.0
+2.39.2 (Apple Git-143)
 

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

@@ -1,4 +1,4 @@
-From b4f94bcc5aeb1dcdbc016ad045989fe20933c650 Mon Sep 17 00:00:00 2001
+From d3075f4e1405c521e8f9217541493252244fa12a Mon Sep 17 00:00:00 2001
 From: Kyle Pitzen <[email protected]>
 Date: Thu, 9 Mar 2023 09:47:49 -0600
 Subject: [PATCH 04/29] Marks SSE Configuration as Computed for Legacy S3
@@ -26,5 +26,5 @@ index 27fe651a83..8879116578 100644
  					Schema: map[string]*schema.Schema{
  						"rule": {
 -- 
-2.41.0
+2.39.2 (Apple Git-143)
 

patches/0005-De-deprecate-bucket_object.patch

@@ -1,4 +1,4 @@
-From 3f33fb93b233555bd4c2f9265c7a8db51c924c4f Mon Sep 17 00:00:00 2001
+From d7ef4e32c60db41a27a0eb79cdbda953d6350f91 Mon Sep 17 00:00:00 2001
 From: Daniel Bradley <[email protected]>
 Date: Fri, 4 Nov 2022 17:06:11 +0000
 Subject: [PATCH 05/29] De-deprecate bucket_object
@@ -8,7 +8,7 @@ Subject: [PATCH 05/29] De-deprecate bucket_object
  1 file changed, 5 insertions(+), 3 deletions(-)
 
 diff --git a/internal/service/s3/bucket_object.go b/internal/service/s3/bucket_object.go
-index 4c5f6cc740..bb53438c3c 100644
+index bc696e299e..47bec8e864 100644
 --- a/internal/service/s3/bucket_object.go
 +++ b/internal/service/s3/bucket_object.go
 @@ -66,7 +66,7 @@ func ResourceBucketObject() *schema.Resource {
@@ -41,5 +41,5 @@ index 4c5f6cc740..bb53438c3c 100644
  }
 
 -- 
-2.41.0
+2.39.2 (Apple Git-143)
 

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

@@ -1,4 +1,4 @@
-From a95b5c1e221f5b49d223775fb7e4997390b6da36 Mon Sep 17 00:00:00 2001
+From 6701906d24a0c539f8488d5e8dc040f4ca4161b6 Mon Sep 17 00:00:00 2001
 From: Daniel Bradley <[email protected]>
 Date: Fri, 4 Nov 2022 17:08:23 +0000
 Subject: [PATCH 06/29] Remove lakeformation catalog_resource default
@@ -23,5 +23,5 @@ index 594d25ee73..258163d0a5 100644
  				Optional: true,
  				ExactlyOneOf: []string{
 -- 
-2.41.0
+2.39.2 (Apple Git-143)
 

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

@@ -1,4 +1,4 @@
-From e825fbdc22e159d1e7b03a1586f519fd4a8d4812 Mon Sep 17 00:00:00 2001
+From d601e767ca1093b18ef2320cccbdc1dbe10e3444 Mon Sep 17 00:00:00 2001
 From: Daniel Bradley <[email protected]>
 Date: Fri, 4 Nov 2022 17:24:42 +0000
 Subject: [PATCH 07/29] Workaround SSM Parameter tier bug
@@ -57,5 +57,5 @@ index 544385cfa6..6f72ffec7a 100644
  		if d.HasChange("data_type") {
  			paramInput.DataType = aws.String(d.Get("data_type").(string))
 -- 
-2.41.0
+2.39.2 (Apple Git-143)
 

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

@@ -1,4 +1,4 @@
-From 9391e7105b1ab1341984d84001efb51901b67ec7 Mon Sep 17 00:00:00 2001
+From 5e8bdb6ebdfb810be4d229b93c92a6779c5e666d Mon Sep 17 00:00:00 2001
 From: Daniel Bradley <[email protected]>
 Date: Fri, 4 Nov 2022 17:31:27 +0000
 Subject: [PATCH 08/29] Add EKS cluster default_addons_to_remove
@@ -268,5 +268,5 @@ index 57a94e414f..6568e06549 100644
  )
 
 -- 
-2.41.0
+2.39.2 (Apple Git-143)
 

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

@@ -1,4 +1,4 @@
-From e0d020562712caddbbaecdc27a0e44392d8d01d3 Mon Sep 17 00:00:00 2001
+From 8f94a529126b5b4ea622c7fba07badf8d15ec17e Mon Sep 17 00:00:00 2001
 From: Daniel Bradley <[email protected]>
 Date: Fri, 4 Nov 2022 17:32:49 +0000
 Subject: [PATCH 09/29] Add EKS cluster certificate_authorities (plural)
@@ -51,5 +51,5 @@ index d8544be700..01c6b3caa0 100644
  		return diag.Errorf("setting certificate_authority: %s", err)
  	}
 -- 
-2.41.0
+2.39.2 (Apple Git-143)
 

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

@@ -1,4 +1,4 @@
-From ae8fb058d67d2fe7e4395c6215e7bac444b504b9 Mon Sep 17 00:00:00 2001
+From cc8d6e10e258e0bacc1c197026cf09a5ba9a5eda Mon Sep 17 00:00:00 2001
 From: Daniel Bradley <[email protected]>
 Date: Fri, 4 Nov 2022 17:34:56 +0000
 Subject: [PATCH 10/29] Workaround Autoscaling launch_configuration
@@ -52,5 +52,5 @@ index 0cd504e232..74d309153f 100644
  	if v, ok := d.GetOk("iam_instance_profile"); ok {
  		input.IamInstanceProfile = aws.String(v.(string))
 -- 
-2.41.0
+2.39.2 (Apple Git-143)
 

patches/0011-Add-ECR-credentials_data_source.patch

@@ -1,4 +1,4 @@
-From 41848d982e294734cb9b95afd1577d021e5ec382 Mon Sep 17 00:00:00 2001
+From ea9f5823aa9e8c71237b47c2f52c6c472ec42224 Mon Sep 17 00:00:00 2001
 From: Daniel Bradley <[email protected]>
 Date: Fri, 4 Nov 2022 17:36:34 +0000
 Subject: [PATCH 11/29] Add ECR credentials_data_source
@@ -155,5 +155,5 @@ index 0000000000..28bc53646f
 +}
 +`, acctest.RandInt())
 -- 
-2.41.0
+2.39.2 (Apple Git-143)
 

patches/0012-Add-custom-appautoscaling-examples.patch

@@ -1,4 +1,4 @@
-From ae098c239c749e3ca17b700349c0cf667cdff0cf Mon Sep 17 00:00:00 2001
+From 17904c3ce60193b15f5687fd3e2f0c390bb1a481 Mon Sep 17 00:00:00 2001
 From: Daniel Bradley <[email protected]>
 Date: Wed, 9 Nov 2022 17:37:35 +0000
 Subject: [PATCH 12/29] Add custom appautoscaling examples
@@ -71,5 +71,5 @@ index c8899c14fe..eec6f7ca46 100644
 
  This resource supports the following arguments:
 -- 
-2.41.0
+2.39.2 (Apple Git-143)
 

patches/0013-Add-dedicated_host-docs.patch

@@ -1,4 +1,4 @@
-From 1f0612aff21ebe547326f9a24850821ed5aa0102 Mon Sep 17 00:00:00 2001
+From 395f6c144fc389e6531b76f42ee2b2a16f0c4f4e Mon Sep 17 00:00:00 2001
 From: Daniel Bradley <[email protected]>
 Date: Tue, 15 Nov 2022 10:08:05 +0000
 Subject: [PATCH 13/29] Add dedicated_host docs
@@ -169,5 +169,5 @@ index 0000000000..01845aa221
 +$ terraform import aws_dedicated_host.host_id h-0385a99d0e4b20cbb
 +```
 -- 
-2.41.0
+2.39.2 (Apple Git-143)
 

patches/0014-Revert-WAF-schema-changes.patch

@@ -1,4 +1,4 @@
-From 681657ef2f93fc068def4717fed9b4c7cb42aa66 Mon Sep 17 00:00:00 2001
+From 461bae8e19283f649c6fb4340c90c2772ea7ac36 Mon Sep 17 00:00:00 2001
 From: Daniel Bradley <[email protected]>
 Date: Tue, 15 Nov 2022 13:59:57 +0000
 Subject: [PATCH 14/29] Revert WAF schema changes
@@ -32,5 +32,5 @@ index fdb18d188d..876317b038 100644
  				"regex_pattern_set_reference_statement": regexPatternSetReferenceStatementSchema(),
  				"size_constraint_statement":             sizeConstraintSchema(),
 -- 
-2.41.0
+2.39.2 (Apple Git-143)
 

patches/0015-Catch-cty-panic-in-new-resourceTopicSubscriptionCust.patch

@@ -1,4 +1,4 @@
-From d14cdbeda2c6ac4263881bbf01a38bf37cd7530e Mon Sep 17 00:00:00 2001
+From 0e95fc1c234a54882bea03da462da5fd1cfed105 Mon Sep 17 00:00:00 2001
 From: Thomas Kappler <[email protected]>
 Date: Thu, 1 Dec 2022 10:56:32 -0800
 Subject: [PATCH 15/29] Catch cty panic in new
@@ -27,5 +27,5 @@ index 97e1d8a056..bb3caf2e1d 100644
  		if !hadScope {
  			// When the filter_policy_scope hasn't been read back from the API,
 -- 
-2.41.0
+2.39.2 (Apple Git-143)
 

patches/0016-add-matchmaking-configuration-72.patch

@@ -1,4 +1,4 @@
-From f2261e530eb117052b5a6b3fd9b68bb7009fea52 Mon Sep 17 00:00:00 2001
+From ec46528cdf336b287f2d999bbe86a000116536d6 Mon Sep 17 00:00:00 2001
 From: Lee Briggs <[email protected]>
 Date: Wed, 21 Dec 2022 12:23:59 -0800
 Subject: [PATCH 16/29] add matchmaking configuration (#72)
@@ -1195,5 +1195,5 @@ index 0000000000..28013532bf
 +$ terraform import aws_gamelift_matchmaking_rule_set.example <ruleset-id>
 +```
 -- 
-2.41.0
+2.39.2 (Apple Git-143)
 

patches/0017-fix-Adding-back-in-removeAddons.patch

@@ -1,4 +1,4 @@
-From 45060c82b6e595170b2eed51f7363b665273dca3 Mon Sep 17 00:00:00 2001
+From de4e155a7b4b53e35bcfd775ec306a5c3decfd41 Mon Sep 17 00:00:00 2001
 From: Richard Shade <[email protected]>
 Date: Fri, 6 Jan 2023 15:31:22 -0600
 Subject: [PATCH 17/29] fix: Adding back in removeAddons
@@ -23,5 +23,5 @@ index 01c6b3caa0..4d7e5760fd 100644
  }
 
 -- 
-2.41.0
+2.39.2 (Apple Git-143)
 

patches/0018-Reverts-patches-to-S3BucketLegacy-and-GameLift.patch

@@ -1,4 +1,4 @@
-From 5e083ac1ed52f0ea3b09d4fa634b246b4736c5df Mon Sep 17 00:00:00 2001
+From 8edb743f2c94cbcdd580e0721ece07a7659e164e Mon Sep 17 00:00:00 2001
 From: Kyle Pitzen <[email protected]>
 Date: Fri, 27 Jan 2023 09:37:43 -0600
 Subject: [PATCH 18/29] Reverts patches to S3BucketLegacy and GameLift
@@ -914,5 +914,5 @@ index 7a548d8d6d..9031539c19 100644
 +	return tfresource.RetryWhenAWSErrCodeEquals(ctx, propagationTimeout, f, s3.ErrCodeNoSuchBucket)
  }
 -- 
-2.41.0
+2.39.2 (Apple Git-143)
 

patches/0019-Revert-Update-endpointHashIPAddress.patch

@@ -1,4 +1,4 @@
-From db0939239f9c49bf23aeda38d41369f41866b27a Mon Sep 17 00:00:00 2001
+From bed5dea13f90b72a23f45563b6b9e7841242998c Mon Sep 17 00:00:00 2001
 From: Thomas Kappler <[email protected]>
 Date: Fri, 3 Feb 2023 17:31:18 -0800
 Subject: [PATCH 19/29] Revert "Update endpointHashIPAddress"
@@ -25,5 +25,5 @@ index fdaba25fa4..0bb4e22ee2 100644
  }
 
 -- 
-2.41.0
+2.39.2 (Apple Git-143)
 

patches/0020-Fixup-eks-formatting.patch

@@ -1,4 +1,4 @@
-From 17cd5924b42c5c9214783e8a3c5379284864700a Mon Sep 17 00:00:00 2001
+From cd825c40a435e48dc89154edac5ae7d27a8203dd Mon Sep 17 00:00:00 2001
 From: Daniel Bradley <[email protected]>
 Date: Thu, 9 Mar 2023 14:50:36 +0000
 Subject: [PATCH 20/29] Fixup eks formatting
@@ -25,5 +25,5 @@ index 6568e06549..fb1ec98588 100644
  )
 
 -- 
-2.41.0
+2.39.2 (Apple Git-143)
 

patches/0021-Fixup-gamelift-context.patch

@@ -1,4 +1,4 @@
-From 881724c9398877e2ce6165f5edeaaca632c92902 Mon Sep 17 00:00:00 2001
+From f96ae401f04687975defdaa16889e3e850c66236 Mon Sep 17 00:00:00 2001
 From: Daniel Bradley <[email protected]>
 Date: Thu, 9 Mar 2023 14:50:51 +0000
 Subject: [PATCH 21/29] Fixup gamelift context
@@ -35,5 +35,5 @@ index 8c1189199f..254c96efc6 100644
  	input := gamelift.CreateMatchmakingRuleSetInput{
  		Name:        aws.String(d.Get("name").(string)),
 -- 
-2.41.0
+2.39.2 (Apple Git-143)
 

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

@@ -1,4 +1,4 @@
-From 1ba77f5923b9129c46a884d02e3582e75cfffc1e Mon Sep 17 00:00:00 2001
+From ecce92e35973eba12d1a596dedfe955b1427d117 Mon Sep 17 00:00:00 2001
 From: Daniel Bradley <[email protected]>
 Date: Tue, 28 Feb 2023 15:19:24 +0000
 Subject: [PATCH 22/29] Change default descriptions to "Managed by Pulumi"
@@ -1128,5 +1128,5 @@ index e17fa7c445..fb9e5b7304 100644
 
  	_, err = conn.DisassociateVPCFromHostedZoneWithContext(ctx, input)
 -- 
-2.41.0
+2.39.2 (Apple Git-143)
 

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

@@ -1,4 +1,4 @@
-From 3aff8210fdea56d24cd79d6e9029e364b4cd47f4 Mon Sep 17 00:00:00 2001
+From c3ae5941e19641066419184a5dab1e16f5f11201 Mon Sep 17 00:00:00 2001
 From: Daniel Bradley <[email protected]>
 Date: Tue, 28 Mar 2023 19:54:00 +0100
 Subject: [PATCH 23/29] remove required elements from schema and fix tests
@@ -286,5 +286,5 @@ index 8788ef5b45..0d6b961c5b 100644
  		name := rs.Primary.Attributes["name"]
  		out, err := conn.DescribeMatchmakingRuleSets(&gamelift.DescribeMatchmakingRuleSetsInput{
 -- 
-2.41.0
+2.39.2 (Apple Git-143)
 

patches/0024-Temp-remove-cognito_identity_pool_roles_attachment-e.patch

@@ -1,4 +1,4 @@
-From 8f4b6df84b15b3f3ac16404c02ff4fc80609ab54 Mon Sep 17 00:00:00 2001
+From 0bb3993650348a51218e36107e2f9da97303e5f5 Mon Sep 17 00:00:00 2001
 From: Anton Tayanovskyy <[email protected]>
 Date: Mon, 24 Apr 2023 10:36:36 -0400
 Subject: [PATCH 24/29] Temp remove cognito_identity_pool_roles_attachment
@@ -101,5 +101,5 @@ index 23c0000bb6..d56a26e5f0 100644
  ## Argument Reference
 
 -- 
-2.41.0
+2.39.2 (Apple Git-143)
 

patches/0025-Fix-elbv2-target-group-read.patch

@@ -1,4 +1,4 @@
-From c5953644ab40f2adf547c6c48fa02521994f8551 Mon Sep 17 00:00:00 2001
+From e18317d305024181cf84c159f9458a7863995781 Mon Sep 17 00:00:00 2001
 From: Daniel Bradley <[email protected]>
 Date: Fri, 12 May 2023 10:55:42 +0100
 Subject: [PATCH 25/29] Fix elbv2 target group read
@@ -27,5 +27,5 @@ index 68f04ccc02..8854953fc5 100644
  }
 
 -- 
-2.41.0
+2.39.2 (Apple Git-143)