@fy-stack/storage-construct 0.0.143 → 0.0.145

package/dist/lib/storage-construct.d.ts

@@ -12,6 +12,8 @@ import type { StorageConstructProps } from './types';
 export declare class StorageConstruct extends Construct implements Attachable, Grantable, CDNResource {
     bucket: s3.IBucket;
     table: dynamo.Table | undefined;
+    private cdnLink;
+    private readonly keyGroup;
     constructor(scope: Construct, id: string, props: StorageConstructProps);
     cloudfront(path: string): {
         [x: string]: cdk.aws_cloudfront.BehaviorOptions;
@@ -19,8 +21,11 @@ export declare class StorageConstruct extends Construct implements Attachable, G
     cloudfrontPolicy(distributionId: string): any;
     attachable(): {
         NAME: string;
+        DOMAIN: string;
         ARN: string;
         LOG_TABLE: string;
+        KEY_PAIR_ID: string;
+        CDN_LINK: string;
     };
     grantable(grant: iam.IGrantable): void;
 }

package/dist/lib/storage-construct.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"storage-construct.d.ts","sourceRoot":"","sources":["../../src/lib/storage-construct.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,WAAW,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AACrE,OAAO,KAAK,GAAG,MAAM,aAAa,CAAC;AAGnC,OAAO,KAAK,MAAM,MAAM,0BAA0B,CAAC;AACnD,OAAO,KAAK,GAAG,MAAM,qBAAqB,CAAC;AAC3C,OAAO,KAAK,EAAE,MAAM,oBAAoB,CAAC;AACzC,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAGvC,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,SAAS,CAAC;AAErD;;;GAGG;AACH,qBAAa,gBACX,SAAQ,SACR,YAAW,UAAU,EAAE,SAAS,EAAE,WAAW;IAEtC,MAAM,EAAE,EAAE,CAAC,OAAO,CAAC;IACnB,KAAK,EAAE,MAAM,CAAC,KAAK,GAAG,SAAS,CAAC;gBAE3B,KAAK,EAAE,SAAS,EAAE,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,qBAAqB;IAsCtE,UAAU,CAAC,IAAI,EAAE,MAAM;;;IAiBvB,gBAAgB,CAAC,cAAc,EAAE,MAAM;IAoBvC,UAAU;;;;;IAQV,SAAS,CAAC,KAAK,EAAE,GAAG,CAAC,UAAU;CAWhC"}
+{"version":3,"file":"storage-construct.d.ts","sourceRoot":"","sources":["../../src/lib/storage-construct.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,UAAU,EAAE,WAAW,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AACrE,OAAO,KAAK,GAAG,MAAM,aAAa,CAAC;AAGnC,OAAO,KAAK,MAAM,MAAM,0BAA0B,CAAC;AACnD,OAAO,KAAK,GAAG,MAAM,qBAAqB,CAAC;AAC3C,OAAO,KAAK,EAAE,MAAM,oBAAoB,CAAC;AACzC,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAGvC,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,SAAS,CAAC;AAErD;;;GAGG;AACH,qBAAa,gBACX,SAAQ,SACR,YAAW,UAAU,EAAE,SAAS,EAAE,WAAW;IAEtC,MAAM,EAAE,EAAE,CAAC,OAAO,CAAC;IACnB,KAAK,EAAE,MAAM,CAAC,KAAK,GAAG,SAAS,CAAC;IAEvC,OAAO,CAAC,OAAO,CAAS;IACxB,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAkC;gBAE/C,KAAK,EAAE,SAAS,EAAE,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,qBAAqB;IAsDtE,UAAU,CAAC,IAAI,EAAE,MAAM;;;IAoBvB,gBAAgB,CAAC,cAAc,EAAE,MAAM;IAoBvC,UAAU;;;;;;;;IAWV,SAAS,CAAC,KAAK,EAAE,GAAG,CAAC,UAAU;CAWhC"}

package/dist/lib/storage-construct.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.StorageConstruct = void 0;
 const tslib_1 = require("tslib");
+const fs = tslib_1.__importStar(require("node:fs"));
 const cdk = tslib_1.__importStar(require("aws-cdk-lib"));
 const aws_cdk_lib_1 = require("aws-cdk-lib");
 const cloudfront = tslib_1.__importStar(require("aws-cdk-lib/aws-cloudfront"));
@@ -17,6 +18,8 @@ const storage_cdn_stack_1 = require("./storage-cdn-stack");
 class StorageConstruct extends constructs_1.Construct {
     bucket;
     table;
+    cdnLink = false;
+    keyGroup;
     constructor(scope, id, props) {
         super(scope, id);
         const bucketProps = {
@@ -29,8 +32,8 @@ class StorageConstruct extends constructs_1.Construct {
                         s3.HttpMethods.PUT,
                         s3.HttpMethods.DELETE,
                     ],
-                    allowedHeaders: ["*"],
-                    exposedHeaders: ["ETag"]
+                    allowedHeaders: ['*'],
+                    exposedHeaders: ['ETag'],
                 },
             ],
         };
@@ -46,6 +49,17 @@ class StorageConstruct extends constructs_1.Construct {
                 },
             });
         }
