@fjall/components-infrastructure 0.94.1 → 0.96.0

package/dist/lib/app.d.ts

@@ -8,6 +8,8 @@ import { type Ecr } from "./resources/aws/storage/ecr.js";
 import { type AnyDatabase } from "./patterns/aws/database.js";
 import { type INetworkProps, type Network } from "./patterns/aws/network.js";
 import { type Cdn } from "./patterns/aws/cdn.js";
+import { type VpcPeer } from "./patterns/aws/vpcPeer.js";
+import { type VpcPeerAccepter } from "./patterns/aws/vpcPeerAccepter.js";
 import { type AnyMessaging } from "./patterns/aws/messaging.js";
 import { type AnyCompute } from "./patterns/aws/compute.js";
 import { type Storage, type StorageFactoryFn } from "./patterns/aws/storage.js";
@@ -85,63 +87,19 @@ export declare class App extends CdkApp {
     private resourceInventory?;
     private manifestCollector;
     private constructor();
-    /**
-     * Apply backup tier tag to all resources in the app.
-     * Maps tier names to AWS Backup plan tag values.
-     */
     private applyBackupTag;
-    /**
-     * Initialise the tunnel bastion in the network stack.
-     * Creates a minimal EC2 instance for SSM port forwarding to databases.
-     */
     private initialiseTunnel;
-    /**
-     * Initialise the network (VPC) for this application.
-     */
     private initialiseNetwork;
-    /**
-     * Get the application name.
-     * @returns {string} The application name
-     */
     getName(): string;
-    /**
-     * Get/Create a basic Fjall Application with standard tags applied.
-     *
-     * @param name Application name
-     * @param options Configuration options including network settings
-     * @returns {App}
-     *
-     * @example
-     * // Create app with new VPC
-     * const app = App.getApp(appName, {
-     *   network: { maxAzs: 2, natGateways: false }
-     * });
-     *
-     * @example
-     * // Create app using existing VPC
-     * const app = App.getApp(appName, {
-     *   network: { useExisting: "vpc-12345678" }
-     * });
-     *
-     * @example
-     * // Create app without network (S3-only apps)
-     * const app = App.getApp(appName, { network: false });
-     */
     static getApp(name?: string, options?: IAppOptions): App;
-    /**
-     * Get/Create the singleton instance of the App
-     * @param name Application name
-     * @param options Configuration options including network settings
-     * @returns {App}
-     */
     static getInstance(name?: string, options?: IAppOptions): App;
+    static resetForTesting(): void;
     /**
      * Retrieve a stack by key. If the stack does not exist, it will be created.
      *  Dependencies are only applied the first time a stack is created.
      *
      * @param key - The key of the stack
      * @param dependencies - The stack(s) that this stack depends on
-     * @returns {AwsStack}
      */
     getStack(key: string, dependencies?: AwsStack | AwsStack[]): AwsStack;
     /**
@@ -149,23 +107,18 @@ export declare class App extends CdkApp {
      *
      * Only depends on Network. Database dependency is added automatically
      * by CDK when compute resources reference database resources.
-     *
-     * @returns {AwsStack}
      */
     getDefaultComputeStack(): AwsStack;
     /**
      * Retrieve default network stack - named as `${this.name}Network`
-     * @returns {AwsStack}
      */
     getDefaultNetworkStack(): AwsStack;
     /**
      * Retrieve default database stack - named as `${this.name}Database`
-     * @returns {AwsStack}
      */
     getDefaultDatabaseStack(): AwsStack;
     /**
      * Retrieve default storage stack - named as `${this.name}Storage`
-     * @returns {AwsStack}
      */
     getDefaultStorageStack(): AwsStack;
     /**
@@ -173,8 +126,6 @@ export declare class App extends CdkApp {
      *
      * Depends on Network. Compute/Storage dependencies are added automatically
      * by CDK when CDN resources reference ALB or S3 bucket resources.
-     *
-     * @returns {AwsStack}
      */
     getDefaultCdnStack(): AwsStack;
     /**
@@ -183,8 +134,6 @@ export declare class App extends CdkApp {
      * Used for SQS queues, SNS topics, and EventBridge event buses.
      * Depends on Network only. These are regional services that don't
      * require VPC, but we maintain consistent stack dependency patterns.
-     *
-     * @returns {AwsStack}
      */
     getDefaultMessagingStack(): AwsStack;
     /**
@@ -194,20 +143,10 @@ export declare class App extends CdkApp {
      * Network must be configured via App.getApp() options or app.addNetwork().
      *
      * @param name - Optional name of the VPC to retrieve. If not provided, returns the default VPC.
-     * @returns {IVpc} The configured VPC
      * @throws {Error} If network is disabled, not configured, or named VPC not found
      */
     getVpc(name?: string): IVpc;
-    /**
-     * Get the names of all available VPCs.
-     *
-     * @returns {string[]} Array of VPC names. Includes "default" if the default VPC is configured.
-     */
     getVpcNames(): string[];
-    /**
-     * Retrieve the default application container registry. If the registry does not exist
-     *  it will be created.
-     */
     getDefaultContainerRegistry(): Ecr;
     /**
      * Create a cross-account audit role in the Network stack that allows
@@ -218,18 +157,9 @@ export declare class App extends CdkApp {
      *
      * @param webappAccountId - Optional AWS account ID of the Fjall webapp. Defaults to configured platform account.
      * @param externalId - Optional external ID for additional security. If not provided, a unique ID will be generated.
-     * @returns {Role} The created audit role
      */
     createAuditRole(webappAccountId?: string, externalId?: string): Role;
-    /**
-     * Get the external ID used for the audit role
-     * @returns {string | undefined} The external ID if audit role has been created
-     */
     getAuditRoleExternalId(): string | undefined;
-    /**
-     * Generate a unique external ID for audit role
-     * Format: fjall-audit-{appName}-{timestamp}
-     */
     private generateAuditExternalId;
     /**
      * Add a compute resource to the default compute stack using the factory pattern.
@@ -255,10 +185,7 @@ export declare class App extends CdkApp {
      * }));
      * worker.getFunction("process"); // Available on LambdaCompute
      */
-    addCompute<T extends AnyCompute>(fn: (app: App, scope: Construct) => T): T;
-    /**
-     * Manually add a resource to the default compute stack.
-     */
+    addCompute<T extends AnyCompute & Construct>(fn: (app: App, scope: Construct) => T): T;
     addComputeResource(resource: Construct): void;
     /**
      * Add a database resource to the default database stack using the factory pattern.
@@ -280,10 +207,7 @@ export declare class App extends CdkApp {
      * }));
      * cache.getTableName(); // Available
      */
-    addDatabase<T extends AnyDatabase>(fn: (app: App, scope: Construct) => T): T;
-    /**
-     * Type guard for IConnectable — checks if a construct has a connections property.
-     */
+    addDatabase<T extends AnyDatabase & Construct>(fn: (app: App, scope: Construct) => T): T;
     private isConnectable;
     /**
      * Add a storage resource (S3) to the default storage stack using the factory pattern.
@@ -322,6 +246,22 @@ export declare class App extends CdkApp {
      * }));
      */
     addCdn(fn: (app: App, scope: Construct) => Cdn): Cdn;
+    /**
+     * Peer this app's VPC with a remote app's VPC.
+     *
+     * Creates the peering connection plus routes on both sides. The remote app
+     * must have deployed a `VpcPeerAccepter` first. Note: `app.getVpc(peerAppName)`
+     * does NOT return the peer's VPC — callers wanting the remote handle must use
+     * the returned `VpcPeer` instance.
+     */
+    addVpcPeer(fn: (app: App, scope: Construct) => VpcPeer): VpcPeer;
+    /**
+     * Accept VPC peering requests from remote apps.
+     *
+     * Creates an IAM role for cross-account peering acceptance and return-route
+     * management, and publishes VPC metadata to SSM for discovery.
+     */
+    addVpcPeerAccepter(fn: (app: App, scope: Construct) => VpcPeerAccepter): VpcPeerAccepter;
     /**
      * Add a messaging resource to the default queue stack using the factory pattern.
      *
@@ -347,7 +287,7 @@ export declare class App extends CdkApp {
      *   contentBasedDeduplication: true
      * }));
      */
-    addMessaging<T extends AnyMessaging>(fn: (app: App, scope: Construct) => T): T;
+    addMessaging<T extends AnyMessaging & Construct>(fn: (app: App, scope: Construct) => T): T;
     /**
      * Add a high-level infrastructure pattern to the application.
      *
@@ -375,7 +315,7 @@ export declare class App extends CdkApp {
      * payload.getServer().getLambdaFunction().addEnvironment("CUSTOM", "value");
      * payload.getCdn().getDistribution().addBehavior("/custom/*", customOrigin);
      */
-    addPattern<T extends AnyPattern>(fn: (app: App, scope: Construct) => T): T;
+    addPattern<T extends AnyPattern & Construct>(fn: (app: App, scope: Construct) => T): T;
     /**
      * Add an additional network (VPC) to the application.
      *
@@ -383,7 +323,6 @@ export declare class App extends CdkApp {
      * Additional VPCs can be retrieved by name using app.getVpc(name).
      *
      * @param fn - Factory function that creates the Network construct
-     * @returns {Network} The created Network construct
      *
      * @example
      * const isolatedVpc = app.addNetwork(
@@ -391,21 +330,9 @@ export declare class App extends CdkApp {
      * );
      */
     addNetwork(fn: (app: App, scope: Construct) => Network): Network;
-    /**
-     * Manually add a resource to the default database stack.
-     */
     addDatabaseResource(resource: Construct): void;
-    /**
-     * Manually add a resource to the default storage stack.
-     */
     addStorageResource(resource: Construct): void;
-    /**
-     * Initialise standard tags
-     */
     private initialiseStandardTags;
-    /**
-     * Apply all tags using CDK's native Tags.of().add() API
-     */
     private applyTagsAspect;
     /**
      * Add custom tags to all resources in the app.
@@ -414,27 +341,16 @@ export declare class App extends CdkApp {
      * @example
      * app.addTags({
      *   "fjall:costAllocation:owner": "platform-team",
-     *   "fjall:costAllocation:cost-center": "CC-123",
+     *   "fjall:costAllocation:cost-centre": "CC-123",
      *   "team:slack-channel": "#platform-alerts"
      * });
      */
     addTags(tags: {
         [key: string]: string;
     }): App;
-    /**
-     * Export resource inventory collected during synthesis
-     * Call this after app.synth() to get complete resource inventory
-     * @returns {ResourceInventory} Complete inventory of all resources in the app
-     */
+    /** Call after app.synth() — inventory is not available before synthesis. */
     exportResourceInventory(): ResourceInventory;
-    /**
-     * Get the manifest collector for registering services and patterns.
-     * Used by ComputeFactory and PatternFactory to register their configurations.
-     */
     getManifestCollector(): ManifestCollector;
-    /**
-     * Override synth to automatically export resource inventory and manifest
-     */
     synth(options?: StageSynthesisOptions): CloudAssembly;
 }
 export default App;

