Upgrade terraform-provider-aws to v5.90.1 (#5289)

Upgrades upstream to
[v5.90.1](https://github.com/hashicorp/terraform-provider-aws/releases/tag/v5.90.1)

## Patches

- [0085-Remove-ephemeral-resources.patch]: Fixes an issue where code was
accidentally removed that sets the `master_password` (re #5288) (affects
both `docdb.Cluster` & `redshiftserverless.Namespace`)
- [0089-disable-plan-modifications-for-tags-in-PF-resources.patch]:
Upstream code was refactored to to run the `setTagsAll` func through a
new `mondifyPlanFuncs`
- [0090-restore-conns-to-awsclient.patch]: Upstream removed this code
because the aws-sdk-go-v1 code has been removed, but we still need it


## Upstream Tests

I've updated the upstream tests workflow to run tests for `docdb` and
`redshiftserverless` based on the patch fixes. I've also enhanced it to
allow for specifying specific test filters.


fixes #5285, fixes #5276, fixes #5288

Author: corymhall

.github/workflows/aws-upstream-tests.yml

@@ -45,6 +45,15 @@ jobs:
       matrix:
         service:
           - sqs
+          - docdb
+          - redshiftserverless
+        include:
+          - service: sqs
+            tests: TestAccSQSQueue
+          - service: docdb
+            tests: TestAccDocDBCluster_basic
+          - service: redshiftserverless
+            tests: TestAccRedshiftServerlessNamespace_basic
     steps:
       - name: Checkout Repo
         uses: actions/checkout@v4
@@ -68,7 +77,8 @@ jobs:
           role-duration-seconds: 7200
           role-session-name: aws@githubActions
           role-to-assume: ${{ secrets.AWS_CI_ROLE_ARN }}
-      - name: Test ${{ matrix.service }}
+      - if: ${{ matrix.tests }}
+        name: Test ${{ matrix.service }}
         run: |
           cd upstream
-          TF_ACC=1 make testacc GO_VER=go PKG=${{ matrix.service }} ACCTEST_PARALLELISM=6 TESTARGS="-skip 'tags|.*/.*/Tags'"
+          TF_ACC=1 make testacc GO_VER=go PKG=${{ matrix.service }} ACCTEST_PARALLELISM=6 TESTS="${{ matrix.tests }}" TESTARGS="-skip 'tags|.*/.*/Tags'"

examples/go.mod

@@ -14,7 +14,7 @@ scheme for registration: see
 https://github.com/hashicorp/terraform-provider-aws/pull/29717.
 
 diff --git a/internal/provider/provider.go b/internal/provider/provider.go
-index 19c9cd7190..3ad50b93e8 100644
+index 061b275d56..a4e6635364 100644
 --- a/internal/provider/provider.go
 +++ b/internal/provider/provider.go
 @@ -14,6 +14,8 @@ import (

examples/go.sum

@@ -5,14 +5,14 @@ Subject: [PATCH] De-deprecate bucket_object
 
 
 diff --git a/internal/service/s3/bucket_object.go b/internal/service/s3/bucket_object.go
-index 6ebd16412c..53794a2d43 100644
+index 85729aea89..53794a2d43 100644
 --- a/internal/service/s3/bucket_object.go
 +++ b/internal/service/s3/bucket_object.go
 @@ -66,7 +66,7 @@ func resourceBucketObject() *schema.Resource {
  				Computed: true,
  			},
  			names.AttrBucket: {
--				Deprecated:   "Use the aws_s3_object resource instead",
+-				Deprecated:   "bucket is deprecated. Use the aws_s3_object resource instead.",
 +				// FORK: Stack72 removed the deprecation warning as it was misleading for Pulumi users
  				Type:         schema.TypeString,
  				Required:     true,
@@ -21,7 +21,7 @@ index 6ebd16412c..53794a2d43 100644
  				Default:  false,
  			},
  			names.AttrKey: {
--				Deprecated:   "Use the aws_s3_object resource instead",
+-				Deprecated:   "key is deprecated. Use the aws_s3_object resource instead.",
 +				// FORK: Stack72 removed the deprecation warning as it was misleading for Pulumi users
  				Type:         schema.TypeString,
  				Required:     true,

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

@@ -7,7 +7,7 @@ Subject: [PATCH] Workaround SSM Parameter tier bug
 - Disable diff suppression & counteractions
 
 diff --git a/internal/service/ssm/parameter.go b/internal/service/ssm/parameter.go
-index e605c7ea1e..b5fccc0112 100644
+index 17253be86c..9c4666ea58 100644
 --- a/internal/service/ssm/parameter.go
 +++ b/internal/service/ssm/parameter.go
 @@ -102,15 +102,17 @@ func resourceParameter() *schema.Resource {

patches/0004-De-deprecate-bucket_object.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Add ECR credentials_data_source
 
 
 diff --git a/internal/provider/provider.go b/internal/provider/provider.go
-index 3ad50b93e8..af639c4dbf 100644
+index a4e6635364..8d1281bbbc 100644
 --- a/internal/provider/provider.go
 +++ b/internal/provider/provider.go
 @@ -14,6 +14,8 @@ import (

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

@@ -6,7 +6,7 @@ Subject: [PATCH] Revert WAF schema changes
 - This causes far too many types to be generated downstream.
 
 diff --git a/internal/service/wafv2/schemas.go b/internal/service/wafv2/schemas.go
-index 8ac8b8d534..65f810be49 100644
+index 01769b9a1f..6f18fdc297 100644
 --- a/internal/service/wafv2/schemas.go
 +++ b/internal/service/wafv2/schemas.go
 @@ -56,14 +56,14 @@ func ruleGroupRootStatementSchema(level int) *schema.Schema {

patches/0009-Add-ECR-credentials_data_source.patch

@@ -10,7 +10,7 @@ Subject: [PATCH] add matchmaking configuration (#72)
 * add resource docs
 
 diff --git a/internal/provider/provider.go b/internal/provider/provider.go
-index af639c4dbf..8629a299bb 100644
+index 8d1281bbbc..d3bcfba57c 100644
 --- a/internal/provider/provider.go
 +++ b/internal/provider/provider.go
 @@ -16,6 +16,7 @@ import (

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

@@ -31,10 +31,10 @@ index f3e5480366..f348cb1e8e 100644
  			"expires": {
  				Type:     schema.TypeString,
 diff --git a/internal/service/cloudfront/origin_access_control.go b/internal/service/cloudfront/origin_access_control.go
-index 3be91ca669..c406d9a83f 100644
+index d09fe1f1bb..49cbcf8377 100644
 --- a/internal/service/cloudfront/origin_access_control.go
 +++ b/internal/service/cloudfront/origin_access_control.go
-@@ -38,7 +38,7 @@ func resourceOriginAccessControl() *schema.Resource {
+@@ -42,7 +42,7 @@ func resourceOriginAccessControl() *schema.Resource {
  			names.AttrDescription: {
  				Type:         schema.TypeString,
  				Optional:     true,
@@ -309,10 +309,10 @@ index c3170d4965..f13dada174 100644
  		HostedZoneId: aws.String(zoneID),
  	}
 diff --git a/internal/service/route53/zone.go b/internal/service/route53/zone.go
-index f44f0b5190..6a5a76267a 100644
+index b9b6d12eb5..298937cd14 100644
 --- a/internal/service/route53/zone.go
 +++ b/internal/service/route53/zone.go
-@@ -51,7 +51,7 @@ func resourceZone() *schema.Resource {
+@@ -50,7 +50,7 @@ func resourceZone() *schema.Resource {
  			names.AttrComment: {
  				Type:         schema.TypeString,
  				Optional:     true,