Restore WORKSPACE support without strip_import_prefix (Bazel 6-7)

Like bazel-workspace-support, but with the workspace root at proto/
and no strip_import_prefix. This makes the repo consumable via
http_archive with strip_prefix=".../proto" without any path conflicts.

Signed-off-by: Steffen Smolka <steffen.smolka@gmail.com>

Author: smolkaj

BUILD.bazel

@@ -11,103 +11,78 @@ license(
     license_text = "LICENSE",
 )
 
-exports_files(["LICENSE"])
+exports_files(["LICENSE", "p4runtime_deps.bzl"])
 
 # -- Aliases for backward compatibility --------------------------------------
 # TODO(https://github.com/p4lang/p4runtime/issues/576): Remove in 2.0.
 
 alias(
     name = "p4types_proto",
-    actual = "//proto/p4/config/v1:p4types_proto",
-    deprecation = "Please use @p4runtime//proto/p4/config/v1:p4types_proto instead.",
+    actual = "//p4/config/v1:p4types_proto",
+    deprecation = "Please use @p4runtime//p4/config/v1:p4types_proto instead.",
 )
 
 alias(
     name = "p4info_proto",
-    actual = "//proto/p4/config/v1:p4info_proto",
-    deprecation = "Please use @p4runtime//proto/p4/config/v1:p4info_proto instead.",
+    actual = "//p4/config/v1:p4info_proto",
+    deprecation = "Please use @p4runtime//p4/config/v1:p4info_proto instead.",
 )
 
 alias(
     name = "p4data_proto",
-    actual = "//proto/p4/v1:p4data_proto",
-    deprecation = "Please use @p4runtime//proto/p4/v1:p4data_proto instead.",
+    actual = "//p4/v1:p4data_proto",
+    deprecation = "Please use @p4runtime//p4/v1:p4data_proto instead.",
 )
 
 alias(
     name = "p4runtime_proto",
-    actual = "//proto/p4/v1:p4runtime_proto",
-    deprecation = "Please use @p4runtime//proto/p4/v1:p4runtime_proto instead.",
+    actual = "//p4/v1:p4runtime_proto",
+    deprecation = "Please use @p4runtime//p4/v1:p4runtime_proto instead.",
 )
 
 alias(
     name = "p4types_cc_proto",
-    actual = "//proto/p4/config/v1:p4types_cc_proto",
-    deprecation = "Please use @p4runtime//proto/p4/config/v1:p4types_cc_proto instead.",
+    actual = "//p4/config/v1:p4types_cc_proto",
+    deprecation = "Please use @p4runtime//p4/config/v1:p4types_cc_proto instead.",
 )
 
 alias(
     name = "p4info_cc_proto",
-    actual = "//proto/p4/config/v1:p4info_cc_proto",
-    deprecation = "Please use @p4runtime//proto/p4/config/v1:p4info_cc_proto instead.",
+    actual = "//p4/config/v1:p4info_cc_proto",
+    deprecation = "Please use @p4runtime//p4/config/v1:p4info_cc_proto instead.",
 )
 
 alias(
     name = "p4data_cc_proto",
-    actual = "//proto/p4/v1:p4data_cc_proto",
-    deprecation = "Please use @p4runtime//proto/p4/v1:p4data_cc_proto instead.",
+    actual = "//p4/v1:p4data_cc_proto",
+    deprecation = "Please use @p4runtime//p4/v1:p4data_cc_proto instead.",
 )
 
 alias(
     name = "p4runtime_cc_proto",
-    actual = "//proto/p4/v1:p4runtime_cc_proto",
-    deprecation = "Please use @p4runtime//proto/p4/v1:p4runtime_cc_proto instead.",
+    actual = "//p4/v1:p4runtime_cc_proto",
+    deprecation = "Please use @p4runtime//p4/v1:p4runtime_cc_proto instead.",
 )
 
 alias(
     name = "p4runtime_cc_grpc",
-    actual = "//proto/p4/v1:p4runtime_cc_grpc",
-    deprecation = "Please use @p4runtime//proto/p4/v1:p4runtime_cc_grpc instead.",
+    actual = "//p4/v1:p4runtime_cc_grpc",
+    deprecation = "Please use @p4runtime//p4/v1:p4runtime_cc_grpc instead.",
 )
 
