Merge branch 'main' into fix/DTFS2-7203/companies-house-endpoint-retu…

…rns-500-for-companies-without-sic-codes

.env.sample

@@ -43,11 +43,11 @@ APIM_INFORMATICA_TIMEOUT= # in milliseconds
 # ORDNANCE SURVEY
 ORDNANCE_SURVEY_URL=https://api.os.uk
 ORDNANCE_SURVEY_KEY=
-ORDNANCE_SURVEY_MAX_REDIRECTS=
-ORDNANCE_SURVEY_TIMEOUT= # in milliseconds
+ORDNANCE_SURVEY_MAX_REDIRECTS=5
+ORDNANCE_SURVEY_TIMEOUT=30000 # in milliseconds
 
 # COMPANIES HOUSE
-COMPANIES_HOUSE_URL=
+COMPANIES_HOUSE_URL=https://api.companieshouse.gov.uk
 COMPANIES_HOUSE_KEY=
-COMPANIES_HOUSE_MAX_REDIRECTS=
-COMPANIES_HOUSE_TIMEOUT= # in milliseconds
+COMPANIES_HOUSE_MAX_REDIRECTS=5
+COMPANIES_HOUSE_TIMEOUT=30000 # in milliseconds

.github/workflows/deployment.yml

@@ -39,7 +39,7 @@ on:
 env:
   PRODUCT: apim
   ENVIRONMENT: ${{ github.ref_name }}
-  timezone: ${{ vars.TIMEZONE }}
+  TIMEZONE: ${{ vars.TIMEZONE }}
   # Base artifact
   FROM: latest
 
@@ -140,7 +140,15 @@ jobs:
             "APIM_INFORMATICA_PASSWORD=${{ secrets.APIM_INFORMATICA_PASSWORD }}" \
             "APIM_INFORMATICA_MAX_REDIRECTS=${{ secrets.APIM_INFORMATICA_MAX_REDIRECTS }}" \
             "APIM_INFORMATICA_TIMEOUT=${{ secrets.APIM_INFORMATICA_TIMEOUT }}" \
-            "API_KEY=${{ secrets.API_KEY }}"
+            "API_KEY=${{ secrets.API_KEY }}" \
+            "ORDNANCE_SURVEY_URL=${{ secrets.ORDNANCE_SURVEY_URL }}" \
+            "ORDNANCE_SURVEY_KEY=${{ secrets.ORDNANCE_SURVEY_KEY }}" \
+            "ORDNANCE_SURVEY_MAX_REDIRECTS=${{ secrets.ORDNANCE_SURVEY_MAX_REDIRECTS }}" \
+            "ORDNANCE_SURVEY_TIMEOUT=${{ secrets.ORDNANCE_SURVEY_TIMEOUT }}" \
+            "COMPANIES_HOUSE_URL=${{ secrets.COMPANIES_HOUSE_URL }}" \
+            "COMPANIES_HOUSE_KEY=${{ secrets.COMPANIES_HOUSE_KEY }}" \
+            "COMPANIES_HOUSE_MAX_REDIRECTS=${{ secrets.COMPANIES_HOUSE_MAX_REDIRECTS }}" \
+            "COMPANIES_HOUSE_TIMEOUT=${{ secrets.COMPANIES_HOUSE_TIMEOUT }}"
 
       - name: Import ⬇️
         if: ${{ '' != env.API_ID }}

.github/workflows/github.yml

@@ -13,7 +13,7 @@ on:
 
 env:
   environment: "qa"
-  timezone: ${{ vars.TIMEZONE }}
+  TIMEZONE: ${{ vars.TIMEZONE }}
 
 jobs:
   # 1. Setup test infrastructure

.github/workflows/infrastructure.yml

@@ -68,7 +68,7 @@ on:
 env:
   PRODUCT: apim
   ENVIRONMENT: infrastructure
-  timezone: ${{ vars.TIMEZONE }}
+  TIMEZONE: ${{ vars.TIMEZONE }}
   # Deployment environment target i.e., `dev`, `staging`, `production`
   TARGET: ${{ vars.ENVIRONMENT }}
 

.github/workflows/lint.yml

@@ -53,7 +53,7 @@ on:
 
 env:
   environment: "qa"
