Merge branch 'main' into aea-6571-remove-app-name-filtring

Author: wildjames

.devcontainer/devcontainer.json

@@ -6,7 +6,7 @@
     "args": {
       "DOCKER_GID": "${env:DOCKER_GID:}",
       "IMAGE_NAME": "node_24_python_3_12",
-      "IMAGE_VERSION": "v1.4.8",
+      "IMAGE_VERSION": "v1.4.9",
       "USER_UID": "${localEnv:USER_ID:}",
       "USER_GID": "${localEnv:GROUP_ID:}"
     },

.github/config/blocked_ods_codes_int.txt

@@ -413,6 +413,7 @@ FTH09
 FTJ10
 FTJ17
 FTK88
+FTL60
 FTM51
 FTM61
 FTP38

.github/config/blocked_ods_codes_prod.txt

@@ -413,6 +413,7 @@ FTH09
 FTJ10
 FTJ17
 FTK88
+FTL60
 FTM51
 FTM61
 FTP38

.github/config/ods_codes_int.txt

@@ -171,3 +171,137 @@ FVR25
 FWD53
 FL139
 FAK27
+FLF99
+FVL96
+FF431
+FYJ85
+FWW91
+FX918
+FRC16
+FD681
+FHJ91
+FKC39
+FJ513
+FLH77
+FJD36
+FX156
+FWF13
+FQR31
+FQD59
+FQW07
+FA183
+FVX64
+FTX59
+FRJ31
+FE038
+FCH29
+FAV46
+FQA59
+FWN32
+FVM25
+FJA94
+FRH84
+FC013
+FN030
+FQA52
+FA031
+FA078
+FA200
+FA247
+FA550
+FA565
+FA679
+FA883
+FA886
+FAC02
+FAD32
+FAD48
+FAF65
+FAF67
+FAJ92
+FAK48
+FAL58
+FAM93
+FAR04
+FAT07
+FAT84
+FAV44
+FAW81
+FAX69
+FC001
+FC049
+FC084
+FC133
+FC265
+FC312
+FC561
+FC576
+FC832
+FC896
+FCG07
+FCG37
+FCG77
+FCH75
+FCK24
+FCQ16
+FCT22
+FCV80
+FD019
+FD120
+FD255
+FD357
+FD502
+FD562
+FD643
+FD700
+FD871
+FDE36
+FDK88
+FDP62
+FDR65
+FDR86
+FDV36
+FDW00
+FDW12
+FDW17
+FDW41
+FDW87
+FE009
+FE127
+FE213
+FE297
+FE310
+FE319
+FE323
+FE353
+FE394
+FE396
+FE436
+FE438
+FE452
+FE534
+FE733
+FE736
+FE813
+FE991
+FEC26
+FEC34
+FEC64
+FED09
+FED64
+FEF48
+FEF70
+FEF86
+FEK57
+FEP39
+FEQ00
+FEQ63
+FEQ64
+FEQ79
+FEQ90
+FET61
+FET87
+FF077
+FF136
+FF346
+FF521

.github/config/ods_codes_prod.txt

@@ -171,3 +171,137 @@ FVR25
 FWD53
 FL139
 FAK27
+FLF99
+FVL96
+FF431
+FYJ85
+FWW91
+FX918
+FRC16
+FD681
+FHJ91
+FKC39
+FJ513
+FLH77
+FJD36
+FX156
+FWF13
+FQR31
+FQD59
+FQW07
+FA183
+FVX64
+FTX59
+FRJ31
+FE038
+FCH29
+FAV46
+FQA59
+FWN32
+FVM25
+FJA94
+FRH84
+FC013
+FN030
+FQA52
+FA031
+FA078
+FA200
+FA247
+FA550
+FA565
+FA679
+FA883
+FA886
+FAC02
+FAD32
+FAD48
+FAF65
+FAF67
+FAJ92
+FAK48
+FAL58
+FAM93
+FAR04
+FAT07
+FAT84
+FAV44
+FAW81
+FAX69
+FC001
+FC049
+FC084
+FC133
+FC265
+FC312
+FC561
+FC576
+FC832
+FC896
+FCG07
+FCG37
+FCG77
+FCH75
+FCK24
+FCQ16
+FCT22
+FCV80
+FD019
+FD120
+FD255
+FD357
+FD502
+FD562
+FD643
+FD700
+FD871
+FDE36
+FDK88
+FDP62
+FDR65
+FDR86
+FDV36
+FDW00
+FDW12
+FDW17
+FDW41
+FDW87
+FE009
+FE127
+FE213
+FE297
+FE310
+FE319
+FE323
+FE353
+FE394
+FE396
+FE436
+FE438
+FE452
+FE534
+FE733
+FE736
+FE813
+FE991
+FEC26
+FEC34
+FEC64
+FED09
+FED64
+FEF48
+FEF70
+FEF86
+FEK57
+FEP39
+FEQ00
+FEQ63
+FEQ64
+FEQ79
+FEQ90
+FET61
+FET87
+FF077
+FF136
+FF346
+FF521

