From 4dd65a0140b2d28b6e78cad349f4a1fbcfe6ff38 Mon Sep 17 00:00:00 2001
From: DrIOS <58635327+DrIOSX@users.noreply.github.com>
Date: Sun, 23 Jun 2024 16:06:02 -0500
Subject: [PATCH] add: Error handling to output functions

---
 source/Private/Get-CISMSTeamsOutput.ps1 |  4 +---
 source/Private/Get-CISMgOutput.ps1      | 11 ++++++-----
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/source/Private/Get-CISMSTeamsOutput.ps1 b/source/Private/Get-CISMSTeamsOutput.ps1
index 79768fe..14b108f 100644
--- a/source/Private/Get-CISMSTeamsOutput.ps1
+++ b/source/Private/Get-CISMSTeamsOutput.ps1
@@ -266,9 +266,7 @@ function Get-CISMSTeamsOutput {
                 $CsTeamsMessagingPolicy = Get-CsTeamsMessagingPolicy -Identity Global | Select-Object -Property AllowSecurityEndUserReporting
                 return $CsTeamsMessagingPolicy
             }
-            default {
-                Write-Output "No matching action found"
-            }
+            default { throw "No match found for test: $Rec" }
         }
     }
     end {
diff --git a/source/Private/Get-CISMgOutput.ps1 b/source/Private/Get-CISMgOutput.ps1
index 3b43c30..55344e8 100644
--- a/source/Private/Get-CISMgOutput.ps1
+++ b/source/Private/Get-CISMgOutput.ps1
@@ -39,6 +39,11 @@ function Get-CISMgOutput {
     }
     process {
         switch ($rec) {
+            '1.1.1' {
+                # 1.1.1
+                $AdminRoleAssignmentsAndUsers = Get-AdminRoleUserAndAssignment
+                return $AdminRoleAssignmentsAndUsers
+            }
             '1.1.3' {
                 # Step: Retrieve global admin role
                 $globalAdminRole = Get-MgDirectoryRole -Filter "RoleTemplateId eq '62e90394-69f5-4237-9190-012177145e10'"
@@ -84,11 +89,7 @@ function Get-CISMgOutput {
                     return $null
                 }
             }
-            Default {
-                # 1.1.1
-                $AdminRoleAssignmentsAndUsers = Get-AdminRoleUserAndAssignment
-                return $AdminRoleAssignmentsAndUsers
-            }
+            default { throw "No match found for test: $Rec" }
         }
     }
     end {