v0.6.0.beta.1 (Sprint 37)

.githooks/pre-push

@@ -1,25 +1,37 @@
 #!/bin/bash
+
+# Function to get the full path of a command
+get_command_path() {
+  command -v $1
+}
+
 ## Set the root directory in the pipeline
 ROOT_DIR=$(git rev-parse --show-toplevel)
+CURRENT_DIR="${PWD##*/}"
 JS_APP_DIR=benefit-finder
-
+IS_JS_APP=false
 COMMITTED_FILES=$(git diff --name-only HEAD~1..HEAD )
 
+echo "Current directory ${CURRENT_DIR}"
 echo $COMMITTED_FILES
 
-# run custom actions for our JS App
 for file in $COMMITTED_FILES; do
-  # Check file extension or content, or run a custom script
-  echo "Found committed file: $file"
+  # Check if file is located in the JS_APP_DIR
+  echo "Found staged file: $file"
   if [[ $file == *$JS_APP_DIR* ]]; then
-    echo "running processes on committed files"
-    cd $ROOT_DIR/$JS_APP_DIR && CI=true npm run test:coverage
-    # check to see if process failed
+    IS_JS_APP=true
+  fi
+done
+
+# Run custom actions for our JS App
+if [ $IS_JS_APP = true ]; then
+    echo "Found a JS application file, running front end task(s)"
+    cd $ROOT_DIR/$JS_APP_DIR && CI=true $(get_command_path npm) run test:coverage
     if [ $? -eq 0 ]; then
         echo "Process succeeded."
+        cd $ROOT_DIR
     else
         echo "Process failed."
         exit 1
     fi
-  fi
-done
+fi

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

@@ -2,7 +2,7 @@ name: Update Dev 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 }} (dev)"
           body: |
             ## Automated update of NGINX WAF
-          
+
             This is an automated build and deploy of the NGINX WAF application in dev.
 
             Build pack: ${{ needs.checkVersion.outputs.cloudgov_wf_version }} => ${{ needs.checkVersion.outputs.cloudgov_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 }}'
-        run: cf stop "${TF_BASTION}"  >/dev/null 2>&1
+          TF_BASTION: "${{ secrets.TF_BASTION }}"
+        run: cf stop "${TF_BASTION}"  >/dev/null 2>&1

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

@@ -4,6 +4,9 @@ on:
   schedule:
     - cron: "0 5 * * 4"
 
+# on:
+#   workflow_dispatch:
+#
 jobs:
   checkVersion:
     name: Check versions
@@ -136,7 +139,7 @@ jobs:
         with:
           token: ${{ secrets.ADD_TO_PROJECT_PAT }}
           assignees: ${{ vars.TECH_LEAD }}
-          title: "Update to NGINX v${{ needs.checkVersion.outputs.new_nginx_version }} (main)"
+          title: "Update to NGINX ${{ needs.checkVersion.outputs.new_nginx_version }} (main)"
           body: |
             ## Automated update of NGINX WAF
 
@@ -172,7 +175,9 @@ jobs:
           GH_PROJECT_NUMBER: ${{ secrets.GH_PROJECT_NUMBER }}
           GH_TOKEN: ${{ secrets.ADD_TO_PROJECT_PAT }}
           ISSUE_NUMBER: ${{ steps.issue.outputs.number }}
-        run: source ./scripts/pipeline/github-update-issue-status.sh
+        run: |
+          source ./scripts/pipeline/github-update-issue-status.sh
+
   stopBastion:
     name: Stop Bastion
     runs-on: ubuntu-latest

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

@@ -55,18 +55,19 @@ jobs:
         run: |
           COMPOSER_DIR=$(composer -n config --global home)
           $COMPOSER_DIR/vendor/bin/phpcs  --standard=./usagov-2021/.phpcs.xml.dist -v --warning-severity=0 ./usagov_benefit_finder # | tee /tmp/results/php-cs.log
-  backup-database-dev:
-    needs: php-lint
-    uses: ./.github/workflows/database-backup-dev.yml
-    if: github.ref == 'refs/heads/dev'
-    secrets: inherit
+  # backup-database-dev:
+  #   needs: php-lint
+  #   uses: ./.github/workflows/database-backup-dev.yml
+  #   if: github.ref == 'refs/heads/dev'
+  #   secrets: inherit
   backup-database-main:
     needs: php-lint
     uses: ./.github/workflows/database-backup-main.yml
     if: github.ref == 'refs/heads/main'
     secrets: inherit
   component-library:
-    needs: [backup-database-dev, backup-database-main]
+    # needs: [backup-database-dev, backup-database-main]
+    needs: [backup-database-main]
     if: always() && contains(needs.*.result, 'success') && !contains(needs.*.result, 'failure')
     name: Build and deploy component library
     runs-on: ubuntu-latest
@@ -112,7 +113,8 @@ jobs:
           echo "${{ secrets.STORYBOOK_USERNAME }}:${{ secrets.STORYBOOK_PASSWORD }}" > Staticfile.auth
           cf push benefit-finder-storybook-${BRANCH}
   build-and-deploy:
-    needs: [backup-database-dev, backup-database-main]
+    # needs: [backup-database-dev, backup-database-main]
+    needs: [backup-database-main]
     if: always() && contains(needs.*.result, 'success') && !contains(needs.*.result, 'failure')
     name: Build and deploy
     runs-on: ubuntu-latest
@@ -170,7 +172,8 @@ jobs:
           tags: |
             type=sha,enable=true,priority=100,prefix=,suffix=,format=short
       - name: Build and push Docker image
-        uses: docker/[email protected]
+        # uses: docker/[email protected]
+        uses: docker/[email protected]
         with:
           context: ./usagov-2021
           file: ./usagov-2021/Dockerfile-cms