Release v0.5.0.beta.1 (sprint 34)

.github/workflows/build-and-deploy-main-waf.yml

@@ -2,7 +2,7 @@ name: Update Main WAF
 
 on:
   schedule:
-    - cron: '0 5 * * 4'
+    - cron: "0 5 * * 4"
 
 jobs:
   checkVersion:
@@ -19,15 +19,15 @@ jobs:
         run: ./scripts/pipeline/deb-cf-install.sh
       - name: Cloud.gov login
         env:
-          CF_USER: '${{ secrets.CF_USER }}'
-          CF_PASSWORD: '${{ secrets.CF_PASSWORD }}'
-          CF_ORG: '${{ secrets.CF_ORG }}'
-          PROJECT: '${{ secrets.PROJECT }}'
+          CF_USER: "${{ secrets.CF_USER }}"
+          CF_PASSWORD: "${{ secrets.CF_PASSWORD }}"
+          CF_ORG: "${{ secrets.CF_ORG }}"
+          PROJECT: "${{ secrets.PROJECT }}"
         run: source ./scripts/pipeline/cloud-gov-login.sh
       - name: Check version
         id: version
         env:
-          PROJECT: '${{ secrets.PROJECT }}'
+          PROJECT: "${{ secrets.PROJECT }}"
         run: |
           ubuntu_version=${{ vars.UBUNTU_VERSION }}
           modsecurity_nginx_version=${{ vars.MODSECURITY_NGINX_VERSION }}
@@ -54,44 +54,44 @@ jobs:
         run: ./scripts/pipeline/deb-cf-install.sh
       - name: Cloud.gov login
         env:
-          CF_USER: '${{ secrets.CF_USER }}'
-          CF_PASSWORD: '${{ secrets.CF_PASSWORD }}'
-          CF_ORG: '${{ secrets.CF_ORG }}'
-          PROJECT: '${{ secrets.PROJECT }}'
-          TF_BASTION: '${{ secrets.TF_BASTION }}'
-          TF_BACKEND_SPACE: '${{ secrets.TF_BACKEND_SPACE }}'
+          CF_USER: "${{ secrets.CF_USER }}"
+          CF_PASSWORD: "${{ secrets.CF_PASSWORD }}"
+          CF_ORG: "${{ secrets.CF_ORG }}"
+          PROJECT: "${{ secrets.PROJECT }}"
+          TF_BASTION: "${{ secrets.TF_BASTION }}"
+          TF_BACKEND_SPACE: "${{ secrets.TF_BACKEND_SPACE }}"
         run: |
           source ./scripts/pipeline/cloud-gov-login.sh
           cf target -s "${TF_BACKEND_SPACE}" >/dev/null 2>&1
       - name: Start Bastion
         env:
-          TF_BASTION: '${{ secrets.TF_BASTION }}'
+          TF_BASTION: "${{ secrets.TF_BASTION }}"
         run: |
           cf start "${TF_BASTION}"  >/dev/null 2>&1
           ./scripts/pipeline/cloud-gov-wait-for-app-start.sh "${TF_BASTION}"
       - name: Cloud.gov bastion git checkout
         env:
-          TF_BASTION: '${{ secrets.TF_BASTION }}'
+          TF_BASTION: "${{ secrets.TF_BASTION }}"
         run: |
           declare -a commands=("rm -rf px-benefit-finder" "git clone https://github.com/GSA/px-benefit-finder.git && cd px-benefit-finder && git checkout ${BRANCH}")
           for command in "${commands[@]}"; do
             ./scripts/pipeline/cloud-gov-remote-command.sh "${TF_BASTION}" "${command}" 1
           done
       - name: Build nginx WAF Plugin
         env:
-          ubuntu_version: '${{ vars.UBUNTU_VERSION }}'
-          modsecurity_nginx_version: '${{ vars.MODSECURITY_NGINX_VERSION }}'
+          ubuntu_version: "${{ vars.UBUNTU_VERSION }}"
+          modsecurity_nginx_version: "${{ vars.MODSECURITY_NGINX_VERSION }}"
           new_nginx_version: ${{ needs.checkVersion.outputs.new_nginx_version }}
-          TF_BASTION: '${{ secrets.TF_BASTION }}'
+          TF_BASTION: "${{ secrets.TF_BASTION }}"
         run: |
           source ./scripts/pipeline/terraform-build-waf-plugin.sh
       - name: Configure Terraform
         env:
