[pull] master from googleapis:master

.bazelignore

@@ -0,0 +1 @@
+.bcr/

.bazeliskrc

@@ -1,2 +1,2 @@
 # See https://github.com/bazelbuild/bazelisk
-USE_BAZEL_VERSION=6.3.0
+USE_BAZEL_VERSION=7.7.1

.bazelrc

@@ -1,16 +1,32 @@
+common --noenable_bzlmod
+
+# --- C++ Toolchain & Compilation ---
+# Force C++17 for Protobuf 31 / gRPC 1.74 compatibility
+build --cxxopt='-std=c++17'
+build --host_cxxopt='-std=c++17'
+build --action_env=BAZEL_CXXOPTS="-std=c++17"
+
+# --- Java Toolchain & Runtime (JDK 21) ---
+build --java_language_version=21
+build --java_runtime_version=remotejdk_21
+build --javacopt="-Xep:ImpossibleNullComparison:OFF"
+
+# --- Protobuf & gRPC ---
+build --proto_toolchain_for_java="@com_google_protobuf_java_only//:java_toolchain"
+build --define=grpc_no_ares=true
 # To make proto_library rules to include source info in the descriptor
 build --protocopt=--include_source_info
 build --protocopt=--experimental_allow_proto3_optional
-# New boringssl requires C++14
-build --repo_env=BAZEL_CXXOPTS="-std=c++14"
 
+# --- Test Environment Fixes ---
+test --jvmopt="-Djava.security.manager=allow"
+test --jvmopt="--add-opens=java.base/java.lang=ALL-UNNAMED"
+build --remote_download_toplevel
 
-# This is to avoid JVM SIGBUS crashes on highly parallel builds,
-# see https://github.com/bazelbuild/bazel/issues/3236 for more details
-build --enable_platform_specific_config
+# --- Linux Specific Config ---
 build:linux --sandbox_tmpfs_path=/tmp
+common:linux --experimental_convenience_symlinks=ignore
 
-# Do not create bazel-* symlinks in the workspace directory
-build:linux --experimental_convenience_symlinks=ignore
-test:linux --experimental_convenience_symlinks=ignore
-run:linux --experimental_convenience_symlinks=ignore
+# --- Performance & Analysis ---
+# Bazel 6.4+: 'common' applies to all commands that support the flag
+common --@aspect_rules_ts//ts:skipLibCheck=honor_tsconfig

.bcr/README.md

@@ -0,0 +1,56 @@
+# BCR Publisher
+
+This document explains how to use the `publish-to-bcr.sh` script to publish `googleapis` to the Bazel Central Registry (BCR).
+
+## Usage
+
+The `publish-to-bcr.sh` script is used to automate the process of creating a new version of the `googleapis` module in the BCR.
+
+### Arguments
+
+The script accepts the following arguments:
+
+*   `-r`, `--ref`: **(Required)** The git ref (commit SHA, tag, or branch) of `googleapis` to be published.
+*   `-t`, `--templates_ref`: The git ref to use for the templates. Defaults to the value of `--ref`.
+*   `-o`, `--org`: The GitHub organization. Defaults to `googleapis`.
+*   `-p`, `--protobuf_version`: The version of protobuf to use. Defaults to `21.7`.
+*   `-b`, `--bcr_organization`: The GitHub organization for the Bazel Central Registry. Defaults to `bazelbuild`.
+*   `-f`, `--bcr_folder`: The local path to a fork of the `bazel-central-registry` repository. If not provided, the script will clone it from `https://github.com/{bcr_organization}/bazel-central-registry`.
+
+### Example
+
+```bash
+./publish-to-bcr.sh --ref <your-commit-sha>
+```
+
+### After running the script
+
+After the script is executed, it will perform the following actions:
+
+1.  A new branch will be created in your local fork of `bazel-central-registry`.
+2.  The script will prompt you to create a Pull Request. If you agree, a new PR will be created in the `bazelbuild/bazel-central-registry` repository.
+3.  The script will automatically add a comment to the PR with the content: `@bazel-io skip_check unstable_url`. This is necessary to bypass the URL stability check.
+
+Once the Pull Request has been created and all Continuous Integration (CI) checks are passing, a maintainer of the Bazel Central Registry will review and merge it.
+
+#### Note on re-running the script
+
+During development, you may need to run the script several times.
+Between each call, it's strongly recommended to reset your local fork of bazel-central-registry.
+For this, you can run the following command:
+
+```bash
+pushd "${fork_location}"
+git reset --hard
+git checkout main
+git clean -d -f
+popd
+```
+
+## Testing
+
+To run the unit tests for the script, use the following command:
+
+```bash
+./publish-to-bcr_test.sh
+```

