* Added few new functions:

'Get-FabricSQLDatabase',
'Remove-FabricSQLDatabase',
'Get-FabricCapacitySkus',
'Confirm-FabricAuthToken'
* Unified objects in module scope (FabricSession, AzureSession)
* Module scope holds all api urls, header params for requests
* Unified function to authenticate to Fabric API with bearer token
* Auto-refresh token when expires
* Removed $authToken as input param in several functions
* Removed usage of $env:azToken from several functions
* Get-FabricItem accepts Workspaces as input-pipeline
* Minor cosmetic changes

Author: NowinskiK

FabricTools/FabricTools.psd1

@@ -12,7 +12,7 @@
     RootModule = 'FabricTools.psm1'
 
     # Version number of this module.
-    ModuleVersion     = '0.8.0.0'
+    ModuleVersion     = '0.9.0.0'
 
     # Supported PSEditions
     # CompatiblePSEditions = @()
@@ -112,13 +112,13 @@
         'Get-FabricKQLDashboard',
         'Get-FabricKQLDatabase',
         'Get-FabricKQLQueryset',
-        'Get-FabricWorkspace',
+        'Get-FabricWorkspace2',
         'Invoke-FabricKQLCommand',
         'New-FabricEventhouse',
         'New-FabricEventstream',
         'New-FabricKQLDashboard',
         'New-FabricKQLDatabase',
-        'New-FabricWorkspace',
+        'New-FabricWorkspace2',
         'Remove-FabricEventhouse',
         'Remove-FabricEventstream',
         'Remove-FabricKQLDatabase',
@@ -130,7 +130,12 @@
         'Add-FabricWorkspaceRoleAssignment',
         'Get-FabricWorkspaceRoleAssignment',
         'Get-FabricKQLDashboardDefinition',
-        'Get-FabricDebugInfo'
+        'Get-FabricDebugInfo',
+
+        'Get-FabricSQLDatabase',
+        'Remove-FabricSQLDatabase',
+        'Get-FabricCapacitySkus',
+        'Confirm-FabricAuthToken'
     )
 
     # Cmdlets to export from this module, for best performance, do not use wildcards and do not delete the entry, use an empty array if there are no cmdlets to export.

FabricTools/FabricTools.psm1

@@ -22,17 +22,23 @@
    This script is part of the FabricTools module.
 #>
 
