Skip to content

add support for additional cookie attributes #3521

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.

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

Closed
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 1 addition & 2 deletions analysis/v1alpha1/message.proto
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ package istio.analysis.v1alpha1;

import "google/protobuf/struct.proto";

option go_package="istio.io/api/analysis/v1alpha1";
option go_package = "istio.io/api/analysis/v1alpha1";

// There are four messages described in this file. One of them is a struct
// common to the other three: AnalysisMessageBase. Using this, we can construct
Expand Down Expand Up @@ -78,7 +78,6 @@ message AnalysisMessageBase {
// `^http(s)?://(preliminary\.)?istio.io/docs/reference/config/analysis/`
// Required.
string documentation_url = 3;

}

// AnalysisMessageWeakSchema is the set of information that's needed to define a
Expand Down
4 changes: 2 additions & 2 deletions envoy/config/filter/http/jwt_auth/v2alpha1/config.proto
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@

syntax = "proto3";

import "google/protobuf/duration.proto";

package istio.envoy.config.filter.http.jwt_auth.v2alpha1;

import "google/protobuf/duration.proto";

option go_package = "istio.io/api/envoy/config/filter/http/jwt_auth/v2alpha1";

// Copied from @envoy/api/envoy/api/v2/core/http_uri.proto
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@ syntax = "proto3";

package envoy.tcp.metadataexchange.config;

option java_outer_classname = "MetadataExchangeProto";
option go_package = "istio.io/api/envoy/config/filter/network/metadata_exchange";
option java_multiple_files = true;
option java_outer_classname = "MetadataExchangeProto";
option java_package = "io.envoyproxy.envoy.tcp.metadataexchange.config";
option go_package = "istio.io/api/envoy/config/filter/network/metadata_exchange";

// [#protodoc-title: MetadataExchange protocol match and data transfer]
// MetadataExchange protocol match and data transfer
Expand Down
25 changes: 12 additions & 13 deletions envoy/extensions/stackdriver/config/v1alpha1/config.proto
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,11 @@ syntax = "proto3";

package stackdriver.config.v1alpha1;

option go_package = "istio.io/api/envoy/extensions/stackdriver/config/v1alpha1";

import "google/protobuf/duration.proto";
import "google/protobuf/wrappers.proto";

option go_package = "istio.io/api/envoy/extensions/stackdriver/config/v1alpha1";

// Custom instance configuration overrides.
// Provides a way to customize logs.
message CustomConfig {
Expand All @@ -55,11 +55,11 @@ message PluginConfig {
// logs. A request is classified as error when `status>=400 or
// response_flag != "-"`
ERRORS_ONLY = 2;
};
}

// Optional. Controls whether to export server access log.
// This is deprecated in favor of AccessLogging enum.
bool disable_server_access_logging = 1 [ deprecated = true ];
bool disable_server_access_logging = 1 [deprecated = true];