-          CF_USER: '${{ secrets.CF_USER }}'
-          CF_PASSWORD: '${{ secrets.CF_PASSWORD }}'
-          CF_ORG: '${{ secrets.CF_ORG }}'
-          PROJECT: '${{ secrets.PROJECT }}'
-          TF_BASTION: '${{ secrets.TF_BASTION }}'
+          CF_USER: "${{ secrets.CF_USER }}"
+          CF_PASSWORD: "${{ secrets.CF_PASSWORD }}"
+          CF_ORG: "${{ secrets.CF_ORG }}"
+          PROJECT: "${{ secrets.PROJECT }}"
+          TF_BASTION: "${{ secrets.TF_BASTION }}"
         run: |
           CWD=$(pwd)
           cd terraform/infra
@@ -100,32 +100,32 @@ jobs:
           cd "${CWD}"
       - name: Terraform Init
         env:
-          TF_BASTION: '${{ secrets.TF_BASTION }}'
+          TF_BASTION: "${{ secrets.TF_BASTION }}"
         id: init
-        run : ./scripts/pipeline/cloud-gov-remote-command.sh "${TF_BASTION}" "tofu -chdir=px-benefit-finder/terraform/infra init" 1
+        run: ./scripts/pipeline/cloud-gov-remote-command.sh "${TF_BASTION}" "tofu -chdir=px-benefit-finder/terraform/infra init" 1
       - name: Terraform Validate
         env:
-          TF_BASTION: '${{ secrets.TF_BASTION }}'
+          TF_BASTION: "${{ secrets.TF_BASTION }}"
         id: validate
-        run : |
-          stdout=$(./scripts/pipeline/cloud-gov-remote-command.sh ${TF_BASTION} "TF_WORKSPACE=${BRANCH} tofu -chdir=px-benefit-finder/terraform/infra validate -no-color" 1)
+        run: |
+          stdout=$(./scripts/pipeline/cloud-gov-remote-command.sh "${TF_BASTION}" "TF_WORKSPACE=${BRANCH} tofu -chdir=px-benefit-finder/terraform/infra validate -no-color" 1)
           stdout=$(echo $stdout | sed '$ d')
           echo ${stdout}
           echo "stdout=${stdout}" >> $GITHUB_OUTPUT
       - name: Terraform Plan
         env:
-          TF_BASTION: '${{ secrets.TF_BASTION }}'
+          TF_BASTION: "${{ secrets.TF_BASTION }}"
         id: plan
-        run : |
+        run: |
           stdout=$(./scripts/pipeline/cloud-gov-remote-command.sh "${TF_BASTION}" "TF_WORKSPACE=${BRANCH} tofu -chdir=px-benefit-finder/terraform/infra plan -no-color" 1)
           stdout=$(echo $stdout | sed '$ d')
           echo ${stdout}
           echo "stdout=${stdout}" >> $GITHUB_OUTPUT
       - name: Terraform Apply
         env:
-          TF_BASTION: '${{ secrets.TF_BASTION }}'
+          TF_BASTION: "${{ secrets.TF_BASTION }}"
         id: apply
-        run : |
+        run: |
           stdout=$(./scripts/pipeline/cloud-gov-remote-command.sh "${TF_BASTION}" "TF_WORKSPACE=${BRANCH} tofu -chdir=px-benefit-finder/terraform/infra apply -auto-approve" 1)
           stdout=$(echo $stdout | sed '$ d')
           echo ${stdout}
@@ -139,15 +139,15 @@ jobs:
           title: "Update to NGINX v${{ needs.checkVersion.outputs.new_nginx_version }} (main)"
           body: |
             ## Automated update of NGINX WAF
-          
+
             This is an automated build and deploy of the NGINX WAF application in main.
 
             Build pack: ${{ needs.checkVersion.outputs.current_bp_version }} => ${{ needs.checkVersion.outputs.new_bp_version }}
             NGINX: ${{ needs.checkVersion.outputs.current_nginx_version }} => ${{ needs.checkVersion.outputs.new_nginx_version }}
 
             #### Terraform Initialization ⚙`${{ steps.init.outcome }}`
             #### Terraform Validation 🤖`${{ steps.validate.outcome }}`
