Merge branch 'main' into HEAD

hashicorp · Dec 27, 2024 · eba80ff · eba80ff
2 parents ae3dc34 + 1f4bced
commit eba80ff
Show file tree

Hide file tree

Showing 7 changed files with 28 additions and 5 deletions.
diff --git a/.changelog/40700.txt b/.changelog/40700.txt
@@ -0,0 +1,3 @@
+```release-note:enhancement
+data-source/aws_rds_engine_version: Add `supports_certificate_rotation_without_restart`, `supports_integrations`, and `supports_local_write_forwarding` attributes
+```
diff --git a/README.md b/README.md
@@ -21,6 +21,5 @@ The [AWS Provider](https://registry.terraform.io/providers/hashicorp/aws/latest/
 - [FAQ](https://hashicorp.github.io/terraform-provider-aws/faq/)
 - [Tutorials](https://learn.hashicorp.com/collections/terraform/aws-get-started)
 - [discuss.hashicorp.com](https://discuss.hashicorp.com/c/terraform-providers/tf-aws/)
-- [Google Groups](http://groups.google.com/group/terraform-tool)
 
 _**Please note:** We take Terraform's security and our users' trust very seriously. If you believe you have found a security issue in the Terraform AWS Provider, please responsibly disclose it by contacting us at [email protected]._
diff --git a/internal/service/rds/engine_version_data_source.go b/internal/service/rds/engine_version_data_source.go
@@ -109,14 +109,26 @@ func dataSourceEngineVersion() *schema.Resource {
 				Elem:     &schema.Schema{Type: schema.TypeString},
 				Computed: true,
 			},
+			"supports_certificate_rotation_without_restart": {
+				Type:     schema.TypeBool,
+				Computed: true,
+			},
 			"supports_global_databases": {
 				Type:     schema.TypeBool,
 				Computed: true,
 			},
+			"supports_integrations": {
+				Type:     schema.TypeBool,
+				Computed: true,
+			},
 			"supports_limitless_database": {
 				Type:     schema.TypeBool,
 				Computed: true,
 			},
+			"supports_local_write_forwarding": {
+				Type:     schema.TypeBool,
+				Computed: true,
+			},
 			"supports_log_exports_to_cloudwatch": {
 				Type:     schema.TypeBool,
 				Computed: true,
@@ -392,8 +404,11 @@ func dataSourceEngineVersionRead(ctx context.Context, d *schema.ResourceData, me
 	d.Set("supported_timezones", tfslices.ApplyToAll(found.SupportedTimezones, func(v awstypes.Timezone) string {
 		return aws.ToString(v.TimezoneName)
 	}))
+	d.Set("supports_certificate_rotation_without_restart", found.SupportsCertificateRotationWithoutRestart)
 	d.Set("supports_global_databases", found.SupportsGlobalDatabases)
+	d.Set("supports_integrations", found.SupportsIntegrations)
 	d.Set("supports_limitless_database", found.SupportsLimitlessDatabase)
+	d.Set("supports_local_write_forwarding", found.SupportsLocalWriteForwarding)
 	d.Set("supports_log_exports_to_cloudwatch", found.SupportsLogExportsToCloudwatchLogs)
 	d.Set("supports_parallel_query", found.SupportsParallelQuery)
 	d.Set("supports_read_replica", found.SupportsReadReplica)

diff --git a/internal/service/rds/engine_version_data_source_test.go b/internal/service/rds/engine_version_data_source_test.go
@@ -47,8 +47,11 @@ func TestAccRDSEngineVersionDataSource_basic(t *testing.T) {
 					resource.TestMatchResourceAttr(dataSourceName, "supported_feature_names.#", regexache.MustCompile(`^[1-9][0-9]*`)),
 					resource.TestMatchResourceAttr(dataSourceName, "supported_modes.#", regexache.MustCompile(`^[0-9]*`)),
 					resource.TestMatchResourceAttr(dataSourceName, "supported_timezones.#", regexache.MustCompile(`^[0-9]*`)),
+					resource.TestCheckResourceAttrSet(dataSourceName, "supports_certificate_rotation_without_restart"),
 					resource.TestCheckResourceAttrSet(dataSourceName, "supports_global_databases"),
+					resource.TestCheckResourceAttrSet(dataSourceName, "supports_integrations"),
 					resource.TestCheckResourceAttrSet(dataSourceName, "supports_limitless_database"),
+					resource.TestCheckResourceAttrSet(dataSourceName, "supports_local_write_forwarding"),
 					resource.TestCheckResourceAttrSet(dataSourceName, "supports_log_exports_to_cloudwatch"),
 					resource.TestCheckResourceAttrSet(dataSourceName, "supports_parallel_query"),
 					resource.TestCheckResourceAttrSet(dataSourceName, "supports_read_replica"),
@@ -168,7 +171,7 @@ func TestAccRDSEngineVersionDataSource_preferredMajorTargets(t *testing.T) {
 			{
 				Config: testAccEngineVersionDataSourceConfig_preferredMajorTarget(tfrds.InstanceEngineMySQL),
 				Check: resource.ComposeTestCheckFunc(
-					resource.TestMatchResourceAttr(dataSourceName, names.AttrVersion, regexache.MustCompile(`^5\.7\.`)),
+					resource.TestMatchResourceAttr(dataSourceName, names.AttrVersion, regexache.MustCompile(`^8\.0\.`)),
 				),
 			},
 			{

diff --git a/website/docs/d/rds_engine_version.html.markdown b/website/docs/d/rds_engine_version.html.markdown
@@ -68,8 +68,11 @@ This data source exports the following attributes in addition to the arguments a
 * `supported_feature_names` - Set of features supported by the engine version.
 * `supported_modes` - Set of supported engine version modes.
 * `supported_timezones` - Set of the time zones supported by the engine version.
+* `supports_certificate_rotation_without_restart` - Whether the certificates can be rotated without restarting the Aurora instance.
 * `supports_global_databases` - Whether you can use Aurora global databases with the engine version.
+* `supports_integrations` - Whether the engine version supports integrations with other AWS services.
 * `supports_log_exports_to_cloudwatch` - Whether the engine version supports exporting the log types specified by `exportable_log_types` to CloudWatch Logs.
+* `supports_local_write_forwarding` - Whether the engine version supports local write forwarding or not.
 * `supports_limitless_database` - Whether the engine version supports Aurora Limitless Database.
 * `supports_parallel_query` - Whether you can use Aurora parallel query with the engine version.
 * `supports_read_replica` - Whether the engine version supports read replicas.

diff --git a/website/docs/index.html.markdown b/website/docs/index.html.markdown
@@ -11,7 +11,7 @@ Use the Amazon Web Services (AWS) provider to interact with the
 many resources supported by AWS. You must configure the provider
 with the proper credentials before you can use it.
 
-Use the navigation to the left to read about the available resources. There are currently 1465 resources and 592 data sources available in the provider.
+Use the navigation to the left to read about the available resources. There are currently 1470 resources and 593 data sources available in the provider.
 
 To learn the basics of Terraform using this provider, follow the
 hands-on [get started tutorials](https://learn.hashicorp.com/tutorials/terraform/infrastructure-as-code?in=terraform/aws-get-started&utm_source=WEBSITE&utm_medium=WEB_IO&utm_offer=ARTICLE_PAGE&utm_content=DOCS). Interact with AWS services,

diff --git a/website/docs/r/cloudfront_distribution.html.markdown b/website/docs/r/cloudfront_distribution.html.markdown
@@ -251,7 +251,7 @@ The CloudFront distribution argument layout is a complex structure composed of s
 * `enabled` (Required) - Whether the distribution is enabled to accept end user requests for content.
 * `is_ipv6_enabled` (Optional) - Whether the IPv6 is enabled for the distribution.
 * `http_version` (Optional) - Maximum HTTP version to support on the distribution. Allowed values are `http1.1`, `http2`, `http2and3` and `http3`. The default is `http2`.
-* `logging_config` (Optional) - The [logging configuration](#logging-config-arguments) that controls how logs are written to your distribution (maximum one).
+* `logging_config` (Optional) - The [logging configuration](#logging-config-arguments) that controls how logs are written to your distribution (maximum one). AWS provides two versions of access logs for CloudFront: Legacy and v2. This argument configures legacy version standard logs.
 * `ordered_cache_behavior` (Optional) - Ordered list of [cache behaviors](#cache-behavior-arguments) resource for this distribution. List from top to bottom in order of precedence. The topmost cache behavior will have precedence 0.
 * `origin` (Required) - One or more [origins](#origin-arguments) for this distribution (multiples allowed).
 * `origin_group` (Optional) - One or more [origin_group](#origin-group-arguments) for this distribution (multiples allowed).
@@ -372,7 +372,7 @@ argument should not be specified.
 
 #### Logging Config Arguments
 
-* `bucket` (Required) - Amazon S3 bucket to store the access logs in, for example, `myawslogbucket.s3.amazonaws.com`.
+* `bucket` (Required) - Amazon S3 bucket to store the access logs in, for example, `myawslogbucket.s3.amazonaws.com`. The bucket must have correct ACL attached with "FULL_CONTROL" permission for "awslogsdelivery" account (Canonical ID: "c4c1ede66af53448b93c283ce9448c4ba468c9432aa01d700d3878632f77d2d0") for log transfer to work.
 * `include_cookies` (Optional) - Whether to include cookies in access logs (default: `false`).
 * `prefix` (Optional) - Prefix to the access log filenames for this distribution, for example, `myprefix/`.