for testing purposes

Author: parthea

.github/workflows/gapic-generator-tests.yml

@@ -3,6 +3,7 @@ permissions:
 
 name: Gapic Generator Specialized Tests
 
+# trigger job
 on:
   pull_request:
   push:
@@ -219,7 +220,8 @@ jobs:
     # Only runs if the Gatekeeper passed
     if: ${{ needs.python_config.result == 'success' }}
     runs-on: ubuntu-latest
-    container: gcr.io/gapic-images/googleapis # zizmor: ignore[unpinned-images]
+    container:
+      image: gcr.io/gapic-images/googleapis # zizmor: ignore[unpinned-images]
     steps:
       - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6
         with:

packages/gapic-generator/.bazeliskrc

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

packages/gapic-generator/.bazelrc

@@ -1,2 +1,12 @@
 # New protobuf requires C++17
 build --repo_env=BAZEL_CXXOPTS="-std=c++17"
+
+# Workaround for rules_python precompilation bug with directory outputs:
+# Newer rules_python (v0.40.0+) attempts to precompile (.py -> .pyc) sources.
+# GAPIC code generator rules (e.g., //tests/integration:asset_py_gapic) output a
+# directory structure of generated code instead of discrete individual files.
+# This triggers: "Error in add: Cannot add directories to Args#add since they may expand to multiple values".
+# Disabling precompilation bypasses the bug without affecting runtime behavior.
+build --@rules_python//python/config_settings:precompile=force_disabled
+
+common --noenable_bzlmod

packages/gapic-generator/WORKSPACE

@@ -2,124 +2,144 @@ workspace(name = "gapic_generator_python")
 
 load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
 
-_bazel_skylib_version = "1.4.0"
+# =========================================================================
+# 1. LOAD MODERN DEPENDENCIES FIRST (CRITICAL: FIRST-LOAD WINS)
+# =========================================================================
+# Load Protobuf 35.1
+http_archive(
+    name = "com_google_protobuf",
+    strip_prefix = "protobuf-35.1",
+    urls = ["https://github.com/protocolbuffers/protobuf/releases/download/v35.1/protobuf-35.1.zip"],
+)
 
-_bazel_skylib_sha256 = "f24ab666394232f834f74d19e2ff142b0af17466ea0c69a3f4c276ee75f6efce"
+# Load standard, unpatched rules_gapic v1.0.0
+http_archive(
+    name = "rules_gapic",
+    strip_prefix = "rules_gapic-1.0.0",
+    urls = [
+        "https://github.com/googleapis/rules_gapic/archive/v1.0.0.tar.gz"
+    ],
+    patch_cmds = [
+        # Safely buffer files in memory first to prevent truncation, then insert the load statement [11]
+        "python3 -c \"import glob; [open(f, 'w').write('load(\\\"@rules_proto//proto:defs.bzl\\\", \\\"ProtoInfo\\\")\\n' + c) for f, c in [(f, open(f).read()) for f in glob.glob('**/*.bzl', recursive=True)] if 'ProtoInfo' in c and '@rules_proto//proto:defs.bzl' not in c]\""
+    ],
+)
 
+http_archive(
+    name = "rules_cc",
+    urls = ["https://github.com/bazelbuild/rules_cc/releases/download/0.1.5/rules_cc-0.1.5.tar.gz"],
+    strip_prefix = "rules_cc-0.1.5",
+)
+
+_bazel_skylib_version = "1.9.0"
 http_archive(
     name = "bazel_skylib",
-    sha256 = _bazel_skylib_sha256,
     url = "https://github.com/bazelbuild/bazel-skylib/releases/download/{0}/bazel-skylib-{0}.tar.gz".format(_bazel_skylib_version),
 )
 
