chore: include src/main/resources in gapic output (#1861)

burkedavison · web-flow · commit a0cd90b59f2b · 2023-07-19T08:39:59.000-04:00
* chore: include src/main/resources in gapic output

* chore: fix generation to maintain structure for all outputs
diff --git a/rules_java_gapic/java_gapic.bzl b/rules_java_gapic/java_gapic.bzl
@@ -37,7 +37,7 @@ def _java_gapic_postprocess_srcjar_impl(ctx):
     WORKING_DIR=`pwd`
 
     # Main source files.
-    cd {output_dir_path}/src/main/java
+    cd {output_dir_path}/src/main
     zip -r $WORKING_DIR/{output_srcjar_name}.srcjar ./
 
     # Resource name source files.
diff --git a/rules_java_gapic/java_gapic_pkg.bzl b/rules_java_gapic/java_gapic_pkg.bzl
@@ -274,6 +274,14 @@ def _java_gapic_srcs_pkg_impl(ctx):
         unzip -q -o $src -d {package_dir_path}/src/main/java
         rm -r -f {package_dir_path}/src/main/java/META-INF
 
+        # GAPIC libraries generate java/ and resources/ folders, unlike grpc and proto.
+        # If this is a GAPIC library, move its output up one directory.
+        if [ -d {package_dir_path}/src/main/java/java ]; then
+          mv {package_dir_path}/src/main/java {package_dir_path}/src/main/tmp-java
+          mv {package_dir_path}/src/main/tmp-java/* {package_dir_path}/src/main
+          rm -d {package_dir_path}/src/main/tmp-java
+        fi
+
         # Remove empty files. If there are no resource names, one such file might have
         # been created. See java_gapic.bzl.
         find {package_dir_path}/src/main/java -type f -size 0 | while read f; do rm -f $f; done
