Skip to content

Commit

Permalink
Resolving merge conflicts
Browse files Browse the repository at this point in the history
Signed-off-by: Prakhar Gautam <prakhag@gmail.com>
  • Loading branch information
prakhag committed Jan 8, 2020
1 parent 486abf3 commit 6ccbabe
Show file tree
Hide file tree
Showing 183 changed files with 1,691 additions and 165 deletions.
26 changes: 25 additions & 1 deletion api/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -35,12 +35,16 @@ proto_library(
"//envoy/config/filter/fault/v2:pkg",
"//envoy/config/filter/http/adaptive_concurrency/v2alpha:pkg",
"//envoy/config/filter/http/buffer/v2:pkg",
"//envoy/config/filter/http/cors/v2:pkg",
"//envoy/config/filter/http/csrf/v2:pkg",
"//envoy/config/filter/http/dynamic_forward_proxy/v2alpha:pkg",
"//envoy/config/filter/http/dynamo/v2:pkg",
"//envoy/config/filter/http/ext_authz/v2:pkg",
"//envoy/config/filter/http/fault/v2:pkg",
"//envoy/config/filter/http/grpc_http1_bridge/v2:pkg",
"//envoy/config/filter/http/grpc_http1_reverse_bridge/v2alpha1:pkg",
"//envoy/config/filter/http/grpc_stats/v2alpha:pkg",
"//envoy/config/filter/http/grpc_web/v2:pkg",
"//envoy/config/filter/http/gzip/v2:pkg",
"//envoy/config/filter/http/header_to_metadata/v2:pkg",
"//envoy/config/filter/http/health_check/v2:pkg",
Expand All @@ -54,9 +58,14 @@ proto_library(
"//envoy/config/filter/http/squash/v2:pkg",
"//envoy/config/filter/http/tap/v2alpha:pkg",
"//envoy/config/filter/http/transcoder/v2:pkg",
"//envoy/config/filter/listener/http_inspector/v2:pkg",
"//envoy/config/filter/listener/original_dst/v2:pkg",
"//envoy/config/filter/listener/original_src/v2alpha1:pkg",
"//envoy/config/filter/listener/proxy_protocol/v2:pkg",
"//envoy/config/filter/listener/tls_inspector/v2:pkg",
"//envoy/config/filter/network/client_ssl_auth/v2:pkg",
"//envoy/config/filter/network/dubbo_proxy/v2alpha1:pkg",
"//envoy/config/filter/network/echo/v2:pkg",
"//envoy/config/filter/network/ext_authz/v2:pkg",
"//envoy/config/filter/network/http_connection_manager/v2:pkg",
"//envoy/config/filter/network/kafka_broker/v2alpha1:pkg",
Expand All @@ -67,6 +76,7 @@ proto_library(
"//envoy/config/filter/network/rate_limit/v2:pkg",
"//envoy/config/filter/network/rbac/v2:pkg",
"//envoy/config/filter/network/redis_proxy/v2:pkg",
"//envoy/config/filter/network/sni_cluster/v2:pkg",
"//envoy/config/filter/network/tcp_proxy/v2:pkg",
"//envoy/config/filter/network/thrift_proxy/v2alpha1:pkg",
"//envoy/config/filter/network/zookeeper_proxy/v1alpha1:pkg",
Expand All @@ -90,13 +100,16 @@ proto_library(
"//envoy/config/resource_monitor/fixed_heap/v2alpha:pkg",
"//envoy/config/resource_monitor/injected_resource/v2alpha:pkg",
"//envoy/config/retry/omit_host_metadata/v2:pkg",
"//envoy/config/retry/omit_canary_hosts/v2:pkg",
"//envoy/config/retry/previous_hosts/v2:pkg",
"//envoy/config/retry/previous_priorities:pkg",
"//envoy/config/route/v3alpha:pkg",
"//envoy/config/tap/v3alpha:pkg",
"//envoy/config/trace/v2:pkg",
"//envoy/config/trace/v2alpha:pkg",
"//envoy/config/trace/v3alpha:pkg",
"//envoy/config/transport_socket/alts/v2alpha:pkg",
"//envoy/config/transport_socket/raw_buffer/v2:pkg",
"//envoy/config/transport_socket/tap/v2alpha:pkg",
"//envoy/data/accesslog/v2:pkg",
"//envoy/data/accesslog/v3alpha:pkg",
Expand All @@ -114,13 +127,17 @@ proto_library(
"//envoy/extensions/filters/common/fault/v3alpha:pkg",
"//envoy/extensions/filters/http/adaptive_concurrency/v3alpha:pkg",
"//envoy/extensions/filters/http/buffer/v3alpha:pkg",
"//envoy/extensions/filters/http/cors/v3alpha:pkg",
"//envoy/extensions/filters/http/csrf/v3alpha:pkg",
"//envoy/extensions/filters/http/dynamic_forward_proxy/v3alpha:pkg",
"//envoy/extensions/filters/http/dynamo/v3alpha:pkg",
"//envoy/extensions/filters/http/ext_authz/v3alpha:pkg",
"//envoy/extensions/filters/http/fault/v3alpha:pkg",
"//envoy/extensions/filters/http/grpc_http1_bridge/v3alpha:pkg",
"//envoy/extensions/filters/http/grpc_http1_reverse_bridge/v3alpha:pkg",
"//envoy/extensions/filters/http/grpc_json_transcoder/v3alpha:pkg",
"//envoy/extensions/filters/http/grpc_stats/v3alpha:pkg",
"//envoy/extensions/filters/http/grpc_web/v3alpha:pkg",
"//envoy/extensions/filters/http/gzip/v3alpha:pkg",
"//envoy/extensions/filters/http/header_to_metadata/v3alpha:pkg",
"//envoy/extensions/filters/http/health_check/v3alpha:pkg",
Expand All @@ -133,10 +150,15 @@ proto_library(
"//envoy/extensions/filters/http/router/v3alpha:pkg",
"//envoy/extensions/filters/http/squash/v3alpha:pkg",
"//envoy/extensions/filters/http/tap/v3alpha:pkg",
"//envoy/extensions/filters/listener/http_inspector/v3alpha:pkg",
"//envoy/extensions/filters/listener/original_dst/v3alpha:pkg",
"//envoy/extensions/filters/listener/original_src/v3alpha:pkg",
"//envoy/extensions/filters/listener/proxy_protocol/v3alpha:pkg",
"//envoy/extensions/filters/listener/tls_inspector/v3alpha:pkg",
"//envoy/extensions/filters/network/client_ssl_auth/v3alpha:pkg",
"//envoy/extensions/filters/network/dubbo_proxy/router/v3alpha:pkg",
"//envoy/extensions/filters/network/dubbo_proxy/v3alpha:pkg",
"//envoy/extensions/filters/network/echo/v3alpha:pkg",
"//envoy/extensions/filters/network/ext_authz/v3alpha:pkg",
"//envoy/extensions/filters/network/http_connection_manager/v3alpha:pkg",
"//envoy/extensions/filters/network/kafka_broker/v3alpha:pkg",
Expand All @@ -145,11 +167,13 @@ proto_library(
"//envoy/extensions/filters/network/ratelimit/v3alpha:pkg",
"//envoy/extensions/filters/network/rbac/v3alpha:pkg",
"//envoy/extensions/filters/network/redis_proxy/v3alpha:pkg",
"//envoy/extensions/filters/network/sni_cluster/v3alpha:pkg",
"//envoy/extensions/filters/network/tcp_proxy/v3alpha:pkg",
"//envoy/extensions/filters/network/thrift_proxy/v3alpha:pkg",
"//envoy/extensions/filters/network/zookeeper_proxy/v3alpha:pkg",
"//envoy/extensions/retry/omit_host_metadata/v3alpha:pkg",
"//envoy/extensions/retry/host/omit_host_metadata/v3alpha:pkg",
"//envoy/extensions/transport_sockets/alts/v3alpha:pkg",
"//envoy/extensions/transport_sockets/raw_buffer/v3alpha:pkg",
"//envoy/extensions/transport_sockets/tap/v3alpha:pkg",
"//envoy/extensions/transport_sockets/tls/v3alpha:pkg",
"//envoy/service/accesslog/v2:pkg",
Expand Down
13 changes: 13 additions & 0 deletions api/docs/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -35,12 +35,16 @@ proto_library(
"//envoy/config/filter/fault/v2:pkg",
"//envoy/config/filter/http/adaptive_concurrency/v2alpha:pkg",
"//envoy/config/filter/http/buffer/v2:pkg",
"//envoy/config/filter/http/cors/v2:pkg",
"//envoy/config/filter/http/csrf/v2:pkg",
"//envoy/config/filter/http/dynamic_forward_proxy/v2alpha:pkg",
"//envoy/config/filter/http/dynamo/v2:pkg",
"//envoy/config/filter/http/ext_authz/v2:pkg",
"//envoy/config/filter/http/fault/v2:pkg",
"//envoy/config/filter/http/grpc_http1_bridge/v2:pkg",
"//envoy/config/filter/http/grpc_http1_reverse_bridge/v2alpha1:pkg",
"//envoy/config/filter/http/grpc_stats/v2alpha:pkg",
"//envoy/config/filter/http/grpc_web/v2:pkg",
"//envoy/config/filter/http/gzip/v2:pkg",
"//envoy/config/filter/http/header_to_metadata/v2:pkg",
"//envoy/config/filter/http/health_check/v2:pkg",
Expand All @@ -54,9 +58,14 @@ proto_library(
"//envoy/config/filter/http/squash/v2:pkg",
"//envoy/config/filter/http/tap/v2alpha:pkg",
"//envoy/config/filter/http/transcoder/v2:pkg",
"//envoy/config/filter/listener/http_inspector/v2:pkg",
"//envoy/config/filter/listener/original_dst/v2:pkg",
"//envoy/config/filter/listener/original_src/v2alpha1:pkg",
"//envoy/config/filter/listener/proxy_protocol/v2:pkg",
"//envoy/config/filter/listener/tls_inspector/v2:pkg",
"//envoy/config/filter/network/client_ssl_auth/v2:pkg",
"//envoy/config/filter/network/dubbo_proxy/v2alpha1:pkg",
"//envoy/config/filter/network/echo/v2:pkg",
"//envoy/config/filter/network/ext_authz/v2:pkg",
"//envoy/config/filter/network/http_connection_manager/v2:pkg",
"//envoy/config/filter/network/kafka_broker/v2alpha1:pkg",
Expand All @@ -66,6 +75,7 @@ proto_library(
"//envoy/config/filter/network/rate_limit/v2:pkg",
"//envoy/config/filter/network/rbac/v2:pkg",
"//envoy/config/filter/network/redis_proxy/v2:pkg",
"//envoy/config/filter/network/sni_cluster/v2:pkg",
"//envoy/config/filter/network/tcp_proxy/v2:pkg",
"//envoy/config/filter/network/thrift_proxy/v2alpha1:pkg",
"//envoy/config/filter/network/zookeeper_proxy/v1alpha1:pkg",
Expand All @@ -82,10 +92,13 @@ proto_library(
"//envoy/config/resource_monitor/fixed_heap/v2alpha:pkg",
"//envoy/config/resource_monitor/injected_resource/v2alpha:pkg",
"//envoy/config/retry/omit_host_metadata/v2:pkg",
"//envoy/config/retry/omit_canary_hosts/v2:pkg",
"//envoy/config/retry/previous_hosts/v2:pkg",
"//envoy/config/retry/previous_priorities:pkg",
"//envoy/config/trace/v2:pkg",
"//envoy/config/trace/v2alpha:pkg",
"//envoy/config/transport_socket/alts/v2alpha:pkg",
"//envoy/config/transport_socket/raw_buffer/v2:pkg",
"//envoy/config/transport_socket/tap/v2alpha:pkg",
"//envoy/data/accesslog/v2:pkg",
"//envoy/data/cluster/v2alpha:pkg",
Expand Down
3 changes: 3 additions & 0 deletions api/envoy/api/v2/listener/udp_listener_config.proto
Original file line number Diff line number Diff line change
Expand Up @@ -31,3 +31,6 @@ message UdpListenerConfig {
google.protobuf.Any typed_config = 3;
}
}

message ActiveRawUdpListenerConfig {
}
9 changes: 9 additions & 0 deletions api/envoy/config/filter/http/cors/v2/BUILD
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
# DO NOT EDIT. This file is generated by tools/proto_sync.py.

load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package")

licenses(["notice"]) # Apache 2

api_proto_package(
deps = ["@com_github_cncf_udpa//udpa/annotations:pkg"],
)
19 changes: 19 additions & 0 deletions api/envoy/config/filter/http/cors/v2/cors.proto
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
syntax = "proto3";

package envoy.config.filter.http.cors.v2;

import "udpa/annotations/migrate.proto";

option java_package = "io.envoyproxy.envoy.config.filter.http.cors.v2";
option java_outer_classname = "CorsProto";
option java_multiple_files = true;
option (udpa.annotations.file_migrate).move_to_package =
"envoy.extensions.filters.http.cors.v3alpha";

// [#protodoc-title: Cors]
// CORS Filter :ref:`configuration overview <config_http_filters_cors>`.
// [#extension: envoy.filters.http.cors]

// Cors filter config.
message Cors {
}
9 changes: 9 additions & 0 deletions api/envoy/config/filter/http/dynamo/v2/BUILD
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
# DO NOT EDIT. This file is generated by tools/proto_sync.py.

load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package")

licenses(["notice"]) # Apache 2

api_proto_package(
deps = ["@com_github_cncf_udpa//udpa/annotations:pkg"],
)
19 changes: 19 additions & 0 deletions api/envoy/config/filter/http/dynamo/v2/dynamo.proto
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
syntax = "proto3";

package envoy.config.filter.http.dynamo.v2;

import "udpa/annotations/migrate.proto";

option java_package = "io.envoyproxy.envoy.config.filter.http.dynamo.v2";
option java_outer_classname = "DynamoProto";
option java_multiple_files = true;
option (udpa.annotations.file_migrate).move_to_package =
"envoy.extensions.filters.http.dynamo.v3alpha";

// [#protodoc-title: Dynamo]
// Dynamo :ref:`configuration overview <config_http_filters_dynamo>`.
// [#extension: envoy.filters.http.dynamo]

// Dynamo filter config.
message Dynamo {
}
9 changes: 9 additions & 0 deletions api/envoy/config/filter/http/grpc_http1_bridge/v2/BUILD
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
# DO NOT EDIT. This file is generated by tools/proto_sync.py.

load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package")

licenses(["notice"]) # Apache 2

api_proto_package(
deps = ["@com_github_cncf_udpa//udpa/annotations:pkg"],
)
19 changes: 19 additions & 0 deletions api/envoy/config/filter/http/grpc_http1_bridge/v2/config.proto
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
syntax = "proto3";

package envoy.config.filter.http.grpc_http1_bridge.v2;

import "udpa/annotations/migrate.proto";

option java_package = "io.envoyproxy.envoy.config.filter.http.grpc_http1_bridge.v2";
option java_outer_classname = "ConfigProto";
option java_multiple_files = true;
option (udpa.annotations.file_migrate).move_to_package =
"envoy.extensions.filters.http.grpc_http1_bridge.v3alpha";

// [#protodoc-title: gRPC HTTP/1.1 Bridge]
// gRPC HTTP/1.1 Bridge Filter :ref:`configuration overview <config_http_filters_grpc_bridge>`.
// [#extension: envoy.filters.http.grpc_http1_bridge]

// gRPC HTTP/1.1 Bridge filter config.
message Config {
}
9 changes: 9 additions & 0 deletions api/envoy/config/filter/http/grpc_web/v2/BUILD
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
# DO NOT EDIT. This file is generated by tools/proto_sync.py.

load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package")

licenses(["notice"]) # Apache 2

api_proto_package(
deps = ["@com_github_cncf_udpa//udpa/annotations:pkg"],
)
19 changes: 19 additions & 0 deletions api/envoy/config/filter/http/grpc_web/v2/grpc_web.proto
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
syntax = "proto3";

package envoy.config.filter.http.grpc_web.v2;

import "udpa/annotations/migrate.proto";

option java_package = "io.envoyproxy.envoy.config.filter.http.grpc_web.v2";
option java_outer_classname = "GrpcWebProto";
option java_multiple_files = true;
option (udpa.annotations.file_migrate).move_to_package =
"envoy.extensions.filters.http.grpc_web.v3alpha";

// [#protodoc-title: gRPC Web]
// gRPC Web :ref:`configuration overview <config_http_filters_grpc_web>`.
// [#extension: envoy.filters.http.grpc_web]

// gRPC Web filter config.
message GrpcWeb {
}
9 changes: 9 additions & 0 deletions api/envoy/config/filter/listener/http_inspector/v2/BUILD
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
# DO NOT EDIT. This file is generated by tools/proto_sync.py.

load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package")

licenses(["notice"]) # Apache 2

api_proto_package(
deps = ["@com_github_cncf_udpa//udpa/annotations:pkg"],
)
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
syntax = "proto3";

package envoy.config.filter.listener.http_inspector.v2;

import "udpa/annotations/migrate.proto";

option java_package = "io.envoyproxy.envoy.config.filter.listener.http_inspector.v2";
option java_outer_classname = "HttpInspectorProto";
option java_multiple_files = true;
option (udpa.annotations.file_migrate).move_to_package =
"envoy.extensions.filters.listener.http_inspector.v3alpha";

// [#protodoc-title: HTTP Inspector Filter]
// Detect whether the application protocol is HTTP.
// [#extension: envoy.filters.listener.http_inspector]

message HttpInspector {
}
9 changes: 9 additions & 0 deletions api/envoy/config/filter/listener/original_dst/v2/BUILD
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
# DO NOT EDIT. This file is generated by tools/proto_sync.py.

load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package")

licenses(["notice"]) # Apache 2

api_proto_package(
deps = ["@com_github_cncf_udpa//udpa/annotations:pkg"],
)
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
syntax = "proto3";

package envoy.config.filter.listener.original_dst.v2;

import "udpa/annotations/migrate.proto";

option java_package = "io.envoyproxy.envoy.config.filter.listener.original_dst.v2";
option java_outer_classname = "OriginalDstProto";
option java_multiple_files = true;
option (udpa.annotations.file_migrate).move_to_package =
"envoy.extensions.filters.listener.original_dst.v3alpha";

// [#protodoc-title: Original Dst Filter]
// Use the Original destination address on downstream connections.
// [#extension: envoy.filters.listener.original_dst]

message OriginalDst {
}
9 changes: 9 additions & 0 deletions api/envoy/config/filter/listener/proxy_protocol/v2/BUILD
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
# DO NOT EDIT. This file is generated by tools/proto_sync.py.

load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package")

licenses(["notice"]) # Apache 2

api_proto_package(
deps = ["@com_github_cncf_udpa//udpa/annotations:pkg"],
)
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
syntax = "proto3";

package envoy.config.filter.listener.proxy_protocol.v2;

import "udpa/annotations/migrate.proto";

option java_package = "io.envoyproxy.envoy.config.filter.listener.proxy_protocol.v2";
option java_outer_classname = "ProxyProtocolProto";
option java_multiple_files = true;
option (udpa.annotations.file_migrate).move_to_package =
"envoy.extensions.filters.listener.proxy_protocol.v3alpha";

// [#protodoc-title: Proxy Protocol Filter]
// PROXY protocol listener filter.
// [#extension: envoy.filters.listener.proxy_protocol]

message ProxyProtocol {
}
9 changes: 9 additions & 0 deletions api/envoy/config/filter/listener/tls_inspector/v2/BUILD
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
# DO NOT EDIT. This file is generated by tools/proto_sync.py.

load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package")

licenses(["notice"]) # Apache 2

api_proto_package(
deps = ["@com_github_cncf_udpa//udpa/annotations:pkg"],
)
Loading

0 comments on commit 6ccbabe

Please sign in to comment.