From 9207b5bcbce749b7c6896ad49b12e6c5856fa99a Mon Sep 17 00:00:00 2001
From: Adam Geiger <ageiger@us.ibm.com>
Date: Mon, 13 Jan 2025 14:42:54 -0500
Subject: [PATCH 1/4] fix: update script files

---
 README.md                                     |  4 +-
 examples/basic/{versions.tf => version.tf}    |  2 +-
 solutions/deploy/README.md                    |  2 +-
 solutions/deploy/cloud-pak-deployer/main.tf   |  2 +-
 .../cloud-pak-deployer/scripts/uninstall.sh   | 44 +++++++++++++++++++
 .../scripts/uninstall.sh.tftpl                | 40 -----------------
 .../{versions.tf => version.tf}               |  0
 solutions/deploy/cpd-image-build/main.tf      | 24 +++++-----
 .../cpd-image-build/scripts/image-build.sh    | 38 ++++++++++++++++
 .../{versions.tf => version.tf}               | 10 ++---
 solutions/deploy/providers.tf                 |  9 ++--
 solutions/deploy/{versions.tf => version.tf}  |  6 +--
 12 files changed, 106 insertions(+), 75 deletions(-)
 rename examples/basic/{versions.tf => version.tf} (89%)
 create mode 100644 solutions/deploy/cloud-pak-deployer/scripts/uninstall.sh
 delete mode 100644 solutions/deploy/cloud-pak-deployer/scripts/uninstall.sh.tftpl
 rename solutions/deploy/cloud-pak-deployer/{versions.tf => version.tf} (100%)
 create mode 100644 solutions/deploy/cpd-image-build/scripts/image-build.sh
 rename solutions/deploy/cpd-image-build/{versions.tf => version.tf} (62%)
 rename solutions/deploy/{versions.tf => version.tf} (84%)

diff --git a/README.md b/README.md
index fe4b64d6..40881025 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,5 @@
 <!-- Update this title with a descriptive name. Use sentence case. -->
-# Terraform modules template project
+# IBM Cloud Pak for Data deployment on OpenShift
 
 <!--
 Update status and "latest release" badges:
@@ -14,7 +14,7 @@ Update status and "latest release" badges:
 
 
 This repository contains the following deployment an Red Hat OpenShift cluster:
-- [IBM Cloud Cloud Pak for Data](./solutions/deploy)
+- [IBM Cloud Pak for Data](./solutions/deploy)
 
 **NB:** These solutions are not intended to be called by one or more other modules since they contain a provider configurations, meaning they are not compatible with the `for_each`, `count`, and `depends_on` arguments. For more information see [Providers Within Modules](https://developer.hashicorp.com/terraform/language/modules/develop/providers)
 
diff --git a/examples/basic/versions.tf b/examples/basic/version.tf
similarity index 89%
rename from examples/basic/versions.tf
rename to examples/basic/version.tf
index 4c869c16..31d066b9 100644
--- a/examples/basic/versions.tf
+++ b/examples/basic/version.tf
@@ -4,7 +4,7 @@ terraform {
     # renovate is set up to keep provider version at the latest for all DA solutions
     ibm = {
       source  = "IBM-Cloud/ibm"
-      version = "1.71.3"
+      version = "1.74.0"
     }
   }
 }
