Commit bede6e3a authored by Pierre Smeyers's avatar Pierre Smeyers
Browse files

Merge branch 'feat/better-logs-decode-url-secrets' into 'master' 

feat: improve logs when @url@ variable eval fails

See merge request to-be-continuous/dbt!14
parents 96b8c9c2 58467fc5

templates/gitlab-ci-dbt.yml

+10 −6
Original line number Diff line number Diff line
@@ -246,25 +246,29 @@ stages: 
      then

        decoded=$(mktemp)

        errors=$(mktemp)

        if curl -s -S -f --connect-timeout 5 -o "${decoded}" "$url" 2> "${errors}"

        if curl -s -S -f --connect-timeout 5 -o "${decoded}" "$url"

        then

          # shellcheck disable=SC2086

          export ${name}="$(cat ${decoded})"

          log_info "Successfully curl'd secret \\e[33;1m${name}\\e[0m"

        else

          fail "Failed getting secret \\e[33;1m${name}\\e[0m:\\n$(sed 's/^/... /g' "${errors}")"

          curl -s -S --connect-timeout 5 -o "${decoded}" "$url" 2> "${errors}"

          fail "Failed getting secret \\e[33;1m${name}\\e[0m:\\n$(sed 's/^/... /g' "${decoded}")\\n... -----\\n$(sed 's/^/... /g' "${errors}")"

        fi

      elif command -v wget > /dev/null

      then

        decoded=$(mktemp)

        errors=$(mktemp)

        if wget -T 5 -O "${decoded}" "$url" 2> "${errors}"

        _extra_opts="--content-on-error"

        if command -v busybox > /dev/null; then _extra_opts=""; fi

        # shellcheck disable=SC2086

        if wget $_extra_opts -T 5 -O "${decoded}" "$url" 2> "${errors}"

        then

          # shellcheck disable=SC2086

          export ${name}="$(cat ${decoded})"

          log_info "Successfully wget'd secret \\e[33;1m${name}\\e[0m"

        else

          fail "Failed getting secret \\e[33;1m${name}\\e[0m:\\n$(sed 's/^/... /g' "${errors}")"

          fail "Failed getting secret \\e[33;1m${name}\\e[0m:\\n$(sed 's/^/... /g' "${decoded}")\\n... -----\\n$(sed 's/^/... /g' "${errors}")"

        fi

      else

        fail "Couldn't get secret \\e[33;1m${name}\\e[0m: no http client found"