fix: fix wildcard resource names helper method (#1363)

This fixes googleapis/gapic-generator-python#1358

Author: vam-google

packages/gapic-generator/gapic/schema/wrappers.py

@@ -596,6 +596,10 @@ def path_regex_str(self) -> str:
             ) +
             "$"
         )
+        # Special case for wildcard resource names
+        if parsing_regex_str == "^*$":
+            parsing_regex_str = "^.*$"
+
         return parsing_regex_str
 
     def get_field(self, *field_path: str,

packages/gapic-generator/tests/integration/BUILD.bazel

@@ -91,18 +91,17 @@ py_gapic_library(
     ],
 )
 
-# Uncomment once https://github.com/googleapis/gapic-generator-python/issues/1358 is fixed
-#py_test(
-#    name = "eventarc_py_gapic_test",
-#    srcs = [
-#        "eventarc_py_gapic_pytest.py",
-#        "eventarc_py_gapic_test.py",
-#    ],
-#    legacy_create_init = False,
-#    deps = [
-#        ":eventarc_py_gapic",
-#    ],
-#)
+py_test(
+    name = "eventarc_py_gapic_test",
+    srcs = [
+        "eventarc_py_gapic_pytest.py",
+        "eventarc_py_gapic_test.py",
+    ],
+    legacy_create_init = False,
+    deps = [
+        ":eventarc_py_gapic",
+    ],
+)
 
 # Logging.
 py_gapic_library(
@@ -154,6 +153,7 @@ test_suite(
     name = "googleapis_test_suite",
     tests = [
         ":credentials_py_gapic_test",
+        ":eventarc_py_gapic_test",
         ":redis_py_gapic_test",
     ],
 )

packages/gapic-generator/tests/integration/goldens/asset/google/cloud/asset_v1/services/asset_service/client.py

@@ -171,7 +171,7 @@ def asset_path() -> str:
     @staticmethod
     def parse_asset_path(path: str) -> Dict[str,str]:
         """Parses a asset path into its component segments."""
-        m = re.match(r"^*$", path)
+        m = re.match(r"^.*$", path)
         return m.groupdict() if m else {}
 
     @staticmethod

packages/gapic-generator/tests/integration/goldens/eventarc/google/cloud/eventarc_v1/services/eventarc/client.py

@@ -176,7 +176,7 @@ def service_path() -> str:
     @staticmethod
     def parse_service_path(path: str) -> Dict[str,str]:
         """Parses a service path into its component segments."""
-        m = re.match(r"^*$", path)
+        m = re.match(r"^.*$", path)
         return m.groupdict() if m else {}
 
     @staticmethod

packages/gapic-generator/tests/unit/schema/wrappers/test_message.py

@@ -223,6 +223,29 @@ def test_resource_path_with_wildcard():
                     "kingdoms/my-kingdom/phyla/my-phylum/classes/") is None
 
 
+def test_resource_path_pure_wildcard():
+    options = descriptor_pb2.MessageOptions()
+    resource = options.Extensions[resource_pb2.resource]
+    resource.pattern.append("*")
+    resource.type = "taxonomy.biology.com/Class"
+    message = make_message('Squid', options=options)
+
+    # Pure wildcard resource names do not really help construct resources
+    # but they are a part of the spec so we need to support them, which means at
+    # least not failing.
+    assert message.resource_path == "*"
+    assert message.resource_path_args == []
+    assert message.resource_type == "Class"
+
+    # Pure wildcard resource names match everything...
+    assert re.match(message.path_regex_str,
+                    "kingdoms/my-kingdom/phyla/my-phylum/classes/my-klass")
+    assert re.match(message.path_regex_str,
+                    "kingdoms/my-kingdom/phyla/my-phylum/classes/my-klass/additional-segment")
+    assert re.match(message.path_regex_str,
+                    "kingdoms/my-kingdom/phyla/my-phylum/classes/")
+
+
 def test_parse_resource_path():
     options = descriptor_pb2.MessageOptions()
     resource = options.Extensions[resource_pb2.resource]