package/dist/lib/app.js

@@ -1,7 +1,6 @@
 import { App as CdkApp, Aspects, Tags } from "aws-cdk-lib";
 import { Vpc } from "./resources/aws/networking/vpc.js";
-import { CfnOutput } from "aws-cdk-lib";
-import { Ec2Instance } from "./resources/aws/compute/ec2.js";
+import { createBastion } from "./utils/bastionFactory.js";
 import { AwsStack } from "./resources/index.js";
 import { EcrFactory } from "./resources/aws/storage/ecr.js";
 import { NetworkFactory } from "./patterns/aws/network.js";
@@ -14,8 +13,7 @@ import { FJALL_AUDIT_CONFIG } from "./config/audit.js";
 import { FjallLogger } from "./utils/validationLogger.js";
 import { getManifestCollector, writeManifest } from "./utils/manifestWriter.js";
 import { toPascalCase, toKebab } from "./utils/capitaliseString.js";
-const COST_ALLOCATION_ENVIRONMENT_TAG = "fjall:costAllocation:environment";
-const COST_ALLOCATION_SERVICE_TAG = "fjall:costAllocation:service";
+import { COST_ALLOCATION_TAGS } from "./utils/costAllocationTags.js";
 /**
  * The basic corner-stone of all Fjall-hosted applications.
  *  This class is a singleton and should be used to create and manage
@@ -62,48 +60,16 @@ export class App extends CdkApp {
             this.initialiseTunnel(options.tunnel);
         }
     }
-    /**
-     * Apply backup tier tag to all resources in the app.
-     * Maps tier names to AWS Backup plan tag values.
-     */
     applyBackupTag(tier) {
         this.globalTags[BACKUP_TIER_TAG_KEY] = BACKUP_TIER_TAG_MAP[tier];
     }