.github/instructions/languages/cdk.instructions.md

@@ -23,6 +23,40 @@ This file provides instructions for generating, reviewing, and maintaining AWS C
 - Suppress warnings with `nagSuppressions.ts` only when justified and documented
 - Use `bin/` for entrypoint apps, `constructs/` for reusable components, and `stacks/` for stack definitions
 - Prefer `props` interfaces for construct configuration
+- For Step Functions definitions, prefer a chain-centric style where states are defined inline within `Chain.start(...).next(...)` so the execution flow reads top-to-bottom in one place. Avoid mixing a chain with many separately declared state `const`s; instead embed calls to helper functions directly in the chain when needed.
+- For Step Functions chain formatting, place `.start`, `.next`, `.when`, and `.otherwise` on their own lines, and give helper calls such as `.jsonata(...)` the same line-break weight so nested flow blocks are visually aligned and easy to scan.
+- For construct props that group resources (for example lambda functions or state machines), prefer explicit named object shapes (e.g. `{status: TypescriptLambdaFunction}`) over generic index signatures or broad maps so consumers are strongly typed to only the supported resources.
+- For construct props that consume grouped resources, prefer inline explicit object shapes in the props contract (for example `functions: { status: TypescriptLambdaFunction }`) over `Pick<...>` or generic map types.
+
+### Good Example - Inline Explicit Shape
+
+```typescript
+interface ApisProps {
+  readonly functions: {
+    readonly status: TypescriptLambdaFunction
+  }
+  readonly stateMachines: {
+    readonly getMyPrescriptions: ExpressStateMachine
+  }
+}
+```
+
+### Bad Example - Hidden Contract via Pick
+
+```typescript
+interface ApisProps {
+  readonly functions: Pick<FunctionResources, "status" | "capabilityStatement">
+}
+```
+
+### Bad Example - Generic Map
+
+```typescript
+interface ApisProps {
+  functions: {[key: string]: TypescriptLambdaFunction}
+  stateMachines: {[key: string]: ExpressStateMachine}
+}
+```
 
 ## Code Standards
 
@@ -33,6 +67,7 @@ This file provides instructions for generating, reviewing, and maintaining AWS C
 - Variables: camelCase
 - Stacks: Suffix with `Stack` (e.g., `CptsApiAppStack`)
 - Entry points: Suffix with `App` (e.g., `CptsApiApp.ts`)
+- CDK app entry points must follow `<app acronym><Api|Ui>[Sandbox]App` naming (e.g., `PsuApiApp`, `PsuApiSandboxApp`)
 
 ### File Organization
 
@@ -88,11 +123,26 @@ export class CptsApiAppStack extends Stack {
 - Prefer VPC endpoints for private connectivity
 - Minimize resource creation in test environments
 
+## Unit Testing
+
+- Write unit tests for CDK stacks and constructs using synthesis-based assertions.
+- Prefer in-process tests that instantiate CDK `App` and `Stack` objects directly and assert on synthesized templates.
+- Keep assertions light-touch and stable, such as resource counts and a small number of important properties.
+- Avoid mocking AWS resources or writing tests that attempt to exercise live AWS behaviour.
+- CDK constructs suitable for reuse should be placed in `eps-cdk-utils` repo.
+- Do not test AWS implementation details owned by the CDK library. Test the resources and properties your code is responsible for declaring.
+
+### Recommended Test Styles
+
+- Smoke tests for `bin/` files: execute the entrypoint and assert that synthesis completes without throwing.
+- In-process synth tests for stacks and constructs: instantiate the stack directly and assert resource counts or key CloudFormation properties with `Template.fromStack(...)`.
+
 
 ## Validation and Verification
 
 - Build: `make cdk-synth`
 - Lint: `npm run lint --workspace packages/cdk`
+- Test: `npm test --workspace packages/cdk`
 
 ## Maintenance
 

.github/instructions/languages/typescript.instructions.md

@@ -23,6 +23,7 @@ This document provides instructions for generating, reviewing, and maintaining T
 - Use destructuring for objects and arrays to improve readability.
 - Avoid magic numbers and hardcoded values; use named constants.
 - Keep functions pure and side-effect free when possible.
+- Do not use the `void` operator to silence unused-value warnings; prefer code that makes usage explicit.
 
 ## Code Standards
 
@@ -92,6 +93,7 @@ This document provides instructions for generating, reviewing, and maintaining T
 ### Type Safety
 
 - Prefer interfaces and types. You MUST NOT use `any`.
+- Prefer `Array<T>` over `T[]` for array type annotations.
 - Use type guards and assertions when necessary.
 - Example: