Skip to content

Commit 9e4e7bb

Browse files
add MySQL 8.4 in google_sql_database_instance documentation (#12610) (#20787)
[upstream:ed32cb07d613e5f910ffa1f10875bd795d543815] Signed-off-by: Modular Magician <magic-modules@google.com>
1 parent 82b9bb7 commit 9e4e7bb

File tree

4 files changed

+16
-4
lines changed

4 files changed

+16
-4
lines changed

.changelog/12610.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
```release-note:none
2+
sql: added MySQL 8.4 in `google_sql_database_instance` documentation
3+
```

google/services/sql/resource_sql_database_instance.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -729,7 +729,7 @@ is set to true. Defaults to ZONAL.`,
729729
"database_version": {
730730
Type: schema.TypeString,
731731
Required: true,
732-
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.`,
732+
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.`,
733733
},
734734

735735
"encryption_key_name": {

google/services/sql/resource_sql_database_instance_test.go

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2266,7 +2266,7 @@ func TestAccSqlDatabaseInstance_activationPolicy(t *testing.T) {
22662266
ImportStateVerifyIgnore: []string{"deletion_protection", "root_password"},
22672267
},
22682268
{
2269-
Config: testGoogleSqlDatabaseInstance_activationPolicy(instanceName, "MYSQL_8_0_26", "NEVER", true),
2269+
Config: testGoogleSqlDatabaseInstance_activationPolicy(instanceName, "MYSQL_8_0_37", "NEVER", true),
22702270
},
22712271
{
22722272
ResourceName: "google_sql_database_instance.instance",
@@ -2275,7 +2275,16 @@ func TestAccSqlDatabaseInstance_activationPolicy(t *testing.T) {
22752275
ImportStateVerifyIgnore: []string{"deletion_protection", "root_password"},
22762276
},
22772277
{
2278-
Config: testGoogleSqlDatabaseInstance_activationPolicy(instanceName, "MYSQL_8_0_26", "ALWAYS", false),
2278+
Config: testGoogleSqlDatabaseInstance_activationPolicy(instanceName, "MYSQL_8_0_37", "ALWAYS", false),
2279+
},
2280+
{
2281+
ResourceName: "google_sql_database_instance.instance",
2282+
ImportState: true,
2283+
ImportStateVerify: true,
2284+
ImportStateVerifyIgnore: []string{"deletion_protection", "root_password"},
2285+
},
2286+
{
2287+
Config: testGoogleSqlDatabaseInstance_activationPolicy(instanceName, "MYSQL_8_4", "ALWAYS", false),
22792288
},
22802289
{
22812290
ResourceName: "google_sql_database_instance.instance",

website/docs/r/sql_database_instance.html.markdown

Lines changed: 1 addition & 1 deletion
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)