Merge branch 'main' into f-s3-express-tidyup

# Conflicts: # go.mod
hashicorp · Nov 30, 2023 · 6c9e986 · 6c9e986
2 parents a959482 + c809ba8
commit 6c9e986
Show file tree

Hide file tree

Showing 212 changed files with 6,606 additions and 3,613 deletions.
diff --git a/.changelog/34500.txt b/.changelog/34500.txt
@@ -0,0 +1,3 @@
+```release-note:enhancement
+resource/aws_neptune_parameter_group: Add `name_prefix` argument
+```
diff --git a/.changelog/34547.txt b/.changelog/34547.txt
@@ -0,0 +1,11 @@
+```release-note:bug
+resource/aws_networkmanager_vpc_attachment: Fixes error where VPC Attachments waiting for acceptance could not be deleted
+```
+
+```release-note:bug
+resource/aws_networkmanager_vpc_attachment: Fixes error when modifying `options` fields while waiting for acceptance
+```
+
+```release-note:bug
+resource/aws_networkmanager_attachment_accepter: Now revokes attachment on deletion for VPC Attachments
+```
diff --git a/.changelog/34566.txt b/.changelog/34566.txt
@@ -0,0 +1,3 @@
+```release-note:new-resource
+aws_eks_pod_identity_association
+```
diff --git a/.changelog/34637.txt b/.changelog/34637.txt
@@ -0,0 +1,3 @@
+```release-note:enhancement
+resource/aws_docdb_cluster: Add `storage_type` argument
+```
diff --git a/.ci/providerlint/go.mod b/.ci/providerlint/go.mod
@@ -3,7 +3,7 @@ module github.com/hashicorp/terraform-provider-aws/ci/providerlint
 go 1.20
 
 require (
-	github.com/aws/aws-sdk-go v1.48.7
+	github.com/aws/aws-sdk-go v1.48.9
 	github.com/bflad/tfproviderlint v0.29.0
 	github.com/hashicorp/terraform-plugin-sdk/v2 v2.30.0
 	golang.org/x/tools v0.13.0

diff --git a/.ci/providerlint/go.sum b/.ci/providerlint/go.sum
@@ -8,8 +8,8 @@ github.com/agext/levenshtein v1.2.2/go.mod h1:JEDfjyjHDjOF/1e4FlBE/PkbqA9OfWu2ki
 github.com/apparentlymart/go-textseg/v12 v12.0.0/go.mod h1:S/4uRK2UtaQttw1GenVJEynmyUenKwP++x/+DdGV/Ec=
 github.com/apparentlymart/go-textseg/v15 v15.0.0 h1:uYvfpb3DyLSCGWnctWKGj857c6ew1u1fNQOlOtuGxQY=
 github.com/apparentlymart/go-textseg/v15 v15.0.0/go.mod h1:K8XmNZdhEBkdlyDdvbmmsvpAG721bKi0joRfFdHIWJ4=
-github.com/aws/aws-sdk-go v1.48.7 h1:gDcOhmkohlNk20j0uWpko5cLBbwSkB+xpkshQO45F7Y=
-github.com/aws/aws-sdk-go v1.48.7/go.mod h1:LF8svs817+Nz+DmiMQKTO3ubZ/6IaTpq3TjupRn3Eqk=
+github.com/aws/aws-sdk-go v1.48.9 h1:vqzjg5FCi/QDWTEenBs65gu57GJdvkqZ0+5steFb44g=
+github.com/aws/aws-sdk-go v1.48.9/go.mod h1:LF8svs817+Nz+DmiMQKTO3ubZ/6IaTpq3TjupRn3Eqk=
 github.com/bflad/gopaniccheck v0.1.0 h1:tJftp+bv42ouERmUMWLoUn/5bi/iQZjHPznM00cP/bU=
 github.com/bflad/gopaniccheck v0.1.0/go.mod h1:ZCj2vSr7EqVeDaqVsWN4n2MwdROx1YL+LFo47TSWtsA=
 github.com/bflad/tfproviderlint v0.29.0 h1:zxKYAAM6IZ4ace1a3LX+uzMRIMP8L+iOtEc+FP2Yoow=

diff --git a/.ci/providerlint/vendor/github.com/aws/aws-sdk-go/aws/endpoints/defaults.go b/.ci/providerlint/vendor/github.com/aws/aws-sdk-go/aws/endpoints/defaults.go
diff --git a/.ci/providerlint/vendor/modules.txt b/.ci/providerlint/vendor/modules.txt
@@ -24,7 +24,7 @@ github.com/agext/levenshtein
 # github.com/apparentlymart/go-textseg/v15 v15.0.0
 ## explicit; go 1.16
 github.com/apparentlymart/go-textseg/v15/textseg
-# github.com/aws/aws-sdk-go v1.48.7
+# github.com/aws/aws-sdk-go v1.48.9
 ## explicit; go 1.19
 github.com/aws/aws-sdk-go/aws/awserr
 github.com/aws/aws-sdk-go/aws/endpoints

diff --git a/.ci/semgrep/pluginsdk/diags.yml b/.ci/semgrep/pluginsdk/diags.yml
@@ -1,81 +1,84 @@
 rules:
   - id: avoid-diag_FromErr
-    fix: sdkdiag.AppendFromErr(diags, $ERR)
     languages: [go]
     message: Prefer `sdkdiag.AppendFromErr` to `diag.FromErr`
     paths:
       exclude:
-        - internal/service/[b-z]*
-    patterns:
-      - pattern: diag.FromErr($ERR)
+        - internal/service/[d-z]*
+    pattern: diag.FromErr($ERR)
+    fix: sdkdiag.AppendFromErr(diags, $ERR)
     severity: WARNING
 
   - id: avoid-diag_Errorf
-    fix-regex:
-      regex: diag\.Errorf\((.*)\)
-      replacement: sdkdiag.AppendErrorf(diags, \1)
     languages: [go]
     message: Prefer `sdkdiag.AppendErrorf` to `diag.Errorf`
     paths:
       exclude:
-        - internal/service/[b-z]*
-    patterns:
-      - pattern: diag.Errorf(...)
+        - internal/service/[d-z]*
+    pattern: diag.Errorf($...ARGS)
+    fix: sdkdiag.AppendErrorf(diags, $...ARGS)
     severity: WARNING
 
-  - id: avoid-create_DiagError
-    fix-regex:
-      regex: create\.DiagError\((.*)\)
-      replacement: create.AppendDiagError(diags, \1)
+  - id: avoid-return-create_DiagError
     languages: [go]
     message: Prefer `create.AppendDiagError` to `create.DiagError`
     paths:
       exclude:
-        - internal/service/[b-z]*
-    patterns:
-      - pattern: create.DiagError(...)
+        - internal/service/[d-z]*
+    pattern: return create.DiagError($...ARGS)
+    fix: return create.AppendDiagError(diags, $...ARGS)
+    severity: WARNING
+
+  - id: avoid-append-create_DiagError
+    languages: [go]
+    message: Prefer `create.AppendDiagError` to `create.DiagError`
+    paths:
+      exclude:
+        - internal/service/connect
+        - internal/service/connectcases
+        - internal/service/controltower
+        - internal/service/cur
+        - internal/service/[d-z]*
+    pattern: append(diags, create.DiagError($...ARGS)...)
+    fix: create.AppendDiagError(diags, $...ARGS)
     severity: WARNING
 
   - id: avoid-create_DiagSettingError
-    fix-regex:
-      regex: create\.DiagSettingError\((.*)\)
-      replacement: create.AppendDiagSettingError(diags, \1)
     languages: [go]
     message: Prefer `create.AppendDiagSettingError` to `create.DiagSettingError`
     paths:
       exclude:
-        - internal/service/[b-z]*
-    patterns:
-      - pattern: create.DiagSettingError(...)
+        - internal/service/[d-z]*
+    pattern: create.DiagSettingError($...ARGS)
+    fix: create.AppendDiagSettingError(diags, $...ARGS)
     severity: WARNING
 
   - id: append-Read-to-diags
-    fix-regex:
-      regex: return (resource\w+Read\(.*\))
-      replacement: return append(diags, \1...)
     languages: [go]
     message: Append results of $READFN to diags instead of returning directly
     paths:
       exclude:
-        - internal/service/[b-z]*
+        - internal/service/[d-z]*
     patterns:
-      - pattern: return $READFN(...)
+      - pattern: return $READFN($...ARGS)
       - metavariable-regex:
           metavariable: "$READFN"
           regex: resource\w+Read
+      - pattern-not-inside: |
+          func $UPDATEFN(...) {
+            return $READFN($...ARGS)
+          }
+    fix: return append(diags, $READFN($...ARGS)...)
     severity: WARNING
 
   - id: return-diags-not-nil
-    fix-regex:
-      regex: return nil
-      replacement: return diags
     languages: [go]
     message: Return diags instead of nil
     paths:
       include:
         - internal/service
       exclude:
-        - internal/service/[b-z]*
+        - internal/service/[d-z]*
     patterns:
       - pattern: return nil
       - pattern-not-inside: |
@@ -86,4 +89,5 @@ rules:
           func $F(...) diag.Diagnostics {
             ...
           }
+    fix: return diags
     severity: WARNING
diff --git a/.github/workflows/gen-teamcity.yml b/.github/workflows/gen-teamcity.yml
@@ -14,7 +14,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
-      - uses: actions/setup-java@0ab4596768b603586c0de567f2430c30f5b0d2b0 # v3.13.0
+      - uses: actions/setup-java@387ac29b308b003ca37ba93a6cab5eb57c8f5f93 # v4.0.0
         with:
           distribution: adopt
           java-version: 17

diff --git a/.github/workflows/pull_request_target.yml b/.github/workflows/pull_request_target.yml
@@ -231,7 +231,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: 'Add comment to add helpful context for new contributors'
-        uses: actions/first-interaction@1dbfe1ba5525b8257e1f259b09745bee346d62d8 # v1.2.0
+        uses: actions/first-interaction@34f15e814fe48ac9312ccf29db4e74fa767cbab7 # v1.3.0
         with:
           repo-token: ${{ secrets.GITHUB_TOKEN }}
           pr-message: |-

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,18 @@
 FEATURES:
 
 * **New Resource:** `aws_docdbelastic_cluster` ([#31033](https://github.com/hashicorp/terraform-provider-aws/issues/31033))
+* **New Resource:** `aws_eks_pod_identity_association` ([#34566](https://github.com/hashicorp/terraform-provider-aws/issues/34566))
+
+ENHANCEMENTS:
+
+* resource/aws_docdb_cluster: Add `storage_type` argument ([#34637](https://github.com/hashicorp/terraform-provider-aws/issues/34637))
+* resource/aws_neptune_parameter_group: Add `name_prefix` argument ([#34500](https://github.com/hashicorp/terraform-provider-aws/issues/34500))
+
+BUG FIXES:
+
+* resource/aws_networkmanager_attachment_accepter: Now revokes attachment on deletion for VPC Attachments ([#34547](https://github.com/hashicorp/terraform-provider-aws/issues/34547))
+* resource/aws_networkmanager_vpc_attachment: Fixes error when modifying `options` fields while waiting for acceptance ([#34547](https://github.com/hashicorp/terraform-provider-aws/issues/34547))
+* resource/aws_networkmanager_vpc_attachment: Fixes error where VPC Attachments waiting for acceptance could not be deleted ([#34547](https://github.com/hashicorp/terraform-provider-aws/issues/34547))
 
 ## 5.28.0 (November 29, 2023)
 

diff --git a/docs/design-decision-log.md b/docs/design-decision-log.md
@@ -5,7 +5,8 @@ what we should encourage/require as a design standard. These are not necessarily
 replaced as new decisions are made. This is an evolution of an internal process and will pivot to take place in public
 as much as possible to allow for external feedback from the community and core contributors.
 
-| Decision | Description | Issue Link |
-|----------|-------------|------------|
-| [Relationship Resource Design Standards](./design-decisions/relationship-resource-design-standards.md) | Align on design standards for relationship management resources in the Terraform AWS Provider. | [#9901](https://github.com/hashicorp/terraform-provider-aws/issues/9901) |
-| [SecretsManager Secret Target Attachment](./design-decisions/secretsmanager-secret-target-attachment.md) | Assess the feasibility of replicating the `AWS::SecretsManager::SecretTargetAttachment` CloudFormation function with Terraform. | [#9183](https://github.com/hashicorp/terraform-provider-aws/issues/9183) |
+| Decision                                                                                                 | Description                                                                                                                     | Issue Link                                                                 |
+|----------------------------------------------------------------------------------------------------------|---------------------------------------------------------------------------------------------------------------------------------|----------------------------------------------------------------------------|
+| [Relationship Resource Design Standards](./design-decisions/relationship-resource-design-standards.md)   | Align on design standards for relationship management resources in the Terraform AWS Provider.                                  | [#9901](https://github.com/hashicorp/terraform-provider-aws/issues/9901)   |
+| [SecretsManager Secret Target Attachment](./design-decisions/secretsmanager-secret-target-attachment.md) | Assess the feasibility of replicating the `AWS::SecretsManager::SecretTargetAttachment` CloudFormation function with Terraform. | [#9183](https://github.com/hashicorp/terraform-provider-aws/issues/9183)   |
+| [RDS Blue Green Deployments](./design-decisions/rds-bluegreen-deployments.md)                            | Assess the feasibility extending blue green deployment functionality found in `aws_rds_instance` to `aws_rds_cluster`.          | [#28956](https://github.com/hashicorp/terraform-provider-aws/issues/28956) |