Merge branch 'v2' into zarate-output

Enterprise-CMCS · Dec 17, 2024 · 3a40832 · 3a40832
2 parents 7e38175 + 330176a
commit 3a40832
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 12 deletions.
diff --git a/dist/index.js b/dist/index.js
diff --git a/src/libs/jira-lib.ts b/src/libs/jira-lib.ts
@@ -485,16 +485,23 @@ export class Jira {
       // Construct the webUrl for the new issue
       newIssue['webUrl'] = `${this.jiraBaseURI}/browse/${newIssue.key}`
       await this.removeCurrentUserAsWatcher(newIssue.key)
-      if (this.jiraWatchers) {
-        await Promise.all(
-          this.jiraWatchers.map((watcher: string) =>
-            this.addUserAsWatcher(
-              newIssue.key,
-              watcher,
-              this.jiraBaseURI.includes('atlassian') == false
+      if (this.jiraWatchers && this.jiraWatchers.length >= 1) {
+        try {
+          await Promise.all(
+            this.jiraWatchers.map(
+              (watcher: string) =>
+                watcher &&
+                this.addUserAsWatcher(
+                  newIssue.key,
+                  watcher,
+                  this.jiraBaseURI.includes('atlassian') == false
+                )
             )
           )
-        )
+        } catch (error: unknown) {
+          console.log('Error: could not add watchers', this.jiraWatchers)
+          return newIssue
+        }
       }
       return newIssue
     } catch (error: unknown) {

diff --git a/src/macfc-security-hub-sync.ts b/src/macfc-security-hub-sync.ts
@@ -447,7 +447,7 @@ export class SecurityHubJiraSync {
 
     // Validate the extracted region
     if (!isAwsRegion(region)) {
-      console.error(`Invalid AWS region: ${region}`)
+      //console.error(`Invalid AWS region: ${region}`)
       region = 'us-east-1' // Fallback to default region
     }