Skip to content

Commit

Permalink
Sync Gloo APIs to 1.5.21 (#89)
Browse files Browse the repository at this point in the history
* Sync Gloo APIs to 1.5.21
  • Loading branch information
Kevin Dorosh authored May 10, 2021
1 parent 2c41d4b commit cf23bfb
Show file tree
Hide file tree
Showing 32 changed files with 413 additions and 62 deletions.
1 change: 0 additions & 1 deletion api/gloo/gateway/v1/gateway.proto
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,6 @@ message TcpGateway {
gloo.solo.io.TcpListenerOptions options = 8;
}


message GatewayStatus {
enum State {
// Pending status indicates the resource has not yet been validated
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -114,4 +114,4 @@ message OutlierDetection {
// is set to true.
google.protobuf.UInt32Value enforcing_local_origin_success_rate = 15
[(validate.rules).uint32.lte = 100];
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -273,4 +273,4 @@ enum HealthStatus {

// Degraded.
DEGRADED = 5;
}
}
2 changes: 1 addition & 1 deletion api/gloo/gloo/external/envoy/api/v2/route/route.proto
Original file line number Diff line number Diff line change
Expand Up @@ -1303,4 +1303,4 @@ message QueryParameterMatcher {
// the right of the equals sign in "key=value") must match the regex.
// E.g., the regex "\d+$" will match "123" but not "a123" or "123a".
google.protobuf.BoolValue regex = 4;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -80,4 +80,4 @@ message Gzip {
// which will produce a 4096 bytes window. For more details about this parameter, please refer to
// zlib manual > deflateInit2.
google.protobuf.UInt32Value window_bits = 9 [(validate.rules).uint32 = {lte: 15 gte: 9}];
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -26,4 +26,4 @@ option java_multiple_files = true;
message Wasm {
// General Plugin configuration.
envoy.extensions.wasm.v3.PluginConfig config = 1;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -236,4 +236,4 @@ message Passthrough {}

message MergeExtractorsToBody {}

message HeaderBodyTransform {}
message HeaderBodyTransform {}
2 changes: 1 addition & 1 deletion api/gloo/gloo/external/envoy/type/range.proto
Original file line number Diff line number Diff line change
Expand Up @@ -32,4 +32,4 @@ message DoubleRange {

// end of the range (exclusive)
double end = 2;
}
}
2 changes: 1 addition & 1 deletion api/gloo/gloo/external/udpa/annotations/sensitive.proto
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,4 @@ extend google.protobuf.FieldOptions {
// Protobuf functions such as `TextFormat::PrintToString`.
bool sensitive = 76569463;
}
option go_package = "github.com/solo-io/solo-apis/pkg/api/gloo.solo.io/external/udpa/annotations";
option go_package = "github.com/solo-io/solo-apis/pkg/api/gloo.solo.io/external/udpa/annotations";
2 changes: 1 addition & 1 deletion api/gloo/gloo/v1/endpoint.proto
Original file line number Diff line number Diff line change
Expand Up @@ -40,4 +40,4 @@ message Endpoint {
message HealthCheckConfig {
// hostname to use for the endpoint health checks if provided.
string hostname = 1;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -84,4 +84,4 @@ message RateLimitRouteExtension {
// Define individual rate limits here. Each rate limit will be evaluated, if any rate limit
// would be throttled, the entire request returns a 429 (gets throttled)
repeated ratelimit.api.solo.io.RateLimitActions rate_limits = 2;
}
}
2 changes: 1 addition & 1 deletion api/gloo/gloo/v1/enterprise/options/rbac/rbac.proto
Original file line number Diff line number Diff line change
Expand Up @@ -53,4 +53,4 @@ message Permissions {
string path_prefix = 1;
// What http methods (GET, POST, ...) are allowed.
repeated string methods = 2;
}
}
2 changes: 1 addition & 1 deletion api/gloo/gloo/v1/enterprise/options/waf/waf.proto
Original file line number Diff line number Diff line change
Expand Up @@ -42,4 +42,4 @@ message CoreRuleSet {
// String representing the core rule set custom config options
string custom_settings_file = 3;
}
}
}
2 changes: 1 addition & 1 deletion api/gloo/gloo/v1/extensions.proto
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,4 @@ message Extensions {

message Extension {
google.protobuf.Struct config = 1;
}
}
2 changes: 1 addition & 1 deletion api/gloo/gloo/v1/failover.proto
Original file line number Diff line number Diff line change
Expand Up @@ -115,4 +115,4 @@ message Locality {
// into smaller chunks of sub-zones so they can be load balanced
// independently.
string sub_zone = 3;
}
}
2 changes: 1 addition & 1 deletion api/gloo/gloo/v1/options/cors/cors.proto
Original file line number Diff line number Diff line change
Expand Up @@ -42,4 +42,4 @@ message CorsPolicy {
// Optional, only applies to route-specific CORS Policies, defaults to false.
// If set, the CORS Policy (specified on the virtual host) will be disabled for this route.
bool disable_for_route = 8;
}
}
2 changes: 1 addition & 1 deletion api/gloo/gloo/v1/options/grpc/grpc.proto
Original file line number Diff line number Diff line change
Expand Up @@ -48,4 +48,4 @@ message DestinationSpec {
// Parameters describe how to extract the function parameters from the
// request.
transformation.options.gloo.solo.io.Parameters parameters = 4;
}
}
2 changes: 1 addition & 1 deletion api/gloo/gloo/v1/options/grpc_json/grpc_json.proto
Original file line number Diff line number Diff line change
Expand Up @@ -158,4 +158,4 @@ message GrpcJsonTranscoder {
// the ``google/rpc/error_details.proto`` should be included in the configured
// :ref:`proto descriptor set <config_grpc_json_generate_proto_descriptor_set>`.
bool convert_grpc_status = 9;
}
}
2 changes: 1 addition & 1 deletion api/gloo/gloo/v1/options/grpc_web/grpc_web.proto
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,4 @@ import "solo-apis/api/gloo/gloo/v1/options/transformation/parameters.proto";
message GrpcWeb {
// Disable grpc web support.
bool disable = 1;
}
}
2 changes: 1 addition & 1 deletion api/gloo/gloo/v1/options/rest/rest.proto
Original file line number Diff line number Diff line change
Expand Up @@ -29,4 +29,4 @@ message DestinationSpec {
transformation.options.gloo.solo.io.Parameters parameters = 2;

envoy.api.v2.filter.http.TransformationTemplate response_transformation = 3;
}
}
2 changes: 1 addition & 1 deletion api/gloo/gloo/v1/options/service_spec.proto
Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,4 @@ message ServiceSpec {
rest.options.gloo.solo.io.ServiceSpec rest = 1;
grpc.options.gloo.solo.io.ServiceSpec grpc = 2;
}
}
}
2 changes: 1 addition & 1 deletion api/gloo/gloo/v1/options/stats/stats.proto
Original file line number Diff line number Diff line change
Expand Up @@ -43,4 +43,4 @@ message VirtualCluster {

// If specified, statistics will be exposed only for requests matching the given HTTP method.
string method = 3;
}
}
2 changes: 1 addition & 1 deletion api/gloo/gloo/v1/options/tcp/tcp.proto
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,4 @@ option (extproto.hash_all) = true;
message TcpProxySettings {
google.protobuf.UInt32Value max_connect_attempts = 1;
google.protobuf.Duration idle_timeout = 2 [ (gogoproto.stdduration) = true ];
}
}
25 changes: 25 additions & 0 deletions api/gloo/gloo/v1/options/tracing/tracing.proto
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,10 @@ message ListenerTracingSettings {
// Requests can produce traces by random sampling or when the `x-client-trace-id` header is provided.
// TracePercentages defines the limits for random, forced, and overall tracing percentages.
TracePercentages trace_percentages = 3;
// Optional. If specified, Envoy will include the environment variables with the given tag as tracing tags.
repeated TracingTagEnvironmentVariable environment_variables_for_tags = 6;
// Optional. If specified, Envoy will include the literals with the given tag as tracing tags.
repeated TracingTagLiteral literals_for_tags = 7;
}