-    /**
-     * Initialise the tunnel bastion in the network stack.
-     * Creates a minimal EC2 instance for SSM port forwarding to databases.
-     */
     initialiseTunnel(config) {
         if (this.networkDisabled || !this.vpc) {
             throw new Error("Tunnel requires a network. Configure network before enabling tunnel.");
         }
-        const instanceType = typeof config === "object" && config.instanceType
-            ? config.instanceType
-            : "t4g.micro";
-        const networkStack = this.getDefaultNetworkStack();
-        const bastionId = `${this.stackPrefix}Bastion`;
-        this.bastion = new Ec2Instance(networkStack.getStack(), bastionId, {
-            serviceName: `${this.stackPrefix}Bastion`,
-            instanceType,
-            vpc: this.vpc,
-            enableSSH: false,
-            minCapacity: 1,
-            maxCapacity: 1
-        });
-        networkStack.addConstruct(this.bastion);
-        const outputPrefix = toPascalCase(this.name);
-        new CfnOutput(networkStack.getStack(), `${outputPrefix}BastionInstanceId`, {
-            value: this.bastion.getAutoScalingGroup().autoScalingGroupName,
-            description: "Bastion ASG name for SSM tunnel discovery"
-        });
-        new CfnOutput(networkStack.getStack(), `${outputPrefix}BastionSecurityGroupId`, {
-            value: this.bastion.asgSecurityGroup.securityGroupId,
-            description: "Bastion security group ID"
-        });
+        const { bastion } = createBastion(this.getDefaultNetworkStack(), this.name, this.stackPrefix, this.vpc, config);
+        this.bastion = bastion;
     }
