@quadnix/octo-aws-cdk 0.2.0 → 0.2.1

package/dist/modules/service/aws-s3-storage-service/models/service/aws-s3-storage-service.schema.js

@@ -14,19 +14,35 @@ import { Schema, ServiceSchema, Validate } from '@quadnix/octo';
 export class AwsS3StorageServiceSchema extends ServiceSchema {
     constructor() {
         super(...arguments);
+        this.accessPrefixes = Schema([]);
         this.bucketName = Schema();
-        this.directories = Schema([]);
+        this.excludePaths = Schema([]);
+        this.sourcePaths = Schema([]);
     }
 }
+__decorate([
+    Validate({
+        destruct: (value) => value.map((v) => [v.accessPrefixAnchorName, v.accessPrefix]).flat(),
+        options: { minLength: 1 },
+    }),
+    __metadata("design:type", Object)
+], AwsS3StorageServiceSchema.prototype, "accessPrefixes", void 0);
 __decorate([
     Validate({ options: { minLength: 1 } }),
     __metadata("design:type", Object)
 ], AwsS3StorageServiceSchema.prototype, "bucketName", void 0);
 __decorate([
     Validate({
-        destruct: (value) => value.map((v) => [v.directoryAnchorName, v.remoteDirectoryPath]).flat(),
+        destruct: (value) => value.map((v) => [v.directoryPath, v.subDirectoryOrFilePath]).flat(),
+        options: { minLength: 1 },
+    }),
+    __metadata("design:type", Object)
+], AwsS3StorageServiceSchema.prototype, "excludePaths", void 0);
+__decorate([
+    Validate({
+        destruct: (value) => value.map((v) => [v.directoryPath, String(v.isDirectory), v.remotePath, v.subDirectoryOrFilePath]).flat(),
         options: { minLength: 1 },
     }),
     __metadata("design:type", Object)
-], AwsS3StorageServiceSchema.prototype, "directories", void 0);
+], AwsS3StorageServiceSchema.prototype, "sourcePaths", void 0);
 //# sourceMappingURL=aws-s3-storage-service.schema.js.map

package/dist/modules/service/aws-s3-storage-service/models/service/aws-s3-storage-service.schema.js.map