+        if (props.keys?.length) {
+            const keys = [];
+            for (const i in props.keys) {
+                keys.push(new cloudfront.PublicKey(this, `CDNPublicKey${i}`, {
+                    encodedKey: fs.readFileSync(props.keys[i]).toString(),
+                }));
+            }
+            this.keyGroup = new cloudfront.KeyGroup(this, 'CDNKeyGroup', {
+                items: keys,
+            });
+        }
     }
     cloudfront(path) {
         const storageOriginStack = new storage_cdn_stack_1.StorageCdnStack(this, 'StorageCDNStack', {
@@ -58,7 +72,9 @@ class StorageConstruct extends constructs_1.Construct {
             allowedMethods: cloudfront.AllowedMethods.ALLOW_GET_HEAD,
             cachedMethods: cloudfront.CachedMethods.CACHE_GET_HEAD,
             viewerProtocolPolicy: cloudfront.ViewerProtocolPolicy.REDIRECT_TO_HTTPS,
+            trustedKeyGroups: this.keyGroup ? [this.keyGroup] : undefined,
         };
+        this.cdnLink = true;
         return { [`${path}/*`]: storageBehavior };
     }
     cloudfrontPolicy(distributionId) {
@@ -81,8 +97,11 @@ class StorageConstruct extends constructs_1.Construct {
     attachable() {
         return {
             NAME: this.bucket.bucketName,
+            DOMAIN: this.bucket.bucketDomainName,
             ARN: this.bucket.bucketArn,
             LOG_TABLE: this.table?.tableName ?? '',
+            KEY_PAIR_ID: this.keyGroup?.keyGroupId ?? '',
+            CDN_LINK: `${this.cdnLink}`,
         };
     }
     grantable(grant) {

package/dist/lib/types.d.ts

@@ -6,6 +6,7 @@ export interface StorageConstructProps {
     /** Retain bucket when stack is deleted */
     retainOnDelete?: boolean;
     logTable?: boolean;
+    keys?: string[];
 }
 /**
  * Interface representing the properties required for configuring a storage stack in CDK.

package/dist/lib/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/lib/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAE/C;;GAEG;AACH,MAAM,WAAW,qBAAqB;IACpC,0CAA0C;IAC1C,cAAc,CAAC,EAAE,OAAO,CAAA;IACxB,QAAQ,CAAC,EAAE,OAAO,CAAA;CACnB;AAED;;;GAGG;AACH,MAAM,WAAW,oBAAqB,SAAQ,gBAAgB;IAC5D,oBAAoB;IACpB,SAAS,EAAE,MAAM,CAAA;CAClB"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/lib/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAE/C;;GAEG;AACH,MAAM,WAAW,qBAAqB;IACpC,0CAA0C;IAC1C,cAAc,CAAC,EAAE,OAAO,CAAA;IACxB,QAAQ,CAAC,EAAE,OAAO,CAAA;IAClB,IAAI,CAAC,EAAE,MAAM,EAAE,CAAA;CAChB;AAED;;;GAGG;AACH,MAAM,WAAW,oBAAqB,SAAQ,gBAAgB;IAC5D,oBAAoB;IACpB,SAAS,EAAE,MAAM,CAAA;CAClB"}

package/package.json

@@ -1,9 +1,9 @@
 {
   "name": "@fy-stack/storage-construct",
-  "version": "0.0.143",
+  "version": "0.0.145",
   "repository": "https://github.com/festusyuma/fy-stack",
   "dependencies": {
-    "@fy-stack/types": "0.0.143",
+    "@fy-stack/types": "0.0.145",
     "tslib": "^2.3.0"
   },
   "peerDependencies": {