Merge pull request #172 from SQLPlayer/issue171

Bug fixed: Loading ADF from code fails when excluding any object and …

Author: NowinskiK

azure.datafactory.tools.psd1

@@ -3,7 +3,7 @@
 #
 # Generated by: Kamil Nowinski @ SQLPlayer.net
 #
-# Generated on: 10/10/2021
+# Generated on: 07/12/2021
 #
 
 @{
@@ -12,7 +12,7 @@
     RootModule = 'azure.datafactory.tools.psm1'
 
     # Version number of this module.
-    ModuleVersion = '0.95.0'
+    ModuleVersion = '0.95.1'
 
     # Supported PSEditions
     # CompatiblePSEditions = @()

changelog.md

@@ -4,6 +4,9 @@ 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.95.1] - 2021-12-07
+* Bug fixed: Loading ADF from code fails when excluding any object and ManagedVNET exist #171
+
 ## [0.95.0] - 2021-10-23
 * Added structure to return object for Test-AdfCode which allows to check number of warnings too
 * Fixed tests

private/AdfObject.class.ps1

@@ -74,10 +74,10 @@ class AdfObject {
         $ofn = ''
         if ($this.Body.PSObject.Properties.Name -contains "properties")
         {
-            $o = $this.Body.properties
-            if ($o.PSobject.Properties.Name -contains "folder")
+            $o = $this.Body.Properties
+            if ($o.PSobject.Properties -ne $null -and $o.PSobject.Properties.Name -contains "folder")
             {
-                $ofn = $this.Body.properties.folder.name
+                $ofn = $this.Body.Properties.folder.name
             }
         }
         return $ofn

test/ApplyExclusionOptions.Tests.ps1

@@ -27,4 +27,32 @@ InModuleScope azure.datafactory.tools {
         }
 
     } 
+
+    Describe 'of BigFactorySample2_vnet without properties node and exclude rules' {
+        BeforeEach {
+            $DataFactoryName = "BigFactorySample2_vnet"
+            $RootFolder = Join-Path -Path $PSScriptRoot -ChildPath $DataFactoryName
+            $vnetFile = Join-Path $RootFolder 'managedVirtualNetwork\default.json'
+            $bf = Backup-File -FileName $vnetFile
+        }
+
+        It 'Should completed successfully' {
+            Remove-ObjectPropertyFromFile -FileName $vnetFile -Path 'properties'
+            $adf = Import-AdfFromFolder -FactoryName $DataFactoryName -RootFolder $RootFolder
+            $option = [AdfPublishOption]::new()
+            $option.Excludes.Add('managedVirtualNetwork*.*', '')
+            $adf.PublishOptions = $option
+            { ApplyExclusionOptions -adf $adf } | Should -Not -Throw
+            #$bf
+        }
+
+        AfterEach {
+            if ($bf) {
+                Write-Verbose "Restoring file from backup: $bf"
+                Restore-File -FileName $bf -RemoveBackup $true 
+            }
+        }
+        
+    }
+
 }

test/adfObject-class.Tests.ps1

@@ -56,6 +56,13 @@ InModuleScope azure.datafactory.tools {
             }
         }
 
+        Context 'When the object has limited nodes in it' {
+            It 'Should not throw an error' {
+                $o = New-AdfObjectFromFile -fileRelativePath 'BigFactorySample2_vnet\managedVirtualNetwork\default.json' -type 'managedVirtualNetwork' -name 'default'
+                $o.Body.Properties.PSObject.Properties.Remove('preventDataExfiltration')
+                { $o.GetFolderName() } | Should -Not -Throw
+            }
+        }
 
     }