Merge branch 'main' into dependabot/pip/cfn-lint-1.39.1

Author: anthony-nhs

.devcontainer/devcontainer.json

@@ -54,7 +54,6 @@
         "python.testing.pytestEnabled": true,
         "python.testing.pytestArgs": [
           "packages/slackBotFunction",
-          "packages/createIndexFunction"
         ],
         "python.linting.pylintEnabled": false,
         "python.linting.flake8Enabled": true,

.gitallowed

@@ -29,3 +29,5 @@ token: props\.slackBotToken
 secretValue: JSON\.stringify\(\{token: props\.slackBotToken\}\)
 token = slack_event_data\["bot_token"\]
 client = WebClient\(token=token\)
+client = WebClient\(token=slack_event_data\["bot_token"\]\)
+context accountId=123456789012

.github/scripts/fix_cdk_json.sh

@@ -35,6 +35,11 @@ fix_boolean_number_key() {
     mv .build/cdk.new.json .build/cdk.json
 }
 
+CFN_DRIFT_DETECTION_GROUP="epsam"
+if [[ "$STACK_NAME" =~ -pr-[0-9]+$ ]]; then
+  CFN_DRIFT_DETECTION_GROUP="epsam-pull-request"
+fi
+
 # go through all the key values we need to set
 fix_string_key accountId "${ACCOUNT_ID}"
 fix_string_key stackName "${STACK_NAME}"
@@ -44,3 +49,4 @@ fix_string_key logRetentionInDays "${LOG_RETENTION_IN_DAYS}"
 fix_string_key logLevel "${LOG_LEVEL}"
 fix_string_key slackBotToken "${SLACK_BOT_TOKEN}"
 fix_string_key slackSigningSecret "${SLACK_SIGNING_SECRET}"
+fix_string_key cfnDriftDetectionGroup "${CFN_DRIFT_DETECTION_GROUP}"

.github/workflows/cdk_package_code.yml

@@ -62,7 +62,6 @@ jobs:
       - name: Build Python Lambda Functions
         run: |
           pip3 install -r packages/slackBotFunction/requirements.txt -t packages/slackBotFunction
-          pip3 install -r packages/createIndexFunction/requirements.txt -t packages/createIndexFunction
           pip3 install -r packages/syncKnowledgeBaseFunction/requirements.txt -t packages/syncKnowledgeBaseFunction
 
       - name: 'Tar files'

.pre-commit-config.yaml

@@ -48,6 +48,15 @@ repos:
         types_or: [sh, shell]
         pass_filenames: false
 
+      - id: lint-cdk
+        name: Lint cdk
+        entry: npm
+        args: ["run", "--prefix=packages/cdk", "lint"]
+        language: system
+        files: ^packages\/cdk
+        types_or: [ts, tsx, javascript, jsx, json]
+        pass_filenames: false
+
   - repo: local
     hooks:
       - id: git-secrets

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

@@ -8,10 +8,6 @@
 			"name": "packages/cdk",
 			"path": "../packages/cdk"
 		},
-		{
-			"name": "packages/createIndexFunction",
-			"path": "../packages/createIndexFunction"
-		},
 		{
 			"name": "packages/slackBotFunction",
 			"path": "../packages/slackBotFunction"

Makefile

@@ -10,7 +10,6 @@ install: install-python install-hooks install-node
 
 install-python:
 	poetry install
-	cd packages/createIndexFunction && pip install -r requirements.txt && pip install -r requirements-test.txt
 	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
 
@@ -30,7 +29,10 @@ git-secrets-docker-setup:
 	export LOCAL_WORKSPACE_FOLDER=$(pwd)
 	docker build -f https://raw.githubusercontent.com/NHSDigital/eps-workflow-quality-checks/refs/tags/v4.0.4/dockerfiles/nhsd-git-secrets.dockerfile -t git-secrets .
 
-lint: lint-githubactions lint-githubaction-scripts lint-black lint-flake8
+lint: lint-githubactions lint-githubaction-scripts lint-black lint-flake8 lint-node
+
+lint-node:
+	npm run lint --workspace packages/cdk
 
 lint-githubactions:
 	actionlint
@@ -46,15 +48,12 @@ lint-flake8:
 	poetry run flake8 .
 
 test:
-	cd packages/createIndexFunction && PYTHONPATH=. COVERAGE_FILE=coverage/.coverage python -m pytest
 	cd packages/slackBotFunction && PYTHONPATH=. COVERAGE_FILE=coverage/.coverage python -m pytest
 	cd packages/syncKnowledgeBaseFunction && PYTHONPATH=. COVERAGE_FILE=coverage/.coverage python -m pytest
 
 clean:
 	rm -rf packages/cdk/coverage
 	rm -rf packages/cdk/lib
-	rm -rf packages/createIndexFunction/coverage
-	rm -rf packages/createIndexFunction/.coverage
 	rm -rf packages/slackBotFunction/coverage
 	rm -rf packages/slackBotFunction/.coverage
 	rm -rf packages/syncKnowledgeBaseFunction/coverage
@@ -99,19 +98,18 @@ cdk-deploy: guard-STACK_NAME
 		--context logRetentionInDays=$$LOG_RETENTION_IN_DAYS \
 		--context slackBotToken=$$SLACK_BOT_TOKEN \
 		--context slackSigningSecret=$$SLACK_SIGNING_SECRET
-
 cdk-synth:
 	npx cdk synth \
 		--quiet \
 		--app "npx ts-node --prefer-ts-exts packages/cdk/bin/EpsAssistMeApp.ts" \
-		--context accountId=undefined \
+		--context accountId=123456789012 \
 		--context stackName=epsam \
 		--context versionNumber=undefined \
 		--context commitId=undefined \
 		--context logRetentionInDays=30 \
 		--context slackBotToken=dummy \
-		--context slackSigningSecret=dummy
-	./scripts/fix_cfn_guard.sh
+		--context slackSigningSecret=dummy \
+		--context cfnDriftDetectionGroup=dummy
 
 cdk-diff:
 	npx cdk diff \

README.md

@@ -28,11 +28,6 @@ packages/
 │   │   └── RestApiGateway/     # API Gateway specific constructs
 │   ├── resources/              # AWS resource definitions
 │   └── stacks/                 # CDK stack definitions
-├── createIndexFunction/        # Lambda function for OpenSearch index management
-│   ├── app/                    # Application code
-│   │   ├── config/             # Configuration and environment variables
-│   │   └── handler.py          # Lambda handler
-│   └── tests/                  # Unit tests
 ├── slackBotFunction/           # Lambda function for Slack bot integration
 │   ├── app/                    # Application code
 │   │   ├── config/             # Configuration and environment variables

package-lock.json

@@ -17,6 +17,7 @@ const accountId = app.node.tryGetContext("accountId")
 const stackName = app.node.tryGetContext("stackName")
 const version = app.node.tryGetContext("versionNumber")
 const commit = app.node.tryGetContext("commitId")
+const cfnDriftDetectionGroup = app.node.tryGetContext("cfnDriftDetectionGroup")
 
 Aspects.of(app).add(new AwsSolutionsChecks({verbose: true}))
 
@@ -25,6 +26,7 @@ Tags.of(app).add("accountId", accountId)
 Tags.of(app).add("stackName", stackName)
 Tags.of(app).add("version", version)
 Tags.of(app).add("commit", commit)
+Tags.of(app).add("cfnDriftDetectionGroup", cfnDriftDetectionGroup)
 
 const EpsAssistMe = new EpsAssistMeStack(app, "EpsAssistMeStack", {
   env: {