Skip to content

Commit

Permalink
api: straggler v2alpha1 -> v3alpha clone. (envoyproxy#8133)
Browse files Browse the repository at this point in the history
These were missed in envoyproxy#8125.

Signed-off-by: Harvey Tuch <htuch@google.com>
  • Loading branch information
htuch authored Sep 4, 2019
1 parent d504fde commit 1b3b4ae
Show file tree
Hide file tree
Showing 32 changed files with 732 additions and 47 deletions.
34 changes: 11 additions & 23 deletions api/docs/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -11,23 +11,13 @@ package_group(
proto_library(
name = "protos",
deps = [
"//envoy/admin/v2alpha:certs",
"//envoy/admin/v2alpha:clusters",
"//envoy/admin/v2alpha:config_dump",
"//envoy/admin/v2alpha:listeners",
"//envoy/admin/v2alpha:memory",
"//envoy/admin/v2alpha:mutex_stats",
"//envoy/admin/v2alpha:server_info",
"//envoy/admin/v2alpha:tap",
"//envoy/api/v2:cds",
"//envoy/api/v2:discovery",
"//envoy/api/v2:eds",
"//envoy/api/v2:lds",
"//envoy/api/v2:rds",
"//envoy/api/v2/cluster:circuit_breaker",
"//envoy/api/v2/cluster:outlier_detection",
"//envoy/api/v2/core:protocol",
"//envoy/api/v2/listener",
"//envoy/admin/v2alpha:pkg",
"//envoy/api/v2",
"//envoy/api/v2/auth",
"//envoy/api/v2/cluster",
"//envoy/api/v2/core",
"//envoy/api/v2/endpoint",
"//envoy/api/v2/listener:pkg",
"//envoy/api/v2/ratelimit",
"//envoy/api/v2/route",
"//envoy/config/accesslog/v2:als",
Expand All @@ -39,6 +29,7 @@ proto_library(
"//envoy/config/common/tap/v2alpha:common",
"//envoy/config/filter/accesslog/v2:accesslog",
"//envoy/config/filter/dubbo/router/v2alpha1:router",
"//envoy/config/filter/fault/v2:fault",
"//envoy/config/filter/http/buffer/v2:buffer",
"//envoy/config/filter/http/csrf/v2:csrf",
"//envoy/config/filter/http/dynamic_forward_proxy/v2alpha:dynamic_forward_proxy",
Expand Down Expand Up @@ -75,6 +66,7 @@ proto_library(
"//envoy/config/health_checker/redis/v2:redis",
"//envoy/config/metrics/v2:metrics_service",
"//envoy/config/metrics/v2:stats",
"//envoy/config/overload/v2alpha:overload",
"//envoy/config/ratelimit/v2:rls",
"//envoy/config/rbac/v2:rbac",
"//envoy/config/resource_monitor/fixed_heap/v2alpha:fixed_heap",
Expand All @@ -95,11 +87,7 @@ proto_library(
"//envoy/service/discovery/v2:rtds",
"//envoy/service/ratelimit/v2:rls",
"//envoy/service/tap/v2alpha:common",
"//envoy/type:percent",
"//envoy/type:range",
"//envoy/type/matcher:metadata",
"//envoy/type/matcher:number",
"//envoy/type/matcher:regex",
"//envoy/type/matcher:string",
"//envoy/type",
"//envoy/type/matcher",
],
)
2 changes: 1 addition & 1 deletion api/envoy/api/v3alpha/cds.proto
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ service ClusterDiscoveryService {

rpc FetchClusters(DiscoveryRequest) returns (DiscoveryResponse) {
option (google.api.http) = {
post: "/v2/discovery:clusters"
post: "/v3alpha/discovery:clusters"
body: "*"
};
}
Expand Down
2 changes: 1 addition & 1 deletion api/envoy/api/v3alpha/eds.proto
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ service EndpointDiscoveryService {

rpc FetchEndpoints(DiscoveryRequest) returns (DiscoveryResponse) {
option (google.api.http) = {
post: "/v2/discovery:endpoints"
post: "/v3alpha/discovery:endpoints"
body: "*"
};
}
Expand Down
2 changes: 1 addition & 1 deletion api/envoy/api/v3alpha/lds.proto
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ service ListenerDiscoveryService {

rpc FetchListeners(DiscoveryRequest) returns (DiscoveryResponse) {
option (google.api.http) = {
post: "/v2/discovery:listeners"
post: "/v3alpha/discovery:listeners"
body: "*"
};
}
Expand Down
2 changes: 1 addition & 1 deletion api/envoy/api/v3alpha/rds.proto
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ service RouteDiscoveryService {

rpc FetchRoutes(DiscoveryRequest) returns (DiscoveryResponse) {
option (google.api.http) = {
post: "/v2/discovery:routes"
post: "/v3alpha/discovery:routes"
body: "*"
};
}
Expand Down
2 changes: 1 addition & 1 deletion api/envoy/api/v3alpha/srds.proto
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ service ScopedRoutesDiscoveryService {

rpc FetchScopedRoutes(DiscoveryRequest) returns (DiscoveryResponse) {
option (google.api.http) = {
post: "/v2/discovery:scoped-routes"
post: "/v3alpha/discovery:scoped-routes"
body: "*"
};
}
Expand Down
10 changes: 10 additions & 0 deletions api/envoy/config/filter/dubbo/router/v3alpha/BUILD
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "api_proto_package")

licenses(["notice"]) # Apache 2

api_proto_package()

api_proto_library_internal(
name = "router",
srcs = ["router.proto"],
)
13 changes: 13 additions & 0 deletions api/envoy/config/filter/dubbo/router/v3alpha/router.proto
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
syntax = "proto3";

package envoy.config.filter.dubbo.router.v3alpha;

option java_outer_classname = "RouterProto";
option java_multiple_files = true;
option java_package = "io.envoyproxy.envoy.config.filter.dubbo.router.v3alpha";

// [#protodoc-title: Router]
// Dubbo router :ref:`configuration overview <config_dubbo_filters_router>`.

message Router {
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library", "api_proto_package")

licenses(["notice"]) # Apache 2

api_proto_package()

api_proto_library(
name = "config",
srcs = ["config.proto"],
)
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
syntax = "proto3";

package envoy.config.filter.http.grpc_http1_reverse_bridge.v3alpha;

option java_outer_classname = "ConfigProto";
option java_multiple_files = true;
option java_package = "io.envoyproxy.envoy.config.filter.http.grpc_http1_reverse_bridge.v3alpha";

import "validate/validate.proto";

// [#protodoc-title: gRPC HTTP/1.1 Reverse Bridge]
// gRPC HTTP/1.1 Reverse Bridge :ref:`configuration overview
// <config_http_filters_grpc_http1_reverse_bridge>`.

// gRPC reverse bridge filter configuration
message FilterConfig {
// The content-type to pass to the upstream when the gRPC bridge filter is applied.
// The filter will also validate that the upstream responds with the same content type.
string content_type = 1 [(validate.rules).string.min_bytes = 1];

// If true, Envoy will assume that the upstream doesn't understand gRPC frames and
// strip the gRPC frame from the request, and add it back in to the response. This will
// hide the gRPC semantics from the upstream, allowing it to receive and respond with a
// simple binary encoded protobuf.
bool withhold_grpc_frames = 2;
}
10 changes: 10 additions & 0 deletions api/envoy/config/filter/http/original_src/v3alpha/BUILD
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "api_proto_package")

licenses(["notice"]) # Apache 2

api_proto_package()

api_proto_library_internal(
name = "original_src",
srcs = ["original_src.proto"],
)
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
syntax = "proto3";

package envoy.config.filter.http.original_src.v3alpha;

option java_outer_classname = "OriginalSrcProto";
option java_multiple_files = true;
option java_package = "io.envoyproxy.envoy.config.filter.http.original_src.v3alpha";

import "validate/validate.proto";

// [#protodoc-title: Original Src Filter]
// Use the Original source address on upstream connections.

// The Original Src filter binds upstream connections to the original source address determined
// for the request. This address could come from something like the Proxy Protocol filter, or it
// could come from trusted http headers.
message OriginalSrc {

// Sets the SO_MARK option on the upstream connection's socket to the provided value. Used to
// ensure that non-local addresses may be routed back through envoy when binding to the original
// source address. The option will not be applied if the mark is 0.
// [#proto-status: experimental]
uint32 mark = 1;
}
10 changes: 10 additions & 0 deletions api/envoy/config/filter/listener/original_src/v3alpha/BUILD
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "api_proto_package")

licenses(["notice"]) # Apache 2

api_proto_package()

api_proto_library_internal(
name = "original_src",
srcs = ["original_src.proto"],
)
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
syntax = "proto3";

package envoy.config.filter.listener.original_src.v3alpha;

option java_outer_classname = "OriginalSrcProto";
option java_multiple_files = true;
option java_package = "io.envoyproxy.envoy.config.filter.listener.original_src.v3alpha";

import "validate/validate.proto";

// [#protodoc-title: Original Src Filter]
// Use the Original source address on upstream connections.

// The Original Src filter binds upstream connections to the original source address determined
// for the connection. This address could come from something like the Proxy Protocol filter, or it
// could come from trusted http headers.
message OriginalSrc {

// Whether to bind the port to the one used in the original downstream connection.
// [#not-implemented-warn:]
bool bind_port = 1;

// Sets the SO_MARK option on the upstream connection's socket to the provided value. Used to
// ensure that non-local addresses may be routed back through envoy when binding to the original
// source address. The option will not be applied if the mark is 0.
// [#proto-status: experimental]
uint32 mark = 2;
}
26 changes: 26 additions & 0 deletions api/envoy/config/filter/network/dubbo_proxy/v3alpha/BUILD
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "api_proto_package")

licenses(["notice"]) # Apache 2

api_proto_package(
deps = [
"//envoy/api/v3alpha/core",
"//envoy/api/v3alpha/route:pkg",
"//envoy/type",
"//envoy/type/matcher",
],
)

api_proto_library_internal(
name = "dubbo_proxy",
srcs = [
"dubbo_proxy.proto",
"route.proto",
],
deps = [
"//envoy/api/v3alpha/core:base",
"//envoy/api/v3alpha/route",
"//envoy/type:range",
"//envoy/type/matcher:string",
],
)
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Protocol buffer definitions for the Dubbo proxy.
Original file line number Diff line number Diff line change
@@ -0,0 +1,60 @@
syntax = "proto3";

package envoy.config.filter.network.dubbo_proxy.v3alpha;

option java_outer_classname = "DubboProxyProto";
option java_multiple_files = true;
option java_package = "io.envoyproxy.envoy.config.filter.network.dubbo_proxy.v3alpha";

import "envoy/config/filter/network/dubbo_proxy/v3alpha/route.proto";

import "google/protobuf/any.proto";

import "validate/validate.proto";
import "gogoproto/gogo.proto";

// [#protodoc-title: Dubbo Proxy]
// Dubbo Proxy :ref:`configuration overview <config_network_filters_dubbo_proxy>`.

// [#comment:next free field: 6]
message DubboProxy {
// The human readable prefix to use when emitting statistics.
string stat_prefix = 1 [(validate.rules).string.min_bytes = 1];

// Configure the protocol used.
ProtocolType protocol_type = 2 [(validate.rules).enum.defined_only = true];

// Configure the serialization protocol used.
SerializationType serialization_type = 3 [(validate.rules).enum.defined_only = true];

// The route table for the connection manager is static and is specified in this property.
repeated RouteConfiguration route_config = 4;

// A list of individual Dubbo filters that make up the filter chain for requests made to the
// Dubbo proxy. Order matters as the filters are processed sequentially. For backwards
// compatibility, if no dubbo_filters are specified, a default Dubbo router filter
// (`envoy.filters.dubbo.router`) is used.
repeated DubboFilter dubbo_filters = 5;
}

// Dubbo Protocol types supported by Envoy.
enum ProtocolType {
Dubbo = 0; // the default protocol.
}

// Dubbo Serialization types supported by Envoy.
enum SerializationType {
Hessian2 = 0; // the default serialization protocol.
}

// DubboFilter configures a Dubbo filter.
// [#comment:next free field: 3]
message DubboFilter {
// The name of the filter to instantiate. The name must match a supported
// filter.
string name = 1 [(validate.rules).string.min_bytes = 1];

// Filter specific configuration which depends on the filter being
// instantiated. See the supported filters for further documentation.
google.protobuf.Any config = 2;
}
Loading

0 comments on commit 1b3b4ae

Please sign in to comment.