Merge pull request #83 from omazin/rename-output

Rename output 'instance_address' to 'instance_ip_address' in all submodules

Author: aaron-lane

CHANGELOG.md

@@ -7,21 +7,22 @@ project adheres to [Semantic Versioning](http://semver.org/).
 
 ## [Unreleased]
 
-### Added
-
-- The `public_ip_address`, `private_ip_address`, and `instance_address` outputs to the `mysql` submodule, the `postgresql` 
-  submodule, and the `safer_mysql` submodule. [#76]
-
-## [3.0.0] - 2019-12-13
+## [3.0.0] - 2019-12-16
 
 ### Removed
 
 - Removed variable `peering_completed`. [#78]
 
 ### Added
 
+- The `public_ip_address`, `private_ip_address`, and `instance_address` outputs to the `mysql` submodule, the `postgresql`
+submodule, and the `safer_mysql` submodule. [#76]
 - Added variable `module_depends_on`. [#78]
 
+### Changed
+
+- Renamed output `instance_address` to `instance_ip_address` in `mysql`, `postgresql` and `safer_mysql` submodules. [#83]
+
 ## [2.0.0] - 2019-09-26
 
 2.0.0 is a backward incompatible release. Review the
@@ -64,9 +65,10 @@ project adheres to [Semantic Versioning](http://semver.org/).
 [1.0.1]: https://github.com/terraform-google-modules/terraform-google-sql-db/compare/1.0.0...1.0.1
 [1.0.0]: https://github.com/terraform-google-modules/terraform-google-sql-db/releases/tag/1.0.0
 
+[#83]: https://github.com/terraform-google-modules/terraform-google-sql-db/pull/83
+[#78]: https://github.com/terraform-google-modules/terraform-google-sql-db/pull/78
 [#76]: https://github.com/terraform-google-modules/terraform-google-sql-db/pull/76
 [#61]: https://github.com/terraform-google-modules/terraform-google-sql-db/pull/61
 [#56]: https://github.com/terraform-google-modules/terraform-google-sql-db/pull/56
 [#53]: https://github.com/terraform-google-modules/terraform-google-sql-db/pull/53
 [#43]: https://github.com/terraform-google-modules/terraform-google-sql-db/pull/43
-[#78]: https://github.com/terraform-google-modules/terraform-google-sql-db/pull/78

modules/mysql/README.md

@@ -78,13 +78,12 @@
 | Name | Description |
 |------|-------------|
 | failover-replica\_instance\_connection\_name | The connection name of the failover-replica instance to be used in connection strings |
-| failover-replica\_instance\_first\_ip\_address | The first IPv4 address of the addesses assigned for the failover-replica instance |
+| failover-replica\_instance\_first\_ip\_address | The first IPv4 address of the addresses assigned for the failover-replica instance |
 | failover-replica\_instance\_name | The instance name for the failover replica instance |
 | failover-replica\_instance\_self\_link | The URI of the failover-replica instance |
 | failover-replica\_instance\_server\_ca\_cert | The CA certificate information used to connect to the failover-replica instance via SSL |
 | failover-replica\_instance\_service\_account\_email\_address | The service account email addresses assigned to the failover-replica instance |
 | generated\_user\_password | The auto generated default user password if not input password was provided |
-| instance\_address | The IPv4 addesses assigned for the master instance |
 | instance\_connection\_name | The connection name of the master instance to be used in connection strings |
 | instance\_first\_ip\_address | The first IPv4 address of the addresses assigned for the master instance. |
 | instance\_ip\_address | The IPv4 address assigned for the master instance |

modules/mysql/outputs.tf

@@ -89,7 +89,7 @@ output "read_replica_instance_names" {
 // Failover Replicas
 output "failover-replica_instance_first_ip_address" {
   value       = google_sql_database_instance.failover-replica[*].ip_address
-  description = "The first IPv4 address of the addesses assigned for the failover-replica instance"
+  description = "The first IPv4 address of the addresses assigned for the failover-replica instance"
 }
 
 output "failover-replica_instance_connection_name" {
@@ -132,8 +132,3 @@ output "private_ip_address" {
   description = "The first private (PRIVATE) IPv4 address assigned for the master instance"
   value       = google_sql_database_instance.default.private_ip_address
 }
-
-output "instance_address" {
-  value       = google_sql_database_instance.default.ip_address
-  description = "The IPv4 addesses assigned for the master instance"
-}

modules/postgresql/README.md

@@ -61,9 +61,9 @@
 | Name | Description |
 |------|-------------|
 | generated\_user\_password | The auto generated default user password if not input password was provided |
-| instance\_address | The IPv4 addesses assigned for the master instance |
 | instance\_connection\_name | The connection name of the master instance to be used in connection strings |
 | instance\_first\_ip\_address | The first IPv4 address of the addresses assigned. |
+| instance\_ip\_address | The IPv4 address assigned for the master instance |
 | instance\_name | The instance name for the master instance |
 | instance\_self\_link | The URI of the master instance |
 | instance\_server\_ca\_cert | The CA certificate information used to connect to the SQL instance via SSL |

modules/postgresql/outputs.tf

@@ -30,9 +30,9 @@ output "private_ip_address" {
   value       = google_sql_database_instance.default.private_ip_address
 }
 
-output "instance_address" {
+output "instance_ip_address" {
   value       = google_sql_database_instance.default.ip_address
-  description = "The IPv4 addesses assigned for the master instance"
+  description = "The IPv4 address assigned for the master instance"
 }
 
 output "instance_first_ip_address" {

modules/safer_mysql/README.md

@@ -239,8 +239,8 @@ mysql -S $HOME/mysql_sockets/myproject:region:instance -u user -p
 | failover-replica\_instance\_self\_link | The URI of the failover-replica instance |
 | failover-replica\_instance\_service\_account\_email\_address | The service account email addresses assigned to the failover-replica instance |
 | generated\_user\_password | The auto generated default user password if not input password was provided |
-| instance\_address | The IPv4 addesses assigned for the master instance |
 | instance\_connection\_name | The connection name of the master instance to be used in connection strings |
+| instance\_ip\_address | The IPv4 address assigned for the master instance |
 | instance\_name | The instance name for the master instance |
 | instance\_self\_link | The URI of the master instance |
 | instance\_service\_account\_email\_address | The service account email address assigned to the master instance |

modules/safer_mysql/outputs.tf

@@ -94,7 +94,7 @@ output "private_ip_address" {
   value       = module.safer_mysql.private_ip_address
 }
 
-output "instance_address" {
-  value       = module.safer_mysql.instance_address
-  description = "The IPv4 addesses assigned for the master instance"
+output "instance_ip_address" {
+  value       = module.safer_mysql.instance_ip_address
+  description = "The IPv4 address assigned for the master instance"
 }