Merge pull request #1558 from NHSDigital/develop

APIM-R 1.33 Cut

Author: nhsd-david-wass

Makefile

@@ -61,6 +61,9 @@ release: clean publish build-proxy
 test:
 	echo "TODO: add tests"
 
+sandbox-tests:
+	ENVIRONMENT=local SERVICE_BASE_PATH=localhost poetry run pytest -v tests/sandbox
+
 setup-environment:
 	@if [ -e /usr/bin/yum ]; then \
 		scripts/rhel_setup_environment.sh; \
@@ -87,4 +90,4 @@ clean-environment:
 		echo "Environment not Mac or RHEL or Ubuntu"; \
 	fi
 
-.PHONY: setup-environment clean-environment sandbox
+.PHONY: setup-environment clean-environment sandbox sandbox-tests

package-lock.json

@@ -12,7 +12,7 @@
   "license": "MIT",
   "homepage": "https://github.com/NHSDigital/e-referrals-service-api",
   "dependencies": {
-    "@redocly/cli": "^1.11.0"
+    "@redocly/cli": "^1.12.2"
   },
   "devDependencies": {
     "apigeetool": "^0.16.4",

package.json

@@ -29,15 +29,15 @@ gitpython = "^3.1.43"
 lxml = "^4.9.4"
 xmlformatter = "^0.2.6"
 pytest-check = "^2.2.3"
-requests = "^2.31.0"
-openapi-core = "^0.19.0"
+requests = "^2.32.1"
+openapi-core = "^0.19.1"
 
 
 [tool.poetry.dev-dependencies]
 flake8 = "^5.0.4"
-black = "^24.3"
+black = "^24.4"
 pip-licenses = "^4.4.0"
-jinja2 = "^3.1.3"
+jinja2 = "^3.1.4"
 pytest = "^6.1.2"
 pytest-asyncio = "^0.20.3"
 pytest-nhsd-apim = "^3.3.12"

poetry.lock

@@ -1,5 +1,7 @@
 FROM node:16.14.2-alpine3.14
 
+ENV npm_config_cache /home/node/app/.npm
+
 WORKDIR /app
 
 COPY package*.json ./
@@ -9,7 +11,7 @@ RUN npm install --only=production
 COPY src ./src
 RUN chmod -R a+x /app
 
-USER nobody
+USER node
 
 EXPOSE 9000
 

pyproject.toml

@@ -12,7 +12,7 @@ build:
 	docker build -t e-referrals-service-api-sandbox .
 
 run:
-	docker run -p 9000:9000 e-referrals-service-api-sandbox:latest
+	docker run -p 9100:9000 e-referrals-service-api-sandbox:latest
 
 clean:
 	docker stop $$(docker ps -a | awk '$$2 ~ /e-referrals-service-api-sandbox/ {print $$1}') || /bin/true

sandbox/Dockerfile

@@ -248,7 +248,7 @@
               }
             ],
             "contentType": "image/png",
-            "url": "Binary/att-70000-70000",
+            "url": "Binary/b2b22a7e-b3e9-4625-8d2c-00507bfdffb5",
             "size": 6,
             "title": "upload.png",
             "creation": "2021-10-13"

sandbox/Makefile

@@ -40,7 +40,7 @@
 				"content": [
 					{
 						"attachment": {
-							"url": "Binary/att-70000-70001"
+							"url": "Binary/b2b22a7e-b3e9-4625-8d2c-00507bfdffb5"
 						}
 					}
 				]
@@ -69,7 +69,7 @@
 				"content": [
 					{
 						"attachment": {
-							"url": "Binary/att-70000-70002"
+							"url": "Binary/857b901d-1491-47d3-90e2-6c9f13f744dc"
 						}
 					}
 				]