-            
+
             <details><summary>Validation Output</summary>
 
             ```
@@ -189,16 +189,16 @@ jobs:
         run: ./scripts/pipeline/deb-cf-install.sh
       - name: Cloud.gov login
         env:
-          CF_USER: '${{ secrets.CF_USER }}'
-          CF_PASSWORD: '${{ secrets.CF_PASSWORD }}'
-          CF_ORG: '${{ secrets.CF_ORG }}'
-          PROJECT: '${{ secrets.PROJECT }}'
-          TF_BASTION: '${{ secrets.TF_BASTION }}'
-          TF_BACKEND_SPACE: '${{ secrets.TF_BACKEND_SPACE }}'
+          CF_USER: "${{ secrets.CF_USER }}"
+          CF_PASSWORD: "${{ secrets.CF_PASSWORD }}"
+          CF_ORG: "${{ secrets.CF_ORG }}"
+          PROJECT: "${{ secrets.PROJECT }}"
+          TF_BASTION: "${{ secrets.TF_BASTION }}"
+          TF_BACKEND_SPACE: "${{ secrets.TF_BACKEND_SPACE }}"
         run: |
           source ./scripts/pipeline/cloud-gov-login.sh
           cf target -s "${TF_BACKEND_SPACE}" >/dev/null 2>&1
       - name: Stop Bastion
         env:
-          TF_BASTION: '${{ secrets.TF_BASTION }}'
+          TF_BASTION: "${{ secrets.TF_BASTION }}"
         run: cf stop "${TF_BASTION}"  >/dev/null 2>&1

.github/workflows/database-backup-dev.yml

@@ -11,6 +11,8 @@ on:
         required: true
       PROJECT:
         required: true
+      DATABASE_BACKUP_BASTION_NAME:
+        required: true
   schedule:
     - cron: "0 0 * * *"
 
@@ -31,15 +33,61 @@ jobs:
         run: ./scripts/pipeline/deb-mysql-client-install.sh
       - name: Install Cloudfoundry CLI
         run: ./scripts/pipeline/deb-cf-install.sh
+      - name: Cloud.gov login
+        env:
+          CF_USER: "${{ secrets.CF_USER }}"
+          CF_PASSWORD: "${{ secrets.CF_PASSWORD }}"
+          CF_ORG: "${{ secrets.CF_ORG }}"
+          PROJECT: "${{ secrets.PROJECT }}"
+        run: |
+          source ./scripts/pipeline/cloud-gov-login.sh
+      - name: Start Bastion
+        env:
+          DATABASE_BACKUP_BASTION_NAME: "${{ secrets.DATABASE_BACKUP_BASTION_NAME }}"
+          PROJECT: "${{ secrets.PROJECT }}"
+        run: |
+          echo "BRANCH=dev" >> $GITHUB_ENV
+          cf start "${PROJECT}-${DATABASE_BACKUP_BASTION_NAME}-${BRANCH}" >/dev/null 2>&1
+          ./scripts/pipeline/cloud-gov-wait-for-app-start.sh "${PROJECT}-${DATABASE_BACKUP_BASTION_NAME}-${BRANCH}"
       - name: Backup Database (dev)
+        id: backup
         shell: bash
         env:
           CF_USER: "${{ secrets.CF_USER }}"
           CF_PASSWORD: "${{ secrets.CF_PASSWORD }}"
           CF_ORG: "${{ secrets.CF_ORG }}"
           PROJECT: "${{ secrets.PROJECT }}"
+          DATABASE_BACKUP_BASTION_NAME: "${{ secrets.DATABASE_BACKUP_BASTION_NAME }}"
         run: |
           export TIMESTAMP=$(date --utc +%FT%TZ | tr ':', '-')
-          source ./scripts/pipeline/cloud-gov-login.sh
           source ./scripts/pipeline/database-backup.sh
           source ./scripts/pipeline/s3-backup-upload.sh
+  stopBastion:
+    name: Stop Bastion
+    runs-on: ubuntu-latest
+    needs: backup-database
+    if: ${{ always() }}
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+      - name: Set env.BRANCH
+        run: echo "BRANCH=dev" >> $GITHUB_ENV
+      - name: Install basic dependancies
+        run: ./scripts/pipeline/deb-basic-deps.sh
+      - name: Install Cloudfoundry CLI
+        run: ./scripts/pipeline/deb-cf-install.sh
+      - name: Cloud.gov login
+        env:
+          CF_USER: "${{ secrets.CF_USER }}"
+          CF_PASSWORD: "${{ secrets.CF_PASSWORD }}"
+          CF_ORG: "${{ secrets.CF_ORG }}"
+          PROJECT: "${{ secrets.PROJECT }}"
+        run: |
+          source ./scripts/pipeline/cloud-gov-login.sh
+      - name: Stop Bastion
+        env:
+          PROJECT: "${{ secrets.PROJECT }}"
+          DATABASE_BACKUP_BASTION_NAME: "${{ secrets.DATABASE_BACKUP_BASTION_NAME }}"
+        run: |
+          echo "BRANCH=dev" >> $GITHUB_ENV
+          cf stop "${PROJECT}-${DATABASE_BACKUP_BASTION_NAME}-${BRANCH}" >/dev/null 2>&1

.github/workflows/database-backup-main.yml

@@ -11,8 +11,10 @@ on:
         required: true
       PROJECT:
         required: true
+      DATABASE_BACKUP_BASTION_NAME:
+        required: true
   schedule:
-    - cron: '0 1 * * *'
+    - cron: "0 1 * * *"
 
 jobs:
   backup-database:
@@ -31,15 +33,62 @@ jobs:
         run: ./scripts/pipeline/deb-mysql-client-install.sh
       - name: Install Cloudfoundry CLI
         run: ./scripts/pipeline/deb-cf-install.sh
+      - name: Cloud.gov login
+        env:
+          CF_USER: "${{ secrets.CF_USER }}"
+          CF_PASSWORD: "${{ secrets.CF_PASSWORD }}"
+          CF_ORG: "${{ secrets.CF_ORG }}"
+          PROJECT: "${{ secrets.PROJECT }}"
+        run: |
+          source ./scripts/pipeline/cloud-gov-login.sh
+      - name: Start Bastion
+        env:
+          DATABASE_BACKUP_BASTION_NAME: "${{ secrets.DATABASE_BACKUP_BASTION_NAME }}"
+          PROJECT: "${{ secrets.PROJECT }}"
+        run: |
+          echo "BRANCH=main" >> $GITHUB_ENV
+          cf start "${PROJECT}-${DATABASE_BACKUP_BASTION_NAME}-${BRANCH}" >/dev/null 2>&1
+          ./scripts/pipeline/cloud-gov-wait-for-app-start.sh "${PROJECT}-${DATABASE_BACKUP_BASTION_NAME}-${BRANCH}"
       - name: Backup Database (main)
+        id: backup
         shell: bash
         env:
-          CF_USER: '${{ secrets.CF_USER }}'
-          CF_PASSWORD: '${{ secrets.CF_PASSWORD }}'
-          CF_ORG: '${{ secrets.CF_ORG }}'
-          PROJECT: '${{ secrets.PROJECT }}'
+          CF_USER: "${{ secrets.CF_USER }}"
+          CF_PASSWORD: "${{ secrets.CF_PASSWORD }}"
+          CF_ORG: "${{ secrets.CF_ORG }}"
+          PROJECT: "${{ secrets.PROJECT }}"
+          DATABASE_BACKUP_BASTION_NAME: "${{ secrets.DATABASE_BACKUP_BASTION_NAME }}"
         run: |
           export TIMESTAMP=$(date --utc +%FT%TZ | tr ':', '-')
-          source ./scripts/pipeline/cloud-gov-login.sh
           source ./scripts/pipeline/database-backup.sh
-          source ./scripts/pipeline/s3-backup-upload.sh
+          source ./scripts/pipeline/s3-backup-upload.sh
+  stopBastion:
+    name: Stop Bastion
+    runs-on: ubuntu-latest
+    needs: backup-database
+    if: ${{ always() }}
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+      - name: Set env.BRANCH
+        run: echo "BRANCH=main" >> $GITHUB_ENV
+      - name: Install basic dependancies
+        run: ./scripts/pipeline/deb-basic-deps.sh
+      - name: Install Cloudfoundry CLI
+        run: ./scripts/pipeline/deb-cf-install.sh
+      - name: Cloud.gov login
+        env:
+          CF_USER: "${{ secrets.CF_USER }}"
+          CF_PASSWORD: "${{ secrets.CF_PASSWORD }}"
+          CF_ORG: "${{ secrets.CF_ORG }}"
+          PROJECT: "${{ secrets.PROJECT }}"
+        run: |
+          source ./scripts/pipeline/cloud-gov-login.sh
+      - name: Stop Bastion
+        env:
+          DATABASE_BACKUP_BASTION_NAME: "${{ secrets.DATABASE_BACKUP_BASTION_NAME }}"
+          PROJECT: "${{ secrets.PROJECT }}"
+        run: |
+          echo "BRANCH=main" >> $GITHUB_ENV
+          cf stop "${PROJECT}-${DATABASE_BACKUP_BASTION_NAME}-${BRANCH}" >/dev/null 2>&1
+