Fix de-serialization of non-object arrays #111 (#112)

- Fix incorrect JSON de-serialization of non-object arrays. #111
microsoft · Mar 24, 2019 · f093774 · f093774
1 parent d0f81ea
commit f093774
Show file tree

Hide file tree

Showing 6 changed files with 31 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,7 @@
 ## Unreleased
 
 - Fix incorrect JSON de-serialization of nested arrays. [#109](https://github.com/BernieWhite/PSRule/issues/109)
+- Fix incorrect JSON de-serialization of non-object arrays. [#111](https://github.com/BernieWhite/PSRule/issues/111)
 
 ## v0.4.0-B190311 (pre-release)
 

diff --git a/src/PSRule/Common/JsonConverters.cs b/src/PSRule/Common/JsonConverters.cs
@@ -183,8 +183,16 @@ private PSObject ReadObject(JsonReader reader)
 
                         while (reader.TokenType != JsonToken.EndArray)
                         {
-                            var item = ReadObject(reader: reader);
-                            items.Add(item);
+                            if (reader.TokenType == JsonToken.StartObject)
+                            {
+                                var item = ReadObject(reader: reader);
+                                items.Add(item);
+                            }
+                            else
+                            {
+                                items.Add(PSObject.AsPSObject(reader.Value));
+                            }
+
                             reader.Read();
                         }
 

diff --git a/tests/PSRule.Tests/FromFile.Rule.ps1 b/tests/PSRule.Tests/FromFile.Rule.ps1
@@ -133,6 +133,7 @@ Rule 'WithConfiguration' {
 Rule 'WithFormat' {
     $TargetObject.spec.properties.kind -eq 'Test'
     ($TargetObject.spec.properties.array.id | Measure-Object).Count -eq 2
+    ($TargetObject.spec.properties.array2 | Measure-Object).Count -eq 3
 }
 
 # Description: Test for Hint keyword

diff --git a/tests/PSRule.Tests/ObjectFromFile.json b/tests/PSRule.Tests/ObjectFromFile.json
@@ -12,6 +12,11 @@
                     {
                         "id": "2"
                     }
+                ],
+                "array2": [
+                    "1",
+                    "2",
+                    "3"
                 ]
             }
         }
@@ -29,6 +34,11 @@
                     {
                         "id": "2"
                     }
+                ],
+                "array2": [
+                    "1",
+                    "2",
+                    "3"
                 ]
             }
         }

diff --git a/tests/PSRule.Tests/ObjectFromFile.yaml b/tests/PSRule.Tests/ObjectFromFile.yaml
@@ -9,7 +9,10 @@ spec:
     array:
     - id: 1
     - id: 2
-
+    array2:
+    - "1"
+    - "2"
+    - "3"
 ---
 targetName: TestObject2
 spec:
@@ -19,6 +22,7 @@ spec:
     array:
     - id: 1
     - id: 2
+    array2: [ "1", "2", "3" ]
 
 ---
 # Null object

diff --git a/tests/PSRule.Tests/ObjectFromFile2.yaml b/tests/PSRule.Tests/ObjectFromFile2.yaml
@@ -9,3 +9,7 @@ spec:
     array:
     - id: 1
     - id: 2
+    array2:
+    - 1
+    - 2
+    - 3
-Original file line number
+Diff line change
@@ Expand Up / @@ -12,6 +12,11 @@ @@
                         {
                             "id": "2"
                         }
+                    ],
+                    "array2": [
+                        "1",
+                        "2",
+                        "3"
                     ]
                 }
             }
@@ Expand All / @@ -29,6 +34,11 @@ @@
                         {
                             "id": "2"
                         }
+                    ],
+                    "array2": [
+                        "1",
+                        "2",
+                        "3"
                     ]
                 }
             }
@@ Expand Down @@