@@ -1 +1 @@
-{"version":3,"file":"aws-s3-storage-service.schema.js","sourceRoot":"","sources":["../../../../../../src/modules/service/aws-s3-storage-service/models/service/aws-s3-storage-service.schema.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAAE,MAAM,EAAE,aAAa,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AAEhE;;GAEG;AACH,MAAM,OAAO,yBAA0B,SAAQ,aAAa;IAA5D;;QAEE,eAAU,GAAG,MAAM,EAAU,CAAC;QAO9B,gBAAW,GAAI,MAAM,CAAiE,EAAE,CAAC,CAAC;IAC5F,CAAC;CAAA;AARC;IADC,QAAQ,CAAC,EAAE,OAAO,EAAE,EAAE,SAAS,EAAE,CAAC,EAAE,EAAE,CAAC;;6DACV;AAO9B;IALC,QAAQ,CAAC;QACR,QAAQ,EAAE,CAAC,KAA+C,EAAY,EAAE,CACtE,KAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,mBAAmB,EAAE,CAAC,CAAC,mBAAmB,CAAC,CAAC,CAAC,IAAI,EAAE;QAC1E,OAAO,EAAE,EAAE,SAAS,EAAE,CAAC,EAAE;KAC1B,CAAC;;8DACwF"}
+{"version":3,"file":"aws-s3-storage-service.schema.js","sourceRoot":"","sources":["../../../../../../src/modules/service/aws-s3-storage-service/models/service/aws-s3-storage-service.schema.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAAE,MAAM,EAAE,aAAa,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AAEhE;;GAEG;AACH,MAAM,OAAO,yBAA0B,SAAQ,aAAa;IAA5D;;QAME,mBAAc,GAAI,MAAM,CAA6D,EAAE,CAAC,CAAC;QAGzF,eAAU,GAAG,MAAM,EAAU,CAAC;QAO9B,iBAAY,GAAI,MAAM,CAA8D,EAAE,CAAC,CAAC;QAOxF,gBAAW,GAAI,MAAM,CAOnB,EAAE,CAAC,CAAC;IACR,CAAC;CAAA;AAzBC;IALC,QAAQ,CAAC;QACR,QAAQ,EAAE,CAAC,KAAkD,EAAY,EAAE,CACzE,KAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,sBAAsB,EAAE,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,IAAI,EAAE;QACtE,OAAO,EAAE,EAAE,SAAS,EAAE,CAAC,EAAE;KAC1B,CAAC;;iEACuF;AAGzF;IADC,QAAQ,CAAC,EAAE,OAAO,EAAE,EAAE,SAAS,EAAE,CAAC,EAAE,EAAE,CAAC;;6DACV;AAO9B;IALC,QAAQ,CAAC;QACR,QAAQ,EAAE,CAAC,KAAgD,EAAY,EAAE,CACvE,KAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,aAAa,EAAE,CAAC,CAAC,sBAAsB,CAAC,CAAC,CAAC,IAAI,EAAE;QACvE,OAAO,EAAE,EAAE,SAAS,EAAE,CAAC,EAAE;KAC1B,CAAC;;+DACsF;AAOxF;IALC,QAAQ,CAAC;QACR,QAAQ,EAAE,CAAC,KAA+C,EAAY,EAAE,CACtE,KAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,aAAa,EAAE,MAAM,CAAC,CAAC,CAAC,WAAW,CAAC,EAAE,CAAC,CAAC,UAAU,EAAE,CAAC,CAAC,sBAAsB,CAAC,CAAC,CAAC,IAAI,EAAE;QAC5G,OAAO,EAAE,EAAE,SAAS,EAAE,CAAC,EAAE;KAC1B,CAAC;;8DAQI"}

package/dist/modules/service/aws-s3-storage-service/models/service/index.d.ts

@@ -1,2 +1,3 @@
 import './actions/add-aws-s3-storage-service.model.action.js';
+import './actions/update-aws-s3-storage-service-source-paths.model.action.js';
 export { AwsS3StorageService } from './aws-s3-storage-service.model.js';

package/dist/modules/service/aws-s3-storage-service/models/service/index.js

@@ -1,3 +1,4 @@
 import './actions/add-aws-s3-storage-service.model.action.js';
+import './actions/update-aws-s3-storage-service-source-paths.model.action.js';
 export { AwsS3StorageService } from './aws-s3-storage-service.model.js';
 //# sourceMappingURL=index.js.map

package/dist/modules/service/aws-s3-storage-service/models/service/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../src/modules/service/aws-s3-storage-service/models/service/index.ts"],"names":[],"mappings":"AAAA,OAAO,sDAAsD,CAAC;AAE9D,OAAO,EAAE,mBAAmB,EAAE,MAAM,mCAAmC,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../src/modules/service/aws-s3-storage-service/models/service/index.ts"],"names":[],"mappings":"AAAA,OAAO,sDAAsD,CAAC;AAC9D,OAAO,sEAAsE,CAAC;AAE9E,OAAO,EAAE,mBAAmB,EAAE,MAAM,mCAAmC,CAAC"}

package/dist/modules/subnet/aws-serverless-subnet/aws-serverless-subnet.module.d.ts

@@ -0,0 +1,31 @@
+import { AModule } from '@quadnix/octo';
+import { AwsServerlessSubnetModuleSchema } from './index.schema.js';
+import { AwsServerlessSubnet } from './models/subnet/index.js';
+/**
+ * `AwsServerlessSubnetModule` is an AWS subnet module that provides an implementation for the `Subnet`
+ * model, for serverless regions. It creates nothing: serverless code runs in no network of octo's. The
+ * subnet is the one boundary of its region, covers the whole of it, and is always named `default`.
+ *
+ * @example
+ * TypeScript
+ * ```ts
+ * import { type Region, stub } from '@quadnix/octo';
+ * import { AwsServerlessSubnetModule } from '@quadnix/octo-aws-cdk/modules/subnet/aws-serverless-subnet';
+ *
+ * octo.loadModule(AwsServerlessSubnetModule, 'my-subnet-module', {
+ *   region: stub<Region>('${{my-region-module.model.region}}'),
+ * });
+ * ```
+ *
+ * @group Modules/Subnet/AwsServerlessSubnet
+ *
+ * @see {@link AwsServerlessSubnetModuleSchema} for the input schema.
+ * @see {@link AModule} to learn more about modules.
+ * @see [Subnet](/api/octo/class/Subnet) to learn more about the `Subnet` model.
+ */
+export declare class AwsServerlessSubnetModule extends AModule<AwsServerlessSubnetModuleSchema, AwsServerlessSubnet> {
+    /**
+     * Creates the region's one subnet, and anchors it.
+     */
+    onInit(inputs: AwsServerlessSubnetModuleSchema): Promise<AwsServerlessSubnet>;
+}

package/dist/modules/subnet/aws-serverless-subnet/aws-serverless-subnet.module.js

@@ -0,0 +1,55 @@
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+import { AModule, Module, ModuleError } from '@quadnix/octo';
+import { AwsServerlessSubnetAnchor } from '../../../anchors/aws-subnet/aws-serverless-subnet.anchor.js';
+import { AwsServerlessSubnetModuleSchema } from './index.schema.js';
+import { AwsServerlessSubnet } from './models/subnet/index.js';
+/**
+ * `AwsServerlessSubnetModule` is an AWS subnet module that provides an implementation for the `Subnet`
+ * model, for serverless regions. It creates nothing: serverless code runs in no network of octo's. The
+ * subnet is the one boundary of its region, covers the whole of it, and is always named `default`.
+ *
+ * @example
+ * TypeScript
+ * ```ts
+ * import { type Region, stub } from '@quadnix/octo';
+ * import { AwsServerlessSubnetModule } from '@quadnix/octo-aws-cdk/modules/subnet/aws-serverless-subnet';
+ *
+ * octo.loadModule(AwsServerlessSubnetModule, 'my-subnet-module', {
+ *   region: stub<Region>('${{my-region-module.model.region}}'),
+ * });
+ * ```
+ *
+ * @group Modules/Subnet/AwsServerlessSubnet
+ *
+ * @see {@link AwsServerlessSubnetModuleSchema} for the input schema.
+ * @see {@link AModule} to learn more about modules.
+ * @see [Subnet](/api/octo/class/Subnet) to learn more about the `Subnet` model.
+ */
+let AwsServerlessSubnetModule = class AwsServerlessSubnetModule extends AModule {
+    /**
+     * Creates the region's one subnet, and anchors it.
+     */
+    async onInit(inputs) {
+        const region = inputs.region;
+        // Validate the region has no subnet yet.
+        if ((region.getChildren()['subnet'] || []).length > 0) {
+            throw new ModuleError(`Region "${region.regionId}" already has a subnet!`, this.constructor.name);
+        }
+        // Create a new subnet.
+        const subnet = new AwsServerlessSubnet(region, 'default');
+        region.addSubnet(subnet);
+        // Add anchors.
+        subnet.addAnchor(new AwsServerlessSubnetAnchor('AwsServerlessSubnetAnchor', { serverless: true, subnetName: subnet.subnetName }, subnet));
+        return subnet;
+    }
+};
+AwsServerlessSubnetModule = __decorate([
+    Module('@octo', AwsServerlessSubnetModuleSchema)
+], AwsServerlessSubnetModule);
+export { AwsServerlessSubnetModule };
+//# sourceMappingURL=aws-serverless-subnet.module.js.map

package/dist/modules/subnet/aws-serverless-subnet/aws-serverless-subnet.module.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"aws-serverless-subnet.module.js","sourceRoot":"","sources":["../../../../src/modules/subnet/aws-serverless-subnet/aws-serverless-subnet.module.ts"],"names":[],"mappings":";;;;;;AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAC7D,OAAO,EAAE,yBAAyB,EAAE,MAAM,6DAA6D,CAAC;AACxG,OAAO,EAAE,+BAA+B,EAAE,MAAM,mBAAmB,CAAC;AACpE,OAAO,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AAE/D;;;;;;;;;;;;;;;;;;;;;GAqBG;AAEI,IAAM,yBAAyB,GAA/B,MAAM,yBAA0B,SAAQ,OAA6D;IAC1G;;OAEG;IACH,KAAK,CAAC,MAAM,CAAC,MAAuC;QAClD,MAAM,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC;QAE7B,yCAAyC;QACzC,IAAI,CAAC,MAAM,CAAC,WAAW,EAAE,CAAC,QAAQ,CAAC,IAAI,EAAE,CAAC,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACtD,MAAM,IAAI,WAAW,CAAC,WAAW,MAAM,CAAC,QAAQ,yBAAyB,EAAE,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;QACpG,CAAC;QAED,uBAAuB;QACvB,MAAM,MAAM,GAAG,IAAI,mBAAmB,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;QAC1D,MAAM,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;QAEzB,eAAe;QACf,MAAM,CAAC,SAAS,CACd,IAAI,yBAAyB,CAC3B,2BAA2B,EAC3B,EAAE,UAAU,EAAE,IAAI,EAAE,UAAU,EAAE,MAAM,CAAC,UAAU,EAAE,EACnD,MAAM,CACP,CACF,CAAC;QAEF,OAAO,MAAM,CAAC;IAChB,CAAC;CACF,CAAA;AA3BY,yBAAyB;IADrC,MAAM,CAA4B,OAAO,EAAE,+BAA+B,CAAC;GAC/D,yBAAyB,CA2BrC"}

package/dist/modules/subnet/aws-serverless-subnet/index.d.ts

@@ -0,0 +1 @@
+export { AwsServerlessSubnetModule } from './aws-serverless-subnet.module.js';

package/dist/modules/subnet/aws-serverless-subnet/index.js

@@ -0,0 +1,2 @@
+export { AwsServerlessSubnetModule } from './aws-serverless-subnet.module.js';
+//# sourceMappingURL=index.js.map

package/dist/modules/subnet/aws-serverless-subnet/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/modules/subnet/aws-serverless-subnet/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,yBAAyB,EAAE,MAAM,mCAAmC,CAAC"}

package/dist/modules/subnet/aws-serverless-subnet/index.schema.d.ts

@@ -0,0 +1,17 @@
+import { type Region } from '@quadnix/octo';
+/**
+ * `AwsServerlessSubnetModuleSchema` is the input schema for the `AwsServerlessSubnetModule` module.
+ * This schema defines the one subnet of a serverless region. The subnet is always named `default`.
+ *
+ * @group Modules/Subnet/AwsServerlessSubnet
+ *
+ * @hideconstructor
+ *
+ * @see {@link AwsServerlessSubnetModule} to learn more about the `AwsServerlessSubnetModule` module.
+ */
+export declare class AwsServerlessSubnetModuleSchema {
+    /**
+     * The serverless region this subnet covers.
+     */
+    region: Region;
+}

package/dist/modules/subnet/aws-serverless-subnet/index.schema.js

@@ -0,0 +1,46 @@
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+};
+import { RegionSchema, Schema, Validate } from '@quadnix/octo';
+import { AwsServerlessRegionAnchorSchema } from '../../../anchors/aws-region/aws-serverless-region.anchor.schema.js';
+/**
+ * `AwsServerlessSubnetModuleSchema` is the input schema for the `AwsServerlessSubnetModule` module.
+ * This schema defines the one subnet of a serverless region. The subnet is always named `default`.
+ *
+ * @group Modules/Subnet/AwsServerlessSubnet
+ *
+ * @hideconstructor
+ *
+ * @see {@link AwsServerlessSubnetModule} to learn more about the `AwsServerlessSubnetModule` module.
+ */
+export class AwsServerlessSubnetModuleSchema {
+    constructor() {
+        /**
+         * The serverless region this subnet covers.
+         */
+        this.region = Schema();
+    }
+}
+__decorate([
+    Validate([
+        {
+            options: {
+                isModel: { anchors: [{ schema: AwsServerlessRegionAnchorSchema }], NODE_NAME: 'region' },
+            },
+        },
+        {
+            destruct: (value) => [value.synth()],
+            options: {
+                isSchema: { schema: RegionSchema },
+            },
+        },
+    ]),
+    __metadata("design:type", Object)
+], AwsServerlessSubnetModuleSchema.prototype, "region", void 0);
+//# sourceMappingURL=index.schema.js.map

package/dist/modules/subnet/aws-serverless-subnet/index.schema.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.schema.js","sourceRoot":"","sources":["../../../../src/modules/subnet/aws-serverless-subnet/index.schema.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAAe,YAAY,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AAC5E,OAAO,EAAE,+BAA+B,EAAE,MAAM,oEAAoE,CAAC;AAErH;;;;;;;;;GASG;AACH,MAAM,OAAO,+BAA+B;IAA5C;QACE;;WAEG;QAcH,WAAM,GAAG,MAAM,EAAU,CAAC;IAC5B,CAAC;CAAA;AADC;IAbC,QAAQ,CAAC;QACR;YACE,OAAO,EAAE;gBACP,OAAO,EAAE,EAAE,OAAO,EAAE,CAAC,EAAE,MAAM,EAAE,+BAA+B,EAAE,CAAC,EAAE,SAAS,EAAE,QAAQ,EAAE;aACzF;SACF;QACD;YACE,QAAQ,EAAE,CAAC,KAAgD,EAAkB,EAAE,CAAC,CAAC,KAAK,CAAC,KAAK,EAAE,CAAC;YAC/F,OAAO,EAAE;gBACP,QAAQ,EAAE,EAAE,MAAM,EAAE,YAAY,EAAE;aACnC;SACF;KACF,CAAC;;+DACwB"}

