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

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

@@ -6,6 +6,10 @@ on:
       - dev
       - main
 
+permissions:
+  contents: read
+  packages: write
+
 jobs:
   php-lint:
     name: PHP Lint

.github/workflows/database-restore.yml

@@ -37,7 +37,7 @@ jobs:
           PROJECT: "${{ secrets.PROJECT }}"
         run: |
           echo "BRANCH=$(echo $GITHUB_REF | cut -d'/' -f 3)" >> $GITHUB_ENV
-          cf start "${PROJECT}-${DATABASE_BACKUP_BASTION_NAME}-${BRANCH}" >/dev/null 2>&1
+          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: Restore database
         shell: bash

.github/workflows/test-cypress-prod-links.yml

@@ -30,7 +30,7 @@ jobs:
         with:
           browser: chrome
           env: NODE_ENV=test
-          config-file: cypress.prod.config.js
+          config-file: cypress.prod.links.config.js
           working-directory: benefit-finder
 
       - name: create github issue

.github/workflows/thog_scan_commit.yml

@@ -0,0 +1,83 @@
+name: TruffleHog Scan
+
+on:
+  push:
+    branches:
+      - main
+      - develop
+  pull_request:
+
+jobs:
+  scan:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - name: Install GitHub CLI
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y gh
+
+      - name: Authenticate GitHub CLI
+        env:
+          GITHUB_TOKEN: ${{ secrets.ADD_TO_PROJECT_PAT }}
+        run: |
+          gh auth setup-git
+
+      - name: Run TruffleHog scan
+        id: trufflehog_scan
+        uses: trufflesecurity/[email protected]
+        with:
+          base: ""
+          head: ${{ github.ref_name }}
+          extra_args: --only-verified --json --entropy --max-depth=50
+        continue-on-error: true
+
+      - name: Check TruffleHog Results
+        id: check_results
+        run: |
+          if [ -f truffleHogResults.json ]; then
+            echo "file_exists=true" >> $GITHUB_ENV
+          else
+            echo "file_exists=false" >> $GITHUB_ENV
+          fi
+
+      - name: Upload TruffleHog scan results
+        if: always() && env.file_exists == 'true'
+        uses: actions/upload-artifact@v3
+        with:
+          name: trufflehog-results
+          path: truffleHogResults.json
+
+      - name: Convert JSON to Readable Report
+        if: always() && env.file_exists == 'true'
+        run: |
+          jq -r '.results[] | "File: \(.path)\nCommit: \(.commit)\nDate: \(.date)\nReason: \(.reason)\n---------------------------"' truffleHogResults.json > truffleHogReport.txt
+
+      - name: Upload Readable Report
+        if: always() && env.file_exists == 'true'
+        uses: actions/upload-artifact@v3
+        with:
+          name: trufflehog-readable-report
+          path: truffleHogReport.txt
+
+      - name: Check for findings and create issue
+        if: failure() && env.file_exists == 'true'
+        env:
+          GITHUB_TOKEN: ${{ secrets.ADD_TO_PROJECT_PAT }}
+        run: |
+          if jq -e '.results | length > 0' truffleHogResults.json > /dev/null; then
+            echo "Secrets found. Creating GitHub issue."
+            gh issue create --title "TruffleHog Scan Results" --body "$(cat truffleHogReport.txt)" --label "bug,security" --assignee "@me"
+            exit 1
+          else
+            echo "No secrets found or no results file."
+          fi
+
+      - name: Fail the job if any secrets are found
+        if: steps.trufflehog_scan.outcome == 'failure'
+        run: exit 1

benefit-finder/cypress/e2e/storybook/dataLayer.cy.js

@@ -5,7 +5,7 @@ import { pageObjects } from '../../support/pageObjects'
 import * as EN_LOCALE_DATA from '../../../../benefit-finder/src/shared/locales/en/en.json'
 import * as BENEFITS_ELIBILITY_DATA from '../../fixtures/benefits-eligibility.json'
 
-const { intro, lifeEventSection, resultsView, benefitCount } =
+const { intro, lifeEventSection, resultsView, openAllBenefitAccordions } =
   dataLayerUtils.dataLayerStructure
 
 const dataLayerValues = [
@@ -26,17 +26,17 @@ const dataLayerValues = [
   {
     event: resultsView.event,
     bfData: {
-      pageView: resultsView.bfData.pageView,
+      pageView: resultsView.bfData.pageView[0],
       viewTitle: 'Your potential benefits',
-      viewState: resultsView.bfData.viewState[1],
+      eligibleBenefitCount: { number: 4, string: '4' },
+      moreInfoBenefitCount: { number: 1, string: '1' },
+      notEligibleBenefitCount: { number: 25, string: '25' },
     },
   },
   {
-    event: benefitCount.event,
+    event: openAllBenefitAccordions.event,
     bfData: {
-      eligible: 4,
-      moreInfo: 1,
-      notEligible: 25,
+      accordionsOpen: openAllBenefitAccordions.bfData.accordionsOpen,
     },
   },
 ]
@@ -120,19 +120,49 @@ describe('Calls to Google Analytics Object', function () {
             }
             delete ev[0]['gtm.uniqueEventId']
 
-            expect(dataLayerValues[2]).to.deep.equal(ev[0])
+            expect(ev[0]).to.deep.equal(dataLayerValues[2])
+          })
+        })
+    })
+  })
 
-            // // check count event
-            const evCount = {
-              ...window.dataLayer.filter(
-                x => x.event === dataLayerValues[3].event
-              ),
-            }
+  it('clicking open all on results page has a bf_open_all_accordions event', function () {
+    const selectedData = BENEFITS_ELIBILITY_DATA.scenario_1_covid.en.param
+    const scenario = utils.encodeURIFromObject(selectedData)
+    cy.visit(`${utils.storybookUri}${scenario}`)
 
-            delete evCount[0]['gtm.uniqueEventId']
+    cy.window().then(window => {
+      assert.isDefined(window.dataLayer, 'window.dataLayer is defined')
 
-            expect(dataLayerValues[3]).to.deep.equal(evCount[0])
-          })
+      pageObjects
+        .expandAll()
+        .click()
+        .then(() => {
+          // check last page change event
+          const ev = {
+            ...window.dataLayer.filter(
+              x => x?.event === dataLayerValues[3].event
+            ),
+          }
+          delete ev[0]['gtm.uniqueEventId']
+
+          expect(dataLayerValues[3]).to.deep.equal(ev[0])
+        })
+
+      pageObjects
+        .expandAll()
+        .click()
+        .then(() => {
+          // check last page change event
+          const ev = {
+            ...window.dataLayer.filter(
+              x => x?.event === dataLayerValues[3].event
+            ),
+          }
+          // we ignore dedup here so there can be multiple fires
+          delete ev[1]['gtm.uniqueEventId']
+
+          expect(dataLayerValues[4]).to.not.deep.equal(ev[1])
         })
     })
   })