Skip to content

Split base API package into sub-packages #421

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mattklein123 merged 55 commits into from
Jan 25, 2018
Merged

Split base API package into sub-packages #421

Show file tree
Hide file tree
Changes from 9 commits
Commits
Show all changes
55 commits
Select commit Hold shift + click to select a range
2c4ba98
shuffle files and create discovery/cluster packages
kyessenov Jan 17, 2018
5f7b322
shuffle files and create discovery/cluster packages
kyessenov Jan 17, 2018
7861bba
split cluster.proto
kyessenov Jan 17, 2018
f4a9e8d
listener and route
kyessenov Jan 17, 2018
75703d1
move bootstrap
kyessenov Jan 17, 2018
0e9e75a
split ads
kyessenov Jan 17, 2018
51892ee
proto packages
kyessenov Jan 17, 2018
a1b9ea9
format
kyessenov Jan 17, 2018
6026989
add go_package annotations
kyessenov Jan 17, 2018
7ab2a90
move package to envoy/api/v2
kyessenov Jan 17, 2018
8dcf677
fix ci
kyessenov Jan 17, 2018
a83ba75
move hds.proto to discovery
kyessenov Jan 17, 2018
958c99f
fix docs
kyessenov Jan 17, 2018
8981995
fix format
kyessenov Jan 17, 2018
ee86b83
package monitoring
kyessenov Jan 18, 2018
cce8c8d
merge conflict
kyessenov Jan 18, 2018
587b89a
fix checks
kyessenov Jan 18, 2018
2d1555f
package ratelimit
kyessenov Jan 18, 2018
bb131ea
package load_stats
kyessenov Jan 18, 2018
88433d8
move discovery and load_stats
kyessenov Jan 19, 2018
dff8d27
move external_auth
kyessenov Jan 19, 2018
16c9cc5
add accesslog service
kyessenov Jan 19, 2018
5a8b24e
add ratelimit
kyessenov Jan 19, 2018
efbe8e1
format
kyessenov Jan 19, 2018
f0fe938
fix go_package
kyessenov Jan 19, 2018
09b9715
fix tests
kyessenov Jan 19, 2018
a48a782
move bootstrap out of core
kyessenov Jan 19, 2018
970da79
fix docs
kyessenov Jan 19, 2018
523b1ae
merge conflict
kyessenov Jan 19, 2018
b2b7e8f
add trace and metrics services
kyessenov Jan 20, 2018
2ffa221
fix docs
kyessenov Jan 20, 2018
334a0b9
Merge remote-tracking branch 'upstream/master' into packages
kyessenov Jan 22, 2018
9d2823c
make docs better
kyessenov Jan 22, 2018
8beb485
merge conflict
kyessenov Jan 23, 2018
994235c
add dummy messages
kyessenov Jan 23, 2018
36ebf6a
fix format
kyessenov Jan 23, 2018
65e15e6
fix docs
kyessenov Jan 23, 2018
de8df65
fix format
kyessenov Jan 23, 2018
eeeb8c4
Merge remote-tracking branch 'upstream/master' into packages
kyessenov Jan 24, 2018
5e4e4f2
Merge remote-tracking branch 'upstream/master' into packages
kyessenov Jan 24, 2018
7a9d4d0
move bootstrap
kyessenov Jan 24, 2018
41d75c5
stats config
kyessenov Jan 24, 2018
b477d99
accesslog config
kyessenov Jan 24, 2018
1ee8679
add ratelimit config
kyessenov Jan 24, 2018
dc5e55f
missing files
kyessenov Jan 24, 2018
2d30be2
trace config
kyessenov Jan 24, 2018
8163206
fix imports
kyessenov Jan 24, 2018
cd734a5
fix format
kyessenov Jan 24, 2018
a1bf2ad
fix docs
kyessenov Jan 24, 2018
f0106d3
create endpoint package
kyessenov Jan 24, 2018
fff0ab5
fix format
kyessenov Jan 24, 2018
b649d10
add github bug reference
kyessenov Jan 24, 2018
43943e6
Merge remote-tracking branch 'upstream/master' into packages
kyessenov Jan 25, 2018
d826004
merge fix
kyessenov Jan 25, 2018
bd258d0
merge fix
kyessenov Jan 25, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
208 changes: 7 additions & 201 deletions api/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,38 +24,6 @@ api_go_proto_library(
deps = [":address_go_proto"],
)

api_proto_library(
name = "bootstrap",
srcs = ["bootstrap.proto"],
deps = [
":address",
":base",
":cds",
":config_source",
":grpc_service",
":lds",
":sds",
":stats",
":trace",
],
)

