From f22b7405678b7f0704eaa46658b8eba78e04b956 Mon Sep 17 00:00:00 2001 From: Matthew Baggett Date: Thu, 26 Dec 2024 19:20:50 +0100 Subject: [PATCH 1/5] Add supports_certificate_rotation_without_restart to aws_rds_engine_version --- internal/service/rds/engine_version_data_source.go | 5 +++++ internal/service/rds/engine_version_data_source_test.go | 1 + website/docs/d/rds_engine_version.html.markdown | 1 + 3 files changed, 7 insertions(+) diff --git a/internal/service/rds/engine_version_data_source.go b/internal/service/rds/engine_version_data_source.go index d145e1ef250..0399abedd0a 100644 --- a/internal/service/rds/engine_version_data_source.go +++ b/internal/service/rds/engine_version_data_source.go @@ -109,6 +109,10 @@ 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, @@ -392,6 +396,7 @@ 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_limitless_database", found.SupportsLimitlessDatabase) d.Set("supports_log_exports_to_cloudwatch", found.SupportsLogExportsToCloudwatchLogs) diff --git a/internal/service/rds/engine_version_data_source_test.go b/internal/service/rds/engine_version_data_source_test.go index 021c23fbd52..f0b9621147d 100644 --- a/internal/service/rds/engine_version_data_source_test.go +++ b/internal/service/rds/engine_version_data_source_test.go @@ -47,6 +47,7 @@ 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_limitless_database"), resource.TestCheckResourceAttrSet(dataSourceName, "supports_log_exports_to_cloudwatch"), diff --git a/website/docs/d/rds_engine_version.html.markdown b/website/docs/d/rds_engine_version.html.markdown index dde0c3d022c..c0456a0b051 100644 --- a/website/docs/d/rds_engine_version.html.markdown +++ b/website/docs/d/rds_engine_version.html.markdown @@ -68,6 +68,7 @@ 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_log_exports_to_cloudwatch` - Whether the engine version supports exporting the log types specified by `exportable_log_types` to CloudWatch Logs. * `supports_limitless_database` - Whether the engine version supports Aurora Limitless Database. From 4ae5154866eacc10490e3ae4a00df4a6a6f09185 Mon Sep 17 00:00:00 2001 From: Matthew Baggett Date: Thu, 26 Dec 2024 19:21:19 +0100 Subject: [PATCH 2/5] Add supports_local_write_forwarding to aws_rds_engine_version --- internal/service/rds/engine_version_data_source.go | 5 +++++ internal/service/rds/engine_version_data_source_test.go | 1 + website/docs/d/rds_engine_version.html.markdown | 1 + 3 files changed, 7 insertions(+) diff --git a/internal/service/rds/engine_version_data_source.go b/internal/service/rds/engine_version_data_source.go index 0399abedd0a..c476383bb6f 100644 --- a/internal/service/rds/engine_version_data_source.go +++ b/internal/service/rds/engine_version_data_source.go @@ -121,6 +121,10 @@ func dataSourceEngineVersion() *schema.Resource { Type: schema.TypeBool, Computed: true, }, + "supports_local_write_forwarding": { + Type: schema.TypeBool, + Computed: true, + }, "supports_log_exports_to_cloudwatch": { Type: schema.TypeBool, Computed: true, @@ -399,6 +403,7 @@ func dataSourceEngineVersionRead(ctx context.Context, d *schema.ResourceData, me d.Set("supports_certificate_rotation_without_restart", found.SupportsCertificateRotationWithoutRestart) d.Set("supports_global_databases", found.SupportsGlobalDatabases) 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 index f0b9621147d..042639c2f94 100644 --- a/internal/service/rds/engine_version_data_source_test.go +++ b/internal/service/rds/engine_version_data_source_test.go @@ -50,6 +50,7 @@ func TestAccRDSEngineVersionDataSource_basic(t *testing.T) { resource.TestCheckResourceAttrSet(dataSourceName, "supports_certificate_rotation_without_restart"), resource.TestCheckResourceAttrSet(dataSourceName, "supports_global_databases"), 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"), diff --git a/website/docs/d/rds_engine_version.html.markdown b/website/docs/d/rds_engine_version.html.markdown index c0456a0b051..0164c08b662 100644 --- a/website/docs/d/rds_engine_version.html.markdown +++ b/website/docs/d/rds_engine_version.html.markdown @@ -71,6 +71,7 @@ This data source exports the following attributes in addition to the arguments a * `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_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. From 540cf4171133266630ae8164d714a674567640f8 Mon Sep 17 00:00:00 2001 From: Matthew Baggett Date: Thu, 26 Dec 2024 19:21:42 +0100 Subject: [PATCH 3/5] Add supports_integrations to aws_rds_engine_version --- internal/service/rds/engine_version_data_source.go | 5 +++++ internal/service/rds/engine_version_data_source_test.go | 1 + website/docs/d/rds_engine_version.html.markdown | 1 + 3 files changed, 7 insertions(+) diff --git a/internal/service/rds/engine_version_data_source.go b/internal/service/rds/engine_version_data_source.go index c476383bb6f..fbd95338220 100644 --- a/internal/service/rds/engine_version_data_source.go +++ b/internal/service/rds/engine_version_data_source.go @@ -117,6 +117,10 @@ func dataSourceEngineVersion() *schema.Resource { Type: schema.TypeBool, Computed: true, }, + "supports_integrations": { + Type: schema.TypeBool, + Computed: true, + }, "supports_limitless_database": { Type: schema.TypeBool, Computed: true, @@ -402,6 +406,7 @@ func dataSourceEngineVersionRead(ctx context.Context, d *schema.ResourceData, me })) 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) diff --git a/internal/service/rds/engine_version_data_source_test.go b/internal/service/rds/engine_version_data_source_test.go index 042639c2f94..5bff49a638c 100644 --- a/internal/service/rds/engine_version_data_source_test.go +++ b/internal/service/rds/engine_version_data_source_test.go @@ -49,6 +49,7 @@ func TestAccRDSEngineVersionDataSource_basic(t *testing.T) { 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"), diff --git a/website/docs/d/rds_engine_version.html.markdown b/website/docs/d/rds_engine_version.html.markdown index 0164c08b662..53b3e65166e 100644 --- a/website/docs/d/rds_engine_version.html.markdown +++ b/website/docs/d/rds_engine_version.html.markdown @@ -70,6 +70,7 @@ This data source exports the following attributes in addition to the arguments a * `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. From 9ac37095165ad859cc2e36c961c43bb313c360aa Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 26 Dec 2024 14:55:08 -0500 Subject: [PATCH 4/5] Add CHANGELOG entry. --- .changelog/40700.txt | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 .changelog/40700.txt diff --git a/.changelog/40700.txt b/.changelog/40700.txt new file mode 100644 index 00000000000..6ea4200325d --- /dev/null +++ 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 +``` \ No newline at end of file From e68330c84b7712f2700347c4842d15bd8e12ce30 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 26 Dec 2024 14:59:38 -0500 Subject: [PATCH 5/5] Fix 'TestAccRDSEngineVersionDataSource_preferredMajorTargets'. --- internal/service/rds/engine_version_data_source_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/service/rds/engine_version_data_source_test.go b/internal/service/rds/engine_version_data_source_test.go index 5bff49a638c..f68c3df5ee5 100644 --- a/internal/service/rds/engine_version_data_source_test.go +++ b/internal/service/rds/engine_version_data_source_test.go @@ -171,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\.`)), ), }, {