Revert "Update: [AEA-3901] - Create status lambda for PSU API (#105)"

This reverts commit 8d7b94a.
NHSDigital · Apr 30, 2024 · 374465b · 374465b
1 parent e951c43
commit 374465b
Show file tree

Hide file tree

Showing 26 changed files with 681 additions and 2,011 deletions.
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -32,15 +32,6 @@ repos:
         types_or: [ts, tsx, javascript, jsx, json]
         pass_filenames: false
 
-      - id: lint-gsul
-        name: Lint gsul
-        entry: npm
-        args: ["run", "--prefix=packages/gsul", "lint"]
-        language: system
-        files: ^packages\/gsul
-        types_or: [ts, tsx, javascript, jsx, json]
-        pass_filenames: false
-
       - id: lint-sandbox
         name: Lint sandbox
         entry: npm
@@ -50,23 +41,14 @@ repos:
         types_or: [ts, tsx, javascript, jsx, json]
         pass_filenames: false
 
-      - id: lint-statusLambda
-        name: Lint statusLambda
-        entry: npm
-        args: ["run", "--prefix=packages/statusLambda", "lint"]
-        language: system
-        files: ^packages\/statusLambda
-        types_or: [ts, tsx, javascript, jsx, json]
-        pass_filenames: false
-
       - id: lint-samtemplates
         name: Lint sam templates
         entry: make
         args: ["lint-samtemplates"]
         language: system
         files: ^SAMtemplates
         pass_filenames: false
-
+      
       - id: lint-githubactions
         name: Lint github actions
         entry: make

