npm - @quadnix/octo-aws-cdk - Versions diffs - 0.1.0 → 0.2.0 - Mend

@quadnix/octo-aws-cdk 0.1.0 → 0.2.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (49) hide show

package/dist/factories/aws-client.factory.d.ts CHANGED Viewed

@@ -1,3 +1,4 @@
+import { CloudFrontClient } from '@aws-sdk/client-cloudfront';
 import { ECRClient } from '@aws-sdk/client-ecr';
 import type { AwsCredentialIdentity, AwsCredentialIdentityProvider } from '@smithy/types';
 /**
@@ -10,6 +11,9 @@ export type AwsClientCredentials = AwsCredentialIdentity | AwsCredentialIdentity
 /**
  * Serves the AWS SDK clients an external resource action needs, one per account and region.
  *
+ * A global service - one whose endpoint is not a region a caller picks - overrides `create()` to
+ * supply the region itself, so its callers name the account alone.
+ *
  * A resource terraform manages needs no client - the provider talks to AWS. Only an external
  * resource, whose lifecycle octo drives itself, resolves one of these, and it must authenticate as
  * the account that owns the resource rather than as whoever the ambient credential chain happens to
@@ -59,4 +63,28 @@ export declare class ECRClientFactory extends AwsClientFactory {
      */
     static createInstance(awsRegionId: string, credentials: AwsClientCredentials, endpoint?: string): ECRClient;
 }
+/**
+ * CloudFront is one global service with one endpoint, so a caller names the account and nothing
+ * else. The region a global service is reached at is a fact about that service rather than
+ * something a caller chooses, so the factory supplies it - which is also what keeps the cache
+ * keyed the same way as every other client's.
+ *
+ * @internal
+ */
+export declare class CloudFrontClientFactory extends AwsClientFactory {
+    protected static readonly serviceName: string;
+    /**
+     * The region every CloudFront call is made to, whichever region the origins behind a distribution
+     * live in.
+     */
+    private static readonly awsRegionId;
+    /**
+     * @internal
+     */
+    static create(awsAccountId: string): Promise<CloudFrontClient>;
+    /**
+     * @internal
+     */
+    static createInstance(awsRegionId: string, credentials: AwsClientCredentials, endpoint?: string): CloudFrontClient;
+}
 export {};

package/dist/factories/aws-client.factory.js CHANGED Viewed

@@ -4,11 +4,15 @@ 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 { CloudFrontClient } from '@aws-sdk/client-cloudfront';
 import { ECRClient } from '@aws-sdk/client-ecr';
 import { Container, ContainerResolutionError, Factory } from '@quadnix/octo';
 /**
  * Serves the AWS SDK clients an external resource action needs, one per account and region.
  *
+ * A global service - one whose endpoint is not a region a caller picks - overrides `create()` to
+ * supply the region itself, so its callers name the account alone.
+ *
  * A resource terraform manages needs no client - the provider talks to AWS. Only an external
  * resource, whose lifecycle octo drives itself, resolves one of these, and it must authenticate as
  * the account that owns the resource rather than as whoever the ambient credential chain happens to
@@ -99,4 +103,36 @@ ECRClientFactory = __decorate([
     Factory(ECRClient, { metadata: { package: '@octo' } })
 ], ECRClientFactory);
 export { ECRClientFactory };
+/**
+ * CloudFront is one global service with one endpoint, so a caller names the account and nothing
+ * else. The region a global service is reached at is a fact about that service rather than
+ * something a caller chooses, so the factory supplies it - which is also what keeps the cache
+ * keyed the same way as every other client's.
+ *
+ * @internal
+ */
+let CloudFrontClientFactory = class CloudFrontClientFactory extends AwsClientFactory {
+    static { this.serviceName = 'cloudfront'; }
+    /**
+     * The region every CloudFront call is made to, whichever region the origins behind a distribution
+     * live in.
+     */
+    static { this.awsRegionId = 'us-east-1'; }
+    /**
+     * @internal
+     */
+    static async create(awsAccountId) {
+        return super.create(awsAccountId, this.awsRegionId);
+    }
+    /**
+     * @internal
+     */
+    static createInstance(awsRegionId, credentials, endpoint) {
+        return new CloudFrontClient({ credentials, endpoint, region: awsRegionId });
+    }
+};
+CloudFrontClientFactory = __decorate([
+    Factory(CloudFrontClient, { metadata: { package: '@octo' } })
+], CloudFrontClientFactory);
+export { CloudFrontClientFactory };
 //# sourceMappingURL=aws-client.factory.js.map

package/dist/factories/aws-client.factory.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"aws-client.factory.js","sourceRoot":"","sources":["../../src/factories/aws-client.factory.ts"],"names":[],"mappings":";;;;;;AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAChD,OAAO,EAAE,SAAS,EAAE,wBAAwB,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AAW7E~~;;;;;;;;;;;;GAYG~~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"}
1	+ {"version":3,"file":"aws-client.factory.js","sourceRoot":"","sources":["../../src/factories/aws-client.factory.ts"],"names":[],"mappings":"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"}

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

@@ -19,6 +19,10 @@ import { AwsS3StaticWebsiteService } from './models/service/index.js';
  *   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'),
  *   filter: (filePath) => !filePath.includes('.DS_Store'),
  *   subDirectoryOrFilePath: 'public',
