Process.exit(1) on error (#2)

* Process.exit(1) on error * Additional message * Format message
jcantosz · Aug 7, 2023 · 628b3aa · 628b3aa
1 parent d380ae6
commit 628b3aa
Show file tree

Hide file tree

Showing 12 changed files with 1,271 additions and 1,228 deletions.
diff --git a/aad-user-sync/dist/index.js b/aad-user-sync/dist/index.js
@@ -58528,6 +58528,7 @@ async function getGroupsFromAzureAD(client) {
 
 // Get the Azure AD group object for the specified group name.
 async function getGroup(client, groupName) {
+  console.log(`Checking group "${groupName}" against Azure`);
   const group = await client.api(`/groups/`).header("ConsistencyLevel", "eventual").search(`"displayName:${groupName}"`).select("id").get();
   if (group.value.length > 1) {
     throw new Error(`Multiple groups found with name ${groupName}`);
@@ -58907,14 +58908,14 @@ async function main() {
       // If an error occurs, log it and continue to the next group (if configured to do so).
       logError(group.displayName, error);
       if (!continueOnErrors) {
-        break;
+        process.exit(1); // exit with error code
       }
     }
   }
 }
 
 // Call the main function and log any errors.
-main().catch(console.error);
+main();
 
 })();
 

diff --git a/aad-user-sync/main.js b/aad-user-sync/main.js
@@ -60,11 +60,11 @@ async function main() {
       // If an error occurs, log it and continue to the next group (if configured to do so).
       logError(group.displayName, error);
       if (!continueOnErrors) {
-        break;
+        process.exit(1); // exit with error code
       }
     }
   }
 }
 
 // Call the main function and log any errors.
-main().catch(console.error);
+main();
diff --git a/aad-user-sync/src/utils.js b/aad-user-sync/src/utils.js
@@ -88,6 +88,7 @@ async function getGroupsFromAzureAD(client) {
 
 // Get the Azure AD group object for the specified group name.
 async function getGroup(client, groupName) {
+  console.log(`\tChecking group "${groupName}" exists in Azure`);
   const group = await client.api(`/groups/`).header("ConsistencyLevel", "eventual").search(`"displayName:${groupName}"`).select("id").get();
   if (group.value.length > 1) {
     throw new Error(`Multiple groups found with name ${groupName}`);

diff --git a/create-teams-from-directories/action.yaml b/create-teams-from-directories/action.yaml
@@ -22,6 +22,10 @@ inputs:
   dry_run:
     description: "Prevent executing commands that would make changes to GitHub"
     required: false
+  continue_on_errors:
+    description: "If errors should be ignored"
+    required: false
+    default: "false"
 
 runs:
   using: "node16"