-$FabricSession = [ordered]@{
+$script:FabricSession = [ordered]@{
    BaseFabricUrl       = 'https://api.fabric.microsoft.com'
+   ApiUrl              = 'https://api.fabric.microsoft.com/v1'
    FabricToken         = $null
    HeaderParams        = $null
    ContentType         = @{'Content-Type' = "application/json"}
    KustoURL            = "https://api.kusto.windows.net"
+   AccessToken         = $null
+}
+
+$script:AzureSession = [ordered]@{
+   BaseUrl             = "https://management.azure.com"
+   AccessToken         = $null
+   Token               = $null
+   HeaderParams        = $null
 }
 
-$script:apiUrl = "https://api.fabric.microsoft.com/v1"
-$script:resourceUrl = "https://api.fabric.microsoft.com"
-$script:fabricToken = $null
 # Get all .ps1 files in the (public) Functions folder
 $functions = Get-ChildItem -Path "$PSScriptRoot\public" -Filter *.ps1
 

FabricTools/public/Add-FabricWorkspaceRoleAssignment.ps1

@@ -57,7 +57,7 @@ begin {
 
     # Check if session is established - if not throw error
     if ($null -eq $FabricSession.headerParams) {
-        throw "No session established to Fabric Real-Time Intelligence. Please run Connect-RTISession"
+        throw "No session established to Fabric Real-Time Intelligence. Please run Connect-FabricAccount"
     }
 
     # Create body of request

FabricTools/public/Confirm-FabricAuthToken.ps1

@@ -0,0 +1,48 @@
+<#
+.SYNOPSIS
+   Check whether the Fabric API authentication token is set and not expired and reset it if necessary.
+
+.DESCRIPTION
+   The Confirm-FabricAuthToken function retrieves the Fabric API authentication token. If the token is not already set, it calls the Set-FabricAuthToken function to set it. It then outputs the token.
+
+.EXAMPLE
+   Confirm-FabricAuthToken
+
+   This command retrieves the Fabric API authentication token.
+
+.INPUTS
+   None. You cannot pipe inputs to this function.
+
+.OUTPUTS
+   Returns object as Get-FabricDebugInfo function
+
+.NOTES
+
+#>
+
+function Confirm-FabricAuthToken {
+   [CmdletBinding()]
+   param  (   )
+
+   # Check if the Fabric token is already set
+   if (!$FabricSession.FabricToken -or !$AzureSession.AccessToken) {
+      Write-Output "Confirm-FabricAuthToken::Set-FabricAuthToken"
+      Set-FabricAuthToken | Out-Null
+   }
+
+   $now = (Get-Date)
+   $s = Get-FabricDebugInfo
+   if ($s.FabricSession.AccessToken.ExpiresOn -lt $now ) {
+      Write-Output "Confirm-FabricAuthToken::Set-FabricAuthToken#1"
+      Set-FabricAuthToken -reset | Out-Null
+   }
+
+   if ($s.AzureSession.AccessToken.ExpiresOn -lt $now ) {
+      Write-Output "Confirm-FabricAuthToken::Set-FabricAuthToken#2"
+      Set-FabricAuthToken -reset | Out-Null
+   }
+
+   $s = Get-FabricDebugInfo
+   return $s
+
+}

FabricTools/public/Connect-FabricAccount.ps1

@@ -14,7 +14,7 @@ function Connect-FabricAccount {
     and in which your Fabric Capacity is.
 
 .EXAMPLE
-    Connect-RTIAccount `
+    Connect-FabricAccount `
         -TenantID '12345678-1234-1234-1234-123456789012'
 
 .NOTES
@@ -44,8 +44,7 @@ process {
                 Out-Null
 
     Write-Verbose "Get authentication token"
-    $FabricSession.FabricToken = (Get-AzAccessToken `
-                                    -ResourceUrl $FabricSession.BaseFabricUrl).Token
+    $FabricSession.FabricToken = (Get-AzAccessToken -ResourceUrl $FabricSession.BaseFabricUrl).Token
     Write-Verbose "Token: $($FabricSession.FabricToken)"
 
     Write-Verbose "Setup headers for API calls"

FabricTools/public/Export-FabricItem.ps1

@@ -39,7 +39,7 @@ Function Export-FabricItem {
     (
         [string]$path = '.\pbipOutput',
         [string]$workspaceId = '',
-        [scriptblock]$filter = { $_.type -in @("Report", "SemanticModel", "Notebook","SparkJobDefinitionV1") },
+        [scriptblock]$filter = { $_.type -in @("Report", "SemanticModel", "Notebook", "SparkJobDefinitionV1") },
         [string]$itemID = ''
     )
     if (![string]::IsNullOrEmpty($itemID)) {
@@ -68,18 +68,21 @@ Function Export-FabricItem {
         $items = Invoke-FabricAPIRequest -Uri "workspaces/$workspaceId/items" -Method Get
 
         if ($filter) {
-            $items = $items | Where-Object $filter
+            $items = $items.value | Where-Object $filter
+        }
+        else {
+            $items = $items.value
         }
 
-        write-output "Existing items: $($items.Count)"
+        Write-Output "Existing items: $($items.Count)"
 
         foreach ($item in $items) {
             $itemId = $item.id
             $itemName = $item.displayName
             $itemType = $item.type
             $itemOutputPath = "$path\$workspaceId\$($itemName).$($itemType)"
 
-            if ($itemType -in @("report", "semanticmodel", "notebook", "SparkJobDefinitionV1")) {
+            if ($itemType -in @("report", "semanticmodel", "notebook", "SparkJobDefinitionV1", "DataPipeline")) {
                 write-output "Getting definition of: $itemId / $itemName / $itemType"
 
                 $response = Invoke-FabricAPIRequest -Uri "workspaces/$workspaceId/items/$itemId/getDefinition" -Method Post

FabricTools/public/Get-AllFabricCapacities.ps1

@@ -35,19 +35,12 @@ function Get-AllFabricCapacities {
     # Initialize an array to store the results
     $res = @()
 
+    Get-FabricAuthToken | Out-Null
+
     # If a subscription ID is provided
     if ($subscriptionID) {
-        # If the 'azToken' environment variable is null, connect to the Azure account and set the 'azToken' environment variable.
-        if ($null -eq $env:azToken) {
-            # Connect to the Azure account
-            Connect-azaccount | Out-Null
-            # Set the context to the provided subscription ID
-            set-azcontext -SubscriptionId $subscriptionID | Out-Null
-            # Set the 'azToken' environment variable
-            $env:aztoken = "Bearer " + (get-azAccessToken).Token
-        }
         # Set the context to the provided subscription ID
-        set-azcontext -SubscriptionId $subscriptionID | Out-Null
+        Set-AzContext -SubscriptionId $subscriptionID | Out-Null
 
         # Get all resource groups in the subscription
         $rgs = Get-AzResourceGroup
@@ -60,19 +53,12 @@ function Get-AllFabricCapacities {
     }
     else {
         # If no subscription ID is provided, get all subscriptions
-        if ($null -eq $env:azToken) {
-            # Connect to the Azure account
-            Connect-azaccount | Out-Null
-            # Set the 'azToken' environment variable
-            $env:aztoken = "Bearer " + (get-azAccessToken).Token
-        }
-        # Get all subscriptions
         $subscriptions = Get-AzSubscription
 
         # For each subscription, set the context to the subscription ID
         foreach ($sub in $subscriptions) {
             # Set the context to the subscription ID
-            set-azcontext -SubscriptionId $sub.id | Out-Null
+            Set-AzContext -SubscriptionId $sub.id | Out-Null
 
             # Get all resource groups in the subscription
             $rgs = Get-AzResourceGroup

FabricTools/public/Get-FabricAPIClusterURI.ps1

@@ -22,20 +22,12 @@ function Get-FabricAPIclusterURI  {
     # Define aliases for the function for flexibility.
     [Alias("Get-FabAPIClusterURI")]
     Param (
-        [Parameter(Mandatory=$false)]
-        [string]$authToken
     )
 
-    if ([string]::IsNullOrEmpty($authToken)) {
-        $authToken = Get-FabricAuthToken
-    }
+    $s = Confirm-FabricAuthToken
 
-    $fabricHeaders = @{
-        'Content-Type'  = $contentType
-        'Authorization' = "Bearer {0}" -f $authToken
-    }
     # Make a GET request to the PowerBI API to retrieve the datasets.
-    $reply = Invoke-RestMethod -uri "https://api.powerbi.com/v1.0/myorg/datasets" -Headers $fabricHeaders -Method GET
+    $reply = Invoke-RestMethod -uri "https://api.powerbi.com/v1.0/myorg/datasets" -Headers $s.FabricSession.HeaderParams -Method GET
 
     # Extract the '@odata.context' property from the response.
     $unaltered = $reply.'@odata.context'

FabricTools/public/Get-FabricAuthToken.ps1

@@ -29,11 +29,11 @@ function Get-FabricAuthToken {
    )
 
    # Check if the Fabric token is already set
-   if (!$script:fabricToken) {
+   if (!$FabricSession.FabricToken) {
       # If not, set the Fabric token
       Set-FabricAuthToken
    }
 
    # Output the Fabric token
-   return $script:fabricToken
+   return $FabricSession.FabricToken
 }

FabricTools/public/Get-FabricCapacity.ps1

@@ -26,6 +26,8 @@ function Get-FabricCapacity  {
         [string]$capacity
     )
 
+    Confirm-FabricAuthToken | Out-Null
+
     if ($capacity) {
         $result = Invoke-FabricAPIRequest -uri "capacities/$capacity" -Method GET
     } else {