feat: added adminuser and certificate_base64 outputs and updated the logic to always output hostname and port details (#141)

Co-authored-by: Steve Peggs <[email protected]>

Author: shemau

README.md

@@ -110,12 +110,14 @@ You need the following permissions to run this module.
 
 | Name | Description |
 |------|-------------|
+| <a name="output_adminuser"></a> [adminuser](#output\_adminuser) | Database admin user name |
 | <a name="output_cbr_rule_ids"></a> [cbr\_rule\_ids](#output\_cbr\_rule\_ids) | CBR rule ids created to restrict etcd |
+| <a name="output_certificate_base64"></a> [certificate\_base64](#output\_certificate\_base64) | Database connection certificate |
 | <a name="output_crn"></a> [crn](#output\_crn) | etcd instance crn |
 | <a name="output_guid"></a> [guid](#output\_guid) | etcd instance guid |
-| <a name="output_hostname"></a> [hostname](#output\_hostname) | Database hostname. Only contains value when var.service\_credential\_names or var.users are set. |
+| <a name="output_hostname"></a> [hostname](#output\_hostname) | Database connection hostname |
 | <a name="output_id"></a> [id](#output\_id) | etcd instance id |
-| <a name="output_port"></a> [port](#output\_port) | Database port. Only contains value when var.service\_credential\_names or var.users are set. |
+| <a name="output_port"></a> [port](#output\_port) | Database connection port |
 | <a name="output_service_credentials_json"></a> [service\_credentials\_json](#output\_service\_credentials\_json) | Service credentials json map |
 | <a name="output_service_credentials_object"></a> [service\_credentials\_object](#output\_service\_credentials\_object) | Service credentials object |
 | <a name="output_version"></a> [version](#output\_version) | etcd instance version |

examples/basic/outputs.tf

@@ -10,3 +10,24 @@ output "version" {
   description = "Etcd instance version"
   value       = module.etcd_db.version
 }
+
+output "adminuser" {
+  description = "Database admin user name"
+  value       = module.etcd_db.adminuser
+}
+
+output "hostname" {
+  description = "Database connection hostname"
+  value       = module.etcd_db.hostname
+}
+
+output "port" {
+  description = "Database connection port"
+  value       = module.etcd_db.port
+}
+
+output "certificate_base64" {
+  description = "Database connection certificate"
+  value       = module.etcd_db.certificate_base64
+  sensitive   = true
+}

main.tf

@@ -208,9 +208,8 @@ locals {
 }
 
 data "ibm_database_connection" "database_connection" {
-  count         = length(var.users) > 0 ? 1 : 0
   endpoint_type = var.service_endpoints
   deployment_id = ibm_database.etcd_db.id
-  user_id       = var.users[0].name
-  user_type     = var.users[0].type
+  user_id       = ibm_database.etcd_db.adminuser
+  user_type     = "database"
 }

modules/fscloud/README.md

@@ -54,12 +54,14 @@ No resources.
 
 | Name | Description |
 |------|-------------|
+| <a name="output_adminuser"></a> [adminuser](#output\_adminuser) | Database admin user name |
 | <a name="output_cbr_rule_ids"></a> [cbr\_rule\_ids](#output\_cbr\_rule\_ids) | CBR rule ids created to restrict etcd db |
+| <a name="output_certificate_base64"></a> [certificate\_base64](#output\_certificate\_base64) | Database connection certificate |
 | <a name="output_crn"></a> [crn](#output\_crn) | etcd db instance crn |
 | <a name="output_guid"></a> [guid](#output\_guid) | etcd db instance guid |
-| <a name="output_hostname"></a> [hostname](#output\_hostname) | etcd db instance hostname |
+| <a name="output_hostname"></a> [hostname](#output\_hostname) | Database connection hostname |
 | <a name="output_id"></a> [id](#output\_id) | etcd db instance id |
-| <a name="output_port"></a> [port](#output\_port) | etcd db instance port |
+| <a name="output_port"></a> [port](#output\_port) | Database connection port |
 | <a name="output_service_credentials_json"></a> [service\_credentials\_json](#output\_service\_credentials\_json) | Service credentials json map |
 | <a name="output_service_credentials_object"></a> [service\_credentials\_object](#output\_service\_credentials\_object) | Service credentials object |
 | <a name="output_version"></a> [version](#output\_version) | etcd db instance version |

modules/fscloud/outputs.tf

@@ -39,12 +39,23 @@ output "service_credentials_object" {
   sensitive   = true
 }
 
+output "adminuser" {
+  description = "Database admin user name"
+  value       = module.etcd_db.adminuser
+}
+
 output "hostname" {
-  description = "etcd db instance hostname"
+  description = "Database connection hostname"
   value       = module.etcd_db.hostname
 }
 
 output "port" {
-  description = "etcd db instance port"
+  description = "Database connection port"
   value       = module.etcd_db.port
 }
+
+output "certificate_base64" {
+  description = "Database connection certificate"
+  value       = module.etcd_db.certificate_base64
+  sensitive   = true
+}

outputs.tf

@@ -39,14 +39,23 @@ output "service_credentials_object" {
   sensitive   = true
 }
 
+output "adminuser" {
+  description = "Database admin user name"
+  value       = ibm_database.etcd_db.adminuser
+}
+
 output "hostname" {
-  description = "Database hostname. Only contains value when var.service_credential_names or var.users are set."
-  value       = length(var.service_credential_names) > 0 ? nonsensitive(ibm_resource_key.service_credentials[keys(var.service_credential_names)[0]].credentials["connection.grpc.hosts.0.hostname"]) : length(var.users) > 0 ? data.ibm_database_connection.database_connection[0].grpc[0].hosts[0].hostname : null
+  description = "Database connection hostname"
+  value       = data.ibm_database_connection.database_connection.grpc[0].hosts[0].hostname
 }
 
 output "port" {
-  description = "Database port. Only contains value when var.service_credential_names or var.users are set."
-  value       = length(var.service_credential_names) > 0 ? nonsensitive(ibm_resource_key.service_credentials[keys(var.service_credential_names)[0]].credentials["connection.grpc.hosts.0.port"]) : length(var.users) > 0 ? data.ibm_database_connection.database_connection[0].grpc[0].hosts[0].port : null
+  description = "Database connection port"
+  value       = data.ibm_database_connection.database_connection.grpc[0].hosts[0].port
 }
 
-##############################################################################
+output "certificate_base64" {
+  description = "Database connection certificate"
+  value       = data.ibm_database_connection.database_connection.grpc[0].certificate[0].certificate_base64
+  sensitive   = true
+}