@ndlib/ndlib-cdk2 1.0.35 → 1.0.37

package/README.md

@@ -113,7 +113,7 @@ if(props.slackChannelId){
     // messageText: 'example of additional message text', // optional
     slackChannelId: props.slackChannelId,
     slackChannelName: props.slackChannelName,
-    // slackNotifyTopicArn: 'some valid topic arn', // optional, defaults to: Fn.importValue('slack-pipeline-status-notify:TopicArn')
+    slackNotifyTopicArn: 'some valid topic arn', 
   })
 }
 ```
@@ -424,8 +424,8 @@ import { Topic } from 'aws-cdk-lib/aws-sns'
 
 ...
 // Create a Topic
-    const importedSlackNotifyTopicArn = Fn.importValue(props.slackNotifyTopicOutput)
-    const approvalTopic = Topic.fromTopicArn(this, 'SlackTopicFromArn', importedSlackNotifyTopicArn)
+    const slackNotifyTopicArn = StringParameter.valueForStringParameter(this, props.slackNotifyTopicArnParameterPath)
+    const approvalTopic = Topic.fromTopicArn(this, 'SlackTopicFromArn', slackNotifyTopicArn)
 
 // Call the SlackIntegratedManualApproval
    const approveTestStackAction = new SlackIntegratedManualApproval({

package/lib/internal-lambdas/sourceWatcherLambda/src/node_modules/brace-expansion/README.md

@@ -104,12 +104,6 @@ This module is proudly supported by my [Sponsors](https://github.com/juliangrube
 
 Do you want to support modules like this to improve their quality, stability and weigh in on new features? Then please consider donating to my [Patreon](https://www.patreon.com/juliangruber). Not sure how much of my modules you're using? Try [feross/thanks](https://github.com/feross/thanks)!
 
-## Security contact information
-
-To report a security vulnerability, please use the
-[Tidelift security contact](https://tidelift.com/security).
-Tidelift will coordinate the fix and disclosure.
-
 ## License
 
 (MIT)

package/lib/internal-lambdas/sourceWatcherLambda/src/node_modules/brace-expansion/index.js

@@ -1,3 +1,4 @@
+var concatMap = require('concat-map');
 var balanced = require('balanced-match');
 
 module.exports = expandTop;
@@ -78,6 +79,10 @@ function expandTop(str) {
   return expand(escapeBraces(str), true).map(unescapeBraces);
 }
 
+function identity(e) {
+  return e;
+}
+
 function embrace(str) {
   return '{' + str + '}';
 }
@@ -96,7 +101,42 @@ function expand(str, isTop) {
   var expansions = [];
 
   var m = balanced('{', '}', str);
-  if (!m) return [str];
+  if (!m || /\$$/.test(m.pre)) return [str];
+
+  var isNumericSequence = /^-?\d+\.\.-?\d+(?:\.\.-?\d+)?$/.test(m.body);
+  var isAlphaSequence = /^[a-zA-Z]\.\.[a-zA-Z](?:\.\.-?\d+)?$/.test(m.body);
+  var isSequence = isNumericSequence || isAlphaSequence;
+  var isOptions = m.body.indexOf(',') >= 0;
+  if (!isSequence && !isOptions) {
+    // {a},b}
+    if (m.post.match(/,(?!,).*\}/)) {
+      str = m.pre + '{' + m.body + escClose + m.post;
+      return expand(str);
+    }
+    return [str];
+  }
+
+  var n;
+  if (isSequence) {
+    n = m.body.split(/\.\./);
+  } else {
+    n = parseCommaParts(m.body);
+    if (n.length === 1) {
+      // x{{a,b}}y ==> x{a}y x{b}y
+      n = expand(n[0], false).map(embrace);
+      if (n.length === 1) {
+        var post = m.post.length
+          ? expand(m.post, false)
+          : [''];
+        return post.map(function(p) {
+          return m.pre + n[0] + p;
+        });
+      }
+    }
+  }
+
+  // at this point, n is the parts, and we know it's not a comma set
+  // with a single entry.
 
   // no need to expand pre, since it is guaranteed to be free of brace-sets
   var pre = m.pre;
@@ -104,97 +144,55 @@ function expand(str, isTop) {
     ? expand(m.post, false)
     : [''];
 
-  if (/\$$/.test(m.pre)) {    
-    for (var k = 0; k < post.length; k++) {
-      var expansion = pre+ '{' + m.body + '}' + post[k];
-      expansions.push(expansion);
-    }
-  } else {
-    var isNumericSequence = /^-?\d+\.\.-?\d+(?:\.\.-?\d+)?$/.test(m.body);
-    var isAlphaSequence = /^[a-zA-Z]\.\.[a-zA-Z](?:\.\.-?\d+)?$/.test(m.body);
-    var isSequence = isNumericSequence || isAlphaSequence;
-    var isOptions = m.body.indexOf(',') >= 0;
-    if (!isSequence && !isOptions) {
-      // {a},b}
-      if (m.post.match(/,.*\}/)) {
-        str = m.pre + '{' + m.body + escClose + m.post;
-        return expand(str);
-      }
-      return [str];
-    }
-
-    var n;
-    if (isSequence) {
-      n = m.body.split(/\.\./);
-    } else {
-      n = parseCommaParts(m.body);
-      if (n.length === 1) {
-        // x{{a,b}}y ==> x{a}y x{b}y
-        n = expand(n[0], false).map(embrace);
-        if (n.length === 1) {
-          return post.map(function(p) {
-            return m.pre + n[0] + p;
-          });
-        }
-      }
+  var N;
+
+  if (isSequence) {
+    var x = numeric(n[0]);
+    var y = numeric(n[1]);
+    var width = Math.max(n[0].length, n[1].length)
+    var incr = n.length == 3
+      ? Math.abs(numeric(n[2]))
+      : 1;
+    var test = lte;
+    var reverse = y < x;
+    if (reverse) {
+      incr *= -1;
+      test = gte;
     }
-
-    // at this point, n is the parts, and we know it's not a comma set
-    // with a single entry.
-    var N;
-
-    if (isSequence) {
-      var x = numeric(n[0]);
-      var y = numeric(n[1]);
-      var width = Math.max(n[0].length, n[1].length)
-      var incr = n.length == 3
-        ? Math.abs(numeric(n[2]))
-        : 1;
-      var test = lte;
-      var reverse = y < x;
-      if (reverse) {
-        incr *= -1;
-        test = gte;
-      }
-      var pad = n.some(isPadded);
-
-      N = [];
-
-      for (var i = x; test(i, y); i += incr) {
-        var c;
-        if (isAlphaSequence) {
-          c = String.fromCharCode(i);
-          if (c === '\\')
-            c = '';
-        } else {
-          c = String(i);
-          if (pad) {
-            var need = width - c.length;
-            if (need > 0) {
-              var z = new Array(need + 1).join('0');
-              if (i < 0)
-                c = '-' + z + c.slice(1);
-              else
-                c = z + c;
-            }
+    var pad = n.some(isPadded);
+
+    N = [];
+
+    for (var i = x; test(i, y); i += incr) {
+      var c;
+      if (isAlphaSequence) {
+        c = String.fromCharCode(i);
+        if (c === '\\')
+          c = '';
+      } else {
+        c = String(i);
+        if (pad) {
+          var need = width - c.length;
+          if (need > 0) {
+            var z = new Array(need + 1).join('0');
+            if (i < 0)
+              c = '-' + z + c.slice(1);
+            else
+              c = z + c;
           }
         }
-        N.push(c);
-      }
-    } else {
-      N = [];
-
-      for (var j = 0; j < n.length; j++) {
-        N.push.apply(N, expand(n[j], false));
       }
+      N.push(c);
     }
+  } else {
+    N = concatMap(n, function(el) { return expand(el, false) });
+  }
 
-    for (var j = 0; j < N.length; j++) {
-      for (var k = 0; k < post.length; k++) {
-        var expansion = pre + N[j] + post[k];
-        if (!isTop || isSequence || expansion)
-          expansions.push(expansion);
-      }
+  for (var j = 0; j < N.length; j++) {
+    for (var k = 0; k < post.length; k++) {
+      var expansion = pre + N[j] + post[k];
+      if (!isTop || isSequence || expansion)
+        expansions.push(expansion);
     }
   }
 

package/lib/internal-lambdas/sourceWatcherLambda/src/node_modules/brace-expansion/package.json

@@ -1,7 +1,7 @@
 {
   "name": "brace-expansion",
   "description": "Brace expansion as known from sh/bash",
-  "version": "2.0.1",
+  "version": "1.1.12",
   "repository": {
     "type": "git",
     "url": "git://github.com/juliangruber/brace-expansion.git"
@@ -14,10 +14,11 @@
     "bench": "matcha test/perf/bench.js"
   },
   "dependencies": {
-    "balanced-match": "^1.0.0"
+    "balanced-match": "^1.0.0",
+    "concat-map": "0.0.1"
   },
   "devDependencies": {
-    "@c4312/matcha": "^1.3.1",
+    "matcha": "^0.7.0",
     "tape": "^4.6.0"
   },
   "keywords": [],
@@ -42,5 +43,8 @@
       "iphone/6.0..latest",
       "android-browser/4.2..latest"
     ]
+  },
+  "publishConfig": {
+    "tag": "1.x"
   }
 }

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

@@ -20,12 +20,12 @@
     "node": ">=22.0.0"
   },
   "devDependencies": {
-    "@aws-sdk/client-codepipeline": "^3.835.0",
-    "@aws-sdk/client-ssm": "^3.835.0"
+    "@aws-sdk/client-codepipeline": "^3.840.0",
+    "@aws-sdk/client-ssm": "^3.840.0"
   },
   "dependencies": {
-    "@aws-sdk/client-codepipeline": "^3.835.0",
-    "@aws-sdk/client-ssm": "^3.835.0",
+    "@aws-sdk/client-codepipeline": "^3.840.0",
+    "@aws-sdk/client-ssm": "^3.840.0",
     "glob": "^11.0.3",
     "multimatch": "5.0.0",
     "cross-spawn": "^7.0.6"

package/lib/slack-pipeline-status-notifications.d.ts

@@ -5,7 +5,7 @@ export interface ISlackPipelineStatusNotificationsProps extends StackProps {
     readonly messageText?: string;
     readonly slackChannelId: string;
     readonly slackChannelName?: string;
-    readonly slackNotifyTopicArn?: string;
+    readonly slackNotifyTopicArn: string;
 }
 export interface ISlackPipelineStatusNotificationsData {
     eventInfo: string;

package/lib/slack-pipeline-status-notifications.js

@@ -11,8 +11,7 @@ class SlackPipelineStatusNotifications extends constructs_1.Construct {
         const pipelineName = aws_cdk_lib_1.aws_events.EventField.fromPath('$.detail.pipeline');
         const pipelineState = aws_cdk_lib_1.aws_events.EventField.fromPath('$.detail.state');
         const pipelineBaseUrl = aws_cdk_lib_1.Fn.sub('https://${AWS::Region}.console.aws.amazon.com/codepipeline/home?region=${AWS::Region}#/view/');
-        // eslint-disable-next-line max-len
-        const testStackApprovalTopic = aws_sns_1.Topic.fromTopicArn(this, 'SlackTopicFromArn', props.slackNotifyTopicArn || aws_cdk_lib_1.Fn.importValue('slack-pipeline-status-notify:TopicArn'));
+        const testStackApprovalTopic = aws_sns_1.Topic.fromTopicArn(this, 'SlackTopicFromArn', props.slackNotifyTopicArn);
         const SlackPipelineStatusNotificationsData = {
             eventInfo: eventInfo,
             messageText: props.messageText,

package/lib/source-watcher.d.ts

@@ -30,7 +30,8 @@ export interface ISourceWatcherProps {
     /**
      * Stack name for aws-github-webhook. Needed in order to create a webhook on targetRepo.
      */
-    readonly webhookResourceStackName: string;
+    readonly webhookResourceStackName?: string;
+    readonly webhookResourceArnParameterPath?: string;
 }
 export declare class SourceWatcher extends Construct {
     /**

package/lib/source-watcher.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.SourceWatcher = 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");
 const path = require("path");
 class SourceWatcher extends constructs_1.Construct {
     constructor(scope, id, props) {
@@ -55,8 +56,18 @@ class SourceWatcher extends constructs_1.Construct {
             handler: this.lambdaFunction,
             proxy: true,
         });
+        // Added the following code to get the WebhookLambdaArn from either a parameter store path or a stack name.  (Used to be only from stack name)
+        let githubWebhookLambdaArn = '';
+        if (props.webhookResourceArnParameterPath) {
+            githubWebhookLambdaArn = aws_ssm_1.StringParameter.valueForStringParameter(this, props.webhookResourceArnParameterPath);
+        }
+        if (!githubWebhookLambdaArn && props.webhookResourceStackName) {
+            githubWebhookLambdaArn = aws_cdk_lib_1.Fn.importValue(`${props.webhookResourceStackName}:LambdaArn`);
+        }
+        if (!githubWebhookLambdaArn) {
+            throw new Error('You must provide a webhookResourceArnParameterPath or webhookResourceStackName to create a GitHub webhook.');
+        }
         // Finally, create the Webhook on GitHub to route push events to the API!
-        const githubWebhookLambdaArn = aws_cdk_lib_1.Fn.importValue(`${props.webhookResourceStackName}:LambdaArn`);
         const webhookLambda = aws_cdk_lib_1.aws_lambda.Function.fromFunctionAttributes(this, 'GithubWebhookLambda', {
             functionArn: githubWebhookLambdaArn,
             skipPermissions: true,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ndlib/ndlib-cdk2",
-  "version": "1.0.35",
+  "version": "1.0.37",
   "description": "Reusable CDK2 modules used within Hesburgh Libraries of Notre Dame",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -41,20 +41,20 @@
   },
   "devDependencies": {
     "@types/jest": "^29.5.14",
-    "@types/node": "^24.0.4",
-    "@typescript-eslint/eslint-plugin": "^8.35.0",
-    "@typescript-eslint/parser": "^8.35.0",
+    "@types/node": "^24.0.11",
+    "@typescript-eslint/eslint-plugin": "^8.36.0",
+    "@typescript-eslint/parser": "^8.36.0",
     "aws-sdk-client-mock": "^4.1.0",
-    "eslint": "^9.29.0",
+    "eslint": "^9.30.1",
     "eslint-plugin-import": "^2.32.0",
-    "eslint-plugin-jest": "^20.0.1",
-    "eslint-plugin-n": "^17.20.0",
+    "eslint-plugin-jest": "^29.0.1",
+    "eslint-plugin-n": "^17.21.0",
     "eslint-plugin-node": "^11.1.0",
     "eslint-plugin-promise": "^7.2.1",
     "github-changes": "^2.0.3",
     "jest": "^29.7.0",
     "jest-mock": "^30.0.2",
-    "prettier": "^3.6.1",
+    "prettier": "^3.6.2",
     "ts-jest": "^29.4.0",
     "tsc-watch": "^7.1.1",
     "typescript": "^5.8.3"
@@ -63,7 +63,7 @@
     "lib/**/*"
   ],
   "dependencies": {
-    "aws-cdk-lib": "^2.202.0",
+    "aws-cdk-lib": "^2.204.0",
     "constructs": "^10.4.2"
   },
   "workspaces": [