merge from main

Author: anthony-nhs

.devcontainer/devcontainer.json

@@ -32,7 +32,6 @@
         "ms-python.flake8",
         "eamodio.gitlens",
         "github.vscode-pull-request-github",
-        "orta.vscode-jest",
         "42crunch.vscode-openapi",
         "mermade.openapi-lint",
         "dbaeumer.vscode-eslint",
@@ -51,10 +50,7 @@
         "python.analysis.autoSearchPaths": true,
         "python.analysis.extraPaths": [],
         "python.testing.unittestEnabled": false,
-        "python.testing.pytestEnabled": true,
-        "python.testing.pytestArgs": [
-          "packages/slackBotFunction",
-        ],
+        "python.testing.pytestEnabled": false,
         "python.linting.pylintEnabled": false,
         "python.linting.flake8Enabled": true,
         "python.linting.enabled": true, // required to format on save

.gitallowed

@@ -31,3 +31,4 @@ token = slack_event_data\["bot_token"\]
 client = WebClient\(token=token\)
 client = WebClient\(token=slack_event_data\["bot_token"\]\)
 context accountId=123456789012
+.*:sample_docs/.*

.github/workflows/cdk_package_code.yml

@@ -61,8 +61,10 @@ jobs:
 
       - name: Build Python Lambda Functions
         run: |
-          pip3 install -r packages/slackBotFunction/requirements.txt -t packages/slackBotFunction
-          pip3 install -r packages/syncKnowledgeBaseFunction/requirements.txt -t packages/syncKnowledgeBaseFunction
+          poetry export --without-hashes --format=requirements.txt --with slackBotFunction > requirements_slackBotFunction
+          poetry export --without-hashes --format=requirements.txt --with syncKnowledgeBaseFunction > requirements_syncKnowledgeBaseFunction
+          pip3 install -r requirements_slackBotFunction -t packages/slackBotFunction
+          pip3 install -r requirements_syncKnowledgeBaseFunction -t packages/syncKnowledgeBaseFunction
 
       - name: 'Tar files'
         run: |

.github/workflows/ci.yml

@@ -9,7 +9,7 @@ env:
 
 jobs:
   quality_checks:
-    uses: NHSDigital/eps-workflow-quality-checks/.github/workflows/quality-checks.yml@v4.1.0
+    uses: NHSDigital/eps-workflow-quality-checks/.github/workflows/quality-checks.yml@v4.1.1
     secrets:
       SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
 

.github/workflows/pull_request.yml

@@ -9,7 +9,7 @@ env:
 
 jobs:
   quality_checks:
-    uses: NHSDigital/eps-workflow-quality-checks/.github/workflows/quality-checks.yml@v4.1.0
+    uses: NHSDigital/eps-workflow-quality-checks/.github/workflows/quality-checks.yml@v4.1.1
     secrets:
       SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
 

.github/workflows/release.yml

@@ -8,7 +8,7 @@ env:
 
 jobs:
   quality_checks:
-    uses: NHSDigital/eps-workflow-quality-checks/.github/workflows/quality-checks.yml@v4.1.0
+    uses: NHSDigital/eps-workflow-quality-checks/.github/workflows/quality-checks.yml@v4.1.1
     secrets:
       SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
 

.tool-versions

@@ -1,6 +1,6 @@
 nodejs 22.12.0
 python 3.13.3
-poetry 1.8.3
+poetry 2.1.4
 shellcheck 0.10.0
 direnv 2.32.2
 actionlint 1.7.3

.vscode/eps-assist-me.code-workspace

@@ -1,7 +1,7 @@
 {
 	"folders": [
 		{
-			"name": "eps-assist-me-monorepo",
+			"name": "eps-assist-me",
 			"path": ".."
 		},
 		{
@@ -19,7 +19,10 @@
 	],
 	"settings": {
 		"jest.disabledWorkspaceFolders": [
-			"eps-assist-me"
+			"eps-assist-me",
+			"packages/cdk",
+			"packages/slackBotFunction",
+			"packages/syncKnowledgeBaseFunction"
 		],
 		"files.exclude": {
 			"packages/": true
@@ -103,7 +106,8 @@
 		"jest.jestCommandLine": "NODE_OPTIONS=--experimental-vm-modules node_modules/.bin/jest --no-cache",
 		"jest.nodeEnv": {
 			"POWERTOOLS_DEV": true
-		}
+		},
+		"python.defaultInterpreterPath": "/workspaces/eps-assist-me/.venv/bin/python"
 	},
 	"extensions": {
 		"recommendations": [

Makefile

@@ -9,9 +9,7 @@ guard-%:
 install: install-python install-hooks install-node
 
 install-python:
-	poetry install
-	cd packages/slackBotFunction && pip install -r requirements.txt && pip install -r requirements-test.txt
-	cd packages/syncKnowledgeBaseFunction && pip install -r requirements.txt && pip install -r requirements-test.txt
+	poetry sync --all-groups
 
 install-hooks: install-python
 	poetry run pre-commit install --install-hooks --overwrite
@@ -48,8 +46,8 @@ lint-flake8:
 	poetry run flake8 .
 
 test:
-	cd packages/slackBotFunction && PYTHONPATH=. COVERAGE_FILE=coverage/.coverage python -m pytest
-	cd packages/syncKnowledgeBaseFunction && PYTHONPATH=. COVERAGE_FILE=coverage/.coverage python -m pytest
+	cd packages/slackBotFunction && PYTHONPATH=. COVERAGE_FILE=coverage/.coverage poetry run python -m pytest
+	cd packages/syncKnowledgeBaseFunction && PYTHONPATH=. COVERAGE_FILE=coverage/.coverage poetry run python -m pytest
 
 clean:
 	rm -rf packages/cdk/coverage
@@ -60,6 +58,7 @@ clean:
 	rm -rf packages/syncKnowledgeBaseFunction/.coverage
 	rm -rf cdk.out
 	rm -rf .build
+	find . -name '.pytest_cache' -type d -prune -exec rm -rf '{}' +
 
 deep-clean: clean
 	rm -rf .venv
@@ -137,3 +136,6 @@ cdk-watch: guard-STACK_NAME
 		--context logRetentionInDays=$$LOG_RETENTION_IN_DAYS \
 		--context slackBotToken=$$SLACK_BOT_TOKEN \
 		--context slackSigningSecret=$$SLACK_SIGNING_SECRET
+
+sync-docs: 
+	./scripts/sync_docs.sh

README.md

@@ -28,6 +28,7 @@ packages/
 │   │   └── RestApiGateway/     # API Gateway specific constructs
 │   ├── resources/              # AWS resource definitions
 │   └── stacks/                 # CDK stack definitions
+├── sample_docs/                # Contains sample docs for testing purposes. These should not be used for real usage
 ├── slackBotFunction/           # Lambda function for Slack bot integration
 │   ├── app/                    # Application code
 │   │   ├── config/             # Configuration and environment variables
@@ -171,6 +172,7 @@ These are used to do common commands related to cdk
 - `git-secrets-docker-setup` Sets up git-secrets Docker container.
 - `pre-commit` Runs pre-commit hooks on all files.
 - `test` Runs unit tests for Lambda functions.
+- `sync-docs` Runs a script to sync sample docs to s3 bucket for a pull request. Useful for setting up a stack for testing
 
 #### Compiling