update to example

Author: danisla

.gitignore

@@ -0,0 +1,6 @@
+**/terraform.tfstate*
+**/.terraform*
+**/backend.tf
+**/terraform.tfvars
+**/terraform.tfplan
+**/values-*.yaml

examples/mysql-and-postgres/README.md

@@ -16,52 +16,55 @@ terraform apply
 
 ## Test connection to database
 
-Install the Cloud SQL Proxy: https://cloud.google.com/sql/docs/mysql/sql-proxy#install
-
-Run the Cloud SQL proxy for MySQL instance:
+1. Install the Cloud SQL Proxy:
 
+```bash
+wget https://dl.google.com/cloudsql/cloud_sql_proxy.$(uname | tr '[:upper:]' '[:lower:]').amd64 -O cloud_sql_proxy
+chmod +x cloud_sql_proxy
 ```
-export GOOGLE_PROJECT=$(gcloud config get-value project)
-
-MYSQL_DB_NAME=$(terraform output -module mysql-db -json | jq -r '.instance_name.value')
-MYSQL_CONN_NAME="${GOOGLE_PROJECT}:us-central1:${MYSQL_DB_NAME}"
 
-PGSQL_DB_NAME=$(terraform output -module postgresql-db -json | jq -r '.instance_name.value')
-PGSQL_CONN_NAME="${GOOGLE_PROJECT}:us-central1:${PGSQL_DB_NAME}"
-
-./cloud_sql_proxy -instances=${MYSQL_CONN_NAME}=tcp:3306,${PGSQL_CONN_NAME}=tcp:5432
-```
-
-Start Cloud SQL Proxy for Postgres instance:
-
-```
-GOOGLE_PROJECT=$(gcloud config get-value project)
+2. Run the Cloud SQL proxy in the background:
 
-PGSQL_DB_NAME=$(terraform output -module postgresql-db -json | jq -r '.instance_name.value')
-PGSQL_CONN_NAME="${GOOGLE_PROJECT}:us-central1:${PGSQL_DB_NAME}"
+```bash
+MYSQL_CONN_NAME=$(terraform output mysql_conn)
+PSQL_CONN_NAME=$(terraform output psql_conn)
 
-./cloud_sql_proxy -instances=${PGSQL_CONN_NAME}=tcp:3306
+./cloud_sql_proxy -instances=${MYSQL_CONN_NAME}=tcp:3306,${PSQL_CONN_NAME}=tcp:5432 &
 ```
 
-Get the generated password:
+3. Get the generated user passwords:
 
 ```
-echo MYSQL_PASSWORD=$(terraform output -module mysql-db -json | jq -r '.generated_user_password.value') 
-echo PGSQL_PASSWORD=$(terraform output -module postgresql-db -json | jq -r '.generated_user_password.value') 
+echo MYSQL_PASSWORD=$(terraform output mysql_user_pass)
+echo PSQL_PASSWORD=$(terraform output psql_user_pass)
 ```
 
-Test the MySQL connection:
+4. Test the MySQL connection:
 
 ```
 mysql -udefault -p --host 127.0.0.1 default
 ```
 
 > When prompted, enter the value of MYSQL_PASSWORD
 
-Test the PostgreSQL connection:
+5. Test the PostgreSQL connection:
 
 ```
 psql -h 127.0.0.1 --user default
 ```
 
-> When prompted, enter the value of PGSQL_PASSWORD
+> When prompted, enter the value of PSQL_PASSWORD
+
+## Cleanup
+
+1. Stop the Cloud SQL Proxy:
+
+```bash
+killall cloud_sql_proxy
+```
+
+2. Remove all resources created by terraform:
+
+```bash
+terraform destroy
+```

examples/mysql-and-postgres/main.tf

@@ -14,44 +14,62 @@
  * limitations under the License.
  */
 
-variable region {
+variable "region" {
   default = "us-central1"
 }
 
-variable network {
+variable "network" {
   default = "default"
 }
 
-variable zone {
+variable "zone" {
   default = "us-central1-b"
 }
 
-provider google {
+variable "mysql_version" {
+  default = "MYSQL_5_6"
+}
+
+variable "postgresql_version" {
+  default = "POSTGRES_9_6"
+}
+
+provider "google" {
   region = "${var.region}"
 }
 
-data "google_client_config" "current" {}
+variable "network_name" {
+  default = "mysql-psql-example"
+}
+
+resource "google_compute_network" "default" {
+  name                    = "${var.network_name}"
+  auto_create_subnetworks = "false"
+}
 
-data "google_compute_subnetwork" "default-us-central1" {
-  project = "${data.google_client_config.current.project}"
-  region  = "${var.region}"
-  name    = "default"
+resource "google_compute_subnetwork" "default" {
+  name                     = "${var.network_name}"
+  ip_cidr_range            = "10.127.0.0/20"
+  network                  = "${google_compute_network.default.self_link}"
+  region                   = "${var.region}"
+  private_ip_google_access = true
 }
 
+data "google_client_config" "current" {}
+
 resource "random_id" "name" {
   byte_length = 2
 }
 
 module "mysql-db" {
-  // source           = "github.com/GoogleCloudPlatform/terraform-google-sql-db"
   source           = "../../"
   name             = "example-mysql-${random_id.name.hex}"
-  database_version = "MYSQL_5_6"
+  database_version = "${var.mysql_version}"
 
   ip_configuration = [{
     authorized_networks = [{
-      name  = "default"
-      value = "${data.google_compute_subnetwork.default-us-central1.ip_cidr_range}"
+      name  = "${var.network_name}"
+      value = "${google_compute_subnetwork.default.ip_cidr_range}"
     }]
   }]
 
@@ -64,16 +82,31 @@ module "mysql-db" {
 }
 
 module "postgresql-db" {
-  // source           = "github.com/GoogleCloudPlatform/terraform-google-sql-db"
   source           = "../../"
   name             = "example-postgresql-${random_id.name.hex}"
   user_host        = ""
-  database_version = "POSTGRES_9_6"
+  database_version = "${var.postgresql_version}"
 
   ip_configuration = [{
     authorized_networks = [{
-      name  = "default"
-      value = "${data.google_compute_subnetwork.default-us-central1.ip_cidr_range}"
+      name  = "${var.network_name}"
+      value = "${google_compute_subnetwork.default.ip_cidr_range}"
     }]
   }]
 }
+
+output "mysql_conn" {
+  value = "${data.google_client_config.current.project}:${var.region}:${module.mysql-db.instance_name}"
+}
+
+output "mysql_user_pass" {
+  value = "${module.mysql-db.generated_user_password}"
+}
+
+output "psql_conn" {
+  value = "${data.google_client_config.current.project}:${var.region}:${module.postgresql-db.instance_name}"
+}
+
+output "psql_user_pass" {
+  value = "${module.postgresql-db.generated_user_password}"
+}