diff --git a/github.com/gogo/protobuf/README.md b/github.com/gogo/protobuf/README.md index f863f21ae..cc2bb1c77 100644 --- a/github.com/gogo/protobuf/README.md +++ b/github.com/gogo/protobuf/README.md @@ -237,6 +237,8 @@ def gogo_proto_library(**kwargs): deps = kwargs.get("deps") importpath = kwargs.get("importpath") visibility = kwargs.get("visibility") + transitive = kwargs.pop("transitive", True) + verbose = kwargs.pop("verbose", 0) go_deps = kwargs.get("go_deps", []) name_pb = name + "_pb" @@ -244,7 +246,8 @@ def gogo_proto_library(**kwargs): gogo_proto_compile( name = name_pb, deps = deps, - transitive = True, + transitive = transitive, + verbose = verbose, plugin_options = get_importmappings(kwargs.pop("importmap", {})) + wkt_mappings, visibility = visibility, ) @@ -337,6 +340,8 @@ def gogo_grpc_library(**kwargs): deps = kwargs.get("deps") importpath = kwargs.get("importpath") visibility = kwargs.get("visibility") + transitive = kwargs.pop("transitive", True) + verbose = kwargs.pop("verbose", 0) go_deps = kwargs.get("go_deps", []) name_pb = name + "_pb" @@ -344,7 +349,8 @@ def gogo_grpc_library(**kwargs): gogo_grpc_compile( name = name_pb, deps = deps, - transitive = True, + transitive = transitive, + verbose = verbose, plugin_options = get_importmappings(kwargs.pop("importmap", {})) + wkt_mappings, visibility = visibility, ) @@ -606,6 +612,8 @@ def gogofast_proto_library(**kwargs): deps = kwargs.get("deps") importpath = kwargs.get("importpath") visibility = kwargs.get("visibility") + transitive = kwargs.pop("transitive", True) + verbose = kwargs.pop("verbose", 0) go_deps = kwargs.get("go_deps", []) name_pb = name + "_pb" @@ -613,7 +621,8 @@ def gogofast_proto_library(**kwargs): gogofast_proto_compile( name = name_pb, deps = deps, - transitive = True, + transitive = transitive, + verbose = verbose, plugin_options = get_importmappings(kwargs.pop("importmap", {})) + wkt_mappings, visibility = visibility, ) @@ -706,6 +715,8 @@ def gogofast_grpc_library(**kwargs): deps = kwargs.get("deps") importpath = kwargs.get("importpath") visibility = kwargs.get("visibility") + transitive = kwargs.pop("transitive", True) + verbose = kwargs.pop("verbose", 0) go_deps = kwargs.get("go_deps", []) name_pb = name + "_pb" @@ -713,7 +724,8 @@ def gogofast_grpc_library(**kwargs): gogofast_grpc_compile( name = name_pb, deps = deps, - transitive = True, + transitive = transitive, + verbose = verbose, plugin_options = get_importmappings(kwargs.pop("importmap", {})) + wkt_mappings, visibility = visibility, ) @@ -975,6 +987,8 @@ def gogofaster_proto_library(**kwargs): deps = kwargs.get("deps") importpath = kwargs.get("importpath") visibility = kwargs.get("visibility") + transitive = kwargs.pop("transitive", True) + verbose = kwargs.pop("verbose", 0) go_deps = kwargs.get("go_deps", []) name_pb = name + "_pb" @@ -982,7 +996,8 @@ def gogofaster_proto_library(**kwargs): gogofaster_proto_compile( name = name_pb, deps = deps, - transitive = True, + transitive = transitive, + verbose = verbose, plugin_options = get_importmappings(kwargs.pop("importmap", {})) + wkt_mappings, visibility = visibility, ) @@ -1075,6 +1090,8 @@ def gogofaster_grpc_library(**kwargs): deps = kwargs.get("deps") importpath = kwargs.get("importpath") visibility = kwargs.get("visibility") + transitive = kwargs.pop("transitive", True) + verbose = kwargs.pop("verbose", 0) go_deps = kwargs.get("go_deps", []) name_pb = name + "_pb" @@ -1082,7 +1099,8 @@ def gogofaster_grpc_library(**kwargs): gogofaster_grpc_compile( name = name_pb, deps = deps, - transitive = True, + transitive = transitive, + verbose = verbose, plugin_options = get_importmappings(kwargs.pop("importmap", {})) + wkt_mappings, visibility = visibility, ) diff --git a/github.com/gogo/protobuf/gogo_grpc_library.bzl b/github.com/gogo/protobuf/gogo_grpc_library.bzl index 24773d095..ac57d2416 100644 --- a/github.com/gogo/protobuf/gogo_grpc_library.bzl +++ b/github.com/gogo/protobuf/gogo_grpc_library.bzl @@ -15,6 +15,8 @@ def gogo_grpc_library(**kwargs): deps = kwargs.get("deps") importpath = kwargs.get("importpath") visibility = kwargs.get("visibility") + transitive = kwargs.pop("transitive", True) + verbose = kwargs.pop("verbose", 0) go_deps = kwargs.get("go_deps", []) name_pb = name + "_pb" @@ -22,7 +24,8 @@ def gogo_grpc_library(**kwargs): gogo_grpc_compile( name = name_pb, deps = deps, - transitive = True, + transitive = transitive, + verbose = verbose, plugin_options = get_importmappings(kwargs.pop("importmap", {})) + wkt_mappings, visibility = visibility, ) diff --git a/github.com/gogo/protobuf/gogo_proto_library.bzl b/github.com/gogo/protobuf/gogo_proto_library.bzl index 2b854739c..ffcc7f795 100644 --- a/github.com/gogo/protobuf/gogo_proto_library.bzl +++ b/github.com/gogo/protobuf/gogo_proto_library.bzl @@ -15,6 +15,8 @@ def gogo_proto_library(**kwargs): deps = kwargs.get("deps") importpath = kwargs.get("importpath") visibility = kwargs.get("visibility") + transitive = kwargs.pop("transitive", True) + verbose = kwargs.pop("verbose", 0) go_deps = kwargs.get("go_deps", []) name_pb = name + "_pb" @@ -22,7 +24,8 @@ def gogo_proto_library(**kwargs): gogo_proto_compile( name = name_pb, deps = deps, - transitive = True, + transitive = transitive, + verbose = verbose, plugin_options = get_importmappings(kwargs.pop("importmap", {})) + wkt_mappings, visibility = visibility, ) diff --git a/github.com/gogo/protobuf/gogofast_grpc_library.bzl b/github.com/gogo/protobuf/gogofast_grpc_library.bzl index 6c4b49b91..c5c6f306d 100644 --- a/github.com/gogo/protobuf/gogofast_grpc_library.bzl +++ b/github.com/gogo/protobuf/gogofast_grpc_library.bzl @@ -15,6 +15,8 @@ def gogofast_grpc_library(**kwargs): deps = kwargs.get("deps") importpath = kwargs.get("importpath") visibility = kwargs.get("visibility") + transitive = kwargs.pop("transitive", True) + verbose = kwargs.pop("verbose", 0) go_deps = kwargs.get("go_deps", []) name_pb = name + "_pb" @@ -22,7 +24,8 @@ def gogofast_grpc_library(**kwargs): gogofast_grpc_compile( name = name_pb, deps = deps, - transitive = True, + transitive = transitive, + verbose = verbose, plugin_options = get_importmappings(kwargs.pop("importmap", {})) + wkt_mappings, visibility = visibility, ) diff --git a/github.com/gogo/protobuf/gogofast_proto_library.bzl b/github.com/gogo/protobuf/gogofast_proto_library.bzl index 3ac29ad66..9ae47e992 100644 --- a/github.com/gogo/protobuf/gogofast_proto_library.bzl +++ b/github.com/gogo/protobuf/gogofast_proto_library.bzl @@ -15,6 +15,8 @@ def gogofast_proto_library(**kwargs): deps = kwargs.get("deps") importpath = kwargs.get("importpath") visibility = kwargs.get("visibility") + transitive = kwargs.pop("transitive", True) + verbose = kwargs.pop("verbose", 0) go_deps = kwargs.get("go_deps", []) name_pb = name + "_pb" @@ -22,7 +24,8 @@ def gogofast_proto_library(**kwargs): gogofast_proto_compile( name = name_pb, deps = deps, - transitive = True, + transitive = transitive, + verbose = verbose, plugin_options = get_importmappings(kwargs.pop("importmap", {})) + wkt_mappings, visibility = visibility, ) diff --git a/github.com/gogo/protobuf/gogofaster_grpc_library.bzl b/github.com/gogo/protobuf/gogofaster_grpc_library.bzl index d3145a701..78ac518d6 100644 --- a/github.com/gogo/protobuf/gogofaster_grpc_library.bzl +++ b/github.com/gogo/protobuf/gogofaster_grpc_library.bzl @@ -15,6 +15,8 @@ def gogofaster_grpc_library(**kwargs): deps = kwargs.get("deps") importpath = kwargs.get("importpath") visibility = kwargs.get("visibility") + transitive = kwargs.pop("transitive", True) + verbose = kwargs.pop("verbose", 0) go_deps = kwargs.get("go_deps", []) name_pb = name + "_pb" @@ -22,7 +24,8 @@ def gogofaster_grpc_library(**kwargs): gogofaster_grpc_compile( name = name_pb, deps = deps, - transitive = True, + transitive = transitive, + verbose = verbose, plugin_options = get_importmappings(kwargs.pop("importmap", {})) + wkt_mappings, visibility = visibility, ) diff --git a/github.com/gogo/protobuf/gogofaster_proto_library.bzl b/github.com/gogo/protobuf/gogofaster_proto_library.bzl index a244a548f..69ac82366 100644 --- a/github.com/gogo/protobuf/gogofaster_proto_library.bzl +++ b/github.com/gogo/protobuf/gogofaster_proto_library.bzl @@ -15,6 +15,8 @@ def gogofaster_proto_library(**kwargs): deps = kwargs.get("deps") importpath = kwargs.get("importpath") visibility = kwargs.get("visibility") + transitive = kwargs.pop("transitive", True) + verbose = kwargs.pop("verbose", 0) go_deps = kwargs.get("go_deps", []) name_pb = name + "_pb" @@ -22,7 +24,8 @@ def gogofaster_proto_library(**kwargs): gogofaster_proto_compile( name = name_pb, deps = deps, - transitive = True, + transitive = transitive, + verbose = verbose, plugin_options = get_importmappings(kwargs.pop("importmap", {})) + wkt_mappings, visibility = visibility, ) diff --git a/go/BUILD.bazel b/go/BUILD.bazel index 43f3cb312..3a1299f70 100644 --- a/go/BUILD.bazel +++ b/go/BUILD.bazel @@ -2,6 +2,7 @@ load("//:plugin.bzl", "proto_plugin") proto_plugin( name = "go", + options = ["paths=source_relative"], outputs = [".pb.go"], tool = "@com_github_golang_protobuf//protoc-gen-go", transitivity = { @@ -12,7 +13,7 @@ proto_plugin( proto_plugin( name = "grpc_go", - options = ["plugins=grpc"], + options = ["paths=source_relative", "plugins=grpc"], outputs = [".pb.go"], tool = "@com_github_golang_protobuf//protoc-gen-go", transitivity = { diff --git a/tools/exgen/gogo.go b/tools/exgen/gogo.go index 8b49655ff..3ecc244b8 100644 --- a/tools/exgen/gogo.go +++ b/tools/exgen/gogo.go @@ -19,6 +19,8 @@ def {{ .Rule.Name }}(**kwargs): deps = kwargs.get("deps") importpath = kwargs.get("importpath") visibility = kwargs.get("visibility") + transitive = kwargs.pop("transitive", True) + verbose = kwargs.pop("verbose", 0) go_deps = kwargs.get("go_deps", []) name_pb = name + "_pb" @@ -26,7 +28,8 @@ def {{ .Rule.Name }}(**kwargs): {{ .Rule.Base}}_{{ .Rule.Kind }}_compile( name = name_pb, deps = deps, - transitive = True, + transitive = transitive, + verbose = verbose, plugin_options = get_importmappings(kwargs.pop("importmap", {})) + wkt_mappings, visibility = visibility, ) @@ -58,6 +61,8 @@ def {{ .Rule.Name }}(**kwargs): deps = kwargs.get("deps") importpath = kwargs.get("importpath") visibility = kwargs.get("visibility") + transitive = kwargs.pop("transitive", True) + verbose = kwargs.pop("verbose", 0) go_deps = kwargs.get("go_deps", []) name_pb = name + "_pb" @@ -65,7 +70,8 @@ def {{ .Rule.Name }}(**kwargs): {{ .Rule.Base}}_{{ .Rule.Kind }}_compile( name = name_pb, deps = deps, - transitive = True, + transitive = transitive, + verbose = verbose, plugin_options = get_importmappings(kwargs.pop("importmap", {})) + wkt_mappings, visibility = visibility, )