Merge pull request #224 from hubot-archive/check-empty-match

Check for empty match on incident lookup
hubot-archive · Apr 4, 2024 · 0ea0d87 · 0ea0d87
2 parents cfd8ee2 + 4fc0cdf
commit 0ea0d87
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/src/scripts/pagerduty.js b/src/scripts/pagerduty.js
@@ -92,7 +92,7 @@ module.exports = function (robot) {
     msg.send("Okay, I've forgotten your PagerDuty email");
   });
 
-  robot.respond(/(pager|major)( me)? incident (.*)$/i, function (msg) {
+  robot.respond(/(pager|major)( me)? incident ([a-z0-9]+)$/i, function (msg) {
     msg.finish();
 
     if (pagerduty.missingEnvironmentForApi(msg)) {
@@ -105,6 +105,12 @@ module.exports = function (robot) {
         return;
       }
 
+      if (!incident || !incident['incident']) {
+        logger.debug(incident);
+        msg.send('No matching incident found for `msg.match[3]`.');
+        return;
+      }
+
       msg.send(formatIncident(incident['incident']));
     });
   });

diff --git a/test/pager-me-test.js b/test/pager-me-test.js
@@ -35,7 +35,7 @@ describe('pagerduty', function () {
   });
 
   it('registers a pager incident listener', function () {
-    expect(this.robot.respond).to.have.been.calledWith(/(pager|major)( me)? incident (.*)$/i);
+    expect(this.robot.respond).to.have.been.calledWith(/(pager|major)( me)? incident ([a-z0-9]+)$/i);
   });
 
   it('registers a pager sup listener', function () {