Fix workspace and replace compile_protos with regenerate-files

.bazelversion

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

WORKSPACE.bazel → WORKSPACE

@@ -16,10 +16,22 @@ workspace(name = "com_github_openconfig_gnpsi")
 
 load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
 
-# -- Load Dependencies ---------------------------------------------------------
-load("gnpsi_deps.bzl", "gnpsi_deps")
+### Bazel rules for many languages to compile PROTO into gRPC libraries
+# Note: any version of this which is less than 4.3.0 requires bazel version 5.4.0 (set in .bazelversion file)
+http_archive(
+    name = "rules_proto_grpc",
+    sha256 = "c0d718f4d892c524025504e67a5bfe83360b3a982e654bc71fed7514eb8ac8ad",
+    strip_prefix = "rules_proto_grpc-4.6.0",
+    urls = ["https://github.com/rules-proto-grpc/rules_proto_grpc/archive/4.6.0.tar.gz"],
+)
 
-gnpsi_deps()
+# googleapis has not had a release since 2016 - take the master version as of 4-jan-23
+http_archive(
+    name = "com_google_googleapis",
+    sha256 = "9fc03150d86501d7da35eefa989d5553bdd77a95cfe4373cdafe8eee92f6bfb1",
+    strip_prefix = "googleapis-870a5ed7e141b4faf70e2a0858854e9b5bb18612",
+    urls = ["https://github.com/googleapis/googleapis/archive/870a5ed7e141b4faf70e2a0858854e9b5bb18612.tar.gz"],
+)
 
 # -- Load GRPC Dependencies ----------------------------------------------------
 load("@com_google_googleapis//:repository_rules.bzl", "switched_rules_by_language")
@@ -31,37 +43,50 @@ switched_rules_by_language(
     go = True,
 )
 
-load("@com_github_grpc_grpc//bazel:grpc_deps.bzl", "grpc_deps")
+load(
+    "@rules_proto_grpc//:repositories.bzl",
+    "bazel_gazelle",
+    "io_bazel_rules_go",
+    "rules_proto_grpc_repos",
+    "rules_proto_grpc_toolchains",
+)
 
-grpc_deps()
+rules_proto_grpc_toolchains()
+rules_proto_grpc_repos()
 
-load("@com_github_grpc_grpc//bazel:grpc_extra_deps.bzl", "grpc_extra_deps")
+load("@rules_proto//proto:repositories.bzl", "rules_proto_dependencies", "rules_proto_toolchains")
 
-grpc_extra_deps()
+rules_proto_dependencies()
+rules_proto_toolchains()
 
-# -- Load Protobuf -------------------------------------------------------------
+### Golang
+io_bazel_rules_go()
+load("@io_bazel_rules_go//go:deps.bzl", "go_register_toolchains", "go_rules_dependencies")
+go_rules_dependencies()
+go_register_toolchains(go_version = "1.20")
 
-load("@com_google_protobuf//:protobuf_deps.bzl", "protobuf_deps")
+# gazelle:repo bazel_gazelle
+bazel_gazelle()
 
-protobuf_deps()
+# -- Load Dependencies ---------------------------------------------------------
+load("gnpsi_deps.bzl", "gnpsi_deps")
 
-load("@rules_proto//proto:repositories.bzl", "rules_proto_dependencies", "rules_proto_toolchains")
+gnpsi_deps()
 
-rules_proto_dependencies()
+load("@rules_proto_grpc//go:repositories.bzl", rules_proto_grpc_go_repos = "go_repos")
 
-rules_proto_toolchains()
+rules_proto_grpc_go_repos()
 
+### C++
+load("@rules_proto_grpc//cpp:repositories.bzl", rules_proto_grpc_cpp_repos = "cpp_repos")
 
+rules_proto_grpc_cpp_repos()
 
