@fjall/components-infrastructure 12.4.0 → 13.0.0

package/dist/lib/app.d.ts

@@ -117,6 +117,12 @@ export declare class App extends CdkApp {
     getName(): string;
     static getApp(name?: string, options?: IAppOptions): App;
     static getInstance(name?: string, options?: IAppOptions): App;
+    /**
+     * Whether the singleton App has been initialised. Lets patterns consult the
+     * instance for defaults without materialising it (and its manifest
+     * collector) as a side effect in bare-synth contexts.
+     */
+    static hasInstance(): boolean;
     static resetForTesting(): void;
     /**
      * Retrieve a stack by key. If the stack does not exist, it will be created.

package/dist/lib/app.js

@@ -169,6 +169,14 @@ export class App extends CdkApp {
         }
         return App.instance;
     }
+    /**
+     * Whether the singleton App has been initialised. Lets patterns consult the
+     * instance for defaults without materialising it (and its manifest
+     * collector) as a side effect in bare-synth contexts.
+     */
+    static hasInstance() {
+        return App.instance !== null;
+    }
     static resetForTesting() {
         App.instance = null;
         // App-scoped synth state resets with the App singleton — the DNS

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

@@ -437,6 +437,8 @@ export class ClickHouseDatabase extends Construct {
         }
         const resolvedAlertsTopic = resolveAlertsTopic(this, "AlertsTopic", props.alertsTopic);
         const alarmsDisabled = props.alarms === false;
+        const applicationId = props.applicationId ??
+            (App.hasInstance() ? App.getInstance().getName() : undefined);
         const alarmThresholds = typeof props.alarms === "object" ? props.alarms : {};
         validateClickHouseAlarmThresholds(alarmThresholds);
         const serverTuning = deriveClickHouseServerTuning(instanceType);
@@ -449,9 +451,7 @@ export class ClickHouseDatabase extends Construct {
             ...(resolvedAlertsTopic !== undefined && {
                 alertsTopic: resolvedAlertsTopic
             }),
-            ...(props.applicationId !== undefined && {
-                applicationId: props.applicationId
-            }),
+            ...(applicationId !== undefined && { applicationId }),
             cluster: {
                 loadBalancer: false,
                 securityGroup,
@@ -639,9 +639,7 @@ export class ClickHouseDatabase extends Construct {
                 asgName,
                 alarmTopic: resolvedAlertsTopic,
                 config: alarmThresholds,
-                ...(props.applicationId !== undefined && {
-                    applicationId: props.applicationId
-                }),
+                ...(applicationId !== undefined && { applicationId }),
                 ...(backupTaskLogGroup !== undefined && { backupTaskLogGroup })
             });
         }

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

@@ -163,7 +163,8 @@ export class ComputeFactory {
             if (computeProps.type === "ecs") {
                 computeProps = {
                     ...computeProps,
-                    appName: computeProps.appName ?? app.getName()
+                    appName: computeProps.appName ?? app.getName(),
+                    applicationId: computeProps.applicationId ?? app.getName()
                 };
             }
             // Create specific compute class based on type discriminator

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

@@ -993,7 +993,8 @@ export class EcsCompute extends Construct {
             cluster,
             services,
             alertsTopic: resolvedAlertsTopic,
-            applicationId: props.applicationId,
+            applicationId: props.applicationId ??
+                (App.hasInstance() ? App.getInstance().getName() : undefined),
             ...(props.taskStopWatchdog === false && { taskStopWatchdog: false })
         };
         this.ecsCluster = new EcsCluster(this, `${id}Ecs`, ecsProps);

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

@@ -176,13 +176,15 @@ export class DatabaseFactory {
             if (props.type === "ClickHouse") {
                 const clickhouseProps = {
                     ...props,
-                    vpc: props.vpc ?? app.getVpc()
+                    vpc: props.vpc ?? app.getVpc(),
+                    applicationId: props.applicationId ?? app.getName()
                 };
                 return new ClickHouseDatabase(scope, id, clickhouseProps);
             }
             const databaseProps = {
                 ...props,
-                vpc: props.vpc ?? app.getVpc()
+                vpc: props.vpc ?? app.getVpc(),
+                applicationId: props.applicationId ?? app.getName()
             };
             validateDatabaseProps(databaseProps);
             return new RelationalDatabase(scope, id, databaseProps);

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

@@ -307,10 +307,13 @@ export class MessagingFactory {
      * Implementation of the build method.
      */
     static build(id, props) {
-        return (_app, scope) => {
+        return (app, scope) => {
             switch (props.type) {
                 case "queue":
-                    return new QueueMessaging(scope, id, props);
+                    return new QueueMessaging(scope, id, {
+                        ...props,
+                        applicationId: props.applicationId ?? app.getName()
+                    });
                 case "topic":
                     return new TopicMessaging(scope, id, props);
                 case "eventBus":

package/dist/lib/resources/aws/monitoring/alarmDefaults.d.ts

@@ -3,8 +3,19 @@ import type { Alarm, AlarmBase } from "aws-cdk-lib/aws-cloudwatch";
 import type { SnsAction } from "aws-cdk-lib/aws-cloudwatch-actions";
 /**
  * Tag key for mapping CloudWatch alarms to Fjall applications.
- * Cross-system contract: the webhook at webapp/app/routes/api/internal/alarm-webhook.ts
- * extracts this tag from alarm descriptions and dimensions.
+ *
+ * Value contract: the tag value is the fjall application NAME — every
+ * alarm-bearing factory branch defaults it to `app.getName()`, which equals
+ * the webapp's `Application.fjallName` (the byte-stable deploy identity), not
+ * a database id. The webapp resolves it to the owning application record at
+ * alarm-webhook ingress.
+ *
+ * Cross-system contract: the webhook at
+ * webapp/app/routes/api/internal/alarm-webhook.ts extracts this tag from
+ * alarm descriptions and dimensions via the mirror constant
+ * `APPLICATION_ID_TAG_KEY` at
+ * webapp/app/.server/services/alarms/alarmMapper.ts — the two literals must
+ * stay byte-identical.
  */
 export declare const APPLICATION_ID_TAG_KEY = "fjall:applicationId";
 export declare const ALARM_DEFAULTS: {

package/dist/lib/resources/aws/monitoring/alarmDefaults.js

@@ -1,8 +1,19 @@
 import { Duration, Tags } from "aws-cdk-lib";
 /**
  * Tag key for mapping CloudWatch alarms to Fjall applications.
- * Cross-system contract: the webhook at webapp/app/routes/api/internal/alarm-webhook.ts
- * extracts this tag from alarm descriptions and dimensions.
+ *
+ * Value contract: the tag value is the fjall application NAME — every
+ * alarm-bearing factory branch defaults it to `app.getName()`, which equals
+ * the webapp's `Application.fjallName` (the byte-stable deploy identity), not
+ * a database id. The webapp resolves it to the owning application record at
+ * alarm-webhook ingress.
+ *
+ * Cross-system contract: the webhook at
+ * webapp/app/routes/api/internal/alarm-webhook.ts extracts this tag from
+ * alarm descriptions and dimensions via the mirror constant
+ * `APPLICATION_ID_TAG_KEY` at
+ * webapp/app/.server/services/alarms/alarmMapper.ts — the two literals must
+ * stay byte-identical.
  */
 export const APPLICATION_ID_TAG_KEY = "fjall:applicationId";
 export const ALARM_DEFAULTS = {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fjall/components-infrastructure",
-  "version": "12.4.0",
+  "version": "13.0.0",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/fjall-tech/fjall.git",
@@ -80,8 +80,8 @@
   },
   "dependencies": {
     "@aws-sdk/client-organizations": "^3.1098.0",
-    "@fjall/generator": "^12.4.0",
-    "@fjall/util": "^12.4.0",
+    "@fjall/generator": "^13.0.0",
+    "@fjall/util": "^13.0.0",
     "constructs": "^10.7.2"
   },
   "overrides": {