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

Author: shemau

README.md

@@ -63,7 +63,7 @@ To attach access management tags to resources in this module, you need the follo
 | Name | Version |
 |------|---------|
 | <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.3.0, <1.7.0 |
-| <a name="requirement_ibm"></a> [ibm](#requirement\_ibm) | >= 1.61.0, < 2.0.0 |
+| <a name="requirement_ibm"></a> [ibm](#requirement\_ibm) | >= 1.64.2, < 2.0.0 |
 | <a name="requirement_time"></a> [time](#requirement\_time) | >= 0.9.1, < 1.0.0 |
 
 ### Modules
@@ -119,12 +119,14 @@ To attach access management tags to resources in this module, you need the follo
 
 | 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 Enterprise DB |
+| <a name="output_certificate_base64"></a> [certificate\_base64](#output\_certificate\_base64) | Database connection certificate |
 | <a name="output_crn"></a> [crn](#output\_crn) | Enterprise DB instance crn |
 | <a name="output_guid"></a> [guid](#output\_guid) | Enterprise DB 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) | Enterprise DB 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) | Enterprise DB instance version |

examples/backup/version.tf

@@ -4,7 +4,7 @@ terraform {
     # Use latest version of provider in non-basic examples to verify latest version works with module
     ibm = {
       source  = "IBM-Cloud/ibm"
-      version = ">= 1.61.0, <2.0.0"
+      version = ">= 1.64.2, <2.0.0"
     }
   }
 }

examples/basic/outputs.tf

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

examples/basic/version.tf

@@ -4,7 +4,7 @@ terraform {
     # Pin to the lowest provider version of the range defined in the main module's version.tf to ensure lowest version still works
     ibm = {
       source  = "IBM-Cloud/ibm"
-      version = "1.61.0"
+      version = "1.64.2"
     }
   }
 }

examples/complete/version.tf

@@ -4,7 +4,7 @@ terraform {
     # Use latest version of provider in non-basic examples to verify latest version works with module
     ibm = {
       source  = "IBM-Cloud/ibm"
-      version = ">= 1.61.0, <2.0.0"
+      version = ">= 1.64.2, <2.0.0"
     }
     time = {
       source  = "hashicorp/time"

examples/fscloud/version.tf

@@ -4,7 +4,7 @@ terraform {
     # Use latest version of provider in non-basic examples to verify latest version works with module
     ibm = {
       source  = "IBM-Cloud/ibm"
-      version = ">= 1.61.0, <2.0.0"
+      version = ">= 1.64.2, <2.0.0"
     }
   }
 }

examples/pitr/version.tf

@@ -4,7 +4,7 @@ terraform {
     # Use latest version of provider in non-basic examples to verify latest version works with module
     ibm = {
       source  = "IBM-Cloud/ibm"
-      version = ">= 1.61.0, <2.0.0"
+      version = ">= 1.64.2, <2.0.0"
     }
   }
 }

main.tf

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

modules/fscloud/README.md

@@ -14,7 +14,7 @@ The IBM Cloud Framework for Financial Services mandates the application of an in
 | Name | Version |
 |------|---------|
 | <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.3.0, <1.7.0 |
-| <a name="requirement_ibm"></a> [ibm](#requirement\_ibm) | >= 1.61.0, <2.0.0 |
+| <a name="requirement_ibm"></a> [ibm](#requirement\_ibm) | >= 1.64.2, <2.0.0 |
 
 ### Modules
 
@@ -55,10 +55,12 @@ No resources.
 
 | Name | Description |
 |------|-------------|
+| <a name="output_adminuser"></a> [adminuser](#output\_adminuser) | Database admin user name |
+| <a name="output_certificate_base64"></a> [certificate\_base64](#output\_certificate\_base64) | Database connection certificate |
 | <a name="output_crn"></a> [crn](#output\_crn) | Enterprise DB instance crn |
 | <a name="output_guid"></a> [guid](#output\_guid) | Enterprise DB instance guid |
-| <a name="output_hostname"></a> [hostname](#output\_hostname) | Enterprise DB instance hostname |
+| <a name="output_hostname"></a> [hostname](#output\_hostname) | Database connection hostname |
 | <a name="output_id"></a> [id](#output\_id) | Enterprise DB instance id |
-| <a name="output_port"></a> [port](#output\_port) | Enterprise DB instance port |
+| <a name="output_port"></a> [port](#output\_port) | Database connection port |
 | <a name="output_version"></a> [version](#output\_version) | Enterprise DB instance version |
 <!-- END OF PRE-COMMIT-TERRAFORM DOCS HOOK -->

modules/fscloud/outputs.tf

@@ -22,12 +22,23 @@ output "crn" {
   value       = module.enterprise_db.crn
 }
 
+output "adminuser" {
+  description = "Database admin user name"
+  value       = module.enterprise_db.adminuser
+}
+
 output "hostname" {
-  description = "Enterprise DB instance hostname"
+  description = "Database connection hostname"
   value       = module.enterprise_db.hostname
 }
 
 output "port" {
-  description = "Enterprise DB instance port"
+  description = "Database connection port"
   value       = module.enterprise_db.port
 }
+
+output "certificate_base64" {
+  description = "Database connection certificate"
+  value       = module.enterprise_db.certificate_base64
+  sensitive   = true
+}