named mock-provider to sandbox+old sandbox to temp

Author: almas-liaqat

.gitignore

@@ -20,4 +20,4 @@ env
 .dir-locals.el
 *.pyc
 .python-version
-mock_provider/specification/
+sandbox/specification/

Makefile

@@ -28,15 +28,15 @@ clean:
 publish: clean
 	mkdir -p build
 	npm run publish 2> /dev/null
-	cp build/immunisation-fhir-api.json mock_provider/
-	cp -r specification mock_provider/specification
+	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 specification mock_provider"
+_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

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

azure/templates/build-mock-receiver-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/build-sandbox-image.yml

@@ -30,14 +30,14 @@ steps:
 
       if [[ $APIGEE_ENVIRONMENT =~ .*-*sandbox ]]
       then
-       poetry run pytest -v -m "not nhsd_apim_authorization and not mock_provider_int" --api-name=immunisation-fhir-api --proxy-name=$PROXY_NAME -o junit_logging=all --junitxml=test-report.xml
+       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 mock_provider_int" --api-name=immunisation-fhir-api --proxy-name=$PROXY_NAME -o junit_logging=all --junitxml=test-report.xml
+       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

azure/templates/post-deploy.yml

@@ -1,4 +1,4 @@
 docker_containers:
   - name: sandbox
-    dockerfile: "mock_provider/Dockerfile"
-    path: "mock_provider"
+    dockerfile: "sandbox/Dockerfile"
+    path: "sandbox"

ecs-proxies-containers.yml

@@ -1,13 +1,22 @@
-FROM python:3.9-slim
+#First Stage
+FROM alpine:latest
+#Installing Jq
+RUN apk add jq
+#Copying OAS spec file in container
+COPY "immunisation-fhir-api.json" ./
+#Copyign HeslthStatus OAS file in container
+COPY "HealthStatusEndpoint.json" ./
+#Copying whole specification directory , to get inline examples and schemas
+COPY ./specification ./specification
+#Adding Health status endpoint to main spec file
+RUN jq ".paths+=$(cat HealthStatusEndpoint.json)" immunisation-fhir-api.json > updated-spec.json
 
-RUN pip install poetry
 
-WORKDIR /sandbox
+#Second stage
+FROM stoplight/prism:latest
+#Inheriting from previous image and copying updated OAS spec file to current container
+COPY --from=0  /specification  /usr/src/prism/packages/cli/immunisation-fhir-api/specification
+COPY --from=0  /updated-spec.json  /usr/src/prism/packages/cli/immunisation-fhir-api/specification/immunisation-fhir-api.json
 
-ADD pyproject.toml .
-RUN poetry config virtualenvs.create false
-RUN poetry install
-
-COPY . /sandbox
-
-CMD uvicorn fhir_api:app --reload --host 0.0.0.0 --port 9000 --log-level=warning
+#Running command of mock with OAS file
+CMD ["mock" , "-h", "0.0.0.0", "-p" ,"9000" ,"immunisation-fhir-api/specification/immunisation-fhir-api.json"]