Merge pull request #23 from bstoll/bazel8

Add bzlmod/Bazel8 support.

Author: marcushines

.bazelversion

@@ -1 +1 @@
-6.4.0
+8.1.1

.github/workflows/ci-cpp-build.yml

@@ -4,35 +4,25 @@ on:
   push:
     branches: [ main ]
   pull_request:
-    branches: [ main ]
   schedule:
     - cron: "0 0 * * *"
   workflow_dispatch:
 
 jobs:
   build:
     runs-on: ubuntu-latest
-    env:
-      BAZEL: bazelisk-linux-amd64
     steps:
-    - uses: actions/checkout@v2
-    - name: Compute hour of the day.
-      id: hour
-      run: echo "::set-output name=number::$(date +%H)"
-    - name: Mount bazel cache
-      uses: actions/cache@v2
-      with:
-        # See https://docs.bazel.build/versions/master/output_directories.html
-        path: "~/.cache/bazel"
-        # Create a new cache entry whenever Bazel files change.
-        # See https://docs.github.com/en/actions/guides/caching-dependencies-to-speed-up-workflows
-        key: bazel-${{ runner.os }}-build-${{ hashFiles('**/*.bzl', '**/*.bazel') }}
-        restore-keys: |
-          bazel-${{ runner.os }}-build-
-    - name: Install bazelisk
-      run: |
-        curl -LO "https://github.com/bazelbuild/bazelisk/releases/download/v1.17.0/$BAZEL"
-        chmod +x $BAZEL
-        sudo mv $BAZEL /usr/local/bin/bazel
-    - name: Build
-      run: bazel build //...
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
+        with:
+          submodules: recursive
+      - name: Mount bazel cache
+        uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4
+        with:
+          path: "~/.cache/bazel"
+          key: bazel-${{ runner.os }}-build-${{ hashFiles('**/*.bzl', '**/*.bazel') }}
+          restore-keys: |
+            bazel-${{ runner.os }}-build-
+      - name: Build
+        run: bazel build //...
+      - name: Test
+        run: bazel test //...

MODULE.bazel

@@ -0,0 +1,10 @@
+module(
+    name = "openconfig_gnpsi",
+    version = "0.0.0",
+)
+
+bazel_dep(name = "grpc", version = "1.69.0", repo_name = "com_github_grpc_grpc")
+bazel_dep(name = "protobuf", version = "29.3", repo_name = "com_google_protobuf")
+bazel_dep(name = "abseil-cpp", version = "20240722.0.bcr.2", repo_name = "com_google_absl")
+bazel_dep(name = "glog", version = "0.7.1", repo_name = "com_github_google_glog")
+bazel_dep(name = "googletest", version = "1.15.2", repo_name = "com_google_googletest")

MODULE.bazel.lock

@@ -0,0 +1,61 @@
+# Copyright 2024 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
+#
+#     https://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.
+
+workspace(name = "com_github_openconfig_gnpsi")
+
+load("//:gnpsi_deps.bzl", "gnpsi_deps")
+
+gnpsi_deps()
+
+load("@com_google_googleapis//:repository_rules.bzl", "switched_rules_by_language")
+
+switched_rules_by_language(
+    name = "com_google_googleapis_imports",
+    cc = True,
+    go = True,
+    grpc = True,
+)
+
+load("@bazel_features//:deps.bzl", "bazel_features_deps")
+
+bazel_features_deps()
+
+load("@bazel_gazelle//:deps.bzl", "gazelle_dependencies")
+load("@io_bazel_rules_go//go:deps.bzl", "go_register_toolchains", "go_rules_dependencies")
+
+go_rules_dependencies()
+
+go_register_toolchains(version = "1.23.4")
+
+gazelle_dependencies()
+
+load("@com_google_protobuf//:protobuf_deps.bzl", "protobuf_deps")
+
+protobuf_deps()
+
+load("@com_github_grpc_grpc//bazel:grpc_deps.bzl", "grpc_deps")
+
+grpc_deps()
+
+load("@build_bazel_apple_support//lib:repositories.bzl", "apple_support_dependencies")
+load("@build_bazel_rules_apple//apple:repositories.bzl", "apple_rules_dependencies")
+
+# Required by grpc
+load("@rules_python//python:repositories.bzl", "py_repositories")
+
+py_repositories()
+
+apple_rules_dependencies(ignore_version_differences = False)
+
+apple_support_dependencies()

WORKSPACE

@@ -18,67 +18,96 @@ load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
 
 def gnpsi_deps():
     """Declare the third-party dependencies necessary to build gnpsi"""
