From b8ff6a41e195cda91bbfb20d9f11d5e58b7cc218 Mon Sep 17 00:00:00 2001
From: Jeffrey Rennie <rennie@google.com>
Date: Fri, 17 Jul 2020 13:02:28 -0700
Subject: [PATCH] fix: allow each language to specify how many components to
 skip while unpacking the tar file generated by bazel (#675)

---
 synthtool/gcp/gapic_bazel.py | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/synthtool/gcp/gapic_bazel.py b/synthtool/gcp/gapic_bazel.py
index f70ca7ed9..79e9c3dd3 100644
--- a/synthtool/gcp/gapic_bazel.py
+++ b/synthtool/gcp/gapic_bazel.py
@@ -58,7 +58,9 @@ def php_library(self, service: str, version: str, **kwargs) -> Path:
         return self._generate_code(service, version, "php", **kwargs)
 
     def java_library(self, service: str, version: str, **kwargs) -> Path:
-        return self._generate_code(service, version, "java", **kwargs)
+        return self._generate_code(
+            service, version, "java", tar_strip_components=0, **kwargs
+        )
 
     def ruby_library(self, service: str, version: str, **kwargs) -> Path:
         return self._generate_code(service, version, "ruby", **kwargs)
@@ -76,6 +78,7 @@ def _generate_code(
         bazel_target: str = None,
         include_protos: bool = False,
         proto_output_path: Union[str, Path] = None,
+        tar_strip_components: int = 1,
     ):
         # Determine which googleapis repo to use
         if discogapic:
@@ -190,7 +193,7 @@ def _generate_code(
             "tar",
             "-C",
             str(output_dir),
-            "--strip-components=1",
+            f"--strip-components={tar_strip_components}",
             "-xzf",
             tar_file,
         ]