Commit 02ac4b4f authored by Hordur Freyr Yngvason's avatar Hordur Freyr Yngvason
Browse files

Merge branch 'guard_unknown_postgres_channel' into 'master' 

fix: Guard against unknown AUTO_DEVOPS_POSTGRES_CHANNEL

See merge request gitlab-org/cluster-integration/auto-deploy-image!60
parents 6a046789 e25ae148

.gitlab/ci/test.gitlab-ci.yml

+2 −0
Original line number Diff line number Diff line
@@ -105,6 +105,8 @@ test-auto_database_url: 
        echo "\$auto_database_url = '${auto_database_url}', want '${expected_url}'"

        exit 1

      fi

    - export AUTO_DEVOPS_POSTGRES_CHANNEL=a

    - auto-deploy auto_database_url && expected_error || failed_as_expected



test-get-replicas:

  <<: *test-job

src/bin/auto-deploy

+4 −0
Original line number Diff line number Diff line
@@ -93,6 +93,10 @@ function auto_database_url() { 
    auto_database_url="postgres://${POSTGRES_USER}:${POSTGRES_PASSWORD}@${POSTGRESQL_RELEASE_NAME}:5432/${POSTGRES_DB}"

  elif [[ "$AUTO_DEVOPS_POSTGRES_CHANNEL" == "1" ]]; then

    auto_database_url="postgres://${POSTGRES_USER}:${POSTGRES_PASSWORD}@${RELEASE_NAME}-postgres:5432/${POSTGRES_DB}"

  else

    echo "Un-recognized \$AUTO_DEVOPS_POSTGRES_CHANNEL variable '${AUTO_DEVOPS_POSTGRES_CHANNEL}'. Accepted values are '1' and '2'"



    exit 1

  fi



  echo "${DATABASE_URL-$auto_database_url}"