@ndlib/ndlib-cdk2 1.0.5 → 1.0.7

package/README.md

@@ -382,7 +382,9 @@ new EC2withDatabase (app, 'StackName', {
   keyName: "libnd",
   privateIpAddress: "IPAddress",
   publicSubnetIds:  [ "ValidSubnet in VPC" ],
-  volumeSize: 50,
+  domainName: "Local domain name",
+  cnameList: [ Array of cnames/additional IPs to be added ],
+  volumeSize: Number (in GB),
   vpcId: "Valid VPC ID",
   sg_ingress_db: 'Security Group of database for access',
   sg_ingress_db_port: PortNumber,

package/lib/ec2s/ec2-with-database.d.ts

@@ -19,6 +19,8 @@ export interface ServiceStackProps extends StackProps {
     readonly sg_ingress_rules: IIngress_Rule[];
     readonly sg_ingress_db: string;
     readonly sg_ingress_db_port: number;
+    readonly domainName: string;
+    readonly CnameList: string[];
 }
 export declare class EC2withDatabase extends Stack {
     constructor(scope: Construct, id: string, props: ServiceStackProps);

package/lib/ec2s/ec2-with-database.js

@@ -2,6 +2,9 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.EC2withDatabase = void 0;
 const aws_cdk_lib_1 = require("aws-cdk-lib");
+const aws_cdk_lib_2 = require("aws-cdk-lib");
+const ssm = require("aws-cdk-lib/aws-ssm");
+const aws_route53_1 = require("aws-cdk-lib/aws-route53");
 class EC2withDatabase extends aws_cdk_lib_1.Stack {
     constructor(scope, id, props) {
         super(scope, id, props);
@@ -16,7 +19,7 @@ class EC2withDatabase extends aws_cdk_lib_1.Stack {
             'us-east-1': props.amiId,
         });
         // Need to look up the role name and then get the ARN value
-        const basic_role = aws_cdk_lib_1.aws_ssm.StringParameter.valueFromLookup(this, '/esu/ec2/basic_role_name');
+        const basic_role = ssm.StringParameter.valueFromLookup(this, '/esu/ec2/basic_role_name');
         const roleName = `arn:aws:iam::${this.account}:${basic_role}`;
         const ec2role = aws_cdk_lib_1.aws_iam.Role.fromRoleArn(this, 'Role', roleName);
         // Create a security group for this specific server using rules passed in
@@ -33,7 +36,7 @@ class EC2withDatabase extends aws_cdk_lib_1.Stack {
             ec2SecurityGroup.addIngressRule(aws_cdk_lib_1.aws_ec2.Peer.ipv4(rule.ipv4), aws_cdk_lib_1.aws_ec2.Port.tcp(rule.port), rule.description);
         });
         // With all of the information gathered, as well as values passed in, create the server
-        new aws_cdk_lib_1.aws_ec2.Instance(this, 'ec2-server', {
+        const ec2_server = new aws_cdk_lib_1.aws_ec2.Instance(this, 'ec2-server', {
             blockDevices: [{
                     deviceName: '/dev/xvda',
                     volume: {
@@ -51,6 +54,50 @@ class EC2withDatabase extends aws_cdk_lib_1.Stack {
             instanceName: props.instanceName,
             privateIpAddress: props.privateIpAddress,
         });
+        const IPAddr = new aws_cdk_lib_1.aws_ec2.CfnEIP(this, 'Ip');
+        new aws_cdk_lib_1.aws_ec2.CfnEIPAssociation(this, 'Ec2Association', {
+            eip: IPAddr.ref,
+            instanceId: ec2_server.instanceId,
+        });
+        // Create DNS for libnd.nd.edu connection
+        const privateZoneId = ssm.StringParameter.fromStringParameterAttributes(this, 'PrivateZoneId', {
+            parameterName: `/all/dns/${props.keyName}/private/zoneId`,
+        }).stringValue;
+        new aws_route53_1.ARecord(this, 'PrivateARec', {
+            target: aws_route53_1.RecordTarget.fromIpAddresses(props.privateIpAddress),
+            recordName: props.instanceName,
+            zone: aws_route53_1.HostedZone.fromHostedZoneAttributes(this, 'PrivateHostedZone', {
+                hostedZoneId: privateZoneId,
+                zoneName: `${props.keyName}.nd.edu`,
+            }),
+            ttl: aws_cdk_lib_2.Duration.minutes(5),
+        });
+        // Create both Public and Private A records for library.nd.edu
+        for (const direction of ['public', 'private']) {
+            const hostedZoneId = ssm.StringParameter.fromStringParameterAttributes(this, `${direction}HostedZoneId`, {
+                parameterName: `/all/dns/${props.domainName}/${direction}/zoneId`,
+            }).stringValue;
+            new aws_route53_1.ARecord(this, `${direction}ServiceARec`, {
+                target: aws_route53_1.RecordTarget.fromIpAddresses(IPAddr.ref),
+                recordName: props.instanceName,
+                zone: aws_route53_1.HostedZone.fromHostedZoneAttributes(this, `${direction}ImportedHostedZone`, {
+                    hostedZoneId: hostedZoneId,
+                    zoneName: props.domainName,
+                }),
+                ttl: aws_cdk_lib_2.Duration.minutes(5),
+            });
+            props.CnameList.forEach(cname => {
+                new aws_route53_1.ARecord(this, `${direction}${cname}`, {
+                    target: aws_route53_1.RecordTarget.fromIpAddresses(IPAddr.ref),
+                    recordName: cname,
+                    zone: aws_route53_1.HostedZone.fromHostedZoneAttributes(this, `${direction}${cname}HostedZone`, {
+                        hostedZoneId: hostedZoneId,
+                        zoneName: props.domainName,
+                    }),
+                    ttl: aws_cdk_lib_2.Duration.minutes(5),
+                });
+            });
+        }
     }
 }
 exports.EC2withDatabase = EC2withDatabase;

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,22 @@ 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']) {
+                if (props.hostedZoneTypes.includes(hostedZoneType)) {
+                    const hostedZoneIdPath = `/all/dns/${props.domainName}/${hostedZoneType}/zoneId`;
+                    const hostedZoneId = aws_ssm_1.StringParameter.valueForStringParameter(this, hostedZoneIdPath);
+                    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.7",
   "description": "Reusable CDK2 modules used within Hesburgh Libraries of Notre Dame",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -37,41 +37,40 @@
   },
   "homepage": "https://github.com/ndlib/ndlib-cdk2#readme",
   "peerDependencies": {
-    "aws-cdk-lib": "^2.24.1",
-    "constructs": "^10.1.12"
+    "aws-cdk-lib": "^2.41.0"
   },
   "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",
-    "aws-sdk-client-mock": "^0.6.2",
-    "eslint": "^8.15.0",
+    "@types/jest": "^29.0.2",
+    "@types/node": "^18.7.18",
+    "@typescript-eslint/eslint-plugin": "^5.37.0",
+    "@typescript-eslint/parser": "^5.37.0",
+    "aws-sdk": "^2.1215.0",
+    "aws-sdk-client-mock": "^2.0.0",
+    "eslint": "^8.23.1",
     "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": "^27.0.4",
+    "eslint-plugin-n": "^15.2.5",
     "eslint-plugin-node": "^11.1.0",
-    "eslint-plugin-promise": "^6.0.0",
+    "eslint-plugin-promise": "^6.0.1",
     "eslint-plugin-standard": "^5.0.0",
     "github-changes": "^2.0.3",
-    "jest": "^28.1.0",
-    "prettier": "^2.6.2",
+    "jest": "^29.0.3",
+    "prettier": "^2.7.1",
     "subpackage": "^1.1.0",
-    "ts-jest": "^28.0.2",
+    "ts-jest": "^29.0.1",
     "tsc-watch": "^5.0.3",
-    "typescript": "^4.6.4"
+    "typescript": "^4.8.3"
   },
   "files": [
     "lib/**/*"
   ],
   "dependencies": {
-    "@aws-cdk/aws-appsync-alpha": "^2.24.1-alpha.0",
-    "aws-cdk-lib": "^2.24.1",
-    "constructs": "^10.1.12",
-    "jest-mock": "^28.1.0",
-    "node-fetch": "^3.2.4"
+    "@aws-cdk/aws-appsync-alpha": "^2.41.0-alpha.0",
+    "aws-cdk-lib": "^2.41.0",
+    "constructs": "^10.1.102",
+    "jest-mock": "^29.0.3",
+    "node-fetch": "^3.2.10"
   },
   "subPackages": [
     "src/internal-lambdas/sourceWatcherLambda/src"