Fixes for simple field cases Azure#1323

BernieWhite · Jan 29, 2023 · f91d24d · f91d24d
1 parent cfd65d2
commit f91d24d
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 7 deletions.
diff --git a/docs/CHANGELOG-v1.md b/docs/CHANGELOG-v1.md
@@ -39,6 +39,8 @@ What's changed since pre-release v1.24.0-B0013:
     [#2004](https://github.com/Azure/PSRule.Rules.Azure/issues/2004)
   - Fixed `apiVersion` comparison of `requestContext` by @BernieWhite.
     [#1654](https://github.com/Azure/PSRule.Rules.Azure/issues/1654)
+  - Fixed simple cases for field type expressions by @BernieWhite.
+    [#1323](https://github.com/Azure/PSRule.Rules.Azure/issues/1323)
 
 ## v1.24.0-B0013 (pre-release)
 

diff --git a/src/PSRule.Rules.Azure/Data/Policy/PolicyAssignmentVisitor.cs b/src/PSRule.Rules.Azure/Data/Policy/PolicyAssignmentVisitor.cs
@@ -922,14 +922,23 @@ private static void VisitValueExpression(PolicyAssignmentContext context, JObjec
                 }
             }
 
-            // Handle "[field('type')]
+            // Handle [field('string')]
             else if (tokens.ConsumeFunction(PROPERTY_FIELD) &&
                 tokens.TryTokenType(ExpressionTokenType.GroupStart, out _) &&
-                tokens.ConsumeString(PROPERTY_TYPE) &&
+                tokens.ConsumeString(out var field) &&
                 tokens.TryTokenType(ExpressionTokenType.GroupEnd, out _))
             {
-                condition.Remove(PROPERTY_VALUE);
-                condition.Add(PROPERTY_TYPE, DOT);
+                // Handle [field('type')]
+                if (string.Equals(field, PROPERTY_TYPE, StringComparison.OrdinalIgnoreCase))
+                {
+                    condition.Remove(PROPERTY_VALUE);
+                    condition.Add(PROPERTY_TYPE, DOT);
+                }
+                else
+                {
+                    condition.Remove(PROPERTY_VALUE);
+                    condition.Add(PROPERTY_FIELD, field);
+                }
             }
         }
 

diff --git a/src/PSRule.Rules.Azure/Data/Template/TokenStream.cs b/src/PSRule.Rules.Azure/Data/Template/TokenStream.cs
@@ -156,14 +156,27 @@ internal static bool ConsumeString(this TokenStream stream, string s)
         {
             if (stream == null ||
                 stream.Count == 0 ||
-                stream.Current.Type != ExpressionTokenType.Property ||
+                stream.Current.Type != ExpressionTokenType.String ||
                 !string.Equals(stream.Current.Content, s, StringComparison.OrdinalIgnoreCase))
                 return false;
 
             stream.Pop();
             return true;
         }
 
+        internal static bool ConsumeString(this TokenStream stream, out string s)
+        {
+            s = null;
+            if (stream == null ||
+                stream.Count == 0 ||
+                stream.Current.Type != ExpressionTokenType.String)
+                return false;
+
+            s = stream.Current.Content;
+            stream.Pop();
+            return true;
+        }
+
         internal static bool ConsumeGroup(this TokenStream stream)
         {
             if (stream == null ||

diff --git a/tests/PSRule.Rules.Azure.Tests/PolicyAssignmentVisitorTests.cs b/tests/PSRule.Rules.Azure.Tests/PolicyAssignmentVisitorTests.cs
@@ -35,7 +35,7 @@ public void GetPolicyDefinition()
 
             var definitions = context.GetDefinitions();
             Assert.NotNull(definitions);
-            Assert.Equal(105, definitions.Length);
+            Assert.Equal(107, definitions.Length);
 
             // Check category and version
             var actual = definitions.FirstOrDefault(definition => definition.DefinitionId == "/providers/Microsoft.Authorization/policyDefinitions/34c877ad-507e-4c82-993e-3452a6e0ad3c");
@@ -74,7 +74,7 @@ public void GetPolicyDefinitionWithIgnore()
 
             var definitions = context.GetDefinitions();
             Assert.NotNull(definitions);
-            Assert.Equal(104, definitions.Length);
+            Assert.Equal(106, definitions.Length);
 
             // Check category and version
             var actual = definitions.FirstOrDefault(definition => definition.DefinitionId == "/providers/Microsoft.Authorization/policyDefinitions/34c877ad-507e-4c82-993e-3452a6e0ad3c");