@ndlib/ndlib-cdk2 1.0.9 → 1.0.11

package/lib/internal-lambdas/sourceWatcherLambda/src/package.json

@@ -17,12 +17,12 @@
     "ndlib"
   ],
   "engines": {
-    "node": ">=12.9.0 <15 || >=16.0.0"
+    "node": ">=16.0.0"
   },
   "dependencies": {
-    "@aws-sdk/client-codepipeline": "3.18.0",
-    "@aws-sdk/client-ssm": "3.18.0",
-    "glob": "^7.1.7",
+    "@aws-sdk/client-codepipeline": "3.293.0",
+    "@aws-sdk/client-ssm": "3.293.0",
+    "glob": "^9.3.0",
     "multimatch": "^5.0.0"
   }
 }

package/lib/newman-runner.js

@@ -15,10 +15,8 @@ class NewmanRunner {
                 version: '0.2',
                 phases: {
                     install: {
-                        'runtime-versions': {
-                            nodejs: '18.x',
-                        },
                         commands: [
+                            'n 18',
                             'npm install -g newman@5.3.2',
                             'echo "Ensure that the Newman spec is readable"',
                             `chmod 755 ${props.collectionPath}`,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ndlib/ndlib-cdk2",
-  "version": "1.0.9",
+  "version": "1.0.11",
   "description": "Reusable CDK2 modules used within Hesburgh Libraries of Notre Dame",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -40,27 +40,26 @@
     "aws-cdk-lib": "^2.64.0"
   },
   "devDependencies": {
-    "@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.1216.0",
-    "aws-sdk-client-mock": "^2.0.0",
-    "eslint": "^8.23.1",
+    "@types/jest": "^29.5.0",
+    "@types/node": "^18.15.3",
+    "@typescript-eslint/eslint-plugin": "^5.55.0",
+    "@typescript-eslint/parser": "^5.55.0",
+    "aws-sdk-client-mock": "^2.1.1",
+    "eslint": "^8.36.0",
     "eslint-config-standard": "^17.0.0",
-    "eslint-plugin-import": "^2.26.0",
-    "eslint-plugin-jest": "^27.0.4",
-    "eslint-plugin-n": "^15.2.5",
+    "eslint-plugin-import": "^2.27.5",
+    "eslint-plugin-jest": "^27.2.1",
+    "eslint-plugin-n": "^15.6.1",
     "eslint-plugin-node": "^11.1.0",
-    "eslint-plugin-promise": "^6.0.1",
+    "eslint-plugin-promise": "^6.1.1",
     "eslint-plugin-standard": "^5.0.0",
     "github-changes": "^2.0.3",
-    "jest": "^29.0.3",
-    "jest-mock": "^29.0.3",
-    "prettier": "^2.7.1",
+    "jest": "^29.5.0",
+    "jest-mock": "^29.5.0",
+    "prettier": "^2.8.4",
     "subpackage": "^1.1.0",
-    "ts-jest": "^29.0.1",
-    "tsc-watch": "^5.0.3",
+    "ts-jest": "^29.0.5",
+    "tsc-watch": "^6.0.0",
     "typescript": "^4.8.3"
   },
   "files": [
@@ -68,8 +67,8 @@
   ],
   "dependencies": {
     "aws-cdk-lib": "^2.64.0",
-    "constructs": "^10.1.250",
-    "node-fetch": "^3.2.10"
+    "constructs": "^10.1.280",
+    "node-fetch": "^3.3.1"
   },
   "subPackages": [
     "src/internal-lambdas/sourceWatcherLambda/src"

package/lib/edge-lambdas/transclusionLambda/index.d.ts

@@ -1,19 +0,0 @@
-import { aws_cloudfront, aws_lambda, aws_s3 } from 'aws-cdk-lib';
-import { Construct } from 'constructs';
-import { IEdgeLambda, IEdgeLambdaProps } from '../index';
-export interface ITransclusionLambdaProps extends IEdgeLambdaProps {
-    /**
-     * The bucket where site files are hosted. Needed to grant permissions so the lambda can fetch objects.
-     * If omitted, you can add the permissions later by calling grantBucketAccess.
-     */
-    originBucket?: aws_s3.IBucket;
-}
-export declare class TransclusionLambda extends Construct implements IEdgeLambda {
-    readonly function: aws_lambda.Function;
-    readonly behavior: aws_cloudfront.Behavior;
-    constructor(scope: Construct, id: string, props: ITransclusionLambdaProps);
-    /**
-     * Add permissions for the transclusion lambda to access the supplied bucket.
-     */
-    grantBucketAccess(bucket: aws_s3.IBucket): void;
-}

package/lib/edge-lambdas/transclusionLambda/index.js

@@ -1,48 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.TransclusionLambda = void 0;
-/* tslint:disable:max-classes-per-file */
-const aws_cdk_lib_1 = require("aws-cdk-lib");
-const constructs_1 = require("constructs");
-const path = require("path");
-class TransclusionLambda extends constructs_1.Construct {
-    constructor(scope, id, props) {
-        super(scope, id);
-        this.function = new aws_cdk_lib_1.aws_lambda.Function(scope, `${id}Function`, {
-            code: aws_cdk_lib_1.aws_lambda.Code.fromAsset(path.join(__dirname, 'src')),
-            description: 'Handles includes inside shtml files so we can serve them up correctly.',
-            handler: 'handler.handler',
-            runtime: aws_cdk_lib_1.aws_lambda.Runtime.NODEJS_18_X,
-            timeout: aws_cdk_lib_1.Duration.seconds(10),
-            ...props,
-        });
-        this.behavior = {
-            allowedMethods: aws_cdk_lib_1.aws_cloudfront.CloudFrontAllowedMethods.GET_HEAD_OPTIONS,
-            compress: true,
-            isDefaultBehavior: props.isDefaultBehavior,
-            pathPattern: props.pathPattern || '*.shtml',
-            lambdaFunctionAssociations: [
-                {
-                    eventType: props.eventType || aws_cdk_lib_1.aws_cloudfront.LambdaEdgeEventType.ORIGIN_REQUEST,
-                    lambdaFunction: this.function.currentVersion,
-                },
-            ],
-            minTtl: props.minTtl,
-            maxTtl: props.maxTtl,
-            defaultTtl: props.defaultTtl,
-        };
-        if (props.originBucket) {
-            this.grantBucketAccess(props.originBucket);
-        }
-    }
-    /**
-     * Add permissions for the transclusion lambda to access the supplied bucket.
-     */
-    grantBucketAccess(bucket) {
-        this.function.addToRolePolicy(new aws_cdk_lib_1.aws_iam.PolicyStatement({
-            resources: [bucket.bucketArn + '/*'],
-            actions: ['s3:GetObject*'],
-        }));
-    }
-}
-exports.TransclusionLambda = TransclusionLambda;

package/lib/edge-lambdas/transclusionLambda/src/getFromS3.d.ts

@@ -1,3 +0,0 @@
-import { S3 } from 'aws-sdk';
-export declare const getFromS3: (bucketName: string, objectPath: string) => Promise<import("aws-sdk/lib/request").PromiseResult<S3.GetObjectOutput, import("aws-sdk").AWSError>>;
-export default getFromS3;

package/lib/edge-lambdas/transclusionLambda/src/getFromS3.js

@@ -1,20 +0,0 @@
-import AWS  from 'aws-sdk'
-// const AWS = require('aws-sdk') // eslint-disable-line node/no-unpublished-require
-const s3 = new AWS.S3({ region: 'us-east-1', apiVersion: '2006-03-01' })
-// const path = require('path')
-
-export const getFromS3 = async (bucketName, objectPath) => {
-// module.exports.getFromS3 = async (bucketName, objectPath) => {
-  // The key for s3 documents does NOT include a root level slash at the beginning
-  if (objectPath.startsWith('/')) {
-    objectPath = objectPath.substring(1)
-  }
-  console.log('Fetch from s3:', bucketName + '/' + objectPath)
-  return s3
-    .getObject({
-      Bucket: bucketName,
-      Key: objectPath,
-    })
-    .promise()
-}
-export default getFromS3

package/lib/edge-lambdas/transclusionLambda/src/getFromS3.ts

@@ -1,20 +0,0 @@
-import { S3 }  from 'aws-sdk'
-// const AWS = require('aws-sdk') // eslint-disable-line node/no-unpublished-require
-const s3 = new S3({ region: 'us-east-1', apiVersion: '2006-03-01' })
-// const path = require('path')
-
-export const getFromS3 = async (bucketName: string, objectPath: string) => {
-// module.exports.getFromS3 = async (bucketName, objectPath) => {
-  // The key for s3 documents does NOT include a root level slash at the beginning
-  if (objectPath.startsWith('/')) {
-    objectPath = objectPath.substring(1)
-  }
-  console.log('Fetch from s3:', bucketName + '/' + objectPath)
-  return s3
-    .getObject({
-      Bucket: bucketName,
-      Key: objectPath,
-    })
-    .promise()
-}
-export default getFromS3

package/lib/edge-lambdas/transclusionLambda/src/handler.d.ts

@@ -1,7 +0,0 @@
-export declare const transclude: (body: any, bucketName: any, parentDir: any) => any;
-export declare const handler: (event: any, context: any, callback: any) => Promise<any>;
-declare const everything: {
-    transclude: (body: any, bucketName: any, parentDir: any) => any;
-    handler: (event: any, context: any, callback: any) => Promise<any>;
-};
-export default everything;

package/lib/edge-lambdas/transclusionLambda/src/handler.js

@@ -1,86 +0,0 @@
-const AWS = require('aws-sdk') // eslint-disable-line node/no-unpublished-require
-const s3 = new AWS.S3({ region: 'us-east-1', apiVersion: '2006-03-01' })
-const path = require('path')
-
-module.exports.getFromS3 = async (bucketName, objectPath) => {
-  // The key for s3 documents does NOT include a root level slash at the beginning
-  if (objectPath.startsWith('/')) {
-    objectPath = objectPath.substring(1)
-  }
-  console.log('Fetch from s3:', bucketName + '/' + objectPath)
-  return s3
-    .getObject({
-      Bucket: bucketName,
-      Key: objectPath,
-    })
-    .promise()
-}
-
-const transclude = async (body, bucketName, parentDir) => {
-  // Get the paths of files to include from strings like: <!--#include virtual="foo/bar.shtml" -->
-  const includesRegex = /<!--\s?#include virtual="(.+?)"\s?-->/g
-  const matches = Array.from(body.matchAll(includesRegex))
-
-  // Fetch all included files
-  const promises = matches.map(match => exports.getFromS3(bucketName, path.resolve(parentDir, match[1])))
-  return Promise.all(promises).then(async s3results => {
-    // Also need to transclude the included page if it is an shtml file
-    const includedBodies = await s3results.map(async (response, index) => {
-      const pageBody = response.Body.toString()
-      const filepath = matches[index][1]
-      console.log('retrieved', filepath)
-      const pageDir = path.resolve(parentDir, path.dirname(filepath))
-      const resultBody =
-        path.extname(filepath) === '.shtml' ? await transclude(pageBody, bucketName, pageDir) : pageBody
-      return resultBody
-    })
-    return Promise.all(includedBodies).then(async resolvedBodies => {
-      resolvedBodies.forEach(async (includedBody, index) => {
-        body = body.replace(matches[index][0], includedBody)
-      })
-      return body
-    })
-  })
-}
-
-module.exports.handler = async (event, context, callback) => {
-  const request = event.Records[0].cf.request
-  const uri = request.uri
-
-  console.log('Request:', JSON.stringify(request, null, 2))
-  if (uri === '/' || path.extname(uri) === '.shtml') {
-    // Get the name of the origin bucket that was fetched from
-    // Ex: hackathon-dev-site-333680067100.s3.us-east-1.amazonaws.com -> hackathon-dev-site-333680067100
-    const bucketName = request.origin.s3.domainName.replace(/\.s3\..*\.amazonaws.com/, '')
-
-    // Now get the requested file
-    const filepath = uri === '/' ? '/index.shtml' : uri
-    const response = await exports.getFromS3(bucketName, filepath)
-
-    // Transclude any included files in the response body
-    const modifiedBody = await transclude(response.Body.toString(), bucketName, path.dirname(filepath))
-    return callback(null, {
-      body: modifiedBody,
-      bodyEncoding: 'text',
-      status: '200',
-      statusDescription: 'OK',
-      headers: {
-        'content-type': [
-          {
-            key: 'Content-Type',
-            value: 'text/html; charset=UTF-8',
-          },
-        ],
-        'cache-control': [
-          {
-            key: 'Cache-Control',
-            value: 'max-age=3600',
-          },
-        ],
-      },
-    })
-  } else {
-    // Was not an shtml file so we can serve it up as is without additional processing
-    return callback(null, request)
-  }
-}