-  timezone: ${{ vars.TIMEZONE }}
+  TIMEZONE: ${{ vars.TIMEZONE }}
 
 jobs:
   # 1. Setup test infrastructure

.github/workflows/pr.yml

@@ -14,7 +14,7 @@ on:
     - cron: "00 00 * * *"
 env:
   environment: "qa"
-  timezone: ${{ vars.TIMEZONE }}
+  TIMEZONE: ${{ vars.TIMEZONE }}
 
 jobs:
   # 1. Setup test infrastructure

.github/workflows/sca.yml

@@ -15,7 +15,7 @@ on:
 
 env:
   environment: "qa"
-  timezone: ${{ vars.TIMEZONE }}
+  TIMEZONE: ${{ vars.TIMEZONE }}
 
 jobs:
   # 1. Setup test infrastructure

.github/workflows/test.yml

@@ -16,7 +16,7 @@ on:
 
 env:
   environment: "qa"
-  timezone: ${{ vars.TIMEZONE }}
+  TIMEZONE: ${{ vars.TIMEZONE }}
 
 jobs:
   # 1. Setup test infrastructure

.release-please-manifest.json

@@ -1,3 +1,3 @@
 {
-    ".": "1.20.0"
+    ".": "1.21.1"
 }

CHANGELOG.md

@@ -1,5 +1,30 @@
 # Changelog
 
+## [1.21.1](https://github.com/UK-Export-Finance/mdm-api/compare/v1.21.0...v1.21.1) (2024-06-04)
+
+
+### Bug Fixes
+
+* **deployment:** added env variables to deployment ([#918](https://github.com/UK-Export-Finance/mdm-api/issues/918)) ([eaf7fad](https://github.com/UK-Export-Finance/mdm-api/commit/eaf7fad86d2b4f7e5f0158c4164f28b5d8c7b402))
+
+## [1.21.0](https://github.com/UK-Export-Finance/mdm-api/compare/v1.20.0...v1.21.0) (2024-06-04)
+
+
+### Features
+
+* **DTFS-7049:** added POST /emails endpoint for sending emails using GOV.UK Notify service ([#820](https://github.com/UK-Export-Finance/mdm-api/issues/820)) ([3a1bf0e](https://github.com/UK-Export-Finance/mdm-api/commit/3a1bf0e369167f7aa1b7a940a4120260a419c3c0))
+* **DTFS2-7049:** fixed tests caused by removal of global transformer and allowing extra params ([71e44ff](https://github.com/UK-Export-Finance/mdm-api/commit/71e44ff577b00695743ad62537b00d6fd25bb22d))
+* **DTFS2-7049:** fixing PR issues ([e0e099e](https://github.com/UK-Export-Finance/mdm-api/commit/e0e099e841726c34cac121059bacff393bfceef7))
+* **DTFS2-7049:** removed BadRequestException tests moving payload to object instead of array ([3bb8d71](https://github.com/UK-Export-Finance/mdm-api/commit/3bb8d714eace1fcaf9fe987b77c8641e1dc79686))
+* **DTFS2-7049:** return error message as string instead of array ([86b5b4d](https://github.com/UK-Export-Finance/mdm-api/commit/86b5b4d982c16ba0e8b6964ff2d422e746800cc3))
+* **DTFS2-7049:** test unknown Gov.UK Notify responses ([c14fa49](https://github.com/UK-Export-Finance/mdm-api/commit/c14fa49d6eabf09585dd85f58a6415fcca2aa9c5))
+* **DTFS2-7121:** create Companies House endpoint ([#821](https://github.com/UK-Export-Finance/mdm-api/issues/821)) ([7860528](https://github.com/UK-Export-Finance/mdm-api/commit/786052823f37b9b5f8e832fc2678c1cfdfb87fed))
+
+
+### Bug Fixes
+
+* **eslint:** reverted back to eslint `8.57.0` ([#905](https://github.com/UK-Export-Finance/mdm-api/issues/905)) ([75ca97c](https://github.com/UK-Export-Finance/mdm-api/commit/75ca97c46e77b2737ff441246974122c346c133e))
+
 ## [1.20.0](https://github.com/UK-Export-Finance/mdm-api/compare/v1.19.0...v1.20.0) (2024-05-22)