feat: Make resource pattern validation looser

This is required for APIs that don't conform to our expectations. Initially this is unconditional; eventually we'd want to make this part of a generation context which might be strict or loose in various ways. Unit test is included in this commit; the next commit has "golden generation result" tests.
googleapis · Apr 14, 2022 · df1a870 · df1a870
1 parent 3b817f3
commit df1a870
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 2 deletions.
diff --git a/Google.Api.Generator.Tests/ResourcePatternTest.cs b/Google.Api.Generator.Tests/ResourcePatternTest.cs
@@ -39,6 +39,18 @@ public void ValidPattern(string pattern, string[] paramNames, string pathTemplat
             Assert.Equal(pathTemplateString, pat.PathTemplateString);
         }
 
+        [Theory]
+        [InlineData("projects/{project}/iap_tunnel/locations/{location}", new[] { "project", "location" },
+            "projects/{project}/iap_tunnel/locations/{location}")]
+        public void SemiValidPattern(string pattern, string[] paramNames, string pathTemplateString)
+        {
+            // TODO: When we make tight/loose validation conditional, this test should change to
+            // assert that the patterns provided are valid under loose validation, and invalid under tight validation.
+            var pat = new ResourcePattern(pattern);
+            Assert.Equal(paramNames, pat.ParameterNames);
+            Assert.Equal(pathTemplateString, pat.PathTemplateString);
+        }
+
         [Theory]
         [InlineData("as/{a}", new[] { "A" }, "as/A")]
         [InlineData("as/{a=*}", new[] { "A" }, "as/A")]

diff --git a/Google.Api.Generator/ProtoUtils/ResourcePattern.cs b/Google.Api.Generator/ProtoUtils/ResourcePattern.cs
@@ -288,11 +288,16 @@ public ResourcePattern(string pattern)
             Segments = segments.ToImmutableList();
             if (Segments.OfType<ResourceIdSegment>().Any())
             {
-                // Perform tight (standard) validation if there are any resource-id path-segments in this pattern.
+                // We normally perform tight (standard) validation if there are any resource-id path-segments in this pattern.
                 // Loose validation is required to support pubsub's legacy use of the pattern '_deleted-topic_'
+                // Temporarily, we perform loose validation here, to unblock IAP.
+                // TODO: Make this configurable, so we can use tight validation in almost all cases, and loose validation
+                // where an API has an exemption.
+                bool tightValidation = false;
+
                 foreach (var segment in Segments.OfType<CollectionIdentifierSegment>())
                 {
-                    segment.Validate(tightValidation: true);
+                    segment.Validate(tightValidation);
                 }
             }
         }