update dependencies

Signed-off-by: hongming <talonwan@yunify.com>
This commit is contained in:
hongming
2020-12-22 16:48:26 +08:00
parent 4a11a50544
commit fe6c5de00f
2857 changed files with 252134 additions and 115656 deletions

View File

@@ -83,6 +83,19 @@ const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package
// - query: api-key
// ```
//
// <!-- crd generation tags
// +cue-gen:HTTPAPISpec:schema:istio.mixer.v1.config.client.HTTPAPISpec
// +cue-gen:HTTPAPISpec:groupName:config.istio.io
// +cue-gen:HTTPAPISpec:version:v1alpha2
// +cue-gen:HTTPAPISpec:storageVersion
// +cue-gen:HTTPAPISpec:annotations:helm.sh/resource-policy=keep
// +cue-gen:HTTPAPISpec:labels:app=istio-mixer,chart=istio,heritage=Tiller,release=istio
// +cue-gen:HTTPAPISpec:subresource:status
// +cue-gen:HTTPAPISpec:scope:Namespaced
// +cue-gen:HTTPAPISpec:resource:categories=istio-io,apim-istio-io
// +cue-gen:HTTPAPISpec:preserveUnknownFields:false
// -->
//
// <!-- go code generation tags
// +kubetype-gen
// +kubetype-gen:groupVersion=config.istio.io/v1alpha2
@@ -400,6 +413,19 @@ var xxx_messageInfo_HTTPAPISpecReference proto.InternalMessageInfo
// namespace: default
// ```
//
// <!-- crd generation tags
// +cue-gen:HTTPAPISpecBinding:schema:istio.mixer.v1.config.client.HTTPAPISpecBinding
// +cue-gen:HTTPAPISpecBinding:groupName:config.istio.io
// +cue-gen:HTTPAPISpecBinding:version:v1alpha2
// +cue-gen:HTTPAPISpecBinding:storageVersion
// +cue-gen:HTTPAPISpecBinding:annotations:helm.sh/resource-policy=keep
// +cue-gen:HTTPAPISpecBinding:labels:app=istio-mixer,chart=istio,heritage=Tiller,release=istio
// +cue-gen:HTTPAPISpecBinding:subresource:status
// +cue-gen:HTTPAPISpecBinding:scope:Namespaced
// +cue-gen:HTTPAPISpecBinding:resource:categories=istio-io,apim-istio-io
// +cue-gen:HTTPAPISpecBinding:preserveUnknownFields:false
// -->
//
// <!-- go code generation tags
// +kubetype-gen
// +kubetype-gen:groupVersion=config.istio.io/v1alpha2

View File

