Skip to content

Commit 7be42ae

Browse files
translucensniharika-98
authored andcommitted
add MySQL 8.4 in google_sql_database_instance documentation (GoogleCloudPlatform#12610)
1 parent 7bb52ea commit 7be42ae

File tree

3 files changed

+13
-4
lines changed

3 files changed

+13
-4
lines changed

mmv1/third_party/terraform/services/sql/resource_sql_database_instance.go.tmpl

+1-1
Original file line numberDiff line numberDiff line change
@@ -727,7 +727,7 @@ is set to true. Defaults to ZONAL.`,
727727
"database_version": {
728728
Type: schema.TypeString,
729729
Required: true,
730-
Description: `The MySQL, PostgreSQL or SQL Server (beta) version to use. Supported values include MYSQL_5_6, MYSQL_5_7, MYSQL_8_0, POSTGRES_9_6, POSTGRES_10, POSTGRES_11, POSTGRES_12, POSTGRES_13, POSTGRES_14, POSTGRES_15, POSTGRES_16, POSTGRES_17, SQLSERVER_2017_STANDARD, SQLSERVER_2017_ENTERPRISE, SQLSERVER_2017_EXPRESS, SQLSERVER_2017_WEB. Database Version Policies includes an up-to-date reference of supported versions.`,
730+
Description: `The MySQL, PostgreSQL or SQL Server (beta) version to use. Supported values include MYSQL_5_6, MYSQL_5_7, MYSQL_8_0, MYSQL_8_4, POSTGRES_9_6, POSTGRES_10, POSTGRES_11, POSTGRES_12, POSTGRES_13, POSTGRES_14, POSTGRES_15, POSTGRES_16, POSTGRES_17, SQLSERVER_2017_STANDARD, SQLSERVER_2017_ENTERPRISE, SQLSERVER_2017_EXPRESS, SQLSERVER_2017_WEB. Database Version Policies includes an up-to-date reference of supported versions.`,
731731
},
732732

733733
"encryption_key_name": {

mmv1/third_party/terraform/services/sql/resource_sql_database_instance_test.go

+11-2
Original file line numberDiff line numberDiff line change
@@ -2264,7 +2264,7 @@ func TestAccSqlDatabaseInstance_activationPolicy(t *testing.T) {
22642264
ImportStateVerifyIgnore: []string{"deletion_protection", "root_password"},
22652265
},
22662266
{
2267-
Config: testGoogleSqlDatabaseInstance_activationPolicy(instanceName, "MYSQL_8_0_26", "NEVER", true),
2267+
Config: testGoogleSqlDatabaseInstance_activationPolicy(instanceName, "MYSQL_8_0_37", "NEVER", true),
22682268
},
22692269
{
22702270
ResourceName: "google_sql_database_instance.instance",
@@ -2273,7 +2273,16 @@ func TestAccSqlDatabaseInstance_activationPolicy(t *testing.T) {
22732273
ImportStateVerifyIgnore: []string{"deletion_protection", "root_password"},
22742274
},
22752275
{
2276-
Config: testGoogleSqlDatabaseInstance_activationPolicy(instanceName, "MYSQL_8_0_26", "ALWAYS", false),
2276+
Config: testGoogleSqlDatabaseInstance_activationPolicy(instanceName, "MYSQL_8_0_37", "ALWAYS", false),
2277+
},
2278+
{
2279+
ResourceName: "google_sql_database_instance.instance",
2280+
ImportState: true,
2281+
ImportStateVerify: true,
2282+
ImportStateVerifyIgnore: []string{"deletion_protection", "root_password"},
2283+
},
2284+
{
2285+
Config: testGoogleSqlDatabaseInstance_activationPolicy(instanceName, "MYSQL_8_4", "ALWAYS", false),
22772286
},
22782287
{
22792288
ResourceName: "google_sql_database_instance.instance",

mmv1/third_party/terraform/website/docs/r/sql_database_instance.html.markdown

+1-1
Original file line numberDiff line numberDiff line change
@@ -239,7 +239,7 @@ The following arguments are supported:
239239

240240
* `database_version` - (Required) The MySQL, PostgreSQL or
241241
SQL Server version to use. Supported values include `MYSQL_5_6`,
242-
`MYSQL_5_7`, `MYSQL_8_0`, `POSTGRES_9_6`,`POSTGRES_10`, `POSTGRES_11`,
242+
`MYSQL_5_7`, `MYSQL_8_0`, `MYSQL_8_4`, `POSTGRES_9_6`,`POSTGRES_10`, `POSTGRES_11`,
243243
`POSTGRES_12`, `POSTGRES_13`, `POSTGRES_14`, `POSTGRES_15`, `POSTGRES_16`, `POSTGRES_17`,
244244
`SQLSERVER_2017_STANDARD`, `SQLSERVER_2017_ENTERPRISE`, `SQLSERVER_2017_EXPRESS`, `SQLSERVER_2017_WEB`.
245245
`SQLSERVER_2019_STANDARD`, `SQLSERVER_2019_ENTERPRISE`, `SQLSERVER_2019_EXPRESS`,

0 commit comments

Comments
 (0)