Fixed use of lower case Tags resource property #43 (#44)

microsoft · Jan 1, 2021 · e73071f · e73071f
1 parent 770bba5
commit e73071f
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 6 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,11 @@
 
 ## Unreleased
 
+What's changed since pre-release v0.1.0-B2012004:
+
+- Bug fixes:
+  - Fixed use of lower case `Tags` resource property. [#43](https://github.com/microsoft/PSRule.Rules.CAF/issues/43)
+
 ## v0.1.0-B2012004 (pre-release)
 
 What's changed since pre-release v0.1.0-B2009009:

diff --git a/src/PSRule.Rules.CAF/rules/CAF.Tag.Rule.ps1 b/src/PSRule.Rules.CAF/rules/CAF.Tag.Rule.ps1
@@ -11,7 +11,7 @@ Rule 'CAF.Tag.Resource' -If { (CAF_SupportsTags) -and !(CAF_IsResourceGroup) -an
     if ($required.Length -eq 0) {
         return $Assert.Pass();
     }
-    $Assert.HasField($TargetObject, 'Tags');
+    $Assert.HasField($TargetObject, 'tags');
     if ($Null -ne $TargetObject.Tags) {
         $Assert.HasFields($TargetObject.Tags, $required, $Configuration.CAF_MatchTagNameCase);
     }
@@ -23,14 +23,17 @@ Rule 'CAF.Tag.ResourceGroup' -Type 'Microsoft.Resources/resourceGroups' -If { ($
     if ($required.Length -eq 0) {
         return $Assert.Pass();
     }
-    $Assert.HasField($TargetObject, 'Tags');
+    $Assert.HasField($TargetObject, 'tags');
     if ($Null -ne $TargetObject.Tags) {
         $Assert.HasFields($TargetObject.Tags, $required, $Configuration.CAF_MatchTagNameCase);
     }
 }
 
 # Synopsis: Tag resources and resource groups with a valid environment.
-Rule 'CAF.Tag.Environment' -If { (CAF_SupportsTags) -and (Exists "Tags.$($Configuration.CAF_EnvironmentTag)") } {
-    $Assert.HasField($TargetObject, "Tags.$($Configuration.CAF_EnvironmentTag)", $Configuration.CAF_MatchTagNameCase);
-    $Assert.In($TargetObject, "Tags.$($Configuration.CAF_EnvironmentTag)", $Configuration.CAF_Environments, $Configuration.CAF_MatchTagValueCase)
+Rule 'CAF.Tag.Environment' -If { (CAF_SupportsTags) -and (Exists "tags.$($Configuration.CAF_EnvironmentTag)") } {
+    $Assert.HasField($TargetObject, 'tags');
+    if ($Null -ne $TargetObject.Tags) {
+        $Assert.HasField($TargetObject.Tags, $Configuration.CAF_EnvironmentTag, $Configuration.CAF_MatchTagNameCase);
+        $Assert.In($TargetObject.Tags, $Configuration.CAF_EnvironmentTag, $Configuration.CAF_Environments, $Configuration.CAF_MatchTagValueCase);
+    }
 }
diff --git a/tests/PSRule.Rules.CAF.Tests/CAF.Tag.Tests.ps1 b/tests/PSRule.Rules.CAF.Tests/CAF.Tag.Tests.ps1
@@ -56,7 +56,7 @@ Describe 'CAF.Tag' -Tag 'tag' {
             @{
                 Name = 'vnet-A'
                 Type = 'Microsoft.Network/virtualNetworks'
-                Tags = @{
+                tags = @{
                     Env = 'Prod'
                 }
             },