From 49e7f4b2e46606d5950816edde95010c9555e468 Mon Sep 17 00:00:00 2001 From: Moiz Haidry Date: Fri, 24 May 2019 16:04:43 -0700 Subject: [PATCH] Added more rules to resolve deps --- BUILD | 14 ++++++++++++-- WORKSPACE | 4 ++++ bazel/grpc_deps.bzl | 6 ++++++ 3 files changed, 22 insertions(+), 2 deletions(-) diff --git a/BUILD b/BUILD index 99dc61a86e9..2b3c2b1d21e 100644 --- a/BUILD +++ b/BUILD @@ -2365,15 +2365,25 @@ grpc_cc_library( ], ) +proto_library( + name = "load_report_proto", + srcs = ["@data_plane_api//envoy/api/v2/endpoint:load_report.proto"] +) + upb_proto_library( name = "upb_load_report", - deps = "@data_plane_api//envoy/api/v2/endpoint:load_report.proto" + deps = [":load_report_proto"] ) +proto_library( + name = "lrs_proto", + srcs = ["@data_plane_api//envoy/service/load_stats/v2:lrs.proto"] +) + upb_proto_library( name = "upb_lrs", - deps = "@data_plane_api//envoy/service/load_stats/v2:lrs.proto" + deps = [":lrs_proto"] ) #TODO: Get this into build.yaml once we start using it. diff --git a/WORKSPACE b/WORKSPACE index ad44ff05222..755760efefc 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -72,3 +72,7 @@ upb_deps() load("@data_plane_api//bazel:repositories.bzl", "api_dependencies") api_dependencies() + +load("@io_bazel_rules_go//go:deps.bzl", "go_rules_dependencies", "go_register_toolchains") +go_rules_dependencies() +go_register_toolchains() diff --git a/bazel/grpc_deps.bzl b/bazel/grpc_deps.bzl index 7173a98c13e..8cc2354ed78 100644 --- a/bazel/grpc_deps.bzl +++ b/bazel/grpc_deps.bzl @@ -224,6 +224,12 @@ def grpc_deps(): url = "https://github.com/envoyproxy/data-plane-api/archive/911001cdca003337bdb93fab32740cde61bafee3.tar.gz", ) + if "io_bazel_rules_go" not in native.existing_rules(): + http_archive( + name = "io_bazel_rules_go", + urls = ["https://github.com/bazelbuild/rules_go/releases/download/0.18.5/rules_go-0.18.5.tar.gz"], + sha256 = "a82a352bffae6bee4e95f68a8d80a70e87f42c4741e6a448bec11998fcc82329", + ) # TODO: move some dependencies from "grpc_deps" here? def grpc_test_only_deps(): """Internal, not intended for use by packages that are consuming grpc.