Skip to content

config: un-deprecating Structs until the replacement (docs etc.) are fully ready #6346

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 1 commit into from
Mar 22, 2019
Merged

config: un-deprecating Structs until the replacement (docs etc.) are fully ready #6346

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 0 additions & 2 deletions DEPRECATED.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,6 @@ A logged warning is expected for each deprecated item that is in deprecation win
* Use of `enabled` in `CorsPolicy`, found in
[route.proto](https://github.com/envoyproxy/envoy/blob/master/api/envoy/api/v2/route/route.proto).
Set the `filter_enabled` field instead.
* Use of google.protobuf.Struct for extension opaque configs is deprecated. Use google.protobuf.Any instead or pack
google.protobuf.Struct in google.protobuf.Any.

## Version 1.9.0 (Dec 20, 2018)

Expand Down
2 changes: 1 addition & 1 deletion api/envoy/api/v2/cds.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -251,7 +251,7 @@ message Cluster {
// for upstream connections. The key should match the extension filter name, such as
// "envoy.filters.network.thrift_proxy". See the extension's documentation for details on
// specific options.
map<string, google.protobuf.Struct> extension_protocol_options = 35 [deprecated = true];
map<string, google.protobuf.Struct> extension_protocol_options = 35;

// The extension_protocol_options field is used to provide extension-specific protocol options
// for upstream connections. The key should match the extension filter name, such as
Expand Down
2 changes: 1 addition & 1 deletion api/envoy/api/v2/core/base.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,7 +198,7 @@ message TransportSocket {
// Implementation specific configuration which depends on the implementation being instantiated.
// See the supported transport socket implementations for further documentation.
oneof config_type {
google.protobuf.Struct config = 2 [deprecated = true];
google.protobuf.Struct config = 2;

google.protobuf.Any typed_config = 3;
}
Expand Down
2 changes: 1 addition & 1 deletion api/envoy/api/v2/core/grpc_service.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ message GrpcService {
message MetadataCredentialsFromPlugin {
string name = 1;
oneof config_type {
google.protobuf.Struct config = 2 [deprecated = true];
google.protobuf.Struct config = 2;

google.protobuf.Any typed_config = 3;
}
Expand Down
2 changes: 1 addition & 1 deletion api/envoy/api/v2/core/health_check.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@ message HealthCheck {
// A custom health checker specific configuration which depends on the custom health checker
// being instantiated. See :api:`envoy/config/health_checker` for reference.
oneof config_type {
google.protobuf.Struct config = 2 [deprecated = true];
google.protobuf.Struct config = 2;

google.protobuf.Any typed_config = 3;
}
Expand Down
4 changes: 2 additions & 2 deletions api/envoy/api/v2/listener/listener.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ message Filter {
// Filter specific configuration which depends on the filter being
// instantiated. See the supported filters for further documentation.
oneof config_type {
google.protobuf.Struct config = 2 [deprecated = true];
google.protobuf.Struct config = 2;

google.protobuf.Any typed_config = 4;
}
Expand Down Expand Up @@ -210,7 +210,7 @@ message ListenerFilter {
// Filter specific configuration which depends on the filter being instantiated.
// See the supported filters for further documentation.
oneof config_type {
google.protobuf.Struct config = 2 [deprecated = true];
google.protobuf.Struct config = 2;

google.protobuf.Any typed_config = 3;
}
Expand Down
10 changes: 5 additions & 5 deletions api/envoy/api/v2/route/route.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ message VirtualHost {
// *envoy.buffer* for the HTTP buffer filter. Use of this field is filter
// specific; see the :ref:`HTTP filter documentation <config_http_filters>`
// for if and how it is utilized.
map<string, google.protobuf.Struct> per_filter_config = 12 [deprecated = true];
map<string, google.protobuf.Struct> per_filter_config = 12;

// The per_filter_config field can be used to provide virtual host-specific
// configurations for filters. The key should match the filter name, such as
Expand Down Expand Up @@ -190,7 +190,7 @@ message Route {
// *envoy.buffer* for the HTTP buffer filter. Use of this field is filter
// specific; see the :ref:`HTTP filter documentation <config_http_filters>` for
// if and how it is utilized.
map<string, google.protobuf.Struct> per_filter_config = 8 [deprecated = true];
map<string, google.protobuf.Struct> per_filter_config = 8;

// The per_filter_config field can be used to provide route-specific
// configurations for filters. The key should match the filter name, such as
Expand Down Expand Up @@ -287,7 +287,7 @@ message WeightedCluster {
// *envoy.buffer* for the HTTP buffer filter. Use of this field is filter
// specific; see the :ref:`HTTP filter documentation <config_http_filters>`
// for if and how it is utilized.
map<string, google.protobuf.Struct> per_filter_config = 8 [deprecated = true];
map<string, google.protobuf.Struct> per_filter_config = 8;

// The per_filter_config field can be used to provide weighted cluster-specific
// configurations for filters. The key should match the filter name, such as
Expand Down Expand Up @@ -825,7 +825,7 @@ message RetryPolicy {
message RetryPriority {
string name = 1 [(validate.rules).string.min_bytes = 1];
oneof config_type {
google.protobuf.Struct config = 2 [deprecated = true];
google.protobuf.Struct config = 2;

google.protobuf.Any typed_config = 3;
}
Expand All @@ -839,7 +839,7 @@ message RetryPolicy {
message RetryHostPredicate {
string name = 1 [(validate.rules).string.min_bytes = 1];
oneof config_type {
google.protobuf.Struct config = 2 [deprecated = true];
google.protobuf.Struct config = 2;

google.protobuf.Any typed_config = 3;
}
Expand Down
2 changes: 1 addition & 1 deletion api/envoy/config/filter/accesslog/v2/accesslog.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ message AccessLog {
// #. "envoy.http_grpc_access_log": :ref:`HttpGrpcAccessLogConfig
// <envoy_api_msg_config.accesslog.v2.HttpGrpcAccessLogConfig>`
oneof config_type {
google.protobuf.Struct config = 3 [deprecated = true];
google.protobuf.Struct config = 3;

google.protobuf.Any typed_config = 4;
}
Expand Down
2 changes: 1 addition & 1 deletion api/envoy/config/filter/network/http_connection_manager/v2/http_connection_manager.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -423,7 +423,7 @@ message HttpFilter {
// Filter specific configuration which depends on the filter being instantiated. See the supported
// filters for further documentation.
oneof config_type {
google.protobuf.Struct config = 2 [deprecated = true];
google.protobuf.Struct config = 2;

google.protobuf.Any typed_config = 4;
}
Expand Down
2 changes: 1 addition & 1 deletion api/envoy/config/filter/network/thrift_proxy/v2alpha1/thrift_proxy.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ message ThriftFilter {
// Filter specific configuration which depends on the filter being instantiated. See the supported
// filters for further documentation.
oneof config_type {
google.protobuf.Struct config = 2 [deprecated = true];
google.protobuf.Struct config = 2;

google.protobuf.Any typed_config = 3;
}
Expand Down
2 changes: 1 addition & 1 deletion api/envoy/config/metrics/v2/stats.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ message StatsSink {
// Stats sink specific configuration which depends on the sink being instantiated. See
// :ref:`StatsdSink <envoy_api_msg_config.metrics.v2.StatsdSink>` for an example.
oneof config_type {
google.protobuf.Struct config = 2 [deprecated = true];
google.protobuf.Struct config = 2;

google.protobuf.Any typed_config = 3;
}
Expand Down
2 changes: 1 addition & 1 deletion api/envoy/config/overload/v2alpha/overload.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ message ResourceMonitor {

// Configuration for the resource monitor being instantiated.
oneof config_type {
google.protobuf.Struct config = 2 [deprecated = true];
google.protobuf.Struct config = 2;

google.protobuf.Any typed_config = 3;
}
Expand Down
2 changes: 1 addition & 1 deletion api/envoy/config/trace/v2/trace.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ message Tracing {
// - :ref:`DynamicOtConfig <envoy_api_msg_config.trace.v2.DynamicOtConfig>`
// - :ref:`DatadogConfig <envoy_api_msg_config.trace.v2.DatadogConfig>`
oneof config_type {
google.protobuf.Struct config = 2 [deprecated = true];
google.protobuf.Struct config = 2;

google.protobuf.Any typed_config = 3;
}
Expand Down