Merge pull request #58 from NHSDigital/mm-apm-2006-add-real-status-endpoint

apm-2006: status endpoint with security in apim now

Author: matt-mercer

.python-version

@@ -0,0 +1 @@
+3.8.2

Makefile

@@ -27,12 +27,15 @@ clean: clean-build clean-dist clean-reports
 	done; \
 	wait
 
-install:
+install: install-python
 	@for dir in $(modules); do \
 		make --no-print-directory -C docker/$${dir} install & \
 	done; \
 	wait
 
+install-python:
+	poetry install
+
 update:
 	@for dir in $(modules); do \
 		make --no-print-directory -C docker/$${dir} update & \
@@ -50,6 +53,7 @@ clean-dist:
 clean-reports:
 	rm -rf ./reports || true
 
+
 build: clean-build
 	@for dir in $(modules); do \
 		make --no-print-directory -C docker/$${dir} build & \
@@ -61,14 +65,15 @@ build: clean-build
 
 build-proxy: build
 
+_dist_include="pytest.ini poetry.lock poetry.toml pyproject.toml Makefile build/. e2e"
+
 dist: clean-dist build
-	mkdir -p dist/proxies
-	cp -R build/. dist/proxies
-	cp -R e2e/. dist/e2e
-#	cp -R utils dist
-#	rm -rf dist/utils/.git
+	mkdir -p dist
+	for f in $(_dist_include); do cp -r $$f dist; done
 	cp ecs-proxies-deploy.yml dist/ecs-deploy-all.yml
 
+release: dist
+
 test: clean-reports
 	@for dir in $(modules); do \
 		make --no-print-directory -C docker/$${dir} test;\
@@ -96,4 +101,4 @@ pass:
 check-licenses: pass
 publish: pass
 
-release: dist
+

azure/azure-build-pipeline.yml

@@ -28,6 +28,28 @@ extends:
   parameters:
     service_name: ${{ variables.service_name }}
     short_service_name: ${{ variables.short_service_name }}
+    cache_steps:
+      - task: s3-cache-action@1
+        inputs:
+          key: 'node modules | ${{ variables.service_name }}/docker/async-slowapp/package-lock.json'
+          location: '${{ variables.service_name }}/docker/async-slowapp/node_modules'
+          debug: true
+          alias: "node-async-slowapp"
+        displayName: cache  async-slowapp node modules
+      - task: s3-cache-action@1
+        inputs:
+          key: 'node modules | ${{ variables.service_name }}/docker/sync-wrap/package-lock.json'
+          location: '${{ variables.service_name }}/docker/sync-wrap/node_modules'
+          alias: "node-sync-wrap"
+          debug: true
+        displayName: cache sync-wrap node modules
+      - task: s3-cache-action@1
+        inputs:
+          key: 'poetry | ${{ variables.service_name }}/poetry.lock'
+          location: '${{ variables.service_name }}/.venv'
+          alias: "py-sync-wrap"
+          debug: true
+        displayName: cache python dependencies
     test_steps:
       - bash: "make test-report"
         displayName: run tests

azure/templates/e2e.yml

@@ -2,8 +2,17 @@ parameters:
   - name: test_type
 
 steps:
+
+    - task: s3-cache-action@1
+      inputs:
+        key: 'poetry | $(SERVICE_DIR)/poetry.lock'
+        location: '$(SERVICE_DIR)/.venv'
+        debug: true
+        alias: "py-sync-wrap"
+      displayName: cache python dependencies
+
     - bash: |
-          make -C e2e install
+          make install-python
       workingDirectory: $(SERVICE_DIR)
       displayName: Setup e2e tests
 
@@ -12,6 +21,7 @@ steps:
         export SOURCE_COMMIT_ID=$(Build.SourceVersion)
         export APIGEE_ENVIRONMENT="$(APIGEE_ENVIRONMENT)"
         export SERVICE_BASE_PATH="$(SERVICE_BASE_PATH)"
+        export STATUS_ENDPOINT_API_KEY="$(status-endpoint-api-key)"
         make -C e2e ${{ parameters.test_type }}
 
       workingDirectory: $(SERVICE_DIR)

docker/_shared/Makefile

@@ -11,7 +11,7 @@ clean:
 	rm -rf ./node_modules
 
 install:
-	npm install --dev
+	npm install --include=dev
 
 update:
 	npm update