From b6a1d2c5aae3a7c7941ca1e2addb398bb497fa9f Mon Sep 17 00:00:00 2001 From: Dana Hoffman Date: Tue, 7 May 2019 00:26:01 +0000 Subject: [PATCH] replace hazardous tf patterns in docs Signed-off-by: Modular Magician --- .../resource_sql_database_instance_test.go | 1 - website/docs/d/google_kms_secret.html.markdown | 6 +++++- website/docs/r/sql_database.html.markdown | 6 +++++- .../docs/r/sql_database_instance.html.markdown | 18 +++++++++++++++--- website/docs/r/sql_ssl_cert.html.markdown | 6 +++++- website/docs/r/sql_user.html.markdown | 6 +++++- 6 files changed, 35 insertions(+), 8 deletions(-) diff --git a/google-beta/resource_sql_database_instance_test.go b/google-beta/resource_sql_database_instance_test.go index e5fad58b9c..e1b39c8a45 100644 --- a/google-beta/resource_sql_database_instance_test.go +++ b/google-beta/resource_sql_database_instance_test.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform/helper/acctest" "github.com/hashicorp/terraform/helper/resource" "github.com/hashicorp/terraform/terraform" - sqladmin "google.golang.org/api/sqladmin/v1beta4" ) diff --git a/website/docs/d/google_kms_secret.html.markdown b/website/docs/d/google_kms_secret.html.markdown index 92454928ec..6ad424e519 100644 --- a/website/docs/d/google_kms_secret.html.markdown +++ b/website/docs/d/google_kms_secret.html.markdown @@ -59,8 +59,12 @@ data "google_kms_secret" "sql_user_password" { ciphertext = "CiQAqD+xX4SXOSziF4a8JYvq4spfAuWhhYSNul33H85HnVtNQW4SOgDu2UZ46dQCRFl5MF6ekabviN8xq+F+2035ZJ85B+xTYXqNf4mZs0RJitnWWuXlYQh6axnnJYu3kDU=" } +resource "random_id" "db_name_suffix" { + byte_length = 4 +} + resource "google_sql_database_instance" "master" { - name = "master-instance" + name = "master-instance-${random_id.db_name_suffix.hex}" settings { tier = "D0" diff --git a/website/docs/r/sql_database.html.markdown b/website/docs/r/sql_database.html.markdown index 948c49c761..8395517fb6 100644 --- a/website/docs/r/sql_database.html.markdown +++ b/website/docs/r/sql_database.html.markdown @@ -17,8 +17,12 @@ or the [JSON API](https://cloud.google.com/sql/docs/admin-api/v1beta4/databases) Example creating a SQL Database. ```hcl +resource "random_id" "db_name_suffix" { + byte_length = 4 +} + resource "google_sql_database_instance" "master" { - name = "master-instance" + name = "master-instance-${random_id.db_name_suffix.hex}" settings { tier = "D0" diff --git a/website/docs/r/sql_database_instance.html.markdown b/website/docs/r/sql_database_instance.html.markdown index de29222b58..e3bcc4944e 100644 --- a/website/docs/r/sql_database_instance.html.markdown +++ b/website/docs/r/sql_database_instance.html.markdown @@ -21,8 +21,12 @@ a restricted host and strong password. ### SQL First Generation ```hcl +resource "random_id" "db_name_suffix" { + byte_length = 4 +} + resource "google_sql_database_instance" "master" { - name = "master-instance" + name = "master-instance-${random_id.db_name_suffix.hex}" database_version = "MYSQL_5_6" # First-generation instance regions are not the conventional # Google Compute Engine regions. See argument reference below. @@ -91,8 +95,12 @@ data "null_data_source" "auth_netw_postgres_allowed_2" { } } +resource "random_id" "db_name_suffix" { + byte_length = 4 +} + resource "google_sql_database_instance" "postgres" { - name = "postgres-instance" + name = "postgres-instance-${random_id.db_name_suffix.hex}" database_version = "POSTGRES_9_6" settings { @@ -136,10 +144,14 @@ resource "google_service_networking_connection" "private_vpc_connection" { reserved_peering_ranges = ["${google_compute_global_address.private_ip_address.name}"] } +resource "random_id" "db_name_suffix" { + byte_length = 4 +} + resource "google_sql_database_instance" "instance" { provider = "google-beta" - name = "private-instance" + name = "private-instance-${random_id.db_name_suffix.hex}" region = "us-central1" depends_on = [ diff --git a/website/docs/r/sql_ssl_cert.html.markdown b/website/docs/r/sql_ssl_cert.html.markdown index 8c9113772f..547507fc99 100644 --- a/website/docs/r/sql_ssl_cert.html.markdown +++ b/website/docs/r/sql_ssl_cert.html.markdown @@ -18,8 +18,12 @@ Creates a new Google SQL SSL Cert on a Google SQL Instance. For more information Example creating a SQL Client Certificate. ```hcl +resource "random_id" "db_name_suffix" { + byte_length = 4 +} + resource "google_sql_database_instance" "master" { - name = "master-instance" + name = "master-instance-${random_id.db_name_suffix.hex}" settings { tier = "D0" diff --git a/website/docs/r/sql_user.html.markdown b/website/docs/r/sql_user.html.markdown index 1628adb899..8ed3d280a5 100644 --- a/website/docs/r/sql_user.html.markdown +++ b/website/docs/r/sql_user.html.markdown @@ -19,8 +19,12 @@ Creates a new Google SQL User on a Google SQL User Instance. For more informatio Example creating a SQL User. ```hcl +resource "random_id" "db_name_suffix" { + byte_length = 4 +} + resource "google_sql_database_instance" "master" { - name = "master-instance" + name = "master-instance-${random_id.db_name_suffix.hex}" settings { tier = "D0"