-### Bazel rules for many languages to compile PROTO into gRPC libraries
-http_archive(
-    name = "rules_proto_grpc",
-    sha256 = "bbe4db93499f5c9414926e46f9e35016999a4e9f6e3522482d3760dc61011070",
-    strip_prefix = "rules_proto_grpc-4.2.0",
-    urls = ["https://github.com/rules-proto-grpc/rules_proto_grpc/archive/4.2.0.tar.gz"],
-)
+load("@com_github_grpc_grpc//bazel:grpc_deps.bzl", "grpc_deps")
 
-load("@rules_proto_grpc//:repositories.bzl", "rules_proto_grpc_repos", "rules_proto_grpc_toolchains")
+grpc_deps()
 
-rules_proto_grpc_toolchains()
-rules_proto_grpc_repos()
+# Load gazelle_dependencies last, so that the newer version of org_golang_google_grpc is used.
+# see https://github.com/rules-proto-grpc/rules_proto_grpc/issues/160
+load("@bazel_gazelle//:deps.bzl", "gazelle_dependencies")
+gazelle_dependencies()

common.bzl

@@ -0,0 +1,29 @@
+load("@io_bazel_rules_go//proto:compiler.bzl", "go_proto_compiler")
+load("@io_bazel_rules_go//proto/wkt:well_known_types.bzl", "PROTO_RUNTIME_DEPS", "WELL_KNOWN_TYPES_APIV2")
+
+def use_new_compilers():
+    go_proto_compiler(
+        name = "go_protoc_gen_go",
+        options = [
+            "paths=source_relative",
+        ],
+        plugin = "@org_golang_google_protobuf//cmd/protoc-gen-go",
+        suffix = ".pb.go",
+        visibility = ["//visibility:public"],
+        deps = PROTO_RUNTIME_DEPS + WELL_KNOWN_TYPES_APIV2,
+    )
+    go_proto_compiler(
+        name = "go_protoc_gen_go_grpc",
+        options = [
+            "paths=source_relative",
+        ],
+        plugin = "@org_golang_google_grpc_cmd_protoc_gen_go_grpc//:protoc-gen-go-grpc",
+        suffix = "_grpc.pb.go",
+        visibility = ["//visibility:public"],
+        deps = PROTO_RUNTIME_DEPS + [
+            "@org_golang_google_grpc//:go_default_library",
+            "@org_golang_google_grpc//codes:go_default_library",
+            "@org_golang_google_grpc//status:go_default_library",
+        ],
+    )
+

proto/gnpsi/BUILD.bazel

@@ -12,9 +12,11 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-
 load("@com_github_grpc_grpc//bazel:cc_grpc_library.bzl", "cc_grpc_library")
-
+load("@io_bazel_rules_go//go:def.bzl", "go_library")
+load("@io_bazel_rules_go//proto:def.bzl", "go_proto_library")
+load("@rules_proto//proto:defs.bzl", "proto_library")
+load("//:common.bzl", "use_new_compilers")
 # gnpsi defines a gRPC-based network packet sampling interface implemented on
 # vendor network elements. It provides mechanisms for streaming packet
 # samples/updates from the network element.
@@ -23,6 +25,8 @@ package(
     licenses = ["notice"],
 )
 
+use_new_compilers()
+
 proto_library(
     name = "gnpsi_proto",
     srcs = ["gnpsi.proto"],
@@ -44,3 +48,19 @@ cc_grpc_library(
     grpc_only = ["True"],
     deps = [":gnpsi_cc_proto"],
 )
+
+go_proto_library(
+    name = "gnpsi_go_proto",
+    compilers = [
+        "go_protoc_gen_go",
+        "go_protoc_gen_go_grpc",
+    ],
+    importpath = "github.com/openconfig/gnpsi/proto/gnpsi",
+    proto = ":gnpsi_proto",
+)
+
+go_library(
+    name = "gnpsi",
+    embed = [":gnpsi_go_proto"],
+    importpath = "github.com/openconfig/gnpsi/proto/gnpsi",
+)