Commit 29fb8e8a authored by Pierre Smeyers's avatar Pierre Smeyers
Browse files

fix(bash mode): unmask errors in shell pipelines with 'set -o pipefail'

parent e8222109
Loading
Loading
Loading
Loading
+4 −3
Original line number Diff line number Diff line
@@ -357,7 +357,7 @@ stages:

.cf-scripts: &cf-scripts |
  # BEGSCRIPT
  set -e
  set -eo pipefail

  function log_info() {
      echo -e "[\\e[1;94mINFO\\e[0m] $*"
@@ -549,7 +549,8 @@ stages:
  }

  function eval_all_secrets() {
    encoded_vars=$(env | grep -Ev '(^|.*_ENV_)scoped__' | awk -F '=' '/^[a-zA-Z0-9_]*=@(b64|hex|url)@/ {print $1}')
    # exclude scoped variables and their copies passed to container services (`<service_name>_ENV_scoped__xxx`)
    encoded_vars=$(env | awk -F '=' '$1 !~ /(^|_ENV_)scoped__/ && $2 ~ /^@(b64|hex|url)@/ {print $1}')
    for var in $encoded_vars
    do
      eval_secret "$var"
@@ -890,7 +891,7 @@ stages:
    log_info "--- \\e[32mblue-green [1/5]\\e[0m: deploy new app as \\e[33;1m${app_tmp}\\e[0m on temporary route \\e[33;1m$hostname_tmp.$domain_tmp\\e[0m..."

    # try/catch-like pattern
    set -E
    set -eo pipefail
    trap 'blue_green_rollback "$app_tmp"' ERR
    simple_deploy "$environment_type" "$app_tmp" "$hostname_tmp" "$domain_tmp" "$vroute_path" "$push_args" "$app_target"
    set +E