ci: onboard to new catalog pipeline (#623)

Author: ocofaigh

.catalog-onboard-pipeline.yaml

@@ -0,0 +1,49 @@
+---
+apiVersion: v1
+offerings:
+  - name: deploy-arch-ibm-slz-vsi
+    kind: solution
+    catalog_id: 7df1e4ca-d54c-4fd0-82ce-3d13247308cd
+    offering_id: ef663980-4c71-4fac-af4f-4a510a9bcf68
+    variations:
+      - name: quickstart
+        mark_ready: false
+        install_type: fullstack
+        pre_validation: "tests/scripts/pre-validation-generate-ssh-key.sh ssh_key patterns/vsi-quickstart"
+        destroy_resources_on_failure: true
+        destroy_workspace_on_failure: false
+      - name: standard
+        mark_ready: false
+        install_type: fullstack
+        pre_validation: "tests/scripts/pre-validation-generate-ssh-key.sh ssh_public_key patterns/vsi"
+        destroy_resources_on_failure: true
+        destroy_workspace_on_failure: false
+        scc:
+          instance_id: 1c7d5f78-9262-44c3-b779-b28fe4d88c37
+          region: us-south
+  - name: deploy-arch-ibm-slz-vpc
+    kind: solution
+    catalog_id: 7df1e4ca-d54c-4fd0-82ce-3d13247308cd
+    offering_id: 9fc0fa64-27af-4fed-9dce-47b3640ba739
+    variations:
+      - name: standard
+        mark_ready: false
+        install_type: fullstack
+        destroy_resources_on_failure: true
+        destroy_workspace_on_failure: false
+        scc:
+          instance_id: 1c7d5f78-9262-44c3-b779-b28fe4d88c37
+          region: us-south
+  - name: deploy-arch-ibm-slz-ocp
+    kind: solution
+    catalog_id: 7df1e4ca-d54c-4fd0-82ce-3d13247308cd
+    offering_id: 95fccffc-ae3b-42df-b6d9-80be5914d852
+    variations:
+      - name: standard
+        mark_ready: false
+        install_type: fullstack
+        destroy_resources_on_failure: true
+        destroy_workspace_on_failure: false
+        scc:
+          instance_id: 1c7d5f78-9262-44c3-b779-b28fe4d88c37
+          region: us-south

.releaserc

@@ -12,7 +12,7 @@
       "successCmd": "echo \"SEMVER_VERSION=${nextRelease.version}\" >> $GITHUB_ENV"
     }],
     ["@semantic-release/exec",{
-      "publishCmd": "./ci/run-catalog-onboarding-pipeline.sh --version=v${nextRelease.version} --github_url=github.com --github_org=terraform-ibm-modules"
+      "publishCmd": "./ci/trigger-catalog-onboarding-pipeline.sh --version=v${nextRelease.version}"
     }]
   ]
 }

patterns/roks/catalogValidationValues.json.template

@@ -3,5 +3,7 @@
   "region": "us-south",
   "entitlement": "cloud_pak",
   "tags": $TAGS,
-  "prefix": $PREFIX
+  "prefix": $PREFIX,
+  "enable_transit_gateway": false,
+  "add_atracker_route": false
 }

patterns/vpc/catalogValidationValues.json.template

@@ -2,5 +2,7 @@
   "ibmcloud_api_key": $VALIDATION_APIKEY,
   "region": "us-east",
   "tags": $TAGS,
-  "prefix": $PREFIX
+  "prefix": $PREFIX,
+  "enable_transit_gateway": false,
+  "add_atracker_route": false
 }

patterns/vsi/catalogValidationValues.json.template

@@ -2,5 +2,7 @@
   "ibmcloud_api_key": $VALIDATION_APIKEY,
   "region": "eu-gb",
   "tags": $TAGS,
-  "prefix": $PREFIX
+  "prefix": $PREFIX,
+  "enable_transit_gateway": false,
+  "add_atracker_route": false
 }

tests/resources/main.tf

@@ -2,30 +2,38 @@
 
 set -e
 
+USAGE="
+NB: This script has been designed to be run from the repos root level directroy, as that is where it will be executed from in the pre-validation stage of the catalog onboarding pipeline.
+
+The script will generate SSH keys and then append the public key to the catalogValidationValues.json file which is generated by the onboarding catalog pipeline before this script runs.
+
+Usage (from repos root directory): ./tests/scripts/pre-validation-generate-ssh-key.sh <ssh_key_variable_name> <directory_of_json>
+
+where:
+<ssh_key_variable_name> = The name of the terraform variable which takes the SSH public key as input
+<directory_of_json> = The directory where the catalogValidationValues.json file exists (will be the same directroy as the terraform code being onboarded)
+"
+
 if [ $# -eq 0 ]; then
-  echo "No arguments supplied - expected the terraform input variable name for ssh public key"
+  echo "No arguments supplied. See usage:"
+  echo "${USAGE}"
   exit 1
 fi
 
-var_name=$1
-
-# Paths relative to base directory of script
-BASE_DIR=$(dirname "$0")
-TERRAFORM_SOURCE_DIR="../resources"
-JSON_FILE="../../../catalogValidationValues.json"
+VAR_NAME=$1
+DIR=$2
 
-(
-  # Execute script from base directory
-  cd "${BASE_DIR}"
-  echo "Generating SSH public key to be used for validation .."
+# Generate SSH keys and place in temp directory
+temp_dir=$(mktemp -d)
+ssh-keygen -f "${temp_dir}/id_rsa" -t rsa -N '' <<<y
 
-  cd ${TERRAFORM_SOURCE_DIR}
-  terraform init || exit 1
-  terraform apply -auto-approve || exit 1
+# Extract public key value and delete temp directory
+ssh_public_key=$(cat "${temp_dir}/id_rsa.pub")
+rm -rf "${temp_dir}"
 
-  ssh_public_key=$(terraform output -state=terraform.tfstate -raw ssh_public_key)
-  echo "Appending SSH public key to $(basename ${JSON_FILE}).."
-  jq -r --arg var_name "${var_name}" --arg ssh_public_key "${ssh_public_key}" '. + {($var_name): $ssh_public_key}' "${JSON_FILE}" > tmpfile && mv tmpfile "${JSON_FILE}" || exit 1
+# Append the SSH public key value to the JSON file which will be used during catalog onboarding validation
+json_file="${DIR}/catalogValidationValues.json"  # This gets created by pipeline code based on the catalogValidationValues.json.template
+echo "Appending SSH public key to ${json_file}.."
+jq -r --arg var_name "${VAR_NAME}" --arg ssh_public_key "${ssh_public_key}" '. + {($var_name): $ssh_public_key}' "${json_file}" > tmpfile && mv tmpfile "${json_file}" || exit 1
 
-  echo "Pre-validation complete successfully"
-)
+echo "Pre-validation complete successfully"