@@ -28,6 +32,8 @@ import { AwsS3StaticWebsiteService } from './models/service/index.js';
  *
  * @group Modules/Service/AwsS3StaticWebsiteService
  *
+ * @reference Resources {@link CloudFrontDistributionSchema}
+ * @reference Resources {@link CloudFrontInvalidationSchema}
  * @reference Resources {@link S3WebsiteSchema}
  *
  * @see {@link AwsS3StaticWebsiteServiceModuleSchema} for the input schema.

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

@@ -4,7 +4,7 @@ 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 } from '@quadnix/octo';
+import { AModule, Module, ModuleError } from '@quadnix/octo';
 import { AwsS3StaticWebsiteServiceModuleSchema } from './index.schema.js';
 import { AwsS3StaticWebsiteService } from './models/service/index.js';
 /**
@@ -25,6 +25,10 @@ import { AwsS3StaticWebsiteService } from './models/service/index.js';
  *   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'),
  *   filter: (filePath) => !filePath.includes('.DS_Store'),
  *   subDirectoryOrFilePath: 'public',
@@ -34,6 +38,8 @@ import { AwsS3StaticWebsiteService } from './models/service/index.js';
  *
  * @group Modules/Service/AwsS3StaticWebsiteService
  *
+ * @reference Resources {@link CloudFrontDistributionSchema}
+ * @reference Resources {@link CloudFrontInvalidationSchema}
  * @reference Resources {@link S3WebsiteSchema}
  *
  * @see {@link AwsS3StaticWebsiteServiceModuleSchema} for the input schema.
@@ -46,6 +52,10 @@ let AwsS3StaticWebsiteServiceModule = class AwsS3StaticWebsiteServiceModule exte
      */
     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);

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

	@@ -1 +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,MAAM,eAAe,CAAC;~~AAC1D~~,OAAO,EAAE,qCAAqC,EAAE,MAAM,mBAAmB,CAAC;AAC1E,OAAO,EAAE,yBAAyB,EAAE,MAAM,2BAA2B,CAAC;AAEtE~~;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAgCG~~;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,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;~~AAxCY~~,+BAA+B;IAD3C,MAAM,CAAkC,OAAO,EAAE,qCAAqC,CAAC;GAC3E,+BAA+B,~~CAwC3C~~"}
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"}

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

@@ -1,4 +1,56 @@
 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;
