Update permissive record matcher based on feedback

John Paul Kee · John Paul Kee · commit c972fc53d98d · 2019-07-31T16:30:11.000-07:00
diff --git a/src/Sql/Sql.Test/UnitTests/PermissiveRecordMatcherWithApiExclusionUnitTests.cs b/src/Sql/Sql.Test/UnitTests/PermissiveRecordMatcherWithApiExclusionUnitTests.cs
@@ -17,15 +17,21 @@ public void PermissiveRecordMatcherWithApiExclusion_ContainsIgnoredProvider()
             {
                 "/subscriptions/a8c9a924-06c0-4bde-9788-e7b1370969e1/providers/Microsoft.Sql?api-version=2016-09-01",
                 "/subscriptions/a8c9a924-06c0-4bde-9788-e7b1370969e1/resourcegroups/ps8625?api-version=2016-09-01",
+
+                // - The above uris should be ignored
                 "/subscriptions/a8c9a924-06c0-4bde-9788-e7b1370969e1/providers/Microsoft.Sql/virtualClusters?api-version=2015-05-01-preview",
+                "/subscriptions/a8c9a924-06c0-4bde-9788-e7b1370969e1/resourceGroups/ps8625/providers/Microsoft.Sql/virtualClusters?api-version=2015-05-01-preview",
+
                 "/subscriptions/a8c9a924-06c0-4bde-9788-e7b1370969e1/resourceGroups/ps8625/providers/Microsoft.Network/virtualNetworks/cl_initial?api-version=2018-12-01",
+
+                "/subscriptions/4cac86b0-1e56-48c2-9df2-669a6d2d87c5/providers/Microsoft.Sql/managedInstances",
+                "/subscriptions/4cac86b0-1e56-48c2-9df2-669a6d2d87c5/resourceGroups/ps8625/providers/Microsoft.Sql/managedInstances",
                 "/subscriptions/a8c9a924-06c0-4bde-9788-e7b1370969e1/resourceGroups/ps8625/providers/Microsoft.Sql/managedInstances/ps8807?api-version=2015-05-01-preview",
-                "/subscriptions/a8c9a924-06c0-4bde-9788-e7b1370969e1/resourceGroups/ps8625/providers/Microsoft.Sql/servers/ps8807?api-version=2015-05-01-preview",
-                "/subscriptions/a8c9a924-06c0-4bde-9788-e7b1370969e1/resourceGroups/ps8625/providers/Microsoft.Sql/virtualClusters?api-version=2015-05-01-preview",
+                "/subscriptions/cca24ec8-99b5-4aa7-9ff6-486e886f304c/resourceGroups/cl_one/providers/Microsoft.Sql/managedInstances/dc-cmdlet-serverps8052?api-version=2018-06-01-preview",
+
                 "/subscriptions/a8c9a924-06c0-4bde-9788-e7b1370969e1/resourceGroups/ps8625/providers/Microsoft.Sql/managedInstances/ps8807/managedDatabases/db1?api-version=2017-03-01-preview",
+                "/subscriptions/a8c9a924-06c0-4bde-9788-e7b1370969e1/resourceGroups/ps8625/providers/Microsoft.Sql/servers/ps8807?api-version=2015-05-01-preview",
                 "/subscriptions/a8c9a924-06c0-4bde-9788-e7b1370969e1/resourceGroups/ps8625/providers/Microsoft.Sql/servers/ps8807/databases/testdb?api-version=2017-03-01-preview",
-                "/subscriptions/4cac86b0-1e56-48c2-9df2-669a6d2d87c5/providers/Microsoft.Sql/managedInstances",
-                "/subscriptions/4cac86b0-1e56-48c2-9df2-669a6d2d87c5/resourceGroups/ps8625/providers/Microsoft.Sql/managedInstances"
             };
 
             TestContainsIgnoredProvider(
@@ -39,15 +45,21 @@ public void PermissiveRecordMatcherWithApiExclusion_ContainsIgnoredProvider()
                 {
                     "Microsoft.Sql/managedInstances",
                 },
-                expectedNumIgnored: 3);
+                expectedNumIgnored: 4);
 
