fix: prepare to generate grafeas

library_generation/generate_library.sh

@@ -224,7 +224,11 @@ if [[ "${proto_only}" == "false" ]]; then
   mv_src_files "gapic" "test" "${temp_destination_path}"
   if [ "${include_samples}" == "true" ]; then
     # move java_gapic_srcjar/samples/snippets to samples/snippets
-    mv_src_files "samples" "main" "${temp_destination_path}"
+    if [[ "${proto_path}" == "grafeas/v1" ]]; then
+      mv_src_files "samples" "main" "${temp_destination_path}" "io"
+    else
+      mv_src_files "samples" "main" "${temp_destination_path}"
+    fi
   fi
 fi
 ##################### Section 3 #####################

library_generation/test/resources/goldens/.repo-metadata-empty-api-id-golden.json

@@ -0,0 +1,17 @@
+{
+  "api_shortname": "baremetalsolution",
+  "name_pretty": "Bare Metal Solution",
+  "product_documentation": "https://cloud.google.com/bare-metal/docs",
+  "api_description": "Bring your Oracle workloads to Google Cloud with Bare Metal Solution and jumpstart your cloud journey with minimal risk.",
+  "client_documentation": "https://cloud.google.com/java/docs/reference/google-cloud-bare-metal-solution/latest/overview",
+  "release_level": "preview",
+  "transport": "grpc",
+  "language": "java",
+  "repo": "googleapis/google-cloud-java",
+  "repo_short": "java-bare-metal-solution",
+  "distribution_name": "com.google.cloud:google-cloud-bare-metal-solution",
+  "library_type": "GAPIC_AUTO",
+  "requires_billing": true,
+  "rest_documentation": "https://cloud.google.com/bare-metal/docs/reference/rest",
+  "rpc_documentation": "https://cloud.google.com/bare-metal/docs/reference/rpc"
+}

library_generation/test/utilities_unit_tests.py

@@ -60,6 +60,17 @@
     library_name="secretmanager",
     gapic_configs=list(),
 )
+library_with_empty_api_id = LibraryConfig(
+    api_shortname="baremetalsolution",
+    name_pretty="Bare Metal Solution",
+    product_documentation="https://cloud.google.com/bare-metal/docs",
+    api_description="Bring your Oracle workloads to Google Cloud with Bare Metal Solution and jumpstart your cloud journey with minimal risk.",
+    gapic_configs=list(),
+    library_name="bare-metal-solution",
+    rest_documentation="https://cloud.google.com/bare-metal/docs/reference/rest",
+    rpc_documentation="https://cloud.google.com/bare-metal/docs/reference/rpc",
+    api_id="",
+)
 
 
 class UtilitiesTest(unittest.TestCase):
@@ -102,6 +113,30 @@ def test_sh_util_nonexistent_function_fails(self):
         with self.assertRaises(RuntimeError):
             result = util.sh_util("nonexistent_function")
 
+    def test_mv_src_files_sample_suffix_io_succeeds(self):
+        previous_dir = os.getcwd()
+        os.chdir(f"{resources_dir}/test_mv_src")
+        util.sh_util("mv_src_files samples main destination io")
+        self.assertTrue(
+            os.path.isfile(
+                "destination/samples/snippets/generated/io/example_io_sample.txt"
+            )
+        )
+        shutil.rmtree("destination/samples")
+        os.chdir(previous_dir)
+
+    def test_mv_src_files_sample_suffix_com_succeeds(self):
+        previous_dir = os.getcwd()
+        os.chdir(f"{resources_dir}/test_mv_src")
+        util.sh_util("mv_src_files samples main destination")
+        self.assertTrue(
+            os.path.isfile(
+                "destination/samples/snippets/generated/com/example_com_sample.txt"
+            )
+        )
+        shutil.rmtree("destination/samples")
+        os.chdir(previous_dir)
+
     def test_eprint_valid_input_succeeds(self):
         test_input = "This is some test input"
         # create a stdio capture object