-alias(
-    name = "p4types_py_proto",
-    actual = "//proto/p4/config/v1:p4types_py_proto",
-    deprecation = "Please use @p4runtime//proto/p4/config/v1:p4types_py_proto instead.",
-)
 
-alias(
-    name = "p4info_py_proto",
-    actual = "//proto/p4/config/v1:p4info_py_proto",
-    deprecation = "Please use @p4runtime//proto/p4/config/v1:p4info_py_proto instead.",
-)
 
-alias(
-    name = "p4data_py_proto",
-    actual = "//proto/p4/v1:p4data_py_proto",
-    deprecation = "Please use @p4runtime//proto/p4/v1:p4data_py_proto instead.",
-)
 
-alias(
-    name = "p4runtime_py_proto",
-    actual = "//proto/p4/v1:p4runtime_py_proto",
-    deprecation = "Please use @p4runtime//proto/p4/v1:p4runtime_py_proto instead.",
-)
 
-alias(
-    name = "p4runtime_py_grpc",
-    actual = "//proto/p4/v1:p4runtime_py_grpc",
-    deprecation = "Please use @p4runtime//proto/p4/v1:p4runtime_py_grpc instead.",
-)
+
+
 
 alias(
     name = "p4info_go_proto",
-    actual = "//proto/p4/config/v1:p4info_go_proto",
-    deprecation = "Please use @p4runtime//proto/p4/config/v1:p4info_go_proto instead.",
+    actual = "//p4/config/v1:p4info_go_proto",
 )
 
 alias(
     name = "p4runtime_go_proto",
-    actual = "//proto/p4/v1:p4runtime_go_proto",
-    deprecation = "Please use @p4runtime//proto/p4/v1:p4runtime_go_proto instead.",
+    actual = "//p4/v1:p4runtime_go_proto",
 )

.bazelrc proto/.bazelrc.bazelrc renamed to proto/.bazelrc

@@ -0,0 +1 @@
+WORKSPACE.bazel

.bazelversion proto/.bazelversion.bazelversion renamed to proto/.bazelversion

@@ -4,13 +4,24 @@ load("//:p4runtime_deps.bzl", "p4runtime_deps")
 
 p4runtime_deps()
 
+# -- Load Go rules (before grpc to use our pinned version) --------------------
+
+load("@io_bazel_rules_go//go:deps.bzl", "go_rules_dependencies")
+
+go_rules_dependencies()
+
+load("@bazel_features//:deps.bzl", "bazel_features_deps")
+
+bazel_features_deps()
+
 # -- Load gRPC (before protobuf to get correct transitive dep versions) --------
 
 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,
 )
 

proto/BUILD.bazel

@@ -1,4 +1,5 @@
 load("@bazel_skylib//rules:build_test.bzl", "build_test")
