@ndlib/ndlib-cdk2 1.0.5 → 1.0.6

package/lib/static-host/static-host.d.ts

@@ -20,10 +20,10 @@ export interface IStaticHostProps {
      */
     readonly createDns?: boolean;
     /**
-     * Hosted zone ids for the route53 record. Is required if createDns is true.
+     * Hosted zone types (used to retrieve hosted zone ids) for the route53 record(s). Is required if createDns is true.
      * This is now an array to accommodate both a public hosted zone id and a private hosted zone id
      */
-    readonly hostedZoneIds?: string[];
+    readonly hostedZoneTypes?: string[];
     /**
      * Root page to be served.
      */

package/lib/static-host/static-host.js

@@ -3,25 +3,20 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.StaticHost = void 0;
 const aws_cdk_lib_1 = require("aws-cdk-lib");
 const constructs_1 = require("constructs");
-const crypto_1 = require("crypto");
+const aws_ssm_1 = require("aws-cdk-lib/aws-ssm");
 class StaticHost extends constructs_1.Construct {
     constructor(scope, id, props) {
         var _a;
         super(scope, id);
         this.inProps = props;
-        // removed .validate() and replaced with this error to enforce hostedZondId when createDNS is true
-        // if (this.inProps.createDns && !this.inProps.hostedZoneIds) {
-        //   Annotations.of(this).addError('hostedZoneIds is required when createDns is true')
-        //   throw new Error('hostedZoneIds is required when createDns is true')
-        // }
         if (this.inProps.createDns) {
-            if (!this.inProps.hostedZoneIds) {
-                aws_cdk_lib_1.Annotations.of(this).addError('hostedZoneIds is required when createDns is true');
-                throw new Error('hostedZoneIds is required when createDns is true');
+            if (!this.inProps.hostedZoneTypes) {
+                aws_cdk_lib_1.Annotations.of(this).addError('hostedZoneTypes is required when createDns is true');
+                throw new Error('hostedZoneTypes is required when createDns is true');
             }
-            if (this.inProps.hostedZoneIds.length == 0) {
-                aws_cdk_lib_1.Annotations.of(this).addError('hostedZoneIds is required when createDns is true, and must contain at least one hostedZoneId');
-                throw new Error('hostedZoneIds is required when createDns is true, and must contain at least one hostedZoneId');
+            if (this.inProps.hostedZoneTypes.length == 0) {
+                aws_cdk_lib_1.Annotations.of(this).addError('hostedZoneTypes is required when createDns is true, and must contain at least one hostedZoneId');
+                throw new Error('hostedZoneTypes is required when createDns is true, and must contain at least one hostedZoneId');
             }
         }
         const stack = aws_cdk_lib_1.Stack.of(this);
@@ -115,19 +110,27 @@ class StaticHost extends constructs_1.Construct {
             viewerProtocolPolicy: aws_cdk_lib_1.aws_cloudfront.ViewerProtocolPolicy.REDIRECT_TO_HTTPS,
         });
         // Create DNS record (conditionally)
-        if (props.createDns && props.hostedZoneIds && props.hostedZoneIds.length > 0) {
-            for (const hostedZoneId of props.hostedZoneIds) {
-                const id = (0, crypto_1.randomUUID)();
-                new aws_cdk_lib_1.aws_route53.CnameRecord(this, `ServiceCNAME${id}`, {
-                    recordName: this.hostname,
-                    comment: this.hostname,
-                    domainName: this.cloudfront.distributionDomainName,
-                    zone: aws_cdk_lib_1.aws_route53.HostedZone.fromHostedZoneAttributes(this, `ImportedHostedZone${id}`, {
-                        hostedZoneId: hostedZoneId,
-                        zoneName: props.domainName,
-                    }),
-                    ttl: aws_cdk_lib_1.Duration.minutes(15),
-                });
+        if (props.createDns && props.hostedZoneTypes && props.hostedZoneTypes.length > 0) {
+            for (const hostedZoneType of ['public', 'private']) {
+                console.log('before if includes');
+                console.log('hostedZoneType=', hostedZoneType);
+                console.log('hostedZoneTypes = ', props.hostedZoneTypes);
+                if (props.hostedZoneTypes.includes(hostedZoneType)) {
+                    console.log('getting hosted zone id for ', hostedZoneType);
+                    const hostedZoneIdPath = `/all/dns/${props.domainName}/${hostedZoneType}/zoneId`;
+                    const hostedZoneId = aws_ssm_1.StringParameter.valueForStringParameter(this, hostedZoneIdPath);
+                    console.log('hosted zone id = ', hostedZoneId);
+                    new aws_cdk_lib_1.aws_route53.CnameRecord(this, `ServiceCNAME${hostedZoneType}`, {
+                        recordName: this.hostname,
+                        comment: this.hostname,
+                        domainName: this.cloudfront.distributionDomainName,
+                        zone: aws_cdk_lib_1.aws_route53.HostedZone.fromHostedZoneAttributes(this, `ImportedHostedZone${hostedZoneType}`, {
+                            hostedZoneId: hostedZoneId,
+                            zoneName: props.domainName,
+                        }),
+                        ttl: aws_cdk_lib_1.Duration.minutes(15),
+                    });
+                }
             }
         }
         this.bucketNameParam = new aws_cdk_lib_1.aws_ssm.StringParameter(this, 'BucketParameter', {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ndlib/ndlib-cdk2",
-  "version": "1.0.5",
+  "version": "1.0.6",
   "description": "Reusable CDK2 modules used within Hesburgh Libraries of Notre Dame",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -37,21 +37,21 @@
   },
   "homepage": "https://github.com/ndlib/ndlib-cdk2#readme",
   "peerDependencies": {
-    "aws-cdk-lib": "^2.24.1",
-    "constructs": "^10.1.12"
+    "aws-cdk-lib": "^2.26.0",
+    "constructs": "^10.1.25"
   },
   "devDependencies": {
-    "@types/jest": "^27.5.1",
-    "@types/node": "^17.0.35",
-    "@typescript-eslint/eslint-plugin": "^5.25.0",
-    "@typescript-eslint/parser": "^5.25.0",
-    "aws-sdk": "^2.1140.0",
+    "@types/jest": "^28.1.0",
+    "@types/node": "^17.0.38",
+    "@typescript-eslint/eslint-plugin": "^5.27.0",
+    "@typescript-eslint/parser": "^5.27.0",
+    "aws-sdk": "^2.1147.0",
     "aws-sdk-client-mock": "^0.6.2",
-    "eslint": "^8.15.0",
+    "eslint": "^8.16.0",
     "eslint-config-standard": "^17.0.0",
     "eslint-plugin-import": "^2.26.0",
-    "eslint-plugin-jest": "^26.2.2",
-    "eslint-plugin-n": "^15.2.0",
+    "eslint-plugin-jest": "^26.4.6",
+    "eslint-plugin-n": "^15.2.1",
     "eslint-plugin-node": "^11.1.0",
     "eslint-plugin-promise": "^6.0.0",
     "eslint-plugin-standard": "^5.0.0",
@@ -59,19 +59,19 @@
     "jest": "^28.1.0",
     "prettier": "^2.6.2",
     "subpackage": "^1.1.0",
-    "ts-jest": "^28.0.2",
+    "ts-jest": "^28.0.3",
     "tsc-watch": "^5.0.3",
-    "typescript": "^4.6.4"
+    "typescript": "^4.7.2"
   },
   "files": [
     "lib/**/*"
   ],
   "dependencies": {
-    "@aws-cdk/aws-appsync-alpha": "^2.24.1-alpha.0",
-    "aws-cdk-lib": "^2.24.1",
-    "constructs": "^10.1.12",
+    "@aws-cdk/aws-appsync-alpha": "^2.26.0-alpha.0",
+    "aws-cdk-lib": "^2.26.0",
+    "constructs": "^10.1.25",
     "jest-mock": "^28.1.0",
-    "node-fetch": "^3.2.4"
+    "node-fetch": "^3.2.5"
   },
   "subPackages": [
     "src/internal-lambdas/sourceWatcherLambda/src"