Fixed bug #131 and few SQLDatabase functions

NowinskiK · NowinskiK · commit 4f39acf6595b · 2025-06-17T02:29:35.000+01:00
Added -NoWait for New-FabricSQLDatabase function #123
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,13 +7,22 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Added
 - Added credits for authors to all functions and Unit tests to verify the existence of such tags #89
+- Added `NoWait` switch parameter to `New-FabricSQLDatabase` (#123)
 
 ### Changed
 - Get-FabricSqlDatabase accepts Workspace as a pipeline, handles errors correctly and can filter by name (#117).
+- Applied splatting for several parameters in `Invoke-FabricRestMethod` and output results in debug mode
+- `Remove-FabricSQLDatabase` uses unified function to handle API results
 
 ### Fixed
+- Enhanced logic in unified function `Test-FabricApiResponse` to handle API results and moved it to private functions
+- Fixed bug in `Get-FabricLongRunningOperation` - Uri was incorectly created (#131)
+- Fixed bug in `Get-FabricLongRunningOperationResult` - uses correct statusCode (#131)
+
 ### Deprecated
 ### Removed
+- Removed Revision History from `Get-FabricSQLDatabase`, `Get-FabricSQLDatabase`
+
 ### Security
 
 ## 0.22.0 - 20250609
diff --git a/source/Private/Test-FabricApiResponse.ps1 b/source/Private/Test-FabricApiResponse.ps1
@@ -0,0 +1,124 @@
+function Test-FabricApiResponse {
+
+    <#
+.SYNOPSIS
+    Tests the response from a Fabric API call and handles long-running operations.
+
+.DESCRIPTION
+    Tests the response from a Fabric API call and handles long-running operations. It checks the status code and processes the response accordingly.
+
+.PARAMETER statusCode
+    The HTTP status code returned from the API call.
+
+.PARAMETER response
+    The response body from the API call.
+
+.PARAMETER responseHeader
+    The response headers from the API call.
+
+.PARAMETER Name
+    The name of the resource being operated.
+
+.PARAMETER typeName
+    The type of resource being operated (default: 'Fabric Item').
+
+.PARAMETER NoWait
+    If specified, the function will not wait for the operation to complete and will return immediately.
+
+.EXAMPLE
+    Test-FabricApiResponse -statusCode 201 -response $response -responseHeader $header -Name "MyResource" -typeName "Fabric Item"
+
+    Handles the response from a Fabric API call with a 201 status code, indicating successful creation of a resource.
+
+.EXAMPLE
+    Test-FabricApiResponse -statusCode 202 -response $response -responseHeader $header -Name "MyResource" -typeName "Fabric Item"
+
+    Handles the response from a Fabric API call with a 202 status code, indicating that the request has been accepted for processing.
+
+.NOTES
+    - This function is designed to be used within the context of a Fabric API client.
+    - It requires the `Write-Message` function to log messages at different levels (Info, Debug, Error).
+    - The function handles long-running operations by checking the status of the operation and retrieving the result if it has succeeded.
+
+    Author: Kamil Nowinski
+
+#>
+
+    [CmdletBinding()]
+    param (
+        [Parameter(Mandatory = $false)]
+        $response,
+
+        [Parameter(Mandatory = $false)]
+        $Name,
+
+        [Parameter(Mandatory = $false)]
+        $typeName = 'Fabric Item',
+
+        [Parameter(Mandatory = $false)]
+        [switch] $NoWait = $false
+    )
+
+    $responseHeader = $script:responseHeader
+    $statusCode = $script:statusCode
+
+    $verb = (Get-PSCallStack)[1].Command.Split('-')[0]
+    Write-Message -Message "Testing API response for '$verb' operation. StatusCode: $statusCode." -Level Debug
+
+    switch ($statusCode) {
+        200 {
+            return $null
+        }
+        201 {
+            switch ($verb) {
+                'New'    { $msg = "$typeName '$Name' created successfully!" }
+                'Update' { $msg = "$typeName '$Name' updated successfully!" }
+                'Remove' { $msg = "$typeName '$Name' deleted successfully!" }
+                default  { $msg = "Received 201 status code for $verb operation on $typeName '$Name'" }
+            }
+            Write-Message -Message $msg -Level Info
+            return $response
+        }
+        202 {
+            Write-Message -Message "$verb Request for $typeName '$Name' accepted. Provisioning in progress!" -Level Info
+            [string]$operationId = $responseHeader["x-ms-operation-id"]
+
+            if ($NoWait) {
+                Write-Message -Message "NoWait parameter is set. Operation ID: $operationId" -Level Info
+                Write-Message -Message "Run to check the progress: Get-FabricLongRunningOperationResult -operationId '$operationId'" -Level Verbose
+                return $responseHeader
+            }
+
+            Write-Message -Message "[Test-FabricApiResponse] Operation ID: '$operationId'" -Level Debug
+            Write-Message -Message "[Test-FabricApiResponse] Getting Long Running Operation status" -Level Debug
+
+            $operationStatus = Get-FabricLongRunningOperation -operationId $operationId
+            Write-Message -Message "[Test-FabricApiResponse] Long Running Operation status: $operationStatus" -Level Debug
+            # Handle operation result
+            if ($operationStatus.status -eq "Succeeded") {
+                Write-Message -Message "Operation Succeeded" -Level Debug
+                Write-Message -Message "Getting Long Running Operation result" -Level Debug
+
+                $operationResult = Get-FabricLongRunningOperationResult -operationId $operationId
+                Write-Message -Message "Long Running Operation status: $operationResult" -Level Debug
+
+                return $operationResult
+            } else {
+                Write-Message -Message "Operation failed. Status: $($operationStatus)" -Level Debug
+                Write-Message -Message "Operation failed. Status: $($operationStatus)" -Level Error
+                return $operationStatus
+            }
+        }
+        default {
+            Write-Message -Message "Test-FabricApiResponse::default" -Level Debug
+            Write-Message -Message "Unexpected response code: $statusCode from the API." -Level Error
+            Write-Message -Message "Error: $($response.message)" -Level Error
+            if ($response.moreDetails) {
+                Write-Message -Message "More Details: $($response.moreDetails)" -Level Error
+            }
+            Write-Message "Error Code: $($response.errorCode)" -Level Error
+            throw "API request failed with status code $statusCode."
+        }
+    }
+
+}
diff --git a/source/Public/Invoke-FabricRestMethod.ps1 b/source/Public/Invoke-FabricRestMethod.ps1
@@ -55,6 +55,8 @@ Function Invoke-FabricRestMethod {
         [switch] $PowerBIApi
     )
 
+    Write-Message -Message "[Invoke-FabricRestMethod]::Begin" -Level Debug
+
     if ($TestTokenExpired) {
         Confirm-TokenState
     }
@@ -73,26 +75,31 @@ Function Invoke-FabricRestMethod {
 
     if ($Body -is [hashtable]) {
         $Body = $Body | ConvertTo-Json -Depth 10
-        Write-Message -Message "Request Body: $Body" -Level Debug
+        Write-Message -Message "[Invoke-FabricRestMethod] Request Body: $Body" -Level Debug
     } elseif ($Body -is [string]) {
-        Write-Message -Message "Request Body: $Body" -Level Debug
+        Write-Message -Message "[Invoke-FabricRestMethod] Request Body: $Body" -Level Debug
     } else {
-        Write-Message -Message "No request body provided." -Level Debug
+        Write-Message -Message "[Invoke-FabricRestMethod] No request body provided." -Level Debug
     }
 
-    $response = Invoke-RestMethod `
-        -Headers $FabricSession.HeaderParams `
-        -Uri $Uri `
-        -Method $Method `
-        -Body $Body `
-        -ContentType "application/json" `
-        -ErrorAction 'Stop' `
-        -SkipHttpErrorCheck `
-        -ResponseHeadersVariable "responseHeader" `
-        -StatusCodeVariable "statusCode"
+    $request = @{
+        Headers = $FabricSession.HeaderParams
+        Uri = $Uri
+        Method = $Method
+        Body = $Body
+        ContentType = "application/json"
+        ErrorAction = 'Stop'
+        SkipHttpErrorCheck = $true
+        ResponseHeadersVariable = "responseHeader"
+        StatusCodeVariable = "statusCode"
+    }
+    $response = Invoke-RestMethod @request
 
+    Write-Message -Message "[Invoke-FabricRestMethod] Result response code: $statusCode" -Level Debug
+    Write-Message -Message "[Invoke-FabricRestMethod] Result return: $response" -Level Debug
     $script:statusCode = $statusCode
     $script:responseHeader = $responseHeader
 
+    Write-Message -Message "[Invoke-FabricRestMethod]::End" -Level Debug
     return $response
 }
diff --git a/source/Public/SQL Database/Get-FabricSQLDatabase.ps1 b/source/Public/SQL Database/Get-FabricSQLDatabase.ps1
@@ -54,10 +54,6 @@ function Get-FabricSQLDatabase
     Returns the details of the Fabric SQL Databases in the MsLearn-dev workspace.
 
 .NOTES
-    Revision History:
-        - 2025-03-06 - KNO: Init version of the function
-        - 2025-06-14 - Update the examples to remove backticks
-
     Author: Kamil Nowinski
 
     #>
@@ -89,7 +85,6 @@ function Get-FabricSQLDatabase
             return
         }
 
-
     }
 
     process
@@ -101,23 +96,15 @@ function Get-FabricSQLDatabase
         }
 
         # Create SQLDatabase API
-        $uri = "$($FabricSession.BaseApiUrl)/workspaces/$WorkspaceId/sqlDatabases"
+        $uri = "workspaces/$WorkspaceId/sqlDatabases"
         if ($SQLDatabaseId)
         {
             $uri = "$uri/$SQLDatabaseId"
         }
         $response = Invoke-FabricRestMethod -Uri $uri
-        ##$databases.Where({$_.displayName -eq $body.displayName}).id
 
         # Step: Validate the response code
-        if ($statusCode -ne 200)
-        {
-            Write-Message -Message "Unexpected response code: $statusCode from the API." -Level Error
-            Write-Message -Message "Error: $($response.message)" -Level Error
-            Write-Message -Message "Error Details: $($response.moreDetails)" -Level Error
-            Write-Message "Error Code: $($response.errorCode)" -Level Error
-            return $null
-        }
+        Test-FabricApiResponse -response $response -Name $SQLDatabaseId -typeName "SQL Database"
 
         $response = $response.value
         if ($SQLDatabaseName)
diff --git a/source/Public/SQL Database/New-FabricSQLDatabase.ps1 b/source/Public/SQL Database/New-FabricSQLDatabase.ps1
@@ -1,27 +1,28 @@
 <#
 .SYNOPSIS
-Creates a new SQL Database in a specified Microsoft Fabric workspace.
+    Creates a new SQL Database in a specified Microsoft Fabric workspace.
 
 .DESCRIPTION
-This function sends a POST request to the Microsoft Fabric API to create a new SQL Database
-in the specified workspace. It supports optional parameters for SQL Database description
-and path definitions for the SQL Database content.
+    This function sends a POST request to the Microsoft Fabric API to create a new SQL Database
+    in the specified workspace. It supports optional parameters for SQL Database description
+    and path definitions for the SQL Database content.
 
 .PARAMETER WorkspaceId
-The unique identifier of the workspace where the SQL Database will be created.
+    The unique identifier of the workspace where the SQL Database will be created.
 
 .PARAMETER Name
-The name of the SQL Database to be created.
+    The name of the SQL Database to be created.
 
 .PARAMETER Description
-An optional description for the SQL Database.
+    An optional description for the SQL Database.
 
+.PARAMETER NoWait
+    If specified, the function will not wait for the operation to complete and will return immediately.
 
 .EXAMPLE
- New-FabricSQLDatabase -WorkspaceId "workspace-12345" -Name "NewDatabase"
+    New-FabricSQLDatabase -WorkspaceId "workspace-12345" -Name "NewDatabase"
 
- .NOTES
-- Requires `$FabricConfig` global configuration, including `BaseUrl` and `FabricHeaders`.
+.NOTES
 - Calls `Confirm-TokenState` to ensure token validity before making the API request.
 
 Author: Kamil Nowinski
@@ -42,7 +43,10 @@ function New-FabricSQLDatabase
 
         [Parameter(Mandatory = $false)]
         [ValidateNotNullOrEmpty()]
-        [string]$Description
+        [string]$Description,
+
+        [Parameter(Mandatory = $false)]
+        [switch]$NoWait = $false
     )
 
     try
@@ -51,7 +55,7 @@ function New-FabricSQLDatabase
         Confirm-TokenState
 
         # Step 2: Construct the API URL
-        $apiEndpointUrl = "{0}/workspaces/{1}/sqldatabases" -f $FabricConfig.BaseUrl, $WorkspaceId
+        $apiEndpointUrl = "workspaces/{0}/sqldatabases" -f $WorkspaceId
         Write-Message -Message "API Endpoint: $apiEndpointUrl" -Level Debug
 
         # Step 3: Construct the request body
@@ -67,18 +71,14 @@ function New-FabricSQLDatabase
         $bodyJson = $body | ConvertTo-Json -Depth 10
         Write-Message -Message "Request Body: $bodyJson" -Level Debug
 
+        # Step 4: Make the API request
         if ($PSCmdlet.ShouldProcess($apiEndpointUrl, "Create SQL Database"))
         {
-
-            # Step 4: Make the API request
-            $response = Invoke-FabricRestMethod `
-                -Uri $apiEndpointUrl `
-                -Method Post `
-                -Body $bodyJson
+            $response = Invoke-FabricRestMethod -Uri $apiEndpointUrl -Method Post -Body $bodyJson
         }
         # Step 5: Handle and log the response
-        Write-Message "RESPONSE: $response" -Level Debug
-        Test-FabricApiResponse -response $response -responseHeader $responseHeader -statusCode $statusCode -Name $Name -TypeName 'SQL Database'
+        Test-FabricApiResponse -response $response -Name $Name -TypeName 'SQL Database' -NoWait:$NoWait
+        Write-Message -Message "SQL Database '$Name' created successfully!" -Level Info
     }
     catch
     {
diff --git a/source/Public/SQL Database/Remove-FabricSQLDatabase.ps1 b/source/Public/SQL Database/Remove-FabricSQLDatabase.ps1
@@ -17,7 +17,6 @@ Remove-FabricSQLDatabas -WorkspaceId "12345" -SQLDatabaseId "67890"
 Deletes the SQL Database with ID "67890" from workspace "12345".
 
 .NOTES
-- Requires `$FabricConfig` global configuration, including `BaseUrl` and `FabricHeaders`.
 - Validates token expiration before making the API request.
 
 Author: Kamil Nowinski
@@ -30,11 +29,11 @@ function Remove-FabricSQLDatabase
     param (
         [Parameter(Mandatory = $true)]
         [ValidateNotNullOrEmpty()]
-        [string]$WorkspaceId,
+        [Guid]$WorkspaceId,
 
         [Parameter(Mandatory = $true)]
         [ValidateNotNullOrEmpty()]
-        [string]$SQLDatabaseId
+        [Guid]$SQLDatabaseId
     )
 
     try
@@ -43,28 +42,19 @@ function Remove-FabricSQLDatabase
         Confirm-TokenState
 
         # Step 2: Construct the API URL
-        $apiEndpointUrl = "{0}/workspaces/{1}/sqldatabases/{2}" -f $FabricConfig.BaseUrl, $WorkspaceId, $SQLDatabaseId
+        $apiEndpointUrl = "workspaces/{0}/sqldatabases/{1}" -f $WorkspaceId, $SQLDatabaseId
         Write-Message -Message "API Endpoint: $apiEndpointUrl" -Level Debug
 
         if ($PSCmdlet.ShouldProcess($apiEndpointUrl, "Delete SQL Database"))
         {
-
             # Step 3: Make the API request
-            $response = Invoke-FabricRestMethod `
-                -Uri $apiEndpointUrl `
-                -Method Delete
+            $response = Invoke-FabricRestMethod -Uri $apiEndpointUrl -Method Delete
         }
 
         # Step 4: Validate the response code
-        if ($statusCode -ne 200)
-        {
-            Write-Message -Message "Unexpected response code: $statusCode from the API." -Level Error
-            Write-Message -Message "Error: $($response.message)" -Level Error
-            Write-Message "Error Code: $($response.errorCode)" -Level Error
-            return $null
-        }
-        Write-Message -Message "SQL Database '$SQLDatabaseId' deleted successfully from workspace '$WorkspaceId'." -Level Info
+        Test-FabricApiResponse -response $response -Name $SQLDatabaseId -typeName "SQL Database"
 
+        Write-Message -Message "SQL Database '$SQLDatabaseId' deleted successfully!" -Level Info
     }
     catch
     {
diff --git a/source/Public/Utils/Get-FabricLongRunningOperation.ps1 b/source/Public/Utils/Get-FabricLongRunningOperation.ps1
diff --git a/source/Public/Utils/Get-FabricLongRunningOperationResult.ps1 b/source/Public/Utils/Get-FabricLongRunningOperationResult.ps1
diff --git a/source/Public/Utils/Test-FabricApiResponse.ps1 b/source/Public/Utils/Test-FabricApiResponse.ps1
