ver.0.110

Fixed bug #260 & added new unit test

Author: NowinskiK

adhoc/issue-260/AzureADF/factory/ADF-BIGroupFacts01-Dev.json

@@ -0,0 +1,9 @@
+{
+	"name": "ADF-BIGroupFacts01-Dev",
+	"properties": {
+		"globalConfigurations": {
+			"PipelineBillingEnabled": "false"
+		}
+	},
+	"location": "eastus"
+}

adhoc/issue-260/repro_code.ps1

@@ -0,0 +1,46 @@
+# Import-Module ".\azure.datafactory.tools.psd1" -Force
+#Get-Module 
+$ErrorActionPreference = 'Stop'
+$VerbosePreference = 'Continue'
+$DebugPreference = 'Continue'
+
+. .\adhoc\~~Load-all-cmdlets-locally.ps1   # Load to this session
+
+$path = (.\adhoc\Get-RootPath.ps1)
+#$RootFolder = Join-Path $path 'ADF-BIGroupFacts01-Dev'
+#$RootFolder = "$path\test\BigFactorySample2"
+$RootFolder = Join-Path $path 'AzureADF'
+$ConfigFolder = Join-Path $RootFolder 'deployment'
+
+# Test
+Test-AdfCode -RootFolder $RootFolder -ConfigPath $ConfigFolder
+
+
+
+# Investigation
+$adfName = Split-Path -Path "$RootFolder" -Leaf
+$adf = Import-AdfFromFolder -FactoryName "$adfName" -RootFolder "$RootFolder" -ErrorAction "SilentlyContinue"
+
+$adf.GlobalFactory.GlobalParameters
+
+#--if ($adf.Factories.Count -gt 0 -and (Get-Member -InputObject $adf.Factories[0].Body -name "properties" -Membertype "Properties")) {
+Get-Member -InputObject $adf.Factories[0].Body.properties.globalParameters -Membertype "NoteProperty" 
+$adf.GlobalFactory
+
+# StrictMode & function
+
+function test-something {
+    Write-Host "check-some"
+    Set-StrictMode -Version 1
+    $adf.Factories[0].Body.properties.globalParameters
+}
+
+Set-StrictMode -Version 3
+test-something
+Write-Host "root code:"
+$gparams = $adf.Factories[0].Body.properties.globalParameters
+if ($gparams) 
+{
+    Get-Member -InputObject $adf.Factories[0].Body.properties.globalParameters -Membertype "NoteProperty" 
+}
+

azure.datafactory.tools.psd1

@@ -3,7 +3,7 @@
 #
 # Generated by: Kamil Nowinski @ SQLPlayer.net
 #
-# Generated on: 19/11/2022
+# Generated on: 02/12/2022
 #
 
 @{
@@ -12,7 +12,7 @@
     RootModule = 'azure.datafactory.tools.psm1'
 
     # Version number of this module.
-    ModuleVersion = '0.101.0'
+    ModuleVersion = '0.110.0'
 
     # Supported PSEditions
     # CompatiblePSEditions = @()

changelog.md

@@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
+## [0.110.0] - 2022-12-02 
+### Fixed
+* Bug #260: Test-AdfCode function: The property 'globalParameters' cannot be found on this object.
+
 ## [0.101.0] - 2022-11-19 
 ### Fixed
 * Bug #226: Cannot overwrite/set DateTime type of value via config file

private/Import-AdfObjects.ps1

@@ -27,6 +27,14 @@ function Import-AdfObjects {
         $o.FileName = $_.FullName
         $o.Body = $txt | ConvertFrom-Json
 
+        # Set Global Parameters
+        if ($SubFolder -eq 'factory') {
+            $adf.GlobalFactory.FilePath = $_.FullName
+            $adf.GlobalFactory.body = $txt
+            Set-StrictMode -Version 1
+            $adf.GlobalFactory.GlobalParameters = $o.Body.Properties.globalParameters
+        }
+
         # Discover all referenced objects
         $refs = Get-ReferencedObjects -obj $o
         foreach ($r in $refs) {

public/Test-AdfCode.ps1

@@ -76,6 +76,7 @@ function Test-AdfCode {
 
     Write-Host "=== Validating other rules ..."
 
+    Write-Host "Checking duplicated names..."
     $adf.AllObjects().Name | Sort-Object -Unique | ForEach-Object {
         $r = $adf.GetObjectsByFullName("*." + $_)
         if ($r.Count -gt 1) {
@@ -84,6 +85,7 @@ function Test-AdfCode {
         }
     }
 
+    Write-Host "Checking names of datasets, pipelines, dataflows..."
     $adf.LinkedServices + $adf.DataSets + $adf.Pipelines + $adf.DataFlows | ForEach-Object {
         [string] $name = $_.Name
         if ($name.Contains('-')) {
@@ -92,12 +94,16 @@ function Test-AdfCode {
         }
     }
 
-    if ($adf.Factories.Count -gt 0 -and (Get-Member -InputObject $adf.Factories[0].Body -name "properties" -Membertype "Properties")) {
-        Get-Member -InputObject $adf.Factories[0].Body.properties.globalParameters -Membertype "NoteProperty" | ForEach-Object {
-            [string] $name = $_.Name
-            if ($name.Contains('-')) {
-                Write-Warning "Dashes ('-') are not allowed in the names of global parameters ($name)."
-                $result.WarningCount += 1
+    Write-Host "Checking: Global parameter names..."
+    if ($adf.Factories.Count -gt 0) {
+        $gparams = $adf.GlobalFactory.GlobalParameters
+        if ($gparams) {
+            $gparams | ForEach-Object {
+                [string] $name = $_.Name
+                if ($name.Contains('-')) {
+                    Write-Warning "Dashes ('-') are not allowed in the names of global parameters ($name)."
+                    $result.WarningCount += 1
+                }
             }
         }
     }
@@ -118,6 +124,7 @@ function Test-AdfCode {
     $files | ForEach-Object { 
         try {
             $FileName = $_.FullName
+            Write-Host "Checking config file: $FileName..."
             Update-PropertiesFromFile -adf $adf -stage $FileName -ErrorVariable err -ErrorAction 'Stop' -dryRun:$True
         }
         catch {

test/Test-AdfCode.Tests.ps1

@@ -35,6 +35,20 @@ InModuleScope azure.datafactory.tools {
             $res.ErrorCount | Should -Be 1
             $res.WarningCount | Should -Be 6
         }
+    }
+
 
+    Describe 'Test-AdfCode' -Tag 'Unit' {
+        It 'Should not throw error when factory has no GP but other global config' {
+            $DataFactoryName = "adf3"
+            $RootFolder = Join-Path -Path $PSScriptRoot -ChildPath $DataFactoryName
+            { 
+                $script:res = Test-AdfCode -RootFolder $RootFolder
+            } | Should -Not -Throw
+        }
     }
+
+
+
+
 }

test/adf3/factory/adf3.json

@@ -0,0 +1,9 @@
+{
+	"name": "adf3",
+	"properties": {
+		"globalConfigurations": {
+			"PipelineBillingEnabled": "false"
+		}
+	},
+	"location": "eastus"
+}