Productionise - 1

Author: nhsd-david-wass

.devcontainer/devcontainer.json

@@ -41,6 +41,7 @@
         "takumii.markdowntable",
         "tamasfe.even-better-toml",
         "tomoki1207.pdf",
+        "vscjava.vscode-java-pack",
         "vscode-icons-team.vscode-icons",
         "vstirbu.vscode-mermaid-preview",
         "wayou.vscode-todo-highlight",
@@ -89,6 +90,9 @@
       "version": "8.0"
     },
     "ghcr.io/devcontainers/features/go:1": {},
+    "ghcr.io/devcontainers/features/java:1": {
+      "version": "17"
+    },
     "ghcr.io/devcontainers/features/node:1": {},
     "ghcr.io/devcontainers/features/python:1": {},
     "ghcr.io/devcontainers/features/ruby:1": {}

.github/actions/build-proxies/action.yml

@@ -19,12 +19,6 @@ runs:
       run: npm ci
       shell: bash
 
-    - name: Build oas
-      working-directory: .
-      shell: bash
-      run: |
-        make publish-oas
-
     - name: Setup Proxy Name and target
       shell: bash
       run: |
@@ -58,8 +52,8 @@ runs:
       working-directory: .
       shell: bash
       run: |
-        make construct-spec APIM_ENV=dev
-        
+        make build-json-oas-spec APIM_ENV=dev
+
     - name: Set target
       shell: bash
       run: |
@@ -75,7 +69,7 @@ runs:
       working-directory: .
       shell: bash
       run: |
-        make construct-spec APIM_ENV=sandbox
+        make build-json-oas-spec APIM_ENV=sandbox
 
     - name: Deploy to Internal Dev Sandbox
       shell: bash

.github/actions/build-sandbox/action.yml

@@ -1,5 +1,5 @@
-name: "Build Proxies"
-description: "Build Proxies"
+name: "Build Sandbox"
+description: "Build Sandbox"
 inputs:
   version:
     description: "Version number"
@@ -23,7 +23,7 @@ runs:
       working-directory: .
       shell: bash
       run: |
-        make construct-spec APIM_ENV=sandbox
+        make build-json-oas-spec APIM_ENV=sandbox
 
     - name: Remove sandbox security
       working-directory: ./build

Makefile

@@ -48,14 +48,26 @@ construct-spec: guard-APIM_ENV
 	cp access-$(APIM_ENV).yml access.yml
 	cp target-$(APIM_ENV).yml target.yml
 	cd -
+
+build-json-oas-spec: guard-APIM_ENV
+	$(MAKE) construct-spec APIM_ENV=$$APIM_ENV
 	$(MAKE) publish-oas
 
+build-yml-oas-spec: guard-APIM_ENV
+	$(MAKE) construct-spec APIM_ENV=$$APIM_ENV
+	$(MAKE) bundle-oas
+
 serve-oas:
 	npm run serve-oas
 
 bundle-oas:
 	npm run bundle-oas
 
+generate-sandbox:
+	$(MAKE) build-json-oas-spec APIM_ENV=sandbox
+	jq --slurpfile status sandbox/HealthcheckEndpoint.json '.paths += $status[0]' build/notify-supplier.json > tmp.json && mv tmp.json build/notify-supplier.json
+	npm run generate-sandbox
+
 serve-swagger:
 	npm run serve-swagger-docs
 

openapitools.json

@@ -0,0 +1,7 @@
+{
+  "$schema": "./node_modules/@openapitools/openapi-generator-cli/config.schema.json",
+  "generator-cli": {
+    "version": "7.14.0"
+  },
+  "spaces": 2
+}