@ndlib/ndlib-cdk2 1.0.30 → 1.0.32

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

@@ -5,24 +5,29 @@
   "license": "Apache-2.0",
   "repository": {
     "type": "git",
-    "url": "https://github.com/ndlib/ndlib-cdk2.git"
+    "url": "https://github.com/ndlibrary/ndlib-cdk2.git"
   },
   "bugs": {
-    "url": "https://github.com/ndlib/ndlib-cdk2/issues"
+    "url": "https://github.com/ndlibrary/ndlib-cdk2/issues"
   },
-  "homepage": "https://github.com/ndlib/ndlib-cdk2#readme",
+  "homepage": "https://github.com/ndlibrary/ndlib-cdk2#readme",
   "keywords": [
     "aws",
     "cdk",
     "ndlib"
   ],
   "engines": {
-    "node": ">=18.0.0"
+    "node": ">=22.0.0"
+  },
+  "devDependencies": {
+    "@aws-sdk/client-codepipeline": "^3.758.0",
+    "@aws-sdk/client-ssm": "^3.759.0"
   },
   "dependencies": {
-    "@aws-sdk/client-codepipeline": "3.583.0",
-    "@aws-sdk/client-ssm": "3.583.0",
-    "glob": "^10.4.1",
-    "multimatch": "^5.0.0"
+    "@aws-sdk/client-codepipeline": "^3.758.0",
+    "@aws-sdk/client-ssm": "^3.759.0",
+    "glob": "^11.0.1",
+    "multimatch": "5.0.0",
+    "cross-spawn": "^7.0.6"
   }
 }

package/lib/newman-runner.js

