From dab57a2afbc64023c73bba32ccf5ec21513c926b Mon Sep 17 00:00:00 2001 From: JoeWang1127 Date: Thu, 9 May 2024 20:31:16 +0000 Subject: [PATCH 1/9] feat: generate grafeas --- library_generation/generate_library.sh | 6 +++++- library_generation/utils/utilities.sh | 6 +++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/library_generation/generate_library.sh b/library_generation/generate_library.sh index 88c2052b56..8bd7b07157 100755 --- a/library_generation/generate_library.sh +++ b/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}" + else + mv_src_files "samples" "main" "${temp_destination_path}" "io" + fi fi fi ##################### Section 3 ##################### diff --git a/library_generation/utils/utilities.sh b/library_generation/utils/utilities.sh index 16ad766ce5..879c3e76f2 100755 --- a/library_generation/utils/utilities.sh +++ b/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" From 98a335922e42ebb5564200362d9ef31a61c5d569 Mon Sep 17 00:00:00 2001 From: JoeWang1127 Date: Thu, 9 May 2024 21:18:02 +0000 Subject: [PATCH 2/9] change function --- library_generation/generate_library.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/library_generation/generate_library.sh b/library_generation/generate_library.sh index 8bd7b07157..d4038fa9e6 100755 --- a/library_generation/generate_library.sh +++ b/library_generation/generate_library.sh @@ -225,9 +225,9 @@ if [[ "${proto_only}" == "false" ]]; then if [ "${include_samples}" == "true" ]; then # move java_gapic_srcjar/samples/snippets to samples/snippets if [[ "${proto_path}" == "grafeas/v1" ]]; then - mv_src_files "samples" "main" "${temp_destination_path}" - else mv_src_files "samples" "main" "${temp_destination_path}" "io" + else + mv_src_files "samples" "main" "${temp_destination_path}" fi fi fi From c6a33bbb8d1b4446bd1fe43f08959780d1a88e82 Mon Sep 17 00:00:00 2001 From: JoeWang1127 Date: Thu, 9 May 2024 22:39:42 +0000 Subject: [PATCH 3/9] do not populate api_id if it's empty string --- .../.repo-metadata-empty-api-id-golden.json | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 library_generation/test/resources/goldens/.repo-metadata-empty-api-id-golden.json diff --git a/library_generation/test/resources/goldens/.repo-metadata-empty-api-id-golden.json b/library_generation/test/resources/goldens/.repo-metadata-empty-api-id-golden.json new file mode 100644 index 0000000000..88ee68b2e1 --- /dev/null +++ b/library_generation/test/resources/goldens/.repo-metadata-empty-api-id-golden.json @@ -0,0 +1,18 @@ +{ + "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", + "api_id": "baremetalsolution.googleapis.com", + "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" +} \ No newline at end of file From 608c15502309a4b3747c55c82b9354295e75059a Mon Sep 17 00:00:00 2001 From: JoeWang1127 Date: Thu, 9 May 2024 22:40:18 +0000 Subject: [PATCH 4/9] do not populate api_id if it's empty string --- .../.repo-metadata-empty-api-id-golden.json | 1 - .../test/utilities_unit_tests.py | 54 +++++++++++++++---- library_generation/utils/utilities.py | 13 +++-- 3 files changed, 53 insertions(+), 15 deletions(-) diff --git a/library_generation/test/resources/goldens/.repo-metadata-empty-api-id-golden.json b/library_generation/test/resources/goldens/.repo-metadata-empty-api-id-golden.json index 88ee68b2e1..1de787767d 100644 --- a/library_generation/test/resources/goldens/.repo-metadata-empty-api-id-golden.json +++ b/library_generation/test/resources/goldens/.repo-metadata-empty-api-id-golden.json @@ -10,7 +10,6 @@ "repo": "googleapis/google-cloud-java", "repo_short": "java-bare-metal-solution", "distribution_name": "com.google.cloud:google-cloud-bare-metal-solution", - "api_id": "baremetalsolution.googleapis.com", "library_type": "GAPIC_AUTO", "requires_billing": true, "rest_documentation": "https://cloud.google.com/bare-metal/docs/reference/rest", diff --git a/library_generation/test/utilities_unit_tests.py b/library_generation/test/utilities_unit_tests.py index 736eba26e4..30cfd49b0e 100644 --- a/library_generation/test/utilities_unit_tests.py +++ b/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): @@ -247,7 +258,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 +277,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 +292,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 +346,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 +358,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,20 +372,20 @@ 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] @@ -361,7 +393,7 @@ def __get_a_gen_config( # 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" diff --git a/library_generation/utils/utilities.py b/library_generation/utils/utilities.py index 71c58f0455..46b2a854df 100755 --- a/library_generation/utils/utilities.py +++ b/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: From 509c79230fa73593024b5f56991eb4d6c0899e57 Mon Sep 17 00:00:00 2001 From: JoeWang1127 Date: Thu, 9 May 2024 23:19:06 +0000 Subject: [PATCH 5/9] add shell test --- .../src/main/java/com/example_com_sample.txt | 0 .../src/main/java/io/example_io_sample.txt | 0 .../test/utilities_unit_tests.py | 24 +++++++++++++++++++ 3 files changed, 24 insertions(+) create mode 100644 library_generation/test/resources/test_mv_src/destination/java_gapic_srcjar/samples/snippets/generated/src/main/java/com/example_com_sample.txt create mode 100644 library_generation/test/resources/test_mv_src/destination/java_gapic_srcjar/samples/snippets/generated/src/main/java/io/example_io_sample.txt diff --git a/library_generation/test/resources/test_mv_src/destination/java_gapic_srcjar/samples/snippets/generated/src/main/java/com/example_com_sample.txt b/library_generation/test/resources/test_mv_src/destination/java_gapic_srcjar/samples/snippets/generated/src/main/java/com/example_com_sample.txt new file mode 100644 index 0000000000..e69de29bb2 diff --git a/library_generation/test/resources/test_mv_src/destination/java_gapic_srcjar/samples/snippets/generated/src/main/java/io/example_io_sample.txt b/library_generation/test/resources/test_mv_src/destination/java_gapic_srcjar/samples/snippets/generated/src/main/java/io/example_io_sample.txt new file mode 100644 index 0000000000..e69de29bb2 diff --git a/library_generation/test/utilities_unit_tests.py b/library_generation/test/utilities_unit_tests.py index 30cfd49b0e..64339329f3 100644 --- a/library_generation/test/utilities_unit_tests.py +++ b/library_generation/test/utilities_unit_tests.py @@ -113,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 From 3257cc86ccdc8f60b5d72a5c4222aef3954d9b62 Mon Sep 17 00:00:00 2001 From: JoeWang1127 Date: Sat, 11 May 2024 15:57:06 +0000 Subject: [PATCH 6/9] do not specify sample suffix --- library_generation/generate_library.sh | 6 +- .../src/main/java/example_main.txt} | 0 .../src/test/java/example_test.txt} | 0 .../src/main/java/example_proto_main.txt | 0 .../src/main/java/com/example_com_sample.txt | 0 .../src/main/java/io/example_io_sample.txt | 0 .../test/utilities_unit_tests.py | 55 ++++++++++++++++--- library_generation/utils/utilities.sh | 17 +++--- 8 files changed, 57 insertions(+), 21 deletions(-) rename library_generation/test/resources/test_mv_src/{destination/java_gapic_srcjar/samples/snippets/generated/src/main/java/com/example_com_sample.txt => gapic/destination/java_gapic_srcjar/src/main/java/example_main.txt} (100%) rename library_generation/test/resources/test_mv_src/{destination/java_gapic_srcjar/samples/snippets/generated/src/main/java/io/example_io_sample.txt => gapic/destination/java_gapic_srcjar/src/test/java/example_test.txt} (100%) create mode 100644 library_generation/test/resources/test_mv_src/proto/destination/java_gapic_srcjar/proto/src/main/java/example_proto_main.txt create mode 100644 library_generation/test/resources/test_mv_src/samples/destination_com/java_gapic_srcjar/samples/snippets/generated/src/main/java/com/example_com_sample.txt create mode 100644 library_generation/test/resources/test_mv_src/samples/destination_io/java_gapic_srcjar/samples/snippets/generated/src/main/java/io/example_io_sample.txt diff --git a/library_generation/generate_library.sh b/library_generation/generate_library.sh index d4038fa9e6..88c2052b56 100755 --- a/library_generation/generate_library.sh +++ b/library_generation/generate_library.sh @@ -224,11 +224,7 @@ 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 - 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 + mv_src_files "samples" "main" "${temp_destination_path}" fi fi ##################### Section 3 ##################### diff --git a/library_generation/test/resources/test_mv_src/destination/java_gapic_srcjar/samples/snippets/generated/src/main/java/com/example_com_sample.txt b/library_generation/test/resources/test_mv_src/gapic/destination/java_gapic_srcjar/src/main/java/example_main.txt similarity index 100% rename from library_generation/test/resources/test_mv_src/destination/java_gapic_srcjar/samples/snippets/generated/src/main/java/com/example_com_sample.txt rename to library_generation/test/resources/test_mv_src/gapic/destination/java_gapic_srcjar/src/main/java/example_main.txt diff --git a/library_generation/test/resources/test_mv_src/destination/java_gapic_srcjar/samples/snippets/generated/src/main/java/io/example_io_sample.txt b/library_generation/test/resources/test_mv_src/gapic/destination/java_gapic_srcjar/src/test/java/example_test.txt similarity index 100% rename from library_generation/test/resources/test_mv_src/destination/java_gapic_srcjar/samples/snippets/generated/src/main/java/io/example_io_sample.txt rename to library_generation/test/resources/test_mv_src/gapic/destination/java_gapic_srcjar/src/test/java/example_test.txt diff --git a/library_generation/test/resources/test_mv_src/proto/destination/java_gapic_srcjar/proto/src/main/java/example_proto_main.txt b/library_generation/test/resources/test_mv_src/proto/destination/java_gapic_srcjar/proto/src/main/java/example_proto_main.txt new file mode 100644 index 0000000000..e69de29bb2 diff --git a/library_generation/test/resources/test_mv_src/samples/destination_com/java_gapic_srcjar/samples/snippets/generated/src/main/java/com/example_com_sample.txt b/library_generation/test/resources/test_mv_src/samples/destination_com/java_gapic_srcjar/samples/snippets/generated/src/main/java/com/example_com_sample.txt new file mode 100644 index 0000000000..e69de29bb2 diff --git a/library_generation/test/resources/test_mv_src/samples/destination_io/java_gapic_srcjar/samples/snippets/generated/src/main/java/io/example_io_sample.txt b/library_generation/test/resources/test_mv_src/samples/destination_io/java_gapic_srcjar/samples/snippets/generated/src/main/java/io/example_io_sample.txt new file mode 100644 index 0000000000..e69de29bb2 diff --git a/library_generation/test/utilities_unit_tests.py b/library_generation/test/utilities_unit_tests.py index 64339329f3..b2f8124c90 100644 --- a/library_generation/test/utilities_unit_tests.py +++ b/library_generation/test/utilities_unit_tests.py @@ -113,28 +113,67 @@ def test_sh_util_nonexistent_function_fails(self): with self.assertRaises(RuntimeError): result = util.sh_util("nonexistent_function") + def test_mv_src_files_gapic_main_succeeds(self): + previous_dir = os.getcwd() + os.chdir(f"{resources_dir}/test_mv_src/gapic") + os.environ["folder_name"] = "example" + util.sh_util("mv_src_files gapic main destination") + self.assertTrue( + os.path.isfile( + "destination/gapic-example/src/main/java/example_main.txt" + ) + ) + shutil.rmtree("destination/gapic-example") + os.chdir(previous_dir) + + def test_mv_src_files_gapic_test_succeeds(self): + previous_dir = os.getcwd() + os.chdir(f"{resources_dir}/test_mv_src/gapic") + os.environ["folder_name"] = "example" + util.sh_util("mv_src_files gapic test destination") + self.assertTrue( + os.path.isfile( + "destination/gapic-example/src/test/java/example_test.txt" + ) + ) + shutil.rmtree("destination/gapic-example") + os.chdir(previous_dir) + + def test_mv_src_files_proto_main_succeeds(self): + previous_dir = os.getcwd() + os.chdir(f"{resources_dir}/test_mv_src/proto") + os.environ["folder_name"] = "example" + util.sh_util("mv_src_files proto main destination") + self.assertTrue( + os.path.isfile( + "destination/proto-example/src/main/java/example_proto_main.txt" + ) + ) + shutil.rmtree("destination/proto-example") + os.chdir(previous_dir) + 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") + os.chdir(f"{resources_dir}/test_mv_src/samples") + util.sh_util("mv_src_files samples main destination_io") self.assertTrue( os.path.isfile( - "destination/samples/snippets/generated/io/example_io_sample.txt" + "destination_io/samples/snippets/generated/io/example_io_sample.txt" ) ) - shutil.rmtree("destination/samples") + shutil.rmtree("destination_io/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") + os.chdir(f"{resources_dir}/test_mv_src/samples") + util.sh_util("mv_src_files samples main destination_com") self.assertTrue( os.path.isfile( - "destination/samples/snippets/generated/com/example_com_sample.txt" + "destination_com/samples/snippets/generated/com/example_com_sample.txt" ) ) - shutil.rmtree("destination/samples") + shutil.rmtree("destination_com/samples") os.chdir(previous_dir) def test_eprint_valid_input_succeeds(self): diff --git a/library_generation/utils/utilities.sh b/library_generation/utils/utilities.sh index 879c3e76f2..eda0dd5ea5 100755 --- a/library_generation/utils/utilities.sh +++ b/library_generation/utils/utilities.sh @@ -31,13 +31,11 @@ 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/${samples_suffix}" + src_suffix="samples/snippets/generated/src/main/java" folder_suffix="samples/snippets/generated" + mkdir -p "${destination_path}/${folder_suffix}" + cp -r "${destination_path}/java_gapic_srcjar/${src_suffix}"/* "${destination_path}/${folder_suffix}" elif [ "${category}" == "proto" ]; then src_suffix="${category}/src/${type}/java" folder_suffix="${category}-${folder_name}/src/${type}" @@ -45,11 +43,14 @@ mv_src_files() { src_suffix="src/${type}" folder_suffix="${category}-${folder_name}/src" fi + + if [ "${category}" == "samples" ]; then + exit + fi + mkdir -p "${destination_path}/${folder_suffix}" cp -r "${destination_path}/java_gapic_srcjar/${src_suffix}" "${destination_path}/${folder_suffix}" - if [ "${category}" != "samples" ]; then - rm -r -f "${destination_path}/${folder_suffix}/java/META-INF" - fi + rm -r -f "${destination_path}/${folder_suffix}/java/META-INF" } # unzip jar file From aac204b9b5d157d05bce463437f318f7725e69de Mon Sep 17 00:00:00 2001 From: JoeWang1127 Date: Sat, 11 May 2024 17:08:31 +0000 Subject: [PATCH 7/9] use return --- library_generation/test/utilities_unit_tests.py | 8 ++------ library_generation/utils/utilities.sh | 2 +- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/library_generation/test/utilities_unit_tests.py b/library_generation/test/utilities_unit_tests.py index b2f8124c90..1370a6e6a2 100644 --- a/library_generation/test/utilities_unit_tests.py +++ b/library_generation/test/utilities_unit_tests.py @@ -119,9 +119,7 @@ def test_mv_src_files_gapic_main_succeeds(self): os.environ["folder_name"] = "example" util.sh_util("mv_src_files gapic main destination") self.assertTrue( - os.path.isfile( - "destination/gapic-example/src/main/java/example_main.txt" - ) + os.path.isfile("destination/gapic-example/src/main/java/example_main.txt") ) shutil.rmtree("destination/gapic-example") os.chdir(previous_dir) @@ -132,9 +130,7 @@ def test_mv_src_files_gapic_test_succeeds(self): os.environ["folder_name"] = "example" util.sh_util("mv_src_files gapic test destination") self.assertTrue( - os.path.isfile( - "destination/gapic-example/src/test/java/example_test.txt" - ) + os.path.isfile("destination/gapic-example/src/test/java/example_test.txt") ) shutil.rmtree("destination/gapic-example") os.chdir(previous_dir) diff --git a/library_generation/utils/utilities.sh b/library_generation/utils/utilities.sh index eda0dd5ea5..237d3c23a9 100755 --- a/library_generation/utils/utilities.sh +++ b/library_generation/utils/utilities.sh @@ -45,7 +45,7 @@ mv_src_files() { fi if [ "${category}" == "samples" ]; then - exit + return fi mkdir -p "${destination_path}/${folder_suffix}" From d473f021340d337c10e9ef77e6213b954f0ea653 Mon Sep 17 00:00:00 2001 From: JoeWang1127 Date: Sat, 11 May 2024 17:47:51 +0000 Subject: [PATCH 8/9] restore api_id change --- .../test/utilities_unit_tests.py | 29 ------------------- library_generation/utils/utilities.py | 13 ++------- 2 files changed, 3 insertions(+), 39 deletions(-) diff --git a/library_generation/test/utilities_unit_tests.py b/library_generation/test/utilities_unit_tests.py index 1370a6e6a2..96c03087fa 100644 --- a/library_generation/test/utilities_unit_tests.py +++ b/library_generation/test/utilities_unit_tests.py @@ -60,17 +60,6 @@ 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): @@ -351,24 +340,6 @@ 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( diff --git a/library_generation/utils/utilities.py b/library_generation/utils/utilities.py index 46b2a854df..71c58f0455 100755 --- a/library_generation/utils/utilities.py +++ b/library_generation/utils/utilities.py @@ -26,7 +26,6 @@ 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]: @@ -217,12 +216,9 @@ def generate_prerequisite_files( if config.is_monorepo() else f"googleapis/{language}-{library_name}" ) - 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 + api_id = ( + library.api_id if library.api_id else f"{library.api_shortname}.googleapis.com" + ) client_documentation = ( library.client_documentation if library.client_documentation @@ -255,9 +251,6 @@ 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: From a8cfbdcfd9744e0df19cab4589354c18a8ad70f7 Mon Sep 17 00:00:00 2001 From: JoeWang1127 Date: Sat, 11 May 2024 17:48:48 +0000 Subject: [PATCH 9/9] remove unused test resource --- .../.repo-metadata-empty-api-id-golden.json | 17 ----------------- 1 file changed, 17 deletions(-) delete mode 100644 library_generation/test/resources/goldens/.repo-metadata-empty-api-id-golden.json diff --git a/library_generation/test/resources/goldens/.repo-metadata-empty-api-id-golden.json b/library_generation/test/resources/goldens/.repo-metadata-empty-api-id-golden.json deleted file mode 100644 index 1de787767d..0000000000 --- a/library_generation/test/resources/goldens/.repo-metadata-empty-api-id-golden.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "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" -} \ No newline at end of file