+http_archive(
+    name = "com_google_absl",
+    strip_prefix = "abseil-cpp-20240722.1",
+    urls = [
+        "https://github.com/abseil/abseil-cpp/releases/download/20240722.1/abseil-cpp-20240722.1.tar.gz",
+    ],
+)
+
 _io_bazel_rules_go_version = "0.33.0"
 http_archive(
     name = "io_bazel_rules_go",
-    sha256 = "685052b498b6ddfe562ca7a97736741d87916fe536623afb7da2824c0211c369",
     urls = [
         "https://mirror.bazel.build/github.com/bazelbuild/rules_go/releases/download/v{0}/rules_go-v{0}.zip".format(_io_bazel_rules_go_version),
         "https://github.com/bazelbuild/rules_go/releases/download/v{0}/rules_go-v{0}.zip".format(_io_bazel_rules_go_version),
     ],
 )
 
-_rules_python_version = "0.26.0"
-
-_rules_python_sha256 = "9d04041ac92a0985e344235f5d946f71ac543f1b1565f2cdbc9a2aaee8adf55b"
-
+# =========================================================================
+# UPGRADED: rules_python v1.1.0 (No sha256) [11]
+# =========================================================================
+_rules_python_version = "1.1.0"
 http_archive(
     name = "rules_python",
-    sha256 = _rules_python_sha256,
     strip_prefix = "rules_python-{}".format(_rules_python_version),
-    url = "https://github.com/bazelbuild/rules_python/archive/{}.tar.gz".format(_rules_python_version),
+    url = "https://github.com/bazelbuild/rules_python/releases/download/{0}/rules_python-{0}.tar.gz".format(_rules_python_version),
 )
 
 load("@rules_python//python:repositories.bzl", "py_repositories")
-
 py_repositories()
 
 load("@rules_python//python:pip.bzl", "pip_parse")
-
-
 pip_parse(
     name = "gapic_generator_python_pip_deps",
-	requirements_lock = "//:requirements.txt",
+    requirements_lock = "//:requirements.txt",
 )
-load("@gapic_generator_python_pip_deps//:requirements.bzl", "install_deps")
 
+load("@gapic_generator_python_pip_deps//:requirements.bzl", "install_deps")
 install_deps()
-#
-# Import gapic-generator-python specific dependencies
-#
-load(
-    "//:repositories.bzl",
-    "gapic_generator_python",
-    "gapic_generator_register_toolchains",
-)
-
-gapic_generator_python()
-
-gapic_generator_register_toolchains()
-
-_grpc_version = "1.71.0"
-
-_grpc_sha256 = "9313c3f8f4dd3341597f152d506a50caf571fe40f886e24ea9078891990df285"
 
+# =========================================================================
+# 2. LOAD THE UNPATCHED UPSTREAM gRPC REPOSITORY
+# =========================================================================
+_grpc_version = "816506e5c0434a42414af6955cc9eef0c562ff3a"
 http_archive(
     name = "com_github_grpc_grpc",
-    sha256 = _grpc_sha256,
-    strip_prefix = "grpc-%s" % _grpc_version,
-    urls = ["https://github.com/grpc/grpc/archive/v%s.zip" % _grpc_version],
+    strip_prefix = "grpc-816506e5c0434a42414af6955cc9eef0c562ff3a",
+    urls = ["https://github.com/grpc/grpc/archive/816506e5c0434a42414af6955cc9eef0c562ff3a.zip"],
 )
-# instantiated in grpc_deps().
-
-_protobuf_version = "30.2"
 
-_protobuf_sha256 = "07a43d88fe5a38e434c7f94129cad56a4c43a51f99336074d0799c2f7d4e44c5"
-
-http_archive(
-    name = "com_google_protobuf",
-    sha256 = _protobuf_sha256,
-    strip_prefix = "protobuf-%s" % _protobuf_version,
-    urls = ["https://github.com/protocolbuffers/protobuf/archive/v%s.tar.gz" % _protobuf_version],
-)
 load("@com_github_grpc_grpc//bazel:grpc_deps.bzl", "grpc_deps")
-
 grpc_deps()
 