-    /**
-     * Initialise the network (VPC) for this application.
-     */
     initialiseNetwork(config) {
         const networkStack = this.getDefaultNetworkStack();
         if ("useExisting" in config) {
@@ -117,45 +83,12 @@ export class App extends CdkApp {
             this.vpc = network.getVpc();
         }
     }
-    /**
-     * Get the application name.
-     * @returns {string} The application name
-     */
     getName() {
         return this.name;
     }
-    /**
-     * Get/Create a basic Fjall Application with standard tags applied.
-     *
-     * @param name Application name
-     * @param options Configuration options including network settings
-     * @returns {App}
-     *
-     * @example
-     * // Create app with new VPC
-     * const app = App.getApp(appName, {
-     *   network: { maxAzs: 2, natGateways: false }
-     * });
-     *
-     * @example
-     * // Create app using existing VPC
-     * const app = App.getApp(appName, {
-     *   network: { useExisting: "vpc-12345678" }
-     * });
-     *
-     * @example
-     * // Create app without network (S3-only apps)
-     * const app = App.getApp(appName, { network: false });
-     */
     static getApp(name, options) {
         return App.getInstance(name, options);
     }
-    /**
-     * Get/Create the singleton instance of the App
-     * @param name Application name
-     * @param options Configuration options including network settings
-     * @returns {App}
-     */
     static getInstance(name, options) {
         // Despite supporting multiple stacks you can still only ever
         // have a single Application per CDK deployment
@@ -198,13 +131,15 @@ export class App extends CdkApp {
         }
         return App.instance;
     }
+    static resetForTesting() {
+        App.instance = null;
+    }
     /**
      * Retrieve a stack by key. If the stack does not exist, it will be created.
      *  Dependencies are only applied the first time a stack is created.
      *
      * @param key - The key of the stack
      * @param dependencies - The stack(s) that this stack depends on
-     * @returns {AwsStack}
      */
     getStack(key, dependencies) {
         // Apply the aspect once before creating the first stack
@@ -223,29 +158,24 @@ export class App extends CdkApp {
      *
      * Only depends on Network. Database dependency is added automatically
      * by CDK when compute resources reference database resources.
-     *
-     * @returns {AwsStack}
      */
     getDefaultComputeStack() {
         return this.getStack(`${this.stackPrefix}Compute`, this.getDefaultNetworkStack());
     }
     /**
      * Retrieve default network stack - named as `${this.name}Network`
-     * @returns {AwsStack}
      */
     getDefaultNetworkStack() {
         return this.getStack(`${this.stackPrefix}Network`);
     }
     /**
      * Retrieve default database stack - named as `${this.name}Database`
-     * @returns {AwsStack}
      */
     getDefaultDatabaseStack() {
         return this.getStack(`${this.stackPrefix}Database`, this.getDefaultNetworkStack());
     }
     /**
      * Retrieve default storage stack - named as `${this.name}Storage`
-     * @returns {AwsStack}
      */
     getDefaultStorageStack() {
         return this.getStack(`${this.stackPrefix}Storage`, this.getDefaultNetworkStack());
@@ -255,8 +185,6 @@ export class App extends CdkApp {
      *
      * Depends on Network. Compute/Storage dependencies are added automatically
      * by CDK when CDN resources reference ALB or S3 bucket resources.
-     *
-     * @returns {AwsStack}
      */
     getDefaultCdnStack() {
         return this.getStack(`${this.stackPrefix}Cdn`, this.getDefaultNetworkStack());
@@ -267,8 +195,6 @@ export class App extends CdkApp {
      * Used for SQS queues, SNS topics, and EventBridge event buses.
      * Depends on Network only. These are regional services that don't
      * require VPC, but we maintain consistent stack dependency patterns.
-     *
-     * @returns {AwsStack}
      */
     getDefaultMessagingStack() {
         return this.getStack(`${this.stackPrefix}Messaging`, this.getDefaultNetworkStack());
@@ -280,7 +206,6 @@ export class App extends CdkApp {
      * Network must be configured via App.getApp() options or app.addNetwork().
      *
      * @param name - Optional name of the VPC to retrieve. If not provided, returns the default VPC.
-     * @returns {IVpc} The configured VPC
      * @throws {Error} If network is disabled, not configured, or named VPC not found
      */
     getVpc(name) {
@@ -304,11 +229,6 @@ export class App extends CdkApp {
         }
         return this.vpc;
     }
-    /**
-     * Get the names of all available VPCs.
-     *
-     * @returns {string[]} Array of VPC names. Includes "default" if the default VPC is configured.
-     */
     getVpcNames() {
         const names = [];
         if (this.vpc) {
@@ -317,10 +237,6 @@ export class App extends CdkApp {
         names.push(...this.additionalVpcs.keys());
         return names;
     }
-    /**
-     * Retrieve the default application container registry. If the registry does not exist
-     *  it will be created.
-     */
     getDefaultContainerRegistry() {
         if (!this.defaultEcr) {
             const networkStack = this.getDefaultNetworkStack();
@@ -341,7 +257,6 @@ export class App extends CdkApp {
      *
      * @param webappAccountId - Optional AWS account ID of the Fjall webapp. Defaults to configured platform account.
      * @param externalId - Optional external ID for additional security. If not provided, a unique ID will be generated.
-     * @returns {Role} The created audit role
      */
     createAuditRole(webappAccountId, externalId) {
         if (!this.defaultAuditRole) {
@@ -361,17 +276,9 @@ export class App extends CdkApp {
         }
         return this.defaultAuditRole;
     }
-    /**
-     * Get the external ID used for the audit role
-     * @returns {string | undefined} The external ID if audit role has been created
-     */
     getAuditRoleExternalId() {
         return this.auditRoleExternalId;
     }
-    /**
-     * Generate a unique external ID for audit role
-     * Format: fjall-audit-{appName}-{timestamp}
-     */
     generateAuditExternalId() {
         const uniqueId = randomBytes(8).toString("hex");
         return `fjall-audit-${toKebab(this.name)}-${uniqueId}`;
@@ -406,9 +313,6 @@ export class App extends CdkApp {
         computeStack.addConstruct(construct);
         return construct;
     }
-    /**
-     * Manually add a resource to the default compute stack.
-     */
     addComputeResource(resource) {
         const computeStack = this.getDefaultComputeStack();
         computeStack.addConstruct(resource);
@@ -443,9 +347,6 @@ export class App extends CdkApp {
         }
         return databaseConstruct;
     }
-    /**
-     * Type guard for IConnectable — checks if a construct has a connections property.
-     */
     isConnectable(construct) {
         return (typeof construct === "object" &&
             construct !== null &&
@@ -509,6 +410,32 @@ export class App extends CdkApp {
         cdnStack.addConstruct(cdn);
         return cdn;
     }
+    /**
+     * Peer this app's VPC with a remote app's VPC.
+     *
+     * Creates the peering connection plus routes on both sides. The remote app
+     * must have deployed a `VpcPeerAccepter` first. Note: `app.getVpc(peerAppName)`
+     * does NOT return the peer's VPC — callers wanting the remote handle must use
+     * the returned `VpcPeer` instance.
+     */
+    addVpcPeer(fn) {
+        const networkStack = this.getDefaultNetworkStack();
+        const peer = fn(this, networkStack.getStack());
+        networkStack.addConstruct(peer);
+        return peer;
+    }
+    /**
+     * Accept VPC peering requests from remote apps.
+     *
+     * Creates an IAM role for cross-account peering acceptance and return-route
+     * management, and publishes VPC metadata to SSM for discovery.
+     */
+    addVpcPeerAccepter(fn) {
+        const networkStack = this.getDefaultNetworkStack();
+        const accepter = fn(this, networkStack.getStack());
+        networkStack.addConstruct(accepter);
+        return accepter;
+    }
     /**
      * Add a messaging resource to the default queue stack using the factory pattern.
      *
@@ -580,7 +507,6 @@ export class App extends CdkApp {
      * Additional VPCs can be retrieved by name using app.getVpc(name).
      *
      * @param fn - Factory function that creates the Network construct
-     * @returns {Network} The created Network construct
      *
      * @example
      * const isolatedVpc = app.addNetwork(
@@ -596,33 +522,19 @@ export class App extends CdkApp {
         networkStack.addConstruct(network);
         return network;
     }
-    /**
-     * Manually add a resource to the default database stack.
-     */
     addDatabaseResource(resource) {
         const databaseStack = this.getDefaultDatabaseStack();
         databaseStack.addConstruct(resource);
     }
-    /**
-     * Manually add a resource to the default storage stack.
-     */
     addStorageResource(resource) {
         const storageStack = this.getDefaultStorageStack();
         storageStack.addConstruct(resource);
     }
-    /**
-     * Initialise standard tags
-     */
     initialiseStandardTags() {
         const config = getConfig();
-        this.globalTags = {
-            [COST_ALLOCATION_ENVIRONMENT_TAG]: config.environment,
-            [COST_ALLOCATION_SERVICE_TAG]: this.name
-        };
+        this.globalTags[COST_ALLOCATION_TAGS.ENVIRONMENT] = config.environment;
+        this.globalTags[COST_ALLOCATION_TAGS.SERVICE] = this.name;
     }
-    /**
-     * Apply all tags using CDK's native Tags.of().add() API
-     */
     applyTagsAspect() {
         if (!this.aspectApplied && Object.keys(this.globalTags).length > 0) {
             // Apply standard tags using Tags.of(this).add()
@@ -641,7 +553,7 @@ export class App extends CdkApp {
      * @example
      * app.addTags({
      *   "fjall:costAllocation:owner": "platform-team",
-     *   "fjall:costAllocation:cost-center": "CC-123",
+     *   "fjall:costAllocation:cost-centre": "CC-123",
      *   "team:slack-channel": "#platform-alerts"
      * });
      */
@@ -656,11 +568,7 @@ export class App extends CdkApp {
         }
         return this;
     }
-    /**
-     * Export resource inventory collected during synthesis
-     * Call this after app.synth() to get complete resource inventory
-     * @returns {ResourceInventory} Complete inventory of all resources in the app
-     */
+    /** Call after app.synth() — inventory is not available before synthesis. */
     exportResourceInventory() {
         if (!this.resourceInventory) {
             throw new Error("Resource inventory not available. Ensure a ResourceInventoryAspect has been added before calling exportResourceInventory().");
@@ -671,16 +579,9 @@ export class App extends CdkApp {
             appName: this.name
         };
     }
-    /**
-     * Get the manifest collector for registering services and patterns.
-     * Used by ComputeFactory and PatternFactory to register their configurations.
-     */
     getManifestCollector() {
         return this.manifestCollector;
     }
-    /**
-     * Override synth to automatically export resource inventory and manifest
-     */
     synth(options) {
         // Call parent synth first
         const assembly = super.synth(options);

package/dist/lib/patterns/aws/account.js

@@ -4,6 +4,7 @@ import { ManagementEventsTrail } from "../../config/aws/cloudTrail.js";
 import { OidcConnector } from "../../config/aws/oidcConnector.js";
 import { AccountMonitoringRole } from "../../config/aws/accountMonitoringRole.js";
 import { AccountAuditRole } from "../../config/aws/accountAuditRole.js";
+import { CDK_CONTEXT_KEYS } from "../../utils/cdkContext.js";
 import { getConfig } from "../../utils/getConfig.js";
 import { DisasterRecovery } from "../../config/aws/disasterRecovery.js";
 import { S3BlockPublicAccess } from "../../config/aws/s3BlockPublicAccess.js";
@@ -27,7 +28,7 @@ export class Account extends Stack {
         const env = props.env ?? { region, account: accountId };
         super(scope, id, { ...props, env });
         this.resolvedRegion = region ?? this.region;
-        const orgId = this.node.tryGetContext("orgId");
+        const orgId = this.node.tryGetContext(CDK_CONTEXT_KEYS.ORG_ID);
         if (orgId) {
             new CfnOutput(this, "OrganisationIdOutput", {
                 key: "OrganisationId",
@@ -66,10 +67,10 @@ export class Account extends Stack {
         }
         new ManagementEventsTrail(this, "CloudTrail", {
             accountId: this.account,
-            region
+            region: this.resolvedRegion
         });
         new EcrDefaultImage(this, "EcrDefaultImage", {
-            region,
+            region: this.resolvedRegion,
             accountId: this.account,
             eventBusArn: eventBus.defaultEventBusArn.value
         });
@@ -78,7 +79,7 @@ export class Account extends Stack {
             const isComplianceAccount = environment === "compliance";
             if (environment === "production" || isComplianceAccount) {
                 new DisasterRecovery(this, "DisasterRecovery", {
-                    region,
+                    region: this.resolvedRegion,
                     accountId
                 });
             }