fix: Provide case invarient lookups for resource group filtering (#1498)

* Provide case invarient lookups for resource group filtering #1492 Signed-off-by: Tom Kerkhove <kerkhove.tom@gmail.com> * Update changelog Signed-off-by: Tom Kerkhove <kerkhove.tom@gmail.com> * Revert Signed-off-by: Tom Kerkhove <kerkhove.tom@gmail.com> * Fix bad changelog Signed-off-by: Tom Kerkhove <kerkhove.tom@gmail.com>
tomkerkhove · Feb 8, 2021 · 403426c · 403426c
1 parent 69ebb6e
commit 403426c
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 5 deletions.
diff --git a/changelog/content/experimental/unreleased.md b/changelog/content/experimental/unreleased.md
@@ -19,3 +19,4 @@ version:
 - {{% tag added %}} Support for discovering Azure Front Door resources ([docs](https://promitor.io/configuration/v2.x/metrics/front-door)
  | [#343](https://github.com/tomkerkhove/promitor/issues/343))
 - {{% tag changed %}} Provide better usability in terms of startup and configuration insights ([#1474](https://github.com/tomkerkhove/promitor/issues/1474))
+- {{% tag fixed %}} Provide case-invarient lookups for resource group filtering ([#1492](https://github.com/tomkerkhove/promitor/issues/1492))
diff --git a/config/promitor/resource-discovery/resource-discovery-declaration.yaml b/config/promitor/resource-discovery/resource-discovery-declaration.yaml
@@ -65,7 +65,7 @@ resourceDiscoveryGroups:
       regions:
       - northeurope
       - westeurope
-- name: web-apps-filtered
+- name: web-apps-in-resource-group
   type: WebApp
   criteria:
     include:
@@ -86,6 +86,12 @@ resourceDiscoveryGroups:
     include:
       resourceGroups:
       - promitor-testing-resource-discovery-eu
+- name: one-resource-group-scenario-wiht-other-casing
+  type: LogicApp
+  criteria:
+    include:
+      resourceGroups:
+      - PROMITOR-testing-resource-discovery-eu
 - name: two-resource-group-scenario
   type: LogicApp
   criteria:

diff --git a/src/Promitor.Agents.ResourceDiscovery/Graph/Query/GraphQueryBuilder.cs b/src/Promitor.Agents.ResourceDiscovery/Graph/Query/GraphQueryBuilder.cs
@@ -25,11 +25,11 @@ public GraphQueryBuilder(string[] resourceTypes)
 
             _queryBuilder = new StringBuilder();
             _queryBuilder.AppendLine("Resources");
-            _queryBuilder.AppendLine($"| where type == tolower('{resourceTypes.First()}')");
+            _queryBuilder.AppendLine($"| where type =~ '{resourceTypes.First()}'");
 
             foreach (var resourceType in resourceTypes.Skip(1))
             {
-                _queryBuilder.AppendLine($" or type == '{resourceType}'");
+                _queryBuilder.AppendLine($" or type =~ '{resourceType}'");
             }
         }
 
@@ -145,10 +145,10 @@ private void FilterByField(string fieldName, List<string> allowedValues)
             _queryBuilder.Append("| where ");
             for (int counter = 0; counter < allowedValues.Count - 1; counter++)
             {
-                _queryBuilder.Append($"{fieldName} == '{allowedValues[counter]}' or ");
+                _queryBuilder.Append($"{fieldName} =~ '{allowedValues[counter]}' or ");
             }
 
-            _queryBuilder.AppendLine($"{fieldName} == '{allowedValues.Last()}'");
+            _queryBuilder.AppendLine($"{fieldName} =~ '{allowedValues.Last()}'");
         }
 
         private void FilterByTags(Dictionary<string,string> allowedTags)

diff --git a/src/Promitor.Tests.Integration/Services/ResourceDiscovery/ResourceDiscoveryTests.cs b/src/Promitor.Tests.Integration/Services/ResourceDiscovery/ResourceDiscoveryTests.cs
@@ -93,6 +93,26 @@ public async Task ResourceDiscovery_GetWithFilterOnOneResourceGroup_ReturnsExpec
             Assert.Equal(expectedResourceCount, resources.Count);
         }
 
+        [Fact]
+        public async Task ResourceDiscovery_GetWithFilterOnOneResourceGroupWithDifferentCasing_ReturnsExpectedAmount()
+        {
+            // Arrange
+            const string resourceDiscoveryGroupName = "one-resource-group-scenario-wiht-other-casing";
+            const int expectedResourceCount = 3;
+            var resourceDiscoveryClient = new ResourceDiscoveryClient(Configuration, Logger);
+
+            // Act
+            var response = await resourceDiscoveryClient.GetDiscoveredResourcesAsync(resourceDiscoveryGroupName);
+
+            // Assert
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+            var rawResponseBody = await response.Content.ReadAsStringAsync();
+            Assert.NotEmpty(rawResponseBody);
+            var resources = JsonConvert.DeserializeObject<List<Resource>>(rawResponseBody);
+            Assert.NotNull(resources);
+            Assert.Equal(expectedResourceCount, resources.Count);
+        }
+
         [Fact]
         public async Task ResourceDiscovery_GetWithFilterOnTwoResourceGroups_ReturnsExpectedAmount()
         {