+}
 /**
  * `AwsS3StaticWebsiteServiceModuleSchema` is the input schema for the `AwsS3StaticWebsiteServiceModule` module.
  * This schema defines the configuration for S3-based static website services including bucket naming,
@@ -26,6 +78,12 @@ export declare class AwsS3StaticWebsiteServiceModuleSchema {
      * 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.

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

@@ -9,6 +9,89 @@ var __metadata = (this && this.__metadata) || function (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);
 /**
  * `AwsS3StaticWebsiteServiceModuleSchema` is the input schema for the `AwsS3StaticWebsiteServiceModule` module.
  * This schema defines the configuration for S3-based static website services including bucket naming,
@@ -37,6 +120,12 @@ export class AwsS3StaticWebsiteServiceModuleSchema {
          * 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.
@@ -89,6 +178,13 @@ __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)

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

	@@ -1 +1 @@
1	- {"version":3,"file":"index.schema.js","sourceRoot":"","sources":["../../../../src/modules/service/aws-s3-static-website-service/index.schema.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAAgB,aAAa,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AAC9E,OAAO,EAAE,sBAAsB,EAAE,MAAM,2DAA2D,CAAC;AAEnG;;;;;;;;;;GAUG;AACH,MAAM,OAAO,qCAAqC;IAAlD;QACE;;;WAGG;QAcH,YAAO,GAAG,MAAM,EAAW,CAAC;QAE5B;;WAEG;QAEH,gBAAW,GAAG,MAAM,EAAU,CAAC;QAE/B;;;;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;;;;;;;WAOG;QAWH,2BAAsB,GAAI,MAAM,CAAgB,IAAI,CAAC,CAAC;QAEtD;;;;WAIG;QAaH,cAAS,GAAI,MAAM,CAAwC,IAAI,CAAC,CAAC;IACnE,CAAC;CAAA;~~AAhFC~~;IAbC,QAAQ,CAAC;QACR;YACE,OAAO,EAAE;gBACP,OAAO,EAAE,EAAE,OAAO,EAAE,CAAC,EAAE,MAAM,EAAE,sBAAsB,EAAE,CAAC,EAAE,SAAS,EAAE,SAAS,EAAE;aACjF;SACF;QACD;YACE,QAAQ,EAAE,CAAC,KAAuD,EAAmB,EAAE,CAAC,CAAC,KAAK,CAAC,KAAK,EAAE,CAAC;YACvG,OAAO,EAAE;gBACP,QAAQ,EAAE,EAAE,MAAM,EAAE,aAAa,EAAE;aACpC;SACF;KACF,CAAC;;sEAC0B;AAM5B;IADC,QAAQ,CAAC,EAAE,OAAO,EAAE,EAAE,SAAS,EAAE,CAAC,EAAE,EAAE,CAAC;;0EACT;AAQ/B;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;AAoB/D;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"}
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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"}

package/dist/modules/service/aws-s3-static-website-service/models/service/actions/add-aws-s3-static-website-service.model.action.js CHANGED Viewed

@@ -4,7 +4,9 @@ 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 { Action, DiffAction, Factory, hasNodeName, } from '@quadnix/octo';
+import { Action, DiffAction, Factory, MatchingResource, hasNodeName, } from '@quadnix/octo';
+import { CloudFrontDistribution } from '../../../../../../resources/cloudfront-distribution/index.js';
+import { CloudFrontInvalidation } from '../../../../../../resources/cloudfront-invalidation/index.js';
 import { S3Website } from '../../../../../../resources/s3-website/index.js';
 import { AwsS3StaticWebsiteService } from '../aws-s3-static-website-service.model.js';
 /**
@@ -26,15 +28,98 @@ let AddAwsS3StaticWebsiteServiceModelAction = class AddAwsS3StaticWebsiteService
     async handle(diff, actionInputs, actionOutputs) {
         const { bucketName } = diff.node;
         const { awsAccountId, awsRegionId } = actionInputs.metadata;
+        const { cloudFront } = actionInputs.inputs;
+        const errorDocument = 'error.html';
+        const indexDocument = 'index.html';
+        const sanitizedBucketName = bucketName.replace(/[^\w-]/g, '-');
         // Create S3 Website.
-        const s3Website = new S3Website(`bucket-${bucketName.replace(/[^\w-]/g, '-')}`, {
+        const s3Website = new S3Website(`bucket-${sanitizedBucketName}`, {
             awsAccountId,
             awsRegionId,
             Bucket: bucketName,
-            ErrorDocument: 'error.html',
-            IndexDocument: 'index.html',
+            // Filled in by the grant below, which is also what closes the bucket.
+            distributionResourceIds: [],
+            ErrorDocument: errorDocument,
+            IndexDocument: indexDocument,
         });
         actionOutputs[s3Website.resourceId] = s3Website;
+        if (!cloudFront) {
+            return actionOutputs;
+        }
+        const originId = `${sanitizedBucketName}-origin`;
+        // Create CloudFront Distribution. This is one website-shaped setup out of what the resource can
+        // express: a single private bucket, everything cached the same way, and misses answered
+        // according to whether the site routes on the client or on the server.
+        const cloudFrontDistribution = new CloudFrontDistribution(`cloudfront-${sanitizedBucketName}`, {
+            aliases: [...(cloudFront.aliases || [])],
+            awsAccountId,
+            behaviors: [
+                {
+                    allowedMethods: ['GET', 'HEAD'],
+                    cachedMethods: ['GET', 'HEAD'],
+                    cachePolicy: { kind: 'managed', name: 'Managed-CachingOptimized' },
+                    compress: true,
+                    functionAssociations: [],
+                    originRequestPolicy: null,
+                    pathPattern: null,
+                    responseHeadersPolicy: null,
+                    targetOriginId: originId,
+                    viewerProtocolPolicy: 'redirect-to-https',
+                },
+            ],
+            cachePolicies: [],
+            comment: cloudFront.aliases?.[0] || bucketName,
+            customErrorResponses: [403, 404].map((errorCode) => cloudFront.notFoundBehavior === 'single-page-app'
+                ? {
+                    // A short TTL, because what is missing today is the app's next route tomorrow.
+                    errorCachingMinTtl: 10,
+                    errorCode,
+                    responseCode: 200,
+                    responsePagePath: `/${indexDocument}`,
+                }
+                : { errorCachingMinTtl: 10, errorCode, responseCode: 404, responsePagePath: `/${errorDocument}` }),
+            defaultRootObject: indexDocument,
+            distributionName: sanitizedBucketName,
+            enabled: true,
+            geoRestriction: { kind: 'none' },
+            httpVersion: 'http2and3',
+            isIpv6Enabled: true,
+            logging: null,
+            originGroups: [],
+            originRequestPolicies: [],
+            origins: [
+                {
+                    connectionAttempts: 3,
+                    connectionTimeout: 10,
+                    customHeaders: {},
+                    kind: { bucketName, bucketRegion: awsRegionId, kind: 's3' },
+                    originId,
+                    originPath: '',
+                },
+            ],
+            priceClass: cloudFront.priceClass || 'PriceClass_All',
+            responseHeadersPolicies: [],
+            viewerCertificate: cloudFront.certificateArn
+                ? {
+                    certificateArn: cloudFront.certificateArn,
+                    kind: 'acm',
+                    // eslint-disable-next-line spellcheck/spell-checker
+                    minimumProtocolVersion: 'TLSv1.2_2021',
+                }
+                : { kind: 'default' },
+            webAclArn: cloudFront.webAclArn || null,
+        });
+        actionOutputs[cloudFrontDistribution.resourceId] = cloudFrontDistribution;
+        // Admit the distribution to the bucket. The grant lives on the bucket, in the one policy the
+        // bucket owns, so a second distribution in front of the same bucket would add a statement rather
+        // than overwrite this one. It also closes the bucket: a bucket with a distribution in front of it
+        // publishes nothing of its own.
+        const matchingCloudFrontDistribution = new MatchingResource(cloudFrontDistribution);
+        s3Website.addCloudFrontAccess(matchingCloudFrontDistribution);
+        // Drop what the edges are holding whenever the published files change. The version is a
+        // placeholder until the source paths are read, which happens in the same transaction.
+        const cloudFrontInvalidation = new CloudFrontInvalidation(`cloudfront-invalidation-${sanitizedBucketName}`, { awsAccountId, contentVersion: 'initial', paths: ['/*'] }, [matchingCloudFrontDistribution]);
+        actionOutputs[cloudFrontInvalidation.resourceId] = cloudFrontInvalidation;
         return actionOutputs;
     }
 };

package/dist/modules/service/aws-s3-static-website-service/models/service/actions/add-aws-s3-static-website-service.model.action.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"add-aws-s3-static-website-service.model.action.js","sourceRoot":"","sources":["../../../../../../../src/modules/service/aws-s3-static-website-service/models/service/actions/add-aws-s3-static-website-service.model.action.ts"],"names":[],"mappings":";;;;;;AAAA,OAAO,EACL,MAAM,EAGN,UAAU,EAEV,OAAO,EAEP,WAAW,GACZ,MAAM,eAAe,CAAC;AACvB,OAAO,EAAE,SAAS,EAAE,MAAM,iDAAiD,CAAC;AAE5E,OAAO,EAAE,yBAAyB,EAAE,MAAM,2CAA2C,CAAC;AAEtF;;GAEG;AAEI,IAAM,uCAAuC,GAA7C,MAAM,uCAAuC;IAClD;;OAEG;IACH,MAAM,CAAC,IAAU;QACf,OAAO,CACL,IAAI,CAAC,MAAM,KAAK,UAAU,CAAC,GAAG;YAC9B,IAAI,CAAC,IAAI,YAAY,yBAAyB;YAC9C,WAAW,CAAC,IAAI,CAAC,IAAI,EAAE,SAAS,CAAC;YACjC,IAAI,CAAC,KAAK,KAAK,WAAW,CAC3B,CAAC;IACJ,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,MAAM,CACV,IAAqC,EACrC,YAAmE,EACnE,aAA4B;QAE5B,MAAM,EAAE,UAAU,EAAE,GAAG,IAAI,CAAC,IAAI,CAAC;QAEjC,MAAM,EAAE,YAAY,EAAE,WAAW,EAAE,GAAG,YAAY,CAAC,QAAQ,CAAC;~~QAE5D~~,qBAAqB;QACrB,MAAM,SAAS,GAAG,IAAI,SAAS,CAAC,UAAU,UAAU,CAAC,~~OAAO~~,CAAC,SAAS,EAAE,GAAG,CAAC,EAAE,EAAE;~~YAC9E~~,YAAY;YACZ,~~WAAW~~;~~YACX~~,MAAM,EAAE,UAAU;~~YAClB~~,aAAa,EAAE,YAAY;~~YAC3B~~,aAAa,EAAE,YAAY;~~SAC5B~~,CAAC,CAAC;QAEH,aAAa,CAAC,~~SAAS~~,CAAC,UAAU,CAAC,GAAG,SAAS,CAAC;~~QAEhD~~,OAAO,aAAa,CAAC;IACvB,CAAC;CACF,CAAA;~~AAtCY~~,uCAAuC;IADnD,MAAM,CAAC,yBAAyB,CAAC;GACrB,uCAAuC,~~CAsCnD~~;;AAED;;GAEG;AAEI,IAAM,8CAA8C,GAApD,MAAM,8CAA8C;IAGzD;;OAEG;IACH,MAAM,CAAC,KAAK,CAAC,MAAM;QACjB,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC;YACnB,IAAI,CAAC,QAAQ,GAAG,IAAI,uCAAuC,EAAE,CAAC;QAChE,CAAC;QACD,OAAO,IAAI,CAAC,QAAQ,CAAC;IACvB,CAAC;CACF,CAAA;AAZY,8CAA8C;IAD1D,OAAO,CAA0C,uCAAuC,CAAC;GAC7E,8CAA8C,CAY1D"}
1	+ {"version":3,"file":"add-aws-s3-static-website-service.model.action.js","sourceRoot":"","sources":["../../../../../../../src/modules/service/aws-s3-static-website-service/models/service/actions/add-aws-s3-static-website-service.model.action.ts"],"names":[],"mappings":";;;;;;AAAA,OAAO,EACL,MAAM,EAGN,UAAU,EAEV,OAAO,EAEP,gBAAgB,EAChB,WAAW,GACZ,MAAM,eAAe,CAAC;AACvB,OAAO,EAAE,sBAAsB,EAAE,MAAM,8DAA8D,CAAC;AACtG,OAAO,EAAE,sBAAsB,EAAE,MAAM,8DAA8D,CAAC;AACtG,OAAO,EAAE,SAAS,EAAE,MAAM,iDAAiD,CAAC;AAE5E,OAAO,EAAE,yBAAyB,EAAE,MAAM,2CAA2C,CAAC;AAEtF;;GAEG;AAEI,IAAM,uCAAuC,GAA7C,MAAM,uCAAuC;IAClD;;OAEG;IACH,MAAM,CAAC,IAAU;QACf,OAAO,CACL,IAAI,CAAC,MAAM,KAAK,UAAU,CAAC,GAAG;YAC9B,IAAI,CAAC,IAAI,YAAY,yBAAyB;YAC9C,WAAW,CAAC,IAAI,CAAC,IAAI,EAAE,SAAS,CAAC;YACjC,IAAI,CAAC,KAAK,KAAK,WAAW,CAC3B,CAAC;IACJ,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,MAAM,CACV,IAAqC,EACrC,YAAmE,EACnE,aAA4B;QAE5B,MAAM,EAAE,UAAU,EAAE,GAAG,IAAI,CAAC,IAAI,CAAC;QAEjC,MAAM,EAAE,YAAY,EAAE,WAAW,EAAE,GAAG,YAAY,CAAC,QAAQ,CAAC;QAC5D,MAAM,EAAE,UAAU,EAAE,GAAG,YAAY,CAAC,MAAM,CAAC;QAE3C,MAAM,aAAa,GAAG,YAAY,CAAC;QACnC,MAAM,aAAa,GAAG,YAAY,CAAC;QACnC,MAAM,mBAAmB,GAAG,UAAU,CAAC,OAAO,CAAC,SAAS,EAAE,GAAG,CAAC,CAAC;QAE/D,qBAAqB;QACrB,MAAM,SAAS,GAAG,IAAI,SAAS,CAAC,UAAU,mBAAmB,EAAE,EAAE;YAC/D,YAAY;YACZ,WAAW;YACX,MAAM,EAAE,UAAU;YAClB,sEAAsE;YACtE,uBAAuB,EAAE,EAAE;YAC3B,aAAa,EAAE,aAAa;YAC5B,aAAa,EAAE,aAAa;SAC7B,CAAC,CAAC;QAEH,aAAa,CAAC,SAAS,CAAC,UAAU,CAAC,GAAG,SAAS,CAAC;QAEhD,IAAI,CAAC,UAAU,EAAE,CAAC;YAChB,OAAO,aAAa,CAAC;QACvB,CAAC;QAED,MAAM,QAAQ,GAAG,GAAG,mBAAmB,SAAS,CAAC;QAEjD,gGAAgG;QAChG,wFAAwF;QACxF,uEAAuE;QACvE,MAAM,sBAAsB,GAAG,IAAI,sBAAsB,CAAC,cAAc,mBAAmB,EAAE,EAAE;YAC7F,OAAO,EAAE,CAAC,GAAG,CAAC,UAAU,CAAC,OAAO,IAAI,EAAE,CAAC,CAAC;YACxC,YAAY;YACZ,SAAS,EAAE;gBACT;oBACE,cAAc,EAAE,CAAC,KAAK,EAAE,MAAM,CAAC;oBAC/B,aAAa,EAAE,CAAC,KAAK,EAAE,MAAM,CAAC;oBAC9B,WAAW,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,0BAA0B,EAAE;oBAClE,QAAQ,EAAE,IAAI;oBACd,oBAAoB,EAAE,EAAE;oBACxB,mBAAmB,EAAE,IAAI;oBACzB,WAAW,EAAE,IAAI;oBACjB,qBAAqB,EAAE,IAAI;oBAC3B,cAAc,EAAE,QAAQ;oBACxB,oBAAoB,EAAE,mBAAmB;iBAC1C;aACF;YACD,aAAa,EAAE,EAAE;YACjB,OAAO,EAAE,UAAU,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,IAAI,UAAU;YAC9C,oBAAoB,EAAE,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,SAAS,EAAE,EAAE,CACjD,UAAU,CAAC,gBAAgB,KAAK,iBAAiB;gBAC/C,CAAC,CAAC;oBACE,+EAA+E;oBAC/E,kBAAkB,EAAE,EAAE;oBACtB,SAAS;oBACT,YAAY,EAAE,GAAG;oBACjB,gBAAgB,EAAE,IAAI,aAAa,EAAE;iBACtC;gBACH,CAAC,CAAC,EAAE,kBAAkB,EAAE,EAAE,EAAE,SAAS,EAAE,YAAY,EAAE,GAAG,EAAE,gBAAgB,EAAE,IAAI,aAAa,EAAE,EAAE,CACpG;YACD,iBAAiB,EAAE,aAAa;YAChC,gBAAgB,EAAE,mBAAmB;YACrC,OAAO,EAAE,IAAI;YACb,cAAc,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE;YAChC,WAAW,EAAE,WAAW;YACxB,aAAa,EAAE,IAAI;YACnB,OAAO,EAAE,IAAI;YACb,YAAY,EAAE,EAAE;YAChB,qBAAqB,EAAE,EAAE;YACzB,OAAO,EAAE;gBACP;oBACE,kBAAkB,EAAE,CAAC;oBACrB,iBAAiB,EAAE,EAAE;oBACrB,aAAa,EAAE,EAAE;oBACjB,IAAI,EAAE,EAAE,UAAU,EAAE,YAAY,EAAE,WAAW,EAAE,IAAI,EAAE,IAAI,EAAE;oBAC3D,QAAQ;oBACR,UAAU,EAAE,EAAE;iBACf;aACF;YACD,UAAU,EAAE,UAAU,CAAC,UAAU,IAAI,gBAAgB;YACrD,uBAAuB,EAAE,EAAE;YAC3B,iBAAiB,EAAE,UAAU,CAAC,cAAc;gBAC1C,CAAC,CAAC;oBACE,cAAc,EAAE,UAAU,CAAC,cAAc;oBACzC,IAAI,EAAE,KAAK;oBACX,oDAAoD;oBACpD,sBAAsB,EAAE,cAAc;iBACvC;gBACH,CAAC,CAAC,EAAE,IAAI,EAAE,SAAS,EAAE;YACvB,SAAS,EAAE,UAAU,CAAC,SAAS,IAAI,IAAI;SACxC,CAAC,CAAC;QAEH,aAAa,CAAC,sBAAsB,CAAC,UAAU,CAAC,GAAG,sBAAsB,CAAC;QAE1E,6FAA6F;QAC7F,iGAAiG;QACjG,kGAAkG;QAClG,gCAAgC;QAChC,MAAM,8BAA8B,GAAG,IAAI,gBAAgB,CAAC,sBAAsB,CAAC,CAAC;QACpF,SAAS,CAAC,mBAAmB,CAAC,8BAA8B,CAAC,CAAC;QAE9D,wFAAwF;QACxF,sFAAsF;QACtF,MAAM,sBAAsB,GAAG,IAAI,sBAAsB,CACvD,2BAA2B,mBAAmB,EAAE,EAChD,EAAE,YAAY,EAAE,cAAc,EAAE,SAAS,EAAE,KAAK,EAAE,CAAC,IAAI,CAAC,EAAE,EAC1D,CAAC,8BAA8B,CAAC,CACjC,CAAC;QAEF,aAAa,CAAC,sBAAsB,CAAC,UAAU,CAAC,GAAG,sBAAsB,CAAC;QAE1E,OAAO,aAAa,CAAC;IACvB,CAAC;CACF,CAAA;AAvIY,uCAAuC;IADnD,MAAM,CAAC,yBAAyB,CAAC;GACrB,uCAAuC,CAuInD;;AAED;;GAEG;AAEI,IAAM,8CAA8C,GAApD,MAAM,8CAA8C;IAGzD;;OAEG;IACH,MAAM,CAAC,KAAK,CAAC,MAAM;QACjB,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC;YACnB,IAAI,CAAC,QAAQ,GAAG,IAAI,uCAAuC,EAAE,CAAC;QAChE,CAAC;QACD,OAAO,IAAI,CAAC,QAAQ,CAAC;IACvB,CAAC;CACF,CAAA;AAZY,8CAA8C;IAD1D,OAAO,CAA0C,uCAAuC,CAAC;GAC7E,8CAA8C,CAY1D"}

package/dist/modules/service/aws-s3-static-website-service/models/service/actions/update-aws-s3-static-website-service-source-paths.model.action.js CHANGED Viewed

@@ -4,6 +4,7 @@ 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 { createHash } from 'crypto';
 import { Action, DiffAction, Factory, hasNodeName, } from '@quadnix/octo';
 import { AwsS3StaticWebsiteService } from '../aws-s3-static-website-service.model.js';
 /**
@@ -24,9 +25,24 @@ let UpdateAwsS3StaticWebsiteServiceSourcePathsModelAction = class UpdateAwsS3Sta
      */
     async handle(diff, actionInputs, actionOutputs) {
         const { bucketName } = diff.node;
-        const s3Website = actionInputs.resources[`bucket-${bucketName.replace(/[^\w-]/g, '-')}`];
+        const sanitizedBucketName = bucketName.replace(/[^\w-]/g, '-');
+        const s3Website = actionInputs.resources[`bucket-${sanitizedBucketName}`];
         s3Website.updateManifest(diff.value);
         actionOutputs[s3Website.resourceId] = s3Website;
+        // What the distribution is serving has moved, so the edges have to be told. The version is a
+        // digest over the manifest rather than the manifest itself: it only ever has to differ from the
+        // last one, and an invalidation that named every file would be billed per path.
+        const cloudFrontInvalidation = actionInputs.resources[`cloudfront-invalidation-${sanitizedBucketName}`];
+        if (cloudFrontInvalidation) {
+            const manifestDigest = createHash('sha1')
+                .update(Object.keys(diff.value)
+                .sort()
+                .map((remotePath) => `${remotePath}:${diff.value[remotePath].digest}`)
+                .join('\n'))
+                .digest('hex');
+            cloudFrontInvalidation.properties.contentVersion = manifestDigest;
+            actionOutputs[cloudFrontInvalidation.resourceId] = cloudFrontInvalidation;
+        }
         return actionOutputs;
     }
 };