package/dist/modules/subnet/aws-serverless-subnet/models/subnet/actions/add-aws-serverless-subnet.model.action.d.ts

@@ -0,0 +1,28 @@
+import { type ActionOutputs, type Diff, type EnhancedModuleSchema, type IModelAction } from '@quadnix/octo';
+import type { AwsServerlessSubnetModule } from '../../../aws-serverless-subnet.module.js';
+import { AwsServerlessSubnet } from '../aws-serverless-subnet.model.js';
+/**
+ * A serverless subnet creates nothing.
+ *
+ * @internal
+ */
+export declare class AddAwsServerlessSubnetModelAction implements IModelAction<AwsServerlessSubnetModule> {
+    /**
+     * @internal
+     */
+    filter(diff: Diff): boolean;
+    /**
+     * @internal
+     */
+    handle(_diff: Diff<AwsServerlessSubnet>, _actionInputs: EnhancedModuleSchema<AwsServerlessSubnetModule>, actionOutputs: ActionOutputs): Promise<ActionOutputs>;
+}
+/**
+ * @internal
+ */
+export declare class AddAwsServerlessSubnetModelActionFactory {
+    private static instance;
+    /**
+     * @internal
+     */
+    static create(): Promise<AddAwsServerlessSubnetModelAction>;
+}

package/dist/modules/subnet/aws-serverless-subnet/models/subnet/actions/add-aws-serverless-subnet.model.action.js

@@ -0,0 +1,53 @@
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+import { Action, DiffAction, Factory, hasNodeName, } from '@quadnix/octo';
+import { AwsServerlessSubnet } from '../aws-serverless-subnet.model.js';
+/**
+ * A serverless subnet creates nothing.
+ *
+ * @internal
+ */
+let AddAwsServerlessSubnetModelAction = class AddAwsServerlessSubnetModelAction {
+    /**
+     * @internal
+     */
+    filter(diff) {
+        return (diff.action === DiffAction.ADD &&
+            diff.node instanceof AwsServerlessSubnet &&
+            hasNodeName(diff.node, 'subnet') &&
+            diff.field === 'subnetId');
+    }
+    /**
+     * @internal
+     */
+    async handle(_diff, _actionInputs, actionOutputs) {
+        return actionOutputs;
+    }
+};
+AddAwsServerlessSubnetModelAction = __decorate([
+    Action(AwsServerlessSubnet)
+], AddAwsServerlessSubnetModelAction);
+export { AddAwsServerlessSubnetModelAction };
+/**
+ * @internal
+ */
+let AddAwsServerlessSubnetModelActionFactory = class AddAwsServerlessSubnetModelActionFactory {
+    /**
+     * @internal
+     */
+    static async create() {
+        if (!this.instance) {
+            this.instance = new AddAwsServerlessSubnetModelAction();
+        }
+        return this.instance;
+    }
+};
+AddAwsServerlessSubnetModelActionFactory = __decorate([
+    Factory(AddAwsServerlessSubnetModelAction)
+], AddAwsServerlessSubnetModelActionFactory);
+export { AddAwsServerlessSubnetModelActionFactory };
+//# sourceMappingURL=add-aws-serverless-subnet.model.action.js.map

package/dist/modules/subnet/aws-serverless-subnet/models/subnet/actions/add-aws-serverless-subnet.model.action.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"add-aws-serverless-subnet.model.action.js","sourceRoot":"","sources":["../../../../../../../src/modules/subnet/aws-serverless-subnet/models/subnet/actions/add-aws-serverless-subnet.model.action.ts"],"names":[],"mappings":";;;;;;AAAA,OAAO,EACL,MAAM,EAGN,UAAU,EAEV,OAAO,EAEP,WAAW,GACZ,MAAM,eAAe,CAAC;AAEvB,OAAO,EAAE,mBAAmB,EAAE,MAAM,mCAAmC,CAAC;AAExE;;;;GAIG;AAEI,IAAM,iCAAiC,GAAvC,MAAM,iCAAiC;IAC5C;;OAEG;IACH,MAAM,CAAC,IAAU;QACf,OAAO,CACL,IAAI,CAAC,MAAM,KAAK,UAAU,CAAC,GAAG;YAC9B,IAAI,CAAC,IAAI,YAAY,mBAAmB;YACxC,WAAW,CAAC,IAAI,CAAC,IAAI,EAAE,QAAQ,CAAC;YAChC,IAAI,CAAC,KAAK,KAAK,UAAU,CAC1B,CAAC;IACJ,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,MAAM,CACV,KAAgC,EAChC,aAA8D,EAC9D,aAA4B;QAE5B,OAAO,aAAa,CAAC;IACvB,CAAC;CACF,CAAA;AAvBY,iCAAiC;IAD7C,MAAM,CAAC,mBAAmB,CAAC;GACf,iCAAiC,CAuB7C;;AAED;;GAEG;AAEI,IAAM,wCAAwC,GAA9C,MAAM,wCAAwC;IAGnD;;OAEG;IACH,MAAM,CAAC,KAAK,CAAC,MAAM;QACjB,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC;YACnB,IAAI,CAAC,QAAQ,GAAG,IAAI,iCAAiC,EAAE,CAAC;QAC1D,CAAC;QACD,OAAO,IAAI,CAAC,QAAQ,CAAC;IACvB,CAAC;CACF,CAAA;AAZY,wCAAwC;IADpD,OAAO,CAAoC,iCAAiC,CAAC;GACjE,wCAAwC,CAYpD"}

package/dist/modules/subnet/aws-serverless-subnet/models/subnet/aws-serverless-subnet.model.d.ts

@@ -0,0 +1,11 @@
+import { type Region, Subnet } from '@quadnix/octo';
+import { AwsServerlessSubnetSchema } from './aws-serverless-subnet.schema.js';
+/**
+ * @internal
+ */
+export declare class AwsServerlessSubnet extends Subnet {
+    /**
+     * @internal
+     */
+    static unSynth(subnet: AwsServerlessSubnetSchema, deReferenceContext: (context: string) => Promise<Region>): Promise<AwsServerlessSubnet>;
+}

package/dist/modules/subnet/aws-serverless-subnet/models/subnet/aws-serverless-subnet.model.js

@@ -0,0 +1,26 @@
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var AwsServerlessSubnet_1;
+import { Model, Subnet } from '@quadnix/octo';
+import { AwsServerlessSubnetSchema } from './aws-serverless-subnet.schema.js';
+/**
+ * @internal
+ */
+let AwsServerlessSubnet = AwsServerlessSubnet_1 = class AwsServerlessSubnet extends Subnet {
+    /**
+     * @internal
+     */
+    static async unSynth(subnet, deReferenceContext) {
+        const region = (await deReferenceContext(subnet.region.context));
+        return new AwsServerlessSubnet_1(region, subnet.subnetName);
+    }
+};
+AwsServerlessSubnet = AwsServerlessSubnet_1 = __decorate([
+    Model('@octo', 'subnet', AwsServerlessSubnetSchema)
+], AwsServerlessSubnet);
+export { AwsServerlessSubnet };
+//# sourceMappingURL=aws-serverless-subnet.model.js.map

package/dist/modules/subnet/aws-serverless-subnet/models/subnet/aws-serverless-subnet.model.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"aws-serverless-subnet.model.js","sourceRoot":"","sources":["../../../../../../src/modules/subnet/aws-serverless-subnet/models/subnet/aws-serverless-subnet.model.ts"],"names":[],"mappings":";;;;;;;AAAA,OAAO,EAAE,KAAK,EAAe,MAAM,EAAE,MAAM,eAAe,CAAC;AAC3D,OAAO,EAAE,yBAAyB,EAAE,MAAM,mCAAmC,CAAC;AAE9E;;GAEG;AAEI,IAAM,mBAAmB,2BAAzB,MAAM,mBAAoB,SAAQ,MAAM;IAC7C;;OAEG;IACH,MAAM,CAAU,KAAK,CAAC,OAAO,CAC3B,MAAiC,EACjC,kBAAwD;QAExD,MAAM,MAAM,GAAG,CAAC,MAAM,kBAAkB,CAAC,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,CAAW,CAAC;QAC3E,OAAO,IAAI,qBAAmB,CAAC,MAAM,EAAE,MAAM,CAAC,UAAU,CAAC,CAAC;IAC5D,CAAC;CACF,CAAA;AAXY,mBAAmB;IAD/B,KAAK,CAAsB,OAAO,EAAE,QAAQ,EAAE,yBAAyB,CAAC;GAC5D,mBAAmB,CAW/B"}

