Merge pull request #579 from Gijsreyn/export-multi-methods

Export multi methods
PowerShell · Nov 12, 2024 · 22dbb57 · 22dbb57
2 parents 71fac96 + 242a1a0
commit 22dbb57
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 1 deletion.
diff --git a/powershell-adapter/Tests/TestClassResource/0.0.1/TestClassResource.psm1 b/powershell-adapter/Tests/TestClassResource/0.0.1/TestClassResource.psm1
@@ -81,6 +81,30 @@ class TestClassResource : BaseTestClass
 
         return $resultList.ToArray()
     }
+
+    static [TestClassResource[]] Export([bool]$UseExport)
+    {
+        if ($UseExport) 
+        {
+            return [TestClassResource]::Export()
+        }
+        else 
+        {
+            $resultList = [List[TestClassResource]]::new()
+            $resultCount = 5
+            if ($env:TestClassResourceResultCount) {
+                $resultCount = $env:TestClassResourceResultCount
+            }
+            1..$resultCount | %{
+                $obj = New-Object TestClassResource
+                $obj.Name = "Object$_"
+                $obj.Prop1 = "Property of object$_"
+                $resultList.Add($obj)
+            }
+        }
+
+        return $resultList.ToArray()
+    }
 }
 
 [DscResource()]

diff --git a/powershell-adapter/psDscAdapter/psDscAdapter.psm1 b/powershell-adapter/psDscAdapter/psDscAdapter.psm1
@@ -485,7 +485,14 @@ function Invoke-DscOperation {
                         }
                         'Export' {
                             $t = $dscResourceInstance.GetType()
-                            $method = $t.GetMethod('Export')
+                            $methods = $t.GetMethods() | Where-Object { $_.Name -eq 'Export' }
+                            $method = foreach ($mt in $methods) {
+                                if ($mt.GetParameters().Count -eq 0) {
+                                    $mt
+				                    break
+                                }
+                            }
+
                             if ($null -eq $method) {
                                 "Export method not implemented by resource '$($DesiredState.Type)'" | Write-DscTrace -Operation Error
                                 exit 1