support for errorpreference

GreyCorbel · Aug 16, 2023 · 5616960 · 5616960
1 parent d75f3ee
commit 5616960
Show file tree

Hide file tree

Showing 6 changed files with 69 additions and 5 deletions.
diff --git a/Commands/BuildModule.ps1 b/Commands/BuildModule.ps1
@@ -3,7 +3,15 @@ param
     [string]$rootPath = '.'
 )
 $moduleFile = "$rootPath\Module\CosmosLite\CosmosLite.psm1"
-'#region Public commands' | Out-File -FilePath $moduleFile
+
+'#region Definitions' | Out-File -FilePath $moduleFile
+foreach($file in Get-ChildItem -Path "$rootPath\Commands\Definitions")
+{
+    Get-Content $file.FullName | Out-File -FilePath $moduleFile -Append
+}
+'#endregion Definitions' | Out-File -FilePath $moduleFile -Append
+
+'#region Public commands' | Out-File -FilePath $moduleFile -Append
 foreach($file in Get-ChildItem -Path "$rootPath\Commands\Public")
 {
     Get-Content $file.FullName | Out-File -FilePath $moduleFile -Append

diff --git a/Commands/Definitions/CosmosLiteException.ps1 b/Commands/Definitions/CosmosLiteException.ps1
@@ -0,0 +1,11 @@
+class CosmosLiteException : Exception {
+    [string] $code
+
+    CosmosLiteException($Code, $Message) : base($Message) {
+        $this.Code = $code
+    }
+
+    [string] ToString() {
+        return "$($this.Code): $($this.Message)"
+     }
+}
diff --git a/Commands/Internal/ProcessCosmosResponseInternal.ps1 b/Commands/Internal/ProcessCosmosResponseInternal.ps1
@@ -62,6 +62,21 @@ function ProcessCosmosResponseInternal
                 throw new-object System.FormatException("InvalidJsonPayloadReceived. Error: $($_.Exception.Message)`nPayload: $s")
             }
         }
+        if(-not $retVal['IsSuccess'])
+        {
+            $ex = [CosmosLiteException]::new($retVal['Data'].code, $retVal['Data'].message)
+            switch($ErrorActionPreference)
+            {
+                'Stop' {
+                    throw $ex
+                    break;
+                }
+                'Continue' {
+                    Write-Error $ex
+                    break;
+                }
+            }
+        }
         [PSCustomObject]$retVal
     }
 }
diff --git a/Commands/Public/Get-CosmosAccessToken.ps1 b/Commands/Public/Get-CosmosAccessToken.ps1
@@ -34,12 +34,13 @@ function Get-CosmosAccessToken
     {
         if([string]::IsNullOrEmpty($context))
         {
-            throw "Call Connect-Cosmos first"
+            throw ([CosmosLiteException]::new('NotInitialized', 'Call Connect-Cosmos first'))
         }
 
         if($null -eq $context.AuthFactory)
         {
-            throw "Call Connect-Cosmos first for CosmosDB account = $($context.AccountName)"
+            throw ([CosmosLiteException]::new('NotInitialized', "Call Connect-Cosmos first for CosmosDB account = $($context.AccountName)"))
+
         }
         #we specify scopes here in case that user pushes own factory without properly specified default scopes
         Get-AadToken -Factory $context.AuthFactory -Scopes $context.RequiredScopes

diff --git a/Module/CosmosLite/CosmosLite.psd1 b/Module/CosmosLite/CosmosLite.psd1
diff --git a/Module/CosmosLite/CosmosLite.psm1 b/Module/CosmosLite/CosmosLite.psm1
@@ -1,3 +1,16 @@
+#region Definitions
+class CosmosLiteException : Exception {
+    [string] $code
+
+    CosmosLiteException($Code, $Message) : base($Message) {
+        $this.Code = $code
+    }
+
+    [string] ToString() {
+        return "$($this.Code): $($this.Message)"
+     }
+}
+#endregion Definitions
 #region Public commands
 function Connect-Cosmos
 {
@@ -236,12 +249,13 @@ function Get-CosmosAccessToken
     {
         if([string]::IsNullOrEmpty($context))
         {
-            throw "Call Connect-Cosmos first"
+            throw ([CosmosLiteException]::new('NotInitialized', 'Call Connect-Cosmos first'))
         }
 
         if($null -eq $context.AuthFactory)
         {
-            throw "Call Connect-Cosmos first for CosmosDB account = $($context.AccountName)"
+            throw ([CosmosLiteException]::new('NotInitialized', "Call Connect-Cosmos first for CosmosDB account = $($context.AccountName)"))
+
         }
         #we specify scopes here in case that user pushes own factory without properly specified default scopes
         Get-AadToken -Factory $context.AuthFactory -Scopes $context.RequiredScopes
@@ -1373,6 +1387,21 @@ function ProcessCosmosResponseInternal
                 throw new-object System.FormatException("InvalidJsonPayloadReceived. Error: $($_.Exception.Message)`nPayload: $s")
             }
         }
+        if(-not $retVal['IsSuccess'])
+        {
+            $ex = [CosmosLiteException]::new($retVal['Data'].code, $retVal['Data'].message)
+            switch($ErrorActionPreference)
+            {
+                'Stop' {
+                    throw $ex
+                    break;
+                }
+                'Continue' {
+                    Write-Error $ex
+                    break;
+                }
+            }
+        }
         [PSCustomObject]$retVal
     }
 }