chore: use library_name to compute destination folder of generate_repo (#2489)

fixes #2494

Author: diegomarquezp

library_generation/generate_composed_library.py

@@ -81,7 +81,9 @@ def generate_composed_library(
             library_path=library_path,
         )
         service_version = gapic.proto_path.split("/")[-1]
-        temp_destination_path = f"java-{library.api_shortname}-{service_version}"
+        temp_destination_path = (
+            f"java-{util.get_library_name(library)}-{service_version}"
+        )
         effective_arguments = __construct_effective_arg(
             base_arguments=base_arguments,
             gapic=gapic,

library_generation/owlbot/bin/entrypoint.sh

@@ -46,7 +46,6 @@ fi
 
 
 # Runs template and etc in current working directory
-monorepo=$1
 
 # apply repo templates
 echo "Rendering templates"
@@ -56,8 +55,11 @@ python3 "${scripts_root}/owlbot/src/apply_repo_templates.py" "${configuration_ya
 echo "Retrieving files from owl-bot-staging directory..."
 if [ -f "owlbot.py" ]
 then
+  # we use an empty synthtool folder to prevent cached templates from being used
+  export SYNTHTOOL_TEMPLATES=$(mktemp -d)
   # defaults to run owlbot.py
   python3 owlbot.py
+  export SYNTHTOOL_TEMPLATES=""
 fi
 echo "...done"
 

library_generation/owlbot/src/apply_repo_templates.py

@@ -13,7 +13,7 @@
 from library_generation.model.generation_config import from_yaml
 
 script_dir = os.path.dirname(os.path.realpath(__file__))
-repo_templates_path = os.path.join(script_dir, "..", "templates", "java_library")
+repo_templates_path = os.path.normpath(os.path.join(script_dir, "..", "templates"))
 
 
 def apply_repo_templates(configuration_yaml_path: str, monorepo: bool) -> None:

library_generation/postprocess_library.sh

@@ -22,7 +22,7 @@
 # different logic
 # 8 - configuration_yaml_path: path to the configuration yaml containing library
 # generation information for this library
-set -eo pipefail
+set -exo pipefail
 scripts_root=$(dirname "$(readlink -f "$0")")
 
 postprocessing_target=$1

library_generation/setup.py

@@ -16,9 +16,10 @@
             "templates/*.j2",
             "gapic-generator-java-wrapper",
             "requirements.*",
-            "owlbot/src/requirements.*",
             "owlbot/bin/*.sh",
-            "owlbot/templates/**/*.j2",
+            "owlbot/templates/clirr/*.j2",
+            "owlbot/templates/poms/*.j2",
+            "owlbot/templates/java_library/**/*",
         ],
     },
 )

library_generation/test/integration_tests.py

@@ -27,6 +27,7 @@
 from library_generation.model.generation_config import from_yaml
 from library_generation.test.compare_poms import compare_xml
 from library_generation.utilities import get_library_name
+from library_generation.utilities import sh_util as shell_call
 
 config_name = "generation_config.yaml"
 script_dir = os.path.dirname(os.path.realpath(__file__))
@@ -37,6 +38,7 @@
 golden_dir = f"{config_dir}/golden"
 repo_prefix = "https://github.com/googleapis"
 committish_list = ["chore/test-hermetic-build"]  # google-cloud-java
+output_folder = shell_call("get_output_folder")
 
 
 class IntegrationTest(unittest.TestCase):
@@ -46,7 +48,7 @@ def test_generate_repo(self):
         config_files = self.__get_config_files(config_dir)
         i = 0
         for repo, config_file in config_files.items():
-            repo_dest = f"{golden_dir}/{repo}"
+            repo_dest = f"{output_folder}/{repo}"
             self.__pull_repo_to(Path(repo_dest), repo, committish_list[i])
             library_names = self.__get_library_names_from_config(config_file)
             # prepare golden files
@@ -62,9 +64,10 @@ def test_generate_repo(self):
             # compare result
             for library_name in library_names:
                 print(
+                    f"Generation finished. Will now compare "
+                    f"the expected library in {golden_dir}/{library_name}, "
+                    f"with the actual library in {repo_dest}/{library_name}. "
                     f"Compare generation result: "
-                    f"expected library in {golden_dir}/{library_name}, "
-                    f"actual library in {repo_dest}/{library_name}."
                 )
                 compare_result = dircmp(
                     f"{golden_dir}/{library_name}",

library_generation/test/resources/integration/google-cloud-java/generation_config.yaml

@@ -25,19 +25,26 @@ libraries:
     GAPICs:
       - proto_path: google/cloud/apigeeconnect/v1
 
-  - api_shortname: cloudasset
-    name_pretty: Cloud Asset Inventory
-    product_documentation: "https://cloud.google.com/resource-manager/docs/cloud-asset-inventory/overview"
-    api_description: "provides inventory services based on a time series database. This database keeps a five week history of Google Cloud asset metadata. The Cloud Asset Inventory export service allows you to export all asset metadata at a certain timestamp or export event change history during a timeframe."
-    library_name: "asset"
-    client_documentation: "https://cloud.google.com/java/docs/reference/google-cloud-asset/latest/overview"
-    distribution_name: "com.google.cloud:google-cloud-asset"
-    release_level: "stable"
-    issue_tracker: "https://issuetracker.google.com/issues/new?component=187210&template=0"
-    api_reference: "https://cloud.google.com/resource-manager/docs/cloud-asset-inventory/overview"
+  - api_shortname: alloydb
+    name_pretty: AlloyDB
+    product_documentation: https://cloud.google.com/alloydb/
+    api_description: AlloyDB is a fully managed, PostgreSQL-compatible database service
+      with industry-leading performance, availability, and scale.
+    rest_documentation: https://cloud.google.com/alloydb/docs/reference/rest
+    GAPICs:
+    - proto_path: google/cloud/alloydb/v1
+    - proto_path: google/cloud/alloydb/v1alpha
+    - proto_path: google/cloud/alloydb/v1beta
+
+  - api_shortname: alloydb
+    name_pretty: AlloyDB connectors
+    product_documentation: https://cloud.google.com/alloydb/docs
+    api_description: AlloyDB is a fully-managed, PostgreSQL-compatible database for
+      demanding transactional workloads. It provides enterprise-grade performance and
+      availability while maintaining 100% compatibility with open-source PostgreSQL.
+    library_name: alloydb-connectors
+    rest_documentation: https://cloud.google.com/alloydb/docs/reference/rest
     GAPICs:
-      - proto_path: google/cloud/asset/v1
-      - proto_path: google/cloud/asset/v1p1beta1
-      - proto_path: google/cloud/asset/v1p2beta1
-      - proto_path: google/cloud/asset/v1p5beta1
-      - proto_path: google/cloud/asset/v1p7beta1
+    - proto_path: google/cloud/alloydb/connectors/v1
+    - proto_path: google/cloud/alloydb/connectors/v1alpha
+    - proto_path: google/cloud/alloydb/connectors/v1beta