diff --git a/.github/workflows/reusable_deploy.yml b/.github/workflows/reusable_deploy.yml index be09f35..c01dd4c 100644 --- a/.github/workflows/reusable_deploy.yml +++ b/.github/workflows/reusable_deploy.yml @@ -29,7 +29,22 @@ jobs: - name: add extra deployment steps for dev id: devSteps if: ${{ inputs.environment == 'dev' }} - run: echo 'command="cf create-service aws-rds micro-psql charlie-brain; bash .github/workflows/wait-for-database.sh"' >> "$GITHUB_OUTPUT" + env: + CF_API: ${{ secrets.CF_API }} + CF_ORG: ${{ secrets.CF_ORG }} + CF_PASSWORD: ${{ secrets.CF_PASSWORD }} + CF_SPACE: ${{ inputs.environment }} + CF_USERNAME: ${{ secrets.CF_USERNAME }} + run: | + cf login -a $CF_API -u $CF_USERNAME -p $CF_PASSWORD -o $CF_ORG -s $CF_SPACE + cf create-service aws-rds micro-psql charlie-brain + STATUS="$(cf service charlie-brain | grep " status:" | awk -F ":" '{print $2}' | xargs)" + while [ "$STATUS" != "create succeeded" ] + do + echo "Waiting for database service to be ready..." + sleep 10 + STATUS="$(cf service charlie-brain | grep " status:" | awk -F ":" '{print $2}' | xargs echo)" + done - name: push to cloud.gov env: CF_API: ${{ secrets.CF_API }} @@ -39,5 +54,4 @@ jobs: CF_USERNAME: ${{ secrets.CF_USERNAME }} run: | cf login -a $CF_API -u $CF_USERNAME -p $CF_PASSWORD -o $CF_ORG -s $CF_SPACE - ${{ steps.devSteps.outputs.command }} cf push -f manifest.yml --vars-file ./${{ inputs.environment }}.yml diff --git a/.github/workflows/wait-for-database.sh b/.github/workflows/wait-for-database.sh deleted file mode 100755 index f25dc53..0000000 --- a/.github/workflows/wait-for-database.sh +++ /dev/null @@ -1,9 +0,0 @@ -#!/usr/bin/env bash - -STATUS="$(cf service charlie-brain | grep " status:" | awk -F ":" '{print $2}' | xargs)" -while [ "$STATUS" != "create succeeded" ] -do - echo "Waiting for database service to be ready..." - sleep 10 - $STATUS=$(cf service charlie-brain | grep " status:" | awk -F ":" '{print $2}' | xargs) -done diff --git a/src/brain.js b/src/brain.js index 4b14c25..0c1b672 100644 --- a/src/brain.js +++ b/src/brain.js @@ -14,7 +14,7 @@ const set = async (key, value) => { }; const initialize = async (config = process.env) => { - client = new Client({ connectionString: config.DATABASE_URL }); + client = new Client({ connectionString: config.DATABASE_URL, ssl: true }); await client.connect(); await client.query(