@@ -85,6 +85,19 @@ option (gogoproto.stable_marshaler_all) = true;
// - query: api-key
// ```
//
// <!-- crd generation tags
// +cue-gen:HTTPAPISpec:schema:istio.mixer.v1.config.client.HTTPAPISpec
// +cue-gen:HTTPAPISpec:groupName:config.istio.io
// +cue-gen:HTTPAPISpec:version:v1alpha2
// +cue-gen:HTTPAPISpec:storageVersion
// +cue-gen:HTTPAPISpec:annotations:helm.sh/resource-policy=keep
// +cue-gen:HTTPAPISpec:labels:app=istio-mixer,chart=istio,heritage=Tiller,release=istio
// +cue-gen:HTTPAPISpec:subresource:status
// +cue-gen:HTTPAPISpec:scope:Namespaced
// +cue-gen:HTTPAPISpec:resource:categories=istio-io,apim-istio-io
// +cue-gen:HTTPAPISpec:preserveUnknownFields:false
// -->
//
// <!-- go code generation tags
// +kubetype-gen
// +kubetype-gen:groupVersion=config.istio.io/v1alpha2
@@ -148,14 +161,7 @@ message HTTPAPISpecPattern {
//
string uri_template = 3;
// EXPERIMENTAL:
//
// ecmascript style regex-based match as defined by
// [EDCA-262](http://en.cppreference.com/w/cpp/regex/ecmascript). For
// example,
//
// "^/pets/(.*?)?"
//
// RE2 style regex-based match (https://github.com/google/re2/wiki/Syntax)
string regex = 4;
}
}
@@ -239,6 +245,19 @@ message HTTPAPISpecReference {
// namespace: default
// ```
//
// <!-- crd generation tags
// +cue-gen:HTTPAPISpecBinding:schema:istio.mixer.v1.config.client.HTTPAPISpecBinding
// +cue-gen:HTTPAPISpecBinding:groupName:config.istio.io
// +cue-gen:HTTPAPISpecBinding:version:v1alpha2
// +cue-gen:HTTPAPISpecBinding:storageVersion
// +cue-gen:HTTPAPISpecBinding:annotations:helm.sh/resource-policy=keep
// +cue-gen:HTTPAPISpecBinding:labels:app=istio-mixer,chart=istio,heritage=Tiller,release=istio
// +cue-gen:HTTPAPISpecBinding:subresource:status
// +cue-gen:HTTPAPISpecBinding:scope:Namespaced
// +cue-gen:HTTPAPISpecBinding:resource:categories=istio-io,apim-istio-io
// +cue-gen:HTTPAPISpecBinding:preserveUnknownFields:false
// -->
//
// <!-- go code generation tags
// +kubetype-gen
// +kubetype-gen:groupVersion=config.istio.io/v1alpha2

View File

@@ -21,6 +21,10 @@ import "mixer/v1/attributes.proto";
import "mixer/v1/config/client/api_spec.proto";
import "mixer/v1/config/client/quota.proto";
// $schema: istio.mixer.v1.config.client.HTTPAPISpecBinding
// $schema: istio.mixer.v1.config.client.HTTPAPISpec
// $schema: istio.mixer.v1.config.client.QuotaSpecBinding
// $schema: istio.mixer.v1.config.client.QuotaSpec
// $title: Mixer Client
// $description: Configuration state for the Mixer client library.
// $location: https://istio.io/docs/reference/config/policy-and-telemetry/istio.mixer.v1.config.client

View File

@@ -32,20 +32,52 @@
"istio.mixer.v1.config.client.HTTPAPISpecPattern": {
"description": "HTTPAPISpecPattern defines a single pattern to match against incoming HTTP requests. The per-pattern list of attributes is generated if both the http_method and uri_template match. In addition, the top-level list of attributes in the HTTPAPISpec is also generated.",
"type": "object",
"properties": {
"attributes": {
"$ref": "#/components/schemas/istio.mixer.v1.Attributes"
},
"httpMethod": {
"description": "HTTP request method to match against as defined by [rfc7231](https://tools.ietf.org/html/rfc7231#page-21). For example: GET, HEAD, POST, PUT, DELETE.",
"type": "string",
"format": "string"
}
},
"oneOf": [
{
"not": {
"anyOf": [
{
"required": [
"uriTemplate"
],
"properties": {
"uriTemplate": {
"description": "URI template to match against as defined by [rfc6570](https://tools.ietf.org/html/rfc6570). For example, the following are valid URI templates: /pets /pets/{id} /dictionary/{term:1}/{term} /search{?q*,lang}",
"type": "string",
"format": "string"
}
}
},
{
"required": [
"regex"
],
"properties": {
"regex": {
"description": "RE2 style regex-based match (https://github.com/google/re2/wiki/Syntax)",
"type": "string",
"format": "string"
}
}
}
]
}
},
{
"required": [
"uriTemplate"
],
"properties": {
"attributes": {
"$ref": "#/components/schemas/istio.mixer.v1.Attributes"
},
"httpMethod": {
"description": "HTTP request method to match against as defined by [rfc7231](https://tools.ietf.org/html/rfc7231#page-21). For example: GET, HEAD, POST, PUT, DELETE.",
"type": "string",
"format": "string"
},
"uriTemplate": {
"description": "URI template to match against as defined by [rfc6570](https://tools.ietf.org/html/rfc6570). For example, the following are valid URI templates: /pets /pets/{id} /dictionary/{term:1}/{term} /search{?q*,lang}",
"type": "string",
@@ -58,16 +90,8 @@
"regex"
],
"properties": {
"attributes": {
"$ref": "#/components/schemas/istio.mixer.v1.Attributes"
},
"regex": {
"description": "EXPERIMENTAL: ecmascript style regex-based match as defined by [EDCA-262](http://en.cppreference.com/w/cpp/regex/ecmascript). For example,",
"type": "string",
"format": "string"
},
"httpMethod": {
"description": "HTTP request method to match against as defined by [rfc7231](https://tools.ietf.org/html/rfc7231#page-21). For example: GET, HEAD, POST, PUT, DELETE.",
"description": "RE2 style regex-based match (https://github.com/google/re2/wiki/Syntax)",
"type": "string",
"format": "string"
}
@@ -79,6 +103,48 @@
"description": "APIKey defines the explicit configuration for generating the `request.api_key` attribute from HTTP requests.",
"type": "object",
"oneOf": [
{
"not": {
"anyOf": [
{
"required": [
"query"
],
"properties": {
"query": {
"description": "API Key is sent as a query parameter. `query` represents the query string parameter name.",
"type": "string",
"format": "string"
}
}
},
{
"required": [
"header"
],
"properties": {
"header": {
"description": "API key is sent in a request header. `header` represents the header name.",
"type": "string",
"format": "string"
}
}
},
{
"required": [
"cookie"
],
"properties": {
"cookie": {
"description": "API key is sent in a [cookie](https://swagger.io/docs/specification/authentication/cookie-authentication),",
"type": "string",
"format": "string"
}
}
}
]
}
},
{
"required": [
"query"
@@ -423,6 +489,48 @@
"description": "Describes how to match a given string in HTTP headers. Match is case-sensitive.",
"type": "object",
"oneOf": [
{
"not": {
"anyOf": [
{
"required": [
"exact"
],
"properties": {
"exact": {
"description": "exact string match",
"type": "string",
"format": "string"
}
}
},
{
"required": [
"prefix"
],
"properties": {
"prefix": {
"description": "prefix-based match",
"type": "string",
"format": "string"
}
}
},
{
"required": [
"regex"
],
"properties": {
"regex": {
"description": "RE2 style regex-based match (https://github.com/google/re2/wiki/Syntax).",
"type": "string",
"format": "string"
}
}
}
]
}
},
{
"required": [
"exact"
@@ -453,7 +561,7 @@
],
"properties": {
"regex": {
"description": "ECMAscript style regex-based match",
"description": "RE2 style regex-based match (https://github.com/google/re2/wiki/Syntax).",
"type": "string",
"format": "string"
}
@@ -513,6 +621,104 @@
"istio.mixer.v1.Attributes.AttributeValue": {
"type": "object",
"oneOf": [
{
"not": {
"anyOf": [
{
"required": [
"stringValue"
],
"properties": {
"stringValue": {
"description": "Used for values of type STRING, DNS_NAME, EMAIL_ADDRESS, and URI",
"type": "string",
"format": "string"
}
}
},
{
"required": [
"int64Value"
],
"properties": {
"int64Value": {
"description": "Used for values of type INT64",
"type": "integer",
"format": "int64"
}
}
},
{
"required": [
"doubleValue"
],
"properties": {
"doubleValue": {
"description": "Used for values of type DOUBLE",
"type": "number",
"format": "double"
}
}
},
{
"required": [
"boolValue"
],
"properties": {
"boolValue": {
"description": "Used for values of type BOOL",
"type": "boolean"
}
}
},
{
"required": [
"bytesValue"
],
"properties": {
"bytesValue": {
"description": "Used for values of type BYTES",
"type": "string",
"format": "binary"
}
}
},
{
"required": [
"timestampValue"
],
"properties": {
"timestampValue": {
"description": "Used for values of type TIMESTAMP",
"type": "string",
"format": "dateTime"
}
}
},
{
"required": [
"durationValue"
],
"properties": {
"durationValue": {
"description": "Used for values of type DURATION",
"type": "string"
}
}
},
{
"required": [
"stringMapValue"
],
"properties": {
"stringMapValue": {
"$ref": "#/components/schemas/istio.mixer.v1.Attributes.StringMap"
}
}
}
]
}
},
{
"required": [
"stringValue"

File diff suppressed because it is too large Load Diff

View File

@@ -29,6 +29,19 @@ const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package
// Determines the quotas used for individual requests.
//
// <!-- crd generation tags
// +cue-gen:QuotaSpec:schema:istio.mixer.v1.config.client.QuotaSpec
// +cue-gen:QuotaSpec:groupName:config.istio.io
// +cue-gen:QuotaSpec:version:v1alpha2
// +cue-gen:QuotaSpec:storageVersion
// +cue-gen:QuotaSpec:annotations:helm.sh/resource-policy=keep
// +cue-gen:QuotaSpec:labels:app=istio-mixer,chart=istio,heritage=Tiller,release=istio
// +cue-gen:QuotaSpec:subresource:status
// +cue-gen:QuotaSpec:scope:Namespaced
// +cue-gen:QuotaSpec:resource:categories=istio-io,apim-istio-io
// +cue-gen:QuotaSpec:preserveUnknownFields:false
// -->
//
// <!-- go code generation tags
// +kubetype-gen
// +kubetype-gen:groupVersion=config.istio.io/v1alpha2
@@ -283,6 +296,19 @@ var xxx_messageInfo_Quota proto.InternalMessageInfo
// QuotaSpecBinding defines the binding between QuotaSpecs and one or more
// IstioService.
//
// <!-- crd generation tags
// +cue-gen:QuotaSpecBinding:schema:istio.mixer.v1.config.client.QuotaSpecBinding
// +cue-gen:QuotaSpecBinding:groupName:config.istio.io
// +cue-gen:QuotaSpecBinding:version:v1alpha2
// +cue-gen:QuotaSpecBinding:storageVersion
// +cue-gen:QuotaSpecBinding:annotations:helm.sh/resource-policy=keep
// +cue-gen:QuotaSpecBinding:labels:app=istio-mixer,chart=istio,heritage=Tiller,release=istio
// +cue-gen:QuotaSpecBinding:subresource:status
// +cue-gen:QuotaSpecBinding:scope:Namespaced
// +cue-gen:QuotaSpecBinding:resource:categories=istio-io,apim-istio-io
// +cue-gen:QuotaSpecBinding:preserveUnknownFields:false
// -->
//
// <!-- go code generation tags
// +kubetype-gen
// +kubetype-gen:groupVersion=config.istio.io/v1alpha2
@@ -376,7 +402,9 @@ func init() {
proto.RegisterType((*QuotaSpecBinding_QuotaSpecReference)(nil), "istio.mixer.v1.config.client.QuotaSpecBinding.QuotaSpecReference")
}
func init() { proto.RegisterFile("mixer/v1/config/client/quota.proto", fileDescriptor_81777b5d047af315) }
func init() {
proto.RegisterFile("mixer/v1/config/client/quota.proto", fileDescriptor_81777b5d047af315)
}
var fileDescriptor_81777b5d047af315 = []byte{
// 569 bytes of a gzipped FileDescriptorProto

View File

@@ -69,6 +69,19 @@ option (gogoproto.stable_marshaler_all) = true;
// Determines the quotas used for individual requests.
//
// <!-- crd generation tags
// +cue-gen:QuotaSpec:schema:istio.mixer.v1.config.client.QuotaSpec
// +cue-gen:QuotaSpec:groupName:config.istio.io
// +cue-gen:QuotaSpec:version:v1alpha2
// +cue-gen:QuotaSpec:storageVersion
// +cue-gen:QuotaSpec:annotations:helm.sh/resource-policy=keep
// +cue-gen:QuotaSpec:labels:app=istio-mixer,chart=istio,heritage=Tiller,release=istio
// +cue-gen:QuotaSpec:subresource:status
// +cue-gen:QuotaSpec:scope:Namespaced
// +cue-gen:QuotaSpec:resource:categories=istio-io,apim-istio-io
// +cue-gen:QuotaSpec:preserveUnknownFields:false
// -->
//
// <!-- go code generation tags
// +kubetype-gen
// +kubetype-gen:groupVersion=config.istio.io/v1alpha2
@@ -95,11 +108,14 @@ message QuotaRule {
// case-sensitive.
message StringMatch {
oneof match_type {
// exact string match
string exact = 1;
// prefix-based match
string prefix = 2;
// ECMAscript style regex-based match
// RE2 style regex-based match (https://github.com/google/re2/wiki/Syntax).
string regex = 3;
}
}
@@ -131,6 +147,19 @@ message Quota {
// QuotaSpecBinding defines the binding between QuotaSpecs and one or more
// IstioService.
//
// <!-- crd generation tags
// +cue-gen:QuotaSpecBinding:schema:istio.mixer.v1.config.client.QuotaSpecBinding
// +cue-gen:QuotaSpecBinding:groupName:config.istio.io
// +cue-gen:QuotaSpecBinding:version:v1alpha2
// +cue-gen:QuotaSpecBinding:storageVersion
// +cue-gen:QuotaSpecBinding:annotations:helm.sh/resource-policy=keep
// +cue-gen:QuotaSpecBinding:labels:app=istio-mixer,chart=istio,heritage=Tiller,release=istio
// +cue-gen:QuotaSpecBinding:subresource:status
// +cue-gen:QuotaSpecBinding:scope:Namespaced
// +cue-gen:QuotaSpecBinding:resource:categories=istio-io,apim-istio-io
// +cue-gen:QuotaSpecBinding:preserveUnknownFields:false
// -->
//
// <!-- go code generation tags
// +kubetype-gen
// +kubetype-gen:groupVersion=config.istio.io/v1alpha2