update to account for api with proto/type dependency.

Author: zhumin8

hermetic_build/common/tests/utils/proto_path_utils_unit_tests.py

@@ -16,6 +16,7 @@
 import unittest
 from pathlib import Path
 from common.utils.proto_path_utils import find_versioned_proto_path
+from common.utils.proto_path_utils import ends_with_version
 
 script_dir = os.path.dirname(os.path.realpath(__file__))
 resources_dir = os.path.join(script_dir, "..", "resources")
@@ -37,3 +38,20 @@ def test_find_versioned_proto_without_version_return_itself(self):
         proto_path = "google/type/color.proto"
         expected = "google/type/color.proto"
         self.assertEqual(expected, find_versioned_proto_path(proto_path))
+
+    def test_ends_with_version_valid(self):
+        self.assertTrue(ends_with_version("google/cloud/gsuiteaddons/v1"))
+        self.assertTrue(ends_with_version("google/iam/v1beta"))
+        self.assertTrue(ends_with_version("google/iam/v2betav1"))
+        self.assertTrue(ends_with_version("google/cloud/alloydb/connectors/v1alpha"))
+        self.assertTrue(ends_with_version("v1"))
+        self.assertTrue(ends_with_version("anything/v123"))
+
+    def test_ends_with_version_invalid(self):
+        self.assertFalse(ends_with_version("google/apps/script/type"))
+        self.assertFalse(ends_with_version("google/apps/script/type/docs"))
+        self.assertFalse(
+            ends_with_version("google/cloud/alloydb/connectors/v123/something")
+        )
+        self.assertFalse(ends_with_version(""))
+        self.assertFalse(ends_with_version("noVersion"))

hermetic_build/common/utils/proto_path_utils.py

@@ -31,3 +31,21 @@ def find_versioned_proto_path(proto_path: str) -> str:
             idx = proto_path.find(version)
             return proto_path[:idx] + version
     return proto_path
+
+
+def ends_with_version(proto_path: str) -> bool:
+    """
+    Checks if a given proto_path string ends with a version identifier.
+
+    :param proto_path: The proto_path string to check.
+
+    :return:
+        True if the proto_path ends with a version, False otherwise.
+    """
+    version_regex = re.compile(r"^v[1-9].*")
+    parts = proto_path.rsplit("/", 1)
+    if len(parts) > 1:
+        last_part = parts[1]
+    else:
+        last_part = parts[0]
+    return bool(version_regex.match(last_part))

hermetic_build/library_generation/generate_repo.py

@@ -12,13 +12,15 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-import shutil
 import copy
+import re
+import shutil
 from pathlib import Path
 from typing import Optional
 import library_generation.utils.utilities as util
 from common.model.generation_config import GenerationConfig
 from common.model.library_config import LibraryConfig
+from common.utils.proto_path_utils import ends_with_version
 from library_generation.generate_composed_library import generate_composed_library
 from library_generation.utils.monorepo_postprocessor import monorepo_postprocessing
 
@@ -125,7 +127,8 @@ def _get_target_libraries_from_api_path(
 ) -> list[LibraryConfig]:
     """
     Retrieves a copy of the LibraryConfig objects that contain the specified
-    target API path, removed other proto_path from LibraryConfig if any.
+    target API path, removed other proto_path versions from LibraryConfig if any.
+    proto_path that is dependency, not another version is kept.
 
     :param config: The GenerationConfig object.
     :param target_api_path: The target proto path to search for.
@@ -136,11 +139,15 @@ def _get_target_libraries_from_api_path(
     """
     target_libraries = []
     for library in config.libraries:
+        target_library = copy.deepcopy(library)
+        gapic_config_list = []
         for item in library.gapic_configs:
-            if item.proto_path == target_api_path:
-                target_library = copy.deepcopy(library)
-                target_library.set_gapic_configs([GapicConfig(target_api_path)])
-                target_libraries.append(target_library)
-                return target_libraries
-
+            if item.proto_path == target_api_path or not ends_with_version(
+                item.proto_path
+            ):
+                gapic_config_list.append(GapicConfig(item.proto_path))
+        if gapic_config_list:
+            target_library.set_gapic_configs(gapic_config_list)
+            target_libraries.append(target_library)
+            return target_libraries
     return []

hermetic_build/library_generation/tests/cli/versions.txt

@@ -83,6 +83,37 @@ def test_get_target_library_returns_selected_api_path(self):
 
         self.assertEqual([another_library_v1], target_libraries)
 
+    def test_get_target_library_returns_selected_api_path_plus_dep(self):
+        one_library = GenerateRepoTest.__get_an_empty_library_config()
+        one_library.api_shortname = "one_library"
+        one_library.gapic_configs = [GapicConfig("google/cloud/one/library/v1")]
+        another_library = GenerateRepoTest.__get_an_empty_library_config()
+        another_library.api_shortname = "another_library"
+        another_library_gapic_config = list()
+        another_library_gapic_config.append(
+            GapicConfig("google/cloud/another/library/v1")
+        )
+        another_library_gapic_config.append(
+            GapicConfig("google/cloud/another/library/v2")
+        )
+        another_library_gapic_config.append(
+            GapicConfig("google/cloud/another/library/type")
+        )
+        another_library.gapic_configs = another_library_gapic_config
+        config = GenerateRepoTest.__get_an_empty_generation_config()
+        config.libraries.extend([one_library, another_library])
+        target_libraries = get_target_libraries(
+            config, target_api_path="google/cloud/another/library/v2"
+        )
+        another_library_v1 = GenerateRepoTest.__get_an_empty_library_config()
+        another_library_v1.api_shortname = "another_library"
+        another_library_v1.gapic_configs = [
+            GapicConfig("google/cloud/another/library/v2"),
+            GapicConfig("google/cloud/another/library/type"),
+        ]
+
+        self.assertEqual([another_library_v1], target_libraries)
+
     @staticmethod
     def __get_an_empty_generation_config() -> GenerationConfig:
         return GenerationConfig(