diff --git a/.vscode/eps-prescription-status-update-api.code-workspace b/.vscode/eps-prescription-status-update-api.code-workspace
@@ -1,118 +1,117 @@
 {
-  "folders": [
-    {
-      "name": "eps-prescription-status-update-monorepo",
-      "path": ".."
-    },
-    {
-      "name": "packages/gsul",
-      "path": "../packages/gsul"
-    },
-    {
-      "name": "packages/sandbox",
-      "path": "../packages/sandbox"
-    },
-    {
-      "name": "packages/specification",
-      "path": "../packages/specification"
-    },
-    {
-      "name": "packages/statusLambda",
-      "path": "../packages/statusLambda"
-    },
-    {
-      "name": "packages/updatePrescriptionStatus",
-      "path": "../packages/updatePrescriptionStatus"
-    }
-  ],
-  "settings": {
-    "jest.disabledWorkspaceFolders": ["eps-prescription-status-update-monorepo"],
-    "files.exclude": {
-      "packages/": true
-    },
-    "cSpell.words": [
-      "apigw",
-      "ASID",
-      "AWSKMS",
-      "Caldicott",
-      "canonicalise",
-      "Canonicaliser",
-      "canonicalization",
-      "Canonicalized",
-      "Codeable",
-      "codeinline",
-      "codesystem",
-      "devcontainer",
-      "eps-prescription-status-update-api",
-      "esbuild",
-      "fhir",
-      "Formik",
-      "Fulfillment",
-      "gsul",
-      "Hashable",
-      "healthcheck",
-      "Helpdesk",
-      "homecare",
-      "HSCN",
-      "liter",
-      "milliliter",
-      "NHSD",
-      "nhsdlogin",
-      "nhslogin",
-      "NOSONAR",
-      "OIDC",
-      "Orthoptist",
-      "Payor",
-      "pino",
-      "pollable",
-      "powertools",
-      "Prosthetist",
-      "querystring",
-      "reingest",
-      "reingested",
-      "Reingestion",
-      "serialisation",
-      "smartcard",
-      "smartcards",
-      "Snomed",
-      "sourcetype",
-      "Truststore",
-      "URID",
-      "URPID",
-      "uuidv4",
-      "vars",
-      "versionable",
-      "whens"
-    ],
-    "cSpell.dictionaries": ["en-GB"],
-    "cSpell.ignorePaths": ["package-lock.json", "node_modules", ".vscode"],
-    "jest.jestCommandLine": "NODE_OPTIONS=--experimental-vm-modules node_modules/.bin/jest --no-cache",
-    "jest.nodeEnv": {
-      "POWERTOOLS_DEV": true
-    }
-  },
-  "extensions": {
-    "recommendations": [
-      "AmazonWebServices.aws-toolkit-vscode",
-      "redhat.vscode-yaml",
-      "ms-python.python",
-      "ms-python.flake8",
-      "eamodio.gitlens",
-      "github.vscode-pull-request-github",
-      "orta.vscode-jest",
-      "42crunch.vscode-openapi",
-      "mermade.openapi-lint",
-      "rvest.vs-code-prettier-eslint",
-      "redhat.vscode-yaml",
-      "christian-kohler.npm-intellisense",
-      "dbaeumer.vscode-eslint",
-      "lfm.vscode-makefile-term",
-      "GrapeCity.gc-excelviewer",
-      "redhat.vscode-xml",
-      "streetsidesoftware.code-spell-checker",
-      "timonwong.shellcheck",
-      "mkhl.direnv",
-      "tamasfe.even-better-toml"
-    ]
-  }
+	"folders": [
+		{
+			"name": "eps-prescription-status-update-monorepo",
+			"path": ".."
+		},
+		{
+			"name": "packages/specification",
+			"path": "../packages/specification"
+		},
+		{
+			"name": "packages/updatePrescriptionStatus",
+			"path": "../packages/updatePrescriptionStatus"
+		},
+		{
+			"name": "packages/gsul",
+			"path": "../packages/gsul"
+		},
+		{
+			"name": "packages/sandbox",
+			"path": "../packages/sandbox"
+		}
+	],
+	"settings": {
+		"jest.disabledWorkspaceFolders": [
+			"eps-prescription-status-update-monorepo"
+		],
+		"files.exclude": {
+			"packages/": true,
+		},
+        "cSpell.words": [
+			"apigw",
+			"ASID",
+			"AWSKMS",
+			"Caldicott",
+			"canonicalise",
+			"Canonicaliser",
+			"canonicalization",
+			"Canonicalized",
+			"Codeable",
+			"codeinline",
+			"codesystem",
+			"devcontainer",
+			"eps-prescription-status-update-api",
+			"esbuild",
+			"fhir",
+			"Formik",
+			"Fulfillment",
+			"Hashable",
+			"healthcheck",
+			"Helpdesk",
+			"homecare",
+			"HSCN",
+			"liter",
+			"milliliter",
+			"NHSD",
+			"nhsdlogin",
+			"nhslogin",
+			"NOSONAR",
+			"OIDC",
+			"Orthoptist",
+			"Payor",
+			"pino",
+			"pollable",
+			"powertools",
+			"Prosthetist",
+			"querystring",
+			"reingest",
+			"reingested",
+			"Reingestion",
+			"serialisation",
+			"smartcard",
+			"smartcards",
+			"Snomed",
+			"sourcetype",
+			"Truststore",
+			"URID",
+			"URPID",
+			"uuidv4",
+			"vars",
+			"versionable",
+			"whens"
+		],
+		"cSpell.dictionaries": [
+			"en-GB"
+		],
+		"cSpell.ignorePaths": [
+			"package-lock.json",
+			"node_modules",
+			".vscode"
+		]
+	},
+	"extensions": {
+		"recommendations": [
+			"AmazonWebServices.aws-toolkit-vscode",
+			"redhat.vscode-yaml",
+			"ms-python.python",
+			"ms-python.flake8",
+			"eamodio.gitlens",
+			"github.vscode-pull-request-github",
+			"orta.vscode-jest",
+			"42crunch.vscode-openapi",
+			"mermade.openapi-lint",
+			"rvest.vs-code-prettier-eslint",
+			"redhat.vscode-yaml",
+			"christian-kohler.npm-intellisense",
+			"dbaeumer.vscode-eslint",
+			"lfm.vscode-makefile-term",
+			"GrapeCity.gc-excelviewer",
+			"redhat.vscode-xml",
+			"streetsidesoftware.code-spell-checker",
+			"timonwong.shellcheck",
+			"mkhl.direnv",
+			"tamasfe.even-better-toml"
+		]
+	}
 }