-http_archive(
-    name = "rules_cc",
-    urls = ["https://github.com/bazelbuild/rules_cc/releases/download/0.1.1/rules_cc-0.1.1.tar.gz"],
-    sha256 = "712d77868b3152dd618c4d64faaddefcc5965f90f5de6e6dd1d5ddcd0be82d42",
-    strip_prefix = "rules_cc-0.1.1",
+# =========================================================================
+# 3. LOAD GAPIC-GENERATOR DEPENDENCIES
+# =========================================================================
+load(
+    "//:repositories.bzl",
+    "gapic_generator_python",
+    "gapic_generator_register_toolchains",
 )
+gapic_generator_python()
+gapic_generator_register_toolchains()
 
-load("@com_google_protobuf//:protobuf_deps.bzl", "protobuf_deps", "PROTOBUF_MAVEN_ARTIFACTS")
-# This is actually already done within grpc_deps but calling this for Bazel convention.
-protobuf_deps()
-
-# Add rules_java to resolve the following error
-# `The repository '@compatibility_proxy' could not be resolved: Repository '@compatibility_proxy' is not defined`
+# Add rules_java to resolve compatibility proxy errors
 load("@rules_java//java:rules_java_deps.bzl", "rules_java_dependencies")
-
 rules_java_dependencies()
 
-# gRPC enforces a specific version of Go toolchain which conflicts with our build.
-# All the relevant parts of grpc_extra_deps() are imported in this  WORKSPACE file
-# explicitly, that is why we do not call grpc_extra_deps() here and call
-# apple_rules_dependencies and apple_support_dependencies macros explicitly.
+# =========================================================================
+# 4. LOAD TRANSITIVE PROTO DEPENDENCIES & REGISTER TOOLCHAINS
+# =========================================================================
+load("@com_google_protobuf//:protobuf_deps.bzl", "protobuf_deps")
+protobuf_deps()
 
-load("@build_bazel_rules_apple//apple:repositories.bzl", "apple_rules_dependencies")
+load("@rules_proto//proto:repositories.bzl", "rules_proto_dependencies")
+rules_proto_dependencies()
+
+load("@rules_proto//proto:toolchains.bzl", "rules_proto_toolchains")
+rules_proto_toolchains()
 
+# =========================================================================
+# 5. LOAD SUPPORTING PLATFORMS
+# =========================================================================
+load("@build_bazel_rules_apple//apple:repositories.bzl", "apple_rules_dependencies")
 apple_rules_dependencies()
 
 load("@build_bazel_apple_support//lib:repositories.bzl", "apple_support_dependencies")
-
 apple_support_dependencies()
 
 load("@com_google_googleapis//:repository_rules.bzl", "switched_rules_by_language")
-
 switched_rules_by_language(
     name = "com_google_googleapis_imports",
     gapic = True,
     grpc = True,
 )
+load("@rules_python//python:repositories.bzl", "python_register_multi_toolchains")
+
+python_register_multi_toolchains(
+    name = "python",
+    ignore_root_user_error = True,
+    python_versions = [
+        "3.10",
+        "3.11",
+        "3.12",
+        "3.13",
+    ],
+)

packages/gapic-generator/repositories.bzl

@@ -16,12 +16,10 @@ def gapic_generator_python():
         urls = ["https://github.com/bazelbuild/bazel-skylib/archive/2169ae1c374aab4a09aa90e65efe1a3aad4e279b.tar.gz"],
     )
 
-    _grpc_version = "1.47.0"
-    _grpc_sha256 = "edf25f4db6c841853b7a29d61b0980b516dc31a1b6cdc399bcf24c1446a4a249"
+    _grpc_version = "1.82.0"
     _maybe(
         http_archive,
         name = "com_github_grpc_grpc",
-        sha256 = _grpc_sha256,
         strip_prefix = "grpc-{}".format(_grpc_version),
         url = "https://github.com/grpc/grpc/archive/v{}.zip".format(_grpc_version),
     )

packages/gapic-generator/rules_python_gapic/py_gapic.bzl

@@ -12,19 +12,41 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-load("@rules_gapic//:gapic.bzl", "proto_custom_library", "unzipped_srcjar")
+load("@rules_gapic//:gapic.bzl", "proto_custom_library", "unzipped_srcjar", "CustomProtoInfo")
 load("@rules_python//python:defs.bzl", "py_library")
 load("@gapic_generator_python_pip_deps//:requirements.bzl", "requirement")
 