+            var len = testRequestUris.Count();
             TestContainsIgnoredProvider(
                  requestUrisToTest: testRequestUris,
-                 resourcesToIgnore: new string[1]
+                 resourcesToIgnore: new string[6]
                  {
-                     "Microsoft.Sql/managedInstances/managedDatabases"
+                     "Microsoft.Network/virtualNetworks",
+                     "Microsoft.Sql/virtualClusters",
+                     "Microsoft.Sql/managedInstances",
+                     "Microsoft.Sql/managedInstances/managedDatabases",
+                     "Microsoft.Sql/servers",
+                     "Microsoft.Sql/servers/databases"
                  },
-                 expectedNumIgnored: 1);
+                 expectedNumIgnored: 10);
         }
 
         private void TestContainsIgnoredProvider(
diff --git a/tools/ScenarioTest.ResourceManager/PermissiveRecordMatcherWithApiExclusion.cs b/tools/ScenarioTest.ResourceManager/PermissiveRecordMatcherWithApiExclusion.cs
@@ -167,12 +167,13 @@ public static bool ContainsIgnoredProvider(
                 // If we're looking at a specific provider and we have top level resource from this provider to ignore
                 foreach (var resourceToIgnore in resourcesToIgnore)
                 {
-                    var segments = requestUri.Split('/');
+                    string[] segments = requestUri.Split(new char[] { '/' }, options: StringSplitOptions.RemoveEmptyEntries);
 
                     // /subscriptions/.../resourceGroups/.../providers/Microsoft.X/resourceType...?api-version=Y
-                    if (requestUri.Contains("resourceGroups/") && requestUri.Contains("providers/"))
+                    var regex = new Regex(@"\/subscriptions\/[0-9A-Fa-f-]*\/resourceGroups\/[a-zA-Z0-9_-]*\/providers\/[a-zA-Z0-9_-]*.[a-zA-Z0-9_-]*\/.*[?api-version=[0-9-]*]?");
+                    if (regex.IsMatch(requestUri))
                     {
-                        if (segments.Length > 8)
+                        if (segments.Length > 7)
                         {
                             var resourceIdentifier = new ResourceIdentifier(requestUri);
                             if (resourceIdentifier.ResourceType == resourceToIgnore)
@@ -181,9 +182,9 @@ public static bool ContainsIgnoredProvider(
                                 return true;
                             }
                         }
-                        else if (segments.Length == 8)
+                        else if (segments.Length == 7)
                         {
-                            var resourceType = $"{segments[6]}/{segments[7]}";
+                            var resourceType = $"{segments[5]}/{segments[6]}";
                             if (resourceType.Contains(resourceToIgnore))
                             {
                                 apiVersion = String.Empty;
@@ -193,16 +194,14 @@ public static bool ContainsIgnoredProvider(
                     }
 
                     // /subscriptions/.../providers/Microsoft.Provider/resourceType
-                    if (requestUri.Contains("providers/"))
+                    regex = new Regex(@"\/subscriptions\/[0-9A-Fa-f-]*\/providers\/[a-zA-Z0-9_-]*.[a-zA-Z0-9_-]*\/.*?[api-version=[0-9-]*]?");
+                    if (regex.IsMatch(requestUri))
                     {
-                        if (segments.Length == 6)
+                        var resourceType = $"{segments[3]}/{segments[4]}";
+                        if (resourceType.Contains(resourceToIgnore))
                         {
-                            var resourceType = $"{segments[4]}/{segments[5]}";
-                            if (resourceType.Contains(resourceToIgnore))
-                            {
-                                apiVersion = String.Empty;
-                                return true;
-                            }
+                            apiVersion = String.Empty;
+                            return true;
                         }
                     }
                 }

Original file line number	Diff line number	Diff line change
`@@ -167,12 +167,13 @@ public static bool ContainsIgnoredProvider(`
`167`	`167`	`// If we're looking at a specific provider and we have top level resource from this provider to ignore`
`168`	`168`	`foreach (var resourceToIgnore in resourcesToIgnore)`
`169`	`169`	`{`
`170`		`- var segments = requestUri.Split('/');`
	`170`	`+ string[] segments = requestUri.Split(new char[] { '/' }, options: StringSplitOptions.RemoveEmptyEntries);`
`171`	`171`
`172`	`172`	`// /subscriptions/.../resourceGroups/.../providers/Microsoft.X/resourceType...?api-version=Y`
`173`		`- if (requestUri.Contains("resourceGroups/") && requestUri.Contains("providers/"))`
	`173`	`+ var regex = new Regex(@"\/subscriptions\/[0-9A-Fa-f-]\/resourceGroups\/[a-zA-Z0-9_-]\/providers\/[a-zA-Z0-9_-].[a-zA-Z0-9_-]\/.[?api-version=[0-9-]]?");`
	`174`	`+ if (regex.IsMatch(requestUri))`
`174`	`175`	`{`
`175`		`- if (segments.Length > 8)`
	`176`	`+ if (segments.Length > 7)`
`176`	`177`	`{`
`177`	`178`	`var resourceIdentifier = new ResourceIdentifier(requestUri);`
`178`	`179`	`if (resourceIdentifier.ResourceType == resourceToIgnore)`
`@@ -181,9 +182,9 @@ public static bool ContainsIgnoredProvider(`
`181`	`182`	`return true;`
`182`	`183`	`}`
`183`	`184`	`}`
`184`		`- else if (segments.Length == 8)`
	`185`	`+ else if (segments.Length == 7)`
`185`	`186`	`{`
`186`		`- var resourceType = $"{segments[6]}/{segments[7]}";`
	`187`	`+ var resourceType = $"{segments[5]}/{segments[6]}";`
`187`	`188`	`if (resourceType.Contains(resourceToIgnore))`
`188`	`189`	`{`
`189`	`190`	`apiVersion = String.Empty;`
`@@ -193,16 +194,14 @@ public static bool ContainsIgnoredProvider(`
`193`	`194`	`}`
`194`	`195`
`195`	`196`	`// /subscriptions/.../providers/Microsoft.Provider/resourceType`
`196`		`- if (requestUri.Contains("providers/"))`
	`197`	`+ regex = new Regex(@"\/subscriptions\/[0-9A-Fa-f-]\/providers\/[a-zA-Z0-9_-].[a-zA-Z0-9_-]\/.?[api-version=[0-9-]*]?");`
	`198`	`+ if (regex.IsMatch(requestUri))`
`197`	`199`	`{`
`198`		`- if (segments.Length == 6)`
	`200`	`+ var resourceType = $"{segments[3]}/{segments[4]}";`
	`201`	`+ if (resourceType.Contains(resourceToIgnore))`
`199`	`202`	`{`
`200`		`- var resourceType = $"{segments[4]}/{segments[5]}";`
`201`		`- if (resourceType.Contains(resourceToIgnore))`
`202`		`- {`
`203`		`- apiVersion = String.Empty;`
`204`		`- return true;`
`205`		`- }`
	`203`	`+ apiVersion = String.Empty;`
	`204`	`+ return true;`
`206`	`205`	`}`
`207`	`206`	`}`
`208`	`207`	`}`