Merge pull request #797 from Gijsreyn/enable-class-based-winps

Allow workaround for class-based WinPS

Author: SteveL-MSFT

powershell-adapter/Tests/win_powershellgroup.tests.ps1

@@ -268,4 +268,86 @@ resources:
     $out | Should -Not -BeNullOrEmpty
     $out | Should -BeLike "*ERROR*Credential object 'Credential' requires both 'username' and 'password' properties*"
   }
+
+  It 'List works with class-based PS DSC resources' -Skip:(!$IsWindows) {
+    BeforeDiscovery {
+      $windowsPowerShellPath = Join-Path $testDrive 'WindowsPowerShell' 'Modules'
+      $env:PSModulePath += [System.IO.Path]::PathSeparator + $windowsPowerShellPath
+
+      $moduleFile = @"
+@{
+    RootModule           = 'PSClassResource.psm1'
+    ModuleVersion        = '0.1.0'
+    GUID                 = '1b2e177b-1819-4f51-8bc9-795dd8fae984'
+    Author               = 'Microsoft Corporation'
+    CompanyName          = 'Microsoft Corporation'
+    Copyright            = '(c) Microsoft Corporation. All rights reserved.'
+    Description          = 'DSC Resource for Windows PowerShell Class'
+    PowerShellVersion    = '5.1'
+    DscResourcesToExport = @(
+        'PSClassResource'
+    )
+    PrivateData          = @{
+        PSData = @{
+            Tags       = @(
+                'PSDscResource_PSClassResource'
+            )
+        }
+    }
 }
+"@
+      $moduleFilePath = Join-Path $windowsPowerShellPath 'PSClassResource' '0.1.0' 'PSClassResource.psd1'
+      if (-not (Test-Path -Path $moduleFilePath)) {
+        New-Item -Path $moduleFilePath -ItemType File -Value $moduleFile -Force | Out-Null
+      }
+
+
+      $module = @'
+[DSCResource()]
+class PSClassResource {
+    [DscProperty(Key)]
+    [string] $Name
+
+    PSClassResource() {
+    }
+
+    [PSClassResource] Get() {
+        return $this
+    }
+
+    [bool] Test() {
+        return $true
+    }
+
+    [void] Set() {
+        
+    }
+}
+'@
+
+      $modulePath = Join-Path $windowsPowerShellPath 'PSClassResource' '0.1.0' 'PSClassResource.psm1'
+      if (-not (Test-Path -Path $modulePath)) {
+        New-Item -Path $modulePath -ItemType File -Value $module -Force | Out-Null
+      }
+    }
+
+    $out = dsc -l trace resource list --adapter Microsoft.Windows/WindowsPowerShell | ConvertFrom-Json
+    $LASTEXITCODE | Should -Be 0
+    $out.type | Should -Contain 'PSClassResource/PSClassResource'
+    $out | Where-Object -Property type -EQ PSClassResource/PSClassResource | Select-Object -ExpandProperty implementedAs | Should -Be 1 # Class-based
+  }
+
+  It 'Get works with class-based PS DSC resources' -Skip:(!$IsWindows) {
+    
+    $out = dsc resource get -r PSClassResource/PSClassResource --input (@{Name = 'TestName' } | ConvertTo-Json) | ConvertFrom-Json
+    $LASTEXITCODE | Should -Be 0
+    $out.actualState.Name | Should -Be 'TestName'
+  }
+
+  It 'Set works with class-based PS DSC resources' -Skip:(!$IsWindows) {
+    
+    $out = dsc resource set -r PSClassResource/PSClassResource --input (@{Name = 'TestName' } | ConvertTo-Json) | ConvertFrom-Json
+    $LASTEXITCODE | Should -Be 0
+    $out.afterstate.InDesiredState | Should -Be $true
+  }
+}

powershell-adapter/psDscAdapter/win_psDscAdapter.psm1

@@ -223,6 +223,12 @@ function Invoke-DscCacheRefresh {
                 }
             }
 
+            # workaround: Use GetTypeInstanceFromModule to get the type instance from the module and validate if it is a class-based resource
+            $classBased = GetTypeInstanceFromModule -modulename $moduleName -classname $dscResource.Name -ErrorAction Ignore
+            if (-not ([string]::IsNullOrEmpty($classBased))) {
+                $dscResourceInfo.ImplementationDetail = 'ClassBased'
+            }
+
             # fill in resource files (and their last-write-times) that will be used for up-do-date checks
             $lastWriteTimes = @{}
             Get-ChildItem -Recurse -File -Path $dscResource.ParentPath -Include "*.ps1", "*.psd1", "*.psm1", "*.mof" -ea Ignore | % {