fix: fixed bug that can produce the error Invalid value for "value" parameter: the given value is not sensitive, so this call is redundant if not passing any values for the users and service_credential_names variables (#204)

Author: rajatagarwal-ibm

main.tf

@@ -214,9 +214,3 @@ data "ibm_database_connection" "database_connection" {
   user_id       = var.users[0].name
   user_type     = var.users[0].type
 }
-
-locals {
-  # Used for output only
-  hostname = length(var.service_credential_names) > 0 ? ibm_resource_key.service_credentials[keys(var.service_credential_names)[0]].credentials["connection.postgres.hosts.0.hostname"] : length(var.users) > 0 ? flatten(data.ibm_database_connection.database_connection[0].postgres[0].hosts[0].hostname) : null
-  port     = length(var.service_credential_names) > 0 ? ibm_resource_key.service_credentials[keys(var.service_credential_names)[0]].credentials["connection.postgres.hosts.0.port"] : length(var.users) > 0 ? flatten(data.ibm_database_connection.database_connection[0].postgres[0].hosts[0].port) : null
-}

outputs.tf

@@ -41,10 +41,10 @@ output "cbr_rule_ids" {
 
 output "hostname" {
   description = "Database hostname. Only contains value when var.service_credential_names or var.users are set."
-  value       = nonsensitive(local.hostname)
+  value       = length(var.service_credential_names) > 0 ? nonsensitive(ibm_resource_key.service_credentials[keys(var.service_credential_names)[0]].credentials["connection.postgres.hosts.0.hostname"]) : length(var.users) > 0 ? nonsensitive(flatten(data.ibm_database_connection.database_connection[0].postgres[0].hosts[0].hostname)) : null
 }
 
 output "port" {
   description = "Database port. Only contains value when var.service_credential_names or var.users are set."
-  value       = nonsensitive(local.port)
+  value       = length(var.service_credential_names) > 0 ? nonsensitive(ibm_resource_key.service_credentials[keys(var.service_credential_names)[0]].credentials["connection.postgres.hosts.0.port"]) : length(var.users) > 0 ? nonsensitive(flatten(data.ibm_database_connection.database_connection[0].postgres[0].hosts[0].port)) : null
 }

tests/pr_test.go

@@ -71,17 +71,6 @@ func TestRunUpgradeCompleteExample(t *testing.T) {
 	_, err := rand.Read(randomBytes)
 	randomPass := base64.URLEncoding.EncodeToString(randomBytes)[:10]
 
-	// User Object
-	type User struct {
-		Name     string
-		Password string
-		Type     string
-	}
-
-	users := []User{
-		{Name: "testuser", Password: randomPass, Type: "database"}, // pragma: allowlist secret
-	}
-
 	options := testhelper.TestOptionsDefaultWithVars(&testhelper.TestOptions{
 		Testing:            t,
 		TerraformDir:       "examples/complete",
@@ -90,7 +79,13 @@ func TestRunUpgradeCompleteExample(t *testing.T) {
 		ResourceGroup:      resourceGroup,
 		TerraformVars: map[string]interface{}{
 			"pg_version": "11", // Always lock to the lowest supported Postgres version
-			"users":      users,
+			"users": []map[string]interface{}{
+				{
+					"name":     "testuser",
+					"password": randomPass, // pragma: allowlist secret
+					"type":     "database",
+				},
+			},
 			"admin_pass": randomPass,
 		},
 	})