diff --git a/Makefile b/Makefile
@@ -66,7 +66,7 @@ sam-validate:
 sam-validate-sandbox:
 	sam validate --template-file SAMtemplates/sandbox_template.yaml --region eu-west-2
 
-sam-deploy-package: guard-artifact_bucket guard-artifact_bucket_prefix guard-stack_name guard-template_file guard-cloud_formation_execution_role guard-LATEST_TRUSTSTORE_VERSION guard-enable_mutual_tls guard-VERSION_NUMBER guard-COMMIT_ID guard-VERSION_NUMBER guard-LOG_RETENTION_DAYS guard-TARGET_ENVIRONMENT
+sam-deploy-package: guard-artifact_bucket guard-artifact_bucket_prefix guard-stack_name guard-template_file guard-cloud_formation_execution_role guard-LATEST_TRUSTSTORE_VERSION guard-enable_mutual_tls guard-VERSION_NUMBER guard-LOG_RETENTION_DAYS guard-TARGET_ENVIRONMENT
 	sam deploy \
 		--template-file $$template_file \
 		--stack-name $$stack_name \
@@ -84,8 +84,6 @@ sam-deploy-package: guard-artifact_bucket guard-artifact_bucket_prefix guard-sta
 			  TruststoreVersion=$$LATEST_TRUSTSTORE_VERSION \
 			  EnableMutualTLS=$$enable_mutual_tls \
 			  EnableSplunk=true \
-			  VersionNumber=$$VERSION_NUMBER \
-			  CommitId=$$COMMIT_ID \
 			  LogLevel=$$LOG_LEVEL \
 			  LogRetentionInDays=$$LOG_RETENTION_DAYS \
 			  Env=$$TARGET_ENVIRONMENT
@@ -96,11 +94,10 @@ compile-node:
 compile: compile-node
 
 lint-node: compile-node
+	npm run lint --workspace packages/specification
 	npm run lint --workspace packages/updatePrescriptionStatus
 	npm run lint --workspace packages/gsul
 	npm run lint --workspace packages/sandbox
-	npm run lint --workspace packages/specification
-	npm run lint --workspace packages/statusLambda
 
 lint-samtemplates:
 	poetry run cfn-lint -t SAMtemplates/**/*.yaml
@@ -121,7 +118,6 @@ test: compile
 	npm run test --workspace packages/gsul
 	npm run test --workspace packages/sandbox
 	npm run test --workspace packages/specification
-	npm run test --workspace packages/statusLambda
 
 clean:
 	rm -rf packages/updatePrescriptionStatus/coverage
@@ -130,8 +126,6 @@ clean:
 	rm -rf packages/sandbox/lib
 	rm -rf packages/specification/coverage
 	rm -rf packages/specification/lib
-	rm -rf packages/statusLambda/coverage
-	rm -rf packages/statusLambda/lib
 	rm -rf .aws-sam
 
 deep-clean: clean

diff --git a/README.md b/README.md
@@ -14,7 +14,6 @@ This is the AWS layer that provides an API for EPS Prescription Status Update.
 - `packages/updatePrescriptionStatus/` Handles updating prescription status for the root endpoint.
 - `packages/sandbox` A sandbox endpoint returning an example response.
 - `packages/specification/` This [Open API Specification](https://swagger.io/docs/specification/about/) describes the endpoints, methods and messages.
-- `packages/statusLambda/` Returns the status of the updatePrescriptionStatus endpoint
 - `scripts/` Utilities helpful to developers of this specification.
 - `SAMtemplates/` Contains the SAM templates used to define the stacks.
 - `.devcontainer` Contains a dockerfile and vscode devcontainer definition.
@@ -162,7 +161,7 @@ These are used to do common commands
 - `test` Runs unit tests for all code
 
 #### Publish targets
-- `publish` Outputs the specification as a **single file** into the `dist/` directory. This is used when uploading to Apigee, which requires the spec as a single file.
+- `publish` Outputs the specification as a **single file** into the `build/` directory. This is used when uploading to Apigee, which requires the spec as a single file.
 
 #### Compiling