Merge remote-tracking branch 'origin/main' into feat/apim-344-handle-…

…sensitive-details-in-logs-messages
UK-Export-Finance · Jul 25, 2023 · 3bf0ec4 · 3bf0ec4
2 parents da02c07 + b1511d8
commit 3bf0ec4
Show file tree

Hide file tree

Showing 12 changed files with 508 additions and 297 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -9,27 +9,27 @@
 version: 2
 updates:
   # Root package-*.json files
-  - package-ecosystem: 'npm'
-    directory: '/'
+  - package-ecosystem: "npm"
+    directory: "/"
     schedule:
-      interval: 'daily'
+      interval: "daily"
     labels:
-      - 'chore'
+      - "chore"
 
   # Root Dockerfile
-  - package-ecosystem: 'docker'
-    directory: '/'
+  - package-ecosystem: "docker"
+    directory: "/"
     schedule:
-      interval: 'daily'
+      interval: "daily"
     labels:
-      - 'chore'
+      - "chore"
 
   # Git Hub Actions
   #  Set the directory to `/` for
   # .github/workflows GHA files
-  - package-ecosystem: 'github-actions'
-    directory: '/'
+  - package-ecosystem: "github-actions"
+    directory: "/"
     schedule:
-      interval: 'daily'
+      interval: "daily"
     labels:
-      - 'chore'
+      - "chore"
diff --git a/.github/workflows/deploy.sh b/.github/workflows/deploy.sh
@@ -16,47 +16,43 @@ read selection
 if [ -n "$selection" ]; then
 
     ############### INFRASTRUCTURE ###############
-    if [ "$selection" = "0" ]
-    then
-    destination=infrastructure
-    branch=main
+    if [ "$selection" = "0" ]; then
+        destination=infrastructure
+        branch=main
     ############### DEPLOYMENT ###############
-    elif [ "$selection" = "1" ]
-    then
-    read destination
-    branch=main
+    elif [ "$selection" = "1" ]; then
+        read destination
+        branch=main
     ############### ACR PURGE ###############
-    elif [ "$selection" = "2" ]
-    then
-    destination=""
-    branch=""
-    az acr run --cmd "acr purge --filter 'get-a-quote:.*' --ago 15d" --registry "${ACR}" /dev/null
+    elif [ "$selection" = "2" ]; then
+        destination=""
+        branch=""
+        az acr run --cmd "acr purge --filter 'mdm:.*' --ago 7d" --registry "${ACR}" /dev/null
     ############### ACR PURGE ###############
     fi
 
-    if [ -n "$destination" -a -n "$branch" ]
-    then
-    # Display latest push commit
-    git checkout "${branch}"
-    git pull
-    printf "\n\n${NC}⬆️ ${branch} branch latest push : ${NC}"
-    printf "${GREEN}"
-    git log -n 1 --pretty | sort | grep commit
-    printf "${NC}\n\n"
-
-    # Deploy
-    git checkout -b "${destination}"
-    git push -f --set-upstream origin "${destination}"
-
-    # Clean up
-    git checkout "${branch}"
-    git branch -d "${destination}"
-    printf "\n\n✅ ${destination} deployment initiated, switched to ${branch}.\n\n"
+    if [ -n "$destination" -a -n "$branch" ]; then
+        # Display latest push commit
+        git checkout "${branch}"
+        git pull
+        printf "\n\n${NC}⬆️ ${branch} branch latest push : ${NC}"
+        printf "${GREEN}"
+        git log -n 1 --pretty | sort | grep commit
+        printf "${NC}\n\n"
+
+        # Deploy
+        git checkout -b "${destination}"
+        git push -f --set-upstream origin "${destination}"
+
+        # Clean up
+        git checkout "${branch}"
+        git branch -d "${destination}"
+        printf "\n\n✅ ${destination} deployment initiated, switched to ${branch}.\n\n"
     fi
 
 else
-    printf "${RED} ❌ Invalid input, terminating.${NC}\n\n";
-    exit 0;
+    printf "${RED} ❌ Invalid input, terminating.${NC}\n\n"
+    exit 0
 fi
 
 #######################################