.bcr/publish-to-bcr.sh

@@ -0,0 +1,288 @@
+#!/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.
+#
+
+set -e
+
+readonly DEFAULT_REPO="googleapis"
+readonly DEFAULT_ORG="googleapis"
+readonly DEFAULT_PROTOBUF_VERSION="21.7"
+readonly DEFAULT_BCR_ORGANIZATION="bazelbuild"
+readonly SKIP_URL_CHECK_COMMENT='@bazel-io skip_check unstable_url'
+readonly SKIP_FLAG_CHECK_COMMENT='@bazel-io skip_check incompatible_flags'
+
+# This function checks out the .bcr folder
+# to the specified commit SHA ($1) into the folder
+# specified in $2
+function checkout_definitions() {
+  local target_folder="$1"
+  local repo_url="$2"
+  local templates_ref="$3"
+  local definitions_ref="$4"
+
+  pushd "${target_folder}" > /dev/null
+  git init
+  git remote add origin "${repo_url}"
+  git sparse-checkout init --cone
+  git sparse-checkout set ".bcr"
+  git fetch --depth 1 origin "${templates_ref}"
+  git fetch --depth 2 origin "${definitions_ref}"
+  git checkout "${definitions_ref}"
+  git checkout "${templates_ref}" -- .bcr/ || (echo "--templates_ref does not contain the templates .bcr folder" && exit 1)
+  popd > /dev/null
+}
+
+function get_version() {
+  local target_folder="$1"
+  local ref="$2"
+  pushd "${target_folder}" &> /dev/null
+  local commit_sha=$(git rev-parse "${ref}")
+  local commit_date=$(git log --format=%cd '--date=format:%Y%m%d' "${ref}~1..${ref}")
+  popd &> /dev/null
+  echo "0.0.0-${commit_date}-${commit_sha:0:8}"
+}
+
+# Replaces values in all files containing the ".template." string in
+# their filenames
+function render_templates() {
+  local target_folder="$1"
+  local ref="$2"
+  local protobuf_version="$3"
+  local org="$4"
+
+  local template_files=$(find "${target_folder}" -type f -name '*.template.*')
+  local version_string="$(get_version "${target_folder}" "${ref}")"
+  for file in ${template_files}; do
+    # here we render the values in each template file
+    sed -i "s|{VERSION}|${ref}|" "${file}"
+    sed -i "s|{GOOGLEAPIS_VERSION}|${version_string}|" "${file}"
+    sed -i "s|{PROTOBUF_VERSION}|${protobuf_version}|" "${file}"
+    sed -i "s|{OWNER}|${DEFAULT_ORG}|" "${file}"
+    sed -i "s|{REPO}|${DEFAULT_REPO}|" "${file}"
+    # we remove the .template string from the filename
+    mv "${file}" $(sed 's|\.template||' <<< "${file}")
+  done
+}
+
+# Creates a .patch file to indicate the introduction of MODULE.bazel
+function create_module_patch() {
+  target_googleapis_module="$1"
+  filename="$(basename "${target_googleapis_module}")"
+  destination="$2"
+  mkdir -p "$(dirname ${destination})"
+  diff -Nau /dev/null "${target_googleapis_module}" \
+    | sed "1 s|.*|--- ${filename}|" \
+    | sed "2 s|.*|+++ ${filename}|" > "${destination}"
+}
+
+# append the version specified in $2 to the specified metadata file
+function append_version_to_metadata() {
+  local version="$1"
+  local metadata_file="$2"
+  cat <<< $(jq ".versions += [\"${version}\"]" "${metadata_file}") > "${metadata_file}"
+}
+
+function copy_module() {
+  local bcr_module_folder="$1"
+  local file_dest="${bcr_module_folder}/overlay/MODULE.bazel"
+  local file_source="${bcr_module_folder}/MODULE.bazel"
+  if [[ -f "${file_dest}" ]]; then
+    rm "${file_dest}"
+  fi
+
+  cp "${file_source}" "${file_dest}"
+}
+
+function update_module_integrity() {
+  bcr_folder="$1"
+  version="$2"
+  pushd "${bcr_folder}" > /dev/null
+  bazelisk run -- //tools:update_integrity "googleapis" \
+    || exit 1
+  popd > /dev/null
+}
+
+function prepare_bcr_repo() {
+
+  local target_folder="$1"
+  local bcr_folder="$2"
+  local ref="$3"
+
+  local version=$(get_version "${target_folder}" "${ref}")
+  pushd "${bcr_folder}"
+  local googleapis_module_root="${bcr_folder}/modules/googleapis"
+  local googleapis_target_module="${googleapis_module_root}/${version}"
+  cp -r "${target_folder}" "${googleapis_target_module}"
+  copy_module "${googleapis_target_module}"
+  append_version_to_metadata "${version}" "${googleapis_module_root}/metadata.json"
+  update_module_integrity "${bcr_folder}" "${version}"
+  popd
+}
+
+function validate_bcr_module() {
+  local target_folder="$1"
+  local bcr_folder="$2"
+  local ref="$3"
+
+  version="$(get_version "${target_folder}" "${ref}")"
+  pushd "${bcr_folder}" > /dev/null
+  # we skip the url stability check because we don't have releases of googleapis/googleapis
+  bazelisk run -- //tools:bcr_validation --skip_validation url_stability "--check=googleapis@${version}" \
+    || exit "$?"
+  popd > /dev/null
+}
+
+function create_pull_request() {
+  local target_folder="$1"
+  local bcr_folder="$2"
+  local bcr_organization="$3"
+  local ref="$4"
+
+  local version=$(get_version "${target_folder}" "${ref}")
+  pushd "${bcr_folder}"
+  # we create a branch with a random string in case of multiple local runs
+  git checkout -b "add-googleapis-${version}-$(openssl rand -hex 3)"
+  git add "modules"
+  commit_message="Add googleapis ${version}"
+  git commit -m "${commit_message}"
+  git push origin
+  pr_command="gh pr create --title \"${commit_message}\" --body \"\" --repo \"${bcr_organization}/bazel-central-registry\""
+  read -p "The PR is ready to be raised. Do you wish to proceed? [y/N]: " -n 1 -r confirmation
+  if [[ "${confirmation}" =~ ^[Yy]$ ]]
+  then
+    echo "Creating Pull Request"
+    export pr_creation_output=$(bash -c "${pr_command}")
+    pr_url=$(grep '/pull/' <<< "${pr_creation_output}")
+    gh pr comment --body "${SKIP_URL_CHECK_COMMENT}" "${pr_url}"
+    gh pr comment --body "${SKIP_FLAG_CHECK_COMMENT}" "${pr_url}"
+    echo "Done! You can see the created PR in ${pr_url}"
+  else
+    echo "The branch is ready. You can create a PR by runing:"
+    echo "cd $(pwd) && ${pr_command}"
+    echo "Make sure to add a comment with the content: '${SKIP_URL_CHECK_COMMENT}'"
+    echo "as well as a comment with the content '${SKIP_FLAG_CHECK_COMMENT}'"
+  fi
+  popd
+}
+
+function confirm_tools() {
+	for tool in gh bazelisk git jq; do
+    if ! command -v "${tool}" &> /dev/null ; then
+      echo "Tool ${tool} is not installed. Please install it and try again."
+      exit 1
+    fi
+  done
+}
+
+function main() {
+  local ref="$1"
+  local templates_ref="$2"
+  local org="$3"
+  local protobuf_version="$4"
+  local bcr_organization="$5"
+  local bcr_folder="$6"
+
+  local target_folder="$(mktemp -d)"
+  readonly target_folder
+  local template_folder="${target_folder}/.bcr/template"
+  local repo_url="https://github.com/${org}/${DEFAULT_REPO}"
+	confirm_tools
+  checkout_definitions "${target_folder}" "${repo_url}" "${templates_ref}" "${ref}"
+  render_templates "${template_folder}" "${ref}" "${protobuf_version}" "${org}"
+  create_module_patch "${template_folder}/MODULE.bazel" "${template_folder}/patches/module_dot_bazel.patch"
+
+  if [[ -z "${bcr_folder}" ]] || [[ ! -d "${bcr_folder}" ]]; then
+    bcr_folder="${target_folder}/bazel-central-registry"
+    git clone "https://github.com/${bcr_organization}/bazel-central-registry" "${bcr_folder}"
+  fi
+  prepare_bcr_repo "${template_folder}" "${bcr_folder}" "${ref}"
+  validate_bcr_module "${template_folder}" "${bcr_folder}" "${ref}"
+  create_pull_request "${template_folder}" "${bcr_folder}" "${bcr_organization}" "${ref}"
+}
+
+# parse input parameters
+while [[ $# -gt 0 ]]; do
+key="$1"
+case $key in
+  -r|--ref)
+    ref="$2"
+    shift
+    ;;
+  -t|--templates_ref)
+    templates_ref="$2"
+    shift
+    ;;
+  -o|--org)
+    org="$2"
+    shift
+    ;;
+  -p|--protobuf_version)
+    protobuf_version="$2"
+    shift
+    ;;
+  -b|--bcr_organization)
+    bcr_organization="$2"
+    shift
+    ;;
+  -f|--bcr_folder)
+    bcr_folder="$2"
+    shift
+    ;;
+  -d|--dry_run)
+    dry_run="$2"
+    shift
+    ;;
+  *)
+    echo "Invalid option: [$1]"
+    exit 1
+    ;;
+esac
+shift # past argument or value
+done
+
+if [[ -z "${ref}" ]]; then
+  echo "Missing option --ref"
+  exit 0
+fi
+
+if [[ -z "${templates_ref}" ]]; then
+  echo "assuming templates_ref to be the HEAD of master"
+  templates_ref="$(git ls-remote https://github.com/googleapis/googleapis HEAD | awk '{ print $1}')"
+fi
+
+if [[ -z "${org}" ]]; then
+  echo "Using default value for --org: ${DEFAULT_ORG}"
+  org="${DEFAULT_ORG}"
+fi
+
+if [[ -z "${protobuf_version}" ]]; then
+  echo "Using default value for --protobuf_version: ${DEFAULT_PROTOBUF_VERSION}"
+  protobuf_version="${DEFAULT_PROTOBUF_VERSION}"
+fi
+
+if [[ -z "${bcr_organization}" ]]; then
+  echo "Using default value for --bcr_organization: ${DEFAULT_BCR_ORGANIZATION}"
+  bcr_organization="${DEFAULT_BCR_ORGANIZATION}"
+fi
+
+if [[ -z "${bcr_folder}" ]] && [[ "${bcr_organization}" == "${DEFAULT_BCR_ORGANIZATION}" ]]; then
+  echo "Cannot create branches in the ${DEFAULT_BCR_ORGANIZATION}/bazel-central-registry repo."
+	echo "Please specify either a --bcr_folder or --bcr_organization we can push to."
+	echo "(This needs a fork of the repo.)"
+  exit 1
+fi
+
+main "${ref}" "${templates_ref}" "${org}" "${protobuf_version}" "${bcr_organization}" "${bcr_folder}"