From 47beb8510aaac65fd0d3ec6e14d490808ce2eb98 Mon Sep 17 00:00:00 2001 From: Petri Autero Date: Tue, 5 Feb 2019 19:28:08 +0200 Subject: [PATCH] Naming changes based on PR review. --- examples/cloud-sql-mysql/outputs.tf | 8 ++++---- modules/mysql/outputs.tf | 6 ++++-- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/examples/cloud-sql-mysql/outputs.tf b/examples/cloud-sql-mysql/outputs.tf index 7565f1a..e5a70af 100644 --- a/examples/cloud-sql-mysql/outputs.tf +++ b/examples/cloud-sql-mysql/outputs.tf @@ -8,9 +8,9 @@ output "public_ip" { value = "${module.mysql.public_ip}" } -output "instance_self_link" { +output "instance" { description = "Self link to the master instance" - value = "${module.mysql.instance_self_link}" + value = "${module.mysql.instance}" } output "db_name" { @@ -22,8 +22,8 @@ output "proxy_connection" { value = "${module.mysql.proxy_connection}" } -output "db_self_link" { +output "db" { description = "Self link to the default database" - value = "${module.mysql.db_self_link}" + value = "${module.mysql.db}" } diff --git a/modules/mysql/outputs.tf b/modules/mysql/outputs.tf index 26971f0..23f64fc 100644 --- a/modules/mysql/outputs.tf +++ b/modules/mysql/outputs.tf @@ -8,7 +8,7 @@ output "public_ip" { value = "${var.publicly_accessible ? google_sql_database_instance.master.ip_address.0.ip_address : ""}" } -output "instance_self_link" { +output "instance" { description = "Self link to the master instance" value = "${google_sql_database_instance.master.self_link}" } @@ -18,11 +18,13 @@ output "db_name" { value = "${google_sql_database.default.name}" } + output "proxy_connection" { + description = "Instance path for connecting with Cloud SQL Proxy. Read more at https://cloud.google.com/sql/docs/mysql/sql-proxy" value = "${var.project}:${var.region}:${google_sql_database_instance.master.name}" } -output "db_self_link" { +output "db" { description = "Self link to the default database" value = "${google_sql_database.default.self_link}" }