address comments

ExpediaGroup · Apr 2, 2024 · a6ae38a · a6ae38a
1 parent 36af523
commit a6ae38a
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 20 deletions.
diff --git a/dist/431.index.js b/dist/431.index.js
diff --git a/dist/431.index.js.map b/dist/431.index.js.map
diff --git a/dist/676.index.js b/dist/676.index.js
diff --git a/dist/676.index.js.map b/dist/676.index.js.map
diff --git a/src/helpers/approvals-satisfied.ts b/src/helpers/approvals-satisfied.ts
@@ -33,7 +33,7 @@ export const approvalsSatisfied = async ({ teams, users, number_of_reviewers = '
 
   const teamsList = updateTeamsList(teams?.split('\n'));
   if (!validateTeamsList(teamsList)) {
-    core.setFailed('Teams input must be in the format "org/team" or "team". The org must be the same as the repository owner.');
+    core.setFailed('If teams input is in the format "org/team", then the org must be the same as the repository org');
     return false;
   }
   const usersList = users?.split('\n');
@@ -102,12 +102,11 @@ const updateTeamsList = (teamsList?: string[]) => {
 
 const validateTeamsList = (teamsList?: string[]) => {
   if (teamsList) {
-    teamsList.forEach(team => {
+    return teamsList.every(team => {
       const inputOrg = team.split('/')[0];
-      if (inputOrg !== context.repo.owner) {
-        return false;
-      }
+      return inputOrg === context.repo.owner;
     });
+  } else {
+    return true;
   }
-  return true;
 };