Merge pull request #800 from Gijsreyn/fix-enum-output

Add fix to return enum string values

Author: SteveL-MSFT

powershell-adapter/Tests/TestClassResource/0.0.1/TestClassResource.psm1

@@ -8,6 +8,11 @@ enum EnumPropEnumeration {
     Expected
 }
 
+enum Ensure {
+    Present
+    Absent
+}
+
 class BaseTestClass
 {
     [DscProperty()]
@@ -32,6 +37,9 @@ class TestClassResource : BaseTestClass
     [DscProperty()]
     [PSCredential] $Credential
 
+    [DscProperty()]
+    [Ensure] $Ensure
+
     [string] $NonDscProperty # This property shouldn't be in results data
 
     hidden

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

@@ -274,4 +274,40 @@ Describe 'PowerShell adapter resource tests' {
     $out | Should -Not -BeNullOrEmpty
     $out | Should -BeLike "*ERROR*Credential object 'Credential' requires both 'username' and 'password' properties*"
   }
+
+  It 'Config get is able to return proper enum value' {
+    $yaml = @"
+        `$schema: https://aka.ms/dsc/schemas/v3/bundled/config/document.json
+        resources:
+        - name: Class-resource Info
+          type: TestClassResource/TestClassResource
+          properties:
+            Name: 'TestClassResource'
+            Ensure: 'Present'
+"@
+
+    $out = dsc config get -i $yaml | ConvertFrom-Json
+    $LASTEXITCODE | Should -Be 0
+    $out.results.result.actualState.Ensure | Should -Be 'Present'
+  }
+
+  It 'Config export is able to return proper enum value' {
+    $yaml = @"
+      `$schema: https://aka.ms/dsc/schemas/v3/bundled/config/document.json
+      resources:
+      - name: Working with class-based resources
+        type: Microsoft.DSC/PowerShell
+        properties:
+          resources:
+          - name: Class-resource Info
+            type: TestClassResource/TestClassResource
+"@
+
+    $out = dsc config export -i $yaml | ConvertFrom-Json
+    $LASTEXITCODE | Should -Be 0
+    $out.resources[0].properties.result.count | Should -Be 5
+    $out.resources[0].properties.result[0].Name | Should -Be "Object1"
+    $out.resources[0].properties.result[0].Prop1 | Should -Be "Property of object1"
+  }
 }
+

powershell-adapter/psDscAdapter/psDscAdapter.psm1

@@ -445,7 +445,15 @@ function Invoke-DscOperation {
                         'Get' {
                             $Result = @{}
                             $raw_obj = $dscResourceInstance.Get()
-                            $ValidProperties | ForEach-Object { $Result[$_] = $raw_obj.$_ }
+                            $ValidProperties | ForEach-Object { 
+                                if ($raw_obj.$_ -is [System.Enum]) {
+                                    $Result[$_] = $raw_obj.$_.ToString()
+
+                                }
+                                else {
+                                    $Result[$_] = $raw_obj.$_
+                                }
+                            }
                             $addToActualState.properties = $Result
                         }
                         'Set' {
@@ -473,7 +481,14 @@ function Invoke-DscOperation {
                             $raw_obj_array = $method.Invoke($null, $null)
                             foreach ($raw_obj in $raw_obj_array) {
                                 $Result_obj = @{}
-                                $ValidProperties | ForEach-Object { $Result_obj[$_] = $raw_obj.$_ }
+                                $ValidProperties | ForEach-Object { 
+                                    if ($raw_obj.$_ -is [System.Enum]) {
+                                        $Result_obj[$_] = $raw_obj.$_.ToString()
+                                    }
+                                    else { 
+                                        $Result_obj[$_] = $raw_obj.$_ 
+                                    }
+                                }
                                 $resultArray += $Result_obj
                             }
                             $addToActualState = $resultArray