Resolve feedback

Author: Gijsreyn

powershell-adapter/Tests/powershellgroup.resource.tests.ps1

@@ -27,8 +27,9 @@ Describe 'PowerShell adapter resource tests' {
         $r = dsc resource list '*' -a Microsoft.DSC/PowerShell
         $LASTEXITCODE | Should -Be 0
         $resources = $r | ConvertFrom-Json
-        ($resources | ? { $_.Type -eq 'TestClassResource/TestClassResource' }).Count | Should -Be 1
+        ($resources | Where-Object { $_.Type -eq 'TestClassResource/TestClassResource' }).Count | Should -Be 1
         ($resources | Where-Object -Property type -EQ 'TestClassResource/TestClassResource').capabilities | Should -BeIn @('get', 'set', 'test', 'export')
+        ($resources | Where-Object -Property type -EQ 'TestClassResource/NoExport').capabilities | Should -BeIn @('get', 'set', 'test')
     }
 
     It 'Get works on class-based resource' {

powershell-adapter/psDscAdapter/powershell.resource.ps1

@@ -91,13 +91,12 @@ switch ($Operation) {
             # TODO: for perf, it is better to take capabilities from psd1 in Invoke-DscCacheRefresh, not by extra call to Get-Module
             if ($DscResourceInfo.ModuleName) {
                 $module = Get-Module -Name $DscResourceInfo.ModuleName -ListAvailable | Sort-Object -Property Version -Descending | Select-Object -First 1
-                if ($module.PrivateData.PSData.DscCapabilities) {
+                if ($DscResourceInfo.Capabilities) {
+                    $capabilities = $DscResourceInfo.Capabilities
+                } elseif ($module.PrivateData.PSData.DscCapabilities) {
+                    
                     $capabilities = $module.PrivateData.PSData.DscCapabilities
-                }
-                elseif ($DscResourceInfo.Methods) {
-                    $capabilities = $DscResourceInfo.Methods
-                }
-                else {
+                } else {
                     $capabilities = @('get', 'set', 'test')
                 }
             }

powershell-adapter/psDscAdapter/psDscAdapter.psm1

@@ -60,7 +60,7 @@ function Add-AstMembers {
 
     foreach ($member in $TypeAst.Members) {
         $property = $member -as [System.Management.Automation.Language.PropertyMemberAst]
-        if (($property -eq $null) -or ($property.IsStatic)) {
+        if (($null -eq $property) -or ($property.IsStatic)) {
             continue;
         }
         $skipProperty = $true
@@ -139,7 +139,7 @@ function FindAndParseResourceDefinitions {
                 $DscResourceInfo.Version = $moduleVersion
 
                 $DscResourceInfo.Properties = [System.Collections.Generic.List[DscResourcePropertyInfo]]::new()
-                $DscResourceInfo.Methods = GetClassBasedCapabilities $typeDefinitionAst.Members
+                $DscResourceInfo.Capabilities = GetClassBasedCapabilities $typeDefinitionAst.Members
                 Add-AstMembers $typeDefinitions $typeDefinitionAst $DscResourceInfo.Properties
 
                 $resourceList.Add($DscResourceInfo)
@@ -531,21 +531,21 @@ function GetTypeInstanceFromModule {
 }
 
 function GetClassBasedCapabilities ($functionMemberAst) {
-    $capabilities = @()
+    $capabilities = [System.Collections.Generic.List[string[]]]::new()
     # These are the methods that we can potentially expect in a class-based DSC resource.
     $availableMethods = @('get', 'set', 'setHandlesExist', 'whatIf', 'test', 'delete', 'export')
     $methods = $functionMemberAst | Where-Object { $_ -is [System.Management.Automation.Language.FunctionMemberAst] -and $_.Name -in $availableMethods }
 
     foreach ($method in $methods.Name) {
         # We go through each method to properly case handle the method names.
         switch ($method) {
-            'Get' { $capabilities += 'get' }
-            'Set' { $capabilities += 'set' }
-            'Test' { $capabilities += 'test' }
-            'WhatIf' { $capabilities += 'whatIf' }
-            'SetHandlesExist' { $capabilities += 'setHandlesExist' }
-            'Delete' { $capabilities += 'delete' }
-            'Export' { $capabilities += 'export' }
+            'Get' { $capabilities.Add('get') }
+            'Set' { $capabilities.Add('set') }
+            'Test' { $capabilities.Add('test') }
+            'WhatIf' { $capabilities.Add('whatIf') }
+            'SetHandlesExist' { $capabilities.Add('setHandlesExist') }
+            'Delete' { $capabilities.Add('delete') }
+            'Export' { $capabilities.Add('export') }
         }
     }
 
@@ -601,5 +601,5 @@ class DscResourceInfo {
     [string] $ImplementedAs
     [string] $CompanyName
     [System.Collections.Generic.List[DscResourcePropertyInfo]] $Properties
-    [string[]] $Methods
+    [string[]] $Capabilities
 }