// Optional. Allows configuration of the size of the LogWrite request. The
// size is in bytes, so that it allows for better performance. Default is 4MB.
Expand All @@ -84,7 +84,7 @@ message PluginConfig {
// service. This is disabled by default.
// Deprecated -- Mesh edge reporting is no longer supported and this setting
// is no-op.
bool enable_mesh_edges_reporting = 3 [ deprecated = true ];
bool enable_mesh_edges_reporting = 3 [deprecated = true];

// Optional. Allows configuration of the time between calls out to the mesh
// edges service to report *NEW* edges. The minimum configurable duration is
Expand All @@ -95,8 +95,7 @@ message PluginConfig {
// reporting every `10m`.
// Deprecated -- Mesh edge reporting is no longer supported and this setting
// is no-op.
google.protobuf.Duration mesh_edges_reporting_duration = 4
[ deprecated = true ];
google.protobuf.Duration mesh_edges_reporting_duration = 4 [deprecated = true];

// maximum size of the peer metadata cache.
// A long lived proxy that connects with many transient peers can build up a
Expand All @@ -117,7 +116,7 @@ message PluginConfig {
// metrics are enabled).
// Deprecated -- use `metrics_overrides` instead.
// if `metrics_overrides` is used, this value will be ignored.
bool disable_http_size_metrics = 8 [ deprecated = true ];
bool disable_http_size_metrics = 8 [deprecated = true];

// Optional. Allows enabling log compression for stackdriver access logs.
google.protobuf.BoolValue enable_log_compression = 9;
Expand All @@ -128,18 +127,18 @@ message PluginConfig {
// CEL expression for filtering access logging. If the expression evaluates
// to true, an access log entry will be generated. Otherwise, no access log
// entry will be generated. If there are any type errors, the CEL expression
// is evaluated as false. More details on type checking can be found
// is evaluated as false. More details on type checking can be found
// at https://kubernetes.io/docs/reference/using-api/cel/#type-checking.
// A common error is referring to a non-existent field in the log entry.
// It's crucial to note that in Envoy, the fields that appear in access log
// entries can vary. This variation is influenced by several factors,
// including the protocol in use (such as HTTP or TCP), the applied filters,
// and the specific configuration of the Envoy instance. Therefore, when
// and the specific configuration of the Envoy instance. Therefore, when
// using CEL expressions for filtering access logs, it's essential to ensure
// that the expressions accurately refer to existing fields in the log entry.
// The has() macro in CEL may be used in CEL expressions to check if a field
// is accessible before attempting to access the field's value.
// You can also quickly test CEL expressions at the CEL Playground
// The has() macro in CEL may be used in CEL expressions to check if a field
// is accessible before attempting to access the field's value.
// You can also quickly test CEL expressions at the CEL Playground
// at https://playcel.undistro.io/.
// NOTE: Audit logs ignore configured filters.
string access_logging_filter_expression = 17;
Expand Down
10 changes: 5 additions & 5 deletions envoy/extensions/stats/config.proto
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,10 @@ syntax = "proto3";

package stats;

option go_package = "istio.io/api/envoy/extensions/stats";

import "google/protobuf/duration.proto";

option go_package = "istio.io/api/envoy/extensions/stats";

// Metric instance configuration overrides.
// The metric value and the metric type are optional and permit changing the
// reported value for an existing metric.
Expand Down Expand Up @@ -95,14 +95,14 @@ message PluginConfig {

// prefix to add to stats emitted by the plugin.
// DEPRECATED.
string stat_prefix = 3; // default: "istio_"
string stat_prefix = 3; // default: "istio_"

// Stats api squashes dimensions in a single string.
// The squashed string is parsed at prometheus scrape time to recover
// dimensions. The following 2 fields set the field and value separators {key:
// value} --> key{value_separator}value{field_separator}
string field_separator = 4; // default: ";;"
string value_separator = 5; // default: "=="
string field_separator = 4; // default: ";;"
string value_separator = 5; // default: "=="

// Optional: Disable using host header as a fallback if destination service is
// not available from the controlplane. Disable the fallback if the host
Expand Down
2 changes: 1 addition & 1 deletion extensions/v1alpha1/wasm.pb.go

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

15 changes: 7 additions & 8 deletions extensions/v1alpha1/wasm.proto
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,6 @@

syntax = "proto3";

import "google/protobuf/wrappers.proto";
import "google/protobuf/struct.proto";
import "type/v1beta1/selector.proto";
import "google/api/field_behavior.proto";

// $schema: istio.extensions.v1alpha1.WasmPlugin
// $title: Wasm Plugin
// $description: Extend the functionality provided by the Istio proxy through WebAssembly filters.
Expand Down Expand Up @@ -207,7 +202,12 @@ import "google/api/field_behavior.proto";
//
package istio.extensions.v1alpha1;

option go_package="istio.io/api/extensions/v1alpha1";
import "google/api/field_behavior.proto";
import "google/protobuf/struct.proto";
import "google/protobuf/wrappers.proto";
import "type/v1beta1/selector.proto";

option go_package = "istio.io/api/extensions/v1alpha1";

// WasmPlugin provides a mechanism to extend the functionality provided by
// the Istio proxy through WebAssembly filters.
Expand Down Expand Up @@ -389,7 +389,6 @@ message WasmPlugin {
PluginType type = 14;
}


// PluginType indicates the type of Wasm extension to be used.
// There are two types of extensions: `HTTP` and `NETWORK`.
//
Expand All @@ -410,7 +409,7 @@ enum PluginType {

// Use HTTP Wasm Extension.
HTTP = 1;

// Use Network Wasm Extension.
NETWORK = 2;
}
Expand Down
3 changes: 3 additions & 0 deletions gen.sh
Original file line number Diff line number Diff line change
Expand Up @@ -36,3 +36,6 @@ buf generate --template buf.gen-noncrd.yaml \
# These plugins are sent to Envoy, which uses golang/protobuf, so do not use gogo
buf generate --template buf.gen-golang.yaml \
--path envoy

# Format Protobuf files
buf format -w
Loading