+# Load the modern Starlark ProtoInfo under an alias [11]
+load("@rules_proto//proto:defs.bzl", StarlarkProtoInfo = "ProtoInfo")
+
+def _gapic_compat_proto_library_impl(ctx):
+    dep = ctx.attr.dep
+    starlark_proto = dep[StarlarkProtoInfo]
+    return [
+        # Construct CustomProtoInfo natively in Starlark, bypassing the native C++ constructor! [11]
+        CustomProtoInfo(
+            direct_sources = starlark_proto.direct_sources,
+            check_deps_sources = starlark_proto.check_deps_sources,
+            # Map legacy transitive_imports to the modern transitive_sources attribute [7]
+            transitive_imports = starlark_proto.transitive_sources,
+            transitive_descriptor_sets = starlark_proto.transitive_descriptor_sets,
+        )
+    ]
+
+gapic_compat_proto_library = rule(
+    implementation = _gapic_compat_proto_library_impl,
+    attrs = {
+        "dep": attr.label(mandatory = True, providers = [StarlarkProtoInfo]),
+    }
+)
+
 def _gapic_test_file_impl(ctx):
     generated_test_file = ctx.actions.declare_file(ctx.label.name)
-
     ctx.actions.expand_template(
         template = ctx.attr.template.files.to_list()[0],
         output = generated_test_file,
         substitutions = {},
     )
-
     return [DefaultInfo(files = depset(direct = [generated_test_file]))]
 
 gapic_test_file = rule(
@@ -46,30 +68,36 @@ def py_gapic_library(
         rest_numeric_enums = False,
         deps = [],
         **kwargs):
+
+    # 1. Dynamically wrap the input srcs with our legacy native provider converter [11]
+    compat_srcs = []
+    for i, src in enumerate(srcs):
+        compat_name = "%s_compat_src_%d" % (name, i)
+        gapic_compat_proto_library(
+            name = compat_name,
+            dep = src,
+        )
+        compat_srcs.append(":%s" % compat_name)
+
     srcjar_target_name = "%s_srcjar" % name
     srcjar_output_suffix = ".srcjar"
-
     plugin_args = plugin_args or []
     opt_args = opt_args or []
-
     if metadata:
         plugin_args.append("metadata")
-
     file_args = {}
     if grpc_service_config:
         file_args[grpc_service_config] = "retry-config"
     if service_yaml:
         file_args[service_yaml] = "service-yaml"
-
     if transport:
         opt_args = opt_args + ["transport=%s" % transport]
-
     if rest_numeric_enums:
         opt_args = opt_args + ["rest-numeric-enums"]
 
     proto_custom_library(
         name = srcjar_target_name,
-        deps = srcs,
+        deps = compat_srcs,  # <--- Changed this from 'srcs' to 'compat_srcs'! [11]
         plugin = Label("@gapic_generator_python//:gapic_plugin"),
         plugin_args = plugin_args,
         plugin_file_args = file_args,
@@ -78,15 +106,12 @@ def py_gapic_library(
         output_suffix = srcjar_output_suffix,
         **kwargs
     )
-
     main_file = "%s" % srcjar_target_name + srcjar_output_suffix
     main_dir = "%s.py" % srcjar_target_name
-
     unzipped_srcjar(
         name = main_dir,
         srcjar = ":%s" % main_file,
     )
-
     actual_deps = deps + [
         "@com_github_grpc_grpc//src/python/grpcio/grpc:grpcio",
         requirement("protobuf"),
@@ -96,22 +121,17 @@ def py_gapic_library(
         requirement("pytest-asyncio"),
         requirement("aiohttp")
     ]
-
     py_library(
         name = name,
         srcs = [":%s" % main_dir],
         deps = actual_deps,
     )
-
     test_file_target_name = "%s_test.py" % name
-
     gapic_test_file(
         name = test_file_target_name,
         template = Label("//rules_python_gapic:test.py"),
     )
-
     test_runner_file_target_name = "%s_pytest.py" % name
-
     gapic_test_file(
         name = test_runner_file_target_name,
         template = Label("//rules_python_gapic:pytest.py"),