Merge branch 'main' into f-resource-explorer-index

.changelog/27670.txt

@@ -0,0 +1,15 @@
+```release-note:enhancement
+resource/aws_db_instance: Add support for `gp3` `storage_type` value
+```
+
+```release-note:enhancement
+resource/aws_db_instance: Add `storage_throughput` argument
+```
+
+```release-note:enhancement
+data-source/aws_db_instance: Add `storage_throughput` attribute
+```
+
+```release-note:enhancement
+resource/aws_db_instance: Change `iops` to `Computed`
+```

.changelog/28112.txt

@@ -0,0 +1,7 @@
+```release-note:enhancement
+resource/aws_eks_cluster: Add `cluster_id` attribute and `outpost_config.control_plane_placement` argument
+```
+
+```release-note:enhancement
+data-source/aws_eks_cluster: Add `cluster_id` attribute
+```

.changelog/28114.txt

@@ -0,0 +1,3 @@
+```release-note:enhancement
+resource/aws_redshiftserverless_workgroup: Wait on `MODIFYING` status on resource Delete
+```

.changelog/28125.txt

@@ -0,0 +1,3 @@
+```release-note:bug
+resource/aws_redshiftserverless_namespace: Fix updating `admin_username` and `admin_user_password`
+```

.changelog/28127.txt

@@ -0,0 +1,3 @@
+```release-note:note
+resource/aws_fsx_ontap_storage_virtual_machine: The `subtype` attribute has been deprecated and will be removed in a future version
+```

.changelog/28130.txt

@@ -0,0 +1,3 @@
+```release-note:new-resource
+aws_dms_s3_endpoint
+```

.changelog/28150.txt

@@ -0,0 +1,3 @@
+```release-note:new-resource
+aws_vpc_network_performance_metric_subscription
+```

.ci/providerlint/go.mod

