feat: generate showcase without post-processing

library_generation/README.md

@@ -125,15 +125,3 @@ library_generation/generate_library.sh \
 --include_samples true
 ```
 
-## An example to generate showcase client
-```
-library_generation/generate_library.sh \
--p schema/google/showcase/v1beta1 \ # google/ should be in library_generation/.
--d output \
---gapic_generator_version 2.24.0 \
---protobuf_version 23.2 \
---grpc_version 1.55.1 \
---transport grpc+rest \
---rest_numeric_enums false \
---include_samples false
-```

library_generation/generate_library.sh

@@ -1,6 +1,7 @@
 #!/usr/bin/env bash
 
 set -eo pipefail
+set -x
 
 # parse input parameters
 while [[ $# -gt 0 ]]; do
@@ -157,3 +158,4 @@ done
 #####################################################
 cd "${destination_path}"
 rm -rf java_gapic_srcjar java_gapic_srcjar_raw.srcjar.zip java_grpc.jar java_proto.jar temp-codegen.srcjar
+set +x

library_generation/test/generate_library_integration_test.sh

@@ -42,34 +42,13 @@ esac
 shift # past argument or value
 done
 
-get_version_from_WORKSPACE() {
-  local version_key_word=$1
-  local workspace=$2
-  local delimiter=$3
-  local version
-  version="$(grep -m 1 "${version_key_word}"  "${workspace}" | sed 's/\"\(.*\)\".*/\1/' | cut -d "${delimiter}" -f2 | sed 's/^[[:space:]]*//;s/[[:space:]]*$//')"
-  echo "${version}"
-}
-
-sparse_clone() {
-  local repo_url=$1
-  local paths=$2
-  local clone_dir
-  clone_dir=$(basename "${repo_url%.*}")
-  rm -rf "${clone_dir}"
-  git clone -n --depth=1 --filter=tree:0 "${repo_url}"
-  cd "${clone_dir}"
-  git sparse-checkout set --no-cone ${paths}
-  git checkout
-  cd ..
-}
-
 script_dir=$(dirname "$(readlink -f "$0")")
+source "${script_dir}/../utilities.sh"
 library_generation_dir="${script_dir}"/..
 cd "${library_generation_dir}"
 # checkout the master branch of googleapis/google (proto files) and WORKSPACE
 echo "Checking out googlapis repository..."
-sparse_clone https://github.com/googleapis/googleapis.git "${proto_path} WORKSPACE google/api google/rpc google/cloud/common_resources.proto"
+sparse_clone https://github.com/googleapis/googleapis.git "${proto_path} WORKSPACE google/api google/rpc google/cloud/common_resources.proto google/iam/v1 google/type google/longrunning"
 cd googleapis
 # parse version of gapic-generator-java, protobuf and grpc from WORKSPACE
 gapic_generator_version=$(get_version_from_WORKSPACE "_gapic_generator_java_version" WORKSPACE "=")
@@ -79,18 +58,25 @@ echo "The version of protobuf is ${protobuf_version}"
 grpc_version=$(get_version_from_WORKSPACE "_grpc_version" WORKSPACE "=")
 echo "The version of protoc-gen-grpc-java plugin is ${gapic_generator_version}."
 # parse GAPIC options from proto_path/BUILD.bazel
-transport="grpc"
-if grep -A 15 "java_gapic_library(" "${proto_path}/BUILD.bazel" | grep -q "grpc+rest"; then
-  transport="grpc+rest"
-fi
-rest_numeric_enums="true"
-if grep -A 15 "java_gapic_library(" "${proto_path}/BUILD.bazel" | grep -q "rest_numeric_enums = False"; then
-  rest_numeric_enums="false"
-fi
-include_samples="false"
-if grep -A 15 "java_gapic_assembly_gradle_pkg(" "${proto_path}/BUILD.bazel" | grep -q "include_samples = True"; then
-  include_samples="true"
-fi
+proto_build_file_path="${proto_path}/BUILD.bazel"
+transport=$(get_config_from_BUILD \
+  "${proto_build_file_path}" \
+  "java_gapic_library(" \
+  "grpc+rest" \
+  "grpc"
+)
+rest_numeric_enums=$(get_config_from_BUILD \
+  "${proto_build_file_path}" \
+  "java_gapic_library(" \
+  "rest_numeric_enums = False" \
+  "true"
+)
+include_samples=$(get_config_from_BUILD \
+  "${proto_build_file_path}" \
+  "java_gapic_assembly_gradle_pkg(" \
+  "include_samples = True" \
+  "false"
+)
 echo "GAPIC options are transport=${transport}, rest_numeric_enums=${rest_numeric_enums}, include_samples=${include_samples}."
 os_architecture="linux-x86_64"
 if [[ "$os_type" == *"macos"* ]]; then

library_generation/utilities.sh

@@ -63,16 +63,14 @@ find_additional_protos_in_yaml() {
 # pulled from googleapis as a prerequisite.
 # Search additional protos in .yaml files.
 search_additional_protos() {
-  local additional_protos="google/cloud/common_resources.proto" # used by every library
-  local iam_policy
-  local locations
-  iam_policy=$(find_additional_protos_in_yaml "name: google.iam.v1.IAMPolicy")
-  if [ -n "${iam_policy}" ]; then
-    additional_protos="${additional_protos} google/iam/v1/iam_policy.proto"
+  additional_protos="google/cloud/common_resources.proto" # used by every library
+  iam_policy=$(find_additional_protos_in_yaml "name: '*google.iam.v1.IAMPolicy'*")
+  if [ -n "$iam_policy" ]; then
+    additional_protos="$additional_protos google/iam/v1/iam_policy.proto"
   fi
-  locations=$(find_additional_protos_in_yaml "name: google.cloud.location.Locations")
+  locations=$(find_additional_protos_in_yaml "name: '*google.cloud.location.Locations'*")
   if [ -n "${locations}" ]; then
-    additional_protos="${additional_protos} google/cloud/location/locations.proto"
+    additional_protos="$additional_protos google/cloud/location/locations.proto"
   fi
   echo "${additional_protos}"
 }
@@ -216,3 +214,65 @@ download_fail() {
   >&2 echo "Fail to download ${artifact} from ${repo} repository. Please install ${artifact} first if you want to download a SNAPSHOT."
   exit 1
 }
+
+# Obtains a version from a bazel WORKSPACE file
+#
+# versions look like "_ggj_version="1.2.3"
+# It will return 1.2.3 for such example
+get_version_from_WORKSPACE() {
+  version_key_word=$1
+  workspace=$2
+  version=$(\
+    cat "$workspace" |\
+    grep "$version_key_word" |\
+    head -n 1 |\
+    sed 's/\(.*\) = "\(.*\)"\(.*\)/\2/' |\
+    sed 's/[a-zA-Z-]*//'
+  )
+  echo "$version"
+}
+
+# Used to obtain configuration values from a bazel BUILD file
+#
+# inspects a $build_file for a certain $rule (e.g. java_gapic_library). If the
+# first 15 lines after the declaration of the rule contain $pattern, then
+# it will return $if_match if $pattern is found, otherwise $default
+get_config_from_BUILD() {
+  build_file=$1
+  rule=$2
+  pattern=$3
+  default=$4
+  if_match=$5
+
+  result="$default"
+  if grep -A 15 "$rule" "$build_file" | grep -q "$pattern"; then
+    result="$if_match"
+  fi
+  echo "$result"
+
+}
+
+get_version_from_versions_txt() {
+  versions=$1
+  key=$2
+  version=$(cat "$versions" | grep "$key" | cut -d: -f3) # 3rd field is snapshot
+  echo $version
+}
+
+
+# Convenience function to clone only the necessary folders from a git repository
+sparse_clone() {
+  repo_url=$1
+  paths=$2
+  commitish=$3
+  clone_dir=$(basename "${repo_url%.*}")
+  rm -rf "$clone_dir"
+  git clone -n --depth=1 --no-single-branch --filter=tree:0 "$repo_url"
+  cd "$clone_dir"
+  if [ ! -z $commitish ]; then
+    git checkout $commitish
+  fi
+  git sparse-checkout set --no-cone $paths
+  git checkout
+  cd ..
+}