@quadnix/octo-aws-cdk 0.2.0 → 0.2.1

package/dist/modules/service/aws-ecs-alb-service/models/service/aws-ecs-alb-service.model.js

@@ -8,7 +8,7 @@ var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
 var AwsEcsAlbService_1;
-import { AModel, Model, Service, Validate } from '@quadnix/octo';
+import { Model, Service, ServiceType, Validate } from '@quadnix/octo';
 import { AwsEcsAlbServiceSchema } from './aws-ecs-alb-service.schema.js';
 /**
  * @internal
@@ -18,41 +18,23 @@ let AwsEcsAlbService = AwsEcsAlbService_1 = class AwsEcsAlbService extends Servi
      * @internal
      */
     constructor(albName, subnets) {
-        super(`${albName}-alb`);
+        super(`${albName}-alb`, subnets, ServiceType.LOAD_BALANCER, 'alb');
         this.albName = albName;
-        for (const subnet of subnets) {
-            subnet.addChild('subnetId', this, 'serviceId');
-        }
     }
     /**
      * @internal
      */
     static async unSynth(service, deReferenceContext) {
-        const subnets = (await Promise.all(service.subnets.map((s) => deReferenceContext(s.context))));
+        const subnets = (await Promise.all(service.parents.map((p) => deReferenceContext(p.context))));
         return new AwsEcsAlbService_1(service.albName, subnets);
     }
-    /**
-     * @internal
-     */
-    setContext() {
-        const parents = this.getParents();
-        const app = parents['app']?.[0]?.to;
-        const subnets = parents['subnet']?.map((d) => d.to) || [];
-        if (!app || subnets.length === 0) {
-            return undefined;
-        }
-        return [`${Service.NODE_NAME}=${this.serviceId}`, ...subnets.map((s) => s.getContext()), app.getContext()].join(',');
-    }
     /**
      * @internal
      */
     synth() {
-        const parents = this.getParents();
-        const subnets = parents['subnet'].map((d) => d.to);
         return {
+            ...super.synth(),
             albName: this.albName,
-            serviceId: this.serviceId,
-            subnets: subnets.map((s) => ({ context: s.getContext() })),
         };
     }
 };

package/dist/modules/service/aws-ecs-alb-service/models/service/aws-ecs-alb-service.model.js.map

@@ -1 +1 @@
-{"version":3,"file":"aws-ecs-alb-service.model.js","sourceRoot":"","sources":["../../../../../../src/modules/service/aws-ecs-alb-service/models/service/aws-ecs-alb-service.model.ts"],"names":[],"mappings":";;;;;;;;;;AAAA,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,EAAe,QAAQ,EAAE,MAAM,eAAe,CAAC;AAC9E,OAAO,EAAE,sBAAsB,EAAE,MAAM,iCAAiC,CAAC;AAEzE;;GAEG;AAEI,IAAM,gBAAgB,wBAAtB,MAAM,gBAAiB,SAAQ,OAAO;IAI3C;;OAEG;IACH,YAAY,OAA0C,EAAE,OAAiB;QACvE,KAAK,CAAC,GAAG,OAAO,MAAM,CAAC,CAAC;QAExB,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;QAEvB,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE,CAAC;YAC7B,MAAM,CAAC,QAAQ,CAAC,UAAU,EAAE,IAAI,EAAE,WAAW,CAAC,CAAC;QACjD,CAAC;IACH,CAAC;IAED;;OAEG;IACH,MAAM,CAAU,KAAK,CAAC,OAAO,CAC3B,OAA+B,EAC/B,kBAAkE;QAElE,MAAM,OAAO,GAAG,CAAC,MAAM,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,kBAAkB,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAa,CAAC;QAC3G,OAAO,IAAI,kBAAgB,CAAC,OAAO,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;IACxD,CAAC;IAED;;OAEG;IACM,UAAU;QACjB,MAAM,OAAO,GAAG,IAAI,CAAC,UAAU,EAAE,CAAC;QAClC,MAAM,GAAG,GAAG,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC;QACpC,MAAM,OAAO,GAAG,OAAO,CAAC,QAAQ,CAAC,EAAE,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAY,CAAC,IAAI,EAAE,CAAC;QACpE,IAAI,CAAC,GAAG,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACjC,OAAO,SAAS,CAAC;QACnB,CAAC;QACD,OAAO,CAAC,GAAG,OAAO,CAAC,SAAS,IAAI,IAAI,CAAC,SAAS,EAAE,EAAE,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,UAAU,EAAE,CAAC,EAAE,GAAG,CAAC,UAAU,EAAE,CAAC,CAAC,IAAI,CAC7G,GAAG,CACJ,CAAC;IACJ,CAAC;IAED;;OAEG;IACM,KAAK;QACZ,MAAM,OAAO,GAAG,IAAI,CAAC,UAAU,EAAE,CAAC;QAClC,MAAM,OAAO,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAY,CAAC,CAAC;QAE7D,OAAO;YACL,OAAO,EAAE,IAAI,CAAC,OAAO;YACrB,SAAS,EAAE,IAAI,CAAC,SAAS;YACzB,OAAO,EAAE,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,OAAO,EAAE,CAAC,CAAC,UAAU,EAAE,EAAE,CAAC,CAAC;SAC3D,CAAC;IACJ,CAAC;CACF,CAAA;AAtDU;IADR,QAAQ,CAAC,EAAE,OAAO,EAAE,EAAE,SAAS,EAAE,EAAE,EAAE,SAAS,EAAE,CAAC,EAAE,KAAK,EAAE,4CAA4C,EAAE,EAAE,CAAC;;iDACnF;AAFd,gBAAgB;IAD5B,KAAK,CAAmB,OAAO,EAAE,SAAS,EAAE,sBAAsB,CAAC;;GACvD,gBAAgB,CAwD5B"}
+{"version":3,"file":"aws-ecs-alb-service.model.js","sourceRoot":"","sources":["../../../../../../src/modules/service/aws-ecs-alb-service/models/service/aws-ecs-alb-service.model.ts"],"names":[],"mappings":";;;;;;;;;;AAAA,OAAO,EAAe,KAAK,EAAE,OAAO,EAAE,WAAW,EAAe,QAAQ,EAAE,MAAM,eAAe,CAAC;AAChG,OAAO,EAAE,sBAAsB,EAAE,MAAM,iCAAiC,CAAC;AAEzE;;GAEG;AAEI,IAAM,gBAAgB,wBAAtB,MAAM,gBAAiB,SAAQ,OAAO;IAI3C;;OAEG;IACH,YAAY,OAA0C,EAAE,OAAiB;QACvE,KAAK,CAAC,GAAG,OAAO,MAAM,EAAE,OAAO,EAAE,WAAW,CAAC,aAAa,EAAE,KAAK,CAAC,CAAC;QAEnE,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;IACzB,CAAC;IAED;;OAEG;IACH,MAAM,CAAU,KAAK,CAAC,OAAO,CAC3B,OAA+B,EAC/B,kBAAkE;QAElE,MAAM,OAAO,GAAG,CAAC,MAAM,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,kBAAkB,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAa,CAAC;QAC3G,OAAO,IAAI,kBAAgB,CAAC,OAAO,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;IACxD,CAAC;IAED;;OAEG;IACM,KAAK;QACZ,OAAO;YACL,GAAG,KAAK,CAAC,KAAK,EAAE;YAChB,OAAO,EAAE,IAAI,CAAC,OAAO;SACtB,CAAC;IACJ,CAAC;CACF,CAAA;AA/BU;IADR,QAAQ,CAAC,EAAE,OAAO,EAAE,EAAE,SAAS,EAAE,EAAE,EAAE,SAAS,EAAE,CAAC,EAAE,KAAK,EAAE,4CAA4C,EAAE,EAAE,CAAC;;iDACnF;AAFd,gBAAgB;IAD5B,KAAK,CAAmB,OAAO,EAAE,SAAS,EAAE,sBAAsB,CAAC;;GACvD,gBAAgB,CAiC5B"}