@@ -3,7 +3,7 @@ module github.com/hashicorp/terraform-provider-aws/ci/providerlint
 go 1.19
 
 require (
-	github.com/aws/aws-sdk-go v1.44.150
+	github.com/aws/aws-sdk-go v1.44.151
 	github.com/bflad/tfproviderlint v0.28.1
 	github.com/hashicorp/terraform-plugin-sdk/v2 v2.24.1
 	golang.org/x/tools v0.1.12

.ci/providerlint/go.sum

@@ -63,8 +63,8 @@ github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5/go.mod h1:wHh0iHkY
 github.com/aws/aws-sdk-go v1.15.78/go.mod h1:E3/ieXAlvM0XWO57iftYVDLLvQ824smPP3ATZkfNZeM=
 github.com/aws/aws-sdk-go v1.25.3/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo=
 github.com/aws/aws-sdk-go v1.37.0/go.mod h1:hcU610XS61/+aQV88ixoOzUoG7v3b31pl2zKMmprdro=
-github.com/aws/aws-sdk-go v1.44.150 h1:X9HBhXu0ZPi+tOHUaZkjx43int7g0Ejk+IVbW25+wYg=
-github.com/aws/aws-sdk-go v1.44.150/go.mod h1:aVsgQcEevwlmQ7qHE9I3h+dtQgpqhFB+i8Phjh7fkwI=
+github.com/aws/aws-sdk-go v1.44.151 h1:2FrJZm3kTcyTtfpE7LEQT9XW+jkoi4KEvBhFWqHEZmo=
+github.com/aws/aws-sdk-go v1.44.151/go.mod h1:aVsgQcEevwlmQ7qHE9I3h+dtQgpqhFB+i8Phjh7fkwI=
 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.28.1 h1:7f54/ynV6/lK5/1EyG7tHtc4sMdjJSEFGjZNRJKwBs8=

.ci/providerlint/vendor/modules.txt

@@ -4,7 +4,7 @@ github.com/agext/levenshtein
 # github.com/apparentlymart/go-textseg/v13 v13.0.0
 ## explicit; go 1.16
 github.com/apparentlymart/go-textseg/v13/textseg
-# github.com/aws/aws-sdk-go v1.44.150
+# github.com/aws/aws-sdk-go v1.44.151
 ## explicit; go 1.11
 github.com/aws/aws-sdk-go/aws/awserr
 github.com/aws/aws-sdk-go/aws/endpoints

.github/labeler-pr-triage.yml

@@ -1038,6 +1038,7 @@ service/vpc:
   - 'website/**/vpc_dhcp_*'
   - 'website/**/vpc_endpoint*'
   - 'website/**/vpc_ipv*'
+  - 'website/**/vpc_network_performance*'
   - 'website/**/vpc_peering_*'
   - 'website/**/vpc\.*'
   - 'website/**/vpcs\.*'

.github/workflows/lock.yml

@@ -8,7 +8,7 @@ jobs:
   lock:
     runs-on: ubuntu-latest
     steps:
-      - uses: dessant/lock-threads@v3
+      - uses: dessant/lock-threads@v4
         with:
           github-token: ${{ github.token }}
           issue-comment: >

CHANGELOG.md

@@ -1,8 +1,33 @@
-## 4.45.0 (Unreleased)
+## 4.46.0 (Unreleased)
+
+FEATURES:
+
+* **New Resource:** `aws_vpc_network_performance_metric_subscription` ([#28150](https://github.com/hashicorp/terraform-provider-aws/issues/28150))
+
+## 4.45.0 (December  2, 2022)
 
 NOTES:
 
 * provider: With AWS's retirement of EC2-Classic the `skip_get_ec2_platforms` attribute has been deprecated and will be removed in a future version ([#28084](https://github.com/hashicorp/terraform-provider-aws/issues/28084))
+* resource/aws_fsx_ontap_storage_virtual_machine: The `subtype` attribute has been deprecated and will be removed in a future version ([#28127](https://github.com/hashicorp/terraform-provider-aws/issues/28127))
+
+FEATURES:
+
+* **New Resource:** `aws_dms_s3_endpoint` ([#28130](https://github.com/hashicorp/terraform-provider-aws/issues/28130))
+
+ENHANCEMENTS:
+
+* data-source/aws_db_instance: Add `storage_throughput` attribute ([#27670](https://github.com/hashicorp/terraform-provider-aws/issues/27670))
+* data-source/aws_eks_cluster: Add `cluster_id` attribute ([#28112](https://github.com/hashicorp/terraform-provider-aws/issues/28112))
+* resource/aws_db_instance: Add `storage_throughput` argument ([#27670](https://github.com/hashicorp/terraform-provider-aws/issues/27670))
+* resource/aws_db_instance: Add support for `gp3` `storage_type` value ([#27670](https://github.com/hashicorp/terraform-provider-aws/issues/27670))
+* resource/aws_db_instance: Change `iops` to `Computed` ([#27670](https://github.com/hashicorp/terraform-provider-aws/issues/27670))
+* resource/aws_eks_cluster: Add `cluster_id` attribute and `outpost_config.control_plane_placement` argument ([#28112](https://github.com/hashicorp/terraform-provider-aws/issues/28112))
+* resource/aws_redshiftserverless_workgroup: Wait on `MODIFYING` status on resource Delete ([#28114](https://github.com/hashicorp/terraform-provider-aws/issues/28114))
+
+BUG FIXES:
+
+* resource/aws_redshiftserverless_namespace: Fix updating `admin_username` and `admin_user_password` ([#28125](https://github.com/hashicorp/terraform-provider-aws/issues/28125))
 
 ## 4.44.0 (November 30, 2022)
 
@@ -3064,7 +3089,7 @@ BUG FIXES:
 
 * aws/resource_aws_amplify_branch: Correctly handle branch names that contain '/' ([#20426](https://github.com/hashicorp/terraform-provider-aws/issues/20426))
 * aws/resource_aws_apigateway_vpc_link: Ensure deletion does not return an error when resource is not found ([#20441](https://github.com/hashicorp/terraform-provider-aws/issues/20441))
-* aws/resource_aws_instance: Fix running `terraform plan` with with `skip_credentials_validation=true` ([#20357](https://github.com/hashicorp/terraform-provider-aws/issues/20357))
+* aws/resource_aws_instance: Fix running `terraform plan` with `skip_credentials_validation=true` ([#20357](https://github.com/hashicorp/terraform-provider-aws/issues/20357))
 * aws/resource_aws_instance: Fix state refresh when launch template was deleted ([#20357](https://github.com/hashicorp/terraform-provider-aws/issues/20357))
 
 ## 3.52.0 (July 29, 2021)

ROADMAP.md

@@ -84,7 +84,7 @@ Research topics include features, architectural changes, and ideas that we are p
 
 ### Expanding Framework based Resources
 
-[#25606](https://github.com/hashicorp/terraform-provider-aws/pull/25606) and [#25715](https://github.com/hashicorp/terraform-provider-aws/pull/25715) added the ability for provider contributors/maintainers to implement resources and data sources based on the next generation of the provider SDK, the [terraform-plugin-framework](https://github.com/hashicorp/terraform-plugin-framework). Over the next quarter we will increase our footprint of resources based on the framework, either by adding them as new resources or migrating existing ones. We will also ensure that resources based on the framework have parity with with provider level features, such as default tags. Beginning this migration will give us access to new features and functionality in the framework, enabling an improved experience in the framework based resources.
+[#25606](https://github.com/hashicorp/terraform-provider-aws/pull/25606) and [#25715](https://github.com/hashicorp/terraform-provider-aws/pull/25715) added the ability for provider contributors/maintainers to implement resources and data sources based on the next generation of the provider SDK, the [terraform-plugin-framework](https://github.com/hashicorp/terraform-plugin-framework). Over the next quarter we will increase our footprint of resources based on the framework, either by adding them as new resources or migrating existing ones. We will also ensure that resources based on the framework have parity with provider level features, such as default tags. Beginning this migration will give us access to new features and functionality in the framework, enabling an improved experience in the framework based resources.
 
 ## Disclosures
 

docs/add-a-new-service.md

@@ -4,7 +4,7 @@ AWS frequently launches new services, and Terraform support is frequently desire
 
 ## Perform Service Design
 
-Before adding a new service to the provider its a good idea to familiarize yourself with the primary workflows practitioners are likely to want to accomplish with the provider to ensure the provider design can solve for for this. Its not always necessary to cover 100% of the AWS service offering to unblock most workflows.
+Before adding a new service to the provider its a good idea to familiarize yourself with the primary workflows practitioners are likely to want to accomplish with the provider to ensure the provider design can solve for this. Its not always necessary to cover 100% of the AWS service offering to unblock most workflows.
 
 You should have an idea of what resources and data sources should be added, their dependencies and relative importance in relation to the workflow. This should give you an idea of the order in which resources to be added. It's important to note that generally, we like to review and merge resources in isolation, and avoid combining multiple new resources in one Pull Request.
 

go.mod

@@ -4,13 +4,15 @@ go 1.19
 
 require (
 	github.com/ProtonMail/go-crypto v0.0.0-20210428141323-04723f9f07d7
-	github.com/aws/aws-sdk-go v1.44.150
+	github.com/aws/aws-sdk-go v1.44.151
 	github.com/aws/aws-sdk-go-v2 v1.17.1
 	github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.12.19
 	github.com/aws/aws-sdk-go-v2/service/auditmanager v1.21.0
+	github.com/aws/aws-sdk-go-v2/service/cloudcontrol v1.10.19
 	github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.17.0
-	github.com/aws/aws-sdk-go-v2/service/comprehend v1.19.2
+	github.com/aws/aws-sdk-go-v2/service/comprehend v1.20.0
 	github.com/aws/aws-sdk-go-v2/service/computeoptimizer v1.18.0
+	github.com/aws/aws-sdk-go-v2/service/ec2 v1.74.0
 	github.com/aws/aws-sdk-go-v2/service/fis v1.13.3
 	github.com/aws/aws-sdk-go-v2/service/identitystore v1.15.7
 	github.com/aws/aws-sdk-go-v2/service/inspector2 v1.9.0
@@ -39,10 +41,10 @@ require (
 	github.com/hashicorp/go-uuid v1.0.3
 	github.com/hashicorp/go-version v1.6.0
 	github.com/hashicorp/hcl/v2 v2.15.0
-	github.com/hashicorp/terraform-plugin-framework v0.16.0
+	github.com/hashicorp/terraform-plugin-framework v0.17.0
 	github.com/hashicorp/terraform-plugin-framework-timeouts v0.2.0
-	github.com/hashicorp/terraform-plugin-framework-validators v0.6.0
-	github.com/hashicorp/terraform-plugin-go v0.14.1
+	github.com/hashicorp/terraform-plugin-framework-validators v0.7.0
+	github.com/hashicorp/terraform-plugin-go v0.14.2
 	github.com/hashicorp/terraform-plugin-log v0.7.0
 	github.com/hashicorp/terraform-plugin-mux v0.7.0
 	github.com/hashicorp/terraform-plugin-sdk/v2 v2.24.1
@@ -93,7 +95,7 @@ require (
 	github.com/hashicorp/logutils v1.0.0 // indirect
 	github.com/hashicorp/terraform-exec v0.17.3 // indirect
 	github.com/hashicorp/terraform-json v0.14.0 // indirect
-	github.com/hashicorp/terraform-registry-address v0.0.0-20220623143253-7d51757b572c // indirect
+	github.com/hashicorp/terraform-registry-address v0.1.0 // indirect
 	github.com/hashicorp/terraform-svchost v0.0.0-20200729002733-f050f53b9734 // indirect
 	github.com/hashicorp/yamux v0.0.0-20181012175058-2f1d1f20f75d // indirect
 	github.com/huandu/xstrings v1.3.2 // indirect
@@ -120,6 +122,6 @@ require (
 	golang.org/x/text v0.4.0 // indirect
 	google.golang.org/appengine v1.6.7 // indirect
 	google.golang.org/genproto v0.0.0-20200711021454-869866162049 // indirect
-	google.golang.org/grpc v1.50.1 // indirect
+	google.golang.org/grpc v1.51.0 // indirect
 	google.golang.org/protobuf v1.28.1 // indirect
 )