package/dist/modules/subnet/aws-serverless-subnet/models/subnet/aws-serverless-subnet.schema.d.ts

@@ -0,0 +1,6 @@
+import { SubnetSchema } from '@quadnix/octo';
+/**
+ * @internal
+ */
+export declare class AwsServerlessSubnetSchema extends SubnetSchema {
+}

package/dist/modules/subnet/aws-serverless-subnet/models/subnet/aws-serverless-subnet.schema.js

@@ -0,0 +1,7 @@
+import { SubnetSchema } from '@quadnix/octo';
+/**
+ * @internal
+ */
+export class AwsServerlessSubnetSchema extends SubnetSchema {
+}
+//# sourceMappingURL=aws-serverless-subnet.schema.js.map

package/dist/modules/subnet/aws-serverless-subnet/models/subnet/aws-serverless-subnet.schema.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"aws-serverless-subnet.schema.js","sourceRoot":"","sources":["../../../../../../src/modules/subnet/aws-serverless-subnet/models/subnet/aws-serverless-subnet.schema.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AAE7C;;GAEG;AACH,MAAM,OAAO,yBAA0B,SAAQ,YAAY;CAAG"}

package/dist/modules/subnet/aws-serverless-subnet/models/subnet/index.d.ts

@@ -0,0 +1,2 @@
+import './actions/add-aws-serverless-subnet.model.action.js';
+export { AwsServerlessSubnet } from './aws-serverless-subnet.model.js';

package/dist/modules/subnet/aws-serverless-subnet/models/subnet/index.js

@@ -0,0 +1,3 @@
+import './actions/add-aws-serverless-subnet.model.action.js';
+export { AwsServerlessSubnet } from './aws-serverless-subnet.model.js';
+//# sourceMappingURL=index.js.map

package/dist/modules/subnet/aws-serverless-subnet/models/subnet/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../src/modules/subnet/aws-serverless-subnet/models/subnet/index.ts"],"names":[],"mappings":"AAAA,OAAO,qDAAqD,CAAC;AAE7D,OAAO,EAAE,mBAAmB,EAAE,MAAM,kCAAkC,CAAC"}

package/dist/modules/subnet/aws-simple-subnet/aws-simple-subnet.module.d.ts

@@ -11,11 +11,12 @@ import { AwsSimpleSubnetLocalFilesystemMountOverlay } from './overlays/aws-simpl
  * @example
  * TypeScript
  * ```ts
+ * import { type Filesystem, type Region, type Subnet, SubnetType, stub } from '@quadnix/octo';
  * import { AwsSimpleSubnetModule } from '@quadnix/octo-aws-cdk/modules/subnet/aws-simple-subnet';
  *
  * octo.loadModule(AwsSimpleSubnetModule, 'my-subnet-module', {
- *   localFilesystems: [myEfsFilesystem],
- *   region: myRegion,
+ *   localFilesystems: [stub<Filesystem>('${{my-filesystem-module.model.filesystem}}')],
+ *   region: stub<Region>('${{my-region-module.model.region}}'),
  *   subnetAvailabilityZone: 'us-east-1a',
  *   subnetCidrBlock: '10.0.1.0/24',
  *   subnetName: 'private-subnet-1',
@@ -26,7 +27,7 @@ import { AwsSimpleSubnetLocalFilesystemMountOverlay } from './overlays/aws-simpl
  *   },
  *   subnetSiblings: [{
  *     attachToNatGateway: true,
- *     subnet: mySiblingSubnet,
+ *     subnet: stub<Subnet>('${{my-sibling-subnet-module.model.subnet}}'),
  *   }],
  * });
  * ```

package/dist/modules/subnet/aws-simple-subnet/aws-simple-subnet.module.js

@@ -22,11 +22,12 @@ import { AwsSimpleSubnetLocalFilesystemMountOverlay } from './overlays/aws-simpl
  * @example
  * TypeScript
  * ```ts
+ * import { type Filesystem, type Region, type Subnet, SubnetType, stub } from '@quadnix/octo';
  * import { AwsSimpleSubnetModule } from '@quadnix/octo-aws-cdk/modules/subnet/aws-simple-subnet';
  *
  * octo.loadModule(AwsSimpleSubnetModule, 'my-subnet-module', {
- *   localFilesystems: [myEfsFilesystem],
- *   region: myRegion,
+ *   localFilesystems: [stub<Filesystem>('${{my-filesystem-module.model.filesystem}}')],
+ *   region: stub<Region>('${{my-region-module.model.region}}'),
  *   subnetAvailabilityZone: 'us-east-1a',
  *   subnetCidrBlock: '10.0.1.0/24',
  *   subnetName: 'private-subnet-1',
@@ -37,7 +38,7 @@ import { AwsSimpleSubnetLocalFilesystemMountOverlay } from './overlays/aws-simpl
  *   },
  *   subnetSiblings: [{
  *     attachToNatGateway: true,
- *     subnet: mySiblingSubnet,
+ *     subnet: stub<Subnet>('${{my-sibling-subnet-module.model.subnet}}'),
  *   }],
  * });
  * ```
@@ -106,7 +107,9 @@ let AwsSimpleSubnetModule = class AwsSimpleSubnetModule extends AModule {
                     .regionId !== region.regionId) {
                 throw new ModuleError(`Filesystem "${filesystem.filesystemName}" not found within the same region!`, this.constructor.name);
             }
