Skip to content

config: support recovery of original message when upgrading. #9633

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
htuch merged 10 commits into from
Jan 14, 2020
Merged

config: support recovery of original message when upgrading. #9633

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
0da7f83
config: support recovery of original message when upgrading.
htuch Jan 9, 2020
53cee75
MessageUtil::checkForUnexpectedFields tests, fix bazel.gcc.
htuch Jan 12, 2020
2ef8b5a
Some admin_test enhancements for logical coverage of field mask Any.
htuch Jan 12, 2020
7210a02
Adjust cluster memory upper boundd for bazel.compile_time_options.
htuch Jan 13, 2020
0e76869
Adjust cluster memory bounds in stats_integration_test for new overhead.
htuch Jan 13, 2020
1a70e89
fix_format
htuch Jan 13, 2020
2164184
Restrucutre how wire content gets sanitized for gRPC and JSON.
htuch Jan 13, 2020
ad92f92
Switch OriginalTypeFieldNumber magic to SHA-based.
htuch Jan 13, 2020
d7d59bc
FieldMask comment improvements.
htuch Jan 13, 2020
75d1d9e
fix_format
htuch Jan 13, 2020
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 api/envoy/admin/v2alpha/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@ licenses(["notice"]) # Apache 2

api_proto_package(
deps = [
"//envoy/api/v2:pkg",
"//envoy/api/v2/auth:pkg",
"//envoy/api/v2/core:pkg",
"//envoy/config/bootstrap/v2:pkg",
"//envoy/service/tap/v2alpha:pkg",
Expand Down
25 changes: 10 additions & 15 deletions api/envoy/admin/v2alpha/config_dump.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,6 @@ syntax = "proto3";

package envoy.admin.v2alpha;

import "envoy/api/v2/auth/cert.proto";
import "envoy/api/v2/cluster.proto";
import "envoy/api/v2/listener.proto";
import "envoy/api/v2/route.proto";
import "envoy/api/v2/scoped_route.proto";
import "envoy/config/bootstrap/v2/bootstrap.proto";

import "google/protobuf/any.proto";
Expand Down Expand Up @@ -69,7 +64,7 @@ message ListenersConfigDump {
// Describes a statically loaded listener.
message StaticListener {
// The listener config.
api.v2.Listener listener = 1;
google.protobuf.Any listener = 1;

// The timestamp when the Listener was last successfully updated.
google.protobuf.Timestamp last_updated = 2;
Expand All @@ -83,7 +78,7 @@ message ListenersConfigDump {
string version_info = 1;

// The listener config.
api.v2.Listener listener = 2;
google.protobuf.Any listener = 2;

// The timestamp when the Listener was last successfully updated.
google.protobuf.Timestamp last_updated = 3;
Expand Down Expand Up @@ -134,7 +129,7 @@ message ClustersConfigDump {
// Describes a statically loaded cluster.
message StaticCluster {
// The cluster config.
api.v2.Cluster cluster = 1;
google.protobuf.Any cluster = 1;

// The timestamp when the Cluster was last updated.
google.protobuf.Timestamp last_updated = 2;
Expand All @@ -149,7 +144,7 @@ message ClustersConfigDump {
string version_info = 1;

// The cluster config.
api.v2.Cluster cluster = 2;
google.protobuf.Any cluster = 2;

// The timestamp when the Cluster was last updated.
google.protobuf.Timestamp last_updated = 3;
Expand Down Expand Up @@ -182,7 +177,7 @@ message ClustersConfigDump {
message RoutesConfigDump {
message StaticRouteConfig {
// The route config.
api.v2.RouteConfiguration route_config = 1;
google.protobuf.Any route_config = 1;

// The timestamp when the Route was last updated.
google.protobuf.Timestamp last_updated = 2;
Expand All @@ -195,7 +190,7 @@ message RoutesConfigDump {
string version_info = 1;

// The route config.
api.v2.RouteConfiguration route_config = 2;
google.protobuf.Any route_config = 2;

// The timestamp when the Route was last updated.
google.protobuf.Timestamp last_updated = 3;
Expand All @@ -218,7 +213,7 @@ message ScopedRoutesConfigDump {
string name = 1;

// The scoped route configurations.
repeated api.v2.ScopedRouteConfiguration scoped_route_configs = 2;
repeated google.protobuf.Any scoped_route_configs = 2;

// The timestamp when the scoped route config set was last updated.
google.protobuf.Timestamp last_updated = 3;
Expand All @@ -234,7 +229,7 @@ message ScopedRoutesConfigDump {
string version_info = 2;

// The scoped route configurations.
repeated api.v2.ScopedRouteConfiguration scoped_route_configs = 3;
repeated google.protobuf.Any scoped_route_configs = 3;

// The timestamp when the scoped route config set was last updated.
google.protobuf.Timestamp last_updated = 4;
Expand Down Expand Up @@ -263,7 +258,7 @@ message SecretsConfigDump {
// The actual secret information.
// Security sensitive information is redacted (replaced with "[redacted]") for
// private keys and passwords in TLS certificates.
api.v2.auth.Secret secret = 4;
google.protobuf.Any secret = 4;
}

// StaticSecret specifies statically loaded secret in bootstrap.
Expand All @@ -277,7 +272,7 @@ message SecretsConfigDump {
// The actual secret information.
// Security sensitive information is redacted (replaced with "[redacted]") for
// private keys and passwords in TLS certificates.
api.v2.auth.Secret secret = 3;
google.protobuf.Any secret = 3;
}

// The statically loaded secrets.
Expand Down
4 changes: 0 additions & 4 deletions api/envoy/admin/v3alpha/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,8 @@ api_proto_package(
deps = [
"//envoy/admin/v2alpha:pkg",
"//envoy/config/bootstrap/v3alpha:pkg",
"//envoy/config/cluster/v3alpha:pkg",
"//envoy/config/core/v3alpha:pkg",
"//envoy/config/listener/v3alpha:pkg",
"//envoy/config/route/v3alpha:pkg",
"//envoy/config/tap/v3alpha:pkg",
"//envoy/extensions/transport_sockets/tls/v3alpha:pkg",
"//envoy/type/v3alpha:pkg",
"@com_github_cncf_udpa//udpa/annotations:pkg",
],
Expand Down
25 changes: 10 additions & 15 deletions api/envoy/admin/v3alpha/config_dump.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,6 @@ syntax = "proto3";
package envoy.admin.v3alpha;

import "envoy/config/bootstrap/v3alpha/bootstrap.proto";
import "envoy/config/cluster/v3alpha/cluster.proto";
import "envoy/config/listener/v3alpha/listener.proto";
import "envoy/config/route/v3alpha/route.proto";
import "envoy/config/route/v3alpha/scoped_route.proto";
import "envoy/extensions/transport_sockets/tls/v3alpha/cert.proto";

import "google/protobuf/any.proto";
import "google/protobuf/timestamp.proto";
Expand Down Expand Up @@ -85,7 +80,7 @@ message ListenersConfigDump {
"envoy.admin.v2alpha.ListenersConfigDump.StaticListener";

// The listener config.
config.listener.v3alpha.Listener listener = 1;
google.protobuf.Any listener = 1;

// The timestamp when the Listener was last successfully updated.
google.protobuf.Timestamp last_updated = 2;
Expand All @@ -103,7 +98,7 @@ message ListenersConfigDump {
string version_info = 1;

// The listener config.
config.listener.v3alpha.Listener listener = 2;
google.protobuf.Any listener = 2;

// The timestamp when the Listener was last successfully updated.
google.protobuf.Timestamp last_updated = 3;
Expand Down Expand Up @@ -164,7 +159,7 @@ message ClustersConfigDump {
"envoy.admin.v2alpha.ClustersConfigDump.StaticCluster";

// The cluster config.
config.cluster.v3alpha.Cluster cluster = 1;
google.protobuf.Any cluster = 1;

// The timestamp when the Cluster was last updated.
google.protobuf.Timestamp last_updated = 2;
Expand All @@ -183,7 +178,7 @@ message ClustersConfigDump {
string version_info = 1;

// The cluster config.
config.cluster.v3alpha.Cluster cluster = 2;
google.protobuf.Any cluster = 2;

// The timestamp when the Cluster was last updated.
google.protobuf.Timestamp last_updated = 3;
Expand Down Expand Up @@ -223,7 +218,7 @@ message RoutesConfigDump {
"envoy.admin.v2alpha.RoutesConfigDump.StaticRouteConfig";

// The route config.
config.route.v3alpha.RouteConfiguration route_config = 1;
google.protobuf.Any route_config = 1;

// The timestamp when the Route was last updated.
google.protobuf.Timestamp last_updated = 2;
Expand All @@ -240,7 +235,7 @@ message RoutesConfigDump {
string version_info = 1;

// The route config.
config.route.v3alpha.RouteConfiguration route_config = 2;
google.protobuf.Any route_config = 2;

// The timestamp when the Route was last updated.
google.protobuf.Timestamp last_updated = 3;
Expand Down Expand Up @@ -269,7 +264,7 @@ message ScopedRoutesConfigDump {
string name = 1;

// The scoped route configurations.
repeated config.route.v3alpha.ScopedRouteConfiguration scoped_route_configs = 2;
repeated google.protobuf.Any scoped_route_configs = 2;

// The timestamp when the scoped route config set was last updated.
google.protobuf.Timestamp last_updated = 3;
Expand All @@ -289,7 +284,7 @@ message ScopedRoutesConfigDump {
string version_info = 2;

// The scoped route configurations.
repeated config.route.v3alpha.ScopedRouteConfiguration scoped_route_configs = 3;
repeated google.protobuf.Any scoped_route_configs = 3;

// The timestamp when the scoped route config set was last updated.
google.protobuf.Timestamp last_updated = 4;
Expand Down Expand Up @@ -324,7 +319,7 @@ message SecretsConfigDump {
// The actual secret information.
// Security sensitive information is redacted (replaced with "[redacted]") for
// private keys and passwords in TLS certificates.
envoy.extensions.transport_sockets.tls.v3alpha.Secret secret = 4;
google.protobuf.Any secret = 4;
}

// StaticSecret specifies statically loaded secret in bootstrap.
Expand All @@ -341,7 +336,7 @@ message SecretsConfigDump {
// The actual secret information.
// Security sensitive information is redacted (replaced with "[redacted]") for
// private keys and passwords in TLS certificates.
envoy.extensions.transport_sockets.tls.v3alpha.Secret secret = 3;
google.protobuf.Any secret = 3;
}

// The statically loaded secrets.
Expand Down
2 changes: 0 additions & 2 deletions generated_api_shadow/envoy/admin/v2alpha/BUILD
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

25 changes: 10 additions & 15 deletions generated_api_shadow/envoy/admin/v2alpha/config_dump.proto
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 0 additions & 4 deletions generated_api_shadow/envoy/admin/v3alpha/BUILD
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading