Skip to content

Commit

Permalink
Sync Gloo APIs. Destination Branch: gloo-main
Browse files Browse the repository at this point in the history
  • Loading branch information
soloio-bot committed Aug 16, 2023
1 parent 8d53336 commit fd2d442
Show file tree
Hide file tree
Showing 11 changed files with 3,018 additions and 2,281 deletions.
76 changes: 76 additions & 0 deletions api/gloo/enterprise.gloo/v1/auth_config.proto
Original file line number Diff line number Diff line change
Expand Up @@ -150,6 +150,77 @@ message Settings {
string stat_prefix = 10;
}

// Header name/value pair.
message HeaderValue {
// Header name.
string key = 1;

// Header value.
//
// The same :ref:`format specifier <config_access_log_format>` as used for
// :ref:`HTTP access logging <config_access_log>` applies here, however
// unknown header values are replaced with the empty string instead of ``-``.
// Header value is encoded as string. This does not work for non-utf8 characters.
// Only one of ``value`` or ``raw_value`` can be set.
string value = 2;

// Header value is encoded as bytes which can support non-utf8 characters.
// Only one of ``value`` or ``raw_value`` can be set.
bytes raw_value = 3;
}

// // Header name/value pair plus option to control append behavior.
message HeaderValueOption {
// // Describes the supported actions types for header append action.
enum HeaderAppendAction {
// This action will append the specified value to the existing values if the header
// already exists. If the header doesn't exist then this will add the header with
// specified key and value.
APPEND_IF_EXISTS_OR_ADD = 0;

// This action will add the header if it doesn't already exist. If the header
// already exists then this will be a no-op.
ADD_IF_ABSENT = 1;

// This action will overwrite the specified value by discarding any existing values if
// the header already exists. If the header doesn't exist then this will add the header
// with specified key and value.
OVERWRITE_IF_EXISTS_OR_ADD = 2;

// This action will overwrite the specified value by discarding any existing values if
// the header already exists. If the header doesn't exist then this will be no-op.
OVERWRITE_IF_EXISTS = 3;
}

// Header name/value pair that this option applies to.
HeaderValue header = 1;

// Should the value be appended? If true (default), the value is appended to
// existing values. Otherwise it replaces any existing values.
// This field is deprecated and please use
// :ref:`append_action <envoy_v3_api_field_config.core.v3.HeaderValueOption.append_action>` as replacement.
//
// .. note::
// The :ref:`external authorization service <envoy_v3_api_msg_service.auth.v3.CheckResponse>` and
// :ref:`external processor service <envoy_v3_api_msg_service.ext_proc.v3.ProcessingResponse>` have
// default value (``false``) for this field.
google.protobuf.BoolValue append = 2
[deprecated = true];

// Describes the action taken to append/overwrite the given value for an existing header
// or to only add this header if it's absent.
// Value defaults to :ref:`APPEND_IF_EXISTS_OR_ADD
// <envoy_v3_api_enum_value_config.core.v3.HeaderValueOption.HeaderAppendAction.APPEND_IF_EXISTS_OR_ADD>`.
HeaderAppendAction append_action = 3;

// Is the header value allowed to be empty? If false (default), custom headers with empty values are dropped,
// otherwise they are added.
bool keep_empty_value = 4;
}




message GrpcService {
// Set the authority header when calling the GRPC service.
string authority = 1;
Expand Down Expand Up @@ -1255,6 +1326,11 @@ message PassThroughHttp {
// If the marshalling fails, the authorization check will fail and the request will be unauthorized after the ext-auth-service pod
// logs the marshal error.
bool read_state_from_response = 3;

//repeated string overwrite_upstream_headers = 4;
repeated HeaderValueOption passthrough_upstream_headers = 4;
repeated HeaderValueOption passthrough_upstream_headers_on_denied = 5;

}
Response response = 4;

Expand Down
2 changes: 1 addition & 1 deletion api/gloo/gloo/v1/enterprise/options/caching/caching.proto
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ message Settings {
// Max payload size to cache. If unset defaults to a reasonable value.
// If explicitly set to 0 will prevent anything with a body from
// being cached.
google.protobuf.UInt64Value max_payload_size = 4;
google.protobuf.UInt32Value max_payload_size = 4;


}
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ message ConnectionLimit {
// The maximum number of active connections for this gateway. When this limit is reached, any incoming connection
// will be closed after delay duration.
// Must be greater than one.
google.protobuf.UInt64Value max_active_connections = 1;
google.protobuf.UInt32Value max_active_connections = 1;

// The time to wait before a connection is dropped. Useful for DoS prevention.
// Defaults to zero and the connection will be closed immediately.
Expand Down
73 changes: 73 additions & 0 deletions pkg/api/enterprise.gloo.solo.io/v1/auth_config.pb.clone.go

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

122 changes: 122 additions & 0 deletions pkg/api/enterprise.gloo.solo.io/v1/auth_config.pb.equal.go

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

Loading

0 comments on commit fd2d442

Please sign in to comment.