diff --git a/.github/workflows/deployment.yml b/.github/workflows/deployment.yml
@@ -29,18 +29,18 @@ on:
       - production
 
     paths:
-      - 'src/**'
-      - 'package.json'
-      - 'package-lock.json'
-      - 'Dockerfile'
-      - 'tsconfig.json'
-      - 'tsconfig.build.json'
-      - '.github/workflows/deployment.yml'
+      - "src/**"
+      - "package.json"
+      - "package-lock.json"
+      - "Dockerfile"
+      - "tsconfig.json"
+      - "tsconfig.build.json"
+      - ".github/workflows/deployment.yml"
 
 env:
   PRODUCT: apim
   ENVIRONMENT: ${{ github.ref_name }}
-  TIMEZONE: 'Europe/London'
+  TIMEZONE: "Europe/London"
   # Base artifact
   FROM: latest
 
@@ -162,4 +162,3 @@ jobs:
             --protocols https \
             --specification-url https://$(az containerapp show --name ${{ env.CA_NAME }} --query properties.latestRevisionFqdn -o tsv)/openapi/json \
             --subscription-required true
-
diff --git a/.github/workflows/infrastructure.yml b/.github/workflows/infrastructure.yml
@@ -68,7 +68,7 @@ on:
 env:
   PRODUCT: apim
   ENVIRONMENT: infrastructure
-  TIMEZONE: 'Europe/London'
+  TIMEZONE: "Europe/London"
   # Deployment environment target i.e., `dev`, `staging`, `production`
   TARGET: ${{ vars.ENVIRONMENT }}
 

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -7,33 +7,32 @@ run-name: Executing lint QA on ${{ github.repository }} 🚀
 
 on:
   pull_request:
-    branches: [ main ]
+    branches: [main]
     paths:
-    - 'src/**'
-    - 'test/**'
+      - "src/**"
+      - "test/**"
 
 env:
-  environment: 'qa'
-  timezone: 'Europe/London'
+  environment: "qa"
+  timezone: "Europe/London"
   node: ${{ vars.NODE_VERSION }}
 
 jobs:
-
-# 1. Setup test infrastructure
+  # 1. Setup test infrastructure
   setup:
     name: Infrastructure setup 🔧
     runs-on: ubuntu-latest
     outputs:
       environment: ${{ env.environment }}
       timezone: ${{ env.timezone }}
     steps:
-    - name: Environment 🧪
-      run: echo "Environment set to ${{ env.environment }}"
-  
-    - name: Timezone 🌐
-      run: echo "Timezone set to ${{ env.timezone }}"
+      - name: Environment 🧪
+        run: echo "Environment set to ${{ env.environment }}"
+
+      - name: Timezone 🌐
+        run: echo "Timezone set to ${{ env.timezone }}"
 
-# 2. Lint
+  # 2. Lint
   lint:
     name: Scanning 🎨
     environment:
@@ -44,7 +43,7 @@ jobs:
         uses: szenius/set-timezone@v1.2
         with:
           timezoneLinux: ${{ needs.setup.outputs.timezone }}
-  
+
       - name: Repository
         uses: actions/checkout@v3
 

diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -7,13 +7,11 @@ run-name: Executing release on ${{ github.repository }} 🚀
 
 on:
   push:
-    branches: [ main ]
+    branches: [main]
 
 jobs:
-
   # 1. `package.json`, `README.md` and `CHANGELOG.md` updates
   release:
-
     name: Release setup 🔧
     runs-on: ubuntu-latest
     steps:
@@ -24,10 +22,10 @@ jobs:
           release-type: node
           package-name: uk-export-finance/mdm-api
           changelog-types: '[