diff --git a/solutions/deploy/README.md b/solutions/deploy/README.md
index 3760a3bf..da4cc298 100644
--- a/solutions/deploy/README.md
+++ b/solutions/deploy/README.md
@@ -106,7 +106,7 @@ You need the following permissions to run this module:
 | <a name="requirement_ibm"></a> [ibm](#requirement\_ibm) | >= 1.66.0, < 2.0.0 |
 | <a name="requirement_kubernetes"></a> [kubernetes](#requirement\_kubernetes) | 2.35.1 |
 | <a name="requirement_null"></a> [null](#requirement\_null) | 3.2.2 |
-| <a name="requirement_restapi"></a> [restapi](#requirement\_restapi) | 1.18.2 |
+| <a name="requirement_shell"></a> [shell](#requirement\_shell) | 1.7.10 |
 
 ### Modules
 
diff --git a/solutions/deploy/cloud-pak-deployer/main.tf b/solutions/deploy/cloud-pak-deployer/main.tf
index cec87fc4..fd2da4ec 100644
--- a/solutions/deploy/cloud-pak-deployer/main.tf
+++ b/solutions/deploy/cloud-pak-deployer/main.tf
@@ -295,7 +295,7 @@ resource "shell_script" "uninstall" {
 
   lifecycle_commands {
     create = ""
-    delete = file("${path.module}/scripts/uninstall.sh.tftpl")
+    delete = file("${path.module}/scripts/uninstall.sh")
   }
 
   environment = {
diff --git a/solutions/deploy/cloud-pak-deployer/scripts/uninstall.sh b/solutions/deploy/cloud-pak-deployer/scripts/uninstall.sh
new file mode 100644
index 00000000..c5fea9f3
--- /dev/null
+++ b/solutions/deploy/cloud-pak-deployer/scripts/uninstall.sh
@@ -0,0 +1,44 @@
+#!/bin/bash
+
+${OC} create -f "${JOB_UNINSTALL_CPD_FILENAME}"
+RC=$?
+if [ "${RC}" -ne 0 ]; then echo "Unable to create job ${JOB_NAME}; exiting..." && exit 1; fi
+
+timeout_seconds=1800 # 30 minutes
+sleep_seconds=5
+number_of_tries=$((timeout_seconds / sleep_seconds))
+complete=false
+failed=false
+
+i=0
+while [ $i -lt "${number_of_tries}" ]; do
+
+echo "Running job ... $i"
+${OC} get jobs -n "${NAMESPACE_NAME}"
+
+${OC} wait --for=condition=complete job "${JOB_NAME}" -n "${NAMESPACE_NAME}" --timeout=0 2>/dev/null
+RC=$?
+if [ "${RC}" -eq 0 ]; then complete=true && break; fi
+
+${OC} wait --for=condition=failed job "${JOB_NAME}" -n "${NAMESPACE_NAME}" --timeout=0 2>/dev/null
+RC=$?
+if [ "${RC}" -eq 0 ]; then failed=true && break; fi
+
+i=$((i+1))
+
+sleep "${sleep_seconds}"
+
+done
+
+${OC} describe pods -n "${NAMESPACE_NAME}"
+
+if $failed; then
+    echo "Job ${JOB_NAME} failed"
+    exit 1
+elif "${complete}"; then
+    echo "Job ${JOB_NAME} completed successfully"
+    ${OC} delete -f "${JOB_UNINSTALL_CPD_FILENAME}"
+    RC=$?
+    if [ "${RC}" -ne 0 ]; then echo "Unable to delete job ${JOB_NAME}; exiting..." && exit 1; fi
+    exit 0
+fi
diff --git a/solutions/deploy/cloud-pak-deployer/scripts/uninstall.sh.tftpl b/solutions/deploy/cloud-pak-deployer/scripts/uninstall.sh.tftpl
deleted file mode 100644
index 39e9041b..00000000
--- a/solutions/deploy/cloud-pak-deployer/scripts/uninstall.sh.tftpl
+++ /dev/null
@@ -1,40 +0,0 @@
-#!/bin/bash
-
-${OC} create -f ${JOB_UNINSTALL_CPD_FILENAME}
-if [ $? -ne 0 ]; then echo "Unable to create job ${JOB_NAME}; exiting..." && exit 1; fi
-
-timeout_seconds=1800 # 30 minutes
-sleep_seconds=5
-number_of_tries=$((timeout_seconds / sleep_seconds))
-complete=false
-failed=false
-
-i=0
-while [ $i -lt $number_of_tries ]; do
-
-echo "Running job ... $i"
-${OC} get jobs -n ${NAMESPACE_NAME}
-
-${OC} wait --for=condition=complete job ${JOB_NAME} -n ${NAMESPACE_NAME} --timeout=0 2>/dev/null
-if [ $? -eq 0 ]; then complete=true && break; fi
-
-${OC} wait --for=condition=failed job ${JOB_NAME} -n ${NAMESPACE_NAME} --timeout=0 2>/dev/null
-if [ $? -eq 0 ]; then failed=true && break; fi
-
-i=`expr $i + 1`
-
-sleep $sleep_seconds
-
-done
-
-${OC} describe pods -n ${NAMESPACE_NAME}
-
-if $failed; then
-    echo "Job ${JOB_NAME} failed"
-    exit 1
-elif $complete; then
-    echo "Job ${JOB_NAME} completed successfully"
-    ${OC} delete -f ${JOB_UNINSTALL_CPD_FILENAME}
-    if [ $? -ne 0 ]; then echo "Unable to delete job ${JOB_NAME}; exiting..." && exit 1; fi
-    exit 0
-fi
diff --git a/solutions/deploy/cloud-pak-deployer/versions.tf b/solutions/deploy/cloud-pak-deployer/version.tf
similarity index 100%
rename from solutions/deploy/cloud-pak-deployer/versions.tf
rename to solutions/deploy/cloud-pak-deployer/version.tf
diff --git a/solutions/deploy/cpd-image-build/main.tf b/solutions/deploy/cpd-image-build/main.tf
index 5a8c9a12..86de8e0f 100644
--- a/solutions/deploy/cpd-image-build/main.tf
+++ b/solutions/deploy/cpd-image-build/main.tf
@@ -89,19 +89,15 @@ module "code_engine_build" {
   depends_on = [module.code_engine]
 }
 
-resource "restapi_object" "buildrun" {
-  path = "/v2/projects/${module.code_engine.project_id}/build_runs"
-  data = jsonencode(
-    {
-      build_name = module.code_engine_build.name
-    }
-  )
-}
-
-resource "time_sleep" "wait_for_build" {
-  create_duration = "10m"
+resource "shell_script" "build_run" {
+  lifecycle_commands {
+    create = file("${path.module}/scripts/image-build.sh")
+    delete = ""
+    update = ""
+  }
 
-  depends_on = [
-    restapi_object.buildrun
-  ]
+  environment = {
+    REGION     = var.region
+    PROJECT_ID = module.code_engine.project_id
+  }
 }
diff --git a/solutions/deploy/cpd-image-build/scripts/image-build.sh b/solutions/deploy/cpd-image-build/scripts/image-build.sh
new file mode 100644
index 00000000..df11eedb
--- /dev/null
+++ b/solutions/deploy/cpd-image-build/scripts/image-build.sh
@@ -0,0 +1,38 @@
+#!/bin/bash
+
+BUILD_OUTPUT=$(curl -X POST "https://api.${REGION}.codeengine.cloud.ibm.com/v2/projects/${PROJECT_ID}/build_runs" -H "Authorization: ${TOKEN}" -H "Content-Type: application/json" -d '{ "build_name": "cpd-build" }')
+RC=$?
+
+BUILD_NAME=$(echo "${BUILD_OUTPUT}" | jq -r .name)
+
+if [ $RC -ne 0 ] || [ "${BUILD_NAME}" == "null" ]; then
+  echo "Creation of build run failed with rc = ${RC}.  Output = ${BUILD_OUTPUT}"
+  exit 1;
+fi
+
+SLEEP_SECONDS=60
+NUMBER_OF_RETRIES=15
+COMPLETE=false
+
+i=0
+while [ "${i}" -lt "${NUMBER_OF_RETRIES}" ]; do
+
+  echo "Running job ... $i"
+
+  BUILD_RUN_OUTPUT=$(curl -X GET "https://api.${REGION}.codeengine.cloud.ibm.com/v2/projects/${PROJECT_ID}/build_runs/${BUILD_NAME}" -H "Authorization: ${TOKEN}")
+  echo "${BUILD_RUN_OUTPUT}"
+
+  BUILD_STATUS=$(echo "${BUILD_RUN_OUTPUT}" | jq -r .status)
+  if [ "${BUILD_STATUS}" == "succeeded" ]; then COMPLETE=true && break; fi
+
+  i=$((i+1))
+
+  sleep "${SLEEP_SECONDS}"
+done
+
+if [ "${COMPLETE}" = false ]; then
+  echo "The build run did not complete in the alloted time.  Output = ${BUILD_RUN_OUTPUT}"
+  exit 1;
+fi
+
+exit 0;
diff --git a/solutions/deploy/cpd-image-build/versions.tf b/solutions/deploy/cpd-image-build/version.tf
similarity index 62%
rename from solutions/deploy/cpd-image-build/versions.tf
rename to solutions/deploy/cpd-image-build/version.tf
index 0ebc2970..9166ef9e 100644
--- a/solutions/deploy/cpd-image-build/versions.tf
+++ b/solutions/deploy/cpd-image-build/version.tf
@@ -9,13 +9,9 @@ terraform {
       source  = "hashicorp/random"
       version = ">= 3.4.3, < 4.0.0"
     }
-    restapi = {
-      source  = "Mastercard/restapi"
-      version = "1.18.2"
-    }
-    time = {
-      source  = "hashicorp/time"
-      version = "0.12.1"
+    shell = {
+      source  = "scottwinkler/shell"
+      version = "1.7.10"
     }
   }
 }
diff --git a/solutions/deploy/providers.tf b/solutions/deploy/providers.tf
index affc7d72..685e07ba 100644
--- a/solutions/deploy/providers.tf
+++ b/solutions/deploy/providers.tf
@@ -16,11 +16,8 @@ provider "kubernetes" {
 
 data "ibm_iam_auth_token" "tokendata" {}
 
-provider "restapi" {
-  uri                  = "https://api.${var.region}.codeengine.cloud.ibm.com/"
-  debug                = true
-  write_returns_object = true
-  headers = {
-    Authorization = data.ibm_iam_auth_token.tokendata.iam_access_token
+provider "shell" {
+  sensitive_environment = {
+    TOKEN = data.ibm_iam_auth_token.tokendata.iam_access_token
   }
 }
diff --git a/solutions/deploy/versions.tf b/solutions/deploy/version.tf
similarity index 84%
rename from solutions/deploy/versions.tf
rename to solutions/deploy/version.tf
index b810d56b..a70b47bd 100644
--- a/solutions/deploy/versions.tf
+++ b/solutions/deploy/version.tf
@@ -17,9 +17,9 @@ terraform {
       source  = "hashicorp/null"
       version = "3.2.2"
     }
-    restapi = {
-      source  = "Mastercard/restapi"
-      version = "1.18.2"
+    shell = {
+      source  = "scottwinkler/shell"
+      version = "1.7.10"
     }
   }
 }

From 30342f776d9db9091010eace6bc303e26c3713c9 Mon Sep 17 00:00:00 2001
From: Adam Geiger <ageiger@us.ibm.com>
Date: Mon, 13 Jan 2025 14:54:37 -0500
Subject: [PATCH 2/4] fix: update script files

---
 examples/basic/version.tf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/basic/version.tf b/examples/basic/version.tf
index 31d066b9..4c869c16 100644
--- a/examples/basic/version.tf
+++ b/examples/basic/version.tf
@@ -4,7 +4,7 @@ terraform {
     # renovate is set up to keep provider version at the latest for all DA solutions
     ibm = {
       source  = "IBM-Cloud/ibm"
-      version = "1.74.0"
+      version = "1.71.3"
     }
   }
 }

From c08f573937123d07b00cd73065754c770b22c488 Mon Sep 17 00:00:00 2001
From: Adam Geiger <ageiger@us.ibm.com>
Date: Mon, 13 Jan 2025 16:03:40 -0500
Subject: [PATCH 3/4] SKIP UPGRADE TEST

---
 examples/basic/README.md | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 examples/basic/README.md

diff --git a/examples/basic/README.md b/examples/basic/README.md
new file mode 100644
index 00000000..e69de29b

From 0ab3b2aa84f61bb211a7b9ef1e026d51c0dfe2bb Mon Sep 17 00:00:00 2001
From: Adam Geiger <ageiger@us.ibm.com>
Date: Tue, 14 Jan 2025 10:23:12 -0500
Subject: [PATCH 4/4] fix: indent loop within shell script

---
 .../cloud-pak-deployer/scripts/uninstall.sh   | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/solutions/deploy/cloud-pak-deployer/scripts/uninstall.sh b/solutions/deploy/cloud-pak-deployer/scripts/uninstall.sh
index c5fea9f3..9033f79e 100644
--- a/solutions/deploy/cloud-pak-deployer/scripts/uninstall.sh
+++ b/solutions/deploy/cloud-pak-deployer/scripts/uninstall.sh
@@ -13,20 +13,20 @@ failed=false
 i=0
 while [ $i -lt "${number_of_tries}" ]; do
 
-echo "Running job ... $i"
-${OC} get jobs -n "${NAMESPACE_NAME}"
+  echo "Running job ... $i"
+  ${OC} get jobs -n "${NAMESPACE_NAME}"
 
-${OC} wait --for=condition=complete job "${JOB_NAME}" -n "${NAMESPACE_NAME}" --timeout=0 2>/dev/null
-RC=$?
-if [ "${RC}" -eq 0 ]; then complete=true && break; fi
+  ${OC} wait --for=condition=complete job "${JOB_NAME}" -n "${NAMESPACE_NAME}" --timeout=0 2>/dev/null
+  RC=$?
+  if [ "${RC}" -eq 0 ]; then complete=true && break; fi
 
-${OC} wait --for=condition=failed job "${JOB_NAME}" -n "${NAMESPACE_NAME}" --timeout=0 2>/dev/null
-RC=$?
-if [ "${RC}" -eq 0 ]; then failed=true && break; fi
+  ${OC} wait --for=condition=failed job "${JOB_NAME}" -n "${NAMESPACE_NAME}" --timeout=0 2>/dev/null
+  RC=$?
+  if [ "${RC}" -eq 0 ]; then failed=true && break; fi
 
-i=$((i+1))
+  i=$((i+1))
 
-sleep "${sleep_seconds}"
+  sleep "${sleep_seconds}"
 
 done