From b27f88a9a27494a1e38b4e11cb50eedbc05e3814 Mon Sep 17 00:00:00 2001 From: Teju Nareddy Date: Wed, 10 Jul 2019 14:06:42 -0700 Subject: [PATCH 1/2] api filter http: add build rules for go protobufs All http filters have build rules to generate cc protobufs, but not go protobufs. Added build rules to generate go protobuf files. Emulates the rules in the `health_check` http filter. Signed-off-by: Teju Nareddy --- api/envoy/config/filter/http/jwt_authn/v2alpha/BUILD | 12 +++++++++++- api/envoy/config/filter/http/router/v2/BUILD | 8 +++++++- api/envoy/config/filter/http/transcoder/v2/BUILD | 7 ++++++- 3 files changed, 24 insertions(+), 3 deletions(-) diff --git a/api/envoy/config/filter/http/jwt_authn/v2alpha/BUILD b/api/envoy/config/filter/http/jwt_authn/v2alpha/BUILD index d637732d32cb8..40e02e90af6c5 100644 --- a/api/envoy/config/filter/http/jwt_authn/v2alpha/BUILD +++ b/api/envoy/config/filter/http/jwt_authn/v2alpha/BUILD @@ -1,6 +1,6 @@ licenses(["notice"]) # Apache 2 -load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal") +load("@envoy_api//bazel:api_build_system.bzl", "api_go_proto_library", "api_proto_library_internal") api_proto_library_internal( name = "jwt_authn", @@ -11,3 +11,13 @@ api_proto_library_internal( "//envoy/api/v2/route", ], ) + +api_go_proto_library( + name = "jwt_authn", + proto = ":jwt_authn", + deps = [ + "//envoy/api/v2/core:base_go_proto", + "//envoy/api/v2/core:http_uri_go_proto", + "//envoy/api/v2/route_go_proto", + ], +) diff --git a/api/envoy/config/filter/http/router/v2/BUILD b/api/envoy/config/filter/http/router/v2/BUILD index 990d8154afada..7a80299a2cf7a 100644 --- a/api/envoy/config/filter/http/router/v2/BUILD +++ b/api/envoy/config/filter/http/router/v2/BUILD @@ -1,4 +1,4 @@ -load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal") +load("@envoy_api//bazel:api_build_system.bzl", "api_go_proto_library", "api_proto_library_internal") licenses(["notice"]) # Apache 2 @@ -7,3 +7,9 @@ api_proto_library_internal( srcs = ["router.proto"], deps = ["//envoy/config/filter/accesslog/v2:accesslog"], ) + +api_go_proto_library( + name = "router", + proto = ":router", + deps = ["//envoy/config/filter/accesslog/v2:accesslog_go_proto"], +) diff --git a/api/envoy/config/filter/http/transcoder/v2/BUILD b/api/envoy/config/filter/http/transcoder/v2/BUILD index 8ecd7759a5ca6..c1a845bcd96e1 100644 --- a/api/envoy/config/filter/http/transcoder/v2/BUILD +++ b/api/envoy/config/filter/http/transcoder/v2/BUILD @@ -1,4 +1,4 @@ -load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal") +load("@envoy_api//bazel:api_build_system.bzl", "api_go_proto_library", "api_proto_library_internal") licenses(["notice"]) # Apache 2 @@ -6,3 +6,8 @@ api_proto_library_internal( name = "transcoder", srcs = ["transcoder.proto"], ) + +api_go_proto_library( + name = "transcoder", + proto = ":transcoder", +) From e71f3656d10b1f22bdb6a516e26fd772e4ce119d Mon Sep 17 00:00:00 2001 From: Teju Nareddy Date: Thu, 11 Jul 2019 11:56:13 -0700 Subject: [PATCH 2/2] Fix invalid dependency target Signed-off-by: Teju Nareddy --- api/envoy/config/filter/http/jwt_authn/v2alpha/BUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/api/envoy/config/filter/http/jwt_authn/v2alpha/BUILD b/api/envoy/config/filter/http/jwt_authn/v2alpha/BUILD index 40e02e90af6c5..e48aa582676c5 100644 --- a/api/envoy/config/filter/http/jwt_authn/v2alpha/BUILD +++ b/api/envoy/config/filter/http/jwt_authn/v2alpha/BUILD @@ -18,6 +18,6 @@ api_go_proto_library( deps = [ "//envoy/api/v2/core:base_go_proto", "//envoy/api/v2/core:http_uri_go_proto", - "//envoy/api/v2/route_go_proto", + "//envoy/api/v2/route:route_go_proto", ], )