// Contains settings for configuring Envoy's tracing capabilities at the route level.
Expand Down Expand Up @@ -55,3 +59,24 @@ message TracePercentages {
// This should be a value between 0.0 and 100.0, with up to 6 significant digits.
google.protobuf.FloatValue overall_sample_percentage = 3;
}

// Requests can produce traces with custom tags.
// TracingTagEnvironmentVariable defines an environment variable which gets added as custom tag.
message TracingTagEnvironmentVariable {
// Used to populate the tag name.
string tag = 1;
// Environment variable name to obtain the value to populate the tag value.
string name = 2;
// When the environment variable is not found, the tag value will be populated with this default value if specified,
// otherwise no tag will be populated.
string default_value = 3;
}

// Requests can produce traces with custom tags.
// TracingTagLiteral defines a literal which gets added as custom tag.
message TracingTagLiteral {
// Used to populate the tag name.
string tag = 1;
// Static literal value to populate the tag value.
string value = 2;
}
Original file line number Diff line number Diff line change
Expand Up @@ -57,4 +57,4 @@ message TransformationStages {
RequestResponseTransformations early = 1;
// Regular transformations happen after Auth and Rate limit decisions has been made.
RequestResponseTransformations regular = 2;
}
}
2 changes: 1 addition & 1 deletion api/gloo/gloo/v1/options/wasm/wasm.proto
Original file line number Diff line number Diff line change
Expand Up @@ -80,4 +80,4 @@ message FilterStage {
Stage stage = 1;
// How this filter should be placed relative to the stage
Predicate predicate = 2;
}
}
1 change: 0 additions & 1 deletion api/gloo/gloo/v1/proxy.proto
Original file line number Diff line number Diff line change
Expand Up @@ -387,7 +387,6 @@ message DirectResponseAction {
string body = 2;
}


message UpstreamGroupStatus {
enum State {
// Pending status indicates the resource has not yet been validated
Expand Down
2 changes: 1 addition & 1 deletion api/gloo/gloo/v1/ssl.proto
Original file line number Diff line number Diff line change
Expand Up @@ -119,4 +119,4 @@ message SslParameters {
ProtocolVersion maximum_protocol_version = 2;
repeated string cipher_suites = 3;
repeated string ecdh_curves = 4;
}
}
2 changes: 1 addition & 1 deletion api/gloo/gloo/v1/subset.proto
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,4 @@ option (extproto.hash_all) = true;

message Subset {
map<string, string> values = 1;
}
}
Loading

0 comments on commit cf23bfb

Please sign in to comment.