@ndlib/ndlib-cdk2 1.0.2 → 1.0.3

package/lib/dashboards/summary-dashboard.js

@@ -116,7 +116,7 @@ class SummaryDashboard extends aws_cdk_lib_1.aws_cloudwatch.Dashboard {
     }
     static visit(node, services, lambdaNames, includeLambdas, serviceLabels) {
         const customLabel = serviceLabels[node.node.addr];
-        if (node instanceof aws_cdk_lib_1.aws_elasticsearch.CfnDomain) {
+        if (node instanceof aws_cdk_lib_1.aws_opensearchservice.CfnDomain) {
             if (node.domainName != undefined) {
                 services.push({
                     typeName: 'ElasticSearchApi',

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

@@ -20,9 +20,10 @@ export interface IStaticHostProps {
      */
     readonly createDns?: boolean;
     /**
-     * Hosted zone id for the route53 record. Is required if createDns is true.
+     * Hosted zone ids for the route53 record. 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 hostedZoneId?: string;
+    readonly hostedZoneIds?: string[];
     /**
      * Root page to be served.
      */

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

@@ -9,9 +9,19 @@ class StaticHost extends constructs_1.Construct {
         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.hostedZoneId) {
-            aws_cdk_lib_1.Annotations.of(this).addError('hostedZoneId is required when createDns is true');
-            throw new Error('hostedZoneId is required 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.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');
+            }
         }
         const stack = aws_cdk_lib_1.Stack.of(this);
         this.hostname = `${props.hostnamePrefix}.${props.domainName}`;
@@ -105,16 +115,18 @@ class StaticHost extends constructs_1.Construct {
         });
         // Create DNS record (conditionally)
         if (props.createDns) {
-            new aws_cdk_lib_1.aws_route53.CnameRecord(this, 'ServiceCNAME', {
-                recordName: this.hostname,
-                comment: this.hostname,
-                domainName: this.cloudfront.distributionDomainName,
-                zone: aws_cdk_lib_1.aws_route53.HostedZone.fromHostedZoneAttributes(this, 'ImportedHostedZone', {
-                    hostedZoneId: props.hostedZoneId,
-                    zoneName: props.domainName,
-                }),
-                ttl: aws_cdk_lib_1.Duration.minutes(15),
-            });
+            for (const hostedZoneId of props.hostedZoneIds || ['']) {
+                new aws_cdk_lib_1.aws_route53.CnameRecord(this, `ServiceCNAME${hostedZoneId}`, {
+                    recordName: this.hostname,
+                    comment: this.hostname,
+                    domainName: this.cloudfront.distributionDomainName,
+                    zone: aws_cdk_lib_1.aws_route53.HostedZone.fromHostedZoneAttributes(this, `ImportedHostedZone${hostedZoneId}`, {
+                        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', {
             parameterName: `/all/stacks/${stack.stackName}/site-bucket-name`,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ndlib/ndlib-cdk2",
-  "version": "1.0.2",
+  "version": "1.0.3",
   "description": "Reusable CDK2 modules used within Hesburgh Libraries of Notre Dame",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -38,19 +38,19 @@
   "homepage": "https://github.com/ndlib/ndlib-cdk2#readme",
   "peerDependencies": {
     "aws-cdk-lib": "^2.24.1",
-    "constructs": "^10.1.7"
+    "constructs": "^10.1.12"
   },
   "devDependencies": {
     "@types/jest": "^27.5.1",
-    "@types/node": "^17.0.33",
-    "@typescript-eslint/eslint-plugin": "^5.23.0",
-    "@typescript-eslint/parser": "^5.23.0",
-    "aws-sdk": "^2.1134.0",
+    "@types/node": "^17.0.35",
+    "@typescript-eslint/eslint-plugin": "^5.25.0",
+    "@typescript-eslint/parser": "^5.25.0",
+    "aws-sdk": "^2.1140.0",
     "aws-sdk-client-mock": "^0.6.2",
     "eslint": "^8.15.0",
     "eslint-config-standard": "^17.0.0",
     "eslint-plugin-import": "^2.26.0",
-    "eslint-plugin-jest": "^26.1.5",
+    "eslint-plugin-jest": "^26.2.2",
     "eslint-plugin-n": "^15.2.0",
     "eslint-plugin-node": "^11.1.0",
     "eslint-plugin-promise": "^6.0.0",
@@ -69,7 +69,7 @@
   "dependencies": {
     "@aws-cdk/aws-appsync-alpha": "^2.24.1-alpha.0",
     "aws-cdk-lib": "^2.24.1",
-    "constructs": "^10.1.7",
+    "constructs": "^10.1.12",
     "jest-mock": "^28.1.0",
     "node-fetch": "^3.2.4"
   },