+load("@io_bazel_rules_go//proto:def.bzl", "go_proto_library")
 load("@rules_proto//proto:defs.bzl", "proto_library")
 
 package(
@@ -8,13 +9,11 @@ package(
 proto_library(
     name = "p4types_proto",
     srcs = ["p4types.proto"],
-    strip_import_prefix = "/proto",
 )
 
 proto_library(
     name = "p4info_proto",
     srcs = ["p4info.proto"],
-    strip_import_prefix = "/proto",
     deps = [
         ":p4types_proto",
         "@com_google_protobuf//:any_proto",
@@ -32,12 +31,22 @@ cc_proto_library(
     deps = [":p4info_proto"],
 )
 
+go_proto_library(
+    name = "p4info_go_proto",
+    importpath = "github.com/p4lang/p4runtime/go/p4/config/v1",
+    protos = [
+        ":p4info_proto",
+        ":p4types_proto",
+    ],
+)
+
 build_test(
     name = "proto_build_test",
     targets = [
         ":p4info_proto",
         ":p4types_proto",
         ":p4types_cc_proto",
         ":p4info_cc_proto",
+        ":p4info_go_proto",
     ],
 )

proto/WORKSPACE

@@ -1,5 +1,6 @@
 load("@bazel_skylib//rules:build_test.bzl", "build_test")
 load("@com_github_grpc_grpc//bazel:cc_grpc_library.bzl", "cc_grpc_library")
+load("@io_bazel_rules_go//proto:def.bzl", "go_proto_library")
 load("@rules_proto//proto:defs.bzl", "proto_library")
 
 package(
@@ -9,16 +10,14 @@ package(
 proto_library(
     name = "p4data_proto",
     srcs = ["p4data.proto"],
-    strip_import_prefix = "/proto",
 )
 
 proto_library(
     name = "p4runtime_proto",
     srcs = ["p4runtime.proto"],
-    strip_import_prefix = "/proto",
     deps = [
         ":p4data_proto",
-        "//proto/p4/config/v1:p4info_proto",
+        "//p4/config/v1:p4info_proto",
         "@com_google_googleapis//google/rpc:status_proto",
         "@com_google_protobuf//:any_proto",
     ],
@@ -42,6 +41,19 @@ cc_grpc_library(
     deps = [":p4runtime_cc_proto"],
 )
 
+go_proto_library(
+    name = "p4runtime_go_proto",
+    importpath = "github.com/p4lang/p4runtime/go/p4/v1",
+    protos = [
+        ":p4data_proto",
+        ":p4runtime_proto",
+    ],
+    deps = [
+        "//p4/config/v1:p4info_go_proto",
+        "@com_google_googleapis//google/rpc:status_go_proto",
+    ],
+)
+
 build_test(
     name = "proto_build_test",
     targets = [
@@ -50,5 +62,6 @@ build_test(
         ":p4data_cc_proto",
         ":p4runtime_cc_proto",
         ":p4runtime_cc_grpc",
+        ":p4runtime_go_proto",
     ],
 )

WORKSPACE.bazel proto/WORKSPACE.bazelWORKSPACE.bazel renamed to proto/WORKSPACE.bazel

@@ -41,3 +41,25 @@ def p4runtime_deps():
             ],
             sha256 = "26d4021f6898e23b82ef953078389dd49ac2b5618ac564ade4ef87cced147b38",
         )
+    if not native.existing_rule("io_bazel_rules_go"):
+        http_archive(
+            name = "io_bazel_rules_go",
+            sha256 = "f4a9314518ca6acfa16cc4ab43b0b8ce1e4ea64b81c38d8a3772883f153346b8",
+            urls = [
+                "https://github.com/bazelbuild/rules_go/releases/download/v0.50.1/rules_go-v0.50.1.zip",
+            ],
+        )
+    if not native.existing_rule("rules_proto"):
+        http_archive(
+            name = "rules_proto",
+            sha256 = "6fb6767d1bef535310547e03247f7518b03487740c11b6c6adb7952033fe1295",
+            strip_prefix = "rules_proto-6.0.2",
+            url = "https://github.com/bazelbuild/rules_proto/releases/download/6.0.2/rules_proto-6.0.2.tar.gz",
+        )
+    if not native.existing_rule("bazel_features"):
+        http_archive(
+            name = "bazel_features",
+            sha256 = "0f23d75c7623d6dba1fd30513a94860447de87c8824570521fcc966eda3151c2",
+            strip_prefix = "bazel_features-1.4.1",
+            url = "https://github.com/bazel-contrib/bazel_features/releases/download/v1.4.1/bazel_features-v1.4.1.tar.gz",
+        )