Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

replace hazardous tf patterns in docs #1730

Merged
merged 3 commits into from
May 7, 2019
Merged

replace hazardous tf patterns in docs #1730

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d5ea29d
replace hazardous tf patterns with better patterns
Apr 9, 2019
63f3f5d
whitespace fix
Apr 9, 2019
2561a8c
Update tracked submodules -> HEAD on Tue May 7 16:34:03 UTC 2019
modular-magician May 7, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion build/terraform
Open in desktop
Submodule terraform updated from d43a17 to 0a667d
2 changes: 1 addition & 1 deletion build/terraform-beta
Open in desktop
Submodule terraform-beta updated from 2d3866 to 1bfc43
6 changes: 5 additions & 1 deletion third_party/terraform/website/docs/d/google_kms_secret.html.markdown
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
6 changes: 5 additions & 1 deletion third_party/terraform/website/docs/r/sql_database.html.markdown
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
18 changes: 15 additions & 3 deletions third_party/terraform/website/docs/r/sql_database_instance.html.markdown
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down Expand Up @@ -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 {
Expand Down Expand Up @@ -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 = [
Expand Down
6 changes: 5 additions & 1 deletion third_party/terraform/website/docs/r/sql_ssl_cert.html.markdown
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
6 changes: 5 additions & 1 deletion third_party/terraform/website/docs/r/sql_user.html.markdown
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down