+    if not native.existing_rule("bazel_features"):
+        http_archive(
+            name = "bazel_features",
+            sha256 = "af3d4fb1cf4f25942cb4a933b1ad93a0ea9fe9ee70c2af7f369fb72a67c266e5",
+            strip_prefix = "bazel_features-1.21.0",
+            url = "https://github.com/bazel-contrib/bazel_features/releases/download/v1.21.0/bazel_features-v1.21.0.tar.gz",
+        )
+    if not native.existing_rule("bazel_gazelle"):
+        http_archive(
+            name = "bazel_gazelle",
+            sha256 = "aefbf2fc7c7616c9ed73aa3d51c77100724d5b3ce66cfa16406e8c13e87c8b52",
+            urls = [
+                "https://mirror.bazel.build/github.com/bazelbuild/bazel-gazelle/releases/download/v0.41.0/bazel-gazelle-v0.41.0.tar.gz",
+                "https://github.com/bazelbuild/bazel-gazelle/releases/download/v0.41.0/bazel-gazelle-v0.41.0.tar.gz",
+            ],
+        )
+    # Needed to make glog happy.
+    if not native.existing_rule("com_github_gflags_gflags"):
+        http_archive(
+            name = "com_github_gflags_gflags",
+            url = "https://github.com/gflags/gflags/archive/v2.2.2.tar.gz",
+            strip_prefix = "gflags-2.2.2",
+            sha256 = "34af2f15cf7367513b352bdcd2493ab14ce43692d2dcd9dfc499492966c64dcf",
+        )
+    if not native.existing_rule("com_github_google_glog"):
+        http_archive(
+            name = "com_github_google_glog",
+            url = "https://github.com/google/glog/archive/v0.7.1.tar.gz",
+            strip_prefix = "glog-0.7.1",
+            sha256 = "00e4a87e87b7e7612f519a41e491f16623b12423620006f59f5688bfd8d13b08",
+        )
     if not native.existing_rule("com_github_grpc_grpc"):
         http_archive(
             name = "com_github_grpc_grpc",
-            url = "https://github.com/grpc/grpc/archive/v1.61.0.zip",
-            strip_prefix = "grpc-1.61.0",
-            sha256 = "ba6c53c3924a1d01c663352010e0f73736bad3d99d72108e0f2b1a6466f9be20",
-            patch_args = ["-p1"],
-            patches = [
-                "@com_github_openconfig_gnpsi//:bazel/patches/grpc-001-fix_file_watcher_race_condition.patch",
-            ],
+            url = "https://github.com/grpc/grpc/archive/refs/tags/v1.69.0.tar.gz",
+            strip_prefix = "grpc-1.69.0",
+            sha256 = "cd256d91781911d46a57506978b3979bfee45d5086a1b6668a3ae19c5e77f8dc",
         )
     if not native.existing_rule("com_google_absl"):
         http_archive(
             name = "com_google_absl",
-            url = "https://github.com/abseil/abseil-cpp/archive/20230802.0.tar.gz",
-            strip_prefix = "abseil-cpp-20230802.0",
-            sha256 = "59d2976af9d6ecf001a81a35749a6e551a335b949d34918cfade07737b9d93c5",
+            url = "https://github.com/abseil/abseil-cpp/archive/20240722.0.tar.gz",
+            strip_prefix = "abseil-cpp-20240722.0",
+            sha256 = "f50e5ac311a81382da7fa75b97310e4b9006474f9560ac46f54a9967f07d4ae3",
+        )
+    if not native.existing_rule("com_google_googleapis"):
+        http_archive(
+            name = "com_google_googleapis",
+            sha256 = "0513f0f40af63bd05dc789cacc334ab6cec27cc89db596557cb2dfe8919463e4",
+            strip_prefix = "googleapis-fe8ba054ad4f7eca946c2d14a63c3f07c0b586a0",
+            urls = ["https://github.com/googleapis/googleapis/archive/fe8ba054ad4f7eca946c2d14a63c3f07c0b586a0.tar.gz"],
         )
     if not native.existing_rule("com_google_googletest"):
         http_archive(
             name = "com_google_googletest",
-            urls = ["https://github.com/google/googletest/archive/release-1.11.0.tar.gz"],
-            strip_prefix = "googletest-release-1.11.0",
-            sha256 = "b4870bf121ff7795ba20d20bcdd8627b8e088f2d1dab299a031c1034eddc93d5",
+            urls = ["https://github.com/google/googletest/archive/v1.15.2.tar.gz"],
+            strip_prefix = "googletest-1.15.2",
+            sha256 = "7b42b4d6ed48810c5362c265a17faebe90dc2373c885e5216439d37927f02926",
         )
     if not native.existing_rule("com_google_protobuf"):
         http_archive(
             name = "com_google_protobuf",
-            url = "https://github.com/protocolbuffers/protobuf/archive/refs/tags/v25.2.zip",
-            strip_prefix = "protobuf-25.2",
-            sha256 = "ddd0f5271f31b549efc74eb39061e142132653d5d043071fcec265bd571e73c4",
+            url = "https://github.com/protocolbuffers/protobuf/archive/refs/tags/v29.3.zip",
+            strip_prefix = "protobuf-29.3",
+            sha256 = "85803e01f347141e16a2f770213a496f808fff9f0138c7c0e0c9dfa708b0da92",
+            repo_mapping = {
+                "@proto_bazel_features": "@bazel_features",
+            },
         )