package/dist/modules/service/aws-s3-static-website-service/models/service/actions/update-aws-s3-static-website-service-source-paths.model.action.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"update-aws-s3-static-website-service-source-paths.model.action.js","sourceRoot":"","sources":["../../../../../../../src/modules/service/aws-s3-static-website-service/models/service/actions/update-aws-s3-static-website-service-source-paths.model.action.ts"],"names":[],"mappings":";;;;;;AAAA,OAAO,EACL,MAAM,EAGN,UAAU,EAEV,OAAO,EAEP,WAAW,GACZ,MAAM,eAAe,CAAC;~~AAGvB~~,OAAO,EAAE,yBAAyB,EAAkB,MAAM,2CAA2C,CAAC;AAEtG;;GAEG;AAEI,IAAM,qDAAqD,GAA3D,MAAM,qDAAqD;IAGhE;;OAEG;IACH,MAAM,CAAC,IAAU;QACf,OAAO,CACL,IAAI,CAAC,MAAM,KAAK,UAAU,CAAC,MAAM;YACjC,IAAI,CAAC,IAAI,YAAY,yBAAyB;YAC9C,WAAW,CAAC,IAAI,CAAC,IAAI,EAAE,SAAS,CAAC;YACjC,IAAI,CAAC,KAAK,KAAK,aAAa,CAC7B,CAAC;IACJ,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,MAAM,CACV,IAAgD,EAChD,YAAmE,EACnE,aAA4B;QAE5B,MAAM,EAAE,UAAU,EAAE,GAAG,IAAI,CAAC,IAAI,CAAC;~~QAEjC~~,MAAM,~~SAAS~~,GAAG,~~YAAY~~,CAAC,~~SAAS~~,CAAC,~~UAAU~~,~~UAAU~~,CAAC,~~OAAO,~~CAAC,SAAS,~~EAAE,~~GAAG,CAAC,EAAE,CAAc,CAAC;~~QACtG~~,SAAS,CAAC,cAAc,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QAErC,aAAa,CAAC,SAAS,CAAC,UAAU,CAAC,GAAG,SAAS,CAAC;QAEhD,OAAO,aAAa,CAAC;IACvB,CAAC;CACF,CAAA;~~AAhCY~~,qDAAqD;IADjE,MAAM,CAAC,yBAAyB,CAAC;GACrB,qDAAqD,~~CAgCjE~~;;AAED;;GAEG;AAEI,IAAM,4DAA4D,GAAlE,MAAM,4DAA4D;IAGvE;;OAEG;IACH,MAAM,CAAC,KAAK,CAAC,MAAM;QACjB,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC;YACnB,IAAI,CAAC,QAAQ,GAAG,IAAI,qDAAqD,EAAE,CAAC;QAC9E,CAAC;QACD,OAAO,IAAI,CAAC,QAAQ,CAAC;IACvB,CAAC;CACF,CAAA;AAZY,4DAA4D;IADxE,OAAO,CAAwD,qDAAqD,CAAC;GACzG,4DAA4D,CAYxE"}
1	+ {"version":3,"file":"update-aws-s3-static-website-service-source-paths.model.action.js","sourceRoot":"","sources":["../../../../../../../src/modules/service/aws-s3-static-website-service/models/service/actions/update-aws-s3-static-website-service-source-paths.model.action.ts"],"names":[],"mappings":";;;;;;AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,QAAQ,CAAC;AACpC,OAAO,EACL,MAAM,EAGN,UAAU,EAEV,OAAO,EAEP,WAAW,GACZ,MAAM,eAAe,CAAC;AAIvB,OAAO,EAAE,yBAAyB,EAAkB,MAAM,2CAA2C,CAAC;AAEtG;;GAEG;AAEI,IAAM,qDAAqD,GAA3D,MAAM,qDAAqD;IAGhE;;OAEG;IACH,MAAM,CAAC,IAAU;QACf,OAAO,CACL,IAAI,CAAC,MAAM,KAAK,UAAU,CAAC,MAAM;YACjC,IAAI,CAAC,IAAI,YAAY,yBAAyB;YAC9C,WAAW,CAAC,IAAI,CAAC,IAAI,EAAE,SAAS,CAAC;YACjC,IAAI,CAAC,KAAK,KAAK,aAAa,CAC7B,CAAC;IACJ,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,MAAM,CACV,IAAgD,EAChD,YAAmE,EACnE,aAA4B;QAE5B,MAAM,EAAE,UAAU,EAAE,GAAG,IAAI,CAAC,IAAI,CAAC;QACjC,MAAM,mBAAmB,GAAG,UAAU,CAAC,OAAO,CAAC,SAAS,EAAE,GAAG,CAAC,CAAC;QAE/D,MAAM,SAAS,GAAG,YAAY,CAAC,SAAS,CAAC,UAAU,mBAAmB,EAAE,CAAc,CAAC;QACvF,SAAS,CAAC,cAAc,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QAErC,aAAa,CAAC,SAAS,CAAC,UAAU,CAAC,GAAG,SAAS,CAAC;QAEhD,6FAA6F;QAC7F,gGAAgG;QAChG,gFAAgF;QAChF,MAAM,sBAAsB,GAAG,YAAY,CAAC,SAAS,CAAC,2BAA2B,mBAAmB,EAAE,CAEzF,CAAC;QACd,IAAI,sBAAsB,EAAE,CAAC;YAC3B,MAAM,cAAc,GAAG,UAAU,CAAC,MAAM,CAAC;iBACtC,MAAM,CACL,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC;iBACpB,IAAI,EAAE;iBACN,GAAG,CAAC,CAAC,UAAU,EAAE,EAAE,CAAC,GAAG,UAAU,IAAI,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC,MAAM,EAAE,CAAC;iBACrE,IAAI,CAAC,IAAI,CAAC,CACd;iBACA,MAAM,CAAC,KAAK,CAAC,CAAC;YACjB,sBAAsB,CAAC,UAAU,CAAC,cAAc,GAAG,cAAc,CAAC;YAElE,aAAa,CAAC,sBAAsB,CAAC,UAAU,CAAC,GAAG,sBAAsB,CAAC;QAC5E,CAAC;QAED,OAAO,aAAa,CAAC;IACvB,CAAC;CACF,CAAA;AArDY,qDAAqD;IADjE,MAAM,CAAC,yBAAyB,CAAC;GACrB,qDAAqD,CAqDjE;;AAED;;GAEG;AAEI,IAAM,4DAA4D,GAAlE,MAAM,4DAA4D;IAGvE;;OAEG;IACH,MAAM,CAAC,KAAK,CAAC,MAAM;QACjB,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC;YACnB,IAAI,CAAC,QAAQ,GAAG,IAAI,qDAAqD,EAAE,CAAC;QAC9E,CAAC;QACD,OAAO,IAAI,CAAC,QAAQ,CAAC;IACvB,CAAC;CACF,CAAA;AAZY,4DAA4D;IADxE,OAAO,CAAwD,qDAAqD,CAAC;GACzG,4DAA4D,CAYxE"}

