Update module version and enhance User-Agent handling

Set the module version to 0.0.1 and refactor the User-Agent header construction in the Invoke-FabricRestMethod function.

Author: NowinskiK

source/FabricTools.psd1

@@ -12,7 +12,7 @@
 RootModule = 'FabricTools.psm1'
 
 # Version number of this module.
-ModuleVersion = '0.31.0'
+ModuleVersion = '0.0.1'
 
 # Supported PSEditions
 # CompatiblePSEditions = @()

source/Private/Get-FabricUserAgent.ps1

@@ -52,5 +52,5 @@ function Get-FabricUserAgent {
         $archToken = $env:PROCESSOR_ARCHITECTURE -or 'unknown'
     }
 
-    return "powershell/$psVersion,FabricTools/$moduleVersion,($osToken; $archToken)"
+    return "FabricTools/$moduleVersion powershell/$psVersion ($osToken; $archToken)"
 }

source/Public/Invoke-FabricRestMethod.ps1

@@ -152,6 +152,17 @@ Function Invoke-FabricRestMethod {
     $contentType = Get-PSFConfigValue -FullName 'FabricTools.FabricApi.ContentType'
     $userAgent = Get-PSFConfigValue -FullName 'FabricTools.UserAgent' -ErrorAction SilentlyContinue
 
+    # Build a fresh headers hashtable by copying session headers and ensuring User-Agent is included.
+    $requestHeaders = @{}
+    if ($sessionHeaders -and $sessionHeaders -is [hashtable]) {
+        foreach ($key in $sessionHeaders.Keys) {
+            $requestHeaders[$key] = $sessionHeaders[$key]
+        }
+    }
+    if ($userAgent) {
+        $requestHeaders['User-Agent'] = $userAgent
+    }
+
     $continuationToken = $null
     $repeat = $false
 
@@ -163,17 +174,6 @@ Function Invoke-FabricRestMethod {
         }
         Write-Message -Message "API Endpoint: $Method $apiEndpointUrl" -Level Verbose
 
-        # Build a fresh headers hashtable by copying session headers and ensuring User-Agent is included.
-        $requestHeaders = @{}
-        if ($sessionHeaders -and $sessionHeaders -is [hashtable]) {
-            foreach ($key in $sessionHeaders.Keys) {
-                $requestHeaders[$key] = $sessionHeaders[$key]
-            }
-        }
-        if ($userAgent) {
-            $requestHeaders['User-Agent'] = $userAgent
-        }
-
         $request = @{
             Headers = $requestHeaders
             Uri = $Uri

tests/Unit/Invoke-FabricRestMethod.Tests.ps1

@@ -35,11 +35,9 @@ Describe "Invoke-FabricRestMethod" -Tag "UnitTests" {
 
     Context "Successful REST call" {
         BeforeAll {
-            Mock -CommandName Invoke-WebRequest -MockWith {
+            Mock -CommandName Invoke-RestMethod -MockWith {
                 return @{
-                    StatusCode = 200
-                    Headers = @{}
-                    Content = '{"value": [{"id": "test-id", "name": "test-name"}]}'
+                    value = @(@{ id = 'test-id'; name = 'test-name' })
                 }
             }
             Mock -CommandName Confirm-TokenState -MockWith { return $true }
@@ -72,50 +70,18 @@ Describe "Invoke-FabricRestMethod" -Tag "UnitTests" {
 
     Context "User-Agent header" {
         BeforeAll {
-            # Clean up any previous dump files
-            $dumpPath = Join-Path $PSScriptRoot '..\..\output\invoke-restmethod-mock-dump.json'
-            $outDir = Split-Path $dumpPath -Parent
-            if (-not (Test-Path $outDir)) { New-Item -ItemType Directory -Path $outDir | Out-Null }
-            Remove-Item -Path $dumpPath -ErrorAction SilentlyContinue
-
-            # Capture the headers passed to Invoke-RestMethod
-            Set-Variable -Name capturedHeaders -Value $null -Scope Script -Force
-
             Mock -CommandName Get-PSFConfigValue -MockWith {
                 param($FullName)
-                $logPath = Join-Path $PSScriptRoot '..\..\output\get-psfconfig-dump.json'
-                $entry = @{ Name = $FullName; Time = (Get-Date).ToString('o') }
-                Add-Content -Path $logPath -Value ($entry | ConvertTo-Json -Compress)
                 switch ($FullName) {
                     'FabricTools.UserAgent' { return 'TestUA/1.2' }
-                    'FabricTools.FabricSession.Headers' { return @{ 'User-Agent' = 'TestUA/1.2' } }
+                    'FabricTools.FabricSession.Headers' { return @{} }
                     'FabricTools.FabricApi.ContentType' { return 'application/json; charset=utf-8' }
                     Default { return $null }
                 }
             }
 
             Mock -CommandName Invoke-RestMethod -MockWith {
-                $dump = @{ Bound = $PSBoundParameters; Args = $args } | ConvertTo-Json -Compress
-                $outPath = Join-Path $PSScriptRoot '..\..\output\invoke-restmethod-mock-dump.json'
-                $outDir = Split-Path $outPath -Parent
-                if (-not (Test-Path $outDir)) { New-Item -ItemType Directory -Path $outDir | Out-Null }
-                Set-Content -Path $outPath -Value $dump  # Use Set-Content (not Add-Content) to write single JSON object
-
-                if ($PSBoundParameters.ContainsKey('Headers')) {
-                    Set-Variable -Name capturedHeaders -Value $PSBoundParameters['Headers'] -Scope Script -Force
-                } elseif ($args -and $args.Count -ge 2) {
-                    # Pester may pass named parameters as an args array: ['-Param:', <value>, ...]
-                    for ($i = 0; $i -lt $args.Count; $i += 2) {
-                        $name = $args[$i].ToString()
-                        if ($name -match 'Headers') {
-                            Set-Variable -Name capturedHeaders -Value $args[$i + 1] -Scope Script -Force
-                            break
-                        }
-                    }
-                } else {
-                    Set-Variable -Name capturedHeaders -Value $null -Scope Script -Force
-                }
-                return @{ value = @() ; statusCode = 200 }
+                return @{ value = @(); statusCode = 200 }
             }
 
             Mock -CommandName Confirm-TokenState -MockWith { return $true }
@@ -125,28 +91,9 @@ Describe "Invoke-FabricRestMethod" -Tag "UnitTests" {
             InModuleScope -ModuleName 'FabricTools' {
                 Invoke-FabricRestMethod -Uri 'https://api.fabric.microsoft.com/v1/test' | Out-Null
 
-                # Try to capture from script variable first (if mock successfully set it)
-                $captured = $script:capturedHeaders
-
-                # If not captured via script variable, read from dump file
-                if (-not $captured) {
-                    $dumpPath = Join-Path $PSScriptRoot '..\..\output\invoke-restmethod-mock-dump.json'
-                    if (Test-Path $dumpPath) {
-                        $dump = Get-Content $dumpPath -Raw | ConvertFrom-Json
-                        $args = $dump.Args
-                        # Find Headers in the args array
-                        for ($i = 0; $i -lt $args.Count - 1; $i++) {
-                            if ($args[$i] -eq '-Headers:') {
-                                $captured = $args[$i + 1]
-                                break
-                            }
-                        }
-                    }
-                }
-
-                # Assert the headers were captured and contain User-Agent
-                $captured | Should -Not -BeNullOrEmpty -Because 'Headers should be captured from mock'
-                $captured.'User-Agent' | Should -Be 'TestUA/1.2' -Because 'User-Agent header should be set to configured value'
+                Should -Invoke -CommandName Invoke-RestMethod -Times 1 -ParameterFilter {
+                    $Headers -ne $null -and $Headers['User-Agent'] -eq 'TestUA/1.2'
+                } -Because 'Invoke-RestMethod should be called with User-Agent header set to configured value'
             }
         }
     }