Merge pull request #19 from NHSDigital/AMB-1682-Create-sandbox-with-prism

 AMB-1682-Create-sandbox-with-prism

Author: almas-liaqat

.gitignore

@@ -19,4 +19,5 @@ smoketest-report.xml
 env
 .dir-locals.el
 *.pyc
-.python-version
+.python-version
+sandbox/specification/

Makefile

@@ -28,13 +28,15 @@ clean:
 publish: clean
 	mkdir -p build
 	npm run publish 2> /dev/null
+	cp build/immunisation-fhir-api.json sandbox/
+	cp -r specification sandbox/specification
 
 #Runs build proxy script
 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"
+_dist_include="pytest.ini poetry.lock poetry.toml pyproject.toml Makefile build/. tests specification sandbox"
 
 #Create /dist/ sub-directory and copy files into directory
 release: clean publish build-proxy

azure/azure-build-pipeline.yml

@@ -30,3 +30,5 @@ extends:
   parameters:
     service_name: ${{ variables.service_name }}
     short_service_name: ${{ variables.short_service_name }}
+    post_ecs_push:
+      - template: ./templates/build-sandbox-image.yml

azure/azure-pr-pipeline.yml

@@ -35,10 +35,8 @@ extends:
     apigee_deployments:
       - environment: internal-dev
         post_deploy:
-          - template: ./templates/run-tests.yml
-            parameters:
-              full: true
+          - template: ./templates/post-deploy.yml
       - environment: internal-dev-sandbox
         proxy_path: sandbox
         post_deploy:
-          - template: ./templates/run-tests.yml
+          - template: ./templates/post-deploy.yml

azure/azure-release-pipeline.yml

@@ -33,38 +33,18 @@ extends:
     apigee_deployments:
       - environment: internal-dev
         post_deploy:
-          - template: ./templates/run-tests.yml
-            parameters:
-              full: true
+          - template: ./templates/post-deploy.yml
       - environment: internal-dev-sandbox
         proxy_path: sandbox
         post_deploy:
-          - template: ./templates/run-tests.yml
-      - environment: internal-qa
-        post_deploy:
-          - template: ./templates/run-tests.yml
-            parameters:
-              full: true
-      - environment: internal-qa-sandbox
-        proxy_path: sandbox
-        post_deploy:
-          - template: ./templates/run-tests.yml
-    #   - environment: ref
-    #     depends_on:
-    #       - internal_qa
-    #       - internal_qa_sandbox
-    #     post_deploy:
-    #       - template: ./templates/run-tests.yml
+          - template: ./templates/post-deploy.yml
       - environment: sandbox
         proxy_path: sandbox
+        depends_on:
+          - internal_dev_sandbox
     # # Enable int environment when ready by uncommenting:
     #   - environment: int
     #     depends_on:
-    #       - internal_qa
-    #       - internal_qa_sandbox
+    #       - internal_dev
     #     post_deploy:
-    #       - template: ./templates/run-tests.yml
-    #         parameters:
-    #           full: true
-    #           test-command: prod
-    #           smoketest-command: prod
+    #       - template: ./templates/post-deploy.yml

azure/templates/build-sandbox-image.yml

@@ -0,0 +1,10 @@
+steps:
+  - 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/post-deploy.yml

@@ -0,0 +1,50 @@
+parameters:
+  - name: aws_dev
+    default: aws --profile=apim-dev
+  - name: is_ptl
+    default: true
+
+steps:
+  - ${{ if parameters.is_ptl }}:
+    - template: "azure/components/aws-assume-role.yml@common"
+      parameters:
+          role: "auto-ops"
+          profile: "apm_ptl"
+
+  - bash: |
+      make install-python
+
+    workingDirectory: $(Pipeline.Workspace)/s/$(SERVICE_NAME)/$(SERVICE_ARTIFACT_NAME)
+    displayName: Setup pytests
+    condition: always()
+
+  - bash: |
+      set -e
+      export RELEASE_RELEASEID=$(Build.BuildId)
+      export SOURCE_COMMIT_ID=$(Build.SourceVersion)
+      export APIGEE_ENVIRONMENT="$(ENVIRONMENT)"
+      export SERVICE_BASE_PATH="$(SERVICE_BASE_PATH)"
+      export APIGEE_ACCESS_TOKEN="$(secret.AccessToken)"
+      export PROXY_NAME="$(FULLY_QUALIFIED_SERVICE_NAME)"
+      export STATUS_ENDPOINT_API_KEY="$(status-endpoint-api-key)"
+
+      if [[ $APIGEE_ENVIRONMENT =~ .*-*sandbox ]]
+      then
+       poetry run pytest -v -m "not nhsd_apim_authorization and not sandbox_int" --api-name=immunisation-fhir-api --proxy-name=$PROXY_NAME -o junit_logging=all --junitxml=test-report.xml
+
+      elif [[ $APIGEE_ENVIRONMENT == "int" ]]
+      then
+       echo "Int tests to be set as of now"
+
+      else
+       poetry run pytest -v -m "not sandbox_int" --api-name=immunisation-fhir-api --proxy-name=$PROXY_NAME -o junit_logging=all --junitxml=test-report.xml
+      fi
+    workingDirectory: "$(Pipeline.Workspace)/s/$(SERVICE_NAME)/$(SERVICE_ARTIFACT_NAME)/tests"
+    displayName: Run full test suite
+
+  - task: PublishTestResults@2
+    displayName: 'Publish test results'
+    condition: always()
+    inputs:
+      testResultsFiles: '$(Pipeline.Workspace)/s/$(SERVICE_NAME)/$(SERVICE_ARTIFACT_NAME)/tests/test-report.xml'
+      failTaskOnFailedTests: true

ecs-proxies-deploy.yml

@@ -12,4 +12,4 @@ docker_service:
         value: "{{ SERVICE_BASE_PATH }}"
     health_check:
       matcher: "200"
-      path: "/_ping"
+      path: "/_status"