tests: update test code

Author: Jordan-Williams2

solutions/deploy/main.tf

@@ -16,7 +16,7 @@ data "ibm_container_vpc_cluster" "cluster_info" {
 }
 
 module "build_cpd_image" {
-  for_each                   = var.cloud_pak_deployer_image == null ? { "build" = 1 } : {}
+  count                      = var.cloud_pak_deployer_image == null ? 1 : 0
   source                     = "./cpd-image-build"
   ibmcloud_api_key           = var.ibmcloud_api_key
   prefix                     = var.prefix
@@ -29,7 +29,7 @@ module "build_cpd_image" {
 }
 
 resource "ibm_container_addons" "odf_cluster_addon" {
-  for_each          = var.install_odf_cluster_addon ? { "odf" = 1 } : {}
+  count             = var.install_odf_cluster_addon ? 1 : 0
   cluster           = var.cluster_name
   manage_all_addons = false
   addons {
@@ -76,10 +76,10 @@ module "cloud_pak_deployer" {
       )]
     }
   )
-  cloud_pak_deployer_image = var.cloud_pak_deployer_image != null ? var.cloud_pak_deployer_image : module.build_cpd_image["build"].container_registry_output_image
+  cloud_pak_deployer_image = var.cloud_pak_deployer_image != null ? var.cloud_pak_deployer_image : module.build_cpd_image[0].container_registry_output_image
 
   cloud_pak_deployer_secret = var.cloud_pak_deployer_secret != null ? var.cloud_pak_deployer_secret : (var.cloud_pak_deployer_image == null ?
-  { username : "iamapikey", password : var.ibmcloud_api_key, server : module.build_cpd_image["build"].container_registry_server, email : "none" } : null)
+  { username : "iamapikey", password : var.ibmcloud_api_key, server : module.build_cpd_image[0].container_registry_server, email : "none" } : null)
 
   cluster_name        = var.cluster_name
   cpd_accept_license  = var.cpd_accept_license

solutions/deploy/outputs.tf

@@ -1,11 +1,11 @@
 output "cloud_pak_deployer_image" {
   description = "The Cloud Pak Deployer image used."
-  value       = var.cloud_pak_deployer_image != null ? var.cloud_pak_deployer_image : module.build_cpd_image["build"].container_registry_output_image
+  value       = var.cloud_pak_deployer_image != null ? var.cloud_pak_deployer_image : module.build_cpd_image[0].container_registry_output_image
 }
 
 output "cloud_pak_deployer_secret" {
   description = "The secret used for accessing the Cloud Pak Deployer image."
-  value       = var.cloud_pak_deployer_secret != null ? var.cloud_pak_deployer_secret : (var.cloud_pak_deployer_image == null ? { username : "iamapikey", password : var.ibmcloud_api_key, server : module.build_cpd_image["build"].container_registry_server, email : "none" } : null)
+  value       = var.cloud_pak_deployer_secret != null ? var.cloud_pak_deployer_secret : (var.cloud_pak_deployer_image == null ? { username : "iamapikey", password : var.ibmcloud_api_key, server : module.build_cpd_image[0].container_registry_server, email : "none" } : null)
   sensitive   = true
 }
 
@@ -16,5 +16,5 @@ output "cluster_name" {
 
 output "code_engine_project_name" {
   description = "The name of the code engine project that was created"
-  value       = module.build_cpd_image.code_engine_project_name
+  value       = var.cloud_pak_deployer_image == null ? module.build_cpd_image.code_engine_project_name : null
 }