Skip to content

Commit 02fd1fd

Browse files
Update sql instance description (#4768) (#3245)
* Update sql instance description * Remove db-f1-micro from sql markdown Signed-off-by: Modular Magician <[email protected]>
1 parent d6a26cd commit 02fd1fd

File tree

4 files changed

+7
-5
lines changed

4 files changed

+7
-5
lines changed

.changelog/4768.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
```release-note:none
2+
3+
```

google-beta/resource_dataproc_cluster_test.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,8 @@ import (
1313
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
1414
"github.com/hashicorp/terraform-plugin-sdk/v2/terraform"
1515

16-
"google.golang.org/api/googleapi"
17-
1816
dataproc "google.golang.org/api/dataproc/v1beta2"
17+
"google.golang.org/api/googleapi"
1918
)
2019

2120
func TestDataprocExtractInitTimeout(t *testing.T) {

google-beta/resource_sql_database_instance.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ func resourceSqlDatabaseInstance() *schema.Resource {
136136
"tier": {
137137
Type: schema.TypeString,
138138
Required: true,
139-
Description: `The machine type to use. See tiers for more details and supported versions. Postgres supports only shared-core machine types such as db-f1-micro, and custom machine types such as db-custom-2-13312. See the Custom Machine Type Documentation to learn about specifying custom machine types.`,
139+
Description: `The machine type to use. See tiers for more details and supported versions. Postgres supports only shared-core machine types, and custom machine types such as db-custom-2-13312. See the Custom Machine Type Documentation to learn about specifying custom machine types.`,
140140
},
141141
"activation_policy": {
142142
Type: schema.TypeString,
@@ -445,7 +445,7 @@ settings.backup_configuration.binary_log_enabled are both set to true.`,
445445
Optional: true,
446446
Default: "MYSQL_5_6",
447447
ForceNew: true,
448-
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_11, SQLSERVER_2017_STANDARD, SQLSERVER_2017_ENTERPRISE, SQLSERVER_2017_EXPRESS, SQLSERVER_2017_WEB. Database Version Policies includes an up-to-date reference of supported versions.`,
448+
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, SQLSERVER_2017_STANDARD, SQLSERVER_2017_ENTERPRISE, SQLSERVER_2017_EXPRESS, SQLSERVER_2017_WEB. Database Version Policies includes an up-to-date reference of supported versions.`,
449449
},
450450

451451
"encryption_key_name": {

website/docs/r/sql_database_instance.html.markdown

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -246,7 +246,7 @@ in Terraform state, a `terraform destroy` or `terraform apply` command that dele
246246
The `settings` block supports:
247247

248248
* `tier` - (Required) The machine type to use. See [tiers](https://cloud.google.com/sql/docs/admin-api/v1beta4/tiers)
249-
for more details and supported versions. Postgres supports only shared-core machine types such as `db-f1-micro`,
249+
for more details and supported versions. Postgres supports only shared-core machine types,
250250
and custom machine types such as `db-custom-2-13312`. See the [Custom Machine Type Documentation](https://cloud.google.com/compute/docs/instances/creating-instance-with-custom-machine-type#create) to learn about specifying custom machine types.
251251

252252
* `activation_policy` - (Optional) This specifies when the instance should be

0 commit comments

Comments
 (0)