Merge remote-tracking branch 'origin/main' into feat/DTFS2-7052/new-e…

…xternal-ordnance-survey-api
UK-Export-Finance · Apr 15, 2024 · 0d86a35 · 0d86a35
2 parents db50210 + 48f1578
commit 0d86a35
Show file tree

Hide file tree

Showing 9 changed files with 396 additions and 89 deletions.
diff --git a/.env.sample b/.env.sample
@@ -40,7 +40,8 @@ APIM_INFORMATICA_PASSWORD=
 APIM_INFORMATICA_MAX_REDIRECTS=
 APIM_INFORMATICA_TIMEOUT=
 
-# ORDANANCE SURVEY
+# ORDNANCE SURVEY
+# Use .uk domain, instead of .co.uk
 ORDNANCE_SURVEY_URL=
 ORDNANCE_SURVEY_KEY=
 ORDNANCE_SURVEY_MAX_REDIRECTS=

diff --git a/.github/workflows/deployment.yml b/.github/workflows/deployment.yml
@@ -74,12 +74,12 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Azure 🔐
-        uses: azure/login@v1
+        uses: azure/login@v2
         with:
           creds: ${{ secrets.AZURE_CREDENTIALS }}
 
       - name: Defaults ✨
-        uses: Azure/cli@v1.0.9
+        uses: Azure/cli@v2.0.0
         with:
           inlineScript: |
             # Basic
@@ -110,7 +110,7 @@ jobs:
           docker push ${{ env.ACR }}/${{ env.NAME }}:${{ env.FROM }}
 
       - name: Revisions 🔀
-        uses: Azure/cli@v1.0.9
+        uses: Azure/cli@v2.0.0
         with:
           inlineScript: |
             az containerapp update \
@@ -144,7 +144,7 @@ jobs:
 
       - name: Import ⬇️
         if: ${{ '' != env.API_ID }}
-        uses: Azure/cli@v1.0.9
+        uses: Azure/cli@v2.0.0
         with:
           inlineScript: |
             # API specification import

diff --git a/.github/workflows/infrastructure.yml b/.github/workflows/infrastructure.yml
@@ -110,12 +110,12 @@ jobs:
           'Team=development' >> $GITHUB_ENV
 
       - name: Login 🔐
-        uses: azure/login@v1
+        uses: azure/login@v2
         with:
           creds: ${{ secrets.AZURE_CREDENTIALS }}
 
       - name: Azure defaults ✨
-        uses: Azure/cli@v1.0.9
+        uses: Azure/cli@v2.0.0
         with:
           inlineScript: |
             # Basic
@@ -126,15 +126,15 @@ jobs:
             az extension add --name containerapp --upgrade
 
       - name: Resource group 🏗️
-        uses: Azure/cli@v1.0.9
+        uses: Azure/cli@v2.0.0
         with:
           inlineScript: |
             az group create \
             --name rg-${{ env.PRODUCT }}-${{ env.TARGET }}-${{ vars.VERSION }} \
             --tags ${{ env.TAGS }}
 
       - name: Log analytics workspace 📝
-        uses: Azure/cli@v1.0.9
+        uses: Azure/cli@v2.0.0
         with:
           inlineScript: |
             az monitor log-analytics workspace create \
@@ -148,7 +148,7 @@ jobs:
             --tags ${{ env.TAGS }}
 
       - name: Container registry 📦️
-        uses: Azure/cli@v1.0.9
+        uses: Azure/cli@v2.0.0
         with:
           inlineScript: |
             az acr create \
@@ -159,7 +159,7 @@ jobs:
             --tags ${{ env.TAGS }}
 
       - name: Virtual network 🧵
-        uses: Azure/cli@v1.0.9
+        uses: Azure/cli@v2.0.0
         with:
           inlineScript: |
             az network vnet create \
@@ -171,13 +171,13 @@ jobs:
             --tags ${{ env.TAGS }}
 
       - name: Login 🔐
-        uses: azure/login@v1
+        uses: azure/login@v2
         with:
           creds: ${{ secrets.AZURE_CREDENTIALS_AMI }}
 
       - name: AMI Pre-production 🔀
         if: contains('["dev", "staging"]', env.TARGET)
