From 40ff7fe76a4b5080dfd6dd20ab32ad424b672691 Mon Sep 17 00:00:00 2001 From: Andrew Matthews Date: Thu, 15 Dec 2022 12:03:05 -0500 Subject: [PATCH] Detect vendor and decode keys for bitbucket (#10) --- .github/actions/deploy/action.yml | 1 - entrypoint.sh | 16 ++++++++++++++-- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/.github/actions/deploy/action.yml b/.github/actions/deploy/action.yml index 4b7c00f..f2bc5b5 100644 --- a/.github/actions/deploy/action.yml +++ b/.github/actions/deploy/action.yml @@ -41,4 +41,3 @@ runs: PHP_LINT: ${{ inputs.PHP_LINT }} CACHE_CLEAR: ${{ inputs.CACHE_CLEAR }} SCRIPT: ${{ inputs.SCRIPT }} - CICD_VENDOR: 'e2e_tests' \ No newline at end of file diff --git a/entrypoint.sh b/entrypoint.sh index 4dc53c8..e1579db 100755 --- a/entrypoint.sh +++ b/entrypoint.sh @@ -12,7 +12,6 @@ validate() { : PHP_LINT="${PHP_LINT:="FALSE"}" : CACHE_CLEAR="${CACHE_CLEAR:="TRUE"}" : SCRIPT="${SCRIPT:=""}" - : CICD_VENDOR="${CICD_VENDOR:="wpe-cicd"}" } setup_env() { @@ -27,6 +26,13 @@ setup_env() { else echo "Failure: Missing environment variable..." && exit 1; fi + if [[ -n ${GITHUB_ACTIONS} ]]; then + CICD_VENDOR="wpe_gha"; + elif [[ -n ${BITBUCKET_BUILD_NUMBER} ]]; then + CICD_VENDOR="wpe_bb"; + else CICD_VENDOR="wpe_cicd" + fi + echo "Deploying your code to:" echo "${WPE_ENV_NAME}" @@ -55,7 +61,13 @@ setup_ssh_dir() { #Copy secret keys to container WPE_SSHG_KEY_PRIVATE_PATH="${SSH_PATH}/wpe_id_rsa" - umask 077 ; echo "${WPE_SSHG_KEY_PRIVATE}" > "${WPE_SSHG_KEY_PRIVATE_PATH}" + + if [ "${CICD_VENDOR}" == "wpe_bb" ]; then + # Only Bitbucket keys require base64 decode + umask 077 ; echo "${WPE_SSHG_KEY_PRIVATE}" | base64 -d > "${WPE_SSHG_KEY_PRIVATE_PATH}" + else umask 077 ; echo "${WPE_SSHG_KEY_PRIVATE}" > "${WPE_SSHG_KEY_PRIVATE_PATH}" + fi + chmod 600 "${WPE_SSHG_KEY_PRIVATE_PATH}" #establish knownhosts KNOWN_HOSTS_PATH="${SSH_PATH}/known_hosts"