api_go_proto_library(
name = "bootstrap",
proto = ":bootstrap",
deps = [
":address_go_proto",
":base_go_proto",
":cds_go_grpc",
":config_source_go_proto",
":grpc_service_go_proto",
":lds_go_grpc",
":sds_go_grpc",
":stats_go_proto",
":trace_go_proto",
],
)

api_proto_library(
name = "health_check",
srcs = ["health_check.proto"],
Expand All @@ -68,35 +36,6 @@ api_go_proto_library(
deps = [":base_go_proto"],
)

api_proto_library(
name = "cds",
srcs = ["cds.proto"],
has_services = 1,
deps = [
":address",
":base",
":config_source",
":discovery",
":health_check",
":protocol",
":sds",
],
)

api_go_grpc_library(
name = "cds",
proto = ":cds",
deps = [
":address_go_proto",
":base_go_proto",
":config_source_go_proto",
":discovery_go_grpc",
":health_check_go_proto",
":protocol_go_proto",
":sds_go_grpc",
],
)

api_proto_library(
name = "config_source",
srcs = ["config_source.proto"],
Expand All @@ -115,42 +54,6 @@ api_go_proto_library(
],
)

api_proto_library(
name = "discovery",
srcs = ["discovery.proto"],
has_services = 1,
deps = [":base"],
)

api_go_grpc_library(
name = "discovery",
proto = ":discovery",
deps = [":base_go_proto"],
)

api_proto_library(
name = "eds",
srcs = ["eds.proto"],
has_services = 1,
deps = [
":address",
":base",
":discovery",
":health_check",
],
)

api_go_grpc_library(
name = "eds",
proto = ":eds",
deps = [
":address_go_proto",
":base_go_proto",
":discovery_go_grpc",
":health_check_go_proto",
],
)

api_proto_library(
name = "grpc_service",
srcs = ["grpc_service.proto"],
Expand Down Expand Up @@ -182,29 +85,6 @@ api_go_grpc_library(
],
)

api_proto_library(
name = "lds",
srcs = ["lds.proto"],
has_services = 1,
deps = [
":address",
":base",
":discovery",
":sds",
],
)

api_go_grpc_library(
name = "lds",
proto = ":lds",
deps = [
":address_go_proto",
":base_go_proto",
":discovery_go_grpc",
":sds_go_grpc",
],
)

api_proto_library(
name = "metrics",
srcs = ["metrics_service.proto"],
Expand Down Expand Up @@ -238,48 +118,6 @@ api_go_grpc_library(
proto = ":rls",
)

api_proto_library(
name = "rds",
srcs = ["rds.proto"],
has_services = 1,
deps = [
":auth",
":base",
":discovery",
],
)

api_go_grpc_library(
name = "rds",
proto = ":rds",
deps = [
":auth_go_proto",
":base_go_proto",
":discovery_go_grpc",
],
)

api_proto_library(
name = "sds",
srcs = ["sds.proto"],
has_services = 1,
deps = [
":base",
":config_source",
":discovery",
],
)

api_go_grpc_library(
name = "sds",
proto = ":sds",
deps = [
":base_go_proto",
":config_source_go_proto",
":discovery_go_grpc",
],
)

api_proto_library(
name = "stats",
srcs = ["stats.proto"],
Expand All @@ -306,53 +144,21 @@ api_go_proto_library(
proto = ":trace",
)

api_proto_library(
name = "auth",
srcs = ["auth.proto"],
deps = [
":sds",
],
)

api_go_proto_library(
name = "auth",
proto = ":auth",
deps = [
"//api:address_go_proto",
"//api:sds_go_grpc",
"@googleapis//:rpc_status_go_proto",
],
)

# TODO(htuch): Grow this to cover everything we want to generate docs for, so we can just invoke
# bazel build //api --aspects tools/protodoc/protodoc.bzl%proto_doc_aspect --output_groups=rst
proto_library(
name = "api",
deps = [
":bootstrap",
":cds",
":eds",
":lds",
":metrics",
":protocol",
":rds",
":rls",
"//api/bootstrap",
"//api/cluster",
"//api/discovery",
"//api/filter/accesslog",
"//api/filter/http:buffer",
"//api/filter/http:ext_authz",
"//api/filter/http:fault",
"//api/filter/http:health_check",
"//api/filter/http:lua",
"//api/filter/http:rate_limit",
"//api/filter/http:router",
"//api/filter/http:squash",
"//api/filter/http:transcoder",
"//api/filter/network:client_ssl_auth",
"//api/filter/network:ext_authz",
"//api/filter/network:http_connection_manager",
"//api/filter/network:mongo_proxy",
"//api/filter/network:rate_limit",
"//api/filter/network:redis_proxy",
"//api/filter/network:tcp_proxy",
"//api/filter/http",
"//api/filter/network",
"//api/listener",
"//api/route",
],
)
22 changes: 20 additions & 2 deletions api/auth/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
load("//bazel:api_build_system.bzl", "api_proto_library")
load("//bazel:api_build_system.bzl", "api_proto_library", "api_go_proto_library")

licenses(["notice"]) # Apache 2

api_proto_library(
name = "auth",
name = "external_auth",
srcs = [
"external_auth.proto",
],
Expand All @@ -12,3 +12,21 @@ api_proto_library(
"//api:address",
],
)

api_proto_library(
name = "auth",
srcs = ["auth.proto"],
deps = [
"//api/cert",
],
)

api_go_proto_library(
name = "auth",
proto = ":auth",
deps = [
"//api:address_go_proto",

@rshriram rshriram Jan 17, 2018

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why is this at top level?

@kyessenov kyessenov Jan 17, 2018

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Go rules? I don't know why we have duplicate go/grpc rules throughout, seems to be an issue with go_rules.

"//api/cert:cert_go_proto",
"@googleapis//:rpc_status_go_proto",
],
)
4 changes: 2 additions & 2 deletions api/auth.proto → api/auth/auth.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ syntax = "proto3";

package envoy.api.v2.auth;

import "api/sds.proto";
import "api/cert/cert.proto";

message AuthAction {
// Should we do white-list or black-list style access control.
Expand All @@ -31,7 +31,7 @@ message AuthAction {
// Check peer identity using X.509 certificate.
message X509Rule {
// How to validate peer certificates.
CertificateValidationContext validation_context = 3;
cert.CertificateValidationContext validation_context = 3;
}

// Element type of AndRule/OrRule, it chooses among different type of rule.
Expand Down
35 changes: 35 additions & 0 deletions api/bootstrap/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
load("//bazel:api_build_system.bzl", "api_proto_library", "api_go_proto_library")

licenses(["notice"]) # Apache 2

api_proto_library(
name = "bootstrap",
srcs = ["bootstrap.proto"],
deps = [
"//api:address",
"//api:base",
"//api:config_source",
"//api:grpc_service",
"//api:stats",
"//api:trace",
"//api/cert",
"//api/cluster:cluster_def",
"//api/listener",
],
)

api_go_proto_library(
name = "bootstrap",
proto = ":bootstrap",
deps = [
"//api:address_go_proto",
"//api:base_go_proto",
"//api:config_source_go_proto",
"//api:grpc_service_go_proto",
"//api:stats_go_proto",
"//api:trace_go_proto",
"//api/cert:cert_go_proto",
"//api/cluster:cluster_def_go_proto",
"//api/listener:listener_go_proto",
],
)
15 changes: 8 additions & 7 deletions api/bootstrap.proto → api/bootstrap/bootstrap.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,16 @@

syntax = "proto3";

package envoy.api.v2;
package envoy.api.v2.bootstrap;
option go_package = "bootstrap";

import "api/address.proto";
import "api/base.proto";
import "api/config_source.proto";
import "api/cds.proto";
import "api/cluster/cluster.proto";
import "api/grpc_service.proto";
import "api/lds.proto";
import "api/sds.proto";
import "api/listener/listener.proto";
import "api/cert/cert.proto";
import "api/stats.proto";
import "api/trace.proto";

Expand All @@ -31,18 +32,18 @@ message Bootstrap {
message StaticResources {
// Static :ref:`Listeners <envoy_api_msg_Listener>`. These listeners are
// available regardless of LDS configuration.
repeated Listener listeners = 1;
repeated listener.Listener listeners = 1;

// If a network based configuration source is specified for :ref:`cds_config
// <envoy_api_field_Bootstrap.DynamicResources.cds_config>`, it's necessary
// to have some initial cluster definitions available to allow Envoy to know
// how to speak to the management server. These cluster definitions may not
// use :ref:`EDS <arch_overview_dynamic_config_sds>` (i.e. they should be static
// IP or DNS-based).
repeated Cluster clusters = 2;
repeated cluster.Cluster clusters = 2;

// [#not-implemented-hide:]
repeated Secret secrets = 3;
repeated cert.Secret secrets = 3;
}
// Statically specified resources.
StaticResources static_resources = 2;
Expand Down
Loading