Merge pull request #44 from NHSDigital/AMB-1741_refactor_terraform

Amb 1741 refactor terraform

Author: artronics

.flake8

@@ -1,3 +1,3 @@
 [flake8]
 max-line-length=121
-exclude = .git,__pycache__,dist,.venv/*,node_modules/*,utils/*,tests/.venv/*
+exclude = .git,__pycache__,dist,.venv/*,node_modules/*,utils/*,tests/.venv/*,dynamodb/*,lambda_code/*

.gitignore

@@ -23,3 +23,4 @@ terraform/zips
 .python-version
 **/.terraform/
 sandbox/specification/
+.vscode/

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 catch_all_lambda"
+_dist_include="pytest.ini poetry.lock poetry.toml pyproject.toml Makefile build/. tests specification sandbox terraform scripts lambda_code"
 
 #Create /dist/ sub-directory and copy files into directory
 release: clean publish build-proxy

azure/azure-build-pipeline.yml

@@ -31,4 +31,4 @@ extends:
     service_name: ${{ variables.service_name }}
     short_service_name: ${{ variables.short_service_name }}
     post_ecs_push:
-      - template: ./templates/build-sandbox-image.yml
+        -   template: ./templates/build.yml

azure/templates/build-sandbox-image.yml

@@ -0,0 +1,16 @@
+steps:
+  - bash: |
+      docker build -t imms-lambda-build .
+      docker run --rm -v $(shell pwd)/build:/build imms-lambda-build
+
+    displayName: Build and test lambda code
+    workingDirectory: "$(Pipeline.Workspace)/s/$(SERVICE_NAME)/lambda_code"
+  - bash: |
+      mkdir -p build
+      npm run publish 2> /dev/null
+      cp build/immunisation-fhir-api.json sandbox/
+
+        cd sandbox
+      docker build -t sandbox .
+    displayName: Build sandbox image
+    workingDirectory: "$(Pipeline.Workspace)/s/$(SERVICE_NAME)"

azure/templates/build.yml

@@ -10,7 +10,7 @@ steps:
       parameters:
         role: "auto-ops"
         profile: "apm_ptl"
-    
+
     - template: "azure/components/get-aws-secrets-and-ssm-params.yml@common"
       parameters:
         secret_file_ids:
@@ -26,7 +26,7 @@ steps:
     workingDirectory: $(Pipeline.Workspace)/s/$(SERVICE_NAME)/$(SERVICE_ARTIFACT_NAME)
     displayName: Setup pytests
     condition: always()
-  
+
   - template: "azure/components/aws-assume-role.yml@common"
     parameters:
       role: "auto-ops"
@@ -67,10 +67,10 @@ steps:
         cd ../terraform
 
         make init
-        make apply aws_account_no=${aws_account_no} environment=$workspace 
+          make apply aws_account_no=${aws_account_no} environment=$workspace
 
       fi
-    displayName: Deploy sandbox
+    displayName: Apply Terraform
     workingDirectory: "$(Pipeline.Workspace)/s/$(SERVICE_NAME)/$(SERVICE_ARTIFACT_NAME)"
     retryCountOnTaskFailure: 2
 
@@ -93,9 +93,9 @@ steps:
       then
         echo "Int tests to be set as of now"
       fi
-      echo $marker 
+        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
-      
+
     workingDirectory: "$(Pipeline.Workspace)/s/$(SERVICE_NAME)/$(SERVICE_ARTIFACT_NAME)/tests"
     displayName: Run full test suite