-    if not native.existing_rule("com_google_googleapis"):
+    if not native.existing_rule("bazel_skylib"):
         http_archive(
-            name = "com_google_googleapis",
-            url = "https://github.com/googleapis/googleapis/archive/f405c718d60484124808adb7fb5963974d654bb4.zip",
-            strip_prefix = "googleapis-f405c718d60484124808adb7fb5963974d654bb4",
-            sha256 = "406b64643eede84ce3e0821a1d01f66eaf6254e79cb9c4f53be9054551935e79",
+            name = "bazel_skylib",
+            urls = [
+                "https://mirror.bazel.build/github.com/bazelbuild/bazel-skylib/releases/download/1.7.1/bazel-skylib-1.7.1.tar.gz",
+                "https://github.com/bazelbuild/bazel-skylib/releases/download/1.7.1/bazel-skylib-1.7.1.tar.gz",
+            ],
+            sha256 = "bc283cdfcd526a52c3201279cda4bc298652efa898b10b4db0837dc51652756f",
         )
-    if not native.existing_rule("com_github_google_glog"):
+    if not native.existing_rule("io_bazel_rules_go"):
         http_archive(
-            name = "com_github_google_glog",
-            url = "https://github.com/google/glog/archive/v0.6.0.tar.gz",
-            strip_prefix = "glog-0.6.0",
-            sha256 = "8a83bf982f37bb70825df71a9709fa90ea9f4447fb3c099e1d720a439d88bad6",
-        )
-
-    # Needed to make glog happy.
-    if not native.existing_rule("com_github_gflags_gflags"):
-        http_archive(
-            name = "com_github_gflags_gflags",
-            url = "https://github.com/gflags/gflags/archive/v2.2.2.tar.gz",
-            strip_prefix = "gflags-2.2.2",
-            sha256 = "34af2f15cf7367513b352bdcd2493ab14ce43692d2dcd9dfc499492966c64dcf",
+            name = "io_bazel_rules_go",
+            sha256 = "0936c9bc3c4321ee372cb8f66dd972d368cb940ed01a9ba9fd7debcf0093f09b",
+            urls = [
+                "https://github.com/bazelbuild/rules_go/releases/download/v0.51.0/rules_go-v0.51.0.zip",
+            ],
         )
     if not native.existing_rule("rules_proto"):
         http_archive(
             name = "rules_proto",
-            urls = [
-                "https://github.com/bazelbuild/rules_proto/archive/5.3.0-21.7.tar.gz",
-            ],
-            strip_prefix = "rules_proto-5.3.0-21.7",
-            sha256 = "dc3fb206a2cb3441b485eb1e423165b231235a1ea9b031b4433cf7bc1fa460dd",
+            sha256 = "0e5c64a2599a6e26c6a03d6162242d231ecc0de219534c38cb4402171def21e8",
+            strip_prefix = "rules_proto-7.0.2",
+            url = "https://github.com/bazelbuild/rules_proto/releases/download/7.0.2/rules_proto-7.0.2.tar.gz",
         )

WORKSPACE.bazel

@@ -14,6 +14,8 @@
 #
 
 load("@com_github_grpc_grpc//bazel:cc_grpc_library.bzl", "cc_grpc_library")
+load("@com_google_protobuf//bazel:cc_proto_library.bzl", "cc_proto_library")
+load("@com_google_protobuf//bazel:proto_library.bzl", "proto_library")
 
 # gnpsi defines a gRPC-based network packet sampling interface implemented on
 # vendor network elements. It provides mechanisms for streaming packet