🧹 improve the powershell error handling for the cnspec login command (#…

…379) * improve the powershell error handling for the cnspec login command Signed-off-by: Patrick Münch <[email protected]> * update powershell gallery module Signed-off-by: Patrick Münch <[email protected]> --------- Signed-off-by: Patrick Münch <[email protected]>
mondoohq · Oct 29, 2023 · 0ddb5c1 · 0ddb5c1
1 parent d5fa35a
commit 0ddb5c1
Show file tree

Hide file tree

Showing 3 changed files with 39 additions and 3 deletions.
diff --git a/install.ps1 b/install.ps1
@@ -314,8 +314,26 @@ function Install-Mondoo {
         If (![string]::IsNullOrEmpty($Proxy)) {
            $login_params = $login_params + @("--api-proxy", "$Proxy")
         }
+
         $program = "$Path\cnspec.exe"
-        & $program $login_params
+
+        # Cache the error action preference
+        $backupErrorActionPreference = $ErrorActionPreference
+        $ErrorActionPreference = "Continue"
+
+        # Capture all output from mysql
+        $output = (& $program $login_params 2>&1)
+
+        # Restore the error action preference
+        $ErrorActionPreference = $backupErrorActionPreference
+
+        if ($output -match "ERROR") {
+          throw $output
+        } elseif($output) {
+          info "$output"
+        } else {
+          info "No output"
+        }
       }
 
       If (@(0,3010) -contains $process.ExitCode) {

diff --git a/powershell/Mondoo.Installer/Mondoo.Installer.psd1 b/powershell/Mondoo.Installer/Mondoo.Installer.psd1
@@ -7,7 +7,7 @@
     RootModule = './Mondoo.Installer.psm1'
 
     # Version number of this module.
-    ModuleVersion = '1.2.0'
+    ModuleVersion = '1.3.0'
 
     # Supported PSEditions
     # CompatiblePSEditions = @()

diff --git a/powershell/Mondoo.Installer/Mondoo.Installer.psm1 b/powershell/Mondoo.Installer/Mondoo.Installer.psm1
@@ -314,8 +314,26 @@ function Install-Mondoo {
         If (![string]::IsNullOrEmpty($Proxy)) {
            $login_params = $login_params + @("--api-proxy", "$Proxy")
         }
+
         $program = "$Path\cnspec.exe"
-        & $program $login_params
+
+        # Cache the error action preference
+        $backupErrorActionPreference = $ErrorActionPreference
+        $ErrorActionPreference = "Continue"
+
+        # Capture all output from mysql
+        $output = (& $program $login_params 2>&1)
+
+        # Restore the error action preference
+        $ErrorActionPreference = $backupErrorActionPreference
+
+        if ($output -match "ERROR") {
+          throw $output
+        } elseif($output) {
+          info "$output"
+        } else {
+          info "No output"
+        }
       }
 
       If (@(0,3010) -contains $process.ExitCode) {