package/dist/modules/service/aws-s3-static-website-service/models/service/aws-s3-static-website-service.model.js CHANGED Viewed

@@ -9,8 +9,8 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 };
 var AwsS3StaticWebsiteService_1;
 import { lstat, readdir } from 'fs/promises';
-import { join, parse, resolve } from 'path';
-import { Diff, DiffAction, Model, ModelError, Service, Validate } from '@quadnix/octo';
+import { join, parse } from 'path';
+import { Diff, DiffAction, Model, ModelError, ProjectUtility, Service, Validate } from '@quadnix/octo';
 import { FileUtility } from '../../../../../utilities/file/file.utility.js';
 import { AwsS3StaticWebsiteServiceSchema } from './aws-s3-static-website-service.schema.js';
 /**
@@ -36,7 +36,10 @@ let AwsS3StaticWebsiteService = AwsS3StaticWebsiteService_1 = class AwsS3StaticW
      * @internal
      */
     async addSource(directoryPath, subDirectoryOrFilePath, filter, transform) {
-        directoryPath = resolve(directoryPath);
+        // Against the project root rather than the working directory. A module composes the graph in
+        // every mode, including the `octo run-action` callback terraform makes mid-apply, and terraform
+        // makes that call from a terragrunt cache directory.
+        directoryPath = ProjectUtility.resolveFromProjectRoot(directoryPath);
         if (!subDirectoryOrFilePath) {
             subDirectoryOrFilePath = '';
         }

package/dist/modules/service/aws-s3-static-website-service/models/service/aws-s3-static-website-service.model.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"aws-s3-static-website-service.model.js","sourceRoot":"","sources":["../../../../../../src/modules/service/aws-s3-static-website-service/models/service/aws-s3-static-website-service.model.ts"],"names":[],"mappings":";;;;;;;;;;AAAA,OAAO,EAAE,KAAK,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;AAC7C,OAAO,EAAE,IAAI,EAAE,KAAK,EAAE,~~OAAO,EAAE,~~MAAM,MAAM,CAAC;~~AAC5C~~,OAAO,EAAE,IAAI,EAAE,UAAU,EAAE,KAAK,EAAE,UAAU,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;~~AACvF~~,OAAO,EAAE,WAAW,EAAE,MAAM,+CAA+C,CAAC;AAC5E,OAAO,EAAE,+BAA+B,EAAE,MAAM,2CAA2C,CAAC;AAI5F;;GAEG;AAEI,IAAM,yBAAyB,iCAA/B,MAAM,yBAA0B,SAAQ,OAAO;IAapD;;OAEG;IACH,YAAY,UAAyD;QACnE,KAAK,CAAC,GAAG,UAAU,oBAAoB,CAAC,CAAC;QAblC,iBAAY,GAAgE,EAAE,CAAC;QAE/E,gBAAW,GAKd,EAAE,CAAC;QAQP,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC;IAC/B,CAAC;IAED;;OAEG;IACH,MAAM,CAAU,KAAK,CAAC,OAAO,CAAC,OAAwC;QACpE,OAAO,IAAI,2BAAyB,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;IAC3D,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,SAAS,CACb,aAAqB,EACrB,sBAA+B,EAC/B,MAAsC,EACtC,SAAwC;QAExC,aAAa,GAAG,~~OAAO~~,CAAC,aAAa,CAAC,CAAC;~~QACvC~~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~~AA1JU~~;IADR,QAAQ,CAAC,EAAE,OAAO,EAAE,EAAE,SAAS,EAAE,GAAG,EAAE,SAAS,EAAE,CAAC,EAAE,KAAK,EAAE,iCAAiC,EAAE,EAAE,CAAC;;6DACtE;AAFjB,yBAAyB;IADrC,KAAK,CAA4B,OAAO,EAAE,SAAS,EAAE,+BAA+B,CAAC;;GACzE,yBAAyB,~~CA4JrC~~"}
1	+ {"version":3,"file":"aws-s3-static-website-service.model.js","sourceRoot":"","sources":["../../../../../../src/modules/service/aws-s3-static-website-service/models/service/aws-s3-static-website-service.model.ts"],"names":[],"mappings":"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"}