From 0077f745249dd11abb3077a9c147fbaa02cd62ae Mon Sep 17 00:00:00 2001
From: Sergiusz Bazanski <q3k@q3k.org>
Date: Mon, 29 Oct 2018 15:34:35 +0100
Subject: [PATCH] gazelle: don't break vendored grpc
---
BUILD.bazel | 1 +
apps/bmp-streamer/pkg/bmpstreamer/BUILD.bazel | 2 +-
lib/grpchelper/BUILD.bazel | 2 +-
.../grpc-ecosystem/go-grpc-middleware/logging/BUILD.bazel | 2 +-
.../go-grpc-middleware/logging/logrus/BUILD.bazel | 2 +-
.../grpc-ecosystem/go-grpc-middleware/recovery/BUILD.bazel | 2 +-
.../grpc-ecosystem/go-grpc-middleware/tags/BUILD.bazel | 2 +-
vendor/github.com/grpc-ecosystem/go-grpc-prometheus/BUILD.bazel | 2 +-
vendor/google.golang.org/grpc/reflection/BUILD.bazel | 2 +-
9 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/BUILD.bazel b/BUILD.bazel
index e2462175..28d310ee 100644
--- a/BUILD.bazel
+++ b/BUILD.bazel
@@ -1,6 +1,7 @@
load("@bazel_gazelle//:def.bzl", "gazelle")
# gazelle:prefix github.com/bio-routing/bio-rd
+# gazelle:resolve go google.golang.org/grpc //vendor/google.golang.org/grpc:go_default_library
gazelle(
name = "gazelle",
external = "vendored",
diff --git a/apps/bmp-streamer/pkg/bmpstreamer/BUILD.bazel b/apps/bmp-streamer/pkg/bmpstreamer/BUILD.bazel
index f7de3bd9..ede8926c 100644
--- a/apps/bmp-streamer/pkg/bmpstreamer/BUILD.bazel
+++ b/apps/bmp-streamer/pkg/bmpstreamer/BUILD.bazel
@@ -20,7 +20,7 @@ go_proto_library(
deps = [
"//net/api:go_default_library",
"//route/api:go_default_library",
- "//vendor/google.golang.org/grpc:go_default_library",
+ "//vendor/google.golang.org/grpc:go_default_library", # keep
],
)
diff --git a/lib/grpchelper/BUILD.bazel b/lib/grpchelper/BUILD.bazel
index 5386f2cb..c6c5f8ca 100644
--- a/lib/grpchelper/BUILD.bazel
+++ b/lib/grpchelper/BUILD.bazel
@@ -17,8 +17,8 @@ go_library(
"//vendor/github.com/prometheus/client_golang/prometheus/promhttp:go_default_library",
"//vendor/github.com/q3k/statusz:go_default_library",
"//vendor/github.com/sirupsen/logrus:go_default_library",
+ "//vendor/google.golang.org/grpc:go_default_library",
"//vendor/google.golang.org/grpc/codes:go_default_library",
"//vendor/google.golang.org/grpc/reflection:go_default_library",
- "//vendor/google.golang.org/grpc:go_default_library",
],
)
diff --git a/vendor/github.com/grpc-ecosystem/go-grpc-middleware/logging/BUILD.bazel b/vendor/github.com/grpc-ecosystem/go-grpc-middleware/logging/BUILD.bazel
index b51b1728..c10961d6 100644
--- a/vendor/github.com/grpc-ecosystem/go-grpc-middleware/logging/BUILD.bazel
+++ b/vendor/github.com/grpc-ecosystem/go-grpc-middleware/logging/BUILD.bazel
@@ -11,7 +11,7 @@ go_library(
visibility = ["//visibility:public"],
deps = [
"//vendor/golang.org/x/net/context:go_default_library",
- "//vendor/google.golang.org/grpc/codes:go_default_library",
"//vendor/google.golang.org/grpc:go_default_library",
+ "//vendor/google.golang.org/grpc/codes:go_default_library",
],
)
diff --git a/vendor/github.com/grpc-ecosystem/go-grpc-middleware/logging/logrus/BUILD.bazel b/vendor/github.com/grpc-ecosystem/go-grpc-middleware/logging/logrus/BUILD.bazel
index 2c16467a..b30fb0b1 100644
--- a/vendor/github.com/grpc-ecosystem/go-grpc-middleware/logging/logrus/BUILD.bazel
+++ b/vendor/github.com/grpc-ecosystem/go-grpc-middleware/logging/logrus/BUILD.bazel
@@ -22,9 +22,9 @@ go_library(
"//vendor/github.com/grpc-ecosystem/go-grpc-middleware/tags/logrus:go_default_library",
"//vendor/github.com/sirupsen/logrus:go_default_library",
"//vendor/golang.org/x/net/context:go_default_library",
+ "//vendor/google.golang.org/grpc:go_default_library",
"//vendor/google.golang.org/grpc/codes:go_default_library",
"//vendor/google.golang.org/grpc/grpclog:go_default_library",
- "//vendor/google.golang.org/grpc:go_default_library",
"@com_github_golang_protobuf//jsonpb:go_default_library_gen",
],
)
diff --git a/vendor/github.com/grpc-ecosystem/go-grpc-middleware/recovery/BUILD.bazel b/vendor/github.com/grpc-ecosystem/go-grpc-middleware/recovery/BUILD.bazel
index 6534cb91..da2f7095 100644
--- a/vendor/github.com/grpc-ecosystem/go-grpc-middleware/recovery/BUILD.bazel
+++ b/vendor/github.com/grpc-ecosystem/go-grpc-middleware/recovery/BUILD.bazel
@@ -12,7 +12,7 @@ go_library(
visibility = ["//visibility:public"],
deps = [
"//vendor/golang.org/x/net/context:go_default_library",
- "//vendor/google.golang.org/grpc/codes:go_default_library",
"//vendor/google.golang.org/grpc:go_default_library",
+ "//vendor/google.golang.org/grpc/codes:go_default_library",
],
)
diff --git a/vendor/github.com/grpc-ecosystem/go-grpc-middleware/tags/BUILD.bazel b/vendor/github.com/grpc-ecosystem/go-grpc-middleware/tags/BUILD.bazel
index 14f44dd0..950cb26b 100644
--- a/vendor/github.com/grpc-ecosystem/go-grpc-middleware/tags/BUILD.bazel
+++ b/vendor/github.com/grpc-ecosystem/go-grpc-middleware/tags/BUILD.bazel
@@ -15,7 +15,7 @@ go_library(
deps = [
"//vendor/github.com/grpc-ecosystem/go-grpc-middleware:go_default_library",
"//vendor/golang.org/x/net/context:go_default_library",
- "//vendor/google.golang.org/grpc/peer:go_default_library",
"//vendor/google.golang.org/grpc:go_default_library",
+ "//vendor/google.golang.org/grpc/peer:go_default_library",
],
)
diff --git a/vendor/github.com/grpc-ecosystem/go-grpc-prometheus/BUILD.bazel b/vendor/github.com/grpc-ecosystem/go-grpc-prometheus/BUILD.bazel
index e6238d4e..228ab06b 100644
--- a/vendor/github.com/grpc-ecosystem/go-grpc-prometheus/BUILD.bazel
+++ b/vendor/github.com/grpc-ecosystem/go-grpc-prometheus/BUILD.bazel
@@ -18,8 +18,8 @@ go_library(
deps = [
"//vendor/github.com/prometheus/client_golang/prometheus:go_default_library",
"//vendor/golang.org/x/net/context:go_default_library",
+ "//vendor/google.golang.org/grpc:go_default_library",
"//vendor/google.golang.org/grpc/codes:go_default_library",
"//vendor/google.golang.org/grpc/status:go_default_library",
- "//vendor/google.golang.org/grpc:go_default_library",
],
)
diff --git a/vendor/google.golang.org/grpc/reflection/BUILD.bazel b/vendor/google.golang.org/grpc/reflection/BUILD.bazel
index 53a6b0ab..1d8595a9 100644
--- a/vendor/google.golang.org/grpc/reflection/BUILD.bazel
+++ b/vendor/google.golang.org/grpc/reflection/BUILD.bazel
@@ -8,10 +8,10 @@ go_library(
visibility = ["//visibility:public"],
deps = [
"//vendor/github.com/golang/protobuf/proto:go_default_library",
+ "//vendor/google.golang.org/grpc:go_default_library",
"//vendor/google.golang.org/grpc/codes:go_default_library",
"//vendor/google.golang.org/grpc/reflection/grpc_reflection_v1alpha:go_default_library",
"//vendor/google.golang.org/grpc/status:go_default_library",
- "//vendor/google.golang.org/grpc:go_default_library",
"@io_bazel_rules_go//proto/wkt:descriptor_go_proto",
],
)
--
GitLab