chore: Address PR comments

Author: lqiu96

.kokoro/nightly/common.sh

@@ -0,0 +1,31 @@
+#!/bin/bash
+# Copyright 2025 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# Checks that the protobuf compatibility scripts provide non-empty input
+function validate_protobuf_compatibility_script_inputs {
+  # Comma-delimited list of repos to test
+  if [ -z "${REPOS_UNDER_TEST}" ]; then
+    echo "REPOS_UNDER_TEST Env Var must be set. This script expects a"
+    echo "comma-delimited list: i.e REPOS_UNDER_TEST=\"java-bigtable,java-bigquery\""
+    exit 1
+  fi
+
+  # A single version of Protobuf-Java runtime to test
+  if [ -z "${PROTOBUF_RUNTIME_VERSION}" ]; then
+    echo "PROTOBUF_RUNTIME_VERSION Env Var must be set. This script expects a single "
+    echo "Protobuf-Java runtime version i.e. PROTOBUF_RUNTIME_VERSION=\"4.28.3\""
+    exit 1
+  fi
+}

.kokoro/nightly/downstream-protobuf-binary-compatibility.sh

@@ -15,19 +15,10 @@
 
 set -eo pipefail
 
-# Comma-delimited list of repos to test with the local java-shared-dependencies
-if [ -z "${REPOS_UNDER_TEST}" ]; then
-  echo "REPOS_UNDER_TEST must be set to run downstream-protobuf-binary-compatibility.sh"
-  echo "Expects a comma-delimited list: i.e REPOS_UNDER_TEST=\"java-bigtable,java-bigquery\""
-  exit 1
-fi
+scriptDir=$(realpath "$(dirname "${BASH_SOURCE[0]}")")
+source "${scriptDir}/common.sh"
 
-# Version of Protobuf-Java runtime to compile with
-if [ -z "${PROTOBUF_RUNTIME_VERSION}" ]; then
-  echo "PROTOBUF_RUNTIME_VERSION must be set to run downstream-protobuf-binary-compatibility.sh"
-  echo "Expects a single Protobuf-Java runtime version i.e. PROTOBUF_RUNTIME_VERSION=\"4.28.3\""
-  exit 1
-fi
+validate_protobuf_compatibility_script_inputs
 
 # Create two mappings of possible API names (Key: Maven Artifact ID Prefix, Value: Maven Group ID)
 # for the libraries that should be tested.
@@ -36,6 +27,7 @@ declare -A monorepo_handwritten_libraries
 monorepo_handwritten_libraries["grafeas"]="io.grafeas"
 monorepo_handwritten_libraries["google-cloud-vertexai"]="com.google.cloud"
 monorepo_handwritten_libraries["google-cloud-resourcemanager"]="com.google.cloud"
+monorepo_handwritten_libraries["google-cloud-translate"]="com.google.cloud"
 
 # 2. These are the mappings of all the downstream handwritten libraries' artifacts
 declare -A downstream_handwritten_libraries
@@ -48,8 +40,10 @@ function build_artifact_list() {
   for artifact_id_prefix in "${!api_maven_mapping[@]}"; do
     group_id="${api_maven_mapping[${artifact_id_prefix}]}"
 
-    # Match all artifacts that start with the artifact_id_prefix to exclude any proto and grpc modules.
-    repo_artifact_list=$(cat "versions.txt" | grep "^${artifact_id_prefix}" || true)
+    # Match all artifacts that start with the $artifact_id_prefix or grpc to exclude any proto modules.
+    # grpc-* module are included as gRPC-Java controls their Protobuf version and may generate code
+    # using a different version of Protobuf
+    repo_artifact_list=$(cat "versions.txt" | grep -E "^(${artifact_id_prefix}|grpc)" || true)
 
     # Only proceed if there are matching elements
     if [ -n "${repo_artifact_list}" ]; then
@@ -100,8 +94,10 @@ for repo in ${REPOS_UNDER_TEST//,/ }; do # Split on comma
     program_args="-r --artifacts ${artifact_list},com.google.protobuf:protobuf-java:${PROTOBUF_RUNTIME_VERSION},com.google.protobuf:protobuf-java-util:${PROTOBUF_RUNTIME_VERSION} -s ${artifact_list}"
     echo "Linkage Checker Program Arguments: ${program_args}"
     mvn -B -ntp exec:java -Dexec.args="${program_args}" -P exec-linkage-checker
+  else
+    echo "Unable to find any matching artifacts to test in ${repo}"
+    exit 1
   fi
-  echo "done"
 done
 popd
 popd

.kokoro/nightly/downstream-protobuf-source-compatibility.sh

@@ -15,19 +15,10 @@
 
 set -eo pipefail
 
-# Comma-delimited list of repos to test with the local java-shared-dependencies
-if [ -z "${REPOS_UNDER_TEST}" ]; then
-  echo "REPOS_UNDER_TEST must be set to run downstream-protobuf-source-compatibility.sh"
-  echo "Expects a comma-delimited list: i.e REPOS_UNDER_TEST=\"java-bigtable,java-bigquery\""
-  exit 1
-fi
+scriptDir=$(realpath "$(dirname "${BASH_SOURCE[0]}")")
+source "${scriptDir}/common.sh"
 
-# Version of Protobuf-Java runtime to compile with
-if [ -z "${PROTOBUF_RUNTIME_VERSION}" ]; then
-  echo "PROTOBUF_RUNTIME_VERSION must be set to run downstream-protobuf-source-compatibility.sh"
-  echo "Expects a single Protobuf-Java runtime version i.e. PROTOBUF_RUNTIME_VERSION=\"4.28.3\""
-  exit 1
-fi
+validate_protobuf_compatibility_script_inputs
 
 for repo in ${REPOS_UNDER_TEST//,/ }; do # Split on comma
   # Perform source-compatibility testing on main (latest changes)