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

.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",

.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 }}

.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 }}

.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

.husky/commit-msg

@@ -1,4 +1 @@
-#!/usr/bin/env sh
-. "$(dirname -- "$0")/_/husky.sh"
-
 npx commitlint --color --edit $1

.husky/pre-commit

@@ -1,4 +1 @@
-#!/usr/bin/env sh
-. "$(dirname -- "$0")/_/husky.sh"
-
 npx lint-staged

.release-please-manifest.json

@@ -1,3 +1,3 @@
 {
-    ".": "2.15.0"
+    ".": "2.35.0"
 }

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