Updates process for generating tile assets (#112)

* Updates process for generating tile assets

* Removes version from name

* Removes version from name

Author: Sean Sundberg

.tile/scripts/build.sh

@@ -27,7 +27,8 @@ if [ -z "${VERSION}" ]; then
   VERSION="#VERSION"
 fi
 
-WORKSPACE_DIR="./workspace"
+WORKSPACE_BASE="./workspace"
+WORKSPACE_DIR="${WORKSPACE_BASE}/${OFFERING_NAME}"
 mkdir -p "${WORKSPACE_DIR}"
 
 SRC_DIR="./terraform"
@@ -54,9 +55,9 @@ rm "${WORKSPACE_DIR}/stage3-logdna.tf"
 rm "${WORKSPACE_DIR}/stage3-sysdig.tf"
 
 echo "  - Creating offering - ${OUTPUT_DIR}/${OFFERING_NAME}.tar.gz"
-cd "${WORKSPACE_DIR}" && tar czf "${OUTPUT_DIR}/${OFFERING_NAME}.tar.gz" .
+cd "${WORKSPACE_BASE}" && tar czf "${OUTPUT_DIR}/${OFFERING_NAME}.tar.gz" .
 cd - 1> /dev/null
-rm -rf "${WORKSPACE_DIR}"
+rm -rf "${WORKSPACE_BASE}"
 
 echo "  - Creating offering json - ${OUTPUT_DIR}/offering-${OFFERING_NAME}.json"
 sed "s/#OFFERING/${OFFERING_NAME}/g" "${SCRIPT_DIR}/master.json" | sed "s/#VERSION/${VERSION}/g" > "${OUTPUT_DIR}/offering-${OFFERING_NAME}.json"

.tile/scripts/master.json

@@ -1,6 +1,6 @@
 {
   "label": "Cloud-Native Toolkit",
-  "name": "cloudnative-toolkit-#VERSION",
+  "name": "#OFFERING",
   "offering_icon_url": "https://globalcatalog.cloud.ibm.com/api/v1/1082e7d2-5e2f-0a11-a3bc-f88a8e1931fc/artifacts/terraform.svg",
   "tags": [
     "terraform",

.tile/scripts/master.sh

@@ -33,7 +33,7 @@ if [ -z "${GIT_REPO}" ]; then
 fi
 
 if [ -z "${OFFERING}" ]; then
-  OFFERING="offering-cloudnative-toolkit.json"
+  OFFERING="offering-cloudnative-toolkit"
 fi
 
 # input validation, Version is provided when the packaged release of this repository is created
@@ -88,7 +88,7 @@ if [ -z "${CATALOG_ID}" ]; then
 fi
 
 # Define the Offering and relationship to the Catalog
-curl -sL "https://github.com/${GIT_REPO}/releases/download/${VERSION}/${OFFERING}" | sed "s/#CATALOG_ID/${CATALOG_ID}/g" | sed "s/#VERSION/${VERSION}/g" > offering.json
+curl -sL "https://github.com/${GIT_REPO}/releases/download/${VERSION}/${OFFERING}.json" | sed "s/#CATALOG_ID/${CATALOG_ID}/g" | sed "s/#VERSION/${VERSION}/g" > offering.json
 
 echo "Creating Offering in Catalog ${CATALOG_ID}"
 CATALOGS=$(eval ${ACURL} -location -request POST "${HOST}/catalogs/${CATALOG_ID}/offerings" -H 'Content-Type: application/json' --data "@offering.json")