Merge pull request #23 from gsi-labs/patch/solution-builder

Added static files at tf build

public/credentials.template

@@ -0,0 +1,4 @@
+# Add the values for the Credentials to access the IBM Cloud
+# Instructions to access this information can be found in the README.MD
+# This is a template file and the ./launch.sh script looks for a file based on this template named credentials.properties
+ibmcloud.api.key=""

public/launch.sh

@@ -0,0 +1,36 @@
+#!/usr/bin/env bash
+
+ENV="credentials"
+
+function prop {
+    grep "${1}" ${ENV}.properties | grep -vE "^#" | cut -d'=' -f2 | sed 's/"//g'
+}
+
+if [[ -f "${ENV}.properties" ]]; then
+    # Load the credentials
+    IBMCLOUD_API_KEY=$(prop 'ibmcloud.api.key')
+    CLASSIC_API_KEY=$(prop 'classic.api.key')
+    CLASSIC_USERNAME=$(prop 'classic.username')
+    LOGIN_USER=$(prop 'login.user')
+    LOGIN_PASSWORD=$(prop 'login.password')
+    LOGIN_TOKEN=$(prop 'login.token')
+    SERVER_URL=$(prop 'server.url')
+else
+    echo "Error: The ${ENV}.properties file is not found."
+    exit 1
+fi
+
+if [[ -d "workspace" ]]; then
+    echo "Found workspace"
+else
+    mkdir workspace
+    cp terraform/* workspace
+    cp utils/* workspace
+fi
+
+docker run -it \
+  -e "TF_VAR_ibmcloud_api_key=${IBMCLOUD_API_KEY}" \
+  -e "IBMCLOUD_API_KEY=${IBMCLOUD_API_KEY}" \
+  -v ${PWD}:/terraform \
+  -w /terraform/workspace \
+  quay.io/ibmgaragecloud/cli-tools:v0.15

public/utils/apply-all.sh

@@ -0,0 +1,15 @@
+#!/usr/bin/env bash
+
+find . -type d -maxdepth 1 | grep -vE "[.]/[.].*" | grep -vE "^[.]$" | grep -v workspace | sort | \
+  while read dir;
+do
+  name=$(echo "$dir" | sed -E "s~[.]/(.*)~\1~g")
+
+  echo "*** Applying ${name} ***"
+
+  cd "${name}" && \
+    terraform init && \
+    terraform apply -auto-approve && \
+    cd - 1> /dev/null || \
+    exit 1
+done

public/utils/apply.sh

@@ -0,0 +1,3 @@
+#!/usr/bin/env bash
+
+terraform apply -auto-approve

public/utils/destroy-all.sh

@@ -0,0 +1,20 @@
+#!/usr/bin/env bash
+
+find . -type d -maxdepth 1 | grep -vE "[.]/[.].*" | grep -vE "^[.]$" | grep -v workspace | sort -r | \
+  while read dir;
+do
+  name=$(echo "$dir" | sed -E "s~[.]/(.*)~\1~g")
+
+  if [[ ! -f "./${name}/terraform.tfstate" ]]; then
+    echo "*** No state found for ${name}. Skipping ***"
+    continue
+  fi
+
+  echo "*** Destroying ${name} ***"
+
+  cd "${name}" && \
+    terraform init && \
+    ./destroy.sh && \
+    cd - 1> /dev/null || \
+    exit 1
+done

public/utils/destroy.sh

@@ -0,0 +1,39 @@
+#! /bin/bash
+
+RESOURCE_FILTER="$1"
+
+echo ""
+echo "Listing current state"
+terraform state list
+
+if [[ -n "${RESOURCE_FILTER}" ]]; then
+  echo ""
+  echo "Collecting resources to destroy using filter: ${RESOURCE_FILTER}"
+  RESOURCE_LIST=""
+  while read -r resource; do
+    echo "  Adding $resource to destroy targets"
+    RESOURCE_LIST="$RESOURCE_LIST -target=$resource"
+  done < <(terraform state list | grep -E "${RESOURCE_FILTER}")
+else
+  echo ""
+  echo "Collecting resources to destroy"
+  RESOURCE_LIST=""
+  while read -r resource; do
+    echo "  Adding $resource to destroy targets"
+    RESOURCE_LIST="$RESOURCE_LIST -target=$resource"
+  done < <(terraform state list)
+fi
+
+if [[ -n "$RESOURCE_LIST" ]]; then
+  echo ""
+  echo "Planning destroy"
+  terraform plan -destroy ${RESOURCE_LIST} -out=destroy.plan
+
+  echo ""
+  echo "Destroying resources"
+  terraform apply -auto-approve destroy.plan
+else
+  echo ""
+  echo "Nothing to destroy!!"
+fi
+

src/helpers/services.helper.ts

@@ -396,14 +396,17 @@ export class ServicesHelper {
             }
         }
 
-
         let mdfiles = "";
         terraformComponent.files.map(async (file: OutputFile) => {
             if (file.type === "documentation") {
                 mdfiles += "- [" + file.name + "](" + file.name + ")\n";
             }
         });
 
+        zip.addLocalFolder('./public/utils', 'utils');
+        zip.addLocalFile('./public/credentials.template')
+        zip.addLocalFile('./public/launch.sh')
+
         // Load the Core ReadME
         const readme = new UrlFile({ name: 'README.MD', type: OutputFileType.documentation, url: "https://raw.githubusercontent.com/ibm-gsi-ecosystem/ibm-enterprise-catalog-tiles/main/BUILD.MD" });
         const newFiles = terraformComponent.files;
@@ -422,6 +425,8 @@ export class ServicesHelper {
 
             let contents: string | Buffer = "";
             //console.log(file.name);
+            if (file.name.endsWith('.tfvars')) file.name = `terraform/${file.name.replace('terraform', `${bom.metadata.name}.auto`)}`;
+            if (file.name.endsWith('.tf')) file.name = `terraform/${file.name}`;
             if (file.type === "documentation") {
                 try {
                     // eslint-disable-next-line @typescript-eslint/no-explicit-any
@@ -442,10 +447,6 @@ export class ServicesHelper {
                     console.log("failed to load contents from ", file.name);
                 }
             } else {
-                if (file.type === 'terraform') {
-                    if (file.name?.endsWith('.tfvars')) file.name = file.name.replace('terraform', `${bom.metadata.name}.auto`);
-                    file.name = `terraform/${file.name}`;
-                }
                 try {
                     contents = (await file.contents).toString();
                 } catch (e) {