Merge pull request #38 from NHSDigital/AMB-1709-backend-error-handling-new

Creating catch_all_lambda configuration

Author: ewan-IW

Makefile

@@ -38,7 +38,7 @@ build-proxy:
 	scripts/build_proxy.sh
 
 #Files to loop over in release
-_dist_include="pytest.ini poetry.lock poetry.toml pyproject.toml Makefile build/. tests specification sandbox terraform lambda_typescript scripts"
+_dist_include="pytest.ini poetry.lock poetry.toml pyproject.toml Makefile build/. tests specification sandbox terraform lambda_typescript scripts catch_all_lambda"
 
 #Create /dist/ sub-directory and copy files into directory
 release: clean publish build-proxy

azure/templates/post-deploy.yml

@@ -8,18 +8,18 @@ steps:
   - ${{ if parameters.is_ptl }}:
     - template: "azure/components/aws-assume-role.yml@common"
       parameters:
-          role: "auto-ops"
-          profile: "apm_ptl"
+        role: "auto-ops"
+        profile: "apm_ptl"
 
     - template: "azure/components/get-aws-secrets-and-ssm-params.yml@common"
       parameters:
-          secret_file_ids:
-              - ptl/app-credentials/jwt_testing/non-prod/JWT_TESTING_PRIVATE_KEY
-          secret_ids:
-              - ptl/app-credentials/immunisation-fhir-api-testing-app/non-prod/INTROSPECTION_CLIENT_ID  
-              - ptl/app-credentials/immunisation-fhir-api-testing-app/non-prod/INTROSPECTION_CLIENT_SECRET
-              - ptl/app-credentials/immunisation-fhir-api-testing-app/non-prod/INTROSPECTION_CLIENT_ID_INT
-              - ptl/app-credentials/immunisation-fhir-api-testing-app/non-prod/INTROSPECTION_CLIENT_SECRET_INT
+        secret_file_ids:
+          - ptl/app-credentials/jwt_testing/non-prod/JWT_TESTING_PRIVATE_KEY
+        secret_ids:
+          - ptl/app-credentials/immunisation-fhir-api-testing-app/non-prod/INTROSPECTION_CLIENT_ID
+          - ptl/app-credentials/immunisation-fhir-api-testing-app/non-prod/INTROSPECTION_CLIENT_SECRET
+          - ptl/app-credentials/immunisation-fhir-api-testing-app/non-prod/INTROSPECTION_CLIENT_ID_INT
+          - ptl/app-credentials/immunisation-fhir-api-testing-app/non-prod/INTROSPECTION_CLIENT_SECRET_INT
 
   - bash: |
       make install-python
@@ -55,9 +55,20 @@ steps:
         echo pr_no: $pr_no
 
         cd terraform
+
+        cd ../lambda_typescript && \
+          chmod +x ./deploy.sh && \
+          ./deploy.sh
+
+        cd ../catch_all_lambda && \
+          chmod +x ./deploy.sh && \
+          ./deploy.sh
+
+        cd ../terraform
+
         make init
         make apply aws_account_no=${aws_account_no} environment=$workspace 
-        
+
       fi
     displayName: Deploy sandbox
     workingDirectory: "$(Pipeline.Workspace)/s/$(SERVICE_NAME)/$(SERVICE_ARTIFACT_NAME)"
@@ -76,11 +87,11 @@ steps:
       marker="not sandbox_int"
       if [[ $APIGEE_ENVIRONMENT =~ .*-*sandbox ]]
       then
-        echo "Sandox env tests"
+        echo "Sandbox env tests"
         marker="not nhsd_apim_authorization and not sandbox_int"
       elif [[ $APIGEE_ENVIRONMENT == "int" ]]
       then
-       echo "Int tests to be set as of now"
+        echo "Int tests to be set as of now"
       fi
       echo $marker 
       poetry run pytest -v -m "$marker" --api-name=immunisation-fhir-api --proxy-name=$PROXY_NAME -o junit_logging=all --junitxml=test-report.xml

catch_all_lambda/deploy.sh

@@ -0,0 +1,13 @@
+    
+
+  # Create a dist folder and copy only the catch_all.py file to dist.
+  mkdir -p ../catch_all_lambda/dist &&\
+  cp -r ../catch_all_lambda/src/catch_all_lambda.py ../catch_all_lambda/dist &&\
+  cd ../catch_all_lambda/dist &&\
+  find . -name "*.zip" -type f -delete && \
+  #Create zips directory under terraform, delete existing one
+  mkdir -p ../../terraform/zips && \
+  # Zip everything in the dist folder and move to terraform directory
+  zip -r ../../terraform/zips/catch_all_lambda_function_code.zip . && \
+  #Delete Distibution folder
+  cd .. && rm -rf dist

catch_all_lambda/src/catch_all_lambda.py

@@ -0,0 +1,36 @@
+import json
+
+
+def handler():
+    response = {
+        "statusCode": 404,  # HTTP status code
+        "headers": {
+            "Content-Type": "application/json",  # Specify the content type
+        },
+        "body": json.dumps({
+            "resourceType": "OperationOutcome",
+            "id": "a5abca2a-4eda-41da-b2cc-95d48c6b791d",
+            "meta": {
+                "profile": [
+                    "https://simplifier.net/guide/UKCoreDevelopment2/ProfileUKCore-OperationOutcome"
+                ]
+            },
+            "issue": [
+                {
+                    "severity": "error",
+                    "code": "not-found",
+                    "details": {
+                        "coding": [
+                            {
+                                "system": "https://fhir.nhs.uk/Codesystem/http-error-codes",
+                                "code": "NOT_FOUND"
+                            }
+                        ]
+                    },
+                    "diagnostics": "The requested resource was not found."
+                }
+            ]
+        })
+    }
+
+    return response