Skip to content

Commit

Permalink
api: add proto options for java (#5369)
Browse files Browse the repository at this point in the history
* api: add proto options for java
* add ci for checking proto options

Signed-off-by: Penn (Dapeng) Zhang <zdapeng@google.com>
  • Loading branch information
dapengzhang0 authored and ggreenway committed Jan 2, 2019
1 parent b2060c5 commit 02659d4
Show file tree
Hide file tree
Showing 93 changed files with 207 additions and 0 deletions.
2 changes: 2 additions & 0 deletions api/envoy/admin/v2alpha/certs.proto
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
syntax = "proto3";

package envoy.admin.v2alpha;
option java_package = "io.envoyproxy.envoy.admin.v2alpha";
option java_multiple_files = true;

import "google/protobuf/timestamp.proto";

Expand Down
2 changes: 2 additions & 0 deletions api/envoy/admin/v2alpha/clusters.proto
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
syntax = "proto3";

package envoy.admin.v2alpha;
option java_package = "io.envoyproxy.envoy.admin.v2alpha";
option java_multiple_files = true;

import "envoy/admin/v2alpha/metrics.proto";
import "envoy/api/v2/core/address.proto";
Expand Down
2 changes: 2 additions & 0 deletions api/envoy/admin/v2alpha/config_dump.proto
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
syntax = "proto3";

package envoy.admin.v2alpha;
option java_package = "io.envoyproxy.envoy.admin.v2alpha";
option java_multiple_files = true;

import "envoy/api/v2/cds.proto";
import "envoy/api/v2/lds.proto";
Expand Down
2 changes: 2 additions & 0 deletions api/envoy/admin/v2alpha/memory.proto
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
syntax = "proto3";

package envoy.admin.v2alpha;
option java_package = "io.envoyproxy.envoy.admin.v2alpha";
option java_multiple_files = true;

// [#protodoc-title: Memory]

Expand Down
2 changes: 2 additions & 0 deletions api/envoy/admin/v2alpha/metrics.proto
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
syntax = "proto3";

package envoy.admin.v2alpha;
option java_package = "io.envoyproxy.envoy.admin.v2alpha";
option java_multiple_files = true;

// [#protodoc-title: Metrics]

Expand Down
2 changes: 2 additions & 0 deletions api/envoy/admin/v2alpha/mutex_stats.proto
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
syntax = "proto3";

package envoy.admin.v2alpha;
option java_package = "io.envoyproxy.envoy.admin.v2alpha";
option java_multiple_files = true;

// [#protodoc-title: MutexStats]

Expand Down
2 changes: 2 additions & 0 deletions api/envoy/admin/v2alpha/server_info.proto
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
syntax = "proto3";

package envoy.admin.v2alpha;
option java_package = "io.envoyproxy.envoy.admin.v2alpha";
option java_multiple_files = true;

import "google/protobuf/duration.proto";

Expand Down
2 changes: 2 additions & 0 deletions api/envoy/api/v2/auth/cert.proto
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
syntax = "proto3";

package envoy.api.v2.auth;
option java_package = "io.envoyproxy.envoy.api.v2.auth";
option java_multiple_files = true;
option go_package = "auth";

import "envoy/api/v2/core/base.proto";
Expand Down
2 changes: 2 additions & 0 deletions api/envoy/api/v2/cds.proto
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
syntax = "proto3";

package envoy.api.v2;
option java_package = "io.envoyproxy.envoy.api.v2";
option java_multiple_files = true;

option java_generic_services = true;

Expand Down
2 changes: 2 additions & 0 deletions api/envoy/api/v2/cluster/circuit_breaker.proto
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
syntax = "proto3";

package envoy.api.v2.cluster;
option java_package = "io.envoyproxy.envoy.api.v2.cluster";
option java_multiple_files = true;
option go_package = "cluster";
option csharp_namespace = "Envoy.Api.V2.ClusterNS";

Expand Down
2 changes: 2 additions & 0 deletions api/envoy/api/v2/cluster/outlier_detection.proto
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
syntax = "proto3";

package envoy.api.v2.cluster;
option java_package = "io.envoyproxy.envoy.api.v2.cluster";
option java_multiple_files = true;
option csharp_namespace = "Envoy.Api.V2.ClusterNS";

import "google/protobuf/duration.proto";
Expand Down
2 changes: 2 additions & 0 deletions api/envoy/api/v2/core/address.proto
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
syntax = "proto3";

package envoy.api.v2.core;
option java_package = "io.envoyproxy.envoy.api.v2.core";
option java_multiple_files = true;

import "envoy/api/v2/core/base.proto";

Expand Down
2 changes: 2 additions & 0 deletions api/envoy/api/v2/core/base.proto
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
syntax = "proto3";

package envoy.api.v2.core;
option java_package = "io.envoyproxy.envoy.api.v2.core";
option java_multiple_files = true;
option go_package = "core";

import "google/protobuf/any.proto";
Expand Down
2 changes: 2 additions & 0 deletions api/envoy/api/v2/core/config_source.proto
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
syntax = "proto3";

package envoy.api.v2.core;
option java_package = "io.envoyproxy.envoy.api.v2.core";
option java_multiple_files = true;

import "envoy/api/v2/core/grpc_service.proto";

Expand Down
2 changes: 2 additions & 0 deletions api/envoy/api/v2/core/grpc_service.proto
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
syntax = "proto3";

package envoy.api.v2.core;
option java_package = "io.envoyproxy.envoy.api.v2.core";
option java_multiple_files = true;

import "envoy/api/v2/core/base.proto";

Expand Down
2 changes: 2 additions & 0 deletions api/envoy/api/v2/core/health_check.proto
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
syntax = "proto3";

package envoy.api.v2.core;
option java_package = "io.envoyproxy.envoy.api.v2.core";
option java_multiple_files = true;

import "envoy/api/v2/core/base.proto";

Expand Down
2 changes: 2 additions & 0 deletions api/envoy/api/v2/core/http_uri.proto
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
syntax = "proto3";

package envoy.api.v2.core;
option java_package = "io.envoyproxy.envoy.api.v2.core";
option java_multiple_files = true;

import "google/protobuf/duration.proto";
import "gogoproto/gogo.proto";
Expand Down
2 changes: 2 additions & 0 deletions api/envoy/api/v2/core/protocol.proto
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@
syntax = "proto3";

package envoy.api.v2.core;
option java_package = "io.envoyproxy.envoy.api.v2.core";
option java_multiple_files = true;

import "google/protobuf/duration.proto";
import "google/protobuf/wrappers.proto";
Expand Down
2 changes: 2 additions & 0 deletions api/envoy/api/v2/discovery.proto
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
syntax = "proto3";

package envoy.api.v2;
option java_package = "io.envoyproxy.envoy.api.v2";
option java_multiple_files = true;
option go_package = "v2";

import "envoy/api/v2/core/base.proto";
Expand Down
2 changes: 2 additions & 0 deletions api/envoy/api/v2/eds.proto
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
syntax = "proto3";

package envoy.api.v2;
option java_package = "io.envoyproxy.envoy.api.v2";
option java_multiple_files = true;

option java_generic_services = true;

Expand Down
2 changes: 2 additions & 0 deletions api/envoy/api/v2/endpoint/endpoint.proto
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
syntax = "proto3";

package envoy.api.v2.endpoint;
option java_package = "io.envoyproxy.envoy.api.v2.endpoint";
option java_multiple_files = true;
option go_package = "endpoint";

import "envoy/api/v2/core/address.proto";
Expand Down
2 changes: 2 additions & 0 deletions api/envoy/api/v2/endpoint/load_report.proto
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
syntax = "proto3";

package envoy.api.v2.endpoint;
option java_package = "io.envoyproxy.envoy.api.v2.endpoint";
option java_multiple_files = true;

import "envoy/api/v2/core/address.proto";
import "envoy/api/v2/core/base.proto";
Expand Down
2 changes: 2 additions & 0 deletions api/envoy/api/v2/lds.proto
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
syntax = "proto3";

package envoy.api.v2;
option java_package = "io.envoyproxy.envoy.api.v2";
option java_multiple_files = true;

option java_generic_services = true;

Expand Down
2 changes: 2 additions & 0 deletions api/envoy/api/v2/listener/listener.proto
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
syntax = "proto3";

package envoy.api.v2.listener;
option java_package = "io.envoyproxy.envoy.api.v2.listener";
option java_multiple_files = true;
option go_package = "listener";
option csharp_namespace = "Envoy.Api.V2.ListenerNS";

Expand Down
2 changes: 2 additions & 0 deletions api/envoy/api/v2/ratelimit/ratelimit.proto
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
syntax = "proto3";

package envoy.api.v2.ratelimit;
option java_package = "io.envoyproxy.envoy.api.v2.ratelimit";
option java_multiple_files = true;
option go_package = "ratelimit";

import "validate/validate.proto";
Expand Down
2 changes: 2 additions & 0 deletions api/envoy/api/v2/rds.proto
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
syntax = "proto3";

package envoy.api.v2;
option java_package = "io.envoyproxy.envoy.api.v2";
option java_multiple_files = true;

option java_generic_services = true;

Expand Down
2 changes: 2 additions & 0 deletions api/envoy/api/v2/route/route.proto
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
syntax = "proto3";

package envoy.api.v2.route;
option java_package = "io.envoyproxy.envoy.api.v2.route";
option java_multiple_files = true;
option go_package = "route";
option java_generic_services = true;

Expand Down
2 changes: 2 additions & 0 deletions api/envoy/config/accesslog/v2/als.proto
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
syntax = "proto3";

package envoy.config.accesslog.v2;
option java_package = "io.envoyproxy.envoy.config.accesslog.v2";
option java_multiple_files = true;
option go_package = "v2";

import "envoy/api/v2/core/grpc_service.proto";
Expand Down
2 changes: 2 additions & 0 deletions api/envoy/config/accesslog/v2/file.proto
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
syntax = "proto3";

package envoy.config.accesslog.v2;
option java_package = "io.envoyproxy.envoy.config.accesslog.v2";
option java_multiple_files = true;
option go_package = "v2";

import "validate/validate.proto";
Expand Down
2 changes: 2 additions & 0 deletions api/envoy/config/bootstrap/v2/bootstrap.proto
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@
syntax = "proto3";

package envoy.config.bootstrap.v2;
option java_package = "io.envoyproxy.envoy.config.bootstrap.v2";
option java_multiple_files = true;
option go_package = "v2";

import "envoy/api/v2/core/address.proto";
Expand Down
2 changes: 2 additions & 0 deletions api/envoy/config/filter/accesslog/v2/accesslog.proto
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
syntax = "proto3";

package envoy.config.filter.accesslog.v2;
option java_package = "io.envoyproxy.envoy.config.filter.accesslog.v2";
option java_multiple_files = true;
option go_package = "v2";

import "envoy/api/v2/core/base.proto";
Expand Down
2 changes: 2 additions & 0 deletions api/envoy/config/filter/fault/v2/fault.proto
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
syntax = "proto3";

package envoy.config.filter.fault.v2;
option java_package = "io.envoyproxy.envoy.config.filter.fault.v2";
option java_multiple_files = true;
option go_package = "v2";

import "envoy/type/percent.proto";
Expand Down
2 changes: 2 additions & 0 deletions api/envoy/config/filter/http/buffer/v2/buffer.proto
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
syntax = "proto3";

package envoy.config.filter.http.buffer.v2;
option java_package = "io.envoyproxy.envoy.config.filter.http.buffer.v2";
option java_multiple_files = true;
option go_package = "v2";

import "google/protobuf/duration.proto";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
syntax = "proto3";

package envoy.config.filter.http.ext_authz.v2alpha;
option java_package = "io.envoyproxy.envoy.config.filter.http.ext_authz.v2alpha";
option java_multiple_files = true;
option go_package = "v2alpha";

import "envoy/api/v2/core/base.proto";
Expand Down
2 changes: 2 additions & 0 deletions api/envoy/config/filter/http/fault/v2/fault.proto
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
syntax = "proto3";

package envoy.config.filter.http.fault.v2;
option java_package = "io.envoyproxy.envoy.config.filter.http.fault.v2";
option java_multiple_files = true;
option go_package = "v2";

import "envoy/api/v2/route/route.proto";
Expand Down
2 changes: 2 additions & 0 deletions api/envoy/config/filter/http/gzip/v2/gzip.proto
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
syntax = "proto3";

package envoy.config.filter.http.gzip.v2;
option java_package = "io.envoyproxy.envoy.config.filter.http.gzip.v2";
option java_multiple_files = true;
option go_package = "v2";

import "google/protobuf/wrappers.proto";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
syntax = "proto3";

package envoy.config.filter.http.header_to_metadata.v2;
option java_package = "io.envoyproxy.envoy.config.filter.http.header_to_metadata.v2";
option java_multiple_files = true;
option go_package = "v2";

import "validate/validate.proto";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
syntax = "proto3";

package envoy.config.filter.http.health_check.v2;
option java_package = "io.envoyproxy.envoy.config.filter.http.health_check.v2";
option java_multiple_files = true;
option go_package = "v2";

import "google/protobuf/duration.proto";
Expand Down
2 changes: 2 additions & 0 deletions api/envoy/config/filter/http/ip_tagging/v2/ip_tagging.proto
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
syntax = "proto3";

package envoy.config.filter.http.ip_tagging.v2;
option java_package = "io.envoyproxy.envoy.config.filter.http.ip_tagging.v2";
option java_multiple_files = true;
option go_package = "v2";

import "envoy/api/v2/core/address.proto";
Expand Down
2 changes: 2 additions & 0 deletions api/envoy/config/filter/http/jwt_authn/v2alpha/config.proto
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@
syntax = "proto3";

package envoy.config.filter.http.jwt_authn.v2alpha;
option java_package = "io.envoyproxy.envoy.config.filter.http.jwt_authn.v2alpha";
option java_multiple_files = true;

import "envoy/api/v2/core/base.proto";
import "envoy/api/v2/core/http_uri.proto";
Expand Down
2 changes: 2 additions & 0 deletions api/envoy/config/filter/http/lua/v2/lua.proto
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
syntax = "proto3";

package envoy.config.filter.http.lua.v2;
option java_package = "io.envoyproxy.envoy.config.filter.http.lua.v2";
option java_multiple_files = true;
option go_package = "v2";

import "validate/validate.proto";
Expand Down
2 changes: 2 additions & 0 deletions api/envoy/config/filter/http/rate_limit/v2/rate_limit.proto
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
syntax = "proto3";

package envoy.config.filter.http.rate_limit.v2;
option java_package = "io.envoyproxy.envoy.config.filter.http.rate_limit.v2";
option java_multiple_files = true;
option go_package = "v2";

import "envoy/config/ratelimit/v2/rls.proto";
Expand Down
2 changes: 2 additions & 0 deletions api/envoy/config/filter/http/rbac/v2/rbac.proto
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
syntax = "proto3";

package envoy.config.filter.http.rbac.v2;
option java_package = "io.envoyproxy.envoy.config.filter.http.rbac.v2";
option java_multiple_files = true;
option go_package = "v2";

import "envoy/config/rbac/v2alpha/rbac.proto";
Expand Down
2 changes: 2 additions & 0 deletions api/envoy/config/filter/http/router/v2/router.proto
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
syntax = "proto3";

package envoy.config.filter.http.router.v2;
option java_package = "io.envoyproxy.envoy.config.filter.http.router.v2";
option java_multiple_files = true;
option go_package = "v2";

import "envoy/config/filter/accesslog/v2/accesslog.proto";
Expand Down
Loading

0 comments on commit 02659d4

Please sign in to comment.