Commit 41f2e12f authored by Pierre Smeyers's avatar Pierre Smeyers
Browse files

refactor(script): retrieve function params directly from env

parent 4db1c1e0

templates/gitlab-ci-aws.yml

+12 −12
Original line number Diff line number Diff line
@@ -275,8 +275,8 @@ stages: 
    fi

  }



  function auth() {

    oidc_role_arn="$1"

  function aws_auth() {

    oidc_role_arn=${ENV_OIDC_ROLE_ARN:-${AWS_OIDC_ROLE_ARN}}

    if [[ "$oidc_role_arn" ]]

    then

      log_info "Obtaining temporary credentials with OpenID connect..."
@@ -290,10 +290,10 @@ stages: 
  }



  # application deployment function

  function deploy() {

    export environment_type=$1

    export environment_name=$2

    environment_url=$3

  function aws_deploy() {

    export environment_type=$ENV_TYPE

    export environment_name=${ENV_APP_NAME:-${AWS_BASE_APP_NAME}${ENV_APP_SUFFIX}}

    environment_url=${ENV_URL:-${AWS_ENVIRONMENT_URL:-$ENV_URL_LEGACY}}



    # backward compatibility

    export env=$environment_type
@@ -338,9 +338,9 @@ stages: 
  }



  # environment cleanup function

  function delete() {

    export environment_type=$1

    export environment_name=$2

  function aws_delete() {

    export environment_type=$ENV_TYPE

    export environment_name=${ENV_APP_NAME:-${AWS_BASE_APP_NAME}${ENV_APP_SUFFIX}}

    

    # backward compatibility

    export env=$environment_type
@@ -378,7 +378,7 @@ stages: 
  before_script:

    - *aws-scripts

    - install_ca_certs "${CUSTOM_CA_CERTS:-$DEFAULT_CA_CERTS}"

    - auth "${ENV_OIDC_ROLE_ARN:-${AWS_OIDC_ROLE_ARN}}"

    - aws_auth



# Deploy job prototype

# Can be extended to define a concrete environment
@@ -393,7 +393,7 @@ stages: 
  variables:

    ENV_APP_SUFFIX: "-$CI_ENVIRONMENT_SLUG"

  script:

    - deploy "$ENV_TYPE" "${ENV_APP_NAME:-${AWS_BASE_APP_NAME}${ENV_APP_SUFFIX}}" "${ENV_URL:-${AWS_ENVIRONMENT_URL:-$ENV_URL_LEGACY}}"

    - aws_deploy

  artifacts:

    name: "$ENV_TYPE env url for $CI_PROJECT_NAME on $CI_COMMIT_REF_SLUG"

    paths:
@@ -417,7 +417,7 @@ stages: 
  variables:

    ENV_APP_SUFFIX: "-$CI_ENVIRONMENT_SLUG"

  script:

    - delete "$ENV_TYPE" "${ENV_APP_NAME:-${AWS_BASE_APP_NAME}${ENV_APP_SUFFIX}}"

    - aws_delete

  environment:

    action: stop