-            const awsSimpleSubnetLocalFilesystemMountOverlay = new AwsSimpleSubnetLocalFilesystemMountOverlay(`aws-simple-subnet-local-filesystem-mount-overlay-${subnet.subnetName}-${filesystem.filesystemName}`, {
+            // An overlay id is unique across the app, and two regions may each hold a subnet and a filesystem
+            // of one name, so the id names the subnet by its id, which holds the region.
+            const awsSimpleSubnetLocalFilesystemMountOverlay = new AwsSimpleSubnetLocalFilesystemMountOverlay(`aws-simple-subnet-local-filesystem-mount-overlay-${subnet.subnetId}-${filesystem.filesystemName}`, {
                 filesystemName: filesystem.filesystemName,
                 regionId: region.regionId,
                 subnetId: subnet.subnetId,

package/dist/modules/subnet/aws-simple-subnet/aws-simple-subnet.module.js.map

@@ -1 +1 @@
-{"version":3,"file":"aws-simple-subnet.module.js","sourceRoot":"","sources":["../../../../src/modules/subnet/aws-simple-subnet/aws-simple-subnet.module.ts"],"names":[],"mappings":";;;;;;AAAA,OAAO,EAAE,OAAO,EAAiC,MAAM,EAAE,WAAW,EAAe,UAAU,EAAE,MAAM,eAAe,CAAC;AACrH,OAAO,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAC3C,OAAO,EAAE,kBAAkB,EAAE,MAAM,mDAAmD,CAAC;AACvF,OAAO,EAAE,qBAAqB,EAAE,MAAM,yDAAyD,CAAC;AAChG,OAAO,EAAE,mCAAmC,EAAE,MAAM,yEAAyE,CAAC;AAC9H,OAAO,EAAE,eAAe,EAAE,MAAM,kDAAkD,CAAC;AACnF,OAAO,EAAE,2BAA2B,EAAE,MAAM,mBAAmB,CAAC;AAChE,OAAO,EAAE,eAAe,EAAE,MAAM,0BAA0B,CAAC;AAC3D,OAAO,EAAE,0CAA0C,EAAE,MAAM,8DAA8D,CAAC;AAE1H;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAyCG;AAEI,IAAM,qBAAqB,GAA3B,MAAM,qBAAsB,SAAQ,OAAqD;IAC9F;;OAEG;IACH,KAAK,CAAC,MAAM,CACV,MAAmC;QAEnC,MAAM,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC;QAC7B,MAAM,EAAE,YAAY,EAAE,oBAAoB,EAAE,WAAW,EAAE,qBAAqB,EAAE,GAC9E,MAAM,IAAI,CAAC,gBAAgB,CAAC,MAAM,CAAC,CAAC;QAEtC,qCAAqC;QACrC,IAAI,CAAC,oBAAoB,CAAC,QAAQ,CAAC,MAAM,CAAC,sBAAsB,CAAC,EAAE,CAAC;YAClE,MAAM,IAAI,WAAW,CAAC,mCAAmC,EAAE,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;QACpF,CAAC;QAED,+BAA+B;QAC/B,IAAI,MAAM,CAAC,aAAa,EAAE,gBAAgB,IAAI,MAAM,CAAC,aAAa,CAAC,UAAU,KAAK,UAAU,CAAC,MAAM,EAAE,CAAC;YACpG,MAAM,IAAI,WAAW,CAAC,qDAAqD,EAAE,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;QACtG,CAAC;QAED,8CAA8C;QAC9C,IAAI,CAAC,QAAQ,CAAC,CAAC,qBAAqB,CAAC,EAAE,CAAC,MAAM,CAAC,eAAe,CAAC,CAAC,EAAE,CAAC;YACjE,MAAM,IAAI,WAAW,CAAC,wCAAwC,EAAE,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;QACzF,CAAC;QAED,uBAAuB;QACvB,MAAM,MAAM,GAAG,IAAI,eAAe,CAAC,MAAM,EAAE,MAAM,CAAC,UAAU,CAAC,CAAC;QAC9D,MAAM,CAAC,gBAAgB,GAAG,MAAM,CAAC,aAAa,EAAE,gBAAgB,IAAI,KAAK,CAAC;QAC1E,MAAM,CAAC,yBAAyB,GAAG,MAAM,CAAC,aAAa,EAAE,yBAAyB,IAAI,KAAK,CAAC;QAC5F,MAAM,CAAC,UAAU,GAAG,MAAM,CAAC,aAAa,EAAE,UAAU,IAAI,UAAU,CAAC,OAAO,CAAC;QAC3E,MAAM,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;QAEzB,eAAe;QACf,MAAM,eAAe,GAAG,IAAI,eAAe,CACzC,iBAAiB,EACjB;YACE,gBAAgB,EAAE,MAAM,CAAC,sBAAsB;YAC/C,YAAY;YACZ,WAAW;YACX,SAAS,EAAE,MAAM,CAAC,eAAe;YACjC,UAAU,EAAE,MAAM,CAAC,UAAU;SAC9B,EACD,MAAM,CACP,CAAC;QACF,MAAM,CAAC,SAAS,CAAC,eAAe,CAAC,CAAC;QAElC,MAAM,MAAM,GAAqE,CAAC,MAAM,CAAC,CAAC;QAE1F,kCAAkC;QAClC,KAAK,MAAM,EAAE,MAAM,EAAE,aAAa,EAAE,IAAI,MAAM,CAAC,cAAc,IAAI,EAAE,EAAE,CAAC;YACpE,IAAK,aAAa,CAAC,UAAU,EAAE,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,EAAa,CAAC,QAAQ,KAAK,MAAM,CAAC,QAAQ,EAAE,CAAC;gBACxF,MAAM,IAAI,WAAW,CACnB,mBAAmB,aAAa,CAAC,UAAU,qCAAqC,EAChF,IAAI,CAAC,WAAW,CAAC,IAAI,CACtB,CAAC;YACJ,CAAC;YACD,MAAM,CAAC,qBAAqB,CAAC,aAAa,EAAE,IAAI,CAAC,CAAC;QACpD,CAAC;QAED,KAAK,MAAM,UAAU,IAAI,MAAM,CAAC,gBAAgB,IAAI,EAAE,EAAE,CAAC;YACvD,MAAM,CAAC,oBAAoB,CAAC,GAAG,MAAM,UAAU,CAAC,wBAAwB,CAAC,kBAAkB,EAAE,EAAE,EAAE;gBAC/F,qBAAqB,EAAE,KAAK;aAC7B,CAAC,CAAC;YACH,IACE,CAAC,oBAAoB;gBACnB,oBAAoB,CAAC,SAAS,EAAE,CAAC,SAAS,EAAiB,CAAC,UAAU,EAAE,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,EAAa;qBAClG,QAAQ,KAAK,MAAM,CAAC,QAAQ,EAC/B,CAAC;gBACD,MAAM,IAAI,WAAW,CACnB,eAAe,UAAU,CAAC,cAAc,qCAAqC,EAC7E,IAAI,CAAC,WAAW,CAAC,IAAI,CACtB,CAAC;YACJ,CAAC;YAED,MAAM,0CAA0C,GAAG,IAAI,0CAA0C,CAC/F,oDAAoD,MAAM,CAAC,UAAU,IAAI,UAAU,CAAC,cAAc,EAAE,EACpG;gBACE,cAAc,EAAE,UAAU,CAAC,cAAc;gBACzC,QAAQ,EAAE,MAAM,CAAC,QAAQ;gBACzB,QAAQ,EAAE,MAAM,CAAC,QAAQ;gBACzB,UAAU,EAAE,MAAM,CAAC,UAAU;aAC9B,EACD,CAAC,oBAAoB,EAAE,eAAe,CAAC,CACxC,CAAC;YACF,MAAM,CAAC,SAAS,CACd,IAAI,mCAAmC,CACrC,uCAAuC,UAAU,CAAC,cAAc,EAAE,EAClE,EAAE,YAAY,EAAE,WAAW,EAAE,cAAc,EAAE,UAAU,CAAC,cAAc,EAAE,UAAU,EAAE,MAAM,CAAC,UAAU,EAAE,EACvG,0CAA0C,CAC3C,CACF,CAAC;YACF,MAAM,CAAC,IAAI,CAAC,0CAA0C,CAAC,CAAC;QAC1D,CAAC;QAED,OAAO,MAAM,CAAC;IAChB,CAAC;IAED;;OAEG;IACM,KAAK,CAAC,gBAAgB,CAAC,MAAmC;QAMjE,MAAM,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC;QAC7B,MAAM,OAAO,GAAG,MAAM,CAAC,UAAU,EAAE,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,EAAa,CAAC;QAEhE,qBAAqB;QACrB,MAAM,CAAC,cAAc,CAAC,GAAG,MAAM,MAAM,CAAC,wBAAwB,CAAC,qBAAqB,EAAE,EAAE,EAAE;YACxF,qBAAqB,EAAE,KAAK;SAC7B,CAAC,CAAC;QACH,MAAM,EAAE,YAAY,EAAE,WAAW,EAAE,YAAY,EAAE,GAAG,cAAc,CAAC,iBAAiB,EAAE,CAAC,UAAU,CAAC;QAElG,OAAO;YACL,YAAY,EAAE,OAAO,CAAC,SAAS;YAC/B,oBAAoB,EAAE,YAAY;YAClC,WAAW;YACX,qBAAqB,EAAE,YAAY;SACpC,CAAC;IACJ,CAAC;CACF,CAAA;AA3HY,qBAAqB;IADjC,MAAM,CAAwB,OAAO,EAAE,2BAA2B,CAAC;GACvD,qBAAqB,CA2HjC"}
+{"version":3,"file":"aws-simple-subnet.module.js","sourceRoot":"","sources":["../../../../src/modules/subnet/aws-simple-subnet/aws-simple-subnet.module.ts"],"names":[],"mappings":";;;;;;AAAA,OAAO,EAAE,OAAO,EAAiC,MAAM,EAAE,WAAW,EAAe,UAAU,EAAE,MAAM,eAAe,CAAC;AACrH,OAAO,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAC3C,OAAO,EAAE,kBAAkB,EAAE,MAAM,mDAAmD,CAAC;AACvF,OAAO,EAAE,qBAAqB,EAAE,MAAM,yDAAyD,CAAC;AAChG,OAAO,EAAE,mCAAmC,EAAE,MAAM,yEAAyE,CAAC;AAC9H,OAAO,EAAE,eAAe,EAAE,MAAM,kDAAkD,CAAC;AACnF,OAAO,EAAE,2BAA2B,EAAE,MAAM,mBAAmB,CAAC;AAChE,OAAO,EAAE,eAAe,EAAE,MAAM,0BAA0B,CAAC;AAC3D,OAAO,EAAE,0CAA0C,EAAE,MAAM,8DAA8D,CAAC;AAE1H;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA0CG;AAEI,IAAM,qBAAqB,GAA3B,MAAM,qBAAsB,SAAQ,OAAqD;IAC9F;;OAEG;IACH,KAAK,CAAC,MAAM,CACV,MAAmC;QAEnC,MAAM,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC;QAC7B,MAAM,EAAE,YAAY,EAAE,oBAAoB,EAAE,WAAW,EAAE,qBAAqB,EAAE,GAC9E,MAAM,IAAI,CAAC,gBAAgB,CAAC,MAAM,CAAC,CAAC;QAEtC,qCAAqC;QACrC,IAAI,CAAC,oBAAoB,CAAC,QAAQ,CAAC,MAAM,CAAC,sBAAsB,CAAC,EAAE,CAAC;YAClE,MAAM,IAAI,WAAW,CAAC,mCAAmC,EAAE,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;QACpF,CAAC;QAED,+BAA+B;QAC/B,IAAI,MAAM,CAAC,aAAa,EAAE,gBAAgB,IAAI,MAAM,CAAC,aAAa,CAAC,UAAU,KAAK,UAAU,CAAC,MAAM,EAAE,CAAC;YACpG,MAAM,IAAI,WAAW,CAAC,qDAAqD,EAAE,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;QACtG,CAAC;QAED,8CAA8C;QAC9C,IAAI,CAAC,QAAQ,CAAC,CAAC,qBAAqB,CAAC,EAAE,CAAC,MAAM,CAAC,eAAe,CAAC,CAAC,EAAE,CAAC;YACjE,MAAM,IAAI,WAAW,CAAC,wCAAwC,EAAE,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;QACzF,CAAC;QAED,uBAAuB;QACvB,MAAM,MAAM,GAAG,IAAI,eAAe,CAAC,MAAM,EAAE,MAAM,CAAC,UAAU,CAAC,CAAC;QAC9D,MAAM,CAAC,gBAAgB,GAAG,MAAM,CAAC,aAAa,EAAE,gBAAgB,IAAI,KAAK,CAAC;QAC1E,MAAM,CAAC,yBAAyB,GAAG,MAAM,CAAC,aAAa,EAAE,yBAAyB,IAAI,KAAK,CAAC;QAC5F,MAAM,CAAC,UAAU,GAAG,MAAM,CAAC,aAAa,EAAE,UAAU,IAAI,UAAU,CAAC,OAAO,CAAC;QAC3E,MAAM,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;QAEzB,eAAe;QACf,MAAM,eAAe,GAAG,IAAI,eAAe,CACzC,iBAAiB,EACjB;YACE,gBAAgB,EAAE,MAAM,CAAC,sBAAsB;YAC/C,YAAY;YACZ,WAAW;YACX,SAAS,EAAE,MAAM,CAAC,eAAe;YACjC,UAAU,EAAE,MAAM,CAAC,UAAU;SAC9B,EACD,MAAM,CACP,CAAC;QACF,MAAM,CAAC,SAAS,CAAC,eAAe,CAAC,CAAC;QAElC,MAAM,MAAM,GAAqE,CAAC,MAAM,CAAC,CAAC;QAE1F,kCAAkC;QAClC,KAAK,MAAM,EAAE,MAAM,EAAE,aAAa,EAAE,IAAI,MAAM,CAAC,cAAc,IAAI,EAAE,EAAE,CAAC;YACpE,IAAK,aAAa,CAAC,UAAU,EAAE,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,EAAa,CAAC,QAAQ,KAAK,MAAM,CAAC,QAAQ,EAAE,CAAC;gBACxF,MAAM,IAAI,WAAW,CACnB,mBAAmB,aAAa,CAAC,UAAU,qCAAqC,EAChF,IAAI,CAAC,WAAW,CAAC,IAAI,CACtB,CAAC;YACJ,CAAC;YACD,MAAM,CAAC,qBAAqB,CAAC,aAAa,EAAE,IAAI,CAAC,CAAC;QACpD,CAAC;QAED,KAAK,MAAM,UAAU,IAAI,MAAM,CAAC,gBAAgB,IAAI,EAAE,EAAE,CAAC;YACvD,MAAM,CAAC,oBAAoB,CAAC,GAAG,MAAM,UAAU,CAAC,wBAAwB,CAAC,kBAAkB,EAAE,EAAE,EAAE;gBAC/F,qBAAqB,EAAE,KAAK;aAC7B,CAAC,CAAC;YACH,IACE,CAAC,oBAAoB;gBACnB,oBAAoB,CAAC,SAAS,EAAE,CAAC,SAAS,EAAiB,CAAC,UAAU,EAAE,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,EAAa;qBAClG,QAAQ,KAAK,MAAM,CAAC,QAAQ,EAC/B,CAAC;gBACD,MAAM,IAAI,WAAW,CACnB,eAAe,UAAU,CAAC,cAAc,qCAAqC,EAC7E,IAAI,CAAC,WAAW,CAAC,IAAI,CACtB,CAAC;YACJ,CAAC;YAED,kGAAkG;YAClG,6EAA6E;YAC7E,MAAM,0CAA0C,GAAG,IAAI,0CAA0C,CAC/F,oDAAoD,MAAM,CAAC,QAAQ,IAAI,UAAU,CAAC,cAAc,EAAE,EAClG;gBACE,cAAc,EAAE,UAAU,CAAC,cAAc;gBACzC,QAAQ,EAAE,MAAM,CAAC,QAAQ;gBACzB,QAAQ,EAAE,MAAM,CAAC,QAAQ;gBACzB,UAAU,EAAE,MAAM,CAAC,UAAU;aAC9B,EACD,CAAC,oBAAoB,EAAE,eAAe,CAAC,CACxC,CAAC;YACF,MAAM,CAAC,SAAS,CACd,IAAI,mCAAmC,CACrC,uCAAuC,UAAU,CAAC,cAAc,EAAE,EAClE,EAAE,YAAY,EAAE,WAAW,EAAE,cAAc,EAAE,UAAU,CAAC,cAAc,EAAE,UAAU,EAAE,MAAM,CAAC,UAAU,EAAE,EACvG,0CAA0C,CAC3C,CACF,CAAC;YACF,MAAM,CAAC,IAAI,CAAC,0CAA0C,CAAC,CAAC;QAC1D,CAAC;QAED,OAAO,MAAM,CAAC;IAChB,CAAC;IAED;;OAEG;IACM,KAAK,CAAC,gBAAgB,CAAC,MAAmC;QAMjE,MAAM,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC;QAC7B,MAAM,OAAO,GAAG,MAAM,CAAC,UAAU,EAAE,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,EAAa,CAAC;QAEhE,qBAAqB;QACrB,MAAM,CAAC,cAAc,CAAC,GAAG,MAAM,MAAM,CAAC,wBAAwB,CAAC,qBAAqB,EAAE,EAAE,EAAE;YACxF,qBAAqB,EAAE,KAAK;SAC7B,CAAC,CAAC;QACH,MAAM,EAAE,YAAY,EAAE,WAAW,EAAE,YAAY,EAAE,GAAG,cAAc,CAAC,iBAAiB,EAAE,CAAC,UAAU,CAAC;QAElG,OAAO;YACL,YAAY,EAAE,OAAO,CAAC,SAAS;YAC/B,oBAAoB,EAAE,YAAY;YAClC,WAAW;YACX,qBAAqB,EAAE,YAAY;SACpC,CAAC;IACJ,CAAC;CACF,CAAA;AA7HY,qBAAqB;IADjC,MAAM,CAAwB,OAAO,EAAE,2BAA2B,CAAC;GACvD,qBAAqB,CA6HjC"}

package/dist/modules/subnet/aws-simple-subnet/models/subnet/actions/add-aws-simple-subnet.model.action.js

@@ -33,17 +33,17 @@ let AddAwsSimpleSubnetModelAction = class AddAwsSimpleSubnetModelAction {
         const subnet = diff.node;
         const { awsAccountId, awsRegionId } = actionInputs.metadata;
         const subnetCidrBlock = actionInputs.inputs.subnetCidrBlock;
-        const [matchingVpcResource] = await subnet.getResourcesMatchingSchema(VpcSchema, [
-            { key: 'awsAccountId', value: awsAccountId },
-            { key: 'awsRegionId', value: awsRegionId },
-        ]);
+        // Get the region's VPC and internet gateway, from the region itself.
+        const region = actionInputs.inputs.region;
+        const [matchingVpcResource] = await region.getResourcesMatchingSchema(VpcSchema, [], [], {
+            searchBoundaryMembers: false,
+        });
         if (!matchingVpcResource) {
             throw new ModelActionExceptionTransactionError(`Vpc in account "${awsAccountId}" and region "${awsRegionId}" not found!`, diff, this.constructor.name);
         }
-        const [matchingInternetGatewayResource] = await subnet.getResourcesMatchingSchema(InternetGatewaySchema, [
-            { key: 'awsAccountId', value: awsAccountId },
-            { key: 'awsRegionId', value: awsRegionId },
-        ]);
+        const [matchingInternetGatewayResource] = await region.getResourcesMatchingSchema(InternetGatewaySchema, [], [], {
+            searchBoundaryMembers: false,
+        });
         if (!matchingInternetGatewayResource) {
             throw new ModelActionExceptionTransactionError(`InternetGateway in account "${awsAccountId}" and region "${awsRegionId}" not found!`, diff, this.constructor.name);
         }
@@ -62,7 +62,7 @@ let AddAwsSimpleSubnetModelAction = class AddAwsSimpleSubnetModelAction {
                 awsAccountId,
                 awsRegionId,
                 ConnectivityType: 'public',
-            }, [matchingVpcResource, matchingInternetGatewayResource, new MatchingResource(subnetSubnet)]);
+            }, [matchingInternetGatewayResource, new MatchingResource(subnetSubnet)]);
         }
         // Create Route Table.
         const subnetRT = new RouteTable(`rt-${subnet.subnetId}`, {

package/dist/modules/subnet/aws-simple-subnet/models/subnet/actions/add-aws-simple-subnet.model.action.js.map

@@ -1 +1 @@
-{"version":3,"file":"add-aws-simple-subnet.model.action.js","sourceRoot":"","sources":["../../../../../../../src/modules/subnet/aws-simple-subnet/models/subnet/actions/add-aws-simple-subnet.model.action.ts"],"names":[],"mappings":";;;;;;AAAA,OAAO,EACL,MAAM,EAGN,UAAU,EAEV,OAAO,EAEP,gBAAgB,EAChB,oCAAoC,EACpC,UAAU,EACV,WAAW,GACZ,MAAM,eAAe,CAAC;AACvB,OAAO,EAAE,qBAAqB,EAAE,MAAM,8DAA8D,CAAC;AACrG,OAAO,EAAE,UAAU,EAAE,MAAM,kDAAkD,CAAC;AAC9E,OAAO,EAAE,UAAU,EAAE,MAAM,kDAAkD,CAAC;AAE9E,OAAO,EAAE,UAAU,EAAE,MAAM,kDAAkD,CAAC;AAC9E,OAAO,EAAE,MAAM,EAAE,MAAM,6CAA6C,CAAC;AACrE,OAAO,EAAE,SAAS,EAAE,MAAM,iDAAiD,CAAC;AAC5E,OAAO,EAAE,iBAAiB,EAAE,MAAM,gEAAgE,CAAC;AAEnG,OAAO,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAC;AAEhE;;GAEG;AAEI,IAAM,6BAA6B,GAAnC,MAAM,6BAA6B;IACxC;;OAEG;IACH,MAAM,CAAC,IAAU;QACf,OAAO,CACL,IAAI,CAAC,MAAM,KAAK,UAAU,CAAC,GAAG;YAC9B,IAAI,CAAC,IAAI,YAAY,eAAe;YACpC,WAAW,CAAC,IAAI,CAAC,IAAI,EAAE,QAAQ,CAAC;YAChC,IAAI,CAAC,KAAK,KAAK,UAAU,CAC1B,CAAC;IACJ,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,MAAM,CACV,IAA2B,EAC3B,YAAyD,EACzD,aAA4B;QAE5B,MAAM,MAAM,GAAG,IAAI,CAAC,IAAI,CAAC;QAEzB,MAAM,EAAE,YAAY,EAAE,WAAW,EAAE,GAAG,YAAY,CAAC,QAAQ,CAAC;QAE5D,MAAM,eAAe,GAAG,YAAY,CAAC,MAAM,CAAC,eAAe,CAAC;QAC5D,MAAM,CAAC,mBAAmB,CAAC,GAAG,MAAM,MAAM,CAAC,0BAA0B,CAAC,SAAS,EAAE;YAC/E,EAAE,GAAG,EAAE,cAAc,EAAE,KAAK,EAAE,YAAY,EAAE;YAC5C,EAAE,GAAG,EAAE,aAAa,EAAE,KAAK,EAAE,WAAW,EAAE;SAC3C,CAAC,CAAC;QACH,IAAI,CAAC,mBAAmB,EAAE,CAAC;YACzB,MAAM,IAAI,oCAAoC,CAC5C,mBAAmB,YAAY,iBAAiB,WAAW,cAAc,EACzE,IAAI,EACJ,IAAI,CAAC,WAAW,CAAC,IAAI,CACtB,CAAC;QACJ,CAAC;QACD,MAAM,CAAC,+BAA+B,CAAC,GAAG,MAAM,MAAM,CAAC,0BAA0B,CAAC,qBAAqB,EAAE;YACvG,EAAE,GAAG,EAAE,cAAc,EAAE,KAAK,EAAE,YAAY,EAAE;YAC5C,EAAE,GAAG,EAAE,aAAa,EAAE,KAAK,EAAE,WAAW,EAAE;SAC3C,CAAC,CAAC;QACH,IAAI,CAAC,+BAA+B,EAAE,CAAC;YACrC,MAAM,IAAI,oCAAoC,CAC5C,+BAA+B,YAAY,iBAAiB,WAAW,cAAc,EACrF,IAAI,EACJ,IAAI,CAAC,WAAW,CAAC,IAAI,CACtB,CAAC;QACJ,CAAC;QAED,iBAAiB;QACjB,MAAM,YAAY,GAAG,IAAI,MAAM,CAC7B,UAAU,MAAM,CAAC,QAAQ,EAAE,EAC3B;YACE,gBAAgB,EAAE,YAAY,CAAC,MAAM,CAAC,sBAAsB;YAC5D,YAAY;YACZ,WAAW;YACX,SAAS,EAAE,eAAe;YAC1B,UAAU,EAAE,MAAM,CAAC,UAAU;SAC9B,EACD,CAAC,mBAAmB,CAAC,CACtB,CAAC;QAEF,sBAAsB;QACtB,IAAI,gBAAwC,CAAC;QAC7C,IAAI,MAAM,CAAC,gBAAgB,EAAE,CAAC;YAC5B,gBAAgB,GAAG,IAAI,UAAU,CAC/B,eAAe,MAAM,CAAC,QAAQ,EAAE,EAChC;gBACE,YAAY;gBACZ,WAAW;gBACX,gBAAgB,EAAE,QAAQ;aAC3B,EACD,CAAC,mBAAmB,EAAE,+BAA+B,EAAE,IAAI,gBAAgB,CAAC,YAAY,CAAC,CAAC,CAC3F,CAAC;QACJ,CAAC;QAED,sBAAsB;QACtB,MAAM,QAAQ,GAAG,IAAI,UAAU,CAC7B,MAAM,MAAM,CAAC,QAAQ,EAAE,EACvB;YACE,4BAA4B,EAAE,MAAM,CAAC,UAAU,KAAK,UAAU,CAAC,MAAM;YACrE,YAAY;YACZ,WAAW;SACZ,EACD,CAAC,mBAAmB,EAAE,+BAA+B,EAAE,IAAI,gBAAgB,CAAC,YAAY,CAAC,CAAC,CAC3F,CAAC;QAEF,8CAA8C;QAC9C,MAAM,iBAAiB,GAA8C,EAAE,CAAC;QACxE,IAAI,MAAM,CAAC,yBAAyB,EAAE,CAAC;YACrC,iBAAiB,CAAC,IAAI,CAAC;gBACrB,SAAS,EAAE,eAAe;gBAC1B,MAAM,EAAE,KAAK;gBACb,SAAS,EAAE,EAAE,IAAI,EAAE,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC,EAAE;gBAC/B,QAAQ,EAAE,IAAI,EAAE,OAAO;gBACvB,UAAU,EAAE,MAAM;gBAClB,UAAU,EAAE,CAAC,CAAC;aACf,CAAC,CAAC;YACH,iBAAiB,CAAC,IAAI,CAAC;gBACrB,SAAS,EAAE,eAAe;gBAC1B,MAAM,EAAE,IAAI;gBACZ,SAAS,EAAE,EAAE,IAAI,EAAE,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC,EAAE;gBAC/B,QAAQ,EAAE,IAAI,EAAE,OAAO;gBACvB,UAAU,EAAE,MAAM;gBAClB,UAAU,EAAE,CAAC,CAAC;aACf,CAAC,CAAC;QACL,CAAC;aAAM,CAAC;YACN,iBAAiB,CAAC,IAAI,CAAC;gBACrB,SAAS,EAAE,eAAe;gBAC1B,MAAM,EAAE,KAAK;gBACb,SAAS,EAAE,EAAE,IAAI,EAAE,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC,EAAE;gBAC/B,QAAQ,EAAE,IAAI,EAAE,OAAO;gBACvB,UAAU,EAAE,OAAO;gBACnB,UAAU,EAAE,CAAC,CAAC;aACf,CAAC,CAAC;YACH,iBAAiB,CAAC,IAAI,CAAC;gBACrB,SAAS,EAAE,eAAe;gBAC1B,MAAM,EAAE,IAAI;gBACZ,SAAS,EAAE,EAAE,IAAI,EAAE,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC,EAAE;gBAC/B,QAAQ,EAAE,IAAI,EAAE,OAAO;gBACvB,UAAU,EAAE,OAAO;gBACnB,UAAU,EAAE,CAAC,CAAC;aACf,CAAC,CAAC;QACL,CAAC;QACD,+CAA+C;QAC/C,IAAI,MAAM,CAAC,UAAU,KAAK,UAAU,CAAC,MAAM,EAAE,CAAC;YAC5C,iBAAiB,CAAC,IAAI,CAAC;gBACrB,SAAS,EAAE,WAAW;gBACtB,MAAM,EAAE,KAAK;gBACb,SAAS,EAAE,EAAE,IAAI,EAAE,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC,EAAE;gBAC/B,QAAQ,EAAE,IAAI,EAAE,OAAO;gBACvB,UAAU,EAAE,OAAO;gBACnB,UAAU,EAAE,CAAC,CAAC;aACf,CAAC,CAAC;YACH,iBAAiB,CAAC,IAAI,CAAC;gBACrB,SAAS,EAAE,WAAW;gBACtB,MAAM,EAAE,IAAI;gBACZ,SAAS,EAAE,EAAE,IAAI,EAAE,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC,EAAE;gBAC/B,QAAQ,EAAE,IAAI,EAAE,OAAO;gBACvB,UAAU,EAAE,OAAO;gBACnB,UAAU,EAAE,CAAC,CAAC;aACf,CAAC,CAAC;QACL,CAAC;aAAM,CAAC;YACN,KAAK,IAAI,CAAC,GAAG,iBAAiB,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;gBACvD,MAAM,KAAK,GAAG,iBAAiB,CAAC,CAAC,CAAC,CAAC;gBACnC,+CAA+C;gBAC/C,IACE,iBAAiB,CAAC,gBAAgB,CAAC,KAAK,EAAE;oBACxC,SAAS,EAAE,WAAW;oBACtB,MAAM,EAAE,KAAK;oBACb,SAAS,EAAE,EAAE,IAAI,EAAE,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC,EAAE;oBAC/B,QAAQ,EAAE,IAAI,EAAE,OAAO;oBACvB,UAAU,EAAE,OAAO;iBACpB,CAAC;oBACF,iBAAiB,CAAC,gBAAgB,CAAC,KAAK,EAAE;wBACxC,SAAS,EAAE,WAAW;wBACtB,MAAM,EAAE,IAAI;wBACZ,SAAS,EAAE,EAAE,IAAI,EAAE,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC,EAAE;wBAC/B,QAAQ,EAAE,IAAI,EAAE,OAAO;wBACvB,UAAU,EAAE,OAAO;qBACpB,CAAC,EACF,CAAC;oBACD,iBAAiB,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;gBACjC,CAAC;YACH,CAAC;QACH,CAAC;QAED,sBAAsB;QACtB,MAAM,UAAU,GAAG,IAAI,UAAU,CAC/B,QAAQ,MAAM,CAAC,QAAQ,EAAE,EACzB;YACE,YAAY;YACZ,WAAW;YACX,OAAO,EAAE,iBAAiB;SAC3B,EACD,CAAC,mBAAmB,EAAE,IAAI,gBAAgB,CAAC,YAAY,CAAC,CAAC,CAC1D,CAAC;QAEF,aAAa,CAAC,YAAY,CAAC,UAAU,CAAC,GAAG,YAAY,CAAC;QAEtD,IAAI,gBAAgB,EAAE,CAAC;YACrB,aAAa,CAAC,gBAAgB,CAAC,UAAU,CAAC,GAAG,gBAAgB,CAAC;QAChE,CAAC;QAED,aAAa,CAAC,QAAQ,CAAC,UAAU,CAAC,GAAG,QAAQ,CAAC;QAE9C,aAAa,CAAC,UAAU,CAAC,UAAU,CAAC,GAAG,UAAU,CAAC;QAElD,OAAO,aAAa,CAAC;IACvB,CAAC;CACF,CAAA;AA9LY,6BAA6B;IADzC,MAAM,CAAC,eAAe,CAAC;GACX,6BAA6B,CA8LzC;;AAED;;GAEG;AAEI,IAAM,oCAAoC,GAA1C,MAAM,oCAAoC;IAG/C;;OAEG;IACH,MAAM,CAAC,KAAK,CAAC,MAAM;QACjB,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC;YACnB,IAAI,CAAC,QAAQ,GAAG,IAAI,6BAA6B,EAAE,CAAC;QACtD,CAAC;QACD,OAAO,IAAI,CAAC,QAAQ,CAAC;IACvB,CAAC;CACF,CAAA;AAZY,oCAAoC;IADhD,OAAO,CAAgC,6BAA6B,CAAC;GACzD,oCAAoC,CAYhD"}
+{"version":3,"file":"add-aws-simple-subnet.model.action.js","sourceRoot":"","sources":["../../../../../../../src/modules/subnet/aws-simple-subnet/models/subnet/actions/add-aws-simple-subnet.model.action.ts"],"names":[],"mappings":"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"}

package/dist/modules/subnet/aws-simple-subnet/overlays/aws-simple-subnet-local-filesystem-mount/actions/add-aws-simple-subnet-local-filesystem-mount.overlay.action.js

@@ -30,19 +30,21 @@ let AddAwsSimpleSubnetLocalFilesystemMountOverlayAction = class AddAwsSimpleSubn
         const subnetLocalFilesystemMountOverlay = diff.node;
         const properties = subnetLocalFilesystemMountOverlay.properties;
         const { awsAccountId, awsRegionId } = actionInputs.metadata;
-        const [matchingEfsResource] = await subnetLocalFilesystemMountOverlay.getResourcesMatchingSchema(EfsSchema, [
-            { key: 'filesystemName', value: properties.filesystemName },
-        ]);
+        // Get the filesystem through the anchor this overlay joins, and the VPC from the subnet's region.
+        const [matchingEfsAnchor] = subnetLocalFilesystemMountOverlay.anchors;
+        const [matchingEfsResource] = await matchingEfsAnchor
+            .getActual()
+            .getParent()
+            .getResourcesMatchingSchema(EfsSchema, [], [], { searchBoundaryMembers: false });
         if (!matchingEfsResource) {
             throw new OverlayActionExceptionTransactionError(`EFS "${properties.filesystemName}" not found!`, diff, this.constructor.name);
         }
         const subnet = actionInputs.resources[`subnet-${properties.subnetId}`];
-        const [matchingVpcResource] = (await subnetLocalFilesystemMountOverlay.getResourcesMatchingSchema(VpcSchema, [
-            { key: 'awsAccountId', value: awsAccountId },
-            { key: 'awsRegionId', value: awsRegionId },
-        ]));
+        const [matchingVpcResource] = await actionInputs.inputs.region.getResourcesMatchingSchema(VpcSchema, [], [], {
+            searchBoundaryMembers: false,
+        });
         // Create EFS Mount Target Security Groups.
-        const efsMountTargetSG = new SecurityGroup(`sec-grp-efs-mount-${properties.regionId}-${properties.subnetName}-${properties.filesystemName}`, {
+        const efsMountTargetSG = new SecurityGroup(`sec-grp-efs-mount-${properties.subnetId}-${properties.filesystemName}`, {
             awsAccountId,
             awsRegionId,
             rules: [
@@ -56,7 +58,7 @@ let AddAwsSimpleSubnetLocalFilesystemMountOverlayAction = class AddAwsSimpleSubn
             ],
         }, [matchingVpcResource]);
         // Create EFS Mount Target.
-        const efsMountTarget = new EfsMountTarget(`efs-mount-${properties.regionId}-${properties.subnetName}-${properties.filesystemName}`, { awsAccountId, awsRegionId }, [matchingEfsResource, new MatchingResource(subnet), new MatchingResource(efsMountTargetSG)]);
+        const efsMountTarget = new EfsMountTarget(`efs-mount-${properties.subnetId}-${properties.filesystemName}`, { awsAccountId, awsRegionId }, [matchingEfsResource, new MatchingResource(subnet), new MatchingResource(efsMountTargetSG)]);
         actionOutputs[efsMountTargetSG.resourceId] = efsMountTargetSG;
         actionOutputs[efsMountTarget.resourceId] = efsMountTarget;
         return actionOutputs;

package/dist/modules/subnet/aws-simple-subnet/overlays/aws-simple-subnet-local-filesystem-mount/actions/add-aws-simple-subnet-local-filesystem-mount.overlay.action.js.map

@@ -1 +1 @@
-{"version":3,"file":"add-aws-simple-subnet-local-filesystem-mount.overlay.action.js","sourceRoot":"","sources":["../../../../../../../src/modules/subnet/aws-simple-subnet/overlays/aws-simple-subnet-local-filesystem-mount/actions/add-aws-simple-subnet-local-filesystem-mount.overlay.action.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"add-aws-simple-subnet-local-filesystem-mount.overlay.action.js","sourceRoot":"","sources":["../../../../../../../src/modules/subnet/aws-simple-subnet/overlays/aws-simple-subnet-local-filesystem-mount/actions/add-aws-simple-subnet-local-filesystem-mount.overlay.action.ts"],"names":[],"mappings":"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"}