address PR comments

Author: akocbek

solutions/project/main.tf

@@ -27,15 +27,21 @@ module "project" {
 # Code Engine Build
 ##############################################################################
 locals {
+  registry_region_result = data.external.container_registry_region.result
+  registry               = lookup(local.registry_region_result, "registry", null)
+  container_registry     = local.registry != null ? "private.${local.registry}" : null
+  registry_region_error  = lookup(local.registry_region_result, "error", null)
 
-  container_registry = "private.${data.external.container_registry_region.result["registry"]}"
+  # This will cause Terraform to fail if "error" is present in the external script output executed as a part of container_registry_region
+  # tflint-ignore: terraform_unused_declarations
+  fail_if_registry_region_error = local.registry_region_error != null ? tobool("Registry region script failed: ${local.registry_region_error}") : null
 
   # if no build defines a container image reference (output_image), a new container registry namespace must be created using container_registry_namespace.
   any_missing_output_image = anytrue([
     for build in values(var.builds) :
     !contains(keys(build), "output_image") || build.output_image == null
   ])
-  image_container = local.any_missing_output_image ? "${local.container_registry}/${resource.ibm_cr_namespace.my_namespace[0].name}" : ""
+  image_container = local.any_missing_output_image && local.container_registry != null ? "${local.container_registry}/${resource.ibm_cr_namespace.my_namespace[0].name}" : ""
 
   # if output_image not exists then a new created container image reference
   updated_builds = {

solutions/project/scripts/build-run.sh

@@ -26,7 +26,7 @@ if [[ -z "${BUILDS}" ]]; then
   exit 1
 fi
 
-ibmcloud login -r "${REGION}" -g "${RESOURCE_GROUP_ID}" --apikey "${IBMCLOUD_API_KEY}"
+ibmcloud login -r "${REGION}" -g "${RESOURCE_GROUP_ID}" --quiet
 
 # selecet the right code engine project
 ibmcloud ce project select -n "${CE_PROJECT_NAME}"

solutions/project/scripts/get-cr-region.sh

@@ -1,33 +1,39 @@
 #!/bin/bash
-set -e
+set -euo pipefail
 
 INPUT=$(cat)
 REGION=$(echo "$INPUT" | jq -r '.REGION')
 RESOURCE_GROUP_ID=$(echo "$INPUT" | jq -r '.RESOURCE_GROUP_ID')
 IBMCLOUD_API_KEY=$(echo "$INPUT" | jq -r '.IBMCLOUD_API_KEY')
+export IBMCLOUD_API_KEY
 
 if [[ -z "${IBMCLOUD_API_KEY}" || "${IBMCLOUD_API_KEY}" == "null" ]]; then
-  echo "IBMCLOUD_API_KEY is required" >&2
-  exit 1
+  echo '{"error": "IBMCLOUD_API_KEY is required"}'
+  exit 0
 fi
 
 if [[ -z "${RESOURCE_GROUP_ID}"  || "${RESOURCE_GROUP_ID}" == "null" ]]; then
-  echo "RESOURCE_GROUP_ID is required" >&2
-  exit 1
+  echo '{"error": "RESOURCE_GROUP_ID is required"}'
+  exit 0
 fi
 
 if [[ -z "${REGION}" || "${REGION}" == "null" ]]; then
-  echo "REGION is required" >&2
-  exit 1
+  echo '{"error": "REGION is required"}'
+  exit 0
 fi
 
-# Login to IBM Cloud quietly
-if ! ibmcloud login -r "${REGION}" -g "${RESOURCE_GROUP_ID}" --apikey "${IBMCLOUD_API_KEY}" --quiet > /dev/null 2>&1; then
-  exit 1
+if ! ibmcloud login -r "${REGION}" -g "${RESOURCE_GROUP_ID}" --quiet > /dev/null 2>&1; then
+  printf '{"error": "Failed to login using: ibmcloud login -r %s -g %s"}' "$REGION" "$RESOURCE_GROUP_ID"
+  exit 0
 fi
 
 # extract registry value from text "You are targeting region 'us-south', the registry is 'us.icr.io'."
-registry=$(ibmcloud cr region 2>/dev/null | grep registry | sed -E "s/.*registry is '([^']+)'.*/\1/") || exit 1
+registry=$(ibmcloud cr region 2>/dev/null | grep registry | sed -E "s/.*registry is '([^']+)'.*/\1/")
+
+# Validate registry value
+if [[ -z "$registry" ]]; then
+  echo '{"error": "Failed to parse registry region from ibmcloud cr region"}'
+  exit 0
+fi
 
-# Output valid JSON for Terraform external data source
 echo "{\"registry\": \"${registry}\"}"