Skip to content

config: Deprecate google.protobuf.Struct config members followup #8861

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
lizan merged 2 commits into from
Nov 3, 2019
Merged

config: Deprecate google.protobuf.Struct config members followup #8861

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3ad43b9
Deprecate google.protobuf.Struct config members in the following types
yanavlasov Nov 1, 2019
ea39333
Fix format
yanavlasov Nov 2, 2019
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: 1 addition & 1 deletion api/envoy/api/v2/auth/cert.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ message PrivateKeyProvider {

// Private key method provider specific configuration.
oneof config_type {
google.protobuf.Struct config = 2;
google.protobuf.Struct config = 2 [deprecated = true];

google.protobuf.Any typed_config = 3;
}
Expand Down
2 changes: 1 addition & 1 deletion api/envoy/api/v2/listener/udp_listener_config.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ message UdpListenerConfig {
// Used to create a specific listener factory. To some factory, e.g.
// "raw_udp_listener", config is not needed.
oneof config_type {
google.protobuf.Struct config = 2;
google.protobuf.Struct config = 2 [deprecated = true];

google.protobuf.Any typed_config = 3;
}
Expand Down
6 changes: 4 additions & 2 deletions api/envoy/api/v3alpha/auth/cert.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,14 +104,16 @@ message TlsParameters {
// (potentially asynchronous) signing and decryption operations. Some use cases for private key
// methods would be TPM support and TLS acceleration.
message PrivateKeyProvider {
reserved 2;

reserved "config";

// Private key method provider name. The name must match a
// supported private key method provider type.
string provider_name = 1 [(validate.rules).string = {min_bytes: 1}];

// Private key method provider specific configuration.
oneof config_type {
google.protobuf.Struct config = 2;

google.protobuf.Any typed_config = 3;
}
}
Expand Down
6 changes: 4 additions & 2 deletions api/envoy/api/v3alpha/listener/udp_listener_config.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,10 @@ import "google/protobuf/struct.proto";
// Listener :ref:`configuration overview <config_listeners>`

message UdpListenerConfig {
reserved 2;

reserved "config";

// Used to look up UDP listener factory, matches "raw_udp_listener" or
// "quic_listener" to create a specific udp listener.
// If not specified, treat as "raw_udp_listener".
Expand All @@ -21,8 +25,6 @@ message UdpListenerConfig {
// Used to create a specific listener factory. To some factory, e.g.
// "raw_udp_listener", config is not needed.
oneof config_type {
google.protobuf.Struct config = 2;

google.protobuf.Any typed_config = 3;
}
}
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 @@ -245,7 +245,7 @@ message ExtensionFilter {

// Custom configuration that depends on the filter being instantiated.
oneof config_type {
google.protobuf.Struct config = 2;
google.protobuf.Struct config = 2 [deprecated = true];

google.protobuf.Any typed_config = 3;
}
Expand Down
6 changes: 4 additions & 2 deletions api/envoy/config/filter/accesslog/v3alpha/accesslog.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -241,14 +241,16 @@ message GrpcStatusFilter {

// Extension filter is statically registered at runtime.
message ExtensionFilter {
reserved 2;

reserved "config";

// The name of the filter implementation to instantiate. The name must
// match a statically registered filter.
string name = 1;

// Custom configuration that depends on the filter being instantiated.
oneof config_type {
google.protobuf.Struct config = 2;

google.protobuf.Any typed_config = 3;
}
}
15 changes: 10 additions & 5 deletions test/common/access_log/access_log_impl_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1253,7 +1253,8 @@ name: envoy.file_access_log
filter:
extension_filter:
name: test_header_filter
config:
typed_config:
"@type": type.googleapis.com/envoy.config.filter.accesslog.v2.HeaderFilter
header:
name: test-header
typed_config:
Expand Down Expand Up @@ -1326,8 +1327,10 @@ name: envoy.file_access_log
filter:
extension_filter:
name: sample_extension_filter
config:
rate: 5
typed_config:
"@type": type.googleapis.com/google.protobuf.Struct
value:
rate: 5
typed_config:
"@type": type.googleapis.com/envoy.config.accesslog.v2.FileAccessLog
path: /dev/null
Expand All @@ -1352,8 +1355,10 @@ name: envoy.file_access_log
filter:
extension_filter:
name: unregistered_extension_filter
config:
foo: bar
typed_config:
"@type": type.googleapis.com/google.protobuf.Struct
value:
foo: bar
typed_config:
"@type": type.googleapis.com/envoy.config.accesslog.v2.FileAccessLog
path: /dev/null
Expand Down
Loading