version 2.4

- azure.datafactory.tools - ver.1.15.0
- Az.DataFactory - ver.1.19.7

Author: NowinskiK

README.md

@@ -190,11 +190,18 @@ The purpose of this task is to ensure such checking. It works exactly the same a
 
 # Related modules
 These tasks include the following modules:  
-- [azure.datafactory.tools - ver.1.13.0](https://www.powershellgallery.com/packages/azure.datafactory.tools/1.13.0)
-- [Az.DataFactory - ver.1.19.2](https://www.powershellgallery.com/packages/Az.DataFactory/1.19.2)
+- [azure.datafactory.tools - ver.1.15.0](https://www.powershellgallery.com/packages/azure.datafactory.tools/1.15.0)
+- [Az.DataFactory - ver.1.19.7](https://www.powershellgallery.com/packages/Az.DataFactory/1.19.7)
 
 # History
+
 ## Version 2.*
+
+- 28 May 2026 - v.2.4   Update [adftools v.1.15.0](https://github.com/Azure-Player/azure.datafactory.tools/releases/tag/v1.15.0)  
+                        - New: Credential type of ADF objects is now supported for deployment via REST API
+                        - Fixed: Starting blob event trigger fails with 'Resource cannot be updated during provisioning' - now waits for provisioning to complete before retrying #484, #474, #463
+                        - Fixed: REST API calls failing with 401 Unauthorized due to Az.Accounts 5.x returning SecureString from Get-AzAccessToken
+                        - Fixed: DryRun not loading deployment state from storage for hash comparison #476
 - 03 Jun 2025 - v.2.3   Update [adftools v.1.13.0](https://github.com/Azure-Player/azure.datafactory.tools/releases/tag/v1.13.0)  
                         - New: Az.DataFactory module is required to import adftools  
                         - New: Added function `Set-AdfToolsAuthToken` to enable   changing URL to API when target environment is different the default Global Azure #356 #441  
@@ -209,7 +216,8 @@ These tasks include the following modules:
                         - Test Connection Task is no longer Preview. ClientID & Secret fields are optional for SPN auth.
 
 ## Version 1.*
-- 13 Jun 2024 - v.1.35    
+
+- 13 Jun 2024 - v.1.35
 - 06 Jun 2024 - v.1.33  Update [adftools v.1.9.0](https://github.com/Azure-Player/azure.datafactory.tools/releases/tag/v1.9.0)  
 - 27 Jan 2024 - v.1.32  - Added dry run option (advanced). Thanks [@LiquoriChris](https://github.com/LiquoriChris)!
 - 12 Sep 2023 - v.1.31  Update [adftools v.1.8.0](https://github.com/Azure-Player/azure.datafactory.tools/releases/tag/v1.8.0):  

buildDataFactoryTask/buildDataFactoryTaskV1/ps_modules/azure.datafactory.tools/azure.datafactory.tools.psd1

@@ -12,7 +12,7 @@
     RootModule = 'azure.datafactory.tools.psm1'
 
     # Version number of this module.
-    ModuleVersion = '1.13.0'
+    ModuleVersion = '1.15.0'
 
     # Supported PSEditions
     # CompatiblePSEditions = @()
@@ -27,7 +27,7 @@
     CompanyName = 'SQLPlayer'
 
     # Copyright statement for this module
-    Copyright = '(c) 2020-2025 Kamil Nowinski. All rights reserved.'
+    Copyright = '(c) 2020-2026 Kamil Nowinski. All rights reserved.'
 
     # Description of the functionality provided by this module
     Description = 'PowerShell module to help with CI&CD for Azure Data Factory, mainly to publish to ADF service in multiple environments. Check https://github.com/Azure-Player/azure.datafactory.tools/ & https://azureplayer.net/adf/'

buildDataFactoryTask/buildDataFactoryTaskV1/ps_modules/azure.datafactory.tools/private/ConvertTo-AdfCollection.ps1

@@ -0,0 +1,26 @@
+function ConvertTo-AdfCollection {
+    [CmdletBinding()]
+    param (
+        [parameter(Mandatory = $true)] 
+        [String] $AzType
+    )
+
+    $resType = ""
+
+    switch -Exact ($AzType)
+    {
+        'Microsoft.DataFactory/factories/pipelines'                                      { $resType = 'Pipelines' }
+        'Microsoft.DataFactory/factories/linkedservices'                                 { $resType = 'LinkedServices' }
+        'Microsoft.DataFactory/factories/datasets'                                       { $resType = 'Datasets' }
+        'Microsoft.DataFactory/factories/dataflows'                                      { $resType = 'Dataflows' }
+        'Microsoft.DataFactory/factories/triggers'                                       { $resType = 'Triggers' }
+        'Microsoft.DataFactory/factories/integrationruntimes'                            { $resType = 'IntegrationRuntimes' }
+        'Microsoft.DataFactory/factories'                                                { $resType = 'Factories' }
+        'Microsoft.DataFactory/factories/managedVirtualNetworks'                         { $resType = 'ManagedVirtualNetworks' }
+        'Microsoft.DataFactory/factories/managedVirtualNetworks/managedPrivateEndpoints' { $resType = 'ManagedPrivateEndpoints' }
+        'Microsoft.DataFactory/factories/credentials'                                    { $resType = 'Credentials' }
+        default                                                                          { Write-Error "ADFT0030: AzType '$AzType' is not supported." }
+    }
+
+    return $resType
+}

buildDataFactoryTask/buildDataFactoryTaskV1/ps_modules/azure.datafactory.tools/private/Deploy-AdfObjectOnly.ps1

@@ -123,8 +123,16 @@ function Deploy-AdfObjectOnly {
         }
         'credential'
         {
-            Write-Warning "Credentials are not yet supported. The deployment for the object is skipped."
-            Write-Warning "Any reference to the object causes error, unless to deploy it before."
+            $resType = Get-AzureResourceType $obj.Type
+            $resName = $obj.AzureResourceName()
+
+            New-AzResource `
+            -ResourceType $resType `
+            -ResourceGroupName $ResourceGroupName `
+            -ResourceName "$resName" `
+            -ApiVersion "2018-06-01" `
+            -Properties $json `
+            -IsFullObject -Force | Out-Null
         }
         'AzResource'
         {

buildDataFactoryTask/buildDataFactoryTaskV1/ps_modules/azure.datafactory.tools/private/Get-AzDFV2Credential.ps1

@@ -5,6 +5,13 @@ function Get-AzDFV2Credential {
     )
     Write-Debug "BEGIN: Get-AzDFV2Credential"
 
+    # Retrieve all credentials via API without parsing
+    $token = Get-AzAccessToken -ResourceUrl 'https://management.azure.com'
+    $tokenStr = [System.Net.NetworkCredential]::new('', $token.Token).Password
+    $authHeader = @{
+        'Content-Type'  = 'application/json'
+        'Authorization' = 'Bearer ' + $tokenStr
+    }
     $url = "$($script:BaseApiUrl)$($adfi.DataFactoryId)/credentials?api-version=2018-06-01"
 
     # Retrieve all credentials via Rest API
@@ -14,7 +21,7 @@ function Get-AzDFV2Credential {
         return $null
     }
 
-    [System.Collections.ArrayList] $items = @{}
+    [System.Collections.ArrayList] $items = @()
     ($r.Content | ConvertFrom-Json).value | ForEach-Object { $i = [AdfPSCredential]::New($_); $items.Add($i) | Out-Null; }
 
     Write-Debug "END: Get-AzDFV2Credential()"

buildDataFactoryTask/buildDataFactoryTaskV1/ps_modules/azure.datafactory.tools/private/Read-CsvConfigFile.ps1

@@ -22,19 +22,36 @@ function Read-CsvConfigFile {
     if ($csv.Count -eq 1) {
         Write-Warning "Config file is empty."
     }
+    
+    # Get actual line numbers for accurate error reporting
+    $fileLines = Get-Content $configFileName
     $i = 0
     $csv | ForEach-Object {
         if ($i -gt 0 -and !$_.type.StartsWith("#") ) {
-            if ($_.type -eq "" -or $null -eq $_.type) { Write-Error -Exception ([System.Data.DataException]::new("ADFT0021: Config file, row $i : Value in column 'Type' is empty."))    }
-            if ($_.type -notin $ADF_FOLDERS)          { Write-Error -Exception ([System.Data.DataException]::new("ADFT0022: Config file, row $i : Type ($($_.type)) is not supported.")) }
-            if ($_.name -eq "" -or $null -eq $_.name) { Write-Error -Exception ([System.Data.DataException]::new("ADFT0023: Config file, row $i : Value in column 'Name' is empty."))    }
-            if ($_.path -eq "" -or $null -eq $_.path) { Write-Error -Exception ([System.Data.DataException]::new("ADFT0024: Config file, row $i : Value in column 'Path' is empty."))    }
+            # Find the actual line number by counting non-empty, non-comment lines up to current CSV row
+            $actualLineNumber = 1  # Start with header line
+            $csvRowCount = 0
+            for ($lineIndex = 1; $lineIndex -lt $fileLines.Count; $lineIndex++) {
+                $line = $fileLines[$lineIndex].Trim()
+                if ($line -ne "" -and !$line.StartsWith("#")) {
+                    $csvRowCount++
+                    if ($csvRowCount -eq $i) {
+                        $actualLineNumber = $lineIndex + 1  # Convert to 1-based line number
+                        break
+                    }
+                }
+            }
+            
+            if ($_.type -eq "" -or $null -eq $_.type) { Write-Error -Exception ([System.Data.DataException]::new("ADFT0021: Config file, row $actualLineNumber : Value in column 'Type' is empty."))    }
+            if ($_.type -notin $ADF_FOLDERS)          { Write-Error -Exception ([System.Data.DataException]::new("ADFT0022: Config file, row $actualLineNumber : Type ($($_.type)) is not supported.")) }
+            if ($_.name -eq "" -or $null -eq $_.name) { Write-Error -Exception ([System.Data.DataException]::new("ADFT0023: Config file, row $actualLineNumber : Value in column 'Name' is empty."))    }
+            if ($_.path -eq "" -or $null -eq $_.path) { Write-Error -Exception ([System.Data.DataException]::new("ADFT0024: Config file, row $actualLineNumber : Value in column 'Path' is empty."))    }
             if ($_.value -eq "" -or $null -eq $_.value) { 
                 if (!$_.path.StartsWith('-')) {
-                    Write-Warning -Message "Config file, row $i : Value in column 'Value' is empty." 
+                    Write-Warning -Message "Config file, row $actualLineNumber : Value in column 'Value' is empty." 
                 }
             }
-            if ($null -ne $_.empty) { Write-Error -Exception ([System.Data.DataException]::new("ADFT0025: Config file, row $i has too many columns.")) }
+            if ($null -ne $_.empty) { Write-Error -Exception ([System.Data.DataException]::new("ADFT0025: Config file, row $actualLineNumber has too many columns.")) }
         }
         $i++
     }

buildDataFactoryTask/buildDataFactoryTaskV1/ps_modules/azure.datafactory.tools/private/Remove-AdfObjectRestAPI.ps1

@@ -8,6 +8,12 @@ function Remove-AdfObjectRestAPI {
 
     Write-Debug "BEGIN: Remove-AdfObjectRestAPI()"
 
+    $token = Get-AzAccessToken -ResourceUrl 'https://management.azure.com'
+    $tokenStr = [System.Net.NetworkCredential]::new('', $token.Token).Password
+    $authHeader = @{
+        'Content-Type'  = 'application/json'
+        'Authorization' = 'Bearer ' + $tokenStr
+    }
     $url = "$($script:BaseApiUrl)$($adfInstance.Id)/$type_plural/$($name)?api-version=2018-06-01"
 
     # Delete given object via Rest API

buildDataFactoryTask/buildDataFactoryTaskV1/ps_modules/azure.datafactory.tools/private/Start-Trigger.ps1

@@ -19,17 +19,38 @@ function Start-Trigger {
                 -DataFactoryName $DataFactoryName `
                 -Name $Name `
                 -Force | Out-Null
+            # If successful, break out of the loop
+            break
         }
         catch {
+            $errMsg = $_.Exception.Message
             if ($i -lt $attempts)
             {
-                Write-Verbose "Attempt #$i of starting trigger failed. Retry in 2 seconds."
-                Start-Sleep -Seconds 2 
-            } 
-            else 
+                if ($errMsg -like "*cannot be updated during provisioning*") {
+                    Write-Verbose "Attempt #${i}: Trigger '$Name' is still provisioning. Waiting for provisioning to complete..."
+                    $provisioningTimeout = 300
+                    $pollInterval = 10
+                    $elapsed = 0
+                    while ($elapsed -lt $provisioningTimeout) {
+                        Start-Sleep -Seconds $pollInterval
+                        $elapsed += $pollInterval
+                        $trigger = Get-AzDataFactoryV2Trigger `
+                            -ResourceGroupName $ResourceGroupName `
+                            -DataFactoryName $DataFactoryName `
+                            -Name $Name
+                        $provState = $trigger.Properties.ProvisioningState
+                        Write-Verbose "Trigger provisioning state: $provState ($elapsed sec elapsed)"
+                        if ($provState -ne 'Provisioning') { break }
+                    }
+                } else {
+                    Write-Verbose "Attempt #$i of starting trigger failed. Retry in 2 seconds."
+                    Start-Sleep -Seconds 2
+                }
+            }
+            else
             {
                 Write-Host "Failed starting trigger after $attempts attempts."
-                Write-Warning -Message $_.Exception.Message
+                Write-Warning -Message $errMsg
             }
         }
     }

buildDataFactoryTask/buildDataFactoryTaskV1/ps_modules/azure.datafactory.tools/public/Get-AdfDocDiagram.ps1

@@ -11,6 +11,12 @@ Object of adf class represents all adf objects from code.
 .PARAMETER direction
 Diagram direction: LR - Left to Right (default), TD - Top to Down
 
+.PARAMETER exclude
+Array of object names to exclude from diagram. Wildcards are supported.
+
+.PARAMETER include
+Array of object names to include in diagram. Wildcards are supported. If this parameter is used, only the specified objects and their dependencies will be included in the diagram.
+
 .EXAMPLE
 $RootFolder = "c:\GitHub\AdfName\"
 $adf = Import-AdfFromFolder -RootFolder $RootFolder -FactoryName 'whatever'
@@ -32,7 +38,10 @@ function Get-AdfDocDiagram {
         [Adf] $adf,
 
         [ValidateSet("LR", "TD")]
-        [String] $direction = 'LR'
+        [String] $direction = 'LR',
+
+        [Array] $exclude = $null, 
+        [Array] $include = $null
     )
     Write-Debug "BEGIN: Get-AdfDocDiagram(adf=$adf, direction=$direction)"
 
@@ -42,12 +51,25 @@ function Get-AdfDocDiagram {
 
     $adf.AllObjects() | ForEach-Object {
         $o = $_
+        $n1 = $o.FullName().Replace(' ', '_')
+        Write-Verbose "Analyse: $($o.FullName())"
         foreach ($d in $o.DependsOn) {
-            $n1 = $o.FullName().Replace(' ', '_')
             $n2 = $d.Replace(' ', '_')
             $n2 = $n2.ToLower()[0] + $n2.Substring(1)
-            $line = "$n1 --> $n2"
-            $diag += $line + "`n"
+            Write-Verbose "- $d"
+            $show = $true
+            if ($include) {
+                 $show = ($include | ForEach-Object { if ($n1 -ilike $_ -or $n2 -ilike $_) {1} else {0} } | Measure-Object -Maximum).Maximum -gt 0
+            } else 
+            {
+                 $show = -not ($exclude | ForEach-Object { if ($n1 -ilike $_ -or $n2 -ilike $_) {1} else {0} } | Measure-Object -Maximum).Maximum -gt 0
+            }
+            if ($show) {
+              $line = "$n1 --> $n2"
+              $diag += $line + "`n"
+            } else {
+                Write-Verbose "$d - excluded."
+            }
         }
     }
     $diag += ":::"

buildDataFactoryTask/buildDataFactoryTaskV1/ps_modules/azure.datafactory.tools/public/Publish-AdfV2FromJson.ps1

@@ -154,10 +154,6 @@ function Publish-AdfV2FromJson {
         $targetAdf = Get-AzDataFactoryV2 -ResourceGroupName "$ResourceGroupName" -Name "$DataFactoryName" -ErrorAction:Ignore
         if ($targetAdf) {
             Write-Host "Azure Data Factory exists."
-            if ($opt.IncrementalDeployment -and !$DryRun.IsPresent) {
-                Write-Host "Loading Deployment State from Storage..."
-                $ds = Get-StateFromStorage -DataFactoryName $DataFactoryName -LocationUri $opt.IncrementalDeploymentStorageUri
-            }
         }
         else {
             $msg = "Azure Data Factory instance does not exist."
@@ -175,13 +171,19 @@ function Publish-AdfV2FromJson {
 
         if ($null -eq $targetAdf) {
             Write-Host "ADFT0032: The process is exiting the function. Do fix the issue and run again."
-            return 
+            return
         }
     }
     else {
         Write-Host "DRY RUN: Skipping ADF existence verification..."
     }
 
+    # Load deployment state from storage for incremental deployment (needed for both DryRun and actual deployment)
+    if ($opt.IncrementalDeployment) {
+        Write-Host "Loading Deployment State from Storage..."
+        $ds = Get-StateFromStorage -DataFactoryName $DataFactoryName -LocationUri $opt.IncrementalDeploymentStorageUri
+    }
+
     Write-Host "===================================================================================";
     Write-Host "STEP: Reading Azure Data Factory from JSON files..."
     $adf = Import-AdfFromFolder -FactoryName $DataFactoryName -RootFolder "$RootFolder"