From bd4585a42844c4206b90be25c502dda9c9535846 Mon Sep 17 00:00:00 2001 From: "data-plane-api(CircleCI)" Date: Fri, 27 Jul 2018 01:50:31 +0000 Subject: [PATCH] thrift_proxy: move protobuf to api/config hierarchy (#3963) As discussed in Slack, these should have been under api/config/filter/network to begin with. Added a note to the style doc to make this clear in the future. *Risk level*: low (rename only) *Testing*: existing tests suffice *Doc Changes*: n/a *Release Notes*: updated Signed-off-by: Stephan Zuercher Mirrored from https://github.com/envoyproxy/envoy @ 1dfde38343e7dfafe2c9f211229109bb22491257 --- STYLE.md | 3 +++ .../filter}/network/thrift_proxy/v2alpha1/BUILD | 0 .../filter}/network/thrift_proxy/v2alpha1/README.md | 0 .../filter}/network/thrift_proxy/v2alpha1/route.proto | 2 +- .../filter}/network/thrift_proxy/v2alpha1/router/BUILD | 0 .../filter}/network/thrift_proxy/v2alpha1/router/router.proto | 2 +- .../filter}/network/thrift_proxy/v2alpha1/thrift_proxy.proto | 4 ++-- 7 files changed, 7 insertions(+), 4 deletions(-) rename envoy/{extensions/filters => config/filter}/network/thrift_proxy/v2alpha1/BUILD (100%) rename envoy/{extensions/filters => config/filter}/network/thrift_proxy/v2alpha1/README.md (100%) rename envoy/{extensions/filters => config/filter}/network/thrift_proxy/v2alpha1/route.proto (95%) rename envoy/{extensions/filters => config/filter}/network/thrift_proxy/v2alpha1/router/BUILD (100%) rename envoy/{extensions/filters => config/filter}/network/thrift_proxy/v2alpha1/router/router.proto (66%) rename envoy/{extensions/filters => config/filter}/network/thrift_proxy/v2alpha1/thrift_proxy.proto (93%) diff --git a/STYLE.md b/STYLE.md index d932c3a3..92592d4a 100644 --- a/STYLE.md +++ b/STYLE.md @@ -131,3 +131,6 @@ the build system to prevent circular dependency formation. Package group `//envoy/api/v2:friends` selects consumers of the core API package (services and configs) and is the default visibility for the core API packages. The default visibility for services and configs should be `//docs` (proto documentation tool). + +Extensions should use the regular hierarchy. For example, configuration for network filters belongs +in a package under `envoy.config.filter.network`. diff --git a/envoy/extensions/filters/network/thrift_proxy/v2alpha1/BUILD b/envoy/config/filter/network/thrift_proxy/v2alpha1/BUILD similarity index 100% rename from envoy/extensions/filters/network/thrift_proxy/v2alpha1/BUILD rename to envoy/config/filter/network/thrift_proxy/v2alpha1/BUILD diff --git a/envoy/extensions/filters/network/thrift_proxy/v2alpha1/README.md b/envoy/config/filter/network/thrift_proxy/v2alpha1/README.md similarity index 100% rename from envoy/extensions/filters/network/thrift_proxy/v2alpha1/README.md rename to envoy/config/filter/network/thrift_proxy/v2alpha1/README.md diff --git a/envoy/extensions/filters/network/thrift_proxy/v2alpha1/route.proto b/envoy/config/filter/network/thrift_proxy/v2alpha1/route.proto similarity index 95% rename from envoy/extensions/filters/network/thrift_proxy/v2alpha1/route.proto rename to envoy/config/filter/network/thrift_proxy/v2alpha1/route.proto index 5c9af1c4..f70523e5 100644 --- a/envoy/extensions/filters/network/thrift_proxy/v2alpha1/route.proto +++ b/envoy/config/filter/network/thrift_proxy/v2alpha1/route.proto @@ -1,6 +1,6 @@ syntax = "proto3"; -package envoy.extensions.filters.network.thrift_proxy.v2alpha1; +package envoy.config.filter.network.thrift_proxy.v2alpha1; option go_package = "v2"; import "validate/validate.proto"; diff --git a/envoy/extensions/filters/network/thrift_proxy/v2alpha1/router/BUILD b/envoy/config/filter/network/thrift_proxy/v2alpha1/router/BUILD similarity index 100% rename from envoy/extensions/filters/network/thrift_proxy/v2alpha1/router/BUILD rename to envoy/config/filter/network/thrift_proxy/v2alpha1/router/BUILD diff --git a/envoy/extensions/filters/network/thrift_proxy/v2alpha1/router/router.proto b/envoy/config/filter/network/thrift_proxy/v2alpha1/router/router.proto similarity index 66% rename from envoy/extensions/filters/network/thrift_proxy/v2alpha1/router/router.proto rename to envoy/config/filter/network/thrift_proxy/v2alpha1/router/router.proto index 2818c044..5ad9863b 100644 --- a/envoy/extensions/filters/network/thrift_proxy/v2alpha1/router/router.proto +++ b/envoy/config/filter/network/thrift_proxy/v2alpha1/router/router.proto @@ -1,6 +1,6 @@ syntax = "proto3"; -package envoy.extensions.filters.network.thrift_proxy.v2alpha1.router; +package envoy.config.filter.network.thrift_proxy.v2alpha1.router; option go_package = "router"; // [#protodoc-title: Thrift Router] diff --git a/envoy/extensions/filters/network/thrift_proxy/v2alpha1/thrift_proxy.proto b/envoy/config/filter/network/thrift_proxy/v2alpha1/thrift_proxy.proto similarity index 93% rename from envoy/extensions/filters/network/thrift_proxy/v2alpha1/thrift_proxy.proto rename to envoy/config/filter/network/thrift_proxy/v2alpha1/thrift_proxy.proto index 88972922..1a7176dc 100644 --- a/envoy/extensions/filters/network/thrift_proxy/v2alpha1/thrift_proxy.proto +++ b/envoy/config/filter/network/thrift_proxy/v2alpha1/thrift_proxy.proto @@ -1,9 +1,9 @@ syntax = "proto3"; -package envoy.extensions.filters.network.thrift_proxy.v2alpha1; +package envoy.config.filter.network.thrift_proxy.v2alpha1; option go_package = "v2"; -import "envoy/extensions/filters/network/thrift_proxy/v2alpha1/route.proto"; +import "envoy/config/filter/network/thrift_proxy/v2alpha1/route.proto"; import "validate/validate.proto"; import "gogoproto/gogo.proto";