-        uses: Azure/cli@v1.0.9
+        uses: Azure/cli@v2.0.0
         with:
           inlineScript: |
             # Azure Managed Instance (AMI) SQL non-production DB VNET peering
@@ -206,7 +206,7 @@ jobs:
 
       - name: AMI Production 🔀
         if: ${{ 'production' == env.TARGET }}
-        uses: Azure/cli@v1.0.9
+        uses: Azure/cli@v2.0.0
         with:
           inlineScript: |
             # Azure Managed Instance (AMI) SQL DB production VNET peering
@@ -234,12 +234,12 @@ jobs:
             --query peeringState)"
 
       - name: Login 🔐
-        uses: azure/login@v1
+        uses: azure/login@v2
         with:
           creds: ${{ secrets.AZURE_CREDENTIALS_VPN }}
 
       - name: VNET Peer - VPN 🔀
-        uses: Azure/cli@v1.0.9
+        uses: Azure/cli@v2.0.0
         with:
           inlineScript: |
             # VPN VNET peering
@@ -267,12 +267,12 @@ jobs:
             --query peeringState)"
 
       - name: Login 🔐
-        uses: azure/login@v1
+        uses: azure/login@v2
         with:
           creds: ${{ secrets.AZURE_CREDENTIALS }}
 
       - name: Route table 🌐
-        uses: Azure/cli@v1.0.9
+        uses: Azure/cli@v2.0.0
         with:
           inlineScript: |
             az network route-table create \
@@ -289,7 +289,7 @@ jobs:
             --next-hop-type VirtualAppliance
 
       - name: Container app environment 🗃️
-        uses: Azure/cli@v1.0.9
+        uses: Azure/cli@v2.0.0
         with:
           inlineScript: |
             az containerapp env create \
@@ -300,7 +300,7 @@ jobs:
             --tags ${{ env.TAGS }}
 
       - name: Container app - MDM 📄
-        uses: Azure/cli@v1.0.9
+        uses: Azure/cli@v2.0.0
         with:
           inlineScript: |
             az containerapp create \
@@ -319,7 +319,7 @@ jobs:
             --tags ${{ env.TAGS }}
 
       - name: API management ⚡️
-        uses: Azure/cli@v1.0.9
+        uses: Azure/cli@v2.0.0
         with:
           inlineScript: |
             az apim create \
@@ -347,20 +347,20 @@ jobs:
         run: echo "TYPE=Production" >> $GITHUB_ENV
 
       - name: Login 🔐
-        uses: azure/login@v1
+        uses: azure/login@v2
         with:
           creds: ${{ secrets.AZURE_CREDENTIALS }}
 
       - name: Azure defaults ✨
-        uses: Azure/cli@v1.0.9
+        uses: Azure/cli@v2.0.0
         with:
           inlineScript: |
             # Basic
             az configure --defaults location=${{ vars.REGION }}
             az configure --defaults group=rg-${{ env.PRODUCT }}-${{ env.TARGET }}-${{ vars.VERSION }}
 
       - name: Subnet routing table 🌐
-        uses: Azure/cli@v1.0.9
+        uses: Azure/cli@v2.0.0
         with:
           inlineScript: |
             # Associate VPN route table to default subnet
@@ -385,12 +385,12 @@ jobs:
         run: echo "TYPE=Production" >> $GITHUB_ENV
 
       - name: Login 🔐
-        uses: azure/login@v1
+        uses: azure/login@v2
         with:
           creds: ${{ secrets.AZURE_CREDENTIALS }}
 
       - name: Azure defaults ✨
-        uses: Azure/cli@v1.0.9
+        uses: Azure/cli@v2.0.0
         with:
           inlineScript: |
             # Basic
@@ -404,7 +404,7 @@ jobs:
           echo API_ECHO=$(az apim api list --service-name apim-${{ env.ENVIRONMENT }}-${{ env.TARGET }}-${{ vars.VERSION }} --filter-display-name 'Echo API' --top 1 --query [0].name -o tsv) >> $GITHUB_ENV
 
       - name: IP restriction 🔒️