@@ -18,7 +18,7 @@ class NewmanRunner {
                 phases: {
                     install: {
                         commands: [
-                            'n 20',
+                            'n 22',
                             'npm install --global yarn',
                             'npm install -g newman@6.1.3',
                             'echo "Ensure that the Newman spec is readable"',

package/lib/rds/postgres-stack.js

@@ -37,7 +37,7 @@ class PostgresRDSConstruct extends constructs_1.Construct {
             },
         });
         const parameterGroupDescription = `Parameter Group for ${props.dbClusterIdentifier}`;
-        let auroraParameters = {};
+        const auroraParameters = {};
         auroraParameters['timezone'] = 'US/Eastern';
         auroraParameters['idle_session_timeout'] = '60000'; // 1 minute idle timeout for any given session
         const libParameterGroup = new aws_rds_1.ParameterGroup(this, 'LibParameterGroup', {
@@ -87,6 +87,7 @@ class PostgresRDSConstruct extends constructs_1.Construct {
             storageEncrypted: true,
             parameterGroup: libParameterGroup,
             vpc: vpc,
+            enableDataApi: true,
             storageType: aws_rds_1.DBClusterStorageType.AURORA_IOPT1,
             deletionProtection: true,
             writer: aws_rds_1.ClusterInstance.serverlessV2('writer'),

package/lib/source-watcher.js

@@ -24,7 +24,7 @@ class SourceWatcher extends constructs_1.Construct {
             code: aws_cdk_lib_1.aws_lambda.Code.fromAsset(path.join(__dirname, './internal-lambdas/sourceWatcherLambda/src')),
             description: 'Checks if git push changed certain files and triggers pipeline(s) accordingly.',
             handler: 'index.handler',
-            runtime: aws_cdk_lib_1.aws_lambda.Runtime.NODEJS_20_X,
+            runtime: aws_cdk_lib_1.aws_lambda.Runtime.NODEJS_22_X,
             timeout: aws_cdk_lib_1.Duration.minutes(1),
             environment: {
                 WEBHOOK_SECRET: webhookSecret.toString(),

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@ndlib/ndlib-cdk2",
-  "version": "1.0.30",
+  "version": "1.0.32",
   "description": "Reusable CDK2 modules used within Hesburgh Libraries of Notre Dame",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
   "scripts": {
     "test": "jest --config jestconfig.json",
     "coverage": "jest --config jestconfig.json --coverage",
-    "build": "subpkg install && tsc && ./copy-lambda-files.sh",
+    "build": "tsc && ./copy-lambda-files.sh",
     "format": "eslint '*/**/*.{js,ts,tsx}' --quiet --fix",
     "lint": "eslint '*/**/*.{js,ts,tsx}'",
     "generate-changelog": "github-changes -n ${npm_package_version} -o ndlib -r ndlib-cdk2 --only-pulls --use-commit-body",
@@ -37,41 +37,40 @@
   },
   "homepage": "https://github.com/ndlibrary/ndlib-cdk2#readme",
   "peerDependencies": {
-    "aws-cdk-lib": "^2.134.0"
+    "aws-cdk-lib": "^2.184.1"
   },
   "devDependencies": {
     "@types/jest": "^29.5.14",
-    "@types/node": "^22.10.0",
-    "@typescript-eslint/eslint-plugin": "^8.16.0",
-    "@typescript-eslint/parser": "^8.16.0",
+    "@types/node": "^22.13.10",
+    "@typescript-eslint/eslint-plugin": "^8.26.1",
+    "@typescript-eslint/parser": "^8.26.1",
     "aws-sdk-client-mock": "^4.1.0",
-    "eslint": "^9.15.0",
+    "eslint": "^9.22.0",
     "eslint-plugin-import": "^2.31.0",
-    "eslint-plugin-jest": "^28.9.0",
-    "eslint-plugin-n": "^17.14.0",
+    "eslint-plugin-jest": "^28.11.0",
+    "eslint-plugin-n": "^17.16.2",
     "eslint-plugin-node": "^11.1.0",
     "eslint-plugin-promise": "^7.2.1",
     "github-changes": "^2.0.3",
     "jest": "^29.7.0",
     "jest-mock": "^29.7.0",
-    "prettier": "^3.4.1",
-    "subpackage": "^1.1.0",
-    "ts-jest": "^29.2.5",
+    "prettier": "^3.5.3",
+    "ts-jest": "^29.2.6",
     "tsc-watch": "^6.2.1",
-    "typescript": "^5.7.2"
+    "typescript": "^5.8.2"
   },
   "files": [
     "lib/**/*"
   ],
   "dependencies": {
-    "aws-cdk-lib": "^2.171.0",
+    "aws-cdk-lib": "^2.184.1",
     "constructs": "^10.4.2",
     "node-fetch": "^3.3.2"
   },
-  "subPackages": [
+  "workspaces": [
     "src/internal-lambdas/sourceWatcherLambda/src"
   ],
   "engines": {
-    "node": ">=20.0.0"
+    "node": ">=22.0.0"
   }
 }

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

@@ -1 +0,0 @@
-export * from './static-host';

package/lib/static-host/index.js

@@ -1,17 +0,0 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __exportStar = (this && this.__exportStar) || function(m, exports) {
-    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-__exportStar(require("./static-host"), exports);

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

@@ -1,74 +0,0 @@
-import { aws_certificatemanager, aws_cloudfront, aws_s3, aws_ssm } from 'aws-cdk-lib';
-import { Construct } from 'constructs';
-import { IEdgeLambda } from '../edge-lambdas';
-export interface IStaticHostProps {
-    /**
-     * This will be used as the prefix in the hostname.
-     */
-    readonly hostnamePrefix: string;
-    /**
-     * Domain name for cloudfront to be hosted at.
-     */
-    readonly domainName: string;
-    /**
-     * SSL certificate to use with cloudfront. Should match domainName.
-     */
-    readonly websiteCertificate: aws_certificatemanager.ICertificate;
-    /**
-     * Should create a DNS record in route53 for the generated hostname. (hostnamePrefix.domainName)
-     * Generally this should only be done with domains other than library.nd.edu.
-     */
-    readonly createDns?: boolean;
-    /**
-     * 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 hostedZoneTypes?: string[];
-    /**
-     * Root page to be served.
-     */
-    readonly indexFilename?: string;
-    /**
-     * Edge lambdas to be configured for use with the CloudFront.
-     */
-    readonly edgeLambdas?: IEdgeLambda[];
-    /**
-     * Error page configuration for the CloudFront distribution.
-     */
-    readonly errorConfig?: aws_cloudfront.CfnDistribution.CustomErrorResponseProperty[];
-    /**
-     * (Optional) Bucket to write logs to. Will create a new bucket by default.
-     */
-    readonly logBucket?: aws_s3.Bucket;
-}
-export declare class StaticHost extends Construct {
-    /**
-     * The S3 bucket that will hold website contents.
-     */
-    readonly bucket: aws_s3.Bucket;
-    /**
-     * The S3 bucket where log files are stored.
-     */
-    readonly logBucket: aws_s3.Bucket;
-    /**
-     * The cloudfront distribution.
-     */
-    readonly cloudfront: aws_cloudfront.CloudFrontWebDistribution;
-    /**
-     * The cloudfront distribution domain name.
-     */
-    readonly hostname: string;
-    /**
-     * Parameter in SSM which will store the name of the site content s3 bucket.
-     */
-    readonly bucketNameParam: aws_ssm.StringParameter;
-    /**
-     * Parameter in SSM which will store the id of the cloudfront distribution.
-     */
-    readonly distributionIdParam: aws_ssm.StringParameter;
-    /**
-     * Props passed to constructor. Used for validation.
-     */
-    private readonly inProps;
-    constructor(scope: Construct, id: string, props: IStaticHostProps);
-}

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

@@ -1,146 +0,0 @@
-"use strict";
-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 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;
-        if (this.inProps.createDns) {
-            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.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);
-        this.hostname = `${props.hostnamePrefix}.${props.domainName}`;
-        // Create buckets for holding logs and the site contents
-        this.logBucket =
-            props.logBucket ||
-                new aws_cdk_lib_1.aws_s3.Bucket(this, 'LogBucket', {
-                    accessControl: aws_cdk_lib_1.aws_s3.BucketAccessControl.LOG_DELIVERY_WRITE,
-                    //we need to set versioned for all buckets to be backed up, but we're not backing up static-host buckets
-                    versioned: false,
-                    removalPolicy: aws_cdk_lib_1.RemovalPolicy.DESTROY,
-                });
-        //add tag for backup (we are not backing up the logs buckets)
-        aws_cdk_lib_1.Tags.of(this.logBucket).add('Backup', 'False');
-        this.bucket = new aws_cdk_lib_1.aws_s3.Bucket(this, 'SiteBucket', {
-            versioned: false,
-            serverAccessLogsBucket: this.logBucket,
-            serverAccessLogsPrefix: `s3/${this.hostname}/`,
-            removalPolicy: aws_cdk_lib_1.RemovalPolicy.DESTROY,
-        });
-        //add tag for backup (we are not backing up the static host buckets, either)
-        aws_cdk_lib_1.Tags.of(this.bucket).add('Backup', 'False');
-        // Create OAI so CloudFront can access bucket files
-        const oai = new aws_cdk_lib_1.aws_cloudfront.OriginAccessIdentity(this, 'OriginAccessIdentity', {
-            comment: `Static assets in ${stack.stackName}`,
-        });
-        this.bucket.addToResourcePolicy(new aws_cdk_lib_1.aws_iam.PolicyStatement({
-            effect: aws_cdk_lib_1.aws_iam.Effect.ALLOW,
-            actions: ['s3:GetBucket*', 's3:List*', 's3:GetObject*'],
-            resources: [this.bucket.bucketArn, this.bucket.bucketArn + '/*'],
-            principals: [new aws_cdk_lib_1.aws_iam.CanonicalUserPrincipal(oai.cloudFrontOriginAccessIdentityS3CanonicalUserId)],
-        }));
-        // Allow edge lambdas to access bucket contents
-        (_a = props.edgeLambdas) === null || _a === void 0 ? void 0 : _a.forEach(edgeLambda => {
-            edgeLambda.function.addToRolePolicy(new aws_cdk_lib_1.aws_iam.PolicyStatement({
-                resources: [this.bucket.bucketArn + '/*'],
-                actions: ['s3:GetObject*'],
-            }));
-        });
-        // Won't work right if it starts with slash. It's an easy mistake to make so just handle it here
-        let indexPath = props.indexFilename || 'index.html';
-        if (indexPath.startsWith('/')) {
-            indexPath = indexPath.substring(1);
-        }
-        this.cloudfront = new aws_cdk_lib_1.aws_cloudfront.CloudFrontWebDistribution(this, 'Distribution', {
-            comment: this.hostname,
-            defaultRootObject: indexPath,
-            errorConfigurations: props.errorConfig || [
-                {
-                    errorCode: 403,
-                    responseCode: 403,
-                    responsePagePath: '/' + indexPath,
-                    errorCachingMinTtl: 3600,
-                },
-                {
-                    errorCode: 404,
-                    responseCode: 404,
-                    responsePagePath: '/' + indexPath,
-                    errorCachingMinTtl: 3600,
-                },
-            ],
-            loggingConfig: {
-                bucket: this.logBucket,
-                includeCookies: true,
-                prefix: `web/${this.hostname}/`,
-            },
-            originConfigs: [
-                {
-                    s3OriginSource: {
-                        s3BucketSource: this.bucket,
-                        originAccessIdentity: oai,
-                    },
-                    behaviors: props.edgeLambdas && props.edgeLambdas.length
-                        ? props.edgeLambdas.map(item => item.behavior)
-                        : [
-                            {
-                                allowedMethods: aws_cdk_lib_1.aws_cloudfront.CloudFrontAllowedMethods.GET_HEAD_OPTIONS,
-                                compress: true,
-                                isDefaultBehavior: true,
-                            },
-                        ],
-                },
-            ],
-            viewerCertificate: aws_cdk_lib_1.aws_cloudfront.ViewerCertificate.fromAcmCertificate(props.websiteCertificate, {
-                aliases: [this.hostname],
-                securityPolicy: aws_cdk_lib_1.aws_cloudfront.SecurityPolicyProtocol.TLS_V1_2_2021,
-                sslMethod: aws_cdk_lib_1.aws_cloudfront.SSLMethod.SNI,
-            }),
-            viewerProtocolPolicy: aws_cdk_lib_1.aws_cloudfront.ViewerProtocolPolicy.REDIRECT_TO_HTTPS,
-        });
-        // Create DNS record (conditionally)
-        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', {
-            parameterName: `/all/stacks/${stack.stackName}/site-bucket-name`,
-            description: 'Bucket where the stack website deploys to.',
-            stringValue: this.bucket.bucketName,
-        });
-        this.distributionIdParam = new aws_cdk_lib_1.aws_ssm.StringParameter(this, 'DistributionParameter', {
-            parameterName: `/all/stacks/${stack.stackName}/distribution-id`,
-            description: 'ID of the CloudFront distribution.',
-            stringValue: this.cloudfront.distributionId,
-        });
-        new aws_cdk_lib_1.CfnOutput(this, 'DistributionDomainName', {
-            value: this.cloudfront.distributionDomainName,
-            description: 'The cloudfront distribution domain name.',
-        });
-    }
-}
-exports.StaticHost = StaticHost;