chore(EMS-3730): merge main into main-iterations (#2912)

* chore(deployment-script): changed feature to main-iterations (#2715) Co-authored-by: Zain Kassam <zkassam@ukexportfinance.gov.uk> * chore(remove-script-prefix): package.json - Remove --prefix (#2708) * chore(main): release 2.10.0 (#2722) * chore(main): release 2.10.0 * chore(cspell): fix typos --------- Co-authored-by: ttbarnes <tony@tonybarnes.me> * fix(EMS-3560): update az cli to v2 (#2720) * fix(EMS-3560): update az cli to v2 * fix(EMS-3560): update az cli to v2 * fix(durable-functions): updated szenius/set-timezone GHA plugin to v2 * fix(durable-functions): updated szenius/set-timezone GHA plugin to v2 --------- Co-authored-by: Abhi Markan <amarkan@ukexportfinance.gov.uk> Co-authored-by: ttbarnes <tony@tonybarnes.me> * chore(main): release 2.10.1 (#2724) * feat(EMS-3502-3567-3568): content updates - contact details (#2721) * feat(EMS-3502-3567-3568): content updates - contact us * feat(EMS-3502-3567-3568): content updates - email links * feat(EMS-3502-3567-3568): content updates - email links * feat(EMS-3502-3567-3568): content updates - email links * feat(EMS-3502-3567-3568): dry cypress selectors * feat(EMS-3502-3567-3568): dry cypress selectors * feat(EMS-3502-3567-3568): content updates - email links * feat(EMS-3502-3567-3568): revert content string change * chore(main): release 2.11.0 (#2725) * fix(EMS-3439-3504): uk goods or services, application submission email copy fixes (#2728) * feat(EMS-2186): added key vault * fix(EMS-2186): added tags to Key Vault * fix(EMS-2186): azure IaC fix * fix(EMS-2186): azure IaC fix * fix(EMS-2186): azure IaC fix * fix(EMS-2186): added tags to Key Vault * chore(main): release 2.11.1 (#2732) * fix(EMS-3590-3591-3423): header link, integrity hashes (#2738) * fix(EMS-3590): update insurance header link * fix(EMS-3591-3423): update integrity hashes * chore(EMS-3533): update start url redirect * fix(EMS-3533): revert start page redirect * chore(e2e): dry route const * chore(main): release 2.11.2 (#2740) * style(EMS-3574): problem with service - content iterations (#2741) * feat(EMS-3587-3425): contact page - content iterations (#2742) * feat(EMS-3587): contact page - content iterations * chore(EMS-3587): remove commented code * fix(EMS-3425): password reset - update label text * fix(EMS-3425): password reset - update label text * chore(main): release 2.12.0 (#2743) * fix(DTFS2-7284): fixed private endpoint * fix(EMS-2186): removed purge protection * chore(deps): bump dependencies (#2755) * fix(EMS-2186): removed * from flag * fix(EM-2186): fixed conditional deployment * chore(main): release 2.12.1 (#2757) * chore(mysql-version): mysql - Version (#2758) * chore(mysql-version): downgraded to 8.0.21 * chore(mysql-version): added to cspell * chore(mysql-version): bumped dependency * chore(mysql-version): downgrade to 8.0 * chore(mysql-version): bump deps * chore(mysql-version): bump deps --------- Co-authored-by: Zain Kassam <zkassam@ukexportfinance.gov.uk> * fix(EMS-3604): no PDF - Anti-bribery code of conduct - Incorrect link (#2768) * chore(main): release 2.12.2 (#2769) * feat(EMS-3606): added missing environment variables * chore(main): release 2.13.0 (#2779) * feat(EMS-3610): changed wording for export contract agent question * chore(main): release 2.14.0 (#2784) * feat(EMS-3535): changes to anti-bribery and corruption definitions (#2778) Co-authored-by: Zain Kassam <zkassam@ukexportfinance.gov.uk> * chore(main): release 2.15.0 (#2786) * chore(e2e-lint): lint - E2E lint fix (#2727) * chore(e2e-lint): changed .eslintrc for e2e * chore(e2e-lint): e2e lint fixes --------- Co-authored-by: Zain Kassam <zkassam@ukexportfinance.gov.uk> * chore(EMS-3631): declarations - Split declarations content strings (#2788) * feat(EMS-1921): added missing env to API .env.sample * chore(deps): bump dependencies (#2801) * chore(deps): bump dependencies * chore(deps): revert ui typescript dependency bump * feat(EMS-3536-3540): remove 'how your data will be used' declaration (#2789) * feat(EMS-3536-3540): remove 'how data will be used' declaration * feat(EMS-3536-3540): remove 'how data will be used' declaration * feat(EMS-3536-3540): remove 'how data will be used' declaration * feat(EMS-3536-3540): remove 'how data will be used' declaration * feat(EMS-3536-3540): fix/update e2e test * feat(EMS-3536-3540): fix/update e2e test * chore(main): release 2.16.0 (#2803) * chore(EMS-3631): declarations - Declaration versioning in constants (#2802) * chore(EMS-3631): declaration - Use of declaration constant in controllers (#2804) * feat(EMS-1921): add custom domains to FD * feat(EMS-1921): add custom domains * feat(EMS-3631): declarations - replace api/keystone rendering with content-strings (#2813) * chore(main): release 2.17.0 (#2814) * feat(EMS-1921): refactored names * feat(EMS-3631): declaration versions - database restructure, application creation (#2805) * chore(EMS-3631): declaration versioning db fields, application creation updates * feat(EMS-3631): application - declaration version creation * feat(EMS-3631): rename application type * feat(EMS-3631): fix typo * feat(EMS-3631): simplify keystone declaration version schema * feat(EMS-3631): update sql dump * feat(EMS-3631): various declaration constant alignments * feat(EMS-3631): various declaration constant alignments * feat(EMS-3631): fix typo * feat(EMS-3631): fix/update unit tests * feat(EMS-3631): fix/update unit tests * chore(main): release 2.18.0 (#2816) * feat(EMS-3633): data migration - declarations (#2819) * feat(EMS-3633): data migration - declaration versioning * feat(EMS-3633): fix typos, add missing documentation * feat(EMS-3633): add missing migration field removal * feat(EMS-3633): fix sonarcloud/promise issue, update README.md * feat(EMS-3633): fix sonarcloud issue * chore(main): release 2.19.0 (#2821) * feat(EMS-3612): declarations - Anti-bribery definitions update (#2820) * feat(EMS-3612): changed content for anti-bribery definitions * feat(EMS-3612): test fixes * feat(EMS-3612): test fixes * feat(EMS-3612): fixed typos --------- Co-authored-by: Zain Kassam <zkassam@ukexportfinance.gov.uk> * chore(main): release 2.20.0 (#2822) * feat(EMS-3613): changed proposal to Proposal * feat(EMS-3611): declaration - Anti-bribery code of conduct version update (#2824) * chore(main): release 2.21.0 (#2825) * chore(bump-deps): bump dependencies * chore(bump-deps): revert deps update * chore(bump-deps): revert deps update * chore(bump-deps): revert deps update * chore(bump-deps): revert deps update * chore(bump-deps): update deps * chore(bump-deps): update deps * chore(bump-deps): bump deps * chore(bump-deps): bump deps * chore(deps): bump sass (#2836) Co-authored-by: Zain Kassam <zkassam@ukexportfinance.gov.uk> * feat(EMS-3668-69-73-74): eligibility - Party to consortium and Member of a group (#2832) * chore(main): release 2.22.0 (#2850) * feat(EMS-3660): export contract - how was contract awarded - UI setup (#2837) * feat(EMS-3660): export contract - how was contract awarded - page/flow setup * feat(EMS-3660): fix/update e2e tests * feat(EMS-3660): fix/update e2e tests * feat(EMS-3660): fix/update e2e test * chore(main): release 2.23.0 (#2855) * feat(EMS-3676): eligibility - Check your answers - Member of group and party to consortium (#2852) * chore(main): release 2.24.0 (#2857) * feat(EMS-3670-72): eligibility - Party to consortium and Member of a group exit pages (#2851) * chore(main): release 2.25.0 (#2858) * feat(EMS-3665): export contract - how was contract awarded - data model (#2856) * feat(EMS-3665): export contract award method data model * feat(EMS-3665): export contract 'other' award method data model * chore(EMS-3665): update cspell * chore(main): release 2.26.0 (#2860) * feat(EMS-3680-3682): eligibility - Data saving (#2853) * chore(main): release 2.27.0 (#2863) * chore(EMS-3660): export contract - how was contract awarded - form fields (#2859) * feat(EMS-3665): export contract award method data model * feat(EMS-3665): export contract 'other' award method data model * chore(EMS-3665): update cspell * chore(EMS-3660): export contract - how was contract awarded - form fields * feat(EMS-3667): eligibility - Check if eligible - Content change (#2861) * chore(main): release 2.28.0 (#2866) * fix(iac): afd custom domains association * chore(deps): bump dependencies (#2854) * chore(main): release 2.28.1 (#2868) * fix(EMS-3703): eligibility - Member of a group - Wording fix (#2869) * chore(main): release 2.28.2 (#2870) * feat(EMS-3661): export contract - how was contract awarded - form validation (#2865) * feat(EMS-3661): export contract - how was contract awarded - form validation * feat(EMS-3661): update unit test * feat(EMS-3661): fix/update unit test * feat(EMS-3661): fix/update e2e command * feat(EMS-3661): fix/update e2e tests * feat(EMS-3661): fix/update e2e tests * feat(EMS-3661): fix/update e2e test * feat(EMS-3661): fix/update e2e test * chore(main): release 2.29.0 (#2876) * feat(EMS-3665): export contract - how was contract awarded - data saving (#2883) * feat(EMS-3665): export contract - how was contract awarded - data saving * feat(EMS-3665): fix validation issue * feat(EMS-3665): improve cypress command documentation * feat(EMS-3665): fix typo * feat(EMS-3665): move logic into conditional * chore(main): release 2.30.0 (#2886) * chore(EMS-3662-3665): task list - export contract requirements, improve e2e test coverage (#2885) * chore(EMS-3662-3665): task list - update export contract requirements * chore(tests): align cypress command params * chore(EMS-3662-3665): application submission - export contract conditional e2e tests * chore(EMS-3662-3665): fix unit test * chore(EMS-3662-3665): fix/update e2e test * feat(EMS-3685): added xlsx for 2 new eligibility fields (#2884) Co-authored-by: Zain Kassam <zkassam@ukexportfinance.gov.uk> * chore(main): release 2.31.0 (#2896) * feat(EMS-3662): export contract - how was contract awarded - save and back (#2892) * feat(EMS-3662): export contract - how was contract awarded - save and back * chore(EMS-3665): address todo comments * chore(docs): minor documentation improvements * feat(EMS-3662): export contract - how was contract awarded - save and back * feat(EMS-3662): fix/update e2e test * feat(EMS-3662): simplify e2e test * chore(main): release 2.32.0 (#2897) * chore(cypress-fix): e2e - switch to electron (#2898) * chore(EMS-3708): code scanning - Server-side URL redirect (#2882) * chore(EMS-3708): fix code scanning issue with unvalidated req.originalUrl * chore(EMS-3708): code fixes * chore(EMS-3707): code fixes * chore(EMS-3707): test fix * chore(EMS-3707): console.error fix --------- Co-authored-by: Zain Kassam <zkassam@ukexportfinance.gov.uk> * feat(EMS-3709-3710): export contract - how the contract was awarded - check your answers (#2895) * chore(main): release 2.33.0 (#2905) * feat(EMS-3722-3723): data migration - eligibility, export contract (#2901) * feat(EMS-3722-3723): data migration - export contract award method * feat(EMS-3722): data migration - eligibility updates * feat(EMS-3722): data migration - eligibility - conditional task list requirements * fix(EMS-3633): data migration - declarations versioning issue * chore(db): update timestamp * fix(EMS-3633): data migration - declarations versioning issue * chore(docs): fix typos * chore(helpers): improve canSubmitApplication logging * chore(migration): simplify promise.all * chore(main): release 2.34.0 (#2909) * feat(EMS-3687): application submission - xlsx - how was contract awarded (#2907) * feat(EMS-3687): application submission - xlsx - how was contract awarded * feat(EMS-3687): add missing content string * chore(e2e): fix typo * chore(EMS-3730): fix/update application creation from merge conflicts * fix(EMS-3711): updated husky script to v9 * chore(EMS-3730): fix/update unit tests * chore(main): release 2.35.0 (#2911) * chore(EMS-3730): fix merge issue * chore(EMS-3730): fix/update e2e test * fix(iac): explicity RBAC authorisation to false for Azure KV (#2910) --------- Co-authored-by: zainZzKk <51957827+Zainzzkk@users.noreply.github.com> Co-authored-by: Zain Kassam <zkassam@ukexportfinance.gov.uk> Co-authored-by: Abhi Markan <32125108+abhi-markan@users.noreply.github.com> Co-authored-by: Abhi Markan <amarkan@ukexportfinance.gov.uk>
UK-Export-Finance · Aug 7, 2024 · 1ae9393 · 1ae9393
1 parent c61bde3
commit 1ae9393
Show file tree

Hide file tree

Showing 410 changed files with 9,466 additions and 5,079 deletions.
diff --git a/.cspell.json b/.cspell.json
@@ -122,6 +122,7 @@
         "pinojs",
         "plusplus",
         "productgroup",
+        "rdbms",
         "recorsets",
         "Robo",
         "sanitisation",
@@ -150,7 +151,12 @@
         "venv",
         "VNET",
         "vnets",
-        "XLSX"
+        "XLSX",
+        "eg9qxlqw4edxa8b5mwbybsrfp",
+        "mzwp337piamg1mei7fqh1o73s",
+        "qnqrle4xwsj5go8pchj31sat4",
+        "qw2hp8khykctdic2z58z70ru8",
+        "tn8k8lot1bvirmztmmgq2u8hn"
     ],
     "dictionaries": [
         "en-gb",

diff --git a/.github/workflows/deployment.yml b/.github/workflows/deployment.yml
@@ -85,6 +85,7 @@ jobs:
         with:
           inlineScript: |
             az config set extension.use_dynamic_install=yes_without_prompt
+            az extension add --name rdbms-connect
 
       - name: Import ⬇
         if: ${{ '1' == vars.DATABASE }}

diff --git a/.github/workflows/infrastructure.yml b/.github/workflows/infrastructure.yml
@@ -379,6 +379,7 @@ jobs:
             --name kv-${{ env.PRODUCT }}-${{ env.TARGET }}-${{ vars.VERSION }} \
             --default-action Deny \
             --public-network-access Disabled \
+            --enable-rbac-authorization false \
             --network-acls-ips ${{ secrets.WAF_ALLOWED_IP }} \
             --network-acls-vnets $(az network vnet subnet list --vnet-name vnet-${{ env.PRODUCT }}-${{ env.TARGET }}-${{ vars.VERSION }} --query '[?contains(name, `keyvault`)].id' -o tsv)
 
@@ -564,6 +565,26 @@ jobs:
             --name IPAllowListRule \
             --policy-name waf${{ env.PRODUCT }}${{ env.TARGET }}${{ vars.VERSION }}
 
+      - name: Identity 🔐
+        uses: azure/cli@v2
+        with:
+          inlineScript: |
+            # Front Door
+            az resource update --ids $(az afd profile list --query '[].id' -o tsv) \
+            --set identity.type=SystemAssigned \
+            --api-version 2022-11-01-preview
+
+      - name: Access 🔑
+        uses: azure/cli@v2
+        with:
+          inlineScript: |
+            # Key Vault
+              az keyvault set-policy \
+              --name kv-${{ env.PRODUCT }}-${{ env.TARGET }}-${{ vars.VERSION }} \
+              --certificate-permissions ${{ vars.KEYVAULT_ACCESS_POLICY }} \
+              --application-id $(az afd profile list --query '[].identity.principalId' -o tsv) \
+              --object-id $(az afd profile list --query '[].identity.principalId' -o tsv)
+
   # 4. WebApp configuration
   webapp:
     name: Web App 🔧
@@ -1058,3 +1079,91 @@ jobs:
             --auto-mitigate true \
             --severity 0 \
             --tags ${{ env.TAGS }}
+
+  # 8. Custom domains
+  domains:
+    name: Domains 🌐
+    needs: [base, security, webapp, dns]
+    environment: ${{ needs.base.outputs.environment }}
+    runs-on: [self-hosted, EXIP, infrastructure]
+    steps:
+      - name: Pre-production 💫
+        if: contains('["dev", "feature", "staging"]', env.TARGET)
+        run: echo "TYPE=Preproduction" >> $GITHUB_ENV
+
+      - name: Production 💫
+        if: ${{ 'production' == env.TARGET }}
+        run: echo "TYPE=Production" >> $GITHUB_ENV
+
+      - name: Tags 🏷️
+        run: echo TAGS='Environment=${{ env.TYPE }}' \
+          'Product=${{ env.PRODUCT }}' \
+          'Team=development' >> $GITHUB_ENV
+
+      - name: Login 🔐
+        uses: azure/login@v2
+        with:
+          creds: ${{ secrets.AZURE_CREDENTIALS }}
+
+      - name: Azure defaults ✨
+        uses: azure/cli@v2
+        with:
+          inlineScript: |
+            # Basic
+            az configure --defaults location=${{ vars.REGION }}
+            az configure --defaults group=rg-${{ env.PRODUCT }}-${{ env.TARGET }}-${{ vars.VERSION }}
+
+      - name: Certificates 📇
+        uses: azure/cli@v2
+        with:
+          inlineScript: |
+            az afd secret create \
+            --name kv-certificate-quote-latest \
+            --profile-name frontdoor-${{ env.PRODUCT }}-${{ env.TARGET }}-${{ vars.VERSION }} \
+            --use-latest-version true \
+            --secret-source $(az keyvault list --query '[].id' -o tsv)/secrets/kv-certificate-quote-latest
+
+            az afd secret create \
+            --name kv-certificate-apply-latest \
+            --profile-name frontdoor-${{ env.PRODUCT }}-${{ env.TARGET }}-${{ vars.VERSION }} \
+            --use-latest-version true \
+            --secret-source $(az keyvault list --query '[].id' -o tsv)/secrets/kv-certificate-apply-latest
+
+      - name: Add ➕
+        uses: azure/cli@v2
+        with:
+          inlineScript: |
+            az afd custom-domain create \
+            --custom-domain-name fd-custom-domain-quote \
+            --profile-name frontdoor-${{ env.PRODUCT }}-${{ env.TARGET }}-${{ vars.VERSION }} \
+            --host-name ${{ vars.DOMAIN_QUOTE }} \
+            --minimum-tls-version TLS12 \
+            --certificate-type CustomerCertificate \
+            --azure-dns-zone $(az network dns zone list --query '[?contains(name, `${{ vars.DOMAIN_QUOTE }}`)]'.id -o tsv) \
+            --secret kv-certificate-quote-latest
+
+            az afd custom-domain create \
+            --custom-domain-name fd-custom-domain-apply \
+            --profile-name frontdoor-${{ env.PRODUCT }}-${{ env.TARGET }}-${{ vars.VERSION }} \
+            --host-name ${{ vars.DOMAIN_INSURANCE }} \
+            --minimum-tls-version TLS12 \
+            --certificate-type CustomerCertificate \
+            --azure-dns-zone $(az network dns zone list --query '[?contains(name, `${{ vars.DOMAIN_INSURANCE }}`)]'.id -o tsv) \
+            --secret kv-certificate-apply-latest
+
+      - name: Associate 🔗
+        uses: azure/cli@v2
+        with:
+          inlineScript: |
+            az afd route update \
+            --route-name default \
+            --endpoint-name ${{ env.PRODUCT }}-ui-${{ env.TARGET }}-${{ vars.VERSION }} \
+            --profile-name frontdoor-${{ env.PRODUCT }}-${{ env.TARGET }}-${{ vars.VERSION }} \
+            --custom-domains $(az afd custom-domain list --profile-name frontdoor-${{ env.PRODUCT }}-${{ env.TARGET }}-${{ vars.VERSION }} --query '[?contains(hostName, `${{ vars.DOMAIN_QUOTE }}`)]'.name -o tsv) $(az afd custom-domain list --profile-name frontdoor-${{ env.PRODUCT }}-${{ env.TARGET }}-${{ vars.VERSION }} --query '[?contains(hostName, `${{ vars.DOMAIN_INSURANCE }}`)]'.name -o tsv)
+
+            # Associate FD
+            az afd security-policy update \
+            --security-policy-name security-policy-${{ env.PRODUCT }}-${{ env.TARGET }}-${{ vars.VERSION }} \
+            --waf-policy $(az network front-door waf-policy list --query '[]'.id -o tsv) \
+            --domains $(az afd endpoint list --profile-name frontdoor-${{ env.PRODUCT }}-${{ env.TARGET }}-${{ vars.VERSION }} --query '[]'.id -o tsv) $(az afd custom-domain list --profile-name frontdoor-${{ env.PRODUCT }}-${{ env.TARGET }}-${{ vars.VERSION }} --query '[?contains(hostName, `${{ vars.DOMAIN_QUOTE }}`)]'.id -o tsv) $(az afd custom-domain list --profile-name frontdoor-${{ env.PRODUCT }}-${{ env.TARGET }}-${{ vars.VERSION }} --query '[?contains(hostName, `${{ vars.DOMAIN_INSURANCE }}`)]'.id -o tsv) \
+            --profile-name frontdoor-${{ env.PRODUCT }}-${{ env.TARGET }}-${{ vars.VERSION }}
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -229,6 +229,7 @@ jobs:
             'check-your-answers/export-contract/change-your-answers/about-goods-or-services/*.spec.js',
             'check-your-answers/export-contract/change-your-answers/agent/*.spec.js',
             'check-your-answers/export-contract/change-your-answers/agent-charges/*.spec.js',
+            'check-your-answers/export-contract/change-your-answers/how-the-contract-was-awarded/*.spec.js',
             'check-your-answers/export-contract/change-your-answers/agent-service/*.spec.js',
             'check-your-answers/export-contract/change-your-answers/how-will-you-get-paid/*.spec.js',
             'check-your-answers/export-contract/change-your-answers/private-market/*.spec.js',
@@ -251,7 +252,6 @@ jobs:
             'declarations/anti-bribery/**/*.spec.js',
             'declarations/confidentiality/**/*.spec.js',
             'declarations/confirmation-and-acknowledgements/**/*.spec.js',
-            'declarations/how-your-data-will-be-used/**/*.spec.js',
             'eligibility/*.spec.js',
             'eligibility/buyer-country/**/*.spec.js',
             'eligibility/cannot-apply/**/*.spec.js',
@@ -268,9 +268,12 @@ jobs:
             'eligibility/end-buyer/**/*.spec.js',
             'eligibility/exporter-location/**/*.spec.js',
             'eligibility/have-an-account/**/*.spec.js',
+            'eligibility/member-of-a-group/**/*.spec.js',
             'eligibility/no-companies-house-number/**/*.spec.js',
+            'eligibility/party-to-consortium/**/*.spec.js',
             'eligibility/total-value-insured/**/*.spec.js',
             'eligibility/uk-goods-or-services/**/*.spec.js',
+            'export-contract/how-was-the-contract-awarded/**/*.spec.js',
             'export-contract/about-goods-or-services/**/*.spec.js',
             'export-contract/how-will-you-get-paid/**/*.spec.js',
             'export-contract/private-market/**/*.spec.js',
@@ -283,6 +286,7 @@ jobs:
             'export-contract/change-your-answers/agent/*.spec.js',
             'export-contract/change-your-answers/agent-charges/*.spec.js',
             'export-contract/change-your-answers/agent-service/*.spec.js',
+            'export-contract/change-your-answers/how-the-contract-was-awarded/*.spec.js',
             'export-contract/change-your-answers/how-will-you-get-paid/*.spec.js',
             'export-contract/change-your-answers/private-market/*.spec.js',
             'export-contract/check-your-answers/**/*.spec.js',
@@ -372,7 +376,7 @@ jobs:
 
       - name: Execute
         working-directory: ./e2e-tests/insurance
-        run: npx cypress run --config video=false,screenshotOnRunFailure=false --browser chrome --project ./ --record false --spec "cypress/e2e/journeys/${{ matrix.spec }}"
+        run: npx cypress run --config video=false,screenshotOnRunFailure=false --browser electron --project ./ --record false --spec "cypress/e2e/journeys/${{ matrix.spec }}"
 
       - name: Coverage
         uses: codecov/codecov-action@v4
@@ -440,7 +444,7 @@ jobs:
 
       - name: Execute
         working-directory: ./e2e-tests/quote
-        run: npx cypress run --config video=false,screenshotOnRunFailure=false --browser chrome --project ./ --record false --spec "cypress/e2e/journeys/${{ matrix.spec }}"
+        run: npx cypress run --config video=false,screenshotOnRunFailure=false --browser electron --project ./ --record false --spec "cypress/e2e/journeys/${{ matrix.spec }}"
 
       - name: Coverage
         uses: codecov/codecov-action@v4
@@ -493,7 +497,7 @@ jobs:
 
       - name: Execute
         working-directory: ./e2e-tests/switch-between-services
-        run: npx cypress run --config video=false,screenshotOnRunFailure=false --browser chrome --project ./ --record false --spec "cypress/e2e/journeys/${{ matrix.spec }}"
+        run: npx cypress run --config video=false,screenshotOnRunFailure=false --browser electron --project ./ --record false --spec "cypress/e2e/journeys/${{ matrix.spec }}"
 
       - name: Coverage
         uses: codecov/codecov-action@v4

diff --git a/.husky/commit-msg b/.husky/commit-msg
@@ -1,4 +1 @@
-#!/usr/bin/env sh
-. "$(dirname -- "$0")/_/husky.sh"
-
 npx commitlint --color --edit $1
diff --git a/.husky/pre-commit b/.husky/pre-commit
@@ -1,4 +1 @@
-#!/usr/bin/env sh
-. "$(dirname -- "$0")/_/husky.sh"
-
 npx lint-staged
diff --git a/.release-please-manifest.json b/.release-please-manifest.json
@@ -1,3 +1,3 @@
 {
-    ".": "2.15.0"
+    ".": "2.35.0"
 }
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,137 @@
 # Changelog
 
+## [2.35.0](https://github.com/UK-Export-Finance/exip/compare/v2.34.0...v2.35.0) (2024-08-06)
+
+### Features
+
+- **EMS-3687:** application submission - xlsx - how was contract awarded ([#2907](https://github.com/UK-Export-Finance/exip/issues/2907)) ([40ea2f4](https://github.com/UK-Export-Finance/exip/commit/40ea2f4a100567b21c321674904c80757fb11cb1))
+
+## [2.34.0](https://github.com/UK-Export-Finance/exip/compare/v2.33.0...v2.34.0) (2024-08-06)
+
+### Features
+
+- **EMS-3722-3723:** data migration - eligibility, export contract ([#2901](https://github.com/UK-Export-Finance/exip/issues/2901)) ([0c16bc1](https://github.com/UK-Export-Finance/exip/commit/0c16bc18b52bf1a6a0737a124d693203a8eba96a))
+
+## [2.33.0](https://github.com/UK-Export-Finance/exip/compare/v2.32.0...v2.33.0) (2024-08-06)
+
+### Features
+
+- **EMS-3709-3710:** export contract - how the contract was awarded - check your answers ([#2895](https://github.com/UK-Export-Finance/exip/issues/2895)) ([4648efc](https://github.com/UK-Export-Finance/exip/commit/4648efc28376536127975d4954b1615135a083bc))
+
+## [2.32.0](https://github.com/UK-Export-Finance/exip/compare/v2.31.0...v2.32.0) (2024-08-05)
+
+### Features
+
+- **EMS-3662:** export contract - how was contract awarded - save and back ([#2892](https://github.com/UK-Export-Finance/exip/issues/2892)) ([8003b9d](https://github.com/UK-Export-Finance/exip/commit/8003b9d66fda8fb75d26877c9fccb9e9c3e753c1))
+
+## [2.31.0](https://github.com/UK-Export-Finance/exip/compare/v2.30.0...v2.31.0) (2024-08-05)
+
+### Features
+
+- **EMS-3685:** added xlsx for 2 new eligibility fields ([#2884](https://github.com/UK-Export-Finance/exip/issues/2884)) ([3878733](https://github.com/UK-Export-Finance/exip/commit/3878733d3235e38fc20e02e5f0b8d43492990974))
+
+## [2.30.0](https://github.com/UK-Export-Finance/exip/compare/v2.29.0...v2.30.0) (2024-08-02)
+
+### Features
+
+- **EMS-3665:** export contract - how was contract awarded - data saving ([#2883](https://github.com/UK-Export-Finance/exip/issues/2883)) ([d91a5d9](https://github.com/UK-Export-Finance/exip/commit/d91a5d9b186209cc07311b6ed0eb53c3f8464287))
+
+## [2.29.0](https://github.com/UK-Export-Finance/exip/compare/v2.28.2...v2.29.0) (2024-08-01)
+
+### Features
+
+- **EMS-3661:** export contract - how was contract awarded - form validation ([#2865](https://github.com/UK-Export-Finance/exip/issues/2865)) ([c495363](https://github.com/UK-Export-Finance/exip/commit/c495363928f0e9f00e7b06638aed9a0d4d475d4e))
+
+## [2.28.2](https://github.com/UK-Export-Finance/exip/compare/v2.28.1...v2.28.2) (2024-08-01)
+
+### Bug Fixes
+
+- **EMS-3703:** eligibility - Member of a group - Wording fix ([#2869](https://github.com/UK-Export-Finance/exip/issues/2869)) ([119ce21](https://github.com/UK-Export-Finance/exip/commit/119ce21f56e97ea99d9db1dcdfd611ca7cb6de05))
+
+## [2.28.1](https://github.com/UK-Export-Finance/exip/compare/v2.28.0...v2.28.1) (2024-08-01)
+
+### Bug Fixes
+
+- **iac:** afd custom domains association ([9ecd958](https://github.com/UK-Export-Finance/exip/commit/9ecd9582a228e3d8266daa228fb6655150358da5))
+
+## [2.28.0](https://github.com/UK-Export-Finance/exip/compare/v2.27.0...v2.28.0) (2024-07-31)
+
+### Features
+
+- **EMS-3667:** eligibility - Check if eligible - Content change ([#2861](https://github.com/UK-Export-Finance/exip/issues/2861)) ([0c7557f](https://github.com/UK-Export-Finance/exip/commit/0c7557faf6fc35a49c4cb6278f58fdaa4768b863))
+
+## [2.27.0](https://github.com/UK-Export-Finance/exip/compare/v2.26.0...v2.27.0) (2024-07-31)
+
+### Features
+
+- **EMS-3680-3682:** eligibility - Data saving ([#2853](https://github.com/UK-Export-Finance/exip/issues/2853)) ([8464b3f](https://github.com/UK-Export-Finance/exip/commit/8464b3fba3657788b3292d95d9bbd79ef452f2e9))
+
+## [2.26.0](https://github.com/UK-Export-Finance/exip/compare/v2.25.0...v2.26.0) (2024-07-31)
+
+### Features
+
+- **EMS-3665:** export contract - how was contract awarded - data model ([#2856](https://github.com/UK-Export-Finance/exip/issues/2856)) ([8295356](https://github.com/UK-Export-Finance/exip/commit/82953569ccb86c167805ec5adf45fb3fea214136))
+
+## [2.25.0](https://github.com/UK-Export-Finance/exip/compare/v2.24.0...v2.25.0) (2024-07-31)
+
+### Features
+
+- **EMS-3670-72:** eligibility - Party to consortium and Member of a group exit pages ([#2851](https://github.com/UK-Export-Finance/exip/issues/2851)) ([5eabbb5](https://github.com/UK-Export-Finance/exip/commit/5eabbb56aaf7d0d64f039b3b7d1bce031f5be8f8))
+
+## [2.24.0](https://github.com/UK-Export-Finance/exip/compare/v2.23.0...v2.24.0) (2024-07-31)
+
+### Features
+
+- **EMS-3676:** eligibility - Check your answers - Member of group and party to consortium ([#2852](https://github.com/UK-Export-Finance/exip/issues/2852)) ([3a8333a](https://github.com/UK-Export-Finance/exip/commit/3a8333a56a6f26b1aac3022cffa6fce83f5afb7a))
+
+## [2.23.0](https://github.com/UK-Export-Finance/exip/compare/v2.22.0...v2.23.0) (2024-07-30)
+
+### Features
+
+- **EMS-3660:** export contract - how was contract awarded - UI setup ([#2837](https://github.com/UK-Export-Finance/exip/issues/2837)) ([5884388](https://github.com/UK-Export-Finance/exip/commit/58843888123744b0272abd9d15a53946ce5ac96f))
+
+## [2.22.0](https://github.com/UK-Export-Finance/exip/compare/v2.21.0...v2.22.0) (2024-07-30)
+
+### Features
+
+- **EMS-3668-69-73-74:** eligibility - Party to consortium and Member of a group ([#2832](https://github.com/UK-Export-Finance/exip/issues/2832)) ([b05ef07](https://github.com/UK-Export-Finance/exip/commit/b05ef0704e3b3771f697a21d4cb157732a1146fb))
+
+## [2.21.0](https://github.com/UK-Export-Finance/exip/compare/v2.20.0...v2.21.0) (2024-07-26)
+
+### Features
+
+- **EMS-3611:** declaration - Anti-bribery code of conduct version update ([#2824](https://github.com/UK-Export-Finance/exip/issues/2824)) ([7637316](https://github.com/UK-Export-Finance/exip/commit/76373166d266a37537b6fbfad685d68d574522f2))
+
+## [2.20.0](https://github.com/UK-Export-Finance/exip/compare/v2.19.0...v2.20.0) (2024-07-25)
+
+### Features
+
+- **EMS-3612:** declarations - Anti-bribery definitions update ([#2820](https://github.com/UK-Export-Finance/exip/issues/2820)) ([09c460e](https://github.com/UK-Export-Finance/exip/commit/09c460ebbd1b95e6e23d7ae3da2ad55c37ae863b))
+
+## [2.19.0](https://github.com/UK-Export-Finance/exip/compare/v2.18.0...v2.19.0) (2024-07-25)
+
+### Features
+
+- **EMS-3633:** data migration - declarations ([#2819](https://github.com/UK-Export-Finance/exip/issues/2819)) ([39da207](https://github.com/UK-Export-Finance/exip/commit/39da207d6ca86253d2037738b42a993bad808711))
+
+## [2.18.0](https://github.com/UK-Export-Finance/exip/compare/v2.17.0...v2.18.0) (2024-07-25)
+
+### Features
+
+- **EMS-3631:** declaration versions - database restructure, application creation ([#2805](https://github.com/UK-Export-Finance/exip/issues/2805)) ([2353b5f](https://github.com/UK-Export-Finance/exip/commit/2353b5f853ecb0c827662d7bd960dbd18a37eb62))
+
+## [2.17.0](https://github.com/UK-Export-Finance/exip/compare/v2.16.0...v2.17.0) (2024-07-25)
+
+### Features
+
+- **EMS-3631:** declarations - replace api/keystone rendering with content-strings ([#2813](https://github.com/UK-Export-Finance/exip/issues/2813)) ([0b30342](https://github.com/UK-Export-Finance/exip/commit/0b30342e8e36222640997280cd922d59dca34206))
+
+## [2.16.0](https://github.com/UK-Export-Finance/exip/compare/v2.15.0...v2.16.0) (2024-07-24)
+
+### Features
+
+- **EMS-3536-3540:** remove 'how your data will be used' declaration ([#2789](https://github.com/UK-Export-Finance/exip/issues/2789)) ([9efa559](https://github.com/UK-Export-Finance/exip/commit/9efa5599a9b784eeee96d4f9f536f4b96231a7b1))
+
 ## [2.15.0](https://github.com/UK-Export-Finance/exip/compare/v2.14.0...v2.15.0) (2024-07-23)
 
 ### Features