-        uses: Azure/cli@v1.0.9
+        uses: Azure/cli@v2.0.0
         with:
           inlineScript: |
             # Add APIM public IP
@@ -418,7 +418,7 @@ jobs:
             --description 'Allow APIM public IP address'
 
       - name: Delete - Starter product
-        uses: Azure/cli@v1.0.9
+        uses: Azure/cli@v2.0.0
         if: ${{ '' != env.PRODUCT_STARTER }}
         with:
           inlineScript: |
@@ -429,7 +429,7 @@ jobs:
             --yes
 
       - name: Delete - Unlimited product
-        uses: Azure/cli@v1.0.9
+        uses: Azure/cli@v2.0.0
         if: ${{ '' != env.PRODUCT_UNLIMITED }}
         with:
           inlineScript: |
@@ -440,7 +440,7 @@ jobs:
             --yes
 
       - name: Delete - Echo API
-        uses: Azure/cli@v1.0.9
+        uses: Azure/cli@v2.0.0
         if: ${{ '' != env.API_ECHO }}
         with:
           inlineScript: |
@@ -469,12 +469,12 @@ jobs:
         run: echo "TYPE=Production" >> $GITHUB_ENV
 
       - name: Login 🔐
-        uses: azure/login@v1
+        uses: azure/login@v2
         with:
           creds: ${{ secrets.AZURE_CREDENTIALS }}
 
       - name: Azure defaults ✨
-        uses: Azure/cli@v1.0.9
+        uses: Azure/cli@v2.0.0
         with:
           inlineScript: |
             # Basic
@@ -487,7 +487,7 @@ jobs:
           echo API_MDM=$(az apim api list --service-name apim-${{ env.ENVIRONMENT }}-${{ env.TARGET }}-${{ vars.VERSION }} --filter-display-name ${{ env.NAME_UPPERCASE }} --top 1 --query [0].name -o tsv) >> $GITHUB_ENV
 
       - name: MDM - Product ➕
-        uses: Azure/cli@v1.0.9
+        uses: Azure/cli@v2.0.0
         if: ${{ '' == env.PRODUCT_MDM }}
         with:
           inlineScript: |
@@ -500,7 +500,7 @@ jobs:
             --subscription-required true
 
       - name: MDM - API import ⬇️
-        uses: Azure/cli@v1.0.9
+        uses: Azure/cli@v2.0.0
         if: ${{ '' == env.API_MDM }}
         with:
           inlineScript: |
@@ -517,7 +517,7 @@ jobs:
             --specification-url https://$(az containerapp show --name ca-${{ env.PRODUCT }}-mdm-${{ env.TARGET }}-${{ vars.VERSION }} --query properties.latestRevisionFqdn -o tsv)/openapi/json
 
       - name: MDM - Product + API 🧱
-        uses: Azure/cli@v1.0.9
+        uses: Azure/cli@v2.0.0
         if: ${{ '' != env.API_MDM }}
         with:
           inlineScript: |
@@ -527,7 +527,7 @@ jobs:
             --product-id $(az apim product list --service-name apim-${{ env.ENVIRONMENT }}-${{ env.TARGET }}-${{ vars.VERSION }} --query '[?contains(displayName, `apim-${{ env.PRODUCT }}-mdm`)].name' -o tsv)
 
       - name: MDM - Policy 🚧
-        uses: Azure/cli@v1.0.9
+        uses: Azure/cli@v2.0.0
         if: ${{ '' != env.API_MDM }}
         with:
           inlineScript: |

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -40,7 +40,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Timezone
-        uses: szenius/set-timezone@v1.2
+        uses: szenius/set-timezone@v2.0
         with:
           timezoneLinux: ${{ needs.setup.outputs.timezone }}
 

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -43,7 +43,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Timezone
-        uses: szenius/set-timezone@v1.2
+        uses: szenius/set-timezone@v2.0
         with:
           timezoneLinux: ${{ needs.setup.outputs.timezone }}