-              { "type": "feat", "section": "Features", "hidden": false},
-              { "type": "fix", "section": "Bug Fixes", "hidden": false},
-              { "type": "chore", "section": "Miscellaneous", "hidden": false},
-              { "type": "docs", "section": "Documentation", "hidden": false}
+            { "type": "feat", "section": "Features", "hidden": false},
+            { "type": "fix", "section": "Bug Fixes", "hidden": false},
+            { "type": "chore", "section": "Miscellaneous", "hidden": false},
+            { "type": "docs", "section": "Documentation", "hidden": false}
             ]'
           extra-files: |
             README.md

diff --git a/.github/workflows/sca.yml b/.github/workflows/sca.yml
@@ -11,29 +11,28 @@ run-name: Executing various SCAs on ${{ github.repository }} 🔍️
 
 on:
   pull_request:
-    branches: [ main ]
+    branches: [main]
 
 env:
-  environment: 'qa'
-  timezone: 'Europe/London'
+  environment: "qa"
+  timezone: "Europe/London"
 
 jobs:
-
-# 1. Setup test infrastructure
+  # 1. Setup test infrastructure
   setup:
     name: Infrastructure setup 🔧
     runs-on: ubuntu-latest
     outputs:
       environment: ${{ env.environment }}
       timezone: ${{ env.timezone }}
     steps:
-    - name: Environment 🧪
-      run: echo "Environment set to ${{ env.environment }}"
-  
-    - name: Timezone 🌐
-      run: echo "Timezone set to ${{ env.timezone }}"
+      - name: Environment 🧪
+        run: echo "Environment set to ${{ env.environment }}"
+
+      - name: Timezone 🌐
+        run: echo "Timezone set to ${{ env.timezone }}"
 
-# 2. Code quality - SCA
+  # 2. Code quality - SCA
   codacy:
     name: Codacy 🔖
     needs: setup
@@ -42,15 +41,15 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - name: Repository
-      uses: actions/checkout@v3
+      - name: Repository
+        uses: actions/checkout@v3
 
-    - name: Codacy
-      uses: codacy/codacy-analysis-cli-action@master
-      with:
-        verbose: true
+      - name: Codacy
+        uses: codacy/codacy-analysis-cli-action@master
+        with:
+          verbose: true
 
-# 3. Licensing - SCA
+  # 3. Licensing - SCA
   license:
     name: Licensing ✏️
     needs: setup
@@ -59,10 +58,10 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - name: Repository
-      uses: actions/checkout@v3
+      - name: Repository
+        uses: actions/checkout@v3
 
-    - name: Fossa
-      uses: fossas/fossa-action@main
-      with:
-        api-key: ${{ secrets.FOSSA_API_KEY }}
+      - name: Fossa
+        uses: fossas/fossa-action@main
+        with:
+          api-key: ${{ secrets.FOSSA_API_KEY }}
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -10,32 +10,31 @@ run-name: Executing test QA on ${{ github.repository }} 🚀
 
 on:
   pull_request:
-    branches: [ main ]
+    branches: [main]
     paths:
-    - '**'
+      - "**"
 
 env:
-  environment: 'qa'
-  timezone: 'Europe/London'
+  environment: "qa"
+  timezone: "Europe/London"
   node: ${{ vars.NODE_VERSION }}
 
 jobs:
-
-# 1. Setup test infrastructure
+  # 1. Setup test infrastructure
   setup:
     name: Infrastructure setup 🔧
     runs-on: ubuntu-latest
     outputs:
       environment: ${{ env.environment }}
       timezone: ${{ env.timezone }}
     steps:
-    - name: Environment 🧪
-      run: echo "Environment set to ${{ env.environment }}"
-  
-    - name: Timezone 🌐
-      run: echo "Timezone set to ${{ env.timezone }}"
+      - name: Environment 🧪
+        run: echo "Environment set to ${{ env.environment }}"
+
+      - name: Timezone 🌐
+        run: echo "Timezone set to ${{ env.timezone }}"
 
-# 2. Unit tests
+  # 2. Unit tests
   unit-tests:
     name: Unit 👷
     needs: setup

diff --git a/.gitignore b/.gitignore
@@ -1,5 +1,5 @@
 # UKEF
-.env
+.env*
 
 # compiled output
 /dist