@@ -247,7 +282,7 @@ def test_gapic_inputs_parse_no_service_yaml_returns_empty_string(self):
 
     def test_generate_prerequisite_files_non_monorepo_success(self):
         library_path = self.__setup_prerequisite_files(
-            num_libraries=1, library_type="GAPIC_COMBO"
+            combination=1, library_type="GAPIC_COMBO"
         )
 
         file_comparator.compare_files(
@@ -266,7 +301,7 @@ def test_generate_prerequisite_files_non_monorepo_success(self):
         self.__remove_prerequisite_files(path=library_path, is_monorepo=False)
 
     def test_generate_prerequisite_files_monorepo_success(self):
-        library_path = self.__setup_prerequisite_files(num_libraries=2)
+        library_path = self.__setup_prerequisite_files(combination=2)
 
         file_comparator.compare_files(
             f"{library_path}/.repo-metadata.json",
@@ -281,6 +316,24 @@ def test_generate_prerequisite_files_monorepo_success(self):
         )
         self.__remove_prerequisite_files(path=library_path)
 
+    def test_generate_prerequisite_files_with_empty_api_id_success(self):
+        library_path = self.__setup_prerequisite_files(
+            combination=3, library=library_with_empty_api_id
+        )
+
+        file_comparator.compare_files(
+            f"{library_path}/.repo-metadata.json",
+            f"{library_path}/.repo-metadata-empty-api-id-golden.json",
+        )
+        file_comparator.compare_files(
+            f"{library_path}/.OwlBot-hermetic.yaml",
+            f"{library_path}/.OwlBot-hermetic-golden.yaml",
+        )
+        file_comparator.compare_files(
+            f"{library_path}/owlbot.py", f"{library_path}/owlbot-golden.py"
+        )
+        self.__remove_prerequisite_files(path=library_path)
+
     def test_prepare_repo_monorepo_success(self):
         gen_config = self.__get_a_gen_config(2)
         repo_config = util.prepare_repo(
@@ -317,7 +370,10 @@ def test_prepare_repo_split_repo_success(self):
         shutil.rmtree(repo_config.output_folder)
 
     def __setup_prerequisite_files(
-        self, num_libraries: int, library_type: str = "GAPIC_AUTO"
+        self,
+        combination: int,
+        library_type: str = "GAPIC_AUTO",
+        library: LibraryConfig = library_1,
     ) -> str:
         library_path = f"{resources_dir}/goldens"
         files = [
@@ -326,12 +382,12 @@ def __setup_prerequisite_files(
             f"{library_path}/owlbot.py",
         ]
         cleanup(files)
-        config = self.__get_a_gen_config(num_libraries, library_type=library_type)
+        config = self.__get_a_gen_config(combination, library_type=library_type)
         proto_path = "google/cloud/baremetalsolution/v2"
         transport = "grpc"
         util.generate_prerequisite_files(
             config=config,
-            library=library_1,
+            library=library,
             proto_path=proto_path,
             transport=transport,
             library_path=library_path,
@@ -340,28 +396,28 @@ def __setup_prerequisite_files(
 
     @staticmethod
     def __get_a_gen_config(
-        num_libraries: int, library_type: str = "GAPIC_AUTO"
+        combination: int, library_type: str = "GAPIC_AUTO"
     ) -> GenerationConfig:
         """
         Returns an object of GenerationConfig with one to three of
         LibraryConfig objects. Other attributes are set to empty str.
 
-        :param num_libraries: the number of LibraryConfig objects associated with
+        :param combination: combination of LibraryConfig objects associated with
         the GenerationConfig. Only support 1, 2 or 3.
         :return: an object of GenerationConfig
         """
-        if num_libraries == 2:
+        if combination == 2:
             libraries = [library_1, library_2]
-        elif num_libraries == 3:
-            libraries = [library_1, library_2, library_3]
+        elif combination == 3:
+            libraries = [library_with_empty_api_id, library_2]
         else:
             libraries = [library_1]
 
         # update libraries with custom configuration (for now, only
         # library_type)
         for library in libraries:
             library.library_type = library_type
-            if num_libraries == 1:
+            if combination == 1:
                 # treat this as a HW library case to generate a real-life
                 # repo-metadata
                 library.extra_versioned_modules = "test-module"

library_generation/utils/utilities.py

@@ -26,6 +26,7 @@
 from library_generation.utils.proto_path_utils import remove_version_from
 
 script_dir = os.path.dirname(os.path.realpath(__file__))
+EMPTY_API_ID = ""
 
 
 def create_argument(arg_key: str, arg_container: object) -> List[str]:
@@ -216,9 +217,12 @@ def generate_prerequisite_files(
         if config.is_monorepo()
         else f"googleapis/{language}-{library_name}"
     )
-    api_id = (
-        library.api_id if library.api_id else f"{library.api_shortname}.googleapis.com"
-    )
+    if library.api_id == EMPTY_API_ID:
+        api_id = None
+    elif not library.api_id:
+        api_id = f"{library.api_shortname}.googleapis.com"
+    else:
+        api_id = library.api_id
     client_documentation = (
         library.client_documentation
         if library.client_documentation
@@ -251,6 +255,9 @@ def generate_prerequisite_files(
         "requires_billing": library.requires_billing,
     }
 
+    if not repo_metadata["api_id"]:
+        repo_metadata.pop("api_id")
+
     if library.api_reference:
         repo_metadata["api_reference"] = library.api_reference
     if library.codeowner_team:

library_generation/utils/utilities.sh

@@ -31,8 +31,12 @@ mv_src_files() {
   local category=$1 # one of gapic, proto, samples
   local type=$2 # one of main, test
   local destination_path=$3
+  local samples_suffix=$4 # one of com, io (grafeas)
+  if [ -z "${samples_suffix}" ]; then
+    samples_suffix="com"
+  fi
   if [ "${category}" == "samples" ]; then
-    src_suffix="samples/snippets/generated/src/main/java/com"
+    src_suffix="samples/snippets/generated/src/main/java/${samples_suffix}"
     folder_suffix="samples/snippets/generated"
   elif [ "${category}" == "proto" ]; then
     src_suffix="${category}/src/${type}/java"