package/dist/modules/service/aws-ecs-alb-service/models/service/aws-ecs-alb-service.schema.d.ts

@@ -1,8 +1,7 @@
-import { type IModelReference, ServiceSchema } from '@quadnix/octo';
+import { ServiceSchema } from '@quadnix/octo';
 /**
  * @internal
  */
 export declare class AwsEcsAlbServiceSchema extends ServiceSchema {
     albName: string;
-    subnets: IModelReference[];
 }

package/dist/modules/service/aws-ecs-alb-service/models/service/aws-ecs-alb-service.schema.js

@@ -15,7 +15,6 @@ export class AwsEcsAlbServiceSchema extends ServiceSchema {
     constructor() {
         super(...arguments);
         this.albName = Schema();
-        this.subnets = Schema();
     }
 }
 __decorate([

package/dist/modules/service/aws-ecs-alb-service/models/service/aws-ecs-alb-service.schema.js.map

@@ -1 +1 @@
-{"version":3,"file":"aws-ecs-alb-service.schema.js","sourceRoot":"","sources":["../../../../../../src/modules/service/aws-ecs-alb-service/models/service/aws-ecs-alb-service.schema.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAAwB,MAAM,EAAE,aAAa,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AAEtF;;GAEG;AACH,MAAM,OAAO,sBAAuB,SAAQ,aAAa;IAAzD;;QAEE,YAAO,GAAG,MAAM,EAAU,CAAC;QAE3B,YAAO,GAAG,MAAM,EAAqB,CAAC;IACxC,CAAC;CAAA;AAHC;IADC,QAAQ,CAAC,EAAE,OAAO,EAAE,EAAE,SAAS,EAAE,CAAC,EAAE,EAAE,CAAC;;uDACb"}
+{"version":3,"file":"aws-ecs-alb-service.schema.js","sourceRoot":"","sources":["../../../../../../src/modules/service/aws-ecs-alb-service/models/service/aws-ecs-alb-service.schema.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAAE,MAAM,EAAE,aAAa,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AAEhE;;GAEG;AACH,MAAM,OAAO,sBAAuB,SAAQ,aAAa;IAAzD;;QAEE,YAAO,GAAG,MAAM,EAAU,CAAC;IAC7B,CAAC;CAAA;AADC;IADC,QAAQ,CAAC,EAAE,OAAO,EAAE,EAAE,SAAS,EAAE,CAAC,EAAE,EAAE,CAAC;;uDACb"}

package/dist/modules/service/aws-ecs-alb-service/overlays/aws-ecs-alb-service/actions/add-aws-ecs-alb-service.overlay.action.js

@@ -29,15 +29,14 @@ let AddAwsEcsAlbServiceOverlayAction = class AddAwsEcsAlbServiceOverlayAction {
      * @internal
      */
     async handle(diff, actionInputs, actionOutputs) {
-        const albEcsExecutionOverlay = diff.node;
         const { awsAccountId, awsRegionId } = actionInputs.metadata;
-        const [matchingVpcResource] = await albEcsExecutionOverlay.getResourcesMatchingSchema(VpcSchema, [
-            { key: 'awsAccountId', value: awsAccountId },
-            { key: 'awsRegionId', value: awsRegionId },
-        ]);
+        // Get the VPC from the ALB's region.
+        const [matchingVpcResource] = await actionInputs.inputs.region.getResourcesMatchingSchema(VpcSchema, [], [], {
+            searchBoundaryMembers: false,
+        });
         const albTargetGroups = [];
         for (const target of actionInputs.inputs.targets) {
-            const albTargetGroup = new AlbTargetGroup(`alb-target-group-${target.execution.executionId}`, {
+            const albTargetGroup = new AlbTargetGroup(`alb-target-group-${actionInputs.inputs.albName}-${target.execution.executionId}`, {
                 awsAccountId,
                 awsRegionId,
                 healthCheck: target.healthCheck || undefined,
@@ -52,8 +51,8 @@ let AddAwsEcsAlbServiceOverlayAction = class AddAwsEcsAlbServiceOverlayAction {
             albTargetGroups.push(albTargetGroup);
         }
         for (const listener of actionInputs.inputs.listeners) {
-            const alb = actionInputs.resources[`alb-${actionInputs.inputs.region.regionId}-${actionInputs.inputs.albName}`];
-            const albListener = new AlbListener(`alb-listener-${actionInputs.inputs.albName}`, {
+            const alb = actionInputs.resources[`alb-${actionInputs.inputs.albName}`];
+            const albListener = new AlbListener(`alb-listener-${actionInputs.inputs.albName}-${listener.Port}`, {
                 awsAccountId,
                 awsRegionId,
                 DefaultActions: listener.DefaultActions,

package/dist/modules/service/aws-ecs-alb-service/overlays/aws-ecs-alb-service/actions/add-aws-ecs-alb-service.overlay.action.js.map

@@ -1 +1 @@
-{"version":3,"file":"add-aws-ecs-alb-service.overlay.action.js","sourceRoot":"","sources":["../../../../../../../src/modules/service/aws-ecs-alb-service/overlays/aws-ecs-alb-service/actions/add-aws-ecs-alb-service.overlay.action.ts"],"names":[],"mappings":";;;;;;AAAA,OAAO,EACL,MAAM,EAGN,UAAU,EAEV,OAAO,EAEP,gBAAgB,EAChB,sCAAsC,EACtC,WAAW,GACZ,MAAM,eAAe,CAAC;AACvB,OAAO,EAAE,GAAG,EAAE,MAAM,0CAA0C,CAAC;AAC/D,OAAO,EAAE,WAAW,EAAE,MAAM,mDAAmD,CAAC;AAChF,OAAO,EAAE,cAAc,EAAE,MAAM,uDAAuD,CAAC;AAEvF,OAAO,EAAE,UAAU,EAAE,MAAM,kDAAkD,CAAC;AAC9E,OAAO,EAAE,gBAAgB,EAAE,MAAM,yDAAyD,CAAC;AAC3F,OAAO,EAAE,SAAS,EAAE,MAAM,iDAAiD,CAAC;AAE5E,OAAO,EAAE,uBAAuB,EAAE,MAAM,mCAAmC,CAAC;AAE5E;;GAEG;AAEI,IAAM,gCAAgC,GAAtC,MAAM,gCAAgC;IAC3C;;OAEG;IACH,MAAM,CAAC,IAAU;QACf,OAAO,CACL,IAAI,CAAC,MAAM,KAAK,UAAU,CAAC,GAAG;YAC9B,IAAI,CAAC,IAAI,YAAY,uBAAuB;YAC5C,WAAW,CAAC,IAAI,CAAC,IAAI,EAAE,6BAA6B,CAAC;YACrD,IAAI,CAAC,KAAK,KAAK,WAAW,CAC3B,CAAC;IACJ,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,MAAM,CACV,IAAmC,EACnC,YAA0D,EAC1D,aAA4B;QAE5B,MAAM,sBAAsB,GAAG,IAAI,CAAC,IAAI,CAAC;QAEzC,MAAM,EAAE,YAAY,EAAE,WAAW,EAAE,GAAG,YAAY,CAAC,QAAQ,CAAC;QAE5D,MAAM,CAAC,mBAAmB,CAAC,GAAG,MAAM,sBAAsB,CAAC,0BAA0B,CAAC,SAAS,EAAE;YAC/F,EAAE,GAAG,EAAE,cAAc,EAAE,KAAK,EAAE,YAAY,EAAE;YAC5C,EAAE,GAAG,EAAE,aAAa,EAAE,KAAK,EAAE,WAAW,EAAE;SAC3C,CAAC,CAAC;QAEH,MAAM,eAAe,GAAqB,EAAE,CAAC;QAC7C,KAAK,MAAM,MAAM,IAAI,YAAY,CAAC,MAAM,CAAC,OAAQ,EAAE,CAAC;YAClD,MAAM,cAAc,GAAG,IAAI,cAAc,CACvC,oBAAoB,MAAM,CAAC,SAAS,CAAC,WAAW,EAAE,EAClD;gBACE,YAAY;gBACZ,WAAW;gBACX,WAAW,EAAE,MAAM,CAAC,WAAW,IAAI,SAAS;gBAC5C,aAAa,EAAE,MAAM;gBACrB,IAAI,EAAE,MAAM,CAAC,IAAI;gBACjB,IAAI,EAAE,MAAM,CAAC,aAAa;gBAC1B,QAAQ,EAAE,MAAM;gBAChB,eAAe,EAAE,OAAO;gBACxB,UAAU,EAAE,IAAI;aACjB,EACD,CAAC,mBAAmB,CAAC,CACtB,CAAC;YAEF,aAAa,CAAC,cAAc,CAAC,UAAU,CAAC,GAAG,cAAc,CAAC;YAE1D,eAAe,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;QACvC,CAAC;QAED,KAAK,MAAM,QAAQ,IAAI,YAAY,CAAC,MAAM,CAAC,SAAS,EAAE,CAAC;YACrD,MAAM,GAAG,GAAG,YAAY,CAAC,SAAS,CAChC,OAAO,YAAY,CAAC,MAAM,CAAC,MAAM,CAAC,QAAQ,IAAI,YAAY,CAAC,MAAM,CAAC,OAAO,EAAE,CACrE,CAAC;YAET,MAAM,WAAW,GAAG,IAAI,WAAW,CACjC,gBAAgB,YAAY,CAAC,MAAM,CAAC,OAAO,EAAE,EAC7C;gBACE,YAAY;gBACZ,WAAW;gBACX,cAAc,EAAE,QAAQ,CAAC,cAAc;gBACvC,IAAI,EAAE,QAAQ,CAAC,IAAI;gBACnB,QAAQ,EAAE,MAAM;gBAChB,KAAK,EAAE,QAAQ,CAAC,KAAK;aACtB,EACD;gBACE,IAAI,gBAAgB,CAAC,GAAG,CAAC;gBACzB,GAAI,eAAe,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,gBAAgB,CAAC,CAAC,CAAC,CAA8C;aACrG,CACF,CAAC;YAEF,aAAa,CAAC,WAAW,CAAC,UAAU,CAAC,GAAG,WAAW,CAAC;QACtD,CAAC;QAED,KAAK,MAAM,MAAM,IAAI,YAAY,CAAC,MAAM,CAAC,OAAQ,EAAE,CAAC;YAClD,MAAM,CAAC,kBAAkB,CAAC,GAAG,MAAM,MAAM,CAAC,SAAS,CAAC,0BAA0B,CAC5E,gBAAgB,EAChB;gBACE,EAAE,GAAG,EAAE,cAAc,EAAE,KAAK,EAAE,YAAY,EAAE;gBAC5C,EAAE,GAAG,EAAE,aAAa,EAAE,KAAK,EAAE,WAAW,EAAE;aAC3C,EACD,EAAE,EACF;gBACE,qBAAqB,EAAE,KAAK;aAC7B,CACF,CAAC;YACF,IAAI,CAAC,kBAAkB,EAAE,CAAC;gBACxB,MAAM,IAAI,sCAAsC,CAC9C,uCAAuC,MAAM,CAAC,SAAS,CAAC,WAAW,IAAI,EACvE,IAAI,EACJ,IAAI,CAAC,WAAW,CAAC,IAAI,CACtB,CAAC;YACJ,CAAC;YAEA,kBAAkB,CAAC,SAAS,EAAiB,CAAC,iBAAiB,CAC9D,IAAI,gBAAgB,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,UAAU,CAAC,IAAI,KAAK,MAAM,CAAC,IAAI,CAAE,CAAC,EACrF,MAAM,CAAC,aAAa,CACrB,CAAC;YAEF,aAAa,CAAC,kBAAkB,CAAC,SAAS,EAAE,CAAC,UAAU,CAAC,GAAG,kBAAkB,CAAC,SAAS,EAAE,CAAC;QAC5F,CAAC;QAED,OAAO,aAAa,CAAC;IACvB,CAAC;CACF,CAAA;AA3GY,gCAAgC;IAD5C,MAAM,CAAC,uBAAuB,CAAC;GACnB,gCAAgC,CA2G5C;;AAED;;GAEG;AAEI,IAAM,uCAAuC,GAA7C,MAAM,uCAAuC;IAGlD;;OAEG;IACH,MAAM,CAAC,KAAK,CAAC,MAAM;QACjB,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC;YACnB,IAAI,CAAC,QAAQ,GAAG,IAAI,gCAAgC,EAAE,CAAC;QACzD,CAAC;QACD,OAAO,IAAI,CAAC,QAAQ,CAAC;IACvB,CAAC;CACF,CAAA;AAZY,uCAAuC;IADnD,OAAO,CAAmC,gCAAgC,CAAC;GAC/D,uCAAuC,CAYnD"}
+{"version":3,"file":"add-aws-ecs-alb-service.overlay.action.js","sourceRoot":"","sources":["../../../../../../../src/modules/service/aws-ecs-alb-service/overlays/aws-ecs-alb-service/actions/add-aws-ecs-alb-service.overlay.action.ts"],"names":[],"mappings":"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"}

package/dist/modules/service/aws-s3-static-website-service/aws-s3-static-website-service.module.d.ts

@@ -1,4 +1,4 @@
-import { AModule, type App } from '@quadnix/octo';
+import { AModule } from '@quadnix/octo';
 import { AwsS3StaticWebsiteServiceModuleSchema } from './index.schema.js';
 import { AwsS3StaticWebsiteService } from './models/service/index.js';
 /**
@@ -8,32 +8,28 @@ import { AwsS3StaticWebsiteService } from './models/service/index.js';
  * filtering, and transformation capabilities.
  * It manages the deployment of static websites from local directories to S3.
  *
+ * The bucket is public and served over plain HTTP on its S3 website endpoint. It lives in a region
+ * created by `AwsServerlessRegionModule`. To serve files through CloudFront instead, use
+ * `AwsS3StorageServiceModule`, whose bucket is closed and fronted by `AwsCloudFrontServiceModule`.
+ *
  * @example
  * TypeScript
  * ```ts
+ * import { type Region, stub } from '@quadnix/octo';
  * import {
  *   AwsS3StaticWebsiteServiceModule
  * } from '@quadnix/octo-aws-cdk/modules/service/aws-s3-static-website-service';
  *
  * octo.loadModule(AwsS3StaticWebsiteServiceModule, 'my-website-module', {
- *   account: myAccount,
- *   awsRegionId: 'us-east-1',
  *   bucketName: 'my-static-website',
- *   cloudFront: {
- *     aliases: ['www.example.com'],
- *     certificateArn: 'arn:aws:acm:us-east-1:123456789012:certificate/<id>',
- *   },
- *   directoryPath: join(__dirname, 'website'),
+ *   directoryPath: 'website',
  *   filter: (filePath) => !filePath.includes('.DS_Store'),
- *   subDirectoryOrFilePath: 'public',
- *   transform: (filePath) => `public/${filePath}`,
+ *   region: stub<Region>('${{my-region-module.model.region}}'),
  * });
  * ```
  *
  * @group Modules/Service/AwsS3StaticWebsiteService
  *
- * @reference Resources {@link CloudFrontDistributionSchema}
- * @reference Resources {@link CloudFrontInvalidationSchema}
  * @reference Resources {@link S3WebsiteSchema}
  *
  * @see {@link AwsS3StaticWebsiteServiceModuleSchema} for the input schema.
@@ -46,10 +42,9 @@ export declare class AwsS3StaticWebsiteServiceModule extends AModule<AwsS3Static
      */
     onInit(inputs: AwsS3StaticWebsiteServiceModuleSchema): Promise<AwsS3StaticWebsiteService>;
     /**
-     * Resolves the app, account, and region this bucket is created in.
+     * Resolves the account and region this bucket is created in.
      */
     registerMetadata(inputs: AwsS3StaticWebsiteServiceModuleSchema): Promise<{
-        app: App;
         awsAccountId: string;
         awsRegionId: string;
     }>;

package/dist/modules/service/aws-s3-static-website-service/aws-s3-static-website-service.module.js

@@ -4,7 +4,8 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     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 { AModule, Module } from '@quadnix/octo';
+import { AwsServerlessRegionAnchorSchema } from '../../../anchors/aws-region/aws-serverless-region.anchor.schema.js';
 import { AwsS3StaticWebsiteServiceModuleSchema } from './index.schema.js';
 import { AwsS3StaticWebsiteService } from './models/service/index.js';
 /**
@@ -14,32 +15,28 @@ import { AwsS3StaticWebsiteService } from './models/service/index.js';
  * filtering, and transformation capabilities.
  * It manages the deployment of static websites from local directories to S3.
  *
+ * The bucket is public and served over plain HTTP on its S3 website endpoint. It lives in a region
+ * created by `AwsServerlessRegionModule`. To serve files through CloudFront instead, use
+ * `AwsS3StorageServiceModule`, whose bucket is closed and fronted by `AwsCloudFrontServiceModule`.
+ *
  * @example
  * TypeScript
  * ```ts
+ * import { type Region, stub } from '@quadnix/octo';
  * import {
  *   AwsS3StaticWebsiteServiceModule
  * } from '@quadnix/octo-aws-cdk/modules/service/aws-s3-static-website-service';
  *
  * octo.loadModule(AwsS3StaticWebsiteServiceModule, 'my-website-module', {
- *   account: myAccount,
- *   awsRegionId: 'us-east-1',
  *   bucketName: 'my-static-website',
- *   cloudFront: {
- *     aliases: ['www.example.com'],
- *     certificateArn: 'arn:aws:acm:us-east-1:123456789012:certificate/<id>',
- *   },
- *   directoryPath: join(__dirname, 'website'),
+ *   directoryPath: 'website',
  *   filter: (filePath) => !filePath.includes('.DS_Store'),
- *   subDirectoryOrFilePath: 'public',
- *   transform: (filePath) => `public/${filePath}`,
+ *   region: stub<Region>('${{my-region-module.model.region}}'),
  * });
  * ```
  *
  * @group Modules/Service/AwsS3StaticWebsiteService
  *
- * @reference Resources {@link CloudFrontDistributionSchema}
- * @reference Resources {@link CloudFrontInvalidationSchema}
  * @reference Resources {@link S3WebsiteSchema}
  *
  * @see {@link AwsS3StaticWebsiteServiceModuleSchema} for the input schema.
@@ -51,28 +48,26 @@ let AwsS3StaticWebsiteServiceModule = class AwsS3StaticWebsiteServiceModule exte
      * Creates the bucket service, and registers the local directory whose files it serves.
      */
     async onInit(inputs) {
-        const { app } = await this.registerMetadata(inputs);
-        // Validate the distribution can serve the domains it answers on.
-        if (inputs.cloudFront?.aliases?.length && !inputs.cloudFront.certificateArn) {
-            throw new ModuleError('A CloudFront certificate is required to serve an alias!', this.constructor.name);
-        }
         // Create a new s3-website service.
-        const s3StaticWebsiteService = new AwsS3StaticWebsiteService(inputs.bucketName);
-        app.addService(s3StaticWebsiteService);
+        const s3StaticWebsiteService = new AwsS3StaticWebsiteService(inputs.bucketName, inputs.region);
         // Add website source.
         await s3StaticWebsiteService.addSource(inputs.directoryPath, inputs.subDirectoryOrFilePath || undefined, inputs.filter || undefined, inputs.transform || undefined);
         return s3StaticWebsiteService;
     }
     /**
-     * Resolves the app, account, and region this bucket is created in.
+     * Resolves the account and region this bucket is created in.
      */
     async registerMetadata(inputs) {
-        const account = inputs.account;
-        const app = account.getParents()['app'][0].to;
+        const region = inputs.region;
+        const account = region.getParents()['account'][0].to;
+        // Get AWS Region ID.
+        const [matchingAnchor] = await region.getAnchorsMatchingSchema(AwsServerlessRegionAnchorSchema, [], {
+            searchBoundaryMembers: false,
+        });
+        const awsRegionId = matchingAnchor.getSchemaInstance().properties.awsRegionId;
         return {
-            app,
             awsAccountId: account.accountId,
-            awsRegionId: inputs.awsRegionId,
+            awsRegionId,
         };
     }
 };

package/dist/modules/service/aws-s3-static-website-service/aws-s3-static-website-service.module.js.map

@@ -1 +1 @@
-{"version":3,"file":"aws-s3-static-website-service.module.js","sourceRoot":"","sources":["../../../../src/modules/service/aws-s3-static-website-service/aws-s3-static-website-service.module.ts"],"names":[],"mappings":";;;;;;AAAA,OAAO,EAAE,OAAO,EAAY,MAAM,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AACvE,OAAO,EAAE,qCAAqC,EAAE,MAAM,mBAAmB,CAAC;AAC1E,OAAO,EAAE,yBAAyB,EAAE,MAAM,2BAA2B,CAAC;AAEtE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAsCG;AAEI,IAAM,+BAA+B,GAArC,MAAM,+BAAgC,SAAQ,OAGpD;IACC;;OAEG;IACH,KAAK,CAAC,MAAM,CAAC,MAA6C;QACxD,MAAM,EAAE,GAAG,EAAE,GAAG,MAAM,IAAI,CAAC,gBAAgB,CAAC,MAAM,CAAC,CAAC;QAEpD,iEAAiE;QACjE,IAAI,MAAM,CAAC,UAAU,EAAE,OAAO,EAAE,MAAM,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,cAAc,EAAE,CAAC;YAC5E,MAAM,IAAI,WAAW,CAAC,yDAAyD,EAAE,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;QAC1G,CAAC;QAED,mCAAmC;QACnC,MAAM,sBAAsB,GAAG,IAAI,yBAAyB,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;QAChF,GAAG,CAAC,UAAU,CAAC,sBAAsB,CAAC,CAAC;QAEvC,sBAAsB;QACtB,MAAM,sBAAsB,CAAC,SAAS,CACpC,MAAM,CAAC,aAAa,EACpB,MAAM,CAAC,sBAAsB,IAAI,SAAS,EAC1C,MAAM,CAAC,MAAM,IAAI,SAAS,EAC1B,MAAM,CAAC,SAAS,IAAI,SAAS,CAC9B,CAAC;QAEF,OAAO,sBAAsB,CAAC;IAChC,CAAC;IAED;;OAEG;IACM,KAAK,CAAC,gBAAgB,CAC7B,MAA6C;QAE7C,MAAM,OAAO,GAAG,MAAM,CAAC,OAAO,CAAC;QAC/B,MAAM,GAAG,GAAG,OAAO,CAAC,UAAU,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,EAAS,CAAC;QAErD,OAAO;YACL,GAAG;YACH,YAAY,EAAE,OAAO,CAAC,SAAS;YAC/B,WAAW,EAAE,MAAM,CAAC,WAAW;SAChC,CAAC;IACJ,CAAC;CACF,CAAA;AA7CY,+BAA+B;IAD3C,MAAM,CAAkC,OAAO,EAAE,qCAAqC,CAAC;GAC3E,+BAA+B,CA6C3C"}
+{"version":3,"file":"aws-s3-static-website-service.module.js","sourceRoot":"","sources":["../../../../src/modules/service/aws-s3-static-website-service/aws-s3-static-website-service.module.ts"],"names":[],"mappings":";;;;;;AAAA,OAAO,EAAE,OAAO,EAAgB,MAAM,EAAE,MAAM,eAAe,CAAC;AAC9D,OAAO,EAAE,+BAA+B,EAAE,MAAM,oEAAoE,CAAC;AACrH,OAAO,EAAE,qCAAqC,EAAE,MAAM,mBAAmB,CAAC;AAC1E,OAAO,EAAE,yBAAyB,EAAE,MAAM,2BAA2B,CAAC;AAEtE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAkCG;AAEI,IAAM,+BAA+B,GAArC,MAAM,+BAAgC,SAAQ,OAGpD;IACC;;OAEG;IACH,KAAK,CAAC,MAAM,CAAC,MAA6C;QACxD,mCAAmC;QACnC,MAAM,sBAAsB,GAAG,IAAI,yBAAyB,CAAC,MAAM,CAAC,UAAU,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC;QAE/F,sBAAsB;QACtB,MAAM,sBAAsB,CAAC,SAAS,CACpC,MAAM,CAAC,aAAa,EACpB,MAAM,CAAC,sBAAsB,IAAI,SAAS,EAC1C,MAAM,CAAC,MAAM,IAAI,SAAS,EAC1B,MAAM,CAAC,SAAS,IAAI,SAAS,CAC9B,CAAC;QAEF,OAAO,sBAAsB,CAAC;IAChC,CAAC;IAED;;OAEG;IACM,KAAK,CAAC,gBAAgB,CAC7B,MAA6C;QAE7C,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,+BAA+B,EAAE,EAAE,EAAE;YAClG,qBAAqB,EAAE,KAAK;SAC7B,CAAC,CAAC;QACH,MAAM,WAAW,GAAG,cAAc,CAAC,iBAAiB,EAAE,CAAC,UAAU,CAAC,WAAW,CAAC;QAE9E,OAAO;YACL,YAAY,EAAE,OAAO,CAAC,SAAS;YAC/B,WAAW;SACZ,CAAC;IACJ,CAAC;CACF,CAAA;AA1CY,+BAA+B;IAD3C,MAAM,CAAkC,OAAO,EAAE,qCAAqC,CAAC;GAC3E,+BAA+B,CA0C3C"}

package/dist/modules/service/aws-s3-static-website-service/index.schema.d.ts

@@ -1,56 +1,4 @@
-import { type Account } from '@quadnix/octo';
-/**
- * Puts a CloudFront distribution in front of the website bucket.
- *
- * Declaring this closes the bucket: it is no longer reachable on its own, and the distribution
- * becomes the only way in, serving the site over HTTPS from CloudFront's edge locations. It also
- * means a deploy invalidates the edge caches, without which new files would sit behind the old ones
- * for as long as a day.
- *
- * The distribution this builds is one opinion about serving a website out of a bucket. The resource
- * underneath it can do a great deal more - several origins, a routing table over them, policies of
- * its own - and a module wanting that writes its own distribution rather than widening this input.
- *
- * @group Modules/Service/AwsS3StaticWebsiteService
- *
- * @hideconstructor
- */
-export declare class AwsS3StaticWebsiteServiceModuleCloudFrontSchema {
-    /**
-     * The custom domain names the distribution answers on, e.g. `docs.example.com`.
-     * Each one needs a DNS record pointing at the distribution, which this module does not create.
-     * Leaving this empty serves the site on the `*.cloudfront.net` domain CloudFront assigns.
-     */
-    aliases?: string[] | undefined;
-    /**
-     * The ARN of the ACM certificate covering every entry in `aliases`.
-     * CloudFront only reads certificates from `us-east-1`, wherever the bucket itself lives.
-     * Required when `aliases` is set, and pointless without it.
-     */
-    certificateArn?: string | null | undefined;
-    /**
-     * What a visitor gets for a path the bucket has nothing at. The two answers are opposites, and
-     * which one is right is a fact about the site rather than about CloudFront.
-     *
-     * * `error-document` returns a real `404` carrying the site's error document. This is what a
-     * content site wants: a missing page is missing, and a search engine should be told so.
-     * * `single-page-app` returns a `200` carrying the index document, so that the app's own router
-     * decides what the path means. A single-page app needs this, and a content site using it would
-     * report every typo as a working page.
-     */
-    notFoundBehavior?: "error-document" | "single-page-app" | undefined;
-    /**
-     * Which edge locations serve the site, which is what the distribution costs.
-     * `PriceClass_100` is North America and Europe alone and is the cheapest;
-     * `PriceClass_All` serves from everywhere.
-     */
-    priceClass?: "PriceClass_100" | "PriceClass_200" | "PriceClass_All" | undefined;
-    /**
-     * The ARN of a web ACL to put in front of the distribution, or `null` for none.
-     * The ACL is not created here, and CloudFront only reads one from `us-east-1`.
-     */
-    webAclArn?: string | null | undefined;
-}
+import { type Region } from '@quadnix/octo';
 /**
  * `AwsS3StaticWebsiteServiceModuleSchema` is the input schema for the `AwsS3StaticWebsiteServiceModule` module.
  * This schema defines the configuration for S3-based static website services including bucket naming,
@@ -63,27 +11,12 @@ export declare class AwsS3StaticWebsiteServiceModuleCloudFrontSchema {
  * @see {@link AwsS3StaticWebsiteServiceModule} to learn more about the `AwsS3StaticWebsiteServiceModule` module.
  */
 export declare class AwsS3StaticWebsiteServiceModuleSchema {
-    /**
-     * The AWS account that this service will be associated with.
-     * Only AWS account types are supported for this module.
-     */
-    account: Account;
-    /**
-     * The AWS region that this service will be associated with.
-     */
-    awsRegionId: string;
     /**
      * The name of the S3 bucket to create for the static website.
      * This name must be globally unique across all AWS accounts and regions.
      * Must follow S3 bucket naming conventions.
      */
     bucketName: string;
-    /**
-     * Serves the bucket through a CloudFront distribution, and closes the bucket to everything else.
-     * Omitting this serves the bucket directly from its S3 website endpoint, over plain HTTP.
-     * See {@link AwsS3StaticWebsiteServiceModuleCloudFrontSchema} for options.
-     */
-    cloudFront?: AwsS3StaticWebsiteServiceModuleCloudFrontSchema | null | undefined;
     /**
      * The local directory path containing the static website files.
      * This is the source directory that will be synchronized to S3.
@@ -95,6 +28,10 @@ export declare class AwsS3StaticWebsiteServiceModuleSchema {
      * Useful for excluding development files, system files, or temporary files.
      */
     filter?: ((filePath: string) => boolean) | null | undefined;
+    /**
+     * The region the website bucket is created in, as produced by the `AwsServerlessRegionModule` module.
+     */
+    region: Region;
     /**
      * Optional subdirectory or specific file path within the source directory.
      * When specified, only this subdirectory or file will be uploaded instead of the entire directory.,

package/dist/modules/service/aws-s3-static-website-service/index.schema.js

@@ -7,91 +7,8 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
-import { AccountSchema, Schema, Validate } from '@quadnix/octo';
-import { AwsAccountAnchorSchema } from '../../../anchors/aws-account/aws-account.anchor.schema.js';
-/**
- * Puts a CloudFront distribution in front of the website bucket.
- *
- * Declaring this closes the bucket: it is no longer reachable on its own, and the distribution
- * becomes the only way in, serving the site over HTTPS from CloudFront's edge locations. It also
- * means a deploy invalidates the edge caches, without which new files would sit behind the old ones
- * for as long as a day.
- *
- * The distribution this builds is one opinion about serving a website out of a bucket. The resource
- * underneath it can do a great deal more - several origins, a routing table over them, policies of
- * its own - and a module wanting that writes its own distribution rather than widening this input.
- *
- * @group Modules/Service/AwsS3StaticWebsiteService
- *
- * @hideconstructor
- */
-export class AwsS3StaticWebsiteServiceModuleCloudFrontSchema {
-    constructor() {
-        /**
-         * The custom domain names the distribution answers on, e.g. `docs.example.com`.
-         * Each one needs a DNS record pointing at the distribution, which this module does not create.
-         * Leaving this empty serves the site on the `*.cloudfront.net` domain CloudFront assigns.
-         */
-        this.aliases = Schema([]);
-        /**
-         * The ARN of the ACM certificate covering every entry in `aliases`.
-         * CloudFront only reads certificates from `us-east-1`, wherever the bucket itself lives.
-         * Required when `aliases` is set, and pointless without it.
-         */
-        this.certificateArn = Schema(null);
-        /**
-         * What a visitor gets for a path the bucket has nothing at. The two answers are opposites, and
-         * which one is right is a fact about the site rather than about CloudFront.
-         *
-         * * `error-document` returns a real `404` carrying the site's error document. This is what a
-         * content site wants: a missing page is missing, and a search engine should be told so.
-         * * `single-page-app` returns a `200` carrying the index document, so that the app's own router
-         * decides what the path means. A single-page app needs this, and a content site using it would
-         * report every typo as a working page.
-         */
-        this.notFoundBehavior = Schema('error-document');
-        /**
-         * Which edge locations serve the site, which is what the distribution costs.
-         * `PriceClass_100` is North America and Europe alone and is the cheapest;
-         * `PriceClass_All` serves from everywhere.
-         */
-        this.priceClass = Schema('PriceClass_All');
-        /**
-         * The ARN of a web ACL to put in front of the distribution, or `null` for none.
-         * The ACL is not created here, and CloudFront only reads one from `us-east-1`.
-         */
-        this.webAclArn = Schema(null);
-    }
-}
-__decorate([
-    Validate({
-        destruct: (value) => value,
-        options: { minLength: 1 },
-    }),
-    __metadata("design:type", Object)
-], AwsS3StaticWebsiteServiceModuleCloudFrontSchema.prototype, "aliases", void 0);
-__decorate([
-    Validate({
-        destruct: (value) => value ? [value] : [],
-        options: { minLength: 1 },
-    }),
-    __metadata("design:type", Object)
-], AwsS3StaticWebsiteServiceModuleCloudFrontSchema.prototype, "certificateArn", void 0);
-__decorate([
-    Validate({ options: { minLength: 1 } }),
-    __metadata("design:type", Object)
-], AwsS3StaticWebsiteServiceModuleCloudFrontSchema.prototype, "notFoundBehavior", void 0);
-__decorate([
-    Validate({ options: { minLength: 1 } }),
-    __metadata("design:type", Object)
-], AwsS3StaticWebsiteServiceModuleCloudFrontSchema.prototype, "priceClass", void 0);
-__decorate([
-    Validate({
-        destruct: (value) => (value ? [value] : []),
-        options: { minLength: 1 },
-    }),
-    __metadata("design:type", Object)
-], AwsS3StaticWebsiteServiceModuleCloudFrontSchema.prototype, "webAclArn", void 0);
+import { RegionSchema, Schema, Validate } from '@quadnix/octo';
+import { AwsServerlessRegionAnchorSchema } from '../../../anchors/aws-region/aws-serverless-region.anchor.schema.js';
 /**
  * `AwsS3StaticWebsiteServiceModuleSchema` is the input schema for the `AwsS3StaticWebsiteServiceModule` module.
  * This schema defines the configuration for S3-based static website services including bucket naming,
@@ -105,27 +22,12 @@ __decorate([
  */
 export class AwsS3StaticWebsiteServiceModuleSchema {
     constructor() {
-        /**
-         * The AWS account that this service will be associated with.
-         * Only AWS account types are supported for this module.
-         */
-        this.account = Schema();
-        /**
-         * The AWS region that this service will be associated with.
-         */
-        this.awsRegionId = Schema();
         /**
          * The name of the S3 bucket to create for the static website.
          * This name must be globally unique across all AWS accounts and regions.
          * Must follow S3 bucket naming conventions.
          */
         this.bucketName = Schema();
-        /**
-         * Serves the bucket through a CloudFront distribution, and closes the bucket to everything else.
-         * Omitting this serves the bucket directly from its S3 website endpoint, over plain HTTP.
-         * See {@link AwsS3StaticWebsiteServiceModuleCloudFrontSchema} for options.
-         */
-        this.cloudFront = Schema(null);
         /**
          * The local directory path containing the static website files.
          * This is the source directory that will be synchronized to S3.
@@ -137,6 +39,10 @@ export class AwsS3StaticWebsiteServiceModuleSchema {
          * Useful for excluding development files, system files, or temporary files.
          */
         this.filter = Schema(null);
+        /**
+         * The region the website bucket is created in, as produced by the `AwsServerlessRegionModule` module.
+         */
+        this.region = Schema();
         /**
          * Optional subdirectory or specific file path within the source directory.
          * When specified, only this subdirectory or file will be uploaded instead of the entire directory.,
@@ -154,37 +60,10 @@ export class AwsS3StaticWebsiteServiceModuleSchema {
         this.transform = Schema(null);
     }
 }
-__decorate([
-    Validate([
-        {
-            options: {
-                isModel: { anchors: [{ schema: AwsAccountAnchorSchema }], NODE_NAME: 'account' },
-            },
-        },
-        {
-            destruct: (value) => [value.synth()],
-            options: {
-                isSchema: { schema: AccountSchema },
-            },
-        },
-    ]),
-    __metadata("design:type", Object)
-], AwsS3StaticWebsiteServiceModuleSchema.prototype, "account", void 0);
-__decorate([
-    Validate({ options: { minLength: 1 } }),
-    __metadata("design:type", Object)
-], AwsS3StaticWebsiteServiceModuleSchema.prototype, "awsRegionId", void 0);
 __decorate([
     Validate({ options: { minLength: 1 } }),
     __metadata("design:type", Object)
 ], AwsS3StaticWebsiteServiceModuleSchema.prototype, "bucketName", void 0);
-__decorate([
-    Validate({
-        destruct: (value) => (value ? [value] : []),
-        options: { isSchema: { schema: AwsS3StaticWebsiteServiceModuleCloudFrontSchema } },
-    }),
-    __metadata("design:type", Object)
-], AwsS3StaticWebsiteServiceModuleSchema.prototype, "cloudFront", void 0);
 __decorate([
     Validate({ options: { minLength: 1 } }),
     __metadata("design:type", Object)
@@ -204,6 +83,20 @@ __decorate([
     }),
     __metadata("design:type", Object)
 ], AwsS3StaticWebsiteServiceModuleSchema.prototype, "filter", void 0);
+__decorate([
+    Validate([
+        {
+            options: {
+                isModel: { anchors: [{ schema: AwsServerlessRegionAnchorSchema }], NODE_NAME: 'region' },
+            },
+        },
+        {
+            destruct: (value) => [value.synth()],
+            options: { isSchema: { schema: RegionSchema } },
+        },
+    ]),
+    __metadata("design:type", Object)
+], AwsS3StaticWebsiteServiceModuleSchema.prototype, "region", void 0);
 __decorate([
     Validate({
         destruct: (value) => {

package/dist/modules/service/aws-s3-static-website-service/index.schema.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.schema.js","sourceRoot":"","sources":["../../../../src/modules/service/aws-s3-static-website-service/index.schema.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.schema.js","sourceRoot":"","sources":["../../../../src/modules/service/aws-s3-static-website-service/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;;;;;;;;;;GAUG;AACH,MAAM,OAAO,qCAAqC;IAAlD;QACE;;;;WAIG;QAEH,eAAU,GAAG,MAAM,EAAU,CAAC;QAE9B;;;WAGG;QAEH,kBAAa,GAAG,MAAM,EAAU,CAAC;QAEjC;;;;WAIG;QAaH,WAAM,GAAI,MAAM,CAAyC,IAAI,CAAC,CAAC;QAE/D;;WAEG;QAYH,WAAM,GAAG,MAAM,EAAU,CAAC;QAE1B;;;;;;;WAOG;QAWH,2BAAsB,GAAI,MAAM,CAAgB,IAAI,CAAC,CAAC;QAEtD;;;;WAIG;QAaH,cAAS,GAAI,MAAM,CAAwC,IAAI,CAAC,CAAC;IACnE,CAAC;CAAA;AAlFC;IADC,QAAQ,CAAC,EAAE,OAAO,EAAE,EAAE,SAAS,EAAE,CAAC,EAAE,EAAE,CAAC;;yEACV;AAO9B;IADC,QAAQ,CAAC,EAAE,OAAO,EAAE,EAAE,SAAS,EAAE,CAAC,EAAE,EAAE,CAAC;;4EACP;AAmBjC;IAZC,QAAQ,CAAC;QACR,QAAQ,EAAE,CAAC,KAAsD,EAAqC,EAAE;YACtG,MAAM,QAAQ,GAAsC,EAAE,CAAC;YACvD,IAAI,KAAK,EAAE,CAAC;gBACV,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;YACvB,CAAC;YACD,OAAO,QAAQ,CAAC;QAClB,CAAC;QACD,OAAO,EAAE;YACP,MAAM,EAAE,CAAC,KAAwC,EAAW,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,OAAO,CAAC,KAAK,UAAU,CAAC;SAC3G;KACF,CAAC;;qEAC6D;AAgB/D;IAXC,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,KAAsD,EAAkB,EAAE,CAAC,CAAC,KAAK,CAAC,KAAK,EAAE,CAAC;YACrG,OAAO,EAAE,EAAE,QAAQ,EAAE,EAAE,MAAM,EAAE,YAAY,EAAE,EAAE;SAChD;KACF,CAAC;;qEACwB;AAoB1B;IAVC,QAAQ,CAAC;QACR,QAAQ,EAAE,CAAC,KAAsE,EAAY,EAAE;YAC7F,MAAM,QAAQ,GAAa,EAAE,CAAC;YAC9B,IAAI,KAAK,EAAE,CAAC;gBACV,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;YACvB,CAAC;YACD,OAAO,QAAQ,CAAC;QAClB,CAAC;QACD,OAAO,EAAE,EAAE,SAAS,EAAE,CAAC,EAAE;KAC1B,CAAC;;qFACoD;AAmBtD;IAZC,QAAQ,CAAC;QACR,QAAQ,EAAE,CAAC,KAAyD,EAAoC,EAAE;YACxG,MAAM,QAAQ,GAAqC,EAAE,CAAC;YACtD,IAAI,KAAK,EAAE,CAAC;gBACV,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;YACvB,CAAC;YACD,OAAO,QAAQ,CAAC;QAClB,CAAC;QACD,OAAO,EAAE;YACP,MAAM,EAAE,CAAC,KAAuC,EAAW,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,OAAO,CAAC,KAAK,UAAU,CAAC;SAC1G;KACF,CAAC;;wEAC+D"}