Skip to content
Snippets Groups Projects
Commit ea7bb204 authored by Pierre SMEYERS's avatar Pierre SMEYERS
Browse files

Merge branch '4-fix_environement_variable' into 'master'

fix: convert environement gcp_key_file content to file

Closes #4

See merge request to-be-continuous/gcloud!4
parents 9ddd5931 0a2e8eb5
No related branches found
No related tags found
No related merge requests found
...@@ -79,6 +79,15 @@ stages: ...@@ -79,6 +79,15 @@ stages:
fi fi
} }
function as_content() {
file_or_content=$1
if [[ -f ${file_or_content} ]]; then
cat "${file_or_content}"
else
echo "${file_or_content}"
fi
}
function unscope_variables() { function unscope_variables() {
_scoped_vars=$(env | awk -F '=' "/^scoped__[a-zA-Z0-9_]+=/ {print \$1}" | sort) _scoped_vars=$(env | awk -F '=' "/^scoped__[a-zA-Z0-9_]+=/ {print \$1}" | sort)
if [[ -z "$_scoped_vars" ]]; then return; fi if [[ -z "$_scoped_vars" ]]; then return; fi
...@@ -359,7 +368,8 @@ stages: ...@@ -359,7 +368,8 @@ stages:
- *gcp-scripts - *gcp-scripts
- install_ca_certs "${CUSTOM_CA_CERTS:-$DEFAULT_CA_CERTS}" - install_ca_certs "${CUSTOM_CA_CERTS:-$DEFAULT_CA_CERTS}"
- assert_defined "${ENV_KEY_FILE:-$GCP_KEY_FILE}" 'Missing required GCP key file (JSON)' - assert_defined "${ENV_KEY_FILE:-$GCP_KEY_FILE}" 'Missing required GCP key file (JSON)'
- gcloud auth activate-service-account --key-file ${ENV_KEY_FILE:-$GCP_KEY_FILE} - as_content "${ENV_KEY_FILE:-$GCP_KEY_FILE}" > /tmp/gcp.key
- gcloud auth activate-service-account --key-file /tmp/gcp.key
script: script:
- deploy "$ENV_TYPE" "${ENV_APP_NAME:-${GCP_BASE_APP_NAME}${ENV_APP_SUFFIX}}" "$ENV_PROJECT" "$ENV_URL" - deploy "$ENV_TYPE" "${ENV_APP_NAME:-${GCP_BASE_APP_NAME}${ENV_APP_SUFFIX}}" "$ENV_PROJECT" "$ENV_URL"
artifacts: artifacts:
...@@ -390,7 +400,8 @@ stages: ...@@ -390,7 +400,8 @@ stages:
- *gcp-scripts - *gcp-scripts
- install_ca_certs "${CUSTOM_CA_CERTS:-$DEFAULT_CA_CERTS}" - install_ca_certs "${CUSTOM_CA_CERTS:-$DEFAULT_CA_CERTS}"
- assert_defined "${ENV_KEY_FILE:-$GCP_KEY_FILE}" 'Missing required GCP key file (JSON)' - assert_defined "${ENV_KEY_FILE:-$GCP_KEY_FILE}" 'Missing required GCP key file (JSON)'
- gcloud auth activate-service-account --key-file ${ENV_KEY_FILE:-$GCP_KEY_FILE} - as_content "${ENV_KEY_FILE:-$GCP_KEY_FILE}" > /tmp/gcp.key
- gcloud auth activate-service-account --key-file /tmp/gcp.key
script: script:
- delete "$ENV_TYPE" "${ENV_APP_NAME:-${GCP_BASE_APP_NAME}${ENV_APP_SUFFIX}}" "$ENV_PROJECT" - delete "$ENV_TYPE" "${ENV_APP_NAME:-${GCP_BASE_APP_NAME}${ENV_APP_SUFFIX}}" "$ENV_PROJECT"
environment: environment:
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment