From 7b7f9b63128059aa5a14ee0f9104a567657e1e6a Mon Sep 17 00:00:00 2001 From: Shriram Rajagopalan Date: Mon, 25 Feb 2019 15:19:12 -0500 Subject: [PATCH 1/3] update istio/tools Signed-off-by: Shriram Rajagopalan --- .circleci/config.yml | 2 +- Makefile | 6 +- authentication/v1alpha1/policy.pb.go | 877 +++++-- .../filter/http/authn/v2alpha1/config.pb.go | 179 +- .../http/jwt_auth/v2alpha1/config.pb.go | 2173 ---------------- .../http/jwt_auth/v2alpha1/config.proto | 4 +- .../tcp_cluster_rewrite/v2alpha1/config.pb.go | 346 --- mcp/v1alpha1/mcp.pb.go | 831 ++++-- mcp/v1alpha1/metadata.pb.go | 204 +- mcp/v1alpha1/resource.pb.go | 146 +- mesh/v1alpha1/config.pb.go | 800 ++++-- mesh/v1alpha1/network.pb.go | 374 ++- mesh/v1alpha1/proxy.pb.go | 552 ++-- mixer/adapter/model/v1beta1/check.pb.go | 188 +- mixer/adapter/model/v1beta1/extensions.pb.go | 98 +- mixer/adapter/model/v1beta1/info.pb.go | 145 +- .../v1beta1/infrastructure_backend.pb.go | 503 +++- mixer/adapter/model/v1beta1/quota.pb.go | 347 ++- mixer/adapter/model/v1beta1/report.pb.go | 113 +- mixer/adapter/model/v1beta1/template.pb.go | 117 +- mixer/v1/attributes.pb.go | 691 +++-- mixer/v1/config/client/api_spec.pb.go | 462 +++- mixer/v1/config/client/client_config.pb.go | 606 +++-- mixer/v1/config/client/quota.pb.go | 506 +++- mixer/v1/config/client/service.pb.go | 173 +- mixer/v1/mixer.pb.go | 903 +++++-- networking/v1alpha3/destination_rule.pb.go | 1256 ++++++--- networking/v1alpha3/envoy_filter.pb.go | 442 +++- networking/v1alpha3/gateway.pb.go | 468 +++- networking/v1alpha3/service_entry.pb.go | 320 ++- networking/v1alpha3/sidecar.pb.go | 405 ++- networking/v1alpha3/virtual_service.pb.go | 2246 +++++++++++++---- policy/v1beta1/cfg.pb.go | 1365 +++++++--- policy/v1beta1/http_response.pb.go | 259 +- policy/v1beta1/type.pb.go | 565 ++++- policy/v1beta1/value_type.pb.go | 74 +- rbac/v1alpha1/rbac.pb.go | 1157 ++++++--- tools/all/Dockerfile | 2 +- tools/all/build-and-push.sh | 5 +- tools/protoc/build-and-push.sh | 5 +- 40 files changed, 13021 insertions(+), 6894 deletions(-) delete mode 100644 envoy/config/filter/http/jwt_auth/v2alpha1/config.pb.go delete mode 100644 envoy/config/filter/network/tcp_cluster_rewrite/v2alpha1/config.pb.go diff --git a/.circleci/config.yml b/.circleci/config.yml index a3edfcf89f0..048a8d72cc2 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -2,7 +2,7 @@ version: 2 defaults: &defaults working_directory: /src/istio.io/api docker: - - image: gcr.io/istio-testing/api-build-tools:2018-10-31 + - image: docker.io/rshriram/api-build-tools:2019-02-25 environment: GOPATH: /go OUT_PATH: /src diff --git a/Makefile b/Makefile index 5d804e31ac5..11836164658 100644 --- a/Makefile +++ b/Makefile @@ -13,9 +13,9 @@ out_path = $(OUT_PATH) docker_lock = protolock docker_tool = prototool else -gen_img := gcr.io/istio-testing/protoc:2018-06-12 +gen_img := docker.io/rshriram/protoc:2019-02-25 lock_img := gcr.io/istio-testing/protolock:2018-10-23 -all_img := gcr.io/istio-testing/api-build-tools:2018-10-31 +all_img := docker.io/rshriram/api-build-tools:2019-02-25 pwd := $(shell pwd) mount_dir := /src repo_dir := istio.io/api @@ -331,7 +331,7 @@ generate-envoy-go: $(envoy_pb_gos) $(envoy_pb_doc) $(envoy_pb_gos): $(envoy_protos) ## Generate envoy/*/*.pb.go @$(docker_lock) status - @$(docker_gen) $(gogofast_plugin) $^ + @$(docker_gen) $(gogofast_plugin) $< generate-envoy-python: $(envoy_pb_pythons) diff --git a/authentication/v1alpha1/policy.pb.go b/authentication/v1alpha1/policy.pb.go index e8592ef4a31..0954be05da2 100644 --- a/authentication/v1alpha1/policy.pb.go +++ b/authentication/v1alpha1/policy.pb.go @@ -1,31 +1,16 @@ // Code generated by protoc-gen-gogo. DO NOT EDIT. // source: authentication/v1alpha1/policy.proto -/* - Package v1alpha1 is a generated protocol buffer package. - - This package defines user-facing authentication policy. - - It is generated from these files: - authentication/v1alpha1/policy.proto - - It has these top-level messages: - StringMatch - MutualTls - Jwt - PeerAuthenticationMethod - OriginAuthenticationMethod - Policy - TargetSelector - PortSelector -*/ -package v1alpha1 +// This package defines user-facing authentication policy. -import proto "github.com/gogo/protobuf/proto" -import fmt "fmt" -import math "math" +package v1alpha1 -import io "io" +import ( + fmt "fmt" + proto "github.com/gogo/protobuf/proto" + io "io" + math "math" +) // Reference imports to suppress errors if they are not otherwise used. var _ = proto.Marshal @@ -52,6 +37,7 @@ var PrincipalBinding_name = map[int32]string{ 0: "USE_PEER", 1: "USE_ORIGIN", } + var PrincipalBinding_value = map[string]int32{ "USE_PEER": 0, "USE_ORIGIN": 1, @@ -60,7 +46,10 @@ var PrincipalBinding_value = map[string]int32{ func (x PrincipalBinding) String() string { return proto.EnumName(PrincipalBinding_name, int32(x)) } -func (PrincipalBinding) EnumDescriptor() ([]byte, []int) { return fileDescriptorPolicy, []int{0} } + +func (PrincipalBinding) EnumDescriptor() ([]byte, []int) { + return fileDescriptor_30ec3f7cef93301a, []int{0} +} // Defines the acceptable connection TLS mode. type MutualTls_Mode int32 @@ -76,6 +65,7 @@ var MutualTls_Mode_name = map[int32]string{ 0: "STRICT", 1: "PERMISSIVE", } + var MutualTls_Mode_value = map[string]int32{ "STRICT": 0, "PERMISSIVE": 1, @@ -84,7 +74,10 @@ var MutualTls_Mode_value = map[string]int32{ func (x MutualTls_Mode) String() string { return proto.EnumName(MutualTls_Mode_name, int32(x)) } -func (MutualTls_Mode) EnumDescriptor() ([]byte, []int) { return fileDescriptorPolicy, []int{1, 0} } + +func (MutualTls_Mode) EnumDescriptor() ([]byte, []int) { + return fileDescriptor_30ec3f7cef93301a, []int{1, 0} +} // Describes how to match a given string. Match is case-sensitive. type StringMatch struct { @@ -93,13 +86,44 @@ type StringMatch struct { // *StringMatch_Prefix // *StringMatch_Suffix // *StringMatch_Regex - MatchType isStringMatch_MatchType `protobuf_oneof:"match_type"` + MatchType isStringMatch_MatchType `protobuf_oneof:"match_type"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` +} + +func (m *StringMatch) Reset() { *m = StringMatch{} } +func (m *StringMatch) String() string { return proto.CompactTextString(m) } +func (*StringMatch) ProtoMessage() {} +func (*StringMatch) Descriptor() ([]byte, []int) { + return fileDescriptor_30ec3f7cef93301a, []int{0} +} +func (m *StringMatch) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *StringMatch) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_StringMatch.Marshal(b, m, deterministic) + } else { + b = b[:cap(b)] + n, err := m.MarshalTo(b) + if err != nil { + return nil, err + } + return b[:n], nil + } +} +func (m *StringMatch) XXX_Merge(src proto.Message) { + xxx_messageInfo_StringMatch.Merge(m, src) +} +func (m *StringMatch) XXX_Size() int { + return m.Size() +} +func (m *StringMatch) XXX_DiscardUnknown() { + xxx_messageInfo_StringMatch.DiscardUnknown(m) } -func (m *StringMatch) Reset() { *m = StringMatch{} } -func (m *StringMatch) String() string { return proto.CompactTextString(m) } -func (*StringMatch) ProtoMessage() {} -func (*StringMatch) Descriptor() ([]byte, []int) { return fileDescriptorPolicy, []int{0} } +var xxx_messageInfo_StringMatch proto.InternalMessageInfo type isStringMatch_MatchType interface { isStringMatch_MatchType() @@ -234,19 +258,19 @@ func _StringMatch_OneofSizer(msg proto.Message) (n int) { // match_type switch x := m.MatchType.(type) { case *StringMatch_Exact: - n += proto.SizeVarint(1<<3 | proto.WireBytes) + n += 1 // tag and wire n += proto.SizeVarint(uint64(len(x.Exact))) n += len(x.Exact) case *StringMatch_Prefix: - n += proto.SizeVarint(2<<3 | proto.WireBytes) + n += 1 // tag and wire n += proto.SizeVarint(uint64(len(x.Prefix))) n += len(x.Prefix) case *StringMatch_Suffix: - n += proto.SizeVarint(3<<3 | proto.WireBytes) + n += 1 // tag and wire n += proto.SizeVarint(uint64(len(x.Suffix))) n += len(x.Suffix) case *StringMatch_Regex: - n += proto.SizeVarint(4<<3 | proto.WireBytes) + n += 1 // tag and wire n += proto.SizeVarint(uint64(len(x.Regex))) n += len(x.Regex) case nil: @@ -266,13 +290,44 @@ type MutualTls struct { // When the flag is false (default), request must have client certificate. AllowTls bool `protobuf:"varint,1,opt,name=allow_tls,json=allowTls,proto3" json:"allow_tls,omitempty"` // Defines the mode of mTLS authentication. - Mode MutualTls_Mode `protobuf:"varint,2,opt,name=mode,proto3,enum=istio.authentication.v1alpha1.MutualTls_Mode" json:"mode,omitempty"` + Mode MutualTls_Mode `protobuf:"varint,2,opt,name=mode,proto3,enum=istio.authentication.v1alpha1.MutualTls_Mode" json:"mode,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` +} + +func (m *MutualTls) Reset() { *m = MutualTls{} } +func (m *MutualTls) String() string { return proto.CompactTextString(m) } +func (*MutualTls) ProtoMessage() {} +func (*MutualTls) Descriptor() ([]byte, []int) { + return fileDescriptor_30ec3f7cef93301a, []int{1} +} +func (m *MutualTls) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *MutualTls) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_MutualTls.Marshal(b, m, deterministic) + } else { + b = b[:cap(b)] + n, err := m.MarshalTo(b) + if err != nil { + return nil, err + } + return b[:n], nil + } +} +func (m *MutualTls) XXX_Merge(src proto.Message) { + xxx_messageInfo_MutualTls.Merge(m, src) +} +func (m *MutualTls) XXX_Size() int { + return m.Size() +} +func (m *MutualTls) XXX_DiscardUnknown() { + xxx_messageInfo_MutualTls.DiscardUnknown(m) } -func (m *MutualTls) Reset() { *m = MutualTls{} } -func (m *MutualTls) String() string { return proto.CompactTextString(m) } -func (*MutualTls) ProtoMessage() {} -func (*MutualTls) Descriptor() ([]byte, []int) { return fileDescriptorPolicy, []int{1} } +var xxx_messageInfo_MutualTls proto.InternalMessageInfo func (m *MutualTls) GetAllowTls() bool { if m != nil { @@ -365,7 +420,7 @@ type Jwt struct { // - bookstore_android.apps.googleusercontent.com // bookstore_web.apps.googleusercontent.com // ``` - Audiences []string `protobuf:"bytes,2,rep,name=audiences" json:"audiences,omitempty"` + Audiences []string `protobuf:"bytes,2,rep,name=audiences,proto3" json:"audiences,omitempty"` // URL of the provider's public key set to validate signature of the // JWT. See [OpenID // Discovery](https://openid.net/specs/openid-connect-discovery-1_0.html#ProviderMetadata). @@ -383,24 +438,55 @@ type Jwt struct { // // For example, if `header=x-goog-iap-jwt-assertion`, the header // format will be x-goog-iap-jwt-assertion: . - JwtHeaders []string `protobuf:"bytes,6,rep,name=jwt_headers,json=jwtHeaders" json:"jwt_headers,omitempty"` + JwtHeaders []string `protobuf:"bytes,6,rep,name=jwt_headers,json=jwtHeaders,proto3" json:"jwt_headers,omitempty"` // JWT is sent in a query parameter. `query` represents the // query parameter name. // // For example, `query=jwt_token`. - JwtParams []string `protobuf:"bytes,7,rep,name=jwt_params,json=jwtParams" json:"jwt_params,omitempty"` + JwtParams []string `protobuf:"bytes,7,rep,name=jwt_params,json=jwtParams,proto3" json:"jwt_params,omitempty"` // List of trigger rules to decide if this JWT should be used to validate the // request. The JWT validation happens if any one of the rules matched. // If the list is not empty and none of the rules matched, authentication will // skip the JWT validation. // Leave this empty to always trigger the JWT validation. - TriggerRules []*Jwt_TriggerRule `protobuf:"bytes,9,rep,name=trigger_rules,json=triggerRules" json:"trigger_rules,omitempty"` + TriggerRules []*Jwt_TriggerRule `protobuf:"bytes,9,rep,name=trigger_rules,json=triggerRules,proto3" json:"trigger_rules,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` +} + +func (m *Jwt) Reset() { *m = Jwt{} } +func (m *Jwt) String() string { return proto.CompactTextString(m) } +func (*Jwt) ProtoMessage() {} +func (*Jwt) Descriptor() ([]byte, []int) { + return fileDescriptor_30ec3f7cef93301a, []int{2} +} +func (m *Jwt) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *Jwt) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_Jwt.Marshal(b, m, deterministic) + } else { + b = b[:cap(b)] + n, err := m.MarshalTo(b) + if err != nil { + return nil, err + } + return b[:n], nil + } +} +func (m *Jwt) XXX_Merge(src proto.Message) { + xxx_messageInfo_Jwt.Merge(m, src) +} +func (m *Jwt) XXX_Size() int { + return m.Size() +} +func (m *Jwt) XXX_DiscardUnknown() { + xxx_messageInfo_Jwt.DiscardUnknown(m) } -func (m *Jwt) Reset() { *m = Jwt{} } -func (m *Jwt) String() string { return proto.CompactTextString(m) } -func (*Jwt) ProtoMessage() {} -func (*Jwt) Descriptor() ([]byte, []int) { return fileDescriptorPolicy, []int{2} } +var xxx_messageInfo_Jwt proto.InternalMessageInfo func (m *Jwt) GetIssuer() string { if m != nil { @@ -449,17 +535,48 @@ func (m *Jwt) GetTriggerRules() []*Jwt_TriggerRule { type Jwt_TriggerRule struct { // List of paths to be excluded from the request. The rule is satisfied if // request path does not match to any of the path in this list. - ExcludedPaths []*StringMatch `protobuf:"bytes,1,rep,name=excluded_paths,json=excludedPaths" json:"excluded_paths,omitempty"` + ExcludedPaths []*StringMatch `protobuf:"bytes,1,rep,name=excluded_paths,json=excludedPaths,proto3" json:"excluded_paths,omitempty"` // List of paths that the request must include. If the list is not empty, the // rule is satisfied if request path matches at least one of the path in the list. // If the list is empty, the rule is ignored, in other words the rule is always satisfied. - IncludedPaths []*StringMatch `protobuf:"bytes,2,rep,name=included_paths,json=includedPaths" json:"included_paths,omitempty"` + IncludedPaths []*StringMatch `protobuf:"bytes,2,rep,name=included_paths,json=includedPaths,proto3" json:"included_paths,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` +} + +func (m *Jwt_TriggerRule) Reset() { *m = Jwt_TriggerRule{} } +func (m *Jwt_TriggerRule) String() string { return proto.CompactTextString(m) } +func (*Jwt_TriggerRule) ProtoMessage() {} +func (*Jwt_TriggerRule) Descriptor() ([]byte, []int) { + return fileDescriptor_30ec3f7cef93301a, []int{2, 0} +} +func (m *Jwt_TriggerRule) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *Jwt_TriggerRule) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_Jwt_TriggerRule.Marshal(b, m, deterministic) + } else { + b = b[:cap(b)] + n, err := m.MarshalTo(b) + if err != nil { + return nil, err + } + return b[:n], nil + } +} +func (m *Jwt_TriggerRule) XXX_Merge(src proto.Message) { + xxx_messageInfo_Jwt_TriggerRule.Merge(m, src) +} +func (m *Jwt_TriggerRule) XXX_Size() int { + return m.Size() +} +func (m *Jwt_TriggerRule) XXX_DiscardUnknown() { + xxx_messageInfo_Jwt_TriggerRule.DiscardUnknown(m) } -func (m *Jwt_TriggerRule) Reset() { *m = Jwt_TriggerRule{} } -func (m *Jwt_TriggerRule) String() string { return proto.CompactTextString(m) } -func (*Jwt_TriggerRule) ProtoMessage() {} -func (*Jwt_TriggerRule) Descriptor() ([]byte, []int) { return fileDescriptorPolicy, []int{2, 0} } +var xxx_messageInfo_Jwt_TriggerRule proto.InternalMessageInfo func (m *Jwt_TriggerRule) GetExcludedPaths() []*StringMatch { if m != nil { @@ -484,13 +601,44 @@ type PeerAuthenticationMethod struct { // Types that are valid to be assigned to Params: // *PeerAuthenticationMethod_Mtls // *PeerAuthenticationMethod_Jwt - Params isPeerAuthenticationMethod_Params `protobuf_oneof:"params"` + Params isPeerAuthenticationMethod_Params `protobuf_oneof:"params"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` +} + +func (m *PeerAuthenticationMethod) Reset() { *m = PeerAuthenticationMethod{} } +func (m *PeerAuthenticationMethod) String() string { return proto.CompactTextString(m) } +func (*PeerAuthenticationMethod) ProtoMessage() {} +func (*PeerAuthenticationMethod) Descriptor() ([]byte, []int) { + return fileDescriptor_30ec3f7cef93301a, []int{3} +} +func (m *PeerAuthenticationMethod) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *PeerAuthenticationMethod) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_PeerAuthenticationMethod.Marshal(b, m, deterministic) + } else { + b = b[:cap(b)] + n, err := m.MarshalTo(b) + if err != nil { + return nil, err + } + return b[:n], nil + } +} +func (m *PeerAuthenticationMethod) XXX_Merge(src proto.Message) { + xxx_messageInfo_PeerAuthenticationMethod.Merge(m, src) +} +func (m *PeerAuthenticationMethod) XXX_Size() int { + return m.Size() +} +func (m *PeerAuthenticationMethod) XXX_DiscardUnknown() { + xxx_messageInfo_PeerAuthenticationMethod.DiscardUnknown(m) } -func (m *PeerAuthenticationMethod) Reset() { *m = PeerAuthenticationMethod{} } -func (m *PeerAuthenticationMethod) String() string { return proto.CompactTextString(m) } -func (*PeerAuthenticationMethod) ProtoMessage() {} -func (*PeerAuthenticationMethod) Descriptor() ([]byte, []int) { return fileDescriptorPolicy, []int{3} } +var xxx_messageInfo_PeerAuthenticationMethod proto.InternalMessageInfo type isPeerAuthenticationMethod_Params interface { isPeerAuthenticationMethod_Params() @@ -499,10 +647,10 @@ type isPeerAuthenticationMethod_Params interface { } type PeerAuthenticationMethod_Mtls struct { - Mtls *MutualTls `protobuf:"bytes,1,opt,name=mtls,oneof"` + Mtls *MutualTls `protobuf:"bytes,1,opt,name=mtls,proto3,oneof"` } type PeerAuthenticationMethod_Jwt struct { - Jwt *Jwt `protobuf:"bytes,2,opt,name=jwt,oneof"` + Jwt *Jwt `protobuf:"bytes,2,opt,name=jwt,proto3,oneof"` } func (*PeerAuthenticationMethod_Mtls) isPeerAuthenticationMethod_Params() {} @@ -588,12 +736,12 @@ func _PeerAuthenticationMethod_OneofSizer(msg proto.Message) (n int) { switch x := m.Params.(type) { case *PeerAuthenticationMethod_Mtls: s := proto.Size(x.Mtls) - n += proto.SizeVarint(1<<3 | proto.WireBytes) + n += 1 // tag and wire n += proto.SizeVarint(uint64(s)) n += s case *PeerAuthenticationMethod_Jwt: s := proto.Size(x.Jwt) - n += proto.SizeVarint(2<<3 | proto.WireBytes) + n += 1 // tag and wire n += proto.SizeVarint(uint64(s)) n += s case nil: @@ -608,13 +756,44 @@ func _PeerAuthenticationMethod_OneofSizer(msg proto.Message) (n int) { // Currently, only JWT is supported for origin authentication. type OriginAuthenticationMethod struct { // Jwt params for the method. - Jwt *Jwt `protobuf:"bytes,1,opt,name=jwt" json:"jwt,omitempty"` + Jwt *Jwt `protobuf:"bytes,1,opt,name=jwt,proto3" json:"jwt,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` +} + +func (m *OriginAuthenticationMethod) Reset() { *m = OriginAuthenticationMethod{} } +func (m *OriginAuthenticationMethod) String() string { return proto.CompactTextString(m) } +func (*OriginAuthenticationMethod) ProtoMessage() {} +func (*OriginAuthenticationMethod) Descriptor() ([]byte, []int) { + return fileDescriptor_30ec3f7cef93301a, []int{4} +} +func (m *OriginAuthenticationMethod) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *OriginAuthenticationMethod) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_OriginAuthenticationMethod.Marshal(b, m, deterministic) + } else { + b = b[:cap(b)] + n, err := m.MarshalTo(b) + if err != nil { + return nil, err + } + return b[:n], nil + } +} +func (m *OriginAuthenticationMethod) XXX_Merge(src proto.Message) { + xxx_messageInfo_OriginAuthenticationMethod.Merge(m, src) +} +func (m *OriginAuthenticationMethod) XXX_Size() int { + return m.Size() +} +func (m *OriginAuthenticationMethod) XXX_DiscardUnknown() { + xxx_messageInfo_OriginAuthenticationMethod.DiscardUnknown(m) } -func (m *OriginAuthenticationMethod) Reset() { *m = OriginAuthenticationMethod{} } -func (m *OriginAuthenticationMethod) String() string { return proto.CompactTextString(m) } -func (*OriginAuthenticationMethod) ProtoMessage() {} -func (*OriginAuthenticationMethod) Descriptor() ([]byte, []int) { return fileDescriptorPolicy, []int{4} } +var xxx_messageInfo_OriginAuthenticationMethod proto.InternalMessageInfo func (m *OriginAuthenticationMethod) GetJwt() *Jwt { if m != nil { @@ -697,13 +876,13 @@ func (m *OriginAuthenticationMethod) GetJwt() *Jwt { type Policy struct { // List rules to select workloads that the policy should be applied on. // If empty, policy will be used on all workloads in the same namespace. - Targets []*TargetSelector `protobuf:"bytes,1,rep,name=targets" json:"targets,omitempty"` + Targets []*TargetSelector `protobuf:"bytes,1,rep,name=targets,proto3" json:"targets,omitempty"` // List of authentication methods that can be used for peer authentication. // They will be evaluated in order; the first validate one will be used to // set peer identity (source.user) and other peer attributes. If none of // these methods pass, request will be rejected with authentication failed error (401). // Leave the list empty if peer authentication is not required - Peers []*PeerAuthenticationMethod `protobuf:"bytes,2,rep,name=peers" json:"peers,omitempty"` + Peers []*PeerAuthenticationMethod `protobuf:"bytes,2,rep,name=peers,proto3" json:"peers,omitempty"` // Set this flag to true to accept request (for peer authentication perspective), // even when none of the peer authentication methods defined above satisfied. // Typically, this is used to delay the rejection decision to next layer (e.g @@ -718,7 +897,7 @@ type Policy struct { // A method may be skipped, depends on its trigger rule. If all of these methods // are skipped, origin authentication will be ignored, as if it is not defined. // Leave the list empty if origin authentication is not required. - Origins []*OriginAuthenticationMethod `protobuf:"bytes,4,rep,name=origins" json:"origins,omitempty"` + Origins []*OriginAuthenticationMethod `protobuf:"bytes,4,rep,name=origins,proto3" json:"origins,omitempty"` // Set this flag to true to accept request (for origin authentication perspective), // even when none of the origin authentication methods defined above satisfied. // Typically, this is used to delay the rejection decision to next layer (e.g @@ -731,13 +910,44 @@ type Policy struct { // authentication is not defined, or failed, principal will be left unset. // In other words, binding rule does not affect the decision to accept or // reject request. - PrincipalBinding PrincipalBinding `protobuf:"varint,6,opt,name=principal_binding,json=principalBinding,proto3,enum=istio.authentication.v1alpha1.PrincipalBinding" json:"principal_binding,omitempty"` + PrincipalBinding PrincipalBinding `protobuf:"varint,6,opt,name=principal_binding,json=principalBinding,proto3,enum=istio.authentication.v1alpha1.PrincipalBinding" json:"principal_binding,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` +} + +func (m *Policy) Reset() { *m = Policy{} } +func (m *Policy) String() string { return proto.CompactTextString(m) } +func (*Policy) ProtoMessage() {} +func (*Policy) Descriptor() ([]byte, []int) { + return fileDescriptor_30ec3f7cef93301a, []int{5} +} +func (m *Policy) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *Policy) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_Policy.Marshal(b, m, deterministic) + } else { + b = b[:cap(b)] + n, err := m.MarshalTo(b) + if err != nil { + return nil, err + } + return b[:n], nil + } +} +func (m *Policy) XXX_Merge(src proto.Message) { + xxx_messageInfo_Policy.Merge(m, src) +} +func (m *Policy) XXX_Size() int { + return m.Size() +} +func (m *Policy) XXX_DiscardUnknown() { + xxx_messageInfo_Policy.DiscardUnknown(m) } -func (m *Policy) Reset() { *m = Policy{} } -func (m *Policy) String() string { return proto.CompactTextString(m) } -func (*Policy) ProtoMessage() {} -func (*Policy) Descriptor() ([]byte, []int) { return fileDescriptorPolicy, []int{5} } +var xxx_messageInfo_Policy proto.InternalMessageInfo func (m *Policy) GetTargets() []*TargetSelector { if m != nil { @@ -791,7 +1001,7 @@ type TargetSelector struct { // $not-implemented-hide // Select workload by labels. // Once implemented, this is a prefer way over using service name. - Labels map[string]string `protobuf:"bytes,3,rep,name=labels" json:"labels,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` + Labels map[string]string `protobuf:"bytes,3,rep,name=labels,proto3" json:"labels,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` // Specifies the ports. Note that this is the port(s) exposed by the service, not workload ports. // For example, if a service is defined as below, then `8000` should be used, not `9000`. // ```yaml @@ -806,14 +1016,45 @@ type TargetSelector struct { // selector: // app: backend // ``` - // Leave empty to match all ports that are exposed. - Ports []*PortSelector `protobuf:"bytes,2,rep,name=ports" json:"ports,omitempty"` + //Leave empty to match all ports that are exposed. + Ports []*PortSelector `protobuf:"bytes,2,rep,name=ports,proto3" json:"ports,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` +} + +func (m *TargetSelector) Reset() { *m = TargetSelector{} } +func (m *TargetSelector) String() string { return proto.CompactTextString(m) } +func (*TargetSelector) ProtoMessage() {} +func (*TargetSelector) Descriptor() ([]byte, []int) { + return fileDescriptor_30ec3f7cef93301a, []int{6} +} +func (m *TargetSelector) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *TargetSelector) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_TargetSelector.Marshal(b, m, deterministic) + } else { + b = b[:cap(b)] + n, err := m.MarshalTo(b) + if err != nil { + return nil, err + } + return b[:n], nil + } +} +func (m *TargetSelector) XXX_Merge(src proto.Message) { + xxx_messageInfo_TargetSelector.Merge(m, src) +} +func (m *TargetSelector) XXX_Size() int { + return m.Size() +} +func (m *TargetSelector) XXX_DiscardUnknown() { + xxx_messageInfo_TargetSelector.DiscardUnknown(m) } -func (m *TargetSelector) Reset() { *m = TargetSelector{} } -func (m *TargetSelector) String() string { return proto.CompactTextString(m) } -func (*TargetSelector) ProtoMessage() {} -func (*TargetSelector) Descriptor() ([]byte, []int) { return fileDescriptorPolicy, []int{6} } +var xxx_messageInfo_TargetSelector proto.InternalMessageInfo func (m *TargetSelector) GetName() string { if m != nil { @@ -843,13 +1084,44 @@ type PortSelector struct { // Types that are valid to be assigned to Port: // *PortSelector_Number // *PortSelector_Name - Port isPortSelector_Port `protobuf_oneof:"port"` + Port isPortSelector_Port `protobuf_oneof:"port"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` +} + +func (m *PortSelector) Reset() { *m = PortSelector{} } +func (m *PortSelector) String() string { return proto.CompactTextString(m) } +func (*PortSelector) ProtoMessage() {} +func (*PortSelector) Descriptor() ([]byte, []int) { + return fileDescriptor_30ec3f7cef93301a, []int{7} +} +func (m *PortSelector) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *PortSelector) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_PortSelector.Marshal(b, m, deterministic) + } else { + b = b[:cap(b)] + n, err := m.MarshalTo(b) + if err != nil { + return nil, err + } + return b[:n], nil + } +} +func (m *PortSelector) XXX_Merge(src proto.Message) { + xxx_messageInfo_PortSelector.Merge(m, src) +} +func (m *PortSelector) XXX_Size() int { + return m.Size() +} +func (m *PortSelector) XXX_DiscardUnknown() { + xxx_messageInfo_PortSelector.DiscardUnknown(m) } -func (m *PortSelector) Reset() { *m = PortSelector{} } -func (m *PortSelector) String() string { return proto.CompactTextString(m) } -func (*PortSelector) ProtoMessage() {} -func (*PortSelector) Descriptor() ([]byte, []int) { return fileDescriptorPolicy, []int{7} } +var xxx_messageInfo_PortSelector proto.InternalMessageInfo type isPortSelector_Port interface { isPortSelector_Port() @@ -940,10 +1212,10 @@ func _PortSelector_OneofSizer(msg proto.Message) (n int) { // port switch x := m.Port.(type) { case *PortSelector_Number: - n += proto.SizeVarint(1<<3 | proto.WireVarint) + n += 1 // tag and wire n += proto.SizeVarint(uint64(x.Number)) case *PortSelector_Name: - n += proto.SizeVarint(2<<3 | proto.WireBytes) + n += 1 // tag and wire n += proto.SizeVarint(uint64(len(x.Name))) n += len(x.Name) case nil: @@ -954,6 +1226,8 @@ func _PortSelector_OneofSizer(msg proto.Message) (n int) { } func init() { + proto.RegisterEnum("istio.authentication.v1alpha1.PrincipalBinding", PrincipalBinding_name, PrincipalBinding_value) + proto.RegisterEnum("istio.authentication.v1alpha1.MutualTls_Mode", MutualTls_Mode_name, MutualTls_Mode_value) proto.RegisterType((*StringMatch)(nil), "istio.authentication.v1alpha1.StringMatch") proto.RegisterType((*MutualTls)(nil), "istio.authentication.v1alpha1.MutualTls") proto.RegisterType((*Jwt)(nil), "istio.authentication.v1alpha1.Jwt") @@ -962,10 +1236,71 @@ func init() { proto.RegisterType((*OriginAuthenticationMethod)(nil), "istio.authentication.v1alpha1.OriginAuthenticationMethod") proto.RegisterType((*Policy)(nil), "istio.authentication.v1alpha1.Policy") proto.RegisterType((*TargetSelector)(nil), "istio.authentication.v1alpha1.TargetSelector") + proto.RegisterMapType((map[string]string)(nil), "istio.authentication.v1alpha1.TargetSelector.LabelsEntry") proto.RegisterType((*PortSelector)(nil), "istio.authentication.v1alpha1.PortSelector") - proto.RegisterEnum("istio.authentication.v1alpha1.PrincipalBinding", PrincipalBinding_name, PrincipalBinding_value) - proto.RegisterEnum("istio.authentication.v1alpha1.MutualTls_Mode", MutualTls_Mode_name, MutualTls_Mode_value) } + +func init() { + proto.RegisterFile("authentication/v1alpha1/policy.proto", fileDescriptor_30ec3f7cef93301a) +} + +var fileDescriptor_30ec3f7cef93301a = []byte{ + // 838 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x55, 0xc1, 0x6e, 0x23, 0x35, + 0x18, 0xee, 0x74, 0x92, 0x69, 0xf2, 0xa7, 0x8d, 0x82, 0xb5, 0x5a, 0x0d, 0x85, 0x2d, 0xd5, 0x68, + 0x0f, 0xd1, 0x02, 0x13, 0x36, 0x20, 0x60, 0x39, 0x20, 0x35, 0x28, 0x6c, 0xb3, 0x22, 0x34, 0xeb, + 0x64, 0x39, 0x20, 0xa4, 0x91, 0x9b, 0x78, 0x13, 0x67, 0x9d, 0x99, 0x91, 0xed, 0xd9, 0x34, 0x27, + 0x1e, 0x81, 0x17, 0xe0, 0xc2, 0x99, 0x23, 0x2f, 0xc1, 0x91, 0x47, 0x40, 0x7d, 0x07, 0xee, 0xc8, + 0xf6, 0x0c, 0x4d, 0x56, 0x94, 0x29, 0x37, 0x7f, 0xff, 0xef, 0xef, 0xf3, 0xef, 0xcf, 0xbf, 0x6d, + 0x78, 0x48, 0x32, 0xb5, 0xa0, 0xb1, 0x62, 0x53, 0xa2, 0x58, 0x12, 0x77, 0x5e, 0x3f, 0x26, 0x3c, + 0x5d, 0x90, 0xc7, 0x9d, 0x34, 0xe1, 0x6c, 0xba, 0x09, 0x53, 0x91, 0xa8, 0x04, 0x3d, 0x60, 0x52, + 0xb1, 0x24, 0xdc, 0x9d, 0x1b, 0x16, 0x73, 0x83, 0x1f, 0xa1, 0x31, 0x56, 0x82, 0xc5, 0xf3, 0x21, + 0x51, 0xd3, 0x05, 0xba, 0x0f, 0x55, 0x7a, 0x45, 0xa6, 0xca, 0x77, 0x4e, 0x9d, 0x76, 0xfd, 0x7c, + 0x0f, 0x5b, 0x88, 0x7c, 0xf0, 0x52, 0x41, 0x5f, 0xb2, 0x2b, 0x7f, 0x3f, 0x4f, 0xe4, 0x58, 0x67, + 0x64, 0xf6, 0x52, 0x67, 0xdc, 0x22, 0x63, 0xb1, 0xd6, 0x12, 0x74, 0x4e, 0xaf, 0xfc, 0x4a, 0xa1, + 0x65, 0x60, 0xef, 0x10, 0x60, 0xa5, 0x17, 0x8b, 0xd4, 0x26, 0xa5, 0xc1, 0x4f, 0x0e, 0xd4, 0x87, + 0x99, 0xca, 0x08, 0x9f, 0x70, 0x89, 0xde, 0x81, 0x3a, 0xe1, 0x3c, 0x59, 0x47, 0x8a, 0x4b, 0x53, + 0x43, 0x0d, 0xd7, 0x4c, 0x40, 0x27, 0xcf, 0xa0, 0xb2, 0x4a, 0x66, 0xd4, 0x94, 0xd0, 0xec, 0x7e, + 0x18, 0xfe, 0xe7, 0xce, 0xc2, 0x7f, 0x44, 0xc3, 0x61, 0x32, 0xa3, 0xd8, 0x50, 0x83, 0x00, 0x2a, + 0x1a, 0x21, 0x00, 0x6f, 0x3c, 0xc1, 0x83, 0xaf, 0x26, 0xad, 0x3d, 0xd4, 0x04, 0x18, 0xf5, 0xf1, + 0x70, 0x30, 0x1e, 0x0f, 0xbe, 0xeb, 0xb7, 0x9c, 0xe0, 0x17, 0x17, 0xdc, 0x67, 0x6b, 0x85, 0xee, + 0x83, 0xc7, 0xa4, 0xcc, 0xa8, 0xb0, 0x66, 0xe0, 0x1c, 0xa1, 0x77, 0xa1, 0x4e, 0xb2, 0x19, 0xa3, + 0xf1, 0x94, 0x4a, 0x7f, 0xff, 0xd4, 0x6d, 0xd7, 0xf1, 0x4d, 0x00, 0xbd, 0x0d, 0xb5, 0xe5, 0xfa, + 0x95, 0x8c, 0x32, 0xc1, 0xac, 0x23, 0xf8, 0x40, 0xe3, 0x17, 0x82, 0xa1, 0xf7, 0xa0, 0xb1, 0x5c, + 0xab, 0x68, 0x41, 0xc9, 0x8c, 0x0a, 0xe9, 0x7b, 0x86, 0x0a, 0xcb, 0xb5, 0x3a, 0xb7, 0x11, 0xf4, + 0x00, 0x34, 0x8a, 0x52, 0x22, 0xc8, 0x4a, 0xfa, 0x07, 0x56, 0x7a, 0xb9, 0x56, 0x23, 0x13, 0x40, + 0x63, 0x38, 0x52, 0x82, 0xcd, 0xe7, 0x54, 0x44, 0x22, 0xe3, 0x54, 0xfa, 0xf5, 0x53, 0xb7, 0xdd, + 0xe8, 0x86, 0x25, 0x46, 0x3c, 0x5b, 0xab, 0x70, 0x62, 0x79, 0x38, 0xe3, 0x14, 0x1f, 0xaa, 0x1b, + 0x20, 0x8f, 0x7f, 0x73, 0xa0, 0xb1, 0x95, 0x45, 0xcf, 0xa1, 0x49, 0xaf, 0xa6, 0x3c, 0x9b, 0xd1, + 0x59, 0x94, 0x12, 0xb5, 0xd0, 0xc7, 0xa0, 0x57, 0x79, 0x54, 0xb2, 0xca, 0x56, 0x17, 0xe1, 0xa3, + 0x42, 0x61, 0xa4, 0x05, 0xb4, 0x24, 0x8b, 0x77, 0x24, 0xf7, 0xff, 0xbf, 0x64, 0xa1, 0x60, 0x24, + 0x83, 0x9f, 0x1d, 0xf0, 0x47, 0x94, 0x8a, 0xb3, 0x1d, 0xea, 0x90, 0xaa, 0x45, 0x32, 0x43, 0x5f, + 0x42, 0x65, 0x55, 0xf4, 0x4f, 0xa3, 0xdb, 0xbe, 0x6b, 0x9f, 0x9c, 0xef, 0x61, 0xc3, 0x43, 0x9f, + 0x82, 0xbb, 0x5c, 0x2b, 0xd3, 0x66, 0x8d, 0x6e, 0x50, 0xee, 0xee, 0xf9, 0x1e, 0xd6, 0x84, 0x5e, + 0x0d, 0x3c, 0x7b, 0x74, 0x01, 0x86, 0xe3, 0x0b, 0xc1, 0xe6, 0x2c, 0xfe, 0xd7, 0xfa, 0x3e, 0xb1, + 0xfa, 0xce, 0x5d, 0xf5, 0x8d, 0x7a, 0xf0, 0xab, 0x0b, 0xde, 0xc8, 0xdc, 0x6c, 0xf4, 0x14, 0x0e, + 0x14, 0x11, 0x73, 0xaa, 0x8a, 0xc3, 0x29, 0xbb, 0x0b, 0x13, 0x33, 0x7b, 0x4c, 0x39, 0x9d, 0xaa, + 0x44, 0xe0, 0x82, 0x8d, 0x86, 0x50, 0x4d, 0xa9, 0xee, 0x45, 0x7b, 0x20, 0x9f, 0x95, 0xc8, 0xdc, + 0xe6, 0x38, 0xb6, 0x2a, 0xa8, 0x0d, 0x2d, 0x3d, 0x88, 0x98, 0x8c, 0x92, 0x54, 0xa7, 0x09, 0x37, + 0x77, 0xa0, 0x86, 0x9b, 0x3a, 0x3e, 0x90, 0x17, 0x79, 0x14, 0x8d, 0xe1, 0x20, 0x31, 0x06, 0x49, + 0xbf, 0x62, 0x96, 0x7e, 0x52, 0xb2, 0xf4, 0xed, 0x76, 0xe2, 0x42, 0x09, 0x7d, 0x00, 0xc8, 0x0e, + 0x77, 0x0a, 0xa8, 0x9a, 0x02, 0x5a, 0x36, 0xb3, 0x55, 0xc2, 0x0f, 0xf0, 0x56, 0x2a, 0x58, 0x3c, + 0x65, 0x29, 0xe1, 0xd1, 0x25, 0x8b, 0x67, 0x2c, 0x9e, 0xfb, 0x9e, 0x79, 0x5a, 0x3a, 0x65, 0x3e, + 0x14, 0xbc, 0x9e, 0xa5, 0xe1, 0x56, 0xfa, 0x46, 0x24, 0xf8, 0xcb, 0x81, 0xe6, 0xae, 0xeb, 0x08, + 0x41, 0x25, 0x26, 0x2b, 0x9a, 0xbf, 0x26, 0x66, 0x8c, 0x9e, 0x83, 0xc7, 0xc9, 0x25, 0xe5, 0xd2, + 0x77, 0xef, 0x64, 0xc3, 0xae, 0x64, 0xf8, 0x8d, 0xe1, 0xf6, 0x63, 0x25, 0x36, 0x38, 0x17, 0x42, + 0x67, 0x50, 0x4d, 0x13, 0xa1, 0x8a, 0x33, 0x7d, 0xbf, 0x6c, 0x2f, 0x89, 0xb8, 0x69, 0x0c, 0xcb, + 0x3c, 0x7e, 0x02, 0x8d, 0x2d, 0x65, 0xd4, 0x02, 0xf7, 0x15, 0xdd, 0xe4, 0x75, 0xeb, 0x21, 0xba, + 0x07, 0xd5, 0xd7, 0x84, 0x67, 0xf6, 0x29, 0xae, 0x63, 0x0b, 0xbe, 0xd8, 0xff, 0xdc, 0x09, 0xbe, + 0x86, 0xc3, 0x6d, 0x45, 0xfd, 0x3d, 0xc4, 0xd9, 0xea, 0x32, 0x7f, 0x44, 0x8f, 0xf4, 0xf7, 0x60, + 0x31, 0xba, 0x97, 0xdb, 0x51, 0x7c, 0x28, 0x06, 0xf5, 0x3c, 0xa8, 0xe8, 0x1a, 0x1e, 0x7d, 0x04, + 0xad, 0x37, 0x5d, 0x46, 0x87, 0x50, 0x7b, 0x31, 0xee, 0x47, 0xa3, 0x7e, 0x1f, 0xdb, 0x67, 0x5b, + 0xa3, 0x0b, 0x3c, 0x78, 0x3a, 0xf8, 0xb6, 0xe5, 0xf4, 0xba, 0xbf, 0x5f, 0x9f, 0x38, 0x7f, 0x5c, + 0x9f, 0x38, 0x7f, 0x5e, 0x9f, 0x38, 0xdf, 0x3f, 0xb4, 0xbb, 0x66, 0x49, 0x87, 0xa4, 0xac, 0x73, + 0xcb, 0x4f, 0x79, 0xe9, 0x99, 0x3f, 0xf2, 0xe3, 0xbf, 0x03, 0x00, 0x00, 0xff, 0xff, 0x98, 0x47, + 0x3a, 0xbe, 0x4b, 0x07, 0x00, 0x00, +} + func (m *StringMatch) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) @@ -988,6 +1323,9 @@ func (m *StringMatch) MarshalTo(dAtA []byte) (int, error) { } i += nn1 } + if m.XXX_unrecognized != nil { + i += copy(dAtA[i:], m.XXX_unrecognized) + } return i, nil } @@ -1053,6 +1391,9 @@ func (m *MutualTls) MarshalTo(dAtA []byte) (int, error) { i++ i = encodeVarintPolicy(dAtA, i, uint64(m.Mode)) } + if m.XXX_unrecognized != nil { + i += copy(dAtA[i:], m.XXX_unrecognized) + } return i, nil } @@ -1140,6 +1481,9 @@ func (m *Jwt) MarshalTo(dAtA []byte) (int, error) { i += n } } + if m.XXX_unrecognized != nil { + i += copy(dAtA[i:], m.XXX_unrecognized) + } return i, nil } @@ -1182,6 +1526,9 @@ func (m *Jwt_TriggerRule) MarshalTo(dAtA []byte) (int, error) { i += n } } + if m.XXX_unrecognized != nil { + i += copy(dAtA[i:], m.XXX_unrecognized) + } return i, nil } @@ -1207,6 +1554,9 @@ func (m *PeerAuthenticationMethod) MarshalTo(dAtA []byte) (int, error) { } i += nn2 } + if m.XXX_unrecognized != nil { + i += copy(dAtA[i:], m.XXX_unrecognized) + } return i, nil } @@ -1263,6 +1613,9 @@ func (m *OriginAuthenticationMethod) MarshalTo(dAtA []byte) (int, error) { } i += n5 } + if m.XXX_unrecognized != nil { + i += copy(dAtA[i:], m.XXX_unrecognized) + } return i, nil } @@ -1342,6 +1695,9 @@ func (m *Policy) MarshalTo(dAtA []byte) (int, error) { i++ i = encodeVarintPolicy(dAtA, i, uint64(m.PrincipalBinding)) } + if m.XXX_unrecognized != nil { + i += copy(dAtA[i:], m.XXX_unrecognized) + } return i, nil } @@ -1395,6 +1751,9 @@ func (m *TargetSelector) MarshalTo(dAtA []byte) (int, error) { i += copy(dAtA[i:], v) } } + if m.XXX_unrecognized != nil { + i += copy(dAtA[i:], m.XXX_unrecognized) + } return i, nil } @@ -1420,6 +1779,9 @@ func (m *PortSelector) MarshalTo(dAtA []byte) (int, error) { } i += nn6 } + if m.XXX_unrecognized != nil { + i += copy(dAtA[i:], m.XXX_unrecognized) + } return i, nil } @@ -1448,15 +1810,24 @@ func encodeVarintPolicy(dAtA []byte, offset int, v uint64) int { return offset + 1 } func (m *StringMatch) Size() (n int) { + if m == nil { + return 0 + } var l int _ = l if m.MatchType != nil { n += m.MatchType.Size() } + if m.XXX_unrecognized != nil { + n += len(m.XXX_unrecognized) + } return n } func (m *StringMatch_Exact) Size() (n int) { + if m == nil { + return 0 + } var l int _ = l l = len(m.Exact) @@ -1464,6 +1835,9 @@ func (m *StringMatch_Exact) Size() (n int) { return n } func (m *StringMatch_Prefix) Size() (n int) { + if m == nil { + return 0 + } var l int _ = l l = len(m.Prefix) @@ -1471,6 +1845,9 @@ func (m *StringMatch_Prefix) Size() (n int) { return n } func (m *StringMatch_Suffix) Size() (n int) { + if m == nil { + return 0 + } var l int _ = l l = len(m.Suffix) @@ -1478,6 +1855,9 @@ func (m *StringMatch_Suffix) Size() (n int) { return n } func (m *StringMatch_Regex) Size() (n int) { + if m == nil { + return 0 + } var l int _ = l l = len(m.Regex) @@ -1485,6 +1865,9 @@ func (m *StringMatch_Regex) Size() (n int) { return n } func (m *MutualTls) Size() (n int) { + if m == nil { + return 0 + } var l int _ = l if m.AllowTls { @@ -1493,10 +1876,16 @@ func (m *MutualTls) Size() (n int) { if m.Mode != 0 { n += 1 + sovPolicy(uint64(m.Mode)) } + if m.XXX_unrecognized != nil { + n += len(m.XXX_unrecognized) + } return n } func (m *Jwt) Size() (n int) { + if m == nil { + return 0 + } var l int _ = l l = len(m.Issuer) @@ -1531,10 +1920,16 @@ func (m *Jwt) Size() (n int) { n += 1 + l + sovPolicy(uint64(l)) } } + if m.XXX_unrecognized != nil { + n += len(m.XXX_unrecognized) + } return n } func (m *Jwt_TriggerRule) Size() (n int) { + if m == nil { + return 0 + } var l int _ = l if len(m.ExcludedPaths) > 0 { @@ -1549,19 +1944,31 @@ func (m *Jwt_TriggerRule) Size() (n int) { n += 1 + l + sovPolicy(uint64(l)) } } + if m.XXX_unrecognized != nil { + n += len(m.XXX_unrecognized) + } return n } func (m *PeerAuthenticationMethod) Size() (n int) { + if m == nil { + return 0 + } var l int _ = l if m.Params != nil { n += m.Params.Size() } + if m.XXX_unrecognized != nil { + n += len(m.XXX_unrecognized) + } return n } func (m *PeerAuthenticationMethod_Mtls) Size() (n int) { + if m == nil { + return 0 + } var l int _ = l if m.Mtls != nil { @@ -1571,6 +1978,9 @@ func (m *PeerAuthenticationMethod_Mtls) Size() (n int) { return n } func (m *PeerAuthenticationMethod_Jwt) Size() (n int) { + if m == nil { + return 0 + } var l int _ = l if m.Jwt != nil { @@ -1580,16 +1990,25 @@ func (m *PeerAuthenticationMethod_Jwt) Size() (n int) { return n } func (m *OriginAuthenticationMethod) Size() (n int) { + if m == nil { + return 0 + } var l int _ = l if m.Jwt != nil { l = m.Jwt.Size() n += 1 + l + sovPolicy(uint64(l)) } + if m.XXX_unrecognized != nil { + n += len(m.XXX_unrecognized) + } return n } func (m *Policy) Size() (n int) { + if m == nil { + return 0 + } var l int _ = l if len(m.Targets) > 0 { @@ -1619,10 +2038,16 @@ func (m *Policy) Size() (n int) { if m.PrincipalBinding != 0 { n += 1 + sovPolicy(uint64(m.PrincipalBinding)) } + if m.XXX_unrecognized != nil { + n += len(m.XXX_unrecognized) + } return n } func (m *TargetSelector) Size() (n int) { + if m == nil { + return 0 + } var l int _ = l l = len(m.Name) @@ -1643,25 +2068,40 @@ func (m *TargetSelector) Size() (n int) { n += mapEntrySize + 1 + sovPolicy(uint64(mapEntrySize)) } } + if m.XXX_unrecognized != nil { + n += len(m.XXX_unrecognized) + } return n } func (m *PortSelector) Size() (n int) { + if m == nil { + return 0 + } var l int _ = l if m.Port != nil { n += m.Port.Size() } + if m.XXX_unrecognized != nil { + n += len(m.XXX_unrecognized) + } return n } func (m *PortSelector_Number) Size() (n int) { + if m == nil { + return 0 + } var l int _ = l n += 1 + sovPolicy(uint64(m.Number)) return n } func (m *PortSelector_Name) Size() (n int) { + if m == nil { + return 0 + } var l int _ = l l = len(m.Name) @@ -1697,7 +2137,7 @@ func (m *StringMatch) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - wire |= (uint64(b) & 0x7F) << shift + wire |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -1725,7 +2165,7 @@ func (m *StringMatch) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLen |= (uint64(b) & 0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -1735,6 +2175,9 @@ func (m *StringMatch) Unmarshal(dAtA []byte) error { return ErrInvalidLengthPolicy } postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthPolicy + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -1754,7 +2197,7 @@ func (m *StringMatch) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLen |= (uint64(b) & 0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -1764,6 +2207,9 @@ func (m *StringMatch) Unmarshal(dAtA []byte) error { return ErrInvalidLengthPolicy } postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthPolicy + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -1783,7 +2229,7 @@ func (m *StringMatch) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLen |= (uint64(b) & 0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -1793,6 +2239,9 @@ func (m *StringMatch) Unmarshal(dAtA []byte) error { return ErrInvalidLengthPolicy } postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthPolicy + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -1812,7 +2261,7 @@ func (m *StringMatch) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLen |= (uint64(b) & 0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -1822,6 +2271,9 @@ func (m *StringMatch) Unmarshal(dAtA []byte) error { return ErrInvalidLengthPolicy } postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthPolicy + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -1836,9 +2288,13 @@ func (m *StringMatch) Unmarshal(dAtA []byte) error { if skippy < 0 { return ErrInvalidLengthPolicy } + if (iNdEx + skippy) < 0 { + return ErrInvalidLengthPolicy + } if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF } + m.XXX_unrecognized = append(m.XXX_unrecognized, dAtA[iNdEx:iNdEx+skippy]...) iNdEx += skippy } } @@ -1863,7 +2319,7 @@ func (m *MutualTls) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - wire |= (uint64(b) & 0x7F) << shift + wire |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -1891,7 +2347,7 @@ func (m *MutualTls) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - v |= (int(b) & 0x7F) << shift + v |= int(b&0x7F) << shift if b < 0x80 { break } @@ -1911,7 +2367,7 @@ func (m *MutualTls) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - m.Mode |= (MutualTls_Mode(b) & 0x7F) << shift + m.Mode |= MutualTls_Mode(b&0x7F) << shift if b < 0x80 { break } @@ -1925,9 +2381,13 @@ func (m *MutualTls) Unmarshal(dAtA []byte) error { if skippy < 0 { return ErrInvalidLengthPolicy } + if (iNdEx + skippy) < 0 { + return ErrInvalidLengthPolicy + } if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF } + m.XXX_unrecognized = append(m.XXX_unrecognized, dAtA[iNdEx:iNdEx+skippy]...) iNdEx += skippy } } @@ -1952,7 +2412,7 @@ func (m *Jwt) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - wire |= (uint64(b) & 0x7F) << shift + wire |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -1980,7 +2440,7 @@ func (m *Jwt) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLen |= (uint64(b) & 0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -1990,6 +2450,9 @@ func (m *Jwt) Unmarshal(dAtA []byte) error { return ErrInvalidLengthPolicy } postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthPolicy + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -2009,7 +2472,7 @@ func (m *Jwt) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLen |= (uint64(b) & 0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -2019,6 +2482,9 @@ func (m *Jwt) Unmarshal(dAtA []byte) error { return ErrInvalidLengthPolicy } postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthPolicy + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -2038,7 +2504,7 @@ func (m *Jwt) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLen |= (uint64(b) & 0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -2048,6 +2514,9 @@ func (m *Jwt) Unmarshal(dAtA []byte) error { return ErrInvalidLengthPolicy } postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthPolicy + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -2067,7 +2536,7 @@ func (m *Jwt) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLen |= (uint64(b) & 0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -2077,6 +2546,9 @@ func (m *Jwt) Unmarshal(dAtA []byte) error { return ErrInvalidLengthPolicy } postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthPolicy + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -2096,7 +2568,7 @@ func (m *Jwt) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLen |= (uint64(b) & 0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -2106,6 +2578,9 @@ func (m *Jwt) Unmarshal(dAtA []byte) error { return ErrInvalidLengthPolicy } postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthPolicy + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -2125,7 +2600,7 @@ func (m *Jwt) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - msglen |= (int(b) & 0x7F) << shift + msglen |= int(b&0x7F) << shift if b < 0x80 { break } @@ -2134,6 +2609,9 @@ func (m *Jwt) Unmarshal(dAtA []byte) error { return ErrInvalidLengthPolicy } postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthPolicy + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -2151,9 +2629,13 @@ func (m *Jwt) Unmarshal(dAtA []byte) error { if skippy < 0 { return ErrInvalidLengthPolicy } + if (iNdEx + skippy) < 0 { + return ErrInvalidLengthPolicy + } if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF } + m.XXX_unrecognized = append(m.XXX_unrecognized, dAtA[iNdEx:iNdEx+skippy]...) iNdEx += skippy } } @@ -2178,7 +2660,7 @@ func (m *Jwt_TriggerRule) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - wire |= (uint64(b) & 0x7F) << shift + wire |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -2206,7 +2688,7 @@ func (m *Jwt_TriggerRule) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - msglen |= (int(b) & 0x7F) << shift + msglen |= int(b&0x7F) << shift if b < 0x80 { break } @@ -2215,6 +2697,9 @@ func (m *Jwt_TriggerRule) Unmarshal(dAtA []byte) error { return ErrInvalidLengthPolicy } postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthPolicy + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -2237,7 +2722,7 @@ func (m *Jwt_TriggerRule) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - msglen |= (int(b) & 0x7F) << shift + msglen |= int(b&0x7F) << shift if b < 0x80 { break } @@ -2246,6 +2731,9 @@ func (m *Jwt_TriggerRule) Unmarshal(dAtA []byte) error { return ErrInvalidLengthPolicy } postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthPolicy + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -2263,9 +2751,13 @@ func (m *Jwt_TriggerRule) Unmarshal(dAtA []byte) error { if skippy < 0 { return ErrInvalidLengthPolicy } + if (iNdEx + skippy) < 0 { + return ErrInvalidLengthPolicy + } if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF } + m.XXX_unrecognized = append(m.XXX_unrecognized, dAtA[iNdEx:iNdEx+skippy]...) iNdEx += skippy } } @@ -2290,7 +2782,7 @@ func (m *PeerAuthenticationMethod) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - wire |= (uint64(b) & 0x7F) << shift + wire |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -2318,7 +2810,7 @@ func (m *PeerAuthenticationMethod) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - msglen |= (int(b) & 0x7F) << shift + msglen |= int(b&0x7F) << shift if b < 0x80 { break } @@ -2327,6 +2819,9 @@ func (m *PeerAuthenticationMethod) Unmarshal(dAtA []byte) error { return ErrInvalidLengthPolicy } postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthPolicy + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -2350,7 +2845,7 @@ func (m *PeerAuthenticationMethod) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - msglen |= (int(b) & 0x7F) << shift + msglen |= int(b&0x7F) << shift if b < 0x80 { break } @@ -2359,6 +2854,9 @@ func (m *PeerAuthenticationMethod) Unmarshal(dAtA []byte) error { return ErrInvalidLengthPolicy } postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthPolicy + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -2377,9 +2875,13 @@ func (m *PeerAuthenticationMethod) Unmarshal(dAtA []byte) error { if skippy < 0 { return ErrInvalidLengthPolicy } + if (iNdEx + skippy) < 0 { + return ErrInvalidLengthPolicy + } if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF } + m.XXX_unrecognized = append(m.XXX_unrecognized, dAtA[iNdEx:iNdEx+skippy]...) iNdEx += skippy } } @@ -2404,7 +2906,7 @@ func (m *OriginAuthenticationMethod) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - wire |= (uint64(b) & 0x7F) << shift + wire |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -2432,7 +2934,7 @@ func (m *OriginAuthenticationMethod) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - msglen |= (int(b) & 0x7F) << shift + msglen |= int(b&0x7F) << shift if b < 0x80 { break } @@ -2441,6 +2943,9 @@ func (m *OriginAuthenticationMethod) Unmarshal(dAtA []byte) error { return ErrInvalidLengthPolicy } postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthPolicy + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -2460,9 +2965,13 @@ func (m *OriginAuthenticationMethod) Unmarshal(dAtA []byte) error { if skippy < 0 { return ErrInvalidLengthPolicy } + if (iNdEx + skippy) < 0 { + return ErrInvalidLengthPolicy + } if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF } + m.XXX_unrecognized = append(m.XXX_unrecognized, dAtA[iNdEx:iNdEx+skippy]...) iNdEx += skippy } } @@ -2487,7 +2996,7 @@ func (m *Policy) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - wire |= (uint64(b) & 0x7F) << shift + wire |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -2515,7 +3024,7 @@ func (m *Policy) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - msglen |= (int(b) & 0x7F) << shift + msglen |= int(b&0x7F) << shift if b < 0x80 { break } @@ -2524,6 +3033,9 @@ func (m *Policy) Unmarshal(dAtA []byte) error { return ErrInvalidLengthPolicy } postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthPolicy + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -2546,7 +3058,7 @@ func (m *Policy) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - msglen |= (int(b) & 0x7F) << shift + msglen |= int(b&0x7F) << shift if b < 0x80 { break } @@ -2555,6 +3067,9 @@ func (m *Policy) Unmarshal(dAtA []byte) error { return ErrInvalidLengthPolicy } postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthPolicy + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -2577,7 +3092,7 @@ func (m *Policy) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - v |= (int(b) & 0x7F) << shift + v |= int(b&0x7F) << shift if b < 0x80 { break } @@ -2597,7 +3112,7 @@ func (m *Policy) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - msglen |= (int(b) & 0x7F) << shift + msglen |= int(b&0x7F) << shift if b < 0x80 { break } @@ -2606,6 +3121,9 @@ func (m *Policy) Unmarshal(dAtA []byte) error { return ErrInvalidLengthPolicy } postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthPolicy + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -2628,7 +3146,7 @@ func (m *Policy) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - v |= (int(b) & 0x7F) << shift + v |= int(b&0x7F) << shift if b < 0x80 { break } @@ -2648,7 +3166,7 @@ func (m *Policy) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - m.PrincipalBinding |= (PrincipalBinding(b) & 0x7F) << shift + m.PrincipalBinding |= PrincipalBinding(b&0x7F) << shift if b < 0x80 { break } @@ -2662,9 +3180,13 @@ func (m *Policy) Unmarshal(dAtA []byte) error { if skippy < 0 { return ErrInvalidLengthPolicy } + if (iNdEx + skippy) < 0 { + return ErrInvalidLengthPolicy + } if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF } + m.XXX_unrecognized = append(m.XXX_unrecognized, dAtA[iNdEx:iNdEx+skippy]...) iNdEx += skippy } } @@ -2689,7 +3211,7 @@ func (m *TargetSelector) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - wire |= (uint64(b) & 0x7F) << shift + wire |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -2717,7 +3239,7 @@ func (m *TargetSelector) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLen |= (uint64(b) & 0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -2727,6 +3249,9 @@ func (m *TargetSelector) Unmarshal(dAtA []byte) error { return ErrInvalidLengthPolicy } postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthPolicy + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -2746,7 +3271,7 @@ func (m *TargetSelector) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - msglen |= (int(b) & 0x7F) << shift + msglen |= int(b&0x7F) << shift if b < 0x80 { break } @@ -2755,6 +3280,9 @@ func (m *TargetSelector) Unmarshal(dAtA []byte) error { return ErrInvalidLengthPolicy } postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthPolicy + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -2777,7 +3305,7 @@ func (m *TargetSelector) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - msglen |= (int(b) & 0x7F) << shift + msglen |= int(b&0x7F) << shift if b < 0x80 { break } @@ -2786,6 +3314,9 @@ func (m *TargetSelector) Unmarshal(dAtA []byte) error { return ErrInvalidLengthPolicy } postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthPolicy + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -2806,7 +3337,7 @@ func (m *TargetSelector) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - wire |= (uint64(b) & 0x7F) << shift + wire |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -2823,7 +3354,7 @@ func (m *TargetSelector) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLenmapkey |= (uint64(b) & 0x7F) << shift + stringLenmapkey |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -2833,6 +3364,9 @@ func (m *TargetSelector) Unmarshal(dAtA []byte) error { return ErrInvalidLengthPolicy } postStringIndexmapkey := iNdEx + intStringLenmapkey + if postStringIndexmapkey < 0 { + return ErrInvalidLengthPolicy + } if postStringIndexmapkey > l { return io.ErrUnexpectedEOF } @@ -2849,7 +3383,7 @@ func (m *TargetSelector) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLenmapvalue |= (uint64(b) & 0x7F) << shift + stringLenmapvalue |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -2859,6 +3393,9 @@ func (m *TargetSelector) Unmarshal(dAtA []byte) error { return ErrInvalidLengthPolicy } postStringIndexmapvalue := iNdEx + intStringLenmapvalue + if postStringIndexmapvalue < 0 { + return ErrInvalidLengthPolicy + } if postStringIndexmapvalue > l { return io.ErrUnexpectedEOF } @@ -2890,9 +3427,13 @@ func (m *TargetSelector) Unmarshal(dAtA []byte) error { if skippy < 0 { return ErrInvalidLengthPolicy } + if (iNdEx + skippy) < 0 { + return ErrInvalidLengthPolicy + } if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF } + m.XXX_unrecognized = append(m.XXX_unrecognized, dAtA[iNdEx:iNdEx+skippy]...) iNdEx += skippy } } @@ -2917,7 +3458,7 @@ func (m *PortSelector) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - wire |= (uint64(b) & 0x7F) << shift + wire |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -2945,7 +3486,7 @@ func (m *PortSelector) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - v |= (uint32(b) & 0x7F) << shift + v |= uint32(b&0x7F) << shift if b < 0x80 { break } @@ -2965,7 +3506,7 @@ func (m *PortSelector) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLen |= (uint64(b) & 0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -2975,6 +3516,9 @@ func (m *PortSelector) Unmarshal(dAtA []byte) error { return ErrInvalidLengthPolicy } postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthPolicy + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -2989,9 +3533,13 @@ func (m *PortSelector) Unmarshal(dAtA []byte) error { if skippy < 0 { return ErrInvalidLengthPolicy } + if (iNdEx + skippy) < 0 { + return ErrInvalidLengthPolicy + } if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF } + m.XXX_unrecognized = append(m.XXX_unrecognized, dAtA[iNdEx:iNdEx+skippy]...) iNdEx += skippy } } @@ -3055,10 +3603,13 @@ func skipPolicy(dAtA []byte) (n int, err error) { break } } - iNdEx += length if length < 0 { return 0, ErrInvalidLengthPolicy } + iNdEx += length + if iNdEx < 0 { + return 0, ErrInvalidLengthPolicy + } return iNdEx, nil case 3: for { @@ -3087,6 +3638,9 @@ func skipPolicy(dAtA []byte) (n int, err error) { return 0, err } iNdEx = start + next + if iNdEx < 0 { + return 0, ErrInvalidLengthPolicy + } } return iNdEx, nil case 4: @@ -3105,62 +3659,3 @@ var ( ErrInvalidLengthPolicy = fmt.Errorf("proto: negative length found during unmarshaling") ErrIntOverflowPolicy = fmt.Errorf("proto: integer overflow") ) - -func init() { proto.RegisterFile("authentication/v1alpha1/policy.proto", fileDescriptorPolicy) } - -var fileDescriptorPolicy = []byte{ - // 839 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x55, 0x4f, 0x6f, 0xe3, 0x44, - 0x14, 0xaf, 0xeb, 0xc4, 0x4d, 0x5e, 0xda, 0x28, 0x8c, 0x56, 0x2b, 0x53, 0xd8, 0x52, 0x59, 0x7b, - 0x88, 0x16, 0x70, 0xd8, 0x80, 0x80, 0xe5, 0x80, 0xd4, 0xa0, 0xb0, 0xcd, 0x8a, 0xd0, 0xec, 0x24, - 0xcb, 0x01, 0x21, 0x59, 0xd3, 0x64, 0x36, 0x99, 0xec, 0xc4, 0xb6, 0x66, 0xc6, 0x9b, 0xe6, 0xc4, - 0x47, 0xe0, 0x0b, 0x70, 0xe1, 0xcc, 0x91, 0x2f, 0xc1, 0x91, 0x8f, 0x80, 0xfa, 0x1d, 0xb8, 0xa3, - 0x99, 0xb1, 0x69, 0xb2, 0xa2, 0xb8, 0xdc, 0xe6, 0xf7, 0x9e, 0x7f, 0xbf, 0xf7, 0xfc, 0x7b, 0xf3, - 0x07, 0x1e, 0x92, 0x4c, 0x2d, 0x68, 0xac, 0xd8, 0x94, 0x28, 0x96, 0xc4, 0x9d, 0xd7, 0x8f, 0x09, - 0x4f, 0x17, 0xe4, 0x71, 0x27, 0x4d, 0x38, 0x9b, 0x6e, 0xc2, 0x54, 0x24, 0x2a, 0x41, 0x0f, 0x98, - 0x54, 0x2c, 0x09, 0x77, 0xbf, 0x0d, 0x8b, 0x6f, 0x83, 0x1f, 0xa1, 0x31, 0x56, 0x82, 0xc5, 0xf3, - 0x21, 0x51, 0xd3, 0x05, 0xba, 0x0f, 0x55, 0x7a, 0x45, 0xa6, 0xca, 0x77, 0x4e, 0x9d, 0x76, 0xfd, - 0x7c, 0x0f, 0x5b, 0x88, 0x7c, 0xf0, 0x52, 0x41, 0x5f, 0xb2, 0x2b, 0x7f, 0x3f, 0x4f, 0xe4, 0x58, - 0x67, 0x64, 0xf6, 0x52, 0x67, 0xdc, 0x22, 0x63, 0xb1, 0xd6, 0x12, 0x74, 0x4e, 0xaf, 0xfc, 0x4a, - 0xa1, 0x65, 0x60, 0xef, 0x10, 0x60, 0xa5, 0x8b, 0x45, 0x6a, 0x93, 0xd2, 0xe0, 0x27, 0x07, 0xea, - 0xc3, 0x4c, 0x65, 0x84, 0x4f, 0xb8, 0x44, 0xef, 0x40, 0x9d, 0x70, 0x9e, 0xac, 0x23, 0xc5, 0xa5, - 0xe9, 0xa1, 0x86, 0x6b, 0x26, 0xa0, 0x93, 0x67, 0x50, 0x59, 0x25, 0x33, 0x6a, 0x5a, 0x68, 0x76, - 0x3f, 0x0c, 0xff, 0xf3, 0xcf, 0xc2, 0x7f, 0x44, 0xc3, 0x61, 0x32, 0xa3, 0xd8, 0x50, 0x83, 0x00, - 0x2a, 0x1a, 0x21, 0x00, 0x6f, 0x3c, 0xc1, 0x83, 0xaf, 0x26, 0xad, 0x3d, 0xd4, 0x04, 0x18, 0xf5, - 0xf1, 0x70, 0x30, 0x1e, 0x0f, 0xbe, 0xeb, 0xb7, 0x9c, 0xe0, 0x17, 0x17, 0xdc, 0x67, 0x6b, 0x85, - 0xee, 0x83, 0xc7, 0xa4, 0xcc, 0xa8, 0xb0, 0x66, 0xe0, 0x1c, 0xa1, 0x77, 0xa1, 0x4e, 0xb2, 0x19, - 0xa3, 0xf1, 0x94, 0x4a, 0x7f, 0xff, 0xd4, 0x6d, 0xd7, 0xf1, 0x4d, 0x00, 0xbd, 0x0d, 0xb5, 0xe5, - 0xfa, 0x95, 0x8c, 0x32, 0xc1, 0xac, 0x23, 0xf8, 0x40, 0xe3, 0x17, 0x82, 0xa1, 0xf7, 0xa0, 0xb1, - 0x5c, 0xab, 0x68, 0x41, 0xc9, 0x8c, 0x0a, 0xe9, 0x7b, 0x86, 0x0a, 0xcb, 0xb5, 0x3a, 0xb7, 0x11, - 0xf4, 0x00, 0x34, 0x8a, 0x52, 0x22, 0xc8, 0x4a, 0xfa, 0x07, 0x56, 0x7a, 0xb9, 0x56, 0x23, 0x13, - 0x40, 0x63, 0x38, 0x52, 0x82, 0xcd, 0xe7, 0x54, 0x44, 0x22, 0xe3, 0x54, 0xfa, 0xf5, 0x53, 0xb7, - 0xdd, 0xe8, 0x86, 0x25, 0x46, 0x3c, 0x5b, 0xab, 0x70, 0x62, 0x79, 0x38, 0xe3, 0x14, 0x1f, 0xaa, - 0x1b, 0x20, 0x8f, 0x7f, 0x73, 0xa0, 0xb1, 0x95, 0x45, 0xcf, 0xa1, 0x49, 0xaf, 0xa6, 0x3c, 0x9b, - 0xd1, 0x59, 0x94, 0x12, 0xb5, 0xd0, 0x63, 0xd0, 0x55, 0x1e, 0x95, 0x54, 0xd9, 0xda, 0x45, 0xf8, - 0xa8, 0x50, 0x18, 0x69, 0x01, 0x2d, 0xc9, 0xe2, 0x1d, 0xc9, 0xfd, 0xff, 0x2f, 0x59, 0x28, 0x18, - 0xc9, 0xe0, 0x67, 0x07, 0xfc, 0x11, 0xa5, 0xe2, 0x6c, 0x87, 0x3a, 0xa4, 0x6a, 0x91, 0xcc, 0xd0, - 0x97, 0x50, 0x59, 0x15, 0xfb, 0xa7, 0xd1, 0x6d, 0xdf, 0x75, 0x9f, 0x9c, 0xef, 0x61, 0xc3, 0x43, - 0x9f, 0x82, 0xbb, 0x5c, 0x2b, 0xb3, 0xcd, 0x1a, 0xdd, 0xa0, 0xdc, 0xdd, 0xf3, 0x3d, 0xac, 0x09, - 0xbd, 0x1a, 0x78, 0x76, 0x74, 0x01, 0x86, 0xe3, 0x0b, 0xc1, 0xe6, 0x2c, 0xfe, 0xd7, 0xfe, 0x3e, - 0xb1, 0xfa, 0xce, 0x5d, 0xf5, 0x8d, 0x7a, 0xf0, 0xab, 0x0b, 0xde, 0xc8, 0x9c, 0x6c, 0xf4, 0x14, - 0x0e, 0x14, 0x11, 0x73, 0xaa, 0x8a, 0xe1, 0x94, 0x9d, 0x85, 0x89, 0xf9, 0x7a, 0x4c, 0x39, 0x9d, - 0xaa, 0x44, 0xe0, 0x82, 0x8d, 0x86, 0x50, 0x4d, 0xa9, 0xde, 0x8b, 0x76, 0x20, 0x9f, 0x95, 0xc8, - 0xdc, 0xe6, 0x38, 0xb6, 0x2a, 0xa8, 0x0d, 0x2d, 0xbd, 0x88, 0x98, 0x8c, 0x92, 0x54, 0xa7, 0x09, - 0x37, 0x67, 0xa0, 0x86, 0x9b, 0x3a, 0x3e, 0x90, 0x17, 0x79, 0x14, 0x8d, 0xe1, 0x20, 0x31, 0x06, - 0x49, 0xbf, 0x62, 0x4a, 0x3f, 0x29, 0x29, 0x7d, 0xbb, 0x9d, 0xb8, 0x50, 0x42, 0x1f, 0x00, 0xb2, - 0xcb, 0x9d, 0x06, 0xaa, 0xa6, 0x81, 0x96, 0xcd, 0x6c, 0xb5, 0xf0, 0x03, 0xbc, 0x95, 0x0a, 0x16, - 0x4f, 0x59, 0x4a, 0x78, 0x74, 0xc9, 0xe2, 0x19, 0x8b, 0xe7, 0xbe, 0x67, 0xae, 0x96, 0x4e, 0x99, - 0x0f, 0x05, 0xaf, 0x67, 0x69, 0xb8, 0x95, 0xbe, 0x11, 0x09, 0xfe, 0x72, 0xa0, 0xb9, 0xeb, 0x3a, - 0x42, 0x50, 0x89, 0xc9, 0x8a, 0xe6, 0xb7, 0x89, 0x59, 0xa3, 0x33, 0xa8, 0xa6, 0x89, 0x50, 0xc5, - 0x00, 0xde, 0x2f, 0x2b, 0x9c, 0x88, 0x9b, 0x29, 0x5a, 0x26, 0x7a, 0x0e, 0x1e, 0x27, 0x97, 0x94, - 0x4b, 0xdf, 0xbd, 0x93, 0x93, 0xbb, 0x5d, 0x85, 0xdf, 0x18, 0x6e, 0x3f, 0x56, 0x62, 0x83, 0x73, - 0xa1, 0xe3, 0x27, 0xd0, 0xd8, 0x0a, 0xa3, 0x16, 0xb8, 0xaf, 0xe8, 0x26, 0xef, 0x5b, 0x2f, 0xd1, - 0x3d, 0xa8, 0xbe, 0x26, 0x3c, 0xb3, 0x57, 0x71, 0x1d, 0x5b, 0xf0, 0xc5, 0xfe, 0xe7, 0x4e, 0xf0, - 0x35, 0x1c, 0x6e, 0x37, 0xa9, 0x9f, 0x87, 0x38, 0x5b, 0x5d, 0xe6, 0x97, 0xe8, 0x91, 0x7e, 0x1e, - 0x2c, 0x46, 0xf7, 0x72, 0x3b, 0x8a, 0x07, 0xc5, 0xa0, 0x9e, 0x07, 0x15, 0xfd, 0x5b, 0x8f, 0x3e, - 0x82, 0xd6, 0x9b, 0x2e, 0xa3, 0x43, 0xa8, 0xbd, 0x18, 0xf7, 0xa3, 0x51, 0xbf, 0x8f, 0xed, 0xb5, - 0xad, 0xd1, 0x05, 0x1e, 0x3c, 0x1d, 0x7c, 0xdb, 0x72, 0x7a, 0xdd, 0xdf, 0xaf, 0x4f, 0x9c, 0x3f, - 0xae, 0x4f, 0x9c, 0x3f, 0xaf, 0x4f, 0x9c, 0xef, 0x1f, 0x5a, 0x13, 0x58, 0xd2, 0x21, 0x29, 0xeb, - 0xdc, 0xf2, 0x52, 0x5e, 0x7a, 0xe6, 0x8d, 0xfc, 0xf8, 0xef, 0x00, 0x00, 0x00, 0xff, 0xff, 0x46, - 0xc2, 0xaa, 0x6f, 0x4b, 0x07, 0x00, 0x00, -} diff --git a/envoy/config/filter/http/authn/v2alpha1/config.pb.go b/envoy/config/filter/http/authn/v2alpha1/config.pb.go index 4600d1e76bf..7559515833f 100644 --- a/envoy/config/filter/http/authn/v2alpha1/config.pb.go +++ b/envoy/config/filter/http/authn/v2alpha1/config.pb.go @@ -1,32 +1,15 @@ // Code generated by protoc-gen-gogo. DO NOT EDIT. // source: envoy/config/filter/http/authn/v2alpha1/config.proto -/* - Package v2alpha1 is a generated protocol buffer package. - - It is generated from these files: - envoy/config/filter/http/authn/v2alpha1/config.proto - envoy/config/filter/http/jwt_auth/v2alpha1/config.proto - envoy/config/filter/network/tcp_cluster_rewrite/v2alpha1/config.proto - - It has these top-level messages: - FilterConfig - HttpUri - DataSource - JwtRule - RemoteJwks - JwtHeader - JwtAuthentication - TcpClusterRewrite -*/ package v2alpha1 -import proto "github.com/gogo/protobuf/proto" -import fmt "fmt" -import math "math" -import istio_authentication_v1alpha1 "istio.io/api/authentication/v1alpha1" - -import io "io" +import ( + fmt "fmt" + proto "github.com/gogo/protobuf/proto" + io "io" + v1alpha1 "istio.io/api/authentication/v1alpha1" + math "math" +) // Reference imports to suppress errors if they are not otherwise used. var _ = proto.Marshal @@ -43,19 +26,50 @@ const _ = proto.GoGoProtoPackageIsVersion2 // please upgrade the proto package // authentication policy on Envoy. type FilterConfig struct { // Policy is the original copy of the policy. - Policy *istio_authentication_v1alpha1.Policy `protobuf:"bytes,1,opt,name=policy" json:"policy,omitempty"` + Policy *v1alpha1.Policy `protobuf:"bytes,1,opt,name=policy,proto3" json:"policy,omitempty"` // Map from issuer to location of the payload that is emitted by Jwt filter. // This information is added by pilot when construct and add Jwt and // authN filters. - JwtOutputPayloadLocations map[string]string `protobuf:"bytes,2,rep,name=jwt_output_payload_locations,json=jwtOutputPayloadLocations" json:"jwt_output_payload_locations,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` + JwtOutputPayloadLocations map[string]string `protobuf:"bytes,2,rep,name=jwt_output_payload_locations,json=jwtOutputPayloadLocations,proto3" json:"jwt_output_payload_locations,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` } -func (m *FilterConfig) Reset() { *m = FilterConfig{} } -func (m *FilterConfig) String() string { return proto.CompactTextString(m) } -func (*FilterConfig) ProtoMessage() {} -func (*FilterConfig) Descriptor() ([]byte, []int) { return fileDescriptorConfig, []int{0} } +func (m *FilterConfig) Reset() { *m = FilterConfig{} } +func (m *FilterConfig) String() string { return proto.CompactTextString(m) } +func (*FilterConfig) ProtoMessage() {} +func (*FilterConfig) Descriptor() ([]byte, []int) { + return fileDescriptor_b4b13c85ef974588, []int{0} +} +func (m *FilterConfig) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *FilterConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_FilterConfig.Marshal(b, m, deterministic) + } else { + b = b[:cap(b)] + n, err := m.MarshalTo(b) + if err != nil { + return nil, err + } + return b[:n], nil + } +} +func (m *FilterConfig) XXX_Merge(src proto.Message) { + xxx_messageInfo_FilterConfig.Merge(m, src) +} +func (m *FilterConfig) XXX_Size() int { + return m.Size() +} +func (m *FilterConfig) XXX_DiscardUnknown() { + xxx_messageInfo_FilterConfig.DiscardUnknown(m) +} + +var xxx_messageInfo_FilterConfig proto.InternalMessageInfo -func (m *FilterConfig) GetPolicy() *istio_authentication_v1alpha1.Policy { +func (m *FilterConfig) GetPolicy() *v1alpha1.Policy { if m != nil { return m.Policy } @@ -71,7 +85,36 @@ func (m *FilterConfig) GetJwtOutputPayloadLocations() map[string]string { func init() { proto.RegisterType((*FilterConfig)(nil), "istio.envoy.config.filter.http.authn.v2alpha1.FilterConfig") + proto.RegisterMapType((map[string]string)(nil), "istio.envoy.config.filter.http.authn.v2alpha1.FilterConfig.JwtOutputPayloadLocationsEntry") +} + +func init() { + proto.RegisterFile("envoy/config/filter/http/authn/v2alpha1/config.proto", fileDescriptor_b4b13c85ef974588) +} + +var fileDescriptor_b4b13c85ef974588 = []byte{ + // 302 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x91, 0x41, 0x4b, 0xc3, 0x30, + 0x14, 0xc7, 0x49, 0x87, 0x03, 0x33, 0x0f, 0x52, 0x3c, 0xcc, 0x21, 0x65, 0x88, 0xc2, 0x2e, 0xbe, + 0xb0, 0xb9, 0x83, 0x08, 0x5e, 0x26, 0x7a, 0x90, 0x81, 0xa3, 0xc7, 0x5d, 0x4a, 0xac, 0x9d, 0xcd, + 0x0c, 0x49, 0xe8, 0x5e, 0x3b, 0xfa, 0x59, 0xfc, 0x24, 0x7e, 0x03, 0x8f, 0x7e, 0x04, 0xe9, 0x27, + 0x91, 0x26, 0x2d, 0xe8, 0x41, 0xd1, 0x5b, 0x5e, 0xde, 0xfb, 0xfd, 0x92, 0x3f, 0x8f, 0x4e, 0x13, + 0x55, 0xe8, 0x92, 0xc5, 0x5a, 0xad, 0xc4, 0x13, 0x5b, 0x09, 0x89, 0x49, 0xc6, 0x52, 0x44, 0xc3, + 0x78, 0x8e, 0xa9, 0x62, 0xc5, 0x84, 0x4b, 0x93, 0xf2, 0x71, 0x33, 0x01, 0x26, 0xd3, 0xa8, 0xfd, + 0x33, 0xb1, 0x41, 0xa1, 0xc1, 0xb2, 0xd0, 0x74, 0x1c, 0x0b, 0x35, 0x0b, 0x96, 0x85, 0x96, 0x1d, + 0x9c, 0xd4, 0x75, 0xa2, 0x50, 0xc4, 0x1c, 0x85, 0x56, 0xac, 0x18, 0x37, 0x52, 0xa3, 0xa5, 0x88, + 0x4b, 0x27, 0x3d, 0x7e, 0xf5, 0xe8, 0xde, 0xad, 0x95, 0x5c, 0x5b, 0xa3, 0x7f, 0x45, 0xbb, 0x6e, + 0xa0, 0x4f, 0x86, 0x64, 0xd4, 0x9b, 0x9c, 0x82, 0x7b, 0xf6, 0xbb, 0x0d, 0x5a, 0x1b, 0x2c, 0xec, + 0x70, 0xd8, 0x40, 0xfe, 0x0b, 0xa1, 0x47, 0xeb, 0x2d, 0x46, 0x3a, 0x47, 0x93, 0x63, 0x64, 0x78, + 0x29, 0x35, 0x7f, 0x8c, 0xa4, 0x76, 0xdc, 0xa6, 0xef, 0x0d, 0x3b, 0xa3, 0xde, 0x64, 0x09, 0xff, + 0x0a, 0x03, 0x5f, 0xbf, 0x08, 0x77, 0x5b, 0xbc, 0xb7, 0xfa, 0x85, 0xb3, 0xcf, 0x5b, 0xf9, 0x8d, + 0xc2, 0xac, 0x0c, 0x0f, 0xd7, 0x3f, 0xf5, 0x07, 0x73, 0x1a, 0xfc, 0x0e, 0xfb, 0xfb, 0xb4, 0xf3, + 0x9c, 0xb8, 0xec, 0xbb, 0x61, 0x7d, 0xf4, 0x0f, 0xe8, 0x4e, 0xc1, 0x65, 0x9e, 0xf4, 0x3d, 0x7b, + 0xe7, 0x8a, 0x4b, 0xef, 0x82, 0xcc, 0x66, 0x6f, 0x55, 0x40, 0xde, 0xab, 0x80, 0x7c, 0x54, 0x01, + 0x59, 0x4e, 0x5d, 0x22, 0xa1, 0x19, 0x37, 0x82, 0xfd, 0x71, 0xc3, 0x0f, 0x5d, 0xbb, 0x86, 0xf3, + 0xcf, 0x00, 0x00, 0x00, 0xff, 0xff, 0xce, 0x7c, 0xfe, 0x70, 0x13, 0x02, 0x00, 0x00, } + func (m *FilterConfig) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) @@ -114,6 +157,9 @@ func (m *FilterConfig) MarshalTo(dAtA []byte) (int, error) { i += copy(dAtA[i:], v) } } + if m.XXX_unrecognized != nil { + i += copy(dAtA[i:], m.XXX_unrecognized) + } return i, nil } @@ -127,6 +173,9 @@ func encodeVarintConfig(dAtA []byte, offset int, v uint64) int { return offset + 1 } func (m *FilterConfig) Size() (n int) { + if m == nil { + return 0 + } var l int _ = l if m.Policy != nil { @@ -141,6 +190,9 @@ func (m *FilterConfig) Size() (n int) { n += mapEntrySize + 1 + sovConfig(uint64(mapEntrySize)) } } + if m.XXX_unrecognized != nil { + n += len(m.XXX_unrecognized) + } return n } @@ -172,7 +224,7 @@ func (m *FilterConfig) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - wire |= (uint64(b) & 0x7F) << shift + wire |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -200,7 +252,7 @@ func (m *FilterConfig) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - msglen |= (int(b) & 0x7F) << shift + msglen |= int(b&0x7F) << shift if b < 0x80 { break } @@ -209,11 +261,14 @@ func (m *FilterConfig) Unmarshal(dAtA []byte) error { return ErrInvalidLengthConfig } postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthConfig + } if postIndex > l { return io.ErrUnexpectedEOF } if m.Policy == nil { - m.Policy = &istio_authentication_v1alpha1.Policy{} + m.Policy = &v1alpha1.Policy{} } if err := m.Policy.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err @@ -233,7 +288,7 @@ func (m *FilterConfig) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - msglen |= (int(b) & 0x7F) << shift + msglen |= int(b&0x7F) << shift if b < 0x80 { break } @@ -242,6 +297,9 @@ func (m *FilterConfig) Unmarshal(dAtA []byte) error { return ErrInvalidLengthConfig } postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthConfig + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -262,7 +320,7 @@ func (m *FilterConfig) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - wire |= (uint64(b) & 0x7F) << shift + wire |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -279,7 +337,7 @@ func (m *FilterConfig) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLenmapkey |= (uint64(b) & 0x7F) << shift + stringLenmapkey |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -289,6 +347,9 @@ func (m *FilterConfig) Unmarshal(dAtA []byte) error { return ErrInvalidLengthConfig } postStringIndexmapkey := iNdEx + intStringLenmapkey + if postStringIndexmapkey < 0 { + return ErrInvalidLengthConfig + } if postStringIndexmapkey > l { return io.ErrUnexpectedEOF } @@ -305,7 +366,7 @@ func (m *FilterConfig) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLenmapvalue |= (uint64(b) & 0x7F) << shift + stringLenmapvalue |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -315,6 +376,9 @@ func (m *FilterConfig) Unmarshal(dAtA []byte) error { return ErrInvalidLengthConfig } postStringIndexmapvalue := iNdEx + intStringLenmapvalue + if postStringIndexmapvalue < 0 { + return ErrInvalidLengthConfig + } if postStringIndexmapvalue > l { return io.ErrUnexpectedEOF } @@ -346,9 +410,13 @@ func (m *FilterConfig) Unmarshal(dAtA []byte) error { if skippy < 0 { return ErrInvalidLengthConfig } + if (iNdEx + skippy) < 0 { + return ErrInvalidLengthConfig + } if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF } + m.XXX_unrecognized = append(m.XXX_unrecognized, dAtA[iNdEx:iNdEx+skippy]...) iNdEx += skippy } } @@ -412,10 +480,13 @@ func skipConfig(dAtA []byte) (n int, err error) { break } } - iNdEx += length if length < 0 { return 0, ErrInvalidLengthConfig } + iNdEx += length + if iNdEx < 0 { + return 0, ErrInvalidLengthConfig + } return iNdEx, nil case 3: for { @@ -444,6 +515,9 @@ func skipConfig(dAtA []byte) (n int, err error) { return 0, err } iNdEx = start + next + if iNdEx < 0 { + return 0, ErrInvalidLengthConfig + } } return iNdEx, nil case 4: @@ -462,30 +536,3 @@ var ( ErrInvalidLengthConfig = fmt.Errorf("proto: negative length found during unmarshaling") ErrIntOverflowConfig = fmt.Errorf("proto: integer overflow") ) - -func init() { - proto.RegisterFile("envoy/config/filter/http/authn/v2alpha1/config.proto", fileDescriptorConfig) -} - -var fileDescriptorConfig = []byte{ - // 302 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x91, 0x41, 0x4b, 0xc3, 0x30, - 0x14, 0xc7, 0x49, 0x87, 0x03, 0x33, 0x0f, 0x52, 0x3c, 0xcc, 0x21, 0x65, 0x88, 0xc2, 0x2e, 0xbe, - 0xb0, 0xb9, 0x83, 0x08, 0x5e, 0x26, 0x7a, 0x90, 0x81, 0xa3, 0xc7, 0x5d, 0x4a, 0xac, 0x9d, 0xcd, - 0x0c, 0x49, 0xe8, 0x5e, 0x3b, 0xfa, 0x59, 0xfc, 0x24, 0x7e, 0x03, 0x8f, 0x7e, 0x04, 0xe9, 0x27, - 0x91, 0x26, 0x2d, 0xe8, 0x41, 0xd1, 0x5b, 0x5e, 0xde, 0xfb, 0xfd, 0x92, 0x3f, 0x8f, 0x4e, 0x13, - 0x55, 0xe8, 0x92, 0xc5, 0x5a, 0xad, 0xc4, 0x13, 0x5b, 0x09, 0x89, 0x49, 0xc6, 0x52, 0x44, 0xc3, - 0x78, 0x8e, 0xa9, 0x62, 0xc5, 0x84, 0x4b, 0x93, 0xf2, 0x71, 0x33, 0x01, 0x26, 0xd3, 0xa8, 0xfd, - 0x33, 0xb1, 0x41, 0xa1, 0xc1, 0xb2, 0xd0, 0x74, 0x1c, 0x0b, 0x35, 0x0b, 0x96, 0x85, 0x96, 0x1d, - 0x9c, 0xd4, 0x75, 0xa2, 0x50, 0xc4, 0x1c, 0x85, 0x56, 0xac, 0x18, 0x37, 0x52, 0xa3, 0xa5, 0x88, - 0x4b, 0x27, 0x3d, 0x7e, 0xf5, 0xe8, 0xde, 0xad, 0x95, 0x5c, 0x5b, 0xa3, 0x7f, 0x45, 0xbb, 0x6e, - 0xa0, 0x4f, 0x86, 0x64, 0xd4, 0x9b, 0x9c, 0x82, 0x7b, 0xf6, 0xbb, 0x0d, 0x5a, 0x1b, 0x2c, 0xec, - 0x70, 0xd8, 0x40, 0xfe, 0x0b, 0xa1, 0x47, 0xeb, 0x2d, 0x46, 0x3a, 0x47, 0x93, 0x63, 0x64, 0x78, - 0x29, 0x35, 0x7f, 0x8c, 0xa4, 0x76, 0xdc, 0xa6, 0xef, 0x0d, 0x3b, 0xa3, 0xde, 0x64, 0x09, 0xff, - 0x0a, 0x03, 0x5f, 0xbf, 0x08, 0x77, 0x5b, 0xbc, 0xb7, 0xfa, 0x85, 0xb3, 0xcf, 0x5b, 0xf9, 0x8d, - 0xc2, 0xac, 0x0c, 0x0f, 0xd7, 0x3f, 0xf5, 0x07, 0x73, 0x1a, 0xfc, 0x0e, 0xfb, 0xfb, 0xb4, 0xf3, - 0x9c, 0xb8, 0xec, 0xbb, 0x61, 0x7d, 0xf4, 0x0f, 0xe8, 0x4e, 0xc1, 0x65, 0x9e, 0xf4, 0x3d, 0x7b, - 0xe7, 0x8a, 0x4b, 0xef, 0x82, 0xcc, 0x66, 0x6f, 0x55, 0x40, 0xde, 0xab, 0x80, 0x7c, 0x54, 0x01, - 0x59, 0x4e, 0x5d, 0x22, 0xa1, 0x19, 0x37, 0x82, 0xfd, 0x71, 0xc3, 0x0f, 0x5d, 0xbb, 0x86, 0xf3, - 0xcf, 0x00, 0x00, 0x00, 0xff, 0xff, 0xce, 0x7c, 0xfe, 0x70, 0x13, 0x02, 0x00, 0x00, -} diff --git a/envoy/config/filter/http/jwt_auth/v2alpha1/config.pb.go b/envoy/config/filter/http/jwt_auth/v2alpha1/config.pb.go deleted file mode 100644 index fee80f4f45b..00000000000 --- a/envoy/config/filter/http/jwt_auth/v2alpha1/config.pb.go +++ /dev/null @@ -1,2173 +0,0 @@ -// Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: envoy/config/filter/http/jwt_auth/v2alpha1/config.proto - -package v2alpha1 - -import proto "github.com/gogo/protobuf/proto" -import fmt "fmt" -import math "math" -import google_protobuf "github.com/gogo/protobuf/types" - -import io "io" - -// Reference imports to suppress errors if they are not otherwise used. -var _ = proto.Marshal -var _ = fmt.Errorf -var _ = math.Inf - -// Copied from @envoy/api/envoy/api/v2/core/http_uri.proto -// Envoy external URI descriptor -type HttpUri struct { - // The HTTP server URI. It should be a full FQDN with protocol, host and path. - // - // Example: - // - // .. code-block:: yaml - // - // uri: https://www.googleapis.com/oauth2/v1/certs - // - Uri string `protobuf:"bytes,1,opt,name=uri,proto3" json:"uri,omitempty"` - // Specify how `uri` is to be fetched. Today, this requires an explicit - // cluster, but in the future we may support dynamic cluster creation or - // inline DNS resolution. See `issue - // `_. - // - // Types that are valid to be assigned to HttpUpstreamType: - // *HttpUri_Cluster - HttpUpstreamType isHttpUri_HttpUpstreamType `protobuf_oneof:"http_upstream_type"` - // Sets the maximum duration in milliseconds that a response can take to arrive upon request. - Timeout *google_protobuf.Duration `protobuf:"bytes,3,opt,name=timeout" json:"timeout,omitempty"` -} - -func (m *HttpUri) Reset() { *m = HttpUri{} } -func (m *HttpUri) String() string { return proto.CompactTextString(m) } -func (*HttpUri) ProtoMessage() {} -func (*HttpUri) Descriptor() ([]byte, []int) { return fileDescriptorConfig, []int{0} } - -type isHttpUri_HttpUpstreamType interface { - isHttpUri_HttpUpstreamType() - MarshalTo([]byte) (int, error) - Size() int -} - -type HttpUri_Cluster struct { - Cluster string `protobuf:"bytes,2,opt,name=cluster,proto3,oneof"` -} - -func (*HttpUri_Cluster) isHttpUri_HttpUpstreamType() {} - -func (m *HttpUri) GetHttpUpstreamType() isHttpUri_HttpUpstreamType { - if m != nil { - return m.HttpUpstreamType - } - return nil -} - -func (m *HttpUri) GetUri() string { - if m != nil { - return m.Uri - } - return "" -} - -func (m *HttpUri) GetCluster() string { - if x, ok := m.GetHttpUpstreamType().(*HttpUri_Cluster); ok { - return x.Cluster - } - return "" -} - -func (m *HttpUri) GetTimeout() *google_protobuf.Duration { - if m != nil { - return m.Timeout - } - return nil -} - -// XXX_OneofFuncs is for the internal use of the proto package. -func (*HttpUri) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) { - return _HttpUri_OneofMarshaler, _HttpUri_OneofUnmarshaler, _HttpUri_OneofSizer, []interface{}{ - (*HttpUri_Cluster)(nil), - } -} - -func _HttpUri_OneofMarshaler(msg proto.Message, b *proto.Buffer) error { - m := msg.(*HttpUri) - // http_upstream_type - switch x := m.HttpUpstreamType.(type) { - case *HttpUri_Cluster: - _ = b.EncodeVarint(2<<3 | proto.WireBytes) - _ = b.EncodeStringBytes(x.Cluster) - case nil: - default: - return fmt.Errorf("HttpUri.HttpUpstreamType has unexpected type %T", x) - } - return nil -} - -func _HttpUri_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) { - m := msg.(*HttpUri) - switch tag { - case 2: // http_upstream_type.cluster - if wire != proto.WireBytes { - return true, proto.ErrInternalBadWireType - } - x, err := b.DecodeStringBytes() - m.HttpUpstreamType = &HttpUri_Cluster{x} - return true, err - default: - return false, nil - } -} - -func _HttpUri_OneofSizer(msg proto.Message) (n int) { - m := msg.(*HttpUri) - // http_upstream_type - switch x := m.HttpUpstreamType.(type) { - case *HttpUri_Cluster: - n += proto.SizeVarint(2<<3 | proto.WireBytes) - n += proto.SizeVarint(uint64(len(x.Cluster))) - n += len(x.Cluster) - case nil: - default: - panic(fmt.Sprintf("proto: unexpected type %T in oneof", x)) - } - return n -} - -// Copied from @envoy/api/envoy/api/v2/core/base.proto -// Data source consisting of either a file or an inline value. -type DataSource struct { - // Types that are valid to be assigned to Specifier: - // *DataSource_Filename - // *DataSource_InlineBytes - // *DataSource_InlineString - Specifier isDataSource_Specifier `protobuf_oneof:"specifier"` -} - -func (m *DataSource) Reset() { *m = DataSource{} } -func (m *DataSource) String() string { return proto.CompactTextString(m) } -func (*DataSource) ProtoMessage() {} -func (*DataSource) Descriptor() ([]byte, []int) { return fileDescriptorConfig, []int{1} } - -type isDataSource_Specifier interface { - isDataSource_Specifier() - MarshalTo([]byte) (int, error) - Size() int -} - -type DataSource_Filename struct { - Filename string `protobuf:"bytes,1,opt,name=filename,proto3,oneof"` -} -type DataSource_InlineBytes struct { - InlineBytes []byte `protobuf:"bytes,2,opt,name=inline_bytes,json=inlineBytes,proto3,oneof"` -} -type DataSource_InlineString struct { - InlineString string `protobuf:"bytes,3,opt,name=inline_string,json=inlineString,proto3,oneof"` -} - -func (*DataSource_Filename) isDataSource_Specifier() {} -func (*DataSource_InlineBytes) isDataSource_Specifier() {} -func (*DataSource_InlineString) isDataSource_Specifier() {} - -func (m *DataSource) GetSpecifier() isDataSource_Specifier { - if m != nil { - return m.Specifier - } - return nil -} - -func (m *DataSource) GetFilename() string { - if x, ok := m.GetSpecifier().(*DataSource_Filename); ok { - return x.Filename - } - return "" -} - -func (m *DataSource) GetInlineBytes() []byte { - if x, ok := m.GetSpecifier().(*DataSource_InlineBytes); ok { - return x.InlineBytes - } - return nil -} - -func (m *DataSource) GetInlineString() string { - if x, ok := m.GetSpecifier().(*DataSource_InlineString); ok { - return x.InlineString - } - return "" -} - -// XXX_OneofFuncs is for the internal use of the proto package. -func (*DataSource) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) { - return _DataSource_OneofMarshaler, _DataSource_OneofUnmarshaler, _DataSource_OneofSizer, []interface{}{ - (*DataSource_Filename)(nil), - (*DataSource_InlineBytes)(nil), - (*DataSource_InlineString)(nil), - } -} - -func _DataSource_OneofMarshaler(msg proto.Message, b *proto.Buffer) error { - m := msg.(*DataSource) - // specifier - switch x := m.Specifier.(type) { - case *DataSource_Filename: - _ = b.EncodeVarint(1<<3 | proto.WireBytes) - _ = b.EncodeStringBytes(x.Filename) - case *DataSource_InlineBytes: - _ = b.EncodeVarint(2<<3 | proto.WireBytes) - _ = b.EncodeRawBytes(x.InlineBytes) - case *DataSource_InlineString: - _ = b.EncodeVarint(3<<3 | proto.WireBytes) - _ = b.EncodeStringBytes(x.InlineString) - case nil: - default: - return fmt.Errorf("DataSource.Specifier has unexpected type %T", x) - } - return nil -} - -func _DataSource_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) { - m := msg.(*DataSource) - switch tag { - case 1: // specifier.filename - if wire != proto.WireBytes { - return true, proto.ErrInternalBadWireType - } - x, err := b.DecodeStringBytes() - m.Specifier = &DataSource_Filename{x} - return true, err - case 2: // specifier.inline_bytes - if wire != proto.WireBytes { - return true, proto.ErrInternalBadWireType - } - x, err := b.DecodeRawBytes(true) - m.Specifier = &DataSource_InlineBytes{x} - return true, err - case 3: // specifier.inline_string - if wire != proto.WireBytes { - return true, proto.ErrInternalBadWireType - } - x, err := b.DecodeStringBytes() - m.Specifier = &DataSource_InlineString{x} - return true, err - default: - return false, nil - } -} - -func _DataSource_OneofSizer(msg proto.Message) (n int) { - m := msg.(*DataSource) - // specifier - switch x := m.Specifier.(type) { - case *DataSource_Filename: - n += proto.SizeVarint(1<<3 | proto.WireBytes) - n += proto.SizeVarint(uint64(len(x.Filename))) - n += len(x.Filename) - case *DataSource_InlineBytes: - n += proto.SizeVarint(2<<3 | proto.WireBytes) - n += proto.SizeVarint(uint64(len(x.InlineBytes))) - n += len(x.InlineBytes) - case *DataSource_InlineString: - n += proto.SizeVarint(3<<3 | proto.WireBytes) - n += proto.SizeVarint(uint64(len(x.InlineString))) - n += len(x.InlineString) - case nil: - default: - panic(fmt.Sprintf("proto: unexpected type %T in oneof", x)) - } - return n -} - -// This message specifies how a JSON Web Token (JWT) can be verified. JWT format is defined -// `here `_. Please see `OAuth2.0 -// `_ and `OIDC1.0 `_ for -// the authentication flow. -// -// Example: -// -// .. code-block:: yaml -// -// issuer: https://example.com -// audiences: -// - bookstore_android.apps.googleusercontent.com -// bookstore_web.apps.googleusercontent.com -// remote_jwks: -// - http_uri: -// - uri: https://example.com/.well-known/jwks.json -// cluster: example_jwks_cluster -// cache_duration: -// - seconds: 300 -// -// [#not-implemented-hide:] -type JwtRule struct { - // Identifies the principal that issued the JWT. See `here - // `_. Usually a URL or an email address. - // - // Example: https://securetoken.google.com - // Example: 1234567-compute@developer.gserviceaccount.com - // - Issuer string `protobuf:"bytes,1,opt,name=issuer,proto3" json:"issuer,omitempty"` - // The list of JWT `audiences `_. that are - // allowed to access. A JWT containing any of these audiences will be accepted. If not specified, - // will not check audiences in the token. - // - // Example: - // - // .. code-block:: yaml - // - // audiences: - // - bookstore_android.apps.googleusercontent.com - // bookstore_web.apps.googleusercontent.com - // - Audiences []string `protobuf:"bytes,2,rep,name=audiences" json:"audiences,omitempty"` - // `JSON Web Key Set `_ is needed. to validate - // signature of the JWT. This field specifies where to fetch JWKS. - // - // Types that are valid to be assigned to JwksSourceSpecifier: - // *JwtRule_RemoteJwks - // *JwtRule_LocalJwks - JwksSourceSpecifier isJwtRule_JwksSourceSpecifier `protobuf_oneof:"jwks_source_specifier"` - // If false, the JWT is removed in the request after a success verification. If true, the JWT is - // not removed in the request. Default value is false. - Forward bool `protobuf:"varint,5,opt,name=forward,proto3" json:"forward,omitempty"` - // Specify the HTTP headers to extract JWT token. For examples, following config: - // - // .. code-block:: yaml - // - // from_headers: - // - name: x-goog-iap-jwt-assertion - // - // can be used to extract token from header:: - // - // x-goog-iap-jwt-assertion: . - // - FromHeaders []*JwtHeader `protobuf:"bytes,6,rep,name=from_headers,json=fromHeaders" json:"from_headers,omitempty"` - // JWT is sent in a query parameter. `jwt_params` represents the query parameter names. - // - // For example, if config is: - // - // .. code-block:: yaml - // - // from_params: - // - jwt_token - // - // The JWT format in query parameter is:: - // - // /path?jwt_token= - // - FromParams []string `protobuf:"bytes,7,rep,name=from_params,json=fromParams" json:"from_params,omitempty"` - // This field specifies the header name to forward a successfully verified JWT payload to the - // backend. The forwarded data is:: - // - // base64_encoded(jwt_payload_in_JSON) - // - // If it is not specified, the payload will not be forwarded. - // Multiple JWTs in a request from different issuers will be supported. Multiple JWTs from the - // same issuer will not be supported. Each issuer can config this `forward_payload_header`. If - // multiple JWTs from different issuers want to forward their payloads, their - // `forward_payload_header` should be different. - ForwardPayloadHeader string `protobuf:"bytes,8,opt,name=forward_payload_header,json=forwardPayloadHeader,proto3" json:"forward_payload_header,omitempty"` -} - -func (m *JwtRule) Reset() { *m = JwtRule{} } -func (m *JwtRule) String() string { return proto.CompactTextString(m) } -func (*JwtRule) ProtoMessage() {} -func (*JwtRule) Descriptor() ([]byte, []int) { return fileDescriptorConfig, []int{2} } - -type isJwtRule_JwksSourceSpecifier interface { - isJwtRule_JwksSourceSpecifier() - MarshalTo([]byte) (int, error) - Size() int -} - -type JwtRule_RemoteJwks struct { - RemoteJwks *RemoteJwks `protobuf:"bytes,3,opt,name=remote_jwks,json=remoteJwks,oneof"` -} -type JwtRule_LocalJwks struct { - LocalJwks *DataSource `protobuf:"bytes,4,opt,name=local_jwks,json=localJwks,oneof"` -} - -func (*JwtRule_RemoteJwks) isJwtRule_JwksSourceSpecifier() {} -func (*JwtRule_LocalJwks) isJwtRule_JwksSourceSpecifier() {} - -func (m *JwtRule) GetJwksSourceSpecifier() isJwtRule_JwksSourceSpecifier { - if m != nil { - return m.JwksSourceSpecifier - } - return nil -} - -func (m *JwtRule) GetIssuer() string { - if m != nil { - return m.Issuer - } - return "" -} - -func (m *JwtRule) GetAudiences() []string { - if m != nil { - return m.Audiences - } - return nil -} - -func (m *JwtRule) GetRemoteJwks() *RemoteJwks { - if x, ok := m.GetJwksSourceSpecifier().(*JwtRule_RemoteJwks); ok { - return x.RemoteJwks - } - return nil -} - -func (m *JwtRule) GetLocalJwks() *DataSource { - if x, ok := m.GetJwksSourceSpecifier().(*JwtRule_LocalJwks); ok { - return x.LocalJwks - } - return nil -} - -func (m *JwtRule) GetForward() bool { - if m != nil { - return m.Forward - } - return false -} - -func (m *JwtRule) GetFromHeaders() []*JwtHeader { - if m != nil { - return m.FromHeaders - } - return nil -} - -func (m *JwtRule) GetFromParams() []string { - if m != nil { - return m.FromParams - } - return nil -} - -func (m *JwtRule) GetForwardPayloadHeader() string { - if m != nil { - return m.ForwardPayloadHeader - } - return "" -} - -// XXX_OneofFuncs is for the internal use of the proto package. -func (*JwtRule) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) { - return _JwtRule_OneofMarshaler, _JwtRule_OneofUnmarshaler, _JwtRule_OneofSizer, []interface{}{ - (*JwtRule_RemoteJwks)(nil), - (*JwtRule_LocalJwks)(nil), - } -} - -func _JwtRule_OneofMarshaler(msg proto.Message, b *proto.Buffer) error { - m := msg.(*JwtRule) - // jwks_source_specifier - switch x := m.JwksSourceSpecifier.(type) { - case *JwtRule_RemoteJwks: - _ = b.EncodeVarint(3<<3 | proto.WireBytes) - if err := b.EncodeMessage(x.RemoteJwks); err != nil { - return err - } - case *JwtRule_LocalJwks: - _ = b.EncodeVarint(4<<3 | proto.WireBytes) - if err := b.EncodeMessage(x.LocalJwks); err != nil { - return err - } - case nil: - default: - return fmt.Errorf("JwtRule.JwksSourceSpecifier has unexpected type %T", x) - } - return nil -} - -func _JwtRule_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) { - m := msg.(*JwtRule) - switch tag { - case 3: // jwks_source_specifier.remote_jwks - if wire != proto.WireBytes { - return true, proto.ErrInternalBadWireType - } - msg := new(RemoteJwks) - err := b.DecodeMessage(msg) - m.JwksSourceSpecifier = &JwtRule_RemoteJwks{msg} - return true, err - case 4: // jwks_source_specifier.local_jwks - if wire != proto.WireBytes { - return true, proto.ErrInternalBadWireType - } - msg := new(DataSource) - err := b.DecodeMessage(msg) - m.JwksSourceSpecifier = &JwtRule_LocalJwks{msg} - return true, err - default: - return false, nil - } -} - -func _JwtRule_OneofSizer(msg proto.Message) (n int) { - m := msg.(*JwtRule) - // jwks_source_specifier - switch x := m.JwksSourceSpecifier.(type) { - case *JwtRule_RemoteJwks: - s := proto.Size(x.RemoteJwks) - n += proto.SizeVarint(3<<3 | proto.WireBytes) - n += proto.SizeVarint(uint64(s)) - n += s - case *JwtRule_LocalJwks: - s := proto.Size(x.LocalJwks) - n += proto.SizeVarint(4<<3 | proto.WireBytes) - n += proto.SizeVarint(uint64(s)) - n += s - case nil: - default: - panic(fmt.Sprintf("proto: unexpected type %T in oneof", x)) - } - return n -} - -// This message specifies how to fetch JWKS from remote and how to cache it. -type RemoteJwks struct { - // The HTTP URI to fetch the JWKS. For example: - // - // .. code-block:: yaml - // - // http_uri: - // - uri: https://www.googleapis.com/oauth2/v1/certs - // cluster: jwt.www.googleapis.com|443 - // - HttpUri *HttpUri `protobuf:"bytes,1,opt,name=http_uri,json=httpUri" json:"http_uri,omitempty"` - // Duration after which the cached JWKS should be expired. If not specified, default cache - // duration is 5 minutes. - CacheDuration *google_protobuf.Duration `protobuf:"bytes,2,opt,name=cache_duration,json=cacheDuration" json:"cache_duration,omitempty"` -} - -func (m *RemoteJwks) Reset() { *m = RemoteJwks{} } -func (m *RemoteJwks) String() string { return proto.CompactTextString(m) } -func (*RemoteJwks) ProtoMessage() {} -func (*RemoteJwks) Descriptor() ([]byte, []int) { return fileDescriptorConfig, []int{3} } - -func (m *RemoteJwks) GetHttpUri() *HttpUri { - if m != nil { - return m.HttpUri - } - return nil -} - -func (m *RemoteJwks) GetCacheDuration() *google_protobuf.Duration { - if m != nil { - return m.CacheDuration - } - return nil -} - -// This message specifies a header location to extract JWT token. -type JwtHeader struct { - // The HTTP header name. - Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"` - // The value prefix. The value format is "value_prefix" - // For example, for "Authorization: Bearer ", value_prefix="Bearer " with a space at the - // end. - ValuePrefix string `protobuf:"bytes,2,opt,name=value_prefix,json=valuePrefix,proto3" json:"value_prefix,omitempty"` -} - -func (m *JwtHeader) Reset() { *m = JwtHeader{} } -func (m *JwtHeader) String() string { return proto.CompactTextString(m) } -func (*JwtHeader) ProtoMessage() {} -func (*JwtHeader) Descriptor() ([]byte, []int) { return fileDescriptorConfig, []int{4} } - -func (m *JwtHeader) GetName() string { - if m != nil { - return m.Name - } - return "" -} - -func (m *JwtHeader) GetValuePrefix() string { - if m != nil { - return m.ValuePrefix - } - return "" -} - -// This is the Envoy HTTP filter config for JWT authentication. -// [#not-implemented-hide:] -type JwtAuthentication struct { - // List of JWT rules to valide. - Rules []*JwtRule `protobuf:"bytes,1,rep,name=rules" json:"rules,omitempty"` - // If true, the request is allowed if JWT is missing or JWT verification fails. - // Default is false, a request without JWT or failed JWT verification is not allowed. - AllowMissingOrFailed bool `protobuf:"varint,2,opt,name=allow_missing_or_failed,json=allowMissingOrFailed,proto3" json:"allow_missing_or_failed,omitempty"` -} - -func (m *JwtAuthentication) Reset() { *m = JwtAuthentication{} } -func (m *JwtAuthentication) String() string { return proto.CompactTextString(m) } -func (*JwtAuthentication) ProtoMessage() {} -func (*JwtAuthentication) Descriptor() ([]byte, []int) { return fileDescriptorConfig, []int{5} } - -func (m *JwtAuthentication) GetRules() []*JwtRule { - if m != nil { - return m.Rules - } - return nil -} - -func (m *JwtAuthentication) GetAllowMissingOrFailed() bool { - if m != nil { - return m.AllowMissingOrFailed - } - return false -} - -func init() { - proto.RegisterType((*HttpUri)(nil), "istio.envoy.config.filter.http.jwt_auth.v2alpha1.HttpUri") - proto.RegisterType((*DataSource)(nil), "istio.envoy.config.filter.http.jwt_auth.v2alpha1.DataSource") - proto.RegisterType((*JwtRule)(nil), "istio.envoy.config.filter.http.jwt_auth.v2alpha1.JwtRule") - proto.RegisterType((*RemoteJwks)(nil), "istio.envoy.config.filter.http.jwt_auth.v2alpha1.RemoteJwks") - proto.RegisterType((*JwtHeader)(nil), "istio.envoy.config.filter.http.jwt_auth.v2alpha1.JwtHeader") - proto.RegisterType((*JwtAuthentication)(nil), "istio.envoy.config.filter.http.jwt_auth.v2alpha1.JwtAuthentication") -} -func (m *HttpUri) Marshal() (dAtA []byte, err error) { - size := m.Size() - dAtA = make([]byte, size) - n, err := m.MarshalTo(dAtA) - if err != nil { - return nil, err - } - return dAtA[:n], nil -} - -func (m *HttpUri) MarshalTo(dAtA []byte) (int, error) { - var i int - _ = i - var l int - _ = l - if len(m.Uri) > 0 { - dAtA[i] = 0xa - i++ - i = encodeVarintConfig(dAtA, i, uint64(len(m.Uri))) - i += copy(dAtA[i:], m.Uri) - } - if m.HttpUpstreamType != nil { - nn1, err := m.HttpUpstreamType.MarshalTo(dAtA[i:]) - if err != nil { - return 0, err - } - i += nn1 - } - if m.Timeout != nil { - dAtA[i] = 0x1a - i++ - i = encodeVarintConfig(dAtA, i, uint64(m.Timeout.Size())) - n2, err := m.Timeout.MarshalTo(dAtA[i:]) - if err != nil { - return 0, err - } - i += n2 - } - return i, nil -} - -func (m *HttpUri_Cluster) MarshalTo(dAtA []byte) (int, error) { - i := 0 - dAtA[i] = 0x12 - i++ - i = encodeVarintConfig(dAtA, i, uint64(len(m.Cluster))) - i += copy(dAtA[i:], m.Cluster) - return i, nil -} -func (m *DataSource) Marshal() (dAtA []byte, err error) { - size := m.Size() - dAtA = make([]byte, size) - n, err := m.MarshalTo(dAtA) - if err != nil { - return nil, err - } - return dAtA[:n], nil -} - -func (m *DataSource) MarshalTo(dAtA []byte) (int, error) { - var i int - _ = i - var l int - _ = l - if m.Specifier != nil { - nn3, err := m.Specifier.MarshalTo(dAtA[i:]) - if err != nil { - return 0, err - } - i += nn3 - } - return i, nil -} - -func (m *DataSource_Filename) MarshalTo(dAtA []byte) (int, error) { - i := 0 - dAtA[i] = 0xa - i++ - i = encodeVarintConfig(dAtA, i, uint64(len(m.Filename))) - i += copy(dAtA[i:], m.Filename) - return i, nil -} -func (m *DataSource_InlineBytes) MarshalTo(dAtA []byte) (int, error) { - i := 0 - if m.InlineBytes != nil { - dAtA[i] = 0x12 - i++ - i = encodeVarintConfig(dAtA, i, uint64(len(m.InlineBytes))) - i += copy(dAtA[i:], m.InlineBytes) - } - return i, nil -} -func (m *DataSource_InlineString) MarshalTo(dAtA []byte) (int, error) { - i := 0 - dAtA[i] = 0x1a - i++ - i = encodeVarintConfig(dAtA, i, uint64(len(m.InlineString))) - i += copy(dAtA[i:], m.InlineString) - return i, nil -} -func (m *JwtRule) Marshal() (dAtA []byte, err error) { - size := m.Size() - dAtA = make([]byte, size) - n, err := m.MarshalTo(dAtA) - if err != nil { - return nil, err - } - return dAtA[:n], nil -} - -func (m *JwtRule) MarshalTo(dAtA []byte) (int, error) { - var i int - _ = i - var l int - _ = l - if len(m.Issuer) > 0 { - dAtA[i] = 0xa - i++ - i = encodeVarintConfig(dAtA, i, uint64(len(m.Issuer))) - i += copy(dAtA[i:], m.Issuer) - } - if len(m.Audiences) > 0 { - for _, s := range m.Audiences { - dAtA[i] = 0x12 - i++ - l = len(s) - for l >= 1<<7 { - dAtA[i] = uint8(uint64(l)&0x7f | 0x80) - l >>= 7 - i++ - } - dAtA[i] = uint8(l) - i++ - i += copy(dAtA[i:], s) - } - } - if m.JwksSourceSpecifier != nil { - nn4, err := m.JwksSourceSpecifier.MarshalTo(dAtA[i:]) - if err != nil { - return 0, err - } - i += nn4 - } - if m.Forward { - dAtA[i] = 0x28 - i++ - if m.Forward { - dAtA[i] = 1 - } else { - dAtA[i] = 0 - } - i++ - } - if len(m.FromHeaders) > 0 { - for _, msg := range m.FromHeaders { - dAtA[i] = 0x32 - i++ - i = encodeVarintConfig(dAtA, i, uint64(msg.Size())) - n, err := msg.MarshalTo(dAtA[i:]) - if err != nil { - return 0, err - } - i += n - } - } - if len(m.FromParams) > 0 { - for _, s := range m.FromParams { - dAtA[i] = 0x3a - i++ - l = len(s) - for l >= 1<<7 { - dAtA[i] = uint8(uint64(l)&0x7f | 0x80) - l >>= 7 - i++ - } - dAtA[i] = uint8(l) - i++ - i += copy(dAtA[i:], s) - } - } - if len(m.ForwardPayloadHeader) > 0 { - dAtA[i] = 0x42 - i++ - i = encodeVarintConfig(dAtA, i, uint64(len(m.ForwardPayloadHeader))) - i += copy(dAtA[i:], m.ForwardPayloadHeader) - } - return i, nil -} - -func (m *JwtRule_RemoteJwks) MarshalTo(dAtA []byte) (int, error) { - i := 0 - if m.RemoteJwks != nil { - dAtA[i] = 0x1a - i++ - i = encodeVarintConfig(dAtA, i, uint64(m.RemoteJwks.Size())) - n5, err := m.RemoteJwks.MarshalTo(dAtA[i:]) - if err != nil { - return 0, err - } - i += n5 - } - return i, nil -} -func (m *JwtRule_LocalJwks) MarshalTo(dAtA []byte) (int, error) { - i := 0 - if m.LocalJwks != nil { - dAtA[i] = 0x22 - i++ - i = encodeVarintConfig(dAtA, i, uint64(m.LocalJwks.Size())) - n6, err := m.LocalJwks.MarshalTo(dAtA[i:]) - if err != nil { - return 0, err - } - i += n6 - } - return i, nil -} -func (m *RemoteJwks) Marshal() (dAtA []byte, err error) { - size := m.Size() - dAtA = make([]byte, size) - n, err := m.MarshalTo(dAtA) - if err != nil { - return nil, err - } - return dAtA[:n], nil -} - -func (m *RemoteJwks) MarshalTo(dAtA []byte) (int, error) { - var i int - _ = i - var l int - _ = l - if m.HttpUri != nil { - dAtA[i] = 0xa - i++ - i = encodeVarintConfig(dAtA, i, uint64(m.HttpUri.Size())) - n7, err := m.HttpUri.MarshalTo(dAtA[i:]) - if err != nil { - return 0, err - } - i += n7 - } - if m.CacheDuration != nil { - dAtA[i] = 0x12 - i++ - i = encodeVarintConfig(dAtA, i, uint64(m.CacheDuration.Size())) - n8, err := m.CacheDuration.MarshalTo(dAtA[i:]) - if err != nil { - return 0, err - } - i += n8 - } - return i, nil -} - -func (m *JwtHeader) Marshal() (dAtA []byte, err error) { - size := m.Size() - dAtA = make([]byte, size) - n, err := m.MarshalTo(dAtA) - if err != nil { - return nil, err - } - return dAtA[:n], nil -} - -func (m *JwtHeader) MarshalTo(dAtA []byte) (int, error) { - var i int - _ = i - var l int - _ = l - if len(m.Name) > 0 { - dAtA[i] = 0xa - i++ - i = encodeVarintConfig(dAtA, i, uint64(len(m.Name))) - i += copy(dAtA[i:], m.Name) - } - if len(m.ValuePrefix) > 0 { - dAtA[i] = 0x12 - i++ - i = encodeVarintConfig(dAtA, i, uint64(len(m.ValuePrefix))) - i += copy(dAtA[i:], m.ValuePrefix) - } - return i, nil -} - -func (m *JwtAuthentication) Marshal() (dAtA []byte, err error) { - size := m.Size() - dAtA = make([]byte, size) - n, err := m.MarshalTo(dAtA) - if err != nil { - return nil, err - } - return dAtA[:n], nil -} - -func (m *JwtAuthentication) MarshalTo(dAtA []byte) (int, error) { - var i int - _ = i - var l int - _ = l - if len(m.Rules) > 0 { - for _, msg := range m.Rules { - dAtA[i] = 0xa - i++ - i = encodeVarintConfig(dAtA, i, uint64(msg.Size())) - n, err := msg.MarshalTo(dAtA[i:]) - if err != nil { - return 0, err - } - i += n - } - } - if m.AllowMissingOrFailed { - dAtA[i] = 0x10 - i++ - if m.AllowMissingOrFailed { - dAtA[i] = 1 - } else { - dAtA[i] = 0 - } - i++ - } - return i, nil -} - -func encodeVarintConfig(dAtA []byte, offset int, v uint64) int { - for v >= 1<<7 { - dAtA[offset] = uint8(v&0x7f | 0x80) - v >>= 7 - offset++ - } - dAtA[offset] = uint8(v) - return offset + 1 -} -func (m *HttpUri) Size() (n int) { - var l int - _ = l - l = len(m.Uri) - if l > 0 { - n += 1 + l + sovConfig(uint64(l)) - } - if m.HttpUpstreamType != nil { - n += m.HttpUpstreamType.Size() - } - if m.Timeout != nil { - l = m.Timeout.Size() - n += 1 + l + sovConfig(uint64(l)) - } - return n -} - -func (m *HttpUri_Cluster) Size() (n int) { - var l int - _ = l - l = len(m.Cluster) - n += 1 + l + sovConfig(uint64(l)) - return n -} -func (m *DataSource) Size() (n int) { - var l int - _ = l - if m.Specifier != nil { - n += m.Specifier.Size() - } - return n -} - -func (m *DataSource_Filename) Size() (n int) { - var l int - _ = l - l = len(m.Filename) - n += 1 + l + sovConfig(uint64(l)) - return n -} -func (m *DataSource_InlineBytes) Size() (n int) { - var l int - _ = l - if m.InlineBytes != nil { - l = len(m.InlineBytes) - n += 1 + l + sovConfig(uint64(l)) - } - return n -} -func (m *DataSource_InlineString) Size() (n int) { - var l int - _ = l - l = len(m.InlineString) - n += 1 + l + sovConfig(uint64(l)) - return n -} -func (m *JwtRule) Size() (n int) { - var l int - _ = l - l = len(m.Issuer) - if l > 0 { - n += 1 + l + sovConfig(uint64(l)) - } - if len(m.Audiences) > 0 { - for _, s := range m.Audiences { - l = len(s) - n += 1 + l + sovConfig(uint64(l)) - } - } - if m.JwksSourceSpecifier != nil { - n += m.JwksSourceSpecifier.Size() - } - if m.Forward { - n += 2 - } - if len(m.FromHeaders) > 0 { - for _, e := range m.FromHeaders { - l = e.Size() - n += 1 + l + sovConfig(uint64(l)) - } - } - if len(m.FromParams) > 0 { - for _, s := range m.FromParams { - l = len(s) - n += 1 + l + sovConfig(uint64(l)) - } - } - l = len(m.ForwardPayloadHeader) - if l > 0 { - n += 1 + l + sovConfig(uint64(l)) - } - return n -} - -func (m *JwtRule_RemoteJwks) Size() (n int) { - var l int - _ = l - if m.RemoteJwks != nil { - l = m.RemoteJwks.Size() - n += 1 + l + sovConfig(uint64(l)) - } - return n -} -func (m *JwtRule_LocalJwks) Size() (n int) { - var l int - _ = l - if m.LocalJwks != nil { - l = m.LocalJwks.Size() - n += 1 + l + sovConfig(uint64(l)) - } - return n -} -func (m *RemoteJwks) Size() (n int) { - var l int - _ = l - if m.HttpUri != nil { - l = m.HttpUri.Size() - n += 1 + l + sovConfig(uint64(l)) - } - if m.CacheDuration != nil { - l = m.CacheDuration.Size() - n += 1 + l + sovConfig(uint64(l)) - } - return n -} - -func (m *JwtHeader) Size() (n int) { - var l int - _ = l - l = len(m.Name) - if l > 0 { - n += 1 + l + sovConfig(uint64(l)) - } - l = len(m.ValuePrefix) - if l > 0 { - n += 1 + l + sovConfig(uint64(l)) - } - return n -} - -func (m *JwtAuthentication) Size() (n int) { - var l int - _ = l - if len(m.Rules) > 0 { - for _, e := range m.Rules { - l = e.Size() - n += 1 + l + sovConfig(uint64(l)) - } - } - if m.AllowMissingOrFailed { - n += 2 - } - return n -} - -func sovConfig(x uint64) (n int) { - for { - n++ - x >>= 7 - if x == 0 { - break - } - } - return n -} -func sozConfig(x uint64) (n int) { - return sovConfig(uint64((x << 1) ^ uint64((int64(x) >> 63)))) -} -func (m *HttpUri) Unmarshal(dAtA []byte) error { - l := len(dAtA) - iNdEx := 0 - for iNdEx < l { - preIndex := iNdEx - var wire uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowConfig - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - wire |= (uint64(b) & 0x7F) << shift - if b < 0x80 { - break - } - } - fieldNum := int32(wire >> 3) - wireType := int(wire & 0x7) - if wireType == 4 { - return fmt.Errorf("proto: HttpUri: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: HttpUri: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Uri", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowConfig - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= (uint64(b) & 0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthConfig - } - postIndex := iNdEx + intStringLen - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.Uri = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - case 2: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Cluster", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowConfig - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= (uint64(b) & 0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthConfig - } - postIndex := iNdEx + intStringLen - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.HttpUpstreamType = &HttpUri_Cluster{string(dAtA[iNdEx:postIndex])} - iNdEx = postIndex - case 3: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Timeout", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowConfig - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= (int(b) & 0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthConfig - } - postIndex := iNdEx + msglen - if postIndex > l { - return io.ErrUnexpectedEOF - } - if m.Timeout == nil { - m.Timeout = &google_protobuf.Duration{} - } - if err := m.Timeout.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex - default: - iNdEx = preIndex - skippy, err := skipConfig(dAtA[iNdEx:]) - if err != nil { - return err - } - if skippy < 0 { - return ErrInvalidLengthConfig - } - if (iNdEx + skippy) > l { - return io.ErrUnexpectedEOF - } - iNdEx += skippy - } - } - - if iNdEx > l { - return io.ErrUnexpectedEOF - } - return nil -} -func (m *DataSource) Unmarshal(dAtA []byte) error { - l := len(dAtA) - iNdEx := 0 - for iNdEx < l { - preIndex := iNdEx - var wire uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowConfig - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - wire |= (uint64(b) & 0x7F) << shift - if b < 0x80 { - break - } - } - fieldNum := int32(wire >> 3) - wireType := int(wire & 0x7) - if wireType == 4 { - return fmt.Errorf("proto: DataSource: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: DataSource: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Filename", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowConfig - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= (uint64(b) & 0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthConfig - } - postIndex := iNdEx + intStringLen - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.Specifier = &DataSource_Filename{string(dAtA[iNdEx:postIndex])} - iNdEx = postIndex - case 2: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field InlineBytes", wireType) - } - var byteLen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowConfig - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - byteLen |= (int(b) & 0x7F) << shift - if b < 0x80 { - break - } - } - if byteLen < 0 { - return ErrInvalidLengthConfig - } - postIndex := iNdEx + byteLen - if postIndex > l { - return io.ErrUnexpectedEOF - } - v := make([]byte, postIndex-iNdEx) - copy(v, dAtA[iNdEx:postIndex]) - m.Specifier = &DataSource_InlineBytes{v} - iNdEx = postIndex - case 3: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field InlineString", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowConfig - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= (uint64(b) & 0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthConfig - } - postIndex := iNdEx + intStringLen - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.Specifier = &DataSource_InlineString{string(dAtA[iNdEx:postIndex])} - iNdEx = postIndex - default: - iNdEx = preIndex - skippy, err := skipConfig(dAtA[iNdEx:]) - if err != nil { - return err - } - if skippy < 0 { - return ErrInvalidLengthConfig - } - if (iNdEx + skippy) > l { - return io.ErrUnexpectedEOF - } - iNdEx += skippy - } - } - - if iNdEx > l { - return io.ErrUnexpectedEOF - } - return nil -} -func (m *JwtRule) Unmarshal(dAtA []byte) error { - l := len(dAtA) - iNdEx := 0 - for iNdEx < l { - preIndex := iNdEx - var wire uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowConfig - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - wire |= (uint64(b) & 0x7F) << shift - if b < 0x80 { - break - } - } - fieldNum := int32(wire >> 3) - wireType := int(wire & 0x7) - if wireType == 4 { - return fmt.Errorf("proto: JwtRule: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: JwtRule: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Issuer", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowConfig - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= (uint64(b) & 0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthConfig - } - postIndex := iNdEx + intStringLen - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.Issuer = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - case 2: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Audiences", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowConfig - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= (uint64(b) & 0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthConfig - } - postIndex := iNdEx + intStringLen - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.Audiences = append(m.Audiences, string(dAtA[iNdEx:postIndex])) - iNdEx = postIndex - case 3: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field RemoteJwks", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowConfig - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= (int(b) & 0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthConfig - } - postIndex := iNdEx + msglen - if postIndex > l { - return io.ErrUnexpectedEOF - } - v := &RemoteJwks{} - if err := v.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - m.JwksSourceSpecifier = &JwtRule_RemoteJwks{v} - iNdEx = postIndex - case 4: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field LocalJwks", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowConfig - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= (int(b) & 0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthConfig - } - postIndex := iNdEx + msglen - if postIndex > l { - return io.ErrUnexpectedEOF - } - v := &DataSource{} - if err := v.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - m.JwksSourceSpecifier = &JwtRule_LocalJwks{v} - iNdEx = postIndex - case 5: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field Forward", wireType) - } - var v int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowConfig - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - v |= (int(b) & 0x7F) << shift - if b < 0x80 { - break - } - } - m.Forward = bool(v != 0) - case 6: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field FromHeaders", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowConfig - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= (int(b) & 0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthConfig - } - postIndex := iNdEx + msglen - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.FromHeaders = append(m.FromHeaders, &JwtHeader{}) - if err := m.FromHeaders[len(m.FromHeaders)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex - case 7: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field FromParams", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowConfig - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= (uint64(b) & 0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthConfig - } - postIndex := iNdEx + intStringLen - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.FromParams = append(m.FromParams, string(dAtA[iNdEx:postIndex])) - iNdEx = postIndex - case 8: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field ForwardPayloadHeader", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowConfig - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= (uint64(b) & 0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthConfig - } - postIndex := iNdEx + intStringLen - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.ForwardPayloadHeader = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - default: - iNdEx = preIndex - skippy, err := skipConfig(dAtA[iNdEx:]) - if err != nil { - return err - } - if skippy < 0 { - return ErrInvalidLengthConfig - } - if (iNdEx + skippy) > l { - return io.ErrUnexpectedEOF - } - iNdEx += skippy - } - } - - if iNdEx > l { - return io.ErrUnexpectedEOF - } - return nil -} -func (m *RemoteJwks) Unmarshal(dAtA []byte) error { - l := len(dAtA) - iNdEx := 0 - for iNdEx < l { - preIndex := iNdEx - var wire uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowConfig - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - wire |= (uint64(b) & 0x7F) << shift - if b < 0x80 { - break - } - } - fieldNum := int32(wire >> 3) - wireType := int(wire & 0x7) - if wireType == 4 { - return fmt.Errorf("proto: RemoteJwks: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: RemoteJwks: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field HttpUri", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowConfig - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= (int(b) & 0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthConfig - } - postIndex := iNdEx + msglen - if postIndex > l { - return io.ErrUnexpectedEOF - } - if m.HttpUri == nil { - m.HttpUri = &HttpUri{} - } - if err := m.HttpUri.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex - case 2: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field CacheDuration", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowConfig - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= (int(b) & 0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthConfig - } - postIndex := iNdEx + msglen - if postIndex > l { - return io.ErrUnexpectedEOF - } - if m.CacheDuration == nil { - m.CacheDuration = &google_protobuf.Duration{} - } - if err := m.CacheDuration.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex - default: - iNdEx = preIndex - skippy, err := skipConfig(dAtA[iNdEx:]) - if err != nil { - return err - } - if skippy < 0 { - return ErrInvalidLengthConfig - } - if (iNdEx + skippy) > l { - return io.ErrUnexpectedEOF - } - iNdEx += skippy - } - } - - if iNdEx > l { - return io.ErrUnexpectedEOF - } - return nil -} -func (m *JwtHeader) Unmarshal(dAtA []byte) error { - l := len(dAtA) - iNdEx := 0 - for iNdEx < l { - preIndex := iNdEx - var wire uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowConfig - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - wire |= (uint64(b) & 0x7F) << shift - if b < 0x80 { - break - } - } - fieldNum := int32(wire >> 3) - wireType := int(wire & 0x7) - if wireType == 4 { - return fmt.Errorf("proto: JwtHeader: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: JwtHeader: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Name", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowConfig - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= (uint64(b) & 0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthConfig - } - postIndex := iNdEx + intStringLen - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.Name = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - case 2: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field ValuePrefix", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowConfig - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= (uint64(b) & 0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthConfig - } - postIndex := iNdEx + intStringLen - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.ValuePrefix = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - default: - iNdEx = preIndex - skippy, err := skipConfig(dAtA[iNdEx:]) - if err != nil { - return err - } - if skippy < 0 { - return ErrInvalidLengthConfig - } - if (iNdEx + skippy) > l { - return io.ErrUnexpectedEOF - } - iNdEx += skippy - } - } - - if iNdEx > l { - return io.ErrUnexpectedEOF - } - return nil -} -func (m *JwtAuthentication) Unmarshal(dAtA []byte) error { - l := len(dAtA) - iNdEx := 0 - for iNdEx < l { - preIndex := iNdEx - var wire uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowConfig - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - wire |= (uint64(b) & 0x7F) << shift - if b < 0x80 { - break - } - } - fieldNum := int32(wire >> 3) - wireType := int(wire & 0x7) - if wireType == 4 { - return fmt.Errorf("proto: JwtAuthentication: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: JwtAuthentication: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Rules", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowConfig - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= (int(b) & 0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthConfig - } - postIndex := iNdEx + msglen - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.Rules = append(m.Rules, &JwtRule{}) - if err := m.Rules[len(m.Rules)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex - case 2: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field AllowMissingOrFailed", wireType) - } - var v int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowConfig - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - v |= (int(b) & 0x7F) << shift - if b < 0x80 { - break - } - } - m.AllowMissingOrFailed = bool(v != 0) - default: - iNdEx = preIndex - skippy, err := skipConfig(dAtA[iNdEx:]) - if err != nil { - return err - } - if skippy < 0 { - return ErrInvalidLengthConfig - } - if (iNdEx + skippy) > l { - return io.ErrUnexpectedEOF - } - iNdEx += skippy - } - } - - if iNdEx > l { - return io.ErrUnexpectedEOF - } - return nil -} -func skipConfig(dAtA []byte) (n int, err error) { - l := len(dAtA) - iNdEx := 0 - for iNdEx < l { - var wire uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return 0, ErrIntOverflowConfig - } - if iNdEx >= l { - return 0, io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - wire |= (uint64(b) & 0x7F) << shift - if b < 0x80 { - break - } - } - wireType := int(wire & 0x7) - switch wireType { - case 0: - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return 0, ErrIntOverflowConfig - } - if iNdEx >= l { - return 0, io.ErrUnexpectedEOF - } - iNdEx++ - if dAtA[iNdEx-1] < 0x80 { - break - } - } - return iNdEx, nil - case 1: - iNdEx += 8 - return iNdEx, nil - case 2: - var length int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return 0, ErrIntOverflowConfig - } - if iNdEx >= l { - return 0, io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - length |= (int(b) & 0x7F) << shift - if b < 0x80 { - break - } - } - iNdEx += length - if length < 0 { - return 0, ErrInvalidLengthConfig - } - return iNdEx, nil - case 3: - for { - var innerWire uint64 - var start int = iNdEx - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return 0, ErrIntOverflowConfig - } - if iNdEx >= l { - return 0, io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - innerWire |= (uint64(b) & 0x7F) << shift - if b < 0x80 { - break - } - } - innerWireType := int(innerWire & 0x7) - if innerWireType == 4 { - break - } - next, err := skipConfig(dAtA[start:]) - if err != nil { - return 0, err - } - iNdEx = start + next - } - return iNdEx, nil - case 4: - return iNdEx, nil - case 5: - iNdEx += 4 - return iNdEx, nil - default: - return 0, fmt.Errorf("proto: illegal wireType %d", wireType) - } - } - panic("unreachable") -} - -var ( - ErrInvalidLengthConfig = fmt.Errorf("proto: negative length found during unmarshaling") - ErrIntOverflowConfig = fmt.Errorf("proto: integer overflow") -) - -func init() { - proto.RegisterFile("envoy/config/filter/http/jwt_auth/v2alpha1/config.proto", fileDescriptorConfig) -} - -var fileDescriptorConfig = []byte{ - // 678 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x54, 0xc1, 0x6e, 0xd3, 0x4a, - 0x14, 0x8d, 0x5f, 0xda, 0x26, 0xb9, 0x4e, 0x9f, 0xde, 0x1b, 0x95, 0xd6, 0x54, 0x55, 0x08, 0x41, - 0x48, 0x59, 0xd9, 0x90, 0x82, 0xaa, 0x0a, 0x16, 0x10, 0x15, 0x14, 0x45, 0x42, 0xad, 0xa6, 0xb0, - 0x41, 0x82, 0xd1, 0xd4, 0x19, 0x27, 0xd3, 0x8e, 0x3d, 0xd6, 0xcc, 0xb8, 0x26, 0x5b, 0xf8, 0x0c, - 0xb6, 0x7c, 0x0c, 0x4b, 0x3e, 0x01, 0x75, 0xc7, 0x5f, 0x20, 0x8f, 0xed, 0x66, 0x87, 0x68, 0x77, - 0x73, 0xcf, 0x9d, 0x7b, 0xee, 0xf1, 0xb9, 0x73, 0x0d, 0x07, 0x2c, 0xb9, 0x94, 0xcb, 0x20, 0x94, - 0x49, 0xc4, 0xe7, 0x41, 0xc4, 0x85, 0x61, 0x2a, 0x58, 0x18, 0x93, 0x06, 0xe7, 0xb9, 0x21, 0x34, - 0x33, 0x8b, 0xe0, 0x72, 0x44, 0x45, 0xba, 0xa0, 0x8f, 0xab, 0x4b, 0x7e, 0xaa, 0xa4, 0x91, 0xe8, - 0x11, 0xd7, 0x86, 0x4b, 0xdf, 0x96, 0xfb, 0x55, 0xa6, 0x2c, 0xf7, 0x8b, 0x72, 0xbf, 0x2e, 0xf7, - 0xeb, 0xf2, 0xdd, 0xde, 0x5c, 0xca, 0xb9, 0x60, 0x81, 0xad, 0x3f, 0xcb, 0xa2, 0x60, 0x96, 0x29, - 0x6a, 0xb8, 0x4c, 0x4a, 0xc6, 0xc1, 0x67, 0x07, 0x5a, 0x13, 0x63, 0xd2, 0x77, 0x8a, 0xa3, 0xff, - 0xa0, 0x99, 0x29, 0xee, 0x39, 0x7d, 0x67, 0xd8, 0xc1, 0xc5, 0x11, 0xed, 0x42, 0x2b, 0x14, 0x99, - 0x36, 0x4c, 0x79, 0xff, 0x14, 0xe8, 0xa4, 0x81, 0x6b, 0x00, 0xed, 0x43, 0xcb, 0xf0, 0x98, 0xc9, - 0xcc, 0x78, 0xcd, 0xbe, 0x33, 0x74, 0x47, 0x77, 0xfd, 0xb2, 0x97, 0x5f, 0xf7, 0xf2, 0x8f, 0xaa, - 0x5e, 0xb8, 0xbe, 0x39, 0xde, 0x02, 0x54, 0x08, 0x25, 0x59, 0xaa, 0x8d, 0x62, 0x34, 0x26, 0x66, - 0x99, 0xb2, 0xc1, 0x17, 0x07, 0xe0, 0x88, 0x1a, 0x7a, 0x2a, 0x33, 0x15, 0x32, 0xb4, 0x07, 0xed, - 0x88, 0x0b, 0x96, 0xd0, 0x98, 0x95, 0x62, 0x26, 0x0d, 0x7c, 0x8d, 0xa0, 0x07, 0xd0, 0xe5, 0x89, - 0xe0, 0x09, 0x23, 0x67, 0x4b, 0xc3, 0xb4, 0x15, 0xd6, 0x9d, 0x34, 0xb0, 0x5b, 0xa2, 0xe3, 0x02, - 0x44, 0x0f, 0x61, 0xb3, 0xba, 0xa4, 0x8d, 0xe2, 0xc9, 0xdc, 0x4a, 0x2c, 0x78, 0xaa, 0xda, 0x53, - 0x8b, 0x8e, 0x5d, 0xe8, 0xe8, 0x94, 0x85, 0x3c, 0xe2, 0x4c, 0x0d, 0x7e, 0x35, 0xa1, 0x35, 0xcd, - 0x0d, 0xce, 0x04, 0x43, 0xdb, 0xb0, 0xc1, 0xb5, 0xce, 0x98, 0xaa, 0xdc, 0xa8, 0x22, 0xb4, 0x07, - 0x1d, 0x9a, 0xcd, 0x38, 0x4b, 0x42, 0xdb, 0xb9, 0x39, 0xec, 0xe0, 0x15, 0x80, 0x08, 0xb8, 0x8a, - 0xc5, 0xd2, 0x30, 0x72, 0x9e, 0x5f, 0xe8, 0xca, 0x96, 0xe7, 0xfe, 0x4d, 0x87, 0xe6, 0x63, 0x4b, - 0x32, 0xcd, 0x2f, 0xf4, 0xa4, 0x81, 0x41, 0x5d, 0x47, 0xe8, 0x03, 0x80, 0x90, 0x21, 0x15, 0x25, - 0xff, 0xda, 0x6d, 0xf9, 0x57, 0x5e, 0x4f, 0x1a, 0xb8, 0x63, 0x19, 0x2d, 0xbd, 0x07, 0xad, 0x48, - 0xaa, 0x9c, 0xaa, 0x99, 0xb7, 0xde, 0x77, 0x86, 0x6d, 0x5c, 0x87, 0xe8, 0x23, 0x74, 0x23, 0x25, - 0x63, 0xb2, 0x60, 0x74, 0xc6, 0x94, 0xf6, 0x36, 0xfa, 0xcd, 0xa1, 0x3b, 0x7a, 0x76, 0xf3, 0xd6, - 0xd3, 0xdc, 0x4c, 0x2c, 0x07, 0x76, 0x0b, 0xc2, 0xf2, 0xac, 0xd1, 0x3d, 0xb0, 0x21, 0x49, 0xa9, - 0xa2, 0xb1, 0xf6, 0x5a, 0xd6, 0x59, 0x28, 0xa0, 0x13, 0x8b, 0xa0, 0x27, 0xb0, 0x5d, 0x69, 0x21, - 0x29, 0x5d, 0x0a, 0x49, 0x67, 0x95, 0x16, 0xaf, 0x6d, 0x07, 0xb4, 0x55, 0x65, 0x4f, 0xca, 0x64, - 0xc9, 0x3b, 0xde, 0x81, 0x3b, 0x85, 0x53, 0x44, 0xdb, 0x8f, 0x25, 0xab, 0x59, 0x7f, 0x73, 0x00, - 0x56, 0x2e, 0xa3, 0xb7, 0xd0, 0x2e, 0x9f, 0x65, 0xf5, 0xfc, 0xdd, 0xd1, 0xe1, 0xcd, 0x3f, 0xad, - 0x5a, 0x23, 0xdc, 0x5a, 0x54, 0xfb, 0xf4, 0x02, 0xfe, 0x0d, 0x69, 0xb8, 0x60, 0xa4, 0xde, 0x39, - 0xfb, 0x56, 0xff, 0xb8, 0x28, 0x9b, 0xb6, 0xa0, 0x0e, 0x07, 0x63, 0xe8, 0x5c, 0x1b, 0x86, 0x10, - 0xac, 0xad, 0x56, 0x02, 0xdb, 0x33, 0xba, 0x0f, 0xdd, 0x4b, 0x2a, 0x32, 0x46, 0x52, 0xc5, 0x22, - 0xfe, 0xa9, 0xdc, 0x52, 0xec, 0x5a, 0xec, 0xc4, 0x42, 0x83, 0xaf, 0x0e, 0xfc, 0x3f, 0xcd, 0xcd, - 0xcb, 0xcc, 0x2c, 0x58, 0x62, 0x78, 0x68, 0x99, 0xd1, 0x31, 0xac, 0xab, 0x4c, 0x30, 0xed, 0x39, - 0x76, 0x92, 0x87, 0xb7, 0x9a, 0x64, 0xb1, 0x2a, 0xb8, 0xe4, 0x41, 0x4f, 0x61, 0x87, 0x0a, 0x21, - 0x73, 0x12, 0x73, 0xad, 0x79, 0x32, 0x27, 0x52, 0x91, 0x88, 0x72, 0xc1, 0x66, 0x56, 0x54, 0x1b, - 0x6f, 0xd9, 0xf4, 0x9b, 0x32, 0x7b, 0xac, 0x5e, 0xdb, 0xdc, 0xf8, 0xd5, 0xf7, 0xab, 0x9e, 0xf3, - 0xe3, 0xaa, 0xe7, 0xfc, 0xbc, 0xea, 0x39, 0xef, 0x0f, 0x4a, 0x15, 0x5c, 0x06, 0x34, 0xe5, 0xc1, - 0xdf, 0xff, 0x25, 0xcf, 0x36, 0xac, 0x95, 0xfb, 0xbf, 0x03, 0x00, 0x00, 0xff, 0xff, 0x1b, 0x4f, - 0x9e, 0x6b, 0x5a, 0x05, 0x00, 0x00, -} diff --git a/envoy/config/filter/http/jwt_auth/v2alpha1/config.proto b/envoy/config/filter/http/jwt_auth/v2alpha1/config.proto index 43b07be768a..477be41f756 100644 --- a/envoy/config/filter/http/jwt_auth/v2alpha1/config.proto +++ b/envoy/config/filter/http/jwt_auth/v2alpha1/config.proto @@ -14,10 +14,10 @@ syntax = "proto3"; -package istio.envoy.config.filter.http.jwt_auth.v2alpha1; - import "google/protobuf/duration.proto"; +package istio.envoy.config.filter.http.jwt_auth.v2alpha1; + option go_package = "istio.io/api/envoy/config/filter/http/jwt_auth/v2alpha1"; // Copied from @envoy/api/envoy/api/v2/core/http_uri.proto diff --git a/envoy/config/filter/network/tcp_cluster_rewrite/v2alpha1/config.pb.go b/envoy/config/filter/network/tcp_cluster_rewrite/v2alpha1/config.pb.go deleted file mode 100644 index 8240044eaf7..00000000000 --- a/envoy/config/filter/network/tcp_cluster_rewrite/v2alpha1/config.pb.go +++ /dev/null @@ -1,346 +0,0 @@ -// Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: envoy/config/filter/network/tcp_cluster_rewrite/v2alpha1/config.proto - -package v2alpha1 - -import proto "github.com/gogo/protobuf/proto" -import fmt "fmt" -import math "math" - -import io "io" - -// Reference imports to suppress errors if they are not otherwise used. -var _ = proto.Marshal -var _ = fmt.Errorf -var _ = math.Inf - -// TcpClusterRewrite is the config for the TCP cluster rewrite filter. -type TcpClusterRewrite struct { - // Specifies the regex pattern to be matched in the cluster name. - ClusterPattern string `protobuf:"bytes,1,opt,name=cluster_pattern,json=clusterPattern,proto3" json:"cluster_pattern,omitempty"` - // Specifies the replacement for the matched cluster pattern. - ClusterReplacement string `protobuf:"bytes,2,opt,name=cluster_replacement,json=clusterReplacement,proto3" json:"cluster_replacement,omitempty"` -} - -func (m *TcpClusterRewrite) Reset() { *m = TcpClusterRewrite{} } -func (m *TcpClusterRewrite) String() string { return proto.CompactTextString(m) } -func (*TcpClusterRewrite) ProtoMessage() {} -func (*TcpClusterRewrite) Descriptor() ([]byte, []int) { return fileDescriptorConfig, []int{0} } - -func (m *TcpClusterRewrite) GetClusterPattern() string { - if m != nil { - return m.ClusterPattern - } - return "" -} - -func (m *TcpClusterRewrite) GetClusterReplacement() string { - if m != nil { - return m.ClusterReplacement - } - return "" -} - -func init() { - proto.RegisterType((*TcpClusterRewrite)(nil), "istio.envoy.config.filter.network.tcp_cluster_rewrite.v2alpha1.TcpClusterRewrite") -} -func (m *TcpClusterRewrite) Marshal() (dAtA []byte, err error) { - size := m.Size() - dAtA = make([]byte, size) - n, err := m.MarshalTo(dAtA) - if err != nil { - return nil, err - } - return dAtA[:n], nil -} - -func (m *TcpClusterRewrite) MarshalTo(dAtA []byte) (int, error) { - var i int - _ = i - var l int - _ = l - if len(m.ClusterPattern) > 0 { - dAtA[i] = 0xa - i++ - i = encodeVarintConfig(dAtA, i, uint64(len(m.ClusterPattern))) - i += copy(dAtA[i:], m.ClusterPattern) - } - if len(m.ClusterReplacement) > 0 { - dAtA[i] = 0x12 - i++ - i = encodeVarintConfig(dAtA, i, uint64(len(m.ClusterReplacement))) - i += copy(dAtA[i:], m.ClusterReplacement) - } - return i, nil -} - -func encodeVarintConfig(dAtA []byte, offset int, v uint64) int { - for v >= 1<<7 { - dAtA[offset] = uint8(v&0x7f | 0x80) - v >>= 7 - offset++ - } - dAtA[offset] = uint8(v) - return offset + 1 -} -func (m *TcpClusterRewrite) Size() (n int) { - var l int - _ = l - l = len(m.ClusterPattern) - if l > 0 { - n += 1 + l + sovConfig(uint64(l)) - } - l = len(m.ClusterReplacement) - if l > 0 { - n += 1 + l + sovConfig(uint64(l)) - } - return n -} - -func sovConfig(x uint64) (n int) { - for { - n++ - x >>= 7 - if x == 0 { - break - } - } - return n -} -func sozConfig(x uint64) (n int) { - return sovConfig(uint64((x << 1) ^ uint64((int64(x) >> 63)))) -} -func (m *TcpClusterRewrite) Unmarshal(dAtA []byte) error { - l := len(dAtA) - iNdEx := 0 - for iNdEx < l { - preIndex := iNdEx - var wire uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowConfig - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - wire |= (uint64(b) & 0x7F) << shift - if b < 0x80 { - break - } - } - fieldNum := int32(wire >> 3) - wireType := int(wire & 0x7) - if wireType == 4 { - return fmt.Errorf("proto: TcpClusterRewrite: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: TcpClusterRewrite: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field ClusterPattern", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowConfig - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= (uint64(b) & 0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthConfig - } - postIndex := iNdEx + intStringLen - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.ClusterPattern = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - case 2: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field ClusterReplacement", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowConfig - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= (uint64(b) & 0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthConfig - } - postIndex := iNdEx + intStringLen - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.ClusterReplacement = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - default: - iNdEx = preIndex - skippy, err := skipConfig(dAtA[iNdEx:]) - if err != nil { - return err - } - if skippy < 0 { - return ErrInvalidLengthConfig - } - if (iNdEx + skippy) > l { - return io.ErrUnexpectedEOF - } - iNdEx += skippy - } - } - - if iNdEx > l { - return io.ErrUnexpectedEOF - } - return nil -} -func skipConfig(dAtA []byte) (n int, err error) { - l := len(dAtA) - iNdEx := 0 - for iNdEx < l { - var wire uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return 0, ErrIntOverflowConfig - } - if iNdEx >= l { - return 0, io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - wire |= (uint64(b) & 0x7F) << shift - if b < 0x80 { - break - } - } - wireType := int(wire & 0x7) - switch wireType { - case 0: - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return 0, ErrIntOverflowConfig - } - if iNdEx >= l { - return 0, io.ErrUnexpectedEOF - } - iNdEx++ - if dAtA[iNdEx-1] < 0x80 { - break - } - } - return iNdEx, nil - case 1: - iNdEx += 8 - return iNdEx, nil - case 2: - var length int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return 0, ErrIntOverflowConfig - } - if iNdEx >= l { - return 0, io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - length |= (int(b) & 0x7F) << shift - if b < 0x80 { - break - } - } - iNdEx += length - if length < 0 { - return 0, ErrInvalidLengthConfig - } - return iNdEx, nil - case 3: - for { - var innerWire uint64 - var start int = iNdEx - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return 0, ErrIntOverflowConfig - } - if iNdEx >= l { - return 0, io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - innerWire |= (uint64(b) & 0x7F) << shift - if b < 0x80 { - break - } - } - innerWireType := int(innerWire & 0x7) - if innerWireType == 4 { - break - } - next, err := skipConfig(dAtA[start:]) - if err != nil { - return 0, err - } - iNdEx = start + next - } - return iNdEx, nil - case 4: - return iNdEx, nil - case 5: - iNdEx += 4 - return iNdEx, nil - default: - return 0, fmt.Errorf("proto: illegal wireType %d", wireType) - } - } - panic("unreachable") -} - -var ( - ErrInvalidLengthConfig = fmt.Errorf("proto: negative length found during unmarshaling") - ErrIntOverflowConfig = fmt.Errorf("proto: integer overflow") -) - -func init() { - proto.RegisterFile("envoy/config/filter/network/tcp_cluster_rewrite/v2alpha1/config.proto", fileDescriptorConfig) -} - -var fileDescriptorConfig = []byte{ - // 213 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x72, 0x4d, 0xcd, 0x2b, 0xcb, - 0xaf, 0xd4, 0x4f, 0xce, 0xcf, 0x4b, 0xcb, 0x4c, 0xd7, 0x4f, 0xcb, 0xcc, 0x29, 0x49, 0x2d, 0xd2, - 0xcf, 0x4b, 0x2d, 0x29, 0xcf, 0x2f, 0xca, 0xd6, 0x2f, 0x49, 0x2e, 0x88, 0x4f, 0xce, 0x29, 0x2d, - 0x2e, 0x49, 0x2d, 0x8a, 0x2f, 0x4a, 0x2d, 0x2f, 0xca, 0x2c, 0x49, 0xd5, 0x2f, 0x33, 0x4a, 0xcc, - 0x29, 0xc8, 0x48, 0x34, 0x84, 0x6a, 0xd1, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0xb2, 0xcb, 0x2c, - 0x2e, 0xc9, 0xcc, 0xd7, 0x03, 0x1b, 0xa6, 0x07, 0x95, 0x81, 0x18, 0xa6, 0x07, 0x35, 0x4c, 0x0f, - 0x8b, 0x61, 0x7a, 0x30, 0xc3, 0x94, 0x72, 0xb9, 0x04, 0x43, 0x92, 0x0b, 0x9c, 0x21, 0xd2, 0x41, - 0x10, 0x59, 0x21, 0x75, 0x2e, 0x7e, 0x98, 0x86, 0x82, 0xc4, 0x92, 0x92, 0xd4, 0xa2, 0x3c, 0x09, - 0x46, 0x05, 0x46, 0x0d, 0xce, 0x20, 0x3e, 0xa8, 0x70, 0x00, 0x44, 0x54, 0x48, 0x9f, 0x4b, 0x18, - 0x61, 0x72, 0x41, 0x4e, 0x62, 0x72, 0x6a, 0x6e, 0x6a, 0x5e, 0x89, 0x04, 0x13, 0x58, 0xb1, 0x50, - 0x32, 0xcc, 0x54, 0xb8, 0x8c, 0x53, 0xf0, 0x89, 0x47, 0x72, 0x8c, 0x17, 0x1e, 0xc9, 0x31, 0x3e, - 0x78, 0x24, 0xc7, 0x18, 0xe5, 0x0a, 0x71, 0x7c, 0x66, 0xbe, 0x7e, 0x62, 0x41, 0xa6, 0x3e, 0xb9, - 0x01, 0x92, 0xc4, 0x06, 0x0e, 0x0a, 0x63, 0x40, 0x00, 0x00, 0x00, 0xff, 0xff, 0xda, 0x0d, 0xa4, - 0x2b, 0x53, 0x01, 0x00, 0x00, -} diff --git a/mcp/v1alpha1/mcp.pb.go b/mcp/v1alpha1/mcp.pb.go index c38f7e36a05..c20686b0b42 100644 --- a/mcp/v1alpha1/mcp.pb.go +++ b/mcp/v1alpha1/mcp.pb.go @@ -1,37 +1,19 @@ // Code generated by protoc-gen-gogo. DO NOT EDIT. // source: mcp/v1alpha1/mcp.proto -/* - Package v1alpha1 is a generated protocol buffer package. - - It is generated from these files: - mcp/v1alpha1/mcp.proto - mcp/v1alpha1/metadata.proto - mcp/v1alpha1/resource.proto - - It has these top-level messages: - SinkNode - MeshConfigRequest - MeshConfigResponse - IncrementalMeshConfigRequest - IncrementalMeshConfigResponse - RequestResources - Resources - Metadata - Resource -*/ package v1alpha1 -import proto "github.com/gogo/protobuf/proto" -import fmt "fmt" -import math "math" -import google_rpc "github.com/gogo/googleapis/google/rpc" -import _ "github.com/gogo/protobuf/gogoproto" - -import context "golang.org/x/net/context" -import grpc "google.golang.org/grpc" - -import io "io" +import ( + bytes "bytes" + context "context" + fmt "fmt" + rpc "github.com/gogo/googleapis/google/rpc" + _ "github.com/gogo/protobuf/gogoproto" + proto "github.com/gogo/protobuf/proto" + grpc "google.golang.org/grpc" + io "io" + math "math" +) // Reference imports to suppress errors if they are not otherwise used. var _ = proto.Marshal @@ -53,13 +35,44 @@ type SinkNode struct { // An opaque identifier for the MCP node. Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"` // Opaque annotations extending the node identifier. - Annotations map[string]string `protobuf:"bytes,2,rep,name=annotations" json:"annotations,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` + Annotations map[string]string `protobuf:"bytes,2,rep,name=annotations,proto3" json:"annotations,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` +} + +func (m *SinkNode) Reset() { *m = SinkNode{} } +func (m *SinkNode) String() string { return proto.CompactTextString(m) } +func (*SinkNode) ProtoMessage() {} +func (*SinkNode) Descriptor() ([]byte, []int) { + return fileDescriptor_0713683a7297bd65, []int{0} +} +func (m *SinkNode) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *SinkNode) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_SinkNode.Marshal(b, m, deterministic) + } else { + b = b[:cap(b)] + n, err := m.MarshalTo(b) + if err != nil { + return nil, err + } + return b[:n], nil + } +} +func (m *SinkNode) XXX_Merge(src proto.Message) { + xxx_messageInfo_SinkNode.Merge(m, src) +} +func (m *SinkNode) XXX_Size() int { + return m.Size() +} +func (m *SinkNode) XXX_DiscardUnknown() { + xxx_messageInfo_SinkNode.DiscardUnknown(m) } -func (m *SinkNode) Reset() { *m = SinkNode{} } -func (m *SinkNode) String() string { return proto.CompactTextString(m) } -func (*SinkNode) ProtoMessage() {} -func (*SinkNode) Descriptor() ([]byte, []int) { return fileDescriptorMcp, []int{0} } +var xxx_messageInfo_SinkNode proto.InternalMessageInfo func (m *SinkNode) GetId() string { if m != nil { @@ -88,7 +101,7 @@ type MeshConfigRequest struct { // below) has an independent version associated with it. VersionInfo string `protobuf:"bytes,1,opt,name=version_info,json=versionInfo,proto3" json:"version_info,omitempty"` // The sink node making the request. - SinkNode *SinkNode `protobuf:"bytes,2,opt,name=sink_node,json=sinkNode" json:"sink_node,omitempty"` + SinkNode *SinkNode `protobuf:"bytes,2,opt,name=sink_node,json=sinkNode,proto3" json:"sink_node,omitempty"` // Type of the resource that is being requested, e.g. // "type.googleapis.com/istio.io.networking.v1alpha3.VirtualService". TypeUrl string `protobuf:"bytes,3,opt,name=type_url,json=typeUrl,proto3" json:"type_url,omitempty"` @@ -103,13 +116,44 @@ type MeshConfigRequest struct { // is only intended for consumption during manual debugging, the // string provided is not guaranteed to be stable across client // versions. - ErrorDetail *google_rpc.Status `protobuf:"bytes,5,opt,name=error_detail,json=errorDetail" json:"error_detail,omitempty"` + ErrorDetail *rpc.Status `protobuf:"bytes,5,opt,name=error_detail,json=errorDetail,proto3" json:"error_detail,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` +} + +func (m *MeshConfigRequest) Reset() { *m = MeshConfigRequest{} } +func (m *MeshConfigRequest) String() string { return proto.CompactTextString(m) } +func (*MeshConfigRequest) ProtoMessage() {} +func (*MeshConfigRequest) Descriptor() ([]byte, []int) { + return fileDescriptor_0713683a7297bd65, []int{1} +} +func (m *MeshConfigRequest) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *MeshConfigRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_MeshConfigRequest.Marshal(b, m, deterministic) + } else { + b = b[:cap(b)] + n, err := m.MarshalTo(b) + if err != nil { + return nil, err + } + return b[:n], nil + } +} +func (m *MeshConfigRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_MeshConfigRequest.Merge(m, src) +} +func (m *MeshConfigRequest) XXX_Size() int { + return m.Size() +} +func (m *MeshConfigRequest) XXX_DiscardUnknown() { + xxx_messageInfo_MeshConfigRequest.DiscardUnknown(m) } -func (m *MeshConfigRequest) Reset() { *m = MeshConfigRequest{} } -func (m *MeshConfigRequest) String() string { return proto.CompactTextString(m) } -func (*MeshConfigRequest) ProtoMessage() {} -func (*MeshConfigRequest) Descriptor() ([]byte, []int) { return fileDescriptorMcp, []int{1} } +var xxx_messageInfo_MeshConfigRequest proto.InternalMessageInfo func (m *MeshConfigRequest) GetVersionInfo() string { if m != nil { @@ -139,7 +183,7 @@ func (m *MeshConfigRequest) GetResponseNonce() string { return "" } -func (m *MeshConfigRequest) GetErrorDetail() *google_rpc.Status { +func (m *MeshConfigRequest) GetErrorDetail() *rpc.Status { if m != nil { return m.ErrorDetail } @@ -153,7 +197,7 @@ type MeshConfigResponse struct { VersionInfo string `protobuf:"bytes,1,opt,name=version_info,json=versionInfo,proto3" json:"version_info,omitempty"` // The response resources wrapped in the common MCP *Resource* // message. - Resources []Resource `protobuf:"bytes,2,rep,name=resources" json:"resources"` + Resources []Resource `protobuf:"bytes,2,rep,name=resources,proto3" json:"resources"` // Type URL for resources wrapped in the provided resources(s). This // must be consistent with the type_url in the wrapper messages if // resources is non-empty. @@ -166,13 +210,44 @@ type MeshConfigResponse struct { // time. The nonce allows the management server to ignore any // further MeshConfigRequests for the previous version until a // MeshConfigRequest bearing the nonce. - Nonce string `protobuf:"bytes,4,opt,name=nonce,proto3" json:"nonce,omitempty"` + Nonce string `protobuf:"bytes,4,opt,name=nonce,proto3" json:"nonce,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` +} + +func (m *MeshConfigResponse) Reset() { *m = MeshConfigResponse{} } +func (m *MeshConfigResponse) String() string { return proto.CompactTextString(m) } +func (*MeshConfigResponse) ProtoMessage() {} +func (*MeshConfigResponse) Descriptor() ([]byte, []int) { + return fileDescriptor_0713683a7297bd65, []int{2} +} +func (m *MeshConfigResponse) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *MeshConfigResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_MeshConfigResponse.Marshal(b, m, deterministic) + } else { + b = b[:cap(b)] + n, err := m.MarshalTo(b) + if err != nil { + return nil, err + } + return b[:n], nil + } +} +func (m *MeshConfigResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_MeshConfigResponse.Merge(m, src) +} +func (m *MeshConfigResponse) XXX_Size() int { + return m.Size() +} +func (m *MeshConfigResponse) XXX_DiscardUnknown() { + xxx_messageInfo_MeshConfigResponse.DiscardUnknown(m) } -func (m *MeshConfigResponse) Reset() { *m = MeshConfigResponse{} } -func (m *MeshConfigResponse) String() string { return proto.CompactTextString(m) } -func (*MeshConfigResponse) ProtoMessage() {} -func (*MeshConfigResponse) Descriptor() ([]byte, []int) { return fileDescriptorMcp, []int{2} } +var xxx_messageInfo_MeshConfigResponse proto.InternalMessageInfo func (m *MeshConfigResponse) GetVersionInfo() string { if m != nil { @@ -211,7 +286,7 @@ func (m *MeshConfigResponse) GetNonce() string { // ACK or NACK is determined by the absence or presence of error_detail. type IncrementalMeshConfigRequest struct { // The sink node making the request. - SinkNode *SinkNode `protobuf:"bytes,1,opt,name=sink_node,json=sinkNode" json:"sink_node,omitempty"` + SinkNode *SinkNode `protobuf:"bytes,1,opt,name=sink_node,json=sinkNode,proto3" json:"sink_node,omitempty"` // Type of the resource that is being requested, e.g. // "type.googleapis.com/istio.io.networking.v1alpha3.VirtualService". TypeUrl string `protobuf:"bytes,2,opt,name=type_url,json=typeUrl,proto3" json:"type_url,omitempty"` @@ -220,7 +295,7 @@ type IncrementalMeshConfigRequest struct { // initial_resource_versions must be omitted. The keys are the // resources names of the MCP resources known to the MCP client. The // values in the map are the associated resource level version info. - InitialResourceVersions map[string]string `protobuf:"bytes,3,rep,name=initial_resource_versions,json=initialResourceVersions" json:"initial_resource_versions,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` + InitialResourceVersions map[string]string `protobuf:"bytes,3,rep,name=initial_resource_versions,json=initialResourceVersions,proto3" json:"initial_resource_versions,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` // When the IncrementalMeshConfigRequest is a ACK or NACK message in response // to a previous IncrementalMeshConfigResponse, the response_nonce must be the // nonce in the IncrementalMeshConfigResponse. @@ -229,13 +304,44 @@ type IncrementalMeshConfigRequest struct { // This is populated when the previous IncrementalMeshConfigResponses // failed to update configuration. The *message* field in *error_details* // provides the client internal exception related to the failure. - ErrorDetail *google_rpc.Status `protobuf:"bytes,5,opt,name=error_detail,json=errorDetail" json:"error_detail,omitempty"` + ErrorDetail *rpc.Status `protobuf:"bytes,5,opt,name=error_detail,json=errorDetail,proto3" json:"error_detail,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` +} + +func (m *IncrementalMeshConfigRequest) Reset() { *m = IncrementalMeshConfigRequest{} } +func (m *IncrementalMeshConfigRequest) String() string { return proto.CompactTextString(m) } +func (*IncrementalMeshConfigRequest) ProtoMessage() {} +func (*IncrementalMeshConfigRequest) Descriptor() ([]byte, []int) { + return fileDescriptor_0713683a7297bd65, []int{3} +} +func (m *IncrementalMeshConfigRequest) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *IncrementalMeshConfigRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_IncrementalMeshConfigRequest.Marshal(b, m, deterministic) + } else { + b = b[:cap(b)] + n, err := m.MarshalTo(b) + if err != nil { + return nil, err + } + return b[:n], nil + } +} +func (m *IncrementalMeshConfigRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_IncrementalMeshConfigRequest.Merge(m, src) +} +func (m *IncrementalMeshConfigRequest) XXX_Size() int { + return m.Size() +} +func (m *IncrementalMeshConfigRequest) XXX_DiscardUnknown() { + xxx_messageInfo_IncrementalMeshConfigRequest.DiscardUnknown(m) } -func (m *IncrementalMeshConfigRequest) Reset() { *m = IncrementalMeshConfigRequest{} } -func (m *IncrementalMeshConfigRequest) String() string { return proto.CompactTextString(m) } -func (*IncrementalMeshConfigRequest) ProtoMessage() {} -func (*IncrementalMeshConfigRequest) Descriptor() ([]byte, []int) { return fileDescriptorMcp, []int{3} } +var xxx_messageInfo_IncrementalMeshConfigRequest proto.InternalMessageInfo func (m *IncrementalMeshConfigRequest) GetSinkNode() *SinkNode { if m != nil { @@ -265,7 +371,7 @@ func (m *IncrementalMeshConfigRequest) GetResponseNonce() string { return "" } -func (m *IncrementalMeshConfigRequest) GetErrorDetail() *google_rpc.Status { +func (m *IncrementalMeshConfigRequest) GetErrorDetail() *rpc.Status { if m != nil { return m.ErrorDetail } @@ -290,21 +396,52 @@ type IncrementalMeshConfigResponse struct { // The response resources wrapped in the common MCP *Resource* // message. These are typed resources that match the type url in the // IncrementalMeshConfigRequest. - Resources []Resource `protobuf:"bytes,2,rep,name=resources" json:"resources"` + Resources []Resource `protobuf:"bytes,2,rep,name=resources,proto3" json:"resources"` // Resources names of resources that have be deleted and to be // removed from the MCP Client. Removed resources for missing // resources can be ignored. - RemovedResources []string `protobuf:"bytes,3,rep,name=removed_resources,json=removedResources" json:"removed_resources,omitempty"` + RemovedResources []string `protobuf:"bytes,3,rep,name=removed_resources,json=removedResources,proto3" json:"removed_resources,omitempty"` // The nonce provides a way for IncrementalMeshConfigRequests to // uniquely reference an IncrementalMeshConfigResponse. The nonce is // required. - Nonce string `protobuf:"bytes,4,opt,name=nonce,proto3" json:"nonce,omitempty"` + Nonce string `protobuf:"bytes,4,opt,name=nonce,proto3" json:"nonce,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` +} + +func (m *IncrementalMeshConfigResponse) Reset() { *m = IncrementalMeshConfigResponse{} } +func (m *IncrementalMeshConfigResponse) String() string { return proto.CompactTextString(m) } +func (*IncrementalMeshConfigResponse) ProtoMessage() {} +func (*IncrementalMeshConfigResponse) Descriptor() ([]byte, []int) { + return fileDescriptor_0713683a7297bd65, []int{4} +} +func (m *IncrementalMeshConfigResponse) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *IncrementalMeshConfigResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_IncrementalMeshConfigResponse.Marshal(b, m, deterministic) + } else { + b = b[:cap(b)] + n, err := m.MarshalTo(b) + if err != nil { + return nil, err + } + return b[:n], nil + } +} +func (m *IncrementalMeshConfigResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_IncrementalMeshConfigResponse.Merge(m, src) +} +func (m *IncrementalMeshConfigResponse) XXX_Size() int { + return m.Size() +} +func (m *IncrementalMeshConfigResponse) XXX_DiscardUnknown() { + xxx_messageInfo_IncrementalMeshConfigResponse.DiscardUnknown(m) } -func (m *IncrementalMeshConfigResponse) Reset() { *m = IncrementalMeshConfigResponse{} } -func (m *IncrementalMeshConfigResponse) String() string { return proto.CompactTextString(m) } -func (*IncrementalMeshConfigResponse) ProtoMessage() {} -func (*IncrementalMeshConfigResponse) Descriptor() ([]byte, []int) { return fileDescriptorMcp, []int{4} } +var xxx_messageInfo_IncrementalMeshConfigResponse proto.InternalMessageInfo func (m *IncrementalMeshConfigResponse) GetSystemVersionInfo() string { if m != nil { @@ -348,7 +485,7 @@ func (m *IncrementalMeshConfigResponse) GetNonce() string { // type RequestResources struct { // The sink node making the request. - SinkNode *SinkNode `protobuf:"bytes,1,opt,name=sink_node,json=sinkNode" json:"sink_node,omitempty"` + SinkNode *SinkNode `protobuf:"bytes,1,opt,name=sink_node,json=sinkNode,proto3" json:"sink_node,omitempty"` // Type of resource collection that is being requested, e.g. // // istio/networking/v1alpha3/VirtualService @@ -358,7 +495,7 @@ type RequestResources struct { // be populated. Otherwise, initial_resource_versions must be omitted. The keys are the // resources names of the MCP resources known to the MCP client. The values in the map // are the associated resource level version info. - InitialResourceVersions map[string]string `protobuf:"bytes,3,rep,name=initial_resource_versions,json=initialResourceVersions" json:"initial_resource_versions,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` + InitialResourceVersions map[string]string `protobuf:"bytes,3,rep,name=initial_resource_versions,json=initialResourceVersions,proto3" json:"initial_resource_versions,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` // When the RequestResources is an ACK or NACK message in response to a previous RequestResources, // the response_nonce must be the nonce in the RequestResources. Otherwise response_nonce must // be omitted. @@ -366,17 +503,48 @@ type RequestResources struct { // This is populated when the previously received resources could not be applied // The *message* field in *error_details* provides the source internal error // related to the failure. - ErrorDetail *google_rpc.Status `protobuf:"bytes,5,opt,name=error_detail,json=errorDetail" json:"error_detail,omitempty"` + ErrorDetail *rpc.Status `protobuf:"bytes,5,opt,name=error_detail,json=errorDetail,proto3" json:"error_detail,omitempty"` // Request an incremental update for the specified collection. The source may choose to // honor this request or ignore and and provide a full-state update in the corresponding // `Resource` response. - Incremental bool `protobuf:"varint,6,opt,name=incremental,proto3" json:"incremental,omitempty"` + Incremental bool `protobuf:"varint,6,opt,name=incremental,proto3" json:"incremental,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` +} + +func (m *RequestResources) Reset() { *m = RequestResources{} } +func (m *RequestResources) String() string { return proto.CompactTextString(m) } +func (*RequestResources) ProtoMessage() {} +func (*RequestResources) Descriptor() ([]byte, []int) { + return fileDescriptor_0713683a7297bd65, []int{5} +} +func (m *RequestResources) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *RequestResources) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_RequestResources.Marshal(b, m, deterministic) + } else { + b = b[:cap(b)] + n, err := m.MarshalTo(b) + if err != nil { + return nil, err + } + return b[:n], nil + } +} +func (m *RequestResources) XXX_Merge(src proto.Message) { + xxx_messageInfo_RequestResources.Merge(m, src) +} +func (m *RequestResources) XXX_Size() int { + return m.Size() +} +func (m *RequestResources) XXX_DiscardUnknown() { + xxx_messageInfo_RequestResources.DiscardUnknown(m) } -func (m *RequestResources) Reset() { *m = RequestResources{} } -func (m *RequestResources) String() string { return proto.CompactTextString(m) } -func (*RequestResources) ProtoMessage() {} -func (*RequestResources) Descriptor() ([]byte, []int) { return fileDescriptorMcp, []int{5} } +var xxx_messageInfo_RequestResources proto.InternalMessageInfo func (m *RequestResources) GetSinkNode() *SinkNode { if m != nil { @@ -406,7 +574,7 @@ func (m *RequestResources) GetResponseNonce() string { return "" } -func (m *RequestResources) GetErrorDetail() *google_rpc.Status { +func (m *RequestResources) GetErrorDetail() *rpc.Status { if m != nil { return m.ErrorDetail } @@ -447,7 +615,7 @@ type Resources struct { // // When `incremental` is false, this contains the full set of resources for the // specified collection. This replaces any previously delivered resources. - Resources []Resource `protobuf:"bytes,3,rep,name=resources" json:"resources"` + Resources []Resource `protobuf:"bytes,3,rep,name=resources,proto3" json:"resources"` // Names of resources that have been deleted and to be // removed from the MCP sink node. Removed resources for missing // resources can be ignored. @@ -457,19 +625,50 @@ type Resources struct { // the sink. // // When `incremental` is false, this field should be ignored. - RemovedResources []string `protobuf:"bytes,4,rep,name=removed_resources,json=removedResources" json:"removed_resources,omitempty"` + RemovedResources []string `protobuf:"bytes,4,rep,name=removed_resources,json=removedResources,proto3" json:"removed_resources,omitempty"` // Required. The nonce provides a way for RequestChange to uniquely // reference a RequestResources. Nonce string `protobuf:"bytes,5,opt,name=nonce,proto3" json:"nonce,omitempty"` // This resource response is an incremental update. The source should only send // incremental updates if the sink requested them. - Incremental bool `protobuf:"varint,6,opt,name=incremental,proto3" json:"incremental,omitempty"` + Incremental bool `protobuf:"varint,6,opt,name=incremental,proto3" json:"incremental,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` +} + +func (m *Resources) Reset() { *m = Resources{} } +func (m *Resources) String() string { return proto.CompactTextString(m) } +func (*Resources) ProtoMessage() {} +func (*Resources) Descriptor() ([]byte, []int) { + return fileDescriptor_0713683a7297bd65, []int{6} +} +func (m *Resources) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *Resources) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_Resources.Marshal(b, m, deterministic) + } else { + b = b[:cap(b)] + n, err := m.MarshalTo(b) + if err != nil { + return nil, err + } + return b[:n], nil + } +} +func (m *Resources) XXX_Merge(src proto.Message) { + xxx_messageInfo_Resources.Merge(m, src) +} +func (m *Resources) XXX_Size() int { + return m.Size() +} +func (m *Resources) XXX_DiscardUnknown() { + xxx_messageInfo_Resources.DiscardUnknown(m) } -func (m *Resources) Reset() { *m = Resources{} } -func (m *Resources) String() string { return proto.CompactTextString(m) } -func (*Resources) ProtoMessage() {} -func (*Resources) Descriptor() ([]byte, []int) { return fileDescriptorMcp, []int{6} } +var xxx_messageInfo_Resources proto.InternalMessageInfo func (m *Resources) GetSystemVersionInfo() string { if m != nil { @@ -515,13 +714,72 @@ func (m *Resources) GetIncremental() bool { func init() { proto.RegisterType((*SinkNode)(nil), "istio.mcp.v1alpha1.SinkNode") + proto.RegisterMapType((map[string]string)(nil), "istio.mcp.v1alpha1.SinkNode.AnnotationsEntry") proto.RegisterType((*MeshConfigRequest)(nil), "istio.mcp.v1alpha1.MeshConfigRequest") proto.RegisterType((*MeshConfigResponse)(nil), "istio.mcp.v1alpha1.MeshConfigResponse") proto.RegisterType((*IncrementalMeshConfigRequest)(nil), "istio.mcp.v1alpha1.IncrementalMeshConfigRequest") + proto.RegisterMapType((map[string]string)(nil), "istio.mcp.v1alpha1.IncrementalMeshConfigRequest.InitialResourceVersionsEntry") proto.RegisterType((*IncrementalMeshConfigResponse)(nil), "istio.mcp.v1alpha1.IncrementalMeshConfigResponse") proto.RegisterType((*RequestResources)(nil), "istio.mcp.v1alpha1.RequestResources") + proto.RegisterMapType((map[string]string)(nil), "istio.mcp.v1alpha1.RequestResources.InitialResourceVersionsEntry") proto.RegisterType((*Resources)(nil), "istio.mcp.v1alpha1.Resources") } + +func init() { proto.RegisterFile("mcp/v1alpha1/mcp.proto", fileDescriptor_0713683a7297bd65) } + +var fileDescriptor_0713683a7297bd65 = []byte{ + // 774 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x56, 0xcd, 0x6e, 0xeb, 0x44, + 0x14, 0xbe, 0xe3, 0x34, 0x97, 0xe4, 0xa4, 0x54, 0xe9, 0x50, 0x51, 0xc7, 0xf7, 0xde, 0x10, 0x22, + 0x8a, 0x22, 0x55, 0x38, 0x6d, 0x10, 0x12, 0xb0, 0x40, 0xb4, 0xd0, 0x45, 0x91, 0x5a, 0x24, 0x47, + 0x74, 0xc1, 0xc6, 0x72, 0xed, 0xa9, 0x3b, 0x8a, 0x33, 0x63, 0x66, 0x26, 0x91, 0xb2, 0x60, 0xc3, + 0x0e, 0xf1, 0x0c, 0xec, 0x51, 0x79, 0x01, 0x1e, 0xa1, 0x4b, 0x16, 0xac, 0x11, 0xca, 0x92, 0xa7, + 0x40, 0xfe, 0xab, 0x1d, 0xea, 0x26, 0x0d, 0x14, 0x89, 0x8d, 0x35, 0x73, 0xce, 0x99, 0xef, 0xfc, + 0x7c, 0xdf, 0x8c, 0x0c, 0x6f, 0x8e, 0xdd, 0xb0, 0x3f, 0x3d, 0x74, 0x82, 0xf0, 0xda, 0x39, 0xec, + 0x8f, 0xdd, 0xd0, 0x0c, 0x05, 0x57, 0x1c, 0x63, 0x2a, 0x15, 0xe5, 0x66, 0x64, 0xc8, 0xbc, 0xc6, + 0xae, 0xcf, 0xb9, 0x1f, 0x90, 0xbe, 0x08, 0xdd, 0xbe, 0x54, 0x8e, 0x9a, 0xc8, 0x24, 0xd8, 0xd8, + 0xf1, 0xb9, 0xcf, 0xe3, 0x65, 0x3f, 0x5a, 0xa5, 0xd6, 0x17, 0x0b, 0xd0, 0x82, 0x48, 0x3e, 0x11, + 0x2e, 0x49, 0x9c, 0xdd, 0x9f, 0x11, 0xd4, 0x86, 0x94, 0x8d, 0xce, 0xb9, 0x47, 0xf0, 0x16, 0x68, + 0xd4, 0xd3, 0x51, 0x07, 0xf5, 0xea, 0x96, 0x46, 0x3d, 0xfc, 0x25, 0x34, 0x1c, 0xc6, 0xb8, 0x72, + 0x14, 0xe5, 0x4c, 0xea, 0x5a, 0xa7, 0xd2, 0x6b, 0x0c, 0xde, 0x33, 0xef, 0x97, 0x64, 0x66, 0x10, + 0xe6, 0x51, 0x1e, 0x7f, 0xc2, 0x94, 0x98, 0x59, 0x45, 0x04, 0xe3, 0x13, 0x68, 0xfe, 0x3d, 0x00, + 0x37, 0xa1, 0x32, 0x22, 0xb3, 0x34, 0x6b, 0xb4, 0xc4, 0x3b, 0x50, 0x9d, 0x3a, 0xc1, 0x84, 0xe8, + 0x5a, 0x6c, 0x4b, 0x36, 0x1f, 0x6b, 0x1f, 0xa2, 0xee, 0x9f, 0x08, 0xb6, 0xcf, 0x88, 0xbc, 0xfe, + 0x8c, 0xb3, 0x2b, 0xea, 0x5b, 0xe4, 0x9b, 0x09, 0x91, 0x0a, 0xbf, 0x0d, 0x9b, 0x53, 0x22, 0x24, + 0xe5, 0xcc, 0xa6, 0xec, 0x8a, 0xa7, 0x50, 0x8d, 0xd4, 0x76, 0xca, 0xae, 0x38, 0xfe, 0x08, 0xea, + 0x92, 0xb2, 0x91, 0xcd, 0xb8, 0x97, 0xc0, 0x36, 0x06, 0x2f, 0x97, 0xf5, 0x61, 0xd5, 0x64, 0x36, + 0x94, 0x16, 0xd4, 0xd4, 0x2c, 0x24, 0xf6, 0x44, 0x04, 0x7a, 0x25, 0x46, 0x7e, 0x2d, 0xda, 0x7f, + 0x25, 0x02, 0xbc, 0x07, 0x5b, 0x82, 0xc8, 0x90, 0x33, 0x49, 0x6c, 0xc6, 0x99, 0x4b, 0xf4, 0x8d, + 0x38, 0xe0, 0xf5, 0xcc, 0x7a, 0x1e, 0x19, 0xf1, 0x07, 0xb0, 0x49, 0x84, 0xe0, 0xc2, 0xf6, 0x88, + 0x72, 0x68, 0xa0, 0x57, 0xe3, 0xfc, 0xd8, 0x4c, 0x68, 0x34, 0x45, 0xe8, 0x9a, 0xc3, 0x98, 0x46, + 0xab, 0x11, 0xc7, 0x7d, 0x1e, 0x87, 0x75, 0x6f, 0x10, 0xe0, 0x62, 0xb3, 0x09, 0xe4, 0x63, 0xba, + 0xfd, 0x14, 0xea, 0x19, 0xcd, 0x19, 0x6b, 0xa5, 0xdd, 0x5a, 0x69, 0xd0, 0xf1, 0xc6, 0xed, 0xef, + 0x6f, 0x3d, 0xb3, 0xf2, 0x43, 0xcb, 0x9a, 0xde, 0x81, 0x6a, 0xb1, 0xd7, 0x64, 0xd3, 0xbd, 0xa9, + 0xc0, 0xcb, 0x53, 0xe6, 0x0a, 0x32, 0x26, 0x4c, 0x39, 0xc1, 0x7d, 0x92, 0x16, 0x18, 0x40, 0xff, + 0x98, 0x01, 0x6d, 0xb1, 0x98, 0xef, 0x11, 0xb4, 0x28, 0xa3, 0x8a, 0x3a, 0x81, 0x9d, 0x55, 0x6f, + 0xa7, 0xa3, 0x90, 0x7a, 0x25, 0x6e, 0xfd, 0xac, 0x2c, 0xcd, 0xb2, 0x5a, 0xcd, 0xd3, 0x04, 0x31, + 0x1b, 0xcf, 0x45, 0x8a, 0x97, 0x08, 0x7a, 0x97, 0x96, 0x7b, 0xff, 0x5b, 0x35, 0x18, 0x5f, 0x44, + 0xf3, 0x7d, 0xb8, 0xac, 0xb5, 0xae, 0xd1, 0x6f, 0x08, 0x5e, 0x3d, 0x30, 0x80, 0x54, 0x64, 0x26, + 0xbc, 0x21, 0x67, 0x52, 0x91, 0xb1, 0x5d, 0xa2, 0xb5, 0xed, 0xc4, 0x75, 0xf1, 0xa4, 0x8a, 0xdb, + 0x87, 0x6d, 0x41, 0xc6, 0x7c, 0x4a, 0x3c, 0x3b, 0x47, 0x8a, 0x08, 0xac, 0x5b, 0xcd, 0xd4, 0x61, + 0xdd, 0x05, 0x97, 0x6b, 0xf0, 0x97, 0x0a, 0x34, 0x53, 0x0a, 0xf3, 0xd0, 0x7f, 0xa1, 0xbb, 0x36, + 0x80, 0xcb, 0x83, 0x80, 0xb8, 0xd1, 0x6b, 0x95, 0x4e, 0xb1, 0x60, 0xc1, 0xdf, 0xae, 0xd6, 0xde, + 0x51, 0xf9, 0x10, 0x16, 0x6b, 0xfc, 0x3f, 0xea, 0x0d, 0x77, 0xa0, 0x41, 0x73, 0x89, 0xe8, 0xcf, + 0x3b, 0xa8, 0x57, 0xb3, 0x8a, 0xa6, 0x27, 0x55, 0xe4, 0x77, 0x1a, 0xd4, 0x73, 0xce, 0xd6, 0x55, + 0xdf, 0x2a, 0xa2, 0x16, 0xd4, 0x59, 0x79, 0x32, 0x75, 0x6e, 0xac, 0x52, 0x67, 0xb5, 0xa0, 0xce, + 0xd5, 0x03, 0x1d, 0xfc, 0xa8, 0xc1, 0x8b, 0x23, 0xdf, 0x17, 0xc4, 0x77, 0x14, 0xf1, 0xf2, 0x5b, + 0x39, 0x24, 0x62, 0x4a, 0x5d, 0x82, 0x43, 0x68, 0x0d, 0x95, 0x20, 0xce, 0x38, 0x0f, 0xca, 0x93, + 0xee, 0x95, 0x35, 0x74, 0xef, 0x69, 0x33, 0xde, 0x5d, 0x15, 0x96, 0x48, 0xa7, 0xfb, 0xac, 0x87, + 0x0e, 0x10, 0xfe, 0x01, 0x41, 0xbb, 0xf0, 0x50, 0x94, 0xe5, 0x3d, 0x58, 0xf7, 0x75, 0x35, 0x0e, + 0xd7, 0x38, 0x51, 0xac, 0x66, 0x30, 0x85, 0xad, 0x2c, 0xef, 0x30, 0xfe, 0x62, 0x0f, 0x76, 0x4f, + 0xa4, 0x72, 0x2e, 0x03, 0x2a, 0xaf, 0xef, 0x5c, 0xf1, 0x88, 0xf0, 0x3b, 0x8f, 0xb9, 0x79, 0xc6, + 0xab, 0x65, 0x32, 0x90, 0x69, 0x5e, 0x05, 0x9b, 0x77, 0xe0, 0x94, 0x8d, 0x96, 0x65, 0x5d, 0x8e, + 0x67, 0x3c, 0xaa, 0xa8, 0x24, 0xeb, 0xf1, 0xfe, 0x4f, 0xf3, 0x36, 0xba, 0x9d, 0xb7, 0xd1, 0xaf, + 0xf3, 0x36, 0xfa, 0x63, 0xde, 0x46, 0x5f, 0xb7, 0x92, 0xc3, 0x94, 0xf7, 0x9d, 0x90, 0xf6, 0x8b, + 0x7f, 0x75, 0x97, 0xcf, 0xe3, 0xbf, 0xb9, 0xf7, 0xff, 0x0a, 0x00, 0x00, 0xff, 0xff, 0x4e, 0x31, + 0xdd, 0xdb, 0x47, 0x0a, 0x00, 0x00, +} + func (this *SinkNode) Equal(that interface{}) bool { if that == nil { return this == nil @@ -552,6 +810,9 @@ func (this *SinkNode) Equal(that interface{}) bool { return false } } + if !bytes.Equal(this.XXX_unrecognized, that1.XXX_unrecognized) { + return false + } return true } func (this *MeshConfigRequest) Equal(that interface{}) bool { @@ -588,6 +849,9 @@ func (this *MeshConfigRequest) Equal(that interface{}) bool { if !this.ErrorDetail.Equal(that1.ErrorDetail) { return false } + if !bytes.Equal(this.XXX_unrecognized, that1.XXX_unrecognized) { + return false + } return true } func (this *MeshConfigResponse) Equal(that interface{}) bool { @@ -626,6 +890,9 @@ func (this *MeshConfigResponse) Equal(that interface{}) bool { if this.Nonce != that1.Nonce { return false } + if !bytes.Equal(this.XXX_unrecognized, that1.XXX_unrecognized) { + return false + } return true } func (this *IncrementalMeshConfigRequest) Equal(that interface{}) bool { @@ -667,6 +934,9 @@ func (this *IncrementalMeshConfigRequest) Equal(that interface{}) bool { if !this.ErrorDetail.Equal(that1.ErrorDetail) { return false } + if !bytes.Equal(this.XXX_unrecognized, that1.XXX_unrecognized) { + return false + } return true } func (this *IncrementalMeshConfigResponse) Equal(that interface{}) bool { @@ -710,6 +980,9 @@ func (this *IncrementalMeshConfigResponse) Equal(that interface{}) bool { if this.Nonce != that1.Nonce { return false } + if !bytes.Equal(this.XXX_unrecognized, that1.XXX_unrecognized) { + return false + } return true } func (this *RequestResources) Equal(that interface{}) bool { @@ -754,6 +1027,9 @@ func (this *RequestResources) Equal(that interface{}) bool { if this.Incremental != that1.Incremental { return false } + if !bytes.Equal(this.XXX_unrecognized, that1.XXX_unrecognized) { + return false + } return true } func (this *Resources) Equal(that interface{}) bool { @@ -803,6 +1079,9 @@ func (this *Resources) Equal(that interface{}) bool { if this.Incremental != that1.Incremental { return false } + if !bytes.Equal(this.XXX_unrecognized, that1.XXX_unrecognized) { + return false + } return true } @@ -814,8 +1093,9 @@ var _ grpc.ClientConn // is compatible with the grpc package it is being compiled against. const _ = grpc.SupportPackageIsVersion4 -// Client API for AggregatedMeshConfigService service - +// AggregatedMeshConfigServiceClient is the client API for AggregatedMeshConfigService service. +// +// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream. type AggregatedMeshConfigServiceClient interface { // StreamAggregatedResources provides the ability to carefully // sequence updates across multiple resource types. A single stream @@ -837,7 +1117,7 @@ func NewAggregatedMeshConfigServiceClient(cc *grpc.ClientConn) AggregatedMeshCon } func (c *aggregatedMeshConfigServiceClient) StreamAggregatedResources(ctx context.Context, opts ...grpc.CallOption) (AggregatedMeshConfigService_StreamAggregatedResourcesClient, error) { - stream, err := grpc.NewClientStream(ctx, &_AggregatedMeshConfigService_serviceDesc.Streams[0], c.cc, "/istio.mcp.v1alpha1.AggregatedMeshConfigService/StreamAggregatedResources", opts...) + stream, err := c.cc.NewStream(ctx, &_AggregatedMeshConfigService_serviceDesc.Streams[0], "/istio.mcp.v1alpha1.AggregatedMeshConfigService/StreamAggregatedResources", opts...) if err != nil { return nil, err } @@ -868,7 +1148,7 @@ func (x *aggregatedMeshConfigServiceStreamAggregatedResourcesClient) Recv() (*Me } func (c *aggregatedMeshConfigServiceClient) IncrementalAggregatedResources(ctx context.Context, opts ...grpc.CallOption) (AggregatedMeshConfigService_IncrementalAggregatedResourcesClient, error) { - stream, err := grpc.NewClientStream(ctx, &_AggregatedMeshConfigService_serviceDesc.Streams[1], c.cc, "/istio.mcp.v1alpha1.AggregatedMeshConfigService/IncrementalAggregatedResources", opts...) + stream, err := c.cc.NewStream(ctx, &_AggregatedMeshConfigService_serviceDesc.Streams[1], "/istio.mcp.v1alpha1.AggregatedMeshConfigService/IncrementalAggregatedResources", opts...) if err != nil { return nil, err } @@ -898,8 +1178,7 @@ func (x *aggregatedMeshConfigServiceIncrementalAggregatedResourcesClient) Recv() return m, nil } -// Server API for AggregatedMeshConfigService service - +// AggregatedMeshConfigServiceServer is the server API for AggregatedMeshConfigService service. type AggregatedMeshConfigServiceServer interface { // StreamAggregatedResources provides the ability to carefully // sequence updates across multiple resource types. A single stream @@ -989,8 +1268,9 @@ var _AggregatedMeshConfigService_serviceDesc = grpc.ServiceDesc{ Metadata: "mcp/v1alpha1/mcp.proto", } -// Client API for ResourceSource service - +// ResourceSourceClient is the client API for ResourceSource service. +// +// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream. type ResourceSourceClient interface { // The sink, acting as gRPC client, establishes a new resource stream // with the source. The sink sends RequestResources message to @@ -1007,7 +1287,7 @@ func NewResourceSourceClient(cc *grpc.ClientConn) ResourceSourceClient { } func (c *resourceSourceClient) EstablishResourceStream(ctx context.Context, opts ...grpc.CallOption) (ResourceSource_EstablishResourceStreamClient, error) { - stream, err := grpc.NewClientStream(ctx, &_ResourceSource_serviceDesc.Streams[0], c.cc, "/istio.mcp.v1alpha1.ResourceSource/EstablishResourceStream", opts...) + stream, err := c.cc.NewStream(ctx, &_ResourceSource_serviceDesc.Streams[0], "/istio.mcp.v1alpha1.ResourceSource/EstablishResourceStream", opts...) if err != nil { return nil, err } @@ -1037,8 +1317,7 @@ func (x *resourceSourceEstablishResourceStreamClient) Recv() (*Resources, error) return m, nil } -// Server API for ResourceSource service - +// ResourceSourceServer is the server API for ResourceSource service. type ResourceSourceServer interface { // The sink, acting as gRPC client, establishes a new resource stream // with the source. The sink sends RequestResources message to @@ -1091,8 +1370,9 @@ var _ResourceSource_serviceDesc = grpc.ServiceDesc{ Metadata: "mcp/v1alpha1/mcp.proto", } -// Client API for ResourceSink service - +// ResourceSinkClient is the client API for ResourceSink service. +// +// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream. type ResourceSinkClient interface { // The source, acting as gRPC client, establishes a new resource stream // with the sink. The sink sends RequestResources message to and @@ -1109,7 +1389,7 @@ func NewResourceSinkClient(cc *grpc.ClientConn) ResourceSinkClient { } func (c *resourceSinkClient) EstablishResourceStream(ctx context.Context, opts ...grpc.CallOption) (ResourceSink_EstablishResourceStreamClient, error) { - stream, err := grpc.NewClientStream(ctx, &_ResourceSink_serviceDesc.Streams[0], c.cc, "/istio.mcp.v1alpha1.ResourceSink/EstablishResourceStream", opts...) + stream, err := c.cc.NewStream(ctx, &_ResourceSink_serviceDesc.Streams[0], "/istio.mcp.v1alpha1.ResourceSink/EstablishResourceStream", opts...) if err != nil { return nil, err } @@ -1139,8 +1419,7 @@ func (x *resourceSinkEstablishResourceStreamClient) Recv() (*RequestResources, e return m, nil } -// Server API for ResourceSink service - +// ResourceSinkServer is the server API for ResourceSink service. type ResourceSinkServer interface { // The source, acting as gRPC client, establishes a new resource stream // with the sink. The sink sends RequestResources message to and @@ -1231,6 +1510,9 @@ func (m *SinkNode) MarshalTo(dAtA []byte) (int, error) { i += copy(dAtA[i:], v) } } + if m.XXX_unrecognized != nil { + i += copy(dAtA[i:], m.XXX_unrecognized) + } return i, nil } @@ -1287,6 +1569,9 @@ func (m *MeshConfigRequest) MarshalTo(dAtA []byte) (int, error) { } i += n2 } + if m.XXX_unrecognized != nil { + i += copy(dAtA[i:], m.XXX_unrecognized) + } return i, nil } @@ -1335,6 +1620,9 @@ func (m *MeshConfigResponse) MarshalTo(dAtA []byte) (int, error) { i = encodeVarintMcp(dAtA, i, uint64(len(m.Nonce))) i += copy(dAtA[i:], m.Nonce) } + if m.XXX_unrecognized != nil { + i += copy(dAtA[i:], m.XXX_unrecognized) + } return i, nil } @@ -1402,6 +1690,9 @@ func (m *IncrementalMeshConfigRequest) MarshalTo(dAtA []byte) (int, error) { } i += n4 } + if m.XXX_unrecognized != nil { + i += copy(dAtA[i:], m.XXX_unrecognized) + } return i, nil } @@ -1459,6 +1750,9 @@ func (m *IncrementalMeshConfigResponse) MarshalTo(dAtA []byte) (int, error) { i = encodeVarintMcp(dAtA, i, uint64(len(m.Nonce))) i += copy(dAtA[i:], m.Nonce) } + if m.XXX_unrecognized != nil { + i += copy(dAtA[i:], m.XXX_unrecognized) + } return i, nil } @@ -1536,6 +1830,9 @@ func (m *RequestResources) MarshalTo(dAtA []byte) (int, error) { } i++ } + if m.XXX_unrecognized != nil { + i += copy(dAtA[i:], m.XXX_unrecognized) + } return i, nil } @@ -1609,6 +1906,9 @@ func (m *Resources) MarshalTo(dAtA []byte) (int, error) { } i++ } + if m.XXX_unrecognized != nil { + i += copy(dAtA[i:], m.XXX_unrecognized) + } return i, nil } @@ -1622,6 +1922,9 @@ func encodeVarintMcp(dAtA []byte, offset int, v uint64) int { return offset + 1 } func (m *SinkNode) Size() (n int) { + if m == nil { + return 0 + } var l int _ = l l = len(m.Id) @@ -1636,10 +1939,16 @@ func (m *SinkNode) Size() (n int) { n += mapEntrySize + 1 + sovMcp(uint64(mapEntrySize)) } } + if m.XXX_unrecognized != nil { + n += len(m.XXX_unrecognized) + } return n } func (m *MeshConfigRequest) Size() (n int) { + if m == nil { + return 0 + } var l int _ = l l = len(m.VersionInfo) @@ -1662,10 +1971,16 @@ func (m *MeshConfigRequest) Size() (n int) { l = m.ErrorDetail.Size() n += 1 + l + sovMcp(uint64(l)) } + if m.XXX_unrecognized != nil { + n += len(m.XXX_unrecognized) + } return n } func (m *MeshConfigResponse) Size() (n int) { + if m == nil { + return 0 + } var l int _ = l l = len(m.VersionInfo) @@ -1686,10 +2001,16 @@ func (m *MeshConfigResponse) Size() (n int) { if l > 0 { n += 1 + l + sovMcp(uint64(l)) } + if m.XXX_unrecognized != nil { + n += len(m.XXX_unrecognized) + } return n } func (m *IncrementalMeshConfigRequest) Size() (n int) { + if m == nil { + return 0 + } var l int _ = l if m.SinkNode != nil { @@ -1716,10 +2037,16 @@ func (m *IncrementalMeshConfigRequest) Size() (n int) { l = m.ErrorDetail.Size() n += 1 + l + sovMcp(uint64(l)) } + if m.XXX_unrecognized != nil { + n += len(m.XXX_unrecognized) + } return n } func (m *IncrementalMeshConfigResponse) Size() (n int) { + if m == nil { + return 0 + } var l int _ = l l = len(m.SystemVersionInfo) @@ -1742,10 +2069,16 @@ func (m *IncrementalMeshConfigResponse) Size() (n int) { if l > 0 { n += 1 + l + sovMcp(uint64(l)) } + if m.XXX_unrecognized != nil { + n += len(m.XXX_unrecognized) + } return n } func (m *RequestResources) Size() (n int) { + if m == nil { + return 0 + } var l int _ = l if m.SinkNode != nil { @@ -1775,10 +2108,16 @@ func (m *RequestResources) Size() (n int) { if m.Incremental { n += 2 } + if m.XXX_unrecognized != nil { + n += len(m.XXX_unrecognized) + } return n } func (m *Resources) Size() (n int) { + if m == nil { + return 0 + } var l int _ = l l = len(m.SystemVersionInfo) @@ -1808,6 +2147,9 @@ func (m *Resources) Size() (n int) { if m.Incremental { n += 2 } + if m.XXX_unrecognized != nil { + n += len(m.XXX_unrecognized) + } return n } @@ -1839,7 +2181,7 @@ func (m *SinkNode) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - wire |= (uint64(b) & 0x7F) << shift + wire |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -1867,7 +2209,7 @@ func (m *SinkNode) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLen |= (uint64(b) & 0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -1877,6 +2219,9 @@ func (m *SinkNode) Unmarshal(dAtA []byte) error { return ErrInvalidLengthMcp } postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthMcp + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -1896,7 +2241,7 @@ func (m *SinkNode) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - msglen |= (int(b) & 0x7F) << shift + msglen |= int(b&0x7F) << shift if b < 0x80 { break } @@ -1905,6 +2250,9 @@ func (m *SinkNode) Unmarshal(dAtA []byte) error { return ErrInvalidLengthMcp } postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthMcp + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -1925,7 +2273,7 @@ func (m *SinkNode) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - wire |= (uint64(b) & 0x7F) << shift + wire |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -1942,7 +2290,7 @@ func (m *SinkNode) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLenmapkey |= (uint64(b) & 0x7F) << shift + stringLenmapkey |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -1952,6 +2300,9 @@ func (m *SinkNode) Unmarshal(dAtA []byte) error { return ErrInvalidLengthMcp } postStringIndexmapkey := iNdEx + intStringLenmapkey + if postStringIndexmapkey < 0 { + return ErrInvalidLengthMcp + } if postStringIndexmapkey > l { return io.ErrUnexpectedEOF } @@ -1968,7 +2319,7 @@ func (m *SinkNode) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLenmapvalue |= (uint64(b) & 0x7F) << shift + stringLenmapvalue |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -1978,6 +2329,9 @@ func (m *SinkNode) Unmarshal(dAtA []byte) error { return ErrInvalidLengthMcp } postStringIndexmapvalue := iNdEx + intStringLenmapvalue + if postStringIndexmapvalue < 0 { + return ErrInvalidLengthMcp + } if postStringIndexmapvalue > l { return io.ErrUnexpectedEOF } @@ -2009,9 +2363,13 @@ func (m *SinkNode) Unmarshal(dAtA []byte) error { if skippy < 0 { return ErrInvalidLengthMcp } + if (iNdEx + skippy) < 0 { + return ErrInvalidLengthMcp + } if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF } + m.XXX_unrecognized = append(m.XXX_unrecognized, dAtA[iNdEx:iNdEx+skippy]...) iNdEx += skippy } } @@ -2036,7 +2394,7 @@ func (m *MeshConfigRequest) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - wire |= (uint64(b) & 0x7F) << shift + wire |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -2064,7 +2422,7 @@ func (m *MeshConfigRequest) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLen |= (uint64(b) & 0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -2074,6 +2432,9 @@ func (m *MeshConfigRequest) Unmarshal(dAtA []byte) error { return ErrInvalidLengthMcp } postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthMcp + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -2093,7 +2454,7 @@ func (m *MeshConfigRequest) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - msglen |= (int(b) & 0x7F) << shift + msglen |= int(b&0x7F) << shift if b < 0x80 { break } @@ -2102,6 +2463,9 @@ func (m *MeshConfigRequest) Unmarshal(dAtA []byte) error { return ErrInvalidLengthMcp } postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthMcp + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -2126,7 +2490,7 @@ func (m *MeshConfigRequest) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLen |= (uint64(b) & 0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -2136,6 +2500,9 @@ func (m *MeshConfigRequest) Unmarshal(dAtA []byte) error { return ErrInvalidLengthMcp } postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthMcp + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -2155,7 +2522,7 @@ func (m *MeshConfigRequest) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLen |= (uint64(b) & 0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -2165,6 +2532,9 @@ func (m *MeshConfigRequest) Unmarshal(dAtA []byte) error { return ErrInvalidLengthMcp } postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthMcp + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -2184,7 +2554,7 @@ func (m *MeshConfigRequest) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - msglen |= (int(b) & 0x7F) << shift + msglen |= int(b&0x7F) << shift if b < 0x80 { break } @@ -2193,11 +2563,14 @@ func (m *MeshConfigRequest) Unmarshal(dAtA []byte) error { return ErrInvalidLengthMcp } postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthMcp + } if postIndex > l { return io.ErrUnexpectedEOF } if m.ErrorDetail == nil { - m.ErrorDetail = &google_rpc.Status{} + m.ErrorDetail = &rpc.Status{} } if err := m.ErrorDetail.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err @@ -2212,9 +2585,13 @@ func (m *MeshConfigRequest) Unmarshal(dAtA []byte) error { if skippy < 0 { return ErrInvalidLengthMcp } + if (iNdEx + skippy) < 0 { + return ErrInvalidLengthMcp + } if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF } + m.XXX_unrecognized = append(m.XXX_unrecognized, dAtA[iNdEx:iNdEx+skippy]...) iNdEx += skippy } } @@ -2239,7 +2616,7 @@ func (m *MeshConfigResponse) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - wire |= (uint64(b) & 0x7F) << shift + wire |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -2267,7 +2644,7 @@ func (m *MeshConfigResponse) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLen |= (uint64(b) & 0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -2277,6 +2654,9 @@ func (m *MeshConfigResponse) Unmarshal(dAtA []byte) error { return ErrInvalidLengthMcp } postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthMcp + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -2296,7 +2676,7 @@ func (m *MeshConfigResponse) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - msglen |= (int(b) & 0x7F) << shift + msglen |= int(b&0x7F) << shift if b < 0x80 { break } @@ -2305,6 +2685,9 @@ func (m *MeshConfigResponse) Unmarshal(dAtA []byte) error { return ErrInvalidLengthMcp } postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthMcp + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -2327,7 +2710,7 @@ func (m *MeshConfigResponse) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLen |= (uint64(b) & 0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -2337,6 +2720,9 @@ func (m *MeshConfigResponse) Unmarshal(dAtA []byte) error { return ErrInvalidLengthMcp } postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthMcp + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -2356,7 +2742,7 @@ func (m *MeshConfigResponse) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLen |= (uint64(b) & 0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -2366,6 +2752,9 @@ func (m *MeshConfigResponse) Unmarshal(dAtA []byte) error { return ErrInvalidLengthMcp } postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthMcp + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -2380,9 +2769,13 @@ func (m *MeshConfigResponse) Unmarshal(dAtA []byte) error { if skippy < 0 { return ErrInvalidLengthMcp } + if (iNdEx + skippy) < 0 { + return ErrInvalidLengthMcp + } if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF } + m.XXX_unrecognized = append(m.XXX_unrecognized, dAtA[iNdEx:iNdEx+skippy]...) iNdEx += skippy } } @@ -2407,7 +2800,7 @@ func (m *IncrementalMeshConfigRequest) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - wire |= (uint64(b) & 0x7F) << shift + wire |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -2435,7 +2828,7 @@ func (m *IncrementalMeshConfigRequest) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - msglen |= (int(b) & 0x7F) << shift + msglen |= int(b&0x7F) << shift if b < 0x80 { break } @@ -2444,6 +2837,9 @@ func (m *IncrementalMeshConfigRequest) Unmarshal(dAtA []byte) error { return ErrInvalidLengthMcp } postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthMcp + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -2468,7 +2864,7 @@ func (m *IncrementalMeshConfigRequest) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLen |= (uint64(b) & 0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -2478,6 +2874,9 @@ func (m *IncrementalMeshConfigRequest) Unmarshal(dAtA []byte) error { return ErrInvalidLengthMcp } postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthMcp + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -2497,7 +2896,7 @@ func (m *IncrementalMeshConfigRequest) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - msglen |= (int(b) & 0x7F) << shift + msglen |= int(b&0x7F) << shift if b < 0x80 { break } @@ -2506,6 +2905,9 @@ func (m *IncrementalMeshConfigRequest) Unmarshal(dAtA []byte) error { return ErrInvalidLengthMcp } postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthMcp + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -2526,7 +2928,7 @@ func (m *IncrementalMeshConfigRequest) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - wire |= (uint64(b) & 0x7F) << shift + wire |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -2543,7 +2945,7 @@ func (m *IncrementalMeshConfigRequest) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLenmapkey |= (uint64(b) & 0x7F) << shift + stringLenmapkey |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -2553,6 +2955,9 @@ func (m *IncrementalMeshConfigRequest) Unmarshal(dAtA []byte) error { return ErrInvalidLengthMcp } postStringIndexmapkey := iNdEx + intStringLenmapkey + if postStringIndexmapkey < 0 { + return ErrInvalidLengthMcp + } if postStringIndexmapkey > l { return io.ErrUnexpectedEOF } @@ -2569,7 +2974,7 @@ func (m *IncrementalMeshConfigRequest) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLenmapvalue |= (uint64(b) & 0x7F) << shift + stringLenmapvalue |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -2579,6 +2984,9 @@ func (m *IncrementalMeshConfigRequest) Unmarshal(dAtA []byte) error { return ErrInvalidLengthMcp } postStringIndexmapvalue := iNdEx + intStringLenmapvalue + if postStringIndexmapvalue < 0 { + return ErrInvalidLengthMcp + } if postStringIndexmapvalue > l { return io.ErrUnexpectedEOF } @@ -2615,7 +3023,7 @@ func (m *IncrementalMeshConfigRequest) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLen |= (uint64(b) & 0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -2625,6 +3033,9 @@ func (m *IncrementalMeshConfigRequest) Unmarshal(dAtA []byte) error { return ErrInvalidLengthMcp } postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthMcp + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -2644,7 +3055,7 @@ func (m *IncrementalMeshConfigRequest) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - msglen |= (int(b) & 0x7F) << shift + msglen |= int(b&0x7F) << shift if b < 0x80 { break } @@ -2653,11 +3064,14 @@ func (m *IncrementalMeshConfigRequest) Unmarshal(dAtA []byte) error { return ErrInvalidLengthMcp } postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthMcp + } if postIndex > l { return io.ErrUnexpectedEOF } if m.ErrorDetail == nil { - m.ErrorDetail = &google_rpc.Status{} + m.ErrorDetail = &rpc.Status{} } if err := m.ErrorDetail.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err @@ -2672,9 +3086,13 @@ func (m *IncrementalMeshConfigRequest) Unmarshal(dAtA []byte) error { if skippy < 0 { return ErrInvalidLengthMcp } + if (iNdEx + skippy) < 0 { + return ErrInvalidLengthMcp + } if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF } + m.XXX_unrecognized = append(m.XXX_unrecognized, dAtA[iNdEx:iNdEx+skippy]...) iNdEx += skippy } } @@ -2699,7 +3117,7 @@ func (m *IncrementalMeshConfigResponse) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - wire |= (uint64(b) & 0x7F) << shift + wire |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -2727,7 +3145,7 @@ func (m *IncrementalMeshConfigResponse) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLen |= (uint64(b) & 0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -2737,6 +3155,9 @@ func (m *IncrementalMeshConfigResponse) Unmarshal(dAtA []byte) error { return ErrInvalidLengthMcp } postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthMcp + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -2756,7 +3177,7 @@ func (m *IncrementalMeshConfigResponse) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - msglen |= (int(b) & 0x7F) << shift + msglen |= int(b&0x7F) << shift if b < 0x80 { break } @@ -2765,6 +3186,9 @@ func (m *IncrementalMeshConfigResponse) Unmarshal(dAtA []byte) error { return ErrInvalidLengthMcp } postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthMcp + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -2787,7 +3211,7 @@ func (m *IncrementalMeshConfigResponse) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLen |= (uint64(b) & 0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -2797,6 +3221,9 @@ func (m *IncrementalMeshConfigResponse) Unmarshal(dAtA []byte) error { return ErrInvalidLengthMcp } postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthMcp + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -2816,7 +3243,7 @@ func (m *IncrementalMeshConfigResponse) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLen |= (uint64(b) & 0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -2826,6 +3253,9 @@ func (m *IncrementalMeshConfigResponse) Unmarshal(dAtA []byte) error { return ErrInvalidLengthMcp } postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthMcp + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -2840,9 +3270,13 @@ func (m *IncrementalMeshConfigResponse) Unmarshal(dAtA []byte) error { if skippy < 0 { return ErrInvalidLengthMcp } + if (iNdEx + skippy) < 0 { + return ErrInvalidLengthMcp + } if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF } + m.XXX_unrecognized = append(m.XXX_unrecognized, dAtA[iNdEx:iNdEx+skippy]...) iNdEx += skippy } } @@ -2867,7 +3301,7 @@ func (m *RequestResources) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - wire |= (uint64(b) & 0x7F) << shift + wire |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -2895,7 +3329,7 @@ func (m *RequestResources) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - msglen |= (int(b) & 0x7F) << shift + msglen |= int(b&0x7F) << shift if b < 0x80 { break } @@ -2904,6 +3338,9 @@ func (m *RequestResources) Unmarshal(dAtA []byte) error { return ErrInvalidLengthMcp } postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthMcp + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -2928,7 +3365,7 @@ func (m *RequestResources) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLen |= (uint64(b) & 0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -2938,6 +3375,9 @@ func (m *RequestResources) Unmarshal(dAtA []byte) error { return ErrInvalidLengthMcp } postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthMcp + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -2957,7 +3397,7 @@ func (m *RequestResources) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - msglen |= (int(b) & 0x7F) << shift + msglen |= int(b&0x7F) << shift if b < 0x80 { break } @@ -2966,6 +3406,9 @@ func (m *RequestResources) Unmarshal(dAtA []byte) error { return ErrInvalidLengthMcp } postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthMcp + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -2986,7 +3429,7 @@ func (m *RequestResources) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - wire |= (uint64(b) & 0x7F) << shift + wire |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -3003,7 +3446,7 @@ func (m *RequestResources) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLenmapkey |= (uint64(b) & 0x7F) << shift + stringLenmapkey |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -3013,6 +3456,9 @@ func (m *RequestResources) Unmarshal(dAtA []byte) error { return ErrInvalidLengthMcp } postStringIndexmapkey := iNdEx + intStringLenmapkey + if postStringIndexmapkey < 0 { + return ErrInvalidLengthMcp + } if postStringIndexmapkey > l { return io.ErrUnexpectedEOF } @@ -3029,7 +3475,7 @@ func (m *RequestResources) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLenmapvalue |= (uint64(b) & 0x7F) << shift + stringLenmapvalue |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -3039,6 +3485,9 @@ func (m *RequestResources) Unmarshal(dAtA []byte) error { return ErrInvalidLengthMcp } postStringIndexmapvalue := iNdEx + intStringLenmapvalue + if postStringIndexmapvalue < 0 { + return ErrInvalidLengthMcp + } if postStringIndexmapvalue > l { return io.ErrUnexpectedEOF } @@ -3075,7 +3524,7 @@ func (m *RequestResources) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLen |= (uint64(b) & 0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -3085,6 +3534,9 @@ func (m *RequestResources) Unmarshal(dAtA []byte) error { return ErrInvalidLengthMcp } postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthMcp + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -3104,7 +3556,7 @@ func (m *RequestResources) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - msglen |= (int(b) & 0x7F) << shift + msglen |= int(b&0x7F) << shift if b < 0x80 { break } @@ -3113,11 +3565,14 @@ func (m *RequestResources) Unmarshal(dAtA []byte) error { return ErrInvalidLengthMcp } postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthMcp + } if postIndex > l { return io.ErrUnexpectedEOF } if m.ErrorDetail == nil { - m.ErrorDetail = &google_rpc.Status{} + m.ErrorDetail = &rpc.Status{} } if err := m.ErrorDetail.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err @@ -3137,7 +3592,7 @@ func (m *RequestResources) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - v |= (int(b) & 0x7F) << shift + v |= int(b&0x7F) << shift if b < 0x80 { break } @@ -3152,9 +3607,13 @@ func (m *RequestResources) Unmarshal(dAtA []byte) error { if skippy < 0 { return ErrInvalidLengthMcp } + if (iNdEx + skippy) < 0 { + return ErrInvalidLengthMcp + } if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF } + m.XXX_unrecognized = append(m.XXX_unrecognized, dAtA[iNdEx:iNdEx+skippy]...) iNdEx += skippy } } @@ -3179,7 +3638,7 @@ func (m *Resources) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - wire |= (uint64(b) & 0x7F) << shift + wire |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -3207,7 +3666,7 @@ func (m *Resources) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLen |= (uint64(b) & 0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -3217,6 +3676,9 @@ func (m *Resources) Unmarshal(dAtA []byte) error { return ErrInvalidLengthMcp } postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthMcp + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -3236,7 +3698,7 @@ func (m *Resources) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLen |= (uint64(b) & 0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -3246,6 +3708,9 @@ func (m *Resources) Unmarshal(dAtA []byte) error { return ErrInvalidLengthMcp } postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthMcp + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -3265,7 +3730,7 @@ func (m *Resources) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - msglen |= (int(b) & 0x7F) << shift + msglen |= int(b&0x7F) << shift if b < 0x80 { break } @@ -3274,6 +3739,9 @@ func (m *Resources) Unmarshal(dAtA []byte) error { return ErrInvalidLengthMcp } postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthMcp + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -3296,7 +3764,7 @@ func (m *Resources) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLen |= (uint64(b) & 0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -3306,6 +3774,9 @@ func (m *Resources) Unmarshal(dAtA []byte) error { return ErrInvalidLengthMcp } postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthMcp + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -3325,7 +3796,7 @@ func (m *Resources) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLen |= (uint64(b) & 0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -3335,6 +3806,9 @@ func (m *Resources) Unmarshal(dAtA []byte) error { return ErrInvalidLengthMcp } postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthMcp + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -3354,7 +3828,7 @@ func (m *Resources) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - v |= (int(b) & 0x7F) << shift + v |= int(b&0x7F) << shift if b < 0x80 { break } @@ -3369,9 +3843,13 @@ func (m *Resources) Unmarshal(dAtA []byte) error { if skippy < 0 { return ErrInvalidLengthMcp } + if (iNdEx + skippy) < 0 { + return ErrInvalidLengthMcp + } if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF } + m.XXX_unrecognized = append(m.XXX_unrecognized, dAtA[iNdEx:iNdEx+skippy]...) iNdEx += skippy } } @@ -3435,10 +3913,13 @@ func skipMcp(dAtA []byte) (n int, err error) { break } } - iNdEx += length if length < 0 { return 0, ErrInvalidLengthMcp } + iNdEx += length + if iNdEx < 0 { + return 0, ErrInvalidLengthMcp + } return iNdEx, nil case 3: for { @@ -3467,6 +3948,9 @@ func skipMcp(dAtA []byte) (n int, err error) { return 0, err } iNdEx = start + next + if iNdEx < 0 { + return 0, ErrInvalidLengthMcp + } } return iNdEx, nil case 4: @@ -3485,58 +3969,3 @@ var ( ErrInvalidLengthMcp = fmt.Errorf("proto: negative length found during unmarshaling") ErrIntOverflowMcp = fmt.Errorf("proto: integer overflow") ) - -func init() { proto.RegisterFile("mcp/v1alpha1/mcp.proto", fileDescriptorMcp) } - -var fileDescriptorMcp = []byte{ - // 774 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x56, 0xcd, 0x6e, 0xeb, 0x44, - 0x14, 0xbe, 0xe3, 0x34, 0x97, 0xe4, 0xa4, 0x54, 0xe9, 0x50, 0x51, 0xc7, 0xf7, 0xde, 0x10, 0x22, - 0x8a, 0x22, 0x55, 0x38, 0x6d, 0x10, 0x12, 0xb0, 0x40, 0xb4, 0xd0, 0x45, 0x91, 0x5a, 0x24, 0x47, - 0x74, 0xc1, 0xc6, 0x72, 0xed, 0xa9, 0x3b, 0x8a, 0x33, 0x63, 0x66, 0x26, 0x91, 0xb2, 0x60, 0xc3, - 0x0e, 0xf1, 0x0c, 0xec, 0x51, 0x79, 0x01, 0x1e, 0xa1, 0x4b, 0x16, 0xac, 0x11, 0xca, 0x92, 0xa7, - 0x40, 0xfe, 0xab, 0x1d, 0xea, 0x26, 0x0d, 0x14, 0x89, 0x8d, 0x35, 0x73, 0xce, 0x99, 0xef, 0xfc, - 0x7c, 0xdf, 0x8c, 0x0c, 0x6f, 0x8e, 0xdd, 0xb0, 0x3f, 0x3d, 0x74, 0x82, 0xf0, 0xda, 0x39, 0xec, - 0x8f, 0xdd, 0xd0, 0x0c, 0x05, 0x57, 0x1c, 0x63, 0x2a, 0x15, 0xe5, 0x66, 0x64, 0xc8, 0xbc, 0xc6, - 0xae, 0xcf, 0xb9, 0x1f, 0x90, 0xbe, 0x08, 0xdd, 0xbe, 0x54, 0x8e, 0x9a, 0xc8, 0x24, 0xd8, 0xd8, - 0xf1, 0xb9, 0xcf, 0xe3, 0x65, 0x3f, 0x5a, 0xa5, 0xd6, 0x17, 0x0b, 0xd0, 0x82, 0x48, 0x3e, 0x11, - 0x2e, 0x49, 0x9c, 0xdd, 0x9f, 0x11, 0xd4, 0x86, 0x94, 0x8d, 0xce, 0xb9, 0x47, 0xf0, 0x16, 0x68, - 0xd4, 0xd3, 0x51, 0x07, 0xf5, 0xea, 0x96, 0x46, 0x3d, 0xfc, 0x25, 0x34, 0x1c, 0xc6, 0xb8, 0x72, - 0x14, 0xe5, 0x4c, 0xea, 0x5a, 0xa7, 0xd2, 0x6b, 0x0c, 0xde, 0x33, 0xef, 0x97, 0x64, 0x66, 0x10, - 0xe6, 0x51, 0x1e, 0x7f, 0xc2, 0x94, 0x98, 0x59, 0x45, 0x04, 0xe3, 0x13, 0x68, 0xfe, 0x3d, 0x00, - 0x37, 0xa1, 0x32, 0x22, 0xb3, 0x34, 0x6b, 0xb4, 0xc4, 0x3b, 0x50, 0x9d, 0x3a, 0xc1, 0x84, 0xe8, - 0x5a, 0x6c, 0x4b, 0x36, 0x1f, 0x6b, 0x1f, 0xa2, 0xee, 0x9f, 0x08, 0xb6, 0xcf, 0x88, 0xbc, 0xfe, - 0x8c, 0xb3, 0x2b, 0xea, 0x5b, 0xe4, 0x9b, 0x09, 0x91, 0x0a, 0xbf, 0x0d, 0x9b, 0x53, 0x22, 0x24, - 0xe5, 0xcc, 0xa6, 0xec, 0x8a, 0xa7, 0x50, 0x8d, 0xd4, 0x76, 0xca, 0xae, 0x38, 0xfe, 0x08, 0xea, - 0x92, 0xb2, 0x91, 0xcd, 0xb8, 0x97, 0xc0, 0x36, 0x06, 0x2f, 0x97, 0xf5, 0x61, 0xd5, 0x64, 0x36, - 0x94, 0x16, 0xd4, 0xd4, 0x2c, 0x24, 0xf6, 0x44, 0x04, 0x7a, 0x25, 0x46, 0x7e, 0x2d, 0xda, 0x7f, - 0x25, 0x02, 0xbc, 0x07, 0x5b, 0x82, 0xc8, 0x90, 0x33, 0x49, 0x6c, 0xc6, 0x99, 0x4b, 0xf4, 0x8d, - 0x38, 0xe0, 0xf5, 0xcc, 0x7a, 0x1e, 0x19, 0xf1, 0x07, 0xb0, 0x49, 0x84, 0xe0, 0xc2, 0xf6, 0x88, - 0x72, 0x68, 0xa0, 0x57, 0xe3, 0xfc, 0xd8, 0x4c, 0x68, 0x34, 0x45, 0xe8, 0x9a, 0xc3, 0x98, 0x46, - 0xab, 0x11, 0xc7, 0x7d, 0x1e, 0x87, 0x75, 0x6f, 0x10, 0xe0, 0x62, 0xb3, 0x09, 0xe4, 0x63, 0xba, - 0xfd, 0x14, 0xea, 0x19, 0xcd, 0x19, 0x6b, 0xa5, 0xdd, 0x5a, 0x69, 0xd0, 0xf1, 0xc6, 0xed, 0xef, - 0x6f, 0x3d, 0xb3, 0xf2, 0x43, 0xcb, 0x9a, 0xde, 0x81, 0x6a, 0xb1, 0xd7, 0x64, 0xd3, 0xbd, 0xa9, - 0xc0, 0xcb, 0x53, 0xe6, 0x0a, 0x32, 0x26, 0x4c, 0x39, 0xc1, 0x7d, 0x92, 0x16, 0x18, 0x40, 0xff, - 0x98, 0x01, 0x6d, 0xb1, 0x98, 0xef, 0x11, 0xb4, 0x28, 0xa3, 0x8a, 0x3a, 0x81, 0x9d, 0x55, 0x6f, - 0xa7, 0xa3, 0x90, 0x7a, 0x25, 0x6e, 0xfd, 0xac, 0x2c, 0xcd, 0xb2, 0x5a, 0xcd, 0xd3, 0x04, 0x31, - 0x1b, 0xcf, 0x45, 0x8a, 0x97, 0x08, 0x7a, 0x97, 0x96, 0x7b, 0xff, 0x5b, 0x35, 0x18, 0x5f, 0x44, - 0xf3, 0x7d, 0xb8, 0xac, 0xb5, 0xae, 0xd1, 0x6f, 0x08, 0x5e, 0x3d, 0x30, 0x80, 0x54, 0x64, 0x26, - 0xbc, 0x21, 0x67, 0x52, 0x91, 0xb1, 0x5d, 0xa2, 0xb5, 0xed, 0xc4, 0x75, 0xf1, 0xa4, 0x8a, 0xdb, - 0x87, 0x6d, 0x41, 0xc6, 0x7c, 0x4a, 0x3c, 0x3b, 0x47, 0x8a, 0x08, 0xac, 0x5b, 0xcd, 0xd4, 0x61, - 0xdd, 0x05, 0x97, 0x6b, 0xf0, 0x97, 0x0a, 0x34, 0x53, 0x0a, 0xf3, 0xd0, 0x7f, 0xa1, 0xbb, 0x36, - 0x80, 0xcb, 0x83, 0x80, 0xb8, 0xd1, 0x6b, 0x95, 0x4e, 0xb1, 0x60, 0xc1, 0xdf, 0xae, 0xd6, 0xde, - 0x51, 0xf9, 0x10, 0x16, 0x6b, 0xfc, 0x3f, 0xea, 0x0d, 0x77, 0xa0, 0x41, 0x73, 0x89, 0xe8, 0xcf, - 0x3b, 0xa8, 0x57, 0xb3, 0x8a, 0xa6, 0x27, 0x55, 0xe4, 0x77, 0x1a, 0xd4, 0x73, 0xce, 0xd6, 0x55, - 0xdf, 0x2a, 0xa2, 0x16, 0xd4, 0x59, 0x79, 0x32, 0x75, 0x6e, 0xac, 0x52, 0x67, 0xb5, 0xa0, 0xce, - 0xd5, 0x03, 0x1d, 0xfc, 0xa8, 0xc1, 0x8b, 0x23, 0xdf, 0x17, 0xc4, 0x77, 0x14, 0xf1, 0xf2, 0x5b, - 0x39, 0x24, 0x62, 0x4a, 0x5d, 0x82, 0x43, 0x68, 0x0d, 0x95, 0x20, 0xce, 0x38, 0x0f, 0xca, 0x93, - 0xee, 0x95, 0x35, 0x74, 0xef, 0x69, 0x33, 0xde, 0x5d, 0x15, 0x96, 0x48, 0xa7, 0xfb, 0xac, 0x87, - 0x0e, 0x10, 0xfe, 0x01, 0x41, 0xbb, 0xf0, 0x50, 0x94, 0xe5, 0x3d, 0x58, 0xf7, 0x75, 0x35, 0x0e, - 0xd7, 0x38, 0x51, 0xac, 0x66, 0x30, 0x85, 0xad, 0x2c, 0xef, 0x30, 0xfe, 0x62, 0x0f, 0x76, 0x4f, - 0xa4, 0x72, 0x2e, 0x03, 0x2a, 0xaf, 0xef, 0x5c, 0xf1, 0x88, 0xf0, 0x3b, 0x8f, 0xb9, 0x79, 0xc6, - 0xab, 0x65, 0x32, 0x90, 0x69, 0x5e, 0x05, 0x9b, 0x77, 0xe0, 0x94, 0x8d, 0x96, 0x65, 0x5d, 0x8e, - 0x67, 0x3c, 0xaa, 0xa8, 0x24, 0xeb, 0xf1, 0xfe, 0x4f, 0xf3, 0x36, 0xba, 0x9d, 0xb7, 0xd1, 0xaf, - 0xf3, 0x36, 0xfa, 0x63, 0xde, 0x46, 0x5f, 0xb7, 0x92, 0xc3, 0x94, 0xf7, 0x9d, 0x90, 0xf6, 0x8b, - 0x7f, 0x75, 0x97, 0xcf, 0xe3, 0xbf, 0xb9, 0xf7, 0xff, 0x0a, 0x00, 0x00, 0xff, 0xff, 0x4e, 0x31, - 0xdd, 0xdb, 0x47, 0x0a, 0x00, 0x00, -} diff --git a/mcp/v1alpha1/metadata.pb.go b/mcp/v1alpha1/metadata.pb.go index bdd4632a26e..91534a30e7b 100644 --- a/mcp/v1alpha1/metadata.pb.go +++ b/mcp/v1alpha1/metadata.pb.go @@ -3,20 +3,27 @@ package v1alpha1 -import proto "github.com/gogo/protobuf/proto" -import fmt "fmt" -import math "math" -import _ "github.com/gogo/protobuf/gogoproto" -import google_protobuf2 "github.com/gogo/protobuf/types" -import _ "github.com/gogo/protobuf/types" - -import io "io" +import ( + bytes "bytes" + fmt "fmt" + _ "github.com/gogo/protobuf/gogoproto" + proto "github.com/gogo/protobuf/proto" + types "github.com/gogo/protobuf/types" + io "io" + math "math" +) // Reference imports to suppress errors if they are not otherwise used. var _ = proto.Marshal var _ = fmt.Errorf var _ = math.Inf +// This is a compile-time assertion to ensure that this generated file +// is compatible with the proto package it is being compiled against. +// A compilation error at this line likely means your copy of the +// proto package needs to be updated. +const _ = proto.GoGoProtoPackageIsVersion2 // please upgrade the proto package + // Metadata information that all resources within the Mesh Configuration Protocol must have. type Metadata struct { // Fully qualified name of the resource. Unique in context of a collection. @@ -53,22 +60,53 @@ type Metadata struct { // "/" Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"` // The creation timestamp of the resource. - CreateTime *google_protobuf2.Timestamp `protobuf:"bytes,2,opt,name=create_time,json=createTime" json:"create_time,omitempty"` + CreateTime *types.Timestamp `protobuf:"bytes,2,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"` // Resource version. This is used to determine when resources change across // resource updates. It should be treated as opaque by consumers/sinks. Version string `protobuf:"bytes,3,opt,name=version,proto3" json:"version,omitempty"` // Map of string keys and values that can be used to organize and categorize // resources within a collection. - Labels map[string]string `protobuf:"bytes,4,rep,name=labels" json:"labels,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` + Labels map[string]string `protobuf:"bytes,4,rep,name=labels,proto3" json:"labels,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` // Map of string keys and values that can be used by source and sink to communicate // arbitrary metadata about this resource. - Annotations map[string]string `protobuf:"bytes,5,rep,name=annotations" json:"annotations,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` + Annotations map[string]string `protobuf:"bytes,5,rep,name=annotations,proto3" json:"annotations,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` +} + +func (m *Metadata) Reset() { *m = Metadata{} } +func (m *Metadata) String() string { return proto.CompactTextString(m) } +func (*Metadata) ProtoMessage() {} +func (*Metadata) Descriptor() ([]byte, []int) { + return fileDescriptor_12ba26a99e116dc7, []int{0} +} +func (m *Metadata) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *Metadata) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_Metadata.Marshal(b, m, deterministic) + } else { + b = b[:cap(b)] + n, err := m.MarshalTo(b) + if err != nil { + return nil, err + } + return b[:n], nil + } +} +func (m *Metadata) XXX_Merge(src proto.Message) { + xxx_messageInfo_Metadata.Merge(m, src) +} +func (m *Metadata) XXX_Size() int { + return m.Size() +} +func (m *Metadata) XXX_DiscardUnknown() { + xxx_messageInfo_Metadata.DiscardUnknown(m) } -func (m *Metadata) Reset() { *m = Metadata{} } -func (m *Metadata) String() string { return proto.CompactTextString(m) } -func (*Metadata) ProtoMessage() {} -func (*Metadata) Descriptor() ([]byte, []int) { return fileDescriptorMetadata, []int{0} } +var xxx_messageInfo_Metadata proto.InternalMessageInfo func (m *Metadata) GetName() string { if m != nil { @@ -77,7 +115,7 @@ func (m *Metadata) GetName() string { return "" } -func (m *Metadata) GetCreateTime() *google_protobuf2.Timestamp { +func (m *Metadata) GetCreateTime() *types.Timestamp { if m != nil { return m.CreateTime } @@ -107,7 +145,37 @@ func (m *Metadata) GetAnnotations() map[string]string { func init() { proto.RegisterType((*Metadata)(nil), "istio.mcp.v1alpha1.Metadata") + proto.RegisterMapType((map[string]string)(nil), "istio.mcp.v1alpha1.Metadata.AnnotationsEntry") + proto.RegisterMapType((map[string]string)(nil), "istio.mcp.v1alpha1.Metadata.LabelsEntry") +} + +func init() { proto.RegisterFile("mcp/v1alpha1/metadata.proto", fileDescriptor_12ba26a99e116dc7) } + +var fileDescriptor_12ba26a99e116dc7 = []byte{ + // 335 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x92, 0xcf, 0x4a, 0xf3, 0x40, + 0x10, 0xc0, 0xd9, 0xa6, 0xed, 0xf7, 0x75, 0x73, 0x29, 0x4b, 0x0f, 0x31, 0x4a, 0x2c, 0x9e, 0x02, + 0xe2, 0x2e, 0xad, 0x17, 0xff, 0x80, 0xa8, 0xe0, 0x4d, 0x11, 0x82, 0x27, 0x2f, 0x32, 0x8d, 0x6b, + 0x5c, 0x4c, 0xb2, 0x21, 0xbb, 0x2d, 0xf4, 0xec, 0xcb, 0xf8, 0x28, 0x1e, 0x7d, 0x04, 0xc9, 0x93, + 0x48, 0x76, 0x13, 0x0c, 0x15, 0x04, 0x6f, 0x33, 0x99, 0xdf, 0xfc, 0x26, 0x33, 0x2c, 0xde, 0xce, + 0xe2, 0x82, 0xad, 0x66, 0x90, 0x16, 0xcf, 0x30, 0x63, 0x19, 0xd7, 0xf0, 0x08, 0x1a, 0x68, 0x51, + 0x4a, 0x2d, 0x09, 0x11, 0x4a, 0x0b, 0x49, 0xb3, 0xb8, 0xa0, 0x2d, 0xe2, 0x4f, 0x12, 0x99, 0x48, + 0x53, 0x66, 0x75, 0x64, 0x49, 0x7f, 0x37, 0x91, 0x32, 0x49, 0x39, 0x33, 0xd9, 0x62, 0xf9, 0xc4, + 0xb4, 0xc8, 0xb8, 0xd2, 0x90, 0x15, 0x0d, 0xb0, 0xb3, 0x09, 0x28, 0x5d, 0x2e, 0x63, 0x6d, 0xab, + 0x7b, 0xaf, 0x0e, 0xfe, 0x7f, 0xd3, 0xcc, 0x26, 0x04, 0xf7, 0x73, 0xc8, 0xb8, 0x87, 0xa6, 0x28, + 0x1c, 0x45, 0x26, 0x26, 0xa7, 0xd8, 0x8d, 0x4b, 0x0e, 0x9a, 0x3f, 0xd4, 0x62, 0xaf, 0x37, 0x45, + 0xa1, 0x3b, 0xf7, 0xa9, 0x95, 0xd2, 0x56, 0x4a, 0xef, 0xda, 0xa9, 0x11, 0xb6, 0x78, 0xfd, 0x81, + 0x78, 0xf8, 0xdf, 0x8a, 0x97, 0x4a, 0xc8, 0xdc, 0x73, 0x8c, 0xb3, 0x4d, 0xc9, 0x39, 0x1e, 0xa6, + 0xb0, 0xe0, 0xa9, 0xf2, 0xfa, 0x53, 0x27, 0x74, 0xe7, 0x21, 0xfd, 0xb9, 0x31, 0x6d, 0x7f, 0x8c, + 0x5e, 0x1b, 0xf4, 0x2a, 0xd7, 0xe5, 0x3a, 0x6a, 0xfa, 0xc8, 0x2d, 0x76, 0x21, 0xcf, 0xa5, 0x06, + 0x2d, 0x64, 0xae, 0xbc, 0x81, 0xd1, 0x1c, 0xfc, 0xaa, 0xb9, 0xf8, 0xe6, 0xad, 0xab, 0x6b, 0xf0, + 0x8f, 0xb1, 0xdb, 0x99, 0x43, 0xc6, 0xd8, 0x79, 0xe1, 0xeb, 0xe6, 0x16, 0x75, 0x48, 0x26, 0x78, + 0xb0, 0x82, 0x74, 0x69, 0x8f, 0x30, 0x8a, 0x6c, 0x72, 0xd2, 0x3b, 0x42, 0xfe, 0x19, 0x1e, 0x6f, + 0xba, 0xff, 0xd2, 0x7f, 0xb9, 0xff, 0x56, 0x05, 0xe8, 0xbd, 0x0a, 0xd0, 0x47, 0x15, 0xa0, 0xcf, + 0x2a, 0x40, 0xf7, 0x5b, 0x76, 0x0f, 0x21, 0x19, 0x14, 0x82, 0x75, 0x9f, 0xca, 0x62, 0x68, 0x8e, + 0x7e, 0xf8, 0x15, 0x00, 0x00, 0xff, 0xff, 0xdf, 0x5a, 0x3a, 0xeb, 0x41, 0x02, 0x00, 0x00, } + func (this *Metadata) Equal(that interface{}) bool { if that == nil { return this == nil @@ -152,6 +220,9 @@ func (this *Metadata) Equal(that interface{}) bool { return false } } + if !bytes.Equal(this.XXX_unrecognized, that1.XXX_unrecognized) { + return false + } return true } func (m *Metadata) Marshal() (dAtA []byte, err error) { @@ -225,6 +296,9 @@ func (m *Metadata) MarshalTo(dAtA []byte) (int, error) { i += copy(dAtA[i:], v) } } + if m.XXX_unrecognized != nil { + i += copy(dAtA[i:], m.XXX_unrecognized) + } return i, nil } @@ -238,6 +312,9 @@ func encodeVarintMetadata(dAtA []byte, offset int, v uint64) int { return offset + 1 } func (m *Metadata) Size() (n int) { + if m == nil { + return 0 + } var l int _ = l l = len(m.Name) @@ -268,6 +345,9 @@ func (m *Metadata) Size() (n int) { n += mapEntrySize + 1 + sovMetadata(uint64(mapEntrySize)) } } + if m.XXX_unrecognized != nil { + n += len(m.XXX_unrecognized) + } return n } @@ -299,7 +379,7 @@ func (m *Metadata) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - wire |= (uint64(b) & 0x7F) << shift + wire |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -327,7 +407,7 @@ func (m *Metadata) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLen |= (uint64(b) & 0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -337,6 +417,9 @@ func (m *Metadata) Unmarshal(dAtA []byte) error { return ErrInvalidLengthMetadata } postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthMetadata + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -356,7 +439,7 @@ func (m *Metadata) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - msglen |= (int(b) & 0x7F) << shift + msglen |= int(b&0x7F) << shift if b < 0x80 { break } @@ -365,11 +448,14 @@ func (m *Metadata) Unmarshal(dAtA []byte) error { return ErrInvalidLengthMetadata } postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthMetadata + } if postIndex > l { return io.ErrUnexpectedEOF } if m.CreateTime == nil { - m.CreateTime = &google_protobuf2.Timestamp{} + m.CreateTime = &types.Timestamp{} } if err := m.CreateTime.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err @@ -389,7 +475,7 @@ func (m *Metadata) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLen |= (uint64(b) & 0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -399,6 +485,9 @@ func (m *Metadata) Unmarshal(dAtA []byte) error { return ErrInvalidLengthMetadata } postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthMetadata + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -418,7 +507,7 @@ func (m *Metadata) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - msglen |= (int(b) & 0x7F) << shift + msglen |= int(b&0x7F) << shift if b < 0x80 { break } @@ -427,6 +516,9 @@ func (m *Metadata) Unmarshal(dAtA []byte) error { return ErrInvalidLengthMetadata } postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthMetadata + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -447,7 +539,7 @@ func (m *Metadata) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - wire |= (uint64(b) & 0x7F) << shift + wire |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -464,7 +556,7 @@ func (m *Metadata) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLenmapkey |= (uint64(b) & 0x7F) << shift + stringLenmapkey |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -474,6 +566,9 @@ func (m *Metadata) Unmarshal(dAtA []byte) error { return ErrInvalidLengthMetadata } postStringIndexmapkey := iNdEx + intStringLenmapkey + if postStringIndexmapkey < 0 { + return ErrInvalidLengthMetadata + } if postStringIndexmapkey > l { return io.ErrUnexpectedEOF } @@ -490,7 +585,7 @@ func (m *Metadata) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLenmapvalue |= (uint64(b) & 0x7F) << shift + stringLenmapvalue |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -500,6 +595,9 @@ func (m *Metadata) Unmarshal(dAtA []byte) error { return ErrInvalidLengthMetadata } postStringIndexmapvalue := iNdEx + intStringLenmapvalue + if postStringIndexmapvalue < 0 { + return ErrInvalidLengthMetadata + } if postStringIndexmapvalue > l { return io.ErrUnexpectedEOF } @@ -536,7 +634,7 @@ func (m *Metadata) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - msglen |= (int(b) & 0x7F) << shift + msglen |= int(b&0x7F) << shift if b < 0x80 { break } @@ -545,6 +643,9 @@ func (m *Metadata) Unmarshal(dAtA []byte) error { return ErrInvalidLengthMetadata } postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthMetadata + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -565,7 +666,7 @@ func (m *Metadata) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - wire |= (uint64(b) & 0x7F) << shift + wire |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -582,7 +683,7 @@ func (m *Metadata) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLenmapkey |= (uint64(b) & 0x7F) << shift + stringLenmapkey |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -592,6 +693,9 @@ func (m *Metadata) Unmarshal(dAtA []byte) error { return ErrInvalidLengthMetadata } postStringIndexmapkey := iNdEx + intStringLenmapkey + if postStringIndexmapkey < 0 { + return ErrInvalidLengthMetadata + } if postStringIndexmapkey > l { return io.ErrUnexpectedEOF } @@ -608,7 +712,7 @@ func (m *Metadata) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLenmapvalue |= (uint64(b) & 0x7F) << shift + stringLenmapvalue |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -618,6 +722,9 @@ func (m *Metadata) Unmarshal(dAtA []byte) error { return ErrInvalidLengthMetadata } postStringIndexmapvalue := iNdEx + intStringLenmapvalue + if postStringIndexmapvalue < 0 { + return ErrInvalidLengthMetadata + } if postStringIndexmapvalue > l { return io.ErrUnexpectedEOF } @@ -649,9 +756,13 @@ func (m *Metadata) Unmarshal(dAtA []byte) error { if skippy < 0 { return ErrInvalidLengthMetadata } + if (iNdEx + skippy) < 0 { + return ErrInvalidLengthMetadata + } if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF } + m.XXX_unrecognized = append(m.XXX_unrecognized, dAtA[iNdEx:iNdEx+skippy]...) iNdEx += skippy } } @@ -715,10 +826,13 @@ func skipMetadata(dAtA []byte) (n int, err error) { break } } - iNdEx += length if length < 0 { return 0, ErrInvalidLengthMetadata } + iNdEx += length + if iNdEx < 0 { + return 0, ErrInvalidLengthMetadata + } return iNdEx, nil case 3: for { @@ -747,6 +861,9 @@ func skipMetadata(dAtA []byte) (n int, err error) { return 0, err } iNdEx = start + next + if iNdEx < 0 { + return 0, ErrInvalidLengthMetadata + } } return iNdEx, nil case 4: @@ -765,30 +882,3 @@ var ( ErrInvalidLengthMetadata = fmt.Errorf("proto: negative length found during unmarshaling") ErrIntOverflowMetadata = fmt.Errorf("proto: integer overflow") ) - -func init() { proto.RegisterFile("mcp/v1alpha1/metadata.proto", fileDescriptorMetadata) } - -var fileDescriptorMetadata = []byte{ - // 335 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x92, 0xcf, 0x4a, 0xf3, 0x40, - 0x10, 0xc0, 0xd9, 0xa6, 0xed, 0xf7, 0x75, 0x73, 0x29, 0x4b, 0x0f, 0x31, 0x4a, 0x2c, 0x9e, 0x02, - 0xe2, 0x2e, 0xad, 0x17, 0xff, 0x80, 0xa8, 0xe0, 0x4d, 0x11, 0x82, 0x27, 0x2f, 0x32, 0x8d, 0x6b, - 0x5c, 0x4c, 0xb2, 0x21, 0xbb, 0x2d, 0xf4, 0xec, 0xcb, 0xf8, 0x28, 0x1e, 0x7d, 0x04, 0xc9, 0x93, - 0x48, 0x76, 0x13, 0x0c, 0x15, 0x04, 0x6f, 0x33, 0x99, 0xdf, 0xfc, 0x26, 0x33, 0x2c, 0xde, 0xce, - 0xe2, 0x82, 0xad, 0x66, 0x90, 0x16, 0xcf, 0x30, 0x63, 0x19, 0xd7, 0xf0, 0x08, 0x1a, 0x68, 0x51, - 0x4a, 0x2d, 0x09, 0x11, 0x4a, 0x0b, 0x49, 0xb3, 0xb8, 0xa0, 0x2d, 0xe2, 0x4f, 0x12, 0x99, 0x48, - 0x53, 0x66, 0x75, 0x64, 0x49, 0x7f, 0x37, 0x91, 0x32, 0x49, 0x39, 0x33, 0xd9, 0x62, 0xf9, 0xc4, - 0xb4, 0xc8, 0xb8, 0xd2, 0x90, 0x15, 0x0d, 0xb0, 0xb3, 0x09, 0x28, 0x5d, 0x2e, 0x63, 0x6d, 0xab, - 0x7b, 0xaf, 0x0e, 0xfe, 0x7f, 0xd3, 0xcc, 0x26, 0x04, 0xf7, 0x73, 0xc8, 0xb8, 0x87, 0xa6, 0x28, - 0x1c, 0x45, 0x26, 0x26, 0xa7, 0xd8, 0x8d, 0x4b, 0x0e, 0x9a, 0x3f, 0xd4, 0x62, 0xaf, 0x37, 0x45, - 0xa1, 0x3b, 0xf7, 0xa9, 0x95, 0xd2, 0x56, 0x4a, 0xef, 0xda, 0xa9, 0x11, 0xb6, 0x78, 0xfd, 0x81, - 0x78, 0xf8, 0xdf, 0x8a, 0x97, 0x4a, 0xc8, 0xdc, 0x73, 0x8c, 0xb3, 0x4d, 0xc9, 0x39, 0x1e, 0xa6, - 0xb0, 0xe0, 0xa9, 0xf2, 0xfa, 0x53, 0x27, 0x74, 0xe7, 0x21, 0xfd, 0xb9, 0x31, 0x6d, 0x7f, 0x8c, - 0x5e, 0x1b, 0xf4, 0x2a, 0xd7, 0xe5, 0x3a, 0x6a, 0xfa, 0xc8, 0x2d, 0x76, 0x21, 0xcf, 0xa5, 0x06, - 0x2d, 0x64, 0xae, 0xbc, 0x81, 0xd1, 0x1c, 0xfc, 0xaa, 0xb9, 0xf8, 0xe6, 0xad, 0xab, 0x6b, 0xf0, - 0x8f, 0xb1, 0xdb, 0x99, 0x43, 0xc6, 0xd8, 0x79, 0xe1, 0xeb, 0xe6, 0x16, 0x75, 0x48, 0x26, 0x78, - 0xb0, 0x82, 0x74, 0x69, 0x8f, 0x30, 0x8a, 0x6c, 0x72, 0xd2, 0x3b, 0x42, 0xfe, 0x19, 0x1e, 0x6f, - 0xba, 0xff, 0xd2, 0x7f, 0xb9, 0xff, 0x56, 0x05, 0xe8, 0xbd, 0x0a, 0xd0, 0x47, 0x15, 0xa0, 0xcf, - 0x2a, 0x40, 0xf7, 0x5b, 0x76, 0x0f, 0x21, 0x19, 0x14, 0x82, 0x75, 0x9f, 0xca, 0x62, 0x68, 0x8e, - 0x7e, 0xf8, 0x15, 0x00, 0x00, 0xff, 0xff, 0xdf, 0x5a, 0x3a, 0xeb, 0x41, 0x02, 0x00, 0x00, -} diff --git a/mcp/v1alpha1/resource.pb.go b/mcp/v1alpha1/resource.pb.go index 9ea11cf6d3e..53c10d90d11 100644 --- a/mcp/v1alpha1/resource.pb.go +++ b/mcp/v1alpha1/resource.pb.go @@ -1,34 +1,75 @@ // Code generated by protoc-gen-gogo. DO NOT EDIT. // source: mcp/v1alpha1/resource.proto -package v1alpha1 +// This package defines the common, core types used by the Mesh Configuration Protocol. -import proto "github.com/gogo/protobuf/proto" -import fmt "fmt" -import math "math" -import google_protobuf "github.com/gogo/protobuf/types" -import _ "github.com/gogo/protobuf/gogoproto" +package v1alpha1 -import io "io" +import ( + bytes "bytes" + fmt "fmt" + _ "github.com/gogo/protobuf/gogoproto" + proto "github.com/gogo/protobuf/proto" + types "github.com/gogo/protobuf/types" + io "io" + math "math" +) // Reference imports to suppress errors if they are not otherwise used. var _ = proto.Marshal var _ = fmt.Errorf var _ = math.Inf +// This is a compile-time assertion to ensure that this generated file +// is compatible with the proto package it is being compiled against. +// A compilation error at this line likely means your copy of the +// proto package needs to be updated. +const _ = proto.GoGoProtoPackageIsVersion2 // please upgrade the proto package + // Resource as transferred via the Mesh Configuration Protocol. Each // resource is made up of common metadata, and a type-specific resource payload. type Resource struct { // Common metadata describing the resource. - Metadata *Metadata `protobuf:"bytes,1,opt,name=metadata" json:"metadata,omitempty"` + Metadata *Metadata `protobuf:"bytes,1,opt,name=metadata,proto3" json:"metadata,omitempty"` // The primary payload for the resource. - Body *google_protobuf.Any `protobuf:"bytes,2,opt,name=body" json:"body,omitempty"` + Body *types.Any `protobuf:"bytes,2,opt,name=body,proto3" json:"body,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` } -func (m *Resource) Reset() { *m = Resource{} } -func (m *Resource) String() string { return proto.CompactTextString(m) } -func (*Resource) ProtoMessage() {} -func (*Resource) Descriptor() ([]byte, []int) { return fileDescriptorResource, []int{0} } +func (m *Resource) Reset() { *m = Resource{} } +func (m *Resource) String() string { return proto.CompactTextString(m) } +func (*Resource) ProtoMessage() {} +func (*Resource) Descriptor() ([]byte, []int) { + return fileDescriptor_d75ce896e5708e1a, []int{0} +} +func (m *Resource) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *Resource) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_Resource.Marshal(b, m, deterministic) + } else { + b = b[:cap(b)] + n, err := m.MarshalTo(b) + if err != nil { + return nil, err + } + return b[:n], nil + } +} +func (m *Resource) XXX_Merge(src proto.Message) { + xxx_messageInfo_Resource.Merge(m, src) +} +func (m *Resource) XXX_Size() int { + return m.Size() +} +func (m *Resource) XXX_DiscardUnknown() { + xxx_messageInfo_Resource.DiscardUnknown(m) +} + +var xxx_messageInfo_Resource proto.InternalMessageInfo func (m *Resource) GetMetadata() *Metadata { if m != nil { @@ -37,7 +78,7 @@ func (m *Resource) GetMetadata() *Metadata { return nil } -func (m *Resource) GetBody() *google_protobuf.Any { +func (m *Resource) GetBody() *types.Any { if m != nil { return m.Body } @@ -47,6 +88,26 @@ func (m *Resource) GetBody() *google_protobuf.Any { func init() { proto.RegisterType((*Resource)(nil), "istio.mcp.v1alpha1.Resource") } + +func init() { proto.RegisterFile("mcp/v1alpha1/resource.proto", fileDescriptor_d75ce896e5708e1a) } + +var fileDescriptor_d75ce896e5708e1a = []byte{ + // 207 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x92, 0xce, 0x4d, 0x2e, 0xd0, + 0x2f, 0x33, 0x4c, 0xcc, 0x29, 0xc8, 0x48, 0x34, 0xd4, 0x2f, 0x4a, 0x2d, 0xce, 0x2f, 0x2d, 0x4a, + 0x4e, 0xd5, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x12, 0xca, 0x2c, 0x2e, 0xc9, 0xcc, 0xd7, 0xcb, + 0x4d, 0x2e, 0xd0, 0x83, 0x29, 0x91, 0x92, 0x4c, 0xcf, 0xcf, 0x4f, 0xcf, 0x49, 0xd5, 0x07, 0xab, + 0x48, 0x2a, 0x4d, 0xd3, 0x4f, 0xcc, 0xab, 0x84, 0x28, 0x97, 0x12, 0x49, 0xcf, 0x4f, 0xcf, 0x07, + 0x33, 0xf5, 0x41, 0x2c, 0xa8, 0x28, 0xaa, 0x0d, 0xb9, 0xa9, 0x25, 0x89, 0x29, 0x89, 0x25, 0x89, + 0x10, 0x49, 0xa5, 0x3c, 0x2e, 0x8e, 0x20, 0xa8, 0x9d, 0x42, 0x16, 0x5c, 0x1c, 0x30, 0x59, 0x09, + 0x46, 0x05, 0x46, 0x0d, 0x6e, 0x23, 0x19, 0x3d, 0x4c, 0x07, 0xe8, 0xf9, 0x42, 0xd5, 0x04, 0xc1, + 0x55, 0x0b, 0x69, 0x70, 0xb1, 0x24, 0xe5, 0xa7, 0x54, 0x4a, 0x30, 0x81, 0x75, 0x89, 0xe8, 0x41, + 0x9c, 0xa8, 0x07, 0x73, 0xa2, 0x9e, 0x63, 0x5e, 0x65, 0x10, 0x58, 0x85, 0x93, 0xf6, 0x8a, 0x47, + 0x72, 0x8c, 0x27, 0x1e, 0xc9, 0x31, 0x5e, 0x78, 0x24, 0xc7, 0xf8, 0xe0, 0x91, 0x1c, 0x63, 0x94, + 0x24, 0xc4, 0x8a, 0xcc, 0x7c, 0xfd, 0xc4, 0x82, 0x4c, 0x7d, 0x64, 0xb7, 0x26, 0xb1, 0x81, 0x0d, + 0x30, 0x06, 0x04, 0x00, 0x00, 0xff, 0xff, 0xd3, 0xae, 0x63, 0x31, 0x24, 0x01, 0x00, 0x00, +} + func (this *Resource) Equal(that interface{}) bool { if that == nil { return this == nil @@ -72,6 +133,9 @@ func (this *Resource) Equal(that interface{}) bool { if !this.Body.Equal(that1.Body) { return false } + if !bytes.Equal(this.XXX_unrecognized, that1.XXX_unrecognized) { + return false + } return true } func (m *Resource) Marshal() (dAtA []byte, err error) { @@ -109,6 +173,9 @@ func (m *Resource) MarshalTo(dAtA []byte) (int, error) { } i += n2 } + if m.XXX_unrecognized != nil { + i += copy(dAtA[i:], m.XXX_unrecognized) + } return i, nil } @@ -122,6 +189,9 @@ func encodeVarintResource(dAtA []byte, offset int, v uint64) int { return offset + 1 } func (m *Resource) Size() (n int) { + if m == nil { + return 0 + } var l int _ = l if m.Metadata != nil { @@ -132,6 +202,9 @@ func (m *Resource) Size() (n int) { l = m.Body.Size() n += 1 + l + sovResource(uint64(l)) } + if m.XXX_unrecognized != nil { + n += len(m.XXX_unrecognized) + } return n } @@ -163,7 +236,7 @@ func (m *Resource) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - wire |= (uint64(b) & 0x7F) << shift + wire |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -191,7 +264,7 @@ func (m *Resource) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - msglen |= (int(b) & 0x7F) << shift + msglen |= int(b&0x7F) << shift if b < 0x80 { break } @@ -200,6 +273,9 @@ func (m *Resource) Unmarshal(dAtA []byte) error { return ErrInvalidLengthResource } postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthResource + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -224,7 +300,7 @@ func (m *Resource) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - msglen |= (int(b) & 0x7F) << shift + msglen |= int(b&0x7F) << shift if b < 0x80 { break } @@ -233,11 +309,14 @@ func (m *Resource) Unmarshal(dAtA []byte) error { return ErrInvalidLengthResource } postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthResource + } if postIndex > l { return io.ErrUnexpectedEOF } if m.Body == nil { - m.Body = &google_protobuf.Any{} + m.Body = &types.Any{} } if err := m.Body.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err @@ -252,9 +331,13 @@ func (m *Resource) Unmarshal(dAtA []byte) error { if skippy < 0 { return ErrInvalidLengthResource } + if (iNdEx + skippy) < 0 { + return ErrInvalidLengthResource + } if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF } + m.XXX_unrecognized = append(m.XXX_unrecognized, dAtA[iNdEx:iNdEx+skippy]...) iNdEx += skippy } } @@ -318,10 +401,13 @@ func skipResource(dAtA []byte) (n int, err error) { break } } - iNdEx += length if length < 0 { return 0, ErrInvalidLengthResource } + iNdEx += length + if iNdEx < 0 { + return 0, ErrInvalidLengthResource + } return iNdEx, nil case 3: for { @@ -350,6 +436,9 @@ func skipResource(dAtA []byte) (n int, err error) { return 0, err } iNdEx = start + next + if iNdEx < 0 { + return 0, ErrInvalidLengthResource + } } return iNdEx, nil case 4: @@ -368,22 +457,3 @@ var ( ErrInvalidLengthResource = fmt.Errorf("proto: negative length found during unmarshaling") ErrIntOverflowResource = fmt.Errorf("proto: integer overflow") ) - -func init() { proto.RegisterFile("mcp/v1alpha1/resource.proto", fileDescriptorResource) } - -var fileDescriptorResource = []byte{ - // 207 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x92, 0xce, 0x4d, 0x2e, 0xd0, - 0x2f, 0x33, 0x4c, 0xcc, 0x29, 0xc8, 0x48, 0x34, 0xd4, 0x2f, 0x4a, 0x2d, 0xce, 0x2f, 0x2d, 0x4a, - 0x4e, 0xd5, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x12, 0xca, 0x2c, 0x2e, 0xc9, 0xcc, 0xd7, 0xcb, - 0x4d, 0x2e, 0xd0, 0x83, 0x29, 0x91, 0x92, 0x4c, 0xcf, 0xcf, 0x4f, 0xcf, 0x49, 0xd5, 0x07, 0xab, - 0x48, 0x2a, 0x4d, 0xd3, 0x4f, 0xcc, 0xab, 0x84, 0x28, 0x97, 0x12, 0x49, 0xcf, 0x4f, 0xcf, 0x07, - 0x33, 0xf5, 0x41, 0x2c, 0xa8, 0x28, 0xaa, 0x0d, 0xb9, 0xa9, 0x25, 0x89, 0x29, 0x89, 0x25, 0x89, - 0x10, 0x49, 0xa5, 0x3c, 0x2e, 0x8e, 0x20, 0xa8, 0x9d, 0x42, 0x16, 0x5c, 0x1c, 0x30, 0x59, 0x09, - 0x46, 0x05, 0x46, 0x0d, 0x6e, 0x23, 0x19, 0x3d, 0x4c, 0x07, 0xe8, 0xf9, 0x42, 0xd5, 0x04, 0xc1, - 0x55, 0x0b, 0x69, 0x70, 0xb1, 0x24, 0xe5, 0xa7, 0x54, 0x4a, 0x30, 0x81, 0x75, 0x89, 0xe8, 0x41, - 0x9c, 0xa8, 0x07, 0x73, 0xa2, 0x9e, 0x63, 0x5e, 0x65, 0x10, 0x58, 0x85, 0x93, 0xf6, 0x8a, 0x47, - 0x72, 0x8c, 0x27, 0x1e, 0xc9, 0x31, 0x5e, 0x78, 0x24, 0xc7, 0xf8, 0xe0, 0x91, 0x1c, 0x63, 0x94, - 0x24, 0xc4, 0x8a, 0xcc, 0x7c, 0xfd, 0xc4, 0x82, 0x4c, 0x7d, 0x64, 0xb7, 0x26, 0xb1, 0x81, 0x0d, - 0x30, 0x06, 0x04, 0x00, 0x00, 0xff, 0xff, 0xd3, 0xae, 0x63, 0x31, 0x24, 0x01, 0x00, 0x00, -} diff --git a/mesh/v1alpha1/config.pb.go b/mesh/v1alpha1/config.pb.go index 06a61fd9bf0..19ae37cb2c2 100644 --- a/mesh/v1alpha1/config.pb.go +++ b/mesh/v1alpha1/config.pb.go @@ -1,34 +1,18 @@ // Code generated by protoc-gen-gogo. DO NOT EDIT. // source: mesh/v1alpha1/config.proto -/* - Package v1alpha1 is a generated protocol buffer package. - - Configuration affecting the service mesh as a whole. - - It is generated from these files: - mesh/v1alpha1/config.proto - mesh/v1alpha1/network.proto - mesh/v1alpha1/proxy.proto - - It has these top-level messages: - MeshConfig - ConfigSource - LocalityLoadBalancerSetting - Network - MeshNetworks - Tracing - ProxyConfig -*/ -package v1alpha1 +// Configuration affecting the service mesh as a whole. -import proto "github.com/gogo/protobuf/proto" -import fmt "fmt" -import math "math" -import google_protobuf "github.com/gogo/protobuf/types" -import istio_networking_v1alpha31 "istio.io/api/networking/v1alpha3" +package v1alpha1 -import io "io" +import ( + fmt "fmt" + proto "github.com/gogo/protobuf/proto" + types "github.com/gogo/protobuf/types" + io "io" + v1alpha3 "istio.io/api/networking/v1alpha3" + math "math" +) // Reference imports to suppress errors if they are not otherwise used. var _ = proto.Marshal @@ -65,6 +49,7 @@ var MeshConfig_IngressControllerMode_name = map[int32]string{ 1: "DEFAULT", 2: "STRICT", } + var MeshConfig_IngressControllerMode_value = map[string]int32{ "OFF": 0, "DEFAULT": 1, @@ -74,8 +59,9 @@ var MeshConfig_IngressControllerMode_value = map[string]int32{ func (x MeshConfig_IngressControllerMode) String() string { return proto.EnumName(MeshConfig_IngressControllerMode_name, int32(x)) } + func (MeshConfig_IngressControllerMode) EnumDescriptor() ([]byte, []int) { - return fileDescriptorConfig, []int{0, 0} + return fileDescriptor_b5c7ece76d5d5022, []int{0, 0} } // $hide_from_docs @@ -90,6 +76,7 @@ var MeshConfig_AuthPolicy_name = map[int32]string{ 0: "NONE", 1: "MUTUAL_TLS", } + var MeshConfig_AuthPolicy_value = map[string]int32{ "NONE": 0, "MUTUAL_TLS": 1, @@ -98,8 +85,9 @@ var MeshConfig_AuthPolicy_value = map[string]int32{ func (x MeshConfig_AuthPolicy) String() string { return proto.EnumName(MeshConfig_AuthPolicy_name, int32(x)) } + func (MeshConfig_AuthPolicy) EnumDescriptor() ([]byte, []int) { - return fileDescriptorConfig, []int{0, 1} + return fileDescriptor_b5c7ece76d5d5022, []int{0, 1} } type MeshConfig_AccessLogEncoding int32 @@ -113,6 +101,7 @@ var MeshConfig_AccessLogEncoding_name = map[int32]string{ 0: "TEXT", 1: "JSON", } + var MeshConfig_AccessLogEncoding_value = map[string]int32{ "TEXT": 0, "JSON": 1, @@ -121,8 +110,9 @@ var MeshConfig_AccessLogEncoding_value = map[string]int32{ func (x MeshConfig_AccessLogEncoding) String() string { return proto.EnumName(MeshConfig_AccessLogEncoding_name, int32(x)) } + func (MeshConfig_AccessLogEncoding) EnumDescriptor() ([]byte, []int) { - return fileDescriptorConfig, []int{0, 2} + return fileDescriptor_b5c7ece76d5d5022, []int{0, 2} } type MeshConfig_OutboundTrafficPolicy_Mode int32 @@ -140,6 +130,7 @@ var MeshConfig_OutboundTrafficPolicy_Mode_name = map[int32]string{ 0: "REGISTRY_ONLY", 1: "ALLOW_ANY", } + var MeshConfig_OutboundTrafficPolicy_Mode_value = map[string]int32{ "REGISTRY_ONLY": 0, "ALLOW_ANY": 1, @@ -148,8 +139,9 @@ var MeshConfig_OutboundTrafficPolicy_Mode_value = map[string]int32{ func (x MeshConfig_OutboundTrafficPolicy_Mode) String() string { return proto.EnumName(MeshConfig_OutboundTrafficPolicy_Mode_name, int32(x)) } + func (MeshConfig_OutboundTrafficPolicy_Mode) EnumDescriptor() ([]byte, []int) { - return fileDescriptorConfig, []int{0, 0, 0} + return fileDescriptor_b5c7ece76d5d5022, []int{0, 0, 0} } // MeshConfig defines mesh-wide variables shared by all Envoy instances in the @@ -190,9 +182,9 @@ type MeshConfig struct { // Port on which Envoy should listen for HTTP PROXY requests if set. ProxyHttpPort int32 `protobuf:"varint,5,opt,name=proxy_http_port,json=proxyHttpPort,proto3" json:"proxy_http_port,omitempty"` // Connection timeout used by Envoy. (MUST BE >=1ms) - ConnectTimeout *google_protobuf.Duration `protobuf:"bytes,6,opt,name=connect_timeout,json=connectTimeout" json:"connect_timeout,omitempty"` + ConnectTimeout *types.Duration `protobuf:"bytes,6,opt,name=connect_timeout,json=connectTimeout,proto3" json:"connect_timeout,omitempty"` // If set then set SO_KEEPALIVE on the socket to enable TCP Keepalives. - TcpKeepalive *istio_networking_v1alpha31.ConnectionPoolSettings_TCPSettings_TcpKeepalive `protobuf:"bytes,28,opt,name=tcp_keepalive,json=tcpKeepalive" json:"tcp_keepalive,omitempty"` + TcpKeepalive *v1alpha3.ConnectionPoolSettings_TCPSettings_TcpKeepalive `protobuf:"bytes,28,opt,name=tcp_keepalive,json=tcpKeepalive,proto3" json:"tcp_keepalive,omitempty"` // Class of ingress resources to be processed by Istio ingress // controller. This corresponds to the value of // "kubernetes.io/ingress.class" annotation. @@ -202,9 +194,9 @@ type MeshConfig struct { // Defines whether to use Istio ingress controller for annotated or all ingress resources. IngressControllerMode MeshConfig_IngressControllerMode `protobuf:"varint,9,opt,name=ingress_controller_mode,json=ingressControllerMode,proto3,enum=istio.mesh.v1alpha1.MeshConfig_IngressControllerMode" json:"ingress_controller_mode,omitempty"` // $hide_from_docs - AuthPolicy MeshConfig_AuthPolicy `protobuf:"varint,10,opt,name=auth_policy,json=authPolicy,proto3,enum=istio.mesh.v1alpha1.MeshConfig_AuthPolicy" json:"auth_policy,omitempty"` + AuthPolicy MeshConfig_AuthPolicy `protobuf:"varint,10,opt,name=auth_policy,json=authPolicy,proto3,enum=istio.mesh.v1alpha1.MeshConfig_AuthPolicy" json:"auth_policy,omitempty"` // Deprecated: Do not use. // $hide_from_docs - RdsRefreshDelay *google_protobuf.Duration `protobuf:"bytes,11,opt,name=rds_refresh_delay,json=rdsRefreshDelay" json:"rds_refresh_delay,omitempty"` + RdsRefreshDelay *types.Duration `protobuf:"bytes,11,opt,name=rds_refresh_delay,json=rdsRefreshDelay,proto3" json:"rds_refresh_delay,omitempty"` // Deprecated: Do not use. // Flag to control generation of trace spans and request IDs. // Requires a trace span collector defined in the proxy configuration. EnableTracing bool `protobuf:"varint,12,opt,name=enable_tracing,json=enableTracing,proto3" json:"enable_tracing,omitempty"` @@ -222,9 +214,9 @@ type MeshConfig struct { // In case of Kubernetes, the proxy config is applied once during the injection process, // and remain constant for the duration of the pod. The rest of the mesh config can be changed // at runtime and config gets distributed dynamically. - DefaultConfig *ProxyConfig `protobuf:"bytes,14,opt,name=default_config,json=defaultConfig" json:"default_config,omitempty"` + DefaultConfig *ProxyConfig `protobuf:"bytes,14,opt,name=default_config,json=defaultConfig,proto3" json:"default_config,omitempty"` // $hide_from_docs - MixerAddress string `protobuf:"bytes,16,opt,name=mixer_address,json=mixerAddress,proto3" json:"mixer_address,omitempty"` + MixerAddress string `protobuf:"bytes,16,opt,name=mixer_address,json=mixerAddress,proto3" json:"mixer_address,omitempty"` // Deprecated: Do not use. // Set the default behavior of the sidecar for handling outbound traffic // from the application. If your application uses one or more external // services that are not known apriori, setting the policy to ALLOW_ANY @@ -233,18 +225,18 @@ type MeshConfig struct { // encouraged to use ServiceEntries to explicitly declare any external // dependencies, instead of using allow_any, so that traffic to these // services can be monitored. - OutboundTrafficPolicy *MeshConfig_OutboundTrafficPolicy `protobuf:"bytes,17,opt,name=outbound_traffic_policy,json=outboundTrafficPolicy" json:"outbound_traffic_policy,omitempty"` + OutboundTrafficPolicy *MeshConfig_OutboundTrafficPolicy `protobuf:"bytes,17,opt,name=outbound_traffic_policy,json=outboundTrafficPolicy,proto3" json:"outbound_traffic_policy,omitempty"` // Enables clide side policy checks. EnableClientSidePolicyCheck bool `protobuf:"varint,19,opt,name=enable_client_side_policy_check,json=enableClientSidePolicyCheck,proto3" json:"enable_client_side_policy_check,omitempty"` // Unix Domain Socket through which envoy communicates with NodeAgent SDS to get key/cert for mTLS. // Use secret-mount files instead of SDS if set to empty. SdsUdsPath string `protobuf:"bytes,20,opt,name=sds_uds_path,json=sdsUdsPath,proto3" json:"sds_uds_path,omitempty"` // $hide_from_docs - SdsRefreshDelay *google_protobuf.Duration `protobuf:"bytes,21,opt,name=sds_refresh_delay,json=sdsRefreshDelay" json:"sds_refresh_delay,omitempty"` + SdsRefreshDelay *types.Duration `protobuf:"bytes,21,opt,name=sds_refresh_delay,json=sdsRefreshDelay,proto3" json:"sds_refresh_delay,omitempty"` // Deprecated: Do not use. // ConfigSource describes a source of configuration data for networking // rules, and other Istio configuration artifacts. Multiple data sources // can be configured for a single control plane. - ConfigSources []*ConfigSource `protobuf:"bytes,22,rep,name=config_sources,json=configSources" json:"config_sources,omitempty"` + ConfigSources []*ConfigSource `protobuf:"bytes,22,rep,name=config_sources,json=configSources,proto3" json:"config_sources,omitempty"` // $hide_from_docs // This flag is used by secret discovery service(SDS). // If set to true(prerequisite: https://kubernetes.io/docs/concepts/storage/volumes/#projected), Istio will inject volumes mount @@ -289,21 +281,21 @@ type MeshConfig struct { // // For further discussion see the reference documentation for ServiceEntry, // Sidecar, and Gateway. - DefaultServiceExportTo []string `protobuf:"bytes,31,rep,name=default_service_export_to,json=defaultServiceExportTo" json:"default_service_export_to,omitempty"` + DefaultServiceExportTo []string `protobuf:"bytes,31,rep,name=default_service_export_to,json=defaultServiceExportTo,proto3" json:"default_service_export_to,omitempty"` // $hide_from_docs // The default value for the VirtualService.export_to field. Has the same // syntax as 'default_service_export_to'. // // If not set the system will use "*" as the default value which implies that // virtual services are exported to all namespaces - DefaultVirtualServiceExportTo []string `protobuf:"bytes,32,rep,name=default_virtual_service_export_to,json=defaultVirtualServiceExportTo" json:"default_virtual_service_export_to,omitempty"` + DefaultVirtualServiceExportTo []string `protobuf:"bytes,32,rep,name=default_virtual_service_export_to,json=defaultVirtualServiceExportTo,proto3" json:"default_virtual_service_export_to,omitempty"` // $hide_from_docs // The default value for the DestinationRule.export_to field. Has the same // syntax as 'default_service_export_to'. // // If not set the system will use "*" as the default value which implies that // destination rules are exported to all namespaces - DefaultDestinationRuleExportTo []string `protobuf:"bytes,33,rep,name=default_destination_rule_export_to,json=defaultDestinationRuleExportTo" json:"default_destination_rule_export_to,omitempty"` + DefaultDestinationRuleExportTo []string `protobuf:"bytes,33,rep,name=default_destination_rule_export_to,json=defaultDestinationRuleExportTo,proto3" json:"default_destination_rule_export_to,omitempty"` // $hide_from_docs // The namespace to treat as the administrative root namespace for // istio configuration. When processing a leaf namespace Istio will search for @@ -321,13 +313,44 @@ type MeshConfig struct { // configuring the control-plane runtime from configuration of the mesh. RootNamespace string `protobuf:"bytes,34,opt,name=root_namespace,json=rootNamespace,proto3" json:"root_namespace,omitempty"` // Locality based load balancing distribution or failover settings. - LocalityLbSetting *LocalityLoadBalancerSetting `protobuf:"bytes,35,opt,name=locality_lb_setting,json=localityLbSetting" json:"locality_lb_setting,omitempty"` + LocalityLbSetting *LocalityLoadBalancerSetting `protobuf:"bytes,35,opt,name=locality_lb_setting,json=localityLbSetting,proto3" json:"locality_lb_setting,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` +} + +func (m *MeshConfig) Reset() { *m = MeshConfig{} } +func (m *MeshConfig) String() string { return proto.CompactTextString(m) } +func (*MeshConfig) ProtoMessage() {} +func (*MeshConfig) Descriptor() ([]byte, []int) { + return fileDescriptor_b5c7ece76d5d5022, []int{0} +} +func (m *MeshConfig) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *MeshConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_MeshConfig.Marshal(b, m, deterministic) + } else { + b = b[:cap(b)] + n, err := m.MarshalTo(b) + if err != nil { + return nil, err + } + return b[:n], nil + } +} +func (m *MeshConfig) XXX_Merge(src proto.Message) { + xxx_messageInfo_MeshConfig.Merge(m, src) +} +func (m *MeshConfig) XXX_Size() int { + return m.Size() +} +func (m *MeshConfig) XXX_DiscardUnknown() { + xxx_messageInfo_MeshConfig.DiscardUnknown(m) } -func (m *MeshConfig) Reset() { *m = MeshConfig{} } -func (m *MeshConfig) String() string { return proto.CompactTextString(m) } -func (*MeshConfig) ProtoMessage() {} -func (*MeshConfig) Descriptor() ([]byte, []int) { return fileDescriptorConfig, []int{0} } +var xxx_messageInfo_MeshConfig proto.InternalMessageInfo func (m *MeshConfig) GetMixerCheckServer() string { if m != nil { @@ -378,14 +401,14 @@ func (m *MeshConfig) GetProxyHttpPort() int32 { return 0 } -func (m *MeshConfig) GetConnectTimeout() *google_protobuf.Duration { +func (m *MeshConfig) GetConnectTimeout() *types.Duration { if m != nil { return m.ConnectTimeout } return nil } -func (m *MeshConfig) GetTcpKeepalive() *istio_networking_v1alpha31.ConnectionPoolSettings_TCPSettings_TcpKeepalive { +func (m *MeshConfig) GetTcpKeepalive() *v1alpha3.ConnectionPoolSettings_TCPSettings_TcpKeepalive { if m != nil { return m.TcpKeepalive } @@ -413,6 +436,7 @@ func (m *MeshConfig) GetIngressControllerMode() MeshConfig_IngressControllerMode return MeshConfig_OFF } +// Deprecated: Do not use. func (m *MeshConfig) GetAuthPolicy() MeshConfig_AuthPolicy { if m != nil { return m.AuthPolicy @@ -420,7 +444,8 @@ func (m *MeshConfig) GetAuthPolicy() MeshConfig_AuthPolicy { return MeshConfig_NONE } -func (m *MeshConfig) GetRdsRefreshDelay() *google_protobuf.Duration { +// Deprecated: Do not use. +func (m *MeshConfig) GetRdsRefreshDelay() *types.Duration { if m != nil { return m.RdsRefreshDelay } @@ -462,6 +487,7 @@ func (m *MeshConfig) GetDefaultConfig() *ProxyConfig { return nil } +// Deprecated: Do not use. func (m *MeshConfig) GetMixerAddress() string { if m != nil { return m.MixerAddress @@ -490,7 +516,8 @@ func (m *MeshConfig) GetSdsUdsPath() string { return "" } -func (m *MeshConfig) GetSdsRefreshDelay() *google_protobuf.Duration { +// Deprecated: Do not use. +func (m *MeshConfig) GetSdsRefreshDelay() *types.Duration { if m != nil { return m.SdsRefreshDelay } @@ -561,15 +588,44 @@ func (m *MeshConfig) GetLocalityLbSetting() *LocalityLoadBalancerSetting { } type MeshConfig_OutboundTrafficPolicy struct { - Mode MeshConfig_OutboundTrafficPolicy_Mode `protobuf:"varint,1,opt,name=mode,proto3,enum=istio.mesh.v1alpha1.MeshConfig_OutboundTrafficPolicy_Mode" json:"mode,omitempty"` + Mode MeshConfig_OutboundTrafficPolicy_Mode `protobuf:"varint,1,opt,name=mode,proto3,enum=istio.mesh.v1alpha1.MeshConfig_OutboundTrafficPolicy_Mode" json:"mode,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` } func (m *MeshConfig_OutboundTrafficPolicy) Reset() { *m = MeshConfig_OutboundTrafficPolicy{} } func (m *MeshConfig_OutboundTrafficPolicy) String() string { return proto.CompactTextString(m) } func (*MeshConfig_OutboundTrafficPolicy) ProtoMessage() {} func (*MeshConfig_OutboundTrafficPolicy) Descriptor() ([]byte, []int) { - return fileDescriptorConfig, []int{0, 0} + return fileDescriptor_b5c7ece76d5d5022, []int{0, 0} +} +func (m *MeshConfig_OutboundTrafficPolicy) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *MeshConfig_OutboundTrafficPolicy) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_MeshConfig_OutboundTrafficPolicy.Marshal(b, m, deterministic) + } else { + b = b[:cap(b)] + n, err := m.MarshalTo(b) + if err != nil { + return nil, err + } + return b[:n], nil + } +} +func (m *MeshConfig_OutboundTrafficPolicy) XXX_Merge(src proto.Message) { + xxx_messageInfo_MeshConfig_OutboundTrafficPolicy.Merge(m, src) } +func (m *MeshConfig_OutboundTrafficPolicy) XXX_Size() int { + return m.Size() +} +func (m *MeshConfig_OutboundTrafficPolicy) XXX_DiscardUnknown() { + xxx_messageInfo_MeshConfig_OutboundTrafficPolicy.DiscardUnknown(m) +} + +var xxx_messageInfo_MeshConfig_OutboundTrafficPolicy proto.InternalMessageInfo func (m *MeshConfig_OutboundTrafficPolicy) GetMode() MeshConfig_OutboundTrafficPolicy_Mode { if m != nil { @@ -589,13 +645,44 @@ type ConfigSource struct { // Use the tls_settings to specify the tls mode to use. If the MCP server // uses Istio MTLS and shares the root CA with Pilot, specify the TLS // mode as ISTIO_MUTUAL. - TlsSettings *istio_networking_v1alpha31.TLSSettings `protobuf:"bytes,2,opt,name=tls_settings,json=tlsSettings" json:"tls_settings,omitempty"` + TlsSettings *v1alpha3.TLSSettings `protobuf:"bytes,2,opt,name=tls_settings,json=tlsSettings,proto3" json:"tls_settings,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` +} + +func (m *ConfigSource) Reset() { *m = ConfigSource{} } +func (m *ConfigSource) String() string { return proto.CompactTextString(m) } +func (*ConfigSource) ProtoMessage() {} +func (*ConfigSource) Descriptor() ([]byte, []int) { + return fileDescriptor_b5c7ece76d5d5022, []int{1} +} +func (m *ConfigSource) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *ConfigSource) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_ConfigSource.Marshal(b, m, deterministic) + } else { + b = b[:cap(b)] + n, err := m.MarshalTo(b) + if err != nil { + return nil, err + } + return b[:n], nil + } +} +func (m *ConfigSource) XXX_Merge(src proto.Message) { + xxx_messageInfo_ConfigSource.Merge(m, src) +} +func (m *ConfigSource) XXX_Size() int { + return m.Size() +} +func (m *ConfigSource) XXX_DiscardUnknown() { + xxx_messageInfo_ConfigSource.DiscardUnknown(m) } -func (m *ConfigSource) Reset() { *m = ConfigSource{} } -func (m *ConfigSource) String() string { return proto.CompactTextString(m) } -func (*ConfigSource) ProtoMessage() {} -func (*ConfigSource) Descriptor() ([]byte, []int) { return fileDescriptorConfig, []int{1} } +var xxx_messageInfo_ConfigSource proto.InternalMessageInfo func (m *ConfigSource) GetAddress() string { if m != nil { @@ -604,7 +691,7 @@ func (m *ConfigSource) GetAddress() string { return "" } -func (m *ConfigSource) GetTlsSettings() *istio_networking_v1alpha31.TLSSettings { +func (m *ConfigSource) GetTlsSettings() *v1alpha3.TLSSettings { if m != nil { return m.TlsSettings } @@ -663,21 +750,50 @@ type LocalityLoadBalancerSetting struct { // Explicitly specify loadbalancing weight across different zones and geographical locations. // Refer to [Locality weighted load balancing](https://www.envoyproxy.io/docs/envoy/latest/intro/arch_overview/load_balancing.html?highlight=load_balancing_weight#locality-weighted-load-balancing) // If empty, the locality weight is set according to the endpoints number within it. - Distribute []*LocalityLoadBalancerSetting_Distribute `protobuf:"bytes,1,rep,name=distribute" json:"distribute,omitempty"` + Distribute []*LocalityLoadBalancerSetting_Distribute `protobuf:"bytes,1,rep,name=distribute,proto3" json:"distribute,omitempty"` // Optional: only failover or distribute can be set. // Explicitly specify the region traffic will land on when endpoints in local region becomes unhealthy. // Should be used together with OutlierDetection to detect unhealthy endpoints. // Note: if no OutlierDetection specified, this will not take effect. - Failover []*LocalityLoadBalancerSetting_Failover `protobuf:"bytes,2,rep,name=failover" json:"failover,omitempty"` + Failover []*LocalityLoadBalancerSetting_Failover `protobuf:"bytes,2,rep,name=failover,proto3" json:"failover,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` } func (m *LocalityLoadBalancerSetting) Reset() { *m = LocalityLoadBalancerSetting{} } func (m *LocalityLoadBalancerSetting) String() string { return proto.CompactTextString(m) } func (*LocalityLoadBalancerSetting) ProtoMessage() {} func (*LocalityLoadBalancerSetting) Descriptor() ([]byte, []int) { - return fileDescriptorConfig, []int{2} + return fileDescriptor_b5c7ece76d5d5022, []int{2} +} +func (m *LocalityLoadBalancerSetting) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *LocalityLoadBalancerSetting) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_LocalityLoadBalancerSetting.Marshal(b, m, deterministic) + } else { + b = b[:cap(b)] + n, err := m.MarshalTo(b) + if err != nil { + return nil, err + } + return b[:n], nil + } +} +func (m *LocalityLoadBalancerSetting) XXX_Merge(src proto.Message) { + xxx_messageInfo_LocalityLoadBalancerSetting.Merge(m, src) +} +func (m *LocalityLoadBalancerSetting) XXX_Size() int { + return m.Size() +} +func (m *LocalityLoadBalancerSetting) XXX_DiscardUnknown() { + xxx_messageInfo_LocalityLoadBalancerSetting.DiscardUnknown(m) } +var xxx_messageInfo_LocalityLoadBalancerSetting proto.InternalMessageInfo + func (m *LocalityLoadBalancerSetting) GetDistribute() []*LocalityLoadBalancerSetting_Distribute { if m != nil { return m.Distribute @@ -705,7 +821,10 @@ type LocalityLoadBalancerSetting_Distribute struct { // Map of upstream localities to traffic distribution weights. The sum of // all weights should be == 100. Any locality not assigned a weight will // receive no traffic. - To map[string]uint32 `protobuf:"bytes,2,rep,name=to" json:"to,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` + To map[string]uint32 `protobuf:"bytes,2,rep,name=to,proto3" json:"to,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` } func (m *LocalityLoadBalancerSetting_Distribute) Reset() { @@ -714,8 +833,34 @@ func (m *LocalityLoadBalancerSetting_Distribute) Reset() { func (m *LocalityLoadBalancerSetting_Distribute) String() string { return proto.CompactTextString(m) } func (*LocalityLoadBalancerSetting_Distribute) ProtoMessage() {} func (*LocalityLoadBalancerSetting_Distribute) Descriptor() ([]byte, []int) { - return fileDescriptorConfig, []int{2, 0} + return fileDescriptor_b5c7ece76d5d5022, []int{2, 0} +} +func (m *LocalityLoadBalancerSetting_Distribute) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *LocalityLoadBalancerSetting_Distribute) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_LocalityLoadBalancerSetting_Distribute.Marshal(b, m, deterministic) + } else { + b = b[:cap(b)] + n, err := m.MarshalTo(b) + if err != nil { + return nil, err + } + return b[:n], nil + } +} +func (m *LocalityLoadBalancerSetting_Distribute) XXX_Merge(src proto.Message) { + xxx_messageInfo_LocalityLoadBalancerSetting_Distribute.Merge(m, src) +} +func (m *LocalityLoadBalancerSetting_Distribute) XXX_Size() int { + return m.Size() } +func (m *LocalityLoadBalancerSetting_Distribute) XXX_DiscardUnknown() { + xxx_messageInfo_LocalityLoadBalancerSetting_Distribute.DiscardUnknown(m) +} + +var xxx_messageInfo_LocalityLoadBalancerSetting_Distribute proto.InternalMessageInfo func (m *LocalityLoadBalancerSetting_Distribute) GetFrom() string { if m != nil { @@ -743,15 +888,44 @@ type LocalityLoadBalancerSetting_Failover struct { From string `protobuf:"bytes,1,opt,name=from,proto3" json:"from,omitempty"` // Destination region the traffic will fail over to when endpoints in // the 'from' region becomes unhealthy. - To string `protobuf:"bytes,2,opt,name=to,proto3" json:"to,omitempty"` + To string `protobuf:"bytes,2,opt,name=to,proto3" json:"to,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` } func (m *LocalityLoadBalancerSetting_Failover) Reset() { *m = LocalityLoadBalancerSetting_Failover{} } func (m *LocalityLoadBalancerSetting_Failover) String() string { return proto.CompactTextString(m) } func (*LocalityLoadBalancerSetting_Failover) ProtoMessage() {} func (*LocalityLoadBalancerSetting_Failover) Descriptor() ([]byte, []int) { - return fileDescriptorConfig, []int{2, 1} + return fileDescriptor_b5c7ece76d5d5022, []int{2, 1} +} +func (m *LocalityLoadBalancerSetting_Failover) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *LocalityLoadBalancerSetting_Failover) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_LocalityLoadBalancerSetting_Failover.Marshal(b, m, deterministic) + } else { + b = b[:cap(b)] + n, err := m.MarshalTo(b) + if err != nil { + return nil, err + } + return b[:n], nil + } +} +func (m *LocalityLoadBalancerSetting_Failover) XXX_Merge(src proto.Message) { + xxx_messageInfo_LocalityLoadBalancerSetting_Failover.Merge(m, src) +} +func (m *LocalityLoadBalancerSetting_Failover) XXX_Size() int { + return m.Size() } +func (m *LocalityLoadBalancerSetting_Failover) XXX_DiscardUnknown() { + xxx_messageInfo_LocalityLoadBalancerSetting_Failover.DiscardUnknown(m) +} + +var xxx_messageInfo_LocalityLoadBalancerSetting_Failover proto.InternalMessageInfo func (m *LocalityLoadBalancerSetting_Failover) GetFrom() string { if m != nil { @@ -768,17 +942,117 @@ func (m *LocalityLoadBalancerSetting_Failover) GetTo() string { } func init() { + proto.RegisterEnum("istio.mesh.v1alpha1.MeshConfig_IngressControllerMode", MeshConfig_IngressControllerMode_name, MeshConfig_IngressControllerMode_value) + proto.RegisterEnum("istio.mesh.v1alpha1.MeshConfig_AuthPolicy", MeshConfig_AuthPolicy_name, MeshConfig_AuthPolicy_value) + proto.RegisterEnum("istio.mesh.v1alpha1.MeshConfig_AccessLogEncoding", MeshConfig_AccessLogEncoding_name, MeshConfig_AccessLogEncoding_value) + proto.RegisterEnum("istio.mesh.v1alpha1.MeshConfig_OutboundTrafficPolicy_Mode", MeshConfig_OutboundTrafficPolicy_Mode_name, MeshConfig_OutboundTrafficPolicy_Mode_value) proto.RegisterType((*MeshConfig)(nil), "istio.mesh.v1alpha1.MeshConfig") proto.RegisterType((*MeshConfig_OutboundTrafficPolicy)(nil), "istio.mesh.v1alpha1.MeshConfig.OutboundTrafficPolicy") proto.RegisterType((*ConfigSource)(nil), "istio.mesh.v1alpha1.ConfigSource") proto.RegisterType((*LocalityLoadBalancerSetting)(nil), "istio.mesh.v1alpha1.LocalityLoadBalancerSetting") proto.RegisterType((*LocalityLoadBalancerSetting_Distribute)(nil), "istio.mesh.v1alpha1.LocalityLoadBalancerSetting.Distribute") + proto.RegisterMapType((map[string]uint32)(nil), "istio.mesh.v1alpha1.LocalityLoadBalancerSetting.Distribute.ToEntry") proto.RegisterType((*LocalityLoadBalancerSetting_Failover)(nil), "istio.mesh.v1alpha1.LocalityLoadBalancerSetting.Failover") - proto.RegisterEnum("istio.mesh.v1alpha1.MeshConfig_IngressControllerMode", MeshConfig_IngressControllerMode_name, MeshConfig_IngressControllerMode_value) - proto.RegisterEnum("istio.mesh.v1alpha1.MeshConfig_AuthPolicy", MeshConfig_AuthPolicy_name, MeshConfig_AuthPolicy_value) - proto.RegisterEnum("istio.mesh.v1alpha1.MeshConfig_AccessLogEncoding", MeshConfig_AccessLogEncoding_name, MeshConfig_AccessLogEncoding_value) - proto.RegisterEnum("istio.mesh.v1alpha1.MeshConfig_OutboundTrafficPolicy_Mode", MeshConfig_OutboundTrafficPolicy_Mode_name, MeshConfig_OutboundTrafficPolicy_Mode_value) } + +func init() { proto.RegisterFile("mesh/v1alpha1/config.proto", fileDescriptor_b5c7ece76d5d5022) } + +var fileDescriptor_b5c7ece76d5d5022 = []byte{ + // 1461 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x56, 0xdd, 0x72, 0xdb, 0xb8, + 0x15, 0x36, 0x65, 0x25, 0x96, 0x8f, 0x7e, 0x4c, 0xc1, 0x71, 0x96, 0x56, 0xba, 0x5e, 0x59, 0x3b, + 0x49, 0x34, 0x9e, 0x0e, 0xdd, 0xd8, 0xb3, 0x33, 0xc9, 0xf6, 0xca, 0x96, 0xe4, 0x8d, 0xbd, 0xb2, + 0xe5, 0xa1, 0xe8, 0xb4, 0x69, 0x2f, 0x50, 0x98, 0x84, 0x24, 0xd4, 0x14, 0xc1, 0x21, 0x40, 0x27, + 0x7a, 0xa7, 0x76, 0xa6, 0x8f, 0xd1, 0xcb, 0x3e, 0x42, 0x27, 0x77, 0x7d, 0x8b, 0x0e, 0x01, 0xd2, + 0x52, 0xbc, 0x9a, 0xb8, 0xe9, 0xde, 0x11, 0xdf, 0xf9, 0xce, 0x07, 0xe2, 0x9c, 0x83, 0x8f, 0x84, + 0xc6, 0x94, 0x8a, 0xc9, 0xfe, 0xed, 0x2b, 0x12, 0x44, 0x13, 0xf2, 0x6a, 0xdf, 0xe3, 0xe1, 0x88, + 0x8d, 0xed, 0x28, 0xe6, 0x92, 0xa3, 0x4d, 0x26, 0x24, 0xe3, 0x76, 0xca, 0xb0, 0x73, 0x46, 0x63, + 0x67, 0xcc, 0xf9, 0x38, 0xa0, 0xfb, 0x8a, 0x72, 0x9d, 0x8c, 0xf6, 0xfd, 0x24, 0x26, 0x92, 0xf1, + 0x50, 0x27, 0x35, 0xb6, 0x3f, 0x17, 0x8c, 0x62, 0xfe, 0x71, 0x96, 0x85, 0xf6, 0x42, 0x2a, 0x3f, + 0xf0, 0xf8, 0x86, 0x85, 0xe3, 0x9c, 0x70, 0xb8, 0xef, 0x53, 0x21, 0x59, 0xa8, 0x14, 0x70, 0x9c, + 0x04, 0x54, 0x73, 0x5b, 0xff, 0x41, 0x00, 0xe7, 0x54, 0x4c, 0x3a, 0xea, 0x85, 0xd0, 0x6f, 0x01, + 0x4d, 0xd9, 0x47, 0x1a, 0x63, 0x6f, 0x42, 0xbd, 0x1b, 0x2c, 0x68, 0x7c, 0x4b, 0x63, 0xcb, 0x68, + 0x1a, 0xed, 0x75, 0xc7, 0x54, 0x91, 0x4e, 0x1a, 0x18, 0x2a, 0x1c, 0xd9, 0xb0, 0xa9, 0xd9, 0x31, + 0x8d, 0x78, 0x2c, 0x73, 0x7a, 0x41, 0xd1, 0xeb, 0x2a, 0xe4, 0xa8, 0x48, 0xc6, 0x3f, 0x80, 0x2d, + 0x9f, 0x09, 0x72, 0x1d, 0x50, 0x1c, 0xf1, 0x80, 0x79, 0x33, 0xbd, 0x8d, 0xb0, 0x56, 0x9b, 0x46, + 0xbb, 0xe4, 0x6c, 0x66, 0xc1, 0x4b, 0x15, 0x53, 0x1b, 0x09, 0x74, 0x08, 0x4f, 0x17, 0xb9, 0x78, + 0x44, 0x58, 0x80, 0x79, 0x44, 0x43, 0x6b, 0x5b, 0x27, 0x45, 0x73, 0xf6, 0x09, 0x61, 0xc1, 0x20, + 0xa2, 0x21, 0xba, 0x84, 0xe7, 0x82, 0xf9, 0xd4, 0x23, 0x31, 0x96, 0x1c, 0x4b, 0x1a, 0xd0, 0x29, + 0x95, 0xf1, 0x0c, 0x0b, 0x2a, 0x44, 0x5a, 0x00, 0x32, 0x1a, 0xb1, 0x90, 0xc9, 0x99, 0xb5, 0xa3, + 0x34, 0x76, 0x33, 0xb2, 0xcb, 0xdd, 0x9c, 0x3a, 0xd4, 0xcc, 0xa3, 0x8c, 0x88, 0xf6, 0xa0, 0xae, + 0x4a, 0x8c, 0x03, 0x26, 0x24, 0x0d, 0x71, 0x7a, 0x2a, 0xab, 0xd8, 0x34, 0xda, 0x8f, 0x9c, 0x0d, + 0x15, 0xe8, 0x2b, 0xfc, 0x92, 0xc7, 0x12, 0xbd, 0x00, 0x0d, 0xe1, 0x89, 0x94, 0x91, 0x66, 0x3e, + 0x52, 0xcc, 0xaa, 0x82, 0xdf, 0x4a, 0x19, 0x29, 0xde, 0x31, 0x6c, 0x78, 0x3c, 0x0c, 0xa9, 0x27, + 0xb1, 0x64, 0x53, 0xca, 0x13, 0x69, 0x3d, 0x6e, 0x1a, 0xed, 0xf2, 0xc1, 0xb6, 0xad, 0x9b, 0x6f, + 0xe7, 0xcd, 0xb7, 0xbb, 0x59, 0xf3, 0x9d, 0x5a, 0x96, 0xe1, 0xea, 0x04, 0xc4, 0xa1, 0x2a, 0xbd, + 0x08, 0xdf, 0x50, 0x1a, 0x91, 0x80, 0xdd, 0x52, 0xeb, 0x37, 0x4a, 0xe1, 0xcc, 0xd6, 0x33, 0x35, + 0x9f, 0x84, 0x7c, 0xb2, 0x0e, 0xed, 0x8e, 0x56, 0x60, 0x3c, 0xbc, 0xe4, 0x3c, 0x18, 0x52, 0x29, + 0x59, 0x38, 0x16, 0xb6, 0xdb, 0xb9, 0x9c, 0x3f, 0x7b, 0xd1, 0xcf, 0xb9, 0xa2, 0x53, 0x91, 0x0b, + 0x2b, 0xf4, 0x3d, 0x54, 0x59, 0x38, 0x8e, 0xa9, 0x10, 0xd8, 0x0b, 0x88, 0x10, 0xd6, 0x9a, 0xea, + 0x76, 0x25, 0x03, 0x3b, 0x29, 0x86, 0x5e, 0xc2, 0x46, 0x4e, 0x4a, 0x67, 0x82, 0x79, 0xd4, 0x2a, + 0x29, 0x5a, 0x2d, 0x83, 0x87, 0x1a, 0x45, 0x53, 0xf8, 0xe6, 0x4e, 0x8d, 0x87, 0x32, 0xe6, 0x41, + 0x40, 0x63, 0x3c, 0xe5, 0x3e, 0xb5, 0xd6, 0x9b, 0x46, 0xbb, 0x76, 0xf0, 0x83, 0xbd, 0xe4, 0x72, + 0xd8, 0xf3, 0x89, 0xb5, 0x4f, 0xb3, 0x7d, 0xef, 0xb2, 0xcf, 0xb9, 0x4f, 0x9d, 0x2d, 0xb6, 0x0c, + 0x46, 0x03, 0x28, 0x93, 0x44, 0x4e, 0xb2, 0xe9, 0xb3, 0x40, 0x6d, 0xb1, 0xf7, 0xd0, 0x16, 0x47, + 0x89, 0x9c, 0xe8, 0x99, 0x3c, 0x2e, 0x58, 0x86, 0x03, 0xe4, 0x6e, 0x8d, 0x4e, 0xa1, 0x1e, 0xfb, + 0x02, 0xc7, 0x74, 0x14, 0x53, 0x31, 0xc1, 0x3e, 0x0d, 0xc8, 0xcc, 0x2a, 0x3f, 0xd0, 0x44, 0xa5, + 0xb2, 0x11, 0xfb, 0xc2, 0xd1, 0x69, 0xdd, 0x34, 0x0b, 0x3d, 0x87, 0x1a, 0x0d, 0xd5, 0xdd, 0x90, + 0x31, 0xf1, 0x58, 0x38, 0xb6, 0x2a, 0x6a, 0x38, 0xab, 0x1a, 0x75, 0x35, 0x98, 0x0e, 0x17, 0xf1, + 0xbc, 0xb4, 0x60, 0x01, 0x1f, 0xe3, 0x11, 0x0b, 0xa8, 0x55, 0x55, 0xa5, 0xad, 0x6a, 0xb8, 0xcf, + 0xc7, 0x27, 0x2c, 0xa0, 0xe9, 0xc0, 0x2e, 0xf2, 0x78, 0x3c, 0x25, 0xd2, 0xb2, 0x14, 0x73, 0x63, + 0xce, 0x54, 0x30, 0x22, 0xb0, 0xb9, 0xc0, 0xa5, 0xa1, 0xc7, 0xfd, 0x74, 0xff, 0x67, 0xaa, 0x3c, + 0xaf, 0x1e, 0x2c, 0x4f, 0xae, 0xd6, 0xcb, 0x12, 0x9d, 0x3a, 0xb9, 0x0f, 0xa1, 0x9f, 0xa0, 0xe6, + 0xd3, 0x11, 0x49, 0x02, 0x89, 0xb5, 0xf7, 0x59, 0x35, 0x55, 0xa5, 0xe6, 0x52, 0xf5, 0xcb, 0xf4, + 0x9e, 0x68, 0x79, 0xa7, 0x9a, 0xe5, 0x65, 0x0e, 0xf5, 0x12, 0xaa, 0xda, 0x73, 0x88, 0xef, 0xa7, + 0x1d, 0xb6, 0xcc, 0xf4, 0x4c, 0xaa, 0xa4, 0x15, 0x15, 0x38, 0xd2, 0x78, 0x3a, 0x5a, 0x3c, 0x91, + 0xd7, 0x3c, 0x09, 0xfd, 0xb4, 0xa2, 0xa3, 0x11, 0xf3, 0xf2, 0xbe, 0xd7, 0xd5, 0xd6, 0x0f, 0x8e, + 0xd6, 0x20, 0x4b, 0x77, 0x75, 0xb6, 0x6e, 0xb9, 0xb3, 0xc5, 0x97, 0xc1, 0xa8, 0x0b, 0xdf, 0x65, + 0xed, 0xf3, 0x02, 0x46, 0x43, 0x89, 0x53, 0x4f, 0xf9, 0xcc, 0xe6, 0xac, 0x4d, 0xd5, 0xcf, 0x67, + 0x9a, 0xd6, 0x51, 0xac, 0x21, 0xf3, 0x17, 0xed, 0x0e, 0x35, 0xa1, 0x22, 0x7c, 0x81, 0x13, 0x5f, + 0xe0, 0x88, 0xc8, 0x89, 0xf5, 0x44, 0x35, 0x0c, 0x84, 0x2f, 0xae, 0x7c, 0x71, 0x49, 0xe4, 0x24, + 0x9d, 0x38, 0xf1, 0x8b, 0x89, 0xdb, 0xfa, 0x9f, 0x26, 0x4e, 0xdc, 0x9b, 0xb8, 0xb7, 0x50, 0xd3, + 0xbd, 0xc0, 0x82, 0x27, 0xb1, 0x47, 0x85, 0xf5, 0xb4, 0xb9, 0xda, 0x2e, 0x1f, 0xec, 0x2e, 0x2d, + 0x8c, 0x2e, 0xca, 0x50, 0x31, 0x9d, 0xaa, 0xb7, 0xb0, 0x52, 0x26, 0x9d, 0x1d, 0x3e, 0x7d, 0x37, + 0xc9, 0x6f, 0x68, 0x88, 0xa7, 0x3c, 0x09, 0xa5, 0xf5, 0x8d, 0x36, 0x69, 0x1d, 0x1d, 0xfa, 0xc2, + 0x4d, 0x63, 0xe7, 0x69, 0x08, 0xed, 0x01, 0x52, 0x67, 0x15, 0x14, 0xdf, 0xbc, 0x16, 0x58, 0x10, + 0xfc, 0xd7, 0x0f, 0xd2, 0xfa, 0x56, 0x25, 0xd4, 0xd2, 0x13, 0x0b, 0xfa, 0xf3, 0x6b, 0x31, 0x24, + 0x67, 0x1f, 0x24, 0xda, 0x85, 0x8a, 0x8c, 0x13, 0x21, 0xb1, 0xcf, 0xa7, 0x84, 0x85, 0x56, 0x43, + 0xd5, 0xa5, 0xac, 0xb0, 0xae, 0x82, 0xd0, 0x1b, 0xd8, 0xce, 0x27, 0x2c, 0xf3, 0x1c, 0x4c, 0x3f, + 0xaa, 0xcf, 0x92, 0xe4, 0xd6, 0x77, 0xcd, 0xd5, 0xf6, 0xba, 0xf3, 0x34, 0x23, 0x64, 0xee, 0xd3, + 0x53, 0x61, 0x97, 0xa3, 0xb7, 0xb0, 0x9b, 0xa7, 0xde, 0xb2, 0x58, 0x26, 0x24, 0x58, 0x22, 0xd1, + 0x54, 0x12, 0xdf, 0x66, 0xc4, 0x77, 0x9a, 0x77, 0x5f, 0xe9, 0x0c, 0x5a, 0xb9, 0xd2, 0xfd, 0x0f, + 0xee, 0x82, 0xd4, 0xae, 0x92, 0xda, 0xc9, 0x98, 0xdd, 0x39, 0xd1, 0x49, 0x82, 0xb9, 0xd6, 0x73, + 0xa8, 0xc5, 0x9c, 0x4b, 0x1c, 0x92, 0x29, 0x15, 0x11, 0xf1, 0xa8, 0xd5, 0xd2, 0x17, 0x3d, 0x45, + 0x2f, 0x72, 0x10, 0xfd, 0x05, 0x36, 0x03, 0xee, 0x91, 0x80, 0xc9, 0x19, 0x0e, 0xae, 0xb1, 0xd0, + 0x1e, 0x6e, 0x7d, 0xaf, 0x46, 0xe2, 0x77, 0x4b, 0x5b, 0xd9, 0xcf, 0xf8, 0x7d, 0x4e, 0xfc, 0x63, + 0x12, 0x90, 0xd0, 0xa3, 0x71, 0xe6, 0xfd, 0x4e, 0x3d, 0x17, 0xeb, 0x5f, 0x67, 0x50, 0xe3, 0xef, + 0x06, 0x6c, 0x2d, 0xbd, 0x0b, 0xe8, 0x02, 0x8a, 0xca, 0xab, 0x0d, 0xe5, 0x14, 0x3f, 0xfe, 0x5f, + 0x17, 0xca, 0x56, 0x86, 0xad, 0x74, 0x5a, 0x5d, 0x28, 0x2a, 0x9f, 0xae, 0x43, 0xd5, 0xe9, 0xfd, + 0x74, 0x3a, 0x74, 0x9d, 0xf7, 0x78, 0x70, 0xd1, 0x7f, 0x6f, 0xae, 0xa0, 0x2a, 0xac, 0x1f, 0xf5, + 0xfb, 0x83, 0x3f, 0xe0, 0xa3, 0x8b, 0xf7, 0xa6, 0xd1, 0x2a, 0x96, 0x0a, 0x66, 0x61, 0xef, 0xc9, + 0xbb, 0x53, 0xc7, 0xbd, 0x3a, 0xea, 0xe3, 0x61, 0xcf, 0x79, 0x77, 0xda, 0xe9, 0x29, 0x72, 0xeb, + 0x0d, 0x6c, 0x2d, 0xfd, 0x2a, 0xa0, 0x35, 0x58, 0x1d, 0x9c, 0x9c, 0x98, 0x2b, 0xa8, 0x0c, 0x6b, + 0xdd, 0xde, 0xc9, 0xd1, 0x55, 0xdf, 0x35, 0x0d, 0x04, 0xf0, 0x78, 0xe8, 0x3a, 0xa7, 0x1d, 0xd7, + 0x2c, 0xb4, 0x5e, 0x00, 0xcc, 0xdd, 0x1e, 0x95, 0xa0, 0x78, 0x31, 0xb8, 0xe8, 0x99, 0x2b, 0xa8, + 0x06, 0x70, 0x7e, 0xa5, 0x76, 0x72, 0xfb, 0x43, 0xd3, 0x68, 0xbd, 0x84, 0xfa, 0x2f, 0x6c, 0x2f, + 0xa5, 0xbb, 0xbd, 0x3f, 0xba, 0xe6, 0x4a, 0xfa, 0x74, 0x36, 0x1c, 0x5c, 0x98, 0xc6, 0x59, 0xb1, + 0xb4, 0x61, 0x9a, 0x67, 0xc5, 0x12, 0x32, 0x37, 0x5b, 0x02, 0x2a, 0x8b, 0x97, 0x08, 0x59, 0xb0, + 0x96, 0x9b, 0x98, 0xfe, 0xc3, 0xca, 0x97, 0xe8, 0x14, 0x2a, 0x32, 0x10, 0x79, 0x2f, 0x85, 0xfa, + 0xa3, 0x2a, 0x1f, 0xbc, 0xf8, 0xc2, 0x47, 0xdd, 0xed, 0x0f, 0xf3, 0xaf, 0xb7, 0x53, 0x96, 0x81, + 0xc8, 0x17, 0xad, 0x7f, 0xac, 0xc2, 0xb3, 0x2f, 0xf4, 0x1b, 0xfd, 0x19, 0xc0, 0x67, 0x42, 0xc6, + 0xec, 0x3a, 0x91, 0x69, 0x23, 0x53, 0x03, 0xf8, 0xfd, 0xd7, 0x4e, 0x8d, 0xdd, 0xbd, 0x93, 0x70, + 0x16, 0xe4, 0xd0, 0x15, 0x94, 0xd2, 0xff, 0x35, 0xae, 0xff, 0x0a, 0x53, 0xe9, 0x37, 0x5f, 0x2d, + 0x7d, 0x92, 0x09, 0x38, 0x77, 0x52, 0x8d, 0xbf, 0x19, 0x00, 0xf3, 0x1d, 0x11, 0x82, 0xe2, 0x28, + 0xe6, 0xd3, 0xac, 0x88, 0xea, 0x19, 0x0d, 0xa1, 0x20, 0x79, 0xb6, 0x67, 0xe7, 0x57, 0x1c, 0xc7, + 0x76, 0x79, 0x2f, 0x94, 0xf1, 0xcc, 0x29, 0x48, 0xde, 0xf8, 0x01, 0xd6, 0xb2, 0x25, 0x32, 0x61, + 0xf5, 0x86, 0xce, 0xb2, 0x2d, 0xd3, 0x47, 0xf4, 0x04, 0x1e, 0xdd, 0x92, 0x20, 0xa1, 0xaa, 0x59, + 0x55, 0x47, 0x2f, 0x7e, 0x2c, 0xbc, 0x36, 0x1a, 0x36, 0x94, 0xf2, 0x43, 0x2c, 0x7d, 0xd7, 0x5a, + 0xf6, 0xae, 0x29, 0x52, 0x90, 0xfc, 0xb8, 0xfd, 0xcf, 0x4f, 0x3b, 0xc6, 0xbf, 0x3e, 0xed, 0x18, + 0xff, 0xfe, 0xb4, 0x63, 0xfc, 0xa9, 0xa1, 0x5f, 0x9e, 0xf1, 0x7d, 0x12, 0xb1, 0xfd, 0xcf, 0xfe, + 0xfa, 0xaf, 0x1f, 0x2b, 0xa7, 0x3f, 0xfc, 0x6f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x5b, 0xff, 0xe8, + 0x08, 0x5e, 0x0c, 0x00, 0x00, +} + func (m *MeshConfig) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) @@ -1114,6 +1388,9 @@ func (m *MeshConfig) MarshalTo(dAtA []byte) (int, error) { } i += n7 } + if m.XXX_unrecognized != nil { + i += copy(dAtA[i:], m.XXX_unrecognized) + } return i, nil } @@ -1137,6 +1414,9 @@ func (m *MeshConfig_OutboundTrafficPolicy) MarshalTo(dAtA []byte) (int, error) { i++ i = encodeVarintConfig(dAtA, i, uint64(m.Mode)) } + if m.XXX_unrecognized != nil { + i += copy(dAtA[i:], m.XXX_unrecognized) + } return i, nil } @@ -1171,6 +1451,9 @@ func (m *ConfigSource) MarshalTo(dAtA []byte) (int, error) { } i += n8 } + if m.XXX_unrecognized != nil { + i += copy(dAtA[i:], m.XXX_unrecognized) + } return i, nil } @@ -1213,6 +1496,9 @@ func (m *LocalityLoadBalancerSetting) MarshalTo(dAtA []byte) (int, error) { i += n } } + if m.XXX_unrecognized != nil { + i += copy(dAtA[i:], m.XXX_unrecognized) + } return i, nil } @@ -1253,6 +1539,9 @@ func (m *LocalityLoadBalancerSetting_Distribute) MarshalTo(dAtA []byte) (int, er i = encodeVarintConfig(dAtA, i, uint64(v)) } } + if m.XXX_unrecognized != nil { + i += copy(dAtA[i:], m.XXX_unrecognized) + } return i, nil } @@ -1283,6 +1572,9 @@ func (m *LocalityLoadBalancerSetting_Failover) MarshalTo(dAtA []byte) (int, erro i = encodeVarintConfig(dAtA, i, uint64(len(m.To))) i += copy(dAtA[i:], m.To) } + if m.XXX_unrecognized != nil { + i += copy(dAtA[i:], m.XXX_unrecognized) + } return i, nil } @@ -1296,6 +1588,9 @@ func encodeVarintConfig(dAtA []byte, offset int, v uint64) int { return offset + 1 } func (m *MeshConfig) Size() (n int) { + if m == nil { + return 0 + } var l int _ = l l = len(m.MixerCheckServer) @@ -1426,19 +1721,31 @@ func (m *MeshConfig) Size() (n int) { l = m.LocalityLbSetting.Size() n += 2 + l + sovConfig(uint64(l)) } + if m.XXX_unrecognized != nil { + n += len(m.XXX_unrecognized) + } return n } func (m *MeshConfig_OutboundTrafficPolicy) Size() (n int) { + if m == nil { + return 0 + } var l int _ = l if m.Mode != 0 { n += 1 + sovConfig(uint64(m.Mode)) } + if m.XXX_unrecognized != nil { + n += len(m.XXX_unrecognized) + } return n } func (m *ConfigSource) Size() (n int) { + if m == nil { + return 0 + } var l int _ = l l = len(m.Address) @@ -1449,10 +1756,16 @@ func (m *ConfigSource) Size() (n int) { l = m.TlsSettings.Size() n += 1 + l + sovConfig(uint64(l)) } + if m.XXX_unrecognized != nil { + n += len(m.XXX_unrecognized) + } return n } func (m *LocalityLoadBalancerSetting) Size() (n int) { + if m == nil { + return 0 + } var l int _ = l if len(m.Distribute) > 0 { @@ -1467,10 +1780,16 @@ func (m *LocalityLoadBalancerSetting) Size() (n int) { n += 1 + l + sovConfig(uint64(l)) } } + if m.XXX_unrecognized != nil { + n += len(m.XXX_unrecognized) + } return n } func (m *LocalityLoadBalancerSetting_Distribute) Size() (n int) { + if m == nil { + return 0 + } var l int _ = l l = len(m.From) @@ -1485,10 +1804,16 @@ func (m *LocalityLoadBalancerSetting_Distribute) Size() (n int) { n += mapEntrySize + 1 + sovConfig(uint64(mapEntrySize)) } } + if m.XXX_unrecognized != nil { + n += len(m.XXX_unrecognized) + } return n } func (m *LocalityLoadBalancerSetting_Failover) Size() (n int) { + if m == nil { + return 0 + } var l int _ = l l = len(m.From) @@ -1499,6 +1824,9 @@ func (m *LocalityLoadBalancerSetting_Failover) Size() (n int) { if l > 0 { n += 1 + l + sovConfig(uint64(l)) } + if m.XXX_unrecognized != nil { + n += len(m.XXX_unrecognized) + } return n } @@ -1530,7 +1858,7 @@ func (m *MeshConfig) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - wire |= (uint64(b) & 0x7F) << shift + wire |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -1558,7 +1886,7 @@ func (m *MeshConfig) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLen |= (uint64(b) & 0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -1568,6 +1896,9 @@ func (m *MeshConfig) Unmarshal(dAtA []byte) error { return ErrInvalidLengthConfig } postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthConfig + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -1587,7 +1918,7 @@ func (m *MeshConfig) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLen |= (uint64(b) & 0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -1597,6 +1928,9 @@ func (m *MeshConfig) Unmarshal(dAtA []byte) error { return ErrInvalidLengthConfig } postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthConfig + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -1616,7 +1950,7 @@ func (m *MeshConfig) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - v |= (int(b) & 0x7F) << shift + v |= int(b&0x7F) << shift if b < 0x80 { break } @@ -1636,7 +1970,7 @@ func (m *MeshConfig) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - m.ProxyListenPort |= (int32(b) & 0x7F) << shift + m.ProxyListenPort |= int32(b&0x7F) << shift if b < 0x80 { break } @@ -1655,7 +1989,7 @@ func (m *MeshConfig) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - m.ProxyHttpPort |= (int32(b) & 0x7F) << shift + m.ProxyHttpPort |= int32(b&0x7F) << shift if b < 0x80 { break } @@ -1674,7 +2008,7 @@ func (m *MeshConfig) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - msglen |= (int(b) & 0x7F) << shift + msglen |= int(b&0x7F) << shift if b < 0x80 { break } @@ -1683,11 +2017,14 @@ func (m *MeshConfig) Unmarshal(dAtA []byte) error { return ErrInvalidLengthConfig } postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthConfig + } if postIndex > l { return io.ErrUnexpectedEOF } if m.ConnectTimeout == nil { - m.ConnectTimeout = &google_protobuf.Duration{} + m.ConnectTimeout = &types.Duration{} } if err := m.ConnectTimeout.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err @@ -1707,7 +2044,7 @@ func (m *MeshConfig) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLen |= (uint64(b) & 0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -1717,6 +2054,9 @@ func (m *MeshConfig) Unmarshal(dAtA []byte) error { return ErrInvalidLengthConfig } postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthConfig + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -1736,7 +2076,7 @@ func (m *MeshConfig) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLen |= (uint64(b) & 0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -1746,6 +2086,9 @@ func (m *MeshConfig) Unmarshal(dAtA []byte) error { return ErrInvalidLengthConfig } postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthConfig + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -1765,7 +2108,7 @@ func (m *MeshConfig) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - m.IngressControllerMode |= (MeshConfig_IngressControllerMode(b) & 0x7F) << shift + m.IngressControllerMode |= MeshConfig_IngressControllerMode(b&0x7F) << shift if b < 0x80 { break } @@ -1784,7 +2127,7 @@ func (m *MeshConfig) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - m.AuthPolicy |= (MeshConfig_AuthPolicy(b) & 0x7F) << shift + m.AuthPolicy |= MeshConfig_AuthPolicy(b&0x7F) << shift if b < 0x80 { break } @@ -1803,7 +2146,7 @@ func (m *MeshConfig) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - msglen |= (int(b) & 0x7F) << shift + msglen |= int(b&0x7F) << shift if b < 0x80 { break } @@ -1812,11 +2155,14 @@ func (m *MeshConfig) Unmarshal(dAtA []byte) error { return ErrInvalidLengthConfig } postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthConfig + } if postIndex > l { return io.ErrUnexpectedEOF } if m.RdsRefreshDelay == nil { - m.RdsRefreshDelay = &google_protobuf.Duration{} + m.RdsRefreshDelay = &types.Duration{} } if err := m.RdsRefreshDelay.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err @@ -1836,7 +2182,7 @@ func (m *MeshConfig) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - v |= (int(b) & 0x7F) << shift + v |= int(b&0x7F) << shift if b < 0x80 { break } @@ -1856,7 +2202,7 @@ func (m *MeshConfig) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLen |= (uint64(b) & 0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -1866,6 +2212,9 @@ func (m *MeshConfig) Unmarshal(dAtA []byte) error { return ErrInvalidLengthConfig } postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthConfig + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -1885,7 +2234,7 @@ func (m *MeshConfig) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - msglen |= (int(b) & 0x7F) << shift + msglen |= int(b&0x7F) << shift if b < 0x80 { break } @@ -1894,6 +2243,9 @@ func (m *MeshConfig) Unmarshal(dAtA []byte) error { return ErrInvalidLengthConfig } postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthConfig + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -1918,7 +2270,7 @@ func (m *MeshConfig) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLen |= (uint64(b) & 0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -1928,6 +2280,9 @@ func (m *MeshConfig) Unmarshal(dAtA []byte) error { return ErrInvalidLengthConfig } postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthConfig + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -1947,7 +2302,7 @@ func (m *MeshConfig) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - msglen |= (int(b) & 0x7F) << shift + msglen |= int(b&0x7F) << shift if b < 0x80 { break } @@ -1956,6 +2311,9 @@ func (m *MeshConfig) Unmarshal(dAtA []byte) error { return ErrInvalidLengthConfig } postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthConfig + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -1980,7 +2338,7 @@ func (m *MeshConfig) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - v |= (int(b) & 0x7F) << shift + v |= int(b&0x7F) << shift if b < 0x80 { break } @@ -2000,7 +2358,7 @@ func (m *MeshConfig) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLen |= (uint64(b) & 0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -2010,6 +2368,9 @@ func (m *MeshConfig) Unmarshal(dAtA []byte) error { return ErrInvalidLengthConfig } postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthConfig + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -2029,7 +2390,7 @@ func (m *MeshConfig) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - msglen |= (int(b) & 0x7F) << shift + msglen |= int(b&0x7F) << shift if b < 0x80 { break } @@ -2038,11 +2399,14 @@ func (m *MeshConfig) Unmarshal(dAtA []byte) error { return ErrInvalidLengthConfig } postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthConfig + } if postIndex > l { return io.ErrUnexpectedEOF } if m.SdsRefreshDelay == nil { - m.SdsRefreshDelay = &google_protobuf.Duration{} + m.SdsRefreshDelay = &types.Duration{} } if err := m.SdsRefreshDelay.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err @@ -2062,7 +2426,7 @@ func (m *MeshConfig) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - msglen |= (int(b) & 0x7F) << shift + msglen |= int(b&0x7F) << shift if b < 0x80 { break } @@ -2071,6 +2435,9 @@ func (m *MeshConfig) Unmarshal(dAtA []byte) error { return ErrInvalidLengthConfig } postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthConfig + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -2093,7 +2460,7 @@ func (m *MeshConfig) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - v |= (int(b) & 0x7F) << shift + v |= int(b&0x7F) << shift if b < 0x80 { break } @@ -2113,7 +2480,7 @@ func (m *MeshConfig) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLen |= (uint64(b) & 0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -2123,6 +2490,9 @@ func (m *MeshConfig) Unmarshal(dAtA []byte) error { return ErrInvalidLengthConfig } postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthConfig + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -2142,7 +2512,7 @@ func (m *MeshConfig) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - v |= (int(b) & 0x7F) << shift + v |= int(b&0x7F) << shift if b < 0x80 { break } @@ -2162,7 +2532,7 @@ func (m *MeshConfig) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLen |= (uint64(b) & 0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -2172,6 +2542,9 @@ func (m *MeshConfig) Unmarshal(dAtA []byte) error { return ErrInvalidLengthConfig } postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthConfig + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -2191,7 +2564,7 @@ func (m *MeshConfig) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - m.AccessLogEncoding |= (MeshConfig_AccessLogEncoding(b) & 0x7F) << shift + m.AccessLogEncoding |= MeshConfig_AccessLogEncoding(b&0x7F) << shift if b < 0x80 { break } @@ -2210,7 +2583,7 @@ func (m *MeshConfig) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - msglen |= (int(b) & 0x7F) << shift + msglen |= int(b&0x7F) << shift if b < 0x80 { break } @@ -2219,11 +2592,14 @@ func (m *MeshConfig) Unmarshal(dAtA []byte) error { return ErrInvalidLengthConfig } postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthConfig + } if postIndex > l { return io.ErrUnexpectedEOF } if m.TcpKeepalive == nil { - m.TcpKeepalive = &istio_networking_v1alpha31.ConnectionPoolSettings_TCPSettings_TcpKeepalive{} + m.TcpKeepalive = &v1alpha3.ConnectionPoolSettings_TCPSettings_TcpKeepalive{} } if err := m.TcpKeepalive.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err @@ -2243,7 +2619,7 @@ func (m *MeshConfig) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - v |= (int(b) & 0x7F) << shift + v |= int(b&0x7F) << shift if b < 0x80 { break } @@ -2263,7 +2639,7 @@ func (m *MeshConfig) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - v |= (int(b) & 0x7F) << shift + v |= int(b&0x7F) << shift if b < 0x80 { break } @@ -2283,7 +2659,7 @@ func (m *MeshConfig) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLen |= (uint64(b) & 0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -2293,6 +2669,9 @@ func (m *MeshConfig) Unmarshal(dAtA []byte) error { return ErrInvalidLengthConfig } postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthConfig + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -2312,7 +2691,7 @@ func (m *MeshConfig) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLen |= (uint64(b) & 0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -2322,6 +2701,9 @@ func (m *MeshConfig) Unmarshal(dAtA []byte) error { return ErrInvalidLengthConfig } postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthConfig + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -2341,7 +2723,7 @@ func (m *MeshConfig) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLen |= (uint64(b) & 0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -2351,6 +2733,9 @@ func (m *MeshConfig) Unmarshal(dAtA []byte) error { return ErrInvalidLengthConfig } postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthConfig + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -2370,7 +2755,7 @@ func (m *MeshConfig) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLen |= (uint64(b) & 0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -2380,6 +2765,9 @@ func (m *MeshConfig) Unmarshal(dAtA []byte) error { return ErrInvalidLengthConfig } postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthConfig + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -2399,7 +2787,7 @@ func (m *MeshConfig) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - msglen |= (int(b) & 0x7F) << shift + msglen |= int(b&0x7F) << shift if b < 0x80 { break } @@ -2408,6 +2796,9 @@ func (m *MeshConfig) Unmarshal(dAtA []byte) error { return ErrInvalidLengthConfig } postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthConfig + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -2427,9 +2818,13 @@ func (m *MeshConfig) Unmarshal(dAtA []byte) error { if skippy < 0 { return ErrInvalidLengthConfig } + if (iNdEx + skippy) < 0 { + return ErrInvalidLengthConfig + } if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF } + m.XXX_unrecognized = append(m.XXX_unrecognized, dAtA[iNdEx:iNdEx+skippy]...) iNdEx += skippy } } @@ -2454,7 +2849,7 @@ func (m *MeshConfig_OutboundTrafficPolicy) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - wire |= (uint64(b) & 0x7F) << shift + wire |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -2482,7 +2877,7 @@ func (m *MeshConfig_OutboundTrafficPolicy) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - m.Mode |= (MeshConfig_OutboundTrafficPolicy_Mode(b) & 0x7F) << shift + m.Mode |= MeshConfig_OutboundTrafficPolicy_Mode(b&0x7F) << shift if b < 0x80 { break } @@ -2496,9 +2891,13 @@ func (m *MeshConfig_OutboundTrafficPolicy) Unmarshal(dAtA []byte) error { if skippy < 0 { return ErrInvalidLengthConfig } + if (iNdEx + skippy) < 0 { + return ErrInvalidLengthConfig + } if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF } + m.XXX_unrecognized = append(m.XXX_unrecognized, dAtA[iNdEx:iNdEx+skippy]...) iNdEx += skippy } } @@ -2523,7 +2922,7 @@ func (m *ConfigSource) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - wire |= (uint64(b) & 0x7F) << shift + wire |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -2551,7 +2950,7 @@ func (m *ConfigSource) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLen |= (uint64(b) & 0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -2561,6 +2960,9 @@ func (m *ConfigSource) Unmarshal(dAtA []byte) error { return ErrInvalidLengthConfig } postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthConfig + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -2580,7 +2982,7 @@ func (m *ConfigSource) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - msglen |= (int(b) & 0x7F) << shift + msglen |= int(b&0x7F) << shift if b < 0x80 { break } @@ -2589,11 +2991,14 @@ func (m *ConfigSource) Unmarshal(dAtA []byte) error { return ErrInvalidLengthConfig } postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthConfig + } if postIndex > l { return io.ErrUnexpectedEOF } if m.TlsSettings == nil { - m.TlsSettings = &istio_networking_v1alpha31.TLSSettings{} + m.TlsSettings = &v1alpha3.TLSSettings{} } if err := m.TlsSettings.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err @@ -2608,9 +3013,13 @@ func (m *ConfigSource) Unmarshal(dAtA []byte) error { if skippy < 0 { return ErrInvalidLengthConfig } + if (iNdEx + skippy) < 0 { + return ErrInvalidLengthConfig + } if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF } + m.XXX_unrecognized = append(m.XXX_unrecognized, dAtA[iNdEx:iNdEx+skippy]...) iNdEx += skippy } } @@ -2635,7 +3044,7 @@ func (m *LocalityLoadBalancerSetting) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - wire |= (uint64(b) & 0x7F) << shift + wire |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -2663,7 +3072,7 @@ func (m *LocalityLoadBalancerSetting) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - msglen |= (int(b) & 0x7F) << shift + msglen |= int(b&0x7F) << shift if b < 0x80 { break } @@ -2672,6 +3081,9 @@ func (m *LocalityLoadBalancerSetting) Unmarshal(dAtA []byte) error { return ErrInvalidLengthConfig } postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthConfig + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -2694,7 +3106,7 @@ func (m *LocalityLoadBalancerSetting) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - msglen |= (int(b) & 0x7F) << shift + msglen |= int(b&0x7F) << shift if b < 0x80 { break } @@ -2703,6 +3115,9 @@ func (m *LocalityLoadBalancerSetting) Unmarshal(dAtA []byte) error { return ErrInvalidLengthConfig } postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthConfig + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -2720,9 +3135,13 @@ func (m *LocalityLoadBalancerSetting) Unmarshal(dAtA []byte) error { if skippy < 0 { return ErrInvalidLengthConfig } + if (iNdEx + skippy) < 0 { + return ErrInvalidLengthConfig + } if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF } + m.XXX_unrecognized = append(m.XXX_unrecognized, dAtA[iNdEx:iNdEx+skippy]...) iNdEx += skippy } } @@ -2747,7 +3166,7 @@ func (m *LocalityLoadBalancerSetting_Distribute) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - wire |= (uint64(b) & 0x7F) << shift + wire |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -2775,7 +3194,7 @@ func (m *LocalityLoadBalancerSetting_Distribute) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLen |= (uint64(b) & 0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -2785,6 +3204,9 @@ func (m *LocalityLoadBalancerSetting_Distribute) Unmarshal(dAtA []byte) error { return ErrInvalidLengthConfig } postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthConfig + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -2804,7 +3226,7 @@ func (m *LocalityLoadBalancerSetting_Distribute) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - msglen |= (int(b) & 0x7F) << shift + msglen |= int(b&0x7F) << shift if b < 0x80 { break } @@ -2813,6 +3235,9 @@ func (m *LocalityLoadBalancerSetting_Distribute) Unmarshal(dAtA []byte) error { return ErrInvalidLengthConfig } postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthConfig + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -2833,7 +3258,7 @@ func (m *LocalityLoadBalancerSetting_Distribute) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - wire |= (uint64(b) & 0x7F) << shift + wire |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -2850,7 +3275,7 @@ func (m *LocalityLoadBalancerSetting_Distribute) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLenmapkey |= (uint64(b) & 0x7F) << shift + stringLenmapkey |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -2860,6 +3285,9 @@ func (m *LocalityLoadBalancerSetting_Distribute) Unmarshal(dAtA []byte) error { return ErrInvalidLengthConfig } postStringIndexmapkey := iNdEx + intStringLenmapkey + if postStringIndexmapkey < 0 { + return ErrInvalidLengthConfig + } if postStringIndexmapkey > l { return io.ErrUnexpectedEOF } @@ -2875,7 +3303,7 @@ func (m *LocalityLoadBalancerSetting_Distribute) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - mapvalue |= (uint32(b) & 0x7F) << shift + mapvalue |= uint32(b&0x7F) << shift if b < 0x80 { break } @@ -2906,9 +3334,13 @@ func (m *LocalityLoadBalancerSetting_Distribute) Unmarshal(dAtA []byte) error { if skippy < 0 { return ErrInvalidLengthConfig } + if (iNdEx + skippy) < 0 { + return ErrInvalidLengthConfig + } if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF } + m.XXX_unrecognized = append(m.XXX_unrecognized, dAtA[iNdEx:iNdEx+skippy]...) iNdEx += skippy } } @@ -2933,7 +3365,7 @@ func (m *LocalityLoadBalancerSetting_Failover) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - wire |= (uint64(b) & 0x7F) << shift + wire |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -2961,7 +3393,7 @@ func (m *LocalityLoadBalancerSetting_Failover) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLen |= (uint64(b) & 0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -2971,6 +3403,9 @@ func (m *LocalityLoadBalancerSetting_Failover) Unmarshal(dAtA []byte) error { return ErrInvalidLengthConfig } postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthConfig + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -2990,7 +3425,7 @@ func (m *LocalityLoadBalancerSetting_Failover) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLen |= (uint64(b) & 0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -3000,6 +3435,9 @@ func (m *LocalityLoadBalancerSetting_Failover) Unmarshal(dAtA []byte) error { return ErrInvalidLengthConfig } postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthConfig + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -3014,9 +3452,13 @@ func (m *LocalityLoadBalancerSetting_Failover) Unmarshal(dAtA []byte) error { if skippy < 0 { return ErrInvalidLengthConfig } + if (iNdEx + skippy) < 0 { + return ErrInvalidLengthConfig + } if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF } + m.XXX_unrecognized = append(m.XXX_unrecognized, dAtA[iNdEx:iNdEx+skippy]...) iNdEx += skippy } } @@ -3080,10 +3522,13 @@ func skipConfig(dAtA []byte) (n int, err error) { break } } - iNdEx += length if length < 0 { return 0, ErrInvalidLengthConfig } + iNdEx += length + if iNdEx < 0 { + return 0, ErrInvalidLengthConfig + } return iNdEx, nil case 3: for { @@ -3112,6 +3557,9 @@ func skipConfig(dAtA []byte) (n int, err error) { return 0, err } iNdEx = start + next + if iNdEx < 0 { + return 0, ErrInvalidLengthConfig + } } return iNdEx, nil case 4: @@ -3130,101 +3578,3 @@ var ( ErrInvalidLengthConfig = fmt.Errorf("proto: negative length found during unmarshaling") ErrIntOverflowConfig = fmt.Errorf("proto: integer overflow") ) - -func init() { proto.RegisterFile("mesh/v1alpha1/config.proto", fileDescriptorConfig) } - -var fileDescriptorConfig = []byte{ - // 1463 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x56, 0xdd, 0x72, 0xdb, 0xb8, - 0x15, 0x0e, 0x65, 0x27, 0x76, 0x8e, 0x7e, 0x4c, 0xc1, 0x71, 0x96, 0x51, 0xba, 0x5e, 0x59, 0x3b, - 0x49, 0x34, 0x9e, 0x8e, 0xdc, 0x38, 0xb3, 0x33, 0xc9, 0xf6, 0xca, 0x91, 0xe4, 0x8d, 0xbd, 0x8a, - 0xe5, 0xa1, 0xe8, 0xb4, 0x69, 0x2f, 0x50, 0x98, 0x84, 0x24, 0xd4, 0x14, 0xc1, 0x21, 0x40, 0x27, - 0x7a, 0xa7, 0x76, 0xa6, 0x8f, 0xd1, 0xcb, 0x3e, 0x42, 0x27, 0x77, 0x7d, 0x8b, 0x0e, 0x7e, 0x68, - 0x29, 0x59, 0xcd, 0xba, 0xdb, 0xbd, 0x23, 0xbe, 0xf3, 0x9d, 0xef, 0x00, 0xe7, 0x1c, 0xe0, 0x10, - 0x1a, 0x33, 0x2a, 0xa6, 0x07, 0xd7, 0xcf, 0x49, 0x9c, 0x4e, 0xc9, 0xf3, 0x83, 0x90, 0x27, 0x63, - 0x36, 0xe9, 0xa4, 0x19, 0x97, 0x1c, 0x6d, 0x33, 0x21, 0x19, 0xef, 0x28, 0x46, 0xa7, 0x60, 0x34, - 0x76, 0x27, 0x9c, 0x4f, 0x62, 0x7a, 0xa0, 0x29, 0x97, 0xf9, 0xf8, 0x20, 0xca, 0x33, 0x22, 0x19, - 0x4f, 0x8c, 0x53, 0xe3, 0xd1, 0xe7, 0x82, 0x69, 0xc6, 0x3f, 0xce, 0xad, 0x69, 0x3f, 0xa1, 0xf2, - 0x03, 0xcf, 0xae, 0x58, 0x32, 0x29, 0x08, 0x2f, 0x0e, 0x22, 0x2a, 0x24, 0x4b, 0xb4, 0x02, 0xce, - 0xf2, 0x98, 0x1a, 0x6e, 0xeb, 0x3f, 0x08, 0xe0, 0x2d, 0x15, 0xd3, 0xae, 0xde, 0x10, 0xfa, 0x2d, - 0xa0, 0x19, 0xfb, 0x48, 0x33, 0x1c, 0x4e, 0x69, 0x78, 0x85, 0x05, 0xcd, 0xae, 0x69, 0xe6, 0x39, - 0x4d, 0xa7, 0x7d, 0xdf, 0x77, 0xb5, 0xa5, 0xab, 0x0c, 0x23, 0x8d, 0xa3, 0x0e, 0x6c, 0x1b, 0x76, - 0x46, 0x53, 0x9e, 0xc9, 0x82, 0x5e, 0xd2, 0xf4, 0xba, 0x36, 0xf9, 0xda, 0x62, 0xf9, 0x87, 0xb0, - 0x13, 0x31, 0x41, 0x2e, 0x63, 0x8a, 0x53, 0x1e, 0xb3, 0x70, 0x6e, 0xc2, 0x08, 0x6f, 0xad, 0xe9, - 0xb4, 0x37, 0xfd, 0x6d, 0x6b, 0x3c, 0xd7, 0x36, 0x1d, 0x48, 0xa0, 0x7d, 0xa8, 0xeb, 0xb3, 0xe1, - 0x98, 0x09, 0x49, 0x13, 0xac, 0xe4, 0xbc, 0xf5, 0xa6, 0xd3, 0xbe, 0xeb, 0x6f, 0x69, 0xc3, 0x40, - 0xe3, 0xe7, 0x3c, 0x93, 0xe8, 0x29, 0x18, 0x08, 0x4f, 0xa5, 0x4c, 0x0d, 0xf3, 0xae, 0x66, 0x56, - 0x35, 0xfc, 0x46, 0xca, 0x54, 0xf3, 0x5e, 0xc3, 0x56, 0xc8, 0x93, 0x84, 0x86, 0x12, 0x4b, 0x36, - 0xa3, 0x3c, 0x97, 0xde, 0xbd, 0xa6, 0xd3, 0x2e, 0x1f, 0x3e, 0xea, 0x98, 0xac, 0x77, 0x8a, 0xac, - 0x77, 0x7a, 0x36, 0xeb, 0x7e, 0xcd, 0x7a, 0x04, 0xc6, 0x01, 0x7d, 0x0b, 0x55, 0x96, 0x4c, 0x32, - 0x2a, 0x04, 0x0e, 0x63, 0x22, 0x84, 0xb7, 0xa1, 0x4f, 0x5d, 0xb1, 0x60, 0x57, 0x61, 0xe8, 0x19, - 0x6c, 0x15, 0x24, 0x95, 0x1b, 0x16, 0x52, 0x6f, 0x53, 0xd3, 0x6a, 0x16, 0x1e, 0x19, 0x14, 0xcd, - 0xe0, 0xab, 0x1b, 0x35, 0x9e, 0xc8, 0x8c, 0xc7, 0x31, 0xcd, 0xf0, 0x8c, 0x47, 0xd4, 0xbb, 0xdf, - 0x74, 0xda, 0xb5, 0xc3, 0xef, 0x3a, 0x2b, 0x9a, 0xa4, 0xb3, 0xa8, 0x5c, 0xe7, 0xc4, 0xc6, 0xbd, - 0xf1, 0x7e, 0xcb, 0x23, 0xea, 0xef, 0xb0, 0x55, 0x30, 0x1a, 0x42, 0x99, 0xe4, 0x72, 0x6a, 0xab, - 0xe0, 0x81, 0x0e, 0xb1, 0x7f, 0x5b, 0x88, 0xa3, 0x5c, 0x4e, 0x4d, 0x6d, 0x5e, 0x97, 0x3c, 0xc7, - 0x07, 0x72, 0xb3, 0x46, 0x27, 0x50, 0xcf, 0x22, 0x81, 0x33, 0x3a, 0xce, 0xa8, 0x98, 0xe2, 0x88, - 0xc6, 0x64, 0xee, 0x95, 0x6f, 0xc9, 0xa9, 0x56, 0xd9, 0xca, 0x22, 0xe1, 0x1b, 0xb7, 0x9e, 0xf2, - 0x42, 0x4f, 0xa0, 0x46, 0x13, 0xdd, 0x23, 0x32, 0x23, 0x21, 0x4b, 0x26, 0x5e, 0x45, 0x77, 0x47, - 0xd5, 0xa0, 0x81, 0x01, 0x55, 0xad, 0x49, 0x18, 0xaa, 0x84, 0xc5, 0x7c, 0x82, 0xc7, 0x2c, 0xa6, - 0x5e, 0x55, 0xa7, 0xb6, 0x6a, 0xe0, 0x01, 0x9f, 0x1c, 0xb3, 0x98, 0xa2, 0x1f, 0xa0, 0x16, 0xd1, - 0x31, 0xc9, 0x63, 0x89, 0xcd, 0xa5, 0xf3, 0x6a, 0x7a, 0x5b, 0xcd, 0x95, 0xa7, 0x3d, 0x57, 0x7d, - 0x62, 0x8e, 0xeb, 0x57, 0xad, 0x9f, 0xbd, 0x1a, 0xcf, 0xa0, 0x6a, 0x9a, 0x9d, 0x44, 0x91, 0x4a, - 0xa9, 0xe7, 0xaa, 0x70, 0xfa, 0x0c, 0x15, 0x6d, 0x38, 0x32, 0xb8, 0xaa, 0x25, 0xcf, 0xe5, 0x25, - 0xcf, 0x93, 0x48, 0x1d, 0x61, 0x3c, 0x66, 0x61, 0x91, 0xe8, 0xba, 0x0e, 0x7d, 0x6b, 0x2d, 0x87, - 0xd6, 0x3d, 0x30, 0xde, 0x26, 0xc7, 0xfe, 0x0e, 0x5f, 0x05, 0xa3, 0x1e, 0x7c, 0x63, 0xf3, 0x15, - 0xc6, 0x8c, 0x26, 0x12, 0x0b, 0x16, 0x7d, 0x7e, 0xbf, 0xbc, 0x6d, 0x9d, 0xc0, 0xc7, 0x86, 0xd6, - 0xd5, 0xac, 0x11, 0x8b, 0x96, 0xef, 0x19, 0x6a, 0x42, 0x45, 0x44, 0x02, 0xe7, 0x91, 0xc0, 0x29, - 0x91, 0x53, 0xef, 0x81, 0xce, 0x25, 0x88, 0x48, 0x5c, 0x44, 0xe2, 0x9c, 0xc8, 0xa9, 0x2a, 0xb1, - 0xf8, 0x49, 0x89, 0x77, 0xfe, 0xa7, 0x12, 0x8b, 0x2f, 0x4a, 0xfc, 0x06, 0x6a, 0xa6, 0x16, 0x58, - 0xf0, 0x3c, 0x0b, 0xa9, 0xf0, 0x1e, 0x36, 0xd7, 0xda, 0xe5, 0xc3, 0xbd, 0x95, 0x89, 0x31, 0x49, - 0x19, 0x69, 0xa6, 0x5f, 0x0d, 0x97, 0x56, 0x02, 0xbd, 0x80, 0x87, 0xf6, 0xf0, 0x6a, 0x6f, 0x92, - 0x5f, 0xd1, 0x04, 0xcf, 0x78, 0x9e, 0x48, 0xef, 0x2b, 0xf3, 0xa4, 0x18, 0xeb, 0x28, 0x12, 0x81, - 0xb2, 0xbd, 0x55, 0x26, 0xf5, 0xa4, 0x2c, 0xb7, 0x0e, 0xcf, 0x66, 0x44, 0x7a, 0x9e, 0x3e, 0xf0, - 0xd6, 0xa2, 0x79, 0x34, 0xac, 0x02, 0x2c, 0xa7, 0x12, 0x8f, 0x09, 0x8b, 0x31, 0x4f, 0x69, 0xe2, - 0x3d, 0x32, 0x01, 0xd2, 0x45, 0x12, 0x8f, 0x09, 0x8b, 0x87, 0x29, 0x4d, 0xd0, 0x1e, 0x54, 0x64, - 0x96, 0x0b, 0x89, 0x23, 0x3e, 0x23, 0x2c, 0xf1, 0x1a, 0x5a, 0xbb, 0xac, 0xb1, 0x9e, 0x86, 0x10, - 0x81, 0xed, 0xa5, 0x3d, 0xd0, 0x24, 0xe4, 0x91, 0x6a, 0xf5, 0xc7, 0xfa, 0x26, 0x3e, 0xbf, 0xf5, - 0x26, 0x16, 0xbb, 0xec, 0x5b, 0x47, 0xbf, 0x4e, 0xbe, 0x84, 0x10, 0x87, 0xaa, 0x0c, 0x53, 0x7c, - 0x45, 0x69, 0x4a, 0x62, 0x76, 0x4d, 0xbd, 0xdf, 0xe8, 0x62, 0x9d, 0x5a, 0xf1, 0xc5, 0x90, 0x28, - 0x42, 0xbc, 0x50, 0xa9, 0x56, 0x6f, 0x1c, 0xe3, 0xc9, 0x39, 0xe7, 0xf1, 0x88, 0x4a, 0xc9, 0x92, - 0x89, 0xe8, 0x04, 0xdd, 0xf3, 0xc5, 0x77, 0x98, 0xfe, 0x58, 0x28, 0xfa, 0x15, 0xb9, 0xb4, 0x42, - 0xfb, 0x80, 0x74, 0x0f, 0x09, 0x8a, 0xaf, 0x5e, 0x0a, 0x2c, 0x08, 0xfe, 0xeb, 0x07, 0xe9, 0x7d, - 0xad, 0xf3, 0x54, 0x53, 0x9d, 0x24, 0xe8, 0x8f, 0x2f, 0xc5, 0x88, 0x9c, 0x7e, 0x90, 0xe8, 0x1c, - 0x9e, 0xa8, 0x3e, 0x0d, 0x49, 0x86, 0x25, 0xc7, 0x92, 0xc6, 0x74, 0x46, 0x65, 0x36, 0xc7, 0x82, - 0x0a, 0xa1, 0x46, 0x94, 0xea, 0xf0, 0x84, 0xc9, 0xb9, 0xb7, 0xab, 0xdd, 0xf7, 0x2c, 0x39, 0xe0, - 0x41, 0x41, 0x1d, 0x19, 0xe6, 0x91, 0x25, 0xa2, 0x57, 0xf0, 0xa8, 0xb8, 0xe8, 0xf6, 0xad, 0xc5, - 0xf4, 0xa3, 0x1e, 0x4b, 0x92, 0x7b, 0xdf, 0x34, 0xd7, 0xda, 0xf7, 0xfd, 0x87, 0x96, 0x60, 0x5f, - 0xdd, 0xbe, 0x36, 0x07, 0x1c, 0xbd, 0x81, 0xbd, 0xc2, 0xf5, 0x9a, 0x65, 0x32, 0x27, 0xf1, 0x0a, - 0x89, 0xa6, 0x96, 0xf8, 0xda, 0x12, 0xdf, 0x19, 0xde, 0x97, 0x4a, 0xa7, 0xd0, 0x2a, 0x94, 0xbe, - 0x1c, 0xb8, 0x4b, 0x52, 0x7b, 0x5a, 0x6a, 0xd7, 0x32, 0x7b, 0x0b, 0xa2, 0x9f, 0xc7, 0x0b, 0xad, - 0x27, 0x50, 0xcb, 0x38, 0x97, 0x38, 0x21, 0x33, 0x2a, 0x52, 0x12, 0x52, 0xaf, 0x65, 0x1e, 0x38, - 0x85, 0x9e, 0x15, 0x20, 0xfa, 0x0b, 0x6c, 0xc7, 0x3c, 0x24, 0x31, 0x93, 0x73, 0x1c, 0x5f, 0x62, - 0x61, 0x0a, 0xe5, 0x7d, 0xab, 0x8b, 0xfd, 0xbb, 0x95, 0x9d, 0x34, 0xb0, 0xfc, 0x01, 0x27, 0xd1, - 0x6b, 0x12, 0x93, 0x24, 0xa4, 0x99, 0x2d, 0xb0, 0x5f, 0x2f, 0xc4, 0x06, 0x97, 0x16, 0x6a, 0xfc, - 0xdd, 0x81, 0x9d, 0x95, 0x4f, 0x12, 0x3a, 0x83, 0x75, 0x3d, 0xa3, 0x1c, 0xdd, 0xb6, 0xdf, 0xff, - 0x5f, 0xef, 0x5a, 0x47, 0x0f, 0x2a, 0xad, 0xd3, 0xea, 0xc1, 0xba, 0x9e, 0x4f, 0x75, 0xa8, 0xfa, - 0xfd, 0x1f, 0x4e, 0x46, 0x81, 0xff, 0x1e, 0x0f, 0xcf, 0x06, 0xef, 0xdd, 0x3b, 0xa8, 0x0a, 0xf7, - 0x8f, 0x06, 0x83, 0xe1, 0x1f, 0xf0, 0xd1, 0xd9, 0x7b, 0xd7, 0x69, 0xad, 0x6f, 0x96, 0xdc, 0xd2, - 0xfe, 0x83, 0x77, 0x27, 0x7e, 0x70, 0x71, 0x34, 0xc0, 0xa3, 0xbe, 0xff, 0xee, 0xa4, 0xdb, 0xd7, - 0xe4, 0xd6, 0x2b, 0xd8, 0x59, 0x39, 0x0d, 0xd1, 0x06, 0xac, 0x0d, 0x8f, 0x8f, 0xdd, 0x3b, 0xa8, - 0x0c, 0x1b, 0xbd, 0xfe, 0xf1, 0xd1, 0xc5, 0x20, 0x70, 0x1d, 0x04, 0x70, 0x6f, 0x14, 0xf8, 0x27, - 0xdd, 0xc0, 0x2d, 0xb5, 0x9e, 0x02, 0x2c, 0xa6, 0x1c, 0xda, 0x84, 0xf5, 0xb3, 0xe1, 0x59, 0xdf, - 0xbd, 0x83, 0x6a, 0x00, 0x6f, 0x2f, 0x74, 0xa4, 0x60, 0x30, 0x72, 0x9d, 0xd6, 0x33, 0xa8, 0xff, - 0xe4, 0x0e, 0x2a, 0x7a, 0xd0, 0xff, 0x63, 0xe0, 0xde, 0x51, 0x5f, 0xa7, 0xa3, 0xe1, 0x99, 0xeb, - 0x9c, 0xae, 0x6f, 0x6e, 0xb9, 0xee, 0xe9, 0xfa, 0x26, 0x72, 0xb7, 0x5b, 0x02, 0x2a, 0xcb, 0x6f, - 0x19, 0xf2, 0x60, 0xa3, 0x98, 0x25, 0xe6, 0x0f, 0xab, 0x58, 0xa2, 0x13, 0xa8, 0xc8, 0x58, 0x14, - 0xb5, 0x14, 0xfa, 0x8f, 0xaa, 0x7c, 0xf8, 0xf4, 0x67, 0x6e, 0x6e, 0x30, 0x18, 0x15, 0x57, 0xd4, - 0x2f, 0xcb, 0x58, 0x14, 0x8b, 0xd6, 0x3f, 0xd6, 0xe0, 0xf1, 0xcf, 0xd4, 0x1b, 0xfd, 0x19, 0x20, - 0x62, 0x42, 0x66, 0xec, 0x32, 0x97, 0xaa, 0x90, 0xea, 0x1d, 0xfe, 0xfd, 0x2f, 0xed, 0x9a, 0x4e, - 0xef, 0x46, 0xc2, 0x5f, 0x92, 0x43, 0x17, 0xb0, 0xa9, 0x1e, 0x4c, 0x6e, 0xfe, 0x0a, 0x95, 0xf4, - 0xab, 0x5f, 0x2c, 0x7d, 0x6c, 0x05, 0xfc, 0x1b, 0xa9, 0xc6, 0xdf, 0x1c, 0x80, 0x45, 0x44, 0x84, - 0x60, 0x7d, 0x9c, 0xf1, 0x99, 0x4d, 0xa2, 0xfe, 0x46, 0x23, 0x28, 0x49, 0x6e, 0x63, 0x76, 0x7f, - 0xc5, 0x71, 0x3a, 0x01, 0xef, 0x27, 0x32, 0x9b, 0xfb, 0x25, 0xc9, 0x1b, 0xdf, 0xc1, 0x86, 0x5d, - 0x22, 0x17, 0xd6, 0xae, 0xe8, 0xdc, 0x86, 0x54, 0x9f, 0xe8, 0x01, 0xdc, 0xbd, 0x26, 0x71, 0x4e, - 0x75, 0xb1, 0xaa, 0xbe, 0x59, 0x7c, 0x5f, 0x7a, 0xe9, 0x34, 0x3a, 0xb0, 0x59, 0x1c, 0x62, 0xe5, - 0x5e, 0x6b, 0x76, 0xaf, 0x0a, 0x29, 0x49, 0xfe, 0xba, 0xfd, 0xcf, 0x4f, 0xbb, 0xce, 0xbf, 0x3e, - 0xed, 0x3a, 0xff, 0xfe, 0xb4, 0xeb, 0xfc, 0xa9, 0x61, 0x36, 0xcf, 0xf8, 0x01, 0x49, 0xd9, 0xc1, - 0x67, 0x7f, 0xfd, 0x97, 0xf7, 0xf4, 0xc0, 0x7d, 0xf1, 0xdf, 0x00, 0x00, 0x00, 0xff, 0xff, 0xe4, - 0xc5, 0xfa, 0x45, 0x5e, 0x0c, 0x00, 0x00, -} diff --git a/mesh/v1alpha1/network.pb.go b/mesh/v1alpha1/network.pb.go index 6c7f002b4ff..d29f114fd78 100644 --- a/mesh/v1alpha1/network.pb.go +++ b/mesh/v1alpha1/network.pb.go @@ -3,17 +3,24 @@ package v1alpha1 -import proto "github.com/gogo/protobuf/proto" -import fmt "fmt" -import math "math" - -import io "io" +import ( + fmt "fmt" + proto "github.com/gogo/protobuf/proto" + io "io" + math "math" +) // Reference imports to suppress errors if they are not otherwise used. var _ = proto.Marshal var _ = fmt.Errorf var _ = math.Inf +// This is a compile-time assertion to ensure that this generated file +// is compatible with the proto package it is being compiled against. +// A compilation error at this line likely means your copy of the +// proto package needs to be updated. +const _ = proto.GoGoProtoPackageIsVersion2 // please upgrade the proto package + // Network provides information about the endpoints in a routable L3 // network. A single routable L3 network can have one or more service // registries. Note that the network has no relation to the locality of the @@ -23,15 +30,46 @@ type Network struct { // REQUIRED: The list of endpoints in the network (obtained through the // constituent service registries or from CIDR ranges). All endpoints in // the network are directly accessible to one another. - Endpoints []*Network_NetworkEndpoints `protobuf:"bytes,2,rep,name=endpoints" json:"endpoints,omitempty"` + Endpoints []*Network_NetworkEndpoints `protobuf:"bytes,2,rep,name=endpoints,proto3" json:"endpoints,omitempty"` // REQUIRED: Set of gateways associated with the network. - Gateways []*Network_IstioNetworkGateway `protobuf:"bytes,3,rep,name=gateways" json:"gateways,omitempty"` + Gateways []*Network_IstioNetworkGateway `protobuf:"bytes,3,rep,name=gateways,proto3" json:"gateways,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` +} + +func (m *Network) Reset() { *m = Network{} } +func (m *Network) String() string { return proto.CompactTextString(m) } +func (*Network) ProtoMessage() {} +func (*Network) Descriptor() ([]byte, []int) { + return fileDescriptor_a15df2a96e10cd86, []int{0} +} +func (m *Network) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *Network) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_Network.Marshal(b, m, deterministic) + } else { + b = b[:cap(b)] + n, err := m.MarshalTo(b) + if err != nil { + return nil, err + } + return b[:n], nil + } +} +func (m *Network) XXX_Merge(src proto.Message) { + xxx_messageInfo_Network.Merge(m, src) +} +func (m *Network) XXX_Size() int { + return m.Size() +} +func (m *Network) XXX_DiscardUnknown() { + xxx_messageInfo_Network.DiscardUnknown(m) } -func (m *Network) Reset() { *m = Network{} } -func (m *Network) String() string { return proto.CompactTextString(m) } -func (*Network) ProtoMessage() {} -func (*Network) Descriptor() ([]byte, []int) { return fileDescriptorNetwork, []int{0} } +var xxx_messageInfo_Network proto.InternalMessageInfo func (m *Network) GetEndpoints() []*Network_NetworkEndpoints { if m != nil { @@ -71,15 +109,44 @@ type Network_NetworkEndpoints struct { // Types that are valid to be assigned to Ne: // *Network_NetworkEndpoints_FromCidr // *Network_NetworkEndpoints_FromRegistry - Ne isNetwork_NetworkEndpoints_Ne `protobuf_oneof:"ne"` + Ne isNetwork_NetworkEndpoints_Ne `protobuf_oneof:"ne"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` } func (m *Network_NetworkEndpoints) Reset() { *m = Network_NetworkEndpoints{} } func (m *Network_NetworkEndpoints) String() string { return proto.CompactTextString(m) } func (*Network_NetworkEndpoints) ProtoMessage() {} func (*Network_NetworkEndpoints) Descriptor() ([]byte, []int) { - return fileDescriptorNetwork, []int{0, 0} + return fileDescriptor_a15df2a96e10cd86, []int{0, 0} +} +func (m *Network_NetworkEndpoints) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *Network_NetworkEndpoints) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_Network_NetworkEndpoints.Marshal(b, m, deterministic) + } else { + b = b[:cap(b)] + n, err := m.MarshalTo(b) + if err != nil { + return nil, err + } + return b[:n], nil + } +} +func (m *Network_NetworkEndpoints) XXX_Merge(src proto.Message) { + xxx_messageInfo_Network_NetworkEndpoints.Merge(m, src) +} +func (m *Network_NetworkEndpoints) XXX_Size() int { + return m.Size() } +func (m *Network_NetworkEndpoints) XXX_DiscardUnknown() { + xxx_messageInfo_Network_NetworkEndpoints.DiscardUnknown(m) +} + +var xxx_messageInfo_Network_NetworkEndpoints proto.InternalMessageInfo type isNetwork_NetworkEndpoints_Ne interface { isNetwork_NetworkEndpoints_Ne() @@ -170,11 +237,11 @@ func _Network_NetworkEndpoints_OneofSizer(msg proto.Message) (n int) { // ne switch x := m.Ne.(type) { case *Network_NetworkEndpoints_FromCidr: - n += proto.SizeVarint(1<<3 | proto.WireBytes) + n += 1 // tag and wire n += proto.SizeVarint(uint64(len(x.FromCidr))) n += len(x.FromCidr) case *Network_NetworkEndpoints_FromRegistry: - n += proto.SizeVarint(2<<3 | proto.WireBytes) + n += 1 // tag and wire n += proto.SizeVarint(uint64(len(x.FromRegistry))) n += len(x.FromRegistry) case nil: @@ -195,16 +262,45 @@ type Network_IstioNetworkGateway struct { // REQUIRED: The port associated with the gateway. Port uint32 `protobuf:"varint,3,opt,name=port,proto3" json:"port,omitempty"` // The locality associated with an explicitly specified gateway (i.e. ip) - Locality string `protobuf:"bytes,4,opt,name=locality,proto3" json:"locality,omitempty"` + Locality string `protobuf:"bytes,4,opt,name=locality,proto3" json:"locality,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` } func (m *Network_IstioNetworkGateway) Reset() { *m = Network_IstioNetworkGateway{} } func (m *Network_IstioNetworkGateway) String() string { return proto.CompactTextString(m) } func (*Network_IstioNetworkGateway) ProtoMessage() {} func (*Network_IstioNetworkGateway) Descriptor() ([]byte, []int) { - return fileDescriptorNetwork, []int{0, 1} + return fileDescriptor_a15df2a96e10cd86, []int{0, 1} +} +func (m *Network_IstioNetworkGateway) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *Network_IstioNetworkGateway) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_Network_IstioNetworkGateway.Marshal(b, m, deterministic) + } else { + b = b[:cap(b)] + n, err := m.MarshalTo(b) + if err != nil { + return nil, err + } + return b[:n], nil + } +} +func (m *Network_IstioNetworkGateway) XXX_Merge(src proto.Message) { + xxx_messageInfo_Network_IstioNetworkGateway.Merge(m, src) +} +func (m *Network_IstioNetworkGateway) XXX_Size() int { + return m.Size() +} +func (m *Network_IstioNetworkGateway) XXX_DiscardUnknown() { + xxx_messageInfo_Network_IstioNetworkGateway.DiscardUnknown(m) } +var xxx_messageInfo_Network_IstioNetworkGateway proto.InternalMessageInfo + type isNetwork_IstioNetworkGateway_Gw interface { isNetwork_IstioNetworkGateway_Gw() MarshalTo([]byte) (int, error) @@ -308,11 +404,11 @@ func _Network_IstioNetworkGateway_OneofSizer(msg proto.Message) (n int) { // gw switch x := m.Gw.(type) { case *Network_IstioNetworkGateway_RegistryServiceName: - n += proto.SizeVarint(1<<3 | proto.WireBytes) + n += 1 // tag and wire n += proto.SizeVarint(uint64(len(x.RegistryServiceName))) n += len(x.RegistryServiceName) case *Network_IstioNetworkGateway_Address: - n += proto.SizeVarint(2<<3 | proto.WireBytes) + n += 1 // tag and wire n += proto.SizeVarint(uint64(len(x.Address))) n += len(x.Address) case nil: @@ -339,13 +435,44 @@ type MeshNetworks struct { // REQUIRED: The set of networks inside this mesh. Each network should // have a unique name and information about how to infer the endpoints in // the network as well as the gateways associated with the network. - Networks map[string]*Network `protobuf:"bytes,1,rep,name=networks" json:"networks,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value"` + Networks map[string]*Network `protobuf:"bytes,1,rep,name=networks,proto3" json:"networks,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` } -func (m *MeshNetworks) Reset() { *m = MeshNetworks{} } -func (m *MeshNetworks) String() string { return proto.CompactTextString(m) } -func (*MeshNetworks) ProtoMessage() {} -func (*MeshNetworks) Descriptor() ([]byte, []int) { return fileDescriptorNetwork, []int{1} } +func (m *MeshNetworks) Reset() { *m = MeshNetworks{} } +func (m *MeshNetworks) String() string { return proto.CompactTextString(m) } +func (*MeshNetworks) ProtoMessage() {} +func (*MeshNetworks) Descriptor() ([]byte, []int) { + return fileDescriptor_a15df2a96e10cd86, []int{1} +} +func (m *MeshNetworks) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *MeshNetworks) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_MeshNetworks.Marshal(b, m, deterministic) + } else { + b = b[:cap(b)] + n, err := m.MarshalTo(b) + if err != nil { + return nil, err + } + return b[:n], nil + } +} +func (m *MeshNetworks) XXX_Merge(src proto.Message) { + xxx_messageInfo_MeshNetworks.Merge(m, src) +} +func (m *MeshNetworks) XXX_Size() int { + return m.Size() +} +func (m *MeshNetworks) XXX_DiscardUnknown() { + xxx_messageInfo_MeshNetworks.DiscardUnknown(m) +} + +var xxx_messageInfo_MeshNetworks proto.InternalMessageInfo func (m *MeshNetworks) GetNetworks() map[string]*Network { if m != nil { @@ -359,7 +486,41 @@ func init() { proto.RegisterType((*Network_NetworkEndpoints)(nil), "istio.mesh.v1alpha1.Network.NetworkEndpoints") proto.RegisterType((*Network_IstioNetworkGateway)(nil), "istio.mesh.v1alpha1.Network.IstioNetworkGateway") proto.RegisterType((*MeshNetworks)(nil), "istio.mesh.v1alpha1.MeshNetworks") + proto.RegisterMapType((map[string]*Network)(nil), "istio.mesh.v1alpha1.MeshNetworks.NetworksEntry") +} + +func init() { proto.RegisterFile("mesh/v1alpha1/network.proto", fileDescriptor_a15df2a96e10cd86) } + +var fileDescriptor_a15df2a96e10cd86 = []byte{ + // 403 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x92, 0xcf, 0x8e, 0xda, 0x30, + 0x10, 0xc6, 0xeb, 0x84, 0x96, 0x30, 0x80, 0x84, 0x8c, 0x2a, 0x45, 0x69, 0x8b, 0x10, 0x52, 0xa5, + 0x5c, 0x9a, 0x14, 0xda, 0x43, 0xd5, 0x23, 0x15, 0x6a, 0x2b, 0x5a, 0x0e, 0xee, 0xa9, 0x3d, 0x14, + 0xb9, 0xc4, 0x05, 0x8b, 0x24, 0x8e, 0x6c, 0x2f, 0x28, 0x0f, 0xb3, 0xb7, 0x7d, 0x86, 0x7d, 0x86, + 0x3d, 0xee, 0x23, 0xac, 0x78, 0x92, 0x55, 0xfe, 0xee, 0xb2, 0x42, 0x9c, 0x6c, 0xcf, 0xf7, 0xfd, + 0x66, 0xc6, 0x63, 0xc3, 0xab, 0x88, 0xa9, 0x8d, 0xbf, 0x1b, 0xd3, 0x30, 0xd9, 0xd0, 0xb1, 0x1f, + 0x33, 0xbd, 0x17, 0x72, 0xeb, 0x25, 0x52, 0x68, 0x81, 0xfb, 0x5c, 0x69, 0x2e, 0xbc, 0xcc, 0xe2, + 0x55, 0x96, 0xd1, 0x95, 0x09, 0xcd, 0x45, 0x61, 0xc3, 0x73, 0x68, 0xb1, 0x38, 0x48, 0x04, 0x8f, + 0xb5, 0xb2, 0x8d, 0xa1, 0xe9, 0xb6, 0x27, 0xef, 0xbc, 0x13, 0x90, 0x57, 0x02, 0xd5, 0x3a, 0xab, + 0x20, 0xf2, 0xc0, 0xe3, 0x1f, 0x60, 0xad, 0xa9, 0x66, 0x7b, 0x9a, 0x2a, 0xdb, 0xcc, 0x73, 0xbd, + 0x3f, 0x9b, 0xeb, 0x7b, 0xa6, 0x95, 0x87, 0xaf, 0x05, 0x48, 0xea, 0x0c, 0xce, 0x5f, 0xe8, 0x3d, + 0x2d, 0x86, 0xdf, 0x40, 0xeb, 0xbf, 0x14, 0xd1, 0x72, 0xc5, 0x03, 0x69, 0xa3, 0x21, 0x72, 0x5b, + 0xdf, 0x9e, 0x11, 0x2b, 0x0b, 0x7d, 0xe1, 0x81, 0xc4, 0x6f, 0xa1, 0x9b, 0xcb, 0x92, 0xad, 0xb9, + 0xd2, 0x32, 0xb5, 0x8d, 0xd2, 0xd2, 0xc9, 0xc2, 0xa4, 0x8c, 0x4e, 0x1b, 0x60, 0xc4, 0xcc, 0xb9, + 0x44, 0xd0, 0x3f, 0xd1, 0x01, 0xfe, 0x08, 0x2f, 0x2b, 0x7e, 0xa9, 0x98, 0xdc, 0xf1, 0x15, 0x5b, + 0xc6, 0x34, 0x62, 0x75, 0xbd, 0x7e, 0x25, 0xff, 0x2a, 0xd4, 0x05, 0x8d, 0x18, 0x76, 0xa0, 0x49, + 0x83, 0x40, 0x32, 0xa5, 0xea, 0xa2, 0x55, 0x00, 0x63, 0x68, 0x24, 0x42, 0x6a, 0xdb, 0x1c, 0x22, + 0xb7, 0x4b, 0xf2, 0x3d, 0x76, 0xc0, 0x0a, 0xc5, 0x8a, 0x86, 0x5c, 0xa7, 0x76, 0x23, 0x03, 0x48, + 0x7d, 0xce, 0xfa, 0x5b, 0xef, 0x47, 0xd7, 0x08, 0x3a, 0x3f, 0x99, 0xda, 0x94, 0xed, 0x29, 0x3c, + 0x07, 0xab, 0x7c, 0x5d, 0x65, 0xa3, 0x7c, 0xbc, 0xfe, 0xc9, 0xf1, 0x3e, 0x86, 0xaa, 0x59, 0xab, + 0x59, 0xac, 0x65, 0x4a, 0xea, 0x04, 0xce, 0x6f, 0xe8, 0x1e, 0x49, 0xb8, 0x07, 0xe6, 0x96, 0xa5, + 0xc5, 0x25, 0x49, 0xb6, 0xc5, 0x13, 0x78, 0xbe, 0xa3, 0xe1, 0x05, 0xcb, 0x2f, 0xd4, 0x9e, 0xbc, + 0x3e, 0xf7, 0x96, 0xa4, 0xb0, 0x7e, 0x36, 0x3e, 0xa1, 0xa9, 0x7b, 0x73, 0x18, 0xa0, 0xdb, 0xc3, + 0x00, 0xdd, 0x1d, 0x06, 0xe8, 0x8f, 0x53, 0x50, 0x5c, 0xf8, 0x34, 0xe1, 0xfe, 0xd1, 0x67, 0xfd, + 0xf7, 0x22, 0xff, 0xa5, 0x1f, 0xee, 0x03, 0x00, 0x00, 0xff, 0xff, 0xbc, 0x70, 0x44, 0x24, 0xc4, + 0x02, 0x00, 0x00, } + func (m *Network) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) @@ -399,6 +560,9 @@ func (m *Network) MarshalTo(dAtA []byte) (int, error) { i += n } } + if m.XXX_unrecognized != nil { + i += copy(dAtA[i:], m.XXX_unrecognized) + } return i, nil } @@ -424,6 +588,9 @@ func (m *Network_NetworkEndpoints) MarshalTo(dAtA []byte) (int, error) { } i += nn1 } + if m.XXX_unrecognized != nil { + i += copy(dAtA[i:], m.XXX_unrecognized) + } return i, nil } @@ -476,6 +643,9 @@ func (m *Network_IstioNetworkGateway) MarshalTo(dAtA []byte) (int, error) { i = encodeVarintNetwork(dAtA, i, uint64(len(m.Locality))) i += copy(dAtA[i:], m.Locality) } + if m.XXX_unrecognized != nil { + i += copy(dAtA[i:], m.XXX_unrecognized) + } return i, nil } @@ -538,6 +708,9 @@ func (m *MeshNetworks) MarshalTo(dAtA []byte) (int, error) { } } } + if m.XXX_unrecognized != nil { + i += copy(dAtA[i:], m.XXX_unrecognized) + } return i, nil } @@ -551,6 +724,9 @@ func encodeVarintNetwork(dAtA []byte, offset int, v uint64) int { return offset + 1 } func (m *Network) Size() (n int) { + if m == nil { + return 0 + } var l int _ = l if len(m.Endpoints) > 0 { @@ -565,19 +741,31 @@ func (m *Network) Size() (n int) { n += 1 + l + sovNetwork(uint64(l)) } } + if m.XXX_unrecognized != nil { + n += len(m.XXX_unrecognized) + } return n } func (m *Network_NetworkEndpoints) Size() (n int) { + if m == nil { + return 0 + } var l int _ = l if m.Ne != nil { n += m.Ne.Size() } + if m.XXX_unrecognized != nil { + n += len(m.XXX_unrecognized) + } return n } func (m *Network_NetworkEndpoints_FromCidr) Size() (n int) { + if m == nil { + return 0 + } var l int _ = l l = len(m.FromCidr) @@ -585,6 +773,9 @@ func (m *Network_NetworkEndpoints_FromCidr) Size() (n int) { return n } func (m *Network_NetworkEndpoints_FromRegistry) Size() (n int) { + if m == nil { + return 0 + } var l int _ = l l = len(m.FromRegistry) @@ -592,6 +783,9 @@ func (m *Network_NetworkEndpoints_FromRegistry) Size() (n int) { return n } func (m *Network_IstioNetworkGateway) Size() (n int) { + if m == nil { + return 0 + } var l int _ = l if m.Gw != nil { @@ -604,10 +798,16 @@ func (m *Network_IstioNetworkGateway) Size() (n int) { if l > 0 { n += 1 + l + sovNetwork(uint64(l)) } + if m.XXX_unrecognized != nil { + n += len(m.XXX_unrecognized) + } return n } func (m *Network_IstioNetworkGateway_RegistryServiceName) Size() (n int) { + if m == nil { + return 0 + } var l int _ = l l = len(m.RegistryServiceName) @@ -615,6 +815,9 @@ func (m *Network_IstioNetworkGateway_RegistryServiceName) Size() (n int) { return n } func (m *Network_IstioNetworkGateway_Address) Size() (n int) { + if m == nil { + return 0 + } var l int _ = l l = len(m.Address) @@ -622,6 +825,9 @@ func (m *Network_IstioNetworkGateway_Address) Size() (n int) { return n } func (m *MeshNetworks) Size() (n int) { + if m == nil { + return 0 + } var l int _ = l if len(m.Networks) > 0 { @@ -637,6 +843,9 @@ func (m *MeshNetworks) Size() (n int) { n += mapEntrySize + 1 + sovNetwork(uint64(mapEntrySize)) } } + if m.XXX_unrecognized != nil { + n += len(m.XXX_unrecognized) + } return n } @@ -668,7 +877,7 @@ func (m *Network) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - wire |= (uint64(b) & 0x7F) << shift + wire |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -696,7 +905,7 @@ func (m *Network) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - msglen |= (int(b) & 0x7F) << shift + msglen |= int(b&0x7F) << shift if b < 0x80 { break } @@ -705,6 +914,9 @@ func (m *Network) Unmarshal(dAtA []byte) error { return ErrInvalidLengthNetwork } postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthNetwork + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -727,7 +939,7 @@ func (m *Network) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - msglen |= (int(b) & 0x7F) << shift + msglen |= int(b&0x7F) << shift if b < 0x80 { break } @@ -736,6 +948,9 @@ func (m *Network) Unmarshal(dAtA []byte) error { return ErrInvalidLengthNetwork } postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthNetwork + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -753,9 +968,13 @@ func (m *Network) Unmarshal(dAtA []byte) error { if skippy < 0 { return ErrInvalidLengthNetwork } + if (iNdEx + skippy) < 0 { + return ErrInvalidLengthNetwork + } if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF } + m.XXX_unrecognized = append(m.XXX_unrecognized, dAtA[iNdEx:iNdEx+skippy]...) iNdEx += skippy } } @@ -780,7 +999,7 @@ func (m *Network_NetworkEndpoints) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - wire |= (uint64(b) & 0x7F) << shift + wire |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -808,7 +1027,7 @@ func (m *Network_NetworkEndpoints) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLen |= (uint64(b) & 0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -818,6 +1037,9 @@ func (m *Network_NetworkEndpoints) Unmarshal(dAtA []byte) error { return ErrInvalidLengthNetwork } postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthNetwork + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -837,7 +1059,7 @@ func (m *Network_NetworkEndpoints) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLen |= (uint64(b) & 0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -847,6 +1069,9 @@ func (m *Network_NetworkEndpoints) Unmarshal(dAtA []byte) error { return ErrInvalidLengthNetwork } postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthNetwork + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -861,9 +1086,13 @@ func (m *Network_NetworkEndpoints) Unmarshal(dAtA []byte) error { if skippy < 0 { return ErrInvalidLengthNetwork } + if (iNdEx + skippy) < 0 { + return ErrInvalidLengthNetwork + } if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF } + m.XXX_unrecognized = append(m.XXX_unrecognized, dAtA[iNdEx:iNdEx+skippy]...) iNdEx += skippy } } @@ -888,7 +1117,7 @@ func (m *Network_IstioNetworkGateway) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - wire |= (uint64(b) & 0x7F) << shift + wire |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -916,7 +1145,7 @@ func (m *Network_IstioNetworkGateway) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLen |= (uint64(b) & 0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -926,6 +1155,9 @@ func (m *Network_IstioNetworkGateway) Unmarshal(dAtA []byte) error { return ErrInvalidLengthNetwork } postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthNetwork + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -945,7 +1177,7 @@ func (m *Network_IstioNetworkGateway) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLen |= (uint64(b) & 0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -955,6 +1187,9 @@ func (m *Network_IstioNetworkGateway) Unmarshal(dAtA []byte) error { return ErrInvalidLengthNetwork } postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthNetwork + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -974,7 +1209,7 @@ func (m *Network_IstioNetworkGateway) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - m.Port |= (uint32(b) & 0x7F) << shift + m.Port |= uint32(b&0x7F) << shift if b < 0x80 { break } @@ -993,7 +1228,7 @@ func (m *Network_IstioNetworkGateway) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLen |= (uint64(b) & 0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -1003,6 +1238,9 @@ func (m *Network_IstioNetworkGateway) Unmarshal(dAtA []byte) error { return ErrInvalidLengthNetwork } postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthNetwork + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -1017,9 +1255,13 @@ func (m *Network_IstioNetworkGateway) Unmarshal(dAtA []byte) error { if skippy < 0 { return ErrInvalidLengthNetwork } + if (iNdEx + skippy) < 0 { + return ErrInvalidLengthNetwork + } if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF } + m.XXX_unrecognized = append(m.XXX_unrecognized, dAtA[iNdEx:iNdEx+skippy]...) iNdEx += skippy } } @@ -1044,7 +1286,7 @@ func (m *MeshNetworks) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - wire |= (uint64(b) & 0x7F) << shift + wire |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -1072,7 +1314,7 @@ func (m *MeshNetworks) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - msglen |= (int(b) & 0x7F) << shift + msglen |= int(b&0x7F) << shift if b < 0x80 { break } @@ -1081,6 +1323,9 @@ func (m *MeshNetworks) Unmarshal(dAtA []byte) error { return ErrInvalidLengthNetwork } postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthNetwork + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -1101,7 +1346,7 @@ func (m *MeshNetworks) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - wire |= (uint64(b) & 0x7F) << shift + wire |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -1118,7 +1363,7 @@ func (m *MeshNetworks) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLenmapkey |= (uint64(b) & 0x7F) << shift + stringLenmapkey |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -1128,6 +1373,9 @@ func (m *MeshNetworks) Unmarshal(dAtA []byte) error { return ErrInvalidLengthNetwork } postStringIndexmapkey := iNdEx + intStringLenmapkey + if postStringIndexmapkey < 0 { + return ErrInvalidLengthNetwork + } if postStringIndexmapkey > l { return io.ErrUnexpectedEOF } @@ -1144,7 +1392,7 @@ func (m *MeshNetworks) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - mapmsglen |= (int(b) & 0x7F) << shift + mapmsglen |= int(b&0x7F) << shift if b < 0x80 { break } @@ -1153,7 +1401,7 @@ func (m *MeshNetworks) Unmarshal(dAtA []byte) error { return ErrInvalidLengthNetwork } postmsgIndex := iNdEx + mapmsglen - if mapmsglen < 0 { + if postmsgIndex < 0 { return ErrInvalidLengthNetwork } if postmsgIndex > l { @@ -1190,9 +1438,13 @@ func (m *MeshNetworks) Unmarshal(dAtA []byte) error { if skippy < 0 { return ErrInvalidLengthNetwork } + if (iNdEx + skippy) < 0 { + return ErrInvalidLengthNetwork + } if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF } + m.XXX_unrecognized = append(m.XXX_unrecognized, dAtA[iNdEx:iNdEx+skippy]...) iNdEx += skippy } } @@ -1256,10 +1508,13 @@ func skipNetwork(dAtA []byte) (n int, err error) { break } } - iNdEx += length if length < 0 { return 0, ErrInvalidLengthNetwork } + iNdEx += length + if iNdEx < 0 { + return 0, ErrInvalidLengthNetwork + } return iNdEx, nil case 3: for { @@ -1288,6 +1543,9 @@ func skipNetwork(dAtA []byte) (n int, err error) { return 0, err } iNdEx = start + next + if iNdEx < 0 { + return 0, ErrInvalidLengthNetwork + } } return iNdEx, nil case 4: @@ -1306,35 +1564,3 @@ var ( ErrInvalidLengthNetwork = fmt.Errorf("proto: negative length found during unmarshaling") ErrIntOverflowNetwork = fmt.Errorf("proto: integer overflow") ) - -func init() { proto.RegisterFile("mesh/v1alpha1/network.proto", fileDescriptorNetwork) } - -var fileDescriptorNetwork = []byte{ - // 403 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x92, 0xcf, 0x8e, 0xda, 0x30, - 0x10, 0xc6, 0xeb, 0x84, 0x96, 0x30, 0x80, 0x84, 0x8c, 0x2a, 0x45, 0x69, 0x8b, 0x10, 0x52, 0xa5, - 0x5c, 0x9a, 0x14, 0xda, 0x43, 0xd5, 0x23, 0x15, 0x6a, 0x2b, 0x5a, 0x0e, 0xee, 0xa9, 0x3d, 0x14, - 0xb9, 0xc4, 0x05, 0x8b, 0x24, 0x8e, 0x6c, 0x2f, 0x28, 0x0f, 0xb3, 0xb7, 0x7d, 0x86, 0x7d, 0x86, - 0x3d, 0xee, 0x23, 0xac, 0x78, 0x92, 0x55, 0xfe, 0xee, 0xb2, 0x42, 0x9c, 0x6c, 0xcf, 0xf7, 0xfd, - 0x66, 0xc6, 0x63, 0xc3, 0xab, 0x88, 0xa9, 0x8d, 0xbf, 0x1b, 0xd3, 0x30, 0xd9, 0xd0, 0xb1, 0x1f, - 0x33, 0xbd, 0x17, 0x72, 0xeb, 0x25, 0x52, 0x68, 0x81, 0xfb, 0x5c, 0x69, 0x2e, 0xbc, 0xcc, 0xe2, - 0x55, 0x96, 0xd1, 0x95, 0x09, 0xcd, 0x45, 0x61, 0xc3, 0x73, 0x68, 0xb1, 0x38, 0x48, 0x04, 0x8f, - 0xb5, 0xb2, 0x8d, 0xa1, 0xe9, 0xb6, 0x27, 0xef, 0xbc, 0x13, 0x90, 0x57, 0x02, 0xd5, 0x3a, 0xab, - 0x20, 0xf2, 0xc0, 0xe3, 0x1f, 0x60, 0xad, 0xa9, 0x66, 0x7b, 0x9a, 0x2a, 0xdb, 0xcc, 0x73, 0xbd, - 0x3f, 0x9b, 0xeb, 0x7b, 0xa6, 0x95, 0x87, 0xaf, 0x05, 0x48, 0xea, 0x0c, 0xce, 0x5f, 0xe8, 0x3d, - 0x2d, 0x86, 0xdf, 0x40, 0xeb, 0xbf, 0x14, 0xd1, 0x72, 0xc5, 0x03, 0x69, 0xa3, 0x21, 0x72, 0x5b, - 0xdf, 0x9e, 0x11, 0x2b, 0x0b, 0x7d, 0xe1, 0x81, 0xc4, 0x6f, 0xa1, 0x9b, 0xcb, 0x92, 0xad, 0xb9, - 0xd2, 0x32, 0xb5, 0x8d, 0xd2, 0xd2, 0xc9, 0xc2, 0xa4, 0x8c, 0x4e, 0x1b, 0x60, 0xc4, 0xcc, 0xb9, - 0x44, 0xd0, 0x3f, 0xd1, 0x01, 0xfe, 0x08, 0x2f, 0x2b, 0x7e, 0xa9, 0x98, 0xdc, 0xf1, 0x15, 0x5b, - 0xc6, 0x34, 0x62, 0x75, 0xbd, 0x7e, 0x25, 0xff, 0x2a, 0xd4, 0x05, 0x8d, 0x18, 0x76, 0xa0, 0x49, - 0x83, 0x40, 0x32, 0xa5, 0xea, 0xa2, 0x55, 0x00, 0x63, 0x68, 0x24, 0x42, 0x6a, 0xdb, 0x1c, 0x22, - 0xb7, 0x4b, 0xf2, 0x3d, 0x76, 0xc0, 0x0a, 0xc5, 0x8a, 0x86, 0x5c, 0xa7, 0x76, 0x23, 0x03, 0x48, - 0x7d, 0xce, 0xfa, 0x5b, 0xef, 0x47, 0xd7, 0x08, 0x3a, 0x3f, 0x99, 0xda, 0x94, 0xed, 0x29, 0x3c, - 0x07, 0xab, 0x7c, 0x5d, 0x65, 0xa3, 0x7c, 0xbc, 0xfe, 0xc9, 0xf1, 0x3e, 0x86, 0xaa, 0x59, 0xab, - 0x59, 0xac, 0x65, 0x4a, 0xea, 0x04, 0xce, 0x6f, 0xe8, 0x1e, 0x49, 0xb8, 0x07, 0xe6, 0x96, 0xa5, - 0xc5, 0x25, 0x49, 0xb6, 0xc5, 0x13, 0x78, 0xbe, 0xa3, 0xe1, 0x05, 0xcb, 0x2f, 0xd4, 0x9e, 0xbc, - 0x3e, 0xf7, 0x96, 0xa4, 0xb0, 0x7e, 0x36, 0x3e, 0xa1, 0xa9, 0x7b, 0x73, 0x18, 0xa0, 0xdb, 0xc3, - 0x00, 0xdd, 0x1d, 0x06, 0xe8, 0x8f, 0x53, 0x50, 0x5c, 0xf8, 0x34, 0xe1, 0xfe, 0xd1, 0x67, 0xfd, - 0xf7, 0x22, 0xff, 0xa5, 0x1f, 0xee, 0x03, 0x00, 0x00, 0xff, 0xff, 0xbc, 0x70, 0x44, 0x24, 0xc4, - 0x02, 0x00, 0x00, -} diff --git a/mesh/v1alpha1/proxy.pb.go b/mesh/v1alpha1/proxy.pb.go index 1a5eba036dd..0056c3caf6c 100644 --- a/mesh/v1alpha1/proxy.pb.go +++ b/mesh/v1alpha1/proxy.pb.go @@ -3,18 +3,25 @@ package v1alpha1 -import proto "github.com/gogo/protobuf/proto" -import fmt "fmt" -import math "math" -import google_protobuf "github.com/gogo/protobuf/types" - -import io "io" +import ( + fmt "fmt" + proto "github.com/gogo/protobuf/proto" + types "github.com/gogo/protobuf/types" + io "io" + math "math" +) // Reference imports to suppress errors if they are not otherwise used. var _ = proto.Marshal var _ = fmt.Errorf var _ = math.Inf +// This is a compile-time assertion to ensure that this generated file +// is compatible with the proto package it is being compiled against. +// A compilation error at this line likely means your copy of the +// proto package needs to be updated. +const _ = proto.GoGoProtoPackageIsVersion2 // please upgrade the proto package + // AuthenticationPolicy defines authentication policy. It can be set for // different scopes (mesh, service …), and the most narrow scope with // non-INHERIT value will be used. @@ -36,6 +43,7 @@ var AuthenticationPolicy_name = map[int32]string{ 1: "MUTUAL_TLS", 1000: "INHERIT", } + var AuthenticationPolicy_value = map[string]int32{ "NONE": 0, "MUTUAL_TLS": 1, @@ -45,7 +53,10 @@ var AuthenticationPolicy_value = map[string]int32{ func (x AuthenticationPolicy) String() string { return proto.EnumName(AuthenticationPolicy_name, int32(x)) } -func (AuthenticationPolicy) EnumDescriptor() ([]byte, []int) { return fileDescriptorProxy, []int{0} } + +func (AuthenticationPolicy) EnumDescriptor() ([]byte, []int) { + return fileDescriptor_5efecd978cf3d28d, []int{0} +} // The mode used to redirect inbound traffic to Envoy. // This setting has no effect on outbound traffic: iptables REDIRECT is always used for @@ -67,6 +78,7 @@ var ProxyConfig_InboundInterceptionMode_name = map[int32]string{ 0: "REDIRECT", 1: "TPROXY", } + var ProxyConfig_InboundInterceptionMode_value = map[string]int32{ "REDIRECT": 0, "TPROXY": 1, @@ -75,8 +87,9 @@ var ProxyConfig_InboundInterceptionMode_value = map[string]int32{ func (x ProxyConfig_InboundInterceptionMode) String() string { return proto.EnumName(ProxyConfig_InboundInterceptionMode_name, int32(x)) } + func (ProxyConfig_InboundInterceptionMode) EnumDescriptor() ([]byte, []int) { - return fileDescriptorProxy, []int{1, 0} + return fileDescriptor_5efecd978cf3d28d, []int{1, 0} } // Tracing defines configuration for the tracing performed by Envoy instances. @@ -86,13 +99,44 @@ type Tracing struct { // Types that are valid to be assigned to Tracer: // *Tracing_Zipkin_ // *Tracing_Lightstep_ - Tracer isTracing_Tracer `protobuf_oneof:"tracer"` + Tracer isTracing_Tracer `protobuf_oneof:"tracer"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` +} + +func (m *Tracing) Reset() { *m = Tracing{} } +func (m *Tracing) String() string { return proto.CompactTextString(m) } +func (*Tracing) ProtoMessage() {} +func (*Tracing) Descriptor() ([]byte, []int) { + return fileDescriptor_5efecd978cf3d28d, []int{0} +} +func (m *Tracing) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *Tracing) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_Tracing.Marshal(b, m, deterministic) + } else { + b = b[:cap(b)] + n, err := m.MarshalTo(b) + if err != nil { + return nil, err + } + return b[:n], nil + } +} +func (m *Tracing) XXX_Merge(src proto.Message) { + xxx_messageInfo_Tracing.Merge(m, src) +} +func (m *Tracing) XXX_Size() int { + return m.Size() +} +func (m *Tracing) XXX_DiscardUnknown() { + xxx_messageInfo_Tracing.DiscardUnknown(m) } -func (m *Tracing) Reset() { *m = Tracing{} } -func (m *Tracing) String() string { return proto.CompactTextString(m) } -func (*Tracing) ProtoMessage() {} -func (*Tracing) Descriptor() ([]byte, []int) { return fileDescriptorProxy, []int{0} } +var xxx_messageInfo_Tracing proto.InternalMessageInfo type isTracing_Tracer interface { isTracing_Tracer() @@ -101,10 +145,10 @@ type isTracing_Tracer interface { } type Tracing_Zipkin_ struct { - Zipkin *Tracing_Zipkin `protobuf:"bytes,1,opt,name=zipkin,oneof"` + Zipkin *Tracing_Zipkin `protobuf:"bytes,1,opt,name=zipkin,proto3,oneof"` } type Tracing_Lightstep_ struct { - Lightstep *Tracing_Lightstep `protobuf:"bytes,2,opt,name=lightstep,oneof"` + Lightstep *Tracing_Lightstep `protobuf:"bytes,2,opt,name=lightstep,proto3,oneof"` } func (*Tracing_Zipkin_) isTracing_Tracer() {} @@ -190,12 +234,12 @@ func _Tracing_OneofSizer(msg proto.Message) (n int) { switch x := m.Tracer.(type) { case *Tracing_Zipkin_: s := proto.Size(x.Zipkin) - n += proto.SizeVarint(1<<3 | proto.WireBytes) + n += 1 // tag and wire n += proto.SizeVarint(uint64(s)) n += s case *Tracing_Lightstep_: s := proto.Size(x.Lightstep) - n += proto.SizeVarint(2<<3 | proto.WireBytes) + n += 1 // tag and wire n += proto.SizeVarint(uint64(s)) n += s case nil: @@ -208,13 +252,44 @@ func _Tracing_OneofSizer(msg proto.Message) (n int) { // Zipkin defines configuration for a Zipkin tracer. type Tracing_Zipkin struct { // Address of the Zipkin service (e.g. _zipkin:9411_). - Address string `protobuf:"bytes,1,opt,name=address,proto3" json:"address,omitempty"` + Address string `protobuf:"bytes,1,opt,name=address,proto3" json:"address,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` +} + +func (m *Tracing_Zipkin) Reset() { *m = Tracing_Zipkin{} } +func (m *Tracing_Zipkin) String() string { return proto.CompactTextString(m) } +func (*Tracing_Zipkin) ProtoMessage() {} +func (*Tracing_Zipkin) Descriptor() ([]byte, []int) { + return fileDescriptor_5efecd978cf3d28d, []int{0, 0} +} +func (m *Tracing_Zipkin) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *Tracing_Zipkin) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_Tracing_Zipkin.Marshal(b, m, deterministic) + } else { + b = b[:cap(b)] + n, err := m.MarshalTo(b) + if err != nil { + return nil, err + } + return b[:n], nil + } +} +func (m *Tracing_Zipkin) XXX_Merge(src proto.Message) { + xxx_messageInfo_Tracing_Zipkin.Merge(m, src) +} +func (m *Tracing_Zipkin) XXX_Size() int { + return m.Size() +} +func (m *Tracing_Zipkin) XXX_DiscardUnknown() { + xxx_messageInfo_Tracing_Zipkin.DiscardUnknown(m) } -func (m *Tracing_Zipkin) Reset() { *m = Tracing_Zipkin{} } -func (m *Tracing_Zipkin) String() string { return proto.CompactTextString(m) } -func (*Tracing_Zipkin) ProtoMessage() {} -func (*Tracing_Zipkin) Descriptor() ([]byte, []int) { return fileDescriptorProxy, []int{0, 0} } +var xxx_messageInfo_Tracing_Zipkin proto.InternalMessageInfo func (m *Tracing_Zipkin) GetAddress() string { if m != nil { @@ -232,13 +307,44 @@ type Tracing_Lightstep struct { // True if a secure connection should be used when communicating with the pool. Secure bool `protobuf:"varint,3,opt,name=secure,proto3" json:"secure,omitempty"` // Path to the trusted cacert used to authenticate the pool. - CacertPath string `protobuf:"bytes,4,opt,name=cacert_path,json=cacertPath,proto3" json:"cacert_path,omitempty"` + CacertPath string `protobuf:"bytes,4,opt,name=cacert_path,json=cacertPath,proto3" json:"cacert_path,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` +} + +func (m *Tracing_Lightstep) Reset() { *m = Tracing_Lightstep{} } +func (m *Tracing_Lightstep) String() string { return proto.CompactTextString(m) } +func (*Tracing_Lightstep) ProtoMessage() {} +func (*Tracing_Lightstep) Descriptor() ([]byte, []int) { + return fileDescriptor_5efecd978cf3d28d, []int{0, 1} +} +func (m *Tracing_Lightstep) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *Tracing_Lightstep) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_Tracing_Lightstep.Marshal(b, m, deterministic) + } else { + b = b[:cap(b)] + n, err := m.MarshalTo(b) + if err != nil { + return nil, err + } + return b[:n], nil + } +} +func (m *Tracing_Lightstep) XXX_Merge(src proto.Message) { + xxx_messageInfo_Tracing_Lightstep.Merge(m, src) +} +func (m *Tracing_Lightstep) XXX_Size() int { + return m.Size() +} +func (m *Tracing_Lightstep) XXX_DiscardUnknown() { + xxx_messageInfo_Tracing_Lightstep.DiscardUnknown(m) } -func (m *Tracing_Lightstep) Reset() { *m = Tracing_Lightstep{} } -func (m *Tracing_Lightstep) String() string { return proto.CompactTextString(m) } -func (*Tracing_Lightstep) ProtoMessage() {} -func (*Tracing_Lightstep) Descriptor() ([]byte, []int) { return fileDescriptorProxy, []int{0, 1} } +var xxx_messageInfo_Tracing_Lightstep proto.InternalMessageInfo func (m *Tracing_Lightstep) GetAddress() string { if m != nil { @@ -291,20 +397,20 @@ type ProxyConfig struct { ServiceCluster string `protobuf:"bytes,3,opt,name=service_cluster,json=serviceCluster,proto3" json:"service_cluster,omitempty"` // The time in seconds that Envoy will drain connections during a hot // restart. MUST be >=1s (e.g., _1s/1m/1h_) - DrainDuration *google_protobuf.Duration `protobuf:"bytes,4,opt,name=drain_duration,json=drainDuration" json:"drain_duration,omitempty"` + DrainDuration *types.Duration `protobuf:"bytes,4,opt,name=drain_duration,json=drainDuration,proto3" json:"drain_duration,omitempty"` // The time in seconds that Envoy will wait before shutting down the // parent process during a hot restart. MUST be >=1s (e.g., _1s/1m/1h_). // MUST BE greater than _drain_duration_ parameter. - ParentShutdownDuration *google_protobuf.Duration `protobuf:"bytes,5,opt,name=parent_shutdown_duration,json=parentShutdownDuration" json:"parent_shutdown_duration,omitempty"` + ParentShutdownDuration *types.Duration `protobuf:"bytes,5,opt,name=parent_shutdown_duration,json=parentShutdownDuration,proto3" json:"parent_shutdown_duration,omitempty"` // Address of the discovery service exposing xDS with mTLS connection. DiscoveryAddress string `protobuf:"bytes,6,opt,name=discovery_address,json=discoveryAddress,proto3" json:"discovery_address,omitempty"` // $hide_from_docs - DiscoveryRefreshDelay *google_protobuf.Duration `protobuf:"bytes,7,opt,name=discovery_refresh_delay,json=discoveryRefreshDelay" json:"discovery_refresh_delay,omitempty"` + DiscoveryRefreshDelay *types.Duration `protobuf:"bytes,7,opt,name=discovery_refresh_delay,json=discoveryRefreshDelay,proto3" json:"discovery_refresh_delay,omitempty"` // Deprecated: Do not use. // Address of the Zipkin service (e.g. _zipkin:9411_). // DEPRECATED: Use [tracing][istio.mesh.v1alpha1.ProxyConfig.tracing] instead. - ZipkinAddress string `protobuf:"bytes,8,opt,name=zipkin_address,json=zipkinAddress,proto3" json:"zipkin_address,omitempty"` + ZipkinAddress string `protobuf:"bytes,8,opt,name=zipkin_address,json=zipkinAddress,proto3" json:"zipkin_address,omitempty"` // Deprecated: Do not use. // Connection timeout used by Envoy for supporting services. (MUST BE >=1ms) - ConnectTimeout *google_protobuf.Duration `protobuf:"bytes,9,opt,name=connect_timeout,json=connectTimeout" json:"connect_timeout,omitempty"` + ConnectTimeout *types.Duration `protobuf:"bytes,9,opt,name=connect_timeout,json=connectTimeout,proto3" json:"connect_timeout,omitempty"` // IP Address and Port of a statsd UDP listener (e.g. _10.75.241.127:9125_). StatsdUdpAddress string `protobuf:"bytes,10,opt,name=statsd_udp_address,json=statsdUdpAddress,proto3" json:"statsd_udp_address,omitempty"` // Address of the Envoy Metrics Service implementation (e.g. metrics-service:15000). @@ -314,7 +420,7 @@ type ProxyConfig struct { // Port on which Envoy should listen for administrative commands. ProxyAdminPort int32 `protobuf:"varint,11,opt,name=proxy_admin_port,json=proxyAdminPort,proto3" json:"proxy_admin_port,omitempty"` // $hide_from_docs - AvailabilityZone string `protobuf:"bytes,12,opt,name=availability_zone,json=availabilityZone,proto3" json:"availability_zone,omitempty"` + AvailabilityZone string `protobuf:"bytes,12,opt,name=availability_zone,json=availabilityZone,proto3" json:"availability_zone,omitempty"` // Deprecated: Do not use. // Authentication policy defines the global switch to control authentication // for Envoy-to-Envoy communication for istio components Mixer and Pilot. ControlPlaneAuthPolicy AuthenticationPolicy `protobuf:"varint,13,opt,name=control_plane_auth_policy,json=controlPlaneAuthPolicy,proto3,enum=istio.mesh.v1alpha1.AuthenticationPolicy" json:"control_plane_auth_policy,omitempty"` @@ -334,13 +440,44 @@ type ProxyConfig struct { // The mode used to redirect inbound traffic to Envoy. InterceptionMode ProxyConfig_InboundInterceptionMode `protobuf:"varint,18,opt,name=interception_mode,json=interceptionMode,proto3,enum=istio.mesh.v1alpha1.ProxyConfig_InboundInterceptionMode" json:"interception_mode,omitempty"` // Tracing configuration to be used by the proxy. - Tracing *Tracing `protobuf:"bytes,19,opt,name=tracing" json:"tracing,omitempty"` + Tracing *Tracing `protobuf:"bytes,19,opt,name=tracing,proto3" json:"tracing,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` +} + +func (m *ProxyConfig) Reset() { *m = ProxyConfig{} } +func (m *ProxyConfig) String() string { return proto.CompactTextString(m) } +func (*ProxyConfig) ProtoMessage() {} +func (*ProxyConfig) Descriptor() ([]byte, []int) { + return fileDescriptor_5efecd978cf3d28d, []int{1} +} +func (m *ProxyConfig) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *ProxyConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_ProxyConfig.Marshal(b, m, deterministic) + } else { + b = b[:cap(b)] + n, err := m.MarshalTo(b) + if err != nil { + return nil, err + } + return b[:n], nil + } +} +func (m *ProxyConfig) XXX_Merge(src proto.Message) { + xxx_messageInfo_ProxyConfig.Merge(m, src) +} +func (m *ProxyConfig) XXX_Size() int { + return m.Size() +} +func (m *ProxyConfig) XXX_DiscardUnknown() { + xxx_messageInfo_ProxyConfig.DiscardUnknown(m) } -func (m *ProxyConfig) Reset() { *m = ProxyConfig{} } -func (m *ProxyConfig) String() string { return proto.CompactTextString(m) } -func (*ProxyConfig) ProtoMessage() {} -func (*ProxyConfig) Descriptor() ([]byte, []int) { return fileDescriptorProxy, []int{1} } +var xxx_messageInfo_ProxyConfig proto.InternalMessageInfo func (m *ProxyConfig) GetConfigPath() string { if m != nil { @@ -363,14 +500,14 @@ func (m *ProxyConfig) GetServiceCluster() string { return "" } -func (m *ProxyConfig) GetDrainDuration() *google_protobuf.Duration { +func (m *ProxyConfig) GetDrainDuration() *types.Duration { if m != nil { return m.DrainDuration } return nil } -func (m *ProxyConfig) GetParentShutdownDuration() *google_protobuf.Duration { +func (m *ProxyConfig) GetParentShutdownDuration() *types.Duration { if m != nil { return m.ParentShutdownDuration } @@ -384,13 +521,15 @@ func (m *ProxyConfig) GetDiscoveryAddress() string { return "" } -func (m *ProxyConfig) GetDiscoveryRefreshDelay() *google_protobuf.Duration { +// Deprecated: Do not use. +func (m *ProxyConfig) GetDiscoveryRefreshDelay() *types.Duration { if m != nil { return m.DiscoveryRefreshDelay } return nil } +// Deprecated: Do not use. func (m *ProxyConfig) GetZipkinAddress() string { if m != nil { return m.ZipkinAddress @@ -398,7 +537,7 @@ func (m *ProxyConfig) GetZipkinAddress() string { return "" } -func (m *ProxyConfig) GetConnectTimeout() *google_protobuf.Duration { +func (m *ProxyConfig) GetConnectTimeout() *types.Duration { if m != nil { return m.ConnectTimeout } @@ -426,6 +565,7 @@ func (m *ProxyConfig) GetProxyAdminPort() int32 { return 0 } +// Deprecated: Do not use. func (m *ProxyConfig) GetAvailabilityZone() string { if m != nil { return m.AvailabilityZone @@ -483,13 +623,76 @@ func (m *ProxyConfig) GetTracing() *Tracing { } func init() { + proto.RegisterEnum("istio.mesh.v1alpha1.AuthenticationPolicy", AuthenticationPolicy_name, AuthenticationPolicy_value) + proto.RegisterEnum("istio.mesh.v1alpha1.ProxyConfig_InboundInterceptionMode", ProxyConfig_InboundInterceptionMode_name, ProxyConfig_InboundInterceptionMode_value) proto.RegisterType((*Tracing)(nil), "istio.mesh.v1alpha1.Tracing") proto.RegisterType((*Tracing_Zipkin)(nil), "istio.mesh.v1alpha1.Tracing.Zipkin") proto.RegisterType((*Tracing_Lightstep)(nil), "istio.mesh.v1alpha1.Tracing.Lightstep") proto.RegisterType((*ProxyConfig)(nil), "istio.mesh.v1alpha1.ProxyConfig") - proto.RegisterEnum("istio.mesh.v1alpha1.AuthenticationPolicy", AuthenticationPolicy_name, AuthenticationPolicy_value) - proto.RegisterEnum("istio.mesh.v1alpha1.ProxyConfig_InboundInterceptionMode", ProxyConfig_InboundInterceptionMode_name, ProxyConfig_InboundInterceptionMode_value) } + +func init() { proto.RegisterFile("mesh/v1alpha1/proxy.proto", fileDescriptor_5efecd978cf3d28d) } + +var fileDescriptor_5efecd978cf3d28d = []byte{ + // 890 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x55, 0x5f, 0x6f, 0xe3, 0xc4, + 0x17, 0xad, 0xfb, 0xdb, 0xcd, 0x9f, 0x9b, 0x36, 0x75, 0x67, 0xf7, 0xd7, 0x75, 0x23, 0x28, 0xa1, + 0x48, 0x90, 0x05, 0xe4, 0x68, 0xbb, 0x12, 0xe2, 0x05, 0x44, 0xd2, 0x76, 0xd5, 0x48, 0x6d, 0x37, + 0x72, 0x53, 0x09, 0xfa, 0x32, 0x9a, 0xd8, 0xb7, 0xf1, 0x68, 0x9d, 0x19, 0x6b, 0x3c, 0x0e, 0x64, + 0xdf, 0xf8, 0x6a, 0x48, 0x48, 0x3c, 0xf2, 0x11, 0x50, 0x9f, 0xf8, 0x18, 0xc8, 0x33, 0x76, 0x36, + 0xa0, 0xee, 0xf6, 0x2d, 0x73, 0xee, 0x39, 0x67, 0xee, 0x1f, 0xdf, 0x09, 0xec, 0xcf, 0x31, 0x8b, + 0xfb, 0x8b, 0x17, 0x2c, 0x49, 0x63, 0xf6, 0xa2, 0x9f, 0x2a, 0xf9, 0xcb, 0xd2, 0x4f, 0x95, 0xd4, + 0x92, 0x3c, 0xe1, 0x99, 0xe6, 0xd2, 0x2f, 0x08, 0x7e, 0x45, 0xe8, 0x1c, 0xcc, 0xa4, 0x9c, 0x25, + 0xd8, 0x37, 0x94, 0x69, 0x7e, 0xdb, 0x8f, 0x72, 0xc5, 0x34, 0x97, 0xc2, 0x8a, 0x0e, 0x7f, 0xdb, + 0x84, 0xfa, 0x44, 0xb1, 0x90, 0x8b, 0x19, 0xf9, 0x0e, 0x6a, 0x6f, 0x79, 0xfa, 0x86, 0x0b, 0xcf, + 0xe9, 0x3a, 0xbd, 0xd6, 0xd1, 0x67, 0xfe, 0x3d, 0x8e, 0x7e, 0xc9, 0xf6, 0x6f, 0x0c, 0xf5, 0x6c, + 0x23, 0x28, 0x45, 0xe4, 0x15, 0x34, 0x13, 0x3e, 0x8b, 0x75, 0xa6, 0x31, 0xf5, 0x36, 0x8d, 0xc3, + 0xe7, 0x1f, 0x74, 0x38, 0xaf, 0xd8, 0x67, 0x1b, 0xc1, 0x3b, 0x69, 0xe7, 0x10, 0x6a, 0xd6, 0x9b, + 0x78, 0x50, 0x67, 0x51, 0xa4, 0x30, 0xcb, 0x4c, 0x46, 0xcd, 0xa0, 0x3a, 0x76, 0x7e, 0x75, 0xa0, + 0xb9, 0x92, 0xbf, 0x9f, 0x47, 0x3e, 0x85, 0x2d, 0x16, 0x86, 0x98, 0x65, 0x54, 0xcb, 0x37, 0x28, + 0x4c, 0x5a, 0xcd, 0xa0, 0x65, 0xb1, 0x49, 0x01, 0x91, 0x3d, 0xa8, 0x65, 0x18, 0xe6, 0x0a, 0xbd, + 0xff, 0x75, 0x9d, 0x5e, 0x23, 0x28, 0x4f, 0xe4, 0x13, 0x68, 0x85, 0x2c, 0x44, 0xa5, 0x69, 0xca, + 0x74, 0xec, 0x3d, 0x32, 0x4a, 0xb0, 0xd0, 0x98, 0xe9, 0x78, 0xd8, 0x80, 0x9a, 0x56, 0xc5, 0xf1, + 0xf0, 0xf7, 0x26, 0xb4, 0xc6, 0xc5, 0x24, 0x8e, 0xa5, 0xb8, 0xe5, 0x33, 0x23, 0x35, 0xbf, 0xac, + 0xd4, 0x29, 0xa5, 0x06, 0x2a, 0xa4, 0x05, 0x61, 0xca, 0x05, 0x53, 0x4b, 0x4b, 0xb0, 0x59, 0x81, + 0x85, 0x0c, 0xe1, 0x0b, 0xd8, 0xc9, 0x50, 0x2d, 0x78, 0x88, 0x34, 0x4c, 0xf2, 0x4c, 0xa3, 0x32, + 0xd9, 0x35, 0x83, 0x76, 0x09, 0x1f, 0x5b, 0x94, 0xfc, 0x00, 0xed, 0x48, 0x31, 0x2e, 0x68, 0x35, + 0x57, 0x93, 0x68, 0xeb, 0x68, 0xdf, 0xb7, 0x83, 0xf7, 0xab, 0xc1, 0xfb, 0x27, 0x25, 0x21, 0xd8, + 0x36, 0x82, 0xea, 0x48, 0xae, 0xc0, 0x4b, 0x99, 0x42, 0xa1, 0x69, 0x16, 0xe7, 0x3a, 0x92, 0x3f, + 0xaf, 0x79, 0x3d, 0x7e, 0xc8, 0x6b, 0xcf, 0x4a, 0xaf, 0x4a, 0xe5, 0xca, 0xf4, 0x2b, 0xd8, 0x8d, + 0x78, 0x16, 0xca, 0x05, 0xaa, 0x25, 0xad, 0x66, 0x53, 0x33, 0x15, 0xb8, 0xab, 0xc0, 0xa0, 0x1c, + 0xd2, 0x35, 0x3c, 0x7b, 0x47, 0x56, 0x78, 0xab, 0x30, 0x8b, 0x69, 0x84, 0x09, 0x5b, 0x7a, 0xf5, + 0x07, 0x12, 0x18, 0x6e, 0x7a, 0x4e, 0xf0, 0xff, 0x95, 0x3a, 0xb0, 0xe2, 0x93, 0x42, 0x4b, 0x9e, + 0x43, 0xdb, 0x7e, 0x99, 0xab, 0x04, 0x1a, 0x45, 0x02, 0x46, 0xb2, 0x6d, 0x23, 0x55, 0x06, 0x43, + 0xd8, 0x09, 0xa5, 0x10, 0x18, 0x6a, 0xaa, 0xf9, 0x1c, 0x65, 0xae, 0xbd, 0xe6, 0x43, 0xa5, 0xb7, + 0x4b, 0xc5, 0xc4, 0x0a, 0xc8, 0xd7, 0x40, 0x32, 0xcd, 0x74, 0x16, 0xd1, 0x3c, 0x4a, 0x57, 0x57, + 0x82, 0xad, 0xd9, 0x46, 0xae, 0xa3, 0xb4, 0xba, 0x71, 0x00, 0x1f, 0xa3, 0x58, 0xc8, 0x25, 0x9d, + 0xa3, 0x56, 0x3c, 0xcc, 0x68, 0x35, 0xee, 0x4a, 0xf8, 0xd4, 0x08, 0x3b, 0x86, 0x74, 0x61, 0x39, + 0x57, 0x96, 0x52, 0x59, 0xf4, 0xc0, 0x35, 0xeb, 0x4f, 0x59, 0x34, 0xe7, 0x82, 0xa6, 0x52, 0x69, + 0xaf, 0xd5, 0x75, 0x7a, 0x8f, 0x83, 0xb6, 0xc1, 0x07, 0x05, 0x3c, 0x96, 0x4a, 0x93, 0x3e, 0xec, + 0xb2, 0x05, 0xe3, 0x09, 0x9b, 0xf2, 0x84, 0xeb, 0x25, 0x7d, 0x2b, 0x05, 0x7a, 0x5b, 0xab, 0x66, + 0xb8, 0xeb, 0xc1, 0x1b, 0x29, 0x90, 0x44, 0xb0, 0x1f, 0x4a, 0xa1, 0x95, 0x4c, 0x68, 0x9a, 0x30, + 0x81, 0x94, 0xe5, 0x3a, 0xa6, 0xa9, 0x4c, 0x78, 0xb8, 0xf4, 0xb6, 0xbb, 0x4e, 0xaf, 0x7d, 0xf4, + 0xfc, 0xde, 0xd5, 0x1e, 0xe4, 0x3a, 0x46, 0xa1, 0x79, 0x68, 0x7a, 0x34, 0x36, 0x82, 0x60, 0xaf, + 0xf4, 0x1a, 0x17, 0x56, 0x05, 0xc3, 0xe2, 0x45, 0xc7, 0xc2, 0x3c, 0xd3, 0x72, 0x4e, 0xcb, 0x6d, + 0xb9, 0xe5, 0x09, 0x7a, 0x6d, 0xdb, 0x31, 0x1b, 0xb1, 0x0b, 0xf5, 0x8a, 0x27, 0x58, 0x94, 0x5b, + 0x74, 0x91, 0x0a, 0x36, 0x47, 0x9a, 0xa0, 0x98, 0xe9, 0xd8, 0xdb, 0xb1, 0xe5, 0x16, 0xf8, 0x25, + 0x9b, 0xe3, 0xb9, 0x41, 0x49, 0xd7, 0xac, 0x5f, 0x98, 0x2b, 0x85, 0x22, 0x5c, 0x7a, 0xae, 0x21, + 0xad, 0x43, 0x45, 0xf7, 0x6d, 0xeb, 0xa6, 0x52, 0xea, 0x4c, 0x2b, 0x96, 0x52, 0x8d, 0xf3, 0x34, + 0x61, 0x1a, 0xed, 0x46, 0xee, 0xda, 0xee, 0x1b, 0xd2, 0xb0, 0xe2, 0x4c, 0x4a, 0x8a, 0xd9, 0x50, + 0x84, 0x5d, 0x2e, 0x34, 0xaa, 0x10, 0xd3, 0xa2, 0x54, 0x3a, 0x97, 0x11, 0x7a, 0xc4, 0xb4, 0xe6, + 0xdb, 0x7b, 0x5b, 0xb3, 0xf6, 0x40, 0xf8, 0x23, 0x31, 0x95, 0xb9, 0x88, 0x46, 0x6b, 0x06, 0x17, + 0x32, 0xc2, 0xc0, 0xe5, 0xff, 0x41, 0xc8, 0x37, 0x50, 0xd7, 0xf6, 0xb9, 0xf4, 0x9e, 0x98, 0x2f, + 0xf2, 0xa3, 0x0f, 0x3d, 0xa9, 0x41, 0x45, 0x3e, 0x7c, 0x09, 0xcf, 0xde, 0x73, 0x09, 0xd9, 0x82, + 0x46, 0x70, 0x7a, 0x32, 0x0a, 0x4e, 0x8f, 0x27, 0xee, 0x06, 0x01, 0xa8, 0x4d, 0xc6, 0xc1, 0xeb, + 0x1f, 0x7f, 0x72, 0x9d, 0x2f, 0xbf, 0x87, 0xa7, 0xf7, 0x0d, 0x90, 0x34, 0xe0, 0xd1, 0xe5, 0xeb, + 0xcb, 0x53, 0x77, 0x83, 0xb4, 0x01, 0x2e, 0xae, 0x27, 0xd7, 0x83, 0x73, 0x3a, 0x39, 0xbf, 0x72, + 0x1d, 0xb2, 0x05, 0xf5, 0xd1, 0xe5, 0xd9, 0x69, 0x30, 0x9a, 0xb8, 0x7f, 0xd7, 0x87, 0xbd, 0x3f, + 0xee, 0x0e, 0x9c, 0x3f, 0xef, 0x0e, 0x9c, 0xbf, 0xee, 0x0e, 0x9c, 0x9b, 0x8e, 0x4d, 0x94, 0xcb, + 0x3e, 0x4b, 0x79, 0xff, 0x5f, 0xff, 0x5b, 0xd3, 0x9a, 0xd9, 0xa7, 0x97, 0xff, 0x04, 0x00, 0x00, + 0xff, 0xff, 0x92, 0x7b, 0x1a, 0x92, 0xcf, 0x06, 0x00, 0x00, +} + func (m *Tracing) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) @@ -512,6 +715,9 @@ func (m *Tracing) MarshalTo(dAtA []byte) (int, error) { } i += nn1 } + if m.XXX_unrecognized != nil { + i += copy(dAtA[i:], m.XXX_unrecognized) + } return i, nil } @@ -564,6 +770,9 @@ func (m *Tracing_Zipkin) MarshalTo(dAtA []byte) (int, error) { i = encodeVarintProxy(dAtA, i, uint64(len(m.Address))) i += copy(dAtA[i:], m.Address) } + if m.XXX_unrecognized != nil { + i += copy(dAtA[i:], m.XXX_unrecognized) + } return i, nil } @@ -610,6 +819,9 @@ func (m *Tracing_Lightstep) MarshalTo(dAtA []byte) (int, error) { i = encodeVarintProxy(dAtA, i, uint64(len(m.CacertPath))) i += copy(dAtA[i:], m.CacertPath) } + if m.XXX_unrecognized != nil { + i += copy(dAtA[i:], m.XXX_unrecognized) + } return i, nil } @@ -773,6 +985,9 @@ func (m *ProxyConfig) MarshalTo(dAtA []byte) (int, error) { i = encodeVarintProxy(dAtA, i, uint64(len(m.EnvoyMetricsServiceAddress))) i += copy(dAtA[i:], m.EnvoyMetricsServiceAddress) } + if m.XXX_unrecognized != nil { + i += copy(dAtA[i:], m.XXX_unrecognized) + } return i, nil } @@ -786,15 +1001,24 @@ func encodeVarintProxy(dAtA []byte, offset int, v uint64) int { return offset + 1 } func (m *Tracing) Size() (n int) { + if m == nil { + return 0 + } var l int _ = l if m.Tracer != nil { n += m.Tracer.Size() } + if m.XXX_unrecognized != nil { + n += len(m.XXX_unrecognized) + } return n } func (m *Tracing_Zipkin_) Size() (n int) { + if m == nil { + return 0 + } var l int _ = l if m.Zipkin != nil { @@ -804,6 +1028,9 @@ func (m *Tracing_Zipkin_) Size() (n int) { return n } func (m *Tracing_Lightstep_) Size() (n int) { + if m == nil { + return 0 + } var l int _ = l if m.Lightstep != nil { @@ -813,16 +1040,25 @@ func (m *Tracing_Lightstep_) Size() (n int) { return n } func (m *Tracing_Zipkin) Size() (n int) { + if m == nil { + return 0 + } var l int _ = l l = len(m.Address) if l > 0 { n += 1 + l + sovProxy(uint64(l)) } + if m.XXX_unrecognized != nil { + n += len(m.XXX_unrecognized) + } return n } func (m *Tracing_Lightstep) Size() (n int) { + if m == nil { + return 0 + } var l int _ = l l = len(m.Address) @@ -840,10 +1076,16 @@ func (m *Tracing_Lightstep) Size() (n int) { if l > 0 { n += 1 + l + sovProxy(uint64(l)) } + if m.XXX_unrecognized != nil { + n += len(m.XXX_unrecognized) + } return n } func (m *ProxyConfig) Size() (n int) { + if m == nil { + return 0 + } var l int _ = l l = len(m.ConfigPath) @@ -921,6 +1163,9 @@ func (m *ProxyConfig) Size() (n int) { if l > 0 { n += 2 + l + sovProxy(uint64(l)) } + if m.XXX_unrecognized != nil { + n += len(m.XXX_unrecognized) + } return n } @@ -952,7 +1197,7 @@ func (m *Tracing) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - wire |= (uint64(b) & 0x7F) << shift + wire |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -980,7 +1225,7 @@ func (m *Tracing) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - msglen |= (int(b) & 0x7F) << shift + msglen |= int(b&0x7F) << shift if b < 0x80 { break } @@ -989,6 +1234,9 @@ func (m *Tracing) Unmarshal(dAtA []byte) error { return ErrInvalidLengthProxy } postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthProxy + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -1012,7 +1260,7 @@ func (m *Tracing) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - msglen |= (int(b) & 0x7F) << shift + msglen |= int(b&0x7F) << shift if b < 0x80 { break } @@ -1021,6 +1269,9 @@ func (m *Tracing) Unmarshal(dAtA []byte) error { return ErrInvalidLengthProxy } postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthProxy + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -1039,9 +1290,13 @@ func (m *Tracing) Unmarshal(dAtA []byte) error { if skippy < 0 { return ErrInvalidLengthProxy } + if (iNdEx + skippy) < 0 { + return ErrInvalidLengthProxy + } if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF } + m.XXX_unrecognized = append(m.XXX_unrecognized, dAtA[iNdEx:iNdEx+skippy]...) iNdEx += skippy } } @@ -1066,7 +1321,7 @@ func (m *Tracing_Zipkin) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - wire |= (uint64(b) & 0x7F) << shift + wire |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -1094,7 +1349,7 @@ func (m *Tracing_Zipkin) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLen |= (uint64(b) & 0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -1104,6 +1359,9 @@ func (m *Tracing_Zipkin) Unmarshal(dAtA []byte) error { return ErrInvalidLengthProxy } postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthProxy + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -1118,9 +1376,13 @@ func (m *Tracing_Zipkin) Unmarshal(dAtA []byte) error { if skippy < 0 { return ErrInvalidLengthProxy } + if (iNdEx + skippy) < 0 { + return ErrInvalidLengthProxy + } if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF } + m.XXX_unrecognized = append(m.XXX_unrecognized, dAtA[iNdEx:iNdEx+skippy]...) iNdEx += skippy } } @@ -1145,7 +1407,7 @@ func (m *Tracing_Lightstep) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - wire |= (uint64(b) & 0x7F) << shift + wire |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -1173,7 +1435,7 @@ func (m *Tracing_Lightstep) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLen |= (uint64(b) & 0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -1183,6 +1445,9 @@ func (m *Tracing_Lightstep) Unmarshal(dAtA []byte) error { return ErrInvalidLengthProxy } postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthProxy + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -1202,7 +1467,7 @@ func (m *Tracing_Lightstep) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLen |= (uint64(b) & 0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -1212,6 +1477,9 @@ func (m *Tracing_Lightstep) Unmarshal(dAtA []byte) error { return ErrInvalidLengthProxy } postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthProxy + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -1231,7 +1499,7 @@ func (m *Tracing_Lightstep) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - v |= (int(b) & 0x7F) << shift + v |= int(b&0x7F) << shift if b < 0x80 { break } @@ -1251,7 +1519,7 @@ func (m *Tracing_Lightstep) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLen |= (uint64(b) & 0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -1261,6 +1529,9 @@ func (m *Tracing_Lightstep) Unmarshal(dAtA []byte) error { return ErrInvalidLengthProxy } postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthProxy + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -1275,9 +1546,13 @@ func (m *Tracing_Lightstep) Unmarshal(dAtA []byte) error { if skippy < 0 { return ErrInvalidLengthProxy } + if (iNdEx + skippy) < 0 { + return ErrInvalidLengthProxy + } if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF } + m.XXX_unrecognized = append(m.XXX_unrecognized, dAtA[iNdEx:iNdEx+skippy]...) iNdEx += skippy } } @@ -1302,7 +1577,7 @@ func (m *ProxyConfig) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - wire |= (uint64(b) & 0x7F) << shift + wire |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -1330,7 +1605,7 @@ func (m *ProxyConfig) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLen |= (uint64(b) & 0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -1340,6 +1615,9 @@ func (m *ProxyConfig) Unmarshal(dAtA []byte) error { return ErrInvalidLengthProxy } postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthProxy + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -1359,7 +1637,7 @@ func (m *ProxyConfig) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLen |= (uint64(b) & 0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -1369,6 +1647,9 @@ func (m *ProxyConfig) Unmarshal(dAtA []byte) error { return ErrInvalidLengthProxy } postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthProxy + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -1388,7 +1669,7 @@ func (m *ProxyConfig) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLen |= (uint64(b) & 0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -1398,6 +1679,9 @@ func (m *ProxyConfig) Unmarshal(dAtA []byte) error { return ErrInvalidLengthProxy } postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthProxy + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -1417,7 +1701,7 @@ func (m *ProxyConfig) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - msglen |= (int(b) & 0x7F) << shift + msglen |= int(b&0x7F) << shift if b < 0x80 { break } @@ -1426,11 +1710,14 @@ func (m *ProxyConfig) Unmarshal(dAtA []byte) error { return ErrInvalidLengthProxy } postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthProxy + } if postIndex > l { return io.ErrUnexpectedEOF } if m.DrainDuration == nil { - m.DrainDuration = &google_protobuf.Duration{} + m.DrainDuration = &types.Duration{} } if err := m.DrainDuration.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err @@ -1450,7 +1737,7 @@ func (m *ProxyConfig) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - msglen |= (int(b) & 0x7F) << shift + msglen |= int(b&0x7F) << shift if b < 0x80 { break } @@ -1459,11 +1746,14 @@ func (m *ProxyConfig) Unmarshal(dAtA []byte) error { return ErrInvalidLengthProxy } postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthProxy + } if postIndex > l { return io.ErrUnexpectedEOF } if m.ParentShutdownDuration == nil { - m.ParentShutdownDuration = &google_protobuf.Duration{} + m.ParentShutdownDuration = &types.Duration{} } if err := m.ParentShutdownDuration.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err @@ -1483,7 +1773,7 @@ func (m *ProxyConfig) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLen |= (uint64(b) & 0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -1493,6 +1783,9 @@ func (m *ProxyConfig) Unmarshal(dAtA []byte) error { return ErrInvalidLengthProxy } postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthProxy + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -1512,7 +1805,7 @@ func (m *ProxyConfig) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - msglen |= (int(b) & 0x7F) << shift + msglen |= int(b&0x7F) << shift if b < 0x80 { break } @@ -1521,11 +1814,14 @@ func (m *ProxyConfig) Unmarshal(dAtA []byte) error { return ErrInvalidLengthProxy } postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthProxy + } if postIndex > l { return io.ErrUnexpectedEOF } if m.DiscoveryRefreshDelay == nil { - m.DiscoveryRefreshDelay = &google_protobuf.Duration{} + m.DiscoveryRefreshDelay = &types.Duration{} } if err := m.DiscoveryRefreshDelay.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err @@ -1545,7 +1841,7 @@ func (m *ProxyConfig) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLen |= (uint64(b) & 0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -1555,6 +1851,9 @@ func (m *ProxyConfig) Unmarshal(dAtA []byte) error { return ErrInvalidLengthProxy } postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthProxy + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -1574,7 +1873,7 @@ func (m *ProxyConfig) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - msglen |= (int(b) & 0x7F) << shift + msglen |= int(b&0x7F) << shift if b < 0x80 { break } @@ -1583,11 +1882,14 @@ func (m *ProxyConfig) Unmarshal(dAtA []byte) error { return ErrInvalidLengthProxy } postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthProxy + } if postIndex > l { return io.ErrUnexpectedEOF } if m.ConnectTimeout == nil { - m.ConnectTimeout = &google_protobuf.Duration{} + m.ConnectTimeout = &types.Duration{} } if err := m.ConnectTimeout.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err @@ -1607,7 +1909,7 @@ func (m *ProxyConfig) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLen |= (uint64(b) & 0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -1617,6 +1919,9 @@ func (m *ProxyConfig) Unmarshal(dAtA []byte) error { return ErrInvalidLengthProxy } postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthProxy + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -1636,7 +1941,7 @@ func (m *ProxyConfig) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - m.ProxyAdminPort |= (int32(b) & 0x7F) << shift + m.ProxyAdminPort |= int32(b&0x7F) << shift if b < 0x80 { break } @@ -1655,7 +1960,7 @@ func (m *ProxyConfig) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLen |= (uint64(b) & 0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -1665,6 +1970,9 @@ func (m *ProxyConfig) Unmarshal(dAtA []byte) error { return ErrInvalidLengthProxy } postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthProxy + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -1684,7 +1992,7 @@ func (m *ProxyConfig) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - m.ControlPlaneAuthPolicy |= (AuthenticationPolicy(b) & 0x7F) << shift + m.ControlPlaneAuthPolicy |= AuthenticationPolicy(b&0x7F) << shift if b < 0x80 { break } @@ -1703,7 +2011,7 @@ func (m *ProxyConfig) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLen |= (uint64(b) & 0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -1713,6 +2021,9 @@ func (m *ProxyConfig) Unmarshal(dAtA []byte) error { return ErrInvalidLengthProxy } postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthProxy + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -1732,7 +2043,7 @@ func (m *ProxyConfig) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - m.StatNameLength |= (int32(b) & 0x7F) << shift + m.StatNameLength |= int32(b&0x7F) << shift if b < 0x80 { break } @@ -1751,7 +2062,7 @@ func (m *ProxyConfig) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - m.Concurrency |= (int32(b) & 0x7F) << shift + m.Concurrency |= int32(b&0x7F) << shift if b < 0x80 { break } @@ -1770,7 +2081,7 @@ func (m *ProxyConfig) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLen |= (uint64(b) & 0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -1780,6 +2091,9 @@ func (m *ProxyConfig) Unmarshal(dAtA []byte) error { return ErrInvalidLengthProxy } postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthProxy + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -1799,7 +2113,7 @@ func (m *ProxyConfig) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - m.InterceptionMode |= (ProxyConfig_InboundInterceptionMode(b) & 0x7F) << shift + m.InterceptionMode |= ProxyConfig_InboundInterceptionMode(b&0x7F) << shift if b < 0x80 { break } @@ -1818,7 +2132,7 @@ func (m *ProxyConfig) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - msglen |= (int(b) & 0x7F) << shift + msglen |= int(b&0x7F) << shift if b < 0x80 { break } @@ -1827,6 +2141,9 @@ func (m *ProxyConfig) Unmarshal(dAtA []byte) error { return ErrInvalidLengthProxy } postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthProxy + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -1851,7 +2168,7 @@ func (m *ProxyConfig) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLen |= (uint64(b) & 0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -1861,6 +2178,9 @@ func (m *ProxyConfig) Unmarshal(dAtA []byte) error { return ErrInvalidLengthProxy } postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthProxy + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -1875,9 +2195,13 @@ func (m *ProxyConfig) Unmarshal(dAtA []byte) error { if skippy < 0 { return ErrInvalidLengthProxy } + if (iNdEx + skippy) < 0 { + return ErrInvalidLengthProxy + } if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF } + m.XXX_unrecognized = append(m.XXX_unrecognized, dAtA[iNdEx:iNdEx+skippy]...) iNdEx += skippy } } @@ -1941,10 +2265,13 @@ func skipProxy(dAtA []byte) (n int, err error) { break } } - iNdEx += length if length < 0 { return 0, ErrInvalidLengthProxy } + iNdEx += length + if iNdEx < 0 { + return 0, ErrInvalidLengthProxy + } return iNdEx, nil case 3: for { @@ -1973,6 +2300,9 @@ func skipProxy(dAtA []byte) (n int, err error) { return 0, err } iNdEx = start + next + if iNdEx < 0 { + return 0, ErrInvalidLengthProxy + } } return iNdEx, nil case 4: @@ -1991,65 +2321,3 @@ var ( ErrInvalidLengthProxy = fmt.Errorf("proto: negative length found during unmarshaling") ErrIntOverflowProxy = fmt.Errorf("proto: integer overflow") ) - -func init() { proto.RegisterFile("mesh/v1alpha1/proxy.proto", fileDescriptorProxy) } - -var fileDescriptorProxy = []byte{ - // 892 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x55, 0x5f, 0x6f, 0xdb, 0xb6, - 0x17, 0x8d, 0xf2, 0x6b, 0xfd, 0xe7, 0x3a, 0x71, 0x14, 0xb6, 0xbf, 0x54, 0x31, 0xb6, 0xcc, 0xcb, - 0x80, 0xcd, 0xdd, 0x06, 0x19, 0x4d, 0x81, 0x61, 0x2f, 0x1b, 0x66, 0x27, 0x29, 0x62, 0x20, 0x49, - 0x0d, 0xc5, 0x01, 0xb6, 0xbc, 0x10, 0xb4, 0x74, 0x63, 0x11, 0x95, 0x49, 0x81, 0xa2, 0xbc, 0xb9, - 0x6f, 0xfb, 0x6a, 0x03, 0x06, 0xec, 0x71, 0x1f, 0x61, 0xc8, 0xd3, 0x3e, 0xc6, 0x20, 0x52, 0x72, - 0xbd, 0x21, 0x6d, 0xde, 0xcc, 0xc3, 0x73, 0xae, 0xce, 0x21, 0xef, 0xa5, 0x61, 0x7f, 0x8e, 0x59, - 0xdc, 0x5f, 0xbc, 0x60, 0x49, 0x1a, 0xb3, 0x17, 0xfd, 0x54, 0xc9, 0x5f, 0x96, 0x7e, 0xaa, 0xa4, - 0x96, 0xe4, 0x09, 0xcf, 0x34, 0x97, 0x7e, 0x41, 0xf0, 0x2b, 0x42, 0xe7, 0x60, 0x26, 0xe5, 0x2c, - 0xc1, 0xbe, 0xa1, 0x4c, 0xf3, 0xdb, 0x7e, 0x94, 0x2b, 0xa6, 0xb9, 0x14, 0x56, 0x74, 0xf8, 0xdb, - 0x26, 0xd4, 0x27, 0x8a, 0x85, 0x5c, 0xcc, 0xc8, 0x77, 0x50, 0x7b, 0xcb, 0xd3, 0x37, 0x5c, 0x78, - 0x4e, 0xd7, 0xe9, 0xb5, 0x8e, 0x3e, 0xf3, 0xef, 0xa9, 0xe8, 0x97, 0x6c, 0xff, 0xc6, 0x50, 0xcf, - 0x36, 0x82, 0x52, 0x44, 0x5e, 0x41, 0x33, 0xe1, 0xb3, 0x58, 0x67, 0x1a, 0x53, 0x6f, 0xd3, 0x54, - 0xf8, 0xfc, 0x83, 0x15, 0xce, 0x2b, 0xf6, 0xd9, 0x46, 0xf0, 0x4e, 0xda, 0x39, 0x84, 0x9a, 0xad, - 0x4d, 0x3c, 0xa8, 0xb3, 0x28, 0x52, 0x98, 0x65, 0xc6, 0x51, 0x33, 0xa8, 0x96, 0x9d, 0x5f, 0x1d, - 0x68, 0xae, 0xe4, 0xef, 0xe7, 0x91, 0x4f, 0x61, 0x8b, 0x85, 0x21, 0x66, 0x19, 0xd5, 0xf2, 0x0d, - 0x0a, 0x63, 0xab, 0x19, 0xb4, 0x2c, 0x36, 0x29, 0x20, 0xb2, 0x07, 0xb5, 0x0c, 0xc3, 0x5c, 0xa1, - 0xf7, 0xbf, 0xae, 0xd3, 0x6b, 0x04, 0xe5, 0x8a, 0x7c, 0x02, 0xad, 0x90, 0x85, 0xa8, 0x34, 0x4d, - 0x99, 0x8e, 0xbd, 0x47, 0x46, 0x09, 0x16, 0x1a, 0x33, 0x1d, 0x0f, 0x1b, 0x50, 0xd3, 0xaa, 0x58, - 0x1e, 0xfe, 0xde, 0x84, 0xd6, 0xb8, 0xb8, 0x89, 0x63, 0x29, 0x6e, 0xf9, 0xcc, 0x48, 0xcd, 0x2f, - 0x2b, 0x75, 0x4a, 0xa9, 0x81, 0x0a, 0x69, 0x41, 0x98, 0x72, 0xc1, 0xd4, 0xd2, 0x12, 0xac, 0x2b, - 0xb0, 0x90, 0x21, 0x7c, 0x01, 0x3b, 0x19, 0xaa, 0x05, 0x0f, 0x91, 0x86, 0x49, 0x9e, 0x69, 0x54, - 0xc6, 0x5d, 0x33, 0x68, 0x97, 0xf0, 0xb1, 0x45, 0xc9, 0x0f, 0xd0, 0x8e, 0x14, 0xe3, 0x82, 0x56, - 0xf7, 0x6a, 0x8c, 0xb6, 0x8e, 0xf6, 0x7d, 0x7b, 0xf1, 0x7e, 0x75, 0xf1, 0xfe, 0x49, 0x49, 0x08, - 0xb6, 0x8d, 0xa0, 0x5a, 0x92, 0x2b, 0xf0, 0x52, 0xa6, 0x50, 0x68, 0x9a, 0xc5, 0xb9, 0x8e, 0xe4, - 0xcf, 0x6b, 0xb5, 0x1e, 0x3f, 0x54, 0x6b, 0xcf, 0x4a, 0xaf, 0x4a, 0xe5, 0xaa, 0xe8, 0x57, 0xb0, - 0x1b, 0xf1, 0x2c, 0x94, 0x0b, 0x54, 0x4b, 0x5a, 0xdd, 0x4d, 0xcd, 0x24, 0x70, 0x57, 0x1b, 0x83, - 0xf2, 0x92, 0xae, 0xe1, 0xd9, 0x3b, 0xb2, 0xc2, 0x5b, 0x85, 0x59, 0x4c, 0x23, 0x4c, 0xd8, 0xd2, - 0xab, 0x3f, 0x60, 0x60, 0xb8, 0xe9, 0x39, 0xc1, 0xff, 0x57, 0xea, 0xc0, 0x8a, 0x4f, 0x0a, 0x2d, - 0x79, 0x0e, 0x6d, 0xdb, 0x99, 0x2b, 0x03, 0x8d, 0xc2, 0x80, 0x91, 0x6c, 0xdb, 0x9d, 0xca, 0xc1, - 0x10, 0x76, 0x42, 0x29, 0x04, 0x86, 0x9a, 0x6a, 0x3e, 0x47, 0x99, 0x6b, 0xaf, 0xf9, 0x50, 0xf4, - 0x76, 0xa9, 0x98, 0x58, 0x01, 0xf9, 0x1a, 0x48, 0xa6, 0x99, 0xce, 0x22, 0x9a, 0x47, 0xe9, 0xea, - 0x93, 0x60, 0x33, 0xdb, 0x9d, 0xeb, 0x28, 0xad, 0xbe, 0xd8, 0x03, 0xd7, 0xcc, 0x2e, 0x65, 0xd1, - 0x9c, 0x0b, 0x9a, 0x4a, 0xa5, 0xbd, 0x56, 0xd7, 0xe9, 0x3d, 0x0e, 0xda, 0x06, 0x1f, 0x14, 0xf0, - 0x58, 0x2a, 0x4d, 0xfa, 0xb0, 0xcb, 0x16, 0x8c, 0x27, 0x6c, 0xca, 0x13, 0xae, 0x97, 0xf4, 0xad, - 0x14, 0xe8, 0x6d, 0xad, 0x92, 0xb8, 0xeb, 0x9b, 0x37, 0x52, 0x20, 0x89, 0x60, 0x3f, 0x94, 0x42, - 0x2b, 0x99, 0xd0, 0x34, 0x61, 0x02, 0x29, 0xcb, 0x75, 0x4c, 0x53, 0x99, 0xf0, 0x70, 0xe9, 0x6d, - 0x77, 0x9d, 0x5e, 0xfb, 0xe8, 0xf9, 0xbd, 0x73, 0x39, 0xc8, 0x75, 0x8c, 0x42, 0xf3, 0xd0, 0x04, - 0x1c, 0x1b, 0x41, 0xb0, 0x57, 0xd6, 0x1a, 0x17, 0xa5, 0x0a, 0x86, 0xc5, 0x8b, 0xb8, 0x61, 0x9e, - 0x69, 0x39, 0xa7, 0x65, 0xab, 0xdf, 0xf2, 0x04, 0xbd, 0xb6, 0x8d, 0x6b, 0x77, 0xec, 0x34, 0xbc, - 0xe2, 0x09, 0x16, 0x71, 0x8b, 0x23, 0xa0, 0x82, 0xcd, 0x91, 0x26, 0x28, 0x66, 0x3a, 0xf6, 0x76, - 0x6c, 0xdc, 0x02, 0xbf, 0x64, 0x73, 0x3c, 0x37, 0x28, 0xe9, 0x9a, 0xd9, 0x09, 0x73, 0xa5, 0x50, - 0x84, 0x4b, 0xcf, 0x35, 0xa4, 0x75, 0x88, 0x0c, 0xe0, 0x63, 0x7b, 0x74, 0x53, 0x29, 0x75, 0xa6, - 0x15, 0x4b, 0xa9, 0xc6, 0x79, 0x9a, 0x30, 0x8d, 0x76, 0x9c, 0x76, 0x8d, 0x89, 0x8e, 0x21, 0x0d, - 0x2b, 0xce, 0xa4, 0xa4, 0x98, 0xf1, 0x42, 0xd8, 0xe5, 0x42, 0xa3, 0x0a, 0x31, 0x2d, 0xa2, 0xd2, - 0xb9, 0x8c, 0xd0, 0x23, 0xe6, 0x68, 0xbe, 0xbd, 0xf7, 0x68, 0xd6, 0xa6, 0xdb, 0x1f, 0x89, 0xa9, - 0xcc, 0x45, 0x34, 0x5a, 0x2b, 0x70, 0x21, 0x23, 0x0c, 0x5c, 0xfe, 0x1f, 0x84, 0x7c, 0x03, 0x75, - 0x6d, 0xdf, 0x3a, 0xef, 0x89, 0x69, 0xa7, 0x8f, 0x3e, 0xf4, 0x1e, 0x06, 0x15, 0xb9, 0x48, 0x88, - 0x62, 0x21, 0x97, 0x74, 0x8e, 0x5a, 0xf1, 0x30, 0xa3, 0xd5, 0x5b, 0x50, 0x75, 0xd5, 0x53, 0x9b, - 0xd0, 0x90, 0x2e, 0x2c, 0xe7, 0xca, 0x52, 0xca, 0xfe, 0x3a, 0x7c, 0x09, 0xcf, 0xde, 0xe3, 0x93, - 0x6c, 0x41, 0x23, 0x38, 0x3d, 0x19, 0x05, 0xa7, 0xc7, 0x13, 0x77, 0x83, 0x00, 0xd4, 0x26, 0xe3, - 0xe0, 0xf5, 0x8f, 0x3f, 0xb9, 0xce, 0x97, 0xdf, 0xc3, 0xd3, 0xfb, 0x7a, 0x80, 0x34, 0xe0, 0xd1, - 0xe5, 0xeb, 0xcb, 0x53, 0x77, 0x83, 0xb4, 0x01, 0x2e, 0xae, 0x27, 0xd7, 0x83, 0x73, 0x3a, 0x39, - 0xbf, 0x72, 0x1d, 0xb2, 0x05, 0xf5, 0xd1, 0xe5, 0xd9, 0x69, 0x30, 0x9a, 0xb8, 0x7f, 0xd7, 0x87, - 0xbd, 0x3f, 0xee, 0x0e, 0x9c, 0x3f, 0xef, 0x0e, 0x9c, 0xbf, 0xee, 0x0e, 0x9c, 0x9b, 0x8e, 0xcd, - 0xca, 0x65, 0x9f, 0xa5, 0xbc, 0xff, 0xaf, 0xff, 0xad, 0x69, 0xcd, 0xcc, 0xd3, 0xcb, 0x7f, 0x02, - 0x00, 0x00, 0xff, 0xff, 0x3f, 0x0f, 0x26, 0x61, 0xcf, 0x06, 0x00, 0x00, -} diff --git a/mixer/adapter/model/v1beta1/check.pb.go b/mixer/adapter/model/v1beta1/check.pb.go index 95a431c4786..93d0e8b1503 100644 --- a/mixer/adapter/model/v1beta1/check.pb.go +++ b/mixer/adapter/model/v1beta1/check.pb.go @@ -1,49 +1,21 @@ // Code generated by protoc-gen-gogo. DO NOT EDIT. // source: mixer/adapter/model/v1beta1/check.proto -/* - Package v1beta1 is a generated protocol buffer package. - - It is generated from these files: - mixer/adapter/model/v1beta1/check.proto - mixer/adapter/model/v1beta1/extensions.proto - mixer/adapter/model/v1beta1/info.proto - mixer/adapter/model/v1beta1/infrastructure_backend.proto - mixer/adapter/model/v1beta1/quota.proto - mixer/adapter/model/v1beta1/report.proto - mixer/adapter/model/v1beta1/template.proto - - It has these top-level messages: - CheckResult - Info - CreateSessionRequest - CreateSessionResponse - ValidateRequest - ValidateResponse - CloseSessionRequest - CloseSessionResponse - QuotaRequest - QuotaResult - ReportResult - Template -*/ package v1beta1 -import proto "github.com/gogo/protobuf/proto" -import fmt "fmt" -import math "math" -import _ "github.com/gogo/protobuf/gogoproto" -import _ "github.com/gogo/protobuf/types" -import google_rpc "github.com/gogo/googleapis/google/rpc" - -import time "time" - -import types "github.com/gogo/protobuf/types" - -import strings "strings" -import reflect "reflect" - -import io "io" +import ( + fmt "fmt" + rpc "github.com/gogo/googleapis/google/rpc" + _ "github.com/gogo/protobuf/gogoproto" + proto "github.com/gogo/protobuf/proto" + _ "github.com/gogo/protobuf/types" + github_com_gogo_protobuf_types "github.com/gogo/protobuf/types" + io "io" + math "math" + reflect "reflect" + strings "strings" + time "time" +) // Reference imports to suppress errors if they are not otherwise used. var _ = proto.Marshal @@ -61,20 +33,78 @@ const _ = proto.GoGoProtoPackageIsVersion2 // please upgrade the proto package type CheckResult struct { // A status code of OK indicates preconditions were satisfied. Any other code indicates preconditions were not // satisfied and details describe why. - Status google_rpc.Status `protobuf:"bytes,1,opt,name=status" json:"status"` + Status rpc.Status `protobuf:"bytes,1,opt,name=status,proto3" json:"status"` // The amount of time for which this result can be considered valid. - ValidDuration time.Duration `protobuf:"bytes,2,opt,name=valid_duration,json=validDuration,stdduration" json:"valid_duration"` + ValidDuration time.Duration `protobuf:"bytes,2,opt,name=valid_duration,json=validDuration,proto3,stdduration" json:"valid_duration"` // The number of uses for which this result can be considered valid. ValidUseCount int32 `protobuf:"varint,3,opt,name=valid_use_count,json=validUseCount,proto3" json:"valid_use_count,omitempty"` } -func (m *CheckResult) Reset() { *m = CheckResult{} } -func (*CheckResult) ProtoMessage() {} -func (*CheckResult) Descriptor() ([]byte, []int) { return fileDescriptorCheck, []int{0} } +func (m *CheckResult) Reset() { *m = CheckResult{} } +func (*CheckResult) ProtoMessage() {} +func (*CheckResult) Descriptor() ([]byte, []int) { + return fileDescriptor_b5cd393dc2a446fd, []int{0} +} +func (m *CheckResult) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *CheckResult) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_CheckResult.Marshal(b, m, deterministic) + } else { + b = b[:cap(b)] + n, err := m.MarshalTo(b) + if err != nil { + return nil, err + } + return b[:n], nil + } +} +func (m *CheckResult) XXX_Merge(src proto.Message) { + xxx_messageInfo_CheckResult.Merge(m, src) +} +func (m *CheckResult) XXX_Size() int { + return m.Size() +} +func (m *CheckResult) XXX_DiscardUnknown() { + xxx_messageInfo_CheckResult.DiscardUnknown(m) +} + +var xxx_messageInfo_CheckResult proto.InternalMessageInfo func init() { proto.RegisterType((*CheckResult)(nil), "istio.mixer.adapter.model.v1beta1.CheckResult") } + +func init() { + proto.RegisterFile("mixer/adapter/model/v1beta1/check.proto", fileDescriptor_b5cd393dc2a446fd) +} + +var fileDescriptor_b5cd393dc2a446fd = []byte{ + // 322 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x91, 0x3d, 0x4e, 0xc3, 0x30, + 0x18, 0x86, 0x6d, 0x7e, 0x2a, 0x94, 0x0a, 0x90, 0x22, 0x24, 0x4a, 0x87, 0xaf, 0x85, 0x01, 0x3a, + 0xd9, 0x14, 0x6e, 0xd0, 0x32, 0x31, 0x16, 0xb1, 0xb0, 0x54, 0x4e, 0x62, 0x82, 0x45, 0x5a, 0x47, + 0x89, 0x53, 0x31, 0x72, 0x04, 0x46, 0x8e, 0xc0, 0xce, 0x25, 0x3a, 0x76, 0xec, 0x04, 0xc4, 0x59, + 0x18, 0x7b, 0x04, 0x14, 0xdb, 0x59, 0xd9, 0x6c, 0x3f, 0xcf, 0xfb, 0xf9, 0x95, 0xed, 0x5d, 0xcc, + 0xc4, 0x0b, 0xcf, 0x28, 0x8b, 0x58, 0xaa, 0x78, 0x46, 0x67, 0x32, 0xe2, 0x09, 0x5d, 0x0c, 0x03, + 0xae, 0xd8, 0x90, 0x86, 0x4f, 0x3c, 0x7c, 0x26, 0x69, 0x26, 0x95, 0xf4, 0x4f, 0x45, 0xae, 0x84, + 0x24, 0x46, 0x27, 0x4e, 0x27, 0x46, 0x27, 0x4e, 0xef, 0x1e, 0xc5, 0x32, 0x96, 0xc6, 0xa6, 0xf5, + 0xca, 0x06, 0xbb, 0x10, 0x4b, 0x19, 0x27, 0x9c, 0x9a, 0x5d, 0x50, 0x3c, 0xd2, 0xa8, 0xc8, 0x98, + 0x12, 0x72, 0xee, 0xf8, 0xb1, 0xe3, 0x59, 0x1a, 0xd2, 0x5c, 0x31, 0x55, 0xe4, 0x16, 0x9c, 0x7d, + 0x62, 0xaf, 0x3d, 0xae, 0x1b, 0x4c, 0x78, 0x5e, 0x24, 0xca, 0xbf, 0xf4, 0x5a, 0x96, 0x77, 0x70, + 0x1f, 0x0f, 0xda, 0x57, 0x3e, 0xb1, 0x49, 0x92, 0xa5, 0x21, 0xb9, 0x33, 0x64, 0xb4, 0xb3, 0xfc, + 0xea, 0xa1, 0x89, 0xf3, 0xfc, 0x5b, 0xef, 0x60, 0xc1, 0x12, 0x11, 0x4d, 0x9b, 0x2b, 0x3b, 0x5b, + 0x26, 0x79, 0xd2, 0x24, 0x9b, 0x4e, 0xe4, 0xc6, 0x09, 0xa3, 0xbd, 0x7a, 0xc0, 0xfb, 0x77, 0x0f, + 0x4f, 0xf6, 0x4d, 0xb4, 0x01, 0xfe, 0xb9, 0x77, 0x68, 0x67, 0x15, 0x39, 0x9f, 0x86, 0xb2, 0x98, + 0xab, 0xce, 0x76, 0x1f, 0x0f, 0x76, 0x9d, 0x77, 0x9f, 0xf3, 0x71, 0x7d, 0x38, 0x0a, 0x96, 0x25, + 0xa0, 0x55, 0x09, 0x68, 0x5d, 0x02, 0xda, 0x94, 0x80, 0x5e, 0x35, 0xe0, 0x0f, 0x0d, 0x68, 0xa9, + 0x01, 0xaf, 0x34, 0xe0, 0x1f, 0x0d, 0xf8, 0x57, 0x03, 0xda, 0x68, 0xc0, 0x6f, 0x15, 0xa0, 0x55, + 0x05, 0x68, 0x5d, 0x01, 0x7a, 0x18, 0xd8, 0x17, 0x16, 0x92, 0xb2, 0x54, 0xd0, 0x7f, 0xfe, 0x25, + 0x68, 0x99, 0xde, 0xd7, 0x7f, 0x01, 0x00, 0x00, 0xff, 0xff, 0xc7, 0x5b, 0xc8, 0xb5, 0xbd, 0x01, + 0x00, 0x00, +} + func (m *CheckResult) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) @@ -100,8 +130,8 @@ func (m *CheckResult) MarshalTo(dAtA []byte) (int, error) { i += n1 dAtA[i] = 0x12 i++ - i = encodeVarintCheck(dAtA, i, uint64(types.SizeOfStdDuration(m.ValidDuration))) - n2, err := types.StdDurationMarshalTo(m.ValidDuration, dAtA[i:]) + i = encodeVarintCheck(dAtA, i, uint64(github_com_gogo_protobuf_types.SizeOfStdDuration(m.ValidDuration))) + n2, err := github_com_gogo_protobuf_types.StdDurationMarshalTo(m.ValidDuration, dAtA[i:]) if err != nil { return 0, err } @@ -124,11 +154,14 @@ func encodeVarintCheck(dAtA []byte, offset int, v uint64) int { return offset + 1 } func (m *CheckResult) Size() (n int) { + if m == nil { + return 0 + } var l int _ = l l = m.Status.Size() n += 1 + l + sovCheck(uint64(l)) - l = types.SizeOfStdDuration(m.ValidDuration) + l = github_com_gogo_protobuf_types.SizeOfStdDuration(m.ValidDuration) n += 1 + l + sovCheck(uint64(l)) if m.ValidUseCount != 0 { n += 1 + sovCheck(uint64(m.ValidUseCount)) @@ -154,8 +187,8 @@ func (this *CheckResult) String() string { return "nil" } s := strings.Join([]string{`&CheckResult{`, - `Status:` + strings.Replace(strings.Replace(this.Status.String(), "Status", "google_rpc.Status", 1), `&`, ``, 1) + `,`, - `ValidDuration:` + strings.Replace(strings.Replace(this.ValidDuration.String(), "Duration", "google_protobuf1.Duration", 1), `&`, ``, 1) + `,`, + `Status:` + strings.Replace(strings.Replace(this.Status.String(), "Status", "rpc.Status", 1), `&`, ``, 1) + `,`, + `ValidDuration:` + strings.Replace(strings.Replace(this.ValidDuration.String(), "Duration", "types.Duration", 1), `&`, ``, 1) + `,`, `ValidUseCount:` + fmt.Sprintf("%v", this.ValidUseCount) + `,`, `}`, }, "") @@ -184,7 +217,7 @@ func (m *CheckResult) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - wire |= (uint64(b) & 0x7F) << shift + wire |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -212,7 +245,7 @@ func (m *CheckResult) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - msglen |= (int(b) & 0x7F) << shift + msglen |= int(b&0x7F) << shift if b < 0x80 { break } @@ -221,6 +254,9 @@ func (m *CheckResult) Unmarshal(dAtA []byte) error { return ErrInvalidLengthCheck } postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthCheck + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -242,7 +278,7 @@ func (m *CheckResult) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - msglen |= (int(b) & 0x7F) << shift + msglen |= int(b&0x7F) << shift if b < 0x80 { break } @@ -251,10 +287,13 @@ func (m *CheckResult) Unmarshal(dAtA []byte) error { return ErrInvalidLengthCheck } postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthCheck + } if postIndex > l { return io.ErrUnexpectedEOF } - if err := types.StdDurationUnmarshal(&m.ValidDuration, dAtA[iNdEx:postIndex]); err != nil { + if err := github_com_gogo_protobuf_types.StdDurationUnmarshal(&m.ValidDuration, dAtA[iNdEx:postIndex]); err != nil { return err } iNdEx = postIndex @@ -272,7 +311,7 @@ func (m *CheckResult) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - m.ValidUseCount |= (int32(b) & 0x7F) << shift + m.ValidUseCount |= int32(b&0x7F) << shift if b < 0x80 { break } @@ -286,6 +325,9 @@ func (m *CheckResult) Unmarshal(dAtA []byte) error { if skippy < 0 { return ErrInvalidLengthCheck } + if (iNdEx + skippy) < 0 { + return ErrInvalidLengthCheck + } if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF } @@ -352,10 +394,13 @@ func skipCheck(dAtA []byte) (n int, err error) { break } } - iNdEx += length if length < 0 { return 0, ErrInvalidLengthCheck } + iNdEx += length + if iNdEx < 0 { + return 0, ErrInvalidLengthCheck + } return iNdEx, nil case 3: for { @@ -384,6 +429,9 @@ func skipCheck(dAtA []byte) (n int, err error) { return 0, err } iNdEx = start + next + if iNdEx < 0 { + return 0, ErrInvalidLengthCheck + } } return iNdEx, nil case 4: @@ -402,29 +450,3 @@ var ( ErrInvalidLengthCheck = fmt.Errorf("proto: negative length found during unmarshaling") ErrIntOverflowCheck = fmt.Errorf("proto: integer overflow") ) - -func init() { proto.RegisterFile("mixer/adapter/model/v1beta1/check.proto", fileDescriptorCheck) } - -var fileDescriptorCheck = []byte{ - // 317 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x91, 0x31, 0x4e, 0xf3, 0x30, - 0x18, 0x86, 0xed, 0xff, 0x87, 0x0a, 0xa5, 0x02, 0xa4, 0x08, 0x89, 0xd2, 0xe1, 0x6b, 0x61, 0x80, - 0x4e, 0x36, 0x85, 0x1b, 0xb4, 0x4c, 0x8c, 0x45, 0x2c, 0x5d, 0x2a, 0x37, 0x31, 0xc1, 0x22, 0xad, - 0xa3, 0xc4, 0xae, 0x18, 0x39, 0x02, 0x23, 0x47, 0x60, 0xe7, 0x12, 0x19, 0x3b, 0x32, 0x01, 0x31, - 0x0b, 0x63, 0x8f, 0x80, 0x62, 0x3b, 0x2b, 0x9b, 0xed, 0xe7, 0x79, 0x3f, 0xbf, 0xb2, 0x83, 0xb3, - 0x85, 0x78, 0xe4, 0x39, 0x65, 0x31, 0xcb, 0x14, 0xcf, 0xe9, 0x42, 0xc6, 0x3c, 0xa5, 0xab, 0xe1, - 0x9c, 0x2b, 0x36, 0xa4, 0xd1, 0x3d, 0x8f, 0x1e, 0x48, 0x96, 0x4b, 0x25, 0xc3, 0x63, 0x51, 0x28, - 0x21, 0x89, 0xd5, 0x89, 0xd7, 0x89, 0xd5, 0x89, 0xd7, 0xbb, 0x07, 0x89, 0x4c, 0xa4, 0xb5, 0x69, - 0xbd, 0x72, 0xc1, 0x2e, 0x24, 0x52, 0x26, 0x29, 0xa7, 0x76, 0x37, 0xd7, 0x77, 0x34, 0xd6, 0x39, - 0x53, 0x42, 0x2e, 0x3d, 0x3f, 0xf4, 0x3c, 0xcf, 0x22, 0x5a, 0x28, 0xa6, 0x74, 0xe1, 0xc0, 0xc9, - 0x1b, 0x0e, 0xda, 0xe3, 0xba, 0xc1, 0x84, 0x17, 0x3a, 0x55, 0xe1, 0x79, 0xd0, 0x72, 0xbc, 0x83, - 0xfb, 0x78, 0xd0, 0xbe, 0x08, 0x89, 0x4b, 0x92, 0x3c, 0x8b, 0xc8, 0x8d, 0x25, 0xa3, 0xad, 0xf2, - 0xa3, 0x87, 0x26, 0xde, 0x0b, 0xaf, 0x83, 0xbd, 0x15, 0x4b, 0x45, 0x3c, 0x6b, 0xae, 0xec, 0xfc, - 0xb3, 0xc9, 0xa3, 0x26, 0xd9, 0x74, 0x22, 0x57, 0x5e, 0x18, 0xed, 0xd4, 0x03, 0x5e, 0x3e, 0x7b, - 0x78, 0xb2, 0x6b, 0xa3, 0x0d, 0x08, 0x4f, 0x83, 0x7d, 0x37, 0x4b, 0x17, 0x7c, 0x16, 0x49, 0xbd, - 0x54, 0x9d, 0xff, 0x7d, 0x3c, 0xd8, 0xf6, 0xde, 0x6d, 0xc1, 0xc7, 0xf5, 0xe1, 0x68, 0x5a, 0x56, - 0x80, 0xd6, 0x15, 0xa0, 0xf7, 0x0a, 0xd0, 0xa6, 0x02, 0xf4, 0x64, 0x00, 0xbf, 0x1a, 0x40, 0xa5, - 0x01, 0xbc, 0x36, 0x80, 0xbf, 0x0c, 0xe0, 0x1f, 0x03, 0x68, 0x63, 0x00, 0x3f, 0x7f, 0x03, 0x9a, - 0x0e, 0xdc, 0xcb, 0x0a, 0x49, 0x59, 0x26, 0xe8, 0x1f, 0xff, 0x31, 0x6f, 0xd9, 0xbe, 0x97, 0xbf, - 0x01, 0x00, 0x00, 0xff, 0xff, 0x0a, 0x50, 0x63, 0xd3, 0xb5, 0x01, 0x00, 0x00, -} diff --git a/mixer/adapter/model/v1beta1/extensions.pb.go b/mixer/adapter/model/v1beta1/extensions.pb.go index 1d510977c52..074e787c05e 100644 --- a/mixer/adapter/model/v1beta1/extensions.pb.go +++ b/mixer/adapter/model/v1beta1/extensions.pb.go @@ -3,18 +3,25 @@ package v1beta1 -import proto "github.com/gogo/protobuf/proto" -import fmt "fmt" -import math "math" -import google_protobuf "github.com/gogo/protobuf/protoc-gen-gogo/descriptor" - -import strconv "strconv" +import ( + fmt "fmt" + proto "github.com/gogo/protobuf/proto" + descriptor "github.com/gogo/protobuf/protoc-gen-gogo/descriptor" + math "math" + strconv "strconv" +) // Reference imports to suppress errors if they are not otherwise used. var _ = proto.Marshal var _ = fmt.Errorf var _ = math.Inf +// This is a compile-time assertion to ensure that this generated file +// is compatible with the proto package it is being compiled against. +// A compilation error at this line likely means your copy of the +// proto package needs to be updated. +const _ = proto.GoGoProtoPackageIsVersion2 // please upgrade the proto package + // The available varieties of templates, controlling the semantics of what an adapter does with each instance. type TemplateVariety int32 @@ -43,6 +50,7 @@ var TemplateVariety_name = map[int32]string{ 3: "TEMPLATE_VARIETY_ATTRIBUTE_GENERATOR", 4: "TEMPLATE_VARIETY_CHECK_WITH_OUTPUT", } + var TemplateVariety_value = map[string]int32{ "TEMPLATE_VARIETY_CHECK": 0, "TEMPLATE_VARIETY_REPORT": 1, @@ -51,23 +59,25 @@ var TemplateVariety_value = map[string]int32{ "TEMPLATE_VARIETY_CHECK_WITH_OUTPUT": 4, } -func (TemplateVariety) EnumDescriptor() ([]byte, []int) { return fileDescriptorExtensions, []int{0} } +func (TemplateVariety) EnumDescriptor() ([]byte, []int) { + return fileDescriptor_3163b5e8dc3ddc37, []int{0} +} var E_TemplateVariety = &proto.ExtensionDesc{ - ExtendedType: (*google_protobuf.FileOptions)(nil), + ExtendedType: (*descriptor.FileOptions)(nil), ExtensionType: (*TemplateVariety)(nil), Field: 72295727, Name: "istio.mixer.adapter.model.v1beta1.template_variety", - Tag: "varint,72295727,opt,name=template_variety,json=templateVariety,enum=istio.mixer.adapter.model.v1beta1.TemplateVariety", + Tag: "varint,72295727,opt,name=template_variety,enum=istio.mixer.adapter.model.v1beta1.TemplateVariety", Filename: "mixer/adapter/model/v1beta1/extensions.proto", } var E_TemplateName = &proto.ExtensionDesc{ - ExtendedType: (*google_protobuf.FileOptions)(nil), + ExtendedType: (*descriptor.FileOptions)(nil), ExtensionType: (*string)(nil), Field: 72295888, Name: "istio.mixer.adapter.model.v1beta1.template_name", - Tag: "bytes,72295888,opt,name=template_name,json=templateName", + Tag: "bytes,72295888,opt,name=template_name", Filename: "mixer/adapter/model/v1beta1/extensions.proto", } @@ -76,6 +86,40 @@ func init() { proto.RegisterExtension(E_TemplateVariety) proto.RegisterExtension(E_TemplateName) } + +func init() { + proto.RegisterFile("mixer/adapter/model/v1beta1/extensions.proto", fileDescriptor_3163b5e8dc3ddc37) +} + +var fileDescriptor_3163b5e8dc3ddc37 = []byte{ + // 389 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x92, 0x41, 0xcb, 0xd3, 0x30, + 0x18, 0xc7, 0x1b, 0x15, 0xc1, 0xa0, 0xae, 0xf4, 0xa0, 0x32, 0x25, 0xcc, 0x21, 0x32, 0x44, 0x12, + 0x36, 0x6f, 0xbb, 0x75, 0x33, 0xba, 0xa1, 0xae, 0x33, 0xa4, 0x13, 0x3d, 0x58, 0x32, 0x17, 0x47, + 0xa0, 0x5d, 0x4a, 0x1b, 0xc7, 0xbc, 0x88, 0x1f, 0xc1, 0x8f, 0xe1, 0xcd, 0xab, 0x07, 0x3f, 0x80, + 0xe8, 0xa5, 0xc7, 0x1d, 0x5d, 0x77, 0xf1, 0xb8, 0x8f, 0x20, 0x76, 0xdd, 0x0b, 0xef, 0xbb, 0xf1, + 0xee, 0x9a, 0x87, 0x5f, 0xfe, 0xbf, 0xe7, 0xcf, 0x03, 0x1f, 0x46, 0x6a, 0x21, 0x13, 0x22, 0x26, + 0x22, 0x36, 0x32, 0x21, 0x91, 0x9e, 0xc8, 0x90, 0xcc, 0x9b, 0x63, 0x69, 0x44, 0x93, 0xc8, 0x85, + 0x91, 0xb3, 0x54, 0xe9, 0x59, 0x8a, 0xe3, 0x44, 0x1b, 0xed, 0xdc, 0x55, 0xa9, 0x51, 0x1a, 0x17, + 0x0c, 0x2e, 0x19, 0x5c, 0x30, 0xb8, 0x64, 0xaa, 0xb5, 0xa9, 0xd6, 0xd3, 0x50, 0x92, 0x02, 0x18, + 0x7f, 0x78, 0x4f, 0x26, 0x32, 0x7d, 0x97, 0xa8, 0xd8, 0xe8, 0x64, 0xfb, 0xc9, 0x83, 0xef, 0x00, + 0x56, 0xb8, 0x8c, 0xe2, 0x50, 0x18, 0x39, 0x12, 0x89, 0x92, 0xe6, 0xa3, 0x53, 0x85, 0x37, 0x38, + 0x7d, 0x31, 0x7c, 0xee, 0x72, 0x1a, 0x8c, 0x5c, 0xd6, 0xa7, 0xfc, 0x75, 0xd0, 0xed, 0xd1, 0xee, + 0x33, 0xdb, 0x72, 0x6e, 0xc3, 0x9b, 0x7b, 0x33, 0x46, 0x87, 0x1e, 0xe3, 0x36, 0x38, 0x08, 0xbe, + 0xf4, 0x3d, 0xee, 0xda, 0x17, 0x9c, 0x06, 0xbc, 0xb7, 0x37, 0x73, 0x39, 0x67, 0xfd, 0x8e, 0xcf, + 0x69, 0xf0, 0x94, 0x0e, 0x28, 0x73, 0xb9, 0xc7, 0xec, 0x8b, 0xce, 0x7d, 0x58, 0x3f, 0x1c, 0x1f, + 0xbc, 0xea, 0xf3, 0x5e, 0xe0, 0xf9, 0x7c, 0xe8, 0x73, 0xfb, 0x52, 0xfb, 0x13, 0xb4, 0x4d, 0x69, + 0x1e, 0xcc, 0x4b, 0xf5, 0x3b, 0x78, 0xbb, 0x31, 0xde, 0x6d, 0x8c, 0x9f, 0xa8, 0x50, 0x7a, 0xb1, + 0xf9, 0xdf, 0xdb, 0xad, 0x6f, 0xbf, 0x7e, 0xd4, 0x6b, 0xa0, 0x71, 0xbd, 0xd5, 0xc2, 0x47, 0xbb, + 0xc3, 0x67, 0x5a, 0x61, 0x15, 0x73, 0xfa, 0xa1, 0xfd, 0x18, 0x5e, 0x3b, 0xc9, 0x9f, 0x89, 0x48, + 0x1e, 0x09, 0xcf, 0x7e, 0x17, 0xe1, 0x57, 0xd8, 0xd5, 0x1d, 0x35, 0x10, 0x91, 0xec, 0xbc, 0xcd, + 0x56, 0xc8, 0x5a, 0xae, 0x90, 0xb5, 0x59, 0x21, 0xf0, 0x39, 0x47, 0xe0, 0x6b, 0x8e, 0xc0, 0xcf, + 0x1c, 0x81, 0x2c, 0x47, 0xe0, 0x4f, 0x8e, 0xc0, 0xdf, 0x1c, 0x59, 0x9b, 0x1c, 0x81, 0x2f, 0x6b, + 0x64, 0x65, 0x6b, 0x64, 0x2d, 0xd7, 0xc8, 0x7a, 0xd3, 0xd8, 0xfa, 0x2b, 0x4d, 0x44, 0xac, 0xc8, + 0x39, 0x67, 0x33, 0xbe, 0x5c, 0xc8, 0x3c, 0xfa, 0x17, 0x00, 0x00, 0xff, 0xff, 0x4d, 0x15, 0x3b, + 0xb8, 0x5c, 0x02, 0x00, 0x00, +} + func (x TemplateVariety) String() string { s, ok := TemplateVariety_name[int32(x)] if ok { @@ -83,35 +127,3 @@ func (x TemplateVariety) String() string { } return strconv.Itoa(int(x)) } - -func init() { - proto.RegisterFile("mixer/adapter/model/v1beta1/extensions.proto", fileDescriptorExtensions) -} - -var fileDescriptorExtensions = []byte{ - // 382 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0xd2, 0xc9, 0xcd, 0xac, 0x48, - 0x2d, 0xd2, 0x4f, 0x4c, 0x49, 0x2c, 0x28, 0x49, 0x2d, 0xd2, 0xcf, 0xcd, 0x4f, 0x49, 0xcd, 0xd1, - 0x2f, 0x33, 0x4c, 0x4a, 0x2d, 0x49, 0x34, 0xd4, 0x4f, 0xad, 0x28, 0x49, 0xcd, 0x2b, 0xce, 0xcc, - 0xcf, 0x2b, 0xd6, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x52, 0xcc, 0x2c, 0x2e, 0xc9, 0xcc, 0xd7, - 0x03, 0xeb, 0xd1, 0x83, 0xea, 0xd1, 0x03, 0xeb, 0xd1, 0x83, 0xea, 0x91, 0x52, 0x48, 0xcf, 0xcf, - 0x4f, 0xcf, 0x49, 0xd5, 0x07, 0x6b, 0x48, 0x2a, 0x4d, 0xd3, 0x4f, 0x49, 0x2d, 0x4e, 0x2e, 0xca, - 0x2c, 0x28, 0xc9, 0x2f, 0x82, 0x18, 0xa2, 0xb5, 0x83, 0x91, 0x8b, 0x3f, 0x24, 0x35, 0xb7, 0x20, - 0x27, 0xb1, 0x24, 0x35, 0x2c, 0xb1, 0x28, 0x33, 0xb5, 0xa4, 0x52, 0x48, 0x8a, 0x4b, 0x2c, 0xc4, - 0xd5, 0x37, 0xc0, 0xc7, 0x31, 0xc4, 0x35, 0x3e, 0xcc, 0x31, 0xc8, 0xd3, 0x35, 0x24, 0x32, 0xde, - 0xd9, 0xc3, 0xd5, 0xd9, 0x5b, 0x80, 0x41, 0x48, 0x9a, 0x4b, 0x1c, 0x43, 0x2e, 0xc8, 0x35, 0xc0, - 0x3f, 0x28, 0x44, 0x80, 0x11, 0xab, 0xc6, 0xc0, 0x50, 0xff, 0x10, 0x47, 0x01, 0x26, 0x21, 0x0d, - 0x2e, 0x15, 0x0c, 0x39, 0xc7, 0x90, 0x90, 0x20, 0x4f, 0xa7, 0xd0, 0x10, 0xd7, 0x78, 0x77, 0x57, - 0x3f, 0xd7, 0x20, 0xc7, 0x10, 0xff, 0x20, 0x01, 0x66, 0x21, 0x35, 0x2e, 0x25, 0xec, 0xd6, 0xc7, - 0x87, 0x7b, 0x86, 0x78, 0xc4, 0xfb, 0x87, 0x86, 0x04, 0x84, 0x86, 0x08, 0xb0, 0x58, 0xd5, 0x71, - 0x09, 0x94, 0x40, 0x5d, 0x1e, 0x5f, 0x06, 0x75, 0xba, 0x8c, 0x1e, 0xc4, 0xc7, 0x7a, 0x30, 0x1f, - 0xeb, 0xb9, 0x65, 0xe6, 0xa4, 0xfa, 0x17, 0x94, 0x80, 0xc2, 0x4d, 0x62, 0xfd, 0xa9, 0x3d, 0x4a, - 0x0a, 0x8c, 0x1a, 0x7c, 0x46, 0x46, 0x7a, 0x04, 0xc3, 0x4e, 0x0f, 0x2d, 0x54, 0x82, 0xf8, 0x4b, - 0x50, 0x05, 0xac, 0x5c, 0xb8, 0x78, 0xe1, 0xf6, 0xe7, 0x25, 0xe6, 0xa6, 0x12, 0xb0, 0xfc, 0xc2, - 0x69, 0xb0, 0xe5, 0x9c, 0x41, 0x3c, 0x30, 0x5d, 0x7e, 0x89, 0xb9, 0xa9, 0x4e, 0x61, 0x17, 0x1e, - 0xca, 0x31, 0xdc, 0x78, 0x28, 0xc7, 0xf0, 0xe1, 0xa1, 0x1c, 0x63, 0xc3, 0x23, 0x39, 0xc6, 0x15, - 0x8f, 0xe4, 0x18, 0x4f, 0x3c, 0x92, 0x63, 0xbc, 0xf0, 0x48, 0x8e, 0xf1, 0xc1, 0x23, 0x39, 0xc6, - 0x17, 0x8f, 0xe4, 0x18, 0x3e, 0x3c, 0x92, 0x63, 0x9c, 0xf0, 0x58, 0x8e, 0x21, 0x4a, 0x03, 0xe2, - 0xee, 0xcc, 0x7c, 0xfd, 0xc4, 0x82, 0x4c, 0x7d, 0x3c, 0xc9, 0x25, 0x89, 0x0d, 0xec, 0x08, 0x63, - 0x40, 0x00, 0x00, 0x00, 0xff, 0xff, 0xfd, 0x93, 0x1c, 0x86, 0x54, 0x02, 0x00, 0x00, -} diff --git a/mixer/adapter/model/v1beta1/info.pb.go b/mixer/adapter/model/v1beta1/info.pb.go index 86041840e6b..230fdaf47ba 100644 --- a/mixer/adapter/model/v1beta1/info.pb.go +++ b/mixer/adapter/model/v1beta1/info.pb.go @@ -3,20 +3,26 @@ package v1beta1 -import proto "github.com/gogo/protobuf/proto" -import fmt "fmt" -import math "math" - -import strings "strings" -import reflect "reflect" - -import io "io" +import ( + fmt "fmt" + proto "github.com/gogo/protobuf/proto" + io "io" + math "math" + reflect "reflect" + strings "strings" +) // Reference imports to suppress errors if they are not otherwise used. var _ = proto.Marshal var _ = fmt.Errorf var _ = math.Inf +// This is a compile-time assertion to ensure that this generated file +// is compatible with the proto package it is being compiled against. +// A compilation error at this line likely means your copy of the +// proto package needs to be updated. +const _ = proto.GoGoProtoPackageIsVersion2 // please upgrade the proto package + // Info describes an adapter or a backend that wants to provide telemetry and policy functionality to Mixer as an // out of process adapter. type Info struct { @@ -30,7 +36,7 @@ type Info struct { // User-friendly description of the adapter. Description string `protobuf:"bytes,2,opt,name=description,proto3" json:"description,omitempty"` // Names of the templates the adapter supports. - Templates []string `protobuf:"bytes,3,rep,name=templates" json:"templates,omitempty"` + Templates []string `protobuf:"bytes,3,rep,name=templates,proto3" json:"templates,omitempty"` // Base64 encoded proto descriptor of the adapter configuration. Config string `protobuf:"bytes,4,opt,name=config,proto3" json:"config,omitempty"` // True if backend has implemented the @@ -49,9 +55,37 @@ type Info struct { SessionBased bool `protobuf:"varint,5,opt,name=session_based,json=sessionBased,proto3" json:"session_based,omitempty"` } -func (m *Info) Reset() { *m = Info{} } -func (*Info) ProtoMessage() {} -func (*Info) Descriptor() ([]byte, []int) { return fileDescriptorInfo, []int{0} } +func (m *Info) Reset() { *m = Info{} } +func (*Info) ProtoMessage() {} +func (*Info) Descriptor() ([]byte, []int) { + return fileDescriptor_62b7a6e7e280c38a, []int{0} +} +func (m *Info) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *Info) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_Info.Marshal(b, m, deterministic) + } else { + b = b[:cap(b)] + n, err := m.MarshalTo(b) + if err != nil { + return nil, err + } + return b[:n], nil + } +} +func (m *Info) XXX_Merge(src proto.Message) { + xxx_messageInfo_Info.Merge(m, src) +} +func (m *Info) XXX_Size() int { + return m.Size() +} +func (m *Info) XXX_DiscardUnknown() { + xxx_messageInfo_Info.DiscardUnknown(m) +} + +var xxx_messageInfo_Info proto.InternalMessageInfo func (m *Info) GetName() string { if m != nil { @@ -91,6 +125,32 @@ func (m *Info) GetSessionBased() bool { func init() { proto.RegisterType((*Info)(nil), "istio.mixer.adapter.model.v1beta1.Info") } + +func init() { + proto.RegisterFile("mixer/adapter/model/v1beta1/info.proto", fileDescriptor_62b7a6e7e280c38a) +} + +var fileDescriptor_62b7a6e7e280c38a = []byte{ + // 267 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x90, 0x31, 0x4e, 0xec, 0x30, + 0x10, 0x86, 0x3d, 0x6f, 0xf3, 0x56, 0xc4, 0x40, 0xe3, 0x02, 0xa5, 0x40, 0xa3, 0x00, 0x12, 0x4a, + 0x15, 0x6b, 0xc5, 0x0d, 0xb6, 0xa3, 0x4d, 0x49, 0x01, 0x72, 0x36, 0x0e, 0xb2, 0xb4, 0xb1, 0xad, + 0xd8, 0x42, 0x94, 0x1c, 0x81, 0x8e, 0x2b, 0x70, 0x14, 0xca, 0x94, 0x5b, 0x12, 0xa7, 0xa1, 0xdc, + 0x23, 0x20, 0x4c, 0x24, 0xa8, 0xe8, 0x66, 0xbe, 0xf9, 0xa6, 0xf8, 0x7f, 0x7a, 0xd9, 0xa9, 0x47, + 0xd9, 0x73, 0xd1, 0x08, 0xeb, 0x65, 0xcf, 0x3b, 0xd3, 0xc8, 0x2d, 0x7f, 0x58, 0xd5, 0xd2, 0x8b, + 0x15, 0x57, 0xba, 0x35, 0xa5, 0xed, 0x8d, 0x37, 0xec, 0x4c, 0x39, 0xaf, 0x4c, 0x19, 0xed, 0x72, + 0xb6, 0xcb, 0x68, 0x97, 0xb3, 0x7d, 0xfe, 0x02, 0x34, 0xb9, 0xd6, 0xad, 0x61, 0x8c, 0x26, 0x5a, + 0x74, 0x32, 0x83, 0x1c, 0x8a, 0xb4, 0x8a, 0x33, 0xcb, 0xe9, 0x61, 0x23, 0xdd, 0xa6, 0x57, 0xd6, + 0x2b, 0xa3, 0xb3, 0x7f, 0xf1, 0xf4, 0x1b, 0xb1, 0x53, 0x9a, 0x7a, 0xd9, 0xd9, 0xad, 0xf0, 0xd2, + 0x65, 0x8b, 0x7c, 0x51, 0xa4, 0xd5, 0x0f, 0x60, 0x27, 0x74, 0xb9, 0x31, 0xba, 0x55, 0xf7, 0x59, + 0x12, 0x5f, 0xe7, 0x8d, 0x5d, 0xd0, 0x63, 0x27, 0x9d, 0x53, 0x46, 0xdf, 0xd5, 0xc2, 0xc9, 0x26, + 0xfb, 0x9f, 0x43, 0x71, 0x50, 0x1d, 0xcd, 0x70, 0xfd, 0xc5, 0xd6, 0xb7, 0xc3, 0x88, 0x64, 0x37, + 0x22, 0xd9, 0x8f, 0x08, 0x4f, 0x01, 0xe1, 0x35, 0x20, 0xbc, 0x05, 0x84, 0x21, 0x20, 0xbc, 0x07, + 0x84, 0x8f, 0x80, 0x64, 0x1f, 0x10, 0x9e, 0x27, 0x24, 0xc3, 0x84, 0x64, 0x37, 0x21, 0xb9, 0x29, + 0xbe, 0x23, 0x2b, 0xc3, 0x85, 0x55, 0xfc, 0x8f, 0x9e, 0xea, 0x65, 0xec, 0xe8, 0xea, 0x33, 0x00, + 0x00, 0xff, 0xff, 0xf6, 0x62, 0xa4, 0x9d, 0x4d, 0x01, 0x00, 0x00, +} + func (this *Info) Equal(that interface{}) bool { if that == nil { return this == nil @@ -225,6 +285,9 @@ func encodeVarintInfo(dAtA []byte, offset int, v uint64) int { return offset + 1 } func (m *Info) Size() (n int) { + if m == nil { + return 0 + } var l int _ = l l = len(m.Name) @@ -301,7 +364,7 @@ func (m *Info) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - wire |= (uint64(b) & 0x7F) << shift + wire |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -329,7 +392,7 @@ func (m *Info) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLen |= (uint64(b) & 0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -339,6 +402,9 @@ func (m *Info) Unmarshal(dAtA []byte) error { return ErrInvalidLengthInfo } postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthInfo + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -358,7 +424,7 @@ func (m *Info) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLen |= (uint64(b) & 0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -368,6 +434,9 @@ func (m *Info) Unmarshal(dAtA []byte) error { return ErrInvalidLengthInfo } postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthInfo + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -387,7 +456,7 @@ func (m *Info) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLen |= (uint64(b) & 0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -397,6 +466,9 @@ func (m *Info) Unmarshal(dAtA []byte) error { return ErrInvalidLengthInfo } postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthInfo + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -416,7 +488,7 @@ func (m *Info) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLen |= (uint64(b) & 0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -426,6 +498,9 @@ func (m *Info) Unmarshal(dAtA []byte) error { return ErrInvalidLengthInfo } postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthInfo + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -445,7 +520,7 @@ func (m *Info) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - v |= (int(b) & 0x7F) << shift + v |= int(b&0x7F) << shift if b < 0x80 { break } @@ -460,6 +535,9 @@ func (m *Info) Unmarshal(dAtA []byte) error { if skippy < 0 { return ErrInvalidLengthInfo } + if (iNdEx + skippy) < 0 { + return ErrInvalidLengthInfo + } if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF } @@ -526,10 +604,13 @@ func skipInfo(dAtA []byte) (n int, err error) { break } } - iNdEx += length if length < 0 { return 0, ErrInvalidLengthInfo } + iNdEx += length + if iNdEx < 0 { + return 0, ErrInvalidLengthInfo + } return iNdEx, nil case 3: for { @@ -558,6 +639,9 @@ func skipInfo(dAtA []byte) (n int, err error) { return 0, err } iNdEx = start + next + if iNdEx < 0 { + return 0, ErrInvalidLengthInfo + } } return iNdEx, nil case 4: @@ -576,26 +660,3 @@ var ( ErrInvalidLengthInfo = fmt.Errorf("proto: negative length found during unmarshaling") ErrIntOverflowInfo = fmt.Errorf("proto: integer overflow") ) - -func init() { proto.RegisterFile("mixer/adapter/model/v1beta1/info.proto", fileDescriptorInfo) } - -var fileDescriptorInfo = []byte{ - // 261 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x90, 0xb1, 0x4e, 0xc3, 0x30, - 0x10, 0x86, 0x73, 0x34, 0x54, 0xc4, 0xc0, 0xe2, 0x01, 0x65, 0x40, 0xa7, 0x00, 0x12, 0xca, 0x14, - 0xab, 0xe2, 0x0d, 0xba, 0xb1, 0x66, 0x60, 0x60, 0x41, 0x4e, 0xe3, 0x20, 0x4b, 0x8d, 0xcf, 0x8a, - 0x2d, 0xc4, 0xc8, 0x23, 0xb0, 0xf1, 0x0a, 0x3c, 0x0a, 0x63, 0x47, 0x46, 0x62, 0x16, 0xc6, 0x3e, - 0x02, 0xc2, 0x44, 0x82, 0xa9, 0xdb, 0xdd, 0x77, 0xdf, 0x0d, 0xff, 0xcf, 0x2e, 0x7b, 0xfd, 0xa8, - 0x06, 0x21, 0x5b, 0x69, 0xbd, 0x1a, 0x44, 0x4f, 0xad, 0x5a, 0x8b, 0x87, 0x45, 0xa3, 0xbc, 0x5c, - 0x08, 0x6d, 0x3a, 0xaa, 0xec, 0x40, 0x9e, 0xf8, 0x99, 0x76, 0x5e, 0x53, 0x15, 0xed, 0x6a, 0xb2, - 0xab, 0x68, 0x57, 0x93, 0x7d, 0xfe, 0x02, 0x2c, 0xbd, 0x36, 0x1d, 0x71, 0xce, 0x52, 0x23, 0x7b, - 0x95, 0x43, 0x01, 0x65, 0x56, 0xc7, 0x99, 0x17, 0xec, 0xb0, 0x55, 0x6e, 0x35, 0x68, 0xeb, 0x35, - 0x99, 0x7c, 0x2f, 0x9e, 0xfe, 0x23, 0x7e, 0xca, 0x32, 0xaf, 0x7a, 0xbb, 0x96, 0x5e, 0xb9, 0x7c, - 0x56, 0xcc, 0xca, 0xac, 0xfe, 0x03, 0xfc, 0x84, 0xcd, 0x57, 0x64, 0x3a, 0x7d, 0x9f, 0xa7, 0xf1, - 0x75, 0xda, 0xf8, 0x05, 0x3b, 0x76, 0xca, 0x39, 0x4d, 0xe6, 0xae, 0x91, 0x4e, 0xb5, 0xf9, 0x7e, - 0x01, 0xe5, 0x41, 0x7d, 0x34, 0xc1, 0xe5, 0x0f, 0x5b, 0xde, 0x6c, 0x46, 0x4c, 0xde, 0x47, 0x4c, - 0xb6, 0x23, 0xc2, 0x53, 0x40, 0x78, 0x0d, 0x08, 0x6f, 0x01, 0x61, 0x13, 0x10, 0x3e, 0x02, 0xc2, - 0x57, 0xc0, 0x64, 0x1b, 0x10, 0x9e, 0x3f, 0x31, 0xb9, 0x2d, 0x7f, 0xa3, 0x6a, 0x12, 0xd2, 0x6a, - 0xb1, 0xa3, 0x9f, 0x66, 0x1e, 0xbb, 0xb9, 0xfa, 0x0e, 0x00, 0x00, 0xff, 0xff, 0xd2, 0xcb, 0x67, - 0x0a, 0x45, 0x01, 0x00, 0x00, -} diff --git a/mixer/adapter/model/v1beta1/infrastructure_backend.pb.go b/mixer/adapter/model/v1beta1/infrastructure_backend.pb.go index 1e0dadb8372..0cfdf0b5788 100644 --- a/mixer/adapter/model/v1beta1/infrastructure_backend.pb.go +++ b/mixer/adapter/model/v1beta1/infrastructure_backend.pb.go @@ -1,50 +1,84 @@ // Code generated by protoc-gen-gogo. DO NOT EDIT. // source: mixer/adapter/model/v1beta1/infrastructure_backend.proto -package v1beta1 - -import proto "github.com/gogo/protobuf/proto" -import fmt "fmt" -import math "math" -import google_protobuf2 "github.com/gogo/protobuf/types" -import google_rpc "github.com/gogo/googleapis/google/rpc" +// This package defines the service and types used by adapter code to serve requests from Mixer. +// This package also defines the types that are used to create Mixer templates. -import strings "strings" -import reflect "reflect" -import sortkeys "github.com/gogo/protobuf/sortkeys" - -import context "golang.org/x/net/context" -import grpc "google.golang.org/grpc" +package v1beta1 -import io "io" +import ( + context "context" + fmt "fmt" + rpc "github.com/gogo/googleapis/google/rpc" + proto "github.com/gogo/protobuf/proto" + github_com_gogo_protobuf_sortkeys "github.com/gogo/protobuf/sortkeys" + types "github.com/gogo/protobuf/types" + grpc "google.golang.org/grpc" + io "io" + math "math" + reflect "reflect" + strings "strings" +) // Reference imports to suppress errors if they are not otherwise used. var _ = proto.Marshal var _ = fmt.Errorf var _ = math.Inf +// This is a compile-time assertion to ensure that this generated file +// is compatible with the proto package it is being compiled against. +// A compilation error at this line likely means your copy of the +// proto package needs to be updated. +const _ = proto.GoGoProtoPackageIsVersion2 // please upgrade the proto package + // Request message for `CreateSession` method. type CreateSessionRequest struct { // Adapter specific configuration. - AdapterConfig *google_protobuf2.Any `protobuf:"bytes,1,opt,name=adapter_config,json=adapterConfig" json:"adapter_config,omitempty"` + AdapterConfig *types.Any `protobuf:"bytes,1,opt,name=adapter_config,json=adapterConfig,proto3" json:"adapter_config,omitempty"` // Map of instance names to their template-specific inferred type. - InferredTypes map[string]*google_protobuf2.Any `protobuf:"bytes,2,rep,name=inferred_types,json=inferredTypes" json:"inferred_types,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value"` + InferredTypes map[string]*types.Any `protobuf:"bytes,2,rep,name=inferred_types,json=inferredTypes,proto3" json:"inferred_types,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` } func (m *CreateSessionRequest) Reset() { *m = CreateSessionRequest{} } func (*CreateSessionRequest) ProtoMessage() {} func (*CreateSessionRequest) Descriptor() ([]byte, []int) { - return fileDescriptorInfrastructureBackend, []int{0} + return fileDescriptor_b62a0b3a6ebb4b55, []int{0} +} +func (m *CreateSessionRequest) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) } +func (m *CreateSessionRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_CreateSessionRequest.Marshal(b, m, deterministic) + } else { + b = b[:cap(b)] + n, err := m.MarshalTo(b) + if err != nil { + return nil, err + } + return b[:n], nil + } +} +func (m *CreateSessionRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_CreateSessionRequest.Merge(m, src) +} +func (m *CreateSessionRequest) XXX_Size() int { + return m.Size() +} +func (m *CreateSessionRequest) XXX_DiscardUnknown() { + xxx_messageInfo_CreateSessionRequest.DiscardUnknown(m) +} + +var xxx_messageInfo_CreateSessionRequest proto.InternalMessageInfo -func (m *CreateSessionRequest) GetAdapterConfig() *google_protobuf2.Any { +func (m *CreateSessionRequest) GetAdapterConfig() *types.Any { if m != nil { return m.AdapterConfig } return nil } -func (m *CreateSessionRequest) GetInferredTypes() map[string]*google_protobuf2.Any { +func (m *CreateSessionRequest) GetInferredTypes() map[string]*types.Any { if m != nil { return m.InferredTypes } @@ -56,15 +90,41 @@ type CreateSessionResponse struct { // Id of the created session. SessionId string `protobuf:"bytes,1,opt,name=session_id,json=sessionId,proto3" json:"session_id,omitempty"` // The success/failure status of create session call. - Status *google_rpc.Status `protobuf:"bytes,2,opt,name=status" json:"status,omitempty"` + Status *rpc.Status `protobuf:"bytes,2,opt,name=status,proto3" json:"status,omitempty"` } func (m *CreateSessionResponse) Reset() { *m = CreateSessionResponse{} } func (*CreateSessionResponse) ProtoMessage() {} func (*CreateSessionResponse) Descriptor() ([]byte, []int) { - return fileDescriptorInfrastructureBackend, []int{1} + return fileDescriptor_b62a0b3a6ebb4b55, []int{1} +} +func (m *CreateSessionResponse) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *CreateSessionResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_CreateSessionResponse.Marshal(b, m, deterministic) + } else { + b = b[:cap(b)] + n, err := m.MarshalTo(b) + if err != nil { + return nil, err + } + return b[:n], nil + } +} +func (m *CreateSessionResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_CreateSessionResponse.Merge(m, src) +} +func (m *CreateSessionResponse) XXX_Size() int { + return m.Size() +} +func (m *CreateSessionResponse) XXX_DiscardUnknown() { + xxx_messageInfo_CreateSessionResponse.DiscardUnknown(m) } +var xxx_messageInfo_CreateSessionResponse proto.InternalMessageInfo + func (m *CreateSessionResponse) GetSessionId() string { if m != nil { return m.SessionId @@ -72,7 +132,7 @@ func (m *CreateSessionResponse) GetSessionId() string { return "" } -func (m *CreateSessionResponse) GetStatus() *google_rpc.Status { +func (m *CreateSessionResponse) GetStatus() *rpc.Status { if m != nil { return m.Status } @@ -82,25 +142,51 @@ func (m *CreateSessionResponse) GetStatus() *google_rpc.Status { // Request message for `Validate` method. type ValidateRequest struct { // Adapter specific configuration. - AdapterConfig *google_protobuf2.Any `protobuf:"bytes,1,opt,name=adapter_config,json=adapterConfig" json:"adapter_config,omitempty"` + AdapterConfig *types.Any `protobuf:"bytes,1,opt,name=adapter_config,json=adapterConfig,proto3" json:"adapter_config,omitempty"` // Map of instance names to their template-specific inferred type. - InferredTypes map[string]*google_protobuf2.Any `protobuf:"bytes,2,rep,name=inferred_types,json=inferredTypes" json:"inferred_types,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value"` + InferredTypes map[string]*types.Any `protobuf:"bytes,2,rep,name=inferred_types,json=inferredTypes,proto3" json:"inferred_types,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` } func (m *ValidateRequest) Reset() { *m = ValidateRequest{} } func (*ValidateRequest) ProtoMessage() {} func (*ValidateRequest) Descriptor() ([]byte, []int) { - return fileDescriptorInfrastructureBackend, []int{2} + return fileDescriptor_b62a0b3a6ebb4b55, []int{2} +} +func (m *ValidateRequest) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *ValidateRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_ValidateRequest.Marshal(b, m, deterministic) + } else { + b = b[:cap(b)] + n, err := m.MarshalTo(b) + if err != nil { + return nil, err + } + return b[:n], nil + } +} +func (m *ValidateRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_ValidateRequest.Merge(m, src) +} +func (m *ValidateRequest) XXX_Size() int { + return m.Size() +} +func (m *ValidateRequest) XXX_DiscardUnknown() { + xxx_messageInfo_ValidateRequest.DiscardUnknown(m) } -func (m *ValidateRequest) GetAdapterConfig() *google_protobuf2.Any { +var xxx_messageInfo_ValidateRequest proto.InternalMessageInfo + +func (m *ValidateRequest) GetAdapterConfig() *types.Any { if m != nil { return m.AdapterConfig } return nil } -func (m *ValidateRequest) GetInferredTypes() map[string]*google_protobuf2.Any { +func (m *ValidateRequest) GetInferredTypes() map[string]*types.Any { if m != nil { return m.InferredTypes } @@ -110,16 +196,42 @@ func (m *ValidateRequest) GetInferredTypes() map[string]*google_protobuf2.Any { // Response message for `Validate` method. type ValidateResponse struct { // The success/failure status of validation call. - Status *google_rpc.Status `protobuf:"bytes,1,opt,name=status" json:"status,omitempty"` + Status *rpc.Status `protobuf:"bytes,1,opt,name=status,proto3" json:"status,omitempty"` } func (m *ValidateResponse) Reset() { *m = ValidateResponse{} } func (*ValidateResponse) ProtoMessage() {} func (*ValidateResponse) Descriptor() ([]byte, []int) { - return fileDescriptorInfrastructureBackend, []int{3} + return fileDescriptor_b62a0b3a6ebb4b55, []int{3} +} +func (m *ValidateResponse) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *ValidateResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_ValidateResponse.Marshal(b, m, deterministic) + } else { + b = b[:cap(b)] + n, err := m.MarshalTo(b) + if err != nil { + return nil, err + } + return b[:n], nil + } } +func (m *ValidateResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_ValidateResponse.Merge(m, src) +} +func (m *ValidateResponse) XXX_Size() int { + return m.Size() +} +func (m *ValidateResponse) XXX_DiscardUnknown() { + xxx_messageInfo_ValidateResponse.DiscardUnknown(m) +} + +var xxx_messageInfo_ValidateResponse proto.InternalMessageInfo -func (m *ValidateResponse) GetStatus() *google_rpc.Status { +func (m *ValidateResponse) GetStatus() *rpc.Status { if m != nil { return m.Status } @@ -135,9 +247,35 @@ type CloseSessionRequest struct { func (m *CloseSessionRequest) Reset() { *m = CloseSessionRequest{} } func (*CloseSessionRequest) ProtoMessage() {} func (*CloseSessionRequest) Descriptor() ([]byte, []int) { - return fileDescriptorInfrastructureBackend, []int{4} + return fileDescriptor_b62a0b3a6ebb4b55, []int{4} +} +func (m *CloseSessionRequest) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *CloseSessionRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_CloseSessionRequest.Marshal(b, m, deterministic) + } else { + b = b[:cap(b)] + n, err := m.MarshalTo(b) + if err != nil { + return nil, err + } + return b[:n], nil + } +} +func (m *CloseSessionRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_CloseSessionRequest.Merge(m, src) +} +func (m *CloseSessionRequest) XXX_Size() int { + return m.Size() +} +func (m *CloseSessionRequest) XXX_DiscardUnknown() { + xxx_messageInfo_CloseSessionRequest.DiscardUnknown(m) } +var xxx_messageInfo_CloseSessionRequest proto.InternalMessageInfo + func (m *CloseSessionRequest) GetSessionId() string { if m != nil { return m.SessionId @@ -148,16 +286,42 @@ func (m *CloseSessionRequest) GetSessionId() string { // Response message for `CloseSession` method. type CloseSessionResponse struct { // The success/failure status of close session call. - Status *google_rpc.Status `protobuf:"bytes,1,opt,name=status" json:"status,omitempty"` + Status *rpc.Status `protobuf:"bytes,1,opt,name=status,proto3" json:"status,omitempty"` } func (m *CloseSessionResponse) Reset() { *m = CloseSessionResponse{} } func (*CloseSessionResponse) ProtoMessage() {} func (*CloseSessionResponse) Descriptor() ([]byte, []int) { - return fileDescriptorInfrastructureBackend, []int{5} + return fileDescriptor_b62a0b3a6ebb4b55, []int{5} +} +func (m *CloseSessionResponse) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) } +func (m *CloseSessionResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_CloseSessionResponse.Marshal(b, m, deterministic) + } else { + b = b[:cap(b)] + n, err := m.MarshalTo(b) + if err != nil { + return nil, err + } + return b[:n], nil + } +} +func (m *CloseSessionResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_CloseSessionResponse.Merge(m, src) +} +func (m *CloseSessionResponse) XXX_Size() int { + return m.Size() +} +func (m *CloseSessionResponse) XXX_DiscardUnknown() { + xxx_messageInfo_CloseSessionResponse.DiscardUnknown(m) +} + +var xxx_messageInfo_CloseSessionResponse proto.InternalMessageInfo -func (m *CloseSessionResponse) GetStatus() *google_rpc.Status { +func (m *CloseSessionResponse) GetStatus() *rpc.Status { if m != nil { return m.Status } @@ -166,12 +330,57 @@ func (m *CloseSessionResponse) GetStatus() *google_rpc.Status { func init() { proto.RegisterType((*CreateSessionRequest)(nil), "istio.mixer.adapter.model.v1beta1.CreateSessionRequest") + proto.RegisterMapType((map[string]*types.Any)(nil), "istio.mixer.adapter.model.v1beta1.CreateSessionRequest.InferredTypesEntry") proto.RegisterType((*CreateSessionResponse)(nil), "istio.mixer.adapter.model.v1beta1.CreateSessionResponse") proto.RegisterType((*ValidateRequest)(nil), "istio.mixer.adapter.model.v1beta1.ValidateRequest") + proto.RegisterMapType((map[string]*types.Any)(nil), "istio.mixer.adapter.model.v1beta1.ValidateRequest.InferredTypesEntry") proto.RegisterType((*ValidateResponse)(nil), "istio.mixer.adapter.model.v1beta1.ValidateResponse") proto.RegisterType((*CloseSessionRequest)(nil), "istio.mixer.adapter.model.v1beta1.CloseSessionRequest") proto.RegisterType((*CloseSessionResponse)(nil), "istio.mixer.adapter.model.v1beta1.CloseSessionResponse") } + +func init() { + proto.RegisterFile("mixer/adapter/model/v1beta1/infrastructure_backend.proto", fileDescriptor_b62a0b3a6ebb4b55) +} + +var fileDescriptor_b62a0b3a6ebb4b55 = []byte{ + // 530 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x54, 0x41, 0x6f, 0xd3, 0x4c, + 0x10, 0xf5, 0x26, 0xfa, 0xaa, 0xaf, 0x5b, 0x52, 0xaa, 0x25, 0x15, 0xc1, 0x12, 0xab, 0x92, 0x53, + 0xd4, 0xc3, 0x5a, 0x4d, 0x11, 0x8d, 0x40, 0x42, 0x22, 0x51, 0x0f, 0xe1, 0xe8, 0xa2, 0x1e, 0xb8, + 0x44, 0x6b, 0x7b, 0x13, 0xad, 0xea, 0x7a, 0xdd, 0xdd, 0x75, 0x85, 0x4f, 0x54, 0xfc, 0x02, 0x84, + 0x38, 0x73, 0xe6, 0xa7, 0x70, 0xcc, 0xb1, 0x47, 0xe2, 0x5c, 0x38, 0xf6, 0x27, 0xa0, 0xda, 0x1b, + 0xb5, 0x49, 0x21, 0xad, 0x11, 0x12, 0x37, 0x6b, 0x67, 0xde, 0xbc, 0x37, 0x6f, 0x66, 0x0c, 0x3b, + 0xc7, 0xfc, 0x1d, 0x93, 0x0e, 0x0d, 0x68, 0xac, 0x99, 0x74, 0x8e, 0x45, 0xc0, 0x42, 0xe7, 0x74, + 0xc7, 0x63, 0x9a, 0xee, 0x38, 0x3c, 0x1a, 0x4a, 0xaa, 0xb4, 0x4c, 0x7c, 0x9d, 0x48, 0x36, 0xf0, + 0xa8, 0x7f, 0xc4, 0xa2, 0x80, 0xc4, 0x52, 0x68, 0x81, 0x9e, 0x70, 0xa5, 0xb9, 0x20, 0x39, 0x9e, + 0x18, 0x3c, 0xc9, 0xf1, 0xc4, 0xe0, 0xed, 0x47, 0x23, 0x21, 0x46, 0x21, 0x73, 0x72, 0x80, 0x97, + 0x0c, 0x1d, 0x1a, 0xa5, 0x05, 0xda, 0x7e, 0x68, 0x42, 0x32, 0xf6, 0x1d, 0xa5, 0xa9, 0x4e, 0x54, + 0x11, 0x68, 0x7e, 0xa9, 0xc0, 0x7a, 0x4f, 0x32, 0xaa, 0xd9, 0x01, 0x53, 0x8a, 0x8b, 0xc8, 0x65, + 0x27, 0x09, 0x53, 0x1a, 0xbd, 0x80, 0xeb, 0x86, 0x65, 0xe0, 0x8b, 0x68, 0xc8, 0x47, 0x0d, 0xb0, + 0x05, 0x5a, 0x6b, 0xed, 0x3a, 0x29, 0x4a, 0x91, 0x19, 0x0b, 0x79, 0x15, 0xa5, 0x6e, 0xcd, 0xe4, + 0xf6, 0xf2, 0x54, 0x74, 0x02, 0xd7, 0x79, 0x34, 0x64, 0x52, 0xb2, 0x60, 0xa0, 0xd3, 0x98, 0xa9, + 0x46, 0x65, 0xab, 0xda, 0x5a, 0x6b, 0xbf, 0x26, 0xb7, 0x76, 0x41, 0x7e, 0xa5, 0x86, 0xf4, 0x4d, + 0xb5, 0x37, 0x97, 0xc5, 0xf6, 0x23, 0x2d, 0x53, 0xb7, 0xc6, 0xaf, 0xbf, 0xd9, 0x87, 0x10, 0xdd, + 0x4c, 0x42, 0x1b, 0xb0, 0x7a, 0xc4, 0xd2, 0x5c, 0xfa, 0xaa, 0x7b, 0xf9, 0x89, 0xb6, 0xe1, 0x7f, + 0xa7, 0x34, 0x4c, 0x58, 0xa3, 0xb2, 0xa4, 0x9d, 0x22, 0xe5, 0x79, 0xa5, 0x03, 0x9a, 0x1e, 0xdc, + 0x5c, 0x50, 0xa4, 0x62, 0x11, 0x29, 0x86, 0x1e, 0x43, 0xa8, 0x8a, 0xa7, 0x01, 0x0f, 0x0c, 0xc3, + 0xaa, 0x79, 0xe9, 0x07, 0x68, 0x1b, 0xae, 0x14, 0x46, 0x1b, 0x22, 0x34, 0x23, 0x92, 0xb1, 0x4f, + 0x0e, 0xf2, 0x88, 0x6b, 0x32, 0x9a, 0x9f, 0x2b, 0xf0, 0xfe, 0x21, 0x0d, 0x79, 0x40, 0x35, 0xfb, + 0x2b, 0xfe, 0x87, 0xbf, 0xf1, 0x7f, 0xff, 0x0e, 0xfe, 0x2f, 0x08, 0xf9, 0x87, 0xd6, 0xbf, 0x84, + 0x1b, 0x57, 0x62, 0x8c, 0xeb, 0x57, 0xb6, 0x82, 0x5b, 0x6d, 0x7d, 0x0a, 0x1f, 0xf4, 0x42, 0xa1, + 0x16, 0x37, 0x7b, 0xf9, 0xe0, 0x9a, 0x5d, 0x58, 0x9f, 0x47, 0x95, 0x67, 0x6e, 0x7f, 0xaa, 0xc2, + 0xcd, 0xfe, 0xdc, 0x35, 0x77, 0x8b, 0x63, 0x46, 0x0a, 0xfe, 0x3f, 0xeb, 0x09, 0xb5, 0xcb, 0x4f, + 0xc3, 0xde, 0x2d, 0x85, 0x31, 0xd2, 0x3f, 0x00, 0x58, 0x9b, 0x5b, 0x62, 0xb4, 0xf7, 0x87, 0x87, + 0x68, 0x77, 0xca, 0x03, 0x8d, 0x88, 0xf7, 0xf0, 0xde, 0x75, 0x5f, 0xd1, 0xb3, 0xbb, 0x54, 0xba, + 0x39, 0x3e, 0x7b, 0xaf, 0x34, 0xae, 0x10, 0xd0, 0xa5, 0xe3, 0x09, 0xb6, 0xce, 0x27, 0xd8, 0xba, + 0x98, 0x60, 0x70, 0x96, 0x61, 0xf0, 0x35, 0xc3, 0xe0, 0x5b, 0x86, 0xc1, 0x38, 0xc3, 0xe0, 0x7b, + 0x86, 0xc1, 0x8f, 0x0c, 0x5b, 0x17, 0x19, 0x06, 0x1f, 0xa7, 0xd8, 0x1a, 0x4f, 0xb1, 0x75, 0x3e, + 0xc5, 0xd6, 0xdb, 0x56, 0xc1, 0xc6, 0x85, 0x43, 0x63, 0xee, 0x2c, 0xf9, 0x7d, 0x9f, 0x01, 0xe0, + 0xad, 0xe4, 0xab, 0xbc, 0xfb, 0x33, 0x00, 0x00, 0xff, 0xff, 0x35, 0xb4, 0xbe, 0x68, 0xe7, 0x05, + 0x00, 0x00, +} + func (this *CreateSessionRequest) Equal(that interface{}) bool { if that == nil { return this == nil @@ -348,8 +557,8 @@ func (this *CreateSessionRequest) GoString() string { for k, _ := range this.InferredTypes { keysForInferredTypes = append(keysForInferredTypes, k) } - sortkeys.Strings(keysForInferredTypes) - mapStringForInferredTypes := "map[string]*google_protobuf2.Any{" + github_com_gogo_protobuf_sortkeys.Strings(keysForInferredTypes) + mapStringForInferredTypes := "map[string]*types.Any{" for _, k := range keysForInferredTypes { mapStringForInferredTypes += fmt.Sprintf("%#v: %#v,", k, this.InferredTypes[k]) } @@ -386,8 +595,8 @@ func (this *ValidateRequest) GoString() string { for k, _ := range this.InferredTypes { keysForInferredTypes = append(keysForInferredTypes, k) } - sortkeys.Strings(keysForInferredTypes) - mapStringForInferredTypes := "map[string]*google_protobuf2.Any{" + github_com_gogo_protobuf_sortkeys.Strings(keysForInferredTypes) + mapStringForInferredTypes := "map[string]*types.Any{" for _, k := range keysForInferredTypes { mapStringForInferredTypes += fmt.Sprintf("%#v: %#v,", k, this.InferredTypes[k]) } @@ -449,8 +658,9 @@ var _ grpc.ClientConn // is compatible with the grpc package it is being compiled against. const _ = grpc.SupportPackageIsVersion4 -// Client API for InfrastructureBackend service - +// InfrastructureBackendClient is the client API for InfrastructureBackend service. +// +// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream. type InfrastructureBackendClient interface { // Validates the handler configuration along with the template-specific instances that would be routed to that // handler. The `CreateSession` for a specific handler configuration is invoked only if its associated `Validate` @@ -492,7 +702,7 @@ func NewInfrastructureBackendClient(cc *grpc.ClientConn) InfrastructureBackendCl func (c *infrastructureBackendClient) Validate(ctx context.Context, in *ValidateRequest, opts ...grpc.CallOption) (*ValidateResponse, error) { out := new(ValidateResponse) - err := grpc.Invoke(ctx, "/istio.mixer.adapter.model.v1beta1.InfrastructureBackend/Validate", in, out, c.cc, opts...) + err := c.cc.Invoke(ctx, "/istio.mixer.adapter.model.v1beta1.InfrastructureBackend/Validate", in, out, opts...) if err != nil { return nil, err } @@ -501,7 +711,7 @@ func (c *infrastructureBackendClient) Validate(ctx context.Context, in *Validate func (c *infrastructureBackendClient) CreateSession(ctx context.Context, in *CreateSessionRequest, opts ...grpc.CallOption) (*CreateSessionResponse, error) { out := new(CreateSessionResponse) - err := grpc.Invoke(ctx, "/istio.mixer.adapter.model.v1beta1.InfrastructureBackend/CreateSession", in, out, c.cc, opts...) + err := c.cc.Invoke(ctx, "/istio.mixer.adapter.model.v1beta1.InfrastructureBackend/CreateSession", in, out, opts...) if err != nil { return nil, err } @@ -510,15 +720,14 @@ func (c *infrastructureBackendClient) CreateSession(ctx context.Context, in *Cre func (c *infrastructureBackendClient) CloseSession(ctx context.Context, in *CloseSessionRequest, opts ...grpc.CallOption) (*CloseSessionResponse, error) { out := new(CloseSessionResponse) - err := grpc.Invoke(ctx, "/istio.mixer.adapter.model.v1beta1.InfrastructureBackend/CloseSession", in, out, c.cc, opts...) + err := c.cc.Invoke(ctx, "/istio.mixer.adapter.model.v1beta1.InfrastructureBackend/CloseSession", in, out, opts...) if err != nil { return nil, err } return out, nil } -// Server API for InfrastructureBackend service - +// InfrastructureBackendServer is the server API for InfrastructureBackend service. type InfrastructureBackendServer interface { // Validates the handler configuration along with the template-specific instances that would be routed to that // handler. The `CreateSession` for a specific handler configuration is invoked only if its associated `Validate` @@ -865,6 +1074,9 @@ func encodeVarintInfrastructureBackend(dAtA []byte, offset int, v uint64) int { return offset + 1 } func (m *CreateSessionRequest) Size() (n int) { + if m == nil { + return 0 + } var l int _ = l if m.AdapterConfig != nil { @@ -888,6 +1100,9 @@ func (m *CreateSessionRequest) Size() (n int) { } func (m *CreateSessionResponse) Size() (n int) { + if m == nil { + return 0 + } var l int _ = l l = len(m.SessionId) @@ -902,6 +1117,9 @@ func (m *CreateSessionResponse) Size() (n int) { } func (m *ValidateRequest) Size() (n int) { + if m == nil { + return 0 + } var l int _ = l if m.AdapterConfig != nil { @@ -925,6 +1143,9 @@ func (m *ValidateRequest) Size() (n int) { } func (m *ValidateResponse) Size() (n int) { + if m == nil { + return 0 + } var l int _ = l if m.Status != nil { @@ -935,6 +1156,9 @@ func (m *ValidateResponse) Size() (n int) { } func (m *CloseSessionRequest) Size() (n int) { + if m == nil { + return 0 + } var l int _ = l l = len(m.SessionId) @@ -945,6 +1169,9 @@ func (m *CloseSessionRequest) Size() (n int) { } func (m *CloseSessionResponse) Size() (n int) { + if m == nil { + return 0 + } var l int _ = l if m.Status != nil { @@ -975,14 +1202,14 @@ func (this *CreateSessionRequest) String() string { for k, _ := range this.InferredTypes { keysForInferredTypes = append(keysForInferredTypes, k) } - sortkeys.Strings(keysForInferredTypes) - mapStringForInferredTypes := "map[string]*google_protobuf2.Any{" + github_com_gogo_protobuf_sortkeys.Strings(keysForInferredTypes) + mapStringForInferredTypes := "map[string]*types.Any{" for _, k := range keysForInferredTypes { mapStringForInferredTypes += fmt.Sprintf("%v: %v,", k, this.InferredTypes[k]) } mapStringForInferredTypes += "}" s := strings.Join([]string{`&CreateSessionRequest{`, - `AdapterConfig:` + strings.Replace(fmt.Sprintf("%v", this.AdapterConfig), "Any", "google_protobuf2.Any", 1) + `,`, + `AdapterConfig:` + strings.Replace(fmt.Sprintf("%v", this.AdapterConfig), "Any", "types.Any", 1) + `,`, `InferredTypes:` + mapStringForInferredTypes + `,`, `}`, }, "") @@ -994,7 +1221,7 @@ func (this *CreateSessionResponse) String() string { } s := strings.Join([]string{`&CreateSessionResponse{`, `SessionId:` + fmt.Sprintf("%v", this.SessionId) + `,`, - `Status:` + strings.Replace(fmt.Sprintf("%v", this.Status), "Status", "google_rpc.Status", 1) + `,`, + `Status:` + strings.Replace(fmt.Sprintf("%v", this.Status), "Status", "rpc.Status", 1) + `,`, `}`, }, "") return s @@ -1007,14 +1234,14 @@ func (this *ValidateRequest) String() string { for k, _ := range this.InferredTypes { keysForInferredTypes = append(keysForInferredTypes, k) } - sortkeys.Strings(keysForInferredTypes) - mapStringForInferredTypes := "map[string]*google_protobuf2.Any{" + github_com_gogo_protobuf_sortkeys.Strings(keysForInferredTypes) + mapStringForInferredTypes := "map[string]*types.Any{" for _, k := range keysForInferredTypes { mapStringForInferredTypes += fmt.Sprintf("%v: %v,", k, this.InferredTypes[k]) } mapStringForInferredTypes += "}" s := strings.Join([]string{`&ValidateRequest{`, - `AdapterConfig:` + strings.Replace(fmt.Sprintf("%v", this.AdapterConfig), "Any", "google_protobuf2.Any", 1) + `,`, + `AdapterConfig:` + strings.Replace(fmt.Sprintf("%v", this.AdapterConfig), "Any", "types.Any", 1) + `,`, `InferredTypes:` + mapStringForInferredTypes + `,`, `}`, }, "") @@ -1025,7 +1252,7 @@ func (this *ValidateResponse) String() string { return "nil" } s := strings.Join([]string{`&ValidateResponse{`, - `Status:` + strings.Replace(fmt.Sprintf("%v", this.Status), "Status", "google_rpc.Status", 1) + `,`, + `Status:` + strings.Replace(fmt.Sprintf("%v", this.Status), "Status", "rpc.Status", 1) + `,`, `}`, }, "") return s @@ -1045,7 +1272,7 @@ func (this *CloseSessionResponse) String() string { return "nil" } s := strings.Join([]string{`&CloseSessionResponse{`, - `Status:` + strings.Replace(fmt.Sprintf("%v", this.Status), "Status", "google_rpc.Status", 1) + `,`, + `Status:` + strings.Replace(fmt.Sprintf("%v", this.Status), "Status", "rpc.Status", 1) + `,`, `}`, }, "") return s @@ -1073,7 +1300,7 @@ func (m *CreateSessionRequest) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - wire |= (uint64(b) & 0x7F) << shift + wire |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -1101,7 +1328,7 @@ func (m *CreateSessionRequest) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - msglen |= (int(b) & 0x7F) << shift + msglen |= int(b&0x7F) << shift if b < 0x80 { break } @@ -1110,11 +1337,14 @@ func (m *CreateSessionRequest) Unmarshal(dAtA []byte) error { return ErrInvalidLengthInfrastructureBackend } postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthInfrastructureBackend + } if postIndex > l { return io.ErrUnexpectedEOF } if m.AdapterConfig == nil { - m.AdapterConfig = &google_protobuf2.Any{} + m.AdapterConfig = &types.Any{} } if err := m.AdapterConfig.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err @@ -1134,7 +1364,7 @@ func (m *CreateSessionRequest) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - msglen |= (int(b) & 0x7F) << shift + msglen |= int(b&0x7F) << shift if b < 0x80 { break } @@ -1143,14 +1373,17 @@ func (m *CreateSessionRequest) Unmarshal(dAtA []byte) error { return ErrInvalidLengthInfrastructureBackend } postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthInfrastructureBackend + } if postIndex > l { return io.ErrUnexpectedEOF } if m.InferredTypes == nil { - m.InferredTypes = make(map[string]*google_protobuf2.Any) + m.InferredTypes = make(map[string]*types.Any) } var mapkey string - var mapvalue *google_protobuf2.Any + var mapvalue *types.Any for iNdEx < postIndex { entryPreIndex := iNdEx var wire uint64 @@ -1163,7 +1396,7 @@ func (m *CreateSessionRequest) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - wire |= (uint64(b) & 0x7F) << shift + wire |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -1180,7 +1413,7 @@ func (m *CreateSessionRequest) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLenmapkey |= (uint64(b) & 0x7F) << shift + stringLenmapkey |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -1190,6 +1423,9 @@ func (m *CreateSessionRequest) Unmarshal(dAtA []byte) error { return ErrInvalidLengthInfrastructureBackend } postStringIndexmapkey := iNdEx + intStringLenmapkey + if postStringIndexmapkey < 0 { + return ErrInvalidLengthInfrastructureBackend + } if postStringIndexmapkey > l { return io.ErrUnexpectedEOF } @@ -1206,7 +1442,7 @@ func (m *CreateSessionRequest) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - mapmsglen |= (int(b) & 0x7F) << shift + mapmsglen |= int(b&0x7F) << shift if b < 0x80 { break } @@ -1215,13 +1451,13 @@ func (m *CreateSessionRequest) Unmarshal(dAtA []byte) error { return ErrInvalidLengthInfrastructureBackend } postmsgIndex := iNdEx + mapmsglen - if mapmsglen < 0 { + if postmsgIndex < 0 { return ErrInvalidLengthInfrastructureBackend } if postmsgIndex > l { return io.ErrUnexpectedEOF } - mapvalue = &google_protobuf2.Any{} + mapvalue = &types.Any{} if err := mapvalue.Unmarshal(dAtA[iNdEx:postmsgIndex]); err != nil { return err } @@ -1252,6 +1488,9 @@ func (m *CreateSessionRequest) Unmarshal(dAtA []byte) error { if skippy < 0 { return ErrInvalidLengthInfrastructureBackend } + if (iNdEx + skippy) < 0 { + return ErrInvalidLengthInfrastructureBackend + } if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF } @@ -1279,7 +1518,7 @@ func (m *CreateSessionResponse) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - wire |= (uint64(b) & 0x7F) << shift + wire |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -1307,7 +1546,7 @@ func (m *CreateSessionResponse) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLen |= (uint64(b) & 0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -1317,6 +1556,9 @@ func (m *CreateSessionResponse) Unmarshal(dAtA []byte) error { return ErrInvalidLengthInfrastructureBackend } postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthInfrastructureBackend + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -1336,7 +1578,7 @@ func (m *CreateSessionResponse) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - msglen |= (int(b) & 0x7F) << shift + msglen |= int(b&0x7F) << shift if b < 0x80 { break } @@ -1345,11 +1587,14 @@ func (m *CreateSessionResponse) Unmarshal(dAtA []byte) error { return ErrInvalidLengthInfrastructureBackend } postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthInfrastructureBackend + } if postIndex > l { return io.ErrUnexpectedEOF } if m.Status == nil { - m.Status = &google_rpc.Status{} + m.Status = &rpc.Status{} } if err := m.Status.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err @@ -1364,6 +1609,9 @@ func (m *CreateSessionResponse) Unmarshal(dAtA []byte) error { if skippy < 0 { return ErrInvalidLengthInfrastructureBackend } + if (iNdEx + skippy) < 0 { + return ErrInvalidLengthInfrastructureBackend + } if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF } @@ -1391,7 +1639,7 @@ func (m *ValidateRequest) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - wire |= (uint64(b) & 0x7F) << shift + wire |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -1419,7 +1667,7 @@ func (m *ValidateRequest) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - msglen |= (int(b) & 0x7F) << shift + msglen |= int(b&0x7F) << shift if b < 0x80 { break } @@ -1428,11 +1676,14 @@ func (m *ValidateRequest) Unmarshal(dAtA []byte) error { return ErrInvalidLengthInfrastructureBackend } postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthInfrastructureBackend + } if postIndex > l { return io.ErrUnexpectedEOF } if m.AdapterConfig == nil { - m.AdapterConfig = &google_protobuf2.Any{} + m.AdapterConfig = &types.Any{} } if err := m.AdapterConfig.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err @@ -1452,7 +1703,7 @@ func (m *ValidateRequest) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - msglen |= (int(b) & 0x7F) << shift + msglen |= int(b&0x7F) << shift if b < 0x80 { break } @@ -1461,14 +1712,17 @@ func (m *ValidateRequest) Unmarshal(dAtA []byte) error { return ErrInvalidLengthInfrastructureBackend } postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthInfrastructureBackend + } if postIndex > l { return io.ErrUnexpectedEOF } if m.InferredTypes == nil { - m.InferredTypes = make(map[string]*google_protobuf2.Any) + m.InferredTypes = make(map[string]*types.Any) } var mapkey string - var mapvalue *google_protobuf2.Any + var mapvalue *types.Any for iNdEx < postIndex { entryPreIndex := iNdEx var wire uint64 @@ -1481,7 +1735,7 @@ func (m *ValidateRequest) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - wire |= (uint64(b) & 0x7F) << shift + wire |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -1498,7 +1752,7 @@ func (m *ValidateRequest) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLenmapkey |= (uint64(b) & 0x7F) << shift + stringLenmapkey |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -1508,6 +1762,9 @@ func (m *ValidateRequest) Unmarshal(dAtA []byte) error { return ErrInvalidLengthInfrastructureBackend } postStringIndexmapkey := iNdEx + intStringLenmapkey + if postStringIndexmapkey < 0 { + return ErrInvalidLengthInfrastructureBackend + } if postStringIndexmapkey > l { return io.ErrUnexpectedEOF } @@ -1524,7 +1781,7 @@ func (m *ValidateRequest) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - mapmsglen |= (int(b) & 0x7F) << shift + mapmsglen |= int(b&0x7F) << shift if b < 0x80 { break } @@ -1533,13 +1790,13 @@ func (m *ValidateRequest) Unmarshal(dAtA []byte) error { return ErrInvalidLengthInfrastructureBackend } postmsgIndex := iNdEx + mapmsglen - if mapmsglen < 0 { + if postmsgIndex < 0 { return ErrInvalidLengthInfrastructureBackend } if postmsgIndex > l { return io.ErrUnexpectedEOF } - mapvalue = &google_protobuf2.Any{} + mapvalue = &types.Any{} if err := mapvalue.Unmarshal(dAtA[iNdEx:postmsgIndex]); err != nil { return err } @@ -1570,6 +1827,9 @@ func (m *ValidateRequest) Unmarshal(dAtA []byte) error { if skippy < 0 { return ErrInvalidLengthInfrastructureBackend } + if (iNdEx + skippy) < 0 { + return ErrInvalidLengthInfrastructureBackend + } if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF } @@ -1597,7 +1857,7 @@ func (m *ValidateResponse) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - wire |= (uint64(b) & 0x7F) << shift + wire |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -1625,7 +1885,7 @@ func (m *ValidateResponse) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - msglen |= (int(b) & 0x7F) << shift + msglen |= int(b&0x7F) << shift if b < 0x80 { break } @@ -1634,11 +1894,14 @@ func (m *ValidateResponse) Unmarshal(dAtA []byte) error { return ErrInvalidLengthInfrastructureBackend } postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthInfrastructureBackend + } if postIndex > l { return io.ErrUnexpectedEOF } if m.Status == nil { - m.Status = &google_rpc.Status{} + m.Status = &rpc.Status{} } if err := m.Status.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err @@ -1653,6 +1916,9 @@ func (m *ValidateResponse) Unmarshal(dAtA []byte) error { if skippy < 0 { return ErrInvalidLengthInfrastructureBackend } + if (iNdEx + skippy) < 0 { + return ErrInvalidLengthInfrastructureBackend + } if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF } @@ -1680,7 +1946,7 @@ func (m *CloseSessionRequest) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - wire |= (uint64(b) & 0x7F) << shift + wire |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -1708,7 +1974,7 @@ func (m *CloseSessionRequest) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLen |= (uint64(b) & 0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -1718,6 +1984,9 @@ func (m *CloseSessionRequest) Unmarshal(dAtA []byte) error { return ErrInvalidLengthInfrastructureBackend } postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthInfrastructureBackend + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -1732,6 +2001,9 @@ func (m *CloseSessionRequest) Unmarshal(dAtA []byte) error { if skippy < 0 { return ErrInvalidLengthInfrastructureBackend } + if (iNdEx + skippy) < 0 { + return ErrInvalidLengthInfrastructureBackend + } if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF } @@ -1759,7 +2031,7 @@ func (m *CloseSessionResponse) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - wire |= (uint64(b) & 0x7F) << shift + wire |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -1787,7 +2059,7 @@ func (m *CloseSessionResponse) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - msglen |= (int(b) & 0x7F) << shift + msglen |= int(b&0x7F) << shift if b < 0x80 { break } @@ -1796,11 +2068,14 @@ func (m *CloseSessionResponse) Unmarshal(dAtA []byte) error { return ErrInvalidLengthInfrastructureBackend } postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthInfrastructureBackend + } if postIndex > l { return io.ErrUnexpectedEOF } if m.Status == nil { - m.Status = &google_rpc.Status{} + m.Status = &rpc.Status{} } if err := m.Status.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err @@ -1815,6 +2090,9 @@ func (m *CloseSessionResponse) Unmarshal(dAtA []byte) error { if skippy < 0 { return ErrInvalidLengthInfrastructureBackend } + if (iNdEx + skippy) < 0 { + return ErrInvalidLengthInfrastructureBackend + } if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF } @@ -1881,10 +2159,13 @@ func skipInfrastructureBackend(dAtA []byte) (n int, err error) { break } } - iNdEx += length if length < 0 { return 0, ErrInvalidLengthInfrastructureBackend } + iNdEx += length + if iNdEx < 0 { + return 0, ErrInvalidLengthInfrastructureBackend + } return iNdEx, nil case 3: for { @@ -1913,6 +2194,9 @@ func skipInfrastructureBackend(dAtA []byte) (n int, err error) { return 0, err } iNdEx = start + next + if iNdEx < 0 { + return 0, ErrInvalidLengthInfrastructureBackend + } } return iNdEx, nil case 4: @@ -1931,44 +2215,3 @@ var ( ErrInvalidLengthInfrastructureBackend = fmt.Errorf("proto: negative length found during unmarshaling") ErrIntOverflowInfrastructureBackend = fmt.Errorf("proto: integer overflow") ) - -func init() { - proto.RegisterFile("mixer/adapter/model/v1beta1/infrastructure_backend.proto", fileDescriptorInfrastructureBackend) -} - -var fileDescriptorInfrastructureBackend = []byte{ - // 523 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x54, 0x41, 0x6b, 0x13, 0x41, - 0x14, 0xce, 0x24, 0x58, 0xec, 0xd4, 0xd4, 0x32, 0xa6, 0x18, 0x17, 0x1c, 0x6a, 0x4e, 0xa1, 0x87, - 0x59, 0x9a, 0x8a, 0x0d, 0x0a, 0x82, 0x09, 0x3d, 0xc4, 0x63, 0x2a, 0x05, 0xbd, 0x84, 0xc9, 0xee, - 0x4b, 0x18, 0xba, 0xdd, 0xd9, 0xce, 0xcc, 0x16, 0xf7, 0x64, 0xf1, 0x17, 0x88, 0x78, 0xf6, 0xec, - 0x4f, 0xf1, 0xd8, 0xa3, 0x47, 0xb3, 0x5e, 0x3c, 0xf6, 0x27, 0x48, 0x77, 0x27, 0xb4, 0x49, 0x35, - 0xed, 0x8a, 0xe0, 0x6d, 0x99, 0xf7, 0xbe, 0xf7, 0x7d, 0xef, 0x7b, 0xef, 0x2d, 0x6e, 0x1f, 0x8a, - 0xb7, 0xa0, 0x5c, 0xee, 0xf3, 0xc8, 0x80, 0x72, 0x0f, 0xa5, 0x0f, 0x81, 0x7b, 0xbc, 0x35, 0x04, - 0xc3, 0xb7, 0x5c, 0x11, 0x8e, 0x14, 0xd7, 0x46, 0xc5, 0x9e, 0x89, 0x15, 0x0c, 0x86, 0xdc, 0x3b, - 0x80, 0xd0, 0x67, 0x91, 0x92, 0x46, 0x92, 0x47, 0x42, 0x1b, 0x21, 0x59, 0x86, 0x67, 0x16, 0xcf, - 0x32, 0x3c, 0xb3, 0x78, 0xe7, 0xc1, 0x58, 0xca, 0x71, 0x00, 0x6e, 0x06, 0x18, 0xc6, 0x23, 0x97, - 0x87, 0x49, 0x8e, 0x76, 0xee, 0xdb, 0x90, 0x8a, 0x3c, 0x57, 0x1b, 0x6e, 0x62, 0x9d, 0x07, 0x1a, - 0x9f, 0xcb, 0xb8, 0xd6, 0x55, 0xc0, 0x0d, 0xec, 0x81, 0xd6, 0x42, 0x86, 0x7d, 0x38, 0x8a, 0x41, - 0x1b, 0xf2, 0x0c, 0xaf, 0x5a, 0x96, 0x81, 0x27, 0xc3, 0x91, 0x18, 0xd7, 0xd1, 0x06, 0x6a, 0xae, - 0xb4, 0x6a, 0x2c, 0x2f, 0xc5, 0xa6, 0x2c, 0xec, 0x45, 0x98, 0xf4, 0xab, 0x36, 0xb7, 0x9b, 0xa5, - 0x92, 0x23, 0xbc, 0x2a, 0xc2, 0x11, 0x28, 0x05, 0xfe, 0xc0, 0x24, 0x11, 0xe8, 0x7a, 0x79, 0xa3, - 0xd2, 0x5c, 0x69, 0xbd, 0x64, 0xd7, 0x76, 0xc1, 0x7e, 0xa7, 0x86, 0xf5, 0x6c, 0xb5, 0x57, 0xe7, - 0xc5, 0x76, 0x43, 0xa3, 0x92, 0x7e, 0x55, 0x5c, 0x7e, 0x73, 0xf6, 0x31, 0xb9, 0x9a, 0x44, 0xd6, - 0x70, 0xe5, 0x00, 0x92, 0x4c, 0xfa, 0x72, 0xff, 0xfc, 0x93, 0x6c, 0xe2, 0x5b, 0xc7, 0x3c, 0x88, - 0xa1, 0x5e, 0x5e, 0xd0, 0x4e, 0x9e, 0xf2, 0xb4, 0xdc, 0x46, 0x8d, 0x21, 0x5e, 0x9f, 0x53, 0xa4, - 0x23, 0x19, 0x6a, 0x20, 0x0f, 0x31, 0xd6, 0xf9, 0xd3, 0x40, 0xf8, 0x96, 0x61, 0xd9, 0xbe, 0xf4, - 0x7c, 0xb2, 0x89, 0x97, 0x72, 0xa3, 0x2d, 0x11, 0x99, 0x12, 0xa9, 0xc8, 0x63, 0x7b, 0x59, 0xa4, - 0x6f, 0x33, 0x1a, 0x9f, 0xca, 0xf8, 0xee, 0x3e, 0x0f, 0x84, 0xcf, 0x0d, 0xfc, 0x13, 0xff, 0x83, - 0x3f, 0xf8, 0xbf, 0x7b, 0x03, 0xff, 0xe7, 0x84, 0xfc, 0x47, 0xeb, 0x9f, 0xe3, 0xb5, 0x0b, 0x31, - 0xd6, 0xf5, 0x0b, 0x5b, 0xd1, 0xb5, 0xb6, 0x3e, 0xc6, 0xf7, 0xba, 0x81, 0xd4, 0xf3, 0x9b, 0xbd, - 0x78, 0x70, 0x8d, 0x0e, 0xae, 0xcd, 0xa2, 0x8a, 0x33, 0xb7, 0x3e, 0x56, 0xf0, 0x7a, 0x6f, 0xe6, - 0x9a, 0x3b, 0xf9, 0x31, 0x13, 0x8d, 0x6f, 0x4f, 0x7b, 0x22, 0xad, 0xe2, 0xd3, 0x70, 0xb6, 0x0b, - 0x61, 0xac, 0xf4, 0xf7, 0x08, 0x57, 0x67, 0x96, 0x98, 0xec, 0xfc, 0xe5, 0x21, 0x3a, 0xed, 0xe2, - 0x40, 0x2b, 0xe2, 0x1d, 0xbe, 0x73, 0xd9, 0x57, 0xf2, 0xe4, 0x26, 0x95, 0xae, 0x8e, 0xcf, 0xd9, - 0x29, 0x8c, 0xcb, 0x05, 0x74, 0x5e, 0x9f, 0x4e, 0x68, 0xe9, 0xdb, 0x84, 0x96, 0xce, 0x26, 0x14, - 0x9d, 0xa4, 0x14, 0x7d, 0x49, 0x29, 0xfa, 0x9a, 0x52, 0x74, 0x9a, 0x52, 0xf4, 0x3d, 0xa5, 0xe8, - 0x67, 0x4a, 0x4b, 0x67, 0x29, 0x45, 0x1f, 0x7e, 0xd0, 0xd2, 0x9b, 0x66, 0xce, 0x22, 0xa4, 0xcb, - 0x23, 0xe1, 0x2e, 0xf8, 0x6d, 0x9f, 0x20, 0x34, 0x5c, 0xca, 0x56, 0x78, 0xfb, 0x57, 0x00, 0x00, - 0x00, 0xff, 0xff, 0x07, 0x94, 0xef, 0x33, 0xdf, 0x05, 0x00, 0x00, -} diff --git a/mixer/adapter/model/v1beta1/quota.pb.go b/mixer/adapter/model/v1beta1/quota.pb.go index 49eee5aa0bf..b9e9d848395 100644 --- a/mixer/adapter/model/v1beta1/quota.pb.go +++ b/mixer/adapter/model/v1beta1/quota.pb.go @@ -3,21 +3,19 @@ package v1beta1 -import proto "github.com/gogo/protobuf/proto" -import fmt "fmt" -import math "math" -import _ "github.com/gogo/protobuf/gogoproto" -import _ "github.com/gogo/protobuf/types" - -import time "time" - -import types "github.com/gogo/protobuf/types" - -import strings "strings" -import reflect "reflect" -import sortkeys "github.com/gogo/protobuf/sortkeys" - -import io "io" +import ( + fmt "fmt" + _ "github.com/gogo/protobuf/gogoproto" + proto "github.com/gogo/protobuf/proto" + github_com_gogo_protobuf_sortkeys "github.com/gogo/protobuf/sortkeys" + _ "github.com/gogo/protobuf/types" + github_com_gogo_protobuf_types "github.com/gogo/protobuf/types" + io "io" + math "math" + reflect "reflect" + strings "strings" + time "time" +) // Reference imports to suppress errors if they are not otherwise used. var _ = proto.Marshal @@ -25,15 +23,49 @@ var _ = fmt.Errorf var _ = math.Inf var _ = time.Kitchen +// This is a compile-time assertion to ensure that this generated file +// is compatible with the proto package it is being compiled against. +// A compilation error at this line likely means your copy of the +// proto package needs to be updated. +const _ = proto.GoGoProtoPackageIsVersion2 // please upgrade the proto package + // Expresses the quota allocation request. type QuotaRequest struct { // The individual quotas to allocate - Quotas map[string]QuotaRequest_QuotaParams `protobuf:"bytes,1,rep,name=quotas" json:"quotas" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value"` + Quotas map[string]QuotaRequest_QuotaParams `protobuf:"bytes,1,rep,name=quotas,proto3" json:"quotas" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` } -func (m *QuotaRequest) Reset() { *m = QuotaRequest{} } -func (*QuotaRequest) ProtoMessage() {} -func (*QuotaRequest) Descriptor() ([]byte, []int) { return fileDescriptorQuota, []int{0} } +func (m *QuotaRequest) Reset() { *m = QuotaRequest{} } +func (*QuotaRequest) ProtoMessage() {} +func (*QuotaRequest) Descriptor() ([]byte, []int) { + return fileDescriptor_f07acf62b4429357, []int{0} +} +func (m *QuotaRequest) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *QuotaRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_QuotaRequest.Marshal(b, m, deterministic) + } else { + b = b[:cap(b)] + n, err := m.MarshalTo(b) + if err != nil { + return nil, err + } + return b[:n], nil + } +} +func (m *QuotaRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_QuotaRequest.Merge(m, src) +} +func (m *QuotaRequest) XXX_Size() int { + return m.Size() +} +func (m *QuotaRequest) XXX_DiscardUnknown() { + xxx_messageInfo_QuotaRequest.DiscardUnknown(m) +} + +var xxx_messageInfo_QuotaRequest proto.InternalMessageInfo // parameters for a quota allocation type QuotaRequest_QuotaParams struct { @@ -43,39 +75,163 @@ type QuotaRequest_QuotaParams struct { BestEffort bool `protobuf:"varint,2,opt,name=best_effort,json=bestEffort,proto3" json:"best_effort,omitempty"` } -func (m *QuotaRequest_QuotaParams) Reset() { *m = QuotaRequest_QuotaParams{} } -func (*QuotaRequest_QuotaParams) ProtoMessage() {} -func (*QuotaRequest_QuotaParams) Descriptor() ([]byte, []int) { return fileDescriptorQuota, []int{0, 0} } +func (m *QuotaRequest_QuotaParams) Reset() { *m = QuotaRequest_QuotaParams{} } +func (*QuotaRequest_QuotaParams) ProtoMessage() {} +func (*QuotaRequest_QuotaParams) Descriptor() ([]byte, []int) { + return fileDescriptor_f07acf62b4429357, []int{0, 0} +} +func (m *QuotaRequest_QuotaParams) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *QuotaRequest_QuotaParams) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_QuotaRequest_QuotaParams.Marshal(b, m, deterministic) + } else { + b = b[:cap(b)] + n, err := m.MarshalTo(b) + if err != nil { + return nil, err + } + return b[:n], nil + } +} +func (m *QuotaRequest_QuotaParams) XXX_Merge(src proto.Message) { + xxx_messageInfo_QuotaRequest_QuotaParams.Merge(m, src) +} +func (m *QuotaRequest_QuotaParams) XXX_Size() int { + return m.Size() +} +func (m *QuotaRequest_QuotaParams) XXX_DiscardUnknown() { + xxx_messageInfo_QuotaRequest_QuotaParams.DiscardUnknown(m) +} + +var xxx_messageInfo_QuotaRequest_QuotaParams proto.InternalMessageInfo // Expresses the result of multiple quota allocations. type QuotaResult struct { // The resulting quota, one entry per requested quota. - Quotas map[string]QuotaResult_Result `protobuf:"bytes,1,rep,name=quotas" json:"quotas" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value"` + Quotas map[string]QuotaResult_Result `protobuf:"bytes,1,rep,name=quotas,proto3" json:"quotas" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` } -func (m *QuotaResult) Reset() { *m = QuotaResult{} } -func (*QuotaResult) ProtoMessage() {} -func (*QuotaResult) Descriptor() ([]byte, []int) { return fileDescriptorQuota, []int{1} } +func (m *QuotaResult) Reset() { *m = QuotaResult{} } +func (*QuotaResult) ProtoMessage() {} +func (*QuotaResult) Descriptor() ([]byte, []int) { + return fileDescriptor_f07acf62b4429357, []int{1} +} +func (m *QuotaResult) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *QuotaResult) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_QuotaResult.Marshal(b, m, deterministic) + } else { + b = b[:cap(b)] + n, err := m.MarshalTo(b) + if err != nil { + return nil, err + } + return b[:n], nil + } +} +func (m *QuotaResult) XXX_Merge(src proto.Message) { + xxx_messageInfo_QuotaResult.Merge(m, src) +} +func (m *QuotaResult) XXX_Size() int { + return m.Size() +} +func (m *QuotaResult) XXX_DiscardUnknown() { + xxx_messageInfo_QuotaResult.DiscardUnknown(m) +} + +var xxx_messageInfo_QuotaResult proto.InternalMessageInfo // Expresses the result of a quota allocation. type QuotaResult_Result struct { // The amount of time for which this result can be considered valid. - ValidDuration time.Duration `protobuf:"bytes,2,opt,name=valid_duration,json=validDuration,stdduration" json:"valid_duration"` + ValidDuration time.Duration `protobuf:"bytes,2,opt,name=valid_duration,json=validDuration,proto3,stdduration" json:"valid_duration"` // The amount of granted quota. When `QuotaParams.best_effort` is true, this will be >= 0. // If `QuotaParams.best_effort` is false, this will be either 0 or >= `QuotaParams.amount`. GrantedAmount int64 `protobuf:"varint,3,opt,name=granted_amount,json=grantedAmount,proto3" json:"granted_amount,omitempty"` } -func (m *QuotaResult_Result) Reset() { *m = QuotaResult_Result{} } -func (*QuotaResult_Result) ProtoMessage() {} -func (*QuotaResult_Result) Descriptor() ([]byte, []int) { return fileDescriptorQuota, []int{1, 0} } +func (m *QuotaResult_Result) Reset() { *m = QuotaResult_Result{} } +func (*QuotaResult_Result) ProtoMessage() {} +func (*QuotaResult_Result) Descriptor() ([]byte, []int) { + return fileDescriptor_f07acf62b4429357, []int{1, 0} +} +func (m *QuotaResult_Result) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *QuotaResult_Result) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_QuotaResult_Result.Marshal(b, m, deterministic) + } else { + b = b[:cap(b)] + n, err := m.MarshalTo(b) + if err != nil { + return nil, err + } + return b[:n], nil + } +} +func (m *QuotaResult_Result) XXX_Merge(src proto.Message) { + xxx_messageInfo_QuotaResult_Result.Merge(m, src) +} +func (m *QuotaResult_Result) XXX_Size() int { + return m.Size() +} +func (m *QuotaResult_Result) XXX_DiscardUnknown() { + xxx_messageInfo_QuotaResult_Result.DiscardUnknown(m) +} + +var xxx_messageInfo_QuotaResult_Result proto.InternalMessageInfo func init() { proto.RegisterType((*QuotaRequest)(nil), "istio.mixer.adapter.model.v1beta1.QuotaRequest") + proto.RegisterMapType((map[string]QuotaRequest_QuotaParams)(nil), "istio.mixer.adapter.model.v1beta1.QuotaRequest.QuotasEntry") proto.RegisterType((*QuotaRequest_QuotaParams)(nil), "istio.mixer.adapter.model.v1beta1.QuotaRequest.QuotaParams") proto.RegisterType((*QuotaResult)(nil), "istio.mixer.adapter.model.v1beta1.QuotaResult") + proto.RegisterMapType((map[string]QuotaResult_Result)(nil), "istio.mixer.adapter.model.v1beta1.QuotaResult.QuotasEntry") proto.RegisterType((*QuotaResult_Result)(nil), "istio.mixer.adapter.model.v1beta1.QuotaResult.Result") } + +func init() { + proto.RegisterFile("mixer/adapter/model/v1beta1/quota.proto", fileDescriptor_f07acf62b4429357) +} + +var fileDescriptor_f07acf62b4429357 = []byte{ + // 451 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x53, 0x3d, 0x8f, 0xd3, 0x30, + 0x18, 0xb6, 0x5b, 0xa8, 0x0e, 0x97, 0x3b, 0x21, 0x0b, 0xa1, 0x92, 0xc1, 0x2d, 0x27, 0x21, 0x3a, + 0xd9, 0x3a, 0x10, 0x12, 0x3a, 0x26, 0x2a, 0x8e, 0x01, 0x16, 0xce, 0x13, 0xb0, 0x54, 0x8e, 0xe2, + 0x46, 0x11, 0x49, 0x9c, 0x73, 0x9c, 0x88, 0x13, 0x0b, 0x3f, 0x81, 0x91, 0x9f, 0x00, 0xff, 0xa4, + 0x63, 0x27, 0x74, 0x13, 0x90, 0x74, 0x61, 0xbc, 0x9f, 0x80, 0x62, 0xbb, 0xd2, 0xc1, 0x70, 0x05, + 0xa6, 0xbc, 0x1f, 0xcf, 0xfb, 0x3c, 0x79, 0x9f, 0x57, 0x46, 0xf7, 0xb2, 0xe4, 0x9d, 0xd4, 0x4c, + 0x44, 0xa2, 0x30, 0x52, 0xb3, 0x4c, 0x45, 0x32, 0x65, 0xf5, 0x41, 0x28, 0x8d, 0x38, 0x60, 0x27, + 0x95, 0x32, 0x82, 0x16, 0x5a, 0x19, 0x85, 0xef, 0x24, 0xa5, 0x49, 0x14, 0xb5, 0x70, 0xea, 0xe1, + 0xd4, 0xc2, 0xa9, 0x87, 0x07, 0x37, 0x63, 0x15, 0x2b, 0x8b, 0x66, 0x5d, 0xe4, 0x06, 0x03, 0x12, + 0x2b, 0x15, 0xa7, 0x92, 0xd9, 0x2c, 0xac, 0x16, 0x2c, 0xaa, 0xb4, 0x30, 0x89, 0xca, 0x5d, 0x7f, + 0xff, 0x4b, 0x0f, 0x5d, 0x3f, 0xee, 0x84, 0xb8, 0x3c, 0xa9, 0x64, 0x69, 0xf0, 0x6b, 0x34, 0xb0, + 0xc2, 0xe5, 0x08, 0x4e, 0xfa, 0xd3, 0xe1, 0xfd, 0xc7, 0x74, 0xab, 0x34, 0xbd, 0x48, 0xe0, 0x92, + 0xf2, 0x28, 0x37, 0xfa, 0x74, 0x76, 0x65, 0xf9, 0x6d, 0x0c, 0xb8, 0x27, 0x0c, 0x9e, 0xa1, 0xa1, + 0x6d, 0xbe, 0x14, 0x5a, 0x64, 0x25, 0xbe, 0x85, 0x06, 0x22, 0x53, 0x55, 0x6e, 0x46, 0x70, 0x02, + 0xa7, 0x7d, 0xee, 0x33, 0x3c, 0x46, 0xc3, 0x50, 0x96, 0x66, 0x2e, 0x17, 0x0b, 0xa5, 0xcd, 0xa8, + 0x37, 0x81, 0xd3, 0x1d, 0x8e, 0xba, 0xd2, 0x91, 0xad, 0x04, 0xb5, 0xe7, 0x71, 0x22, 0xf8, 0x06, + 0xea, 0xbf, 0x95, 0xa7, 0x96, 0xe4, 0x1a, 0xef, 0x42, 0x7c, 0x8c, 0xae, 0xd6, 0x22, 0xad, 0xa4, + 0x9d, 0xfd, 0xdf, 0x15, 0xdc, 0x5f, 0x72, 0xc7, 0x74, 0xd8, 0x7b, 0x04, 0xf7, 0xbf, 0xf6, 0xbc, + 0x30, 0x97, 0x65, 0x95, 0x1a, 0xfc, 0xea, 0x0f, 0xab, 0x0e, 0xff, 0x5e, 0xa7, 0x9b, 0xbf, 0xc4, + 0xa9, 0xf7, 0x68, 0xe0, 0x35, 0x9e, 0xa3, 0xbd, 0x5a, 0xa4, 0x49, 0x34, 0xdf, 0xdc, 0xcd, 0xef, + 0x74, 0x9b, 0xba, 0xc3, 0xd2, 0xcd, 0x61, 0xe9, 0x53, 0x0f, 0x98, 0xed, 0x74, 0x54, 0x9f, 0xbe, + 0x8f, 0x21, 0xdf, 0xb5, 0xa3, 0x9b, 0x06, 0xbe, 0x8b, 0xf6, 0x62, 0x2d, 0x72, 0x23, 0xa3, 0xb9, + 0x37, 0xbe, 0x6f, 0x8d, 0xdf, 0xf5, 0xd5, 0x27, 0xb6, 0x18, 0x14, 0xdb, 0xec, 0x7d, 0xf1, 0xbb, + 0xbd, 0x0f, 0xff, 0x71, 0x6d, 0xf7, 0xb9, 0x60, 0xec, 0x2c, 0x5c, 0x36, 0x04, 0xac, 0x1a, 0x02, + 0xce, 0x1a, 0x02, 0xce, 0x1b, 0x02, 0x3e, 0xb4, 0x04, 0x7e, 0x6e, 0x09, 0x58, 0xb6, 0x04, 0xae, + 0x5a, 0x02, 0x7f, 0xb4, 0x04, 0xfe, 0x6c, 0x09, 0x38, 0x6f, 0x09, 0xfc, 0xb8, 0x26, 0x60, 0xb5, + 0x26, 0xe0, 0x6c, 0x4d, 0xc0, 0x9b, 0xa9, 0x93, 0x4e, 0x14, 0x13, 0x45, 0xc2, 0x2e, 0x79, 0x4d, + 0xe1, 0xc0, 0x1a, 0xf5, 0xe0, 0x57, 0x00, 0x00, 0x00, 0xff, 0xff, 0xf5, 0xdb, 0x42, 0x83, 0x73, + 0x03, 0x00, 0x00, +} + func (m *QuotaRequest) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) @@ -214,8 +370,8 @@ func (m *QuotaResult_Result) MarshalTo(dAtA []byte) (int, error) { _ = l dAtA[i] = 0x12 i++ - i = encodeVarintQuota(dAtA, i, uint64(types.SizeOfStdDuration(m.ValidDuration))) - n3, err := types.StdDurationMarshalTo(m.ValidDuration, dAtA[i:]) + i = encodeVarintQuota(dAtA, i, uint64(github_com_gogo_protobuf_types.SizeOfStdDuration(m.ValidDuration))) + n3, err := github_com_gogo_protobuf_types.StdDurationMarshalTo(m.ValidDuration, dAtA[i:]) if err != nil { return 0, err } @@ -238,6 +394,9 @@ func encodeVarintQuota(dAtA []byte, offset int, v uint64) int { return offset + 1 } func (m *QuotaRequest) Size() (n int) { + if m == nil { + return 0 + } var l int _ = l if len(m.Quotas) > 0 { @@ -253,6 +412,9 @@ func (m *QuotaRequest) Size() (n int) { } func (m *QuotaRequest_QuotaParams) Size() (n int) { + if m == nil { + return 0 + } var l int _ = l if m.Amount != 0 { @@ -265,6 +427,9 @@ func (m *QuotaRequest_QuotaParams) Size() (n int) { } func (m *QuotaResult) Size() (n int) { + if m == nil { + return 0 + } var l int _ = l if len(m.Quotas) > 0 { @@ -280,9 +445,12 @@ func (m *QuotaResult) Size() (n int) { } func (m *QuotaResult_Result) Size() (n int) { + if m == nil { + return 0 + } var l int _ = l - l = types.SizeOfStdDuration(m.ValidDuration) + l = github_com_gogo_protobuf_types.SizeOfStdDuration(m.ValidDuration) n += 1 + l + sovQuota(uint64(l)) if m.GrantedAmount != 0 { n += 1 + sovQuota(uint64(m.GrantedAmount)) @@ -311,7 +479,7 @@ func (this *QuotaRequest) String() string { for k, _ := range this.Quotas { keysForQuotas = append(keysForQuotas, k) } - sortkeys.Strings(keysForQuotas) + github_com_gogo_protobuf_sortkeys.Strings(keysForQuotas) mapStringForQuotas := "map[string]QuotaRequest_QuotaParams{" for _, k := range keysForQuotas { mapStringForQuotas += fmt.Sprintf("%v: %v,", k, this.Quotas[k]) @@ -342,7 +510,7 @@ func (this *QuotaResult) String() string { for k, _ := range this.Quotas { keysForQuotas = append(keysForQuotas, k) } - sortkeys.Strings(keysForQuotas) + github_com_gogo_protobuf_sortkeys.Strings(keysForQuotas) mapStringForQuotas := "map[string]QuotaResult_Result{" for _, k := range keysForQuotas { mapStringForQuotas += fmt.Sprintf("%v: %v,", k, this.Quotas[k]) @@ -359,7 +527,7 @@ func (this *QuotaResult_Result) String() string { return "nil" } s := strings.Join([]string{`&QuotaResult_Result{`, - `ValidDuration:` + strings.Replace(strings.Replace(this.ValidDuration.String(), "Duration", "google_protobuf1.Duration", 1), `&`, ``, 1) + `,`, + `ValidDuration:` + strings.Replace(strings.Replace(this.ValidDuration.String(), "Duration", "types.Duration", 1), `&`, ``, 1) + `,`, `GrantedAmount:` + fmt.Sprintf("%v", this.GrantedAmount) + `,`, `}`, }, "") @@ -388,7 +556,7 @@ func (m *QuotaRequest) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - wire |= (uint64(b) & 0x7F) << shift + wire |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -416,7 +584,7 @@ func (m *QuotaRequest) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - msglen |= (int(b) & 0x7F) << shift + msglen |= int(b&0x7F) << shift if b < 0x80 { break } @@ -425,6 +593,9 @@ func (m *QuotaRequest) Unmarshal(dAtA []byte) error { return ErrInvalidLengthQuota } postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthQuota + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -445,7 +616,7 @@ func (m *QuotaRequest) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - wire |= (uint64(b) & 0x7F) << shift + wire |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -462,7 +633,7 @@ func (m *QuotaRequest) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLenmapkey |= (uint64(b) & 0x7F) << shift + stringLenmapkey |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -472,6 +643,9 @@ func (m *QuotaRequest) Unmarshal(dAtA []byte) error { return ErrInvalidLengthQuota } postStringIndexmapkey := iNdEx + intStringLenmapkey + if postStringIndexmapkey < 0 { + return ErrInvalidLengthQuota + } if postStringIndexmapkey > l { return io.ErrUnexpectedEOF } @@ -488,7 +662,7 @@ func (m *QuotaRequest) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - mapmsglen |= (int(b) & 0x7F) << shift + mapmsglen |= int(b&0x7F) << shift if b < 0x80 { break } @@ -497,7 +671,7 @@ func (m *QuotaRequest) Unmarshal(dAtA []byte) error { return ErrInvalidLengthQuota } postmsgIndex := iNdEx + mapmsglen - if mapmsglen < 0 { + if postmsgIndex < 0 { return ErrInvalidLengthQuota } if postmsgIndex > l { @@ -534,6 +708,9 @@ func (m *QuotaRequest) Unmarshal(dAtA []byte) error { if skippy < 0 { return ErrInvalidLengthQuota } + if (iNdEx + skippy) < 0 { + return ErrInvalidLengthQuota + } if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF } @@ -561,7 +738,7 @@ func (m *QuotaRequest_QuotaParams) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - wire |= (uint64(b) & 0x7F) << shift + wire |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -589,7 +766,7 @@ func (m *QuotaRequest_QuotaParams) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - m.Amount |= (int64(b) & 0x7F) << shift + m.Amount |= int64(b&0x7F) << shift if b < 0x80 { break } @@ -608,7 +785,7 @@ func (m *QuotaRequest_QuotaParams) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - v |= (int(b) & 0x7F) << shift + v |= int(b&0x7F) << shift if b < 0x80 { break } @@ -623,6 +800,9 @@ func (m *QuotaRequest_QuotaParams) Unmarshal(dAtA []byte) error { if skippy < 0 { return ErrInvalidLengthQuota } + if (iNdEx + skippy) < 0 { + return ErrInvalidLengthQuota + } if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF } @@ -650,7 +830,7 @@ func (m *QuotaResult) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - wire |= (uint64(b) & 0x7F) << shift + wire |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -678,7 +858,7 @@ func (m *QuotaResult) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - msglen |= (int(b) & 0x7F) << shift + msglen |= int(b&0x7F) << shift if b < 0x80 { break } @@ -687,6 +867,9 @@ func (m *QuotaResult) Unmarshal(dAtA []byte) error { return ErrInvalidLengthQuota } postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthQuota + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -707,7 +890,7 @@ func (m *QuotaResult) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - wire |= (uint64(b) & 0x7F) << shift + wire |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -724,7 +907,7 @@ func (m *QuotaResult) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLenmapkey |= (uint64(b) & 0x7F) << shift + stringLenmapkey |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -734,6 +917,9 @@ func (m *QuotaResult) Unmarshal(dAtA []byte) error { return ErrInvalidLengthQuota } postStringIndexmapkey := iNdEx + intStringLenmapkey + if postStringIndexmapkey < 0 { + return ErrInvalidLengthQuota + } if postStringIndexmapkey > l { return io.ErrUnexpectedEOF } @@ -750,7 +936,7 @@ func (m *QuotaResult) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - mapmsglen |= (int(b) & 0x7F) << shift + mapmsglen |= int(b&0x7F) << shift if b < 0x80 { break } @@ -759,7 +945,7 @@ func (m *QuotaResult) Unmarshal(dAtA []byte) error { return ErrInvalidLengthQuota } postmsgIndex := iNdEx + mapmsglen - if mapmsglen < 0 { + if postmsgIndex < 0 { return ErrInvalidLengthQuota } if postmsgIndex > l { @@ -796,6 +982,9 @@ func (m *QuotaResult) Unmarshal(dAtA []byte) error { if skippy < 0 { return ErrInvalidLengthQuota } + if (iNdEx + skippy) < 0 { + return ErrInvalidLengthQuota + } if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF } @@ -823,7 +1012,7 @@ func (m *QuotaResult_Result) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - wire |= (uint64(b) & 0x7F) << shift + wire |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -851,7 +1040,7 @@ func (m *QuotaResult_Result) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - msglen |= (int(b) & 0x7F) << shift + msglen |= int(b&0x7F) << shift if b < 0x80 { break } @@ -860,10 +1049,13 @@ func (m *QuotaResult_Result) Unmarshal(dAtA []byte) error { return ErrInvalidLengthQuota } postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthQuota + } if postIndex > l { return io.ErrUnexpectedEOF } - if err := types.StdDurationUnmarshal(&m.ValidDuration, dAtA[iNdEx:postIndex]); err != nil { + if err := github_com_gogo_protobuf_types.StdDurationUnmarshal(&m.ValidDuration, dAtA[iNdEx:postIndex]); err != nil { return err } iNdEx = postIndex @@ -881,7 +1073,7 @@ func (m *QuotaResult_Result) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - m.GrantedAmount |= (int64(b) & 0x7F) << shift + m.GrantedAmount |= int64(b&0x7F) << shift if b < 0x80 { break } @@ -895,6 +1087,9 @@ func (m *QuotaResult_Result) Unmarshal(dAtA []byte) error { if skippy < 0 { return ErrInvalidLengthQuota } + if (iNdEx + skippy) < 0 { + return ErrInvalidLengthQuota + } if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF } @@ -961,10 +1156,13 @@ func skipQuota(dAtA []byte) (n int, err error) { break } } - iNdEx += length if length < 0 { return 0, ErrInvalidLengthQuota } + iNdEx += length + if iNdEx < 0 { + return 0, ErrInvalidLengthQuota + } return iNdEx, nil case 3: for { @@ -993,6 +1191,9 @@ func skipQuota(dAtA []byte) (n int, err error) { return 0, err } iNdEx = start + next + if iNdEx < 0 { + return 0, ErrInvalidLengthQuota + } } return iNdEx, nil case 4: @@ -1011,37 +1212,3 @@ var ( ErrInvalidLengthQuota = fmt.Errorf("proto: negative length found during unmarshaling") ErrIntOverflowQuota = fmt.Errorf("proto: integer overflow") ) - -func init() { proto.RegisterFile("mixer/adapter/model/v1beta1/quota.proto", fileDescriptorQuota) } - -var fileDescriptorQuota = []byte{ - // 444 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x53, 0x3d, 0x6f, 0xd4, 0x30, - 0x18, 0xb6, 0xef, 0xe0, 0x54, 0x7c, 0xb4, 0x42, 0x16, 0x42, 0x47, 0x06, 0xdf, 0x51, 0x09, 0x91, - 0xc9, 0x56, 0x41, 0x48, 0xa8, 0x4c, 0x9c, 0x28, 0x03, 0x2c, 0xd4, 0x13, 0x74, 0x39, 0x39, 0x8a, - 0x2f, 0x8a, 0x48, 0xe2, 0xd4, 0x71, 0x22, 0x2a, 0x16, 0x7e, 0x02, 0x23, 0x3f, 0x01, 0xfe, 0xc9, - 0x8d, 0x9d, 0x10, 0x13, 0x90, 0xb0, 0x30, 0xf6, 0x27, 0xa0, 0xd8, 0x3e, 0xa9, 0x30, 0xf4, 0xa0, - 0x53, 0xde, 0x8f, 0xe7, 0x7d, 0x9e, 0xbc, 0xcf, 0x2b, 0xa3, 0x7b, 0x79, 0xfa, 0x56, 0x6a, 0x26, - 0x62, 0x51, 0x1a, 0xa9, 0x59, 0xae, 0x62, 0x99, 0xb1, 0x66, 0x2f, 0x92, 0x46, 0xec, 0xb1, 0xe3, - 0x5a, 0x19, 0x41, 0x4b, 0xad, 0x8c, 0xc2, 0x77, 0xd2, 0xca, 0xa4, 0x8a, 0x5a, 0x38, 0xf5, 0x70, - 0x6a, 0xe1, 0xd4, 0xc3, 0x83, 0x9b, 0x89, 0x4a, 0x94, 0x45, 0xb3, 0x3e, 0x72, 0x83, 0x01, 0x49, - 0x94, 0x4a, 0x32, 0xc9, 0x6c, 0x16, 0xd5, 0x4b, 0x16, 0xd7, 0x5a, 0x98, 0x54, 0x15, 0xae, 0xbf, - 0xfb, 0x79, 0x80, 0xae, 0x1f, 0xf6, 0x42, 0x5c, 0x1e, 0xd7, 0xb2, 0x32, 0xf8, 0x35, 0x1a, 0x59, - 0xe1, 0x6a, 0x02, 0x67, 0xc3, 0x70, 0x7c, 0xff, 0x31, 0xdd, 0x28, 0x4d, 0xcf, 0x13, 0xb8, 0xa4, - 0x3a, 0x28, 0x8c, 0x3e, 0x99, 0x5f, 0x59, 0x7d, 0x9b, 0x02, 0xee, 0x09, 0x83, 0x67, 0x68, 0x6c, - 0x9b, 0x2f, 0x85, 0x16, 0x79, 0x85, 0x6f, 0xa1, 0x91, 0xc8, 0x55, 0x5d, 0x98, 0x09, 0x9c, 0xc1, - 0x70, 0xc8, 0x7d, 0x86, 0xa7, 0x68, 0x1c, 0xc9, 0xca, 0x2c, 0xe4, 0x72, 0xa9, 0xb4, 0x99, 0x0c, - 0x66, 0x30, 0xdc, 0xe2, 0xa8, 0x2f, 0x1d, 0xd8, 0x4a, 0xd0, 0x78, 0x1e, 0x27, 0x82, 0x6f, 0xa0, - 0xe1, 0x1b, 0x79, 0x62, 0x49, 0xae, 0xf1, 0x3e, 0xc4, 0x87, 0xe8, 0x6a, 0x23, 0xb2, 0x5a, 0xda, - 0xd9, 0xcb, 0xae, 0xe0, 0xfe, 0x92, 0x3b, 0xa6, 0xfd, 0xc1, 0x23, 0xb8, 0xfb, 0x65, 0xe0, 0x85, - 0xb9, 0xac, 0xea, 0xcc, 0xe0, 0x57, 0x7f, 0x59, 0xb5, 0xff, 0xef, 0x3a, 0xfd, 0xfc, 0x05, 0x4e, - 0xbd, 0x43, 0x23, 0xaf, 0xf1, 0x1c, 0xed, 0x34, 0x22, 0x4b, 0xe3, 0xc5, 0xfa, 0x6e, 0x7e, 0xa7, - 0xdb, 0xd4, 0x1d, 0x96, 0xae, 0x0f, 0x4b, 0x9f, 0x7a, 0xc0, 0x7c, 0xab, 0xa7, 0xfa, 0xf8, 0x7d, - 0x0a, 0xf9, 0xb6, 0x1d, 0x5d, 0x37, 0xf0, 0x5d, 0xb4, 0x93, 0x68, 0x51, 0x18, 0x19, 0x2f, 0xbc, - 0xf1, 0x43, 0x6b, 0xfc, 0xb6, 0xaf, 0x3e, 0xb1, 0xc5, 0xa0, 0xdc, 0x64, 0xef, 0x8b, 0x3f, 0xed, - 0x7d, 0xf8, 0x9f, 0x6b, 0xbb, 0xcf, 0x39, 0x63, 0xe7, 0x47, 0xab, 0x96, 0x80, 0xd3, 0x96, 0x80, - 0xaf, 0x2d, 0x01, 0x67, 0x2d, 0x01, 0xef, 0x3b, 0x02, 0x3f, 0x75, 0x04, 0xac, 0x3a, 0x02, 0x4f, - 0x3b, 0x02, 0x7f, 0x74, 0x04, 0xfe, 0xea, 0x08, 0x38, 0xeb, 0x08, 0xfc, 0xf0, 0x93, 0x80, 0xa3, - 0xd0, 0x49, 0xa6, 0x8a, 0x89, 0x32, 0x65, 0x17, 0xbc, 0xa2, 0x68, 0x64, 0x0d, 0x7a, 0xf0, 0x3b, - 0x00, 0x00, 0xff, 0xff, 0xf7, 0xfa, 0xfe, 0x63, 0x6b, 0x03, 0x00, 0x00, -} diff --git a/mixer/adapter/model/v1beta1/report.pb.go b/mixer/adapter/model/v1beta1/report.pb.go index 1ec33b37bff..3ca2dca28e6 100644 --- a/mixer/adapter/model/v1beta1/report.pb.go +++ b/mixer/adapter/model/v1beta1/report.pb.go @@ -3,32 +3,87 @@ package v1beta1 -import proto "github.com/gogo/protobuf/proto" -import fmt "fmt" -import math "math" -import _ "github.com/gogo/protobuf/gogoproto" - -import strings "strings" -import reflect "reflect" - -import io "io" +import ( + fmt "fmt" + _ "github.com/gogo/protobuf/gogoproto" + proto "github.com/gogo/protobuf/proto" + io "io" + math "math" + reflect "reflect" + strings "strings" +) // Reference imports to suppress errors if they are not otherwise used. var _ = proto.Marshal var _ = fmt.Errorf var _ = math.Inf +// This is a compile-time assertion to ensure that this generated file +// is compatible with the proto package it is being compiled against. +// A compilation error at this line likely means your copy of the +// proto package needs to be updated. +const _ = proto.GoGoProtoPackageIsVersion2 // please upgrade the proto package + // Expresses the result of a report call. type ReportResult struct { } -func (m *ReportResult) Reset() { *m = ReportResult{} } -func (*ReportResult) ProtoMessage() {} -func (*ReportResult) Descriptor() ([]byte, []int) { return fileDescriptorReport, []int{0} } +func (m *ReportResult) Reset() { *m = ReportResult{} } +func (*ReportResult) ProtoMessage() {} +func (*ReportResult) Descriptor() ([]byte, []int) { + return fileDescriptor_abc732328b315eb4, []int{0} +} +func (m *ReportResult) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *ReportResult) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_ReportResult.Marshal(b, m, deterministic) + } else { + b = b[:cap(b)] + n, err := m.MarshalTo(b) + if err != nil { + return nil, err + } + return b[:n], nil + } +} +func (m *ReportResult) XXX_Merge(src proto.Message) { + xxx_messageInfo_ReportResult.Merge(m, src) +} +func (m *ReportResult) XXX_Size() int { + return m.Size() +} +func (m *ReportResult) XXX_DiscardUnknown() { + xxx_messageInfo_ReportResult.DiscardUnknown(m) +} + +var xxx_messageInfo_ReportResult proto.InternalMessageInfo func init() { proto.RegisterType((*ReportResult)(nil), "istio.mixer.adapter.model.v1beta1.ReportResult") } + +func init() { + proto.RegisterFile("mixer/adapter/model/v1beta1/report.proto", fileDescriptor_abc732328b315eb4) +} + +var fileDescriptor_abc732328b315eb4 = []byte{ + // 191 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0xce, 0xa1, 0x0e, 0xc2, 0x30, + 0x10, 0x80, 0xe1, 0xab, 0x41, 0x2c, 0x04, 0x41, 0x50, 0x88, 0x4b, 0x40, 0x4d, 0xb5, 0x59, 0x78, + 0x03, 0x1e, 0x61, 0x12, 0xd7, 0x65, 0xcd, 0xd2, 0x64, 0xcb, 0x35, 0x5d, 0x21, 0x48, 0x1e, 0x81, + 0xc7, 0xe0, 0x51, 0x26, 0x27, 0x27, 0x69, 0x67, 0x90, 0x7b, 0x04, 0x42, 0x37, 0x8d, 0x3b, 0xf1, + 0xdd, 0xdd, 0x9f, 0xa4, 0x8d, 0xbe, 0x2b, 0x2b, 0x64, 0x29, 0x8d, 0x53, 0x56, 0x34, 0x54, 0xaa, + 0x5a, 0xdc, 0xb2, 0x42, 0x39, 0x99, 0x09, 0xab, 0x0c, 0x59, 0xc7, 0x8d, 0x25, 0x47, 0xdb, 0x83, + 0x6e, 0x9d, 0x26, 0x1e, 0x3d, 0x5f, 0x3c, 0x8f, 0x9e, 0x2f, 0x7e, 0xbf, 0xab, 0xa8, 0xa2, 0xa8, + 0xc5, 0x6f, 0x9a, 0x17, 0x8f, 0x9b, 0x64, 0x9d, 0xc7, 0x43, 0xb9, 0x6a, 0xaf, 0xb5, 0x3b, 0x17, + 0x9d, 0x47, 0xe8, 0x3d, 0xc2, 0xe0, 0x11, 0x26, 0x8f, 0xf0, 0x08, 0xc8, 0x5e, 0x01, 0xa1, 0x0b, + 0xc8, 0xfa, 0x80, 0xec, 0x1d, 0x90, 0x7d, 0x02, 0xc2, 0x14, 0x90, 0x3d, 0x47, 0x84, 0x7e, 0x44, + 0x18, 0x46, 0x84, 0x4b, 0x3a, 0x27, 0x68, 0x12, 0xd2, 0x68, 0xf1, 0xa7, 0xbc, 0x58, 0xc5, 0xd7, + 0xa7, 0x6f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x3b, 0x63, 0xe9, 0xbe, 0xdf, 0x00, 0x00, 0x00, +} + func (m *ReportResult) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) @@ -57,6 +112,9 @@ func encodeVarintReport(dAtA []byte, offset int, v uint64) int { return offset + 1 } func (m *ReportResult) Size() (n int) { + if m == nil { + return 0 + } var l int _ = l return n @@ -107,7 +165,7 @@ func (m *ReportResult) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - wire |= (uint64(b) & 0x7F) << shift + wire |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -130,6 +188,9 @@ func (m *ReportResult) Unmarshal(dAtA []byte) error { if skippy < 0 { return ErrInvalidLengthReport } + if (iNdEx + skippy) < 0 { + return ErrInvalidLengthReport + } if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF } @@ -196,10 +257,13 @@ func skipReport(dAtA []byte) (n int, err error) { break } } - iNdEx += length if length < 0 { return 0, ErrInvalidLengthReport } + iNdEx += length + if iNdEx < 0 { + return 0, ErrInvalidLengthReport + } return iNdEx, nil case 3: for { @@ -228,6 +292,9 @@ func skipReport(dAtA []byte) (n int, err error) { return 0, err } iNdEx = start + next + if iNdEx < 0 { + return 0, ErrInvalidLengthReport + } } return iNdEx, nil case 4: @@ -246,21 +313,3 @@ var ( ErrInvalidLengthReport = fmt.Errorf("proto: negative length found during unmarshaling") ErrIntOverflowReport = fmt.Errorf("proto: integer overflow") ) - -func init() { proto.RegisterFile("mixer/adapter/model/v1beta1/report.proto", fileDescriptorReport) } - -var fileDescriptorReport = []byte{ - // 183 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0xd2, 0xc8, 0xcd, 0xac, 0x48, - 0x2d, 0xd2, 0x4f, 0x4c, 0x49, 0x2c, 0x28, 0x49, 0x2d, 0xd2, 0xcf, 0xcd, 0x4f, 0x49, 0xcd, 0xd1, - 0x2f, 0x33, 0x4c, 0x4a, 0x2d, 0x49, 0x34, 0xd4, 0x2f, 0x4a, 0x2d, 0xc8, 0x2f, 0x2a, 0xd1, 0x2b, - 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x52, 0xcc, 0x2c, 0x2e, 0xc9, 0xcc, 0xd7, 0x03, 0xab, 0xd7, 0x83, - 0xaa, 0xd7, 0x03, 0xab, 0xd7, 0x83, 0xaa, 0x97, 0x12, 0x49, 0xcf, 0x4f, 0xcf, 0x07, 0xab, 0xd6, - 0x07, 0xb1, 0x20, 0x1a, 0x95, 0xf8, 0xb8, 0x78, 0x82, 0xc0, 0x06, 0x05, 0xa5, 0x16, 0x97, 0xe6, - 0x94, 0x38, 0x45, 0x9d, 0x78, 0x28, 0xc7, 0x70, 0xe1, 0xa1, 0x1c, 0xc3, 0x8d, 0x87, 0x72, 0x0c, - 0x1f, 0x1e, 0xca, 0x31, 0x34, 0x3c, 0x92, 0x63, 0x5c, 0xf1, 0x48, 0x8e, 0xe1, 0xc4, 0x23, 0x39, - 0xc6, 0x0b, 0x8f, 0xe4, 0x18, 0x1f, 0x3c, 0x92, 0x63, 0x7c, 0xf1, 0x48, 0x8e, 0xe1, 0xc3, 0x23, - 0x39, 0xc6, 0x09, 0x8f, 0xe5, 0x18, 0xa2, 0x34, 0x20, 0x56, 0x67, 0xe6, 0xeb, 0x27, 0x16, 0x64, - 0xea, 0xe3, 0x71, 0x71, 0x12, 0x1b, 0xd8, 0x4a, 0x63, 0x40, 0x00, 0x00, 0x00, 0xff, 0xff, 0xbc, - 0x98, 0x6a, 0x09, 0xd7, 0x00, 0x00, 0x00, -} diff --git a/mixer/adapter/model/v1beta1/template.pb.go b/mixer/adapter/model/v1beta1/template.pb.go index 2c81649cb32..1e5424cd0d6 100644 --- a/mixer/adapter/model/v1beta1/template.pb.go +++ b/mixer/adapter/model/v1beta1/template.pb.go @@ -3,29 +3,63 @@ package v1beta1 -import proto "github.com/gogo/protobuf/proto" -import fmt "fmt" -import math "math" - -import strings "strings" -import reflect "reflect" - -import io "io" +import ( + fmt "fmt" + proto "github.com/gogo/protobuf/proto" + io "io" + math "math" + reflect "reflect" + strings "strings" +) // Reference imports to suppress errors if they are not otherwise used. var _ = proto.Marshal var _ = fmt.Errorf var _ = math.Inf +// This is a compile-time assertion to ensure that this generated file +// is compatible with the proto package it is being compiled against. +// A compilation error at this line likely means your copy of the +// proto package needs to be updated. +const _ = proto.GoGoProtoPackageIsVersion2 // please upgrade the proto package + // Template provides the details of a mixer template. type Template struct { // Base64 encoded proto descriptor of the template. Descriptor_ string `protobuf:"bytes,1,opt,name=descriptor,proto3" json:"descriptor,omitempty"` } -func (m *Template) Reset() { *m = Template{} } -func (*Template) ProtoMessage() {} -func (*Template) Descriptor() ([]byte, []int) { return fileDescriptorTemplate, []int{0} } +func (m *Template) Reset() { *m = Template{} } +func (*Template) ProtoMessage() {} +func (*Template) Descriptor() ([]byte, []int) { + return fileDescriptor_bfb51c5f8ecd0171, []int{0} +} +func (m *Template) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *Template) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_Template.Marshal(b, m, deterministic) + } else { + b = b[:cap(b)] + n, err := m.MarshalTo(b) + if err != nil { + return nil, err + } + return b[:n], nil + } +} +func (m *Template) XXX_Merge(src proto.Message) { + xxx_messageInfo_Template.Merge(m, src) +} +func (m *Template) XXX_Size() int { + return m.Size() +} +func (m *Template) XXX_DiscardUnknown() { + xxx_messageInfo_Template.DiscardUnknown(m) +} + +var xxx_messageInfo_Template proto.InternalMessageInfo func (m *Template) GetDescriptor_() string { if m != nil { @@ -37,6 +71,28 @@ func (m *Template) GetDescriptor_() string { func init() { proto.RegisterType((*Template)(nil), "istio.mixer.adapter.model.v1beta1.Template") } + +func init() { + proto.RegisterFile("mixer/adapter/model/v1beta1/template.proto", fileDescriptor_bfb51c5f8ecd0171) +} + +var fileDescriptor_bfb51c5f8ecd0171 = []byte{ + // 193 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0xd2, 0xca, 0xcd, 0xac, 0x48, + 0x2d, 0xd2, 0x4f, 0x4c, 0x49, 0x2c, 0x28, 0x49, 0x2d, 0xd2, 0xcf, 0xcd, 0x4f, 0x49, 0xcd, 0xd1, + 0x2f, 0x33, 0x4c, 0x4a, 0x2d, 0x49, 0x34, 0xd4, 0x2f, 0x49, 0xcd, 0x2d, 0xc8, 0x49, 0x2c, 0x49, + 0xd5, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x52, 0xcc, 0x2c, 0x2e, 0xc9, 0xcc, 0xd7, 0x03, 0xeb, + 0xd0, 0x83, 0xea, 0xd0, 0x03, 0xeb, 0xd0, 0x83, 0xea, 0x50, 0xd2, 0xe2, 0xe2, 0x08, 0x81, 0x6a, + 0x12, 0x92, 0xe3, 0xe2, 0x4a, 0x49, 0x2d, 0x4e, 0x2e, 0xca, 0x2c, 0x28, 0xc9, 0x2f, 0x92, 0x60, + 0x54, 0x60, 0xd4, 0xe0, 0x0c, 0x42, 0x12, 0x71, 0x8a, 0xbb, 0xf0, 0x50, 0x8e, 0xe1, 0xc6, 0x43, + 0x39, 0x86, 0x0f, 0x0f, 0xe5, 0x18, 0x1b, 0x1e, 0xc9, 0x31, 0xae, 0x78, 0x24, 0xc7, 0x78, 0xe2, + 0x91, 0x1c, 0xe3, 0x85, 0x47, 0x72, 0x8c, 0x0f, 0x1e, 0xc9, 0x31, 0xbe, 0x78, 0x24, 0xc7, 0xf0, + 0xe1, 0x91, 0x1c, 0xe3, 0x84, 0xc7, 0x72, 0x0c, 0x17, 0x1e, 0xcb, 0x31, 0xdc, 0x78, 0x2c, 0xc7, + 0x10, 0xa5, 0x01, 0x71, 0x44, 0x66, 0xbe, 0x7e, 0x62, 0x41, 0xa6, 0x3e, 0x1e, 0xd7, 0x27, 0xb1, + 0x81, 0x5d, 0x6d, 0x0c, 0x08, 0x00, 0x00, 0xff, 0xff, 0x3a, 0xe9, 0x16, 0x20, 0xe3, 0x00, 0x00, + 0x00, +} + func (this *Template) Equal(that interface{}) bool { if that == nil { return this == nil @@ -113,6 +169,9 @@ func encodeVarintTemplate(dAtA []byte, offset int, v uint64) int { return offset + 1 } func (m *Template) Size() (n int) { + if m == nil { + return 0 + } var l int _ = l l = len(m.Descriptor_) @@ -168,7 +227,7 @@ func (m *Template) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - wire |= (uint64(b) & 0x7F) << shift + wire |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -196,7 +255,7 @@ func (m *Template) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLen |= (uint64(b) & 0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -206,6 +265,9 @@ func (m *Template) Unmarshal(dAtA []byte) error { return ErrInvalidLengthTemplate } postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthTemplate + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -220,6 +282,9 @@ func (m *Template) Unmarshal(dAtA []byte) error { if skippy < 0 { return ErrInvalidLengthTemplate } + if (iNdEx + skippy) < 0 { + return ErrInvalidLengthTemplate + } if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF } @@ -286,10 +351,13 @@ func skipTemplate(dAtA []byte) (n int, err error) { break } } - iNdEx += length if length < 0 { return 0, ErrInvalidLengthTemplate } + iNdEx += length + if iNdEx < 0 { + return 0, ErrInvalidLengthTemplate + } return iNdEx, nil case 3: for { @@ -318,6 +386,9 @@ func skipTemplate(dAtA []byte) (n int, err error) { return 0, err } iNdEx = start + next + if iNdEx < 0 { + return 0, ErrInvalidLengthTemplate + } } return iNdEx, nil case 4: @@ -336,21 +407,3 @@ var ( ErrInvalidLengthTemplate = fmt.Errorf("proto: negative length found during unmarshaling") ErrIntOverflowTemplate = fmt.Errorf("proto: integer overflow") ) - -func init() { proto.RegisterFile("mixer/adapter/model/v1beta1/template.proto", fileDescriptorTemplate) } - -var fileDescriptorTemplate = []byte{ - // 185 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0xd2, 0xca, 0xcd, 0xac, 0x48, - 0x2d, 0xd2, 0x4f, 0x4c, 0x49, 0x2c, 0x28, 0x49, 0x2d, 0xd2, 0xcf, 0xcd, 0x4f, 0x49, 0xcd, 0xd1, - 0x2f, 0x33, 0x4c, 0x4a, 0x2d, 0x49, 0x34, 0xd4, 0x2f, 0x49, 0xcd, 0x2d, 0xc8, 0x49, 0x2c, 0x49, - 0xd5, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x52, 0xcc, 0x2c, 0x2e, 0xc9, 0xcc, 0xd7, 0x03, 0xeb, - 0xd0, 0x83, 0xea, 0xd0, 0x03, 0xeb, 0xd0, 0x83, 0xea, 0x50, 0xd2, 0xe2, 0xe2, 0x08, 0x81, 0x6a, - 0x12, 0x92, 0xe3, 0xe2, 0x4a, 0x49, 0x2d, 0x4e, 0x2e, 0xca, 0x2c, 0x28, 0xc9, 0x2f, 0x92, 0x60, - 0x54, 0x60, 0xd4, 0xe0, 0x0c, 0x42, 0x12, 0x71, 0x0a, 0xbb, 0xf0, 0x50, 0x8e, 0xe1, 0xc6, 0x43, - 0x39, 0x86, 0x0f, 0x0f, 0xe5, 0x18, 0x1b, 0x1e, 0xc9, 0x31, 0xae, 0x78, 0x24, 0xc7, 0x78, 0xe2, - 0x91, 0x1c, 0xe3, 0x85, 0x47, 0x72, 0x8c, 0x0f, 0x1e, 0xc9, 0x31, 0xbe, 0x78, 0x24, 0xc7, 0xf0, - 0xe1, 0x91, 0x1c, 0xe3, 0x84, 0xc7, 0x72, 0x0c, 0x51, 0x1a, 0x10, 0xcb, 0x33, 0xf3, 0xf5, 0x13, - 0x0b, 0x32, 0xf5, 0xf1, 0xb8, 0x3a, 0x89, 0x0d, 0xec, 0x5a, 0x63, 0x40, 0x00, 0x00, 0x00, 0xff, - 0xff, 0xf1, 0x57, 0x3e, 0x72, 0xdb, 0x00, 0x00, 0x00, -} diff --git a/mixer/v1/attributes.pb.go b/mixer/v1/attributes.pb.go index 4543320353b..af3a17af5bf 100644 --- a/mixer/v1/attributes.pb.go +++ b/mixer/v1/attributes.pb.go @@ -1,44 +1,22 @@ // Code generated by protoc-gen-gogo. DO NOT EDIT. // source: mixer/v1/attributes.proto -/* - Package v1 is a generated protocol buffer package. - - It is generated from these files: - mixer/v1/attributes.proto - mixer/v1/mixer.proto - - It has these top-level messages: - Attributes - CompressedAttributes - StringMap - CheckRequest - CheckResponse - ReferencedAttributes - HeaderOperation - RouteDirective - ReportRequest - ReportResponse -*/ package v1 -import proto "github.com/gogo/protobuf/proto" -import fmt "fmt" -import math "math" -import _ "github.com/gogo/protobuf/gogoproto" -import google_protobuf1 "github.com/gogo/protobuf/types" -import google_protobuf2 "github.com/gogo/protobuf/types" - -import time "time" - -import binary "encoding/binary" -import types "github.com/gogo/protobuf/types" - -import strings "strings" -import reflect "reflect" -import sortkeys "github.com/gogo/protobuf/sortkeys" - -import io "io" +import ( + encoding_binary "encoding/binary" + fmt "fmt" + _ "github.com/gogo/protobuf/gogoproto" + proto "github.com/gogo/protobuf/proto" + github_com_gogo_protobuf_sortkeys "github.com/gogo/protobuf/sortkeys" + github_com_gogo_protobuf_types "github.com/gogo/protobuf/types" + types "github.com/gogo/protobuf/types" + io "io" + math "math" + reflect "reflect" + strings "strings" + time "time" +) // Reference imports to suppress errors if they are not otherwise used. var _ = proto.Marshal @@ -89,12 +67,40 @@ const _ = proto.GoGoProtoPackageIsVersion2 // please upgrade the proto package // 3) Forward attributes from client proxy to server proxy for HTTP requests. type Attributes struct { // A map of attribute name to its value. - Attributes map[string]*Attributes_AttributeValue `protobuf:"bytes,1,rep,name=attributes" json:"attributes,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value"` + Attributes map[string]*Attributes_AttributeValue `protobuf:"bytes,1,rep,name=attributes,proto3" json:"attributes,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` } -func (m *Attributes) Reset() { *m = Attributes{} } -func (*Attributes) ProtoMessage() {} -func (*Attributes) Descriptor() ([]byte, []int) { return fileDescriptorAttributes, []int{0} } +func (m *Attributes) Reset() { *m = Attributes{} } +func (*Attributes) ProtoMessage() {} +func (*Attributes) Descriptor() ([]byte, []int) { + return fileDescriptor_6504964367320bd3, []int{0} +} +func (m *Attributes) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *Attributes) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_Attributes.Marshal(b, m, deterministic) + } else { + b = b[:cap(b)] + n, err := m.MarshalTo(b) + if err != nil { + return nil, err + } + return b[:n], nil + } +} +func (m *Attributes) XXX_Merge(src proto.Message) { + xxx_messageInfo_Attributes.Merge(m, src) +} +func (m *Attributes) XXX_Size() int { + return m.Size() +} +func (m *Attributes) XXX_DiscardUnknown() { + xxx_messageInfo_Attributes.DiscardUnknown(m) +} + +var xxx_messageInfo_Attributes proto.InternalMessageInfo // Specifies one attribute value with different type. type Attributes_AttributeValue struct { @@ -115,8 +121,34 @@ type Attributes_AttributeValue struct { func (m *Attributes_AttributeValue) Reset() { *m = Attributes_AttributeValue{} } func (*Attributes_AttributeValue) ProtoMessage() {} func (*Attributes_AttributeValue) Descriptor() ([]byte, []int) { - return fileDescriptorAttributes, []int{0, 1} + return fileDescriptor_6504964367320bd3, []int{0, 1} +} +func (m *Attributes_AttributeValue) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) } +func (m *Attributes_AttributeValue) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_Attributes_AttributeValue.Marshal(b, m, deterministic) + } else { + b = b[:cap(b)] + n, err := m.MarshalTo(b) + if err != nil { + return nil, err + } + return b[:n], nil + } +} +func (m *Attributes_AttributeValue) XXX_Merge(src proto.Message) { + xxx_messageInfo_Attributes_AttributeValue.Merge(m, src) +} +func (m *Attributes_AttributeValue) XXX_Size() int { + return m.Size() +} +func (m *Attributes_AttributeValue) XXX_DiscardUnknown() { + xxx_messageInfo_Attributes_AttributeValue.DiscardUnknown(m) +} + +var xxx_messageInfo_Attributes_AttributeValue proto.InternalMessageInfo type isAttributes_AttributeValue_Value interface { isAttributes_AttributeValue_Value() @@ -140,13 +172,13 @@ type Attributes_AttributeValue_BytesValue struct { BytesValue []byte `protobuf:"bytes,6,opt,name=bytes_value,json=bytesValue,proto3,oneof"` } type Attributes_AttributeValue_TimestampValue struct { - TimestampValue *google_protobuf2.Timestamp `protobuf:"bytes,7,opt,name=timestamp_value,json=timestampValue,oneof"` + TimestampValue *types.Timestamp `protobuf:"bytes,7,opt,name=timestamp_value,json=timestampValue,proto3,oneof"` } type Attributes_AttributeValue_DurationValue struct { - DurationValue *google_protobuf1.Duration `protobuf:"bytes,8,opt,name=duration_value,json=durationValue,oneof"` + DurationValue *types.Duration `protobuf:"bytes,8,opt,name=duration_value,json=durationValue,proto3,oneof"` } type Attributes_AttributeValue_StringMapValue struct { - StringMapValue *Attributes_StringMap `protobuf:"bytes,9,opt,name=string_map_value,json=stringMapValue,oneof"` + StringMapValue *Attributes_StringMap `protobuf:"bytes,9,opt,name=string_map_value,json=stringMapValue,proto3,oneof"` } func (*Attributes_AttributeValue_StringValue) isAttributes_AttributeValue_Value() {} @@ -200,14 +232,14 @@ func (m *Attributes_AttributeValue) GetBytesValue() []byte { return nil } -func (m *Attributes_AttributeValue) GetTimestampValue() *google_protobuf2.Timestamp { +func (m *Attributes_AttributeValue) GetTimestampValue() *types.Timestamp { if x, ok := m.GetValue().(*Attributes_AttributeValue_TimestampValue); ok { return x.TimestampValue } return nil } -func (m *Attributes_AttributeValue) GetDurationValue() *google_protobuf1.Duration { +func (m *Attributes_AttributeValue) GetDurationValue() *types.Duration { if x, ok := m.GetValue().(*Attributes_AttributeValue_DurationValue); ok { return x.DurationValue } @@ -322,7 +354,7 @@ func _Attributes_AttributeValue_OneofUnmarshaler(msg proto.Message, tag, wire in if wire != proto.WireBytes { return true, proto.ErrInternalBadWireType } - msg := new(google_protobuf2.Timestamp) + msg := new(types.Timestamp) err := b.DecodeMessage(msg) m.Value = &Attributes_AttributeValue_TimestampValue{msg} return true, err @@ -330,7 +362,7 @@ func _Attributes_AttributeValue_OneofUnmarshaler(msg proto.Message, tag, wire in if wire != proto.WireBytes { return true, proto.ErrInternalBadWireType } - msg := new(google_protobuf1.Duration) + msg := new(types.Duration) err := b.DecodeMessage(msg) m.Value = &Attributes_AttributeValue_DurationValue{msg} return true, err @@ -352,35 +384,35 @@ func _Attributes_AttributeValue_OneofSizer(msg proto.Message) (n int) { // value switch x := m.Value.(type) { case *Attributes_AttributeValue_StringValue: - n += proto.SizeVarint(2<<3 | proto.WireBytes) + n += 1 // tag and wire n += proto.SizeVarint(uint64(len(x.StringValue))) n += len(x.StringValue) case *Attributes_AttributeValue_Int64Value: - n += proto.SizeVarint(3<<3 | proto.WireVarint) + n += 1 // tag and wire n += proto.SizeVarint(uint64(x.Int64Value)) case *Attributes_AttributeValue_DoubleValue: - n += proto.SizeVarint(4<<3 | proto.WireFixed64) + n += 1 // tag and wire n += 8 case *Attributes_AttributeValue_BoolValue: - n += proto.SizeVarint(5<<3 | proto.WireVarint) + n += 1 // tag and wire n += 1 case *Attributes_AttributeValue_BytesValue: - n += proto.SizeVarint(6<<3 | proto.WireBytes) + n += 1 // tag and wire n += proto.SizeVarint(uint64(len(x.BytesValue))) n += len(x.BytesValue) case *Attributes_AttributeValue_TimestampValue: s := proto.Size(x.TimestampValue) - n += proto.SizeVarint(7<<3 | proto.WireBytes) + n += 1 // tag and wire n += proto.SizeVarint(uint64(s)) n += s case *Attributes_AttributeValue_DurationValue: s := proto.Size(x.DurationValue) - n += proto.SizeVarint(8<<3 | proto.WireBytes) + n += 1 // tag and wire n += proto.SizeVarint(uint64(s)) n += s case *Attributes_AttributeValue_StringMapValue: s := proto.Size(x.StringMapValue) - n += proto.SizeVarint(9<<3 | proto.WireBytes) + n += 1 // tag and wire n += proto.SizeVarint(uint64(s)) n += s case nil: @@ -393,15 +425,41 @@ func _Attributes_AttributeValue_OneofSizer(msg proto.Message) (n int) { // Defines a string map. type Attributes_StringMap struct { // Holds a set of name/value pairs. - Entries map[string]string `protobuf:"bytes,1,rep,name=entries" json:"entries,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` + Entries map[string]string `protobuf:"bytes,1,rep,name=entries,proto3" json:"entries,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` } func (m *Attributes_StringMap) Reset() { *m = Attributes_StringMap{} } func (*Attributes_StringMap) ProtoMessage() {} func (*Attributes_StringMap) Descriptor() ([]byte, []int) { - return fileDescriptorAttributes, []int{0, 2} + return fileDescriptor_6504964367320bd3, []int{0, 2} +} +func (m *Attributes_StringMap) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *Attributes_StringMap) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_Attributes_StringMap.Marshal(b, m, deterministic) + } else { + b = b[:cap(b)] + n, err := m.MarshalTo(b) + if err != nil { + return nil, err + } + return b[:n], nil + } +} +func (m *Attributes_StringMap) XXX_Merge(src proto.Message) { + xxx_messageInfo_Attributes_StringMap.Merge(m, src) +} +func (m *Attributes_StringMap) XXX_Size() int { + return m.Size() +} +func (m *Attributes_StringMap) XXX_DiscardUnknown() { + xxx_messageInfo_Attributes_StringMap.DiscardUnknown(m) } +var xxx_messageInfo_Attributes_StringMap proto.InternalMessageInfo + // Defines a list of attributes in compressed format optimized for transport. // Within this message, strings are referenced using integer indices into // one of two string dictionaries. Positive integers index into the global @@ -411,47 +469,172 @@ func (*Attributes_StringMap) Descriptor() ([]byte, []int) { // configuration. type CompressedAttributes struct { // The message-level dictionary. - Words []string `protobuf:"bytes,1,rep,name=words" json:"words,omitempty"` + Words []string `protobuf:"bytes,1,rep,name=words,proto3" json:"words,omitempty"` // Holds attributes of type STRING, DNS_NAME, EMAIL_ADDRESS, URI - Strings map[int32]int32 `protobuf:"bytes,2,rep,name=strings" json:"strings,omitempty" protobuf_key:"zigzag32,1,opt,name=key,proto3" protobuf_val:"zigzag32,2,opt,name=value,proto3"` + Strings map[int32]int32 `protobuf:"bytes,2,rep,name=strings,proto3" json:"strings,omitempty" protobuf_key:"zigzag32,1,opt,name=key,proto3" protobuf_val:"zigzag32,2,opt,name=value,proto3"` // Holds attributes of type INT64 - Int64S map[int32]int64 `protobuf:"bytes,3,rep,name=int64s" json:"int64s,omitempty" protobuf_key:"zigzag32,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` + Int64S map[int32]int64 `protobuf:"bytes,3,rep,name=int64s,proto3" json:"int64s,omitempty" protobuf_key:"zigzag32,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` // Holds attributes of type DOUBLE - Doubles map[int32]float64 `protobuf:"bytes,4,rep,name=doubles" json:"doubles,omitempty" protobuf_key:"zigzag32,1,opt,name=key,proto3" protobuf_val:"fixed64,2,opt,name=value,proto3"` + Doubles map[int32]float64 `protobuf:"bytes,4,rep,name=doubles,proto3" json:"doubles,omitempty" protobuf_key:"zigzag32,1,opt,name=key,proto3" protobuf_val:"fixed64,2,opt,name=value,proto3"` // Holds attributes of type BOOL - Bools map[int32]bool `protobuf:"bytes,5,rep,name=bools" json:"bools,omitempty" protobuf_key:"zigzag32,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` + Bools map[int32]bool `protobuf:"bytes,5,rep,name=bools,proto3" json:"bools,omitempty" protobuf_key:"zigzag32,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` // Holds attributes of type TIMESTAMP - Timestamps map[int32]time.Time `protobuf:"bytes,6,rep,name=timestamps,stdtime" json:"timestamps" protobuf_key:"zigzag32,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value"` + Timestamps map[int32]time.Time `protobuf:"bytes,6,rep,name=timestamps,proto3,stdtime" json:"timestamps" protobuf_key:"zigzag32,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` // Holds attributes of type DURATION - Durations map[int32]time.Duration `protobuf:"bytes,7,rep,name=durations,stdduration" json:"durations" protobuf_key:"zigzag32,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value"` + Durations map[int32]time.Duration `protobuf:"bytes,7,rep,name=durations,proto3,stdduration" json:"durations" protobuf_key:"zigzag32,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` // Holds attributes of type BYTES - Bytes map[int32][]byte `protobuf:"bytes,8,rep,name=bytes" json:"bytes,omitempty" protobuf_key:"zigzag32,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` + Bytes map[int32][]byte `protobuf:"bytes,8,rep,name=bytes,proto3" json:"bytes,omitempty" protobuf_key:"zigzag32,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` // Holds attributes of type STRING_MAP - StringMaps map[int32]StringMap `protobuf:"bytes,9,rep,name=string_maps,json=stringMaps" json:"string_maps" protobuf_key:"zigzag32,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value"` + StringMaps map[int32]StringMap `protobuf:"bytes,9,rep,name=string_maps,json=stringMaps,proto3" json:"string_maps" protobuf_key:"zigzag32,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` } -func (m *CompressedAttributes) Reset() { *m = CompressedAttributes{} } -func (*CompressedAttributes) ProtoMessage() {} -func (*CompressedAttributes) Descriptor() ([]byte, []int) { return fileDescriptorAttributes, []int{1} } +func (m *CompressedAttributes) Reset() { *m = CompressedAttributes{} } +func (*CompressedAttributes) ProtoMessage() {} +func (*CompressedAttributes) Descriptor() ([]byte, []int) { + return fileDescriptor_6504964367320bd3, []int{1} +} +func (m *CompressedAttributes) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *CompressedAttributes) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_CompressedAttributes.Marshal(b, m, deterministic) + } else { + b = b[:cap(b)] + n, err := m.MarshalTo(b) + if err != nil { + return nil, err + } + return b[:n], nil + } +} +func (m *CompressedAttributes) XXX_Merge(src proto.Message) { + xxx_messageInfo_CompressedAttributes.Merge(m, src) +} +func (m *CompressedAttributes) XXX_Size() int { + return m.Size() +} +func (m *CompressedAttributes) XXX_DiscardUnknown() { + xxx_messageInfo_CompressedAttributes.DiscardUnknown(m) +} + +var xxx_messageInfo_CompressedAttributes proto.InternalMessageInfo // A map of string to string. The keys and values in this map are dictionary // indices (see the [Attributes][istio.mixer.v1.CompressedAttributes] message for an explanation) type StringMap struct { // Holds a set of name/value pairs. - Entries map[int32]int32 `protobuf:"bytes,1,rep,name=entries" json:"entries,omitempty" protobuf_key:"zigzag32,1,opt,name=key,proto3" protobuf_val:"zigzag32,2,opt,name=value,proto3"` + Entries map[int32]int32 `protobuf:"bytes,1,rep,name=entries,proto3" json:"entries,omitempty" protobuf_key:"zigzag32,1,opt,name=key,proto3" protobuf_val:"zigzag32,2,opt,name=value,proto3"` } -func (m *StringMap) Reset() { *m = StringMap{} } -func (*StringMap) ProtoMessage() {} -func (*StringMap) Descriptor() ([]byte, []int) { return fileDescriptorAttributes, []int{2} } +func (m *StringMap) Reset() { *m = StringMap{} } +func (*StringMap) ProtoMessage() {} +func (*StringMap) Descriptor() ([]byte, []int) { + return fileDescriptor_6504964367320bd3, []int{2} +} +func (m *StringMap) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *StringMap) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_StringMap.Marshal(b, m, deterministic) + } else { + b = b[:cap(b)] + n, err := m.MarshalTo(b) + if err != nil { + return nil, err + } + return b[:n], nil + } +} +func (m *StringMap) XXX_Merge(src proto.Message) { + xxx_messageInfo_StringMap.Merge(m, src) +} +func (m *StringMap) XXX_Size() int { + return m.Size() +} +func (m *StringMap) XXX_DiscardUnknown() { + xxx_messageInfo_StringMap.DiscardUnknown(m) +} + +var xxx_messageInfo_StringMap proto.InternalMessageInfo func init() { proto.RegisterType((*Attributes)(nil), "istio.mixer.v1.Attributes") + proto.RegisterMapType((map[string]*Attributes_AttributeValue)(nil), "istio.mixer.v1.Attributes.AttributesEntry") proto.RegisterType((*Attributes_AttributeValue)(nil), "istio.mixer.v1.Attributes.AttributeValue") proto.RegisterType((*Attributes_StringMap)(nil), "istio.mixer.v1.Attributes.StringMap") + proto.RegisterMapType((map[string]string)(nil), "istio.mixer.v1.Attributes.StringMap.EntriesEntry") proto.RegisterType((*CompressedAttributes)(nil), "istio.mixer.v1.CompressedAttributes") + proto.RegisterMapType((map[int32]bool)(nil), "istio.mixer.v1.CompressedAttributes.BoolsEntry") + proto.RegisterMapType((map[int32][]byte)(nil), "istio.mixer.v1.CompressedAttributes.BytesEntry") + proto.RegisterMapType((map[int32]float64)(nil), "istio.mixer.v1.CompressedAttributes.DoublesEntry") + proto.RegisterMapType((map[int32]time.Duration)(nil), "istio.mixer.v1.CompressedAttributes.DurationsEntry") + proto.RegisterMapType((map[int32]int64)(nil), "istio.mixer.v1.CompressedAttributes.Int64sEntry") + proto.RegisterMapType((map[int32]StringMap)(nil), "istio.mixer.v1.CompressedAttributes.StringMapsEntry") + proto.RegisterMapType((map[int32]int32)(nil), "istio.mixer.v1.CompressedAttributes.StringsEntry") + proto.RegisterMapType((map[int32]time.Time)(nil), "istio.mixer.v1.CompressedAttributes.TimestampsEntry") proto.RegisterType((*StringMap)(nil), "istio.mixer.v1.StringMap") + proto.RegisterMapType((map[int32]int32)(nil), "istio.mixer.v1.StringMap.EntriesEntry") } + +func init() { proto.RegisterFile("mixer/v1/attributes.proto", fileDescriptor_6504964367320bd3) } + +var fileDescriptor_6504964367320bd3 = []byte{ + // 815 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x96, 0xcd, 0x6f, 0xd3, 0x48, + 0x18, 0xc6, 0x67, 0x9a, 0xe6, 0xc3, 0x6f, 0xb2, 0x49, 0x6b, 0x65, 0x25, 0x37, 0x87, 0x49, 0xb6, + 0xbb, 0x5a, 0x65, 0xf7, 0x60, 0xf7, 0x4b, 0xa8, 0xf4, 0x02, 0x84, 0x46, 0x0a, 0x20, 0x24, 0x64, + 0x10, 0x5f, 0x95, 0x40, 0x89, 0x62, 0x82, 0x45, 0x12, 0x47, 0x1e, 0xa7, 0x90, 0x1b, 0x12, 0x27, + 0x6e, 0x3d, 0x70, 0xe0, 0x3f, 0x80, 0x3f, 0xa5, 0xc7, 0x1e, 0x7b, 0x02, 0x92, 0x5e, 0xb8, 0x20, + 0xf5, 0xc8, 0x11, 0x79, 0x66, 0xec, 0x4c, 0x42, 0xda, 0x38, 0x37, 0x7b, 0xe6, 0x7d, 0x7e, 0x7e, + 0x66, 0xe6, 0x99, 0x37, 0x81, 0xb5, 0x8e, 0xfd, 0xc6, 0x72, 0x8d, 0xc3, 0x4d, 0xa3, 0xee, 0x79, + 0xae, 0xdd, 0xe8, 0x7b, 0x16, 0xd5, 0x7b, 0xae, 0xe3, 0x39, 0x6a, 0xd6, 0xa6, 0x9e, 0xed, 0xe8, + 0xac, 0x40, 0x3f, 0xdc, 0x2c, 0xe4, 0x5b, 0x4e, 0xcb, 0x61, 0x53, 0x86, 0xff, 0xc4, 0xab, 0x0a, + 0xa4, 0xe5, 0x38, 0xad, 0xb6, 0x65, 0xb0, 0xb7, 0x46, 0xff, 0x85, 0xd1, 0xec, 0xbb, 0x75, 0xcf, + 0x76, 0xba, 0x62, 0xbe, 0x38, 0x3d, 0xef, 0xd9, 0x1d, 0x8b, 0x7a, 0xf5, 0x4e, 0x8f, 0x17, 0xac, + 0xbf, 0x4b, 0x00, 0xdc, 0x08, 0xbf, 0xad, 0xde, 0x06, 0x18, 0x3b, 0xd1, 0x70, 0x29, 0x56, 0x4e, + 0x6f, 0xfd, 0xaf, 0x4f, 0x5a, 0xd1, 0xc7, 0xf5, 0xd2, 0x63, 0xb5, 0xeb, 0xb9, 0x03, 0x53, 0x52, + 0x17, 0x5e, 0x42, 0x6e, 0x6a, 0x5a, 0x5d, 0x81, 0xd8, 0x2b, 0x6b, 0xa0, 0xe1, 0x12, 0x2e, 0x2b, + 0xa6, 0xff, 0xa8, 0x5e, 0x83, 0xf8, 0x61, 0xbd, 0xdd, 0xb7, 0xb4, 0xa5, 0x12, 0x2e, 0xa7, 0xb7, + 0xfe, 0x8b, 0xf2, 0xad, 0x87, 0xbe, 0xc0, 0xe4, 0xba, 0xbd, 0xa5, 0x5d, 0x5c, 0xf8, 0x14, 0x83, + 0xec, 0xe4, 0xac, 0xfa, 0x37, 0x64, 0xa8, 0xe7, 0xda, 0xdd, 0xd6, 0xf3, 0x31, 0x5e, 0xa9, 0x21, + 0x33, 0xcd, 0x47, 0x79, 0xd1, 0x5f, 0x90, 0xb6, 0xbb, 0xde, 0x95, 0x1d, 0x51, 0x13, 0x2b, 0xe1, + 0x72, 0xac, 0x86, 0x4c, 0x60, 0x83, 0x21, 0xa7, 0xe9, 0xf4, 0x1b, 0x6d, 0x4b, 0xd4, 0x2c, 0x97, + 0x70, 0x19, 0xfb, 0x1c, 0x3e, 0xca, 0x8b, 0x8a, 0x00, 0x0d, 0xc7, 0x69, 0x8b, 0x92, 0x78, 0x09, + 0x97, 0x53, 0x35, 0x64, 0x2a, 0xfe, 0x58, 0xf8, 0xa1, 0xc6, 0xc0, 0xb3, 0xa8, 0xa8, 0x48, 0x94, + 0x70, 0x39, 0xe3, 0x7f, 0x88, 0x0d, 0xf2, 0x92, 0x2a, 0xe4, 0xc2, 0xb3, 0x11, 0x65, 0x49, 0xb6, + 0x25, 0x05, 0x9d, 0x9f, 0xa1, 0x1e, 0x9c, 0xa1, 0xfe, 0x20, 0xa8, 0xab, 0x21, 0x33, 0x1b, 0x8a, + 0x38, 0xa6, 0x02, 0xd9, 0x20, 0x02, 0x82, 0x92, 0x62, 0x94, 0xb5, 0xdf, 0x28, 0xfb, 0xa2, 0xac, + 0x86, 0xcc, 0x3f, 0x02, 0x09, 0x67, 0xdc, 0x83, 0x15, 0xb1, 0x77, 0x9d, 0x7a, 0xe0, 0x45, 0x61, + 0x94, 0x7f, 0x2e, 0x39, 0x9e, 0xfb, 0x4c, 0x72, 0xb7, 0xce, 0x5c, 0xd1, 0xe0, 0x85, 0x11, 0x2b, + 0x49, 0x71, 0xca, 0x85, 0x0f, 0x18, 0x94, 0xb0, 0x50, 0xbd, 0x03, 0x49, 0xab, 0xeb, 0xb9, 0x76, + 0x18, 0xb5, 0xcd, 0x28, 0x7c, 0xbd, 0xca, 0x35, 0x3c, 0x71, 0x01, 0xa1, 0xb0, 0x07, 0x19, 0x79, + 0x62, 0x46, 0xd6, 0xf2, 0x72, 0xd6, 0x14, 0x29, 0x40, 0xeb, 0x3f, 0x14, 0xc8, 0xdf, 0x74, 0x3a, + 0x3d, 0xd7, 0xa2, 0xd4, 0x6a, 0x4a, 0xf7, 0x21, 0x0f, 0xf1, 0xd7, 0x8e, 0xdb, 0xe4, 0xfe, 0x14, + 0x93, 0xbf, 0xf8, 0xbe, 0xf9, 0x02, 0xa9, 0xb6, 0x34, 0xdb, 0xf7, 0x2c, 0x98, 0x58, 0x41, 0xe0, + 0x5b, 0x10, 0xd4, 0x1a, 0x24, 0x58, 0xde, 0xa8, 0x16, 0x63, 0xac, 0x8d, 0x48, 0xac, 0x5b, 0x4c, + 0xc2, 0x51, 0x42, 0xef, 0xdb, 0xe2, 0xa9, 0xa4, 0xda, 0xf2, 0x02, 0xb6, 0xf6, 0xb9, 0x46, 0xd8, + 0x12, 0x04, 0xb5, 0x0a, 0x71, 0x3f, 0xbf, 0x54, 0x8b, 0x33, 0x94, 0x11, 0x09, 0x55, 0xf1, 0x15, + 0x1c, 0xc4, 0xd5, 0xea, 0x33, 0x80, 0x30, 0xa1, 0x54, 0x4b, 0x30, 0xd6, 0x4e, 0x24, 0x56, 0x98, + 0x72, 0x0e, 0xac, 0xa4, 0x8e, 0xbf, 0x14, 0xd1, 0xd1, 0xd7, 0x22, 0x36, 0x25, 0xa2, 0x7a, 0x00, + 0x4a, 0x10, 0x5e, 0xaa, 0x25, 0x19, 0x7e, 0x3b, 0xda, 0xaa, 0x03, 0x95, 0x44, 0xff, 0xe8, 0xd3, + 0xc7, 0x3c, 0xb6, 0x07, 0xfe, 0x0d, 0xd5, 0x52, 0x8b, 0xec, 0xc1, 0x20, 0xec, 0x86, 0x5c, 0xad, + 0x1e, 0x40, 0x7a, 0x7c, 0x9f, 0xa8, 0xa6, 0x2c, 0xb0, 0x09, 0x61, 0xe8, 0x85, 0xcd, 0x65, 0xdf, + 0xa6, 0x09, 0xe1, 0xf5, 0x62, 0xb1, 0x97, 0x73, 0x25, 0xc7, 0x7e, 0x75, 0x46, 0xec, 0x57, 0xe5, + 0xbe, 0x79, 0x15, 0xd2, 0x52, 0x8e, 0xe6, 0x49, 0x63, 0xb2, 0x74, 0x0f, 0x32, 0x72, 0x6e, 0xe6, + 0x69, 0xb1, 0xac, 0xdd, 0x05, 0x18, 0x07, 0x65, 0x9e, 0x32, 0x25, 0x2b, 0x9f, 0x40, 0x6e, 0x2a, + 0x16, 0x33, 0xe4, 0x1b, 0x93, 0x3f, 0x29, 0x97, 0xf4, 0x4f, 0x19, 0xfd, 0x08, 0xb2, 0x93, 0x91, + 0x98, 0x41, 0x36, 0x26, 0xc9, 0x17, 0xf7, 0xd4, 0xe9, 0xd5, 0x0e, 0xbc, 0x88, 0xfb, 0x94, 0x91, + 0x95, 0x8f, 0x21, 0x37, 0x75, 0xfe, 0x51, 0x3c, 0x4d, 0xc5, 0x2a, 0x24, 0xc8, 0xfd, 0xee, 0xfd, + 0x44, 0x1b, 0xbe, 0x3e, 0xdd, 0x86, 0xff, 0xbd, 0x10, 0xb2, 0x78, 0xef, 0x9d, 0x17, 0xc2, 0x8a, + 0x79, 0x3c, 0x24, 0xe8, 0x64, 0x48, 0xd0, 0xe9, 0x90, 0xa0, 0xf3, 0x21, 0x41, 0x6f, 0x47, 0x04, + 0x7f, 0x1e, 0x11, 0x74, 0x3c, 0x22, 0xf8, 0x64, 0x44, 0xf0, 0xb7, 0x11, 0xc1, 0xdf, 0x47, 0x04, + 0x9d, 0x8f, 0x08, 0x3e, 0x3a, 0x23, 0xe8, 0xe4, 0x8c, 0xa0, 0xd3, 0x33, 0x82, 0x9e, 0xfe, 0xc9, + 0x5d, 0xda, 0x8e, 0x51, 0xef, 0xd9, 0x46, 0xf0, 0x57, 0xea, 0x27, 0xc6, 0x8d, 0x04, 0x3b, 0x91, + 0xed, 0x5f, 0x01, 0x00, 0x00, 0xff, 0xff, 0xb3, 0xaa, 0x85, 0xf6, 0x60, 0x09, 0x00, 0x00, +} + func (m *Attributes) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) @@ -542,7 +725,7 @@ func (m *Attributes_AttributeValue_DoubleValue) MarshalTo(dAtA []byte) (int, err i := 0 dAtA[i] = 0x21 i++ - binary.LittleEndian.PutUint64(dAtA[i:], uint64(math.Float64bits(float64(m.DoubleValue)))) + encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(math.Float64bits(float64(m.DoubleValue)))) i += 8 return i, nil } @@ -717,7 +900,7 @@ func (m *CompressedAttributes) MarshalTo(dAtA []byte) (int, error) { i = encodeVarintAttributes(dAtA, i, uint64((uint32(k)<<1)^uint32((k>>31)))) dAtA[i] = 0x11 i++ - binary.LittleEndian.PutUint64(dAtA[i:], uint64(math.Float64bits(float64(v)))) + encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(math.Float64bits(float64(v)))) i += 8 } } @@ -748,7 +931,7 @@ func (m *CompressedAttributes) MarshalTo(dAtA []byte) (int, error) { v := m.Timestamps[k] msgSize := 0 if (&v) != nil { - msgSize = types.SizeOfStdTime(*(&v)) + msgSize = github_com_gogo_protobuf_types.SizeOfStdTime(*(&v)) msgSize += 1 + sovAttributes(uint64(msgSize)) } mapSize := 1 + sozAttributes(uint64(k)) + msgSize @@ -758,8 +941,8 @@ func (m *CompressedAttributes) MarshalTo(dAtA []byte) (int, error) { i = encodeVarintAttributes(dAtA, i, uint64((uint32(k)<<1)^uint32((k>>31)))) dAtA[i] = 0x12 i++ - i = encodeVarintAttributes(dAtA, i, uint64(types.SizeOfStdTime(*(&v)))) - n6, err := types.StdTimeMarshalTo(*(&v), dAtA[i:]) + i = encodeVarintAttributes(dAtA, i, uint64(github_com_gogo_protobuf_types.SizeOfStdTime(*(&v)))) + n6, err := github_com_gogo_protobuf_types.StdTimeMarshalTo(*(&v), dAtA[i:]) if err != nil { return 0, err } @@ -773,7 +956,7 @@ func (m *CompressedAttributes) MarshalTo(dAtA []byte) (int, error) { v := m.Durations[k] msgSize := 0 if (&v) != nil { - msgSize = types.SizeOfStdDuration(*(&v)) + msgSize = github_com_gogo_protobuf_types.SizeOfStdDuration(*(&v)) msgSize += 1 + sovAttributes(uint64(msgSize)) } mapSize := 1 + sozAttributes(uint64(k)) + msgSize @@ -783,8 +966,8 @@ func (m *CompressedAttributes) MarshalTo(dAtA []byte) (int, error) { i = encodeVarintAttributes(dAtA, i, uint64((uint32(k)<<1)^uint32((k>>31)))) dAtA[i] = 0x12 i++ - i = encodeVarintAttributes(dAtA, i, uint64(types.SizeOfStdDuration(*(&v)))) - n7, err := types.StdDurationMarshalTo(*(&v), dAtA[i:]) + i = encodeVarintAttributes(dAtA, i, uint64(github_com_gogo_protobuf_types.SizeOfStdDuration(*(&v)))) + n7, err := github_com_gogo_protobuf_types.StdDurationMarshalTo(*(&v), dAtA[i:]) if err != nil { return 0, err } @@ -884,6 +1067,9 @@ func encodeVarintAttributes(dAtA []byte, offset int, v uint64) int { return offset + 1 } func (m *Attributes) Size() (n int) { + if m == nil { + return 0 + } var l int _ = l if len(m.Attributes) > 0 { @@ -903,6 +1089,9 @@ func (m *Attributes) Size() (n int) { } func (m *Attributes_AttributeValue) Size() (n int) { + if m == nil { + return 0 + } var l int _ = l if m.Value != nil { @@ -912,6 +1101,9 @@ func (m *Attributes_AttributeValue) Size() (n int) { } func (m *Attributes_AttributeValue_StringValue) Size() (n int) { + if m == nil { + return 0 + } var l int _ = l l = len(m.StringValue) @@ -919,24 +1111,36 @@ func (m *Attributes_AttributeValue_StringValue) Size() (n int) { return n } func (m *Attributes_AttributeValue_Int64Value) Size() (n int) { + if m == nil { + return 0 + } var l int _ = l n += 1 + sovAttributes(uint64(m.Int64Value)) return n } func (m *Attributes_AttributeValue_DoubleValue) Size() (n int) { + if m == nil { + return 0 + } var l int _ = l n += 9 return n } func (m *Attributes_AttributeValue_BoolValue) Size() (n int) { + if m == nil { + return 0 + } var l int _ = l n += 2 return n } func (m *Attributes_AttributeValue_BytesValue) Size() (n int) { + if m == nil { + return 0 + } var l int _ = l if m.BytesValue != nil { @@ -946,6 +1150,9 @@ func (m *Attributes_AttributeValue_BytesValue) Size() (n int) { return n } func (m *Attributes_AttributeValue_TimestampValue) Size() (n int) { + if m == nil { + return 0 + } var l int _ = l if m.TimestampValue != nil { @@ -955,6 +1162,9 @@ func (m *Attributes_AttributeValue_TimestampValue) Size() (n int) { return n } func (m *Attributes_AttributeValue_DurationValue) Size() (n int) { + if m == nil { + return 0 + } var l int _ = l if m.DurationValue != nil { @@ -964,6 +1174,9 @@ func (m *Attributes_AttributeValue_DurationValue) Size() (n int) { return n } func (m *Attributes_AttributeValue_StringMapValue) Size() (n int) { + if m == nil { + return 0 + } var l int _ = l if m.StringMapValue != nil { @@ -973,6 +1186,9 @@ func (m *Attributes_AttributeValue_StringMapValue) Size() (n int) { return n } func (m *Attributes_StringMap) Size() (n int) { + if m == nil { + return 0 + } var l int _ = l if len(m.Entries) > 0 { @@ -987,6 +1203,9 @@ func (m *Attributes_StringMap) Size() (n int) { } func (m *CompressedAttributes) Size() (n int) { + if m == nil { + return 0 + } var l int _ = l if len(m.Words) > 0 { @@ -1031,7 +1250,7 @@ func (m *CompressedAttributes) Size() (n int) { for k, v := range m.Timestamps { _ = k _ = v - l = types.SizeOfStdTime(v) + l = github_com_gogo_protobuf_types.SizeOfStdTime(v) mapEntrySize := 1 + sozAttributes(uint64(k)) + 1 + l + sovAttributes(uint64(l)) n += mapEntrySize + 1 + sovAttributes(uint64(mapEntrySize)) } @@ -1040,7 +1259,7 @@ func (m *CompressedAttributes) Size() (n int) { for k, v := range m.Durations { _ = k _ = v - l = types.SizeOfStdDuration(v) + l = github_com_gogo_protobuf_types.SizeOfStdDuration(v) mapEntrySize := 1 + sozAttributes(uint64(k)) + 1 + l + sovAttributes(uint64(l)) n += mapEntrySize + 1 + sovAttributes(uint64(mapEntrySize)) } @@ -1070,6 +1289,9 @@ func (m *CompressedAttributes) Size() (n int) { } func (m *StringMap) Size() (n int) { + if m == nil { + return 0 + } var l int _ = l if len(m.Entries) > 0 { @@ -1104,7 +1326,7 @@ func (this *Attributes) String() string { for k, _ := range this.Attributes { keysForAttributes = append(keysForAttributes, k) } - sortkeys.Strings(keysForAttributes) + github_com_gogo_protobuf_sortkeys.Strings(keysForAttributes) mapStringForAttributes := "map[string]*Attributes_AttributeValue{" for _, k := range keysForAttributes { mapStringForAttributes += fmt.Sprintf("%v: %v,", k, this.Attributes[k]) @@ -1181,7 +1403,7 @@ func (this *Attributes_AttributeValue_TimestampValue) String() string { return "nil" } s := strings.Join([]string{`&Attributes_AttributeValue_TimestampValue{`, - `TimestampValue:` + strings.Replace(fmt.Sprintf("%v", this.TimestampValue), "Timestamp", "google_protobuf2.Timestamp", 1) + `,`, + `TimestampValue:` + strings.Replace(fmt.Sprintf("%v", this.TimestampValue), "Timestamp", "types.Timestamp", 1) + `,`, `}`, }, "") return s @@ -1191,7 +1413,7 @@ func (this *Attributes_AttributeValue_DurationValue) String() string { return "nil" } s := strings.Join([]string{`&Attributes_AttributeValue_DurationValue{`, - `DurationValue:` + strings.Replace(fmt.Sprintf("%v", this.DurationValue), "Duration", "google_protobuf1.Duration", 1) + `,`, + `DurationValue:` + strings.Replace(fmt.Sprintf("%v", this.DurationValue), "Duration", "types.Duration", 1) + `,`, `}`, }, "") return s @@ -1214,7 +1436,7 @@ func (this *Attributes_StringMap) String() string { for k, _ := range this.Entries { keysForEntries = append(keysForEntries, k) } - sortkeys.Strings(keysForEntries) + github_com_gogo_protobuf_sortkeys.Strings(keysForEntries) mapStringForEntries := "map[string]string{" for _, k := range keysForEntries { mapStringForEntries += fmt.Sprintf("%v: %v,", k, this.Entries[k]) @@ -1234,7 +1456,7 @@ func (this *CompressedAttributes) String() string { for k, _ := range this.Strings { keysForStrings = append(keysForStrings, k) } - sortkeys.Int32s(keysForStrings) + github_com_gogo_protobuf_sortkeys.Int32s(keysForStrings) mapStringForStrings := "map[int32]int32{" for _, k := range keysForStrings { mapStringForStrings += fmt.Sprintf("%v: %v,", k, this.Strings[k]) @@ -1244,7 +1466,7 @@ func (this *CompressedAttributes) String() string { for k, _ := range this.Int64S { keysForInt64S = append(keysForInt64S, k) } - sortkeys.Int32s(keysForInt64S) + github_com_gogo_protobuf_sortkeys.Int32s(keysForInt64S) mapStringForInt64S := "map[int32]int64{" for _, k := range keysForInt64S { mapStringForInt64S += fmt.Sprintf("%v: %v,", k, this.Int64S[k]) @@ -1254,7 +1476,7 @@ func (this *CompressedAttributes) String() string { for k, _ := range this.Doubles { keysForDoubles = append(keysForDoubles, k) } - sortkeys.Int32s(keysForDoubles) + github_com_gogo_protobuf_sortkeys.Int32s(keysForDoubles) mapStringForDoubles := "map[int32]float64{" for _, k := range keysForDoubles { mapStringForDoubles += fmt.Sprintf("%v: %v,", k, this.Doubles[k]) @@ -1264,7 +1486,7 @@ func (this *CompressedAttributes) String() string { for k, _ := range this.Bools { keysForBools = append(keysForBools, k) } - sortkeys.Int32s(keysForBools) + github_com_gogo_protobuf_sortkeys.Int32s(keysForBools) mapStringForBools := "map[int32]bool{" for _, k := range keysForBools { mapStringForBools += fmt.Sprintf("%v: %v,", k, this.Bools[k]) @@ -1274,7 +1496,7 @@ func (this *CompressedAttributes) String() string { for k, _ := range this.Timestamps { keysForTimestamps = append(keysForTimestamps, k) } - sortkeys.Int32s(keysForTimestamps) + github_com_gogo_protobuf_sortkeys.Int32s(keysForTimestamps) mapStringForTimestamps := "map[int32]time.Time{" for _, k := range keysForTimestamps { mapStringForTimestamps += fmt.Sprintf("%v: %v,", k, this.Timestamps[k]) @@ -1284,7 +1506,7 @@ func (this *CompressedAttributes) String() string { for k, _ := range this.Durations { keysForDurations = append(keysForDurations, k) } - sortkeys.Int32s(keysForDurations) + github_com_gogo_protobuf_sortkeys.Int32s(keysForDurations) mapStringForDurations := "map[int32]time.Duration{" for _, k := range keysForDurations { mapStringForDurations += fmt.Sprintf("%v: %v,", k, this.Durations[k]) @@ -1294,7 +1516,7 @@ func (this *CompressedAttributes) String() string { for k, _ := range this.Bytes { keysForBytes = append(keysForBytes, k) } - sortkeys.Int32s(keysForBytes) + github_com_gogo_protobuf_sortkeys.Int32s(keysForBytes) mapStringForBytes := "map[int32][]byte{" for _, k := range keysForBytes { mapStringForBytes += fmt.Sprintf("%v: %v,", k, this.Bytes[k]) @@ -1304,7 +1526,7 @@ func (this *CompressedAttributes) String() string { for k, _ := range this.StringMaps { keysForStringMaps = append(keysForStringMaps, k) } - sortkeys.Int32s(keysForStringMaps) + github_com_gogo_protobuf_sortkeys.Int32s(keysForStringMaps) mapStringForStringMaps := "map[int32]StringMap{" for _, k := range keysForStringMaps { mapStringForStringMaps += fmt.Sprintf("%v: %v,", k, this.StringMaps[k]) @@ -1332,7 +1554,7 @@ func (this *StringMap) String() string { for k, _ := range this.Entries { keysForEntries = append(keysForEntries, k) } - sortkeys.Int32s(keysForEntries) + github_com_gogo_protobuf_sortkeys.Int32s(keysForEntries) mapStringForEntries := "map[int32]int32{" for _, k := range keysForEntries { mapStringForEntries += fmt.Sprintf("%v: %v,", k, this.Entries[k]) @@ -1367,7 +1589,7 @@ func (m *Attributes) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - wire |= (uint64(b) & 0x7F) << shift + wire |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -1395,7 +1617,7 @@ func (m *Attributes) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - msglen |= (int(b) & 0x7F) << shift + msglen |= int(b&0x7F) << shift if b < 0x80 { break } @@ -1404,6 +1626,9 @@ func (m *Attributes) Unmarshal(dAtA []byte) error { return ErrInvalidLengthAttributes } postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthAttributes + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -1424,7 +1649,7 @@ func (m *Attributes) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - wire |= (uint64(b) & 0x7F) << shift + wire |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -1441,7 +1666,7 @@ func (m *Attributes) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLenmapkey |= (uint64(b) & 0x7F) << shift + stringLenmapkey |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -1451,6 +1676,9 @@ func (m *Attributes) Unmarshal(dAtA []byte) error { return ErrInvalidLengthAttributes } postStringIndexmapkey := iNdEx + intStringLenmapkey + if postStringIndexmapkey < 0 { + return ErrInvalidLengthAttributes + } if postStringIndexmapkey > l { return io.ErrUnexpectedEOF } @@ -1467,7 +1695,7 @@ func (m *Attributes) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - mapmsglen |= (int(b) & 0x7F) << shift + mapmsglen |= int(b&0x7F) << shift if b < 0x80 { break } @@ -1476,7 +1704,7 @@ func (m *Attributes) Unmarshal(dAtA []byte) error { return ErrInvalidLengthAttributes } postmsgIndex := iNdEx + mapmsglen - if mapmsglen < 0 { + if postmsgIndex < 0 { return ErrInvalidLengthAttributes } if postmsgIndex > l { @@ -1513,6 +1741,9 @@ func (m *Attributes) Unmarshal(dAtA []byte) error { if skippy < 0 { return ErrInvalidLengthAttributes } + if (iNdEx + skippy) < 0 { + return ErrInvalidLengthAttributes + } if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF } @@ -1540,7 +1771,7 @@ func (m *Attributes_AttributeValue) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - wire |= (uint64(b) & 0x7F) << shift + wire |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -1568,7 +1799,7 @@ func (m *Attributes_AttributeValue) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLen |= (uint64(b) & 0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -1578,6 +1809,9 @@ func (m *Attributes_AttributeValue) Unmarshal(dAtA []byte) error { return ErrInvalidLengthAttributes } postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthAttributes + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -1597,7 +1831,7 @@ func (m *Attributes_AttributeValue) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - v |= (int64(b) & 0x7F) << shift + v |= int64(b&0x7F) << shift if b < 0x80 { break } @@ -1611,7 +1845,7 @@ func (m *Attributes_AttributeValue) Unmarshal(dAtA []byte) error { if (iNdEx + 8) > l { return io.ErrUnexpectedEOF } - v = uint64(binary.LittleEndian.Uint64(dAtA[iNdEx:])) + v = uint64(encoding_binary.LittleEndian.Uint64(dAtA[iNdEx:])) iNdEx += 8 m.Value = &Attributes_AttributeValue_DoubleValue{float64(math.Float64frombits(v))} case 5: @@ -1628,7 +1862,7 @@ func (m *Attributes_AttributeValue) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - v |= (int(b) & 0x7F) << shift + v |= int(b&0x7F) << shift if b < 0x80 { break } @@ -1649,7 +1883,7 @@ func (m *Attributes_AttributeValue) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - byteLen |= (int(b) & 0x7F) << shift + byteLen |= int(b&0x7F) << shift if b < 0x80 { break } @@ -1658,6 +1892,9 @@ func (m *Attributes_AttributeValue) Unmarshal(dAtA []byte) error { return ErrInvalidLengthAttributes } postIndex := iNdEx + byteLen + if postIndex < 0 { + return ErrInvalidLengthAttributes + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -1679,7 +1916,7 @@ func (m *Attributes_AttributeValue) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - msglen |= (int(b) & 0x7F) << shift + msglen |= int(b&0x7F) << shift if b < 0x80 { break } @@ -1688,10 +1925,13 @@ func (m *Attributes_AttributeValue) Unmarshal(dAtA []byte) error { return ErrInvalidLengthAttributes } postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthAttributes + } if postIndex > l { return io.ErrUnexpectedEOF } - v := &google_protobuf2.Timestamp{} + v := &types.Timestamp{} if err := v.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } @@ -1711,7 +1951,7 @@ func (m *Attributes_AttributeValue) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - msglen |= (int(b) & 0x7F) << shift + msglen |= int(b&0x7F) << shift if b < 0x80 { break } @@ -1720,10 +1960,13 @@ func (m *Attributes_AttributeValue) Unmarshal(dAtA []byte) error { return ErrInvalidLengthAttributes } postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthAttributes + } if postIndex > l { return io.ErrUnexpectedEOF } - v := &google_protobuf1.Duration{} + v := &types.Duration{} if err := v.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } @@ -1743,7 +1986,7 @@ func (m *Attributes_AttributeValue) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - msglen |= (int(b) & 0x7F) << shift + msglen |= int(b&0x7F) << shift if b < 0x80 { break } @@ -1752,6 +1995,9 @@ func (m *Attributes_AttributeValue) Unmarshal(dAtA []byte) error { return ErrInvalidLengthAttributes } postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthAttributes + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -1770,6 +2016,9 @@ func (m *Attributes_AttributeValue) Unmarshal(dAtA []byte) error { if skippy < 0 { return ErrInvalidLengthAttributes } + if (iNdEx + skippy) < 0 { + return ErrInvalidLengthAttributes + } if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF } @@ -1797,7 +2046,7 @@ func (m *Attributes_StringMap) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - wire |= (uint64(b) & 0x7F) << shift + wire |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -1825,7 +2074,7 @@ func (m *Attributes_StringMap) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - msglen |= (int(b) & 0x7F) << shift + msglen |= int(b&0x7F) << shift if b < 0x80 { break } @@ -1834,6 +2083,9 @@ func (m *Attributes_StringMap) Unmarshal(dAtA []byte) error { return ErrInvalidLengthAttributes } postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthAttributes + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -1854,7 +2106,7 @@ func (m *Attributes_StringMap) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - wire |= (uint64(b) & 0x7F) << shift + wire |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -1871,7 +2123,7 @@ func (m *Attributes_StringMap) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLenmapkey |= (uint64(b) & 0x7F) << shift + stringLenmapkey |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -1881,6 +2133,9 @@ func (m *Attributes_StringMap) Unmarshal(dAtA []byte) error { return ErrInvalidLengthAttributes } postStringIndexmapkey := iNdEx + intStringLenmapkey + if postStringIndexmapkey < 0 { + return ErrInvalidLengthAttributes + } if postStringIndexmapkey > l { return io.ErrUnexpectedEOF } @@ -1897,7 +2152,7 @@ func (m *Attributes_StringMap) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLenmapvalue |= (uint64(b) & 0x7F) << shift + stringLenmapvalue |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -1907,6 +2162,9 @@ func (m *Attributes_StringMap) Unmarshal(dAtA []byte) error { return ErrInvalidLengthAttributes } postStringIndexmapvalue := iNdEx + intStringLenmapvalue + if postStringIndexmapvalue < 0 { + return ErrInvalidLengthAttributes + } if postStringIndexmapvalue > l { return io.ErrUnexpectedEOF } @@ -1938,6 +2196,9 @@ func (m *Attributes_StringMap) Unmarshal(dAtA []byte) error { if skippy < 0 { return ErrInvalidLengthAttributes } + if (iNdEx + skippy) < 0 { + return ErrInvalidLengthAttributes + } if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF } @@ -1965,7 +2226,7 @@ func (m *CompressedAttributes) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - wire |= (uint64(b) & 0x7F) << shift + wire |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -1993,7 +2254,7 @@ func (m *CompressedAttributes) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLen |= (uint64(b) & 0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -2003,6 +2264,9 @@ func (m *CompressedAttributes) Unmarshal(dAtA []byte) error { return ErrInvalidLengthAttributes } postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthAttributes + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -2022,7 +2286,7 @@ func (m *CompressedAttributes) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - msglen |= (int(b) & 0x7F) << shift + msglen |= int(b&0x7F) << shift if b < 0x80 { break } @@ -2031,6 +2295,9 @@ func (m *CompressedAttributes) Unmarshal(dAtA []byte) error { return ErrInvalidLengthAttributes } postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthAttributes + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -2051,7 +2318,7 @@ func (m *CompressedAttributes) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - wire |= (uint64(b) & 0x7F) << shift + wire |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -2068,7 +2335,7 @@ func (m *CompressedAttributes) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - mapkeytemp |= (int32(b) & 0x7F) << shift + mapkeytemp |= int32(b&0x7F) << shift if b < 0x80 { break } @@ -2086,7 +2353,7 @@ func (m *CompressedAttributes) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - mapvaluetemp |= (int32(b) & 0x7F) << shift + mapvaluetemp |= int32(b&0x7F) << shift if b < 0x80 { break } @@ -2124,7 +2391,7 @@ func (m *CompressedAttributes) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - msglen |= (int(b) & 0x7F) << shift + msglen |= int(b&0x7F) << shift if b < 0x80 { break } @@ -2133,6 +2400,9 @@ func (m *CompressedAttributes) Unmarshal(dAtA []byte) error { return ErrInvalidLengthAttributes } postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthAttributes + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -2153,7 +2423,7 @@ func (m *CompressedAttributes) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - wire |= (uint64(b) & 0x7F) << shift + wire |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -2170,7 +2440,7 @@ func (m *CompressedAttributes) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - mapkeytemp |= (int32(b) & 0x7F) << shift + mapkeytemp |= int32(b&0x7F) << shift if b < 0x80 { break } @@ -2187,7 +2457,7 @@ func (m *CompressedAttributes) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - mapvalue |= (int64(b) & 0x7F) << shift + mapvalue |= int64(b&0x7F) << shift if b < 0x80 { break } @@ -2223,7 +2493,7 @@ func (m *CompressedAttributes) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - msglen |= (int(b) & 0x7F) << shift + msglen |= int(b&0x7F) << shift if b < 0x80 { break } @@ -2232,6 +2502,9 @@ func (m *CompressedAttributes) Unmarshal(dAtA []byte) error { return ErrInvalidLengthAttributes } postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthAttributes + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -2252,7 +2525,7 @@ func (m *CompressedAttributes) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - wire |= (uint64(b) & 0x7F) << shift + wire |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -2269,7 +2542,7 @@ func (m *CompressedAttributes) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - mapkeytemp |= (int32(b) & 0x7F) << shift + mapkeytemp |= int32(b&0x7F) << shift if b < 0x80 { break } @@ -2281,7 +2554,7 @@ func (m *CompressedAttributes) Unmarshal(dAtA []byte) error { if (iNdEx + 8) > l { return io.ErrUnexpectedEOF } - mapvaluetemp = uint64(binary.LittleEndian.Uint64(dAtA[iNdEx:])) + mapvaluetemp = uint64(encoding_binary.LittleEndian.Uint64(dAtA[iNdEx:])) iNdEx += 8 mapvalue = math.Float64frombits(mapvaluetemp) } else { @@ -2315,7 +2588,7 @@ func (m *CompressedAttributes) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - msglen |= (int(b) & 0x7F) << shift + msglen |= int(b&0x7F) << shift if b < 0x80 { break } @@ -2324,6 +2597,9 @@ func (m *CompressedAttributes) Unmarshal(dAtA []byte) error { return ErrInvalidLengthAttributes } postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthAttributes + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -2344,7 +2620,7 @@ func (m *CompressedAttributes) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - wire |= (uint64(b) & 0x7F) << shift + wire |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -2361,7 +2637,7 @@ func (m *CompressedAttributes) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - mapkeytemp |= (int32(b) & 0x7F) << shift + mapkeytemp |= int32(b&0x7F) << shift if b < 0x80 { break } @@ -2379,7 +2655,7 @@ func (m *CompressedAttributes) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - mapvaluetemp |= (int(b) & 0x7F) << shift + mapvaluetemp |= int(b&0x7F) << shift if b < 0x80 { break } @@ -2416,7 +2692,7 @@ func (m *CompressedAttributes) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - msglen |= (int(b) & 0x7F) << shift + msglen |= int(b&0x7F) << shift if b < 0x80 { break } @@ -2425,6 +2701,9 @@ func (m *CompressedAttributes) Unmarshal(dAtA []byte) error { return ErrInvalidLengthAttributes } postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthAttributes + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -2445,7 +2724,7 @@ func (m *CompressedAttributes) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - wire |= (uint64(b) & 0x7F) << shift + wire |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -2462,7 +2741,7 @@ func (m *CompressedAttributes) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - mapkeytemp |= (int32(b) & 0x7F) << shift + mapkeytemp |= int32(b&0x7F) << shift if b < 0x80 { break } @@ -2480,7 +2759,7 @@ func (m *CompressedAttributes) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - mapmsglen |= (int(b) & 0x7F) << shift + mapmsglen |= int(b&0x7F) << shift if b < 0x80 { break } @@ -2489,13 +2768,13 @@ func (m *CompressedAttributes) Unmarshal(dAtA []byte) error { return ErrInvalidLengthAttributes } postmsgIndex := iNdEx + mapmsglen - if mapmsglen < 0 { + if postmsgIndex < 0 { return ErrInvalidLengthAttributes } if postmsgIndex > l { return io.ErrUnexpectedEOF } - if err := types.StdTimeUnmarshal(mapvalue, dAtA[iNdEx:postmsgIndex]); err != nil { + if err := github_com_gogo_protobuf_types.StdTimeUnmarshal(mapvalue, dAtA[iNdEx:postmsgIndex]); err != nil { return err } iNdEx = postmsgIndex @@ -2530,7 +2809,7 @@ func (m *CompressedAttributes) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - msglen |= (int(b) & 0x7F) << shift + msglen |= int(b&0x7F) << shift if b < 0x80 { break } @@ -2539,6 +2818,9 @@ func (m *CompressedAttributes) Unmarshal(dAtA []byte) error { return ErrInvalidLengthAttributes } postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthAttributes + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -2559,7 +2841,7 @@ func (m *CompressedAttributes) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - wire |= (uint64(b) & 0x7F) << shift + wire |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -2576,7 +2858,7 @@ func (m *CompressedAttributes) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - mapkeytemp |= (int32(b) & 0x7F) << shift + mapkeytemp |= int32(b&0x7F) << shift if b < 0x80 { break } @@ -2594,7 +2876,7 @@ func (m *CompressedAttributes) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - mapmsglen |= (int(b) & 0x7F) << shift + mapmsglen |= int(b&0x7F) << shift if b < 0x80 { break } @@ -2603,13 +2885,13 @@ func (m *CompressedAttributes) Unmarshal(dAtA []byte) error { return ErrInvalidLengthAttributes } postmsgIndex := iNdEx + mapmsglen - if mapmsglen < 0 { + if postmsgIndex < 0 { return ErrInvalidLengthAttributes } if postmsgIndex > l { return io.ErrUnexpectedEOF } - if err := types.StdDurationUnmarshal(mapvalue, dAtA[iNdEx:postmsgIndex]); err != nil { + if err := github_com_gogo_protobuf_types.StdDurationUnmarshal(mapvalue, dAtA[iNdEx:postmsgIndex]); err != nil { return err } iNdEx = postmsgIndex @@ -2644,7 +2926,7 @@ func (m *CompressedAttributes) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - msglen |= (int(b) & 0x7F) << shift + msglen |= int(b&0x7F) << shift if b < 0x80 { break } @@ -2653,6 +2935,9 @@ func (m *CompressedAttributes) Unmarshal(dAtA []byte) error { return ErrInvalidLengthAttributes } postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthAttributes + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -2673,7 +2958,7 @@ func (m *CompressedAttributes) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - wire |= (uint64(b) & 0x7F) << shift + wire |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -2690,7 +2975,7 @@ func (m *CompressedAttributes) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - mapkeytemp |= (int32(b) & 0x7F) << shift + mapkeytemp |= int32(b&0x7F) << shift if b < 0x80 { break } @@ -2708,7 +2993,7 @@ func (m *CompressedAttributes) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - mapbyteLen |= (uint64(b) & 0x7F) << shift + mapbyteLen |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -2718,6 +3003,9 @@ func (m *CompressedAttributes) Unmarshal(dAtA []byte) error { return ErrInvalidLengthAttributes } postbytesIndex := iNdEx + intMapbyteLen + if postbytesIndex < 0 { + return ErrInvalidLengthAttributes + } if postbytesIndex > l { return io.ErrUnexpectedEOF } @@ -2755,7 +3043,7 @@ func (m *CompressedAttributes) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - msglen |= (int(b) & 0x7F) << shift + msglen |= int(b&0x7F) << shift if b < 0x80 { break } @@ -2764,6 +3052,9 @@ func (m *CompressedAttributes) Unmarshal(dAtA []byte) error { return ErrInvalidLengthAttributes } postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthAttributes + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -2784,7 +3075,7 @@ func (m *CompressedAttributes) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - wire |= (uint64(b) & 0x7F) << shift + wire |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -2801,7 +3092,7 @@ func (m *CompressedAttributes) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - mapkeytemp |= (int32(b) & 0x7F) << shift + mapkeytemp |= int32(b&0x7F) << shift if b < 0x80 { break } @@ -2819,7 +3110,7 @@ func (m *CompressedAttributes) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - mapmsglen |= (int(b) & 0x7F) << shift + mapmsglen |= int(b&0x7F) << shift if b < 0x80 { break } @@ -2828,7 +3119,7 @@ func (m *CompressedAttributes) Unmarshal(dAtA []byte) error { return ErrInvalidLengthAttributes } postmsgIndex := iNdEx + mapmsglen - if mapmsglen < 0 { + if postmsgIndex < 0 { return ErrInvalidLengthAttributes } if postmsgIndex > l { @@ -2865,6 +3156,9 @@ func (m *CompressedAttributes) Unmarshal(dAtA []byte) error { if skippy < 0 { return ErrInvalidLengthAttributes } + if (iNdEx + skippy) < 0 { + return ErrInvalidLengthAttributes + } if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF } @@ -2892,7 +3186,7 @@ func (m *StringMap) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - wire |= (uint64(b) & 0x7F) << shift + wire |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -2920,7 +3214,7 @@ func (m *StringMap) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - msglen |= (int(b) & 0x7F) << shift + msglen |= int(b&0x7F) << shift if b < 0x80 { break } @@ -2929,6 +3223,9 @@ func (m *StringMap) Unmarshal(dAtA []byte) error { return ErrInvalidLengthAttributes } postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthAttributes + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -2949,7 +3246,7 @@ func (m *StringMap) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - wire |= (uint64(b) & 0x7F) << shift + wire |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -2966,7 +3263,7 @@ func (m *StringMap) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - mapkeytemp |= (int32(b) & 0x7F) << shift + mapkeytemp |= int32(b&0x7F) << shift if b < 0x80 { break } @@ -2984,7 +3281,7 @@ func (m *StringMap) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - mapvaluetemp |= (int32(b) & 0x7F) << shift + mapvaluetemp |= int32(b&0x7F) << shift if b < 0x80 { break } @@ -3017,6 +3314,9 @@ func (m *StringMap) Unmarshal(dAtA []byte) error { if skippy < 0 { return ErrInvalidLengthAttributes } + if (iNdEx + skippy) < 0 { + return ErrInvalidLengthAttributes + } if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF } @@ -3083,10 +3383,13 @@ func skipAttributes(dAtA []byte) (n int, err error) { break } } - iNdEx += length if length < 0 { return 0, ErrInvalidLengthAttributes } + iNdEx += length + if iNdEx < 0 { + return 0, ErrInvalidLengthAttributes + } return iNdEx, nil case 3: for { @@ -3115,6 +3418,9 @@ func skipAttributes(dAtA []byte) (n int, err error) { return 0, err } iNdEx = start + next + if iNdEx < 0 { + return 0, ErrInvalidLengthAttributes + } } return iNdEx, nil case 4: @@ -3133,60 +3439,3 @@ var ( ErrInvalidLengthAttributes = fmt.Errorf("proto: negative length found during unmarshaling") ErrIntOverflowAttributes = fmt.Errorf("proto: integer overflow") ) - -func init() { proto.RegisterFile("mixer/v1/attributes.proto", fileDescriptorAttributes) } - -var fileDescriptorAttributes = []byte{ - // 808 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x96, 0xcd, 0x6f, 0xd3, 0x48, - 0x18, 0xc6, 0x3d, 0x4d, 0xf3, 0xe1, 0x37, 0xd9, 0xa4, 0xb5, 0xb2, 0x92, 0x9b, 0x83, 0x93, 0xed, - 0xae, 0x56, 0x81, 0x83, 0xdd, 0x2f, 0xa1, 0xd2, 0x0b, 0x10, 0x1a, 0x29, 0x14, 0x21, 0x21, 0x83, - 0xf8, 0xaa, 0x04, 0x4a, 0x14, 0x13, 0x2c, 0x92, 0x4c, 0xe4, 0x99, 0x14, 0x72, 0x43, 0xe2, 0xc4, - 0xad, 0x07, 0x0e, 0xfc, 0x07, 0xf0, 0xa7, 0xf4, 0xd8, 0x23, 0x27, 0x20, 0xe1, 0xc2, 0x05, 0xa9, - 0x47, 0x8e, 0xc8, 0x33, 0x63, 0x67, 0x12, 0xd2, 0xc6, 0xb9, 0xd9, 0x33, 0xef, 0xf3, 0xf3, 0x33, - 0x33, 0xcf, 0xbc, 0x09, 0xac, 0x75, 0xdc, 0xd7, 0x8e, 0x67, 0x1d, 0x6d, 0x5a, 0x75, 0x4a, 0x3d, - 0xb7, 0xd1, 0xa7, 0x0e, 0x31, 0x7b, 0x1e, 0xa6, 0x58, 0xcb, 0xba, 0x84, 0xba, 0xd8, 0x64, 0x05, - 0xe6, 0xd1, 0x66, 0x21, 0xdf, 0xc2, 0x2d, 0xcc, 0xa6, 0x2c, 0xff, 0x89, 0x57, 0x15, 0x8c, 0x16, - 0xc6, 0xad, 0xb6, 0x63, 0xb1, 0xb7, 0x46, 0xff, 0xb9, 0xd5, 0xec, 0x7b, 0x75, 0xea, 0xe2, 0xae, - 0x98, 0x2f, 0x4e, 0xcf, 0x53, 0xb7, 0xe3, 0x10, 0x5a, 0xef, 0xf4, 0x78, 0xc1, 0xfa, 0xdb, 0x04, - 0xc0, 0x8d, 0xf0, 0xdb, 0xda, 0x01, 0xc0, 0xd8, 0x89, 0x8e, 0x4a, 0xb1, 0x72, 0x7a, 0xeb, 0xb2, - 0x39, 0x69, 0xc5, 0x1c, 0xd7, 0x4b, 0x8f, 0xd5, 0x2e, 0xf5, 0x06, 0xb6, 0xa4, 0x2e, 0xbc, 0x80, - 0xdc, 0xd4, 0xb4, 0xb6, 0x02, 0xb1, 0x97, 0xce, 0x40, 0x47, 0x25, 0x54, 0x56, 0x6d, 0xff, 0x51, - 0xbb, 0x06, 0xf1, 0xa3, 0x7a, 0xbb, 0xef, 0xe8, 0x4b, 0x25, 0x54, 0x4e, 0x6f, 0x5d, 0x8a, 0xf2, - 0xad, 0x07, 0xbe, 0xc0, 0xe6, 0xba, 0xbd, 0xa5, 0x5d, 0x54, 0xf8, 0x18, 0x83, 0xec, 0xe4, 0xac, - 0xf6, 0x2f, 0x64, 0x08, 0xf5, 0xdc, 0x6e, 0xeb, 0xd9, 0x18, 0xaf, 0xd6, 0x14, 0x3b, 0xcd, 0x47, - 0x79, 0xd1, 0x3f, 0x90, 0x76, 0xbb, 0xf4, 0xca, 0x8e, 0xa8, 0x89, 0x95, 0x50, 0x39, 0x56, 0x53, - 0x6c, 0x60, 0x83, 0x21, 0xa7, 0x89, 0xfb, 0x8d, 0xb6, 0x23, 0x6a, 0x96, 0x4b, 0xa8, 0x8c, 0x7c, - 0x0e, 0x1f, 0xe5, 0x45, 0x45, 0x80, 0x06, 0xc6, 0x6d, 0x51, 0x12, 0x2f, 0xa1, 0x72, 0xaa, 0xa6, - 0xd8, 0xaa, 0x3f, 0x16, 0x7e, 0xa8, 0x31, 0xa0, 0x0e, 0x11, 0x15, 0x89, 0x12, 0x2a, 0x67, 0xfc, - 0x0f, 0xb1, 0x41, 0x5e, 0x52, 0x85, 0x5c, 0x78, 0x36, 0xa2, 0x2c, 0xc9, 0xb6, 0xa4, 0x60, 0xf2, - 0x33, 0x34, 0x83, 0x33, 0x34, 0xef, 0x07, 0x75, 0x35, 0xc5, 0xce, 0x86, 0x22, 0x8e, 0xa9, 0x40, - 0x36, 0x88, 0x80, 0xa0, 0xa4, 0x18, 0x65, 0xed, 0x0f, 0xca, 0xbe, 0x28, 0xab, 0x29, 0xf6, 0x5f, - 0x81, 0x84, 0x33, 0xee, 0xc2, 0x8a, 0xd8, 0xbb, 0x4e, 0x3d, 0xf0, 0xa2, 0x32, 0xca, 0x7f, 0x17, - 0x1c, 0xcf, 0x3d, 0x26, 0xb9, 0x53, 0x67, 0xae, 0x48, 0xf0, 0xc2, 0x88, 0x95, 0xa4, 0x38, 0xe5, - 0xc2, 0x7b, 0x04, 0x6a, 0x58, 0xa8, 0xdd, 0x86, 0xa4, 0xd3, 0xa5, 0x9e, 0x1b, 0x46, 0x6d, 0x33, - 0x0a, 0xdf, 0xac, 0x72, 0x0d, 0x4f, 0x5c, 0x40, 0x28, 0xec, 0x41, 0x46, 0x9e, 0x98, 0x91, 0xb5, - 0xbc, 0x9c, 0x35, 0x55, 0x0a, 0xd0, 0xfa, 0x4f, 0x15, 0xf2, 0x37, 0x71, 0xa7, 0xe7, 0x39, 0x84, - 0x38, 0x4d, 0xe9, 0x3e, 0xe4, 0x21, 0xfe, 0x0a, 0x7b, 0x4d, 0xee, 0x4f, 0xb5, 0xf9, 0x8b, 0xef, - 0x9b, 0x2f, 0x90, 0xe8, 0x4b, 0xb3, 0x7d, 0xcf, 0x82, 0x89, 0x15, 0x04, 0xbe, 0x05, 0x41, 0xab, - 0x41, 0x82, 0xe5, 0x8d, 0xe8, 0x31, 0xc6, 0xda, 0x88, 0xc4, 0xba, 0xc5, 0x24, 0x1c, 0x25, 0xf4, - 0xbe, 0x2d, 0x9e, 0x4a, 0xa2, 0x2f, 0x2f, 0x60, 0x6b, 0x9f, 0x6b, 0x84, 0x2d, 0x41, 0xd0, 0xaa, - 0x10, 0xf7, 0xf3, 0x4b, 0xf4, 0x38, 0x43, 0x59, 0x91, 0x50, 0x15, 0x5f, 0xc1, 0x41, 0x5c, 0xad, - 0x3d, 0x05, 0x08, 0x13, 0x4a, 0xf4, 0x04, 0x63, 0xed, 0x44, 0x62, 0x85, 0x29, 0xe7, 0xc0, 0x4a, - 0xea, 0xe4, 0x4b, 0x51, 0x39, 0xfe, 0x5a, 0x44, 0xb6, 0x44, 0xd4, 0x0e, 0x41, 0x0d, 0xc2, 0x4b, - 0xf4, 0x24, 0xc3, 0x6f, 0x47, 0x5b, 0x75, 0xa0, 0x92, 0xe8, 0x1f, 0x7c, 0xfa, 0x98, 0xc7, 0xf6, - 0xc0, 0xbf, 0xa1, 0x7a, 0x6a, 0x91, 0x3d, 0x18, 0x84, 0xdd, 0x90, 0xab, 0xb5, 0x43, 0x48, 0x8f, - 0xef, 0x13, 0xd1, 0xd5, 0x05, 0x36, 0x21, 0x0c, 0xbd, 0xb0, 0xb9, 0xec, 0xdb, 0xb4, 0x21, 0xbc, - 0x5e, 0x2c, 0xf6, 0x72, 0xae, 0xe4, 0xd8, 0xaf, 0xce, 0x88, 0xfd, 0xaa, 0xdc, 0x37, 0xaf, 0x42, - 0x5a, 0xca, 0xd1, 0x3c, 0x69, 0x4c, 0x96, 0xee, 0x41, 0x46, 0xce, 0xcd, 0x3c, 0x2d, 0x92, 0xb5, - 0xbb, 0x00, 0xe3, 0xa0, 0xcc, 0x53, 0xa6, 0x64, 0xe5, 0x63, 0xc8, 0x4d, 0xc5, 0x62, 0x86, 0x7c, - 0x63, 0xf2, 0x27, 0xe5, 0x82, 0xfe, 0x29, 0xa3, 0x1f, 0x42, 0x76, 0x32, 0x12, 0x33, 0xc8, 0xd6, - 0x24, 0xf9, 0xfc, 0x9e, 0x3a, 0xbd, 0xda, 0x01, 0x8d, 0xb8, 0x4f, 0x19, 0x59, 0xf9, 0x08, 0x72, - 0x53, 0xe7, 0x1f, 0xc5, 0xd3, 0x54, 0xac, 0x42, 0x82, 0xdc, 0xef, 0xde, 0x4d, 0xb4, 0xe1, 0xeb, - 0xd3, 0x6d, 0xf8, 0xff, 0x73, 0x21, 0x8b, 0xf7, 0xde, 0x79, 0x21, 0xac, 0x1c, 0x9c, 0x0c, 0x0d, - 0xe5, 0x74, 0x68, 0x28, 0x9f, 0x87, 0x86, 0x72, 0x36, 0x34, 0x94, 0x37, 0x23, 0x03, 0x7d, 0x1a, - 0x19, 0xca, 0xc9, 0xc8, 0x40, 0xa7, 0x23, 0x03, 0x7d, 0x1b, 0x19, 0xe8, 0xc7, 0xc8, 0x50, 0xce, - 0x46, 0x06, 0x3a, 0xfe, 0x6e, 0x28, 0x4f, 0xfe, 0xe6, 0xee, 0x5c, 0x6c, 0xd5, 0x7b, 0xae, 0x15, - 0xfc, 0x85, 0xfa, 0x85, 0x50, 0x23, 0xc1, 0x4e, 0x62, 0xfb, 0x77, 0x00, 0x00, 0x00, 0xff, 0xff, - 0xe3, 0xd9, 0xac, 0x62, 0x58, 0x09, 0x00, 0x00, -} diff --git a/mixer/v1/config/client/api_spec.pb.go b/mixer/v1/config/client/api_spec.pb.go index ec1b1e7f69a..ad6be4e7592 100644 --- a/mixer/v1/config/client/api_spec.pb.go +++ b/mixer/v1/config/client/api_spec.pb.go @@ -1,46 +1,18 @@ // Code generated by protoc-gen-gogo. DO NOT EDIT. // source: mixer/v1/config/client/api_spec.proto -/* - Package client is a generated protocol buffer package. - - It is generated from these files: - mixer/v1/config/client/api_spec.proto - mixer/v1/config/client/client_config.proto - mixer/v1/config/client/quota.proto - mixer/v1/config/client/service.proto - - It has these top-level messages: - HTTPAPISpec - HTTPAPISpecPattern - APIKey - HTTPAPISpecReference - HTTPAPISpecBinding - NetworkFailPolicy - ServiceConfig - TransportConfig - HttpClientConfig - TcpClientConfig - QuotaSpec - QuotaRule - StringMatch - AttributeMatch - Quota - QuotaSpecBinding - IstioService -*/ package client -import proto "github.com/gogo/protobuf/proto" -import fmt "fmt" -import math "math" -import _ "github.com/gogo/protobuf/gogoproto" -import istio_mixer_v1 "istio.io/api/mixer/v1" - -import strings "strings" -import reflect "reflect" - -import io "io" +import ( + fmt "fmt" + _ "github.com/gogo/protobuf/gogoproto" + proto "github.com/gogo/protobuf/proto" + io "io" + v1 "istio.io/api/mixer/v1" + math "math" + reflect "reflect" + strings "strings" +) // Reference imports to suppress errors if they are not otherwise used. var _ = proto.Marshal @@ -112,9 +84,9 @@ type HTTPAPISpec struct { // List of attributes that are generated when *any* of the HTTP // patterns match. This list typically includes the "api.service" // and "api.version" attributes. - Attributes *istio_mixer_v1.Attributes `protobuf:"bytes,1,opt,name=attributes" json:"attributes,omitempty"` + Attributes *v1.Attributes `protobuf:"bytes,1,opt,name=attributes,proto3" json:"attributes,omitempty"` // List of HTTP patterns to match. - Patterns []*HTTPAPISpecPattern `protobuf:"bytes,2,rep,name=patterns" json:"patterns,omitempty"` + Patterns []*HTTPAPISpecPattern `protobuf:"bytes,2,rep,name=patterns,proto3" json:"patterns,omitempty"` // List of APIKey that describes how to extract an API-KEY from an // HTTP request. The first API-Key match found in the list is used, // i.e. 'OR' semantics. @@ -124,12 +96,40 @@ type HTTPAPISpec struct { // // `query: key, `query: api_key`, and then `header: x-api-key` // - ApiKeys []*APIKey `protobuf:"bytes,3,rep,name=api_keys,json=apiKeys" json:"api_keys,omitempty"` + ApiKeys []*APIKey `protobuf:"bytes,3,rep,name=api_keys,json=apiKeys,proto3" json:"api_keys,omitempty"` +} + +func (m *HTTPAPISpec) Reset() { *m = HTTPAPISpec{} } +func (*HTTPAPISpec) ProtoMessage() {} +func (*HTTPAPISpec) Descriptor() ([]byte, []int) { + return fileDescriptor_fb6b15fd2f44b459, []int{0} +} +func (m *HTTPAPISpec) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *HTTPAPISpec) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_HTTPAPISpec.Marshal(b, m, deterministic) + } else { + b = b[:cap(b)] + n, err := m.MarshalTo(b) + if err != nil { + return nil, err + } + return b[:n], nil + } +} +func (m *HTTPAPISpec) XXX_Merge(src proto.Message) { + xxx_messageInfo_HTTPAPISpec.Merge(m, src) +} +func (m *HTTPAPISpec) XXX_Size() int { + return m.Size() +} +func (m *HTTPAPISpec) XXX_DiscardUnknown() { + xxx_messageInfo_HTTPAPISpec.DiscardUnknown(m) } -func (m *HTTPAPISpec) Reset() { *m = HTTPAPISpec{} } -func (*HTTPAPISpec) ProtoMessage() {} -func (*HTTPAPISpec) Descriptor() ([]byte, []int) { return fileDescriptorApiSpec, []int{0} } +var xxx_messageInfo_HTTPAPISpec proto.InternalMessageInfo // HTTPAPISpecPattern defines a single pattern to match against // incoming HTTP requests. The per-pattern list of attributes is @@ -148,7 +148,7 @@ type HTTPAPISpecPattern struct { // List of attributes that are generated if the HTTP request matches // the specified http_method and uri_template. This typically // includes the "api.operation" attribute. - Attributes *istio_mixer_v1.Attributes `protobuf:"bytes,1,opt,name=attributes" json:"attributes,omitempty"` + Attributes *v1.Attributes `protobuf:"bytes,1,opt,name=attributes,proto3" json:"attributes,omitempty"` // 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. @@ -159,9 +159,37 @@ type HTTPAPISpecPattern struct { Pattern isHTTPAPISpecPattern_Pattern `protobuf_oneof:"pattern"` } -func (m *HTTPAPISpecPattern) Reset() { *m = HTTPAPISpecPattern{} } -func (*HTTPAPISpecPattern) ProtoMessage() {} -func (*HTTPAPISpecPattern) Descriptor() ([]byte, []int) { return fileDescriptorApiSpec, []int{1} } +func (m *HTTPAPISpecPattern) Reset() { *m = HTTPAPISpecPattern{} } +func (*HTTPAPISpecPattern) ProtoMessage() {} +func (*HTTPAPISpecPattern) Descriptor() ([]byte, []int) { + return fileDescriptor_fb6b15fd2f44b459, []int{1} +} +func (m *HTTPAPISpecPattern) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *HTTPAPISpecPattern) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_HTTPAPISpecPattern.Marshal(b, m, deterministic) + } else { + b = b[:cap(b)] + n, err := m.MarshalTo(b) + if err != nil { + return nil, err + } + return b[:n], nil + } +} +func (m *HTTPAPISpecPattern) XXX_Merge(src proto.Message) { + xxx_messageInfo_HTTPAPISpecPattern.Merge(m, src) +} +func (m *HTTPAPISpecPattern) XXX_Size() int { + return m.Size() +} +func (m *HTTPAPISpecPattern) XXX_DiscardUnknown() { + xxx_messageInfo_HTTPAPISpecPattern.DiscardUnknown(m) +} + +var xxx_messageInfo_HTTPAPISpecPattern proto.InternalMessageInfo type isHTTPAPISpecPattern_Pattern interface { isHTTPAPISpecPattern_Pattern() @@ -252,11 +280,11 @@ func _HTTPAPISpecPattern_OneofSizer(msg proto.Message) (n int) { // pattern switch x := m.Pattern.(type) { case *HTTPAPISpecPattern_UriTemplate: - n += proto.SizeVarint(3<<3 | proto.WireBytes) + n += 1 // tag and wire n += proto.SizeVarint(uint64(len(x.UriTemplate))) n += len(x.UriTemplate) case *HTTPAPISpecPattern_Regex: - n += proto.SizeVarint(4<<3 | proto.WireBytes) + n += 1 // tag and wire n += proto.SizeVarint(uint64(len(x.Regex))) n += len(x.Regex) case nil: @@ -279,9 +307,37 @@ type APIKey struct { Key isAPIKey_Key `protobuf_oneof:"key"` } -func (m *APIKey) Reset() { *m = APIKey{} } -func (*APIKey) ProtoMessage() {} -func (*APIKey) Descriptor() ([]byte, []int) { return fileDescriptorApiSpec, []int{2} } +func (m *APIKey) Reset() { *m = APIKey{} } +func (*APIKey) ProtoMessage() {} +func (*APIKey) Descriptor() ([]byte, []int) { + return fileDescriptor_fb6b15fd2f44b459, []int{2} +} +func (m *APIKey) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *APIKey) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_APIKey.Marshal(b, m, deterministic) + } else { + b = b[:cap(b)] + n, err := m.MarshalTo(b) + if err != nil { + return nil, err + } + return b[:n], nil + } +} +func (m *APIKey) XXX_Merge(src proto.Message) { + xxx_messageInfo_APIKey.Merge(m, src) +} +func (m *APIKey) XXX_Size() int { + return m.Size() +} +func (m *APIKey) XXX_DiscardUnknown() { + xxx_messageInfo_APIKey.DiscardUnknown(m) +} + +var xxx_messageInfo_APIKey proto.InternalMessageInfo type isAPIKey_Key interface { isAPIKey_Key() @@ -394,15 +450,15 @@ func _APIKey_OneofSizer(msg proto.Message) (n int) { // key switch x := m.Key.(type) { case *APIKey_Query: - n += proto.SizeVarint(1<<3 | proto.WireBytes) + n += 1 // tag and wire n += proto.SizeVarint(uint64(len(x.Query))) n += len(x.Query) case *APIKey_Header: - n += proto.SizeVarint(2<<3 | proto.WireBytes) + n += 1 // tag and wire n += proto.SizeVarint(uint64(len(x.Header))) n += len(x.Header) case *APIKey_Cookie: - n += proto.SizeVarint(3<<3 | proto.WireBytes) + n += 1 // tag and wire n += proto.SizeVarint(uint64(len(x.Cookie))) n += len(x.Cookie) case nil: @@ -430,9 +486,37 @@ type HTTPAPISpecReference struct { Namespace string `protobuf:"bytes,2,opt,name=namespace,proto3" json:"namespace,omitempty"` } -func (m *HTTPAPISpecReference) Reset() { *m = HTTPAPISpecReference{} } -func (*HTTPAPISpecReference) ProtoMessage() {} -func (*HTTPAPISpecReference) Descriptor() ([]byte, []int) { return fileDescriptorApiSpec, []int{3} } +func (m *HTTPAPISpecReference) Reset() { *m = HTTPAPISpecReference{} } +func (*HTTPAPISpecReference) ProtoMessage() {} +func (*HTTPAPISpecReference) Descriptor() ([]byte, []int) { + return fileDescriptor_fb6b15fd2f44b459, []int{3} +} +func (m *HTTPAPISpecReference) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *HTTPAPISpecReference) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_HTTPAPISpecReference.Marshal(b, m, deterministic) + } else { + b = b[:cap(b)] + n, err := m.MarshalTo(b) + if err != nil { + return nil, err + } + return b[:n], nil + } +} +func (m *HTTPAPISpecReference) XXX_Merge(src proto.Message) { + xxx_messageInfo_HTTPAPISpecReference.Merge(m, src) +} +func (m *HTTPAPISpecReference) XXX_Size() int { + return m.Size() +} +func (m *HTTPAPISpecReference) XXX_DiscardUnknown() { + xxx_messageInfo_HTTPAPISpecReference.DiscardUnknown(m) +} + +var xxx_messageInfo_HTTPAPISpecReference proto.InternalMessageInfo // HTTPAPISpecBinding defines the binding between HTTPAPISpecs and one or more // IstioService. For example, the following establishes a binding @@ -454,16 +538,44 @@ func (*HTTPAPISpecReference) Descriptor() ([]byte, []int) { return fileDescripto // ``` type HTTPAPISpecBinding struct { // REQUIRED. One or more services to map the listed HTTPAPISpec onto. - Services []*IstioService `protobuf:"bytes,1,rep,name=services" json:"services,omitempty"` + Services []*IstioService `protobuf:"bytes,1,rep,name=services,proto3" json:"services,omitempty"` // REQUIRED. One or more HTTPAPISpec references that should be mapped to // the specified service(s). The aggregate collection of match // conditions defined in the HTTPAPISpecs should not overlap. - ApiSpecs []*HTTPAPISpecReference `protobuf:"bytes,2,rep,name=api_specs,json=apiSpecs" json:"api_specs,omitempty"` + ApiSpecs []*HTTPAPISpecReference `protobuf:"bytes,2,rep,name=api_specs,json=apiSpecs,proto3" json:"api_specs,omitempty"` } -func (m *HTTPAPISpecBinding) Reset() { *m = HTTPAPISpecBinding{} } -func (*HTTPAPISpecBinding) ProtoMessage() {} -func (*HTTPAPISpecBinding) Descriptor() ([]byte, []int) { return fileDescriptorApiSpec, []int{4} } +func (m *HTTPAPISpecBinding) Reset() { *m = HTTPAPISpecBinding{} } +func (*HTTPAPISpecBinding) ProtoMessage() {} +func (*HTTPAPISpecBinding) Descriptor() ([]byte, []int) { + return fileDescriptor_fb6b15fd2f44b459, []int{4} +} +func (m *HTTPAPISpecBinding) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *HTTPAPISpecBinding) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_HTTPAPISpecBinding.Marshal(b, m, deterministic) + } else { + b = b[:cap(b)] + n, err := m.MarshalTo(b) + if err != nil { + return nil, err + } + return b[:n], nil + } +} +func (m *HTTPAPISpecBinding) XXX_Merge(src proto.Message) { + xxx_messageInfo_HTTPAPISpecBinding.Merge(m, src) +} +func (m *HTTPAPISpecBinding) XXX_Size() int { + return m.Size() +} +func (m *HTTPAPISpecBinding) XXX_DiscardUnknown() { + xxx_messageInfo_HTTPAPISpecBinding.DiscardUnknown(m) +} + +var xxx_messageInfo_HTTPAPISpecBinding proto.InternalMessageInfo func init() { proto.RegisterType((*HTTPAPISpec)(nil), "istio.mixer.v1.config.client.HTTPAPISpec") @@ -472,6 +584,48 @@ func init() { proto.RegisterType((*HTTPAPISpecReference)(nil), "istio.mixer.v1.config.client.HTTPAPISpecReference") proto.RegisterType((*HTTPAPISpecBinding)(nil), "istio.mixer.v1.config.client.HTTPAPISpecBinding") } + +func init() { + proto.RegisterFile("mixer/v1/config/client/api_spec.proto", fileDescriptor_fb6b15fd2f44b459) +} + +var fileDescriptor_fb6b15fd2f44b459 = []byte{ + // 524 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x53, 0xcf, 0x6e, 0xda, 0x4e, + 0x10, 0x5e, 0x87, 0x84, 0xc0, 0xf0, 0x3b, 0xad, 0xa2, 0x9f, 0x5c, 0x14, 0x6d, 0x11, 0x49, 0x25, + 0xd4, 0x83, 0xdd, 0xd0, 0x5b, 0x2f, 0x15, 0x1c, 0x2a, 0x50, 0x5a, 0x15, 0x39, 0x9c, 0x5a, 0x55, + 0xc8, 0x31, 0x13, 0x58, 0x11, 0xbc, 0xee, 0x7a, 0x41, 0xe1, 0xd6, 0x47, 0xe8, 0x63, 0xf4, 0xd2, + 0x07, 0xe8, 0x1b, 0xe4, 0xc8, 0x91, 0x63, 0x31, 0x97, 0x1e, 0xf3, 0x08, 0xd5, 0x7a, 0x1d, 0xa0, + 0xff, 0x50, 0xa5, 0x9e, 0xec, 0x99, 0xf9, 0x66, 0xbe, 0xf9, 0x66, 0x67, 0xe0, 0xd1, 0x98, 0xdf, + 0xa0, 0x74, 0xa7, 0x67, 0x6e, 0x20, 0xc2, 0x2b, 0x3e, 0x70, 0x83, 0x6b, 0x8e, 0xa1, 0x72, 0xfd, + 0x88, 0xf7, 0xe2, 0x08, 0x03, 0x27, 0x92, 0x42, 0x09, 0x7a, 0xcc, 0x63, 0xc5, 0x85, 0x93, 0x82, + 0x9d, 0xe9, 0x99, 0x63, 0xc0, 0x8e, 0x01, 0x97, 0x8f, 0x06, 0x62, 0x20, 0x52, 0xa0, 0xab, 0xff, + 0x4c, 0x4e, 0xf9, 0xc1, 0xba, 0xb4, 0xaf, 0x94, 0xe4, 0x97, 0x13, 0x85, 0x71, 0x16, 0x3a, 0xfd, + 0x03, 0x6b, 0x8c, 0x72, 0xca, 0x03, 0x34, 0xa8, 0xea, 0xc2, 0x82, 0x52, 0xab, 0xdb, 0xed, 0x34, + 0x3a, 0xed, 0x8b, 0x08, 0x03, 0xfa, 0x0c, 0x60, 0x53, 0xc9, 0xb6, 0x2a, 0x56, 0xad, 0x54, 0x2f, + 0x3b, 0x3f, 0x75, 0xd6, 0x58, 0x23, 0xbc, 0x2d, 0x34, 0x7d, 0x09, 0x85, 0xc8, 0x57, 0x0a, 0x65, + 0x18, 0xdb, 0x7b, 0x95, 0x5c, 0xad, 0x54, 0x7f, 0xe2, 0xec, 0xd2, 0xe4, 0x6c, 0x11, 0x77, 0x4c, + 0xa2, 0xb7, 0xae, 0x40, 0x9f, 0x43, 0x41, 0x0f, 0x68, 0x84, 0xb3, 0xd8, 0xce, 0xa5, 0xd5, 0x4e, + 0x77, 0x57, 0x6b, 0x74, 0xda, 0xe7, 0x38, 0xf3, 0x0e, 0xfd, 0x88, 0x9f, 0xe3, 0x2c, 0xae, 0x7e, + 0xb1, 0x80, 0xfe, 0xca, 0xf0, 0x4f, 0x0a, 0x1f, 0x42, 0x69, 0xa8, 0x54, 0xd4, 0x1b, 0xa3, 0x1a, + 0x8a, 0xbe, 0xbd, 0x57, 0xb1, 0x6a, 0x45, 0x0f, 0xb4, 0xeb, 0x55, 0xea, 0xa1, 0x27, 0xf0, 0xdf, + 0x44, 0xf2, 0x9e, 0xc2, 0x71, 0x74, 0xed, 0x2b, 0xb4, 0x73, 0x1a, 0xd1, 0x22, 0x5e, 0x69, 0x22, + 0x79, 0x37, 0x73, 0xd2, 0xff, 0xe1, 0x40, 0xe2, 0x00, 0x6f, 0xec, 0xfd, 0x2c, 0x6a, 0xcc, 0x66, + 0x11, 0x0e, 0x33, 0xf5, 0xd5, 0xb7, 0x90, 0x37, 0x72, 0x34, 0xf8, 0xfd, 0x04, 0xe5, 0x2c, 0xed, + 0x34, 0x05, 0xa7, 0x26, 0xb5, 0x21, 0x3f, 0x44, 0xbf, 0x8f, 0xd2, 0x74, 0xd1, 0x22, 0x5e, 0x66, + 0xeb, 0x48, 0x20, 0xc4, 0x88, 0x6f, 0xd8, 0x33, 0xbb, 0x79, 0x00, 0xb9, 0x11, 0xce, 0xaa, 0x2d, + 0x38, 0xda, 0x9a, 0x8b, 0x87, 0x57, 0x28, 0x31, 0x0c, 0x90, 0x52, 0xd8, 0x0f, 0xfd, 0x31, 0x1a, + 0x26, 0x2f, 0xfd, 0xa7, 0xc7, 0x50, 0xd4, 0xdf, 0x38, 0xf2, 0x03, 0xcc, 0xf4, 0x6e, 0x1c, 0xd5, + 0xcf, 0x3f, 0x8e, 0xb8, 0xc9, 0xc3, 0x3e, 0x0f, 0x07, 0xf4, 0x05, 0x14, 0xb2, 0x2d, 0xd3, 0x03, + 0xd6, 0x4f, 0xf7, 0x78, 0xf7, 0xd3, 0xb5, 0x75, 0xf0, 0xc2, 0xa4, 0x78, 0xeb, 0x5c, 0xfa, 0x1a, + 0x8a, 0xf7, 0x37, 0x72, 0xbf, 0x51, 0xf5, 0xbf, 0xde, 0xa8, 0xb5, 0x2e, 0x4f, 0xef, 0x91, 0xf6, + 0xc4, 0xcd, 0x77, 0xb7, 0x4b, 0x46, 0xe6, 0x4b, 0x46, 0x16, 0x4b, 0x46, 0xee, 0x96, 0x8c, 0x7c, + 0x48, 0x98, 0xf5, 0x29, 0x61, 0xe4, 0x36, 0x61, 0xd6, 0x3c, 0x61, 0xd6, 0xd7, 0x84, 0x59, 0xdf, + 0x12, 0x46, 0xee, 0x12, 0x66, 0x7d, 0x5c, 0x31, 0x32, 0x5f, 0x31, 0xb2, 0x58, 0x31, 0xf2, 0xe6, + 0xc4, 0xd0, 0x72, 0xa1, 0xaf, 0xd6, 0xfd, 0xfd, 0x69, 0x5d, 0xe6, 0xd3, 0x9b, 0x7a, 0xfa, 0x3d, + 0x00, 0x00, 0xff, 0xff, 0x74, 0x4a, 0xd4, 0x0b, 0xf1, 0x03, 0x00, 0x00, +} + func (m *HTTPAPISpec) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) @@ -712,6 +866,9 @@ func encodeVarintApiSpec(dAtA []byte, offset int, v uint64) int { return offset + 1 } func (m *HTTPAPISpec) Size() (n int) { + if m == nil { + return 0 + } var l int _ = l if m.Attributes != nil { @@ -734,6 +891,9 @@ func (m *HTTPAPISpec) Size() (n int) { } func (m *HTTPAPISpecPattern) Size() (n int) { + if m == nil { + return 0 + } var l int _ = l if m.Attributes != nil { @@ -751,6 +911,9 @@ func (m *HTTPAPISpecPattern) Size() (n int) { } func (m *HTTPAPISpecPattern_UriTemplate) Size() (n int) { + if m == nil { + return 0 + } var l int _ = l l = len(m.UriTemplate) @@ -758,6 +921,9 @@ func (m *HTTPAPISpecPattern_UriTemplate) Size() (n int) { return n } func (m *HTTPAPISpecPattern_Regex) Size() (n int) { + if m == nil { + return 0 + } var l int _ = l l = len(m.Regex) @@ -765,6 +931,9 @@ func (m *HTTPAPISpecPattern_Regex) Size() (n int) { return n } func (m *APIKey) Size() (n int) { + if m == nil { + return 0 + } var l int _ = l if m.Key != nil { @@ -774,6 +943,9 @@ func (m *APIKey) Size() (n int) { } func (m *APIKey_Query) Size() (n int) { + if m == nil { + return 0 + } var l int _ = l l = len(m.Query) @@ -781,6 +953,9 @@ func (m *APIKey_Query) Size() (n int) { return n } func (m *APIKey_Header) Size() (n int) { + if m == nil { + return 0 + } var l int _ = l l = len(m.Header) @@ -788,6 +963,9 @@ func (m *APIKey_Header) Size() (n int) { return n } func (m *APIKey_Cookie) Size() (n int) { + if m == nil { + return 0 + } var l int _ = l l = len(m.Cookie) @@ -795,6 +973,9 @@ func (m *APIKey_Cookie) Size() (n int) { return n } func (m *HTTPAPISpecReference) Size() (n int) { + if m == nil { + return 0 + } var l int _ = l l = len(m.Name) @@ -809,6 +990,9 @@ func (m *HTTPAPISpecReference) Size() (n int) { } func (m *HTTPAPISpecBinding) Size() (n int) { + if m == nil { + return 0 + } var l int _ = l if len(m.Services) > 0 { @@ -844,7 +1028,7 @@ func (this *HTTPAPISpec) String() string { return "nil" } s := strings.Join([]string{`&HTTPAPISpec{`, - `Attributes:` + strings.Replace(fmt.Sprintf("%v", this.Attributes), "Attributes", "istio_mixer_v1.Attributes", 1) + `,`, + `Attributes:` + strings.Replace(fmt.Sprintf("%v", this.Attributes), "Attributes", "v1.Attributes", 1) + `,`, `Patterns:` + strings.Replace(fmt.Sprintf("%v", this.Patterns), "HTTPAPISpecPattern", "HTTPAPISpecPattern", 1) + `,`, `ApiKeys:` + strings.Replace(fmt.Sprintf("%v", this.ApiKeys), "APIKey", "APIKey", 1) + `,`, `}`, @@ -856,7 +1040,7 @@ func (this *HTTPAPISpecPattern) String() string { return "nil" } s := strings.Join([]string{`&HTTPAPISpecPattern{`, - `Attributes:` + strings.Replace(fmt.Sprintf("%v", this.Attributes), "Attributes", "istio_mixer_v1.Attributes", 1) + `,`, + `Attributes:` + strings.Replace(fmt.Sprintf("%v", this.Attributes), "Attributes", "v1.Attributes", 1) + `,`, `HttpMethod:` + fmt.Sprintf("%v", this.HttpMethod) + `,`, `Pattern:` + fmt.Sprintf("%v", this.Pattern) + `,`, `}`, @@ -968,7 +1152,7 @@ func (m *HTTPAPISpec) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - wire |= (uint64(b) & 0x7F) << shift + wire |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -996,7 +1180,7 @@ func (m *HTTPAPISpec) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - msglen |= (int(b) & 0x7F) << shift + msglen |= int(b&0x7F) << shift if b < 0x80 { break } @@ -1005,11 +1189,14 @@ func (m *HTTPAPISpec) Unmarshal(dAtA []byte) error { return ErrInvalidLengthApiSpec } postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthApiSpec + } if postIndex > l { return io.ErrUnexpectedEOF } if m.Attributes == nil { - m.Attributes = &istio_mixer_v1.Attributes{} + m.Attributes = &v1.Attributes{} } if err := m.Attributes.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err @@ -1029,7 +1216,7 @@ func (m *HTTPAPISpec) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - msglen |= (int(b) & 0x7F) << shift + msglen |= int(b&0x7F) << shift if b < 0x80 { break } @@ -1038,6 +1225,9 @@ func (m *HTTPAPISpec) Unmarshal(dAtA []byte) error { return ErrInvalidLengthApiSpec } postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthApiSpec + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -1060,7 +1250,7 @@ func (m *HTTPAPISpec) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - msglen |= (int(b) & 0x7F) << shift + msglen |= int(b&0x7F) << shift if b < 0x80 { break } @@ -1069,6 +1259,9 @@ func (m *HTTPAPISpec) Unmarshal(dAtA []byte) error { return ErrInvalidLengthApiSpec } postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthApiSpec + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -1086,6 +1279,9 @@ func (m *HTTPAPISpec) Unmarshal(dAtA []byte) error { if skippy < 0 { return ErrInvalidLengthApiSpec } + if (iNdEx + skippy) < 0 { + return ErrInvalidLengthApiSpec + } if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF } @@ -1113,7 +1309,7 @@ func (m *HTTPAPISpecPattern) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - wire |= (uint64(b) & 0x7F) << shift + wire |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -1141,7 +1337,7 @@ func (m *HTTPAPISpecPattern) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - msglen |= (int(b) & 0x7F) << shift + msglen |= int(b&0x7F) << shift if b < 0x80 { break } @@ -1150,11 +1346,14 @@ func (m *HTTPAPISpecPattern) Unmarshal(dAtA []byte) error { return ErrInvalidLengthApiSpec } postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthApiSpec + } if postIndex > l { return io.ErrUnexpectedEOF } if m.Attributes == nil { - m.Attributes = &istio_mixer_v1.Attributes{} + m.Attributes = &v1.Attributes{} } if err := m.Attributes.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err @@ -1174,7 +1373,7 @@ func (m *HTTPAPISpecPattern) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLen |= (uint64(b) & 0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -1184,6 +1383,9 @@ func (m *HTTPAPISpecPattern) Unmarshal(dAtA []byte) error { return ErrInvalidLengthApiSpec } postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthApiSpec + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -1203,7 +1405,7 @@ func (m *HTTPAPISpecPattern) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLen |= (uint64(b) & 0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -1213,6 +1415,9 @@ func (m *HTTPAPISpecPattern) Unmarshal(dAtA []byte) error { return ErrInvalidLengthApiSpec } postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthApiSpec + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -1232,7 +1437,7 @@ func (m *HTTPAPISpecPattern) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLen |= (uint64(b) & 0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -1242,6 +1447,9 @@ func (m *HTTPAPISpecPattern) Unmarshal(dAtA []byte) error { return ErrInvalidLengthApiSpec } postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthApiSpec + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -1256,6 +1464,9 @@ func (m *HTTPAPISpecPattern) Unmarshal(dAtA []byte) error { if skippy < 0 { return ErrInvalidLengthApiSpec } + if (iNdEx + skippy) < 0 { + return ErrInvalidLengthApiSpec + } if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF } @@ -1283,7 +1494,7 @@ func (m *APIKey) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - wire |= (uint64(b) & 0x7F) << shift + wire |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -1311,7 +1522,7 @@ func (m *APIKey) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLen |= (uint64(b) & 0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -1321,6 +1532,9 @@ func (m *APIKey) Unmarshal(dAtA []byte) error { return ErrInvalidLengthApiSpec } postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthApiSpec + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -1340,7 +1554,7 @@ func (m *APIKey) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLen |= (uint64(b) & 0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -1350,6 +1564,9 @@ func (m *APIKey) Unmarshal(dAtA []byte) error { return ErrInvalidLengthApiSpec } postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthApiSpec + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -1369,7 +1586,7 @@ func (m *APIKey) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLen |= (uint64(b) & 0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -1379,6 +1596,9 @@ func (m *APIKey) Unmarshal(dAtA []byte) error { return ErrInvalidLengthApiSpec } postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthApiSpec + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -1393,6 +1613,9 @@ func (m *APIKey) Unmarshal(dAtA []byte) error { if skippy < 0 { return ErrInvalidLengthApiSpec } + if (iNdEx + skippy) < 0 { + return ErrInvalidLengthApiSpec + } if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF } @@ -1420,7 +1643,7 @@ func (m *HTTPAPISpecReference) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - wire |= (uint64(b) & 0x7F) << shift + wire |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -1448,7 +1671,7 @@ func (m *HTTPAPISpecReference) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLen |= (uint64(b) & 0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -1458,6 +1681,9 @@ func (m *HTTPAPISpecReference) Unmarshal(dAtA []byte) error { return ErrInvalidLengthApiSpec } postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthApiSpec + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -1477,7 +1703,7 @@ func (m *HTTPAPISpecReference) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLen |= (uint64(b) & 0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -1487,6 +1713,9 @@ func (m *HTTPAPISpecReference) Unmarshal(dAtA []byte) error { return ErrInvalidLengthApiSpec } postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthApiSpec + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -1501,6 +1730,9 @@ func (m *HTTPAPISpecReference) Unmarshal(dAtA []byte) error { if skippy < 0 { return ErrInvalidLengthApiSpec } + if (iNdEx + skippy) < 0 { + return ErrInvalidLengthApiSpec + } if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF } @@ -1528,7 +1760,7 @@ func (m *HTTPAPISpecBinding) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - wire |= (uint64(b) & 0x7F) << shift + wire |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -1556,7 +1788,7 @@ func (m *HTTPAPISpecBinding) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - msglen |= (int(b) & 0x7F) << shift + msglen |= int(b&0x7F) << shift if b < 0x80 { break } @@ -1565,6 +1797,9 @@ func (m *HTTPAPISpecBinding) Unmarshal(dAtA []byte) error { return ErrInvalidLengthApiSpec } postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthApiSpec + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -1587,7 +1822,7 @@ func (m *HTTPAPISpecBinding) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - msglen |= (int(b) & 0x7F) << shift + msglen |= int(b&0x7F) << shift if b < 0x80 { break } @@ -1596,6 +1831,9 @@ func (m *HTTPAPISpecBinding) Unmarshal(dAtA []byte) error { return ErrInvalidLengthApiSpec } postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthApiSpec + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -1613,6 +1851,9 @@ func (m *HTTPAPISpecBinding) Unmarshal(dAtA []byte) error { if skippy < 0 { return ErrInvalidLengthApiSpec } + if (iNdEx + skippy) < 0 { + return ErrInvalidLengthApiSpec + } if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF } @@ -1679,10 +1920,13 @@ func skipApiSpec(dAtA []byte) (n int, err error) { break } } - iNdEx += length if length < 0 { return 0, ErrInvalidLengthApiSpec } + iNdEx += length + if iNdEx < 0 { + return 0, ErrInvalidLengthApiSpec + } return iNdEx, nil case 3: for { @@ -1711,6 +1955,9 @@ func skipApiSpec(dAtA []byte) (n int, err error) { return 0, err } iNdEx = start + next + if iNdEx < 0 { + return 0, ErrInvalidLengthApiSpec + } } return iNdEx, nil case 4: @@ -1729,42 +1976,3 @@ var ( ErrInvalidLengthApiSpec = fmt.Errorf("proto: negative length found during unmarshaling") ErrIntOverflowApiSpec = fmt.Errorf("proto: integer overflow") ) - -func init() { proto.RegisterFile("mixer/v1/config/client/api_spec.proto", fileDescriptorApiSpec) } - -var fileDescriptorApiSpec = []byte{ - // 517 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x53, 0xbd, 0x6e, 0x13, 0x41, - 0x10, 0xbe, 0x8d, 0xf3, 0x63, 0x8f, 0xa9, 0x56, 0x11, 0x3a, 0xac, 0x68, 0xb1, 0x9c, 0x20, 0x59, - 0x14, 0x77, 0xc4, 0x74, 0x34, 0xc8, 0x2e, 0x90, 0xad, 0x80, 0xb0, 0x36, 0xa6, 0x81, 0xc2, 0xba, - 0x9c, 0x27, 0xf6, 0xca, 0xf1, 0xed, 0xb1, 0xb7, 0xb6, 0xe2, 0x8e, 0x47, 0xe0, 0x31, 0x68, 0x78, - 0x00, 0xde, 0x20, 0x65, 0xca, 0x94, 0xf8, 0x68, 0x28, 0xf3, 0x08, 0x68, 0x6f, 0x2f, 0xb6, 0xf9, - 0xb3, 0x90, 0xa8, 0xee, 0x66, 0xe6, 0x9b, 0xf9, 0xe6, 0x9b, 0x9d, 0x81, 0x47, 0x13, 0x71, 0x89, - 0xca, 0x9f, 0x1d, 0xfb, 0xa1, 0x8c, 0xce, 0xc5, 0xd0, 0x0f, 0x2f, 0x04, 0x46, 0xda, 0x0f, 0x62, - 0xd1, 0x4f, 0x62, 0x0c, 0xbd, 0x58, 0x49, 0x2d, 0xe9, 0x81, 0x48, 0xb4, 0x90, 0x5e, 0x06, 0xf6, - 0x66, 0xc7, 0x9e, 0x05, 0x7b, 0x16, 0x5c, 0xd9, 0x1f, 0xca, 0xa1, 0xcc, 0x80, 0xbe, 0xf9, 0xb3, - 0x39, 0x95, 0x07, 0xcb, 0xd2, 0x81, 0xd6, 0x4a, 0x9c, 0x4d, 0x35, 0x26, 0x79, 0xe8, 0xe8, 0x2f, - 0xac, 0x09, 0xaa, 0x99, 0x08, 0xd1, 0xa2, 0x6a, 0x37, 0x04, 0xca, 0xed, 0x5e, 0xaf, 0xdb, 0xec, - 0x76, 0x4e, 0x63, 0x0c, 0xe9, 0x33, 0x80, 0x55, 0x25, 0x97, 0x54, 0x49, 0xbd, 0xdc, 0xa8, 0x78, - 0xbf, 0x74, 0xd6, 0x5c, 0x22, 0xf8, 0x1a, 0x9a, 0xbe, 0x84, 0x62, 0x1c, 0x68, 0x8d, 0x2a, 0x4a, - 0xdc, 0xad, 0x6a, 0xa1, 0x5e, 0x6e, 0x3c, 0xf1, 0x36, 0x69, 0xf2, 0xd6, 0x88, 0xbb, 0x36, 0x91, - 0x2f, 0x2b, 0xd0, 0xe7, 0x50, 0x34, 0x03, 0x1a, 0xe3, 0x3c, 0x71, 0x0b, 0x59, 0xb5, 0xa3, 0xcd, - 0xd5, 0x9a, 0xdd, 0xce, 0x09, 0xce, 0xf9, 0x5e, 0x10, 0x8b, 0x13, 0x9c, 0x27, 0xb5, 0x2f, 0x04, - 0xe8, 0xef, 0x0c, 0xff, 0xa5, 0xf0, 0x21, 0x94, 0x47, 0x5a, 0xc7, 0xfd, 0x09, 0xea, 0x91, 0x1c, - 0xb8, 0x5b, 0x55, 0x52, 0x2f, 0x71, 0x30, 0xae, 0x57, 0x99, 0x87, 0x1e, 0xc2, 0xbd, 0xa9, 0x12, - 0x7d, 0x8d, 0x93, 0xf8, 0x22, 0xd0, 0xe8, 0x16, 0x0c, 0xa2, 0xed, 0xf0, 0xf2, 0x54, 0x89, 0x5e, - 0xee, 0xa4, 0xf7, 0x61, 0x47, 0xe1, 0x10, 0x2f, 0xdd, 0xed, 0x3c, 0x6a, 0xcd, 0x56, 0x09, 0xf6, - 0x72, 0xf5, 0xb5, 0x77, 0xb0, 0x6b, 0xe5, 0x18, 0xf0, 0xfb, 0x29, 0xaa, 0x79, 0xd6, 0x69, 0x06, - 0xce, 0x4c, 0xea, 0xc2, 0xee, 0x08, 0x83, 0x01, 0x2a, 0xdb, 0x45, 0xdb, 0xe1, 0xb9, 0x6d, 0x22, - 0xa1, 0x94, 0x63, 0xb1, 0x62, 0xcf, 0xed, 0xd6, 0x0e, 0x14, 0xc6, 0x38, 0xaf, 0xb5, 0x61, 0x7f, - 0x6d, 0x2e, 0x1c, 0xcf, 0x51, 0x61, 0x14, 0x22, 0xa5, 0xb0, 0x1d, 0x05, 0x13, 0xb4, 0x4c, 0x3c, - 0xfb, 0xa7, 0x07, 0x50, 0x32, 0xdf, 0x24, 0x0e, 0x42, 0xcc, 0xf5, 0xae, 0x1c, 0xb5, 0xcf, 0x3f, - 0x8f, 0xb8, 0x25, 0xa2, 0x81, 0x88, 0x86, 0xf4, 0x05, 0x14, 0xf3, 0x2d, 0x33, 0x03, 0x36, 0x4f, - 0xf7, 0x78, 0xf3, 0xd3, 0x75, 0x4c, 0xf0, 0xd4, 0xa6, 0xf0, 0x65, 0x2e, 0x7d, 0x0d, 0xa5, 0xbb, - 0x1b, 0xb9, 0xdb, 0xa8, 0xc6, 0x3f, 0x6f, 0xd4, 0x52, 0x17, 0x37, 0x7b, 0x64, 0x3c, 0x49, 0xeb, - 0xcd, 0xd5, 0x82, 0x39, 0xd7, 0x0b, 0xe6, 0xdc, 0x2c, 0x98, 0x73, 0xbb, 0x60, 0xce, 0x87, 0x94, - 0x91, 0x4f, 0x29, 0x73, 0xae, 0x52, 0x46, 0xae, 0x53, 0x46, 0xbe, 0xa6, 0x8c, 0x7c, 0x4f, 0x99, - 0x73, 0x9b, 0x32, 0xf2, 0xf1, 0x1b, 0x73, 0xde, 0x1e, 0x5a, 0x3a, 0x21, 0xcd, 0xb5, 0xfa, 0x7f, - 0x3e, 0xa9, 0xb3, 0xdd, 0xec, 0x96, 0x9e, 0xfe, 0x08, 0x00, 0x00, 0xff, 0xff, 0xd9, 0xe5, 0x31, - 0x31, 0xe9, 0x03, 0x00, 0x00, -} diff --git a/mixer/v1/config/client/client_config.pb.go b/mixer/v1/config/client/client_config.pb.go index dee422b03a8..b6b85b74966 100644 --- a/mixer/v1/config/client/client_config.pb.go +++ b/mixer/v1/config/client/client_config.pb.go @@ -3,26 +3,31 @@ package client -import proto "github.com/gogo/protobuf/proto" -import fmt "fmt" -import math "math" -import _ "github.com/gogo/protobuf/gogoproto" -import google_protobuf1 "github.com/gogo/protobuf/types" -import istio_mixer_v1 "istio.io/api/mixer/v1" - -import strconv "strconv" - -import strings "strings" -import reflect "reflect" -import sortkeys "github.com/gogo/protobuf/sortkeys" - -import io "io" +import ( + fmt "fmt" + _ "github.com/gogo/protobuf/gogoproto" + proto "github.com/gogo/protobuf/proto" + github_com_gogo_protobuf_sortkeys "github.com/gogo/protobuf/sortkeys" + types "github.com/gogo/protobuf/types" + io "io" + v1 "istio.io/api/mixer/v1" + math "math" + reflect "reflect" + strconv "strconv" + strings "strings" +) // Reference imports to suppress errors if they are not otherwise used. var _ = proto.Marshal var _ = fmt.Errorf var _ = math.Inf +// This is a compile-time assertion to ensure that this generated file +// is compatible with the proto package it is being compiled against. +// A compilation error at this line likely means your copy of the +// proto package needs to be updated. +const _ = proto.GoGoProtoPackageIsVersion2 // please upgrade the proto package + // Describes the policy. type NetworkFailPolicy_FailPolicy int32 @@ -38,13 +43,14 @@ var NetworkFailPolicy_FailPolicy_name = map[int32]string{ 0: "FAIL_OPEN", 1: "FAIL_CLOSE", } + var NetworkFailPolicy_FailPolicy_value = map[string]int32{ "FAIL_OPEN": 0, "FAIL_CLOSE": 1, } func (NetworkFailPolicy_FailPolicy) EnumDescriptor() ([]byte, []int) { - return fileDescriptorClientConfig, []int{0, 0} + return fileDescriptor_27bf0dec365e2f6f, []int{0, 0} } // Specifies the behavior when the client is unable to connect to Mixer. @@ -55,14 +61,42 @@ type NetworkFailPolicy struct { MaxRetry uint32 `protobuf:"varint,2,opt,name=max_retry,json=maxRetry,proto3" json:"max_retry,omitempty"` // Base time to wait between retries. Will be adjusted by exponential // backoff and jitter. - BaseRetryWait *google_protobuf1.Duration `protobuf:"bytes,3,opt,name=base_retry_wait,json=baseRetryWait" json:"base_retry_wait,omitempty"` + BaseRetryWait *types.Duration `protobuf:"bytes,3,opt,name=base_retry_wait,json=baseRetryWait,proto3" json:"base_retry_wait,omitempty"` // Max time to wait between retries. - MaxRetryWait *google_protobuf1.Duration `protobuf:"bytes,4,opt,name=max_retry_wait,json=maxRetryWait" json:"max_retry_wait,omitempty"` + MaxRetryWait *types.Duration `protobuf:"bytes,4,opt,name=max_retry_wait,json=maxRetryWait,proto3" json:"max_retry_wait,omitempty"` +} + +func (m *NetworkFailPolicy) Reset() { *m = NetworkFailPolicy{} } +func (*NetworkFailPolicy) ProtoMessage() {} +func (*NetworkFailPolicy) Descriptor() ([]byte, []int) { + return fileDescriptor_27bf0dec365e2f6f, []int{0} +} +func (m *NetworkFailPolicy) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *NetworkFailPolicy) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_NetworkFailPolicy.Marshal(b, m, deterministic) + } else { + b = b[:cap(b)] + n, err := m.MarshalTo(b) + if err != nil { + return nil, err + } + return b[:n], nil + } +} +func (m *NetworkFailPolicy) XXX_Merge(src proto.Message) { + xxx_messageInfo_NetworkFailPolicy.Merge(m, src) +} +func (m *NetworkFailPolicy) XXX_Size() int { + return m.Size() +} +func (m *NetworkFailPolicy) XXX_DiscardUnknown() { + xxx_messageInfo_NetworkFailPolicy.DiscardUnknown(m) } -func (m *NetworkFailPolicy) Reset() { *m = NetworkFailPolicy{} } -func (*NetworkFailPolicy) ProtoMessage() {} -func (*NetworkFailPolicy) Descriptor() ([]byte, []int) { return fileDescriptorClientConfig, []int{0} } +var xxx_messageInfo_NetworkFailPolicy proto.InternalMessageInfo // Defines the per-service client configuration. type ServiceConfig struct { @@ -74,16 +108,16 @@ type ServiceConfig struct { // typically includes the "destination.service" attribute. // In case of a per-route override, per-route attributes take precedence // over the attributes supplied in the client configuration. - MixerAttributes *istio_mixer_v1.Attributes `protobuf:"bytes,3,opt,name=mixer_attributes,json=mixerAttributes" json:"mixer_attributes,omitempty"` + MixerAttributes *v1.Attributes `protobuf:"bytes,3,opt,name=mixer_attributes,json=mixerAttributes,proto3" json:"mixer_attributes,omitempty"` // HTTP API specifications to generate API attributes. - HttpApiSpec []*HTTPAPISpec `protobuf:"bytes,4,rep,name=http_api_spec,json=httpApiSpec" json:"http_api_spec,omitempty"` + HttpApiSpec []*HTTPAPISpec `protobuf:"bytes,4,rep,name=http_api_spec,json=httpApiSpec,proto3" json:"http_api_spec,omitempty"` // Quota specifications to generate quota requirements. - QuotaSpec []*QuotaSpec `protobuf:"bytes,5,rep,name=quota_spec,json=quotaSpec" json:"quota_spec,omitempty"` + QuotaSpec []*QuotaSpec `protobuf:"bytes,5,rep,name=quota_spec,json=quotaSpec,proto3" json:"quota_spec,omitempty"` // Specifies the behavior when the client is unable to connect to Mixer. // This is the service-level policy. It overrides // [mesh-level // policy][istio.mixer.v1.config.client.TransportConfig.network_fail_policy]. - NetworkFailPolicy *NetworkFailPolicy `protobuf:"bytes,7,opt,name=network_fail_policy,json=networkFailPolicy" json:"network_fail_policy,omitempty"` + NetworkFailPolicy *NetworkFailPolicy `protobuf:"bytes,7,opt,name=network_fail_policy,json=networkFailPolicy,proto3" json:"network_fail_policy,omitempty"` // Default attributes to forward to upstream. This typically // includes the "source.ip" and "source.uid" attributes. // In case of a per-route override, per-route attributes take precedence @@ -96,12 +130,40 @@ type ServiceConfig struct { // 3. forwarded attributes from the source filter config (if any); // 4. forwarded attributes from the source route config (if any); // 5. derived attributes from the request metadata. - ForwardAttributes *istio_mixer_v1.Attributes `protobuf:"bytes,8,opt,name=forward_attributes,json=forwardAttributes" json:"forward_attributes,omitempty"` + ForwardAttributes *v1.Attributes `protobuf:"bytes,8,opt,name=forward_attributes,json=forwardAttributes,proto3" json:"forward_attributes,omitempty"` +} + +func (m *ServiceConfig) Reset() { *m = ServiceConfig{} } +func (*ServiceConfig) ProtoMessage() {} +func (*ServiceConfig) Descriptor() ([]byte, []int) { + return fileDescriptor_27bf0dec365e2f6f, []int{1} +} +func (m *ServiceConfig) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *ServiceConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_ServiceConfig.Marshal(b, m, deterministic) + } else { + b = b[:cap(b)] + n, err := m.MarshalTo(b) + if err != nil { + return nil, err + } + return b[:n], nil + } +} +func (m *ServiceConfig) XXX_Merge(src proto.Message) { + xxx_messageInfo_ServiceConfig.Merge(m, src) +} +func (m *ServiceConfig) XXX_Size() int { + return m.Size() +} +func (m *ServiceConfig) XXX_DiscardUnknown() { + xxx_messageInfo_ServiceConfig.DiscardUnknown(m) } -func (m *ServiceConfig) Reset() { *m = ServiceConfig{} } -func (*ServiceConfig) ProtoMessage() {} -func (*ServiceConfig) Descriptor() ([]byte, []int) { return fileDescriptorClientConfig, []int{1} } +var xxx_messageInfo_ServiceConfig proto.InternalMessageInfo // Defines the transport config on how to call Mixer. type TransportConfig struct { @@ -113,10 +175,10 @@ type TransportConfig struct { DisableReportBatch bool `protobuf:"varint,3,opt,name=disable_report_batch,json=disableReportBatch,proto3" json:"disable_report_batch,omitempty"` // Specifies the behavior when the client is unable to connect to Mixer. // This is the mesh level policy. The default value for policy is FAIL_OPEN. - NetworkFailPolicy *NetworkFailPolicy `protobuf:"bytes,4,opt,name=network_fail_policy,json=networkFailPolicy" json:"network_fail_policy,omitempty"` + NetworkFailPolicy *NetworkFailPolicy `protobuf:"bytes,4,opt,name=network_fail_policy,json=networkFailPolicy,proto3" json:"network_fail_policy,omitempty"` // Specify refresh interval to write mixer client statistics to Envoy share // memory. If not specified, the interval is 10 seconds. - StatsUpdateInterval *google_protobuf1.Duration `protobuf:"bytes,5,opt,name=stats_update_interval,json=statsUpdateInterval" json:"stats_update_interval,omitempty"` + StatsUpdateInterval *types.Duration `protobuf:"bytes,5,opt,name=stats_update_interval,json=statsUpdateInterval,proto3" json:"stats_update_interval,omitempty"` // Name of the cluster that will forward check calls to a pool of mixer // servers. Defaults to "mixer_server". By using different names for // checkCluster and reportCluster, it is possible to have one set of @@ -138,70 +200,224 @@ type TransportConfig struct { // Default attributes to forward to mixer upstream. This typically // includes the "source.ip" and "source.uid" attributes. These // attributes are consumed by the proxy in front of mixer. - AttributesForMixerProxy *istio_mixer_v1.Attributes `protobuf:"bytes,8,opt,name=attributes_for_mixer_proxy,json=attributesForMixerProxy" json:"attributes_for_mixer_proxy,omitempty"` + AttributesForMixerProxy *v1.Attributes `protobuf:"bytes,8,opt,name=attributes_for_mixer_proxy,json=attributesForMixerProxy,proto3" json:"attributes_for_mixer_proxy,omitempty"` +} + +func (m *TransportConfig) Reset() { *m = TransportConfig{} } +func (*TransportConfig) ProtoMessage() {} +func (*TransportConfig) Descriptor() ([]byte, []int) { + return fileDescriptor_27bf0dec365e2f6f, []int{2} +} +func (m *TransportConfig) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *TransportConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_TransportConfig.Marshal(b, m, deterministic) + } else { + b = b[:cap(b)] + n, err := m.MarshalTo(b) + if err != nil { + return nil, err + } + return b[:n], nil + } +} +func (m *TransportConfig) XXX_Merge(src proto.Message) { + xxx_messageInfo_TransportConfig.Merge(m, src) +} +func (m *TransportConfig) XXX_Size() int { + return m.Size() +} +func (m *TransportConfig) XXX_DiscardUnknown() { + xxx_messageInfo_TransportConfig.DiscardUnknown(m) } -func (m *TransportConfig) Reset() { *m = TransportConfig{} } -func (*TransportConfig) ProtoMessage() {} -func (*TransportConfig) Descriptor() ([]byte, []int) { return fileDescriptorClientConfig, []int{2} } +var xxx_messageInfo_TransportConfig proto.InternalMessageInfo // Defines the client config for HTTP. type HttpClientConfig struct { // The transport config. - Transport *TransportConfig `protobuf:"bytes,1,opt,name=transport" json:"transport,omitempty"` + Transport *TransportConfig `protobuf:"bytes,1,opt,name=transport,proto3" json:"transport,omitempty"` // Map of control configuration indexed by destination.service. This // is used to support per-service configuration for cases where a // mixerclient serves multiple services. - ServiceConfigs map[string]*ServiceConfig `protobuf:"bytes,2,rep,name=service_configs,json=serviceConfigs" json:"service_configs,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value"` + ServiceConfigs map[string]*ServiceConfig `protobuf:"bytes,2,rep,name=service_configs,json=serviceConfigs,proto3" json:"service_configs,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` // Default destination service name if none was specified in the // client request. DefaultDestinationService string `protobuf:"bytes,3,opt,name=default_destination_service,json=defaultDestinationService,proto3" json:"default_destination_service,omitempty"` // Default attributes to send to Mixer in both Check and // Report. This typically includes "destination.ip" and // "destination.uid" attributes. - MixerAttributes *istio_mixer_v1.Attributes `protobuf:"bytes,4,opt,name=mixer_attributes,json=mixerAttributes" json:"mixer_attributes,omitempty"` + MixerAttributes *v1.Attributes `protobuf:"bytes,4,opt,name=mixer_attributes,json=mixerAttributes,proto3" json:"mixer_attributes,omitempty"` // Default attributes to forward to upstream. This typically // includes the "source.ip" and "source.uid" attributes. - ForwardAttributes *istio_mixer_v1.Attributes `protobuf:"bytes,5,opt,name=forward_attributes,json=forwardAttributes" json:"forward_attributes,omitempty"` + ForwardAttributes *v1.Attributes `protobuf:"bytes,5,opt,name=forward_attributes,json=forwardAttributes,proto3" json:"forward_attributes,omitempty"` } -func (m *HttpClientConfig) Reset() { *m = HttpClientConfig{} } -func (*HttpClientConfig) ProtoMessage() {} -func (*HttpClientConfig) Descriptor() ([]byte, []int) { return fileDescriptorClientConfig, []int{3} } +func (m *HttpClientConfig) Reset() { *m = HttpClientConfig{} } +func (*HttpClientConfig) ProtoMessage() {} +func (*HttpClientConfig) Descriptor() ([]byte, []int) { + return fileDescriptor_27bf0dec365e2f6f, []int{3} +} +func (m *HttpClientConfig) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *HttpClientConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_HttpClientConfig.Marshal(b, m, deterministic) + } else { + b = b[:cap(b)] + n, err := m.MarshalTo(b) + if err != nil { + return nil, err + } + return b[:n], nil + } +} +func (m *HttpClientConfig) XXX_Merge(src proto.Message) { + xxx_messageInfo_HttpClientConfig.Merge(m, src) +} +func (m *HttpClientConfig) XXX_Size() int { + return m.Size() +} +func (m *HttpClientConfig) XXX_DiscardUnknown() { + xxx_messageInfo_HttpClientConfig.DiscardUnknown(m) +} + +var xxx_messageInfo_HttpClientConfig proto.InternalMessageInfo // Defines the client config for TCP. type TcpClientConfig struct { // The transport config. - Transport *TransportConfig `protobuf:"bytes,1,opt,name=transport" json:"transport,omitempty"` + Transport *TransportConfig `protobuf:"bytes,1,opt,name=transport,proto3" json:"transport,omitempty"` // Default attributes to send to Mixer in both Check and // Report. This typically includes "destination.ip" and // "destination.uid" attributes. - MixerAttributes *istio_mixer_v1.Attributes `protobuf:"bytes,2,opt,name=mixer_attributes,json=mixerAttributes" json:"mixer_attributes,omitempty"` + MixerAttributes *v1.Attributes `protobuf:"bytes,2,opt,name=mixer_attributes,json=mixerAttributes,proto3" json:"mixer_attributes,omitempty"` // If set to true, disables mixer check calls. DisableCheckCalls bool `protobuf:"varint,3,opt,name=disable_check_calls,json=disableCheckCalls,proto3" json:"disable_check_calls,omitempty"` // If set to true, disables mixer check calls. DisableReportCalls bool `protobuf:"varint,4,opt,name=disable_report_calls,json=disableReportCalls,proto3" json:"disable_report_calls,omitempty"` // Quota specifications to generate quota requirements. // It applies on the new TCP connections. - ConnectionQuotaSpec *QuotaSpec `protobuf:"bytes,5,opt,name=connection_quota_spec,json=connectionQuotaSpec" json:"connection_quota_spec,omitempty"` + ConnectionQuotaSpec *QuotaSpec `protobuf:"bytes,5,opt,name=connection_quota_spec,json=connectionQuotaSpec,proto3" json:"connection_quota_spec,omitempty"` // Specify report interval to send periodical reports for long TCP // connections. If not specified, the interval is 10 seconds. This interval // should not be less than 1 second, otherwise it will be reset to 1 second. - ReportInterval *google_protobuf1.Duration `protobuf:"bytes,6,opt,name=report_interval,json=reportInterval" json:"report_interval,omitempty"` + ReportInterval *types.Duration `protobuf:"bytes,6,opt,name=report_interval,json=reportInterval,proto3" json:"report_interval,omitempty"` } -func (m *TcpClientConfig) Reset() { *m = TcpClientConfig{} } -func (*TcpClientConfig) ProtoMessage() {} -func (*TcpClientConfig) Descriptor() ([]byte, []int) { return fileDescriptorClientConfig, []int{4} } +func (m *TcpClientConfig) Reset() { *m = TcpClientConfig{} } +func (*TcpClientConfig) ProtoMessage() {} +func (*TcpClientConfig) Descriptor() ([]byte, []int) { + return fileDescriptor_27bf0dec365e2f6f, []int{4} +} +func (m *TcpClientConfig) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *TcpClientConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_TcpClientConfig.Marshal(b, m, deterministic) + } else { + b = b[:cap(b)] + n, err := m.MarshalTo(b) + if err != nil { + return nil, err + } + return b[:n], nil + } +} +func (m *TcpClientConfig) XXX_Merge(src proto.Message) { + xxx_messageInfo_TcpClientConfig.Merge(m, src) +} +func (m *TcpClientConfig) XXX_Size() int { + return m.Size() +} +func (m *TcpClientConfig) XXX_DiscardUnknown() { + xxx_messageInfo_TcpClientConfig.DiscardUnknown(m) +} + +var xxx_messageInfo_TcpClientConfig proto.InternalMessageInfo func init() { + proto.RegisterEnum("istio.mixer.v1.config.client.NetworkFailPolicy_FailPolicy", NetworkFailPolicy_FailPolicy_name, NetworkFailPolicy_FailPolicy_value) proto.RegisterType((*NetworkFailPolicy)(nil), "istio.mixer.v1.config.client.NetworkFailPolicy") proto.RegisterType((*ServiceConfig)(nil), "istio.mixer.v1.config.client.ServiceConfig") proto.RegisterType((*TransportConfig)(nil), "istio.mixer.v1.config.client.TransportConfig") proto.RegisterType((*HttpClientConfig)(nil), "istio.mixer.v1.config.client.HttpClientConfig") + proto.RegisterMapType((map[string]*ServiceConfig)(nil), "istio.mixer.v1.config.client.HttpClientConfig.ServiceConfigsEntry") proto.RegisterType((*TcpClientConfig)(nil), "istio.mixer.v1.config.client.TcpClientConfig") - proto.RegisterEnum("istio.mixer.v1.config.client.NetworkFailPolicy_FailPolicy", NetworkFailPolicy_FailPolicy_name, NetworkFailPolicy_FailPolicy_value) } + +func init() { + proto.RegisterFile("mixer/v1/config/client/client_config.proto", fileDescriptor_27bf0dec365e2f6f) +} + +var fileDescriptor_27bf0dec365e2f6f = []byte{ + // 954 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x56, 0x4d, 0x6f, 0x1a, 0x47, + 0x18, 0xde, 0x05, 0xec, 0x98, 0x71, 0xf8, 0xf0, 0x90, 0xa8, 0x98, 0x54, 0x2b, 0x44, 0x14, 0x95, + 0x36, 0xea, 0xd2, 0xd0, 0x4b, 0x95, 0x43, 0x2b, 0x4c, 0x6c, 0xc5, 0x6a, 0x9c, 0xd0, 0xb5, 0xab, + 0x48, 0xad, 0xaa, 0xd1, 0xb0, 0x0c, 0x30, 0xf2, 0x7a, 0x67, 0x33, 0x3b, 0x60, 0xfb, 0xd6, 0x5f, + 0x50, 0xf5, 0x67, 0xe4, 0x0f, 0xf4, 0x3f, 0xe4, 0xe8, 0x63, 0x8e, 0x35, 0xbe, 0xf4, 0x98, 0x63, + 0xa5, 0x5e, 0xaa, 0x9d, 0x19, 0x58, 0x63, 0xf3, 0x51, 0xaa, 0xf6, 0xc4, 0xec, 0xfb, 0x3e, 0xcf, + 0xcb, 0xec, 0xf3, 0x3e, 0xf3, 0xce, 0x82, 0xcf, 0x4e, 0xe8, 0x19, 0xe1, 0xb5, 0xe1, 0x93, 0x9a, + 0xcb, 0xfc, 0x2e, 0xed, 0xd5, 0x5c, 0x8f, 0x12, 0x5f, 0xe8, 0x1f, 0xa4, 0x82, 0x76, 0xc0, 0x99, + 0x60, 0xf0, 0x63, 0x1a, 0x0a, 0xca, 0x6c, 0xc9, 0xb0, 0x87, 0x4f, 0x6c, 0x9d, 0x54, 0xd0, 0xd2, + 0xbd, 0x1e, 0xeb, 0x31, 0x09, 0xac, 0x45, 0x2b, 0xc5, 0x29, 0x59, 0x3d, 0xc6, 0x7a, 0x1e, 0xa9, + 0xc9, 0xa7, 0xf6, 0xa0, 0x5b, 0xeb, 0x0c, 0x38, 0x16, 0x94, 0xf9, 0x3a, 0xbf, 0x3d, 0xf9, 0x7f, + 0x2c, 0x04, 0xa7, 0xed, 0x81, 0x20, 0xa1, 0x4e, 0x3d, 0x9a, 0xb3, 0x35, 0x1c, 0x50, 0x14, 0x06, + 0xc4, 0xd5, 0xb0, 0xca, 0x1c, 0xd8, 0x9b, 0x01, 0x13, 0x58, 0x61, 0x2a, 0xbf, 0x25, 0xc0, 0xd6, + 0x4b, 0x22, 0x4e, 0x19, 0x3f, 0xde, 0xc3, 0xd4, 0x6b, 0x31, 0x8f, 0xba, 0xe7, 0xd0, 0x01, 0xeb, + 0x81, 0x5c, 0x15, 0xcd, 0xb2, 0x59, 0xcd, 0xd6, 0x9f, 0xda, 0x8b, 0x5e, 0xd0, 0xbe, 0x55, 0xc0, + 0x8e, 0x97, 0x8e, 0xae, 0x04, 0x1f, 0x80, 0xf4, 0x09, 0x3e, 0x43, 0x9c, 0x08, 0x7e, 0x5e, 0x4c, + 0x94, 0xcd, 0x6a, 0xc6, 0xd9, 0x38, 0xc1, 0x67, 0x4e, 0xf4, 0x0c, 0x1b, 0x20, 0xd7, 0xc6, 0x21, + 0x51, 0x59, 0x74, 0x8a, 0xa9, 0x28, 0x26, 0xcb, 0x66, 0x75, 0xb3, 0xbe, 0x6d, 0x2b, 0x99, 0xec, + 0xb1, 0x4c, 0xf6, 0x33, 0x2d, 0x93, 0x93, 0x89, 0x18, 0x92, 0xfe, 0x1a, 0x53, 0x01, 0xbf, 0x01, + 0xd9, 0x49, 0x7d, 0x55, 0x21, 0xb5, 0xac, 0xc2, 0xdd, 0xf1, 0xff, 0x47, 0x05, 0x2a, 0x8f, 0x01, + 0xb8, 0x26, 0x41, 0x06, 0xa4, 0xf7, 0x1a, 0xfb, 0x2f, 0xd0, 0xab, 0xd6, 0xee, 0xcb, 0xbc, 0x01, + 0xb3, 0x00, 0xc8, 0xc7, 0xe6, 0x8b, 0x57, 0x87, 0xbb, 0x79, 0xb3, 0xf2, 0x57, 0x12, 0x64, 0x0e, + 0x09, 0x1f, 0x52, 0x97, 0x34, 0xa5, 0x16, 0xd0, 0x06, 0x85, 0x0e, 0x0d, 0x71, 0xdb, 0x23, 0xc8, + 0xed, 0x13, 0xf7, 0x18, 0xb9, 0xd8, 0xf3, 0x42, 0x29, 0xe0, 0x86, 0xb3, 0xa5, 0x53, 0xcd, 0x28, + 0xd3, 0x8c, 0x12, 0xf0, 0x0b, 0x70, 0x6f, 0x8c, 0xe7, 0x24, 0x60, 0x5c, 0x68, 0x42, 0x42, 0x12, + 0xa0, 0xce, 0x39, 0x32, 0xa5, 0x18, 0xbb, 0x20, 0x2f, 0x1b, 0x80, 0x62, 0x43, 0x68, 0x95, 0x4a, + 0x37, 0xfb, 0xd3, 0x98, 0x20, 0x9c, 0x9c, 0x0c, 0xc6, 0x01, 0x78, 0x00, 0x32, 0x7d, 0x21, 0x02, + 0x34, 0x76, 0x4b, 0x31, 0x55, 0x4e, 0x56, 0x37, 0xeb, 0x9f, 0x2e, 0xee, 0xf1, 0xf3, 0xa3, 0xa3, + 0x56, 0xa3, 0xb5, 0x7f, 0x18, 0x10, 0xd7, 0xd9, 0x8c, 0xf8, 0x8d, 0x80, 0x46, 0x0f, 0x70, 0x0f, + 0x00, 0x69, 0x28, 0x55, 0x6b, 0x4d, 0xd6, 0xfa, 0x64, 0x71, 0xad, 0xef, 0x22, 0xbc, 0xac, 0x94, + 0x7e, 0x33, 0x5e, 0x42, 0x04, 0x0a, 0xbe, 0xf2, 0x11, 0xea, 0x62, 0xea, 0x21, 0x6d, 0xc0, 0x3b, + 0xf2, 0x05, 0x6b, 0x2b, 0x1a, 0xd0, 0xd9, 0xf2, 0x6f, 0x99, 0x7a, 0x1f, 0xc0, 0x2e, 0xe3, 0xa7, + 0x98, 0x77, 0xae, 0x0b, 0xb8, 0xb1, 0x54, 0xc0, 0x2d, 0xcd, 0x8a, 0x43, 0x95, 0x3f, 0x93, 0x20, + 0x77, 0xc4, 0xb1, 0x1f, 0xca, 0xe6, 0xcc, 0xed, 0xbf, 0xdb, 0x27, 0xb3, 0xfb, 0xef, 0xf6, 0xc9, + 0x75, 0xbc, 0xd2, 0x4f, 0xe1, 0x13, 0x53, 0x78, 0xa9, 0x94, 0xc2, 0xdf, 0xf6, 0x4b, 0x1b, 0x0b, + 0xb7, 0x2f, 0x1d, 0x70, 0xd3, 0x2f, 0x3b, 0x51, 0x66, 0x9e, 0xa2, 0xa9, 0xff, 0x4c, 0xd1, 0x03, + 0x70, 0x3f, 0x14, 0x58, 0x84, 0x68, 0x10, 0x74, 0xb0, 0x20, 0x88, 0xfa, 0x82, 0xf0, 0x21, 0xf6, + 0x8a, 0x6b, 0xcb, 0x4e, 0x5e, 0x41, 0xf2, 0xbe, 0x97, 0xb4, 0x7d, 0xcd, 0x82, 0x0f, 0x41, 0x46, + 0x2b, 0xe7, 0x0d, 0x42, 0x41, 0x78, 0x71, 0xbd, 0x6c, 0x56, 0xd3, 0xce, 0x5d, 0x19, 0x6c, 0xaa, + 0x18, 0x7c, 0x04, 0xb2, 0xe3, 0xe3, 0xa2, 0x51, 0x77, 0x24, 0x2a, 0xa3, 0xa2, 0x63, 0xd8, 0x6b, + 0x50, 0x8a, 0x9b, 0x8c, 0xba, 0x8c, 0x23, 0x75, 0x74, 0x02, 0xce, 0xce, 0xce, 0xff, 0x41, 0xd3, + 0x3f, 0x8a, 0xd9, 0x7b, 0x8c, 0x1f, 0x44, 0x88, 0x56, 0x44, 0xad, 0xfc, 0x92, 0x02, 0xf9, 0xe7, + 0x42, 0x04, 0x4d, 0xa9, 0x93, 0xee, 0xfd, 0xb7, 0x20, 0x2d, 0xc6, 0x76, 0x90, 0x1d, 0xdf, 0xac, + 0x7f, 0xbe, 0x58, 0xdf, 0x1b, 0xee, 0x71, 0x62, 0x3e, 0x3c, 0x06, 0xb9, 0x50, 0x4d, 0x16, 0x7d, + 0xc9, 0x44, 0x33, 0x21, 0x3a, 0x55, 0x3b, 0x4b, 0x4e, 0xe8, 0x8d, 0x5d, 0xd9, 0x53, 0xf3, 0x29, + 0xdc, 0xf5, 0x05, 0x3f, 0x77, 0xb2, 0xe1, 0x54, 0x10, 0x7e, 0x0d, 0x1e, 0x74, 0x48, 0x17, 0x0f, + 0x3c, 0x81, 0x3a, 0x24, 0x14, 0xd4, 0x97, 0xfd, 0x41, 0x1a, 0x25, 0xcd, 0x95, 0x76, 0xb6, 0x35, + 0xe4, 0x59, 0x8c, 0xd0, 0xb5, 0x67, 0xce, 0xa4, 0xd4, 0xea, 0x33, 0x69, 0xf6, 0xd9, 0x5c, 0xfb, + 0x17, 0x67, 0xb3, 0xe4, 0x83, 0xc2, 0x8c, 0x17, 0x87, 0x79, 0x90, 0x3c, 0x26, 0xea, 0x3e, 0x4b, + 0x3b, 0xd1, 0x12, 0x36, 0xc0, 0xda, 0x10, 0x7b, 0x03, 0x75, 0xe4, 0x36, 0xeb, 0x8f, 0x17, 0xab, + 0x3b, 0x55, 0xd3, 0x51, 0xcc, 0xa7, 0x89, 0xaf, 0xcc, 0xca, 0xdb, 0x68, 0x16, 0xb8, 0xff, 0xa3, + 0x1f, 0x66, 0x49, 0x9c, 0x58, 0x5d, 0xe2, 0x39, 0xf7, 0x53, 0x72, 0xd5, 0xfb, 0x29, 0x35, 0xf7, + 0x7e, 0xfa, 0x11, 0xdc, 0x77, 0x99, 0xef, 0x13, 0x57, 0x5a, 0x68, 0xea, 0x52, 0x30, 0x57, 0xb9, + 0x14, 0x0a, 0x71, 0x95, 0x49, 0x10, 0xee, 0x80, 0x9c, 0xde, 0xc6, 0x64, 0xca, 0xac, 0x2f, 0x9b, + 0x32, 0x7a, 0x52, 0x8c, 0x07, 0xcc, 0xce, 0x4f, 0xef, 0x2e, 0x2d, 0xe3, 0xe2, 0xd2, 0x32, 0xde, + 0x5f, 0x5a, 0xc6, 0x87, 0x4b, 0xcb, 0xf8, 0x79, 0x64, 0x99, 0x6f, 0x47, 0x96, 0xf1, 0x6e, 0x64, + 0x99, 0x17, 0x23, 0xcb, 0xfc, 0x7d, 0x64, 0x99, 0x7f, 0x8c, 0x2c, 0xe3, 0xc3, 0xc8, 0x32, 0x7f, + 0xbd, 0xb2, 0x8c, 0x8b, 0x2b, 0xcb, 0x78, 0x7f, 0x65, 0x19, 0x3f, 0x3c, 0x54, 0x5b, 0xa7, 0x2c, + 0xfa, 0xc6, 0xaa, 0xcd, 0xfe, 0xae, 0x6a, 0xaf, 0xcb, 0x1d, 0x7c, 0xf9, 0x77, 0x00, 0x00, 0x00, + 0xff, 0xff, 0x1b, 0xe3, 0x81, 0xd2, 0x3a, 0x0a, 0x00, 0x00, +} + func (x NetworkFailPolicy_FailPolicy) String() string { s, ok := NetworkFailPolicy_FailPolicy_name[int32(x)] if ok { @@ -609,6 +825,9 @@ func encodeVarintClientConfig(dAtA []byte, offset int, v uint64) int { return offset + 1 } func (m *NetworkFailPolicy) Size() (n int) { + if m == nil { + return 0 + } var l int _ = l if m.Policy != 0 { @@ -629,6 +848,9 @@ func (m *NetworkFailPolicy) Size() (n int) { } func (m *ServiceConfig) Size() (n int) { + if m == nil { + return 0 + } var l int _ = l if m.DisableCheckCalls { @@ -665,6 +887,9 @@ func (m *ServiceConfig) Size() (n int) { } func (m *TransportConfig) Size() (n int) { + if m == nil { + return 0 + } var l int _ = l if m.DisableCheckCache { @@ -700,6 +925,9 @@ func (m *TransportConfig) Size() (n int) { } func (m *HttpClientConfig) Size() (n int) { + if m == nil { + return 0 + } var l int _ = l if m.Transport != nil { @@ -735,6 +963,9 @@ func (m *HttpClientConfig) Size() (n int) { } func (m *TcpClientConfig) Size() (n int) { + if m == nil { + return 0 + } var l int _ = l if m.Transport != nil { @@ -782,8 +1013,8 @@ func (this *NetworkFailPolicy) String() string { s := strings.Join([]string{`&NetworkFailPolicy{`, `Policy:` + fmt.Sprintf("%v", this.Policy) + `,`, `MaxRetry:` + fmt.Sprintf("%v", this.MaxRetry) + `,`, - `BaseRetryWait:` + strings.Replace(fmt.Sprintf("%v", this.BaseRetryWait), "Duration", "google_protobuf1.Duration", 1) + `,`, - `MaxRetryWait:` + strings.Replace(fmt.Sprintf("%v", this.MaxRetryWait), "Duration", "google_protobuf1.Duration", 1) + `,`, + `BaseRetryWait:` + strings.Replace(fmt.Sprintf("%v", this.BaseRetryWait), "Duration", "types.Duration", 1) + `,`, + `MaxRetryWait:` + strings.Replace(fmt.Sprintf("%v", this.MaxRetryWait), "Duration", "types.Duration", 1) + `,`, `}`, }, "") return s @@ -795,11 +1026,11 @@ func (this *ServiceConfig) String() string { s := strings.Join([]string{`&ServiceConfig{`, `DisableCheckCalls:` + fmt.Sprintf("%v", this.DisableCheckCalls) + `,`, `DisableReportCalls:` + fmt.Sprintf("%v", this.DisableReportCalls) + `,`, - `MixerAttributes:` + strings.Replace(fmt.Sprintf("%v", this.MixerAttributes), "Attributes", "istio_mixer_v1.Attributes", 1) + `,`, + `MixerAttributes:` + strings.Replace(fmt.Sprintf("%v", this.MixerAttributes), "Attributes", "v1.Attributes", 1) + `,`, `HttpApiSpec:` + strings.Replace(fmt.Sprintf("%v", this.HttpApiSpec), "HTTPAPISpec", "HTTPAPISpec", 1) + `,`, `QuotaSpec:` + strings.Replace(fmt.Sprintf("%v", this.QuotaSpec), "QuotaSpec", "QuotaSpec", 1) + `,`, `NetworkFailPolicy:` + strings.Replace(fmt.Sprintf("%v", this.NetworkFailPolicy), "NetworkFailPolicy", "NetworkFailPolicy", 1) + `,`, - `ForwardAttributes:` + strings.Replace(fmt.Sprintf("%v", this.ForwardAttributes), "Attributes", "istio_mixer_v1.Attributes", 1) + `,`, + `ForwardAttributes:` + strings.Replace(fmt.Sprintf("%v", this.ForwardAttributes), "Attributes", "v1.Attributes", 1) + `,`, `}`, }, "") return s @@ -813,10 +1044,10 @@ func (this *TransportConfig) String() string { `DisableQuotaCache:` + fmt.Sprintf("%v", this.DisableQuotaCache) + `,`, `DisableReportBatch:` + fmt.Sprintf("%v", this.DisableReportBatch) + `,`, `NetworkFailPolicy:` + strings.Replace(fmt.Sprintf("%v", this.NetworkFailPolicy), "NetworkFailPolicy", "NetworkFailPolicy", 1) + `,`, - `StatsUpdateInterval:` + strings.Replace(fmt.Sprintf("%v", this.StatsUpdateInterval), "Duration", "google_protobuf1.Duration", 1) + `,`, + `StatsUpdateInterval:` + strings.Replace(fmt.Sprintf("%v", this.StatsUpdateInterval), "Duration", "types.Duration", 1) + `,`, `CheckCluster:` + fmt.Sprintf("%v", this.CheckCluster) + `,`, `ReportCluster:` + fmt.Sprintf("%v", this.ReportCluster) + `,`, - `AttributesForMixerProxy:` + strings.Replace(fmt.Sprintf("%v", this.AttributesForMixerProxy), "Attributes", "istio_mixer_v1.Attributes", 1) + `,`, + `AttributesForMixerProxy:` + strings.Replace(fmt.Sprintf("%v", this.AttributesForMixerProxy), "Attributes", "v1.Attributes", 1) + `,`, `}`, }, "") return s @@ -829,7 +1060,7 @@ func (this *HttpClientConfig) String() string { for k, _ := range this.ServiceConfigs { keysForServiceConfigs = append(keysForServiceConfigs, k) } - sortkeys.Strings(keysForServiceConfigs) + github_com_gogo_protobuf_sortkeys.Strings(keysForServiceConfigs) mapStringForServiceConfigs := "map[string]*ServiceConfig{" for _, k := range keysForServiceConfigs { mapStringForServiceConfigs += fmt.Sprintf("%v: %v,", k, this.ServiceConfigs[k]) @@ -839,8 +1070,8 @@ func (this *HttpClientConfig) String() string { `Transport:` + strings.Replace(fmt.Sprintf("%v", this.Transport), "TransportConfig", "TransportConfig", 1) + `,`, `ServiceConfigs:` + mapStringForServiceConfigs + `,`, `DefaultDestinationService:` + fmt.Sprintf("%v", this.DefaultDestinationService) + `,`, - `MixerAttributes:` + strings.Replace(fmt.Sprintf("%v", this.MixerAttributes), "Attributes", "istio_mixer_v1.Attributes", 1) + `,`, - `ForwardAttributes:` + strings.Replace(fmt.Sprintf("%v", this.ForwardAttributes), "Attributes", "istio_mixer_v1.Attributes", 1) + `,`, + `MixerAttributes:` + strings.Replace(fmt.Sprintf("%v", this.MixerAttributes), "Attributes", "v1.Attributes", 1) + `,`, + `ForwardAttributes:` + strings.Replace(fmt.Sprintf("%v", this.ForwardAttributes), "Attributes", "v1.Attributes", 1) + `,`, `}`, }, "") return s @@ -851,11 +1082,11 @@ func (this *TcpClientConfig) String() string { } s := strings.Join([]string{`&TcpClientConfig{`, `Transport:` + strings.Replace(fmt.Sprintf("%v", this.Transport), "TransportConfig", "TransportConfig", 1) + `,`, - `MixerAttributes:` + strings.Replace(fmt.Sprintf("%v", this.MixerAttributes), "Attributes", "istio_mixer_v1.Attributes", 1) + `,`, + `MixerAttributes:` + strings.Replace(fmt.Sprintf("%v", this.MixerAttributes), "Attributes", "v1.Attributes", 1) + `,`, `DisableCheckCalls:` + fmt.Sprintf("%v", this.DisableCheckCalls) + `,`, `DisableReportCalls:` + fmt.Sprintf("%v", this.DisableReportCalls) + `,`, `ConnectionQuotaSpec:` + strings.Replace(fmt.Sprintf("%v", this.ConnectionQuotaSpec), "QuotaSpec", "QuotaSpec", 1) + `,`, - `ReportInterval:` + strings.Replace(fmt.Sprintf("%v", this.ReportInterval), "Duration", "google_protobuf1.Duration", 1) + `,`, + `ReportInterval:` + strings.Replace(fmt.Sprintf("%v", this.ReportInterval), "Duration", "types.Duration", 1) + `,`, `}`, }, "") return s @@ -883,7 +1114,7 @@ func (m *NetworkFailPolicy) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - wire |= (uint64(b) & 0x7F) << shift + wire |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -911,7 +1142,7 @@ func (m *NetworkFailPolicy) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - m.Policy |= (NetworkFailPolicy_FailPolicy(b) & 0x7F) << shift + m.Policy |= NetworkFailPolicy_FailPolicy(b&0x7F) << shift if b < 0x80 { break } @@ -930,7 +1161,7 @@ func (m *NetworkFailPolicy) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - m.MaxRetry |= (uint32(b) & 0x7F) << shift + m.MaxRetry |= uint32(b&0x7F) << shift if b < 0x80 { break } @@ -949,7 +1180,7 @@ func (m *NetworkFailPolicy) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - msglen |= (int(b) & 0x7F) << shift + msglen |= int(b&0x7F) << shift if b < 0x80 { break } @@ -958,11 +1189,14 @@ func (m *NetworkFailPolicy) Unmarshal(dAtA []byte) error { return ErrInvalidLengthClientConfig } postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthClientConfig + } if postIndex > l { return io.ErrUnexpectedEOF } if m.BaseRetryWait == nil { - m.BaseRetryWait = &google_protobuf1.Duration{} + m.BaseRetryWait = &types.Duration{} } if err := m.BaseRetryWait.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err @@ -982,7 +1216,7 @@ func (m *NetworkFailPolicy) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - msglen |= (int(b) & 0x7F) << shift + msglen |= int(b&0x7F) << shift if b < 0x80 { break } @@ -991,11 +1225,14 @@ func (m *NetworkFailPolicy) Unmarshal(dAtA []byte) error { return ErrInvalidLengthClientConfig } postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthClientConfig + } if postIndex > l { return io.ErrUnexpectedEOF } if m.MaxRetryWait == nil { - m.MaxRetryWait = &google_protobuf1.Duration{} + m.MaxRetryWait = &types.Duration{} } if err := m.MaxRetryWait.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err @@ -1010,6 +1247,9 @@ func (m *NetworkFailPolicy) Unmarshal(dAtA []byte) error { if skippy < 0 { return ErrInvalidLengthClientConfig } + if (iNdEx + skippy) < 0 { + return ErrInvalidLengthClientConfig + } if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF } @@ -1037,7 +1277,7 @@ func (m *ServiceConfig) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - wire |= (uint64(b) & 0x7F) << shift + wire |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -1065,7 +1305,7 @@ func (m *ServiceConfig) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - v |= (int(b) & 0x7F) << shift + v |= int(b&0x7F) << shift if b < 0x80 { break } @@ -1085,7 +1325,7 @@ func (m *ServiceConfig) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - v |= (int(b) & 0x7F) << shift + v |= int(b&0x7F) << shift if b < 0x80 { break } @@ -1105,7 +1345,7 @@ func (m *ServiceConfig) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - msglen |= (int(b) & 0x7F) << shift + msglen |= int(b&0x7F) << shift if b < 0x80 { break } @@ -1114,11 +1354,14 @@ func (m *ServiceConfig) Unmarshal(dAtA []byte) error { return ErrInvalidLengthClientConfig } postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthClientConfig + } if postIndex > l { return io.ErrUnexpectedEOF } if m.MixerAttributes == nil { - m.MixerAttributes = &istio_mixer_v1.Attributes{} + m.MixerAttributes = &v1.Attributes{} } if err := m.MixerAttributes.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err @@ -1138,7 +1381,7 @@ func (m *ServiceConfig) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - msglen |= (int(b) & 0x7F) << shift + msglen |= int(b&0x7F) << shift if b < 0x80 { break } @@ -1147,6 +1390,9 @@ func (m *ServiceConfig) Unmarshal(dAtA []byte) error { return ErrInvalidLengthClientConfig } postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthClientConfig + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -1169,7 +1415,7 @@ func (m *ServiceConfig) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - msglen |= (int(b) & 0x7F) << shift + msglen |= int(b&0x7F) << shift if b < 0x80 { break } @@ -1178,6 +1424,9 @@ func (m *ServiceConfig) Unmarshal(dAtA []byte) error { return ErrInvalidLengthClientConfig } postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthClientConfig + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -1200,7 +1449,7 @@ func (m *ServiceConfig) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - msglen |= (int(b) & 0x7F) << shift + msglen |= int(b&0x7F) << shift if b < 0x80 { break } @@ -1209,6 +1458,9 @@ func (m *ServiceConfig) Unmarshal(dAtA []byte) error { return ErrInvalidLengthClientConfig } postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthClientConfig + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -1233,7 +1485,7 @@ func (m *ServiceConfig) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - msglen |= (int(b) & 0x7F) << shift + msglen |= int(b&0x7F) << shift if b < 0x80 { break } @@ -1242,11 +1494,14 @@ func (m *ServiceConfig) Unmarshal(dAtA []byte) error { return ErrInvalidLengthClientConfig } postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthClientConfig + } if postIndex > l { return io.ErrUnexpectedEOF } if m.ForwardAttributes == nil { - m.ForwardAttributes = &istio_mixer_v1.Attributes{} + m.ForwardAttributes = &v1.Attributes{} } if err := m.ForwardAttributes.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err @@ -1261,6 +1516,9 @@ func (m *ServiceConfig) Unmarshal(dAtA []byte) error { if skippy < 0 { return ErrInvalidLengthClientConfig } + if (iNdEx + skippy) < 0 { + return ErrInvalidLengthClientConfig + } if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF } @@ -1288,7 +1546,7 @@ func (m *TransportConfig) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - wire |= (uint64(b) & 0x7F) << shift + wire |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -1316,7 +1574,7 @@ func (m *TransportConfig) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - v |= (int(b) & 0x7F) << shift + v |= int(b&0x7F) << shift if b < 0x80 { break } @@ -1336,7 +1594,7 @@ func (m *TransportConfig) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - v |= (int(b) & 0x7F) << shift + v |= int(b&0x7F) << shift if b < 0x80 { break } @@ -1356,7 +1614,7 @@ func (m *TransportConfig) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - v |= (int(b) & 0x7F) << shift + v |= int(b&0x7F) << shift if b < 0x80 { break } @@ -1376,7 +1634,7 @@ func (m *TransportConfig) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - msglen |= (int(b) & 0x7F) << shift + msglen |= int(b&0x7F) << shift if b < 0x80 { break } @@ -1385,6 +1643,9 @@ func (m *TransportConfig) Unmarshal(dAtA []byte) error { return ErrInvalidLengthClientConfig } postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthClientConfig + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -1409,7 +1670,7 @@ func (m *TransportConfig) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - msglen |= (int(b) & 0x7F) << shift + msglen |= int(b&0x7F) << shift if b < 0x80 { break } @@ -1418,11 +1679,14 @@ func (m *TransportConfig) Unmarshal(dAtA []byte) error { return ErrInvalidLengthClientConfig } postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthClientConfig + } if postIndex > l { return io.ErrUnexpectedEOF } if m.StatsUpdateInterval == nil { - m.StatsUpdateInterval = &google_protobuf1.Duration{} + m.StatsUpdateInterval = &types.Duration{} } if err := m.StatsUpdateInterval.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err @@ -1442,7 +1706,7 @@ func (m *TransportConfig) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLen |= (uint64(b) & 0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -1452,6 +1716,9 @@ func (m *TransportConfig) Unmarshal(dAtA []byte) error { return ErrInvalidLengthClientConfig } postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthClientConfig + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -1471,7 +1738,7 @@ func (m *TransportConfig) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLen |= (uint64(b) & 0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -1481,6 +1748,9 @@ func (m *TransportConfig) Unmarshal(dAtA []byte) error { return ErrInvalidLengthClientConfig } postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthClientConfig + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -1500,7 +1770,7 @@ func (m *TransportConfig) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - msglen |= (int(b) & 0x7F) << shift + msglen |= int(b&0x7F) << shift if b < 0x80 { break } @@ -1509,11 +1779,14 @@ func (m *TransportConfig) Unmarshal(dAtA []byte) error { return ErrInvalidLengthClientConfig } postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthClientConfig + } if postIndex > l { return io.ErrUnexpectedEOF } if m.AttributesForMixerProxy == nil { - m.AttributesForMixerProxy = &istio_mixer_v1.Attributes{} + m.AttributesForMixerProxy = &v1.Attributes{} } if err := m.AttributesForMixerProxy.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err @@ -1528,6 +1801,9 @@ func (m *TransportConfig) Unmarshal(dAtA []byte) error { if skippy < 0 { return ErrInvalidLengthClientConfig } + if (iNdEx + skippy) < 0 { + return ErrInvalidLengthClientConfig + } if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF } @@ -1555,7 +1831,7 @@ func (m *HttpClientConfig) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - wire |= (uint64(b) & 0x7F) << shift + wire |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -1583,7 +1859,7 @@ func (m *HttpClientConfig) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - msglen |= (int(b) & 0x7F) << shift + msglen |= int(b&0x7F) << shift if b < 0x80 { break } @@ -1592,6 +1868,9 @@ func (m *HttpClientConfig) Unmarshal(dAtA []byte) error { return ErrInvalidLengthClientConfig } postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthClientConfig + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -1616,7 +1895,7 @@ func (m *HttpClientConfig) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - msglen |= (int(b) & 0x7F) << shift + msglen |= int(b&0x7F) << shift if b < 0x80 { break } @@ -1625,6 +1904,9 @@ func (m *HttpClientConfig) Unmarshal(dAtA []byte) error { return ErrInvalidLengthClientConfig } postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthClientConfig + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -1645,7 +1927,7 @@ func (m *HttpClientConfig) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - wire |= (uint64(b) & 0x7F) << shift + wire |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -1662,7 +1944,7 @@ func (m *HttpClientConfig) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLenmapkey |= (uint64(b) & 0x7F) << shift + stringLenmapkey |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -1672,6 +1954,9 @@ func (m *HttpClientConfig) Unmarshal(dAtA []byte) error { return ErrInvalidLengthClientConfig } postStringIndexmapkey := iNdEx + intStringLenmapkey + if postStringIndexmapkey < 0 { + return ErrInvalidLengthClientConfig + } if postStringIndexmapkey > l { return io.ErrUnexpectedEOF } @@ -1688,7 +1973,7 @@ func (m *HttpClientConfig) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - mapmsglen |= (int(b) & 0x7F) << shift + mapmsglen |= int(b&0x7F) << shift if b < 0x80 { break } @@ -1697,7 +1982,7 @@ func (m *HttpClientConfig) Unmarshal(dAtA []byte) error { return ErrInvalidLengthClientConfig } postmsgIndex := iNdEx + mapmsglen - if mapmsglen < 0 { + if postmsgIndex < 0 { return ErrInvalidLengthClientConfig } if postmsgIndex > l { @@ -1739,7 +2024,7 @@ func (m *HttpClientConfig) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLen |= (uint64(b) & 0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -1749,6 +2034,9 @@ func (m *HttpClientConfig) Unmarshal(dAtA []byte) error { return ErrInvalidLengthClientConfig } postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthClientConfig + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -1768,7 +2056,7 @@ func (m *HttpClientConfig) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - msglen |= (int(b) & 0x7F) << shift + msglen |= int(b&0x7F) << shift if b < 0x80 { break } @@ -1777,11 +2065,14 @@ func (m *HttpClientConfig) Unmarshal(dAtA []byte) error { return ErrInvalidLengthClientConfig } postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthClientConfig + } if postIndex > l { return io.ErrUnexpectedEOF } if m.MixerAttributes == nil { - m.MixerAttributes = &istio_mixer_v1.Attributes{} + m.MixerAttributes = &v1.Attributes{} } if err := m.MixerAttributes.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err @@ -1801,7 +2092,7 @@ func (m *HttpClientConfig) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - msglen |= (int(b) & 0x7F) << shift + msglen |= int(b&0x7F) << shift if b < 0x80 { break } @@ -1810,11 +2101,14 @@ func (m *HttpClientConfig) Unmarshal(dAtA []byte) error { return ErrInvalidLengthClientConfig } postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthClientConfig + } if postIndex > l { return io.ErrUnexpectedEOF } if m.ForwardAttributes == nil { - m.ForwardAttributes = &istio_mixer_v1.Attributes{} + m.ForwardAttributes = &v1.Attributes{} } if err := m.ForwardAttributes.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err @@ -1829,6 +2123,9 @@ func (m *HttpClientConfig) Unmarshal(dAtA []byte) error { if skippy < 0 { return ErrInvalidLengthClientConfig } + if (iNdEx + skippy) < 0 { + return ErrInvalidLengthClientConfig + } if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF } @@ -1856,7 +2153,7 @@ func (m *TcpClientConfig) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - wire |= (uint64(b) & 0x7F) << shift + wire |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -1884,7 +2181,7 @@ func (m *TcpClientConfig) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - msglen |= (int(b) & 0x7F) << shift + msglen |= int(b&0x7F) << shift if b < 0x80 { break } @@ -1893,6 +2190,9 @@ func (m *TcpClientConfig) Unmarshal(dAtA []byte) error { return ErrInvalidLengthClientConfig } postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthClientConfig + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -1917,7 +2217,7 @@ func (m *TcpClientConfig) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - msglen |= (int(b) & 0x7F) << shift + msglen |= int(b&0x7F) << shift if b < 0x80 { break } @@ -1926,11 +2226,14 @@ func (m *TcpClientConfig) Unmarshal(dAtA []byte) error { return ErrInvalidLengthClientConfig } postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthClientConfig + } if postIndex > l { return io.ErrUnexpectedEOF } if m.MixerAttributes == nil { - m.MixerAttributes = &istio_mixer_v1.Attributes{} + m.MixerAttributes = &v1.Attributes{} } if err := m.MixerAttributes.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err @@ -1950,7 +2253,7 @@ func (m *TcpClientConfig) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - v |= (int(b) & 0x7F) << shift + v |= int(b&0x7F) << shift if b < 0x80 { break } @@ -1970,7 +2273,7 @@ func (m *TcpClientConfig) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - v |= (int(b) & 0x7F) << shift + v |= int(b&0x7F) << shift if b < 0x80 { break } @@ -1990,7 +2293,7 @@ func (m *TcpClientConfig) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - msglen |= (int(b) & 0x7F) << shift + msglen |= int(b&0x7F) << shift if b < 0x80 { break } @@ -1999,6 +2302,9 @@ func (m *TcpClientConfig) Unmarshal(dAtA []byte) error { return ErrInvalidLengthClientConfig } postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthClientConfig + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -2023,7 +2329,7 @@ func (m *TcpClientConfig) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - msglen |= (int(b) & 0x7F) << shift + msglen |= int(b&0x7F) << shift if b < 0x80 { break } @@ -2032,11 +2338,14 @@ func (m *TcpClientConfig) Unmarshal(dAtA []byte) error { return ErrInvalidLengthClientConfig } postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthClientConfig + } if postIndex > l { return io.ErrUnexpectedEOF } if m.ReportInterval == nil { - m.ReportInterval = &google_protobuf1.Duration{} + m.ReportInterval = &types.Duration{} } if err := m.ReportInterval.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err @@ -2051,6 +2360,9 @@ func (m *TcpClientConfig) Unmarshal(dAtA []byte) error { if skippy < 0 { return ErrInvalidLengthClientConfig } + if (iNdEx + skippy) < 0 { + return ErrInvalidLengthClientConfig + } if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF } @@ -2117,10 +2429,13 @@ func skipClientConfig(dAtA []byte) (n int, err error) { break } } - iNdEx += length if length < 0 { return 0, ErrInvalidLengthClientConfig } + iNdEx += length + if iNdEx < 0 { + return 0, ErrInvalidLengthClientConfig + } return iNdEx, nil case 3: for { @@ -2149,6 +2464,9 @@ func skipClientConfig(dAtA []byte) (n int, err error) { return 0, err } iNdEx = start + next + if iNdEx < 0 { + return 0, ErrInvalidLengthClientConfig + } } return iNdEx, nil case 4: @@ -2167,71 +2485,3 @@ var ( ErrInvalidLengthClientConfig = fmt.Errorf("proto: negative length found during unmarshaling") ErrIntOverflowClientConfig = fmt.Errorf("proto: integer overflow") ) - -func init() { - proto.RegisterFile("mixer/v1/config/client/client_config.proto", fileDescriptorClientConfig) -} - -var fileDescriptorClientConfig = []byte{ - // 945 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x56, 0x4d, 0x6f, 0x1a, 0x47, - 0x18, 0x66, 0x01, 0x3b, 0x66, 0x08, 0x1f, 0x1e, 0x12, 0x15, 0x93, 0x6a, 0x85, 0x88, 0xa2, 0xd2, - 0x46, 0x5d, 0x1a, 0x7a, 0xa9, 0x72, 0x68, 0x85, 0x89, 0xad, 0x58, 0x8d, 0x13, 0xba, 0x76, 0x14, - 0xa9, 0x3d, 0x8c, 0x86, 0x65, 0x80, 0x91, 0xd7, 0x3b, 0x9b, 0xd9, 0x01, 0xdb, 0xb7, 0xfe, 0x82, - 0xaa, 0x3f, 0x23, 0x7f, 0xa0, 0xff, 0x21, 0xc7, 0x1c, 0x7b, 0xac, 0xe9, 0xa5, 0x47, 0x1f, 0x2b, - 0xf5, 0x52, 0xed, 0xcc, 0x2c, 0x6b, 0x6c, 0x3e, 0x4a, 0xd5, 0x9e, 0x98, 0x7d, 0xdf, 0xe7, 0x79, - 0x77, 0xf6, 0x79, 0x9f, 0x79, 0x07, 0xf0, 0xd9, 0x29, 0x3d, 0x27, 0xbc, 0x31, 0x7e, 0xd2, 0x70, - 0x98, 0xd7, 0xa7, 0x83, 0x86, 0xe3, 0x52, 0xe2, 0x09, 0xfd, 0x83, 0x54, 0xd0, 0xf2, 0x39, 0x13, - 0x0c, 0x7e, 0x4c, 0x03, 0x41, 0x99, 0x25, 0x19, 0xd6, 0xf8, 0x89, 0xa5, 0x93, 0x0a, 0x5a, 0xb9, - 0x37, 0x60, 0x03, 0x26, 0x81, 0x8d, 0x70, 0xa5, 0x38, 0x15, 0x73, 0xc0, 0xd8, 0xc0, 0x25, 0x0d, - 0xf9, 0xd4, 0x1d, 0xf5, 0x1b, 0xbd, 0x11, 0xc7, 0x82, 0x32, 0x4f, 0xe7, 0x77, 0xa6, 0xef, 0xc7, - 0x42, 0x70, 0xda, 0x1d, 0x09, 0x12, 0xe8, 0xd4, 0xa3, 0x05, 0x5b, 0xc3, 0x3e, 0x45, 0x81, 0x4f, - 0x1c, 0x0d, 0xab, 0x2d, 0x80, 0xbd, 0x1d, 0x31, 0x81, 0x15, 0xa6, 0xf6, 0x4b, 0x12, 0x6c, 0xbf, - 0x24, 0xe2, 0x8c, 0xf1, 0x93, 0x7d, 0x4c, 0xdd, 0x0e, 0x73, 0xa9, 0x73, 0x01, 0x6d, 0xb0, 0xe9, - 0xcb, 0x55, 0xd9, 0xa8, 0x1a, 0xf5, 0x7c, 0xf3, 0xa9, 0xb5, 0xec, 0x03, 0xad, 0x5b, 0x05, 0xac, - 0x78, 0x69, 0xeb, 0x4a, 0xf0, 0x01, 0xc8, 0x9c, 0xe2, 0x73, 0xc4, 0x89, 0xe0, 0x17, 0xe5, 0x64, - 0xd5, 0xa8, 0xe7, 0xec, 0xad, 0x53, 0x7c, 0x6e, 0x87, 0xcf, 0xb0, 0x05, 0x0a, 0x5d, 0x1c, 0x10, - 0x95, 0x45, 0x67, 0x98, 0x8a, 0x72, 0xaa, 0x6a, 0xd4, 0xb3, 0xcd, 0x1d, 0x4b, 0xc9, 0x64, 0x45, - 0x32, 0x59, 0xcf, 0xb4, 0x4c, 0x76, 0x2e, 0x64, 0x48, 0xfa, 0x1b, 0x4c, 0x05, 0xfc, 0x06, 0xe4, - 0xa7, 0xf5, 0x55, 0x85, 0xf4, 0xaa, 0x0a, 0x77, 0xa3, 0xf7, 0x87, 0x05, 0x6a, 0x8f, 0x01, 0xb8, - 0x26, 0x41, 0x0e, 0x64, 0xf6, 0x5b, 0x07, 0x2f, 0xd0, 0xab, 0xce, 0xde, 0xcb, 0x62, 0x02, 0xe6, - 0x01, 0x90, 0x8f, 0xed, 0x17, 0xaf, 0x8e, 0xf6, 0x8a, 0x46, 0xed, 0xaf, 0x14, 0xc8, 0x1d, 0x11, - 0x3e, 0xa6, 0x0e, 0x69, 0x4b, 0x2d, 0xa0, 0x05, 0x4a, 0x3d, 0x1a, 0xe0, 0xae, 0x4b, 0x90, 0x33, - 0x24, 0xce, 0x09, 0x72, 0xb0, 0xeb, 0x06, 0x52, 0xc0, 0x2d, 0x7b, 0x5b, 0xa7, 0xda, 0x61, 0xa6, - 0x1d, 0x26, 0xe0, 0x17, 0xe0, 0x5e, 0x84, 0xe7, 0xc4, 0x67, 0x5c, 0x68, 0x42, 0x52, 0x12, 0xa0, - 0xce, 0xd9, 0x32, 0xa5, 0x18, 0x7b, 0xa0, 0x28, 0x1b, 0x80, 0x62, 0x43, 0x68, 0x95, 0x2a, 0x37, - 0xfb, 0xd3, 0x9a, 0x22, 0xec, 0x82, 0x0c, 0xc6, 0x01, 0x78, 0x08, 0x72, 0x43, 0x21, 0x7c, 0x14, - 0xb9, 0xa5, 0x9c, 0xae, 0xa6, 0xea, 0xd9, 0xe6, 0xa7, 0xcb, 0x7b, 0xfc, 0xfc, 0xf8, 0xb8, 0xd3, - 0xea, 0x1c, 0x1c, 0xf9, 0xc4, 0xb1, 0xb3, 0x21, 0xbf, 0xe5, 0xd3, 0xf0, 0x01, 0xee, 0x03, 0x20, - 0x0d, 0xa5, 0x6a, 0x6d, 0xc8, 0x5a, 0x9f, 0x2c, 0xaf, 0xf5, 0x5d, 0x88, 0x97, 0x95, 0x32, 0x6f, - 0xa3, 0x25, 0x44, 0xa0, 0xe4, 0x29, 0x1f, 0xa1, 0x3e, 0xa6, 0x2e, 0xd2, 0x06, 0xbc, 0x23, 0x3f, - 0xb0, 0xb1, 0xa6, 0x01, 0xed, 0x6d, 0xef, 0x96, 0xa9, 0x0f, 0x00, 0xec, 0x33, 0x7e, 0x86, 0x79, - 0xef, 0xba, 0x80, 0x5b, 0x2b, 0x05, 0xdc, 0xd6, 0xac, 0x38, 0x54, 0xfb, 0x33, 0x05, 0x0a, 0xc7, - 0x1c, 0x7b, 0x81, 0x6c, 0xce, 0xc2, 0xfe, 0x3b, 0x43, 0x32, 0xbf, 0xff, 0xce, 0x90, 0x5c, 0xc7, - 0x2b, 0xfd, 0x14, 0x3e, 0x39, 0x83, 0x97, 0x4a, 0x29, 0xfc, 0x6d, 0xbf, 0x74, 0xb1, 0x70, 0x86, - 0xd2, 0x01, 0x37, 0xfd, 0xb2, 0x1b, 0x66, 0x16, 0x29, 0x9a, 0xfe, 0xcf, 0x14, 0x3d, 0x04, 0xf7, - 0x03, 0x81, 0x45, 0x80, 0x46, 0x7e, 0x0f, 0x0b, 0x82, 0xa8, 0x27, 0x08, 0x1f, 0x63, 0xb7, 0xbc, - 0xb1, 0xea, 0xe4, 0x95, 0x24, 0xef, 0xb5, 0xa4, 0x1d, 0x68, 0x16, 0x7c, 0x08, 0x72, 0x5a, 0x39, - 0x77, 0x14, 0x08, 0xc2, 0xcb, 0x9b, 0x55, 0xa3, 0x9e, 0xb1, 0xef, 0xca, 0x60, 0x5b, 0xc5, 0xe0, - 0x23, 0x90, 0x8f, 0x8e, 0x8b, 0x46, 0xdd, 0x91, 0xa8, 0x9c, 0x8a, 0x46, 0xb0, 0x37, 0xa0, 0x12, - 0x37, 0x19, 0xf5, 0x19, 0x47, 0xea, 0xe8, 0xf8, 0x9c, 0x9d, 0x5f, 0xfc, 0x83, 0xa6, 0x7f, 0x14, - 0xb3, 0xf7, 0x19, 0x3f, 0x0c, 0x11, 0x9d, 0x90, 0x5a, 0xfb, 0x29, 0x0d, 0x8a, 0xcf, 0x85, 0xf0, - 0xdb, 0x52, 0x27, 0xdd, 0xfb, 0x6f, 0x41, 0x46, 0x44, 0x76, 0x90, 0x1d, 0xcf, 0x36, 0x3f, 0x5f, - 0xae, 0xef, 0x0d, 0xf7, 0xd8, 0x31, 0x1f, 0x9e, 0x80, 0x42, 0xa0, 0x26, 0x8b, 0xbe, 0x64, 0xc2, - 0x99, 0x10, 0x9e, 0xaa, 0xdd, 0x15, 0x27, 0xf4, 0xc6, 0xae, 0xac, 0x99, 0xf9, 0x14, 0xec, 0x79, - 0x82, 0x5f, 0xd8, 0xf9, 0x60, 0x26, 0x08, 0xbf, 0x06, 0x0f, 0x7a, 0xa4, 0x8f, 0x47, 0xae, 0x40, - 0x3d, 0x12, 0x08, 0xea, 0xc9, 0xfe, 0x20, 0x8d, 0x92, 0xe6, 0xca, 0xd8, 0x3b, 0x1a, 0xf2, 0x2c, - 0x46, 0xe8, 0xda, 0x73, 0x67, 0x52, 0x7a, 0xfd, 0x99, 0x34, 0xff, 0x6c, 0x6e, 0xfc, 0x8b, 0xb3, - 0x59, 0xf1, 0x40, 0x69, 0xce, 0x87, 0xc3, 0x22, 0x48, 0x9d, 0x10, 0x75, 0x9f, 0x65, 0xec, 0x70, - 0x09, 0x5b, 0x60, 0x63, 0x8c, 0xdd, 0x91, 0x3a, 0x72, 0xd9, 0xe6, 0xe3, 0xe5, 0xea, 0xce, 0xd4, - 0xb4, 0x15, 0xf3, 0x69, 0xf2, 0x2b, 0xa3, 0xf6, 0x2e, 0x9c, 0x05, 0xce, 0xff, 0xe8, 0x87, 0x79, - 0x12, 0x27, 0xd7, 0x97, 0x78, 0xc1, 0xfd, 0x94, 0x5a, 0xf7, 0x7e, 0x4a, 0x2f, 0xbc, 0x9f, 0x7e, - 0x00, 0xf7, 0x1d, 0xe6, 0x79, 0xc4, 0x91, 0x16, 0x9a, 0xb9, 0x14, 0x8c, 0x75, 0x2e, 0x85, 0x52, - 0x5c, 0x65, 0x1a, 0x84, 0xbb, 0xa0, 0xa0, 0xb7, 0x31, 0x9d, 0x32, 0x9b, 0xab, 0xa6, 0x8c, 0x9e, - 0x14, 0xd1, 0x80, 0xd9, 0x7d, 0xfd, 0xfe, 0xd2, 0x4c, 0x7c, 0xb8, 0x34, 0x13, 0xbf, 0x5e, 0x9a, - 0x89, 0xab, 0x4b, 0x33, 0xf1, 0xe3, 0xc4, 0x34, 0xde, 0x4d, 0xcc, 0xc4, 0xfb, 0x89, 0x69, 0x7c, - 0x98, 0x98, 0xc6, 0x6f, 0x13, 0xd3, 0xf8, 0x63, 0x62, 0x26, 0xae, 0x26, 0xa6, 0xf1, 0xf3, 0xef, - 0x66, 0xe2, 0xfb, 0x87, 0x6a, 0xcb, 0x94, 0x85, 0xff, 0xad, 0x1a, 0xf3, 0xff, 0x4f, 0x75, 0x37, - 0xe5, 0x9b, 0xbf, 0xfc, 0x3b, 0x00, 0x00, 0xff, 0xff, 0x85, 0x74, 0xc6, 0xd6, 0x32, 0x0a, 0x00, - 0x00, -} diff --git a/mixer/v1/config/client/quota.pb.go b/mixer/v1/config/client/quota.pb.go index 4ef4f86cfab..02e71e22b1c 100644 --- a/mixer/v1/config/client/quota.pb.go +++ b/mixer/v1/config/client/quota.pb.go @@ -3,45 +3,107 @@ package client -import proto "github.com/gogo/protobuf/proto" -import fmt "fmt" -import math "math" -import _ "github.com/gogo/protobuf/gogoproto" - -import strings "strings" -import reflect "reflect" -import sortkeys "github.com/gogo/protobuf/sortkeys" - -import io "io" +import ( + fmt "fmt" + _ "github.com/gogo/protobuf/gogoproto" + proto "github.com/gogo/protobuf/proto" + github_com_gogo_protobuf_sortkeys "github.com/gogo/protobuf/sortkeys" + io "io" + math "math" + reflect "reflect" + strings "strings" +) // Reference imports to suppress errors if they are not otherwise used. var _ = proto.Marshal var _ = fmt.Errorf var _ = math.Inf +// This is a compile-time assertion to ensure that this generated file +// is compatible with the proto package it is being compiled against. +// A compilation error at this line likely means your copy of the +// proto package needs to be updated. +const _ = proto.GoGoProtoPackageIsVersion2 // please upgrade the proto package + // Determines the quotas used for individual requests. type QuotaSpec struct { // A list of Quota rules. - Rules []*QuotaRule `protobuf:"bytes,1,rep,name=rules" json:"rules,omitempty"` + Rules []*QuotaRule `protobuf:"bytes,1,rep,name=rules,proto3" json:"rules,omitempty"` } -func (m *QuotaSpec) Reset() { *m = QuotaSpec{} } -func (*QuotaSpec) ProtoMessage() {} -func (*QuotaSpec) Descriptor() ([]byte, []int) { return fileDescriptorQuota, []int{0} } +func (m *QuotaSpec) Reset() { *m = QuotaSpec{} } +func (*QuotaSpec) ProtoMessage() {} +func (*QuotaSpec) Descriptor() ([]byte, []int) { + return fileDescriptor_81777b5d047af315, []int{0} +} +func (m *QuotaSpec) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *QuotaSpec) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_QuotaSpec.Marshal(b, m, deterministic) + } else { + b = b[:cap(b)] + n, err := m.MarshalTo(b) + if err != nil { + return nil, err + } + return b[:n], nil + } +} +func (m *QuotaSpec) XXX_Merge(src proto.Message) { + xxx_messageInfo_QuotaSpec.Merge(m, src) +} +func (m *QuotaSpec) XXX_Size() int { + return m.Size() +} +func (m *QuotaSpec) XXX_DiscardUnknown() { + xxx_messageInfo_QuotaSpec.DiscardUnknown(m) +} + +var xxx_messageInfo_QuotaSpec proto.InternalMessageInfo // Specifies a rule with list of matches and list of quotas. // If any clause matched, the list of quotas will be used. type QuotaRule struct { // If empty, match all request. // If any of match is true, it is matched. - Match []*AttributeMatch `protobuf:"bytes,1,rep,name=match" json:"match,omitempty"` + Match []*AttributeMatch `protobuf:"bytes,1,rep,name=match,proto3" json:"match,omitempty"` // The list of quotas to charge. - Quotas []*Quota `protobuf:"bytes,2,rep,name=quotas" json:"quotas,omitempty"` + Quotas []*Quota `protobuf:"bytes,2,rep,name=quotas,proto3" json:"quotas,omitempty"` } -func (m *QuotaRule) Reset() { *m = QuotaRule{} } -func (*QuotaRule) ProtoMessage() {} -func (*QuotaRule) Descriptor() ([]byte, []int) { return fileDescriptorQuota, []int{1} } +func (m *QuotaRule) Reset() { *m = QuotaRule{} } +func (*QuotaRule) ProtoMessage() {} +func (*QuotaRule) Descriptor() ([]byte, []int) { + return fileDescriptor_81777b5d047af315, []int{1} +} +func (m *QuotaRule) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *QuotaRule) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_QuotaRule.Marshal(b, m, deterministic) + } else { + b = b[:cap(b)] + n, err := m.MarshalTo(b) + if err != nil { + return nil, err + } + return b[:n], nil + } +} +func (m *QuotaRule) XXX_Merge(src proto.Message) { + xxx_messageInfo_QuotaRule.Merge(m, src) +} +func (m *QuotaRule) XXX_Size() int { + return m.Size() +} +func (m *QuotaRule) XXX_DiscardUnknown() { + xxx_messageInfo_QuotaRule.DiscardUnknown(m) +} + +var xxx_messageInfo_QuotaRule proto.InternalMessageInfo // Describes how to match a given string in HTTP headers. Match is // case-sensitive. @@ -53,9 +115,37 @@ type StringMatch struct { MatchType isStringMatch_MatchType `protobuf_oneof:"match_type"` } -func (m *StringMatch) Reset() { *m = StringMatch{} } -func (*StringMatch) ProtoMessage() {} -func (*StringMatch) Descriptor() ([]byte, []int) { return fileDescriptorQuota, []int{2} } +func (m *StringMatch) Reset() { *m = StringMatch{} } +func (*StringMatch) ProtoMessage() {} +func (*StringMatch) Descriptor() ([]byte, []int) { + return fileDescriptor_81777b5d047af315, []int{2} +} +func (m *StringMatch) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *StringMatch) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_StringMatch.Marshal(b, m, deterministic) + } else { + b = b[:cap(b)] + n, err := m.MarshalTo(b) + if err != nil { + return nil, err + } + return b[:n], nil + } +} +func (m *StringMatch) XXX_Merge(src proto.Message) { + xxx_messageInfo_StringMatch.Merge(m, src) +} +func (m *StringMatch) XXX_Size() int { + return m.Size() +} +func (m *StringMatch) XXX_DiscardUnknown() { + xxx_messageInfo_StringMatch.DiscardUnknown(m) +} + +var xxx_messageInfo_StringMatch proto.InternalMessageInfo type isStringMatch_MatchType interface { isStringMatch_MatchType() @@ -168,15 +258,15 @@ func _StringMatch_OneofSizer(msg proto.Message) (n int) { // match_type switch x := m.MatchType.(type) { case *StringMatch_Exact: - n += proto.SizeVarint(1<<3 | proto.WireBytes) + n += 1 // tag and wire n += proto.SizeVarint(uint64(len(x.Exact))) n += len(x.Exact) case *StringMatch_Prefix: - n += proto.SizeVarint(2<<3 | proto.WireBytes) + n += 1 // tag and wire n += proto.SizeVarint(uint64(len(x.Prefix))) n += len(x.Prefix) case *StringMatch_Regex: - n += proto.SizeVarint(3<<3 | proto.WireBytes) + n += 1 // tag and wire n += proto.SizeVarint(uint64(len(x.Regex))) n += len(x.Regex) case nil: @@ -198,12 +288,40 @@ type AttributeMatch struct { // exact: SOURCE_UID // request.http_method: // exact: POST - Clause map[string]*StringMatch `protobuf:"bytes,1,rep,name=clause" json:"clause,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value"` + Clause map[string]*StringMatch `protobuf:"bytes,1,rep,name=clause,proto3" json:"clause,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` } -func (m *AttributeMatch) Reset() { *m = AttributeMatch{} } -func (*AttributeMatch) ProtoMessage() {} -func (*AttributeMatch) Descriptor() ([]byte, []int) { return fileDescriptorQuota, []int{3} } +func (m *AttributeMatch) Reset() { *m = AttributeMatch{} } +func (*AttributeMatch) ProtoMessage() {} +func (*AttributeMatch) Descriptor() ([]byte, []int) { + return fileDescriptor_81777b5d047af315, []int{3} +} +func (m *AttributeMatch) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *AttributeMatch) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_AttributeMatch.Marshal(b, m, deterministic) + } else { + b = b[:cap(b)] + n, err := m.MarshalTo(b) + if err != nil { + return nil, err + } + return b[:n], nil + } +} +func (m *AttributeMatch) XXX_Merge(src proto.Message) { + xxx_messageInfo_AttributeMatch.Merge(m, src) +} +func (m *AttributeMatch) XXX_Size() int { + return m.Size() +} +func (m *AttributeMatch) XXX_DiscardUnknown() { + xxx_messageInfo_AttributeMatch.DiscardUnknown(m) +} + +var xxx_messageInfo_AttributeMatch proto.InternalMessageInfo // Specifies a quota to use with quota name and amount. type Quota struct { @@ -213,24 +331,80 @@ type Quota struct { Charge int64 `protobuf:"varint,2,opt,name=charge,proto3" json:"charge,omitempty"` } -func (m *Quota) Reset() { *m = Quota{} } -func (*Quota) ProtoMessage() {} -func (*Quota) Descriptor() ([]byte, []int) { return fileDescriptorQuota, []int{4} } +func (m *Quota) Reset() { *m = Quota{} } +func (*Quota) ProtoMessage() {} +func (*Quota) Descriptor() ([]byte, []int) { + return fileDescriptor_81777b5d047af315, []int{4} +} +func (m *Quota) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *Quota) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_Quota.Marshal(b, m, deterministic) + } else { + b = b[:cap(b)] + n, err := m.MarshalTo(b) + if err != nil { + return nil, err + } + return b[:n], nil + } +} +func (m *Quota) XXX_Merge(src proto.Message) { + xxx_messageInfo_Quota.Merge(m, src) +} +func (m *Quota) XXX_Size() int { + return m.Size() +} +func (m *Quota) XXX_DiscardUnknown() { + xxx_messageInfo_Quota.DiscardUnknown(m) +} + +var xxx_messageInfo_Quota proto.InternalMessageInfo // QuotaSpecBinding defines the binding between QuotaSpecs and one or more // IstioService. type QuotaSpecBinding struct { // REQUIRED. One or more services to map the listed QuotaSpec onto. - Services []*IstioService `protobuf:"bytes,1,rep,name=services" json:"services,omitempty"` + Services []*IstioService `protobuf:"bytes,1,rep,name=services,proto3" json:"services,omitempty"` // REQUIRED. One or more QuotaSpec references that should be mapped to // the specified service(s). The aggregate collection of match // conditions defined in the QuotaSpecs should not overlap. - QuotaSpecs []*QuotaSpecBinding_QuotaSpecReference `protobuf:"bytes,2,rep,name=quota_specs,json=quotaSpecs" json:"quota_specs,omitempty"` + QuotaSpecs []*QuotaSpecBinding_QuotaSpecReference `protobuf:"bytes,2,rep,name=quota_specs,json=quotaSpecs,proto3" json:"quota_specs,omitempty"` +} + +func (m *QuotaSpecBinding) Reset() { *m = QuotaSpecBinding{} } +func (*QuotaSpecBinding) ProtoMessage() {} +func (*QuotaSpecBinding) Descriptor() ([]byte, []int) { + return fileDescriptor_81777b5d047af315, []int{5} +} +func (m *QuotaSpecBinding) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *QuotaSpecBinding) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_QuotaSpecBinding.Marshal(b, m, deterministic) + } else { + b = b[:cap(b)] + n, err := m.MarshalTo(b) + if err != nil { + return nil, err + } + return b[:n], nil + } +} +func (m *QuotaSpecBinding) XXX_Merge(src proto.Message) { + xxx_messageInfo_QuotaSpecBinding.Merge(m, src) +} +func (m *QuotaSpecBinding) XXX_Size() int { + return m.Size() +} +func (m *QuotaSpecBinding) XXX_DiscardUnknown() { + xxx_messageInfo_QuotaSpecBinding.DiscardUnknown(m) } -func (m *QuotaSpecBinding) Reset() { *m = QuotaSpecBinding{} } -func (*QuotaSpecBinding) ProtoMessage() {} -func (*QuotaSpecBinding) Descriptor() ([]byte, []int) { return fileDescriptorQuota, []int{5} } +var xxx_messageInfo_QuotaSpecBinding proto.InternalMessageInfo // QuotaSpecReference uniquely identifies the QuotaSpec used in the // Binding. @@ -246,18 +420,86 @@ type QuotaSpecBinding_QuotaSpecReference struct { func (m *QuotaSpecBinding_QuotaSpecReference) Reset() { *m = QuotaSpecBinding_QuotaSpecReference{} } func (*QuotaSpecBinding_QuotaSpecReference) ProtoMessage() {} func (*QuotaSpecBinding_QuotaSpecReference) Descriptor() ([]byte, []int) { - return fileDescriptorQuota, []int{5, 0} + return fileDescriptor_81777b5d047af315, []int{5, 0} +} +func (m *QuotaSpecBinding_QuotaSpecReference) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *QuotaSpecBinding_QuotaSpecReference) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_QuotaSpecBinding_QuotaSpecReference.Marshal(b, m, deterministic) + } else { + b = b[:cap(b)] + n, err := m.MarshalTo(b) + if err != nil { + return nil, err + } + return b[:n], nil + } } +func (m *QuotaSpecBinding_QuotaSpecReference) XXX_Merge(src proto.Message) { + xxx_messageInfo_QuotaSpecBinding_QuotaSpecReference.Merge(m, src) +} +func (m *QuotaSpecBinding_QuotaSpecReference) XXX_Size() int { + return m.Size() +} +func (m *QuotaSpecBinding_QuotaSpecReference) XXX_DiscardUnknown() { + xxx_messageInfo_QuotaSpecBinding_QuotaSpecReference.DiscardUnknown(m) +} + +var xxx_messageInfo_QuotaSpecBinding_QuotaSpecReference proto.InternalMessageInfo func init() { proto.RegisterType((*QuotaSpec)(nil), "istio.mixer.v1.config.client.QuotaSpec") proto.RegisterType((*QuotaRule)(nil), "istio.mixer.v1.config.client.QuotaRule") proto.RegisterType((*StringMatch)(nil), "istio.mixer.v1.config.client.StringMatch") proto.RegisterType((*AttributeMatch)(nil), "istio.mixer.v1.config.client.AttributeMatch") + proto.RegisterMapType((map[string]*StringMatch)(nil), "istio.mixer.v1.config.client.AttributeMatch.ClauseEntry") proto.RegisterType((*Quota)(nil), "istio.mixer.v1.config.client.Quota") proto.RegisterType((*QuotaSpecBinding)(nil), "istio.mixer.v1.config.client.QuotaSpecBinding") proto.RegisterType((*QuotaSpecBinding_QuotaSpecReference)(nil), "istio.mixer.v1.config.client.QuotaSpecBinding.QuotaSpecReference") } + +func init() { proto.RegisterFile("mixer/v1/config/client/quota.proto", fileDescriptor_81777b5d047af315) } + +var fileDescriptor_81777b5d047af315 = []byte{ + // 540 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x93, 0xcf, 0x6a, 0x13, 0x5f, + 0x14, 0xc7, 0x67, 0x92, 0xdf, 0x84, 0x5f, 0x4e, 0x44, 0xca, 0xa5, 0x94, 0x21, 0x94, 0x4b, 0x99, + 0x0a, 0x56, 0x91, 0x19, 0x5a, 0x11, 0x8a, 0x22, 0xd2, 0x88, 0x45, 0x05, 0x41, 0x6f, 0x76, 0x82, + 0x94, 0xc9, 0xf4, 0x64, 0x7a, 0x31, 0x99, 0x99, 0xde, 0xb9, 0x13, 0x92, 0x9d, 0x2b, 0x57, 0x2e, + 0x7c, 0x0c, 0x1f, 0x25, 0xcb, 0x2c, 0xbb, 0x34, 0x93, 0x8d, 0xcb, 0x3e, 0x82, 0xcc, 0xbd, 0x37, + 0x6d, 0x44, 0x0d, 0x75, 0x35, 0xe7, 0x9c, 0x39, 0x9f, 0xef, 0xf9, 0xc3, 0xb9, 0xe0, 0x0d, 0xf9, + 0x18, 0x45, 0x30, 0xda, 0x0f, 0xa2, 0x34, 0xe9, 0xf3, 0x38, 0x88, 0x06, 0x1c, 0x13, 0x19, 0x9c, + 0x17, 0xa9, 0x0c, 0xfd, 0x4c, 0xa4, 0x32, 0x25, 0xdb, 0x3c, 0x97, 0x3c, 0xf5, 0x55, 0xa6, 0x3f, + 0xda, 0xf7, 0x75, 0xa6, 0xaf, 0x33, 0xdb, 0x9b, 0x71, 0x1a, 0xa7, 0x2a, 0x31, 0xa8, 0x2c, 0xcd, + 0xb4, 0xef, 0xfc, 0x45, 0x37, 0x47, 0x31, 0xe2, 0x11, 0xea, 0x2c, 0xef, 0x35, 0x34, 0xdf, 0x55, + 0x85, 0xba, 0x19, 0x46, 0xe4, 0x29, 0x38, 0xa2, 0x18, 0x60, 0xee, 0xda, 0x3b, 0xf5, 0xbd, 0xd6, + 0xc1, 0x5d, 0x7f, 0x5d, 0x59, 0x5f, 0x71, 0xac, 0x18, 0x20, 0xd3, 0x94, 0xf7, 0xc5, 0x36, 0x62, + 0x55, 0x90, 0x74, 0xc0, 0x19, 0x86, 0x32, 0x3a, 0x33, 0x62, 0x0f, 0xd6, 0x8b, 0x1d, 0x49, 0x29, + 0x78, 0xaf, 0x90, 0xf8, 0xa6, 0x62, 0x98, 0x46, 0xc9, 0x13, 0x68, 0xa8, 0x35, 0xe4, 0x6e, 0x4d, + 0x89, 0xec, 0xde, 0xa4, 0x23, 0x83, 0x78, 0x08, 0xad, 0xae, 0x14, 0x3c, 0x89, 0x95, 0x24, 0xd9, + 0x02, 0x07, 0xc7, 0x61, 0x24, 0x5d, 0x7b, 0xc7, 0xde, 0x6b, 0xbe, 0xb4, 0x98, 0x76, 0x89, 0x0b, + 0x8d, 0x4c, 0x60, 0x9f, 0x8f, 0xdd, 0x9a, 0xf9, 0x61, 0xfc, 0x8a, 0x10, 0x18, 0xe3, 0xd8, 0xad, + 0x2f, 0x09, 0xe5, 0x76, 0x6e, 0x01, 0xa8, 0xf6, 0x4e, 0xe4, 0x24, 0x43, 0x6f, 0x6a, 0xc3, 0xed, + 0x5f, 0xbb, 0x27, 0x6f, 0xa1, 0x11, 0x0d, 0xc2, 0x22, 0x47, 0x33, 0xfb, 0xe1, 0xbf, 0xcc, 0xee, + 0x3f, 0x57, 0xe8, 0x8b, 0x44, 0x8a, 0x09, 0x33, 0x3a, 0xed, 0x53, 0x68, 0xad, 0x84, 0xc9, 0x06, + 0xd4, 0x3f, 0xe2, 0x44, 0x4f, 0xc2, 0x2a, 0x93, 0x3c, 0x03, 0x67, 0x14, 0x0e, 0x0a, 0x54, 0x43, + 0xb4, 0x0e, 0xee, 0xad, 0xaf, 0xb8, 0xb2, 0x17, 0xa6, 0xb9, 0xc7, 0xb5, 0x43, 0xdb, 0x7b, 0x04, + 0x8e, 0x5a, 0x21, 0xd9, 0x04, 0x47, 0x2d, 0xd1, 0x54, 0xd0, 0x0e, 0xd9, 0x82, 0x46, 0x74, 0x16, + 0x8a, 0x58, 0x17, 0xa9, 0x33, 0xe3, 0x79, 0x9f, 0x6b, 0xb0, 0x71, 0x75, 0x44, 0x1d, 0x9e, 0x9c, + 0xf2, 0x24, 0x26, 0xc7, 0xf0, 0xbf, 0xb9, 0xb4, 0xe5, 0x39, 0xdd, 0x5f, 0xdf, 0xd3, 0xab, 0xea, + 0x67, 0x57, 0x23, 0xec, 0x8a, 0x25, 0x3d, 0x68, 0xa9, 0xea, 0x27, 0x79, 0x86, 0xd1, 0xf2, 0x0e, + 0x8e, 0x6e, 0x70, 0x07, 0x2b, 0xcd, 0x5c, 0x07, 0x18, 0xf6, 0x51, 0x60, 0x12, 0x21, 0x83, 0xf3, + 0x65, 0x2c, 0x6f, 0x1f, 0x03, 0xf9, 0x3d, 0x83, 0x10, 0xf8, 0x2f, 0x09, 0x87, 0x68, 0x76, 0xa0, + 0x6c, 0xb2, 0x0d, 0xcd, 0xea, 0x9b, 0x67, 0x61, 0xa4, 0xb7, 0xd0, 0x64, 0xd7, 0x81, 0xce, 0x87, + 0xe9, 0x9c, 0x5a, 0xb3, 0x39, 0xb5, 0x2e, 0xe6, 0xd4, 0xba, 0x9c, 0x53, 0xeb, 0x53, 0x49, 0xed, + 0x6f, 0x25, 0xb5, 0xa6, 0x25, 0xb5, 0x67, 0x25, 0xb5, 0xbf, 0x97, 0xd4, 0xfe, 0x51, 0x52, 0xeb, + 0xb2, 0xa4, 0xf6, 0xd7, 0x05, 0xb5, 0x66, 0x0b, 0x6a, 0x5d, 0x2c, 0xa8, 0xf5, 0x7e, 0x57, 0xcf, + 0xc3, 0xd3, 0x20, 0xcc, 0x78, 0xf0, 0xe7, 0x97, 0xdb, 0x6b, 0xa8, 0x27, 0xfb, 0xf0, 0x67, 0x00, + 0x00, 0x00, 0xff, 0xff, 0x07, 0x28, 0x43, 0xd1, 0x32, 0x04, 0x00, 0x00, +} + func (m *QuotaSpec) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) @@ -536,6 +778,9 @@ func encodeVarintQuota(dAtA []byte, offset int, v uint64) int { return offset + 1 } func (m *QuotaSpec) Size() (n int) { + if m == nil { + return 0 + } var l int _ = l if len(m.Rules) > 0 { @@ -548,6 +793,9 @@ func (m *QuotaSpec) Size() (n int) { } func (m *QuotaRule) Size() (n int) { + if m == nil { + return 0 + } var l int _ = l if len(m.Match) > 0 { @@ -566,6 +814,9 @@ func (m *QuotaRule) Size() (n int) { } func (m *StringMatch) Size() (n int) { + if m == nil { + return 0 + } var l int _ = l if m.MatchType != nil { @@ -575,6 +826,9 @@ func (m *StringMatch) Size() (n int) { } func (m *StringMatch_Exact) Size() (n int) { + if m == nil { + return 0 + } var l int _ = l l = len(m.Exact) @@ -582,6 +836,9 @@ func (m *StringMatch_Exact) Size() (n int) { return n } func (m *StringMatch_Prefix) Size() (n int) { + if m == nil { + return 0 + } var l int _ = l l = len(m.Prefix) @@ -589,6 +846,9 @@ func (m *StringMatch_Prefix) Size() (n int) { return n } func (m *StringMatch_Regex) Size() (n int) { + if m == nil { + return 0 + } var l int _ = l l = len(m.Regex) @@ -596,6 +856,9 @@ func (m *StringMatch_Regex) Size() (n int) { return n } func (m *AttributeMatch) Size() (n int) { + if m == nil { + return 0 + } var l int _ = l if len(m.Clause) > 0 { @@ -615,6 +878,9 @@ func (m *AttributeMatch) Size() (n int) { } func (m *Quota) Size() (n int) { + if m == nil { + return 0 + } var l int _ = l l = len(m.Quota) @@ -628,6 +894,9 @@ func (m *Quota) Size() (n int) { } func (m *QuotaSpecBinding) Size() (n int) { + if m == nil { + return 0 + } var l int _ = l if len(m.Services) > 0 { @@ -646,6 +915,9 @@ func (m *QuotaSpecBinding) Size() (n int) { } func (m *QuotaSpecBinding_QuotaSpecReference) Size() (n int) { + if m == nil { + return 0 + } var l int _ = l l = len(m.Name) @@ -741,7 +1013,7 @@ func (this *AttributeMatch) String() string { for k, _ := range this.Clause { keysForClause = append(keysForClause, k) } - sortkeys.Strings(keysForClause) + github_com_gogo_protobuf_sortkeys.Strings(keysForClause) mapStringForClause := "map[string]*StringMatch{" for _, k := range keysForClause { mapStringForClause += fmt.Sprintf("%v: %v,", k, this.Clause[k]) @@ -809,7 +1081,7 @@ func (m *QuotaSpec) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - wire |= (uint64(b) & 0x7F) << shift + wire |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -837,7 +1109,7 @@ func (m *QuotaSpec) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - msglen |= (int(b) & 0x7F) << shift + msglen |= int(b&0x7F) << shift if b < 0x80 { break } @@ -846,6 +1118,9 @@ func (m *QuotaSpec) Unmarshal(dAtA []byte) error { return ErrInvalidLengthQuota } postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthQuota + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -863,6 +1138,9 @@ func (m *QuotaSpec) Unmarshal(dAtA []byte) error { if skippy < 0 { return ErrInvalidLengthQuota } + if (iNdEx + skippy) < 0 { + return ErrInvalidLengthQuota + } if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF } @@ -890,7 +1168,7 @@ func (m *QuotaRule) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - wire |= (uint64(b) & 0x7F) << shift + wire |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -918,7 +1196,7 @@ func (m *QuotaRule) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - msglen |= (int(b) & 0x7F) << shift + msglen |= int(b&0x7F) << shift if b < 0x80 { break } @@ -927,6 +1205,9 @@ func (m *QuotaRule) Unmarshal(dAtA []byte) error { return ErrInvalidLengthQuota } postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthQuota + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -949,7 +1230,7 @@ func (m *QuotaRule) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - msglen |= (int(b) & 0x7F) << shift + msglen |= int(b&0x7F) << shift if b < 0x80 { break } @@ -958,6 +1239,9 @@ func (m *QuotaRule) Unmarshal(dAtA []byte) error { return ErrInvalidLengthQuota } postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthQuota + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -975,6 +1259,9 @@ func (m *QuotaRule) Unmarshal(dAtA []byte) error { if skippy < 0 { return ErrInvalidLengthQuota } + if (iNdEx + skippy) < 0 { + return ErrInvalidLengthQuota + } if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF } @@ -1002,7 +1289,7 @@ func (m *StringMatch) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - wire |= (uint64(b) & 0x7F) << shift + wire |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -1030,7 +1317,7 @@ func (m *StringMatch) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLen |= (uint64(b) & 0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -1040,6 +1327,9 @@ func (m *StringMatch) Unmarshal(dAtA []byte) error { return ErrInvalidLengthQuota } postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthQuota + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -1059,7 +1349,7 @@ func (m *StringMatch) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLen |= (uint64(b) & 0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -1069,6 +1359,9 @@ func (m *StringMatch) Unmarshal(dAtA []byte) error { return ErrInvalidLengthQuota } postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthQuota + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -1088,7 +1381,7 @@ func (m *StringMatch) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLen |= (uint64(b) & 0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -1098,6 +1391,9 @@ func (m *StringMatch) Unmarshal(dAtA []byte) error { return ErrInvalidLengthQuota } postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthQuota + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -1112,6 +1408,9 @@ func (m *StringMatch) Unmarshal(dAtA []byte) error { if skippy < 0 { return ErrInvalidLengthQuota } + if (iNdEx + skippy) < 0 { + return ErrInvalidLengthQuota + } if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF } @@ -1139,7 +1438,7 @@ func (m *AttributeMatch) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - wire |= (uint64(b) & 0x7F) << shift + wire |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -1167,7 +1466,7 @@ func (m *AttributeMatch) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - msglen |= (int(b) & 0x7F) << shift + msglen |= int(b&0x7F) << shift if b < 0x80 { break } @@ -1176,6 +1475,9 @@ func (m *AttributeMatch) Unmarshal(dAtA []byte) error { return ErrInvalidLengthQuota } postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthQuota + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -1196,7 +1498,7 @@ func (m *AttributeMatch) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - wire |= (uint64(b) & 0x7F) << shift + wire |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -1213,7 +1515,7 @@ func (m *AttributeMatch) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLenmapkey |= (uint64(b) & 0x7F) << shift + stringLenmapkey |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -1223,6 +1525,9 @@ func (m *AttributeMatch) Unmarshal(dAtA []byte) error { return ErrInvalidLengthQuota } postStringIndexmapkey := iNdEx + intStringLenmapkey + if postStringIndexmapkey < 0 { + return ErrInvalidLengthQuota + } if postStringIndexmapkey > l { return io.ErrUnexpectedEOF } @@ -1239,7 +1544,7 @@ func (m *AttributeMatch) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - mapmsglen |= (int(b) & 0x7F) << shift + mapmsglen |= int(b&0x7F) << shift if b < 0x80 { break } @@ -1248,7 +1553,7 @@ func (m *AttributeMatch) Unmarshal(dAtA []byte) error { return ErrInvalidLengthQuota } postmsgIndex := iNdEx + mapmsglen - if mapmsglen < 0 { + if postmsgIndex < 0 { return ErrInvalidLengthQuota } if postmsgIndex > l { @@ -1285,6 +1590,9 @@ func (m *AttributeMatch) Unmarshal(dAtA []byte) error { if skippy < 0 { return ErrInvalidLengthQuota } + if (iNdEx + skippy) < 0 { + return ErrInvalidLengthQuota + } if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF } @@ -1312,7 +1620,7 @@ func (m *Quota) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - wire |= (uint64(b) & 0x7F) << shift + wire |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -1340,7 +1648,7 @@ func (m *Quota) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLen |= (uint64(b) & 0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -1350,6 +1658,9 @@ func (m *Quota) Unmarshal(dAtA []byte) error { return ErrInvalidLengthQuota } postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthQuota + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -1369,7 +1680,7 @@ func (m *Quota) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - m.Charge |= (int64(b) & 0x7F) << shift + m.Charge |= int64(b&0x7F) << shift if b < 0x80 { break } @@ -1383,6 +1694,9 @@ func (m *Quota) Unmarshal(dAtA []byte) error { if skippy < 0 { return ErrInvalidLengthQuota } + if (iNdEx + skippy) < 0 { + return ErrInvalidLengthQuota + } if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF } @@ -1410,7 +1724,7 @@ func (m *QuotaSpecBinding) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - wire |= (uint64(b) & 0x7F) << shift + wire |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -1438,7 +1752,7 @@ func (m *QuotaSpecBinding) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - msglen |= (int(b) & 0x7F) << shift + msglen |= int(b&0x7F) << shift if b < 0x80 { break } @@ -1447,6 +1761,9 @@ func (m *QuotaSpecBinding) Unmarshal(dAtA []byte) error { return ErrInvalidLengthQuota } postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthQuota + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -1469,7 +1786,7 @@ func (m *QuotaSpecBinding) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - msglen |= (int(b) & 0x7F) << shift + msglen |= int(b&0x7F) << shift if b < 0x80 { break } @@ -1478,6 +1795,9 @@ func (m *QuotaSpecBinding) Unmarshal(dAtA []byte) error { return ErrInvalidLengthQuota } postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthQuota + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -1495,6 +1815,9 @@ func (m *QuotaSpecBinding) Unmarshal(dAtA []byte) error { if skippy < 0 { return ErrInvalidLengthQuota } + if (iNdEx + skippy) < 0 { + return ErrInvalidLengthQuota + } if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF } @@ -1522,7 +1845,7 @@ func (m *QuotaSpecBinding_QuotaSpecReference) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - wire |= (uint64(b) & 0x7F) << shift + wire |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -1550,7 +1873,7 @@ func (m *QuotaSpecBinding_QuotaSpecReference) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLen |= (uint64(b) & 0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -1560,6 +1883,9 @@ func (m *QuotaSpecBinding_QuotaSpecReference) Unmarshal(dAtA []byte) error { return ErrInvalidLengthQuota } postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthQuota + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -1579,7 +1905,7 @@ func (m *QuotaSpecBinding_QuotaSpecReference) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLen |= (uint64(b) & 0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -1589,6 +1915,9 @@ func (m *QuotaSpecBinding_QuotaSpecReference) Unmarshal(dAtA []byte) error { return ErrInvalidLengthQuota } postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthQuota + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -1603,6 +1932,9 @@ func (m *QuotaSpecBinding_QuotaSpecReference) Unmarshal(dAtA []byte) error { if skippy < 0 { return ErrInvalidLengthQuota } + if (iNdEx + skippy) < 0 { + return ErrInvalidLengthQuota + } if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF } @@ -1669,10 +2001,13 @@ func skipQuota(dAtA []byte) (n int, err error) { break } } - iNdEx += length if length < 0 { return 0, ErrInvalidLengthQuota } + iNdEx += length + if iNdEx < 0 { + return 0, ErrInvalidLengthQuota + } return iNdEx, nil case 3: for { @@ -1701,6 +2036,9 @@ func skipQuota(dAtA []byte) (n int, err error) { return 0, err } iNdEx = start + next + if iNdEx < 0 { + return 0, ErrInvalidLengthQuota + } } return iNdEx, nil case 4: @@ -1719,43 +2057,3 @@ var ( ErrInvalidLengthQuota = fmt.Errorf("proto: negative length found during unmarshaling") ErrIntOverflowQuota = fmt.Errorf("proto: integer overflow") ) - -func init() { proto.RegisterFile("mixer/v1/config/client/quota.proto", fileDescriptorQuota) } - -var fileDescriptorQuota = []byte{ - // 533 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x93, 0x4f, 0x6b, 0x13, 0x4f, - 0x18, 0xc7, 0x77, 0x93, 0xdf, 0x86, 0x5f, 0x9e, 0x88, 0x94, 0xa1, 0x94, 0x25, 0x94, 0xa1, 0x6c, - 0x05, 0xab, 0xc8, 0x2e, 0xad, 0x08, 0x45, 0x11, 0x69, 0xc4, 0xa2, 0x82, 0xa0, 0x53, 0xbc, 0x78, - 0x29, 0x9b, 0xe9, 0x93, 0xed, 0x60, 0xb2, 0xbb, 0x9d, 0x9d, 0x0d, 0xc9, 0xcd, 0x93, 0x27, 0x0f, - 0xbe, 0x0c, 0x5f, 0x4a, 0x8e, 0x3d, 0x7a, 0x34, 0xeb, 0xc5, 0x63, 0x5f, 0x82, 0xec, 0xcc, 0xa4, - 0x8d, 0xa8, 0xa1, 0x9e, 0xf6, 0x79, 0x9e, 0x7d, 0x3e, 0xdf, 0xe7, 0x0f, 0xcf, 0x40, 0x30, 0x12, - 0x13, 0x94, 0xd1, 0x78, 0x37, 0xe2, 0x59, 0x3a, 0x10, 0x49, 0xc4, 0x87, 0x02, 0x53, 0x15, 0x9d, - 0x95, 0x99, 0x8a, 0xc3, 0x5c, 0x66, 0x2a, 0x23, 0x9b, 0xa2, 0x50, 0x22, 0x0b, 0x75, 0x66, 0x38, - 0xde, 0x0d, 0x4d, 0x66, 0x68, 0x32, 0xbb, 0xeb, 0x49, 0x96, 0x64, 0x3a, 0x31, 0xaa, 0x2d, 0xc3, - 0x74, 0x6f, 0xfd, 0x45, 0xb7, 0x40, 0x39, 0x16, 0x1c, 0x4d, 0x56, 0xf0, 0x12, 0xda, 0x6f, 0xea, - 0x42, 0x47, 0x39, 0x72, 0xf2, 0x18, 0x3c, 0x59, 0x0e, 0xb1, 0xf0, 0xdd, 0xad, 0xe6, 0x4e, 0x67, - 0xef, 0x76, 0xb8, 0xaa, 0x6c, 0xa8, 0x39, 0x56, 0x0e, 0x91, 0x19, 0x2a, 0xf8, 0xe4, 0x5a, 0xb1, - 0x3a, 0x48, 0x7a, 0xe0, 0x8d, 0x62, 0xc5, 0x4f, 0xad, 0xd8, 0xbd, 0xd5, 0x62, 0x07, 0x4a, 0x49, - 0xd1, 0x2f, 0x15, 0xbe, 0xaa, 0x19, 0x66, 0x50, 0xf2, 0x08, 0x5a, 0x7a, 0x0d, 0x85, 0xdf, 0xd0, - 0x22, 0xdb, 0xd7, 0xe9, 0xc8, 0x22, 0x01, 0x42, 0xe7, 0x48, 0x49, 0x91, 0x26, 0x5a, 0x92, 0x6c, - 0x80, 0x87, 0x93, 0x98, 0x2b, 0xdf, 0xdd, 0x72, 0x77, 0xda, 0xcf, 0x1d, 0x66, 0x5c, 0xe2, 0x43, - 0x2b, 0x97, 0x38, 0x10, 0x13, 0xbf, 0x61, 0x7f, 0x58, 0xbf, 0x26, 0x24, 0x26, 0x38, 0xf1, 0x9b, - 0x0b, 0x42, 0xbb, 0xbd, 0x1b, 0x00, 0xba, 0xbd, 0x63, 0x35, 0xcd, 0x31, 0x98, 0xb9, 0x70, 0xf3, - 0xd7, 0xee, 0xc9, 0x6b, 0x68, 0xf1, 0x61, 0x5c, 0x16, 0x68, 0x67, 0xdf, 0xff, 0x97, 0xd9, 0xc3, - 0xa7, 0x1a, 0x7d, 0x96, 0x2a, 0x39, 0x65, 0x56, 0xa7, 0x7b, 0x02, 0x9d, 0xa5, 0x30, 0x59, 0x83, - 0xe6, 0x7b, 0x9c, 0x9a, 0x49, 0x58, 0x6d, 0x92, 0x27, 0xe0, 0x8d, 0xe3, 0x61, 0x89, 0x7a, 0x88, - 0xce, 0xde, 0x9d, 0xd5, 0x15, 0x97, 0xf6, 0xc2, 0x0c, 0xf7, 0xb0, 0xb1, 0xef, 0x06, 0x0f, 0xc0, - 0xd3, 0x2b, 0x24, 0xeb, 0xe0, 0xe9, 0x25, 0xda, 0x0a, 0xc6, 0x21, 0x1b, 0xd0, 0xe2, 0xa7, 0xb1, - 0x4c, 0x4c, 0x91, 0x26, 0xb3, 0x5e, 0xf0, 0xb1, 0x01, 0x6b, 0x97, 0x47, 0xd4, 0x13, 0xe9, 0x89, - 0x48, 0x13, 0x72, 0x08, 0xff, 0xdb, 0x4b, 0x5b, 0x9c, 0xd3, 0xdd, 0xd5, 0x3d, 0xbd, 0xa8, 0x7f, - 0x1e, 0x19, 0x84, 0x5d, 0xb2, 0xa4, 0x0f, 0x1d, 0x5d, 0xfd, 0xb8, 0xc8, 0x91, 0x2f, 0xee, 0xe0, - 0xe0, 0x1a, 0x77, 0xb0, 0xd4, 0xcc, 0x55, 0x80, 0xe1, 0x00, 0x25, 0xa6, 0x1c, 0x19, 0x9c, 0x2d, - 0x62, 0x45, 0xf7, 0x10, 0xc8, 0xef, 0x19, 0x84, 0xc0, 0x7f, 0x69, 0x3c, 0x42, 0xbb, 0x03, 0x6d, - 0x93, 0x4d, 0x68, 0xd7, 0xdf, 0x22, 0x8f, 0xb9, 0xd9, 0x42, 0x9b, 0x5d, 0x05, 0x7a, 0x6f, 0x67, - 0x73, 0xea, 0x9c, 0xcf, 0xa9, 0xf3, 0x75, 0x4e, 0x9d, 0x8b, 0x39, 0x75, 0x3e, 0x54, 0xd4, 0xfd, - 0x52, 0x51, 0x67, 0x56, 0x51, 0xf7, 0xbc, 0xa2, 0xee, 0xb7, 0x8a, 0xba, 0x3f, 0x2a, 0xea, 0x5c, - 0x54, 0xd4, 0xfd, 0xfc, 0x9d, 0x3a, 0xef, 0xb6, 0xcd, 0x1c, 0x22, 0x8b, 0xe2, 0x5c, 0x44, 0x7f, - 0x7e, 0xb1, 0xfd, 0x96, 0x7e, 0xaa, 0xf7, 0x7f, 0x06, 0x00, 0x00, 0xff, 0xff, 0x84, 0xe2, 0xec, - 0x62, 0x2a, 0x04, 0x00, 0x00, -} diff --git a/mixer/v1/config/client/service.pb.go b/mixer/v1/config/client/service.pb.go index bbf3e660920..11e541be687 100644 --- a/mixer/v1/config/client/service.pb.go +++ b/mixer/v1/config/client/service.pb.go @@ -3,22 +3,28 @@ package client -import proto "github.com/gogo/protobuf/proto" -import fmt "fmt" -import math "math" -import _ "github.com/gogo/protobuf/gogoproto" - -import strings "strings" -import reflect "reflect" -import sortkeys "github.com/gogo/protobuf/sortkeys" - -import io "io" +import ( + fmt "fmt" + _ "github.com/gogo/protobuf/gogoproto" + proto "github.com/gogo/protobuf/proto" + github_com_gogo_protobuf_sortkeys "github.com/gogo/protobuf/sortkeys" + io "io" + math "math" + reflect "reflect" + strings "strings" +) // Reference imports to suppress errors if they are not otherwise used. var _ = proto.Marshal var _ = fmt.Errorf var _ = math.Inf +// This is a compile-time assertion to ensure that this generated file +// is compatible with the proto package it is being compiled against. +// A compilation error at this line likely means your copy of the +// proto package needs to be updated. +const _ = proto.GoGoProtoPackageIsVersion2 // please upgrade the proto package + // IstioService identifies a service and optionally service version. // The FQDN of the service is composed from the name, namespace, and implementation-specific domain suffix // (e.g. on Kubernetes, "reviews" + "default" + "svc.cluster.local" -> "reviews.default.svc.cluster.local"). @@ -35,16 +41,74 @@ type IstioService struct { // // *Note:* When used for a VirtualService destination, labels MUST be empty. // - Labels map[string]string `protobuf:"bytes,5,rep,name=labels" json:"labels,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` + Labels map[string]string `protobuf:"bytes,5,rep,name=labels,proto3" json:"labels,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` } -func (m *IstioService) Reset() { *m = IstioService{} } -func (*IstioService) ProtoMessage() {} -func (*IstioService) Descriptor() ([]byte, []int) { return fileDescriptorService, []int{0} } +func (m *IstioService) Reset() { *m = IstioService{} } +func (*IstioService) ProtoMessage() {} +func (*IstioService) Descriptor() ([]byte, []int) { + return fileDescriptor_3358a28a51c817d5, []int{0} +} +func (m *IstioService) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *IstioService) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_IstioService.Marshal(b, m, deterministic) + } else { + b = b[:cap(b)] + n, err := m.MarshalTo(b) + if err != nil { + return nil, err + } + return b[:n], nil + } +} +func (m *IstioService) XXX_Merge(src proto.Message) { + xxx_messageInfo_IstioService.Merge(m, src) +} +func (m *IstioService) XXX_Size() int { + return m.Size() +} +func (m *IstioService) XXX_DiscardUnknown() { + xxx_messageInfo_IstioService.DiscardUnknown(m) +} + +var xxx_messageInfo_IstioService proto.InternalMessageInfo func init() { proto.RegisterType((*IstioService)(nil), "istio.mixer.v1.config.client.IstioService") + proto.RegisterMapType((map[string]string)(nil), "istio.mixer.v1.config.client.IstioService.LabelsEntry") +} + +func init() { + proto.RegisterFile("mixer/v1/config/client/service.proto", fileDescriptor_3358a28a51c817d5) +} + +var fileDescriptor_3358a28a51c817d5 = []byte{ + // 315 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x51, 0x3f, 0x4b, 0x03, 0x31, + 0x1c, 0x4d, 0xfa, 0x4f, 0x9a, 0x3a, 0x48, 0x28, 0x12, 0x4a, 0xf9, 0x51, 0xd4, 0xa1, 0x53, 0x42, + 0x15, 0x44, 0x1d, 0x05, 0x07, 0x41, 0x1c, 0xea, 0x26, 0x38, 0xa4, 0x67, 0x2c, 0xc1, 0xeb, 0xa5, + 0xdc, 0x9d, 0x87, 0xdd, 0xfc, 0x08, 0x7e, 0x0c, 0x3f, 0x4a, 0xc7, 0x8e, 0x1d, 0xbd, 0x74, 0x71, + 0xec, 0x17, 0x10, 0xe4, 0x92, 0x2b, 0x76, 0x10, 0xa7, 0xbc, 0xf7, 0x7b, 0xef, 0xfd, 0x78, 0x49, + 0xc8, 0xd1, 0x44, 0xbf, 0xaa, 0x58, 0x64, 0x03, 0x11, 0x98, 0xe8, 0x49, 0x8f, 0x45, 0x10, 0x6a, + 0x15, 0xa5, 0x22, 0x51, 0x71, 0xa6, 0x03, 0xc5, 0xa7, 0xb1, 0x49, 0x0d, 0xed, 0xea, 0x24, 0xd5, + 0x86, 0x3b, 0x2f, 0xcf, 0x06, 0xdc, 0x7b, 0xb9, 0xf7, 0x76, 0xda, 0x63, 0x33, 0x36, 0xce, 0x28, + 0x0a, 0xe4, 0x33, 0x07, 0xdf, 0x98, 0xec, 0x5e, 0x17, 0xb1, 0x3b, 0xbf, 0x8a, 0x52, 0x52, 0x8b, + 0xe4, 0x44, 0x31, 0xdc, 0xc3, 0xfd, 0xe6, 0xd0, 0x61, 0xda, 0x25, 0xcd, 0xe2, 0x4c, 0xa6, 0x32, + 0x50, 0xac, 0xe2, 0x84, 0xdf, 0x01, 0xdd, 0x27, 0x8d, 0x47, 0x33, 0x91, 0x3a, 0x62, 0x55, 0x27, + 0x95, 0x8c, 0x32, 0xb2, 0x53, 0xf6, 0x63, 0x35, 0x27, 0x6c, 0x28, 0xbd, 0x25, 0x8d, 0x50, 0x8e, + 0x54, 0x98, 0xb0, 0x7a, 0xaf, 0xda, 0x6f, 0x1d, 0x9f, 0xf2, 0xff, 0x9a, 0xf3, 0xed, 0x7e, 0xfc, + 0xc6, 0x05, 0xaf, 0xa2, 0x34, 0x9e, 0x0d, 0xcb, 0x2d, 0x9d, 0x73, 0xd2, 0xda, 0x1a, 0xd3, 0x3d, + 0x52, 0x7d, 0x56, 0xb3, 0xf2, 0x06, 0x05, 0xa4, 0x6d, 0x52, 0xcf, 0x64, 0xf8, 0xb2, 0x29, 0xef, + 0xc9, 0x45, 0xe5, 0x0c, 0x5f, 0x3e, 0xcc, 0x73, 0x40, 0x8b, 0x1c, 0xd0, 0x32, 0x07, 0xb4, 0xce, + 0x01, 0xbd, 0x59, 0xc0, 0x1f, 0x16, 0xd0, 0xdc, 0x02, 0x5e, 0x58, 0xc0, 0x9f, 0x16, 0xf0, 0x97, + 0x05, 0xb4, 0xb6, 0x80, 0xdf, 0x57, 0x80, 0x16, 0x2b, 0x40, 0xcb, 0x15, 0xa0, 0xfb, 0x43, 0xdf, + 0x59, 0x1b, 0x21, 0xa7, 0x5a, 0xfc, 0xfd, 0x41, 0xa3, 0x86, 0x7b, 0xe5, 0x93, 0x9f, 0x00, 0x00, + 0x00, 0xff, 0xff, 0xc4, 0x69, 0x6e, 0x30, 0xc1, 0x01, 0x00, 0x00, } + func (m *IstioService) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) @@ -114,6 +178,9 @@ func encodeVarintService(dAtA []byte, offset int, v uint64) int { return offset + 1 } func (m *IstioService) Size() (n int) { + if m == nil { + return 0 + } var l int _ = l l = len(m.Name) @@ -164,7 +231,7 @@ func (this *IstioService) String() string { for k, _ := range this.Labels { keysForLabels = append(keysForLabels, k) } - sortkeys.Strings(keysForLabels) + github_com_gogo_protobuf_sortkeys.Strings(keysForLabels) mapStringForLabels := "map[string]string{" for _, k := range keysForLabels { mapStringForLabels += fmt.Sprintf("%v: %v,", k, this.Labels[k]) @@ -203,7 +270,7 @@ func (m *IstioService) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - wire |= (uint64(b) & 0x7F) << shift + wire |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -231,7 +298,7 @@ func (m *IstioService) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLen |= (uint64(b) & 0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -241,6 +308,9 @@ func (m *IstioService) Unmarshal(dAtA []byte) error { return ErrInvalidLengthService } postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthService + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -260,7 +330,7 @@ func (m *IstioService) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLen |= (uint64(b) & 0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -270,6 +340,9 @@ func (m *IstioService) Unmarshal(dAtA []byte) error { return ErrInvalidLengthService } postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthService + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -289,7 +362,7 @@ func (m *IstioService) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLen |= (uint64(b) & 0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -299,6 +372,9 @@ func (m *IstioService) Unmarshal(dAtA []byte) error { return ErrInvalidLengthService } postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthService + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -318,7 +394,7 @@ func (m *IstioService) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLen |= (uint64(b) & 0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -328,6 +404,9 @@ func (m *IstioService) Unmarshal(dAtA []byte) error { return ErrInvalidLengthService } postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthService + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -347,7 +426,7 @@ func (m *IstioService) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - msglen |= (int(b) & 0x7F) << shift + msglen |= int(b&0x7F) << shift if b < 0x80 { break } @@ -356,6 +435,9 @@ func (m *IstioService) Unmarshal(dAtA []byte) error { return ErrInvalidLengthService } postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthService + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -376,7 +458,7 @@ func (m *IstioService) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - wire |= (uint64(b) & 0x7F) << shift + wire |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -393,7 +475,7 @@ func (m *IstioService) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLenmapkey |= (uint64(b) & 0x7F) << shift + stringLenmapkey |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -403,6 +485,9 @@ func (m *IstioService) Unmarshal(dAtA []byte) error { return ErrInvalidLengthService } postStringIndexmapkey := iNdEx + intStringLenmapkey + if postStringIndexmapkey < 0 { + return ErrInvalidLengthService + } if postStringIndexmapkey > l { return io.ErrUnexpectedEOF } @@ -419,7 +504,7 @@ func (m *IstioService) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLenmapvalue |= (uint64(b) & 0x7F) << shift + stringLenmapvalue |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -429,6 +514,9 @@ func (m *IstioService) Unmarshal(dAtA []byte) error { return ErrInvalidLengthService } postStringIndexmapvalue := iNdEx + intStringLenmapvalue + if postStringIndexmapvalue < 0 { + return ErrInvalidLengthService + } if postStringIndexmapvalue > l { return io.ErrUnexpectedEOF } @@ -460,6 +548,9 @@ func (m *IstioService) Unmarshal(dAtA []byte) error { if skippy < 0 { return ErrInvalidLengthService } + if (iNdEx + skippy) < 0 { + return ErrInvalidLengthService + } if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF } @@ -526,10 +617,13 @@ func skipService(dAtA []byte) (n int, err error) { break } } - iNdEx += length if length < 0 { return 0, ErrInvalidLengthService } + iNdEx += length + if iNdEx < 0 { + return 0, ErrInvalidLengthService + } return iNdEx, nil case 3: for { @@ -558,6 +652,9 @@ func skipService(dAtA []byte) (n int, err error) { return 0, err } iNdEx = start + next + if iNdEx < 0 { + return 0, ErrInvalidLengthService + } } return iNdEx, nil case 4: @@ -576,29 +673,3 @@ var ( ErrInvalidLengthService = fmt.Errorf("proto: negative length found during unmarshaling") ErrIntOverflowService = fmt.Errorf("proto: integer overflow") ) - -func init() { proto.RegisterFile("mixer/v1/config/client/service.proto", fileDescriptorService) } - -var fileDescriptorService = []byte{ - // 308 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x52, 0xc9, 0xcd, 0xac, 0x48, - 0x2d, 0xd2, 0x2f, 0x33, 0xd4, 0x4f, 0xce, 0xcf, 0x4b, 0xcb, 0x4c, 0xd7, 0x4f, 0xce, 0xc9, 0x4c, - 0xcd, 0x2b, 0xd1, 0x2f, 0x4e, 0x2d, 0x2a, 0xcb, 0x4c, 0x4e, 0xd5, 0x2b, 0x28, 0xca, 0x2f, 0xc9, - 0x17, 0x92, 0xc9, 0x2c, 0x2e, 0xc9, 0xcc, 0xd7, 0x03, 0xab, 0xd5, 0x2b, 0x33, 0xd4, 0x83, 0xa8, - 0xd5, 0x83, 0xa8, 0x95, 0x12, 0x49, 0xcf, 0x4f, 0xcf, 0x07, 0x2b, 0xd4, 0x07, 0xb1, 0x20, 0x7a, - 0x94, 0xfe, 0x32, 0x72, 0xf1, 0x78, 0x82, 0xb4, 0x05, 0x43, 0x8c, 0x12, 0x12, 0xe2, 0x62, 0xc9, - 0x4b, 0xcc, 0x4d, 0x95, 0x60, 0x54, 0x60, 0xd4, 0xe0, 0x0c, 0x02, 0xb3, 0x85, 0x64, 0xb8, 0x38, - 0x41, 0x74, 0x71, 0x41, 0x62, 0x72, 0xaa, 0x04, 0x13, 0x58, 0x02, 0x21, 0x20, 0x24, 0xc6, 0xc5, - 0x96, 0x92, 0x9f, 0x9b, 0x98, 0x99, 0x27, 0xc1, 0x0c, 0x96, 0x82, 0xf2, 0x84, 0x24, 0xb8, 0xd8, - 0xa1, 0xee, 0x93, 0x60, 0x01, 0x4b, 0xc0, 0xb8, 0x42, 0x7e, 0x5c, 0x6c, 0x39, 0x89, 0x49, 0xa9, - 0x39, 0xc5, 0x12, 0xac, 0x0a, 0xcc, 0x1a, 0xdc, 0x46, 0x66, 0x7a, 0xf8, 0x5c, 0xae, 0x87, 0xec, - 0x3e, 0x3d, 0x1f, 0xb0, 0x46, 0xd7, 0xbc, 0x92, 0xa2, 0xca, 0x20, 0xa8, 0x29, 0x52, 0x96, 0x5c, - 0xdc, 0x48, 0xc2, 0x42, 0x02, 0x5c, 0xcc, 0xd9, 0xa9, 0x95, 0x50, 0x1f, 0x80, 0x98, 0x42, 0x22, - 0x5c, 0xac, 0x65, 0x89, 0x39, 0xa5, 0x30, 0xc7, 0x43, 0x38, 0x56, 0x4c, 0x16, 0x8c, 0x4e, 0xa1, - 0x27, 0x1e, 0xca, 0x31, 0x5c, 0x78, 0x28, 0xc7, 0x70, 0xe3, 0xa1, 0x1c, 0xc3, 0x87, 0x87, 0x72, - 0x0c, 0x0d, 0x8f, 0xe4, 0x18, 0x57, 0x3c, 0x92, 0x63, 0x38, 0xf1, 0x48, 0x8e, 0xf1, 0xc2, 0x23, - 0x39, 0xc6, 0x07, 0x8f, 0xe4, 0x18, 0x5f, 0x3c, 0x92, 0x63, 0xf8, 0xf0, 0x48, 0x8e, 0x71, 0xc2, - 0x63, 0x39, 0x86, 0x28, 0x65, 0x88, 0x5b, 0x33, 0xf3, 0xf5, 0x13, 0x0b, 0x32, 0xf5, 0xb1, 0x47, - 0x4c, 0x12, 0x1b, 0x38, 0x74, 0x8d, 0x01, 0x01, 0x00, 0x00, 0xff, 0xff, 0xc8, 0x61, 0xda, 0x1b, - 0xb9, 0x01, 0x00, 0x00, -} diff --git a/mixer/v1/mixer.pb.go b/mixer/v1/mixer.pb.go index c413a36f50b..be9a088d51c 100644 --- a/mixer/v1/mixer.pb.go +++ b/mixer/v1/mixer.pb.go @@ -1,29 +1,28 @@ // Code generated by protoc-gen-gogo. DO NOT EDIT. // source: mixer/v1/mixer.proto -package v1 - -import proto "github.com/gogo/protobuf/proto" -import fmt "fmt" -import math "math" -import _ "github.com/gogo/protobuf/gogoproto" -import _ "github.com/gogo/protobuf/types" -import google_rpc "github.com/gogo/googleapis/google/rpc" - -import time "time" - -import strconv "strconv" +// This package defines the Mixer API that the sidecar proxy uses to perform +// precondition checks, manage quotas, and report telemetry. -import context "golang.org/x/net/context" -import grpc "google.golang.org/grpc" - -import types "github.com/gogo/protobuf/types" - -import strings "strings" -import reflect "reflect" -import sortkeys "github.com/gogo/protobuf/sortkeys" +package v1 -import io "io" +import ( + context "context" + fmt "fmt" + rpc "github.com/gogo/googleapis/google/rpc" + _ "github.com/gogo/protobuf/gogoproto" + proto "github.com/gogo/protobuf/proto" + github_com_gogo_protobuf_sortkeys "github.com/gogo/protobuf/sortkeys" + _ "github.com/gogo/protobuf/types" + github_com_gogo_protobuf_types "github.com/gogo/protobuf/types" + grpc "google.golang.org/grpc" + io "io" + math "math" + reflect "reflect" + strconv "strconv" + strings "strings" + time "time" +) // Reference imports to suppress errors if they are not otherwise used. var _ = proto.Marshal @@ -31,6 +30,12 @@ var _ = fmt.Errorf var _ = math.Inf var _ = time.Kitchen +// This is a compile-time assertion to ensure that this generated file +// is compatible with the proto package it is being compiled against. +// A compilation error at this line likely means your copy of the +// proto package needs to be updated. +const _ = proto.GoGoProtoPackageIsVersion2 // please upgrade the proto package + // How an attribute's value was matched type ReferencedAttributes_Condition int32 @@ -47,6 +52,7 @@ var ReferencedAttributes_Condition_name = map[int32]string{ 2: "EXACT", 3: "REGEX", } + var ReferencedAttributes_Condition_value = map[string]int32{ "CONDITION_UNSPECIFIED": 0, "ABSENCE": 1, @@ -55,7 +61,7 @@ var ReferencedAttributes_Condition_value = map[string]int32{ } func (ReferencedAttributes_Condition) EnumDescriptor() ([]byte, []int) { - return fileDescriptorMixer, []int{2, 0} + return fileDescriptor_f6f59c90bff4c1e2, []int{2, 0} } // Operation type. @@ -72,6 +78,7 @@ var HeaderOperation_Operation_name = map[int32]string{ 1: "REMOVE", 2: "APPEND", } + var HeaderOperation_Operation_value = map[string]int32{ "REPLACE": 0, "REMOVE": 1, @@ -79,7 +86,7 @@ var HeaderOperation_Operation_value = map[string]int32{ } func (HeaderOperation_Operation) EnumDescriptor() ([]byte, []int) { - return fileDescriptorMixer, []int{3, 0} + return fileDescriptor_f6f59c90bff4c1e2, []int{3, 0} } // Used to signal how the sets of compressed attributes should be reconstitued server-side. @@ -101,13 +108,14 @@ var ReportRequest_RepeatedAttributesSemantics_name = map[int32]string{ 0: "DELTA_ENCODING", 1: "INDEPENDENT_ENCODING", } + var ReportRequest_RepeatedAttributesSemantics_value = map[string]int32{ "DELTA_ENCODING": 0, "INDEPENDENT_ENCODING": 1, } func (ReportRequest_RepeatedAttributesSemantics) EnumDescriptor() ([]byte, []int) { - return fileDescriptorMixer, []int{5, 0} + return fileDescriptor_f6f59c90bff4c1e2, []int{5, 0} } // Used to get a thumbs-up/thumbs-down before performing an action. @@ -116,7 +124,7 @@ type CheckRequest struct { // // Mixer's configuration determines how these attributes are used to // establish the result returned in the response. - Attributes CompressedAttributes `protobuf:"bytes,1,opt,name=attributes" json:"attributes"` + Attributes CompressedAttributes `protobuf:"bytes,1,opt,name=attributes,proto3" json:"attributes"` // The number of words in the global dictionary, used with to populate the attributes. // This value is used as a quick way to determine whether the client is using a dictionary that // the server understands. @@ -125,12 +133,40 @@ type CheckRequest struct { // per call, where the same UUID is used for retries of the same call. DeduplicationId string `protobuf:"bytes,3,opt,name=deduplication_id,json=deduplicationId,proto3" json:"deduplication_id,omitempty"` // The individual quotas to allocate - Quotas map[string]CheckRequest_QuotaParams `protobuf:"bytes,4,rep,name=quotas" json:"quotas" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value"` + Quotas map[string]CheckRequest_QuotaParams `protobuf:"bytes,4,rep,name=quotas,proto3" json:"quotas" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` } -func (m *CheckRequest) Reset() { *m = CheckRequest{} } -func (*CheckRequest) ProtoMessage() {} -func (*CheckRequest) Descriptor() ([]byte, []int) { return fileDescriptorMixer, []int{0} } +func (m *CheckRequest) Reset() { *m = CheckRequest{} } +func (*CheckRequest) ProtoMessage() {} +func (*CheckRequest) Descriptor() ([]byte, []int) { + return fileDescriptor_f6f59c90bff4c1e2, []int{0} +} +func (m *CheckRequest) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *CheckRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_CheckRequest.Marshal(b, m, deterministic) + } else { + b = b[:cap(b)] + n, err := m.MarshalTo(b) + if err != nil { + return nil, err + } + return b[:n], nil + } +} +func (m *CheckRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_CheckRequest.Merge(m, src) +} +func (m *CheckRequest) XXX_Size() int { + return m.Size() +} +func (m *CheckRequest) XXX_DiscardUnknown() { + xxx_messageInfo_CheckRequest.DiscardUnknown(m) +} + +var xxx_messageInfo_CheckRequest proto.InternalMessageInfo // parameters for a quota allocation type CheckRequest_QuotaParams struct { @@ -140,76 +176,212 @@ type CheckRequest_QuotaParams struct { BestEffort bool `protobuf:"varint,2,opt,name=best_effort,json=bestEffort,proto3" json:"best_effort,omitempty"` } -func (m *CheckRequest_QuotaParams) Reset() { *m = CheckRequest_QuotaParams{} } -func (*CheckRequest_QuotaParams) ProtoMessage() {} -func (*CheckRequest_QuotaParams) Descriptor() ([]byte, []int) { return fileDescriptorMixer, []int{0, 0} } +func (m *CheckRequest_QuotaParams) Reset() { *m = CheckRequest_QuotaParams{} } +func (*CheckRequest_QuotaParams) ProtoMessage() {} +func (*CheckRequest_QuotaParams) Descriptor() ([]byte, []int) { + return fileDescriptor_f6f59c90bff4c1e2, []int{0, 0} +} +func (m *CheckRequest_QuotaParams) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *CheckRequest_QuotaParams) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_CheckRequest_QuotaParams.Marshal(b, m, deterministic) + } else { + b = b[:cap(b)] + n, err := m.MarshalTo(b) + if err != nil { + return nil, err + } + return b[:n], nil + } +} +func (m *CheckRequest_QuotaParams) XXX_Merge(src proto.Message) { + xxx_messageInfo_CheckRequest_QuotaParams.Merge(m, src) +} +func (m *CheckRequest_QuotaParams) XXX_Size() int { + return m.Size() +} +func (m *CheckRequest_QuotaParams) XXX_DiscardUnknown() { + xxx_messageInfo_CheckRequest_QuotaParams.DiscardUnknown(m) +} + +var xxx_messageInfo_CheckRequest_QuotaParams proto.InternalMessageInfo // The response generated by the Check method. type CheckResponse struct { // The precondition check results. - Precondition CheckResponse_PreconditionResult `protobuf:"bytes,2,opt,name=precondition" json:"precondition"` + Precondition CheckResponse_PreconditionResult `protobuf:"bytes,2,opt,name=precondition,proto3" json:"precondition"` // The resulting quota, one entry per requested quota. - Quotas map[string]CheckResponse_QuotaResult `protobuf:"bytes,3,rep,name=quotas" json:"quotas" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value"` + Quotas map[string]CheckResponse_QuotaResult `protobuf:"bytes,3,rep,name=quotas,proto3" json:"quotas" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` } -func (m *CheckResponse) Reset() { *m = CheckResponse{} } -func (*CheckResponse) ProtoMessage() {} -func (*CheckResponse) Descriptor() ([]byte, []int) { return fileDescriptorMixer, []int{1} } +func (m *CheckResponse) Reset() { *m = CheckResponse{} } +func (*CheckResponse) ProtoMessage() {} +func (*CheckResponse) Descriptor() ([]byte, []int) { + return fileDescriptor_f6f59c90bff4c1e2, []int{1} +} +func (m *CheckResponse) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *CheckResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_CheckResponse.Marshal(b, m, deterministic) + } else { + b = b[:cap(b)] + n, err := m.MarshalTo(b) + if err != nil { + return nil, err + } + return b[:n], nil + } +} +func (m *CheckResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_CheckResponse.Merge(m, src) +} +func (m *CheckResponse) XXX_Size() int { + return m.Size() +} +func (m *CheckResponse) XXX_DiscardUnknown() { + xxx_messageInfo_CheckResponse.DiscardUnknown(m) +} + +var xxx_messageInfo_CheckResponse proto.InternalMessageInfo // Expresses the result of a precondition check. type CheckResponse_PreconditionResult struct { // A status code of OK indicates all preconditions were satisfied. Any other code indicates not // all preconditions were satisfied and details describe why. - Status google_rpc.Status `protobuf:"bytes,1,opt,name=status" json:"status"` + Status rpc.Status `protobuf:"bytes,1,opt,name=status,proto3" json:"status"` // The amount of time for which this result can be considered valid. - ValidDuration time.Duration `protobuf:"bytes,2,opt,name=valid_duration,json=validDuration,stdduration" json:"valid_duration"` + ValidDuration time.Duration `protobuf:"bytes,2,opt,name=valid_duration,json=validDuration,proto3,stdduration" json:"valid_duration"` // The number of uses for which this result can be considered valid. ValidUseCount int32 `protobuf:"varint,3,opt,name=valid_use_count,json=validUseCount,proto3" json:"valid_use_count,omitempty"` // The total set of attributes that were used in producing the result // along with matching conditions. - ReferencedAttributes *ReferencedAttributes `protobuf:"bytes,5,opt,name=referenced_attributes,json=referencedAttributes" json:"referenced_attributes,omitempty"` + ReferencedAttributes *ReferencedAttributes `protobuf:"bytes,5,opt,name=referenced_attributes,json=referencedAttributes,proto3" json:"referenced_attributes,omitempty"` // An optional routing directive, used to manipulate the traffic metadata // whenever all preconditions are satisfied. - RouteDirective *RouteDirective `protobuf:"bytes,6,opt,name=route_directive,json=routeDirective" json:"route_directive,omitempty"` + RouteDirective *RouteDirective `protobuf:"bytes,6,opt,name=route_directive,json=routeDirective,proto3" json:"route_directive,omitempty"` } func (m *CheckResponse_PreconditionResult) Reset() { *m = CheckResponse_PreconditionResult{} } func (*CheckResponse_PreconditionResult) ProtoMessage() {} func (*CheckResponse_PreconditionResult) Descriptor() ([]byte, []int) { - return fileDescriptorMixer, []int{1, 0} + return fileDescriptor_f6f59c90bff4c1e2, []int{1, 0} +} +func (m *CheckResponse_PreconditionResult) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *CheckResponse_PreconditionResult) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_CheckResponse_PreconditionResult.Marshal(b, m, deterministic) + } else { + b = b[:cap(b)] + n, err := m.MarshalTo(b) + if err != nil { + return nil, err + } + return b[:n], nil + } +} +func (m *CheckResponse_PreconditionResult) XXX_Merge(src proto.Message) { + xxx_messageInfo_CheckResponse_PreconditionResult.Merge(m, src) +} +func (m *CheckResponse_PreconditionResult) XXX_Size() int { + return m.Size() +} +func (m *CheckResponse_PreconditionResult) XXX_DiscardUnknown() { + xxx_messageInfo_CheckResponse_PreconditionResult.DiscardUnknown(m) } +var xxx_messageInfo_CheckResponse_PreconditionResult proto.InternalMessageInfo + // Expresses the result of a quota allocation. type CheckResponse_QuotaResult struct { // The amount of time for which this result can be considered valid. - ValidDuration time.Duration `protobuf:"bytes,1,opt,name=valid_duration,json=validDuration,stdduration" json:"valid_duration"` + ValidDuration time.Duration `protobuf:"bytes,1,opt,name=valid_duration,json=validDuration,proto3,stdduration" json:"valid_duration"` // The amount of granted quota. When `QuotaParams.best_effort` is true, this will be >= 0. // If `QuotaParams.best_effort` is false, this will be either 0 or >= `QuotaParams.amount`. GrantedAmount int64 `protobuf:"varint,2,opt,name=granted_amount,json=grantedAmount,proto3" json:"granted_amount,omitempty"` // The total set of attributes that were used in producing the result // along with matching conditions. - ReferencedAttributes ReferencedAttributes `protobuf:"bytes,5,opt,name=referenced_attributes,json=referencedAttributes" json:"referenced_attributes"` + ReferencedAttributes ReferencedAttributes `protobuf:"bytes,5,opt,name=referenced_attributes,json=referencedAttributes,proto3" json:"referenced_attributes"` } func (m *CheckResponse_QuotaResult) Reset() { *m = CheckResponse_QuotaResult{} } func (*CheckResponse_QuotaResult) ProtoMessage() {} func (*CheckResponse_QuotaResult) Descriptor() ([]byte, []int) { - return fileDescriptorMixer, []int{1, 1} + return fileDescriptor_f6f59c90bff4c1e2, []int{1, 1} +} +func (m *CheckResponse_QuotaResult) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *CheckResponse_QuotaResult) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_CheckResponse_QuotaResult.Marshal(b, m, deterministic) + } else { + b = b[:cap(b)] + n, err := m.MarshalTo(b) + if err != nil { + return nil, err + } + return b[:n], nil + } +} +func (m *CheckResponse_QuotaResult) XXX_Merge(src proto.Message) { + xxx_messageInfo_CheckResponse_QuotaResult.Merge(m, src) +} +func (m *CheckResponse_QuotaResult) XXX_Size() int { + return m.Size() +} +func (m *CheckResponse_QuotaResult) XXX_DiscardUnknown() { + xxx_messageInfo_CheckResponse_QuotaResult.DiscardUnknown(m) } +var xxx_messageInfo_CheckResponse_QuotaResult proto.InternalMessageInfo + // Describes the attributes that were used to determine the response. // This can be used to construct a response cache. type ReferencedAttributes struct { // The message-level dictionary. Refer to [CompressedAttributes][istio.mixer.v1.CompressedAttributes] for information // on using dictionaries. - Words []string `protobuf:"bytes,1,rep,name=words" json:"words,omitempty"` + Words []string `protobuf:"bytes,1,rep,name=words,proto3" json:"words,omitempty"` // Describes a set of attributes. - AttributeMatches []ReferencedAttributes_AttributeMatch `protobuf:"bytes,2,rep,name=attribute_matches,json=attributeMatches" json:"attribute_matches"` + AttributeMatches []ReferencedAttributes_AttributeMatch `protobuf:"bytes,2,rep,name=attribute_matches,json=attributeMatches,proto3" json:"attribute_matches"` } -func (m *ReferencedAttributes) Reset() { *m = ReferencedAttributes{} } -func (*ReferencedAttributes) ProtoMessage() {} -func (*ReferencedAttributes) Descriptor() ([]byte, []int) { return fileDescriptorMixer, []int{2} } +func (m *ReferencedAttributes) Reset() { *m = ReferencedAttributes{} } +func (*ReferencedAttributes) ProtoMessage() {} +func (*ReferencedAttributes) Descriptor() ([]byte, []int) { + return fileDescriptor_f6f59c90bff4c1e2, []int{2} +} +func (m *ReferencedAttributes) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *ReferencedAttributes) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_ReferencedAttributes.Marshal(b, m, deterministic) + } else { + b = b[:cap(b)] + n, err := m.MarshalTo(b) + if err != nil { + return nil, err + } + return b[:n], nil + } +} +func (m *ReferencedAttributes) XXX_Merge(src proto.Message) { + xxx_messageInfo_ReferencedAttributes.Merge(m, src) +} +func (m *ReferencedAttributes) XXX_Size() int { + return m.Size() +} +func (m *ReferencedAttributes) XXX_DiscardUnknown() { + xxx_messageInfo_ReferencedAttributes.DiscardUnknown(m) +} + +var xxx_messageInfo_ReferencedAttributes proto.InternalMessageInfo // Describes a single attribute match. type ReferencedAttributes_AttributeMatch struct { @@ -237,8 +409,34 @@ type ReferencedAttributes_AttributeMatch struct { func (m *ReferencedAttributes_AttributeMatch) Reset() { *m = ReferencedAttributes_AttributeMatch{} } func (*ReferencedAttributes_AttributeMatch) ProtoMessage() {} func (*ReferencedAttributes_AttributeMatch) Descriptor() ([]byte, []int) { - return fileDescriptorMixer, []int{2, 0} + return fileDescriptor_f6f59c90bff4c1e2, []int{2, 0} +} +func (m *ReferencedAttributes_AttributeMatch) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) } +func (m *ReferencedAttributes_AttributeMatch) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_ReferencedAttributes_AttributeMatch.Marshal(b, m, deterministic) + } else { + b = b[:cap(b)] + n, err := m.MarshalTo(b) + if err != nil { + return nil, err + } + return b[:n], nil + } +} +func (m *ReferencedAttributes_AttributeMatch) XXX_Merge(src proto.Message) { + xxx_messageInfo_ReferencedAttributes_AttributeMatch.Merge(m, src) +} +func (m *ReferencedAttributes_AttributeMatch) XXX_Size() int { + return m.Size() +} +func (m *ReferencedAttributes_AttributeMatch) XXX_DiscardUnknown() { + xxx_messageInfo_ReferencedAttributes_AttributeMatch.DiscardUnknown(m) +} + +var xxx_messageInfo_ReferencedAttributes_AttributeMatch proto.InternalMessageInfo // Operation on HTTP headers to replace, append, or remove a header. Header // names are normalized to lower-case with dashes, e.g. "x-request-id". @@ -253,17 +451,45 @@ type HeaderOperation struct { Operation HeaderOperation_Operation `protobuf:"varint,3,opt,name=operation,proto3,enum=istio.mixer.v1.HeaderOperation_Operation" json:"operation,omitempty"` } -func (m *HeaderOperation) Reset() { *m = HeaderOperation{} } -func (*HeaderOperation) ProtoMessage() {} -func (*HeaderOperation) Descriptor() ([]byte, []int) { return fileDescriptorMixer, []int{3} } +func (m *HeaderOperation) Reset() { *m = HeaderOperation{} } +func (*HeaderOperation) ProtoMessage() {} +func (*HeaderOperation) Descriptor() ([]byte, []int) { + return fileDescriptor_f6f59c90bff4c1e2, []int{3} +} +func (m *HeaderOperation) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *HeaderOperation) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_HeaderOperation.Marshal(b, m, deterministic) + } else { + b = b[:cap(b)] + n, err := m.MarshalTo(b) + if err != nil { + return nil, err + } + return b[:n], nil + } +} +func (m *HeaderOperation) XXX_Merge(src proto.Message) { + xxx_messageInfo_HeaderOperation.Merge(m, src) +} +func (m *HeaderOperation) XXX_Size() int { + return m.Size() +} +func (m *HeaderOperation) XXX_DiscardUnknown() { + xxx_messageInfo_HeaderOperation.DiscardUnknown(m) +} + +var xxx_messageInfo_HeaderOperation proto.InternalMessageInfo // Expresses the routing manipulation actions to be performed on behalf of // Mixer in response to a precondition check. type RouteDirective struct { // Operations on the request headers. - RequestHeaderOperations []HeaderOperation `protobuf:"bytes,1,rep,name=request_header_operations,json=requestHeaderOperations" json:"request_header_operations"` + RequestHeaderOperations []HeaderOperation `protobuf:"bytes,1,rep,name=request_header_operations,json=requestHeaderOperations,proto3" json:"request_header_operations"` // Operations on the response headers. - ResponseHeaderOperations []HeaderOperation `protobuf:"bytes,2,rep,name=response_header_operations,json=responseHeaderOperations" json:"response_header_operations"` + ResponseHeaderOperations []HeaderOperation `protobuf:"bytes,2,rep,name=response_header_operations,json=responseHeaderOperations,proto3" json:"response_header_operations"` // If set, enables a direct response without proxying the request to the routing // destination. Required to be a value in the 2xx or 3xx range. DirectResponseCode uint32 `protobuf:"varint,3,opt,name=direct_response_code,json=directResponseCode,proto3" json:"direct_response_code,omitempty"` @@ -272,9 +498,37 @@ type RouteDirective struct { DirectResponseBody string `protobuf:"bytes,4,opt,name=direct_response_body,json=directResponseBody,proto3" json:"direct_response_body,omitempty"` } -func (m *RouteDirective) Reset() { *m = RouteDirective{} } -func (*RouteDirective) ProtoMessage() {} -func (*RouteDirective) Descriptor() ([]byte, []int) { return fileDescriptorMixer, []int{4} } +func (m *RouteDirective) Reset() { *m = RouteDirective{} } +func (*RouteDirective) ProtoMessage() {} +func (*RouteDirective) Descriptor() ([]byte, []int) { + return fileDescriptor_f6f59c90bff4c1e2, []int{4} +} +func (m *RouteDirective) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *RouteDirective) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_RouteDirective.Marshal(b, m, deterministic) + } else { + b = b[:cap(b)] + n, err := m.MarshalTo(b) + if err != nil { + return nil, err + } + return b[:n], nil + } +} +func (m *RouteDirective) XXX_Merge(src proto.Message) { + xxx_messageInfo_RouteDirective.Merge(m, src) +} +func (m *RouteDirective) XXX_Size() int { + return m.Size() +} +func (m *RouteDirective) XXX_DiscardUnknown() { + xxx_messageInfo_RouteDirective.DiscardUnknown(m) +} + +var xxx_messageInfo_RouteDirective proto.InternalMessageInfo // Used to report telemetry after performing one or more actions. type ReportRequest struct { @@ -283,7 +537,7 @@ type ReportRequest struct { // Each `Attributes` element represents the state of a single action. Multiple actions // can be provided in a single message in order to improve communication efficiency. The // client can accumulate a set of actions and send them all in one single message. - Attributes []CompressedAttributes `protobuf:"bytes,1,rep,name=attributes" json:"attributes"` + Attributes []CompressedAttributes `protobuf:"bytes,1,rep,name=attributes,proto3" json:"attributes"` // Indicates how to decode the attributes sets in this request. RepeatedAttributesSemantics ReportRequest_RepeatedAttributesSemantics `protobuf:"varint,4,opt,name=repeated_attributes_semantics,json=repeatedAttributesSemantics,proto3,enum=istio.mixer.v1.ReportRequest_RepeatedAttributesSemantics" json:"repeated_attributes_semantics,omitempty"` // The default message-level dictionary for all the attributes. @@ -292,28 +546,89 @@ type ReportRequest struct { // // This makes it possible to share the same dictionary for all attributes in this // request, which can substantially reduce the overall request size. - DefaultWords []string `protobuf:"bytes,2,rep,name=default_words,json=defaultWords" json:"default_words,omitempty"` + DefaultWords []string `protobuf:"bytes,2,rep,name=default_words,json=defaultWords,proto3" json:"default_words,omitempty"` // The number of words in the global dictionary. // To detect global dictionary out of sync between client and server. GlobalWordCount uint32 `protobuf:"varint,3,opt,name=global_word_count,json=globalWordCount,proto3" json:"global_word_count,omitempty"` } -func (m *ReportRequest) Reset() { *m = ReportRequest{} } -func (*ReportRequest) ProtoMessage() {} -func (*ReportRequest) Descriptor() ([]byte, []int) { return fileDescriptorMixer, []int{5} } +func (m *ReportRequest) Reset() { *m = ReportRequest{} } +func (*ReportRequest) ProtoMessage() {} +func (*ReportRequest) Descriptor() ([]byte, []int) { + return fileDescriptor_f6f59c90bff4c1e2, []int{5} +} +func (m *ReportRequest) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *ReportRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_ReportRequest.Marshal(b, m, deterministic) + } else { + b = b[:cap(b)] + n, err := m.MarshalTo(b) + if err != nil { + return nil, err + } + return b[:n], nil + } +} +func (m *ReportRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_ReportRequest.Merge(m, src) +} +func (m *ReportRequest) XXX_Size() int { + return m.Size() +} +func (m *ReportRequest) XXX_DiscardUnknown() { + xxx_messageInfo_ReportRequest.DiscardUnknown(m) +} + +var xxx_messageInfo_ReportRequest proto.InternalMessageInfo // Used to carry responses to telemetry reports type ReportResponse struct { } -func (m *ReportResponse) Reset() { *m = ReportResponse{} } -func (*ReportResponse) ProtoMessage() {} -func (*ReportResponse) Descriptor() ([]byte, []int) { return fileDescriptorMixer, []int{6} } +func (m *ReportResponse) Reset() { *m = ReportResponse{} } +func (*ReportResponse) ProtoMessage() {} +func (*ReportResponse) Descriptor() ([]byte, []int) { + return fileDescriptor_f6f59c90bff4c1e2, []int{6} +} +func (m *ReportResponse) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *ReportResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_ReportResponse.Marshal(b, m, deterministic) + } else { + b = b[:cap(b)] + n, err := m.MarshalTo(b) + if err != nil { + return nil, err + } + return b[:n], nil + } +} +func (m *ReportResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_ReportResponse.Merge(m, src) +} +func (m *ReportResponse) XXX_Size() int { + return m.Size() +} +func (m *ReportResponse) XXX_DiscardUnknown() { + xxx_messageInfo_ReportResponse.DiscardUnknown(m) +} + +var xxx_messageInfo_ReportResponse proto.InternalMessageInfo func init() { + proto.RegisterEnum("istio.mixer.v1.ReferencedAttributes_Condition", ReferencedAttributes_Condition_name, ReferencedAttributes_Condition_value) + proto.RegisterEnum("istio.mixer.v1.HeaderOperation_Operation", HeaderOperation_Operation_name, HeaderOperation_Operation_value) + proto.RegisterEnum("istio.mixer.v1.ReportRequest_RepeatedAttributesSemantics", ReportRequest_RepeatedAttributesSemantics_name, ReportRequest_RepeatedAttributesSemantics_value) proto.RegisterType((*CheckRequest)(nil), "istio.mixer.v1.CheckRequest") + proto.RegisterMapType((map[string]CheckRequest_QuotaParams)(nil), "istio.mixer.v1.CheckRequest.QuotasEntry") proto.RegisterType((*CheckRequest_QuotaParams)(nil), "istio.mixer.v1.CheckRequest.QuotaParams") proto.RegisterType((*CheckResponse)(nil), "istio.mixer.v1.CheckResponse") + proto.RegisterMapType((map[string]CheckResponse_QuotaResult)(nil), "istio.mixer.v1.CheckResponse.QuotasEntry") proto.RegisterType((*CheckResponse_PreconditionResult)(nil), "istio.mixer.v1.CheckResponse.PreconditionResult") proto.RegisterType((*CheckResponse_QuotaResult)(nil), "istio.mixer.v1.CheckResponse.QuotaResult") proto.RegisterType((*ReferencedAttributes)(nil), "istio.mixer.v1.ReferencedAttributes") @@ -322,10 +637,91 @@ func init() { proto.RegisterType((*RouteDirective)(nil), "istio.mixer.v1.RouteDirective") proto.RegisterType((*ReportRequest)(nil), "istio.mixer.v1.ReportRequest") proto.RegisterType((*ReportResponse)(nil), "istio.mixer.v1.ReportResponse") - proto.RegisterEnum("istio.mixer.v1.ReferencedAttributes_Condition", ReferencedAttributes_Condition_name, ReferencedAttributes_Condition_value) - proto.RegisterEnum("istio.mixer.v1.HeaderOperation_Operation", HeaderOperation_Operation_name, HeaderOperation_Operation_value) - proto.RegisterEnum("istio.mixer.v1.ReportRequest_RepeatedAttributesSemantics", ReportRequest_RepeatedAttributesSemantics_name, ReportRequest_RepeatedAttributesSemantics_value) } + +func init() { proto.RegisterFile("mixer/v1/mixer.proto", fileDescriptor_f6f59c90bff4c1e2) } + +var fileDescriptor_f6f59c90bff4c1e2 = []byte{ + // 1218 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x56, 0x3b, 0x73, 0xdb, 0x46, + 0x10, 0x06, 0x08, 0x91, 0x36, 0x97, 0x26, 0x05, 0xdf, 0xd0, 0x31, 0x45, 0xc7, 0x90, 0x86, 0x79, + 0x8c, 0x9c, 0x02, 0x94, 0xe5, 0x26, 0x49, 0x91, 0x0c, 0x45, 0x42, 0x0a, 0xfd, 0xa0, 0x14, 0x48, + 0x8e, 0x1d, 0x37, 0x18, 0x08, 0x38, 0xd2, 0x18, 0x93, 0x3c, 0xf8, 0x00, 0x28, 0x56, 0x91, 0x19, + 0xcf, 0xe4, 0x0f, 0xa4, 0xcc, 0xa4, 0x4b, 0x93, 0xc9, 0x2f, 0x48, 0x95, 0x1f, 0xe0, 0xd2, 0xa5, + 0xab, 0x24, 0xa2, 0x93, 0x99, 0x94, 0x2e, 0x5d, 0x66, 0x70, 0x77, 0x00, 0x49, 0x91, 0x92, 0x95, + 0x47, 0x77, 0xb7, 0x8f, 0x6f, 0x77, 0x3f, 0xec, 0x2e, 0x0e, 0xca, 0x03, 0xef, 0x09, 0xa6, 0xf5, + 0x83, 0xeb, 0x75, 0x76, 0xd0, 0x7d, 0x4a, 0x42, 0x82, 0x4a, 0x5e, 0x10, 0x7a, 0x44, 0xe7, 0xa2, + 0x83, 0xeb, 0xd5, 0x72, 0x8f, 0xf4, 0x08, 0x53, 0xd5, 0xe3, 0x13, 0xb7, 0xaa, 0x6a, 0x3d, 0x42, + 0x7a, 0x7d, 0x5c, 0x67, 0xb7, 0xfd, 0xa8, 0x5b, 0x77, 0x23, 0x6a, 0x87, 0x1e, 0x19, 0x0a, 0xfd, + 0x65, 0xa1, 0xa7, 0xbe, 0x53, 0x0f, 0x42, 0x3b, 0x8c, 0x02, 0xa1, 0x58, 0x4a, 0x83, 0xda, 0x61, + 0x48, 0xbd, 0xfd, 0x28, 0xc4, 0x42, 0x55, 0xfb, 0x51, 0x81, 0x0b, 0xcd, 0x87, 0xd8, 0x79, 0x64, + 0xe2, 0xc7, 0x11, 0x0e, 0x42, 0x74, 0x13, 0x60, 0x6c, 0x54, 0x91, 0x57, 0xe4, 0xd5, 0xc2, 0xfa, + 0xbb, 0xfa, 0x74, 0x7e, 0x7a, 0x93, 0x0c, 0x7c, 0x8a, 0x83, 0x00, 0xbb, 0x8d, 0xd4, 0x76, 0x63, + 0xe1, 0xd9, 0xaf, 0xcb, 0x92, 0x39, 0xe1, 0x8d, 0x3e, 0x80, 0x8b, 0xbd, 0x3e, 0xd9, 0xb7, 0xfb, + 0xd6, 0x57, 0x84, 0xba, 0x96, 0x43, 0xa2, 0x61, 0x58, 0xc9, 0xac, 0xc8, 0xab, 0x45, 0x73, 0x91, + 0x2b, 0xee, 0x11, 0xea, 0x36, 0x63, 0x31, 0xba, 0x06, 0xaa, 0x8b, 0xdd, 0xc8, 0xef, 0x7b, 0x0e, + 0xab, 0xc9, 0xf2, 0xdc, 0x8a, 0xb2, 0x22, 0xaf, 0xe6, 0xcd, 0xc5, 0x29, 0x79, 0xdb, 0x45, 0x9b, + 0x90, 0x7b, 0x1c, 0x91, 0xd0, 0x0e, 0x2a, 0x0b, 0x2b, 0xca, 0x6a, 0x61, 0x7d, 0x75, 0x26, 0xbd, + 0x89, 0x82, 0xf4, 0xcf, 0x99, 0xa9, 0x31, 0x0c, 0xe9, 0xa1, 0x48, 0x51, 0x78, 0x57, 0x37, 0xa1, + 0xc0, 0x94, 0x3b, 0x36, 0xb5, 0x07, 0x01, 0x7a, 0x0b, 0x72, 0xf6, 0x80, 0xa5, 0x18, 0x57, 0xad, + 0x98, 0xe2, 0x86, 0x96, 0xa1, 0xb0, 0x8f, 0x83, 0xd0, 0xc2, 0xdd, 0x2e, 0xa1, 0x3c, 0xff, 0xf3, + 0x26, 0xc4, 0x22, 0x83, 0x49, 0xaa, 0x8e, 0xc0, 0xe1, 0x41, 0x90, 0x0a, 0xca, 0x23, 0x7c, 0xc8, + 0x40, 0xf2, 0x66, 0x7c, 0x44, 0x9f, 0x40, 0xf6, 0xc0, 0xee, 0x47, 0x98, 0xf9, 0x9e, 0x29, 0x5f, + 0x9e, 0x92, 0xc9, 0xdd, 0x3e, 0xce, 0x7c, 0x28, 0xd7, 0xfe, 0xcc, 0x41, 0x51, 0xd8, 0x05, 0x3e, + 0x19, 0x06, 0x18, 0x3d, 0x80, 0x0b, 0x3e, 0xc5, 0x0e, 0x19, 0xba, 0x5e, 0x4c, 0x8c, 0x00, 0x5f, + 0x3b, 0x01, 0x9c, 0x3b, 0xe9, 0x3b, 0x13, 0x1e, 0x26, 0x0e, 0xa2, 0x7e, 0x28, 0x48, 0x99, 0xc2, + 0x42, 0x5b, 0x29, 0xc5, 0x0a, 0xa3, 0xf8, 0xda, 0xe9, 0xa8, 0x27, 0x73, 0xfc, 0x47, 0x06, 0xd0, + 0x6c, 0x4c, 0xb4, 0x06, 0x39, 0xde, 0xa1, 0xa2, 0xc3, 0x90, 0xce, 0x7b, 0x57, 0xa7, 0xbe, 0xa3, + 0xef, 0x32, 0x4d, 0x02, 0xc4, 0xed, 0xd0, 0x4d, 0x28, 0x1d, 0xd8, 0x7d, 0xcf, 0xb5, 0x92, 0xa6, + 0x17, 0xf5, 0x2e, 0x25, 0x9e, 0xc9, 0x54, 0xe8, 0x2d, 0x61, 0xb0, 0x71, 0x3e, 0x06, 0xf8, 0xee, + 0xb7, 0x65, 0xd9, 0x2c, 0x32, 0xd7, 0x44, 0x81, 0xde, 0x87, 0x45, 0x8e, 0x15, 0x05, 0x58, 0x74, + 0x65, 0xdc, 0x6a, 0x59, 0x61, 0x77, 0x37, 0xc0, 0xbc, 0x27, 0xbf, 0x84, 0x4b, 0x14, 0x77, 0x31, + 0xc5, 0x43, 0x07, 0xbb, 0xd6, 0xc4, 0x58, 0x64, 0xe7, 0x8f, 0x85, 0x99, 0x1a, 0x8f, 0xc7, 0xc2, + 0x2c, 0xd3, 0x39, 0x52, 0xb4, 0x05, 0x8b, 0x94, 0x44, 0x21, 0xb6, 0x5c, 0x8f, 0x62, 0x27, 0xf4, + 0x0e, 0x70, 0x25, 0xc7, 0x40, 0xb5, 0x19, 0xd0, 0xd8, 0xac, 0x95, 0x58, 0x99, 0x25, 0x3a, 0x75, + 0xbf, 0xb9, 0x70, 0x7e, 0x41, 0xcd, 0x56, 0x8f, 0x64, 0xd1, 0x83, 0x82, 0xdf, 0x59, 0xb6, 0xe4, + 0x7f, 0xcd, 0xd6, 0x7b, 0x50, 0xea, 0x51, 0x7b, 0x18, 0xc6, 0x14, 0x0c, 0xd2, 0x11, 0x56, 0xcc, + 0xa2, 0x90, 0x36, 0xf8, 0x98, 0x58, 0xff, 0x03, 0x59, 0xe2, 0x9b, 0xcf, 0xa5, 0xac, 0xea, 0xbe, + 0x69, 0xcc, 0x3e, 0x9d, 0x1e, 0xb3, 0xb3, 0xf4, 0x2c, 0xa7, 0x6b, 0x72, 0xce, 0xbe, 0x51, 0xa0, + 0x3c, 0x2f, 0x35, 0x54, 0x86, 0x6c, 0xbc, 0xc5, 0xe2, 0x8e, 0x55, 0x56, 0xf3, 0x26, 0xbf, 0xa0, + 0x2e, 0x5c, 0x4c, 0x4b, 0xb5, 0x06, 0x76, 0xe8, 0x3c, 0xc4, 0x41, 0x25, 0xc3, 0x66, 0xe6, 0xc6, + 0x59, 0x2a, 0xd6, 0xd3, 0xe3, 0x9d, 0xd8, 0x59, 0x10, 0xa0, 0xda, 0x53, 0x52, 0x1c, 0x54, 0x7f, + 0x90, 0xa1, 0x34, 0x6d, 0x8a, 0x10, 0x2c, 0x0c, 0xed, 0x01, 0x66, 0x0c, 0x5c, 0x34, 0xd9, 0x19, + 0xdd, 0x86, 0xfc, 0xf4, 0x42, 0x28, 0xad, 0xeb, 0x67, 0x4a, 0xa3, 0x99, 0x0e, 0xe8, 0x18, 0x20, + 0x2e, 0x99, 0xe2, 0x1e, 0x7e, 0x22, 0x16, 0x31, 0xbf, 0xa0, 0xcb, 0x70, 0x6e, 0x60, 0xfb, 0x56, + 0x4c, 0xfe, 0x02, 0x0b, 0x9d, 0x1b, 0xd8, 0xfe, 0x2d, 0x7c, 0x58, 0x6b, 0x43, 0x3e, 0x85, 0x41, + 0x4b, 0x70, 0xa9, 0xb9, 0xdd, 0x69, 0xb5, 0xf7, 0xda, 0xdb, 0x1d, 0xeb, 0x6e, 0x67, 0x77, 0xc7, + 0x68, 0xb6, 0x37, 0xdb, 0x46, 0x4b, 0x95, 0x50, 0x01, 0xce, 0x35, 0x36, 0x76, 0x8d, 0x4e, 0xd3, + 0x50, 0x65, 0x94, 0x87, 0xac, 0x71, 0xbf, 0xd1, 0xdc, 0x53, 0x33, 0xf1, 0xd1, 0x34, 0xb6, 0x8c, + 0xfb, 0xaa, 0x52, 0xfb, 0x59, 0x86, 0xc5, 0xcf, 0xb0, 0xed, 0x62, 0xba, 0xed, 0x63, 0xd1, 0x87, + 0x93, 0xf5, 0xe6, 0x45, 0xbd, 0xe5, 0xc9, 0x4f, 0x9e, 0x17, 0xdf, 0x11, 0x6d, 0x41, 0x9e, 0x24, + 0x6e, 0x2c, 0xf7, 0xd2, 0x6c, 0x33, 0x1c, 0x43, 0xd7, 0xd3, 0x93, 0x39, 0xf6, 0xad, 0xad, 0x41, + 0x7e, 0x1c, 0xbf, 0x00, 0xe7, 0x4c, 0x63, 0xe7, 0x76, 0xa3, 0x69, 0xa8, 0x12, 0x02, 0xc8, 0x99, + 0xc6, 0x9d, 0xed, 0x2f, 0xe2, 0x12, 0x00, 0x72, 0x8d, 0x9d, 0x1d, 0xa3, 0xd3, 0x52, 0x33, 0xb5, + 0x5f, 0x32, 0x50, 0x9a, 0x9e, 0x58, 0x64, 0xc3, 0x12, 0xe5, 0xbb, 0xdd, 0x7a, 0xc8, 0x82, 0x5a, + 0x69, 0x00, 0xde, 0x4c, 0x85, 0xf5, 0xe5, 0x37, 0x64, 0x27, 0xda, 0xe2, 0xb2, 0xc0, 0x39, 0xa6, + 0x0d, 0x90, 0x03, 0x55, 0x2a, 0xfa, 0x7a, 0x4e, 0x8c, 0xcc, 0x3f, 0x89, 0x51, 0x49, 0x80, 0x66, + 0x82, 0xac, 0x41, 0x99, 0x2f, 0x2b, 0x2b, 0x8d, 0xe5, 0x10, 0x17, 0x33, 0x82, 0x8b, 0x26, 0xe2, + 0xba, 0x64, 0xbc, 0x9a, 0xc4, 0xc5, 0xf3, 0x3c, 0xf6, 0x89, 0xcb, 0xdb, 0x26, 0x7f, 0xdc, 0x63, + 0x83, 0xb8, 0x87, 0xb5, 0xd7, 0x19, 0x28, 0x9a, 0xd8, 0x27, 0x34, 0x3c, 0xe9, 0x3d, 0xa2, 0xfc, + 0x87, 0xf7, 0xc8, 0xd7, 0x70, 0x95, 0x62, 0x1f, 0xdb, 0xe1, 0xd4, 0x82, 0xb2, 0x02, 0x3c, 0xb0, + 0x87, 0xa1, 0xe7, 0x04, 0x2c, 0xb1, 0xd2, 0xfa, 0x47, 0xb3, 0x13, 0x33, 0x91, 0x51, 0x7c, 0x63, + 0x10, 0xe3, 0x50, 0xbb, 0x09, 0x80, 0x79, 0x85, 0x9e, 0xac, 0x44, 0xef, 0x40, 0xd1, 0xc5, 0x5d, + 0x3b, 0xea, 0x87, 0x16, 0xdf, 0x24, 0x19, 0xb6, 0x49, 0x2e, 0x08, 0xe1, 0x3d, 0xb6, 0x50, 0xe6, + 0xbe, 0x99, 0x94, 0xb9, 0x6f, 0xa6, 0xda, 0x2d, 0xb8, 0x72, 0x4a, 0x32, 0x08, 0x41, 0xa9, 0x65, + 0xdc, 0xde, 0x6b, 0x58, 0x46, 0xa7, 0xb9, 0xdd, 0x6a, 0x77, 0xb6, 0x54, 0x09, 0x55, 0xa0, 0xdc, + 0xee, 0xb4, 0x8c, 0xb8, 0x5b, 0x8d, 0xce, 0xde, 0x58, 0x23, 0xd7, 0x54, 0x28, 0x25, 0x75, 0xf2, + 0x0f, 0xb2, 0xfe, 0xbd, 0x0c, 0xd9, 0x3b, 0x31, 0x07, 0x68, 0x13, 0xb2, 0x6c, 0x79, 0xa2, 0xb7, + 0x4f, 0x7b, 0xba, 0x54, 0xaf, 0x9e, 0xba, 0x71, 0x6b, 0x12, 0x6a, 0x43, 0x8e, 0xc7, 0x40, 0x57, + 0x4f, 0xe5, 0xb8, 0xaa, 0x9d, 0xa4, 0x4e, 0xa0, 0x36, 0xee, 0x3e, 0x3b, 0xd2, 0xa4, 0xe7, 0x47, + 0x9a, 0xf4, 0xe2, 0x48, 0x93, 0x5e, 0x1d, 0x69, 0xd2, 0xd3, 0x91, 0x26, 0xff, 0x34, 0xd2, 0xa4, + 0x67, 0x23, 0x4d, 0x7e, 0x3e, 0xd2, 0xe4, 0xdf, 0x47, 0x9a, 0xfc, 0xd7, 0x48, 0x93, 0x5e, 0x8d, + 0x34, 0xf9, 0xdb, 0x97, 0x9a, 0xf4, 0xfc, 0xa5, 0x26, 0xbd, 0x78, 0xa9, 0x49, 0x0f, 0x2e, 0x71, + 0x68, 0x8f, 0xd4, 0x6d, 0xdf, 0xab, 0x27, 0x4f, 0xe3, 0xa7, 0xb2, 0xfc, 0x5a, 0x96, 0xf7, 0x73, + 0xec, 0xc7, 0x78, 0xe3, 0xef, 0x00, 0x00, 0x00, 0xff, 0xff, 0x02, 0xb5, 0x66, 0x8d, 0xa8, 0x0b, + 0x00, 0x00, +} + func (x ReferencedAttributes_Condition) String() string { s, ok := ReferencedAttributes_Condition_name[int32(x)] if ok { @@ -356,8 +752,9 @@ var _ grpc.ClientConn // is compatible with the grpc package it is being compiled against. const _ = grpc.SupportPackageIsVersion4 -// Client API for Mixer service - +// MixerClient is the client API for Mixer service. +// +// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream. type MixerClient interface { // Checks preconditions and allocate quota before performing an operation. // The preconditions enforced depend on the set of supplied attributes and @@ -379,7 +776,7 @@ func NewMixerClient(cc *grpc.ClientConn) MixerClient { func (c *mixerClient) Check(ctx context.Context, in *CheckRequest, opts ...grpc.CallOption) (*CheckResponse, error) { out := new(CheckResponse) - err := grpc.Invoke(ctx, "/istio.mixer.v1.Mixer/Check", in, out, c.cc, opts...) + err := c.cc.Invoke(ctx, "/istio.mixer.v1.Mixer/Check", in, out, opts...) if err != nil { return nil, err } @@ -388,15 +785,14 @@ func (c *mixerClient) Check(ctx context.Context, in *CheckRequest, opts ...grpc. func (c *mixerClient) Report(ctx context.Context, in *ReportRequest, opts ...grpc.CallOption) (*ReportResponse, error) { out := new(ReportResponse) - err := grpc.Invoke(ctx, "/istio.mixer.v1.Mixer/Report", in, out, c.cc, opts...) + err := c.cc.Invoke(ctx, "/istio.mixer.v1.Mixer/Report", in, out, opts...) if err != nil { return nil, err } return out, nil } -// Server API for Mixer service - +// MixerServer is the server API for Mixer service. type MixerServer interface { // Checks preconditions and allocate quota before performing an operation. // The preconditions enforced depend on the set of supplied attributes and @@ -638,8 +1034,8 @@ func (m *CheckResponse_PreconditionResult) MarshalTo(dAtA []byte) (int, error) { i += n5 dAtA[i] = 0x12 i++ - i = encodeVarintMixer(dAtA, i, uint64(types.SizeOfStdDuration(m.ValidDuration))) - n6, err := types.StdDurationMarshalTo(m.ValidDuration, dAtA[i:]) + i = encodeVarintMixer(dAtA, i, uint64(github_com_gogo_protobuf_types.SizeOfStdDuration(m.ValidDuration))) + n6, err := github_com_gogo_protobuf_types.StdDurationMarshalTo(m.ValidDuration, dAtA[i:]) if err != nil { return 0, err } @@ -689,8 +1085,8 @@ func (m *CheckResponse_QuotaResult) MarshalTo(dAtA []byte) (int, error) { _ = l dAtA[i] = 0xa i++ - i = encodeVarintMixer(dAtA, i, uint64(types.SizeOfStdDuration(m.ValidDuration))) - n9, err := types.StdDurationMarshalTo(m.ValidDuration, dAtA[i:]) + i = encodeVarintMixer(dAtA, i, uint64(github_com_gogo_protobuf_types.SizeOfStdDuration(m.ValidDuration))) + n9, err := github_com_gogo_protobuf_types.StdDurationMarshalTo(m.ValidDuration, dAtA[i:]) if err != nil { return 0, err } @@ -966,6 +1362,9 @@ func encodeVarintMixer(dAtA []byte, offset int, v uint64) int { return offset + 1 } func (m *CheckRequest) Size() (n int) { + if m == nil { + return 0 + } var l int _ = l l = m.Attributes.Size() @@ -990,6 +1389,9 @@ func (m *CheckRequest) Size() (n int) { } func (m *CheckRequest_QuotaParams) Size() (n int) { + if m == nil { + return 0 + } var l int _ = l if m.Amount != 0 { @@ -1002,6 +1404,9 @@ func (m *CheckRequest_QuotaParams) Size() (n int) { } func (m *CheckResponse) Size() (n int) { + if m == nil { + return 0 + } var l int _ = l l = m.Precondition.Size() @@ -1019,11 +1424,14 @@ func (m *CheckResponse) Size() (n int) { } func (m *CheckResponse_PreconditionResult) Size() (n int) { + if m == nil { + return 0 + } var l int _ = l l = m.Status.Size() n += 1 + l + sovMixer(uint64(l)) - l = types.SizeOfStdDuration(m.ValidDuration) + l = github_com_gogo_protobuf_types.SizeOfStdDuration(m.ValidDuration) n += 1 + l + sovMixer(uint64(l)) if m.ValidUseCount != 0 { n += 1 + sovMixer(uint64(m.ValidUseCount)) @@ -1040,9 +1448,12 @@ func (m *CheckResponse_PreconditionResult) Size() (n int) { } func (m *CheckResponse_QuotaResult) Size() (n int) { + if m == nil { + return 0 + } var l int _ = l - l = types.SizeOfStdDuration(m.ValidDuration) + l = github_com_gogo_protobuf_types.SizeOfStdDuration(m.ValidDuration) n += 1 + l + sovMixer(uint64(l)) if m.GrantedAmount != 0 { n += 1 + sovMixer(uint64(m.GrantedAmount)) @@ -1053,6 +1464,9 @@ func (m *CheckResponse_QuotaResult) Size() (n int) { } func (m *ReferencedAttributes) Size() (n int) { + if m == nil { + return 0 + } var l int _ = l if len(m.Words) > 0 { @@ -1071,6 +1485,9 @@ func (m *ReferencedAttributes) Size() (n int) { } func (m *ReferencedAttributes_AttributeMatch) Size() (n int) { + if m == nil { + return 0 + } var l int _ = l if m.Name != 0 { @@ -1090,6 +1507,9 @@ func (m *ReferencedAttributes_AttributeMatch) Size() (n int) { } func (m *HeaderOperation) Size() (n int) { + if m == nil { + return 0 + } var l int _ = l l = len(m.Name) @@ -1107,6 +1527,9 @@ func (m *HeaderOperation) Size() (n int) { } func (m *RouteDirective) Size() (n int) { + if m == nil { + return 0 + } var l int _ = l if len(m.RequestHeaderOperations) > 0 { @@ -1132,6 +1555,9 @@ func (m *RouteDirective) Size() (n int) { } func (m *ReportRequest) Size() (n int) { + if m == nil { + return 0 + } var l int _ = l if len(m.Attributes) > 0 { @@ -1156,6 +1582,9 @@ func (m *ReportRequest) Size() (n int) { } func (m *ReportResponse) Size() (n int) { + if m == nil { + return 0 + } var l int _ = l return n @@ -1182,7 +1611,7 @@ func (this *CheckRequest) String() string { for k, _ := range this.Quotas { keysForQuotas = append(keysForQuotas, k) } - sortkeys.Strings(keysForQuotas) + github_com_gogo_protobuf_sortkeys.Strings(keysForQuotas) mapStringForQuotas := "map[string]CheckRequest_QuotaParams{" for _, k := range keysForQuotas { mapStringForQuotas += fmt.Sprintf("%v: %v,", k, this.Quotas[k]) @@ -1216,7 +1645,7 @@ func (this *CheckResponse) String() string { for k, _ := range this.Quotas { keysForQuotas = append(keysForQuotas, k) } - sortkeys.Strings(keysForQuotas) + github_com_gogo_protobuf_sortkeys.Strings(keysForQuotas) mapStringForQuotas := "map[string]CheckResponse_QuotaResult{" for _, k := range keysForQuotas { mapStringForQuotas += fmt.Sprintf("%v: %v,", k, this.Quotas[k]) @@ -1234,8 +1663,8 @@ func (this *CheckResponse_PreconditionResult) String() string { return "nil" } s := strings.Join([]string{`&CheckResponse_PreconditionResult{`, - `Status:` + strings.Replace(strings.Replace(this.Status.String(), "Status", "google_rpc.Status", 1), `&`, ``, 1) + `,`, - `ValidDuration:` + strings.Replace(strings.Replace(this.ValidDuration.String(), "Duration", "google_protobuf1.Duration", 1), `&`, ``, 1) + `,`, + `Status:` + strings.Replace(strings.Replace(this.Status.String(), "Status", "rpc.Status", 1), `&`, ``, 1) + `,`, + `ValidDuration:` + strings.Replace(strings.Replace(this.ValidDuration.String(), "Duration", "types.Duration", 1), `&`, ``, 1) + `,`, `ValidUseCount:` + fmt.Sprintf("%v", this.ValidUseCount) + `,`, `ReferencedAttributes:` + strings.Replace(fmt.Sprintf("%v", this.ReferencedAttributes), "ReferencedAttributes", "ReferencedAttributes", 1) + `,`, `RouteDirective:` + strings.Replace(fmt.Sprintf("%v", this.RouteDirective), "RouteDirective", "RouteDirective", 1) + `,`, @@ -1248,7 +1677,7 @@ func (this *CheckResponse_QuotaResult) String() string { return "nil" } s := strings.Join([]string{`&CheckResponse_QuotaResult{`, - `ValidDuration:` + strings.Replace(strings.Replace(this.ValidDuration.String(), "Duration", "google_protobuf1.Duration", 1), `&`, ``, 1) + `,`, + `ValidDuration:` + strings.Replace(strings.Replace(this.ValidDuration.String(), "Duration", "types.Duration", 1), `&`, ``, 1) + `,`, `GrantedAmount:` + fmt.Sprintf("%v", this.GrantedAmount) + `,`, `ReferencedAttributes:` + strings.Replace(strings.Replace(this.ReferencedAttributes.String(), "ReferencedAttributes", "ReferencedAttributes", 1), `&`, ``, 1) + `,`, `}`, @@ -1349,7 +1778,7 @@ func (m *CheckRequest) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - wire |= (uint64(b) & 0x7F) << shift + wire |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -1377,7 +1806,7 @@ func (m *CheckRequest) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - msglen |= (int(b) & 0x7F) << shift + msglen |= int(b&0x7F) << shift if b < 0x80 { break } @@ -1386,6 +1815,9 @@ func (m *CheckRequest) Unmarshal(dAtA []byte) error { return ErrInvalidLengthMixer } postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthMixer + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -1407,7 +1839,7 @@ func (m *CheckRequest) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - m.GlobalWordCount |= (uint32(b) & 0x7F) << shift + m.GlobalWordCount |= uint32(b&0x7F) << shift if b < 0x80 { break } @@ -1426,7 +1858,7 @@ func (m *CheckRequest) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLen |= (uint64(b) & 0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -1436,6 +1868,9 @@ func (m *CheckRequest) Unmarshal(dAtA []byte) error { return ErrInvalidLengthMixer } postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthMixer + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -1455,7 +1890,7 @@ func (m *CheckRequest) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - msglen |= (int(b) & 0x7F) << shift + msglen |= int(b&0x7F) << shift if b < 0x80 { break } @@ -1464,6 +1899,9 @@ func (m *CheckRequest) Unmarshal(dAtA []byte) error { return ErrInvalidLengthMixer } postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthMixer + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -1484,7 +1922,7 @@ func (m *CheckRequest) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - wire |= (uint64(b) & 0x7F) << shift + wire |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -1501,7 +1939,7 @@ func (m *CheckRequest) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLenmapkey |= (uint64(b) & 0x7F) << shift + stringLenmapkey |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -1511,6 +1949,9 @@ func (m *CheckRequest) Unmarshal(dAtA []byte) error { return ErrInvalidLengthMixer } postStringIndexmapkey := iNdEx + intStringLenmapkey + if postStringIndexmapkey < 0 { + return ErrInvalidLengthMixer + } if postStringIndexmapkey > l { return io.ErrUnexpectedEOF } @@ -1527,7 +1968,7 @@ func (m *CheckRequest) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - mapmsglen |= (int(b) & 0x7F) << shift + mapmsglen |= int(b&0x7F) << shift if b < 0x80 { break } @@ -1536,7 +1977,7 @@ func (m *CheckRequest) Unmarshal(dAtA []byte) error { return ErrInvalidLengthMixer } postmsgIndex := iNdEx + mapmsglen - if mapmsglen < 0 { + if postmsgIndex < 0 { return ErrInvalidLengthMixer } if postmsgIndex > l { @@ -1573,6 +2014,9 @@ func (m *CheckRequest) Unmarshal(dAtA []byte) error { if skippy < 0 { return ErrInvalidLengthMixer } + if (iNdEx + skippy) < 0 { + return ErrInvalidLengthMixer + } if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF } @@ -1600,7 +2044,7 @@ func (m *CheckRequest_QuotaParams) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - wire |= (uint64(b) & 0x7F) << shift + wire |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -1628,7 +2072,7 @@ func (m *CheckRequest_QuotaParams) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - m.Amount |= (int64(b) & 0x7F) << shift + m.Amount |= int64(b&0x7F) << shift if b < 0x80 { break } @@ -1647,7 +2091,7 @@ func (m *CheckRequest_QuotaParams) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - v |= (int(b) & 0x7F) << shift + v |= int(b&0x7F) << shift if b < 0x80 { break } @@ -1662,6 +2106,9 @@ func (m *CheckRequest_QuotaParams) Unmarshal(dAtA []byte) error { if skippy < 0 { return ErrInvalidLengthMixer } + if (iNdEx + skippy) < 0 { + return ErrInvalidLengthMixer + } if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF } @@ -1689,7 +2136,7 @@ func (m *CheckResponse) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - wire |= (uint64(b) & 0x7F) << shift + wire |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -1717,7 +2164,7 @@ func (m *CheckResponse) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - msglen |= (int(b) & 0x7F) << shift + msglen |= int(b&0x7F) << shift if b < 0x80 { break } @@ -1726,6 +2173,9 @@ func (m *CheckResponse) Unmarshal(dAtA []byte) error { return ErrInvalidLengthMixer } postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthMixer + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -1747,7 +2197,7 @@ func (m *CheckResponse) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - msglen |= (int(b) & 0x7F) << shift + msglen |= int(b&0x7F) << shift if b < 0x80 { break } @@ -1756,6 +2206,9 @@ func (m *CheckResponse) Unmarshal(dAtA []byte) error { return ErrInvalidLengthMixer } postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthMixer + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -1776,7 +2229,7 @@ func (m *CheckResponse) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - wire |= (uint64(b) & 0x7F) << shift + wire |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -1793,7 +2246,7 @@ func (m *CheckResponse) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLenmapkey |= (uint64(b) & 0x7F) << shift + stringLenmapkey |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -1803,6 +2256,9 @@ func (m *CheckResponse) Unmarshal(dAtA []byte) error { return ErrInvalidLengthMixer } postStringIndexmapkey := iNdEx + intStringLenmapkey + if postStringIndexmapkey < 0 { + return ErrInvalidLengthMixer + } if postStringIndexmapkey > l { return io.ErrUnexpectedEOF } @@ -1819,7 +2275,7 @@ func (m *CheckResponse) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - mapmsglen |= (int(b) & 0x7F) << shift + mapmsglen |= int(b&0x7F) << shift if b < 0x80 { break } @@ -1828,7 +2284,7 @@ func (m *CheckResponse) Unmarshal(dAtA []byte) error { return ErrInvalidLengthMixer } postmsgIndex := iNdEx + mapmsglen - if mapmsglen < 0 { + if postmsgIndex < 0 { return ErrInvalidLengthMixer } if postmsgIndex > l { @@ -1865,6 +2321,9 @@ func (m *CheckResponse) Unmarshal(dAtA []byte) error { if skippy < 0 { return ErrInvalidLengthMixer } + if (iNdEx + skippy) < 0 { + return ErrInvalidLengthMixer + } if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF } @@ -1892,7 +2351,7 @@ func (m *CheckResponse_PreconditionResult) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - wire |= (uint64(b) & 0x7F) << shift + wire |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -1920,7 +2379,7 @@ func (m *CheckResponse_PreconditionResult) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - msglen |= (int(b) & 0x7F) << shift + msglen |= int(b&0x7F) << shift if b < 0x80 { break } @@ -1929,6 +2388,9 @@ func (m *CheckResponse_PreconditionResult) Unmarshal(dAtA []byte) error { return ErrInvalidLengthMixer } postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthMixer + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -1950,7 +2412,7 @@ func (m *CheckResponse_PreconditionResult) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - msglen |= (int(b) & 0x7F) << shift + msglen |= int(b&0x7F) << shift if b < 0x80 { break } @@ -1959,10 +2421,13 @@ func (m *CheckResponse_PreconditionResult) Unmarshal(dAtA []byte) error { return ErrInvalidLengthMixer } postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthMixer + } if postIndex > l { return io.ErrUnexpectedEOF } - if err := types.StdDurationUnmarshal(&m.ValidDuration, dAtA[iNdEx:postIndex]); err != nil { + if err := github_com_gogo_protobuf_types.StdDurationUnmarshal(&m.ValidDuration, dAtA[iNdEx:postIndex]); err != nil { return err } iNdEx = postIndex @@ -1980,7 +2445,7 @@ func (m *CheckResponse_PreconditionResult) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - m.ValidUseCount |= (int32(b) & 0x7F) << shift + m.ValidUseCount |= int32(b&0x7F) << shift if b < 0x80 { break } @@ -1999,7 +2464,7 @@ func (m *CheckResponse_PreconditionResult) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - msglen |= (int(b) & 0x7F) << shift + msglen |= int(b&0x7F) << shift if b < 0x80 { break } @@ -2008,6 +2473,9 @@ func (m *CheckResponse_PreconditionResult) Unmarshal(dAtA []byte) error { return ErrInvalidLengthMixer } postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthMixer + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -2032,7 +2500,7 @@ func (m *CheckResponse_PreconditionResult) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - msglen |= (int(b) & 0x7F) << shift + msglen |= int(b&0x7F) << shift if b < 0x80 { break } @@ -2041,6 +2509,9 @@ func (m *CheckResponse_PreconditionResult) Unmarshal(dAtA []byte) error { return ErrInvalidLengthMixer } postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthMixer + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -2060,6 +2531,9 @@ func (m *CheckResponse_PreconditionResult) Unmarshal(dAtA []byte) error { if skippy < 0 { return ErrInvalidLengthMixer } + if (iNdEx + skippy) < 0 { + return ErrInvalidLengthMixer + } if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF } @@ -2087,7 +2561,7 @@ func (m *CheckResponse_QuotaResult) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - wire |= (uint64(b) & 0x7F) << shift + wire |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -2115,7 +2589,7 @@ func (m *CheckResponse_QuotaResult) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - msglen |= (int(b) & 0x7F) << shift + msglen |= int(b&0x7F) << shift if b < 0x80 { break } @@ -2124,10 +2598,13 @@ func (m *CheckResponse_QuotaResult) Unmarshal(dAtA []byte) error { return ErrInvalidLengthMixer } postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthMixer + } if postIndex > l { return io.ErrUnexpectedEOF } - if err := types.StdDurationUnmarshal(&m.ValidDuration, dAtA[iNdEx:postIndex]); err != nil { + if err := github_com_gogo_protobuf_types.StdDurationUnmarshal(&m.ValidDuration, dAtA[iNdEx:postIndex]); err != nil { return err } iNdEx = postIndex @@ -2145,7 +2622,7 @@ func (m *CheckResponse_QuotaResult) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - m.GrantedAmount |= (int64(b) & 0x7F) << shift + m.GrantedAmount |= int64(b&0x7F) << shift if b < 0x80 { break } @@ -2164,7 +2641,7 @@ func (m *CheckResponse_QuotaResult) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - msglen |= (int(b) & 0x7F) << shift + msglen |= int(b&0x7F) << shift if b < 0x80 { break } @@ -2173,6 +2650,9 @@ func (m *CheckResponse_QuotaResult) Unmarshal(dAtA []byte) error { return ErrInvalidLengthMixer } postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthMixer + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -2189,6 +2669,9 @@ func (m *CheckResponse_QuotaResult) Unmarshal(dAtA []byte) error { if skippy < 0 { return ErrInvalidLengthMixer } + if (iNdEx + skippy) < 0 { + return ErrInvalidLengthMixer + } if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF } @@ -2216,7 +2699,7 @@ func (m *ReferencedAttributes) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - wire |= (uint64(b) & 0x7F) << shift + wire |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -2244,7 +2727,7 @@ func (m *ReferencedAttributes) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLen |= (uint64(b) & 0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -2254,6 +2737,9 @@ func (m *ReferencedAttributes) Unmarshal(dAtA []byte) error { return ErrInvalidLengthMixer } postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthMixer + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -2273,7 +2759,7 @@ func (m *ReferencedAttributes) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - msglen |= (int(b) & 0x7F) << shift + msglen |= int(b&0x7F) << shift if b < 0x80 { break } @@ -2282,6 +2768,9 @@ func (m *ReferencedAttributes) Unmarshal(dAtA []byte) error { return ErrInvalidLengthMixer } postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthMixer + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -2299,6 +2788,9 @@ func (m *ReferencedAttributes) Unmarshal(dAtA []byte) error { if skippy < 0 { return ErrInvalidLengthMixer } + if (iNdEx + skippy) < 0 { + return ErrInvalidLengthMixer + } if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF } @@ -2326,7 +2818,7 @@ func (m *ReferencedAttributes_AttributeMatch) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - wire |= (uint64(b) & 0x7F) << shift + wire |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -2354,7 +2846,7 @@ func (m *ReferencedAttributes_AttributeMatch) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - v |= (int32(b) & 0x7F) << shift + v |= int32(b&0x7F) << shift if b < 0x80 { break } @@ -2375,7 +2867,7 @@ func (m *ReferencedAttributes_AttributeMatch) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - m.Condition |= (ReferencedAttributes_Condition(b) & 0x7F) << shift + m.Condition |= ReferencedAttributes_Condition(b&0x7F) << shift if b < 0x80 { break } @@ -2394,7 +2886,7 @@ func (m *ReferencedAttributes_AttributeMatch) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLen |= (uint64(b) & 0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -2404,6 +2896,9 @@ func (m *ReferencedAttributes_AttributeMatch) Unmarshal(dAtA []byte) error { return ErrInvalidLengthMixer } postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthMixer + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -2423,7 +2918,7 @@ func (m *ReferencedAttributes_AttributeMatch) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - v |= (int32(b) & 0x7F) << shift + v |= int32(b&0x7F) << shift if b < 0x80 { break } @@ -2439,6 +2934,9 @@ func (m *ReferencedAttributes_AttributeMatch) Unmarshal(dAtA []byte) error { if skippy < 0 { return ErrInvalidLengthMixer } + if (iNdEx + skippy) < 0 { + return ErrInvalidLengthMixer + } if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF } @@ -2466,7 +2964,7 @@ func (m *HeaderOperation) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - wire |= (uint64(b) & 0x7F) << shift + wire |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -2494,7 +2992,7 @@ func (m *HeaderOperation) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLen |= (uint64(b) & 0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -2504,6 +3002,9 @@ func (m *HeaderOperation) Unmarshal(dAtA []byte) error { return ErrInvalidLengthMixer } postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthMixer + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -2523,7 +3024,7 @@ func (m *HeaderOperation) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLen |= (uint64(b) & 0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -2533,6 +3034,9 @@ func (m *HeaderOperation) Unmarshal(dAtA []byte) error { return ErrInvalidLengthMixer } postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthMixer + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -2552,7 +3056,7 @@ func (m *HeaderOperation) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - m.Operation |= (HeaderOperation_Operation(b) & 0x7F) << shift + m.Operation |= HeaderOperation_Operation(b&0x7F) << shift if b < 0x80 { break } @@ -2566,6 +3070,9 @@ func (m *HeaderOperation) Unmarshal(dAtA []byte) error { if skippy < 0 { return ErrInvalidLengthMixer } + if (iNdEx + skippy) < 0 { + return ErrInvalidLengthMixer + } if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF } @@ -2593,7 +3100,7 @@ func (m *RouteDirective) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - wire |= (uint64(b) & 0x7F) << shift + wire |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -2621,7 +3128,7 @@ func (m *RouteDirective) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - msglen |= (int(b) & 0x7F) << shift + msglen |= int(b&0x7F) << shift if b < 0x80 { break } @@ -2630,6 +3137,9 @@ func (m *RouteDirective) Unmarshal(dAtA []byte) error { return ErrInvalidLengthMixer } postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthMixer + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -2652,7 +3162,7 @@ func (m *RouteDirective) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - msglen |= (int(b) & 0x7F) << shift + msglen |= int(b&0x7F) << shift if b < 0x80 { break } @@ -2661,6 +3171,9 @@ func (m *RouteDirective) Unmarshal(dAtA []byte) error { return ErrInvalidLengthMixer } postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthMixer + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -2683,7 +3196,7 @@ func (m *RouteDirective) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - m.DirectResponseCode |= (uint32(b) & 0x7F) << shift + m.DirectResponseCode |= uint32(b&0x7F) << shift if b < 0x80 { break } @@ -2702,7 +3215,7 @@ func (m *RouteDirective) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLen |= (uint64(b) & 0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -2712,6 +3225,9 @@ func (m *RouteDirective) Unmarshal(dAtA []byte) error { return ErrInvalidLengthMixer } postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthMixer + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -2726,6 +3242,9 @@ func (m *RouteDirective) Unmarshal(dAtA []byte) error { if skippy < 0 { return ErrInvalidLengthMixer } + if (iNdEx + skippy) < 0 { + return ErrInvalidLengthMixer + } if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF } @@ -2753,7 +3272,7 @@ func (m *ReportRequest) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - wire |= (uint64(b) & 0x7F) << shift + wire |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -2781,7 +3300,7 @@ func (m *ReportRequest) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - msglen |= (int(b) & 0x7F) << shift + msglen |= int(b&0x7F) << shift if b < 0x80 { break } @@ -2790,6 +3309,9 @@ func (m *ReportRequest) Unmarshal(dAtA []byte) error { return ErrInvalidLengthMixer } postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthMixer + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -2812,7 +3334,7 @@ func (m *ReportRequest) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLen |= (uint64(b) & 0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -2822,6 +3344,9 @@ func (m *ReportRequest) Unmarshal(dAtA []byte) error { return ErrInvalidLengthMixer } postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthMixer + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -2841,7 +3366,7 @@ func (m *ReportRequest) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - m.GlobalWordCount |= (uint32(b) & 0x7F) << shift + m.GlobalWordCount |= uint32(b&0x7F) << shift if b < 0x80 { break } @@ -2860,7 +3385,7 @@ func (m *ReportRequest) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - m.RepeatedAttributesSemantics |= (ReportRequest_RepeatedAttributesSemantics(b) & 0x7F) << shift + m.RepeatedAttributesSemantics |= ReportRequest_RepeatedAttributesSemantics(b&0x7F) << shift if b < 0x80 { break } @@ -2874,6 +3399,9 @@ func (m *ReportRequest) Unmarshal(dAtA []byte) error { if skippy < 0 { return ErrInvalidLengthMixer } + if (iNdEx + skippy) < 0 { + return ErrInvalidLengthMixer + } if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF } @@ -2901,7 +3429,7 @@ func (m *ReportResponse) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - wire |= (uint64(b) & 0x7F) << shift + wire |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -2924,6 +3452,9 @@ func (m *ReportResponse) Unmarshal(dAtA []byte) error { if skippy < 0 { return ErrInvalidLengthMixer } + if (iNdEx + skippy) < 0 { + return ErrInvalidLengthMixer + } if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF } @@ -2990,10 +3521,13 @@ func skipMixer(dAtA []byte) (n int, err error) { break } } - iNdEx += length if length < 0 { return 0, ErrInvalidLengthMixer } + iNdEx += length + if iNdEx < 0 { + return 0, ErrInvalidLengthMixer + } return iNdEx, nil case 3: for { @@ -3022,6 +3556,9 @@ func skipMixer(dAtA []byte) (n int, err error) { return 0, err } iNdEx = start + next + if iNdEx < 0 { + return 0, ErrInvalidLengthMixer + } } return iNdEx, nil case 4: @@ -3040,85 +3577,3 @@ var ( ErrInvalidLengthMixer = fmt.Errorf("proto: negative length found during unmarshaling") ErrIntOverflowMixer = fmt.Errorf("proto: integer overflow") ) - -func init() { proto.RegisterFile("mixer/v1/mixer.proto", fileDescriptorMixer) } - -var fileDescriptorMixer = []byte{ - // 1209 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x56, 0x4d, 0x73, 0xdb, 0x44, - 0x18, 0x96, 0xac, 0xd8, 0xad, 0x5f, 0xd7, 0x8e, 0xba, 0xe3, 0x52, 0xc7, 0xa5, 0x4a, 0xc6, 0x7c, - 0x4c, 0xca, 0x41, 0x4e, 0xd3, 0x0b, 0x70, 0x80, 0x71, 0x6c, 0x25, 0xb8, 0x6d, 0x9c, 0xa0, 0xa4, - 0xb4, 0xf4, 0xa2, 0x51, 0xa4, 0xb5, 0xab, 0xa9, 0xed, 0x55, 0x57, 0x52, 0x68, 0x0e, 0xcc, 0x74, - 0x86, 0x3f, 0xc0, 0x91, 0xe1, 0xc6, 0x85, 0xe1, 0x17, 0x70, 0xe2, 0x07, 0xf4, 0xd8, 0x23, 0x27, - 0x20, 0x06, 0x66, 0x38, 0xf6, 0xd8, 0x23, 0xa3, 0xdd, 0x95, 0x6c, 0xc7, 0x4e, 0x1a, 0x3e, 0x6e, - 0xbb, 0xfb, 0xbe, 0xef, 0xf3, 0x7e, 0xe8, 0x79, 0x56, 0x0b, 0xe5, 0x81, 0xf7, 0x14, 0xd3, 0xfa, - 0xe1, 0xcd, 0x3a, 0x5b, 0xe8, 0x3e, 0x25, 0x21, 0x41, 0x25, 0x2f, 0x08, 0x3d, 0xa2, 0xf3, 0xa3, - 0xc3, 0x9b, 0xd5, 0x72, 0x8f, 0xf4, 0x08, 0x33, 0xd5, 0xe3, 0x15, 0xf7, 0xaa, 0x6a, 0x3d, 0x42, - 0x7a, 0x7d, 0x5c, 0x67, 0xbb, 0x83, 0xa8, 0x5b, 0x77, 0x23, 0x6a, 0x87, 0x1e, 0x19, 0x0a, 0xfb, - 0x55, 0x61, 0xa7, 0xbe, 0x53, 0x0f, 0x42, 0x3b, 0x8c, 0x02, 0x61, 0x58, 0x4a, 0x93, 0xda, 0x61, - 0x48, 0xbd, 0x83, 0x28, 0xc4, 0xc2, 0x54, 0xfb, 0x5e, 0x81, 0x4b, 0xcd, 0x47, 0xd8, 0x79, 0x6c, - 0xe2, 0x27, 0x11, 0x0e, 0x42, 0x74, 0x1b, 0x60, 0xec, 0x54, 0x91, 0x57, 0xe4, 0xd5, 0xc2, 0xfa, - 0xdb, 0xfa, 0x74, 0x7d, 0x7a, 0x93, 0x0c, 0x7c, 0x8a, 0x83, 0x00, 0xbb, 0x8d, 0xd4, 0x77, 0x63, - 0xe1, 0xf9, 0x2f, 0xcb, 0x92, 0x39, 0x11, 0x8d, 0xde, 0x83, 0xcb, 0xbd, 0x3e, 0x39, 0xb0, 0xfb, - 0xd6, 0x17, 0x84, 0xba, 0x96, 0x43, 0xa2, 0x61, 0x58, 0xc9, 0xac, 0xc8, 0xab, 0x45, 0x73, 0x91, - 0x1b, 0xee, 0x13, 0xea, 0x36, 0xe3, 0x63, 0x74, 0x03, 0x54, 0x17, 0xbb, 0x91, 0xdf, 0xf7, 0x1c, - 0xd6, 0x93, 0xe5, 0xb9, 0x15, 0x65, 0x45, 0x5e, 0xcd, 0x9b, 0x8b, 0x53, 0xe7, 0x6d, 0x17, 0x6d, - 0x42, 0xee, 0x49, 0x44, 0x42, 0x3b, 0xa8, 0x2c, 0xac, 0x28, 0xab, 0x85, 0xf5, 0xd5, 0x99, 0xf2, - 0x26, 0x1a, 0xd2, 0x3f, 0x65, 0xae, 0xc6, 0x30, 0xa4, 0x47, 0xa2, 0x44, 0x11, 0x5d, 0xdd, 0x84, - 0x02, 0x33, 0xee, 0xda, 0xd4, 0x1e, 0x04, 0xe8, 0x0d, 0xc8, 0xd9, 0x03, 0x56, 0x62, 0xdc, 0xb5, - 0x62, 0x8a, 0x1d, 0x5a, 0x86, 0xc2, 0x01, 0x0e, 0x42, 0x0b, 0x77, 0xbb, 0x84, 0xf2, 0xfa, 0x2f, - 0x9a, 0x10, 0x1f, 0x19, 0xec, 0xa4, 0xea, 0x08, 0x1c, 0x9e, 0x04, 0xa9, 0xa0, 0x3c, 0xc6, 0x47, - 0x0c, 0x24, 0x6f, 0xc6, 0x4b, 0xf4, 0x11, 0x64, 0x0f, 0xed, 0x7e, 0x84, 0x59, 0xec, 0xb9, 0xea, - 0xe5, 0x25, 0x99, 0x3c, 0xec, 0xc3, 0xcc, 0xfb, 0x72, 0xed, 0xcf, 0x1c, 0x14, 0x85, 0x5f, 0xe0, - 0x93, 0x61, 0x80, 0xd1, 0x43, 0xb8, 0xe4, 0x53, 0xec, 0x90, 0xa1, 0xeb, 0xc5, 0x83, 0x11, 0xe0, - 0x6b, 0xa7, 0x80, 0xf3, 0x20, 0x7d, 0x77, 0x22, 0xc2, 0xc4, 0x41, 0xd4, 0x0f, 0xc5, 0x50, 0xa6, - 0xb0, 0xd0, 0x56, 0x3a, 0x62, 0x85, 0x8d, 0xf8, 0xc6, 0xd9, 0xa8, 0xa7, 0xcf, 0xf8, 0x8f, 0x0c, - 0xa0, 0xd9, 0x9c, 0x68, 0x0d, 0x72, 0x9c, 0xa1, 0x82, 0x61, 0x48, 0xe7, 0xdc, 0xd5, 0xa9, 0xef, - 0xe8, 0x7b, 0xcc, 0x92, 0x00, 0x71, 0x3f, 0x74, 0x1b, 0x4a, 0x87, 0x76, 0xdf, 0x73, 0xad, 0x84, - 0xf4, 0xa2, 0xdf, 0xa5, 0x24, 0x32, 0x51, 0x85, 0xde, 0x12, 0x0e, 0x1b, 0x17, 0x63, 0x80, 0x6f, - 0x7e, 0x5d, 0x96, 0xcd, 0x22, 0x0b, 0x4d, 0x0c, 0xe8, 0x5d, 0x58, 0xe4, 0x58, 0x51, 0x80, 0x05, - 0x2b, 0x63, 0xaa, 0x65, 0x85, 0xdf, 0xbd, 0x00, 0x73, 0x4e, 0x7e, 0x0e, 0x57, 0x28, 0xee, 0x62, - 0x8a, 0x87, 0x0e, 0x76, 0xad, 0x09, 0x59, 0x64, 0xe7, 0xcb, 0xc2, 0x4c, 0x9d, 0xc7, 0xb2, 0x30, - 0xcb, 0x74, 0xce, 0x29, 0xda, 0x82, 0x45, 0x4a, 0xa2, 0x10, 0x5b, 0xae, 0x47, 0xb1, 0x13, 0x7a, - 0x87, 0xb8, 0x92, 0x63, 0xa0, 0xda, 0x0c, 0x68, 0xec, 0xd6, 0x4a, 0xbc, 0xcc, 0x12, 0x9d, 0xda, - 0xdf, 0x5e, 0xb8, 0xb8, 0xa0, 0x66, 0xab, 0xc7, 0xb2, 0xe0, 0xa0, 0x98, 0xef, 0xec, 0xb4, 0xe4, - 0x7f, 0x3d, 0xad, 0x77, 0xa0, 0xd4, 0xa3, 0xf6, 0x30, 0x8c, 0x47, 0x30, 0x48, 0x25, 0xac, 0x98, - 0x45, 0x71, 0xda, 0xe0, 0x32, 0xb1, 0xfe, 0x87, 0x61, 0x89, 0x6f, 0x3e, 0x77, 0x64, 0x55, 0xf7, - 0x75, 0x32, 0xfb, 0x78, 0x5a, 0x66, 0xe7, 0xe1, 0x2c, 0x1f, 0xd7, 0xa4, 0xce, 0xbe, 0x52, 0xa0, - 0x3c, 0xaf, 0x34, 0x54, 0x86, 0x6c, 0x7c, 0x8b, 0xc5, 0x8c, 0x55, 0x56, 0xf3, 0x26, 0xdf, 0xa0, - 0x2e, 0x5c, 0x4e, 0x5b, 0xb5, 0x06, 0x76, 0xe8, 0x3c, 0xc2, 0x41, 0x25, 0xc3, 0x34, 0x73, 0xeb, - 0x3c, 0x1d, 0xeb, 0xe9, 0x72, 0x3b, 0x0e, 0x16, 0x03, 0x50, 0xed, 0xa9, 0x53, 0x1c, 0x54, 0xbf, - 0x93, 0xa1, 0x34, 0xed, 0x8a, 0x10, 0x2c, 0x0c, 0xed, 0x01, 0x66, 0x13, 0xb8, 0x6c, 0xb2, 0x35, - 0xba, 0x0b, 0xf9, 0xe9, 0x0b, 0xa1, 0xb4, 0xae, 0x9f, 0xab, 0x8c, 0x66, 0x2a, 0xd0, 0x31, 0x40, - 0xdc, 0x32, 0xc5, 0x3d, 0xfc, 0x54, 0x5c, 0xc4, 0x7c, 0x83, 0xae, 0xc2, 0x85, 0x81, 0xed, 0x5b, - 0xf1, 0xf0, 0x17, 0x58, 0xea, 0xdc, 0xc0, 0xf6, 0xef, 0xe0, 0xa3, 0x5a, 0x1b, 0xf2, 0x29, 0x0c, - 0x5a, 0x82, 0x2b, 0xcd, 0x9d, 0x4e, 0xab, 0xbd, 0xdf, 0xde, 0xe9, 0x58, 0xf7, 0x3a, 0x7b, 0xbb, - 0x46, 0xb3, 0xbd, 0xd9, 0x36, 0x5a, 0xaa, 0x84, 0x0a, 0x70, 0xa1, 0xb1, 0xb1, 0x67, 0x74, 0x9a, - 0x86, 0x2a, 0xa3, 0x3c, 0x64, 0x8d, 0x07, 0x8d, 0xe6, 0xbe, 0x9a, 0x89, 0x97, 0xa6, 0xb1, 0x65, - 0x3c, 0x50, 0x95, 0xda, 0x8f, 0x32, 0x2c, 0x7e, 0x82, 0x6d, 0x17, 0xd3, 0x1d, 0x1f, 0x0b, 0x1e, - 0x4e, 0xf6, 0x9b, 0x17, 0xfd, 0x96, 0x27, 0x3f, 0x79, 0x5e, 0x7c, 0x47, 0xb4, 0x05, 0x79, 0x92, - 0x84, 0xb1, 0xda, 0x4b, 0xb3, 0x64, 0x38, 0x81, 0xae, 0xa7, 0x2b, 0x73, 0x1c, 0x5b, 0x5b, 0x83, - 0xfc, 0x38, 0x7f, 0x01, 0x2e, 0x98, 0xc6, 0xee, 0xdd, 0x46, 0xd3, 0x50, 0x25, 0x04, 0x90, 0x33, - 0x8d, 0xed, 0x9d, 0xcf, 0xe2, 0x16, 0x00, 0x72, 0x8d, 0xdd, 0x5d, 0xa3, 0xd3, 0x52, 0x33, 0xb5, - 0x9f, 0x32, 0x50, 0x9a, 0x56, 0x2c, 0xb2, 0x61, 0x89, 0xf2, 0xbb, 0xdd, 0x7a, 0xc4, 0x92, 0x5a, - 0x69, 0x02, 0x4e, 0xa6, 0xc2, 0xfa, 0xf2, 0x6b, 0xaa, 0x13, 0xb4, 0xb8, 0x2a, 0x70, 0x4e, 0x58, - 0x03, 0xe4, 0x40, 0x95, 0x0a, 0x5e, 0xcf, 0xc9, 0x91, 0xf9, 0x27, 0x39, 0x2a, 0x09, 0xd0, 0x4c, - 0x92, 0x35, 0x28, 0xf3, 0xcb, 0xca, 0x4a, 0x73, 0x39, 0xc4, 0xc5, 0x6c, 0xc0, 0x45, 0x13, 0x71, - 0x5b, 0x22, 0xaf, 0x26, 0x71, 0xf1, 0xbc, 0x88, 0x03, 0xe2, 0x72, 0xda, 0xe4, 0x4f, 0x46, 0x6c, - 0x10, 0xf7, 0xa8, 0xf6, 0x2a, 0x03, 0x45, 0x13, 0xfb, 0x84, 0x86, 0xa7, 0xbd, 0x47, 0x94, 0xff, - 0xf0, 0x1e, 0x79, 0x0b, 0x8a, 0x2e, 0xee, 0xda, 0x51, 0x3f, 0xb4, 0xb8, 0x94, 0x33, 0x4c, 0xca, - 0x97, 0xc4, 0xe1, 0x7d, 0xa6, 0xe8, 0xb9, 0x8f, 0x16, 0x65, 0xfe, 0xa3, 0xe5, 0x4b, 0xb8, 0x4e, - 0xb1, 0x8f, 0xed, 0x70, 0xea, 0xc6, 0xb3, 0x02, 0x3c, 0xb0, 0x87, 0xa1, 0xe7, 0x04, 0xac, 0xd3, - 0xd2, 0xfa, 0x07, 0xb3, 0x12, 0x9c, 0x68, 0x31, 0xde, 0x31, 0x88, 0x71, 0xed, 0x7b, 0x09, 0x80, - 0x79, 0x8d, 0x9e, 0x6e, 0xac, 0xdd, 0x81, 0x6b, 0x67, 0xc4, 0x22, 0x04, 0xa5, 0x96, 0x71, 0x77, - 0xbf, 0x61, 0x19, 0x9d, 0xe6, 0x4e, 0xab, 0xdd, 0xd9, 0x52, 0x25, 0x54, 0x81, 0x72, 0xbb, 0xd3, - 0x32, 0x62, 0xb6, 0x1a, 0x9d, 0xfd, 0xb1, 0x45, 0xae, 0xa9, 0x50, 0x4a, 0xca, 0xe2, 0x1f, 0x64, - 0xfd, 0x5b, 0x19, 0xb2, 0xdb, 0x71, 0xc9, 0x68, 0x13, 0xb2, 0xec, 0xf2, 0x44, 0x6f, 0x9e, 0xf5, - 0x74, 0xa9, 0x5e, 0x3f, 0xf3, 0xc6, 0xad, 0x49, 0xa8, 0x0d, 0x39, 0x9e, 0x03, 0x5d, 0x3f, 0x73, - 0x24, 0x55, 0xed, 0x34, 0x73, 0x02, 0xb5, 0xb1, 0xfd, 0xfc, 0x58, 0x93, 0x5e, 0x1c, 0x6b, 0xd2, - 0xcf, 0xc7, 0x9a, 0xf4, 0xf2, 0x58, 0x93, 0x9e, 0x8d, 0x34, 0xf9, 0x87, 0x91, 0x26, 0x3d, 0x1f, - 0x69, 0xf2, 0x8b, 0x91, 0x26, 0xff, 0x36, 0xd2, 0xe4, 0xbf, 0x46, 0x9a, 0xf4, 0x72, 0xa4, 0xc9, - 0x5f, 0xff, 0xae, 0x49, 0x0f, 0xaf, 0x70, 0x48, 0x8f, 0xd4, 0x6d, 0xdf, 0xab, 0x27, 0x4f, 0xe2, - 0x67, 0xb2, 0xfc, 0x4a, 0x96, 0x0f, 0x72, 0xec, 0x87, 0x78, 0xeb, 0xef, 0x00, 0x00, 0x00, 0xff, - 0xff, 0x7a, 0xa2, 0x01, 0x40, 0xa0, 0x0b, 0x00, 0x00, -} diff --git a/networking/v1alpha3/destination_rule.pb.go b/networking/v1alpha3/destination_rule.pb.go index 9b263002db7..9a0d61a14ea 100644 --- a/networking/v1alpha3/destination_rule.pb.go +++ b/networking/v1alpha3/destination_rule.pb.go @@ -1,67 +1,18 @@ // Code generated by protoc-gen-gogo. DO NOT EDIT. // source: networking/v1alpha3/destination_rule.proto -/* - Package v1alpha3 is a generated protocol buffer package. - - It is generated from these files: - networking/v1alpha3/destination_rule.proto - networking/v1alpha3/envoy_filter.proto - networking/v1alpha3/gateway.proto - networking/v1alpha3/service_entry.proto - networking/v1alpha3/sidecar.proto - networking/v1alpha3/virtual_service.proto - - It has these top-level messages: - DestinationRule - TrafficPolicy - Subset - LoadBalancerSettings - ConnectionPoolSettings - OutlierDetection - TLSSettings - EnvoyFilter - Gateway - Server - Port - ServiceEntry - Sidecar - IstioIngressListener - IstioEgressListener - WorkloadSelector - VirtualService - Destination - HTTPRoute - Headers - TLSRoute - TCPRoute - HTTPMatchRequest - HTTPRouteDestination - RouteDestination - L4MatchAttributes - TLSMatchAttributes - HTTPRedirect - HTTPRewrite - StringMatch - HTTPRetry - CorsPolicy - HTTPFaultInjection - PortSelector - Percent -*/ package v1alpha3 -import proto "github.com/gogo/protobuf/proto" -import fmt "fmt" -import math "math" -import google_protobuf "github.com/gogo/protobuf/types" -import _ "github.com/gogo/protobuf/gogoproto" - -import time "time" - -import types "github.com/gogo/protobuf/types" - -import io "io" +import ( + fmt "fmt" + _ "github.com/gogo/protobuf/gogoproto" + proto "github.com/gogo/protobuf/proto" + github_com_gogo_protobuf_types "github.com/gogo/protobuf/types" + types "github.com/gogo/protobuf/types" + io "io" + math "math" + time "time" +) // Reference imports to suppress errors if they are not otherwise used. var _ = proto.Marshal @@ -103,6 +54,7 @@ var LoadBalancerSettings_SimpleLB_name = map[int32]string{ 2: "RANDOM", 3: "PASSTHROUGH", } + var LoadBalancerSettings_SimpleLB_value = map[string]int32{ "ROUND_ROBIN": 0, "LEAST_CONN": 1, @@ -113,8 +65,9 @@ var LoadBalancerSettings_SimpleLB_value = map[string]int32{ func (x LoadBalancerSettings_SimpleLB) String() string { return proto.EnumName(LoadBalancerSettings_SimpleLB_name, int32(x)) } + func (LoadBalancerSettings_SimpleLB) EnumDescriptor() ([]byte, []int) { - return fileDescriptorDestinationRule, []int{3, 0} + return fileDescriptor_12899beb695152c8, []int{3, 0} } // TLS connection mode @@ -142,6 +95,7 @@ var TLSSettings_TLSmode_name = map[int32]string{ 2: "MUTUAL", 3: "ISTIO_MUTUAL", } + var TLSSettings_TLSmode_value = map[string]int32{ "DISABLE": 0, "SIMPLE": 1, @@ -152,8 +106,9 @@ var TLSSettings_TLSmode_value = map[string]int32{ func (x TLSSettings_TLSmode) String() string { return proto.EnumName(TLSSettings_TLSmode_name, int32(x)) } + func (TLSSettings_TLSmode) EnumDescriptor() ([]byte, []int) { - return fileDescriptorDestinationRule, []int{6, 0} + return fileDescriptor_12899beb695152c8, []int{6, 0} } // `DestinationRule` defines policies that apply to traffic intended for a @@ -246,20 +201,51 @@ type DestinationRule struct { Host string `protobuf:"bytes,1,opt,name=host,proto3" json:"host,omitempty"` // Traffic policies to apply (load balancing policy, connection pool // sizes, outlier detection). - TrafficPolicy *TrafficPolicy `protobuf:"bytes,2,opt,name=traffic_policy,json=trafficPolicy" json:"traffic_policy,omitempty"` + TrafficPolicy *TrafficPolicy `protobuf:"bytes,2,opt,name=traffic_policy,json=trafficPolicy,proto3" json:"traffic_policy,omitempty"` // One or more named sets that represent individual versions of a // service. Traffic policies can be overridden at subset level. - Subsets []*Subset `protobuf:"bytes,3,rep,name=subsets" json:"subsets,omitempty"` + Subsets []*Subset `protobuf:"bytes,3,rep,name=subsets,proto3" json:"subsets,omitempty"` // The resolution of a DestinationRule to apply to a service occurs in the // context of a hierarchy of namespaces. This rule controls whether those // namespaces are allowed to select this rule. - ExportTo []string `protobuf:"bytes,4,rep,name=export_to,json=exportTo" json:"export_to,omitempty"` + ExportTo []string `protobuf:"bytes,4,rep,name=export_to,json=exportTo,proto3" json:"export_to,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` +} + +func (m *DestinationRule) Reset() { *m = DestinationRule{} } +func (m *DestinationRule) String() string { return proto.CompactTextString(m) } +func (*DestinationRule) ProtoMessage() {} +func (*DestinationRule) Descriptor() ([]byte, []int) { + return fileDescriptor_12899beb695152c8, []int{0} +} +func (m *DestinationRule) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *DestinationRule) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_DestinationRule.Marshal(b, m, deterministic) + } else { + b = b[:cap(b)] + n, err := m.MarshalTo(b) + if err != nil { + return nil, err + } + return b[:n], nil + } +} +func (m *DestinationRule) XXX_Merge(src proto.Message) { + xxx_messageInfo_DestinationRule.Merge(m, src) +} +func (m *DestinationRule) XXX_Size() int { + return m.Size() +} +func (m *DestinationRule) XXX_DiscardUnknown() { + xxx_messageInfo_DestinationRule.DiscardUnknown(m) } -func (m *DestinationRule) Reset() { *m = DestinationRule{} } -func (m *DestinationRule) String() string { return proto.CompactTextString(m) } -func (*DestinationRule) ProtoMessage() {} -func (*DestinationRule) Descriptor() ([]byte, []int) { return fileDescriptorDestinationRule, []int{0} } +var xxx_messageInfo_DestinationRule proto.InternalMessageInfo func (m *DestinationRule) GetHost() string { if m != nil { @@ -293,25 +279,56 @@ func (m *DestinationRule) GetExportTo() []string { // destination ports. See DestinationRule for examples. type TrafficPolicy struct { // Settings controlling the load balancer algorithms. - LoadBalancer *LoadBalancerSettings `protobuf:"bytes,1,opt,name=load_balancer,json=loadBalancer" json:"load_balancer,omitempty"` + LoadBalancer *LoadBalancerSettings `protobuf:"bytes,1,opt,name=load_balancer,json=loadBalancer,proto3" json:"load_balancer,omitempty"` // Settings controlling the volume of connections to an upstream service - ConnectionPool *ConnectionPoolSettings `protobuf:"bytes,2,opt,name=connection_pool,json=connectionPool" json:"connection_pool,omitempty"` + ConnectionPool *ConnectionPoolSettings `protobuf:"bytes,2,opt,name=connection_pool,json=connectionPool,proto3" json:"connection_pool,omitempty"` // Settings controlling eviction of unhealthy hosts from the load balancing pool - OutlierDetection *OutlierDetection `protobuf:"bytes,3,opt,name=outlier_detection,json=outlierDetection" json:"outlier_detection,omitempty"` + OutlierDetection *OutlierDetection `protobuf:"bytes,3,opt,name=outlier_detection,json=outlierDetection,proto3" json:"outlier_detection,omitempty"` // TLS related settings for connections to the upstream service. - Tls *TLSSettings `protobuf:"bytes,4,opt,name=tls" json:"tls,omitempty"` + Tls *TLSSettings `protobuf:"bytes,4,opt,name=tls,proto3" json:"tls,omitempty"` // Traffic policies specific to individual ports. Note that port level // settings will override the destination-level settings. Traffic // settings specified at the destination-level will not be inherited when // overridden by port-level settings, i.e. default values will be applied // to fields omitted in port-level traffic policies. - PortLevelSettings []*TrafficPolicy_PortTrafficPolicy `protobuf:"bytes,5,rep,name=port_level_settings,json=portLevelSettings" json:"port_level_settings,omitempty"` + PortLevelSettings []*TrafficPolicy_PortTrafficPolicy `protobuf:"bytes,5,rep,name=port_level_settings,json=portLevelSettings,proto3" json:"port_level_settings,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` +} + +func (m *TrafficPolicy) Reset() { *m = TrafficPolicy{} } +func (m *TrafficPolicy) String() string { return proto.CompactTextString(m) } +func (*TrafficPolicy) ProtoMessage() {} +func (*TrafficPolicy) Descriptor() ([]byte, []int) { + return fileDescriptor_12899beb695152c8, []int{1} +} +func (m *TrafficPolicy) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *TrafficPolicy) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_TrafficPolicy.Marshal(b, m, deterministic) + } else { + b = b[:cap(b)] + n, err := m.MarshalTo(b) + if err != nil { + return nil, err + } + return b[:n], nil + } +} +func (m *TrafficPolicy) XXX_Merge(src proto.Message) { + xxx_messageInfo_TrafficPolicy.Merge(m, src) +} +func (m *TrafficPolicy) XXX_Size() int { + return m.Size() +} +func (m *TrafficPolicy) XXX_DiscardUnknown() { + xxx_messageInfo_TrafficPolicy.DiscardUnknown(m) } -func (m *TrafficPolicy) Reset() { *m = TrafficPolicy{} } -func (m *TrafficPolicy) String() string { return proto.CompactTextString(m) } -func (*TrafficPolicy) ProtoMessage() {} -func (*TrafficPolicy) Descriptor() ([]byte, []int) { return fileDescriptorDestinationRule, []int{1} } +var xxx_messageInfo_TrafficPolicy proto.InternalMessageInfo func (m *TrafficPolicy) GetLoadBalancer() *LoadBalancerSettings { if m != nil { @@ -357,23 +374,52 @@ type TrafficPolicy_PortTrafficPolicy struct { // collide with numbers. If there are multiple ports on a service with // the same protocol the names should be of the form -. - Port *PortSelector `protobuf:"bytes,1,opt,name=port" json:"port,omitempty"` + Port *PortSelector `protobuf:"bytes,1,opt,name=port,proto3" json:"port,omitempty"` // Settings controlling the load balancer algorithms. - LoadBalancer *LoadBalancerSettings `protobuf:"bytes,2,opt,name=load_balancer,json=loadBalancer" json:"load_balancer,omitempty"` + LoadBalancer *LoadBalancerSettings `protobuf:"bytes,2,opt,name=load_balancer,json=loadBalancer,proto3" json:"load_balancer,omitempty"` // Settings controlling the volume of connections to an upstream service - ConnectionPool *ConnectionPoolSettings `protobuf:"bytes,3,opt,name=connection_pool,json=connectionPool" json:"connection_pool,omitempty"` + ConnectionPool *ConnectionPoolSettings `protobuf:"bytes,3,opt,name=connection_pool,json=connectionPool,proto3" json:"connection_pool,omitempty"` // Settings controlling eviction of unhealthy hosts from the load balancing pool - OutlierDetection *OutlierDetection `protobuf:"bytes,4,opt,name=outlier_detection,json=outlierDetection" json:"outlier_detection,omitempty"` + OutlierDetection *OutlierDetection `protobuf:"bytes,4,opt,name=outlier_detection,json=outlierDetection,proto3" json:"outlier_detection,omitempty"` // TLS related settings for connections to the upstream service. - Tls *TLSSettings `protobuf:"bytes,5,opt,name=tls" json:"tls,omitempty"` + Tls *TLSSettings `protobuf:"bytes,5,opt,name=tls,proto3" json:"tls,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` } func (m *TrafficPolicy_PortTrafficPolicy) Reset() { *m = TrafficPolicy_PortTrafficPolicy{} } func (m *TrafficPolicy_PortTrafficPolicy) String() string { return proto.CompactTextString(m) } func (*TrafficPolicy_PortTrafficPolicy) ProtoMessage() {} func (*TrafficPolicy_PortTrafficPolicy) Descriptor() ([]byte, []int) { - return fileDescriptorDestinationRule, []int{1, 0} + return fileDescriptor_12899beb695152c8, []int{1, 0} } +func (m *TrafficPolicy_PortTrafficPolicy) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *TrafficPolicy_PortTrafficPolicy) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_TrafficPolicy_PortTrafficPolicy.Marshal(b, m, deterministic) + } else { + b = b[:cap(b)] + n, err := m.MarshalTo(b) + if err != nil { + return nil, err + } + return b[:n], nil + } +} +func (m *TrafficPolicy_PortTrafficPolicy) XXX_Merge(src proto.Message) { + xxx_messageInfo_TrafficPolicy_PortTrafficPolicy.Merge(m, src) +} +func (m *TrafficPolicy_PortTrafficPolicy) XXX_Size() int { + return m.Size() +} +func (m *TrafficPolicy_PortTrafficPolicy) XXX_DiscardUnknown() { + xxx_messageInfo_TrafficPolicy_PortTrafficPolicy.DiscardUnknown(m) +} + +var xxx_messageInfo_TrafficPolicy_PortTrafficPolicy proto.InternalMessageInfo func (m *TrafficPolicy_PortTrafficPolicy) GetPort() *PortSelector { if m != nil { @@ -452,18 +498,49 @@ type Subset struct { Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"` // Labels apply a filter over the endpoints of a service in the // service registry. See route rules for examples of usage. - Labels map[string]string `protobuf:"bytes,2,rep,name=labels" json:"labels,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` + Labels map[string]string `protobuf:"bytes,2,rep,name=labels,proto3" json:"labels,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` // Traffic policies that apply to this subset. Subsets inherit the // traffic policies specified at the DestinationRule level. Settings // specified at the subset level will override the corresponding settings // specified at the DestinationRule level. - TrafficPolicy *TrafficPolicy `protobuf:"bytes,3,opt,name=traffic_policy,json=trafficPolicy" json:"traffic_policy,omitempty"` + TrafficPolicy *TrafficPolicy `protobuf:"bytes,3,opt,name=traffic_policy,json=trafficPolicy,proto3" json:"traffic_policy,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` } -func (m *Subset) Reset() { *m = Subset{} } -func (m *Subset) String() string { return proto.CompactTextString(m) } -func (*Subset) ProtoMessage() {} -func (*Subset) Descriptor() ([]byte, []int) { return fileDescriptorDestinationRule, []int{2} } +func (m *Subset) Reset() { *m = Subset{} } +func (m *Subset) String() string { return proto.CompactTextString(m) } +func (*Subset) ProtoMessage() {} +func (*Subset) Descriptor() ([]byte, []int) { + return fileDescriptor_12899beb695152c8, []int{2} +} +func (m *Subset) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *Subset) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_Subset.Marshal(b, m, deterministic) + } else { + b = b[:cap(b)] + n, err := m.MarshalTo(b) + if err != nil { + return nil, err + } + return b[:n], nil + } +} +func (m *Subset) XXX_Merge(src proto.Message) { + xxx_messageInfo_Subset.Merge(m, src) +} +func (m *Subset) XXX_Size() int { + return m.Size() +} +func (m *Subset) XXX_DiscardUnknown() { + xxx_messageInfo_Subset.DiscardUnknown(m) +} + +var xxx_messageInfo_Subset proto.InternalMessageInfo func (m *Subset) GetName() string { if m != nil { @@ -531,16 +608,45 @@ type LoadBalancerSettings struct { // Types that are valid to be assigned to LbPolicy: // *LoadBalancerSettings_Simple // *LoadBalancerSettings_ConsistentHash - LbPolicy isLoadBalancerSettings_LbPolicy `protobuf_oneof:"lb_policy"` + LbPolicy isLoadBalancerSettings_LbPolicy `protobuf_oneof:"lb_policy"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` } func (m *LoadBalancerSettings) Reset() { *m = LoadBalancerSettings{} } func (m *LoadBalancerSettings) String() string { return proto.CompactTextString(m) } func (*LoadBalancerSettings) ProtoMessage() {} func (*LoadBalancerSettings) Descriptor() ([]byte, []int) { - return fileDescriptorDestinationRule, []int{3} + return fileDescriptor_12899beb695152c8, []int{3} +} +func (m *LoadBalancerSettings) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *LoadBalancerSettings) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_LoadBalancerSettings.Marshal(b, m, deterministic) + } else { + b = b[:cap(b)] + n, err := m.MarshalTo(b) + if err != nil { + return nil, err + } + return b[:n], nil + } +} +func (m *LoadBalancerSettings) XXX_Merge(src proto.Message) { + xxx_messageInfo_LoadBalancerSettings.Merge(m, src) +} +func (m *LoadBalancerSettings) XXX_Size() int { + return m.Size() +} +func (m *LoadBalancerSettings) XXX_DiscardUnknown() { + xxx_messageInfo_LoadBalancerSettings.DiscardUnknown(m) } +var xxx_messageInfo_LoadBalancerSettings proto.InternalMessageInfo + type isLoadBalancerSettings_LbPolicy interface { isLoadBalancerSettings_LbPolicy() MarshalTo([]byte) (int, error) @@ -551,7 +657,7 @@ type LoadBalancerSettings_Simple struct { Simple LoadBalancerSettings_SimpleLB `protobuf:"varint,1,opt,name=simple,proto3,enum=istio.networking.v1alpha3.LoadBalancerSettings_SimpleLB,oneof"` } type LoadBalancerSettings_ConsistentHash struct { - ConsistentHash *LoadBalancerSettings_ConsistentHashLB `protobuf:"bytes,2,opt,name=consistent_hash,json=consistentHash,oneof"` + ConsistentHash *LoadBalancerSettings_ConsistentHashLB `protobuf:"bytes,2,opt,name=consistent_hash,json=consistentHash,proto3,oneof"` } func (*LoadBalancerSettings_Simple) isLoadBalancerSettings_LbPolicy() {} @@ -633,11 +739,11 @@ func _LoadBalancerSettings_OneofSizer(msg proto.Message) (n int) { // lb_policy switch x := m.LbPolicy.(type) { case *LoadBalancerSettings_Simple: - n += proto.SizeVarint(1<<3 | proto.WireVarint) + n += 1 // tag and wire n += proto.SizeVarint(uint64(x.Simple)) case *LoadBalancerSettings_ConsistentHash: s := proto.Size(x.ConsistentHash) - n += proto.SizeVarint(2<<3 | proto.WireBytes) + n += 1 // tag and wire n += proto.SizeVarint(uint64(s)) n += s case nil: @@ -666,15 +772,44 @@ type LoadBalancerSettings_ConsistentHashLB struct { // load distributions. If the number of hosts in the load balancing // pool is larger than the ring size, each host will be assigned a // single virtual node. - MinimumRingSize uint64 `protobuf:"varint,4,opt,name=minimum_ring_size,json=minimumRingSize,proto3" json:"minimum_ring_size,omitempty"` + MinimumRingSize uint64 `protobuf:"varint,4,opt,name=minimum_ring_size,json=minimumRingSize,proto3" json:"minimum_ring_size,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` } func (m *LoadBalancerSettings_ConsistentHashLB) Reset() { *m = LoadBalancerSettings_ConsistentHashLB{} } func (m *LoadBalancerSettings_ConsistentHashLB) String() string { return proto.CompactTextString(m) } func (*LoadBalancerSettings_ConsistentHashLB) ProtoMessage() {} func (*LoadBalancerSettings_ConsistentHashLB) Descriptor() ([]byte, []int) { - return fileDescriptorDestinationRule, []int{3, 0} + return fileDescriptor_12899beb695152c8, []int{3, 0} +} +func (m *LoadBalancerSettings_ConsistentHashLB) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) } +func (m *LoadBalancerSettings_ConsistentHashLB) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_LoadBalancerSettings_ConsistentHashLB.Marshal(b, m, deterministic) + } else { + b = b[:cap(b)] + n, err := m.MarshalTo(b) + if err != nil { + return nil, err + } + return b[:n], nil + } +} +func (m *LoadBalancerSettings_ConsistentHashLB) XXX_Merge(src proto.Message) { + xxx_messageInfo_LoadBalancerSettings_ConsistentHashLB.Merge(m, src) +} +func (m *LoadBalancerSettings_ConsistentHashLB) XXX_Size() int { + return m.Size() +} +func (m *LoadBalancerSettings_ConsistentHashLB) XXX_DiscardUnknown() { + xxx_messageInfo_LoadBalancerSettings_ConsistentHashLB.DiscardUnknown(m) +} + +var xxx_messageInfo_LoadBalancerSettings_ConsistentHashLB proto.InternalMessageInfo type isLoadBalancerSettings_ConsistentHashLB_HashKey interface { isLoadBalancerSettings_ConsistentHashLB_HashKey() @@ -686,7 +821,7 @@ type LoadBalancerSettings_ConsistentHashLB_HttpHeaderName struct { HttpHeaderName string `protobuf:"bytes,1,opt,name=http_header_name,json=httpHeaderName,proto3,oneof"` } type LoadBalancerSettings_ConsistentHashLB_HttpCookie struct { - HttpCookie *LoadBalancerSettings_ConsistentHashLB_HTTPCookie `protobuf:"bytes,2,opt,name=http_cookie,json=httpCookie,oneof"` + HttpCookie *LoadBalancerSettings_ConsistentHashLB_HTTPCookie `protobuf:"bytes,2,opt,name=http_cookie,json=httpCookie,proto3,oneof"` } type LoadBalancerSettings_ConsistentHashLB_UseSourceIp struct { UseSourceIp bool `protobuf:"varint,3,opt,name=use_source_ip,json=useSourceIp,proto3,oneof"` @@ -804,16 +939,16 @@ func _LoadBalancerSettings_ConsistentHashLB_OneofSizer(msg proto.Message) (n int // hash_key switch x := m.HashKey.(type) { case *LoadBalancerSettings_ConsistentHashLB_HttpHeaderName: - n += proto.SizeVarint(1<<3 | proto.WireBytes) + n += 1 // tag and wire n += proto.SizeVarint(uint64(len(x.HttpHeaderName))) n += len(x.HttpHeaderName) case *LoadBalancerSettings_ConsistentHashLB_HttpCookie: s := proto.Size(x.HttpCookie) - n += proto.SizeVarint(2<<3 | proto.WireBytes) + n += 1 // tag and wire n += proto.SizeVarint(uint64(s)) n += s case *LoadBalancerSettings_ConsistentHashLB_UseSourceIp: - n += proto.SizeVarint(3<<3 | proto.WireVarint) + n += 1 // tag and wire n += 1 case nil: default: @@ -831,7 +966,10 @@ type LoadBalancerSettings_ConsistentHashLB_HTTPCookie struct { // Path to set for the cookie. Path string `protobuf:"bytes,2,opt,name=path,proto3" json:"path,omitempty"` // REQUIRED. Lifetime of the cookie. - Ttl *time.Duration `protobuf:"bytes,3,opt,name=ttl,stdduration" json:"ttl,omitempty"` + Ttl *time.Duration `protobuf:"bytes,3,opt,name=ttl,proto3,stdduration" json:"ttl,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` } func (m *LoadBalancerSettings_ConsistentHashLB_HTTPCookie) Reset() { @@ -842,8 +980,34 @@ func (m *LoadBalancerSettings_ConsistentHashLB_HTTPCookie) String() string { } func (*LoadBalancerSettings_ConsistentHashLB_HTTPCookie) ProtoMessage() {} func (*LoadBalancerSettings_ConsistentHashLB_HTTPCookie) Descriptor() ([]byte, []int) { - return fileDescriptorDestinationRule, []int{3, 0, 0} + return fileDescriptor_12899beb695152c8, []int{3, 0, 0} +} +func (m *LoadBalancerSettings_ConsistentHashLB_HTTPCookie) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *LoadBalancerSettings_ConsistentHashLB_HTTPCookie) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_LoadBalancerSettings_ConsistentHashLB_HTTPCookie.Marshal(b, m, deterministic) + } else { + b = b[:cap(b)] + n, err := m.MarshalTo(b) + if err != nil { + return nil, err + } + return b[:n], nil + } +} +func (m *LoadBalancerSettings_ConsistentHashLB_HTTPCookie) XXX_Merge(src proto.Message) { + xxx_messageInfo_LoadBalancerSettings_ConsistentHashLB_HTTPCookie.Merge(m, src) +} +func (m *LoadBalancerSettings_ConsistentHashLB_HTTPCookie) XXX_Size() int { + return m.Size() } +func (m *LoadBalancerSettings_ConsistentHashLB_HTTPCookie) XXX_DiscardUnknown() { + xxx_messageInfo_LoadBalancerSettings_ConsistentHashLB_HTTPCookie.DiscardUnknown(m) +} + +var xxx_messageInfo_LoadBalancerSettings_ConsistentHashLB_HTTPCookie proto.InternalMessageInfo func (m *LoadBalancerSettings_ConsistentHashLB_HTTPCookie) GetName() string { if m != nil { @@ -893,17 +1057,46 @@ func (m *LoadBalancerSettings_ConsistentHashLB_HTTPCookie) GetTtl() *time.Durati // ``` type ConnectionPoolSettings struct { // Settings common to both HTTP and TCP upstream connections. - Tcp *ConnectionPoolSettings_TCPSettings `protobuf:"bytes,1,opt,name=tcp" json:"tcp,omitempty"` + Tcp *ConnectionPoolSettings_TCPSettings `protobuf:"bytes,1,opt,name=tcp,proto3" json:"tcp,omitempty"` // HTTP connection pool settings. - Http *ConnectionPoolSettings_HTTPSettings `protobuf:"bytes,2,opt,name=http" json:"http,omitempty"` + Http *ConnectionPoolSettings_HTTPSettings `protobuf:"bytes,2,opt,name=http,proto3" json:"http,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` } func (m *ConnectionPoolSettings) Reset() { *m = ConnectionPoolSettings{} } func (m *ConnectionPoolSettings) String() string { return proto.CompactTextString(m) } func (*ConnectionPoolSettings) ProtoMessage() {} func (*ConnectionPoolSettings) Descriptor() ([]byte, []int) { - return fileDescriptorDestinationRule, []int{4} + return fileDescriptor_12899beb695152c8, []int{4} +} +func (m *ConnectionPoolSettings) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *ConnectionPoolSettings) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_ConnectionPoolSettings.Marshal(b, m, deterministic) + } else { + b = b[:cap(b)] + n, err := m.MarshalTo(b) + if err != nil { + return nil, err + } + return b[:n], nil + } } +func (m *ConnectionPoolSettings) XXX_Merge(src proto.Message) { + xxx_messageInfo_ConnectionPoolSettings.Merge(m, src) +} +func (m *ConnectionPoolSettings) XXX_Size() int { + return m.Size() +} +func (m *ConnectionPoolSettings) XXX_DiscardUnknown() { + xxx_messageInfo_ConnectionPoolSettings.DiscardUnknown(m) +} + +var xxx_messageInfo_ConnectionPoolSettings proto.InternalMessageInfo func (m *ConnectionPoolSettings) GetTcp() *ConnectionPoolSettings_TCPSettings { if m != nil { @@ -924,18 +1117,47 @@ type ConnectionPoolSettings_TCPSettings struct { // Maximum number of HTTP1 /TCP connections to a destination host. MaxConnections int32 `protobuf:"varint,1,opt,name=max_connections,json=maxConnections,proto3" json:"max_connections,omitempty"` // TCP connection timeout. - ConnectTimeout *google_protobuf.Duration `protobuf:"bytes,2,opt,name=connect_timeout,json=connectTimeout" json:"connect_timeout,omitempty"` + ConnectTimeout *types.Duration `protobuf:"bytes,2,opt,name=connect_timeout,json=connectTimeout,proto3" json:"connect_timeout,omitempty"` // If set then set SO_KEEPALIVE on the socket to enable TCP Keepalives. - TcpKeepalive *ConnectionPoolSettings_TCPSettings_TcpKeepalive `protobuf:"bytes,3,opt,name=tcp_keepalive,json=tcpKeepalive" json:"tcp_keepalive,omitempty"` + TcpKeepalive *ConnectionPoolSettings_TCPSettings_TcpKeepalive `protobuf:"bytes,3,opt,name=tcp_keepalive,json=tcpKeepalive,proto3" json:"tcp_keepalive,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` } func (m *ConnectionPoolSettings_TCPSettings) Reset() { *m = ConnectionPoolSettings_TCPSettings{} } func (m *ConnectionPoolSettings_TCPSettings) String() string { return proto.CompactTextString(m) } func (*ConnectionPoolSettings_TCPSettings) ProtoMessage() {} func (*ConnectionPoolSettings_TCPSettings) Descriptor() ([]byte, []int) { - return fileDescriptorDestinationRule, []int{4, 0} + return fileDescriptor_12899beb695152c8, []int{4, 0} +} +func (m *ConnectionPoolSettings_TCPSettings) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *ConnectionPoolSettings_TCPSettings) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_ConnectionPoolSettings_TCPSettings.Marshal(b, m, deterministic) + } else { + b = b[:cap(b)] + n, err := m.MarshalTo(b) + if err != nil { + return nil, err + } + return b[:n], nil + } +} +func (m *ConnectionPoolSettings_TCPSettings) XXX_Merge(src proto.Message) { + xxx_messageInfo_ConnectionPoolSettings_TCPSettings.Merge(m, src) +} +func (m *ConnectionPoolSettings_TCPSettings) XXX_Size() int { + return m.Size() +} +func (m *ConnectionPoolSettings_TCPSettings) XXX_DiscardUnknown() { + xxx_messageInfo_ConnectionPoolSettings_TCPSettings.DiscardUnknown(m) } +var xxx_messageInfo_ConnectionPoolSettings_TCPSettings proto.InternalMessageInfo + func (m *ConnectionPoolSettings_TCPSettings) GetMaxConnections() int32 { if m != nil { return m.MaxConnections @@ -943,7 +1165,7 @@ func (m *ConnectionPoolSettings_TCPSettings) GetMaxConnections() int32 { return 0 } -func (m *ConnectionPoolSettings_TCPSettings) GetConnectTimeout() *google_protobuf.Duration { +func (m *ConnectionPoolSettings_TCPSettings) GetConnectTimeout() *types.Duration { if m != nil { return m.ConnectTimeout } @@ -966,11 +1188,14 @@ type ConnectionPoolSettings_TCPSettings_TcpKeepalive struct { // The time duration a connection needs to be idle before keep-alive // probes start being sent. Default is to use the OS level configuration // (unless overridden, Linux defaults to 7200s (ie 2 hours.) - Time *google_protobuf.Duration `protobuf:"bytes,2,opt,name=time" json:"time,omitempty"` + Time *types.Duration `protobuf:"bytes,2,opt,name=time,proto3" json:"time,omitempty"` // The time duration between keep-alive probes. // Default is to use the OS level configuration // (unless overridden, Linux defaults to 75s.) - Interval *google_protobuf.Duration `protobuf:"bytes,3,opt,name=interval" json:"interval,omitempty"` + Interval *types.Duration `protobuf:"bytes,3,opt,name=interval,proto3" json:"interval,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` } func (m *ConnectionPoolSettings_TCPSettings_TcpKeepalive) Reset() { @@ -981,9 +1206,35 @@ func (m *ConnectionPoolSettings_TCPSettings_TcpKeepalive) String() string { } func (*ConnectionPoolSettings_TCPSettings_TcpKeepalive) ProtoMessage() {} func (*ConnectionPoolSettings_TCPSettings_TcpKeepalive) Descriptor() ([]byte, []int) { - return fileDescriptorDestinationRule, []int{4, 0, 0} + return fileDescriptor_12899beb695152c8, []int{4, 0, 0} +} +func (m *ConnectionPoolSettings_TCPSettings_TcpKeepalive) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *ConnectionPoolSettings_TCPSettings_TcpKeepalive) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_ConnectionPoolSettings_TCPSettings_TcpKeepalive.Marshal(b, m, deterministic) + } else { + b = b[:cap(b)] + n, err := m.MarshalTo(b) + if err != nil { + return nil, err + } + return b[:n], nil + } +} +func (m *ConnectionPoolSettings_TCPSettings_TcpKeepalive) XXX_Merge(src proto.Message) { + xxx_messageInfo_ConnectionPoolSettings_TCPSettings_TcpKeepalive.Merge(m, src) +} +func (m *ConnectionPoolSettings_TCPSettings_TcpKeepalive) XXX_Size() int { + return m.Size() +} +func (m *ConnectionPoolSettings_TCPSettings_TcpKeepalive) XXX_DiscardUnknown() { + xxx_messageInfo_ConnectionPoolSettings_TCPSettings_TcpKeepalive.DiscardUnknown(m) } +var xxx_messageInfo_ConnectionPoolSettings_TCPSettings_TcpKeepalive proto.InternalMessageInfo + func (m *ConnectionPoolSettings_TCPSettings_TcpKeepalive) GetProbes() uint32 { if m != nil { return m.Probes @@ -991,14 +1242,14 @@ func (m *ConnectionPoolSettings_TCPSettings_TcpKeepalive) GetProbes() uint32 { return 0 } -func (m *ConnectionPoolSettings_TCPSettings_TcpKeepalive) GetTime() *google_protobuf.Duration { +func (m *ConnectionPoolSettings_TCPSettings_TcpKeepalive) GetTime() *types.Duration { if m != nil { return m.Time } return nil } -func (m *ConnectionPoolSettings_TCPSettings_TcpKeepalive) GetInterval() *google_protobuf.Duration { +func (m *ConnectionPoolSettings_TCPSettings_TcpKeepalive) GetInterval() *types.Duration { if m != nil { return m.Interval } @@ -1016,16 +1267,45 @@ type ConnectionPoolSettings_HTTPSettings struct { MaxRequestsPerConnection int32 `protobuf:"varint,3,opt,name=max_requests_per_connection,json=maxRequestsPerConnection,proto3" json:"max_requests_per_connection,omitempty"` // Maximum number of retries that can be outstanding to all hosts in a // cluster at a given time. Defaults to 3. - MaxRetries int32 `protobuf:"varint,4,opt,name=max_retries,json=maxRetries,proto3" json:"max_retries,omitempty"` + MaxRetries int32 `protobuf:"varint,4,opt,name=max_retries,json=maxRetries,proto3" json:"max_retries,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` } func (m *ConnectionPoolSettings_HTTPSettings) Reset() { *m = ConnectionPoolSettings_HTTPSettings{} } func (m *ConnectionPoolSettings_HTTPSettings) String() string { return proto.CompactTextString(m) } func (*ConnectionPoolSettings_HTTPSettings) ProtoMessage() {} func (*ConnectionPoolSettings_HTTPSettings) Descriptor() ([]byte, []int) { - return fileDescriptorDestinationRule, []int{4, 1} + return fileDescriptor_12899beb695152c8, []int{4, 1} +} +func (m *ConnectionPoolSettings_HTTPSettings) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *ConnectionPoolSettings_HTTPSettings) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_ConnectionPoolSettings_HTTPSettings.Marshal(b, m, deterministic) + } else { + b = b[:cap(b)] + n, err := m.MarshalTo(b) + if err != nil { + return nil, err + } + return b[:n], nil + } +} +func (m *ConnectionPoolSettings_HTTPSettings) XXX_Merge(src proto.Message) { + xxx_messageInfo_ConnectionPoolSettings_HTTPSettings.Merge(m, src) +} +func (m *ConnectionPoolSettings_HTTPSettings) XXX_Size() int { + return m.Size() +} +func (m *ConnectionPoolSettings_HTTPSettings) XXX_DiscardUnknown() { + xxx_messageInfo_ConnectionPoolSettings_HTTPSettings.DiscardUnknown(m) } +var xxx_messageInfo_ConnectionPoolSettings_HTTPSettings proto.InternalMessageInfo + func (m *ConnectionPoolSettings_HTTPSettings) GetHttp1MaxPendingRequests() int32 { if m != nil { return m.Http1MaxPendingRequests @@ -1098,13 +1378,13 @@ type OutlierDetection struct { ConsecutiveErrors int32 `protobuf:"varint,1,opt,name=consecutive_errors,json=consecutiveErrors,proto3" json:"consecutive_errors,omitempty"` // Time interval between ejection sweep analysis. format: // 1h/1m/1s/1ms. MUST BE >=1ms. Default is 10s. - Interval *google_protobuf.Duration `protobuf:"bytes,2,opt,name=interval" json:"interval,omitempty"` + Interval *types.Duration `protobuf:"bytes,2,opt,name=interval,proto3" json:"interval,omitempty"` // Minimum ejection duration. A host will remain ejected for a period // equal to the product of minimum ejection duration and the number of // times the host has been ejected. This technique allows the system to // automatically increase the ejection period for unhealthy upstream // servers. format: 1h/1m/1s/1ms. MUST BE >=1ms. Default is 30s. - BaseEjectionTime *google_protobuf.Duration `protobuf:"bytes,3,opt,name=base_ejection_time,json=baseEjectionTime" json:"base_ejection_time,omitempty"` + BaseEjectionTime *types.Duration `protobuf:"bytes,3,opt,name=base_ejection_time,json=baseEjectionTime,proto3" json:"base_ejection_time,omitempty"` // Maximum % of hosts in the load balancing pool for the upstream // service that can be ejected. Defaults to 10%. MaxEjectionPercent int32 `protobuf:"varint,4,opt,name=max_ejection_percent,json=maxEjectionPercent,proto3" json:"max_ejection_percent,omitempty"` @@ -1113,13 +1393,44 @@ type OutlierDetection struct { // percentage of healthy hosts in the load balancing pool drops below this // threshold, outlier detection will be disabled and the proxy will load balance // across all hosts in the pool (healthy and unhealthy). The default is 50%. - MinHealthPercent int32 `protobuf:"varint,5,opt,name=min_health_percent,json=minHealthPercent,proto3" json:"min_health_percent,omitempty"` + MinHealthPercent int32 `protobuf:"varint,5,opt,name=min_health_percent,json=minHealthPercent,proto3" json:"min_health_percent,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` +} + +func (m *OutlierDetection) Reset() { *m = OutlierDetection{} } +func (m *OutlierDetection) String() string { return proto.CompactTextString(m) } +func (*OutlierDetection) ProtoMessage() {} +func (*OutlierDetection) Descriptor() ([]byte, []int) { + return fileDescriptor_12899beb695152c8, []int{5} +} +func (m *OutlierDetection) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *OutlierDetection) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_OutlierDetection.Marshal(b, m, deterministic) + } else { + b = b[:cap(b)] + n, err := m.MarshalTo(b) + if err != nil { + return nil, err + } + return b[:n], nil + } +} +func (m *OutlierDetection) XXX_Merge(src proto.Message) { + xxx_messageInfo_OutlierDetection.Merge(m, src) +} +func (m *OutlierDetection) XXX_Size() int { + return m.Size() +} +func (m *OutlierDetection) XXX_DiscardUnknown() { + xxx_messageInfo_OutlierDetection.DiscardUnknown(m) } -func (m *OutlierDetection) Reset() { *m = OutlierDetection{} } -func (m *OutlierDetection) String() string { return proto.CompactTextString(m) } -func (*OutlierDetection) ProtoMessage() {} -func (*OutlierDetection) Descriptor() ([]byte, []int) { return fileDescriptorDestinationRule, []int{5} } +var xxx_messageInfo_OutlierDetection proto.InternalMessageInfo func (m *OutlierDetection) GetConsecutiveErrors() int32 { if m != nil { @@ -1128,14 +1439,14 @@ func (m *OutlierDetection) GetConsecutiveErrors() int32 { return 0 } -func (m *OutlierDetection) GetInterval() *google_protobuf.Duration { +func (m *OutlierDetection) GetInterval() *types.Duration { if m != nil { return m.Interval } return nil } -func (m *OutlierDetection) GetBaseEjectionTime() *google_protobuf.Duration { +func (m *OutlierDetection) GetBaseEjectionTime() *types.Duration { if m != nil { return m.BaseEjectionTime } @@ -1229,15 +1540,46 @@ type TLSSettings struct { // certificate's subject alt name matches one of the specified values. // If specified, this list overrides the value of subject_alt_names // from the ServiceEntry. - SubjectAltNames []string `protobuf:"bytes,5,rep,name=subject_alt_names,json=subjectAltNames" json:"subject_alt_names,omitempty"` + SubjectAltNames []string `protobuf:"bytes,5,rep,name=subject_alt_names,json=subjectAltNames,proto3" json:"subject_alt_names,omitempty"` // SNI string to present to the server during TLS handshake. - Sni string `protobuf:"bytes,6,opt,name=sni,proto3" json:"sni,omitempty"` + Sni string `protobuf:"bytes,6,opt,name=sni,proto3" json:"sni,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` +} + +func (m *TLSSettings) Reset() { *m = TLSSettings{} } +func (m *TLSSettings) String() string { return proto.CompactTextString(m) } +func (*TLSSettings) ProtoMessage() {} +func (*TLSSettings) Descriptor() ([]byte, []int) { + return fileDescriptor_12899beb695152c8, []int{6} +} +func (m *TLSSettings) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *TLSSettings) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_TLSSettings.Marshal(b, m, deterministic) + } else { + b = b[:cap(b)] + n, err := m.MarshalTo(b) + if err != nil { + return nil, err + } + return b[:n], nil + } +} +func (m *TLSSettings) XXX_Merge(src proto.Message) { + xxx_messageInfo_TLSSettings.Merge(m, src) +} +func (m *TLSSettings) XXX_Size() int { + return m.Size() +} +func (m *TLSSettings) XXX_DiscardUnknown() { + xxx_messageInfo_TLSSettings.DiscardUnknown(m) } -func (m *TLSSettings) Reset() { *m = TLSSettings{} } -func (m *TLSSettings) String() string { return proto.CompactTextString(m) } -func (*TLSSettings) ProtoMessage() {} -func (*TLSSettings) Descriptor() ([]byte, []int) { return fileDescriptorDestinationRule, []int{6} } +var xxx_messageInfo_TLSSettings proto.InternalMessageInfo func (m *TLSSettings) GetMode() TLSSettings_TLSmode { if m != nil { @@ -1282,10 +1624,13 @@ func (m *TLSSettings) GetSni() string { } func init() { + proto.RegisterEnum("istio.networking.v1alpha3.LoadBalancerSettings_SimpleLB", LoadBalancerSettings_SimpleLB_name, LoadBalancerSettings_SimpleLB_value) + proto.RegisterEnum("istio.networking.v1alpha3.TLSSettings_TLSmode", TLSSettings_TLSmode_name, TLSSettings_TLSmode_value) proto.RegisterType((*DestinationRule)(nil), "istio.networking.v1alpha3.DestinationRule") proto.RegisterType((*TrafficPolicy)(nil), "istio.networking.v1alpha3.TrafficPolicy") proto.RegisterType((*TrafficPolicy_PortTrafficPolicy)(nil), "istio.networking.v1alpha3.TrafficPolicy.PortTrafficPolicy") proto.RegisterType((*Subset)(nil), "istio.networking.v1alpha3.Subset") + proto.RegisterMapType((map[string]string)(nil), "istio.networking.v1alpha3.Subset.LabelsEntry") proto.RegisterType((*LoadBalancerSettings)(nil), "istio.networking.v1alpha3.LoadBalancerSettings") proto.RegisterType((*LoadBalancerSettings_ConsistentHashLB)(nil), "istio.networking.v1alpha3.LoadBalancerSettings.ConsistentHashLB") proto.RegisterType((*LoadBalancerSettings_ConsistentHashLB_HTTPCookie)(nil), "istio.networking.v1alpha3.LoadBalancerSettings.ConsistentHashLB.HTTPCookie") @@ -1295,9 +1640,104 @@ func init() { proto.RegisterType((*ConnectionPoolSettings_HTTPSettings)(nil), "istio.networking.v1alpha3.ConnectionPoolSettings.HTTPSettings") proto.RegisterType((*OutlierDetection)(nil), "istio.networking.v1alpha3.OutlierDetection") proto.RegisterType((*TLSSettings)(nil), "istio.networking.v1alpha3.TLSSettings") - proto.RegisterEnum("istio.networking.v1alpha3.LoadBalancerSettings_SimpleLB", LoadBalancerSettings_SimpleLB_name, LoadBalancerSettings_SimpleLB_value) - proto.RegisterEnum("istio.networking.v1alpha3.TLSSettings_TLSmode", TLSSettings_TLSmode_name, TLSSettings_TLSmode_value) } + +func init() { + proto.RegisterFile("networking/v1alpha3/destination_rule.proto", fileDescriptor_12899beb695152c8) +} + +var fileDescriptor_12899beb695152c8 = []byte{ + // 1396 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x57, 0xcf, 0x6e, 0x1b, 0xb7, + 0x13, 0xb6, 0xfe, 0xc6, 0x1a, 0xd9, 0xb2, 0xcc, 0x9f, 0x91, 0x9f, 0xa2, 0x00, 0x8e, 0x2b, 0x14, + 0x8d, 0x9b, 0x36, 0xab, 0xda, 0x41, 0x81, 0x34, 0x41, 0x8a, 0x58, 0xb6, 0x10, 0xb9, 0x91, 0x2d, + 0x81, 0x92, 0x81, 0x22, 0x97, 0x05, 0xb5, 0xa2, 0x25, 0xc6, 0xab, 0xe5, 0x76, 0xc9, 0x55, 0xed, + 0x3c, 0x43, 0xcf, 0x41, 0xaf, 0xbd, 0xf4, 0x59, 0x8a, 0x9e, 0x72, 0x6d, 0x2f, 0x2d, 0xf2, 0x02, + 0x3d, 0xf5, 0xd2, 0x53, 0x41, 0x2e, 0x57, 0x92, 0x13, 0xc7, 0x8e, 0xe1, 0xe6, 0xc6, 0xe5, 0xcc, + 0xf7, 0x91, 0x9c, 0x6f, 0x38, 0xc3, 0x85, 0x3b, 0x1e, 0x95, 0xdf, 0xf3, 0xe0, 0x88, 0x79, 0x83, + 0xea, 0x78, 0x83, 0xb8, 0xfe, 0x90, 0xdc, 0xab, 0xf6, 0xa9, 0x90, 0xcc, 0x23, 0x92, 0x71, 0xcf, + 0x0e, 0x42, 0x97, 0x5a, 0x7e, 0xc0, 0x25, 0x47, 0x37, 0x98, 0x90, 0x8c, 0x5b, 0x53, 0x84, 0x15, + 0x23, 0xca, 0xab, 0x03, 0xce, 0x07, 0x2e, 0xad, 0x6a, 0xc7, 0x5e, 0x78, 0x58, 0xed, 0x87, 0x81, + 0xc6, 0x47, 0xd0, 0xf2, 0xa7, 0x67, 0x2d, 0x33, 0x66, 0x81, 0x0c, 0x89, 0x6b, 0x0b, 0x1a, 0x8c, + 0x99, 0x63, 0x56, 0x29, 0xaf, 0x0c, 0xf8, 0x80, 0xeb, 0x61, 0x55, 0x8d, 0xa2, 0xd9, 0xca, 0xab, + 0x04, 0x2c, 0xed, 0x4c, 0xb7, 0x85, 0x43, 0x97, 0x22, 0x04, 0xe9, 0x21, 0x17, 0xb2, 0x94, 0x58, + 0x4b, 0xac, 0xe7, 0xb0, 0x1e, 0xa3, 0x16, 0x14, 0x64, 0x40, 0x0e, 0x0f, 0x99, 0x63, 0xfb, 0xdc, + 0x65, 0xce, 0x49, 0x29, 0xb9, 0x96, 0x58, 0xcf, 0x6f, 0xae, 0x5b, 0xef, 0xdc, 0xbc, 0xd5, 0x8d, + 0x00, 0x6d, 0xed, 0x8f, 0x17, 0xe5, 0xec, 0x27, 0x7a, 0x08, 0xd7, 0x44, 0xd8, 0x13, 0x54, 0x8a, + 0x52, 0x6a, 0x2d, 0xb5, 0x9e, 0xdf, 0xfc, 0xe8, 0x1c, 0xa6, 0x8e, 0xf6, 0xc4, 0x31, 0x02, 0xdd, + 0x84, 0x1c, 0x3d, 0xf6, 0x79, 0x20, 0x6d, 0xc9, 0x4b, 0xe9, 0xb5, 0xd4, 0x7a, 0x0e, 0xcf, 0x47, + 0x13, 0x5d, 0x5e, 0xf9, 0x3d, 0x0b, 0x8b, 0xa7, 0x96, 0x46, 0x5d, 0x58, 0x74, 0x39, 0xe9, 0xdb, + 0x3d, 0xe2, 0x12, 0xcf, 0xa1, 0x81, 0x3e, 0x59, 0x7e, 0xb3, 0x7a, 0xce, 0x8a, 0x4d, 0x4e, 0xfa, + 0x35, 0xe3, 0xde, 0xa1, 0x52, 0x32, 0x6f, 0x20, 0xf0, 0x82, 0x3b, 0x33, 0x8b, 0x9e, 0xc1, 0x92, + 0xc3, 0x3d, 0x8f, 0x3a, 0x5a, 0x4f, 0x9f, 0x73, 0xd7, 0xc4, 0x64, 0xe3, 0x1c, 0xde, 0xed, 0x09, + 0xa2, 0xcd, 0xb9, 0x3b, 0x61, 0x2e, 0x38, 0xa7, 0xe6, 0xd1, 0xb7, 0xb0, 0xcc, 0x43, 0xe9, 0x32, + 0x1a, 0xd8, 0x7d, 0x2a, 0x23, 0x43, 0x29, 0xa5, 0xd9, 0x3f, 0x3b, 0x87, 0xbd, 0x15, 0x61, 0x76, + 0x62, 0x08, 0x2e, 0xf2, 0x37, 0x66, 0xd0, 0x7d, 0x48, 0x49, 0x57, 0x94, 0xd2, 0x9a, 0xeb, 0x93, + 0xf3, 0xd4, 0x6b, 0x76, 0x26, 0xdb, 0x53, 0x10, 0xf4, 0x1c, 0xfe, 0xa7, 0x43, 0xee, 0xd2, 0x31, + 0x55, 0xc9, 0x15, 0xd9, 0x4a, 0x19, 0xad, 0xde, 0x83, 0xf7, 0xcd, 0x03, 0xab, 0xad, 0x54, 0x3a, + 0x95, 0x19, 0xcb, 0x8a, 0xb6, 0xa9, 0x58, 0xe3, 0x05, 0xcb, 0x2f, 0x53, 0xb0, 0xfc, 0x96, 0x23, + 0x7a, 0x08, 0x69, 0xe5, 0x6a, 0xe4, 0xbb, 0x7d, 0xce, 0x92, 0x0a, 0xdb, 0xa1, 0x2e, 0x75, 0x24, + 0x0f, 0xb0, 0x06, 0xbd, 0x9d, 0x04, 0xc9, 0x0f, 0x94, 0x04, 0xa9, 0x0f, 0x9a, 0x04, 0xe9, 0xff, + 0x30, 0x09, 0x32, 0x97, 0x4e, 0x82, 0xca, 0x5f, 0x09, 0xc8, 0x46, 0xb7, 0x51, 0x95, 0x09, 0x8f, + 0x8c, 0x68, 0x5c, 0x26, 0xd4, 0x18, 0xd5, 0x21, 0xeb, 0x92, 0x1e, 0x75, 0x45, 0x29, 0xa9, 0xd3, + 0xe2, 0xee, 0x85, 0x97, 0xda, 0x6a, 0x6a, 0xff, 0xba, 0x27, 0x83, 0x13, 0x6c, 0xc0, 0x67, 0x54, + 0x9b, 0xd4, 0x95, 0xaa, 0x4d, 0xf9, 0x2b, 0xc8, 0xcf, 0xac, 0x83, 0x8a, 0x90, 0x3a, 0xa2, 0x27, + 0x66, 0xe7, 0x6a, 0x88, 0x56, 0x20, 0x33, 0x26, 0x6e, 0x48, 0x75, 0x56, 0xe4, 0x70, 0xf4, 0xf1, + 0x20, 0x79, 0x3f, 0x51, 0xf9, 0x39, 0x03, 0x2b, 0x67, 0x25, 0x02, 0xc2, 0x90, 0x15, 0x6c, 0xe4, + 0xbb, 0x51, 0x04, 0x0a, 0x9b, 0xf7, 0x2f, 0x99, 0x49, 0x56, 0x47, 0xa3, 0x9b, 0xb5, 0xc6, 0x1c, + 0x36, 0x4c, 0xe8, 0x48, 0xa7, 0x93, 0x60, 0x42, 0x52, 0x4f, 0xda, 0x43, 0x22, 0x86, 0x26, 0x4d, + 0x1f, 0x5f, 0x96, 0x7c, 0x7b, 0x42, 0xd3, 0x20, 0x62, 0xa8, 0x17, 0x29, 0x38, 0xa7, 0xe6, 0xca, + 0x7f, 0x27, 0xa1, 0xf8, 0xa6, 0x1b, 0xba, 0x03, 0xc5, 0xa1, 0x94, 0xbe, 0x3d, 0xa4, 0xa4, 0x4f, + 0x03, 0x7b, 0xaa, 0xb0, 0x22, 0x50, 0x96, 0x86, 0x36, 0xec, 0x2b, 0xb5, 0x3d, 0xc8, 0x6b, 0x5f, + 0x87, 0xf3, 0x23, 0x46, 0xcd, 0x4e, 0x9f, 0x5e, 0x75, 0xa7, 0x56, 0xa3, 0xdb, 0x6d, 0x6f, 0x6b, + 0xca, 0xc6, 0x1c, 0x06, 0xb5, 0x42, 0xf4, 0x85, 0x3e, 0x86, 0xc5, 0x50, 0x50, 0x5b, 0xf0, 0x30, + 0x70, 0xa8, 0xcd, 0x7c, 0x9d, 0x15, 0xf3, 0x8d, 0x39, 0x9c, 0x0f, 0x05, 0xed, 0xe8, 0xd9, 0x5d, + 0x1f, 0xdd, 0x81, 0xe5, 0x11, 0xf3, 0xd8, 0x28, 0x1c, 0xd9, 0x01, 0xf3, 0x06, 0xb6, 0x60, 0x2f, + 0xa8, 0xbe, 0x36, 0x69, 0xbc, 0x64, 0x0c, 0x98, 0x79, 0x83, 0x0e, 0x7b, 0x41, 0xcb, 0x03, 0x80, + 0xe9, 0x6a, 0x67, 0x66, 0x34, 0x82, 0xb4, 0x4f, 0xe4, 0xd0, 0xe4, 0x85, 0x1e, 0xa3, 0x0d, 0x48, + 0x49, 0x19, 0x5f, 0xf4, 0x1b, 0x56, 0xd4, 0xa3, 0xad, 0xb8, 0x47, 0x5b, 0x3b, 0xa6, 0x47, 0xd7, + 0xd2, 0x3f, 0xfe, 0x71, 0x2b, 0x81, 0x95, 0x6f, 0x0d, 0x60, 0x5e, 0xa9, 0x69, 0x1f, 0xd1, 0x93, + 0x4a, 0x03, 0xe6, 0x63, 0xe9, 0xd1, 0x12, 0xe4, 0x71, 0xeb, 0x60, 0x7f, 0xc7, 0xc6, 0xad, 0xda, + 0xee, 0x7e, 0x71, 0x0e, 0x15, 0x00, 0x9a, 0xf5, 0xad, 0x4e, 0xd7, 0xde, 0x6e, 0xed, 0xef, 0x17, + 0x13, 0x08, 0x20, 0x8b, 0xb7, 0xf6, 0x77, 0x5a, 0x7b, 0xc5, 0xa4, 0x72, 0x6e, 0x6f, 0x75, 0x3a, + 0xdd, 0x06, 0x6e, 0x1d, 0x3c, 0x69, 0x14, 0x53, 0xb5, 0x3c, 0xe4, 0xdc, 0x9e, 0xb9, 0x22, 0x95, + 0x97, 0x59, 0xb8, 0x7e, 0x76, 0x65, 0x41, 0x2d, 0x48, 0x49, 0xc7, 0x37, 0x75, 0xf3, 0xd1, 0xa5, + 0x2b, 0x93, 0xd5, 0xdd, 0x6e, 0xcf, 0x94, 0x01, 0xc7, 0x47, 0x18, 0xd2, 0x4a, 0x17, 0x23, 0xf9, + 0xd7, 0x97, 0x67, 0x54, 0x51, 0x9f, 0x50, 0x6a, 0xae, 0xf2, 0x3f, 0x49, 0xc8, 0xcf, 0x2c, 0x84, + 0x6e, 0xc3, 0xd2, 0x88, 0x1c, 0xdb, 0xd3, 0xa2, 0x28, 0xf4, 0x01, 0x32, 0xb8, 0x30, 0x22, 0xc7, + 0x53, 0x5a, 0x81, 0x6a, 0x93, 0x1a, 0x6c, 0x4b, 0x36, 0xa2, 0x3c, 0x94, 0x66, 0x5f, 0xef, 0x96, + 0x66, 0x52, 0x6b, 0xbb, 0x11, 0x00, 0x71, 0x58, 0x94, 0x8e, 0x6f, 0x1f, 0x51, 0xea, 0x13, 0x97, + 0x8d, 0xa9, 0x11, 0xf7, 0x9b, 0x2b, 0xc5, 0xca, 0xea, 0x3a, 0xfe, 0xd3, 0x98, 0x11, 0x2f, 0xc8, + 0x99, 0xaf, 0xf2, 0x0f, 0x09, 0x58, 0x98, 0x35, 0xa3, 0xeb, 0x90, 0xf5, 0x03, 0xde, 0xa3, 0xd1, + 0x29, 0x17, 0xb1, 0xf9, 0x42, 0x77, 0x21, 0xad, 0x4e, 0x75, 0xf1, 0x91, 0xb4, 0x1b, 0xfa, 0x12, + 0xe6, 0x99, 0x27, 0x69, 0x30, 0x26, 0x17, 0x27, 0x28, 0x9e, 0xb8, 0x96, 0x7f, 0x4b, 0xc0, 0xc2, + 0xac, 0x26, 0xe8, 0x21, 0x94, 0x95, 0x2a, 0x1b, 0xb6, 0xd2, 0xc0, 0xa7, 0x5e, 0x5f, 0x5d, 0xa5, + 0x80, 0x7e, 0x17, 0x52, 0x21, 0x63, 0x21, 0xfe, 0xaf, 0x3d, 0xf6, 0xc8, 0x71, 0x3b, 0xb2, 0x63, + 0x63, 0x46, 0x9f, 0x03, 0x52, 0xa6, 0x4d, 0x0d, 0x9e, 0x80, 0x92, 0x1a, 0xa4, 0xcb, 0xcb, 0xe6, + 0x1e, 0x39, 0x9e, 0x78, 0x3f, 0x82, 0x9b, 0xb3, 0x7e, 0xb6, 0x4f, 0x83, 0x19, 0xd5, 0xf5, 0x29, + 0x32, 0xb8, 0x34, 0x9a, 0x22, 0xda, 0x34, 0x98, 0x06, 0x1f, 0xdd, 0x82, 0x7c, 0x04, 0x97, 0x01, + 0xa3, 0xd1, 0xcb, 0x26, 0x83, 0x41, 0xbb, 0xeb, 0x99, 0xca, 0x4f, 0x49, 0x28, 0xbe, 0xd9, 0x14, + 0xd1, 0x5d, 0x40, 0xaa, 0x1c, 0x52, 0x27, 0x94, 0x6c, 0x4c, 0x6d, 0x1a, 0x04, 0x3c, 0x88, 0xcf, + 0xb5, 0x3c, 0x63, 0xa9, 0x6b, 0xc3, 0xa9, 0xb0, 0x26, 0xdf, 0x3b, 0xac, 0xe8, 0x09, 0xa0, 0x1e, + 0x11, 0xd4, 0xa6, 0xcf, 0xcd, 0x0b, 0x41, 0x4b, 0x79, 0xa1, 0x2e, 0x45, 0x05, 0xaa, 0x1b, 0x8c, + 0x4a, 0x51, 0xf4, 0x05, 0xac, 0xa8, 0x43, 0x4e, 0x78, 0x7c, 0x1a, 0x38, 0xd4, 0x93, 0xe6, 0xb4, + 0x68, 0x44, 0x8e, 0x63, 0xf7, 0x76, 0x64, 0x51, 0x1a, 0x8c, 0x98, 0xa7, 0xea, 0xb8, 0x2b, 0x87, + 0x13, 0xff, 0x4c, 0xa4, 0xc1, 0x88, 0x79, 0x0d, 0x6d, 0x30, 0xde, 0x95, 0x5f, 0xd5, 0xe5, 0x9b, + 0x36, 0x7b, 0x54, 0x83, 0xf4, 0x88, 0xf7, 0xe3, 0xd6, 0x66, 0xbd, 0xdf, 0x13, 0x41, 0x8d, 0x15, + 0x0a, 0x6b, 0xac, 0x0e, 0xb1, 0xcb, 0x54, 0x23, 0x73, 0x68, 0x20, 0xd9, 0x21, 0x73, 0x88, 0x8c, + 0x1b, 0xec, 0x72, 0x64, 0xd9, 0x9e, 0x1a, 0x94, 0x8e, 0x7e, 0xc0, 0xc6, 0x44, 0x52, 0x55, 0x25, + 0x75, 0x90, 0x72, 0x18, 0xcc, 0xd4, 0x53, 0x7a, 0xa2, 0x0a, 0x82, 0x43, 0x66, 0xb9, 0x22, 0xb1, + 0x73, 0xb8, 0xe0, 0x90, 0x19, 0x22, 0xa1, 0x3a, 0x80, 0x08, 0x7b, 0x2a, 0x1e, 0x36, 0x71, 0xa5, + 0xee, 0x61, 0xd1, 0x3b, 0x35, 0x87, 0x97, 0x8c, 0x61, 0xcb, 0x95, 0xaa, 0x85, 0x09, 0xf5, 0x14, + 0x10, 0x1e, 0x2b, 0x65, 0xa3, 0xa7, 0x80, 0xf0, 0x58, 0xe5, 0x31, 0x5c, 0x33, 0xe7, 0x40, 0x79, + 0xb8, 0xb6, 0xb3, 0xdb, 0xd9, 0xaa, 0x35, 0xeb, 0xc5, 0x39, 0x55, 0x89, 0x3b, 0xbb, 0x7b, 0xed, + 0x66, 0x3d, 0xaa, 0xca, 0x7b, 0x07, 0xdd, 0x83, 0xad, 0x66, 0x31, 0x89, 0x8a, 0xb0, 0xb0, 0xdb, + 0xe9, 0xee, 0xb6, 0x6c, 0x33, 0x93, 0xaa, 0x59, 0xbf, 0xbc, 0x5e, 0x4d, 0xbc, 0x7a, 0xbd, 0x9a, + 0xf8, 0xf3, 0xf5, 0x6a, 0xe2, 0xd9, 0x5a, 0x14, 0x3b, 0xc6, 0xab, 0xc4, 0x67, 0xd5, 0x33, 0x7e, + 0xd8, 0x7a, 0x59, 0x9d, 0x01, 0xf7, 0xfe, 0x0d, 0x00, 0x00, 0xff, 0xff, 0xfd, 0x7d, 0x30, 0x94, + 0x35, 0x0e, 0x00, 0x00, +} + func (m *DestinationRule) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) @@ -1356,6 +1796,9 @@ func (m *DestinationRule) MarshalTo(dAtA []byte) (int, error) { i += copy(dAtA[i:], s) } } + if m.XXX_unrecognized != nil { + i += copy(dAtA[i:], m.XXX_unrecognized) + } return i, nil } @@ -1426,6 +1869,9 @@ func (m *TrafficPolicy) MarshalTo(dAtA []byte) (int, error) { i += n } } + if m.XXX_unrecognized != nil { + i += copy(dAtA[i:], m.XXX_unrecognized) + } return i, nil } @@ -1494,6 +1940,9 @@ func (m *TrafficPolicy_PortTrafficPolicy) MarshalTo(dAtA []byte) (int, error) { } i += n10 } + if m.XXX_unrecognized != nil { + i += copy(dAtA[i:], m.XXX_unrecognized) + } return i, nil } @@ -1545,6 +1994,9 @@ func (m *Subset) MarshalTo(dAtA []byte) (int, error) { } i += n11 } + if m.XXX_unrecognized != nil { + i += copy(dAtA[i:], m.XXX_unrecognized) + } return i, nil } @@ -1570,6 +2022,9 @@ func (m *LoadBalancerSettings) MarshalTo(dAtA []byte) (int, error) { } i += nn12 } + if m.XXX_unrecognized != nil { + i += copy(dAtA[i:], m.XXX_unrecognized) + } return i, nil } @@ -1621,6 +2076,9 @@ func (m *LoadBalancerSettings_ConsistentHashLB) MarshalTo(dAtA []byte) (int, err i++ i = encodeVarintDestinationRule(dAtA, i, uint64(m.MinimumRingSize)) } + if m.XXX_unrecognized != nil { + i += copy(dAtA[i:], m.XXX_unrecognized) + } return i, nil } @@ -1688,13 +2146,16 @@ func (m *LoadBalancerSettings_ConsistentHashLB_HTTPCookie) MarshalTo(dAtA []byte if m.Ttl != nil { dAtA[i] = 0x1a i++ - i = encodeVarintDestinationRule(dAtA, i, uint64(types.SizeOfStdDuration(*m.Ttl))) - n16, err := types.StdDurationMarshalTo(*m.Ttl, dAtA[i:]) + i = encodeVarintDestinationRule(dAtA, i, uint64(github_com_gogo_protobuf_types.SizeOfStdDuration(*m.Ttl))) + n16, err := github_com_gogo_protobuf_types.StdDurationMarshalTo(*m.Ttl, dAtA[i:]) if err != nil { return 0, err } i += n16 } + if m.XXX_unrecognized != nil { + i += copy(dAtA[i:], m.XXX_unrecognized) + } return i, nil } @@ -1733,6 +2194,9 @@ func (m *ConnectionPoolSettings) MarshalTo(dAtA []byte) (int, error) { } i += n18 } + if m.XXX_unrecognized != nil { + i += copy(dAtA[i:], m.XXX_unrecognized) + } return i, nil } @@ -1776,6 +2240,9 @@ func (m *ConnectionPoolSettings_TCPSettings) MarshalTo(dAtA []byte) (int, error) } i += n20 } + if m.XXX_unrecognized != nil { + i += copy(dAtA[i:], m.XXX_unrecognized) + } return i, nil } @@ -1819,6 +2286,9 @@ func (m *ConnectionPoolSettings_TCPSettings_TcpKeepalive) MarshalTo(dAtA []byte) } i += n22 } + if m.XXX_unrecognized != nil { + i += copy(dAtA[i:], m.XXX_unrecognized) + } return i, nil } @@ -1857,6 +2327,9 @@ func (m *ConnectionPoolSettings_HTTPSettings) MarshalTo(dAtA []byte) (int, error i++ i = encodeVarintDestinationRule(dAtA, i, uint64(m.MaxRetries)) } + if m.XXX_unrecognized != nil { + i += copy(dAtA[i:], m.XXX_unrecognized) + } return i, nil } @@ -1910,6 +2383,9 @@ func (m *OutlierDetection) MarshalTo(dAtA []byte) (int, error) { i++ i = encodeVarintDestinationRule(dAtA, i, uint64(m.MinHealthPercent)) } + if m.XXX_unrecognized != nil { + i += copy(dAtA[i:], m.XXX_unrecognized) + } return i, nil } @@ -1972,6 +2448,9 @@ func (m *TLSSettings) MarshalTo(dAtA []byte) (int, error) { i = encodeVarintDestinationRule(dAtA, i, uint64(len(m.Sni))) i += copy(dAtA[i:], m.Sni) } + if m.XXX_unrecognized != nil { + i += copy(dAtA[i:], m.XXX_unrecognized) + } return i, nil } @@ -1985,6 +2464,9 @@ func encodeVarintDestinationRule(dAtA []byte, offset int, v uint64) int { return offset + 1 } func (m *DestinationRule) Size() (n int) { + if m == nil { + return 0 + } var l int _ = l l = len(m.Host) @@ -2007,10 +2489,16 @@ func (m *DestinationRule) Size() (n int) { n += 1 + l + sovDestinationRule(uint64(l)) } } + if m.XXX_unrecognized != nil { + n += len(m.XXX_unrecognized) + } return n } func (m *TrafficPolicy) Size() (n int) { + if m == nil { + return 0 + } var l int _ = l if m.LoadBalancer != nil { @@ -2035,10 +2523,16 @@ func (m *TrafficPolicy) Size() (n int) { n += 1 + l + sovDestinationRule(uint64(l)) } } + if m.XXX_unrecognized != nil { + n += len(m.XXX_unrecognized) + } return n } func (m *TrafficPolicy_PortTrafficPolicy) Size() (n int) { + if m == nil { + return 0 + } var l int _ = l if m.Port != nil { @@ -2061,10 +2555,16 @@ func (m *TrafficPolicy_PortTrafficPolicy) Size() (n int) { l = m.Tls.Size() n += 1 + l + sovDestinationRule(uint64(l)) } + if m.XXX_unrecognized != nil { + n += len(m.XXX_unrecognized) + } return n } func (m *Subset) Size() (n int) { + if m == nil { + return 0 + } var l int _ = l l = len(m.Name) @@ -2083,25 +2583,40 @@ func (m *Subset) Size() (n int) { l = m.TrafficPolicy.Size() n += 1 + l + sovDestinationRule(uint64(l)) } + if m.XXX_unrecognized != nil { + n += len(m.XXX_unrecognized) + } return n } func (m *LoadBalancerSettings) Size() (n int) { + if m == nil { + return 0 + } var l int _ = l if m.LbPolicy != nil { n += m.LbPolicy.Size() } + if m.XXX_unrecognized != nil { + n += len(m.XXX_unrecognized) + } return n } func (m *LoadBalancerSettings_Simple) Size() (n int) { + if m == nil { + return 0 + } var l int _ = l n += 1 + sovDestinationRule(uint64(m.Simple)) return n } func (m *LoadBalancerSettings_ConsistentHash) Size() (n int) { + if m == nil { + return 0 + } var l int _ = l if m.ConsistentHash != nil { @@ -2111,6 +2626,9 @@ func (m *LoadBalancerSettings_ConsistentHash) Size() (n int) { return n } func (m *LoadBalancerSettings_ConsistentHashLB) Size() (n int) { + if m == nil { + return 0 + } var l int _ = l if m.HashKey != nil { @@ -2119,10 +2637,16 @@ func (m *LoadBalancerSettings_ConsistentHashLB) Size() (n int) { if m.MinimumRingSize != 0 { n += 1 + sovDestinationRule(uint64(m.MinimumRingSize)) } + if m.XXX_unrecognized != nil { + n += len(m.XXX_unrecognized) + } return n } func (m *LoadBalancerSettings_ConsistentHashLB_HttpHeaderName) Size() (n int) { + if m == nil { + return 0 + } var l int _ = l l = len(m.HttpHeaderName) @@ -2130,6 +2654,9 @@ func (m *LoadBalancerSettings_ConsistentHashLB_HttpHeaderName) Size() (n int) { return n } func (m *LoadBalancerSettings_ConsistentHashLB_HttpCookie) Size() (n int) { + if m == nil { + return 0 + } var l int _ = l if m.HttpCookie != nil { @@ -2139,12 +2666,18 @@ func (m *LoadBalancerSettings_ConsistentHashLB_HttpCookie) Size() (n int) { return n } func (m *LoadBalancerSettings_ConsistentHashLB_UseSourceIp) Size() (n int) { + if m == nil { + return 0 + } var l int _ = l n += 2 return n } func (m *LoadBalancerSettings_ConsistentHashLB_HTTPCookie) Size() (n int) { + if m == nil { + return 0 + } var l int _ = l l = len(m.Name) @@ -2156,13 +2689,19 @@ func (m *LoadBalancerSettings_ConsistentHashLB_HTTPCookie) Size() (n int) { n += 1 + l + sovDestinationRule(uint64(l)) } if m.Ttl != nil { - l = types.SizeOfStdDuration(*m.Ttl) + l = github_com_gogo_protobuf_types.SizeOfStdDuration(*m.Ttl) n += 1 + l + sovDestinationRule(uint64(l)) } + if m.XXX_unrecognized != nil { + n += len(m.XXX_unrecognized) + } return n } func (m *ConnectionPoolSettings) Size() (n int) { + if m == nil { + return 0 + } var l int _ = l if m.Tcp != nil { @@ -2173,10 +2712,16 @@ func (m *ConnectionPoolSettings) Size() (n int) { l = m.Http.Size() n += 1 + l + sovDestinationRule(uint64(l)) } + if m.XXX_unrecognized != nil { + n += len(m.XXX_unrecognized) + } return n } func (m *ConnectionPoolSettings_TCPSettings) Size() (n int) { + if m == nil { + return 0 + } var l int _ = l if m.MaxConnections != 0 { @@ -2190,10 +2735,16 @@ func (m *ConnectionPoolSettings_TCPSettings) Size() (n int) { l = m.TcpKeepalive.Size() n += 1 + l + sovDestinationRule(uint64(l)) } + if m.XXX_unrecognized != nil { + n += len(m.XXX_unrecognized) + } return n } func (m *ConnectionPoolSettings_TCPSettings_TcpKeepalive) Size() (n int) { + if m == nil { + return 0 + } var l int _ = l if m.Probes != 0 { @@ -2207,10 +2758,16 @@ func (m *ConnectionPoolSettings_TCPSettings_TcpKeepalive) Size() (n int) { l = m.Interval.Size() n += 1 + l + sovDestinationRule(uint64(l)) } + if m.XXX_unrecognized != nil { + n += len(m.XXX_unrecognized) + } return n } func (m *ConnectionPoolSettings_HTTPSettings) Size() (n int) { + if m == nil { + return 0 + } var l int _ = l if m.Http1MaxPendingRequests != 0 { @@ -2225,10 +2782,16 @@ func (m *ConnectionPoolSettings_HTTPSettings) Size() (n int) { if m.MaxRetries != 0 { n += 1 + sovDestinationRule(uint64(m.MaxRetries)) } + if m.XXX_unrecognized != nil { + n += len(m.XXX_unrecognized) + } return n } func (m *OutlierDetection) Size() (n int) { + if m == nil { + return 0 + } var l int _ = l if m.ConsecutiveErrors != 0 { @@ -2248,10 +2811,16 @@ func (m *OutlierDetection) Size() (n int) { if m.MinHealthPercent != 0 { n += 1 + sovDestinationRule(uint64(m.MinHealthPercent)) } + if m.XXX_unrecognized != nil { + n += len(m.XXX_unrecognized) + } return n } func (m *TLSSettings) Size() (n int) { + if m == nil { + return 0 + } var l int _ = l if m.Mode != 0 { @@ -2279,6 +2848,9 @@ func (m *TLSSettings) Size() (n int) { if l > 0 { n += 1 + l + sovDestinationRule(uint64(l)) } + if m.XXX_unrecognized != nil { + n += len(m.XXX_unrecognized) + } return n } @@ -2310,7 +2882,7 @@ func (m *DestinationRule) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - wire |= (uint64(b) & 0x7F) << shift + wire |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -2338,7 +2910,7 @@ func (m *DestinationRule) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLen |= (uint64(b) & 0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -2348,6 +2920,9 @@ func (m *DestinationRule) Unmarshal(dAtA []byte) error { return ErrInvalidLengthDestinationRule } postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthDestinationRule + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -2367,7 +2942,7 @@ func (m *DestinationRule) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - msglen |= (int(b) & 0x7F) << shift + msglen |= int(b&0x7F) << shift if b < 0x80 { break } @@ -2376,6 +2951,9 @@ func (m *DestinationRule) Unmarshal(dAtA []byte) error { return ErrInvalidLengthDestinationRule } postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthDestinationRule + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -2400,7 +2978,7 @@ func (m *DestinationRule) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - msglen |= (int(b) & 0x7F) << shift + msglen |= int(b&0x7F) << shift if b < 0x80 { break } @@ -2409,6 +2987,9 @@ func (m *DestinationRule) Unmarshal(dAtA []byte) error { return ErrInvalidLengthDestinationRule } postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthDestinationRule + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -2431,7 +3012,7 @@ func (m *DestinationRule) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLen |= (uint64(b) & 0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -2441,6 +3022,9 @@ func (m *DestinationRule) Unmarshal(dAtA []byte) error { return ErrInvalidLengthDestinationRule } postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthDestinationRule + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -2455,9 +3039,13 @@ func (m *DestinationRule) Unmarshal(dAtA []byte) error { if skippy < 0 { return ErrInvalidLengthDestinationRule } + if (iNdEx + skippy) < 0 { + return ErrInvalidLengthDestinationRule + } if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF } + m.XXX_unrecognized = append(m.XXX_unrecognized, dAtA[iNdEx:iNdEx+skippy]...) iNdEx += skippy } } @@ -2482,7 +3070,7 @@ func (m *TrafficPolicy) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - wire |= (uint64(b) & 0x7F) << shift + wire |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -2510,7 +3098,7 @@ func (m *TrafficPolicy) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - msglen |= (int(b) & 0x7F) << shift + msglen |= int(b&0x7F) << shift if b < 0x80 { break } @@ -2519,6 +3107,9 @@ func (m *TrafficPolicy) Unmarshal(dAtA []byte) error { return ErrInvalidLengthDestinationRule } postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthDestinationRule + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -2543,7 +3134,7 @@ func (m *TrafficPolicy) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - msglen |= (int(b) & 0x7F) << shift + msglen |= int(b&0x7F) << shift if b < 0x80 { break } @@ -2552,6 +3143,9 @@ func (m *TrafficPolicy) Unmarshal(dAtA []byte) error { return ErrInvalidLengthDestinationRule } postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthDestinationRule + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -2576,7 +3170,7 @@ func (m *TrafficPolicy) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - msglen |= (int(b) & 0x7F) << shift + msglen |= int(b&0x7F) << shift if b < 0x80 { break } @@ -2585,6 +3179,9 @@ func (m *TrafficPolicy) Unmarshal(dAtA []byte) error { return ErrInvalidLengthDestinationRule } postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthDestinationRule + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -2609,7 +3206,7 @@ func (m *TrafficPolicy) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - msglen |= (int(b) & 0x7F) << shift + msglen |= int(b&0x7F) << shift if b < 0x80 { break } @@ -2618,6 +3215,9 @@ func (m *TrafficPolicy) Unmarshal(dAtA []byte) error { return ErrInvalidLengthDestinationRule } postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthDestinationRule + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -2642,7 +3242,7 @@ func (m *TrafficPolicy) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - msglen |= (int(b) & 0x7F) << shift + msglen |= int(b&0x7F) << shift if b < 0x80 { break } @@ -2651,6 +3251,9 @@ func (m *TrafficPolicy) Unmarshal(dAtA []byte) error { return ErrInvalidLengthDestinationRule } postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthDestinationRule + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -2668,9 +3271,13 @@ func (m *TrafficPolicy) Unmarshal(dAtA []byte) error { if skippy < 0 { return ErrInvalidLengthDestinationRule } + if (iNdEx + skippy) < 0 { + return ErrInvalidLengthDestinationRule + } if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF } + m.XXX_unrecognized = append(m.XXX_unrecognized, dAtA[iNdEx:iNdEx+skippy]...) iNdEx += skippy } } @@ -2695,7 +3302,7 @@ func (m *TrafficPolicy_PortTrafficPolicy) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - wire |= (uint64(b) & 0x7F) << shift + wire |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -2723,7 +3330,7 @@ func (m *TrafficPolicy_PortTrafficPolicy) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - msglen |= (int(b) & 0x7F) << shift + msglen |= int(b&0x7F) << shift if b < 0x80 { break } @@ -2732,6 +3339,9 @@ func (m *TrafficPolicy_PortTrafficPolicy) Unmarshal(dAtA []byte) error { return ErrInvalidLengthDestinationRule } postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthDestinationRule + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -2756,7 +3366,7 @@ func (m *TrafficPolicy_PortTrafficPolicy) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - msglen |= (int(b) & 0x7F) << shift + msglen |= int(b&0x7F) << shift if b < 0x80 { break } @@ -2765,6 +3375,9 @@ func (m *TrafficPolicy_PortTrafficPolicy) Unmarshal(dAtA []byte) error { return ErrInvalidLengthDestinationRule } postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthDestinationRule + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -2789,7 +3402,7 @@ func (m *TrafficPolicy_PortTrafficPolicy) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - msglen |= (int(b) & 0x7F) << shift + msglen |= int(b&0x7F) << shift if b < 0x80 { break } @@ -2798,6 +3411,9 @@ func (m *TrafficPolicy_PortTrafficPolicy) Unmarshal(dAtA []byte) error { return ErrInvalidLengthDestinationRule } postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthDestinationRule + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -2822,7 +3438,7 @@ func (m *TrafficPolicy_PortTrafficPolicy) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - msglen |= (int(b) & 0x7F) << shift + msglen |= int(b&0x7F) << shift if b < 0x80 { break } @@ -2831,6 +3447,9 @@ func (m *TrafficPolicy_PortTrafficPolicy) Unmarshal(dAtA []byte) error { return ErrInvalidLengthDestinationRule } postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthDestinationRule + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -2855,7 +3474,7 @@ func (m *TrafficPolicy_PortTrafficPolicy) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - msglen |= (int(b) & 0x7F) << shift + msglen |= int(b&0x7F) << shift if b < 0x80 { break } @@ -2864,6 +3483,9 @@ func (m *TrafficPolicy_PortTrafficPolicy) Unmarshal(dAtA []byte) error { return ErrInvalidLengthDestinationRule } postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthDestinationRule + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -2883,9 +3505,13 @@ func (m *TrafficPolicy_PortTrafficPolicy) Unmarshal(dAtA []byte) error { if skippy < 0 { return ErrInvalidLengthDestinationRule } + if (iNdEx + skippy) < 0 { + return ErrInvalidLengthDestinationRule + } if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF } + m.XXX_unrecognized = append(m.XXX_unrecognized, dAtA[iNdEx:iNdEx+skippy]...) iNdEx += skippy } } @@ -2910,7 +3536,7 @@ func (m *Subset) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - wire |= (uint64(b) & 0x7F) << shift + wire |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -2938,7 +3564,7 @@ func (m *Subset) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLen |= (uint64(b) & 0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -2948,6 +3574,9 @@ func (m *Subset) Unmarshal(dAtA []byte) error { return ErrInvalidLengthDestinationRule } postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthDestinationRule + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -2967,7 +3596,7 @@ func (m *Subset) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - msglen |= (int(b) & 0x7F) << shift + msglen |= int(b&0x7F) << shift if b < 0x80 { break } @@ -2976,6 +3605,9 @@ func (m *Subset) Unmarshal(dAtA []byte) error { return ErrInvalidLengthDestinationRule } postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthDestinationRule + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -2996,7 +3628,7 @@ func (m *Subset) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - wire |= (uint64(b) & 0x7F) << shift + wire |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -3013,7 +3645,7 @@ func (m *Subset) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLenmapkey |= (uint64(b) & 0x7F) << shift + stringLenmapkey |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -3023,6 +3655,9 @@ func (m *Subset) Unmarshal(dAtA []byte) error { return ErrInvalidLengthDestinationRule } postStringIndexmapkey := iNdEx + intStringLenmapkey + if postStringIndexmapkey < 0 { + return ErrInvalidLengthDestinationRule + } if postStringIndexmapkey > l { return io.ErrUnexpectedEOF } @@ -3039,7 +3674,7 @@ func (m *Subset) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLenmapvalue |= (uint64(b) & 0x7F) << shift + stringLenmapvalue |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -3049,6 +3684,9 @@ func (m *Subset) Unmarshal(dAtA []byte) error { return ErrInvalidLengthDestinationRule } postStringIndexmapvalue := iNdEx + intStringLenmapvalue + if postStringIndexmapvalue < 0 { + return ErrInvalidLengthDestinationRule + } if postStringIndexmapvalue > l { return io.ErrUnexpectedEOF } @@ -3085,7 +3723,7 @@ func (m *Subset) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - msglen |= (int(b) & 0x7F) << shift + msglen |= int(b&0x7F) << shift if b < 0x80 { break } @@ -3094,6 +3732,9 @@ func (m *Subset) Unmarshal(dAtA []byte) error { return ErrInvalidLengthDestinationRule } postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthDestinationRule + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -3113,9 +3754,13 @@ func (m *Subset) Unmarshal(dAtA []byte) error { if skippy < 0 { return ErrInvalidLengthDestinationRule } + if (iNdEx + skippy) < 0 { + return ErrInvalidLengthDestinationRule + } if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF } + m.XXX_unrecognized = append(m.XXX_unrecognized, dAtA[iNdEx:iNdEx+skippy]...) iNdEx += skippy } } @@ -3140,7 +3785,7 @@ func (m *LoadBalancerSettings) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - wire |= (uint64(b) & 0x7F) << shift + wire |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -3168,7 +3813,7 @@ func (m *LoadBalancerSettings) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - v |= (LoadBalancerSettings_SimpleLB(b) & 0x7F) << shift + v |= LoadBalancerSettings_SimpleLB(b&0x7F) << shift if b < 0x80 { break } @@ -3188,7 +3833,7 @@ func (m *LoadBalancerSettings) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - msglen |= (int(b) & 0x7F) << shift + msglen |= int(b&0x7F) << shift if b < 0x80 { break } @@ -3197,6 +3842,9 @@ func (m *LoadBalancerSettings) Unmarshal(dAtA []byte) error { return ErrInvalidLengthDestinationRule } postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthDestinationRule + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -3215,9 +3863,13 @@ func (m *LoadBalancerSettings) Unmarshal(dAtA []byte) error { if skippy < 0 { return ErrInvalidLengthDestinationRule } + if (iNdEx + skippy) < 0 { + return ErrInvalidLengthDestinationRule + } if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF } + m.XXX_unrecognized = append(m.XXX_unrecognized, dAtA[iNdEx:iNdEx+skippy]...) iNdEx += skippy } } @@ -3242,7 +3894,7 @@ func (m *LoadBalancerSettings_ConsistentHashLB) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - wire |= (uint64(b) & 0x7F) << shift + wire |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -3270,7 +3922,7 @@ func (m *LoadBalancerSettings_ConsistentHashLB) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLen |= (uint64(b) & 0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -3280,6 +3932,9 @@ func (m *LoadBalancerSettings_ConsistentHashLB) Unmarshal(dAtA []byte) error { return ErrInvalidLengthDestinationRule } postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthDestinationRule + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -3299,7 +3954,7 @@ func (m *LoadBalancerSettings_ConsistentHashLB) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - msglen |= (int(b) & 0x7F) << shift + msglen |= int(b&0x7F) << shift if b < 0x80 { break } @@ -3308,6 +3963,9 @@ func (m *LoadBalancerSettings_ConsistentHashLB) Unmarshal(dAtA []byte) error { return ErrInvalidLengthDestinationRule } postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthDestinationRule + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -3331,7 +3989,7 @@ func (m *LoadBalancerSettings_ConsistentHashLB) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - v |= (int(b) & 0x7F) << shift + v |= int(b&0x7F) << shift if b < 0x80 { break } @@ -3352,7 +4010,7 @@ func (m *LoadBalancerSettings_ConsistentHashLB) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - m.MinimumRingSize |= (uint64(b) & 0x7F) << shift + m.MinimumRingSize |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -3366,9 +4024,13 @@ func (m *LoadBalancerSettings_ConsistentHashLB) Unmarshal(dAtA []byte) error { if skippy < 0 { return ErrInvalidLengthDestinationRule } + if (iNdEx + skippy) < 0 { + return ErrInvalidLengthDestinationRule + } if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF } + m.XXX_unrecognized = append(m.XXX_unrecognized, dAtA[iNdEx:iNdEx+skippy]...) iNdEx += skippy } } @@ -3393,7 +4055,7 @@ func (m *LoadBalancerSettings_ConsistentHashLB_HTTPCookie) Unmarshal(dAtA []byte } b := dAtA[iNdEx] iNdEx++ - wire |= (uint64(b) & 0x7F) << shift + wire |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -3421,7 +4083,7 @@ func (m *LoadBalancerSettings_ConsistentHashLB_HTTPCookie) Unmarshal(dAtA []byte } b := dAtA[iNdEx] iNdEx++ - stringLen |= (uint64(b) & 0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -3431,6 +4093,9 @@ func (m *LoadBalancerSettings_ConsistentHashLB_HTTPCookie) Unmarshal(dAtA []byte return ErrInvalidLengthDestinationRule } postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthDestinationRule + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -3450,7 +4115,7 @@ func (m *LoadBalancerSettings_ConsistentHashLB_HTTPCookie) Unmarshal(dAtA []byte } b := dAtA[iNdEx] iNdEx++ - stringLen |= (uint64(b) & 0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -3460,6 +4125,9 @@ func (m *LoadBalancerSettings_ConsistentHashLB_HTTPCookie) Unmarshal(dAtA []byte return ErrInvalidLengthDestinationRule } postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthDestinationRule + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -3479,7 +4147,7 @@ func (m *LoadBalancerSettings_ConsistentHashLB_HTTPCookie) Unmarshal(dAtA []byte } b := dAtA[iNdEx] iNdEx++ - msglen |= (int(b) & 0x7F) << shift + msglen |= int(b&0x7F) << shift if b < 0x80 { break } @@ -3488,13 +4156,16 @@ func (m *LoadBalancerSettings_ConsistentHashLB_HTTPCookie) Unmarshal(dAtA []byte return ErrInvalidLengthDestinationRule } postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthDestinationRule + } if postIndex > l { return io.ErrUnexpectedEOF } if m.Ttl == nil { m.Ttl = new(time.Duration) } - if err := types.StdDurationUnmarshal(m.Ttl, dAtA[iNdEx:postIndex]); err != nil { + if err := github_com_gogo_protobuf_types.StdDurationUnmarshal(m.Ttl, dAtA[iNdEx:postIndex]); err != nil { return err } iNdEx = postIndex @@ -3507,9 +4178,13 @@ func (m *LoadBalancerSettings_ConsistentHashLB_HTTPCookie) Unmarshal(dAtA []byte if skippy < 0 { return ErrInvalidLengthDestinationRule } + if (iNdEx + skippy) < 0 { + return ErrInvalidLengthDestinationRule + } if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF } + m.XXX_unrecognized = append(m.XXX_unrecognized, dAtA[iNdEx:iNdEx+skippy]...) iNdEx += skippy } } @@ -3534,7 +4209,7 @@ func (m *ConnectionPoolSettings) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - wire |= (uint64(b) & 0x7F) << shift + wire |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -3562,7 +4237,7 @@ func (m *ConnectionPoolSettings) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - msglen |= (int(b) & 0x7F) << shift + msglen |= int(b&0x7F) << shift if b < 0x80 { break } @@ -3571,6 +4246,9 @@ func (m *ConnectionPoolSettings) Unmarshal(dAtA []byte) error { return ErrInvalidLengthDestinationRule } postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthDestinationRule + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -3595,7 +4273,7 @@ func (m *ConnectionPoolSettings) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - msglen |= (int(b) & 0x7F) << shift + msglen |= int(b&0x7F) << shift if b < 0x80 { break } @@ -3604,6 +4282,9 @@ func (m *ConnectionPoolSettings) Unmarshal(dAtA []byte) error { return ErrInvalidLengthDestinationRule } postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthDestinationRule + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -3623,9 +4304,13 @@ func (m *ConnectionPoolSettings) Unmarshal(dAtA []byte) error { if skippy < 0 { return ErrInvalidLengthDestinationRule } + if (iNdEx + skippy) < 0 { + return ErrInvalidLengthDestinationRule + } if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF } + m.XXX_unrecognized = append(m.XXX_unrecognized, dAtA[iNdEx:iNdEx+skippy]...) iNdEx += skippy } } @@ -3650,7 +4335,7 @@ func (m *ConnectionPoolSettings_TCPSettings) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - wire |= (uint64(b) & 0x7F) << shift + wire |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -3678,7 +4363,7 @@ func (m *ConnectionPoolSettings_TCPSettings) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - m.MaxConnections |= (int32(b) & 0x7F) << shift + m.MaxConnections |= int32(b&0x7F) << shift if b < 0x80 { break } @@ -3697,7 +4382,7 @@ func (m *ConnectionPoolSettings_TCPSettings) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - msglen |= (int(b) & 0x7F) << shift + msglen |= int(b&0x7F) << shift if b < 0x80 { break } @@ -3706,11 +4391,14 @@ func (m *ConnectionPoolSettings_TCPSettings) Unmarshal(dAtA []byte) error { return ErrInvalidLengthDestinationRule } postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthDestinationRule + } if postIndex > l { return io.ErrUnexpectedEOF } if m.ConnectTimeout == nil { - m.ConnectTimeout = &google_protobuf.Duration{} + m.ConnectTimeout = &types.Duration{} } if err := m.ConnectTimeout.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err @@ -3730,7 +4418,7 @@ func (m *ConnectionPoolSettings_TCPSettings) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - msglen |= (int(b) & 0x7F) << shift + msglen |= int(b&0x7F) << shift if b < 0x80 { break } @@ -3739,6 +4427,9 @@ func (m *ConnectionPoolSettings_TCPSettings) Unmarshal(dAtA []byte) error { return ErrInvalidLengthDestinationRule } postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthDestinationRule + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -3758,9 +4449,13 @@ func (m *ConnectionPoolSettings_TCPSettings) Unmarshal(dAtA []byte) error { if skippy < 0 { return ErrInvalidLengthDestinationRule } + if (iNdEx + skippy) < 0 { + return ErrInvalidLengthDestinationRule + } if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF } + m.XXX_unrecognized = append(m.XXX_unrecognized, dAtA[iNdEx:iNdEx+skippy]...) iNdEx += skippy } } @@ -3785,7 +4480,7 @@ func (m *ConnectionPoolSettings_TCPSettings_TcpKeepalive) Unmarshal(dAtA []byte) } b := dAtA[iNdEx] iNdEx++ - wire |= (uint64(b) & 0x7F) << shift + wire |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -3813,7 +4508,7 @@ func (m *ConnectionPoolSettings_TCPSettings_TcpKeepalive) Unmarshal(dAtA []byte) } b := dAtA[iNdEx] iNdEx++ - m.Probes |= (uint32(b) & 0x7F) << shift + m.Probes |= uint32(b&0x7F) << shift if b < 0x80 { break } @@ -3832,7 +4527,7 @@ func (m *ConnectionPoolSettings_TCPSettings_TcpKeepalive) Unmarshal(dAtA []byte) } b := dAtA[iNdEx] iNdEx++ - msglen |= (int(b) & 0x7F) << shift + msglen |= int(b&0x7F) << shift if b < 0x80 { break } @@ -3841,11 +4536,14 @@ func (m *ConnectionPoolSettings_TCPSettings_TcpKeepalive) Unmarshal(dAtA []byte) return ErrInvalidLengthDestinationRule } postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthDestinationRule + } if postIndex > l { return io.ErrUnexpectedEOF } if m.Time == nil { - m.Time = &google_protobuf.Duration{} + m.Time = &types.Duration{} } if err := m.Time.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err @@ -3865,7 +4563,7 @@ func (m *ConnectionPoolSettings_TCPSettings_TcpKeepalive) Unmarshal(dAtA []byte) } b := dAtA[iNdEx] iNdEx++ - msglen |= (int(b) & 0x7F) << shift + msglen |= int(b&0x7F) << shift if b < 0x80 { break } @@ -3874,11 +4572,14 @@ func (m *ConnectionPoolSettings_TCPSettings_TcpKeepalive) Unmarshal(dAtA []byte) return ErrInvalidLengthDestinationRule } postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthDestinationRule + } if postIndex > l { return io.ErrUnexpectedEOF } if m.Interval == nil { - m.Interval = &google_protobuf.Duration{} + m.Interval = &types.Duration{} } if err := m.Interval.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err @@ -3893,9 +4594,13 @@ func (m *ConnectionPoolSettings_TCPSettings_TcpKeepalive) Unmarshal(dAtA []byte) if skippy < 0 { return ErrInvalidLengthDestinationRule } + if (iNdEx + skippy) < 0 { + return ErrInvalidLengthDestinationRule + } if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF } + m.XXX_unrecognized = append(m.XXX_unrecognized, dAtA[iNdEx:iNdEx+skippy]...) iNdEx += skippy } } @@ -3920,7 +4625,7 @@ func (m *ConnectionPoolSettings_HTTPSettings) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - wire |= (uint64(b) & 0x7F) << shift + wire |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -3948,7 +4653,7 @@ func (m *ConnectionPoolSettings_HTTPSettings) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - m.Http1MaxPendingRequests |= (int32(b) & 0x7F) << shift + m.Http1MaxPendingRequests |= int32(b&0x7F) << shift if b < 0x80 { break } @@ -3967,7 +4672,7 @@ func (m *ConnectionPoolSettings_HTTPSettings) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - m.Http2MaxRequests |= (int32(b) & 0x7F) << shift + m.Http2MaxRequests |= int32(b&0x7F) << shift if b < 0x80 { break } @@ -3986,7 +4691,7 @@ func (m *ConnectionPoolSettings_HTTPSettings) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - m.MaxRequestsPerConnection |= (int32(b) & 0x7F) << shift + m.MaxRequestsPerConnection |= int32(b&0x7F) << shift if b < 0x80 { break } @@ -4005,7 +4710,7 @@ func (m *ConnectionPoolSettings_HTTPSettings) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - m.MaxRetries |= (int32(b) & 0x7F) << shift + m.MaxRetries |= int32(b&0x7F) << shift if b < 0x80 { break } @@ -4019,9 +4724,13 @@ func (m *ConnectionPoolSettings_HTTPSettings) Unmarshal(dAtA []byte) error { if skippy < 0 { return ErrInvalidLengthDestinationRule } + if (iNdEx + skippy) < 0 { + return ErrInvalidLengthDestinationRule + } if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF } + m.XXX_unrecognized = append(m.XXX_unrecognized, dAtA[iNdEx:iNdEx+skippy]...) iNdEx += skippy } } @@ -4046,7 +4755,7 @@ func (m *OutlierDetection) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - wire |= (uint64(b) & 0x7F) << shift + wire |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -4074,7 +4783,7 @@ func (m *OutlierDetection) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - m.ConsecutiveErrors |= (int32(b) & 0x7F) << shift + m.ConsecutiveErrors |= int32(b&0x7F) << shift if b < 0x80 { break } @@ -4093,7 +4802,7 @@ func (m *OutlierDetection) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - msglen |= (int(b) & 0x7F) << shift + msglen |= int(b&0x7F) << shift if b < 0x80 { break } @@ -4102,11 +4811,14 @@ func (m *OutlierDetection) Unmarshal(dAtA []byte) error { return ErrInvalidLengthDestinationRule } postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthDestinationRule + } if postIndex > l { return io.ErrUnexpectedEOF } if m.Interval == nil { - m.Interval = &google_protobuf.Duration{} + m.Interval = &types.Duration{} } if err := m.Interval.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err @@ -4126,7 +4838,7 @@ func (m *OutlierDetection) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - msglen |= (int(b) & 0x7F) << shift + msglen |= int(b&0x7F) << shift if b < 0x80 { break } @@ -4135,11 +4847,14 @@ func (m *OutlierDetection) Unmarshal(dAtA []byte) error { return ErrInvalidLengthDestinationRule } postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthDestinationRule + } if postIndex > l { return io.ErrUnexpectedEOF } if m.BaseEjectionTime == nil { - m.BaseEjectionTime = &google_protobuf.Duration{} + m.BaseEjectionTime = &types.Duration{} } if err := m.BaseEjectionTime.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err @@ -4159,7 +4874,7 @@ func (m *OutlierDetection) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - m.MaxEjectionPercent |= (int32(b) & 0x7F) << shift + m.MaxEjectionPercent |= int32(b&0x7F) << shift if b < 0x80 { break } @@ -4178,7 +4893,7 @@ func (m *OutlierDetection) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - m.MinHealthPercent |= (int32(b) & 0x7F) << shift + m.MinHealthPercent |= int32(b&0x7F) << shift if b < 0x80 { break } @@ -4192,9 +4907,13 @@ func (m *OutlierDetection) Unmarshal(dAtA []byte) error { if skippy < 0 { return ErrInvalidLengthDestinationRule } + if (iNdEx + skippy) < 0 { + return ErrInvalidLengthDestinationRule + } if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF } + m.XXX_unrecognized = append(m.XXX_unrecognized, dAtA[iNdEx:iNdEx+skippy]...) iNdEx += skippy } } @@ -4219,7 +4938,7 @@ func (m *TLSSettings) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - wire |= (uint64(b) & 0x7F) << shift + wire |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -4247,7 +4966,7 @@ func (m *TLSSettings) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - m.Mode |= (TLSSettings_TLSmode(b) & 0x7F) << shift + m.Mode |= TLSSettings_TLSmode(b&0x7F) << shift if b < 0x80 { break } @@ -4266,7 +4985,7 @@ func (m *TLSSettings) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLen |= (uint64(b) & 0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -4276,6 +4995,9 @@ func (m *TLSSettings) Unmarshal(dAtA []byte) error { return ErrInvalidLengthDestinationRule } postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthDestinationRule + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -4295,7 +5017,7 @@ func (m *TLSSettings) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLen |= (uint64(b) & 0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -4305,6 +5027,9 @@ func (m *TLSSettings) Unmarshal(dAtA []byte) error { return ErrInvalidLengthDestinationRule } postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthDestinationRule + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -4324,7 +5049,7 @@ func (m *TLSSettings) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLen |= (uint64(b) & 0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -4334,6 +5059,9 @@ func (m *TLSSettings) Unmarshal(dAtA []byte) error { return ErrInvalidLengthDestinationRule } postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthDestinationRule + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -4353,7 +5081,7 @@ func (m *TLSSettings) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLen |= (uint64(b) & 0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -4363,6 +5091,9 @@ func (m *TLSSettings) Unmarshal(dAtA []byte) error { return ErrInvalidLengthDestinationRule } postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthDestinationRule + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -4382,7 +5113,7 @@ func (m *TLSSettings) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLen |= (uint64(b) & 0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -4392,6 +5123,9 @@ func (m *TLSSettings) Unmarshal(dAtA []byte) error { return ErrInvalidLengthDestinationRule } postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthDestinationRule + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -4406,9 +5140,13 @@ func (m *TLSSettings) Unmarshal(dAtA []byte) error { if skippy < 0 { return ErrInvalidLengthDestinationRule } + if (iNdEx + skippy) < 0 { + return ErrInvalidLengthDestinationRule + } if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF } + m.XXX_unrecognized = append(m.XXX_unrecognized, dAtA[iNdEx:iNdEx+skippy]...) iNdEx += skippy } } @@ -4472,10 +5210,13 @@ func skipDestinationRule(dAtA []byte) (n int, err error) { break } } - iNdEx += length if length < 0 { return 0, ErrInvalidLengthDestinationRule } + iNdEx += length + if iNdEx < 0 { + return 0, ErrInvalidLengthDestinationRule + } return iNdEx, nil case 3: for { @@ -4504,6 +5245,9 @@ func skipDestinationRule(dAtA []byte) (n int, err error) { return 0, err } iNdEx = start + next + if iNdEx < 0 { + return 0, ErrInvalidLengthDestinationRule + } } return iNdEx, nil case 4: @@ -4522,99 +5266,3 @@ var ( ErrInvalidLengthDestinationRule = fmt.Errorf("proto: negative length found during unmarshaling") ErrIntOverflowDestinationRule = fmt.Errorf("proto: integer overflow") ) - -func init() { - proto.RegisterFile("networking/v1alpha3/destination_rule.proto", fileDescriptorDestinationRule) -} - -var fileDescriptorDestinationRule = []byte{ - // 1396 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x57, 0xcf, 0x6e, 0x1b, 0xb7, - 0x13, 0xb6, 0xfe, 0xc6, 0x1a, 0xd9, 0xb2, 0xcc, 0x9f, 0x91, 0x9f, 0xa2, 0x00, 0x8e, 0x2b, 0x14, - 0x8d, 0x9b, 0x36, 0xab, 0xda, 0x41, 0x81, 0x34, 0x41, 0x8a, 0x58, 0xb6, 0x10, 0xb9, 0x91, 0x2d, - 0x81, 0x92, 0x81, 0x22, 0x97, 0x05, 0xb5, 0xa2, 0x25, 0xc6, 0xab, 0xe5, 0x76, 0xc9, 0x55, 0xed, - 0x3c, 0x43, 0xcf, 0x41, 0xaf, 0xbd, 0xf4, 0x59, 0x8a, 0x9e, 0x72, 0x6d, 0x2f, 0x2d, 0xf2, 0x02, - 0x3d, 0xf5, 0xd2, 0x53, 0x41, 0x2e, 0x57, 0x92, 0x13, 0xc7, 0x8e, 0xe1, 0xe6, 0xc6, 0xe5, 0xcc, - 0xf7, 0x91, 0x9c, 0x6f, 0x38, 0xc3, 0x85, 0x3b, 0x1e, 0x95, 0xdf, 0xf3, 0xe0, 0x88, 0x79, 0x83, - 0xea, 0x78, 0x83, 0xb8, 0xfe, 0x90, 0xdc, 0xab, 0xf6, 0xa9, 0x90, 0xcc, 0x23, 0x92, 0x71, 0xcf, - 0x0e, 0x42, 0x97, 0x5a, 0x7e, 0xc0, 0x25, 0x47, 0x37, 0x98, 0x90, 0x8c, 0x5b, 0x53, 0x84, 0x15, - 0x23, 0xca, 0xab, 0x03, 0xce, 0x07, 0x2e, 0xad, 0x6a, 0xc7, 0x5e, 0x78, 0x58, 0xed, 0x87, 0x81, - 0xc6, 0x47, 0xd0, 0xf2, 0xa7, 0x67, 0x2d, 0x33, 0x66, 0x81, 0x0c, 0x89, 0x6b, 0x0b, 0x1a, 0x8c, - 0x99, 0x63, 0x56, 0x29, 0xaf, 0x0c, 0xf8, 0x80, 0xeb, 0x61, 0x55, 0x8d, 0xa2, 0xd9, 0xca, 0xab, - 0x04, 0x2c, 0xed, 0x4c, 0xb7, 0x85, 0x43, 0x97, 0x22, 0x04, 0xe9, 0x21, 0x17, 0xb2, 0x94, 0x58, - 0x4b, 0xac, 0xe7, 0xb0, 0x1e, 0xa3, 0x16, 0x14, 0x64, 0x40, 0x0e, 0x0f, 0x99, 0x63, 0xfb, 0xdc, - 0x65, 0xce, 0x49, 0x29, 0xb9, 0x96, 0x58, 0xcf, 0x6f, 0xae, 0x5b, 0xef, 0xdc, 0xbc, 0xd5, 0x8d, - 0x00, 0x6d, 0xed, 0x8f, 0x17, 0xe5, 0xec, 0x27, 0x7a, 0x08, 0xd7, 0x44, 0xd8, 0x13, 0x54, 0x8a, - 0x52, 0x6a, 0x2d, 0xb5, 0x9e, 0xdf, 0xfc, 0xe8, 0x1c, 0xa6, 0x8e, 0xf6, 0xc4, 0x31, 0x02, 0xdd, - 0x84, 0x1c, 0x3d, 0xf6, 0x79, 0x20, 0x6d, 0xc9, 0x4b, 0xe9, 0xb5, 0xd4, 0x7a, 0x0e, 0xcf, 0x47, - 0x13, 0x5d, 0x5e, 0xf9, 0x3d, 0x0b, 0x8b, 0xa7, 0x96, 0x46, 0x5d, 0x58, 0x74, 0x39, 0xe9, 0xdb, - 0x3d, 0xe2, 0x12, 0xcf, 0xa1, 0x81, 0x3e, 0x59, 0x7e, 0xb3, 0x7a, 0xce, 0x8a, 0x4d, 0x4e, 0xfa, - 0x35, 0xe3, 0xde, 0xa1, 0x52, 0x32, 0x6f, 0x20, 0xf0, 0x82, 0x3b, 0x33, 0x8b, 0x9e, 0xc1, 0x92, - 0xc3, 0x3d, 0x8f, 0x3a, 0x5a, 0x4f, 0x9f, 0x73, 0xd7, 0xc4, 0x64, 0xe3, 0x1c, 0xde, 0xed, 0x09, - 0xa2, 0xcd, 0xb9, 0x3b, 0x61, 0x2e, 0x38, 0xa7, 0xe6, 0xd1, 0xb7, 0xb0, 0xcc, 0x43, 0xe9, 0x32, - 0x1a, 0xd8, 0x7d, 0x2a, 0x23, 0x43, 0x29, 0xa5, 0xd9, 0x3f, 0x3b, 0x87, 0xbd, 0x15, 0x61, 0x76, - 0x62, 0x08, 0x2e, 0xf2, 0x37, 0x66, 0xd0, 0x7d, 0x48, 0x49, 0x57, 0x94, 0xd2, 0x9a, 0xeb, 0x93, - 0xf3, 0xd4, 0x6b, 0x76, 0x26, 0xdb, 0x53, 0x10, 0xf4, 0x1c, 0xfe, 0xa7, 0x43, 0xee, 0xd2, 0x31, - 0x55, 0xc9, 0x15, 0xd9, 0x4a, 0x19, 0xad, 0xde, 0x83, 0xf7, 0xcd, 0x03, 0xab, 0xad, 0x54, 0x3a, - 0x95, 0x19, 0xcb, 0x8a, 0xb6, 0xa9, 0x58, 0xe3, 0x05, 0xcb, 0x2f, 0x53, 0xb0, 0xfc, 0x96, 0x23, - 0x7a, 0x08, 0x69, 0xe5, 0x6a, 0xe4, 0xbb, 0x7d, 0xce, 0x92, 0x0a, 0xdb, 0xa1, 0x2e, 0x75, 0x24, - 0x0f, 0xb0, 0x06, 0xbd, 0x9d, 0x04, 0xc9, 0x0f, 0x94, 0x04, 0xa9, 0x0f, 0x9a, 0x04, 0xe9, 0xff, - 0x30, 0x09, 0x32, 0x97, 0x4e, 0x82, 0xca, 0x5f, 0x09, 0xc8, 0x46, 0xb7, 0x51, 0x95, 0x09, 0x8f, - 0x8c, 0x68, 0x5c, 0x26, 0xd4, 0x18, 0xd5, 0x21, 0xeb, 0x92, 0x1e, 0x75, 0x45, 0x29, 0xa9, 0xd3, - 0xe2, 0xee, 0x85, 0x97, 0xda, 0x6a, 0x6a, 0xff, 0xba, 0x27, 0x83, 0x13, 0x6c, 0xc0, 0x67, 0x54, - 0x9b, 0xd4, 0x95, 0xaa, 0x4d, 0xf9, 0x2b, 0xc8, 0xcf, 0xac, 0x83, 0x8a, 0x90, 0x3a, 0xa2, 0x27, - 0x66, 0xe7, 0x6a, 0x88, 0x56, 0x20, 0x33, 0x26, 0x6e, 0x48, 0x75, 0x56, 0xe4, 0x70, 0xf4, 0xf1, - 0x20, 0x79, 0x3f, 0x51, 0xf9, 0x39, 0x03, 0x2b, 0x67, 0x25, 0x02, 0xc2, 0x90, 0x15, 0x6c, 0xe4, - 0xbb, 0x51, 0x04, 0x0a, 0x9b, 0xf7, 0x2f, 0x99, 0x49, 0x56, 0x47, 0xa3, 0x9b, 0xb5, 0xc6, 0x1c, - 0x36, 0x4c, 0xe8, 0x48, 0xa7, 0x93, 0x60, 0x42, 0x52, 0x4f, 0xda, 0x43, 0x22, 0x86, 0x26, 0x4d, - 0x1f, 0x5f, 0x96, 0x7c, 0x7b, 0x42, 0xd3, 0x20, 0x62, 0xa8, 0x17, 0x29, 0x38, 0xa7, 0xe6, 0xca, - 0x7f, 0x27, 0xa1, 0xf8, 0xa6, 0x1b, 0xba, 0x03, 0xc5, 0xa1, 0x94, 0xbe, 0x3d, 0xa4, 0xa4, 0x4f, - 0x03, 0x7b, 0xaa, 0xb0, 0x22, 0x50, 0x96, 0x86, 0x36, 0xec, 0x2b, 0xb5, 0x3d, 0xc8, 0x6b, 0x5f, - 0x87, 0xf3, 0x23, 0x46, 0xcd, 0x4e, 0x9f, 0x5e, 0x75, 0xa7, 0x56, 0xa3, 0xdb, 0x6d, 0x6f, 0x6b, - 0xca, 0xc6, 0x1c, 0x06, 0xb5, 0x42, 0xf4, 0x85, 0x3e, 0x86, 0xc5, 0x50, 0x50, 0x5b, 0xf0, 0x30, - 0x70, 0xa8, 0xcd, 0x7c, 0x9d, 0x15, 0xf3, 0x8d, 0x39, 0x9c, 0x0f, 0x05, 0xed, 0xe8, 0xd9, 0x5d, - 0x1f, 0xdd, 0x81, 0xe5, 0x11, 0xf3, 0xd8, 0x28, 0x1c, 0xd9, 0x01, 0xf3, 0x06, 0xb6, 0x60, 0x2f, - 0xa8, 0xbe, 0x36, 0x69, 0xbc, 0x64, 0x0c, 0x98, 0x79, 0x83, 0x0e, 0x7b, 0x41, 0xcb, 0x03, 0x80, - 0xe9, 0x6a, 0x67, 0x66, 0x34, 0x82, 0xb4, 0x4f, 0xe4, 0xd0, 0xe4, 0x85, 0x1e, 0xa3, 0x0d, 0x48, - 0x49, 0x19, 0x5f, 0xf4, 0x1b, 0x56, 0xd4, 0xa3, 0xad, 0xb8, 0x47, 0x5b, 0x3b, 0xa6, 0x47, 0xd7, - 0xd2, 0x3f, 0xfe, 0x71, 0x2b, 0x81, 0x95, 0x6f, 0x0d, 0x60, 0x5e, 0xa9, 0x69, 0x1f, 0xd1, 0x93, - 0x4a, 0x03, 0xe6, 0x63, 0xe9, 0xd1, 0x12, 0xe4, 0x71, 0xeb, 0x60, 0x7f, 0xc7, 0xc6, 0xad, 0xda, - 0xee, 0x7e, 0x71, 0x0e, 0x15, 0x00, 0x9a, 0xf5, 0xad, 0x4e, 0xd7, 0xde, 0x6e, 0xed, 0xef, 0x17, - 0x13, 0x08, 0x20, 0x8b, 0xb7, 0xf6, 0x77, 0x5a, 0x7b, 0xc5, 0xa4, 0x72, 0x6e, 0x6f, 0x75, 0x3a, - 0xdd, 0x06, 0x6e, 0x1d, 0x3c, 0x69, 0x14, 0x53, 0xb5, 0x3c, 0xe4, 0xdc, 0x9e, 0xb9, 0x22, 0x95, - 0x97, 0x59, 0xb8, 0x7e, 0x76, 0x65, 0x41, 0x2d, 0x48, 0x49, 0xc7, 0x37, 0x75, 0xf3, 0xd1, 0xa5, - 0x2b, 0x93, 0xd5, 0xdd, 0x6e, 0xcf, 0x94, 0x01, 0xc7, 0x47, 0x18, 0xd2, 0x4a, 0x17, 0x23, 0xf9, - 0xd7, 0x97, 0x67, 0x54, 0x51, 0x9f, 0x50, 0x6a, 0xae, 0xf2, 0x3f, 0x49, 0xc8, 0xcf, 0x2c, 0x84, - 0x6e, 0xc3, 0xd2, 0x88, 0x1c, 0xdb, 0xd3, 0xa2, 0x28, 0xf4, 0x01, 0x32, 0xb8, 0x30, 0x22, 0xc7, - 0x53, 0x5a, 0x81, 0x6a, 0x93, 0x1a, 0x6c, 0x4b, 0x36, 0xa2, 0x3c, 0x94, 0x66, 0x5f, 0xef, 0x96, - 0x66, 0x52, 0x6b, 0xbb, 0x11, 0x00, 0x71, 0x58, 0x94, 0x8e, 0x6f, 0x1f, 0x51, 0xea, 0x13, 0x97, - 0x8d, 0xa9, 0x11, 0xf7, 0x9b, 0x2b, 0xc5, 0xca, 0xea, 0x3a, 0xfe, 0xd3, 0x98, 0x11, 0x2f, 0xc8, - 0x99, 0xaf, 0xf2, 0x0f, 0x09, 0x58, 0x98, 0x35, 0xa3, 0xeb, 0x90, 0xf5, 0x03, 0xde, 0xa3, 0xd1, - 0x29, 0x17, 0xb1, 0xf9, 0x42, 0x77, 0x21, 0xad, 0x4e, 0x75, 0xf1, 0x91, 0xb4, 0x1b, 0xfa, 0x12, - 0xe6, 0x99, 0x27, 0x69, 0x30, 0x26, 0x17, 0x27, 0x28, 0x9e, 0xb8, 0x96, 0x7f, 0x4b, 0xc0, 0xc2, - 0xac, 0x26, 0xe8, 0x21, 0x94, 0x95, 0x2a, 0x1b, 0xb6, 0xd2, 0xc0, 0xa7, 0x5e, 0x5f, 0x5d, 0xa5, - 0x80, 0x7e, 0x17, 0x52, 0x21, 0x63, 0x21, 0xfe, 0xaf, 0x3d, 0xf6, 0xc8, 0x71, 0x3b, 0xb2, 0x63, - 0x63, 0x46, 0x9f, 0x03, 0x52, 0xa6, 0x4d, 0x0d, 0x9e, 0x80, 0x92, 0x1a, 0xa4, 0xcb, 0xcb, 0xe6, - 0x1e, 0x39, 0x9e, 0x78, 0x3f, 0x82, 0x9b, 0xb3, 0x7e, 0xb6, 0x4f, 0x83, 0x19, 0xd5, 0xf5, 0x29, - 0x32, 0xb8, 0x34, 0x9a, 0x22, 0xda, 0x34, 0x98, 0x06, 0x1f, 0xdd, 0x82, 0x7c, 0x04, 0x97, 0x01, - 0xa3, 0xd1, 0xcb, 0x26, 0x83, 0x41, 0xbb, 0xeb, 0x99, 0xca, 0x4f, 0x49, 0x28, 0xbe, 0xd9, 0x14, - 0xd1, 0x5d, 0x40, 0xaa, 0x1c, 0x52, 0x27, 0x94, 0x6c, 0x4c, 0x6d, 0x1a, 0x04, 0x3c, 0x88, 0xcf, - 0xb5, 0x3c, 0x63, 0xa9, 0x6b, 0xc3, 0xa9, 0xb0, 0x26, 0xdf, 0x3b, 0xac, 0xe8, 0x09, 0xa0, 0x1e, - 0x11, 0xd4, 0xa6, 0xcf, 0xcd, 0x0b, 0x41, 0x4b, 0x79, 0xa1, 0x2e, 0x45, 0x05, 0xaa, 0x1b, 0x8c, - 0x4a, 0x51, 0xf4, 0x05, 0xac, 0xa8, 0x43, 0x4e, 0x78, 0x7c, 0x1a, 0x38, 0xd4, 0x93, 0xe6, 0xb4, - 0x68, 0x44, 0x8e, 0x63, 0xf7, 0x76, 0x64, 0x51, 0x1a, 0x8c, 0x98, 0xa7, 0xea, 0xb8, 0x2b, 0x87, - 0x13, 0xff, 0x4c, 0xa4, 0xc1, 0x88, 0x79, 0x0d, 0x6d, 0x30, 0xde, 0x95, 0x5f, 0xd5, 0xe5, 0x9b, - 0x36, 0x7b, 0x54, 0x83, 0xf4, 0x88, 0xf7, 0xe3, 0xd6, 0x66, 0xbd, 0xdf, 0x13, 0x41, 0x8d, 0x15, - 0x0a, 0x6b, 0xac, 0x0e, 0xb1, 0xcb, 0x54, 0x23, 0x73, 0x68, 0x20, 0xd9, 0x21, 0x73, 0x88, 0x8c, - 0x1b, 0xec, 0x72, 0x64, 0xd9, 0x9e, 0x1a, 0x94, 0x8e, 0x7e, 0xc0, 0xc6, 0x44, 0x52, 0x55, 0x25, - 0x75, 0x90, 0x72, 0x18, 0xcc, 0xd4, 0x53, 0x7a, 0xa2, 0x0a, 0x82, 0x43, 0x66, 0xb9, 0x22, 0xb1, - 0x73, 0xb8, 0xe0, 0x90, 0x19, 0x22, 0xa1, 0x3a, 0x80, 0x08, 0x7b, 0x2a, 0x1e, 0x36, 0x71, 0xa5, - 0xee, 0x61, 0xd1, 0x3b, 0x35, 0x87, 0x97, 0x8c, 0x61, 0xcb, 0x95, 0xaa, 0x85, 0x09, 0xf5, 0x14, - 0x10, 0x1e, 0x2b, 0x65, 0xa3, 0xa7, 0x80, 0xf0, 0x58, 0xe5, 0x31, 0x5c, 0x33, 0xe7, 0x40, 0x79, - 0xb8, 0xb6, 0xb3, 0xdb, 0xd9, 0xaa, 0x35, 0xeb, 0xc5, 0x39, 0x55, 0x89, 0x3b, 0xbb, 0x7b, 0xed, - 0x66, 0x3d, 0xaa, 0xca, 0x7b, 0x07, 0xdd, 0x83, 0xad, 0x66, 0x31, 0x89, 0x8a, 0xb0, 0xb0, 0xdb, - 0xe9, 0xee, 0xb6, 0x6c, 0x33, 0x93, 0xaa, 0x59, 0xbf, 0xbc, 0x5e, 0x4d, 0xbc, 0x7a, 0xbd, 0x9a, - 0xf8, 0xf3, 0xf5, 0x6a, 0xe2, 0xd9, 0x5a, 0x14, 0x3b, 0xc6, 0xab, 0xc4, 0x67, 0xd5, 0x33, 0x7e, - 0xd8, 0x7a, 0x59, 0x9d, 0x01, 0xf7, 0xfe, 0x0d, 0x00, 0x00, 0xff, 0xff, 0xfd, 0x7d, 0x30, 0x94, - 0x35, 0x0e, 0x00, 0x00, -} diff --git a/networking/v1alpha3/envoy_filter.pb.go b/networking/v1alpha3/envoy_filter.pb.go index f71ab80395d..3d3c9450534 100644 --- a/networking/v1alpha3/envoy_filter.pb.go +++ b/networking/v1alpha3/envoy_filter.pb.go @@ -3,18 +3,25 @@ package v1alpha3 -import proto "github.com/gogo/protobuf/proto" -import fmt "fmt" -import math "math" -import google_protobuf3 "github.com/gogo/protobuf/types" - -import io "io" +import ( + fmt "fmt" + proto "github.com/gogo/protobuf/proto" + types "github.com/gogo/protobuf/types" + io "io" + math "math" +) // Reference imports to suppress errors if they are not otherwise used. var _ = proto.Marshal var _ = fmt.Errorf var _ = math.Inf +// This is a compile-time assertion to ensure that this generated file +// is compatible with the proto package it is being compiled against. +// A compilation error at this line likely means your copy of the +// proto package needs to be updated. +const _ = proto.GoGoProtoPackageIsVersion2 // please upgrade the proto package + type EnvoyFilter_ListenerMatch_ListenerType int32 const ( @@ -34,6 +41,7 @@ var EnvoyFilter_ListenerMatch_ListenerType_name = map[int32]string{ 2: "SIDECAR_OUTBOUND", 3: "GATEWAY", } + var EnvoyFilter_ListenerMatch_ListenerType_value = map[string]int32{ "ANY": 0, "SIDECAR_INBOUND": 1, @@ -44,8 +52,9 @@ var EnvoyFilter_ListenerMatch_ListenerType_value = map[string]int32{ func (x EnvoyFilter_ListenerMatch_ListenerType) String() string { return proto.EnumName(EnvoyFilter_ListenerMatch_ListenerType_name, int32(x)) } + func (EnvoyFilter_ListenerMatch_ListenerType) EnumDescriptor() ([]byte, []int) { - return fileDescriptorEnvoyFilter, []int{0, 1, 0} + return fileDescriptor_16d9b2922bd3e4a9, []int{0, 1, 0} } type EnvoyFilter_ListenerMatch_ListenerProtocol int32 @@ -64,6 +73,7 @@ var EnvoyFilter_ListenerMatch_ListenerProtocol_name = map[int32]string{ 1: "HTTP", 2: "TCP", } + var EnvoyFilter_ListenerMatch_ListenerProtocol_value = map[string]int32{ "ALL": 0, "HTTP": 1, @@ -73,8 +83,9 @@ var EnvoyFilter_ListenerMatch_ListenerProtocol_value = map[string]int32{ func (x EnvoyFilter_ListenerMatch_ListenerProtocol) String() string { return proto.EnumName(EnvoyFilter_ListenerMatch_ListenerProtocol_name, int32(x)) } + func (EnvoyFilter_ListenerMatch_ListenerProtocol) EnumDescriptor() ([]byte, []int) { - return fileDescriptorEnvoyFilter, []int{0, 1, 1} + return fileDescriptor_16d9b2922bd3e4a9, []int{0, 1, 1} } // Index/position in the filter chain. @@ -97,6 +108,7 @@ var EnvoyFilter_InsertPosition_Index_name = map[int32]string{ 2: "BEFORE", 3: "AFTER", } + var EnvoyFilter_InsertPosition_Index_value = map[string]int32{ "FIRST": 0, "LAST": 1, @@ -107,8 +119,9 @@ var EnvoyFilter_InsertPosition_Index_value = map[string]int32{ func (x EnvoyFilter_InsertPosition_Index) String() string { return proto.EnumName(EnvoyFilter_InsertPosition_Index_name, int32(x)) } + func (EnvoyFilter_InsertPosition_Index) EnumDescriptor() ([]byte, []int) { - return fileDescriptorEnvoyFilter, []int{0, 2, 0} + return fileDescriptor_16d9b2922bd3e4a9, []int{0, 2, 0} } type EnvoyFilter_Filter_FilterType int32 @@ -127,6 +140,7 @@ var EnvoyFilter_Filter_FilterType_name = map[int32]string{ 1: "HTTP", 2: "NETWORK", } + var EnvoyFilter_Filter_FilterType_value = map[string]int32{ "INVALID": 0, "HTTP": 1, @@ -136,8 +150,9 @@ var EnvoyFilter_Filter_FilterType_value = map[string]int32{ func (x EnvoyFilter_Filter_FilterType) String() string { return proto.EnumName(EnvoyFilter_Filter_FilterType_name, int32(x)) } + func (EnvoyFilter_Filter_FilterType) EnumDescriptor() ([]byte, []int) { - return fileDescriptorEnvoyFilter, []int{0, 3, 0} + return fileDescriptor_16d9b2922bd3e4a9, []int{0, 3, 0} } // `EnvoyFilter` describes Envoy proxy-specific filters that can be used to @@ -187,18 +202,49 @@ type EnvoyFilter struct { // NOTE: There can be only one EnvoyFilter bound to a specific workload. // The behavior is undefined if multiple EnvoyFilter configurations are // specified for the same workload. - WorkloadLabels map[string]string `protobuf:"bytes,1,rep,name=workload_labels,json=workloadLabels" json:"workload_labels,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` + WorkloadLabels map[string]string `protobuf:"bytes,1,rep,name=workload_labels,json=workloadLabels,proto3" json:"workload_labels,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` // REQUIRED: Envoy network filters/http filters to be added to matching // listeners. When adding network filters to http connections, care // should be taken to ensure that the filter is added before // envoy.http_connection_manager. - Filters []*EnvoyFilter_Filter `protobuf:"bytes,2,rep,name=filters" json:"filters,omitempty"` + Filters []*EnvoyFilter_Filter `protobuf:"bytes,2,rep,name=filters,proto3" json:"filters,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` } -func (m *EnvoyFilter) Reset() { *m = EnvoyFilter{} } -func (m *EnvoyFilter) String() string { return proto.CompactTextString(m) } -func (*EnvoyFilter) ProtoMessage() {} -func (*EnvoyFilter) Descriptor() ([]byte, []int) { return fileDescriptorEnvoyFilter, []int{0} } +func (m *EnvoyFilter) Reset() { *m = EnvoyFilter{} } +func (m *EnvoyFilter) String() string { return proto.CompactTextString(m) } +func (*EnvoyFilter) ProtoMessage() {} +func (*EnvoyFilter) Descriptor() ([]byte, []int) { + return fileDescriptor_16d9b2922bd3e4a9, []int{0} +} +func (m *EnvoyFilter) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *EnvoyFilter) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_EnvoyFilter.Marshal(b, m, deterministic) + } else { + b = b[:cap(b)] + n, err := m.MarshalTo(b) + if err != nil { + return nil, err + } + return b[:n], nil + } +} +func (m *EnvoyFilter) XXX_Merge(src proto.Message) { + xxx_messageInfo_EnvoyFilter.Merge(m, src) +} +func (m *EnvoyFilter) XXX_Size() int { + return m.Size() +} +func (m *EnvoyFilter) XXX_DiscardUnknown() { + xxx_messageInfo_EnvoyFilter.DiscardUnknown(m) +} + +var xxx_messageInfo_EnvoyFilter proto.InternalMessageInfo func (m *EnvoyFilter) GetWorkloadLabels() map[string]string { if m != nil { @@ -239,16 +285,45 @@ type EnvoyFilter_ListenerMatch struct { ListenerProtocol EnvoyFilter_ListenerMatch_ListenerProtocol `protobuf:"varint,4,opt,name=listener_protocol,json=listenerProtocol,proto3,enum=istio.networking.v1alpha3.EnvoyFilter_ListenerMatch_ListenerProtocol" json:"listener_protocol,omitempty"` // One or more IP addresses to which the listener is bound. If // specified, should match at least one address in the list. - Address []string `protobuf:"bytes,5,rep,name=address" json:"address,omitempty"` + Address []string `protobuf:"bytes,5,rep,name=address,proto3" json:"address,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` } func (m *EnvoyFilter_ListenerMatch) Reset() { *m = EnvoyFilter_ListenerMatch{} } func (m *EnvoyFilter_ListenerMatch) String() string { return proto.CompactTextString(m) } func (*EnvoyFilter_ListenerMatch) ProtoMessage() {} func (*EnvoyFilter_ListenerMatch) Descriptor() ([]byte, []int) { - return fileDescriptorEnvoyFilter, []int{0, 1} + return fileDescriptor_16d9b2922bd3e4a9, []int{0, 1} +} +func (m *EnvoyFilter_ListenerMatch) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *EnvoyFilter_ListenerMatch) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_EnvoyFilter_ListenerMatch.Marshal(b, m, deterministic) + } else { + b = b[:cap(b)] + n, err := m.MarshalTo(b) + if err != nil { + return nil, err + } + return b[:n], nil + } +} +func (m *EnvoyFilter_ListenerMatch) XXX_Merge(src proto.Message) { + xxx_messageInfo_EnvoyFilter_ListenerMatch.Merge(m, src) +} +func (m *EnvoyFilter_ListenerMatch) XXX_Size() int { + return m.Size() +} +func (m *EnvoyFilter_ListenerMatch) XXX_DiscardUnknown() { + xxx_messageInfo_EnvoyFilter_ListenerMatch.DiscardUnknown(m) } +var xxx_messageInfo_EnvoyFilter_ListenerMatch proto.InternalMessageInfo + func (m *EnvoyFilter_ListenerMatch) GetPortNumber() uint32 { if m != nil { return m.PortNumber @@ -290,15 +365,44 @@ type EnvoyFilter_InsertPosition struct { Index EnvoyFilter_InsertPosition_Index `protobuf:"varint,1,opt,name=index,proto3,enum=istio.networking.v1alpha3.EnvoyFilter_InsertPosition_Index" json:"index,omitempty"` // If BEFORE or AFTER position is specified, specify the name of the // filter relative to which this filter should be inserted. - RelativeTo string `protobuf:"bytes,2,opt,name=relative_to,json=relativeTo,proto3" json:"relative_to,omitempty"` + RelativeTo string `protobuf:"bytes,2,opt,name=relative_to,json=relativeTo,proto3" json:"relative_to,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` } func (m *EnvoyFilter_InsertPosition) Reset() { *m = EnvoyFilter_InsertPosition{} } func (m *EnvoyFilter_InsertPosition) String() string { return proto.CompactTextString(m) } func (*EnvoyFilter_InsertPosition) ProtoMessage() {} func (*EnvoyFilter_InsertPosition) Descriptor() ([]byte, []int) { - return fileDescriptorEnvoyFilter, []int{0, 2} + return fileDescriptor_16d9b2922bd3e4a9, []int{0, 2} +} +func (m *EnvoyFilter_InsertPosition) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) } +func (m *EnvoyFilter_InsertPosition) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_EnvoyFilter_InsertPosition.Marshal(b, m, deterministic) + } else { + b = b[:cap(b)] + n, err := m.MarshalTo(b) + if err != nil { + return nil, err + } + return b[:n], nil + } +} +func (m *EnvoyFilter_InsertPosition) XXX_Merge(src proto.Message) { + xxx_messageInfo_EnvoyFilter_InsertPosition.Merge(m, src) +} +func (m *EnvoyFilter_InsertPosition) XXX_Size() int { + return m.Size() +} +func (m *EnvoyFilter_InsertPosition) XXX_DiscardUnknown() { + xxx_messageInfo_EnvoyFilter_InsertPosition.DiscardUnknown(m) +} + +var xxx_messageInfo_EnvoyFilter_InsertPosition proto.InternalMessageInfo func (m *EnvoyFilter_InsertPosition) GetIndex() EnvoyFilter_InsertPosition_Index { if m != nil { @@ -318,9 +422,9 @@ func (m *EnvoyFilter_InsertPosition) GetRelativeTo() string { type EnvoyFilter_Filter struct { // Filter will be added to the listener only if the match conditions are true. // If not specified, the filters will be applied to all listeners. - ListenerMatch *EnvoyFilter_ListenerMatch `protobuf:"bytes,1,opt,name=listener_match,json=listenerMatch" json:"listener_match,omitempty"` + ListenerMatch *EnvoyFilter_ListenerMatch `protobuf:"bytes,1,opt,name=listener_match,json=listenerMatch,proto3" json:"listener_match,omitempty"` // Insert position in the filter chain. Defaults to FIRST - InsertPosition *EnvoyFilter_InsertPosition `protobuf:"bytes,2,opt,name=insert_position,json=insertPosition" json:"insert_position,omitempty"` + InsertPosition *EnvoyFilter_InsertPosition `protobuf:"bytes,2,opt,name=insert_position,json=insertPosition,proto3" json:"insert_position,omitempty"` // REQUIRED: The type of filter to instantiate. FilterType EnvoyFilter_Filter_FilterType `protobuf:"varint,3,opt,name=filter_type,json=filterType,proto3,enum=istio.networking.v1alpha3.EnvoyFilter_Filter_FilterType" json:"filter_type,omitempty"` // REQUIRED: The name of the filter to instantiate. The name must match a supported @@ -328,13 +432,44 @@ type EnvoyFilter_Filter struct { FilterName string `protobuf:"bytes,4,opt,name=filter_name,json=filterName,proto3" json:"filter_name,omitempty"` // REQUIRED: Filter specific configuration which depends on the filter being // instantiated. - FilterConfig *google_protobuf3.Struct `protobuf:"bytes,5,opt,name=filter_config,json=filterConfig" json:"filter_config,omitempty"` + FilterConfig *types.Struct `protobuf:"bytes,5,opt,name=filter_config,json=filterConfig,proto3" json:"filter_config,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` +} + +func (m *EnvoyFilter_Filter) Reset() { *m = EnvoyFilter_Filter{} } +func (m *EnvoyFilter_Filter) String() string { return proto.CompactTextString(m) } +func (*EnvoyFilter_Filter) ProtoMessage() {} +func (*EnvoyFilter_Filter) Descriptor() ([]byte, []int) { + return fileDescriptor_16d9b2922bd3e4a9, []int{0, 3} +} +func (m *EnvoyFilter_Filter) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *EnvoyFilter_Filter) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_EnvoyFilter_Filter.Marshal(b, m, deterministic) + } else { + b = b[:cap(b)] + n, err := m.MarshalTo(b) + if err != nil { + return nil, err + } + return b[:n], nil + } +} +func (m *EnvoyFilter_Filter) XXX_Merge(src proto.Message) { + xxx_messageInfo_EnvoyFilter_Filter.Merge(m, src) +} +func (m *EnvoyFilter_Filter) XXX_Size() int { + return m.Size() +} +func (m *EnvoyFilter_Filter) XXX_DiscardUnknown() { + xxx_messageInfo_EnvoyFilter_Filter.DiscardUnknown(m) } -func (m *EnvoyFilter_Filter) Reset() { *m = EnvoyFilter_Filter{} } -func (m *EnvoyFilter_Filter) String() string { return proto.CompactTextString(m) } -func (*EnvoyFilter_Filter) ProtoMessage() {} -func (*EnvoyFilter_Filter) Descriptor() ([]byte, []int) { return fileDescriptorEnvoyFilter, []int{0, 3} } +var xxx_messageInfo_EnvoyFilter_Filter proto.InternalMessageInfo func (m *EnvoyFilter_Filter) GetListenerMatch() *EnvoyFilter_ListenerMatch { if m != nil { @@ -364,7 +499,7 @@ func (m *EnvoyFilter_Filter) GetFilterName() string { return "" } -func (m *EnvoyFilter_Filter) GetFilterConfig() *google_protobuf3.Struct { +func (m *EnvoyFilter_Filter) GetFilterConfig() *types.Struct { if m != nil { return m.FilterConfig } @@ -372,15 +507,70 @@ func (m *EnvoyFilter_Filter) GetFilterConfig() *google_protobuf3.Struct { } func init() { - proto.RegisterType((*EnvoyFilter)(nil), "istio.networking.v1alpha3.EnvoyFilter") - proto.RegisterType((*EnvoyFilter_ListenerMatch)(nil), "istio.networking.v1alpha3.EnvoyFilter.ListenerMatch") - proto.RegisterType((*EnvoyFilter_InsertPosition)(nil), "istio.networking.v1alpha3.EnvoyFilter.InsertPosition") - proto.RegisterType((*EnvoyFilter_Filter)(nil), "istio.networking.v1alpha3.EnvoyFilter.Filter") proto.RegisterEnum("istio.networking.v1alpha3.EnvoyFilter_ListenerMatch_ListenerType", EnvoyFilter_ListenerMatch_ListenerType_name, EnvoyFilter_ListenerMatch_ListenerType_value) proto.RegisterEnum("istio.networking.v1alpha3.EnvoyFilter_ListenerMatch_ListenerProtocol", EnvoyFilter_ListenerMatch_ListenerProtocol_name, EnvoyFilter_ListenerMatch_ListenerProtocol_value) proto.RegisterEnum("istio.networking.v1alpha3.EnvoyFilter_InsertPosition_Index", EnvoyFilter_InsertPosition_Index_name, EnvoyFilter_InsertPosition_Index_value) proto.RegisterEnum("istio.networking.v1alpha3.EnvoyFilter_Filter_FilterType", EnvoyFilter_Filter_FilterType_name, EnvoyFilter_Filter_FilterType_value) + proto.RegisterType((*EnvoyFilter)(nil), "istio.networking.v1alpha3.EnvoyFilter") + proto.RegisterMapType((map[string]string)(nil), "istio.networking.v1alpha3.EnvoyFilter.WorkloadLabelsEntry") + proto.RegisterType((*EnvoyFilter_ListenerMatch)(nil), "istio.networking.v1alpha3.EnvoyFilter.ListenerMatch") + proto.RegisterType((*EnvoyFilter_InsertPosition)(nil), "istio.networking.v1alpha3.EnvoyFilter.InsertPosition") + proto.RegisterType((*EnvoyFilter_Filter)(nil), "istio.networking.v1alpha3.EnvoyFilter.Filter") +} + +func init() { + proto.RegisterFile("networking/v1alpha3/envoy_filter.proto", fileDescriptor_16d9b2922bd3e4a9) } + +var fileDescriptor_16d9b2922bd3e4a9 = []byte{ + // 706 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x54, 0x41, 0x6f, 0xda, 0x4c, + 0x10, 0x8d, 0x71, 0x08, 0x1f, 0xe3, 0x40, 0xfc, 0x6d, 0x22, 0xd5, 0x45, 0x55, 0x8a, 0x38, 0x54, + 0x5c, 0x6a, 0x5a, 0xd2, 0x4a, 0x51, 0xda, 0x8b, 0x93, 0x98, 0x14, 0x95, 0x02, 0x5d, 0x9c, 0x46, + 0x69, 0xa5, 0x5a, 0x06, 0x16, 0xb2, 0x8a, 0xf1, 0x5a, 0xf6, 0x42, 0xc2, 0xcf, 0xea, 0xb1, 0xd7, + 0x9e, 0x7a, 0x6c, 0xff, 0x41, 0x95, 0x5f, 0x52, 0x79, 0x6d, 0x08, 0x44, 0xa9, 0x94, 0xa6, 0x27, + 0x7b, 0x9f, 0xde, 0xbc, 0x99, 0xd9, 0x79, 0xb3, 0xf0, 0xc4, 0x23, 0xfc, 0x82, 0x05, 0xe7, 0xd4, + 0x1b, 0x56, 0x26, 0xcf, 0x1d, 0xd7, 0x3f, 0x73, 0x76, 0x2a, 0xc4, 0x9b, 0xb0, 0xa9, 0x3d, 0xa0, + 0x2e, 0x27, 0x81, 0xee, 0x07, 0x8c, 0x33, 0xf4, 0x90, 0x86, 0x9c, 0x32, 0xfd, 0x9a, 0xad, 0xcf, + 0xd8, 0x85, 0x47, 0x43, 0xc6, 0x86, 0x2e, 0xa9, 0x08, 0x62, 0x77, 0x3c, 0xa8, 0x84, 0x3c, 0x18, + 0xf7, 0x78, 0x1c, 0x58, 0xfa, 0x06, 0xa0, 0x98, 0x91, 0x5e, 0x4d, 0xc8, 0xa1, 0x1e, 0x6c, 0x44, + 0x0a, 0x2e, 0x73, 0xfa, 0xb6, 0xeb, 0x74, 0x89, 0x1b, 0x6a, 0x52, 0x51, 0x2e, 0x2b, 0xd5, 0x3d, + 0xfd, 0x8f, 0x29, 0xf4, 0x05, 0x01, 0xfd, 0x24, 0x89, 0x6e, 0x88, 0x60, 0xd3, 0xe3, 0xc1, 0x14, + 0xe7, 0x2f, 0x96, 0x40, 0x74, 0x04, 0x99, 0xb8, 0xfa, 0x50, 0x4b, 0x09, 0xf1, 0xa7, 0x77, 0x14, + 0x8f, 0x3f, 0x78, 0x16, 0x5d, 0x30, 0x60, 0xf3, 0x96, 0x7c, 0x48, 0x05, 0xf9, 0x9c, 0x4c, 0x35, + 0xa9, 0x28, 0x95, 0xb3, 0x38, 0xfa, 0x45, 0x5b, 0x90, 0x9e, 0x38, 0xee, 0x98, 0x68, 0x29, 0x81, + 0xc5, 0x87, 0xbd, 0xd4, 0xae, 0x54, 0xf8, 0x29, 0x43, 0xae, 0x41, 0x43, 0x4e, 0x3c, 0x12, 0xbc, + 0x73, 0x78, 0xef, 0x0c, 0x3d, 0x06, 0xc5, 0x67, 0x01, 0xb7, 0xbd, 0xf1, 0xa8, 0x4b, 0x02, 0xa1, + 0x92, 0xc3, 0x10, 0x41, 0x4d, 0x81, 0xa0, 0x32, 0xa8, 0x31, 0xc1, 0x19, 0x11, 0xdb, 0x0f, 0xc8, + 0x80, 0x5e, 0x26, 0xba, 0x79, 0xc1, 0x72, 0x46, 0xa4, 0x2d, 0x50, 0x34, 0x80, 0x9c, 0x9b, 0x68, + 0xdb, 0x7c, 0xea, 0x13, 0x4d, 0x2e, 0x4a, 0xe5, 0x7c, 0xd5, 0xb8, 0x63, 0xbb, 0x4b, 0x75, 0xcd, + 0x4f, 0xd6, 0xd4, 0x27, 0x78, 0xdd, 0x5d, 0x38, 0xa1, 0x00, 0xfe, 0x9f, 0xe7, 0x11, 0x73, 0xed, + 0x31, 0x57, 0x5b, 0x15, 0xb9, 0xcc, 0x7f, 0xca, 0xd5, 0x4e, 0xc4, 0xb0, 0xea, 0xde, 0x40, 0x90, + 0x06, 0x19, 0xa7, 0xdf, 0x0f, 0x48, 0x18, 0x6a, 0xe9, 0xa2, 0x5c, 0xce, 0xe2, 0xd9, 0xb1, 0xd4, + 0x82, 0xf5, 0xc5, 0x5a, 0x51, 0x06, 0x64, 0xa3, 0x79, 0xaa, 0xae, 0xa0, 0x4d, 0xd8, 0xe8, 0xd4, + 0x0f, 0xcd, 0x03, 0x03, 0xdb, 0xf5, 0xe6, 0x7e, 0xeb, 0xb8, 0x79, 0xa8, 0x4a, 0x68, 0x0b, 0xd4, + 0x19, 0xd8, 0x3a, 0xb6, 0x62, 0x34, 0x85, 0x14, 0xc8, 0x1c, 0x19, 0x96, 0x79, 0x62, 0x9c, 0xaa, + 0x72, 0x49, 0x07, 0xf5, 0x66, 0x41, 0x42, 0xb4, 0xd1, 0x50, 0x57, 0xd0, 0x7f, 0xb0, 0xfa, 0xc6, + 0xb2, 0xda, 0xaa, 0x14, 0x41, 0xd6, 0x41, 0x5b, 0x4d, 0x15, 0xbe, 0x4a, 0x90, 0xaf, 0x7b, 0x21, + 0x09, 0x78, 0x9b, 0x85, 0x94, 0x53, 0xe6, 0xa1, 0xf7, 0x90, 0xa6, 0x5e, 0x9f, 0x5c, 0x8a, 0x71, + 0xe6, 0xab, 0xaf, 0xee, 0x78, 0x2b, 0xcb, 0x2a, 0x7a, 0x3d, 0x92, 0xc0, 0xb1, 0x52, 0xe4, 0x93, + 0x80, 0xb8, 0x0e, 0xa7, 0x13, 0x62, 0x73, 0x96, 0x38, 0x00, 0x66, 0x90, 0xc5, 0x4a, 0x3b, 0x90, + 0x16, 0x01, 0x28, 0x0b, 0xe9, 0x5a, 0x1d, 0x77, 0xac, 0xb8, 0xda, 0x86, 0xd1, 0xb1, 0x54, 0x09, + 0x01, 0xac, 0xed, 0x9b, 0xb5, 0x16, 0x36, 0xd5, 0x54, 0x44, 0x30, 0x6a, 0x96, 0x89, 0x55, 0xb9, + 0xf0, 0x45, 0x86, 0xb5, 0x64, 0x17, 0x3f, 0x41, 0x7e, 0x3e, 0xd5, 0x51, 0x34, 0x16, 0x51, 0xbc, + 0x52, 0x7d, 0x71, 0x9f, 0x91, 0xe2, 0xb9, 0x13, 0x63, 0x97, 0x7f, 0x86, 0x0d, 0x2a, 0x9a, 0xb3, + 0xfd, 0xa4, 0x3b, 0xd1, 0x81, 0x52, 0x7d, 0x79, 0xaf, 0xab, 0xc1, 0x79, 0xba, 0x7c, 0xe1, 0xa7, + 0xa0, 0xc4, 0x5b, 0xba, 0x68, 0xfc, 0xdd, 0xbf, 0xda, 0xf3, 0xe4, 0x23, 0xfc, 0x0e, 0x83, 0xf9, + 0x7f, 0x74, 0xf1, 0x89, 0x74, 0xb4, 0x81, 0xc2, 0xe7, 0xd9, 0x19, 0x21, 0x5a, 0x3e, 0xf4, 0x1a, + 0x72, 0x09, 0xa1, 0xc7, 0xbc, 0x01, 0x1d, 0x6a, 0x69, 0xd1, 0xd9, 0x03, 0x3d, 0x7e, 0x0a, 0xf5, + 0xd9, 0x53, 0xa8, 0x77, 0xc4, 0x53, 0x88, 0xd7, 0x63, 0xf6, 0x81, 0x20, 0x97, 0x9e, 0x01, 0x5c, + 0x27, 0x8e, 0x8c, 0x58, 0x6f, 0x7e, 0x30, 0x1a, 0xf5, 0xc3, 0x25, 0xaf, 0x29, 0x90, 0x69, 0x9a, + 0xd6, 0x49, 0x0b, 0xbf, 0x55, 0x53, 0xfb, 0xfa, 0xf7, 0xab, 0x6d, 0xe9, 0xc7, 0xd5, 0xb6, 0xf4, + 0xeb, 0x6a, 0x5b, 0xfa, 0x58, 0x8c, 0x7b, 0xa4, 0xac, 0xe2, 0xf8, 0xb4, 0x72, 0xcb, 0x03, 0xde, + 0x5d, 0x13, 0x05, 0xec, 0xfc, 0x0e, 0x00, 0x00, 0xff, 0xff, 0x26, 0x48, 0xc9, 0xfc, 0xde, 0x05, + 0x00, 0x00, +} + func (m *EnvoyFilter) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) @@ -425,6 +615,9 @@ func (m *EnvoyFilter) MarshalTo(dAtA []byte) (int, error) { i += n } } + if m.XXX_unrecognized != nil { + i += copy(dAtA[i:], m.XXX_unrecognized) + } return i, nil } @@ -479,6 +672,9 @@ func (m *EnvoyFilter_ListenerMatch) MarshalTo(dAtA []byte) (int, error) { i += copy(dAtA[i:], s) } } + if m.XXX_unrecognized != nil { + i += copy(dAtA[i:], m.XXX_unrecognized) + } return i, nil } @@ -508,6 +704,9 @@ func (m *EnvoyFilter_InsertPosition) MarshalTo(dAtA []byte) (int, error) { i = encodeVarintEnvoyFilter(dAtA, i, uint64(len(m.RelativeTo))) i += copy(dAtA[i:], m.RelativeTo) } + if m.XXX_unrecognized != nil { + i += copy(dAtA[i:], m.XXX_unrecognized) + } return i, nil } @@ -567,6 +766,9 @@ func (m *EnvoyFilter_Filter) MarshalTo(dAtA []byte) (int, error) { } i += n3 } + if m.XXX_unrecognized != nil { + i += copy(dAtA[i:], m.XXX_unrecognized) + } return i, nil } @@ -580,6 +782,9 @@ func encodeVarintEnvoyFilter(dAtA []byte, offset int, v uint64) int { return offset + 1 } func (m *EnvoyFilter) Size() (n int) { + if m == nil { + return 0 + } var l int _ = l if len(m.WorkloadLabels) > 0 { @@ -596,10 +801,16 @@ func (m *EnvoyFilter) Size() (n int) { n += 1 + l + sovEnvoyFilter(uint64(l)) } } + if m.XXX_unrecognized != nil { + n += len(m.XXX_unrecognized) + } return n } func (m *EnvoyFilter_ListenerMatch) Size() (n int) { + if m == nil { + return 0 + } var l int _ = l if m.PortNumber != 0 { @@ -621,10 +832,16 @@ func (m *EnvoyFilter_ListenerMatch) Size() (n int) { n += 1 + l + sovEnvoyFilter(uint64(l)) } } + if m.XXX_unrecognized != nil { + n += len(m.XXX_unrecognized) + } return n } func (m *EnvoyFilter_InsertPosition) Size() (n int) { + if m == nil { + return 0 + } var l int _ = l if m.Index != 0 { @@ -634,10 +851,16 @@ func (m *EnvoyFilter_InsertPosition) Size() (n int) { if l > 0 { n += 1 + l + sovEnvoyFilter(uint64(l)) } + if m.XXX_unrecognized != nil { + n += len(m.XXX_unrecognized) + } return n } func (m *EnvoyFilter_Filter) Size() (n int) { + if m == nil { + return 0 + } var l int _ = l if m.ListenerMatch != nil { @@ -659,6 +882,9 @@ func (m *EnvoyFilter_Filter) Size() (n int) { l = m.FilterConfig.Size() n += 1 + l + sovEnvoyFilter(uint64(l)) } + if m.XXX_unrecognized != nil { + n += len(m.XXX_unrecognized) + } return n } @@ -690,7 +916,7 @@ func (m *EnvoyFilter) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - wire |= (uint64(b) & 0x7F) << shift + wire |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -718,7 +944,7 @@ func (m *EnvoyFilter) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - msglen |= (int(b) & 0x7F) << shift + msglen |= int(b&0x7F) << shift if b < 0x80 { break } @@ -727,6 +953,9 @@ func (m *EnvoyFilter) Unmarshal(dAtA []byte) error { return ErrInvalidLengthEnvoyFilter } postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthEnvoyFilter + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -747,7 +976,7 @@ func (m *EnvoyFilter) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - wire |= (uint64(b) & 0x7F) << shift + wire |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -764,7 +993,7 @@ func (m *EnvoyFilter) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLenmapkey |= (uint64(b) & 0x7F) << shift + stringLenmapkey |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -774,6 +1003,9 @@ func (m *EnvoyFilter) Unmarshal(dAtA []byte) error { return ErrInvalidLengthEnvoyFilter } postStringIndexmapkey := iNdEx + intStringLenmapkey + if postStringIndexmapkey < 0 { + return ErrInvalidLengthEnvoyFilter + } if postStringIndexmapkey > l { return io.ErrUnexpectedEOF } @@ -790,7 +1022,7 @@ func (m *EnvoyFilter) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLenmapvalue |= (uint64(b) & 0x7F) << shift + stringLenmapvalue |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -800,6 +1032,9 @@ func (m *EnvoyFilter) Unmarshal(dAtA []byte) error { return ErrInvalidLengthEnvoyFilter } postStringIndexmapvalue := iNdEx + intStringLenmapvalue + if postStringIndexmapvalue < 0 { + return ErrInvalidLengthEnvoyFilter + } if postStringIndexmapvalue > l { return io.ErrUnexpectedEOF } @@ -836,7 +1071,7 @@ func (m *EnvoyFilter) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - msglen |= (int(b) & 0x7F) << shift + msglen |= int(b&0x7F) << shift if b < 0x80 { break } @@ -845,6 +1080,9 @@ func (m *EnvoyFilter) Unmarshal(dAtA []byte) error { return ErrInvalidLengthEnvoyFilter } postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthEnvoyFilter + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -862,9 +1100,13 @@ func (m *EnvoyFilter) Unmarshal(dAtA []byte) error { if skippy < 0 { return ErrInvalidLengthEnvoyFilter } + if (iNdEx + skippy) < 0 { + return ErrInvalidLengthEnvoyFilter + } if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF } + m.XXX_unrecognized = append(m.XXX_unrecognized, dAtA[iNdEx:iNdEx+skippy]...) iNdEx += skippy } } @@ -889,7 +1131,7 @@ func (m *EnvoyFilter_ListenerMatch) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - wire |= (uint64(b) & 0x7F) << shift + wire |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -917,7 +1159,7 @@ func (m *EnvoyFilter_ListenerMatch) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - m.PortNumber |= (uint32(b) & 0x7F) << shift + m.PortNumber |= uint32(b&0x7F) << shift if b < 0x80 { break } @@ -936,7 +1178,7 @@ func (m *EnvoyFilter_ListenerMatch) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLen |= (uint64(b) & 0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -946,6 +1188,9 @@ func (m *EnvoyFilter_ListenerMatch) Unmarshal(dAtA []byte) error { return ErrInvalidLengthEnvoyFilter } postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthEnvoyFilter + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -965,7 +1210,7 @@ func (m *EnvoyFilter_ListenerMatch) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - m.ListenerType |= (EnvoyFilter_ListenerMatch_ListenerType(b) & 0x7F) << shift + m.ListenerType |= EnvoyFilter_ListenerMatch_ListenerType(b&0x7F) << shift if b < 0x80 { break } @@ -984,7 +1229,7 @@ func (m *EnvoyFilter_ListenerMatch) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - m.ListenerProtocol |= (EnvoyFilter_ListenerMatch_ListenerProtocol(b) & 0x7F) << shift + m.ListenerProtocol |= EnvoyFilter_ListenerMatch_ListenerProtocol(b&0x7F) << shift if b < 0x80 { break } @@ -1003,7 +1248,7 @@ func (m *EnvoyFilter_ListenerMatch) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLen |= (uint64(b) & 0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -1013,6 +1258,9 @@ func (m *EnvoyFilter_ListenerMatch) Unmarshal(dAtA []byte) error { return ErrInvalidLengthEnvoyFilter } postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthEnvoyFilter + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -1027,9 +1275,13 @@ func (m *EnvoyFilter_ListenerMatch) Unmarshal(dAtA []byte) error { if skippy < 0 { return ErrInvalidLengthEnvoyFilter } + if (iNdEx + skippy) < 0 { + return ErrInvalidLengthEnvoyFilter + } if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF } + m.XXX_unrecognized = append(m.XXX_unrecognized, dAtA[iNdEx:iNdEx+skippy]...) iNdEx += skippy } } @@ -1054,7 +1306,7 @@ func (m *EnvoyFilter_InsertPosition) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - wire |= (uint64(b) & 0x7F) << shift + wire |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -1082,7 +1334,7 @@ func (m *EnvoyFilter_InsertPosition) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - m.Index |= (EnvoyFilter_InsertPosition_Index(b) & 0x7F) << shift + m.Index |= EnvoyFilter_InsertPosition_Index(b&0x7F) << shift if b < 0x80 { break } @@ -1101,7 +1353,7 @@ func (m *EnvoyFilter_InsertPosition) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLen |= (uint64(b) & 0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -1111,6 +1363,9 @@ func (m *EnvoyFilter_InsertPosition) Unmarshal(dAtA []byte) error { return ErrInvalidLengthEnvoyFilter } postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthEnvoyFilter + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -1125,9 +1380,13 @@ func (m *EnvoyFilter_InsertPosition) Unmarshal(dAtA []byte) error { if skippy < 0 { return ErrInvalidLengthEnvoyFilter } + if (iNdEx + skippy) < 0 { + return ErrInvalidLengthEnvoyFilter + } if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF } + m.XXX_unrecognized = append(m.XXX_unrecognized, dAtA[iNdEx:iNdEx+skippy]...) iNdEx += skippy } } @@ -1152,7 +1411,7 @@ func (m *EnvoyFilter_Filter) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - wire |= (uint64(b) & 0x7F) << shift + wire |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -1180,7 +1439,7 @@ func (m *EnvoyFilter_Filter) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - msglen |= (int(b) & 0x7F) << shift + msglen |= int(b&0x7F) << shift if b < 0x80 { break } @@ -1189,6 +1448,9 @@ func (m *EnvoyFilter_Filter) Unmarshal(dAtA []byte) error { return ErrInvalidLengthEnvoyFilter } postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthEnvoyFilter + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -1213,7 +1475,7 @@ func (m *EnvoyFilter_Filter) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - msglen |= (int(b) & 0x7F) << shift + msglen |= int(b&0x7F) << shift if b < 0x80 { break } @@ -1222,6 +1484,9 @@ func (m *EnvoyFilter_Filter) Unmarshal(dAtA []byte) error { return ErrInvalidLengthEnvoyFilter } postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthEnvoyFilter + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -1246,7 +1511,7 @@ func (m *EnvoyFilter_Filter) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - m.FilterType |= (EnvoyFilter_Filter_FilterType(b) & 0x7F) << shift + m.FilterType |= EnvoyFilter_Filter_FilterType(b&0x7F) << shift if b < 0x80 { break } @@ -1265,7 +1530,7 @@ func (m *EnvoyFilter_Filter) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLen |= (uint64(b) & 0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -1275,6 +1540,9 @@ func (m *EnvoyFilter_Filter) Unmarshal(dAtA []byte) error { return ErrInvalidLengthEnvoyFilter } postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthEnvoyFilter + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -1294,7 +1562,7 @@ func (m *EnvoyFilter_Filter) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - msglen |= (int(b) & 0x7F) << shift + msglen |= int(b&0x7F) << shift if b < 0x80 { break } @@ -1303,11 +1571,14 @@ func (m *EnvoyFilter_Filter) Unmarshal(dAtA []byte) error { return ErrInvalidLengthEnvoyFilter } postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthEnvoyFilter + } if postIndex > l { return io.ErrUnexpectedEOF } if m.FilterConfig == nil { - m.FilterConfig = &google_protobuf3.Struct{} + m.FilterConfig = &types.Struct{} } if err := m.FilterConfig.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err @@ -1322,9 +1593,13 @@ func (m *EnvoyFilter_Filter) Unmarshal(dAtA []byte) error { if skippy < 0 { return ErrInvalidLengthEnvoyFilter } + if (iNdEx + skippy) < 0 { + return ErrInvalidLengthEnvoyFilter + } if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF } + m.XXX_unrecognized = append(m.XXX_unrecognized, dAtA[iNdEx:iNdEx+skippy]...) iNdEx += skippy } } @@ -1388,10 +1663,13 @@ func skipEnvoyFilter(dAtA []byte) (n int, err error) { break } } - iNdEx += length if length < 0 { return 0, ErrInvalidLengthEnvoyFilter } + iNdEx += length + if iNdEx < 0 { + return 0, ErrInvalidLengthEnvoyFilter + } return iNdEx, nil case 3: for { @@ -1420,6 +1698,9 @@ func skipEnvoyFilter(dAtA []byte) (n int, err error) { return 0, err } iNdEx = start + next + if iNdEx < 0 { + return 0, ErrInvalidLengthEnvoyFilter + } } return iNdEx, nil case 4: @@ -1438,54 +1719,3 @@ var ( ErrInvalidLengthEnvoyFilter = fmt.Errorf("proto: negative length found during unmarshaling") ErrIntOverflowEnvoyFilter = fmt.Errorf("proto: integer overflow") ) - -func init() { proto.RegisterFile("networking/v1alpha3/envoy_filter.proto", fileDescriptorEnvoyFilter) } - -var fileDescriptorEnvoyFilter = []byte{ - // 706 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x54, 0x41, 0x6f, 0xda, 0x4c, - 0x10, 0x8d, 0x71, 0x08, 0x1f, 0xe3, 0x40, 0xfc, 0x6d, 0x22, 0xd5, 0x45, 0x55, 0x8a, 0x38, 0x54, - 0x5c, 0x6a, 0x5a, 0xd2, 0x4a, 0x51, 0xda, 0x8b, 0x93, 0x98, 0x14, 0x95, 0x02, 0x5d, 0x9c, 0x46, - 0x69, 0xa5, 0x5a, 0x06, 0x16, 0xb2, 0x8a, 0xf1, 0x5a, 0xf6, 0x42, 0xc2, 0xcf, 0xea, 0xb1, 0xd7, - 0x9e, 0x7a, 0x6c, 0xff, 0x41, 0x95, 0x5f, 0x52, 0x79, 0x6d, 0x08, 0x44, 0xa9, 0x94, 0xa6, 0x27, - 0x7b, 0x9f, 0xde, 0xbc, 0x99, 0xd9, 0x79, 0xb3, 0xf0, 0xc4, 0x23, 0xfc, 0x82, 0x05, 0xe7, 0xd4, - 0x1b, 0x56, 0x26, 0xcf, 0x1d, 0xd7, 0x3f, 0x73, 0x76, 0x2a, 0xc4, 0x9b, 0xb0, 0xa9, 0x3d, 0xa0, - 0x2e, 0x27, 0x81, 0xee, 0x07, 0x8c, 0x33, 0xf4, 0x90, 0x86, 0x9c, 0x32, 0xfd, 0x9a, 0xad, 0xcf, - 0xd8, 0x85, 0x47, 0x43, 0xc6, 0x86, 0x2e, 0xa9, 0x08, 0x62, 0x77, 0x3c, 0xa8, 0x84, 0x3c, 0x18, - 0xf7, 0x78, 0x1c, 0x58, 0xfa, 0x06, 0xa0, 0x98, 0x91, 0x5e, 0x4d, 0xc8, 0xa1, 0x1e, 0x6c, 0x44, - 0x0a, 0x2e, 0x73, 0xfa, 0xb6, 0xeb, 0x74, 0x89, 0x1b, 0x6a, 0x52, 0x51, 0x2e, 0x2b, 0xd5, 0x3d, - 0xfd, 0x8f, 0x29, 0xf4, 0x05, 0x01, 0xfd, 0x24, 0x89, 0x6e, 0x88, 0x60, 0xd3, 0xe3, 0xc1, 0x14, - 0xe7, 0x2f, 0x96, 0x40, 0x74, 0x04, 0x99, 0xb8, 0xfa, 0x50, 0x4b, 0x09, 0xf1, 0xa7, 0x77, 0x14, - 0x8f, 0x3f, 0x78, 0x16, 0x5d, 0x30, 0x60, 0xf3, 0x96, 0x7c, 0x48, 0x05, 0xf9, 0x9c, 0x4c, 0x35, - 0xa9, 0x28, 0x95, 0xb3, 0x38, 0xfa, 0x45, 0x5b, 0x90, 0x9e, 0x38, 0xee, 0x98, 0x68, 0x29, 0x81, - 0xc5, 0x87, 0xbd, 0xd4, 0xae, 0x54, 0xf8, 0x29, 0x43, 0xae, 0x41, 0x43, 0x4e, 0x3c, 0x12, 0xbc, - 0x73, 0x78, 0xef, 0x0c, 0x3d, 0x06, 0xc5, 0x67, 0x01, 0xb7, 0xbd, 0xf1, 0xa8, 0x4b, 0x02, 0xa1, - 0x92, 0xc3, 0x10, 0x41, 0x4d, 0x81, 0xa0, 0x32, 0xa8, 0x31, 0xc1, 0x19, 0x11, 0xdb, 0x0f, 0xc8, - 0x80, 0x5e, 0x26, 0xba, 0x79, 0xc1, 0x72, 0x46, 0xa4, 0x2d, 0x50, 0x34, 0x80, 0x9c, 0x9b, 0x68, - 0xdb, 0x7c, 0xea, 0x13, 0x4d, 0x2e, 0x4a, 0xe5, 0x7c, 0xd5, 0xb8, 0x63, 0xbb, 0x4b, 0x75, 0xcd, - 0x4f, 0xd6, 0xd4, 0x27, 0x78, 0xdd, 0x5d, 0x38, 0xa1, 0x00, 0xfe, 0x9f, 0xe7, 0x11, 0x73, 0xed, - 0x31, 0x57, 0x5b, 0x15, 0xb9, 0xcc, 0x7f, 0xca, 0xd5, 0x4e, 0xc4, 0xb0, 0xea, 0xde, 0x40, 0x90, - 0x06, 0x19, 0xa7, 0xdf, 0x0f, 0x48, 0x18, 0x6a, 0xe9, 0xa2, 0x5c, 0xce, 0xe2, 0xd9, 0xb1, 0xd4, - 0x82, 0xf5, 0xc5, 0x5a, 0x51, 0x06, 0x64, 0xa3, 0x79, 0xaa, 0xae, 0xa0, 0x4d, 0xd8, 0xe8, 0xd4, - 0x0f, 0xcd, 0x03, 0x03, 0xdb, 0xf5, 0xe6, 0x7e, 0xeb, 0xb8, 0x79, 0xa8, 0x4a, 0x68, 0x0b, 0xd4, - 0x19, 0xd8, 0x3a, 0xb6, 0x62, 0x34, 0x85, 0x14, 0xc8, 0x1c, 0x19, 0x96, 0x79, 0x62, 0x9c, 0xaa, - 0x72, 0x49, 0x07, 0xf5, 0x66, 0x41, 0x42, 0xb4, 0xd1, 0x50, 0x57, 0xd0, 0x7f, 0xb0, 0xfa, 0xc6, - 0xb2, 0xda, 0xaa, 0x14, 0x41, 0xd6, 0x41, 0x5b, 0x4d, 0x15, 0xbe, 0x4a, 0x90, 0xaf, 0x7b, 0x21, - 0x09, 0x78, 0x9b, 0x85, 0x94, 0x53, 0xe6, 0xa1, 0xf7, 0x90, 0xa6, 0x5e, 0x9f, 0x5c, 0x8a, 0x71, - 0xe6, 0xab, 0xaf, 0xee, 0x78, 0x2b, 0xcb, 0x2a, 0x7a, 0x3d, 0x92, 0xc0, 0xb1, 0x52, 0xe4, 0x93, - 0x80, 0xb8, 0x0e, 0xa7, 0x13, 0x62, 0x73, 0x96, 0x38, 0x00, 0x66, 0x90, 0xc5, 0x4a, 0x3b, 0x90, - 0x16, 0x01, 0x28, 0x0b, 0xe9, 0x5a, 0x1d, 0x77, 0xac, 0xb8, 0xda, 0x86, 0xd1, 0xb1, 0x54, 0x09, - 0x01, 0xac, 0xed, 0x9b, 0xb5, 0x16, 0x36, 0xd5, 0x54, 0x44, 0x30, 0x6a, 0x96, 0x89, 0x55, 0xb9, - 0xf0, 0x45, 0x86, 0xb5, 0x64, 0x17, 0x3f, 0x41, 0x7e, 0x3e, 0xd5, 0x51, 0x34, 0x16, 0x51, 0xbc, - 0x52, 0x7d, 0x71, 0x9f, 0x91, 0xe2, 0xb9, 0x13, 0x63, 0x97, 0x7f, 0x86, 0x0d, 0x2a, 0x9a, 0xb3, - 0xfd, 0xa4, 0x3b, 0xd1, 0x81, 0x52, 0x7d, 0x79, 0xaf, 0xab, 0xc1, 0x79, 0xba, 0x7c, 0xe1, 0xa7, - 0xa0, 0xc4, 0x5b, 0xba, 0x68, 0xfc, 0xdd, 0xbf, 0xda, 0xf3, 0xe4, 0x23, 0xfc, 0x0e, 0x83, 0xf9, - 0x7f, 0x74, 0xf1, 0x89, 0x74, 0xb4, 0x81, 0xc2, 0xe7, 0xd9, 0x19, 0x21, 0x5a, 0x3e, 0xf4, 0x1a, - 0x72, 0x09, 0xa1, 0xc7, 0xbc, 0x01, 0x1d, 0x6a, 0x69, 0xd1, 0xd9, 0x03, 0x3d, 0x7e, 0x0a, 0xf5, - 0xd9, 0x53, 0xa8, 0x77, 0xc4, 0x53, 0x88, 0xd7, 0x63, 0xf6, 0x81, 0x20, 0x97, 0x9e, 0x01, 0x5c, - 0x27, 0x8e, 0x8c, 0x58, 0x6f, 0x7e, 0x30, 0x1a, 0xf5, 0xc3, 0x25, 0xaf, 0x29, 0x90, 0x69, 0x9a, - 0xd6, 0x49, 0x0b, 0xbf, 0x55, 0x53, 0xfb, 0xfa, 0xf7, 0xab, 0x6d, 0xe9, 0xc7, 0xd5, 0xb6, 0xf4, - 0xeb, 0x6a, 0x5b, 0xfa, 0x58, 0x8c, 0x7b, 0xa4, 0xac, 0xe2, 0xf8, 0xb4, 0x72, 0xcb, 0x03, 0xde, - 0x5d, 0x13, 0x05, 0xec, 0xfc, 0x0e, 0x00, 0x00, 0xff, 0xff, 0x26, 0x48, 0xc9, 0xfc, 0xde, 0x05, - 0x00, 0x00, -} diff --git a/networking/v1alpha3/gateway.pb.go b/networking/v1alpha3/gateway.pb.go index 0bb2c9e736f..62fc8b17826 100644 --- a/networking/v1alpha3/gateway.pb.go +++ b/networking/v1alpha3/gateway.pb.go @@ -3,17 +3,24 @@ package v1alpha3 -import proto "github.com/gogo/protobuf/proto" -import fmt "fmt" -import math "math" - -import io "io" +import ( + fmt "fmt" + proto "github.com/gogo/protobuf/proto" + io "io" + math "math" +) // Reference imports to suppress errors if they are not otherwise used. var _ = proto.Marshal var _ = fmt.Errorf var _ = math.Inf +// This is a compile-time assertion to ensure that this generated file +// is compatible with the proto package it is being compiled against. +// A compilation error at this line likely means your copy of the +// proto package needs to be updated. +const _ = proto.GoGoProtoPackageIsVersion2 // please upgrade the proto package + // TLS modes enforced by the proxy type Server_TLSOptions_TLSmode int32 @@ -46,6 +53,7 @@ var Server_TLSOptions_TLSmode_name = map[int32]string{ 2: "MUTUAL", 3: "AUTO_PASSTHROUGH", } + var Server_TLSOptions_TLSmode_value = map[string]int32{ "PASSTHROUGH": 0, "SIMPLE": 1, @@ -56,8 +64,9 @@ var Server_TLSOptions_TLSmode_value = map[string]int32{ func (x Server_TLSOptions_TLSmode) String() string { return proto.EnumName(Server_TLSOptions_TLSmode_name, int32(x)) } + func (Server_TLSOptions_TLSmode) EnumDescriptor() ([]byte, []int) { - return fileDescriptorGateway, []int{1, 0, 0} + return fileDescriptor_067d98d02f84cc0b, []int{1, 0, 0} } // TLS protocol versions. @@ -83,6 +92,7 @@ var Server_TLSOptions_TLSProtocol_name = map[int32]string{ 3: "TLSV1_2", 4: "TLSV1_3", } + var Server_TLSOptions_TLSProtocol_value = map[string]int32{ "TLS_AUTO": 0, "TLSV1_0": 1, @@ -94,8 +104,9 @@ var Server_TLSOptions_TLSProtocol_value = map[string]int32{ func (x Server_TLSOptions_TLSProtocol) String() string { return proto.EnumName(Server_TLSOptions_TLSProtocol_name, int32(x)) } + func (Server_TLSOptions_TLSProtocol) EnumDescriptor() ([]byte, []int) { - return fileDescriptorGateway, []int{1, 0, 1} + return fileDescriptor_067d98d02f84cc0b, []int{1, 0, 1} } // `Gateway` describes a load balancer operating at the edge of the mesh @@ -235,19 +246,50 @@ func (Server_TLSOptions_TLSProtocol) EnumDescriptor() ([]byte, []int) { // ``` type Gateway struct { // REQUIRED: A list of server specifications. - Servers []*Server `protobuf:"bytes,1,rep,name=servers" json:"servers,omitempty"` + Servers []*Server `protobuf:"bytes,1,rep,name=servers,proto3" json:"servers,omitempty"` // REQUIRED: One or more labels that indicate a specific set of pods/VMs // on which this gateway configuration should be applied. The scope of // label search is restricted to the configuration namespace in which the // the resource is present. In other words, the Gateway resource must // reside in the same namespace as the gateway workload. - Selector map[string]string `protobuf:"bytes,2,rep,name=selector" json:"selector,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` + Selector map[string]string `protobuf:"bytes,2,rep,name=selector,proto3" json:"selector,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` +} + +func (m *Gateway) Reset() { *m = Gateway{} } +func (m *Gateway) String() string { return proto.CompactTextString(m) } +func (*Gateway) ProtoMessage() {} +func (*Gateway) Descriptor() ([]byte, []int) { + return fileDescriptor_067d98d02f84cc0b, []int{0} +} +func (m *Gateway) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *Gateway) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_Gateway.Marshal(b, m, deterministic) + } else { + b = b[:cap(b)] + n, err := m.MarshalTo(b) + if err != nil { + return nil, err + } + return b[:n], nil + } +} +func (m *Gateway) XXX_Merge(src proto.Message) { + xxx_messageInfo_Gateway.Merge(m, src) +} +func (m *Gateway) XXX_Size() int { + return m.Size() +} +func (m *Gateway) XXX_DiscardUnknown() { + xxx_messageInfo_Gateway.DiscardUnknown(m) } -func (m *Gateway) Reset() { *m = Gateway{} } -func (m *Gateway) String() string { return proto.CompactTextString(m) } -func (*Gateway) ProtoMessage() {} -func (*Gateway) Descriptor() ([]byte, []int) { return fileDescriptorGateway, []int{0} } +var xxx_messageInfo_Gateway proto.InternalMessageInfo func (m *Gateway) GetServers() []*Server { if m != nil { @@ -328,7 +370,7 @@ type Server struct { // REQUIRED: The Port on which the proxy should listen for incoming // connections. If using unix domain socket, use 0 as the port number, // with a valid protocol and port name, along with the bind parameter. - Port *Port `protobuf:"bytes,1,opt,name=port" json:"port,omitempty"` + Port *Port `protobuf:"bytes,1,opt,name=port,proto3" json:"port,omitempty"` // $hide_from_docs // The ip or the unix domain socket to which the listener should be bound // to. Format: x.x.x.x or unix:///path/to/uds or unix://@foobar (Linux @@ -348,21 +390,52 @@ type Server struct { // VirtualServices with hosts dev.example.com, prod.example.com will // match. However, VirtualServices with hosts example.com or // newexample.com will not match. - Hosts []string `protobuf:"bytes,2,rep,name=hosts" json:"hosts,omitempty"` + Hosts []string `protobuf:"bytes,2,rep,name=hosts,proto3" json:"hosts,omitempty"` // Set of TLS related options that govern the server's behavior. Use // these options to control if all http requests should be redirected to // https, and the TLS modes to use. - Tls *Server_TLSOptions `protobuf:"bytes,3,opt,name=tls" json:"tls,omitempty"` + Tls *Server_TLSOptions `protobuf:"bytes,3,opt,name=tls,proto3" json:"tls,omitempty"` // The loopback IP endpoint or unix domain socket to which traffic should // be forwarded to by default. Format should be 127.0.0.1:PORT or // unix:///path/to/socket or unix://@foobar (Linux abstract namespace). - DefaultEndpoint string `protobuf:"bytes,5,opt,name=default_endpoint,json=defaultEndpoint,proto3" json:"default_endpoint,omitempty"` + DefaultEndpoint string `protobuf:"bytes,5,opt,name=default_endpoint,json=defaultEndpoint,proto3" json:"default_endpoint,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` +} + +func (m *Server) Reset() { *m = Server{} } +func (m *Server) String() string { return proto.CompactTextString(m) } +func (*Server) ProtoMessage() {} +func (*Server) Descriptor() ([]byte, []int) { + return fileDescriptor_067d98d02f84cc0b, []int{1} +} +func (m *Server) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *Server) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_Server.Marshal(b, m, deterministic) + } else { + b = b[:cap(b)] + n, err := m.MarshalTo(b) + if err != nil { + return nil, err + } + return b[:n], nil + } +} +func (m *Server) XXX_Merge(src proto.Message) { + xxx_messageInfo_Server.Merge(m, src) +} +func (m *Server) XXX_Size() int { + return m.Size() +} +func (m *Server) XXX_DiscardUnknown() { + xxx_messageInfo_Server.DiscardUnknown(m) } -func (m *Server) Reset() { *m = Server{} } -func (m *Server) String() string { return proto.CompactTextString(m) } -func (*Server) ProtoMessage() {} -func (*Server) Descriptor() ([]byte, []int) { return fileDescriptorGateway, []int{1} } +var xxx_messageInfo_Server proto.InternalMessageInfo func (m *Server) GetPort() *Port { if m != nil { @@ -433,20 +506,51 @@ type Server_TLSOptions struct { CredentialName string `protobuf:"bytes,10,opt,name=credential_name,json=credentialName,proto3" json:"credential_name,omitempty"` // A list of alternate names to verify the subject identity in the // certificate presented by the client. - SubjectAltNames []string `protobuf:"bytes,6,rep,name=subject_alt_names,json=subjectAltNames" json:"subject_alt_names,omitempty"` + SubjectAltNames []string `protobuf:"bytes,6,rep,name=subject_alt_names,json=subjectAltNames,proto3" json:"subject_alt_names,omitempty"` // Optional: Minimum TLS protocol version. MinProtocolVersion Server_TLSOptions_TLSProtocol `protobuf:"varint,7,opt,name=min_protocol_version,json=minProtocolVersion,proto3,enum=istio.networking.v1alpha3.Server_TLSOptions_TLSProtocol" json:"min_protocol_version,omitempty"` // Optional: Maximum TLS protocol version. MaxProtocolVersion Server_TLSOptions_TLSProtocol `protobuf:"varint,8,opt,name=max_protocol_version,json=maxProtocolVersion,proto3,enum=istio.networking.v1alpha3.Server_TLSOptions_TLSProtocol" json:"max_protocol_version,omitempty"` // Optional: If specified, only support the specified cipher list. // Otherwise default to the default cipher list supported by Envoy. - CipherSuites []string `protobuf:"bytes,9,rep,name=cipher_suites,json=cipherSuites" json:"cipher_suites,omitempty"` + CipherSuites []string `protobuf:"bytes,9,rep,name=cipher_suites,json=cipherSuites,proto3" json:"cipher_suites,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` } -func (m *Server_TLSOptions) Reset() { *m = Server_TLSOptions{} } -func (m *Server_TLSOptions) String() string { return proto.CompactTextString(m) } -func (*Server_TLSOptions) ProtoMessage() {} -func (*Server_TLSOptions) Descriptor() ([]byte, []int) { return fileDescriptorGateway, []int{1, 0} } +func (m *Server_TLSOptions) Reset() { *m = Server_TLSOptions{} } +func (m *Server_TLSOptions) String() string { return proto.CompactTextString(m) } +func (*Server_TLSOptions) ProtoMessage() {} +func (*Server_TLSOptions) Descriptor() ([]byte, []int) { + return fileDescriptor_067d98d02f84cc0b, []int{1, 0} +} +func (m *Server_TLSOptions) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *Server_TLSOptions) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_Server_TLSOptions.Marshal(b, m, deterministic) + } else { + b = b[:cap(b)] + n, err := m.MarshalTo(b) + if err != nil { + return nil, err + } + return b[:n], nil + } +} +func (m *Server_TLSOptions) XXX_Merge(src proto.Message) { + xxx_messageInfo_Server_TLSOptions.Merge(m, src) +} +func (m *Server_TLSOptions) XXX_Size() int { + return m.Size() +} +func (m *Server_TLSOptions) XXX_DiscardUnknown() { + xxx_messageInfo_Server_TLSOptions.DiscardUnknown(m) +} + +var xxx_messageInfo_Server_TLSOptions proto.InternalMessageInfo func (m *Server_TLSOptions) GetHttpsRedirect() bool { if m != nil { @@ -528,13 +632,44 @@ type Port struct { // the destination without terminating the TLS connection. Protocol string `protobuf:"bytes,2,opt,name=protocol,proto3" json:"protocol,omitempty"` // Label assigned to the port. - Name string `protobuf:"bytes,3,opt,name=name,proto3" json:"name,omitempty"` + Name string `protobuf:"bytes,3,opt,name=name,proto3" json:"name,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` +} + +func (m *Port) Reset() { *m = Port{} } +func (m *Port) String() string { return proto.CompactTextString(m) } +func (*Port) ProtoMessage() {} +func (*Port) Descriptor() ([]byte, []int) { + return fileDescriptor_067d98d02f84cc0b, []int{2} +} +func (m *Port) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *Port) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_Port.Marshal(b, m, deterministic) + } else { + b = b[:cap(b)] + n, err := m.MarshalTo(b) + if err != nil { + return nil, err + } + return b[:n], nil + } +} +func (m *Port) XXX_Merge(src proto.Message) { + xxx_messageInfo_Port.Merge(m, src) +} +func (m *Port) XXX_Size() int { + return m.Size() +} +func (m *Port) XXX_DiscardUnknown() { + xxx_messageInfo_Port.DiscardUnknown(m) } -func (m *Port) Reset() { *m = Port{} } -func (m *Port) String() string { return proto.CompactTextString(m) } -func (*Port) ProtoMessage() {} -func (*Port) Descriptor() ([]byte, []int) { return fileDescriptorGateway, []int{2} } +var xxx_messageInfo_Port proto.InternalMessageInfo func (m *Port) GetNumber() uint32 { if m != nil { @@ -558,13 +693,64 @@ func (m *Port) GetName() string { } func init() { + proto.RegisterEnum("istio.networking.v1alpha3.Server_TLSOptions_TLSmode", Server_TLSOptions_TLSmode_name, Server_TLSOptions_TLSmode_value) + proto.RegisterEnum("istio.networking.v1alpha3.Server_TLSOptions_TLSProtocol", Server_TLSOptions_TLSProtocol_name, Server_TLSOptions_TLSProtocol_value) proto.RegisterType((*Gateway)(nil), "istio.networking.v1alpha3.Gateway") + proto.RegisterMapType((map[string]string)(nil), "istio.networking.v1alpha3.Gateway.SelectorEntry") proto.RegisterType((*Server)(nil), "istio.networking.v1alpha3.Server") proto.RegisterType((*Server_TLSOptions)(nil), "istio.networking.v1alpha3.Server.TLSOptions") proto.RegisterType((*Port)(nil), "istio.networking.v1alpha3.Port") - proto.RegisterEnum("istio.networking.v1alpha3.Server_TLSOptions_TLSmode", Server_TLSOptions_TLSmode_name, Server_TLSOptions_TLSmode_value) - proto.RegisterEnum("istio.networking.v1alpha3.Server_TLSOptions_TLSProtocol", Server_TLSOptions_TLSProtocol_name, Server_TLSOptions_TLSProtocol_value) } + +func init() { proto.RegisterFile("networking/v1alpha3/gateway.proto", fileDescriptor_067d98d02f84cc0b) } + +var fileDescriptor_067d98d02f84cc0b = []byte{ + // 674 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x54, 0x5d, 0x4f, 0x1a, 0x4d, + 0x14, 0x76, 0x01, 0xf9, 0x38, 0x88, 0xac, 0x13, 0xf3, 0x66, 0x5f, 0x2f, 0xfc, 0xa0, 0x69, 0x6a, + 0x9b, 0x76, 0x51, 0xe8, 0x85, 0xa9, 0x49, 0x13, 0xda, 0x18, 0x69, 0x8a, 0x42, 0x76, 0xc1, 0x8b, + 0xde, 0x6c, 0x86, 0x65, 0x94, 0xd1, 0x65, 0x67, 0x33, 0x33, 0xa0, 0xfc, 0xb3, 0xfe, 0x84, 0x5e, + 0xb6, 0xff, 0xa0, 0xb1, 0x7f, 0xa4, 0xd9, 0xd9, 0x41, 0xe8, 0x97, 0x8d, 0xe9, 0xdd, 0x39, 0xcf, + 0x3c, 0xcf, 0x73, 0xe6, 0x9c, 0xf9, 0x80, 0x9d, 0x90, 0xc8, 0x6b, 0xc6, 0xaf, 0x68, 0x78, 0x51, + 0x9d, 0xec, 0xe3, 0x20, 0x1a, 0xe2, 0x7a, 0xf5, 0x02, 0x4b, 0x72, 0x8d, 0xa7, 0x76, 0xc4, 0x99, + 0x64, 0xe8, 0x7f, 0x2a, 0x24, 0x65, 0xf6, 0x9c, 0x68, 0xcf, 0x88, 0x95, 0x2f, 0x06, 0xe4, 0x8e, + 0x13, 0x32, 0x3a, 0x84, 0x9c, 0x20, 0x7c, 0x42, 0xb8, 0xb0, 0x8c, 0xed, 0xf4, 0x6e, 0xb1, 0xb6, + 0x63, 0xff, 0x51, 0x68, 0xbb, 0x8a, 0xe9, 0xcc, 0x14, 0xa8, 0x05, 0x79, 0x41, 0x02, 0xe2, 0x4b, + 0xc6, 0xad, 0x94, 0x52, 0xef, 0xdd, 0xa3, 0xd6, 0x25, 0x6d, 0x57, 0x4b, 0x8e, 0x42, 0xc9, 0xa7, + 0xce, 0x9d, 0xc3, 0xc6, 0x21, 0x94, 0x7e, 0x58, 0x42, 0x26, 0xa4, 0xaf, 0xc8, 0xd4, 0x32, 0xb6, + 0x8d, 0xdd, 0x82, 0x13, 0x87, 0x68, 0x1d, 0x96, 0x27, 0x38, 0x18, 0x13, 0x2b, 0xa5, 0xb0, 0x24, + 0x79, 0x95, 0x3a, 0x30, 0x2a, 0x1f, 0x73, 0x90, 0x4d, 0xb6, 0x87, 0xea, 0x90, 0x89, 0x18, 0x97, + 0x4a, 0x57, 0xac, 0x6d, 0xdd, 0xb3, 0xa3, 0x0e, 0xe3, 0xd2, 0x51, 0x64, 0x84, 0x20, 0xd3, 0xa7, + 0xe1, 0xc0, 0xca, 0x28, 0x63, 0x15, 0xc7, 0xd5, 0x86, 0x4c, 0x48, 0xa1, 0x7a, 0x2b, 0x38, 0x49, + 0x82, 0x5e, 0x43, 0x5a, 0x06, 0xc2, 0x4a, 0x2b, 0xf7, 0xe7, 0x7f, 0x9d, 0x96, 0xdd, 0x6d, 0xb9, + 0xed, 0x48, 0x52, 0x16, 0x0a, 0x27, 0x16, 0xa2, 0xa7, 0x60, 0x0e, 0xc8, 0x39, 0x1e, 0x07, 0xd2, + 0x23, 0xe1, 0x20, 0x62, 0x34, 0x94, 0xd6, 0xb2, 0xaa, 0x5a, 0xd6, 0xf8, 0x91, 0x86, 0x37, 0xbe, + 0x2d, 0x03, 0xcc, 0xe5, 0xe8, 0x31, 0xac, 0x0e, 0xa5, 0x8c, 0x84, 0xc7, 0xc9, 0x80, 0x72, 0xe2, + 0x27, 0x2d, 0xe6, 0x9d, 0x92, 0x42, 0x1d, 0x0d, 0xa2, 0x26, 0x64, 0x46, 0x6c, 0x90, 0xcc, 0x68, + 0xb5, 0xf6, 0xf2, 0x21, 0x3b, 0x8c, 0xc3, 0x58, 0xeb, 0x28, 0x07, 0xf4, 0x02, 0x50, 0x72, 0xd4, + 0x9e, 0x4f, 0xb8, 0xa4, 0xe7, 0xd4, 0xc7, 0x92, 0xa8, 0xce, 0x0b, 0xce, 0x5a, 0xb2, 0xf2, 0x76, + 0xbe, 0x80, 0xb6, 0xa0, 0x18, 0x71, 0x3a, 0xc1, 0x92, 0x78, 0xf1, 0xb9, 0x25, 0xa3, 0x04, 0x0d, + 0xbd, 0x27, 0x53, 0xf4, 0x04, 0xca, 0x3e, 0x5e, 0xf4, 0x12, 0xba, 0xf3, 0x55, 0x1f, 0x2f, 0x18, + 0x09, 0x45, 0xe4, 0x64, 0x40, 0x42, 0x49, 0x71, 0xe0, 0x85, 0x78, 0x44, 0x2c, 0xd0, 0xc4, 0x3b, + 0xf8, 0x14, 0x8f, 0x08, 0x7a, 0x06, 0x6b, 0x62, 0xdc, 0xbf, 0x24, 0xbe, 0xf4, 0x70, 0x20, 0x15, + 0x53, 0x58, 0x59, 0x75, 0x5c, 0x65, 0xbd, 0xd0, 0x08, 0x64, 0x4c, 0x15, 0xe8, 0x12, 0xd6, 0x47, + 0x34, 0xf4, 0xd4, 0xf3, 0xf0, 0x59, 0xe0, 0xc5, 0x57, 0x98, 0xb2, 0xd0, 0xca, 0xa9, 0x39, 0x1d, + 0x3c, 0x74, 0x4e, 0x1d, 0xed, 0xe3, 0xa0, 0x11, 0x0d, 0x67, 0xc9, 0x59, 0xe2, 0xa9, 0x6a, 0xe1, + 0x9b, 0x5f, 0x6b, 0xe5, 0xff, 0xb9, 0x16, 0xbe, 0xf9, 0xb9, 0xd6, 0x23, 0x28, 0xf9, 0x34, 0x1a, + 0x12, 0xee, 0x89, 0x31, 0x8d, 0x67, 0x5a, 0x50, 0xfd, 0xaf, 0x24, 0xa0, 0xab, 0xb0, 0x4a, 0x13, + 0x72, 0xfa, 0x6c, 0x51, 0x19, 0x8a, 0x9d, 0x86, 0xeb, 0x76, 0x9b, 0x4e, 0xbb, 0x77, 0xdc, 0x34, + 0x97, 0x10, 0x40, 0xd6, 0x7d, 0x77, 0xd2, 0x69, 0x1d, 0x99, 0x46, 0x1c, 0x9f, 0xf4, 0xba, 0xbd, + 0x46, 0xcb, 0x4c, 0xa1, 0x75, 0x30, 0x1b, 0xbd, 0x6e, 0xdb, 0x5b, 0x64, 0xa7, 0x2b, 0x6d, 0x28, + 0x2e, 0xec, 0x08, 0xad, 0x40, 0xbe, 0xdb, 0x72, 0xbd, 0x98, 0x68, 0x2e, 0xa1, 0xa2, 0x2a, 0x73, + 0xb6, 0xef, 0xed, 0x99, 0xc6, 0x3c, 0xd9, 0x37, 0x53, 0xf3, 0xa4, 0x66, 0xa6, 0xe7, 0x49, 0xdd, + 0xcc, 0x54, 0x4e, 0x21, 0x13, 0x3f, 0x44, 0xf4, 0x1f, 0x64, 0xc3, 0xf1, 0xa8, 0x4f, 0xb8, 0xba, + 0xd6, 0x25, 0x47, 0x67, 0x68, 0x03, 0xf2, 0xb3, 0x39, 0xea, 0x77, 0x7f, 0x97, 0xc7, 0xcf, 0x56, + 0xdd, 0x8e, 0xe4, 0x4e, 0xaa, 0xf8, 0x8d, 0xfd, 0xe9, 0x76, 0xd3, 0xf8, 0x7c, 0xbb, 0x69, 0x7c, + 0xbd, 0xdd, 0x34, 0x3e, 0x6c, 0x27, 0xa3, 0xa6, 0xac, 0x8a, 0x23, 0x5a, 0xfd, 0xcd, 0xbf, 0xd9, + 0xcf, 0x2a, 0xb7, 0xfa, 0xf7, 0x00, 0x00, 0x00, 0xff, 0xff, 0xd0, 0x11, 0xfe, 0x50, 0x55, 0x05, + 0x00, 0x00, +} + func (m *Gateway) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) @@ -609,6 +795,9 @@ func (m *Gateway) MarshalTo(dAtA []byte) (int, error) { i += copy(dAtA[i:], v) } } + if m.XXX_unrecognized != nil { + i += copy(dAtA[i:], m.XXX_unrecognized) + } return i, nil } @@ -674,6 +863,9 @@ func (m *Server) MarshalTo(dAtA []byte) (int, error) { i = encodeVarintGateway(dAtA, i, uint64(len(m.DefaultEndpoint))) i += copy(dAtA[i:], m.DefaultEndpoint) } + if m.XXX_unrecognized != nil { + i += copy(dAtA[i:], m.XXX_unrecognized) + } return i, nil } @@ -771,6 +963,9 @@ func (m *Server_TLSOptions) MarshalTo(dAtA []byte) (int, error) { i = encodeVarintGateway(dAtA, i, uint64(len(m.CredentialName))) i += copy(dAtA[i:], m.CredentialName) } + if m.XXX_unrecognized != nil { + i += copy(dAtA[i:], m.XXX_unrecognized) + } return i, nil } @@ -806,6 +1001,9 @@ func (m *Port) MarshalTo(dAtA []byte) (int, error) { i = encodeVarintGateway(dAtA, i, uint64(len(m.Name))) i += copy(dAtA[i:], m.Name) } + if m.XXX_unrecognized != nil { + i += copy(dAtA[i:], m.XXX_unrecognized) + } return i, nil } @@ -819,6 +1017,9 @@ func encodeVarintGateway(dAtA []byte, offset int, v uint64) int { return offset + 1 } func (m *Gateway) Size() (n int) { + if m == nil { + return 0 + } var l int _ = l if len(m.Servers) > 0 { @@ -835,10 +1036,16 @@ func (m *Gateway) Size() (n int) { n += mapEntrySize + 1 + sovGateway(uint64(mapEntrySize)) } } + if m.XXX_unrecognized != nil { + n += len(m.XXX_unrecognized) + } return n } func (m *Server) Size() (n int) { + if m == nil { + return 0 + } var l int _ = l if m.Port != nil { @@ -863,10 +1070,16 @@ func (m *Server) Size() (n int) { if l > 0 { n += 1 + l + sovGateway(uint64(l)) } + if m.XXX_unrecognized != nil { + n += len(m.XXX_unrecognized) + } return n } func (m *Server_TLSOptions) Size() (n int) { + if m == nil { + return 0 + } var l int _ = l if m.HttpsRedirect { @@ -909,10 +1122,16 @@ func (m *Server_TLSOptions) Size() (n int) { if l > 0 { n += 1 + l + sovGateway(uint64(l)) } + if m.XXX_unrecognized != nil { + n += len(m.XXX_unrecognized) + } return n } func (m *Port) Size() (n int) { + if m == nil { + return 0 + } var l int _ = l if m.Number != 0 { @@ -926,6 +1145,9 @@ func (m *Port) Size() (n int) { if l > 0 { n += 1 + l + sovGateway(uint64(l)) } + if m.XXX_unrecognized != nil { + n += len(m.XXX_unrecognized) + } return n } @@ -957,7 +1179,7 @@ func (m *Gateway) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - wire |= (uint64(b) & 0x7F) << shift + wire |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -985,7 +1207,7 @@ func (m *Gateway) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - msglen |= (int(b) & 0x7F) << shift + msglen |= int(b&0x7F) << shift if b < 0x80 { break } @@ -994,6 +1216,9 @@ func (m *Gateway) Unmarshal(dAtA []byte) error { return ErrInvalidLengthGateway } postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthGateway + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -1016,7 +1241,7 @@ func (m *Gateway) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - msglen |= (int(b) & 0x7F) << shift + msglen |= int(b&0x7F) << shift if b < 0x80 { break } @@ -1025,6 +1250,9 @@ func (m *Gateway) Unmarshal(dAtA []byte) error { return ErrInvalidLengthGateway } postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthGateway + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -1045,7 +1273,7 @@ func (m *Gateway) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - wire |= (uint64(b) & 0x7F) << shift + wire |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -1062,7 +1290,7 @@ func (m *Gateway) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLenmapkey |= (uint64(b) & 0x7F) << shift + stringLenmapkey |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -1072,6 +1300,9 @@ func (m *Gateway) Unmarshal(dAtA []byte) error { return ErrInvalidLengthGateway } postStringIndexmapkey := iNdEx + intStringLenmapkey + if postStringIndexmapkey < 0 { + return ErrInvalidLengthGateway + } if postStringIndexmapkey > l { return io.ErrUnexpectedEOF } @@ -1088,7 +1319,7 @@ func (m *Gateway) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLenmapvalue |= (uint64(b) & 0x7F) << shift + stringLenmapvalue |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -1098,6 +1329,9 @@ func (m *Gateway) Unmarshal(dAtA []byte) error { return ErrInvalidLengthGateway } postStringIndexmapvalue := iNdEx + intStringLenmapvalue + if postStringIndexmapvalue < 0 { + return ErrInvalidLengthGateway + } if postStringIndexmapvalue > l { return io.ErrUnexpectedEOF } @@ -1129,9 +1363,13 @@ func (m *Gateway) Unmarshal(dAtA []byte) error { if skippy < 0 { return ErrInvalidLengthGateway } + if (iNdEx + skippy) < 0 { + return ErrInvalidLengthGateway + } if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF } + m.XXX_unrecognized = append(m.XXX_unrecognized, dAtA[iNdEx:iNdEx+skippy]...) iNdEx += skippy } } @@ -1156,7 +1394,7 @@ func (m *Server) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - wire |= (uint64(b) & 0x7F) << shift + wire |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -1184,7 +1422,7 @@ func (m *Server) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - msglen |= (int(b) & 0x7F) << shift + msglen |= int(b&0x7F) << shift if b < 0x80 { break } @@ -1193,6 +1431,9 @@ func (m *Server) Unmarshal(dAtA []byte) error { return ErrInvalidLengthGateway } postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthGateway + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -1217,7 +1458,7 @@ func (m *Server) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLen |= (uint64(b) & 0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -1227,6 +1468,9 @@ func (m *Server) Unmarshal(dAtA []byte) error { return ErrInvalidLengthGateway } postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthGateway + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -1246,7 +1490,7 @@ func (m *Server) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - msglen |= (int(b) & 0x7F) << shift + msglen |= int(b&0x7F) << shift if b < 0x80 { break } @@ -1255,6 +1499,9 @@ func (m *Server) Unmarshal(dAtA []byte) error { return ErrInvalidLengthGateway } postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthGateway + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -1279,7 +1526,7 @@ func (m *Server) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLen |= (uint64(b) & 0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -1289,6 +1536,9 @@ func (m *Server) Unmarshal(dAtA []byte) error { return ErrInvalidLengthGateway } postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthGateway + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -1308,7 +1558,7 @@ func (m *Server) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLen |= (uint64(b) & 0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -1318,6 +1568,9 @@ func (m *Server) Unmarshal(dAtA []byte) error { return ErrInvalidLengthGateway } postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthGateway + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -1332,9 +1585,13 @@ func (m *Server) Unmarshal(dAtA []byte) error { if skippy < 0 { return ErrInvalidLengthGateway } + if (iNdEx + skippy) < 0 { + return ErrInvalidLengthGateway + } if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF } + m.XXX_unrecognized = append(m.XXX_unrecognized, dAtA[iNdEx:iNdEx+skippy]...) iNdEx += skippy } } @@ -1359,7 +1616,7 @@ func (m *Server_TLSOptions) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - wire |= (uint64(b) & 0x7F) << shift + wire |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -1387,7 +1644,7 @@ func (m *Server_TLSOptions) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - v |= (int(b) & 0x7F) << shift + v |= int(b&0x7F) << shift if b < 0x80 { break } @@ -1407,7 +1664,7 @@ func (m *Server_TLSOptions) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - m.Mode |= (Server_TLSOptions_TLSmode(b) & 0x7F) << shift + m.Mode |= Server_TLSOptions_TLSmode(b&0x7F) << shift if b < 0x80 { break } @@ -1426,7 +1683,7 @@ func (m *Server_TLSOptions) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLen |= (uint64(b) & 0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -1436,6 +1693,9 @@ func (m *Server_TLSOptions) Unmarshal(dAtA []byte) error { return ErrInvalidLengthGateway } postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthGateway + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -1455,7 +1715,7 @@ func (m *Server_TLSOptions) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLen |= (uint64(b) & 0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -1465,6 +1725,9 @@ func (m *Server_TLSOptions) Unmarshal(dAtA []byte) error { return ErrInvalidLengthGateway } postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthGateway + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -1484,7 +1747,7 @@ func (m *Server_TLSOptions) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLen |= (uint64(b) & 0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -1494,6 +1757,9 @@ func (m *Server_TLSOptions) Unmarshal(dAtA []byte) error { return ErrInvalidLengthGateway } postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthGateway + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -1513,7 +1779,7 @@ func (m *Server_TLSOptions) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLen |= (uint64(b) & 0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -1523,6 +1789,9 @@ func (m *Server_TLSOptions) Unmarshal(dAtA []byte) error { return ErrInvalidLengthGateway } postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthGateway + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -1542,7 +1811,7 @@ func (m *Server_TLSOptions) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - m.MinProtocolVersion |= (Server_TLSOptions_TLSProtocol(b) & 0x7F) << shift + m.MinProtocolVersion |= Server_TLSOptions_TLSProtocol(b&0x7F) << shift if b < 0x80 { break } @@ -1561,7 +1830,7 @@ func (m *Server_TLSOptions) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - m.MaxProtocolVersion |= (Server_TLSOptions_TLSProtocol(b) & 0x7F) << shift + m.MaxProtocolVersion |= Server_TLSOptions_TLSProtocol(b&0x7F) << shift if b < 0x80 { break } @@ -1580,7 +1849,7 @@ func (m *Server_TLSOptions) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLen |= (uint64(b) & 0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -1590,6 +1859,9 @@ func (m *Server_TLSOptions) Unmarshal(dAtA []byte) error { return ErrInvalidLengthGateway } postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthGateway + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -1609,7 +1881,7 @@ func (m *Server_TLSOptions) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLen |= (uint64(b) & 0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -1619,6 +1891,9 @@ func (m *Server_TLSOptions) Unmarshal(dAtA []byte) error { return ErrInvalidLengthGateway } postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthGateway + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -1633,9 +1908,13 @@ func (m *Server_TLSOptions) Unmarshal(dAtA []byte) error { if skippy < 0 { return ErrInvalidLengthGateway } + if (iNdEx + skippy) < 0 { + return ErrInvalidLengthGateway + } if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF } + m.XXX_unrecognized = append(m.XXX_unrecognized, dAtA[iNdEx:iNdEx+skippy]...) iNdEx += skippy } } @@ -1660,7 +1939,7 @@ func (m *Port) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - wire |= (uint64(b) & 0x7F) << shift + wire |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -1688,7 +1967,7 @@ func (m *Port) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - m.Number |= (uint32(b) & 0x7F) << shift + m.Number |= uint32(b&0x7F) << shift if b < 0x80 { break } @@ -1707,7 +1986,7 @@ func (m *Port) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLen |= (uint64(b) & 0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -1717,6 +1996,9 @@ func (m *Port) Unmarshal(dAtA []byte) error { return ErrInvalidLengthGateway } postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthGateway + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -1736,7 +2018,7 @@ func (m *Port) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLen |= (uint64(b) & 0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -1746,6 +2028,9 @@ func (m *Port) Unmarshal(dAtA []byte) error { return ErrInvalidLengthGateway } postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthGateway + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -1760,9 +2045,13 @@ func (m *Port) Unmarshal(dAtA []byte) error { if skippy < 0 { return ErrInvalidLengthGateway } + if (iNdEx + skippy) < 0 { + return ErrInvalidLengthGateway + } if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF } + m.XXX_unrecognized = append(m.XXX_unrecognized, dAtA[iNdEx:iNdEx+skippy]...) iNdEx += skippy } } @@ -1826,10 +2115,13 @@ func skipGateway(dAtA []byte) (n int, err error) { break } } - iNdEx += length if length < 0 { return 0, ErrInvalidLengthGateway } + iNdEx += length + if iNdEx < 0 { + return 0, ErrInvalidLengthGateway + } return iNdEx, nil case 3: for { @@ -1858,6 +2150,9 @@ func skipGateway(dAtA []byte) (n int, err error) { return 0, err } iNdEx = start + next + if iNdEx < 0 { + return 0, ErrInvalidLengthGateway + } } return iNdEx, nil case 4: @@ -1876,52 +2171,3 @@ var ( ErrInvalidLengthGateway = fmt.Errorf("proto: negative length found during unmarshaling") ErrIntOverflowGateway = fmt.Errorf("proto: integer overflow") ) - -func init() { proto.RegisterFile("networking/v1alpha3/gateway.proto", fileDescriptorGateway) } - -var fileDescriptorGateway = []byte{ - // 674 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x54, 0xdb, 0x4e, 0xdb, 0x4c, - 0x10, 0xc6, 0x49, 0xc8, 0x61, 0x42, 0x88, 0x59, 0xa1, 0x5f, 0xfe, 0xb9, 0xe0, 0x90, 0xaa, 0x2a, - 0xad, 0x5a, 0x07, 0x92, 0x5e, 0xa0, 0x22, 0x55, 0x4a, 0x2b, 0x44, 0xaa, 0x06, 0x12, 0xd9, 0x09, - 0x17, 0xbd, 0xb1, 0x36, 0xce, 0x42, 0x16, 0x1c, 0xaf, 0xb5, 0xbb, 0x09, 0xe4, 0xcd, 0xfa, 0x08, - 0xbd, 0x6c, 0xdf, 0xa0, 0xa2, 0x2f, 0x52, 0xed, 0xda, 0x21, 0xe9, 0x89, 0x0a, 0xf5, 0x6e, 0xe6, - 0x9b, 0x99, 0x6f, 0x66, 0xbe, 0x59, 0x1b, 0x76, 0x42, 0x22, 0xaf, 0x19, 0xbf, 0xa2, 0xe1, 0x45, - 0x75, 0xb2, 0x8f, 0x83, 0x68, 0x88, 0xeb, 0xd5, 0x0b, 0x2c, 0xc9, 0x35, 0x9e, 0xda, 0x11, 0x67, - 0x92, 0xa1, 0xff, 0xa9, 0x90, 0x94, 0xd9, 0xf3, 0x44, 0x7b, 0x96, 0x58, 0xf9, 0x62, 0x40, 0xee, - 0x38, 0x4e, 0x46, 0x87, 0x90, 0x13, 0x84, 0x4f, 0x08, 0x17, 0x96, 0xb1, 0x9d, 0xde, 0x2d, 0xd6, - 0x76, 0xec, 0x3f, 0x16, 0xda, 0xae, 0xce, 0x74, 0x66, 0x15, 0xa8, 0x05, 0x79, 0x41, 0x02, 0xe2, - 0x4b, 0xc6, 0xad, 0x94, 0xae, 0xde, 0xbb, 0xa7, 0x3a, 0x69, 0x69, 0xbb, 0x49, 0xc9, 0x51, 0x28, - 0xf9, 0xd4, 0xb9, 0x63, 0xd8, 0x38, 0x84, 0xd2, 0x0f, 0x21, 0x64, 0x42, 0xfa, 0x8a, 0x4c, 0x2d, - 0x63, 0xdb, 0xd8, 0x2d, 0x38, 0xca, 0x44, 0xeb, 0xb0, 0x3c, 0xc1, 0xc1, 0x98, 0x58, 0x29, 0x8d, - 0xc5, 0xce, 0xab, 0xd4, 0x81, 0x51, 0xf9, 0x98, 0x83, 0x6c, 0x3c, 0x1e, 0xaa, 0x43, 0x26, 0x62, - 0x5c, 0xea, 0xba, 0x62, 0x6d, 0xeb, 0x9e, 0x89, 0x3a, 0x8c, 0x4b, 0x47, 0x27, 0x2b, 0xe6, 0x21, - 0x13, 0x52, 0xe8, 0x3d, 0x0a, 0x4e, 0xec, 0xa0, 0xd7, 0x90, 0x96, 0x81, 0xb0, 0xd2, 0x9a, 0xe9, - 0xf9, 0x5f, 0x95, 0xb1, 0xbb, 0x2d, 0xb7, 0x1d, 0x49, 0xca, 0x42, 0xe1, 0xa8, 0x42, 0x84, 0x20, - 0xd3, 0xa7, 0xe1, 0xc0, 0xca, 0xe8, 0x71, 0xb5, 0x8d, 0x9e, 0x82, 0x39, 0x20, 0xe7, 0x78, 0x1c, - 0x48, 0x8f, 0x84, 0x83, 0x88, 0xd1, 0x50, 0x5a, 0xcb, 0x3a, 0x5e, 0x4e, 0xf0, 0xa3, 0x04, 0xde, - 0xf8, 0xb6, 0x0c, 0x30, 0xa7, 0x44, 0x8f, 0x61, 0x75, 0x28, 0x65, 0x24, 0x3c, 0x4e, 0x06, 0x94, - 0x13, 0x3f, 0x5e, 0x31, 0xef, 0x94, 0x34, 0xea, 0x24, 0x20, 0x6a, 0x42, 0x66, 0xc4, 0x06, 0xb1, - 0x46, 0xab, 0xb5, 0x97, 0x0f, 0x99, 0x5a, 0x99, 0xaa, 0xd6, 0xd1, 0x0c, 0xe8, 0x05, 0xa0, 0xf8, - 0xd4, 0x9e, 0x4f, 0xb8, 0xa4, 0xe7, 0xd4, 0xc7, 0x92, 0x68, 0x35, 0x0a, 0xce, 0x5a, 0x1c, 0x79, - 0x3b, 0x0f, 0xa0, 0x2d, 0x28, 0x46, 0x9c, 0x4e, 0xb0, 0x24, 0x9e, 0xba, 0x5b, 0xbc, 0x34, 0x24, - 0xd0, 0x7b, 0x32, 0x45, 0x4f, 0xa0, 0xec, 0xe3, 0x45, 0x2e, 0x91, 0x6c, 0xbe, 0xea, 0xe3, 0x05, - 0x22, 0x81, 0x9e, 0xc1, 0x9a, 0x18, 0xf7, 0x2f, 0x89, 0x2f, 0x3d, 0x1c, 0x48, 0x2f, 0xc4, 0x23, - 0x22, 0xac, 0xac, 0xbe, 0x4c, 0x39, 0x09, 0x34, 0x02, 0x79, 0xaa, 0x60, 0x74, 0x09, 0xeb, 0x23, - 0x1a, 0x7a, 0xfa, 0xd5, 0xfb, 0x2c, 0xf0, 0xd4, 0xcb, 0xa4, 0x2c, 0xb4, 0x72, 0x7a, 0xfd, 0x83, - 0x87, 0xae, 0xdf, 0x49, 0x78, 0x1c, 0x34, 0xa2, 0xe1, 0xcc, 0x39, 0x8b, 0x39, 0x75, 0x2f, 0x7c, - 0xf3, 0x6b, 0xaf, 0xfc, 0x3f, 0xf7, 0xc2, 0x37, 0x3f, 0xf7, 0x7a, 0x04, 0x25, 0x9f, 0x46, 0x43, - 0xc2, 0x3d, 0x31, 0xa6, 0x4a, 0xaa, 0x82, 0xde, 0x7f, 0x25, 0x06, 0x5d, 0x8d, 0x69, 0x45, 0x39, - 0x19, 0x90, 0x50, 0x52, 0x1c, 0x68, 0x9d, 0x2c, 0x48, 0x14, 0xbd, 0x83, 0x95, 0x4c, 0x95, 0x26, - 0xe4, 0x92, 0xdb, 0xa2, 0x32, 0x14, 0x3b, 0x0d, 0xd7, 0xed, 0x36, 0x9d, 0x76, 0xef, 0xb8, 0x69, - 0x2e, 0x21, 0x80, 0xac, 0xfb, 0xee, 0xa4, 0xd3, 0x3a, 0x32, 0x0d, 0x65, 0x9f, 0xf4, 0xba, 0xbd, - 0x46, 0xcb, 0x4c, 0xa1, 0x75, 0x30, 0x1b, 0xbd, 0x6e, 0xdb, 0x5b, 0xcc, 0x4e, 0x57, 0xda, 0x50, - 0x5c, 0x18, 0x1d, 0xad, 0x40, 0xbe, 0xdb, 0x72, 0x3d, 0x95, 0x68, 0x2e, 0xa1, 0xa2, 0x6e, 0x73, - 0xb6, 0xef, 0xed, 0x99, 0xc6, 0xdc, 0xd9, 0x37, 0x53, 0x73, 0xa7, 0x66, 0xa6, 0xe7, 0x4e, 0xdd, - 0xcc, 0x54, 0x4e, 0x21, 0xa3, 0x3e, 0x44, 0xf4, 0x1f, 0x64, 0xc3, 0xf1, 0xa8, 0x4f, 0xb8, 0x7e, - 0xd6, 0x25, 0x27, 0xf1, 0xd0, 0x06, 0xe4, 0x67, 0x82, 0x27, 0xdf, 0xfd, 0x9d, 0xaf, 0x3e, 0x30, - 0xbd, 0x74, 0xfc, 0x26, 0xb5, 0xfd, 0xc6, 0xfe, 0x74, 0xbb, 0x69, 0x7c, 0xbe, 0xdd, 0x34, 0xbe, - 0xde, 0x6e, 0x1a, 0x1f, 0xb6, 0xe3, 0x9b, 0x50, 0x56, 0xc5, 0x11, 0xad, 0xfe, 0xe6, 0xbf, 0xd9, - 0xcf, 0x6a, 0xb6, 0xfa, 0xf7, 0x00, 0x00, 0x00, 0xff, 0xff, 0xaa, 0xbd, 0x84, 0xff, 0x55, 0x05, - 0x00, 0x00, -} diff --git a/networking/v1alpha3/service_entry.pb.go b/networking/v1alpha3/service_entry.pb.go index 091d09a45a7..d34c55bc909 100644 --- a/networking/v1alpha3/service_entry.pb.go +++ b/networking/v1alpha3/service_entry.pb.go @@ -3,17 +3,24 @@ package v1alpha3 -import proto "github.com/gogo/protobuf/proto" -import fmt "fmt" -import math "math" - -import io "io" +import ( + fmt "fmt" + proto "github.com/gogo/protobuf/proto" + io "io" + math "math" +) // Reference imports to suppress errors if they are not otherwise used. var _ = proto.Marshal var _ = fmt.Errorf var _ = math.Inf +// This is a compile-time assertion to ensure that this generated file +// is compatible with the proto package it is being compiled against. +// A compilation error at this line likely means your copy of the +// proto package needs to be updated. +const _ = proto.GoGoProtoPackageIsVersion2 // please upgrade the proto package + // Location specifies whether the service is part of Istio mesh or // outside the mesh. Location determines the behavior of several // features, such as service-to-service mTLS authentication, policy @@ -37,6 +44,7 @@ var ServiceEntry_Location_name = map[int32]string{ 0: "MESH_EXTERNAL", 1: "MESH_INTERNAL", } + var ServiceEntry_Location_value = map[string]int32{ "MESH_EXTERNAL": 0, "MESH_INTERNAL": 1, @@ -45,8 +53,9 @@ var ServiceEntry_Location_value = map[string]int32{ func (x ServiceEntry_Location) String() string { return proto.EnumName(ServiceEntry_Location_name, int32(x)) } + func (ServiceEntry_Location) EnumDescriptor() ([]byte, []int) { - return fileDescriptorServiceEntry, []int{0, 0} + return fileDescriptor_9220e0fa673c4bf8, []int{0, 0} } // Resolution determines how the proxy will resolve the IP addresses of @@ -86,6 +95,7 @@ var ServiceEntry_Resolution_name = map[int32]string{ 1: "STATIC", 2: "DNS", } + var ServiceEntry_Resolution_value = map[string]int32{ "NONE": 0, "STATIC": 1, @@ -95,8 +105,9 @@ var ServiceEntry_Resolution_value = map[string]int32{ func (x ServiceEntry_Resolution) String() string { return proto.EnumName(ServiceEntry_Resolution_name, int32(x)) } + func (ServiceEntry_Resolution) EnumDescriptor() ([]byte, []int) { - return fileDescriptorServiceEntry, []int{0, 1} + return fileDescriptor_9220e0fa673c4bf8, []int{0, 1} } // `ServiceEntry` enables adding additional entries into Istio's internal @@ -412,7 +423,7 @@ type ServiceEntry struct { // protocols such as mongo/opaque TCP/HTTPS. In such scenarios, the // IP addresses specified in the Addresses field or the port will be used // to uniquely identify the destination. - Hosts []string `protobuf:"bytes,1,rep,name=hosts" json:"hosts,omitempty"` + Hosts []string `protobuf:"bytes,1,rep,name=hosts,proto3" json:"hosts,omitempty"` // The virtual IP addresses associated with the service. Could be CIDR // prefix. For HTTP services, the addresses field will be ignored and // the destination will be identified based on the HTTP Host/Authority @@ -427,11 +438,11 @@ type ServiceEntry struct { // simple TCP proxy, forwarding incoming traffic on a specified port to // the specified destination endpoint IP/host. Unix domain socket // addresses are not supported in this field. - Addresses []string `protobuf:"bytes,2,rep,name=addresses" json:"addresses,omitempty"` + Addresses []string `protobuf:"bytes,2,rep,name=addresses,proto3" json:"addresses,omitempty"` // REQUIRED. The ports associated with the external service. If the // Endpoints are unix domain socket addresses, there must be exactly one // port. - Ports []*Port `protobuf:"bytes,3,rep,name=ports" json:"ports,omitempty"` + Ports []*Port `protobuf:"bytes,3,rep,name=ports,proto3" json:"ports,omitempty"` // Specify whether the service should be considered external to the mesh // or part of the mesh. Location ServiceEntry_Location `protobuf:"varint,4,opt,name=location,proto3,enum=istio.networking.v1alpha3.ServiceEntry_Location" json:"location,omitempty"` @@ -441,7 +452,7 @@ type ServiceEntry struct { // said port will be allowed (i.e. 0.0.0.0:). Resolution ServiceEntry_Resolution `protobuf:"varint,5,opt,name=resolution,proto3,enum=istio.networking.v1alpha3.ServiceEntry_Resolution" json:"resolution,omitempty"` // One or more endpoints associated with the service. - Endpoints []*ServiceEntry_Endpoint `protobuf:"bytes,6,rep,name=endpoints" json:"endpoints,omitempty"` + Endpoints []*ServiceEntry_Endpoint `protobuf:"bytes,6,rep,name=endpoints,proto3" json:"endpoints,omitempty"` // A list of namespaces to which this service is exported. Exporting a service // allows it to used by sidecars, gateways and virtual services defined in // other namespaces. This feature provides a mechanism for service owners @@ -458,19 +469,50 @@ type ServiceEntry struct { // For a Kubernetes Service the equivalent effect can be achieved by setting // the annotation "networking.istio.io/exportTo" to a comma-separated list // of namespace names. - ExportTo []string `protobuf:"bytes,7,rep,name=export_to,json=exportTo" json:"export_to,omitempty"` + ExportTo []string `protobuf:"bytes,7,rep,name=export_to,json=exportTo,proto3" json:"export_to,omitempty"` // The list of subject alternate names allowed for workloads that // implement this service. This information is used to enforce // secure-naming . // If specified, the proxy will verify that the server // certificate's subject alternate name matches one of the specified values. - SubjectAltNames []string `protobuf:"bytes,8,rep,name=subject_alt_names,json=subjectAltNames" json:"subject_alt_names,omitempty"` + SubjectAltNames []string `protobuf:"bytes,8,rep,name=subject_alt_names,json=subjectAltNames,proto3" json:"subject_alt_names,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` } -func (m *ServiceEntry) Reset() { *m = ServiceEntry{} } -func (m *ServiceEntry) String() string { return proto.CompactTextString(m) } -func (*ServiceEntry) ProtoMessage() {} -func (*ServiceEntry) Descriptor() ([]byte, []int) { return fileDescriptorServiceEntry, []int{0} } +func (m *ServiceEntry) Reset() { *m = ServiceEntry{} } +func (m *ServiceEntry) String() string { return proto.CompactTextString(m) } +func (*ServiceEntry) ProtoMessage() {} +func (*ServiceEntry) Descriptor() ([]byte, []int) { + return fileDescriptor_9220e0fa673c4bf8, []int{0} +} +func (m *ServiceEntry) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *ServiceEntry) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_ServiceEntry.Marshal(b, m, deterministic) + } else { + b = b[:cap(b)] + n, err := m.MarshalTo(b) + if err != nil { + return nil, err + } + return b[:n], nil + } +} +func (m *ServiceEntry) XXX_Merge(src proto.Message) { + xxx_messageInfo_ServiceEntry.Merge(m, src) +} +func (m *ServiceEntry) XXX_Size() int { + return m.Size() +} +func (m *ServiceEntry) XXX_DiscardUnknown() { + xxx_messageInfo_ServiceEntry.DiscardUnknown(m) +} + +var xxx_messageInfo_ServiceEntry proto.InternalMessageInfo func (m *ServiceEntry) GetHosts() []string { if m != nil { @@ -539,9 +581,9 @@ type ServiceEntry_Endpoint struct { // Set of ports associated with the endpoint. The ports must be // associated with a port name that was declared as part of the // service. Do not use for unix:// addresses. - Ports map[string]uint32 `protobuf:"bytes,2,rep,name=ports" json:"ports,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` + Ports map[string]uint32 `protobuf:"bytes,2,rep,name=ports,proto3" json:"ports,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` // One or more labels associated with the endpoint. - Labels map[string]string `protobuf:"bytes,3,rep,name=labels" json:"labels,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` + Labels map[string]string `protobuf:"bytes,3,rep,name=labels,proto3" json:"labels,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` // Network enables Istio to group endpoints resident in the same L3 // domain/network. All endpoints in the same network are assumed to be // directly reachable from one another. When endpoints in different @@ -571,15 +613,44 @@ type ServiceEntry_Endpoint struct { Locality string `protobuf:"bytes,5,opt,name=locality,proto3" json:"locality,omitempty"` // The load balancing weight associated with the endpoint. Endpoints // with higher weights will receive proportionally higher traffic. - Weight uint32 `protobuf:"varint,6,opt,name=weight,proto3" json:"weight,omitempty"` + Weight uint32 `protobuf:"varint,6,opt,name=weight,proto3" json:"weight,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` } func (m *ServiceEntry_Endpoint) Reset() { *m = ServiceEntry_Endpoint{} } func (m *ServiceEntry_Endpoint) String() string { return proto.CompactTextString(m) } func (*ServiceEntry_Endpoint) ProtoMessage() {} func (*ServiceEntry_Endpoint) Descriptor() ([]byte, []int) { - return fileDescriptorServiceEntry, []int{0, 0} + return fileDescriptor_9220e0fa673c4bf8, []int{0, 0} +} +func (m *ServiceEntry_Endpoint) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *ServiceEntry_Endpoint) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_ServiceEntry_Endpoint.Marshal(b, m, deterministic) + } else { + b = b[:cap(b)] + n, err := m.MarshalTo(b) + if err != nil { + return nil, err + } + return b[:n], nil + } +} +func (m *ServiceEntry_Endpoint) XXX_Merge(src proto.Message) { + xxx_messageInfo_ServiceEntry_Endpoint.Merge(m, src) +} +func (m *ServiceEntry_Endpoint) XXX_Size() int { + return m.Size() } +func (m *ServiceEntry_Endpoint) XXX_DiscardUnknown() { + xxx_messageInfo_ServiceEntry_Endpoint.DiscardUnknown(m) +} + +var xxx_messageInfo_ServiceEntry_Endpoint proto.InternalMessageInfo func (m *ServiceEntry_Endpoint) GetAddress() string { if m != nil { @@ -624,11 +695,55 @@ func (m *ServiceEntry_Endpoint) GetWeight() uint32 { } func init() { - proto.RegisterType((*ServiceEntry)(nil), "istio.networking.v1alpha3.ServiceEntry") - proto.RegisterType((*ServiceEntry_Endpoint)(nil), "istio.networking.v1alpha3.ServiceEntry.Endpoint") proto.RegisterEnum("istio.networking.v1alpha3.ServiceEntry_Location", ServiceEntry_Location_name, ServiceEntry_Location_value) proto.RegisterEnum("istio.networking.v1alpha3.ServiceEntry_Resolution", ServiceEntry_Resolution_name, ServiceEntry_Resolution_value) + proto.RegisterType((*ServiceEntry)(nil), "istio.networking.v1alpha3.ServiceEntry") + proto.RegisterType((*ServiceEntry_Endpoint)(nil), "istio.networking.v1alpha3.ServiceEntry.Endpoint") + proto.RegisterMapType((map[string]string)(nil), "istio.networking.v1alpha3.ServiceEntry.Endpoint.LabelsEntry") + proto.RegisterMapType((map[string]uint32)(nil), "istio.networking.v1alpha3.ServiceEntry.Endpoint.PortsEntry") } + +func init() { + proto.RegisterFile("networking/v1alpha3/service_entry.proto", fileDescriptor_9220e0fa673c4bf8) +} + +var fileDescriptor_9220e0fa673c4bf8 = []byte{ + // 527 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x93, 0xdf, 0x8e, 0xd2, 0x40, + 0x14, 0xc6, 0x77, 0xe8, 0x52, 0xda, 0xb3, 0xae, 0xb2, 0x13, 0x63, 0x46, 0x34, 0x58, 0xb9, 0x91, + 0x68, 0x52, 0x56, 0x36, 0x26, 0xeb, 0x9f, 0x1b, 0xd4, 0x26, 0x6e, 0x82, 0x55, 0x07, 0x2e, 0x8c, + 0x37, 0x64, 0x80, 0x09, 0xd4, 0xad, 0x1d, 0xd2, 0x19, 0x40, 0xde, 0xc2, 0xa7, 0xf0, 0x59, 0xbc, + 0xf4, 0x11, 0x0c, 0x4f, 0x62, 0x3a, 0x9d, 0x02, 0x17, 0xab, 0xbb, 0x7b, 0xd7, 0x73, 0xe6, 0x7c, + 0xbf, 0x7e, 0x73, 0xce, 0x19, 0x78, 0x94, 0x70, 0xb5, 0x14, 0xe9, 0x79, 0x94, 0x4c, 0x5a, 0x8b, + 0xa7, 0x2c, 0x9e, 0x4d, 0xd9, 0x49, 0x4b, 0xf2, 0x74, 0x11, 0x8d, 0xf8, 0x80, 0x27, 0x2a, 0x5d, + 0xf9, 0xb3, 0x54, 0x28, 0x81, 0xef, 0x46, 0x52, 0x45, 0xc2, 0xdf, 0x96, 0xfb, 0x45, 0x79, 0xed, + 0xe1, 0x45, 0x8c, 0x09, 0x53, 0x7c, 0xc9, 0x8c, 0xba, 0xf1, 0xb3, 0x02, 0x37, 0x7a, 0x39, 0x35, + 0xc8, 0xa0, 0xf8, 0x36, 0x94, 0xa7, 0x42, 0x2a, 0x49, 0x90, 0x67, 0x35, 0x5d, 0x9a, 0x07, 0xf8, + 0x3e, 0xb8, 0x6c, 0x3c, 0x4e, 0xb9, 0x94, 0x5c, 0x92, 0x92, 0x3e, 0xd9, 0x26, 0xf0, 0x33, 0x28, + 0xcf, 0x44, 0xaa, 0x24, 0xb1, 0x3c, 0xab, 0x79, 0xd0, 0x7e, 0xe0, 0xff, 0xd3, 0x92, 0xff, 0x51, + 0xa4, 0x8a, 0xe6, 0xd5, 0xb8, 0x0b, 0x4e, 0x2c, 0x46, 0x4c, 0x45, 0x22, 0x21, 0xfb, 0x1e, 0x6a, + 0xde, 0x6c, 0x1f, 0xff, 0x47, 0xb9, 0xeb, 0xd2, 0xef, 0x1a, 0x1d, 0xdd, 0x10, 0x30, 0x05, 0x48, + 0xb9, 0x14, 0xf1, 0x5c, 0xf3, 0xca, 0x9a, 0xd7, 0xbe, 0x2a, 0x8f, 0x6e, 0x94, 0x74, 0x87, 0x82, + 0x43, 0x70, 0x79, 0x32, 0x9e, 0x89, 0x28, 0x51, 0x92, 0xd8, 0xfa, 0x72, 0x57, 0xb6, 0x18, 0x18, + 0x21, 0xdd, 0x22, 0xf0, 0x3d, 0x70, 0xf9, 0xf7, 0xec, 0xf2, 0x03, 0x25, 0x48, 0x45, 0xb7, 0xd1, + 0xc9, 0x13, 0x7d, 0x81, 0x1f, 0xc3, 0x91, 0x9c, 0x0f, 0xbf, 0xf2, 0x91, 0x1a, 0xb0, 0x58, 0x0d, + 0x12, 0xf6, 0x8d, 0x4b, 0xe2, 0xe8, 0xa2, 0x5b, 0xe6, 0xa0, 0x13, 0xab, 0x30, 0x4b, 0xd7, 0x7e, + 0x58, 0xe0, 0x14, 0x3f, 0xc0, 0x04, 0x2a, 0x66, 0x16, 0x04, 0x79, 0xa8, 0xe9, 0xd2, 0x22, 0xc4, + 0x9f, 0x8a, 0xc1, 0x94, 0xb4, 0xf7, 0x97, 0xd7, 0xf5, 0xae, 0xc7, 0x25, 0x75, 0xae, 0x18, 0x5a, + 0x1f, 0xec, 0x98, 0x0d, 0x79, 0x5c, 0x0c, 0xfb, 0xd5, 0xb5, 0x99, 0x5d, 0x2d, 0xcf, 0xa1, 0x86, + 0x95, 0x5d, 0xc1, 0x00, 0xf4, 0x26, 0xb8, 0xb4, 0x08, 0x71, 0x2d, 0x5f, 0x92, 0x38, 0x52, 0x2b, + 0x3d, 0x54, 0x97, 0x6e, 0x62, 0x7c, 0x07, 0xec, 0x25, 0x8f, 0x26, 0x53, 0x45, 0x6c, 0x0f, 0x35, + 0x0f, 0xa9, 0x89, 0x6a, 0xa7, 0x00, 0x5b, 0xe3, 0xb8, 0x0a, 0xd6, 0x39, 0x5f, 0x99, 0xd6, 0x64, + 0x9f, 0xd9, 0x8e, 0x2f, 0x58, 0x3c, 0xe7, 0xa4, 0xa4, 0x65, 0x79, 0xf0, 0xa2, 0x74, 0x8a, 0x6a, + 0xcf, 0xe1, 0x60, 0xc7, 0xde, 0x65, 0x52, 0x77, 0x47, 0xda, 0x38, 0x06, 0xa7, 0xd8, 0x4a, 0x7c, + 0x04, 0x87, 0xef, 0x83, 0xde, 0xbb, 0x41, 0xf0, 0xb9, 0x1f, 0xd0, 0xb0, 0xd3, 0xad, 0xee, 0x6d, + 0x52, 0x67, 0xa1, 0x49, 0xa1, 0xc6, 0x13, 0x80, 0xed, 0xde, 0x61, 0x07, 0xf6, 0xc3, 0x0f, 0x61, + 0x50, 0xdd, 0xc3, 0x00, 0x76, 0xaf, 0xdf, 0xe9, 0x9f, 0xbd, 0xa9, 0x22, 0x5c, 0x01, 0xeb, 0x6d, + 0xd8, 0xab, 0x96, 0x5e, 0xfb, 0xbf, 0xd6, 0x75, 0xf4, 0x7b, 0x5d, 0x47, 0x7f, 0xd6, 0x75, 0xf4, + 0xc5, 0xcb, 0x9b, 0x1e, 0x89, 0x16, 0x9b, 0x45, 0xad, 0x0b, 0x9e, 0xf9, 0xd0, 0xd6, 0xef, 0xfb, + 0xe4, 0x6f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x10, 0x53, 0xa9, 0xc0, 0x48, 0x04, 0x00, 0x00, +} + func (m *ServiceEntry) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) @@ -738,6 +853,9 @@ func (m *ServiceEntry) MarshalTo(dAtA []byte) (int, error) { i += copy(dAtA[i:], s) } } + if m.XXX_unrecognized != nil { + i += copy(dAtA[i:], m.XXX_unrecognized) + } return i, nil } @@ -812,6 +930,9 @@ func (m *ServiceEntry_Endpoint) MarshalTo(dAtA []byte) (int, error) { i++ i = encodeVarintServiceEntry(dAtA, i, uint64(m.Weight)) } + if m.XXX_unrecognized != nil { + i += copy(dAtA[i:], m.XXX_unrecognized) + } return i, nil } @@ -825,6 +946,9 @@ func encodeVarintServiceEntry(dAtA []byte, offset int, v uint64) int { return offset + 1 } func (m *ServiceEntry) Size() (n int) { + if m == nil { + return 0 + } var l int _ = l if len(m.Hosts) > 0 { @@ -869,10 +993,16 @@ func (m *ServiceEntry) Size() (n int) { n += 1 + l + sovServiceEntry(uint64(l)) } } + if m.XXX_unrecognized != nil { + n += len(m.XXX_unrecognized) + } return n } func (m *ServiceEntry_Endpoint) Size() (n int) { + if m == nil { + return 0 + } var l int _ = l l = len(m.Address) @@ -906,6 +1036,9 @@ func (m *ServiceEntry_Endpoint) Size() (n int) { if m.Weight != 0 { n += 1 + sovServiceEntry(uint64(m.Weight)) } + if m.XXX_unrecognized != nil { + n += len(m.XXX_unrecognized) + } return n } @@ -937,7 +1070,7 @@ func (m *ServiceEntry) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - wire |= (uint64(b) & 0x7F) << shift + wire |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -965,7 +1098,7 @@ func (m *ServiceEntry) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLen |= (uint64(b) & 0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -975,6 +1108,9 @@ func (m *ServiceEntry) Unmarshal(dAtA []byte) error { return ErrInvalidLengthServiceEntry } postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthServiceEntry + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -994,7 +1130,7 @@ func (m *ServiceEntry) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLen |= (uint64(b) & 0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -1004,6 +1140,9 @@ func (m *ServiceEntry) Unmarshal(dAtA []byte) error { return ErrInvalidLengthServiceEntry } postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthServiceEntry + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -1023,7 +1162,7 @@ func (m *ServiceEntry) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - msglen |= (int(b) & 0x7F) << shift + msglen |= int(b&0x7F) << shift if b < 0x80 { break } @@ -1032,6 +1171,9 @@ func (m *ServiceEntry) Unmarshal(dAtA []byte) error { return ErrInvalidLengthServiceEntry } postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthServiceEntry + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -1054,7 +1196,7 @@ func (m *ServiceEntry) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - m.Location |= (ServiceEntry_Location(b) & 0x7F) << shift + m.Location |= ServiceEntry_Location(b&0x7F) << shift if b < 0x80 { break } @@ -1073,7 +1215,7 @@ func (m *ServiceEntry) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - m.Resolution |= (ServiceEntry_Resolution(b) & 0x7F) << shift + m.Resolution |= ServiceEntry_Resolution(b&0x7F) << shift if b < 0x80 { break } @@ -1092,7 +1234,7 @@ func (m *ServiceEntry) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - msglen |= (int(b) & 0x7F) << shift + msglen |= int(b&0x7F) << shift if b < 0x80 { break } @@ -1101,6 +1243,9 @@ func (m *ServiceEntry) Unmarshal(dAtA []byte) error { return ErrInvalidLengthServiceEntry } postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthServiceEntry + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -1123,7 +1268,7 @@ func (m *ServiceEntry) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLen |= (uint64(b) & 0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -1133,6 +1278,9 @@ func (m *ServiceEntry) Unmarshal(dAtA []byte) error { return ErrInvalidLengthServiceEntry } postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthServiceEntry + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -1152,7 +1300,7 @@ func (m *ServiceEntry) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLen |= (uint64(b) & 0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -1162,6 +1310,9 @@ func (m *ServiceEntry) Unmarshal(dAtA []byte) error { return ErrInvalidLengthServiceEntry } postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthServiceEntry + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -1176,9 +1327,13 @@ func (m *ServiceEntry) Unmarshal(dAtA []byte) error { if skippy < 0 { return ErrInvalidLengthServiceEntry } + if (iNdEx + skippy) < 0 { + return ErrInvalidLengthServiceEntry + } if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF } + m.XXX_unrecognized = append(m.XXX_unrecognized, dAtA[iNdEx:iNdEx+skippy]...) iNdEx += skippy } } @@ -1203,7 +1358,7 @@ func (m *ServiceEntry_Endpoint) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - wire |= (uint64(b) & 0x7F) << shift + wire |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -1231,7 +1386,7 @@ func (m *ServiceEntry_Endpoint) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLen |= (uint64(b) & 0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -1241,6 +1396,9 @@ func (m *ServiceEntry_Endpoint) Unmarshal(dAtA []byte) error { return ErrInvalidLengthServiceEntry } postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthServiceEntry + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -1260,7 +1418,7 @@ func (m *ServiceEntry_Endpoint) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - msglen |= (int(b) & 0x7F) << shift + msglen |= int(b&0x7F) << shift if b < 0x80 { break } @@ -1269,6 +1427,9 @@ func (m *ServiceEntry_Endpoint) Unmarshal(dAtA []byte) error { return ErrInvalidLengthServiceEntry } postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthServiceEntry + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -1289,7 +1450,7 @@ func (m *ServiceEntry_Endpoint) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - wire |= (uint64(b) & 0x7F) << shift + wire |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -1306,7 +1467,7 @@ func (m *ServiceEntry_Endpoint) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLenmapkey |= (uint64(b) & 0x7F) << shift + stringLenmapkey |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -1316,6 +1477,9 @@ func (m *ServiceEntry_Endpoint) Unmarshal(dAtA []byte) error { return ErrInvalidLengthServiceEntry } postStringIndexmapkey := iNdEx + intStringLenmapkey + if postStringIndexmapkey < 0 { + return ErrInvalidLengthServiceEntry + } if postStringIndexmapkey > l { return io.ErrUnexpectedEOF } @@ -1331,7 +1495,7 @@ func (m *ServiceEntry_Endpoint) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - mapvalue |= (uint32(b) & 0x7F) << shift + mapvalue |= uint32(b&0x7F) << shift if b < 0x80 { break } @@ -1367,7 +1531,7 @@ func (m *ServiceEntry_Endpoint) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - msglen |= (int(b) & 0x7F) << shift + msglen |= int(b&0x7F) << shift if b < 0x80 { break } @@ -1376,6 +1540,9 @@ func (m *ServiceEntry_Endpoint) Unmarshal(dAtA []byte) error { return ErrInvalidLengthServiceEntry } postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthServiceEntry + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -1396,7 +1563,7 @@ func (m *ServiceEntry_Endpoint) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - wire |= (uint64(b) & 0x7F) << shift + wire |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -1413,7 +1580,7 @@ func (m *ServiceEntry_Endpoint) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLenmapkey |= (uint64(b) & 0x7F) << shift + stringLenmapkey |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -1423,6 +1590,9 @@ func (m *ServiceEntry_Endpoint) Unmarshal(dAtA []byte) error { return ErrInvalidLengthServiceEntry } postStringIndexmapkey := iNdEx + intStringLenmapkey + if postStringIndexmapkey < 0 { + return ErrInvalidLengthServiceEntry + } if postStringIndexmapkey > l { return io.ErrUnexpectedEOF } @@ -1439,7 +1609,7 @@ func (m *ServiceEntry_Endpoint) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLenmapvalue |= (uint64(b) & 0x7F) << shift + stringLenmapvalue |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -1449,6 +1619,9 @@ func (m *ServiceEntry_Endpoint) Unmarshal(dAtA []byte) error { return ErrInvalidLengthServiceEntry } postStringIndexmapvalue := iNdEx + intStringLenmapvalue + if postStringIndexmapvalue < 0 { + return ErrInvalidLengthServiceEntry + } if postStringIndexmapvalue > l { return io.ErrUnexpectedEOF } @@ -1485,7 +1658,7 @@ func (m *ServiceEntry_Endpoint) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLen |= (uint64(b) & 0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -1495,6 +1668,9 @@ func (m *ServiceEntry_Endpoint) Unmarshal(dAtA []byte) error { return ErrInvalidLengthServiceEntry } postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthServiceEntry + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -1514,7 +1690,7 @@ func (m *ServiceEntry_Endpoint) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLen |= (uint64(b) & 0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -1524,6 +1700,9 @@ func (m *ServiceEntry_Endpoint) Unmarshal(dAtA []byte) error { return ErrInvalidLengthServiceEntry } postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthServiceEntry + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -1543,7 +1722,7 @@ func (m *ServiceEntry_Endpoint) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - m.Weight |= (uint32(b) & 0x7F) << shift + m.Weight |= uint32(b&0x7F) << shift if b < 0x80 { break } @@ -1557,9 +1736,13 @@ func (m *ServiceEntry_Endpoint) Unmarshal(dAtA []byte) error { if skippy < 0 { return ErrInvalidLengthServiceEntry } + if (iNdEx + skippy) < 0 { + return ErrInvalidLengthServiceEntry + } if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF } + m.XXX_unrecognized = append(m.XXX_unrecognized, dAtA[iNdEx:iNdEx+skippy]...) iNdEx += skippy } } @@ -1623,10 +1806,13 @@ func skipServiceEntry(dAtA []byte) (n int, err error) { break } } - iNdEx += length if length < 0 { return 0, ErrInvalidLengthServiceEntry } + iNdEx += length + if iNdEx < 0 { + return 0, ErrInvalidLengthServiceEntry + } return iNdEx, nil case 3: for { @@ -1655,6 +1841,9 @@ func skipServiceEntry(dAtA []byte) (n int, err error) { return 0, err } iNdEx = start + next + if iNdEx < 0 { + return 0, ErrInvalidLengthServiceEntry + } } return iNdEx, nil case 4: @@ -1673,42 +1862,3 @@ var ( ErrInvalidLengthServiceEntry = fmt.Errorf("proto: negative length found during unmarshaling") ErrIntOverflowServiceEntry = fmt.Errorf("proto: integer overflow") ) - -func init() { proto.RegisterFile("networking/v1alpha3/service_entry.proto", fileDescriptorServiceEntry) } - -var fileDescriptorServiceEntry = []byte{ - // 527 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x93, 0xdf, 0x8e, 0xd2, 0x40, - 0x14, 0xc6, 0x77, 0xe8, 0x52, 0xda, 0xb3, 0xae, 0xb2, 0x13, 0x63, 0x46, 0x34, 0x58, 0xb9, 0x91, - 0x68, 0x52, 0x56, 0x36, 0x26, 0xeb, 0x9f, 0x1b, 0xd4, 0x26, 0x6e, 0x82, 0x55, 0x07, 0x2e, 0x8c, - 0x37, 0x64, 0x80, 0x09, 0xd4, 0xad, 0x1d, 0xd2, 0x19, 0x40, 0xde, 0xc2, 0xa7, 0xf0, 0x59, 0xbc, - 0xf4, 0x11, 0x0c, 0x4f, 0x62, 0x3a, 0x9d, 0x02, 0x17, 0xab, 0xbb, 0x7b, 0xd7, 0x73, 0xe6, 0x7c, - 0xbf, 0x7e, 0x73, 0xce, 0x19, 0x78, 0x94, 0x70, 0xb5, 0x14, 0xe9, 0x79, 0x94, 0x4c, 0x5a, 0x8b, - 0xa7, 0x2c, 0x9e, 0x4d, 0xd9, 0x49, 0x4b, 0xf2, 0x74, 0x11, 0x8d, 0xf8, 0x80, 0x27, 0x2a, 0x5d, - 0xf9, 0xb3, 0x54, 0x28, 0x81, 0xef, 0x46, 0x52, 0x45, 0xc2, 0xdf, 0x96, 0xfb, 0x45, 0x79, 0xed, - 0xe1, 0x45, 0x8c, 0x09, 0x53, 0x7c, 0xc9, 0x8c, 0xba, 0xf1, 0xb3, 0x02, 0x37, 0x7a, 0x39, 0x35, - 0xc8, 0xa0, 0xf8, 0x36, 0x94, 0xa7, 0x42, 0x2a, 0x49, 0x90, 0x67, 0x35, 0x5d, 0x9a, 0x07, 0xf8, - 0x3e, 0xb8, 0x6c, 0x3c, 0x4e, 0xb9, 0x94, 0x5c, 0x92, 0x92, 0x3e, 0xd9, 0x26, 0xf0, 0x33, 0x28, - 0xcf, 0x44, 0xaa, 0x24, 0xb1, 0x3c, 0xab, 0x79, 0xd0, 0x7e, 0xe0, 0xff, 0xd3, 0x92, 0xff, 0x51, - 0xa4, 0x8a, 0xe6, 0xd5, 0xb8, 0x0b, 0x4e, 0x2c, 0x46, 0x4c, 0x45, 0x22, 0x21, 0xfb, 0x1e, 0x6a, - 0xde, 0x6c, 0x1f, 0xff, 0x47, 0xb9, 0xeb, 0xd2, 0xef, 0x1a, 0x1d, 0xdd, 0x10, 0x30, 0x05, 0x48, - 0xb9, 0x14, 0xf1, 0x5c, 0xf3, 0xca, 0x9a, 0xd7, 0xbe, 0x2a, 0x8f, 0x6e, 0x94, 0x74, 0x87, 0x82, - 0x43, 0x70, 0x79, 0x32, 0x9e, 0x89, 0x28, 0x51, 0x92, 0xd8, 0xfa, 0x72, 0x57, 0xb6, 0x18, 0x18, - 0x21, 0xdd, 0x22, 0xf0, 0x3d, 0x70, 0xf9, 0xf7, 0xec, 0xf2, 0x03, 0x25, 0x48, 0x45, 0xb7, 0xd1, - 0xc9, 0x13, 0x7d, 0x81, 0x1f, 0xc3, 0x91, 0x9c, 0x0f, 0xbf, 0xf2, 0x91, 0x1a, 0xb0, 0x58, 0x0d, - 0x12, 0xf6, 0x8d, 0x4b, 0xe2, 0xe8, 0xa2, 0x5b, 0xe6, 0xa0, 0x13, 0xab, 0x30, 0x4b, 0xd7, 0x7e, - 0x58, 0xe0, 0x14, 0x3f, 0xc0, 0x04, 0x2a, 0x66, 0x16, 0x04, 0x79, 0xa8, 0xe9, 0xd2, 0x22, 0xc4, - 0x9f, 0x8a, 0xc1, 0x94, 0xb4, 0xf7, 0x97, 0xd7, 0xf5, 0xae, 0xc7, 0x25, 0x75, 0xae, 0x18, 0x5a, - 0x1f, 0xec, 0x98, 0x0d, 0x79, 0x5c, 0x0c, 0xfb, 0xd5, 0xb5, 0x99, 0x5d, 0x2d, 0xcf, 0xa1, 0x86, - 0x95, 0x5d, 0xc1, 0x00, 0xf4, 0x26, 0xb8, 0xb4, 0x08, 0x71, 0x2d, 0x5f, 0x92, 0x38, 0x52, 0x2b, - 0x3d, 0x54, 0x97, 0x6e, 0x62, 0x7c, 0x07, 0xec, 0x25, 0x8f, 0x26, 0x53, 0x45, 0x6c, 0x0f, 0x35, - 0x0f, 0xa9, 0x89, 0x6a, 0xa7, 0x00, 0x5b, 0xe3, 0xb8, 0x0a, 0xd6, 0x39, 0x5f, 0x99, 0xd6, 0x64, - 0x9f, 0xd9, 0x8e, 0x2f, 0x58, 0x3c, 0xe7, 0xa4, 0xa4, 0x65, 0x79, 0xf0, 0xa2, 0x74, 0x8a, 0x6a, - 0xcf, 0xe1, 0x60, 0xc7, 0xde, 0x65, 0x52, 0x77, 0x47, 0xda, 0x38, 0x06, 0xa7, 0xd8, 0x4a, 0x7c, - 0x04, 0x87, 0xef, 0x83, 0xde, 0xbb, 0x41, 0xf0, 0xb9, 0x1f, 0xd0, 0xb0, 0xd3, 0xad, 0xee, 0x6d, - 0x52, 0x67, 0xa1, 0x49, 0xa1, 0xc6, 0x13, 0x80, 0xed, 0xde, 0x61, 0x07, 0xf6, 0xc3, 0x0f, 0x61, - 0x50, 0xdd, 0xc3, 0x00, 0x76, 0xaf, 0xdf, 0xe9, 0x9f, 0xbd, 0xa9, 0x22, 0x5c, 0x01, 0xeb, 0x6d, - 0xd8, 0xab, 0x96, 0x5e, 0xfb, 0xbf, 0xd6, 0x75, 0xf4, 0x7b, 0x5d, 0x47, 0x7f, 0xd6, 0x75, 0xf4, - 0xc5, 0xcb, 0x9b, 0x1e, 0x89, 0x16, 0x9b, 0x45, 0xad, 0x0b, 0x9e, 0xf9, 0xd0, 0xd6, 0xef, 0xfb, - 0xe4, 0x6f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x10, 0x53, 0xa9, 0xc0, 0x48, 0x04, 0x00, 0x00, -} diff --git a/networking/v1alpha3/sidecar.pb.go b/networking/v1alpha3/sidecar.pb.go index 81feff98ba7..70b52cdf959 100644 --- a/networking/v1alpha3/sidecar.pb.go +++ b/networking/v1alpha3/sidecar.pb.go @@ -3,17 +3,24 @@ package v1alpha3 -import proto "github.com/gogo/protobuf/proto" -import fmt "fmt" -import math "math" - -import io "io" +import ( + fmt "fmt" + proto "github.com/gogo/protobuf/proto" + io "io" + math "math" +) // Reference imports to suppress errors if they are not otherwise used. var _ = proto.Marshal var _ = fmt.Errorf var _ = math.Inf +// This is a compile-time assertion to ensure that this generated file +// is compatible with the proto package it is being compiled against. +// A compilation error at this line likely means your copy of the +// proto package needs to be updated. +const _ = proto.GoGoProtoPackageIsVersion2 // please upgrade the proto package + // CaptureMode describes how traffic to a listener is expected to be // captured. Applicable only when the listener is bound to an IP. type CaptureMode int32 @@ -36,6 +43,7 @@ var CaptureMode_name = map[int32]string{ 1: "IPTABLES", 2: "NONE", } + var CaptureMode_value = map[string]int32{ "DEFAULT": 0, "IPTABLES": 1, @@ -45,7 +53,10 @@ var CaptureMode_value = map[string]int32{ func (x CaptureMode) String() string { return proto.EnumName(CaptureMode_name, int32(x)) } -func (CaptureMode) EnumDescriptor() ([]byte, []int) { return fileDescriptorSidecar, []int{0} } + +func (CaptureMode) EnumDescriptor() ([]byte, []int) { + return fileDescriptor_b5c11342f04ad3d1, []int{0} +} // `Sidecar` describes the configuration of the sidecar proxy that mediates // inbound and outbound communication to the workload it is attached to. By @@ -129,24 +140,55 @@ type Sidecar struct { // sidecar configuration should be applied. If omitted, the sidecar // configuration will be applied to all workloads in the same config // namespace. - WorkloadSelector *WorkloadSelector `protobuf:"bytes,1,opt,name=workload_selector,json=workloadSelector" json:"workload_selector,omitempty"` + WorkloadSelector *WorkloadSelector `protobuf:"bytes,1,opt,name=workload_selector,json=workloadSelector,proto3" json:"workload_selector,omitempty"` // Ingress specifies the configuration of the sidecar for processing // inbound traffic to the attached workload. If omitted, Istio will // autoconfigure the sidecar based on the information about the workload // obtained from the orchestration platform (e.g., exposed ports, services, // etc.). - Ingress []*IstioIngressListener `protobuf:"bytes,2,rep,name=ingress" json:"ingress,omitempty"` + Ingress []*IstioIngressListener `protobuf:"bytes,2,rep,name=ingress,proto3" json:"ingress,omitempty"` // Egress specifies the configuration of the sidecar for processing // outbound traffic from the attached workload to other services in the // mesh. If omitted, Istio will autoconfigure the sidecar to be able to // reach every service in the mesh that is visible to this namespace. - Egress []*IstioEgressListener `protobuf:"bytes,3,rep,name=egress" json:"egress,omitempty"` + Egress []*IstioEgressListener `protobuf:"bytes,3,rep,name=egress,proto3" json:"egress,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` +} + +func (m *Sidecar) Reset() { *m = Sidecar{} } +func (m *Sidecar) String() string { return proto.CompactTextString(m) } +func (*Sidecar) ProtoMessage() {} +func (*Sidecar) Descriptor() ([]byte, []int) { + return fileDescriptor_b5c11342f04ad3d1, []int{0} +} +func (m *Sidecar) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *Sidecar) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_Sidecar.Marshal(b, m, deterministic) + } else { + b = b[:cap(b)] + n, err := m.MarshalTo(b) + if err != nil { + return nil, err + } + return b[:n], nil + } +} +func (m *Sidecar) XXX_Merge(src proto.Message) { + xxx_messageInfo_Sidecar.Merge(m, src) +} +func (m *Sidecar) XXX_Size() int { + return m.Size() +} +func (m *Sidecar) XXX_DiscardUnknown() { + xxx_messageInfo_Sidecar.DiscardUnknown(m) } -func (m *Sidecar) Reset() { *m = Sidecar{} } -func (m *Sidecar) String() string { return proto.CompactTextString(m) } -func (*Sidecar) ProtoMessage() {} -func (*Sidecar) Descriptor() ([]byte, []int) { return fileDescriptorSidecar, []int{0} } +var xxx_messageInfo_Sidecar proto.InternalMessageInfo func (m *Sidecar) GetWorkloadSelector() *WorkloadSelector { if m != nil { @@ -175,7 +217,7 @@ type IstioIngressListener struct { // REQUIRED. The port associated with the listener. If using // unix domain socket, use 0 as the port number, with a valid // protocol. - Port *Port `protobuf:"bytes,1,opt,name=port" json:"port,omitempty"` + Port *Port `protobuf:"bytes,1,opt,name=port,proto3" json:"port,omitempty"` // The ip or the unix domain socket to which the listener should be bound // to. Format: x.x.x.x or unix:///path/to/uds or unix://@foobar (Linux // abstract namespace). If omitted, Istio will autoconfigure the defaults @@ -191,13 +233,44 @@ type IstioIngressListener struct { // redirect traffic arriving at the bind point on the sidecar to a port // or unix domain socket where the application workload is listening for // connections. Format should be 127.0.0.1:PORT or unix:///path/to/socket - DefaultEndpoint string `protobuf:"bytes,4,opt,name=default_endpoint,json=defaultEndpoint,proto3" json:"default_endpoint,omitempty"` + DefaultEndpoint string `protobuf:"bytes,4,opt,name=default_endpoint,json=defaultEndpoint,proto3" json:"default_endpoint,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` } -func (m *IstioIngressListener) Reset() { *m = IstioIngressListener{} } -func (m *IstioIngressListener) String() string { return proto.CompactTextString(m) } -func (*IstioIngressListener) ProtoMessage() {} -func (*IstioIngressListener) Descriptor() ([]byte, []int) { return fileDescriptorSidecar, []int{1} } +func (m *IstioIngressListener) Reset() { *m = IstioIngressListener{} } +func (m *IstioIngressListener) String() string { return proto.CompactTextString(m) } +func (*IstioIngressListener) ProtoMessage() {} +func (*IstioIngressListener) Descriptor() ([]byte, []int) { + return fileDescriptor_b5c11342f04ad3d1, []int{1} +} +func (m *IstioIngressListener) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *IstioIngressListener) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_IstioIngressListener.Marshal(b, m, deterministic) + } else { + b = b[:cap(b)] + n, err := m.MarshalTo(b) + if err != nil { + return nil, err + } + return b[:n], nil + } +} +func (m *IstioIngressListener) XXX_Merge(src proto.Message) { + xxx_messageInfo_IstioIngressListener.Merge(m, src) +} +func (m *IstioIngressListener) XXX_Size() int { + return m.Size() +} +func (m *IstioIngressListener) XXX_DiscardUnknown() { + xxx_messageInfo_IstioIngressListener.DiscardUnknown(m) +} + +var xxx_messageInfo_IstioIngressListener proto.InternalMessageInfo func (m *IstioIngressListener) GetPort() *Port { if m != nil { @@ -239,7 +312,7 @@ type IstioEgressListener struct { // specific ports while others have no port, the hosts exposed on a // listener port will be based on the listener with the most specific // port. - Port *Port `protobuf:"bytes,1,opt,name=port" json:"port,omitempty"` + Port *Port `protobuf:"bytes,1,opt,name=port,proto3" json:"port,omitempty"` // The ip or the unix domain socket to which the listener should be bound // to. Port MUST be specified if bind is not empty. Format: x.x.x.x or // unix:///path/to/uds or unix://@foobar (Linux abstract namespace). If @@ -270,13 +343,44 @@ type IstioEgressListener struct { // namespace can be imported. Private services/configuration will not be // imported. Refer to the scope setting associated with VirtualService, // DestinationRule, ServiceEntry, etc. for details. - Hosts []string `protobuf:"bytes,4,rep,name=hosts" json:"hosts,omitempty"` + Hosts []string `protobuf:"bytes,4,rep,name=hosts,proto3" json:"hosts,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` } -func (m *IstioEgressListener) Reset() { *m = IstioEgressListener{} } -func (m *IstioEgressListener) String() string { return proto.CompactTextString(m) } -func (*IstioEgressListener) ProtoMessage() {} -func (*IstioEgressListener) Descriptor() ([]byte, []int) { return fileDescriptorSidecar, []int{2} } +func (m *IstioEgressListener) Reset() { *m = IstioEgressListener{} } +func (m *IstioEgressListener) String() string { return proto.CompactTextString(m) } +func (*IstioEgressListener) ProtoMessage() {} +func (*IstioEgressListener) Descriptor() ([]byte, []int) { + return fileDescriptor_b5c11342f04ad3d1, []int{2} +} +func (m *IstioEgressListener) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *IstioEgressListener) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_IstioEgressListener.Marshal(b, m, deterministic) + } else { + b = b[:cap(b)] + n, err := m.MarshalTo(b) + if err != nil { + return nil, err + } + return b[:n], nil + } +} +func (m *IstioEgressListener) XXX_Merge(src proto.Message) { + xxx_messageInfo_IstioEgressListener.Merge(m, src) +} +func (m *IstioEgressListener) XXX_Size() int { + return m.Size() +} +func (m *IstioEgressListener) XXX_DiscardUnknown() { + xxx_messageInfo_IstioEgressListener.DiscardUnknown(m) +} + +var xxx_messageInfo_IstioEgressListener proto.InternalMessageInfo func (m *IstioEgressListener) GetPort() *Port { if m != nil { @@ -318,13 +422,44 @@ type WorkloadSelector struct { // on which this sidecar configuration should be applied. The scope of // label search is restricted to the configuration namespace in which the // the resource is present. - Labels map[string]string `protobuf:"bytes,1,rep,name=labels" json:"labels,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` + Labels map[string]string `protobuf:"bytes,1,rep,name=labels,proto3" json:"labels,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` } -func (m *WorkloadSelector) Reset() { *m = WorkloadSelector{} } -func (m *WorkloadSelector) String() string { return proto.CompactTextString(m) } -func (*WorkloadSelector) ProtoMessage() {} -func (*WorkloadSelector) Descriptor() ([]byte, []int) { return fileDescriptorSidecar, []int{3} } +func (m *WorkloadSelector) Reset() { *m = WorkloadSelector{} } +func (m *WorkloadSelector) String() string { return proto.CompactTextString(m) } +func (*WorkloadSelector) ProtoMessage() {} +func (*WorkloadSelector) Descriptor() ([]byte, []int) { + return fileDescriptor_b5c11342f04ad3d1, []int{3} +} +func (m *WorkloadSelector) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *WorkloadSelector) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_WorkloadSelector.Marshal(b, m, deterministic) + } else { + b = b[:cap(b)] + n, err := m.MarshalTo(b) + if err != nil { + return nil, err + } + return b[:n], nil + } +} +func (m *WorkloadSelector) XXX_Merge(src proto.Message) { + xxx_messageInfo_WorkloadSelector.Merge(m, src) +} +func (m *WorkloadSelector) XXX_Size() int { + return m.Size() +} +func (m *WorkloadSelector) XXX_DiscardUnknown() { + xxx_messageInfo_WorkloadSelector.DiscardUnknown(m) +} + +var xxx_messageInfo_WorkloadSelector proto.InternalMessageInfo func (m *WorkloadSelector) GetLabels() map[string]string { if m != nil { @@ -334,12 +469,50 @@ func (m *WorkloadSelector) GetLabels() map[string]string { } func init() { + proto.RegisterEnum("istio.networking.v1alpha3.CaptureMode", CaptureMode_name, CaptureMode_value) proto.RegisterType((*Sidecar)(nil), "istio.networking.v1alpha3.Sidecar") proto.RegisterType((*IstioIngressListener)(nil), "istio.networking.v1alpha3.IstioIngressListener") proto.RegisterType((*IstioEgressListener)(nil), "istio.networking.v1alpha3.IstioEgressListener") proto.RegisterType((*WorkloadSelector)(nil), "istio.networking.v1alpha3.WorkloadSelector") - proto.RegisterEnum("istio.networking.v1alpha3.CaptureMode", CaptureMode_name, CaptureMode_value) + proto.RegisterMapType((map[string]string)(nil), "istio.networking.v1alpha3.WorkloadSelector.LabelsEntry") +} + +func init() { proto.RegisterFile("networking/v1alpha3/sidecar.proto", fileDescriptor_b5c11342f04ad3d1) } + +var fileDescriptor_b5c11342f04ad3d1 = []byte{ + // 465 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x93, 0x4f, 0x6f, 0xd3, 0x30, + 0x18, 0xc6, 0x71, 0x13, 0xda, 0xf5, 0xcd, 0x04, 0xc1, 0xec, 0x10, 0x76, 0x28, 0xa1, 0x07, 0x14, + 0x40, 0x4a, 0x44, 0x7b, 0xe0, 0xcf, 0x6d, 0x83, 0x4c, 0x8a, 0x54, 0xb6, 0x29, 0x1d, 0x02, 0x71, + 0xa9, 0xdc, 0xe6, 0xa5, 0xb3, 0x16, 0xe2, 0xc8, 0x76, 0x57, 0xf5, 0xcb, 0xf0, 0x55, 0xb8, 0x72, + 0xe4, 0xc2, 0x1d, 0xf5, 0x43, 0x70, 0x46, 0x4d, 0x3c, 0x6d, 0x4c, 0xa5, 0x88, 0x1b, 0x37, 0xbf, + 0x6f, 0x9e, 0xe7, 0xf7, 0xfa, 0x89, 0x6d, 0x78, 0x50, 0xa0, 0x9e, 0x0b, 0x79, 0xc6, 0x8b, 0x69, + 0x74, 0xfe, 0x94, 0xe5, 0xe5, 0x29, 0xeb, 0x47, 0x8a, 0x67, 0x38, 0x61, 0x32, 0x2c, 0xa5, 0xd0, + 0x82, 0xde, 0xe3, 0x4a, 0x73, 0x11, 0x5e, 0x0a, 0xc3, 0x0b, 0xe1, 0xee, 0x5a, 0xf7, 0x94, 0x69, + 0x9c, 0xb3, 0x45, 0xed, 0xee, 0xfe, 0x24, 0xd0, 0x1a, 0xd6, 0x3c, 0xfa, 0x1e, 0xee, 0xac, 0xd4, + 0xb9, 0x60, 0xd9, 0x48, 0x61, 0x8e, 0x13, 0x2d, 0xa4, 0x47, 0x7c, 0x12, 0x38, 0xbd, 0x27, 0xe1, + 0x1f, 0xa7, 0x84, 0xef, 0x8c, 0x67, 0x68, 0x2c, 0xa9, 0x3b, 0xbf, 0xd6, 0xa1, 0x09, 0xb4, 0x78, + 0x31, 0x95, 0xa8, 0x94, 0xd7, 0xf0, 0xad, 0xc0, 0xe9, 0x45, 0x1b, 0x78, 0xc9, 0xea, 0x4b, 0x52, + 0xcb, 0x07, 0x5c, 0x69, 0x2c, 0x50, 0xa6, 0x17, 0x7e, 0x7a, 0x00, 0x4d, 0xac, 0x49, 0x56, 0x45, + 0x0a, 0xff, 0x46, 0x8a, 0x7f, 0x07, 0x19, 0x77, 0xf7, 0x3b, 0x81, 0x9d, 0x75, 0x93, 0x68, 0x1f, + 0xec, 0x52, 0x48, 0x6d, 0x82, 0xdf, 0xdf, 0x80, 0x3f, 0x16, 0x52, 0xa7, 0x95, 0x98, 0x52, 0xb0, + 0xc7, 0xbc, 0xc8, 0xbc, 0x86, 0x4f, 0x82, 0x76, 0x5a, 0xad, 0x69, 0x02, 0xdb, 0x13, 0x56, 0xea, + 0x99, 0xc4, 0xd1, 0x27, 0x91, 0xa1, 0x67, 0xf9, 0x24, 0xb8, 0xd5, 0x7b, 0xb8, 0x01, 0xf8, 0xaa, + 0x96, 0xbf, 0x11, 0x19, 0xa6, 0xce, 0xe4, 0xb2, 0xa0, 0x8f, 0xc0, 0xcd, 0xf0, 0x23, 0x9b, 0xe5, + 0x7a, 0x84, 0x45, 0x56, 0x0a, 0x5e, 0x68, 0xcf, 0xae, 0x46, 0xdd, 0x36, 0xfd, 0xd8, 0xb4, 0xbb, + 0x5f, 0x08, 0xdc, 0x5d, 0x93, 0xfb, 0xbf, 0x8c, 0xb5, 0x03, 0x37, 0x4f, 0x85, 0xd2, 0xca, 0xb3, + 0x7d, 0x2b, 0x68, 0xa7, 0x75, 0xd1, 0xfd, 0x4c, 0xc0, 0xbd, 0x7e, 0xa7, 0xe8, 0x11, 0x34, 0x73, + 0x36, 0xc6, 0x5c, 0x79, 0xa4, 0x3a, 0xf6, 0x67, 0xff, 0x70, 0x21, 0xc3, 0x41, 0xe5, 0x8c, 0x0b, + 0x2d, 0x17, 0xa9, 0xc1, 0xec, 0xbe, 0x00, 0xe7, 0x4a, 0x9b, 0xba, 0x60, 0x9d, 0xe1, 0xa2, 0xfa, + 0x3b, 0xed, 0x74, 0xb5, 0x5c, 0x6d, 0xee, 0x9c, 0xe5, 0x33, 0x34, 0xe1, 0xeb, 0xe2, 0x65, 0xe3, + 0x39, 0x79, 0xdc, 0x03, 0xe7, 0x4a, 0x24, 0xea, 0x40, 0xeb, 0x75, 0x7c, 0xb0, 0xf7, 0x76, 0x70, + 0xe2, 0xde, 0xa0, 0xdb, 0xb0, 0x95, 0x1c, 0x9f, 0xec, 0xed, 0x0f, 0xe2, 0xa1, 0x4b, 0xe8, 0x16, + 0xd8, 0x87, 0x47, 0x87, 0xb1, 0xdb, 0xd8, 0x0f, 0xbf, 0x2e, 0x3b, 0xe4, 0xdb, 0xb2, 0x43, 0x7e, + 0x2c, 0x3b, 0xe4, 0x83, 0x5f, 0x6f, 0x9e, 0x8b, 0x88, 0x95, 0x3c, 0x5a, 0xf3, 0x4a, 0xc7, 0xcd, + 0xea, 0x79, 0xf6, 0x7f, 0x05, 0x00, 0x00, 0xff, 0xff, 0x32, 0x9f, 0xa8, 0x1c, 0x01, 0x04, 0x00, + 0x00, } + func (m *Sidecar) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) @@ -389,6 +562,9 @@ func (m *Sidecar) MarshalTo(dAtA []byte) (int, error) { i += n } } + if m.XXX_unrecognized != nil { + i += copy(dAtA[i:], m.XXX_unrecognized) + } return i, nil } @@ -434,6 +610,9 @@ func (m *IstioIngressListener) MarshalTo(dAtA []byte) (int, error) { i = encodeVarintSidecar(dAtA, i, uint64(len(m.DefaultEndpoint))) i += copy(dAtA[i:], m.DefaultEndpoint) } + if m.XXX_unrecognized != nil { + i += copy(dAtA[i:], m.XXX_unrecognized) + } return i, nil } @@ -488,6 +667,9 @@ func (m *IstioEgressListener) MarshalTo(dAtA []byte) (int, error) { i += copy(dAtA[i:], s) } } + if m.XXX_unrecognized != nil { + i += copy(dAtA[i:], m.XXX_unrecognized) + } return i, nil } @@ -523,6 +705,9 @@ func (m *WorkloadSelector) MarshalTo(dAtA []byte) (int, error) { i += copy(dAtA[i:], v) } } + if m.XXX_unrecognized != nil { + i += copy(dAtA[i:], m.XXX_unrecognized) + } return i, nil } @@ -536,6 +721,9 @@ func encodeVarintSidecar(dAtA []byte, offset int, v uint64) int { return offset + 1 } func (m *Sidecar) Size() (n int) { + if m == nil { + return 0 + } var l int _ = l if m.WorkloadSelector != nil { @@ -554,10 +742,16 @@ func (m *Sidecar) Size() (n int) { n += 1 + l + sovSidecar(uint64(l)) } } + if m.XXX_unrecognized != nil { + n += len(m.XXX_unrecognized) + } return n } func (m *IstioIngressListener) Size() (n int) { + if m == nil { + return 0 + } var l int _ = l if m.Port != nil { @@ -575,10 +769,16 @@ func (m *IstioIngressListener) Size() (n int) { if l > 0 { n += 1 + l + sovSidecar(uint64(l)) } + if m.XXX_unrecognized != nil { + n += len(m.XXX_unrecognized) + } return n } func (m *IstioEgressListener) Size() (n int) { + if m == nil { + return 0 + } var l int _ = l if m.Port != nil { @@ -598,10 +798,16 @@ func (m *IstioEgressListener) Size() (n int) { n += 1 + l + sovSidecar(uint64(l)) } } + if m.XXX_unrecognized != nil { + n += len(m.XXX_unrecognized) + } return n } func (m *WorkloadSelector) Size() (n int) { + if m == nil { + return 0 + } var l int _ = l if len(m.Labels) > 0 { @@ -612,6 +818,9 @@ func (m *WorkloadSelector) Size() (n int) { n += mapEntrySize + 1 + sovSidecar(uint64(mapEntrySize)) } } + if m.XXX_unrecognized != nil { + n += len(m.XXX_unrecognized) + } return n } @@ -643,7 +852,7 @@ func (m *Sidecar) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - wire |= (uint64(b) & 0x7F) << shift + wire |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -671,7 +880,7 @@ func (m *Sidecar) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - msglen |= (int(b) & 0x7F) << shift + msglen |= int(b&0x7F) << shift if b < 0x80 { break } @@ -680,6 +889,9 @@ func (m *Sidecar) Unmarshal(dAtA []byte) error { return ErrInvalidLengthSidecar } postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthSidecar + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -704,7 +916,7 @@ func (m *Sidecar) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - msglen |= (int(b) & 0x7F) << shift + msglen |= int(b&0x7F) << shift if b < 0x80 { break } @@ -713,6 +925,9 @@ func (m *Sidecar) Unmarshal(dAtA []byte) error { return ErrInvalidLengthSidecar } postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthSidecar + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -735,7 +950,7 @@ func (m *Sidecar) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - msglen |= (int(b) & 0x7F) << shift + msglen |= int(b&0x7F) << shift if b < 0x80 { break } @@ -744,6 +959,9 @@ func (m *Sidecar) Unmarshal(dAtA []byte) error { return ErrInvalidLengthSidecar } postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthSidecar + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -761,9 +979,13 @@ func (m *Sidecar) Unmarshal(dAtA []byte) error { if skippy < 0 { return ErrInvalidLengthSidecar } + if (iNdEx + skippy) < 0 { + return ErrInvalidLengthSidecar + } if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF } + m.XXX_unrecognized = append(m.XXX_unrecognized, dAtA[iNdEx:iNdEx+skippy]...) iNdEx += skippy } } @@ -788,7 +1010,7 @@ func (m *IstioIngressListener) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - wire |= (uint64(b) & 0x7F) << shift + wire |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -816,7 +1038,7 @@ func (m *IstioIngressListener) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - msglen |= (int(b) & 0x7F) << shift + msglen |= int(b&0x7F) << shift if b < 0x80 { break } @@ -825,6 +1047,9 @@ func (m *IstioIngressListener) Unmarshal(dAtA []byte) error { return ErrInvalidLengthSidecar } postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthSidecar + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -849,7 +1074,7 @@ func (m *IstioIngressListener) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLen |= (uint64(b) & 0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -859,6 +1084,9 @@ func (m *IstioIngressListener) Unmarshal(dAtA []byte) error { return ErrInvalidLengthSidecar } postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthSidecar + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -878,7 +1106,7 @@ func (m *IstioIngressListener) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - m.CaptureMode |= (CaptureMode(b) & 0x7F) << shift + m.CaptureMode |= CaptureMode(b&0x7F) << shift if b < 0x80 { break } @@ -897,7 +1125,7 @@ func (m *IstioIngressListener) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLen |= (uint64(b) & 0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -907,6 +1135,9 @@ func (m *IstioIngressListener) Unmarshal(dAtA []byte) error { return ErrInvalidLengthSidecar } postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthSidecar + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -921,9 +1152,13 @@ func (m *IstioIngressListener) Unmarshal(dAtA []byte) error { if skippy < 0 { return ErrInvalidLengthSidecar } + if (iNdEx + skippy) < 0 { + return ErrInvalidLengthSidecar + } if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF } + m.XXX_unrecognized = append(m.XXX_unrecognized, dAtA[iNdEx:iNdEx+skippy]...) iNdEx += skippy } } @@ -948,7 +1183,7 @@ func (m *IstioEgressListener) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - wire |= (uint64(b) & 0x7F) << shift + wire |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -976,7 +1211,7 @@ func (m *IstioEgressListener) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - msglen |= (int(b) & 0x7F) << shift + msglen |= int(b&0x7F) << shift if b < 0x80 { break } @@ -985,6 +1220,9 @@ func (m *IstioEgressListener) Unmarshal(dAtA []byte) error { return ErrInvalidLengthSidecar } postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthSidecar + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -1009,7 +1247,7 @@ func (m *IstioEgressListener) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLen |= (uint64(b) & 0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -1019,6 +1257,9 @@ func (m *IstioEgressListener) Unmarshal(dAtA []byte) error { return ErrInvalidLengthSidecar } postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthSidecar + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -1038,7 +1279,7 @@ func (m *IstioEgressListener) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - m.CaptureMode |= (CaptureMode(b) & 0x7F) << shift + m.CaptureMode |= CaptureMode(b&0x7F) << shift if b < 0x80 { break } @@ -1057,7 +1298,7 @@ func (m *IstioEgressListener) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLen |= (uint64(b) & 0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -1067,6 +1308,9 @@ func (m *IstioEgressListener) Unmarshal(dAtA []byte) error { return ErrInvalidLengthSidecar } postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthSidecar + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -1081,9 +1325,13 @@ func (m *IstioEgressListener) Unmarshal(dAtA []byte) error { if skippy < 0 { return ErrInvalidLengthSidecar } + if (iNdEx + skippy) < 0 { + return ErrInvalidLengthSidecar + } if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF } + m.XXX_unrecognized = append(m.XXX_unrecognized, dAtA[iNdEx:iNdEx+skippy]...) iNdEx += skippy } } @@ -1108,7 +1356,7 @@ func (m *WorkloadSelector) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - wire |= (uint64(b) & 0x7F) << shift + wire |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -1136,7 +1384,7 @@ func (m *WorkloadSelector) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - msglen |= (int(b) & 0x7F) << shift + msglen |= int(b&0x7F) << shift if b < 0x80 { break } @@ -1145,6 +1393,9 @@ func (m *WorkloadSelector) Unmarshal(dAtA []byte) error { return ErrInvalidLengthSidecar } postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthSidecar + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -1165,7 +1416,7 @@ func (m *WorkloadSelector) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - wire |= (uint64(b) & 0x7F) << shift + wire |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -1182,7 +1433,7 @@ func (m *WorkloadSelector) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLenmapkey |= (uint64(b) & 0x7F) << shift + stringLenmapkey |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -1192,6 +1443,9 @@ func (m *WorkloadSelector) Unmarshal(dAtA []byte) error { return ErrInvalidLengthSidecar } postStringIndexmapkey := iNdEx + intStringLenmapkey + if postStringIndexmapkey < 0 { + return ErrInvalidLengthSidecar + } if postStringIndexmapkey > l { return io.ErrUnexpectedEOF } @@ -1208,7 +1462,7 @@ func (m *WorkloadSelector) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLenmapvalue |= (uint64(b) & 0x7F) << shift + stringLenmapvalue |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -1218,6 +1472,9 @@ func (m *WorkloadSelector) Unmarshal(dAtA []byte) error { return ErrInvalidLengthSidecar } postStringIndexmapvalue := iNdEx + intStringLenmapvalue + if postStringIndexmapvalue < 0 { + return ErrInvalidLengthSidecar + } if postStringIndexmapvalue > l { return io.ErrUnexpectedEOF } @@ -1249,9 +1506,13 @@ func (m *WorkloadSelector) Unmarshal(dAtA []byte) error { if skippy < 0 { return ErrInvalidLengthSidecar } + if (iNdEx + skippy) < 0 { + return ErrInvalidLengthSidecar + } if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF } + m.XXX_unrecognized = append(m.XXX_unrecognized, dAtA[iNdEx:iNdEx+skippy]...) iNdEx += skippy } } @@ -1315,10 +1576,13 @@ func skipSidecar(dAtA []byte) (n int, err error) { break } } - iNdEx += length if length < 0 { return 0, ErrInvalidLengthSidecar } + iNdEx += length + if iNdEx < 0 { + return 0, ErrInvalidLengthSidecar + } return iNdEx, nil case 3: for { @@ -1347,6 +1611,9 @@ func skipSidecar(dAtA []byte) (n int, err error) { return 0, err } iNdEx = start + next + if iNdEx < 0 { + return 0, ErrInvalidLengthSidecar + } } return iNdEx, nil case 4: @@ -1365,39 +1632,3 @@ var ( ErrInvalidLengthSidecar = fmt.Errorf("proto: negative length found during unmarshaling") ErrIntOverflowSidecar = fmt.Errorf("proto: integer overflow") ) - -func init() { proto.RegisterFile("networking/v1alpha3/sidecar.proto", fileDescriptorSidecar) } - -var fileDescriptorSidecar = []byte{ - // 465 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x93, 0x4f, 0x6f, 0xd3, 0x30, - 0x18, 0xc6, 0x71, 0x13, 0xda, 0xf5, 0xcd, 0x04, 0xc1, 0xec, 0x10, 0x76, 0x28, 0xa1, 0x07, 0x14, - 0x40, 0x4a, 0x44, 0x7b, 0xe0, 0xcf, 0x6d, 0x83, 0x4c, 0x8a, 0x54, 0xb6, 0x29, 0x1d, 0x02, 0x71, - 0xa9, 0xdc, 0xe6, 0xa5, 0xb3, 0x16, 0xe2, 0xc8, 0x76, 0x57, 0xf5, 0xcb, 0xf0, 0x55, 0xb8, 0x72, - 0xe4, 0xc2, 0x1d, 0xf5, 0x43, 0x70, 0x46, 0x4d, 0x3c, 0x6d, 0x4c, 0xa5, 0x88, 0x1b, 0x37, 0xbf, - 0x6f, 0x9e, 0xe7, 0xf7, 0xfa, 0x89, 0x6d, 0x78, 0x50, 0xa0, 0x9e, 0x0b, 0x79, 0xc6, 0x8b, 0x69, - 0x74, 0xfe, 0x94, 0xe5, 0xe5, 0x29, 0xeb, 0x47, 0x8a, 0x67, 0x38, 0x61, 0x32, 0x2c, 0xa5, 0xd0, - 0x82, 0xde, 0xe3, 0x4a, 0x73, 0x11, 0x5e, 0x0a, 0xc3, 0x0b, 0xe1, 0xee, 0x5a, 0xf7, 0x94, 0x69, - 0x9c, 0xb3, 0x45, 0xed, 0xee, 0xfe, 0x24, 0xd0, 0x1a, 0xd6, 0x3c, 0xfa, 0x1e, 0xee, 0xac, 0xd4, - 0xb9, 0x60, 0xd9, 0x48, 0x61, 0x8e, 0x13, 0x2d, 0xa4, 0x47, 0x7c, 0x12, 0x38, 0xbd, 0x27, 0xe1, - 0x1f, 0xa7, 0x84, 0xef, 0x8c, 0x67, 0x68, 0x2c, 0xa9, 0x3b, 0xbf, 0xd6, 0xa1, 0x09, 0xb4, 0x78, - 0x31, 0x95, 0xa8, 0x94, 0xd7, 0xf0, 0xad, 0xc0, 0xe9, 0x45, 0x1b, 0x78, 0xc9, 0xea, 0x4b, 0x52, - 0xcb, 0x07, 0x5c, 0x69, 0x2c, 0x50, 0xa6, 0x17, 0x7e, 0x7a, 0x00, 0x4d, 0xac, 0x49, 0x56, 0x45, - 0x0a, 0xff, 0x46, 0x8a, 0x7f, 0x07, 0x19, 0x77, 0xf7, 0x3b, 0x81, 0x9d, 0x75, 0x93, 0x68, 0x1f, - 0xec, 0x52, 0x48, 0x6d, 0x82, 0xdf, 0xdf, 0x80, 0x3f, 0x16, 0x52, 0xa7, 0x95, 0x98, 0x52, 0xb0, - 0xc7, 0xbc, 0xc8, 0xbc, 0x86, 0x4f, 0x82, 0x76, 0x5a, 0xad, 0x69, 0x02, 0xdb, 0x13, 0x56, 0xea, - 0x99, 0xc4, 0xd1, 0x27, 0x91, 0xa1, 0x67, 0xf9, 0x24, 0xb8, 0xd5, 0x7b, 0xb8, 0x01, 0xf8, 0xaa, - 0x96, 0xbf, 0x11, 0x19, 0xa6, 0xce, 0xe4, 0xb2, 0xa0, 0x8f, 0xc0, 0xcd, 0xf0, 0x23, 0x9b, 0xe5, - 0x7a, 0x84, 0x45, 0x56, 0x0a, 0x5e, 0x68, 0xcf, 0xae, 0x46, 0xdd, 0x36, 0xfd, 0xd8, 0xb4, 0xbb, - 0x5f, 0x08, 0xdc, 0x5d, 0x93, 0xfb, 0xbf, 0x8c, 0xb5, 0x03, 0x37, 0x4f, 0x85, 0xd2, 0xca, 0xb3, - 0x7d, 0x2b, 0x68, 0xa7, 0x75, 0xd1, 0xfd, 0x4c, 0xc0, 0xbd, 0x7e, 0xa7, 0xe8, 0x11, 0x34, 0x73, - 0x36, 0xc6, 0x5c, 0x79, 0xa4, 0x3a, 0xf6, 0x67, 0xff, 0x70, 0x21, 0xc3, 0x41, 0xe5, 0x8c, 0x0b, - 0x2d, 0x17, 0xa9, 0xc1, 0xec, 0xbe, 0x00, 0xe7, 0x4a, 0x9b, 0xba, 0x60, 0x9d, 0xe1, 0xa2, 0xfa, - 0x3b, 0xed, 0x74, 0xb5, 0x5c, 0x6d, 0xee, 0x9c, 0xe5, 0x33, 0x34, 0xe1, 0xeb, 0xe2, 0x65, 0xe3, - 0x39, 0x79, 0xdc, 0x03, 0xe7, 0x4a, 0x24, 0xea, 0x40, 0xeb, 0x75, 0x7c, 0xb0, 0xf7, 0x76, 0x70, - 0xe2, 0xde, 0xa0, 0xdb, 0xb0, 0x95, 0x1c, 0x9f, 0xec, 0xed, 0x0f, 0xe2, 0xa1, 0x4b, 0xe8, 0x16, - 0xd8, 0x87, 0x47, 0x87, 0xb1, 0xdb, 0xd8, 0x0f, 0xbf, 0x2e, 0x3b, 0xe4, 0xdb, 0xb2, 0x43, 0x7e, - 0x2c, 0x3b, 0xe4, 0x83, 0x5f, 0x6f, 0x9e, 0x8b, 0x88, 0x95, 0x3c, 0x5a, 0xf3, 0x4a, 0xc7, 0xcd, - 0xea, 0x79, 0xf6, 0x7f, 0x05, 0x00, 0x00, 0xff, 0xff, 0x32, 0x9f, 0xa8, 0x1c, 0x01, 0x04, 0x00, - 0x00, -} diff --git a/networking/v1alpha3/virtual_service.pb.go b/networking/v1alpha3/virtual_service.pb.go index 433763766f7..7ccda22babb 100644 --- a/networking/v1alpha3/virtual_service.pb.go +++ b/networking/v1alpha3/virtual_service.pb.go @@ -1,23 +1,57 @@ // Code generated by protoc-gen-gogo. DO NOT EDIT. // source: networking/v1alpha3/virtual_service.proto -package v1alpha3 - -import proto "github.com/gogo/protobuf/proto" -import fmt "fmt" -import math "math" -import google_protobuf "github.com/gogo/protobuf/types" -import google_protobuf1 "github.com/gogo/protobuf/types" +// Configuration affecting traffic routing. Here are a few terms useful to define +// in the context of traffic routing. +// +// `Service` a unit of application behavior bound to a unique name in a +// service registry. Services consist of multiple network *endpoints* +// implemented by workload instances running on pods, containers, VMs etc. +// +// `Service versions (a.k.a. subsets)` - In a continuous deployment +// scenario, for a given service, there can be distinct subsets of +// instances running different variants of the application binary. These +// variants are not necessarily different API versions. They could be +// iterative changes to the same service, deployed in different +// environments (prod, staging, dev, etc.). Common scenarios where this +// occurs include A/B testing, canary rollouts, etc. The choice of a +// particular version can be decided based on various criterion (headers, +// url, etc.) and/or by weights assigned to each version. Each service has +// a default version consisting of all its instances. +// +// `Source` - A downstream client calling a service. +// +// `Host` - The address used by a client when attempting to connect to a +// service. +// +// `Access model` - Applications address only the destination service +// (Host) without knowledge of individual service versions (subsets). The +// actual choice of the version is determined by the proxy/sidecar, enabling the +// application code to decouple itself from the evolution of dependent +// services. -import binary "encoding/binary" +package v1alpha3 -import io "io" +import ( + encoding_binary "encoding/binary" + fmt "fmt" + proto "github.com/gogo/protobuf/proto" + types "github.com/gogo/protobuf/types" + io "io" + math "math" +) // Reference imports to suppress errors if they are not otherwise used. var _ = proto.Marshal var _ = fmt.Errorf var _ = math.Inf +// This is a compile-time assertion to ensure that this generated file +// is compatible with the proto package it is being compiled against. +// A compilation error at this line likely means your copy of the +// proto package needs to be updated. +const _ = proto.GoGoProtoPackageIsVersion2 // please upgrade the proto package + // A `VirtualService` defines a set of traffic routing rules to apply when a host is // addressed. Each routing rule defines matching criteria for traffic of a specific // protocol. If the traffic is matched, then it is sent to a named destination service @@ -102,7 +136,7 @@ type VirtualService struct { // the mesh, i.e., those found in the service registry, must always be // referred to using their alphanumeric names. IP addresses are allowed // only for services defined via the Gateway. - Hosts []string `protobuf:"bytes,1,rep,name=hosts" json:"hosts,omitempty"` + Hosts []string `protobuf:"bytes,1,rep,name=hosts,proto3" json:"hosts,omitempty"` // The names of gateways and sidecars that should apply these routes. A // single VirtualService is used for sidecars inside the mesh as well as // for one or more gateways. The selection condition imposed by this @@ -113,13 +147,13 @@ type VirtualService struct { // sidecars in the mesh. If a list of gateway names is provided, the // rules will apply only to the gateways. To apply the rules to both // gateways and sidecars, specify `mesh` as one of the gateway names. - Gateways []string `protobuf:"bytes,2,rep,name=gateways" json:"gateways,omitempty"` + Gateways []string `protobuf:"bytes,2,rep,name=gateways,proto3" json:"gateways,omitempty"` // An ordered list of route rules for HTTP traffic. HTTP routes will be // applied to platform service ports named 'http-*'/'http2-*'/'grpc-*', gateway // ports with protocol HTTP/HTTP2/GRPC/ TLS-terminated-HTTPS and service // entry ports using HTTP/HTTP2/GRPC protocols. The first rule matching // an incoming request is used. - Http []*HTTPRoute `protobuf:"bytes,3,rep,name=http" json:"http,omitempty"` + Http []*HTTPRoute `protobuf:"bytes,3,rep,name=http,proto3" json:"http,omitempty"` // An ordered list of route rule for non-terminated TLS & HTTPS // traffic. Routing is typically performed using the SNI value presented // by the ClientHello message. TLS routes will be applied to platform @@ -129,11 +163,11 @@ type VirtualService struct { // incoming request is used. NOTE: Traffic 'https-*' or 'tls-*' ports // without associated virtual service will be treated as opaque TCP // traffic. - Tls []*TLSRoute `protobuf:"bytes,5,rep,name=tls" json:"tls,omitempty"` + Tls []*TLSRoute `protobuf:"bytes,5,rep,name=tls,proto3" json:"tls,omitempty"` // An ordered list of route rules for opaque TCP traffic. TCP routes will // be applied to any port that is not a HTTP or TLS port. The first rule // matching an incoming request is used. - Tcp []*TCPRoute `protobuf:"bytes,4,rep,name=tcp" json:"tcp,omitempty"` + Tcp []*TCPRoute `protobuf:"bytes,4,rep,name=tcp,proto3" json:"tcp,omitempty"` // A list of namespaces to which this virtual service is exported. Exporting a // virtual service allows it to used by sidecars and gateways defined in // other namespaces. This feature provides a mechanism for service owners @@ -146,13 +180,44 @@ type VirtualService struct { // The value "." is reserved and defines an export to the same namespace that // the virtual service is declared in, similarly the value "*" is reserved and // defines an export to all namespaces. - ExportTo []string `protobuf:"bytes,6,rep,name=export_to,json=exportTo" json:"export_to,omitempty"` + ExportTo []string `protobuf:"bytes,6,rep,name=export_to,json=exportTo,proto3" json:"export_to,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` +} + +func (m *VirtualService) Reset() { *m = VirtualService{} } +func (m *VirtualService) String() string { return proto.CompactTextString(m) } +func (*VirtualService) ProtoMessage() {} +func (*VirtualService) Descriptor() ([]byte, []int) { + return fileDescriptor_e85a9a4fa9c17a22, []int{0} +} +func (m *VirtualService) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *VirtualService) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_VirtualService.Marshal(b, m, deterministic) + } else { + b = b[:cap(b)] + n, err := m.MarshalTo(b) + if err != nil { + return nil, err + } + return b[:n], nil + } +} +func (m *VirtualService) XXX_Merge(src proto.Message) { + xxx_messageInfo_VirtualService.Merge(m, src) +} +func (m *VirtualService) XXX_Size() int { + return m.Size() +} +func (m *VirtualService) XXX_DiscardUnknown() { + xxx_messageInfo_VirtualService.DiscardUnknown(m) } -func (m *VirtualService) Reset() { *m = VirtualService{} } -func (m *VirtualService) String() string { return proto.CompactTextString(m) } -func (*VirtualService) ProtoMessage() {} -func (*VirtualService) Descriptor() ([]byte, []int) { return fileDescriptorVirtualService, []int{0} } +var xxx_messageInfo_VirtualService proto.InternalMessageInfo func (m *VirtualService) GetHosts() []string { if m != nil { @@ -346,13 +411,44 @@ type Destination struct { // Specifies the port on the host that is being addressed. If a service // exposes only a single port it is not required to explicitly select the // port. - Port *PortSelector `protobuf:"bytes,3,opt,name=port" json:"port,omitempty"` + Port *PortSelector `protobuf:"bytes,3,opt,name=port,proto3" json:"port,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` +} + +func (m *Destination) Reset() { *m = Destination{} } +func (m *Destination) String() string { return proto.CompactTextString(m) } +func (*Destination) ProtoMessage() {} +func (*Destination) Descriptor() ([]byte, []int) { + return fileDescriptor_e85a9a4fa9c17a22, []int{1} +} +func (m *Destination) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *Destination) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_Destination.Marshal(b, m, deterministic) + } else { + b = b[:cap(b)] + n, err := m.MarshalTo(b) + if err != nil { + return nil, err + } + return b[:n], nil + } +} +func (m *Destination) XXX_Merge(src proto.Message) { + xxx_messageInfo_Destination.Merge(m, src) +} +func (m *Destination) XXX_Size() int { + return m.Size() +} +func (m *Destination) XXX_DiscardUnknown() { + xxx_messageInfo_Destination.DiscardUnknown(m) } -func (m *Destination) Reset() { *m = Destination{} } -func (m *Destination) String() string { return proto.CompactTextString(m) } -func (*Destination) ProtoMessage() {} -func (*Destination) Descriptor() ([]byte, []int) { return fileDescriptorVirtualService, []int{1} } +var xxx_messageInfo_Destination proto.InternalMessageInfo func (m *Destination) GetHost() string { if m != nil { @@ -382,65 +478,96 @@ type HTTPRoute struct { // activated. All conditions inside a single match block have AND // semantics, while the list of match blocks have OR semantics. The rule // is matched if any one of the match blocks succeed. - Match []*HTTPMatchRequest `protobuf:"bytes,1,rep,name=match" json:"match,omitempty"` + Match []*HTTPMatchRequest `protobuf:"bytes,1,rep,name=match,proto3" json:"match,omitempty"` // A http rule can either redirect or forward (default) traffic. The // forwarding target can be one of several versions of a service (see // glossary in beginning of document). Weights associated with the // service version determine the proportion of traffic it receives. - Route []*HTTPRouteDestination `protobuf:"bytes,2,rep,name=route" json:"route,omitempty"` + Route []*HTTPRouteDestination `protobuf:"bytes,2,rep,name=route,proto3" json:"route,omitempty"` // A http rule can either redirect or forward (default) traffic. If // traffic passthrough option is specified in the rule, // route/redirect will be ignored. The redirect primitive can be used to // send a HTTP 301 redirect to a different URI or Authority. - Redirect *HTTPRedirect `protobuf:"bytes,3,opt,name=redirect" json:"redirect,omitempty"` + Redirect *HTTPRedirect `protobuf:"bytes,3,opt,name=redirect,proto3" json:"redirect,omitempty"` // Rewrite HTTP URIs and Authority headers. Rewrite cannot be used with // Redirect primitive. Rewrite will be performed before forwarding. - Rewrite *HTTPRewrite `protobuf:"bytes,4,opt,name=rewrite" json:"rewrite,omitempty"` + Rewrite *HTTPRewrite `protobuf:"bytes,4,opt,name=rewrite,proto3" json:"rewrite,omitempty"` // Deprecated. Websocket upgrades are done automatically starting from Istio 1.0. // $hide_from_docs WebsocketUpgrade bool `protobuf:"varint,5,opt,name=websocket_upgrade,json=websocketUpgrade,proto3" json:"websocket_upgrade,omitempty"` // Timeout for HTTP requests. - Timeout *google_protobuf.Duration `protobuf:"bytes,6,opt,name=timeout" json:"timeout,omitempty"` + Timeout *types.Duration `protobuf:"bytes,6,opt,name=timeout,proto3" json:"timeout,omitempty"` // Retry policy for HTTP requests. - Retries *HTTPRetry `protobuf:"bytes,7,opt,name=retries" json:"retries,omitempty"` + Retries *HTTPRetry `protobuf:"bytes,7,opt,name=retries,proto3" json:"retries,omitempty"` // Fault injection policy to apply on HTTP traffic at the client side. // Note that timeouts or retries will not be enabled when faults are // enabled on the client side. - Fault *HTTPFaultInjection `protobuf:"bytes,8,opt,name=fault" json:"fault,omitempty"` + Fault *HTTPFaultInjection `protobuf:"bytes,8,opt,name=fault,proto3" json:"fault,omitempty"` // Mirror HTTP traffic to a another destination in addition to forwarding // the requests to the intended destination. Mirrored traffic is on a // best effort basis where the sidecar/gateway will not wait for the // mirrored cluster to respond before returning the response from the // original destination. Statistics will be generated for the mirrored // destination. - Mirror *Destination `protobuf:"bytes,9,opt,name=mirror" json:"mirror,omitempty"` + Mirror *Destination `protobuf:"bytes,9,opt,name=mirror,proto3" json:"mirror,omitempty"` // Cross-Origin Resource Sharing policy (CORS). Refer to // [CORS](https://developer.mozilla.org/en-US/docs/Web/HTTP/CORS) // for further details about cross origin resource sharing. - CorsPolicy *CorsPolicy `protobuf:"bytes,10,opt,name=cors_policy,json=corsPolicy" json:"cors_policy,omitempty"` + CorsPolicy *CorsPolicy `protobuf:"bytes,10,opt,name=cors_policy,json=corsPolicy,proto3" json:"cors_policy,omitempty"` // Use of `append_headers` is deprecated. Use the `headers` // field instead. - AppendHeaders map[string]string `protobuf:"bytes,11,rep,name=append_headers,json=appendHeaders" json:"append_headers,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` + AppendHeaders map[string]string `protobuf:"bytes,11,rep,name=append_headers,json=appendHeaders,proto3" json:"append_headers,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` // Deprecated: Do not use. // Use of `remove_response_header` is deprecated. Use the `headers` // field instead. - RemoveResponseHeaders []string `protobuf:"bytes,12,rep,name=remove_response_headers,json=removeResponseHeaders" json:"remove_response_headers,omitempty"` + RemoveResponseHeaders []string `protobuf:"bytes,12,rep,name=remove_response_headers,json=removeResponseHeaders,proto3" json:"remove_response_headers,omitempty"` // Deprecated: Do not use. // Use of `append_response_headers` is deprecated. Use the `headers` // field instead. - AppendResponseHeaders map[string]string `protobuf:"bytes,13,rep,name=append_response_headers,json=appendResponseHeaders" json:"append_response_headers,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` + AppendResponseHeaders map[string]string `protobuf:"bytes,13,rep,name=append_response_headers,json=appendResponseHeaders,proto3" json:"append_response_headers,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` // Deprecated: Do not use. // Use of `remove_request_headers` is deprecated. Use the `headers` // field instead. - RemoveRequestHeaders []string `protobuf:"bytes,14,rep,name=remove_request_headers,json=removeRequestHeaders" json:"remove_request_headers,omitempty"` + RemoveRequestHeaders []string `protobuf:"bytes,14,rep,name=remove_request_headers,json=removeRequestHeaders,proto3" json:"remove_request_headers,omitempty"` // Deprecated: Do not use. // Use of `append_request_headers` is deprecated. Use the `headers` // field instead. - AppendRequestHeaders map[string]string `protobuf:"bytes,15,rep,name=append_request_headers,json=appendRequestHeaders" json:"append_request_headers,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` + AppendRequestHeaders map[string]string `protobuf:"bytes,15,rep,name=append_request_headers,json=appendRequestHeaders,proto3" json:"append_request_headers,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` // Deprecated: Do not use. // Header manipulation rules - Headers *Headers `protobuf:"bytes,16,opt,name=headers" json:"headers,omitempty"` + Headers *Headers `protobuf:"bytes,16,opt,name=headers,proto3" json:"headers,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` +} + +func (m *HTTPRoute) Reset() { *m = HTTPRoute{} } +func (m *HTTPRoute) String() string { return proto.CompactTextString(m) } +func (*HTTPRoute) ProtoMessage() {} +func (*HTTPRoute) Descriptor() ([]byte, []int) { + return fileDescriptor_e85a9a4fa9c17a22, []int{2} +} +func (m *HTTPRoute) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *HTTPRoute) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_HTTPRoute.Marshal(b, m, deterministic) + } else { + b = b[:cap(b)] + n, err := m.MarshalTo(b) + if err != nil { + return nil, err + } + return b[:n], nil + } +} +func (m *HTTPRoute) XXX_Merge(src proto.Message) { + xxx_messageInfo_HTTPRoute.Merge(m, src) +} +func (m *HTTPRoute) XXX_Size() int { + return m.Size() +} +func (m *HTTPRoute) XXX_DiscardUnknown() { + xxx_messageInfo_HTTPRoute.DiscardUnknown(m) } -func (m *HTTPRoute) Reset() { *m = HTTPRoute{} } -func (m *HTTPRoute) String() string { return proto.CompactTextString(m) } -func (*HTTPRoute) ProtoMessage() {} -func (*HTTPRoute) Descriptor() ([]byte, []int) { return fileDescriptorVirtualService, []int{2} } +var xxx_messageInfo_HTTPRoute proto.InternalMessageInfo func (m *HTTPRoute) GetMatch() []*HTTPMatchRequest { if m != nil { @@ -477,7 +604,7 @@ func (m *HTTPRoute) GetWebsocketUpgrade() bool { return false } -func (m *HTTPRoute) GetTimeout() *google_protobuf.Duration { +func (m *HTTPRoute) GetTimeout() *types.Duration { if m != nil { return m.Timeout } @@ -512,6 +639,7 @@ func (m *HTTPRoute) GetCorsPolicy() *CorsPolicy { return nil } +// Deprecated: Do not use. func (m *HTTPRoute) GetAppendHeaders() map[string]string { if m != nil { return m.AppendHeaders @@ -519,6 +647,7 @@ func (m *HTTPRoute) GetAppendHeaders() map[string]string { return nil } +// Deprecated: Do not use. func (m *HTTPRoute) GetRemoveResponseHeaders() []string { if m != nil { return m.RemoveResponseHeaders @@ -526,6 +655,7 @@ func (m *HTTPRoute) GetRemoveResponseHeaders() []string { return nil } +// Deprecated: Do not use. func (m *HTTPRoute) GetAppendResponseHeaders() map[string]string { if m != nil { return m.AppendResponseHeaders @@ -533,6 +663,7 @@ func (m *HTTPRoute) GetAppendResponseHeaders() map[string]string { return nil } +// Deprecated: Do not use. func (m *HTTPRoute) GetRemoveRequestHeaders() []string { if m != nil { return m.RemoveRequestHeaders @@ -540,6 +671,7 @@ func (m *HTTPRoute) GetRemoveRequestHeaders() []string { return nil } +// Deprecated: Do not use. func (m *HTTPRoute) GetAppendRequestHeaders() map[string]string { if m != nil { return m.AppendRequestHeaders @@ -558,16 +690,47 @@ func (m *HTTPRoute) GetHeaders() *Headers { type Headers struct { // Header manipulation rules to apply before forwarding a request // to the destination service - Request *Headers_HeaderOperations `protobuf:"bytes,1,opt,name=request" json:"request,omitempty"` + Request *Headers_HeaderOperations `protobuf:"bytes,1,opt,name=request,proto3" json:"request,omitempty"` // Header manipulation rules to apply before returning a response // to the caller - Response *Headers_HeaderOperations `protobuf:"bytes,2,opt,name=response" json:"response,omitempty"` + Response *Headers_HeaderOperations `protobuf:"bytes,2,opt,name=response,proto3" json:"response,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` +} + +func (m *Headers) Reset() { *m = Headers{} } +func (m *Headers) String() string { return proto.CompactTextString(m) } +func (*Headers) ProtoMessage() {} +func (*Headers) Descriptor() ([]byte, []int) { + return fileDescriptor_e85a9a4fa9c17a22, []int{3} +} +func (m *Headers) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *Headers) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_Headers.Marshal(b, m, deterministic) + } else { + b = b[:cap(b)] + n, err := m.MarshalTo(b) + if err != nil { + return nil, err + } + return b[:n], nil + } +} +func (m *Headers) XXX_Merge(src proto.Message) { + xxx_messageInfo_Headers.Merge(m, src) +} +func (m *Headers) XXX_Size() int { + return m.Size() +} +func (m *Headers) XXX_DiscardUnknown() { + xxx_messageInfo_Headers.DiscardUnknown(m) } -func (m *Headers) Reset() { *m = Headers{} } -func (m *Headers) String() string { return proto.CompactTextString(m) } -func (*Headers) ProtoMessage() {} -func (*Headers) Descriptor() ([]byte, []int) { return fileDescriptorVirtualService, []int{3} } +var xxx_messageInfo_Headers proto.InternalMessageInfo func (m *Headers) GetRequest() *Headers_HeaderOperations { if m != nil { @@ -586,20 +749,49 @@ func (m *Headers) GetResponse() *Headers_HeaderOperations { // HeaderOperations Describes the header manipulations to apply type Headers_HeaderOperations struct { // Overwrite the headers specified by key with the given values - Set map[string]string `protobuf:"bytes,1,rep,name=set" json:"set,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` + Set map[string]string `protobuf:"bytes,1,rep,name=set,proto3" json:"set,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` // Append the given values to the headers specified by keys // (will create a comma-separated list of values) - Add map[string]string `protobuf:"bytes,2,rep,name=add" json:"add,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` + Add map[string]string `protobuf:"bytes,2,rep,name=add,proto3" json:"add,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` // Remove a the specified headers - Remove []string `protobuf:"bytes,3,rep,name=remove" json:"remove,omitempty"` + Remove []string `protobuf:"bytes,3,rep,name=remove,proto3" json:"remove,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` } func (m *Headers_HeaderOperations) Reset() { *m = Headers_HeaderOperations{} } func (m *Headers_HeaderOperations) String() string { return proto.CompactTextString(m) } func (*Headers_HeaderOperations) ProtoMessage() {} func (*Headers_HeaderOperations) Descriptor() ([]byte, []int) { - return fileDescriptorVirtualService, []int{3, 0} + return fileDescriptor_e85a9a4fa9c17a22, []int{3, 0} } +func (m *Headers_HeaderOperations) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *Headers_HeaderOperations) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_Headers_HeaderOperations.Marshal(b, m, deterministic) + } else { + b = b[:cap(b)] + n, err := m.MarshalTo(b) + if err != nil { + return nil, err + } + return b[:n], nil + } +} +func (m *Headers_HeaderOperations) XXX_Merge(src proto.Message) { + xxx_messageInfo_Headers_HeaderOperations.Merge(m, src) +} +func (m *Headers_HeaderOperations) XXX_Size() int { + return m.Size() +} +func (m *Headers_HeaderOperations) XXX_DiscardUnknown() { + xxx_messageInfo_Headers_HeaderOperations.DiscardUnknown(m) +} + +var xxx_messageInfo_Headers_HeaderOperations proto.InternalMessageInfo func (m *Headers_HeaderOperations) GetSet() map[string]string { if m != nil { @@ -658,15 +850,46 @@ type TLSRoute struct { // activated. All conditions inside a single match block have AND // semantics, while the list of match blocks have OR semantics. The rule // is matched if any one of the match blocks succeed. - Match []*TLSMatchAttributes `protobuf:"bytes,1,rep,name=match" json:"match,omitempty"` + Match []*TLSMatchAttributes `protobuf:"bytes,1,rep,name=match,proto3" json:"match,omitempty"` // The destination to which the connection should be forwarded to. - Route []*RouteDestination `protobuf:"bytes,2,rep,name=route" json:"route,omitempty"` + Route []*RouteDestination `protobuf:"bytes,2,rep,name=route,proto3" json:"route,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` +} + +func (m *TLSRoute) Reset() { *m = TLSRoute{} } +func (m *TLSRoute) String() string { return proto.CompactTextString(m) } +func (*TLSRoute) ProtoMessage() {} +func (*TLSRoute) Descriptor() ([]byte, []int) { + return fileDescriptor_e85a9a4fa9c17a22, []int{4} +} +func (m *TLSRoute) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *TLSRoute) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_TLSRoute.Marshal(b, m, deterministic) + } else { + b = b[:cap(b)] + n, err := m.MarshalTo(b) + if err != nil { + return nil, err + } + return b[:n], nil + } +} +func (m *TLSRoute) XXX_Merge(src proto.Message) { + xxx_messageInfo_TLSRoute.Merge(m, src) +} +func (m *TLSRoute) XXX_Size() int { + return m.Size() +} +func (m *TLSRoute) XXX_DiscardUnknown() { + xxx_messageInfo_TLSRoute.DiscardUnknown(m) } -func (m *TLSRoute) Reset() { *m = TLSRoute{} } -func (m *TLSRoute) String() string { return proto.CompactTextString(m) } -func (*TLSRoute) ProtoMessage() {} -func (*TLSRoute) Descriptor() ([]byte, []int) { return fileDescriptorVirtualService, []int{4} } +var xxx_messageInfo_TLSRoute proto.InternalMessageInfo func (m *TLSRoute) GetMatch() []*TLSMatchAttributes { if m != nil { @@ -708,15 +931,46 @@ type TCPRoute struct { // activated. All conditions inside a single match block have AND // semantics, while the list of match blocks have OR semantics. The rule // is matched if any one of the match blocks succeed. - Match []*L4MatchAttributes `protobuf:"bytes,1,rep,name=match" json:"match,omitempty"` + Match []*L4MatchAttributes `protobuf:"bytes,1,rep,name=match,proto3" json:"match,omitempty"` // The destination to which the connection should be forwarded to. - Route []*RouteDestination `protobuf:"bytes,2,rep,name=route" json:"route,omitempty"` + Route []*RouteDestination `protobuf:"bytes,2,rep,name=route,proto3" json:"route,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` +} + +func (m *TCPRoute) Reset() { *m = TCPRoute{} } +func (m *TCPRoute) String() string { return proto.CompactTextString(m) } +func (*TCPRoute) ProtoMessage() {} +func (*TCPRoute) Descriptor() ([]byte, []int) { + return fileDescriptor_e85a9a4fa9c17a22, []int{5} +} +func (m *TCPRoute) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *TCPRoute) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_TCPRoute.Marshal(b, m, deterministic) + } else { + b = b[:cap(b)] + n, err := m.MarshalTo(b) + if err != nil { + return nil, err + } + return b[:n], nil + } +} +func (m *TCPRoute) XXX_Merge(src proto.Message) { + xxx_messageInfo_TCPRoute.Merge(m, src) +} +func (m *TCPRoute) XXX_Size() int { + return m.Size() +} +func (m *TCPRoute) XXX_DiscardUnknown() { + xxx_messageInfo_TCPRoute.DiscardUnknown(m) } -func (m *TCPRoute) Reset() { *m = TCPRoute{} } -func (m *TCPRoute) String() string { return proto.CompactTextString(m) } -func (*TCPRoute) ProtoMessage() {} -func (*TCPRoute) Descriptor() ([]byte, []int) { return fileDescriptorVirtualService, []int{5} } +var xxx_messageInfo_TCPRoute proto.InternalMessageInfo func (m *TCPRoute) GetMatch() []*L4MatchAttributes { if m != nil { @@ -769,7 +1023,7 @@ type HTTPMatchRequest struct { // // - `regex: "value"` for ECMAscript style regex-based match // - Uri *StringMatch `protobuf:"bytes,1,opt,name=uri" json:"uri,omitempty"` + Uri *StringMatch `protobuf:"bytes,1,opt,name=uri,proto3" json:"uri,omitempty"` // URI Scheme // values are case-sensitive and formatted as follows: // @@ -779,7 +1033,7 @@ type HTTPMatchRequest struct { // // - `regex: "value"` for ECMAscript style regex-based match // - Scheme *StringMatch `protobuf:"bytes,2,opt,name=scheme" json:"scheme,omitempty"` + Scheme *StringMatch `protobuf:"bytes,2,opt,name=scheme,proto3" json:"scheme,omitempty"` // HTTP Method // values are case-sensitive and formatted as follows: // @@ -789,7 +1043,7 @@ type HTTPMatchRequest struct { // // - `regex: "value"` for ECMAscript style regex-based match // - Method *StringMatch `protobuf:"bytes,3,opt,name=method" json:"method,omitempty"` + Method *StringMatch `protobuf:"bytes,3,opt,name=method,proto3" json:"method,omitempty"` // HTTP Authority // values are case-sensitive and formatted as follows: // @@ -799,7 +1053,7 @@ type HTTPMatchRequest struct { // // - `regex: "value"` for ECMAscript style regex-based match // - Authority *StringMatch `protobuf:"bytes,4,opt,name=authority" json:"authority,omitempty"` + Authority *StringMatch `protobuf:"bytes,4,opt,name=authority,proto3" json:"authority,omitempty"` // The header keys must be lowercase and use hyphen as the separator, // e.g. _x-request-id_. // @@ -812,7 +1066,7 @@ type HTTPMatchRequest struct { // - `regex: "value"` for ECMAscript style regex-based match // // **Note:** The keys `uri`, `scheme`, `method`, and `authority` will be ignored. - Headers map[string]*StringMatch `protobuf:"bytes,5,rep,name=headers" json:"headers,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value"` + Headers map[string]*StringMatch `protobuf:"bytes,5,rep,name=headers,proto3" json:"headers,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` // Specifies the ports on the host that is being addressed. Many services // only expose a single port or label ports with the protocols they support, // in these cases it is not required to explicitly select the port. @@ -821,17 +1075,48 @@ type HTTPMatchRequest struct { // workloads with the given labels. If the VirtualService has a list of // gateways specified at the top, it should include the reserved gateway // `mesh` in order for this field to be applicable. - SourceLabels map[string]string `protobuf:"bytes,7,rep,name=source_labels,json=sourceLabels" json:"source_labels,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` + SourceLabels map[string]string `protobuf:"bytes,7,rep,name=source_labels,json=sourceLabels,proto3" json:"source_labels,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` // Names of gateways where the rule should be applied to. Gateway names // at the top of the VirtualService (if any) are overridden. The gateway match is // independent of sourceLabels. - Gateways []string `protobuf:"bytes,8,rep,name=gateways" json:"gateways,omitempty"` + Gateways []string `protobuf:"bytes,8,rep,name=gateways,proto3" json:"gateways,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` +} + +func (m *HTTPMatchRequest) Reset() { *m = HTTPMatchRequest{} } +func (m *HTTPMatchRequest) String() string { return proto.CompactTextString(m) } +func (*HTTPMatchRequest) ProtoMessage() {} +func (*HTTPMatchRequest) Descriptor() ([]byte, []int) { + return fileDescriptor_e85a9a4fa9c17a22, []int{6} +} +func (m *HTTPMatchRequest) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *HTTPMatchRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_HTTPMatchRequest.Marshal(b, m, deterministic) + } else { + b = b[:cap(b)] + n, err := m.MarshalTo(b) + if err != nil { + return nil, err + } + return b[:n], nil + } +} +func (m *HTTPMatchRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_HTTPMatchRequest.Merge(m, src) +} +func (m *HTTPMatchRequest) XXX_Size() int { + return m.Size() +} +func (m *HTTPMatchRequest) XXX_DiscardUnknown() { + xxx_messageInfo_HTTPMatchRequest.DiscardUnknown(m) } -func (m *HTTPMatchRequest) Reset() { *m = HTTPMatchRequest{} } -func (m *HTTPMatchRequest) String() string { return proto.CompactTextString(m) } -func (*HTTPMatchRequest) ProtoMessage() {} -func (*HTTPMatchRequest) Descriptor() ([]byte, []int) { return fileDescriptorVirtualService, []int{6} } +var xxx_messageInfo_HTTPMatchRequest proto.InternalMessageInfo func (m *HTTPMatchRequest) GetUri() *StringMatch { if m != nil { @@ -958,7 +1243,7 @@ func (m *HTTPMatchRequest) GetGateways() []string { type HTTPRouteDestination struct { // REQUIRED. Destination uniquely identifies the instances of a service // to which the request/connection should be forwarded to. - Destination *Destination `protobuf:"bytes,1,opt,name=destination" json:"destination,omitempty"` + Destination *Destination `protobuf:"bytes,1,opt,name=destination,proto3" json:"destination,omitempty"` // REQUIRED. The proportion of traffic to be forwarded to the service // version. (0-100). Sum of weights across destinations SHOULD BE == 100. // If there is only one destination in a rule, the weight value is assumed to @@ -966,26 +1251,55 @@ type HTTPRouteDestination struct { Weight int32 `protobuf:"varint,2,opt,name=weight,proto3" json:"weight,omitempty"` // Use of `remove_response_header` is deprecated. Use the `headers` // field instead. - RemoveResponseHeaders []string `protobuf:"bytes,3,rep,name=remove_response_headers,json=removeResponseHeaders" json:"remove_response_headers,omitempty"` + RemoveResponseHeaders []string `protobuf:"bytes,3,rep,name=remove_response_headers,json=removeResponseHeaders,proto3" json:"remove_response_headers,omitempty"` // Deprecated: Do not use. // Use of `append_response_headers` is deprecated. Use the `headers` // field instead. - AppendResponseHeaders map[string]string `protobuf:"bytes,4,rep,name=append_response_headers,json=appendResponseHeaders" json:"append_response_headers,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` + AppendResponseHeaders map[string]string `protobuf:"bytes,4,rep,name=append_response_headers,json=appendResponseHeaders,proto3" json:"append_response_headers,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` // Deprecated: Do not use. // Use of `remove_request_headers` is deprecated. Use the `headers` // field instead. - RemoveRequestHeaders []string `protobuf:"bytes,5,rep,name=remove_request_headers,json=removeRequestHeaders" json:"remove_request_headers,omitempty"` + RemoveRequestHeaders []string `protobuf:"bytes,5,rep,name=remove_request_headers,json=removeRequestHeaders,proto3" json:"remove_request_headers,omitempty"` // Deprecated: Do not use. // Use of `append_request_headers` is deprecated. Use the `headers` // field instead. - AppendRequestHeaders map[string]string `protobuf:"bytes,6,rep,name=append_request_headers,json=appendRequestHeaders" json:"append_request_headers,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` + AppendRequestHeaders map[string]string `protobuf:"bytes,6,rep,name=append_request_headers,json=appendRequestHeaders,proto3" json:"append_request_headers,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` // Deprecated: Do not use. // Header manipulation rules - Headers *Headers `protobuf:"bytes,7,opt,name=headers" json:"headers,omitempty"` + Headers *Headers `protobuf:"bytes,7,opt,name=headers,proto3" json:"headers,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` } func (m *HTTPRouteDestination) Reset() { *m = HTTPRouteDestination{} } func (m *HTTPRouteDestination) String() string { return proto.CompactTextString(m) } func (*HTTPRouteDestination) ProtoMessage() {} func (*HTTPRouteDestination) Descriptor() ([]byte, []int) { - return fileDescriptorVirtualService, []int{7} + return fileDescriptor_e85a9a4fa9c17a22, []int{7} +} +func (m *HTTPRouteDestination) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *HTTPRouteDestination) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_HTTPRouteDestination.Marshal(b, m, deterministic) + } else { + b = b[:cap(b)] + n, err := m.MarshalTo(b) + if err != nil { + return nil, err + } + return b[:n], nil + } +} +func (m *HTTPRouteDestination) XXX_Merge(src proto.Message) { + xxx_messageInfo_HTTPRouteDestination.Merge(m, src) } +func (m *HTTPRouteDestination) XXX_Size() int { + return m.Size() +} +func (m *HTTPRouteDestination) XXX_DiscardUnknown() { + xxx_messageInfo_HTTPRouteDestination.DiscardUnknown(m) +} + +var xxx_messageInfo_HTTPRouteDestination proto.InternalMessageInfo func (m *HTTPRouteDestination) GetDestination() *Destination { if m != nil { @@ -1001,6 +1315,7 @@ func (m *HTTPRouteDestination) GetWeight() int32 { return 0 } +// Deprecated: Do not use. func (m *HTTPRouteDestination) GetRemoveResponseHeaders() []string { if m != nil { return m.RemoveResponseHeaders @@ -1008,6 +1323,7 @@ func (m *HTTPRouteDestination) GetRemoveResponseHeaders() []string { return nil } +// Deprecated: Do not use. func (m *HTTPRouteDestination) GetAppendResponseHeaders() map[string]string { if m != nil { return m.AppendResponseHeaders @@ -1015,6 +1331,7 @@ func (m *HTTPRouteDestination) GetAppendResponseHeaders() map[string]string { return nil } +// Deprecated: Do not use. func (m *HTTPRouteDestination) GetRemoveRequestHeaders() []string { if m != nil { return m.RemoveRequestHeaders @@ -1022,6 +1339,7 @@ func (m *HTTPRouteDestination) GetRemoveRequestHeaders() []string { return nil } +// Deprecated: Do not use. func (m *HTTPRouteDestination) GetAppendRequestHeaders() map[string]string { if m != nil { return m.AppendRequestHeaders @@ -1040,17 +1358,48 @@ func (m *HTTPRouteDestination) GetHeaders() *Headers { type RouteDestination struct { // REQUIRED. Destination uniquely identifies the instances of a service // to which the request/connection should be forwarded to. - Destination *Destination `protobuf:"bytes,1,opt,name=destination" json:"destination,omitempty"` + Destination *Destination `protobuf:"bytes,1,opt,name=destination,proto3" json:"destination,omitempty"` // REQUIRED. The proportion of traffic to be forwarded to the service // version. If there is only one destination in a rule, all traffic will be // routed to it irrespective of the weight. - Weight int32 `protobuf:"varint,2,opt,name=weight,proto3" json:"weight,omitempty"` + Weight int32 `protobuf:"varint,2,opt,name=weight,proto3" json:"weight,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` +} + +func (m *RouteDestination) Reset() { *m = RouteDestination{} } +func (m *RouteDestination) String() string { return proto.CompactTextString(m) } +func (*RouteDestination) ProtoMessage() {} +func (*RouteDestination) Descriptor() ([]byte, []int) { + return fileDescriptor_e85a9a4fa9c17a22, []int{8} +} +func (m *RouteDestination) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *RouteDestination) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_RouteDestination.Marshal(b, m, deterministic) + } else { + b = b[:cap(b)] + n, err := m.MarshalTo(b) + if err != nil { + return nil, err + } + return b[:n], nil + } +} +func (m *RouteDestination) XXX_Merge(src proto.Message) { + xxx_messageInfo_RouteDestination.Merge(m, src) +} +func (m *RouteDestination) XXX_Size() int { + return m.Size() +} +func (m *RouteDestination) XXX_DiscardUnknown() { + xxx_messageInfo_RouteDestination.DiscardUnknown(m) } -func (m *RouteDestination) Reset() { *m = RouteDestination{} } -func (m *RouteDestination) String() string { return proto.CompactTextString(m) } -func (*RouteDestination) ProtoMessage() {} -func (*RouteDestination) Descriptor() ([]byte, []int) { return fileDescriptorVirtualService, []int{8} } +var xxx_messageInfo_RouteDestination proto.InternalMessageInfo func (m *RouteDestination) GetDestination() *Destination { if m != nil { @@ -1071,7 +1420,7 @@ func (m *RouteDestination) GetWeight() int32 { type L4MatchAttributes struct { // IPv4 or IPv6 ip addresses of destination with optional subnet. E.g., // a.b.c.d/xx form or just a.b.c.d. - DestinationSubnets []string `protobuf:"bytes,1,rep,name=destination_subnets,json=destinationSubnets" json:"destination_subnets,omitempty"` + DestinationSubnets []string `protobuf:"bytes,1,rep,name=destination_subnets,json=destinationSubnets,proto3" json:"destination_subnets,omitempty"` // Specifies the port on the host that is being addressed. Many services // only expose a single port or label ports with the protocols they support, // in these cases it is not required to explicitly select the port. @@ -1084,17 +1433,48 @@ type L4MatchAttributes struct { // workloads with the given labels. If the VirtualService has a list of // gateways specified at the top, it should include the reserved gateway // `mesh` in order for this field to be applicable. - SourceLabels map[string]string `protobuf:"bytes,4,rep,name=source_labels,json=sourceLabels" json:"source_labels,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` + SourceLabels map[string]string `protobuf:"bytes,4,rep,name=source_labels,json=sourceLabels,proto3" json:"source_labels,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` // Names of gateways where the rule should be applied to. Gateway names // at the top of the VirtualService (if any) are overridden. The gateway // match is independent of sourceLabels. - Gateways []string `protobuf:"bytes,5,rep,name=gateways" json:"gateways,omitempty"` + Gateways []string `protobuf:"bytes,5,rep,name=gateways,proto3" json:"gateways,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` +} + +func (m *L4MatchAttributes) Reset() { *m = L4MatchAttributes{} } +func (m *L4MatchAttributes) String() string { return proto.CompactTextString(m) } +func (*L4MatchAttributes) ProtoMessage() {} +func (*L4MatchAttributes) Descriptor() ([]byte, []int) { + return fileDescriptor_e85a9a4fa9c17a22, []int{9} +} +func (m *L4MatchAttributes) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *L4MatchAttributes) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_L4MatchAttributes.Marshal(b, m, deterministic) + } else { + b = b[:cap(b)] + n, err := m.MarshalTo(b) + if err != nil { + return nil, err + } + return b[:n], nil + } +} +func (m *L4MatchAttributes) XXX_Merge(src proto.Message) { + xxx_messageInfo_L4MatchAttributes.Merge(m, src) +} +func (m *L4MatchAttributes) XXX_Size() int { + return m.Size() +} +func (m *L4MatchAttributes) XXX_DiscardUnknown() { + xxx_messageInfo_L4MatchAttributes.DiscardUnknown(m) } -func (m *L4MatchAttributes) Reset() { *m = L4MatchAttributes{} } -func (m *L4MatchAttributes) String() string { return proto.CompactTextString(m) } -func (*L4MatchAttributes) ProtoMessage() {} -func (*L4MatchAttributes) Descriptor() ([]byte, []int) { return fileDescriptorVirtualService, []int{9} } +var xxx_messageInfo_L4MatchAttributes proto.InternalMessageInfo func (m *L4MatchAttributes) GetDestinationSubnets() []string { if m != nil { @@ -1137,10 +1517,10 @@ type TLSMatchAttributes struct { // can be used in the SNI value, e.g., *.com will match foo.example.com // as well as example.com. An SNI value must be a subset (i.e., fall // within the domain) of the corresponding virtual serivce's hosts. - SniHosts []string `protobuf:"bytes,1,rep,name=sni_hosts,json=sniHosts" json:"sni_hosts,omitempty"` + SniHosts []string `protobuf:"bytes,1,rep,name=sni_hosts,json=sniHosts,proto3" json:"sni_hosts,omitempty"` // IPv4 or IPv6 ip addresses of destination with optional subnet. E.g., // a.b.c.d/xx form or just a.b.c.d. - DestinationSubnets []string `protobuf:"bytes,2,rep,name=destination_subnets,json=destinationSubnets" json:"destination_subnets,omitempty"` + DestinationSubnets []string `protobuf:"bytes,2,rep,name=destination_subnets,json=destinationSubnets,proto3" json:"destination_subnets,omitempty"` // Specifies the port on the host that is being addressed. Many services // only expose a single port or label ports with the protocols they // support, in these cases it is not required to explicitly select the @@ -1154,20 +1534,49 @@ type TLSMatchAttributes struct { // workloads with the given labels. If the VirtualService has a list of // gateways specified at the top, it should include the reserved gateway // `mesh` in order for this field to be applicable. - SourceLabels map[string]string `protobuf:"bytes,5,rep,name=source_labels,json=sourceLabels" json:"source_labels,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` + SourceLabels map[string]string `protobuf:"bytes,5,rep,name=source_labels,json=sourceLabels,proto3" json:"source_labels,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` // Names of gateways where the rule should be applied to. Gateway names // at the top of the VirtualService (if any) are overridden. The gateway // match is independent of sourceLabels. - Gateways []string `protobuf:"bytes,6,rep,name=gateways" json:"gateways,omitempty"` + Gateways []string `protobuf:"bytes,6,rep,name=gateways,proto3" json:"gateways,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` } func (m *TLSMatchAttributes) Reset() { *m = TLSMatchAttributes{} } func (m *TLSMatchAttributes) String() string { return proto.CompactTextString(m) } func (*TLSMatchAttributes) ProtoMessage() {} func (*TLSMatchAttributes) Descriptor() ([]byte, []int) { - return fileDescriptorVirtualService, []int{10} + return fileDescriptor_e85a9a4fa9c17a22, []int{10} +} +func (m *TLSMatchAttributes) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *TLSMatchAttributes) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_TLSMatchAttributes.Marshal(b, m, deterministic) + } else { + b = b[:cap(b)] + n, err := m.MarshalTo(b) + if err != nil { + return nil, err + } + return b[:n], nil + } +} +func (m *TLSMatchAttributes) XXX_Merge(src proto.Message) { + xxx_messageInfo_TLSMatchAttributes.Merge(m, src) +} +func (m *TLSMatchAttributes) XXX_Size() int { + return m.Size() +} +func (m *TLSMatchAttributes) XXX_DiscardUnknown() { + xxx_messageInfo_TLSMatchAttributes.DiscardUnknown(m) } +var xxx_messageInfo_TLSMatchAttributes proto.InternalMessageInfo + func (m *TLSMatchAttributes) GetSniHosts() []string { if m != nil { return m.SniHosts @@ -1240,13 +1649,44 @@ type HTTPRedirect struct { Uri string `protobuf:"bytes,1,opt,name=uri,proto3" json:"uri,omitempty"` // On a redirect, overwrite the Authority/Host portion of the URL with // this value. - Authority string `protobuf:"bytes,2,opt,name=authority,proto3" json:"authority,omitempty"` + Authority string `protobuf:"bytes,2,opt,name=authority,proto3" json:"authority,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` +} + +func (m *HTTPRedirect) Reset() { *m = HTTPRedirect{} } +func (m *HTTPRedirect) String() string { return proto.CompactTextString(m) } +func (*HTTPRedirect) ProtoMessage() {} +func (*HTTPRedirect) Descriptor() ([]byte, []int) { + return fileDescriptor_e85a9a4fa9c17a22, []int{11} +} +func (m *HTTPRedirect) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *HTTPRedirect) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_HTTPRedirect.Marshal(b, m, deterministic) + } else { + b = b[:cap(b)] + n, err := m.MarshalTo(b) + if err != nil { + return nil, err + } + return b[:n], nil + } +} +func (m *HTTPRedirect) XXX_Merge(src proto.Message) { + xxx_messageInfo_HTTPRedirect.Merge(m, src) +} +func (m *HTTPRedirect) XXX_Size() int { + return m.Size() +} +func (m *HTTPRedirect) XXX_DiscardUnknown() { + xxx_messageInfo_HTTPRedirect.DiscardUnknown(m) } -func (m *HTTPRedirect) Reset() { *m = HTTPRedirect{} } -func (m *HTTPRedirect) String() string { return proto.CompactTextString(m) } -func (*HTTPRedirect) ProtoMessage() {} -func (*HTTPRedirect) Descriptor() ([]byte, []int) { return fileDescriptorVirtualService, []int{11} } +var xxx_messageInfo_HTTPRedirect proto.InternalMessageInfo func (m *HTTPRedirect) GetUri() string { if m != nil { @@ -1294,13 +1734,44 @@ type HTTPRewrite struct { // provided in this field will replace the corresponding matched prefix. Uri string `protobuf:"bytes,1,opt,name=uri,proto3" json:"uri,omitempty"` // rewrite the Authority/Host header with this value. - Authority string `protobuf:"bytes,2,opt,name=authority,proto3" json:"authority,omitempty"` + Authority string `protobuf:"bytes,2,opt,name=authority,proto3" json:"authority,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` +} + +func (m *HTTPRewrite) Reset() { *m = HTTPRewrite{} } +func (m *HTTPRewrite) String() string { return proto.CompactTextString(m) } +func (*HTTPRewrite) ProtoMessage() {} +func (*HTTPRewrite) Descriptor() ([]byte, []int) { + return fileDescriptor_e85a9a4fa9c17a22, []int{12} +} +func (m *HTTPRewrite) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *HTTPRewrite) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_HTTPRewrite.Marshal(b, m, deterministic) + } else { + b = b[:cap(b)] + n, err := m.MarshalTo(b) + if err != nil { + return nil, err + } + return b[:n], nil + } +} +func (m *HTTPRewrite) XXX_Merge(src proto.Message) { + xxx_messageInfo_HTTPRewrite.Merge(m, src) +} +func (m *HTTPRewrite) XXX_Size() int { + return m.Size() +} +func (m *HTTPRewrite) XXX_DiscardUnknown() { + xxx_messageInfo_HTTPRewrite.DiscardUnknown(m) } -func (m *HTTPRewrite) Reset() { *m = HTTPRewrite{} } -func (m *HTTPRewrite) String() string { return proto.CompactTextString(m) } -func (*HTTPRewrite) ProtoMessage() {} -func (*HTTPRewrite) Descriptor() ([]byte, []int) { return fileDescriptorVirtualService, []int{12} } +var xxx_messageInfo_HTTPRewrite proto.InternalMessageInfo func (m *HTTPRewrite) GetUri() string { if m != nil { @@ -1323,13 +1794,44 @@ type StringMatch struct { // *StringMatch_Exact // *StringMatch_Prefix // *StringMatch_Regex - MatchType isStringMatch_MatchType `protobuf_oneof:"match_type"` + MatchType isStringMatch_MatchType `protobuf_oneof:"match_type"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` +} + +func (m *StringMatch) Reset() { *m = StringMatch{} } +func (m *StringMatch) String() string { return proto.CompactTextString(m) } +func (*StringMatch) ProtoMessage() {} +func (*StringMatch) Descriptor() ([]byte, []int) { + return fileDescriptor_e85a9a4fa9c17a22, []int{13} +} +func (m *StringMatch) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *StringMatch) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_StringMatch.Marshal(b, m, deterministic) + } else { + b = b[:cap(b)] + n, err := m.MarshalTo(b) + if err != nil { + return nil, err + } + return b[:n], nil + } +} +func (m *StringMatch) XXX_Merge(src proto.Message) { + xxx_messageInfo_StringMatch.Merge(m, src) +} +func (m *StringMatch) XXX_Size() int { + return m.Size() +} +func (m *StringMatch) XXX_DiscardUnknown() { + xxx_messageInfo_StringMatch.DiscardUnknown(m) } -func (m *StringMatch) Reset() { *m = StringMatch{} } -func (m *StringMatch) String() string { return proto.CompactTextString(m) } -func (*StringMatch) ProtoMessage() {} -func (*StringMatch) Descriptor() ([]byte, []int) { return fileDescriptorVirtualService, []int{13} } +var xxx_messageInfo_StringMatch proto.InternalMessageInfo type isStringMatch_MatchType interface { isStringMatch_MatchType() @@ -1442,15 +1944,15 @@ func _StringMatch_OneofSizer(msg proto.Message) (n int) { // match_type switch x := m.MatchType.(type) { case *StringMatch_Exact: - n += proto.SizeVarint(1<<3 | proto.WireBytes) + n += 1 // tag and wire n += proto.SizeVarint(uint64(len(x.Exact))) n += len(x.Exact) case *StringMatch_Prefix: - n += proto.SizeVarint(2<<3 | proto.WireBytes) + n += 1 // tag and wire n += proto.SizeVarint(uint64(len(x.Prefix))) n += len(x.Prefix) case *StringMatch_Regex: - n += proto.SizeVarint(3<<3 | proto.WireBytes) + n += 1 // tag and wire n += proto.SizeVarint(uint64(len(x.Regex))) n += len(x.Regex) case nil: @@ -1489,19 +1991,50 @@ type HTTPRetry struct { // number of retries attempted depends on the httpReqTimeout. Attempts int32 `protobuf:"varint,1,opt,name=attempts,proto3" json:"attempts,omitempty"` // Timeout per retry attempt for a given request. format: 1h/1m/1s/1ms. MUST BE >=1ms. - PerTryTimeout *google_protobuf.Duration `protobuf:"bytes,2,opt,name=per_try_timeout,json=perTryTimeout" json:"per_try_timeout,omitempty"` + PerTryTimeout *types.Duration `protobuf:"bytes,2,opt,name=per_try_timeout,json=perTryTimeout,proto3" json:"per_try_timeout,omitempty"` // Specifies the conditions under which retry takes place. // One or more policies can be specified using a ‘,’ delimited list. // The supported policies can be found in // // and - RetryOn string `protobuf:"bytes,3,opt,name=retry_on,json=retryOn,proto3" json:"retry_on,omitempty"` + RetryOn string `protobuf:"bytes,3,opt,name=retry_on,json=retryOn,proto3" json:"retry_on,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` +} + +func (m *HTTPRetry) Reset() { *m = HTTPRetry{} } +func (m *HTTPRetry) String() string { return proto.CompactTextString(m) } +func (*HTTPRetry) ProtoMessage() {} +func (*HTTPRetry) Descriptor() ([]byte, []int) { + return fileDescriptor_e85a9a4fa9c17a22, []int{14} +} +func (m *HTTPRetry) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *HTTPRetry) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_HTTPRetry.Marshal(b, m, deterministic) + } else { + b = b[:cap(b)] + n, err := m.MarshalTo(b) + if err != nil { + return nil, err + } + return b[:n], nil + } +} +func (m *HTTPRetry) XXX_Merge(src proto.Message) { + xxx_messageInfo_HTTPRetry.Merge(m, src) +} +func (m *HTTPRetry) XXX_Size() int { + return m.Size() +} +func (m *HTTPRetry) XXX_DiscardUnknown() { + xxx_messageInfo_HTTPRetry.DiscardUnknown(m) } -func (m *HTTPRetry) Reset() { *m = HTTPRetry{} } -func (m *HTTPRetry) String() string { return proto.CompactTextString(m) } -func (*HTTPRetry) ProtoMessage() {} -func (*HTTPRetry) Descriptor() ([]byte, []int) { return fileDescriptorVirtualService, []int{14} } +var xxx_messageInfo_HTTPRetry proto.InternalMessageInfo func (m *HTTPRetry) GetAttempts() int32 { if m != nil { @@ -1510,7 +2043,7 @@ func (m *HTTPRetry) GetAttempts() int32 { return 0 } -func (m *HTTPRetry) GetPerTryTimeout() *google_protobuf.Duration { +func (m *HTTPRetry) GetPerTryTimeout() *types.Duration { if m != nil { return m.PerTryTimeout } @@ -1562,29 +2095,60 @@ type CorsPolicy struct { // The list of origins that are allowed to perform CORS requests. The // content will be serialized into the Access-Control-Allow-Origin // header. Wildcard * will allow all origins. - AllowOrigin []string `protobuf:"bytes,1,rep,name=allow_origin,json=allowOrigin" json:"allow_origin,omitempty"` + AllowOrigin []string `protobuf:"bytes,1,rep,name=allow_origin,json=allowOrigin,proto3" json:"allow_origin,omitempty"` // List of HTTP methods allowed to access the resource. The content will // be serialized into the Access-Control-Allow-Methods header. - AllowMethods []string `protobuf:"bytes,2,rep,name=allow_methods,json=allowMethods" json:"allow_methods,omitempty"` + AllowMethods []string `protobuf:"bytes,2,rep,name=allow_methods,json=allowMethods,proto3" json:"allow_methods,omitempty"` // List of HTTP headers that can be used when requesting the // resource. Serialized to Access-Control-Allow-Headers header. - AllowHeaders []string `protobuf:"bytes,3,rep,name=allow_headers,json=allowHeaders" json:"allow_headers,omitempty"` + AllowHeaders []string `protobuf:"bytes,3,rep,name=allow_headers,json=allowHeaders,proto3" json:"allow_headers,omitempty"` // A white list of HTTP headers that the browsers are allowed to // access. Serialized into Access-Control-Expose-Headers header. - ExposeHeaders []string `protobuf:"bytes,4,rep,name=expose_headers,json=exposeHeaders" json:"expose_headers,omitempty"` + ExposeHeaders []string `protobuf:"bytes,4,rep,name=expose_headers,json=exposeHeaders,proto3" json:"expose_headers,omitempty"` // Specifies how long the results of a preflight request can be // cached. Translates to the `Access-Control-Max-Age` header. - MaxAge *google_protobuf.Duration `protobuf:"bytes,5,opt,name=max_age,json=maxAge" json:"max_age,omitempty"` + MaxAge *types.Duration `protobuf:"bytes,5,opt,name=max_age,json=maxAge,proto3" json:"max_age,omitempty"` // Indicates whether the caller is allowed to send the actual request // (not the preflight) using credentials. Translates to // `Access-Control-Allow-Credentials` header. - AllowCredentials *google_protobuf1.BoolValue `protobuf:"bytes,6,opt,name=allow_credentials,json=allowCredentials" json:"allow_credentials,omitempty"` + AllowCredentials *types.BoolValue `protobuf:"bytes,6,opt,name=allow_credentials,json=allowCredentials,proto3" json:"allow_credentials,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` +} + +func (m *CorsPolicy) Reset() { *m = CorsPolicy{} } +func (m *CorsPolicy) String() string { return proto.CompactTextString(m) } +func (*CorsPolicy) ProtoMessage() {} +func (*CorsPolicy) Descriptor() ([]byte, []int) { + return fileDescriptor_e85a9a4fa9c17a22, []int{15} +} +func (m *CorsPolicy) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *CorsPolicy) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_CorsPolicy.Marshal(b, m, deterministic) + } else { + b = b[:cap(b)] + n, err := m.MarshalTo(b) + if err != nil { + return nil, err + } + return b[:n], nil + } +} +func (m *CorsPolicy) XXX_Merge(src proto.Message) { + xxx_messageInfo_CorsPolicy.Merge(m, src) +} +func (m *CorsPolicy) XXX_Size() int { + return m.Size() +} +func (m *CorsPolicy) XXX_DiscardUnknown() { + xxx_messageInfo_CorsPolicy.DiscardUnknown(m) } -func (m *CorsPolicy) Reset() { *m = CorsPolicy{} } -func (m *CorsPolicy) String() string { return proto.CompactTextString(m) } -func (*CorsPolicy) ProtoMessage() {} -func (*CorsPolicy) Descriptor() ([]byte, []int) { return fileDescriptorVirtualService, []int{15} } +var xxx_messageInfo_CorsPolicy proto.InternalMessageInfo func (m *CorsPolicy) GetAllowOrigin() []string { if m != nil { @@ -1614,14 +2178,14 @@ func (m *CorsPolicy) GetExposeHeaders() []string { return nil } -func (m *CorsPolicy) GetMaxAge() *google_protobuf.Duration { +func (m *CorsPolicy) GetMaxAge() *types.Duration { if m != nil { return m.MaxAge } return nil } -func (m *CorsPolicy) GetAllowCredentials() *google_protobuf1.BoolValue { +func (m *CorsPolicy) GetAllowCredentials() *types.BoolValue { if m != nil { return m.AllowCredentials } @@ -1639,19 +2203,48 @@ func (m *CorsPolicy) GetAllowCredentials() *google_protobuf1.BoolValue { type HTTPFaultInjection struct { // Delay requests before forwarding, emulating various failures such as // network issues, overloaded upstream service, etc. - Delay *HTTPFaultInjection_Delay `protobuf:"bytes,1,opt,name=delay" json:"delay,omitempty"` + Delay *HTTPFaultInjection_Delay `protobuf:"bytes,1,opt,name=delay,proto3" json:"delay,omitempty"` // Abort Http request attempts and return error codes back to downstream // service, giving the impression that the upstream service is faulty. - Abort *HTTPFaultInjection_Abort `protobuf:"bytes,2,opt,name=abort" json:"abort,omitempty"` + Abort *HTTPFaultInjection_Abort `protobuf:"bytes,2,opt,name=abort,proto3" json:"abort,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` } func (m *HTTPFaultInjection) Reset() { *m = HTTPFaultInjection{} } func (m *HTTPFaultInjection) String() string { return proto.CompactTextString(m) } func (*HTTPFaultInjection) ProtoMessage() {} func (*HTTPFaultInjection) Descriptor() ([]byte, []int) { - return fileDescriptorVirtualService, []int{16} + return fileDescriptor_e85a9a4fa9c17a22, []int{16} +} +func (m *HTTPFaultInjection) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *HTTPFaultInjection) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_HTTPFaultInjection.Marshal(b, m, deterministic) + } else { + b = b[:cap(b)] + n, err := m.MarshalTo(b) + if err != nil { + return nil, err + } + return b[:n], nil + } +} +func (m *HTTPFaultInjection) XXX_Merge(src proto.Message) { + xxx_messageInfo_HTTPFaultInjection.Merge(m, src) +} +func (m *HTTPFaultInjection) XXX_Size() int { + return m.Size() +} +func (m *HTTPFaultInjection) XXX_DiscardUnknown() { + xxx_messageInfo_HTTPFaultInjection.DiscardUnknown(m) } +var xxx_messageInfo_HTTPFaultInjection proto.InternalMessageInfo + func (m *HTTPFaultInjection) GetDelay() *HTTPFaultInjection_Delay { if m != nil { return m.Delay @@ -1701,22 +2294,51 @@ type HTTPFaultInjection_Delay struct { // Percentage of requests on which the delay will be injected (0-100). // Use of integer `percent` value is deprecated. Use the double `percentage` // field instead. - Percent int32 `protobuf:"varint,1,opt,name=percent,proto3" json:"percent,omitempty"` + Percent int32 `protobuf:"varint,1,opt,name=percent,proto3" json:"percent,omitempty"` // Deprecated: Do not use. // Types that are valid to be assigned to HttpDelayType: // *HTTPFaultInjection_Delay_FixedDelay // *HTTPFaultInjection_Delay_ExponentialDelay HttpDelayType isHTTPFaultInjection_Delay_HttpDelayType `protobuf_oneof:"http_delay_type"` // Percentage of requests on which the delay will be injected. - Percentage *Percent `protobuf:"bytes,5,opt,name=percentage" json:"percentage,omitempty"` + Percentage *Percent `protobuf:"bytes,5,opt,name=percentage,proto3" json:"percentage,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` } func (m *HTTPFaultInjection_Delay) Reset() { *m = HTTPFaultInjection_Delay{} } func (m *HTTPFaultInjection_Delay) String() string { return proto.CompactTextString(m) } func (*HTTPFaultInjection_Delay) ProtoMessage() {} func (*HTTPFaultInjection_Delay) Descriptor() ([]byte, []int) { - return fileDescriptorVirtualService, []int{16, 0} + return fileDescriptor_e85a9a4fa9c17a22, []int{16, 0} +} +func (m *HTTPFaultInjection_Delay) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *HTTPFaultInjection_Delay) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_HTTPFaultInjection_Delay.Marshal(b, m, deterministic) + } else { + b = b[:cap(b)] + n, err := m.MarshalTo(b) + if err != nil { + return nil, err + } + return b[:n], nil + } +} +func (m *HTTPFaultInjection_Delay) XXX_Merge(src proto.Message) { + xxx_messageInfo_HTTPFaultInjection_Delay.Merge(m, src) +} +func (m *HTTPFaultInjection_Delay) XXX_Size() int { + return m.Size() +} +func (m *HTTPFaultInjection_Delay) XXX_DiscardUnknown() { + xxx_messageInfo_HTTPFaultInjection_Delay.DiscardUnknown(m) } +var xxx_messageInfo_HTTPFaultInjection_Delay proto.InternalMessageInfo + type isHTTPFaultInjection_Delay_HttpDelayType interface { isHTTPFaultInjection_Delay_HttpDelayType() MarshalTo([]byte) (int, error) @@ -1724,10 +2346,10 @@ type isHTTPFaultInjection_Delay_HttpDelayType interface { } type HTTPFaultInjection_Delay_FixedDelay struct { - FixedDelay *google_protobuf.Duration `protobuf:"bytes,2,opt,name=fixed_delay,json=fixedDelay,oneof"` + FixedDelay *types.Duration `protobuf:"bytes,2,opt,name=fixed_delay,json=fixedDelay,proto3,oneof"` } type HTTPFaultInjection_Delay_ExponentialDelay struct { - ExponentialDelay *google_protobuf.Duration `protobuf:"bytes,3,opt,name=exponential_delay,json=exponentialDelay,oneof"` + ExponentialDelay *types.Duration `protobuf:"bytes,3,opt,name=exponential_delay,json=exponentialDelay,proto3,oneof"` } func (*HTTPFaultInjection_Delay_FixedDelay) isHTTPFaultInjection_Delay_HttpDelayType() {} @@ -1740,6 +2362,7 @@ func (m *HTTPFaultInjection_Delay) GetHttpDelayType() isHTTPFaultInjection_Delay return nil } +// Deprecated: Do not use. func (m *HTTPFaultInjection_Delay) GetPercent() int32 { if m != nil { return m.Percent @@ -1747,14 +2370,14 @@ func (m *HTTPFaultInjection_Delay) GetPercent() int32 { return 0 } -func (m *HTTPFaultInjection_Delay) GetFixedDelay() *google_protobuf.Duration { +func (m *HTTPFaultInjection_Delay) GetFixedDelay() *types.Duration { if x, ok := m.GetHttpDelayType().(*HTTPFaultInjection_Delay_FixedDelay); ok { return x.FixedDelay } return nil } -func (m *HTTPFaultInjection_Delay) GetExponentialDelay() *google_protobuf.Duration { +func (m *HTTPFaultInjection_Delay) GetExponentialDelay() *types.Duration { if x, ok := m.GetHttpDelayType().(*HTTPFaultInjection_Delay_ExponentialDelay); ok { return x.ExponentialDelay } @@ -1804,7 +2427,7 @@ func _HTTPFaultInjection_Delay_OneofUnmarshaler(msg proto.Message, tag, wire int if wire != proto.WireBytes { return true, proto.ErrInternalBadWireType } - msg := new(google_protobuf.Duration) + msg := new(types.Duration) err := b.DecodeMessage(msg) m.HttpDelayType = &HTTPFaultInjection_Delay_FixedDelay{msg} return true, err @@ -1812,7 +2435,7 @@ func _HTTPFaultInjection_Delay_OneofUnmarshaler(msg proto.Message, tag, wire int if wire != proto.WireBytes { return true, proto.ErrInternalBadWireType } - msg := new(google_protobuf.Duration) + msg := new(types.Duration) err := b.DecodeMessage(msg) m.HttpDelayType = &HTTPFaultInjection_Delay_ExponentialDelay{msg} return true, err @@ -1827,12 +2450,12 @@ func _HTTPFaultInjection_Delay_OneofSizer(msg proto.Message) (n int) { switch x := m.HttpDelayType.(type) { case *HTTPFaultInjection_Delay_FixedDelay: s := proto.Size(x.FixedDelay) - n += proto.SizeVarint(2<<3 | proto.WireBytes) + n += 1 // tag and wire n += proto.SizeVarint(uint64(s)) n += s case *HTTPFaultInjection_Delay_ExponentialDelay: s := proto.Size(x.ExponentialDelay) - n += proto.SizeVarint(3<<3 | proto.WireBytes) + n += 1 // tag and wire n += proto.SizeVarint(uint64(s)) n += s case nil: @@ -1874,22 +2497,51 @@ type HTTPFaultInjection_Abort struct { // Percentage of requests to be aborted with the error code provided (0-100). // Use of integer `percent` value is deprecated. Use the double `percentage` // field instead. - Percent int32 `protobuf:"varint,1,opt,name=percent,proto3" json:"percent,omitempty"` + Percent int32 `protobuf:"varint,1,opt,name=percent,proto3" json:"percent,omitempty"` // Deprecated: Do not use. // Types that are valid to be assigned to ErrorType: // *HTTPFaultInjection_Abort_HttpStatus // *HTTPFaultInjection_Abort_GrpcStatus // *HTTPFaultInjection_Abort_Http2Error ErrorType isHTTPFaultInjection_Abort_ErrorType `protobuf_oneof:"error_type"` // Percentage of requests to be aborted with the error code provided. - Percentage *Percent `protobuf:"bytes,5,opt,name=percentage" json:"percentage,omitempty"` + Percentage *Percent `protobuf:"bytes,5,opt,name=percentage,proto3" json:"percentage,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` } func (m *HTTPFaultInjection_Abort) Reset() { *m = HTTPFaultInjection_Abort{} } func (m *HTTPFaultInjection_Abort) String() string { return proto.CompactTextString(m) } func (*HTTPFaultInjection_Abort) ProtoMessage() {} func (*HTTPFaultInjection_Abort) Descriptor() ([]byte, []int) { - return fileDescriptorVirtualService, []int{16, 1} + return fileDescriptor_e85a9a4fa9c17a22, []int{16, 1} +} +func (m *HTTPFaultInjection_Abort) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) } +func (m *HTTPFaultInjection_Abort) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_HTTPFaultInjection_Abort.Marshal(b, m, deterministic) + } else { + b = b[:cap(b)] + n, err := m.MarshalTo(b) + if err != nil { + return nil, err + } + return b[:n], nil + } +} +func (m *HTTPFaultInjection_Abort) XXX_Merge(src proto.Message) { + xxx_messageInfo_HTTPFaultInjection_Abort.Merge(m, src) +} +func (m *HTTPFaultInjection_Abort) XXX_Size() int { + return m.Size() +} +func (m *HTTPFaultInjection_Abort) XXX_DiscardUnknown() { + xxx_messageInfo_HTTPFaultInjection_Abort.DiscardUnknown(m) +} + +var xxx_messageInfo_HTTPFaultInjection_Abort proto.InternalMessageInfo type isHTTPFaultInjection_Abort_ErrorType interface { isHTTPFaultInjection_Abort_ErrorType() @@ -1918,6 +2570,7 @@ func (m *HTTPFaultInjection_Abort) GetErrorType() isHTTPFaultInjection_Abort_Err return nil } +// Deprecated: Do not use. func (m *HTTPFaultInjection_Abort) GetPercent() int32 { if m != nil { return m.Percent @@ -2016,14 +2669,14 @@ func _HTTPFaultInjection_Abort_OneofSizer(msg proto.Message) (n int) { // error_type switch x := m.ErrorType.(type) { case *HTTPFaultInjection_Abort_HttpStatus: - n += proto.SizeVarint(2<<3 | proto.WireVarint) + n += 1 // tag and wire n += proto.SizeVarint(uint64(x.HttpStatus)) case *HTTPFaultInjection_Abort_GrpcStatus: - n += proto.SizeVarint(3<<3 | proto.WireBytes) + n += 1 // tag and wire n += proto.SizeVarint(uint64(len(x.GrpcStatus))) n += len(x.GrpcStatus) case *HTTPFaultInjection_Abort_Http2Error: - n += proto.SizeVarint(4<<3 | proto.WireBytes) + n += 1 // tag and wire n += proto.SizeVarint(uint64(len(x.Http2Error))) n += len(x.Http2Error) case nil: @@ -2039,13 +2692,44 @@ type PortSelector struct { // Types that are valid to be assigned to Port: // *PortSelector_Number // *PortSelector_Name - Port isPortSelector_Port `protobuf_oneof:"port"` + Port isPortSelector_Port `protobuf_oneof:"port"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` +} + +func (m *PortSelector) Reset() { *m = PortSelector{} } +func (m *PortSelector) String() string { return proto.CompactTextString(m) } +func (*PortSelector) ProtoMessage() {} +func (*PortSelector) Descriptor() ([]byte, []int) { + return fileDescriptor_e85a9a4fa9c17a22, []int{17} +} +func (m *PortSelector) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *PortSelector) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_PortSelector.Marshal(b, m, deterministic) + } else { + b = b[:cap(b)] + n, err := m.MarshalTo(b) + if err != nil { + return nil, err + } + return b[:n], nil + } +} +func (m *PortSelector) XXX_Merge(src proto.Message) { + xxx_messageInfo_PortSelector.Merge(m, src) +} +func (m *PortSelector) XXX_Size() int { + return m.Size() +} +func (m *PortSelector) XXX_DiscardUnknown() { + xxx_messageInfo_PortSelector.DiscardUnknown(m) } -func (m *PortSelector) Reset() { *m = PortSelector{} } -func (m *PortSelector) String() string { return proto.CompactTextString(m) } -func (*PortSelector) ProtoMessage() {} -func (*PortSelector) Descriptor() ([]byte, []int) { return fileDescriptorVirtualService, []int{17} } +var xxx_messageInfo_PortSelector proto.InternalMessageInfo type isPortSelector_Port interface { isPortSelector_Port() @@ -2136,10 +2820,10 @@ func _PortSelector_OneofSizer(msg proto.Message) (n int) { // port switch x := m.Port.(type) { case *PortSelector_Number: - n += proto.SizeVarint(1<<3 | proto.WireVarint) + n += 1 // tag and wire n += proto.SizeVarint(uint64(x.Number)) case *PortSelector_Name: - n += proto.SizeVarint(2<<3 | proto.WireBytes) + n += 1 // tag and wire n += proto.SizeVarint(uint64(len(x.Name))) n += len(x.Name) case nil: @@ -2151,13 +2835,44 @@ func _PortSelector_OneofSizer(msg proto.Message) (n int) { // Percent specifies a percentage in the range of [0.0, 100.0]. type Percent struct { - Value float64 `protobuf:"fixed64,1,opt,name=value,proto3" json:"value,omitempty"` + Value float64 `protobuf:"fixed64,1,opt,name=value,proto3" json:"value,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` +} + +func (m *Percent) Reset() { *m = Percent{} } +func (m *Percent) String() string { return proto.CompactTextString(m) } +func (*Percent) ProtoMessage() {} +func (*Percent) Descriptor() ([]byte, []int) { + return fileDescriptor_e85a9a4fa9c17a22, []int{18} +} +func (m *Percent) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *Percent) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_Percent.Marshal(b, m, deterministic) + } else { + b = b[:cap(b)] + n, err := m.MarshalTo(b) + if err != nil { + return nil, err + } + return b[:n], nil + } +} +func (m *Percent) XXX_Merge(src proto.Message) { + xxx_messageInfo_Percent.Merge(m, src) +} +func (m *Percent) XXX_Size() int { + return m.Size() +} +func (m *Percent) XXX_DiscardUnknown() { + xxx_messageInfo_Percent.DiscardUnknown(m) } -func (m *Percent) Reset() { *m = Percent{} } -func (m *Percent) String() string { return proto.CompactTextString(m) } -func (*Percent) ProtoMessage() {} -func (*Percent) Descriptor() ([]byte, []int) { return fileDescriptorVirtualService, []int{18} } +var xxx_messageInfo_Percent proto.InternalMessageInfo func (m *Percent) GetValue() float64 { if m != nil { @@ -2170,15 +2885,26 @@ func init() { proto.RegisterType((*VirtualService)(nil), "istio.networking.v1alpha3.VirtualService") proto.RegisterType((*Destination)(nil), "istio.networking.v1alpha3.Destination") proto.RegisterType((*HTTPRoute)(nil), "istio.networking.v1alpha3.HTTPRoute") + proto.RegisterMapType((map[string]string)(nil), "istio.networking.v1alpha3.HTTPRoute.AppendHeadersEntry") + proto.RegisterMapType((map[string]string)(nil), "istio.networking.v1alpha3.HTTPRoute.AppendRequestHeadersEntry") + proto.RegisterMapType((map[string]string)(nil), "istio.networking.v1alpha3.HTTPRoute.AppendResponseHeadersEntry") proto.RegisterType((*Headers)(nil), "istio.networking.v1alpha3.Headers") proto.RegisterType((*Headers_HeaderOperations)(nil), "istio.networking.v1alpha3.Headers.HeaderOperations") + proto.RegisterMapType((map[string]string)(nil), "istio.networking.v1alpha3.Headers.HeaderOperations.AddEntry") + proto.RegisterMapType((map[string]string)(nil), "istio.networking.v1alpha3.Headers.HeaderOperations.SetEntry") proto.RegisterType((*TLSRoute)(nil), "istio.networking.v1alpha3.TLSRoute") proto.RegisterType((*TCPRoute)(nil), "istio.networking.v1alpha3.TCPRoute") proto.RegisterType((*HTTPMatchRequest)(nil), "istio.networking.v1alpha3.HTTPMatchRequest") + proto.RegisterMapType((map[string]*StringMatch)(nil), "istio.networking.v1alpha3.HTTPMatchRequest.HeadersEntry") + proto.RegisterMapType((map[string]string)(nil), "istio.networking.v1alpha3.HTTPMatchRequest.SourceLabelsEntry") proto.RegisterType((*HTTPRouteDestination)(nil), "istio.networking.v1alpha3.HTTPRouteDestination") + proto.RegisterMapType((map[string]string)(nil), "istio.networking.v1alpha3.HTTPRouteDestination.AppendRequestHeadersEntry") + proto.RegisterMapType((map[string]string)(nil), "istio.networking.v1alpha3.HTTPRouteDestination.AppendResponseHeadersEntry") proto.RegisterType((*RouteDestination)(nil), "istio.networking.v1alpha3.RouteDestination") proto.RegisterType((*L4MatchAttributes)(nil), "istio.networking.v1alpha3.L4MatchAttributes") + proto.RegisterMapType((map[string]string)(nil), "istio.networking.v1alpha3.L4MatchAttributes.SourceLabelsEntry") proto.RegisterType((*TLSMatchAttributes)(nil), "istio.networking.v1alpha3.TLSMatchAttributes") + proto.RegisterMapType((map[string]string)(nil), "istio.networking.v1alpha3.TLSMatchAttributes.SourceLabelsEntry") proto.RegisterType((*HTTPRedirect)(nil), "istio.networking.v1alpha3.HTTPRedirect") proto.RegisterType((*HTTPRewrite)(nil), "istio.networking.v1alpha3.HTTPRewrite") proto.RegisterType((*StringMatch)(nil), "istio.networking.v1alpha3.StringMatch") @@ -2190,6 +2916,127 @@ func init() { proto.RegisterType((*PortSelector)(nil), "istio.networking.v1alpha3.PortSelector") proto.RegisterType((*Percent)(nil), "istio.networking.v1alpha3.Percent") } + +func init() { + proto.RegisterFile("networking/v1alpha3/virtual_service.proto", fileDescriptor_e85a9a4fa9c17a22) +} + +var fileDescriptor_e85a9a4fa9c17a22 = []byte{ + // 1785 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x59, 0x5f, 0x73, 0xdb, 0x4a, + 0x15, 0xaf, 0x6c, 0xcb, 0x7f, 0x8e, 0x9d, 0xd4, 0x59, 0x72, 0x73, 0x15, 0xdf, 0x3b, 0x21, 0xd7, + 0x97, 0x0b, 0x61, 0x4a, 0xed, 0x21, 0x81, 0x92, 0x29, 0x69, 0x5a, 0x3b, 0x69, 0xeb, 0x32, 0x2d, + 0xc9, 0xc8, 0xa1, 0x0f, 0xbc, 0x68, 0x64, 0x69, 0x63, 0x8b, 0xda, 0x5a, 0xb1, 0x5a, 0x25, 0xf6, + 0xf0, 0xc8, 0xbf, 0x67, 0x18, 0x5e, 0x19, 0xbe, 0x07, 0x2f, 0xbc, 0xf2, 0xc4, 0xf0, 0x09, 0x98, + 0x4e, 0x1f, 0x78, 0xe5, 0x2b, 0x30, 0xbb, 0x2b, 0xc9, 0x4a, 0x9c, 0x58, 0x76, 0x28, 0x0c, 0x4f, + 0xf1, 0xee, 0x9e, 0xdf, 0x6f, 0xcf, 0x9e, 0xdd, 0x3d, 0xe7, 0xa7, 0x0d, 0x7c, 0xdb, 0xc5, 0xec, + 0x92, 0xd0, 0x77, 0x8e, 0xdb, 0x6f, 0x5e, 0x7c, 0xd7, 0x1c, 0x7a, 0x03, 0x73, 0xaf, 0x79, 0xe1, + 0x50, 0x16, 0x98, 0x43, 0xc3, 0xc7, 0xf4, 0xc2, 0xb1, 0x70, 0xc3, 0xa3, 0x84, 0x11, 0xb4, 0xe9, + 0xf8, 0xcc, 0x21, 0x8d, 0x29, 0xa0, 0x11, 0x01, 0x6a, 0x5b, 0x7d, 0x42, 0xfa, 0x43, 0xdc, 0x14, + 0x86, 0xbd, 0xe0, 0xbc, 0x69, 0x07, 0xd4, 0x64, 0x0e, 0x71, 0x25, 0x74, 0x76, 0xfc, 0x92, 0x9a, + 0x9e, 0x87, 0xa9, 0x2f, 0xc7, 0xeb, 0xbf, 0xcd, 0xc0, 0xea, 0x5b, 0x39, 0x69, 0x57, 0xce, 0x89, + 0xd6, 0x41, 0x1d, 0x10, 0x9f, 0xf9, 0x9a, 0xb2, 0x9d, 0xdd, 0x29, 0xe9, 0xb2, 0x81, 0x6a, 0x50, + 0xec, 0x9b, 0x0c, 0x5f, 0x9a, 0x13, 0x5f, 0xcb, 0x88, 0x81, 0xb8, 0x8d, 0xf6, 0x21, 0x37, 0x60, + 0xcc, 0xd3, 0xb2, 0xdb, 0xd9, 0x9d, 0xf2, 0xee, 0x37, 0x1a, 0xb7, 0xba, 0xdb, 0xe8, 0x9c, 0x9d, + 0x9d, 0xea, 0x24, 0x60, 0x58, 0x17, 0x08, 0xf4, 0x7d, 0xc8, 0xb2, 0xa1, 0xaf, 0xa9, 0x02, 0xf8, + 0xe5, 0x1c, 0xe0, 0xd9, 0xeb, 0xae, 0xc4, 0x71, 0x7b, 0x01, 0xb3, 0x3c, 0x2d, 0x97, 0x0e, 0x3b, + 0x3a, 0x8d, 0x60, 0x96, 0x87, 0x3e, 0x83, 0x12, 0x1e, 0x7b, 0x84, 0x32, 0x83, 0x11, 0x2d, 0x2f, + 0x17, 0x21, 0x3b, 0xce, 0x48, 0xfd, 0x02, 0xca, 0xc7, 0xd8, 0x67, 0x8e, 0x2b, 0xc2, 0x87, 0x10, + 0xe4, 0xf8, 0xc2, 0x35, 0x65, 0x5b, 0xd9, 0x29, 0xe9, 0xe2, 0x37, 0xda, 0x80, 0xbc, 0x1f, 0xf4, + 0x7c, 0xcc, 0xb4, 0x8c, 0xe8, 0x0d, 0x5b, 0xe8, 0x87, 0x90, 0xe3, 0x24, 0x5a, 0x76, 0x5b, 0xd9, + 0x29, 0xef, 0x7e, 0x6b, 0x8e, 0x3f, 0xa7, 0x84, 0xb2, 0x2e, 0x1e, 0x62, 0x8b, 0x11, 0xaa, 0x0b, + 0x50, 0xfd, 0x5f, 0x00, 0xa5, 0x38, 0x2c, 0xa8, 0x05, 0xea, 0xc8, 0x64, 0xd6, 0x40, 0x04, 0xbf, + 0xbc, 0xfb, 0x20, 0x25, 0x96, 0x6f, 0xb8, 0xad, 0x8e, 0x7f, 0x1e, 0x60, 0x9f, 0xe9, 0x12, 0x89, + 0x9e, 0x83, 0x4a, 0x39, 0x97, 0xd8, 0xa6, 0xf2, 0x6e, 0x73, 0x91, 0xed, 0x48, 0xac, 0x5c, 0x97, + 0x68, 0x74, 0x04, 0x45, 0x8a, 0x6d, 0x87, 0x62, 0x6b, 0x91, 0x85, 0x09, 0xa6, 0xd0, 0x5c, 0x8f, + 0x81, 0xe8, 0x19, 0x14, 0x28, 0xbe, 0xa4, 0x0e, 0xc3, 0x5a, 0x4e, 0x70, 0x7c, 0x33, 0x95, 0x43, + 0x58, 0xeb, 0x11, 0x0c, 0x3d, 0x80, 0xb5, 0x4b, 0xdc, 0xf3, 0x89, 0xf5, 0x0e, 0x33, 0x23, 0xf0, + 0xfa, 0xd4, 0xb4, 0xb1, 0xa6, 0x6e, 0x2b, 0x3b, 0x45, 0xbd, 0x1a, 0x0f, 0xfc, 0x44, 0xf6, 0xa3, + 0x3d, 0x28, 0x30, 0x67, 0x84, 0x49, 0xc0, 0xb4, 0xbc, 0x98, 0x6e, 0xb3, 0x21, 0xcf, 0x7f, 0x23, + 0x3a, 0xff, 0x8d, 0xe3, 0xf0, 0x7e, 0xe8, 0x91, 0x25, 0x3a, 0xe4, 0x3e, 0x32, 0xea, 0x60, 0x5f, + 0x2b, 0x08, 0x50, 0xea, 0x01, 0xc6, 0x8c, 0x4e, 0xf4, 0x08, 0x84, 0x8e, 0x40, 0x3d, 0x37, 0x83, + 0x21, 0xd3, 0x8a, 0x02, 0xfd, 0x30, 0x05, 0xfd, 0x82, 0xdb, 0xbe, 0x72, 0x7f, 0x86, 0x2d, 0x19, + 0x6d, 0x81, 0x45, 0x87, 0x90, 0x1f, 0x39, 0x94, 0x12, 0xaa, 0x95, 0x52, 0xe3, 0x94, 0xdc, 0xac, + 0x10, 0x85, 0x5e, 0x40, 0xd9, 0x22, 0xd4, 0x37, 0x3c, 0x32, 0x74, 0xac, 0x89, 0x06, 0x82, 0xe4, + 0xab, 0x39, 0x24, 0x47, 0x84, 0xfa, 0xa7, 0xc2, 0x58, 0x07, 0x2b, 0xfe, 0x8d, 0x7a, 0xb0, 0xca, + 0xf3, 0x83, 0x6b, 0x1b, 0x03, 0x6c, 0xda, 0x98, 0xfa, 0x5a, 0x59, 0x9c, 0xa2, 0x1f, 0x2c, 0x72, + 0x8a, 0x1a, 0x2d, 0x01, 0xed, 0x48, 0xe4, 0x73, 0x97, 0xd1, 0x49, 0x3b, 0xa3, 0x29, 0xfa, 0x8a, + 0x99, 0xec, 0x47, 0x8f, 0xe1, 0x53, 0x8a, 0x47, 0xe4, 0x02, 0x1b, 0x14, 0xfb, 0x1e, 0x71, 0x7d, + 0x1c, 0x4f, 0x56, 0xe1, 0x97, 0x52, 0x60, 0x3e, 0x91, 0x26, 0x7a, 0x68, 0x11, 0x61, 0x7f, 0x01, + 0x9f, 0x86, 0xfe, 0xcd, 0x60, 0x57, 0x84, 0xa3, 0x4f, 0x97, 0x70, 0xf4, 0x1a, 0xf9, 0xd4, 0xe1, + 0x4f, 0xcc, 0x9b, 0xc6, 0xd1, 0x3e, 0x6c, 0xc4, 0x8e, 0x8b, 0x2b, 0x17, 0xcf, 0xbd, 0x1a, 0xfb, + 0xbd, 0x1e, 0xf9, 0x2d, 0x0c, 0x22, 0xe4, 0x18, 0x36, 0x62, 0xb7, 0xaf, 0x22, 0xef, 0x0b, 0xaf, + 0x0f, 0x97, 0xf2, 0x3a, 0x49, 0x3d, 0x75, 0x7a, 0xdd, 0xbc, 0x61, 0x18, 0x1d, 0x40, 0x21, 0x9a, + 0xaa, 0x2a, 0x0e, 0x45, 0x7d, 0xde, 0x54, 0xd2, 0x52, 0x8f, 0x20, 0xb5, 0x67, 0x80, 0x66, 0xf7, + 0x14, 0x55, 0x21, 0xfb, 0x0e, 0x4f, 0xc2, 0xd4, 0xc8, 0x7f, 0xf2, 0x9a, 0x71, 0x61, 0x0e, 0x03, + 0x1c, 0x26, 0x46, 0xd9, 0x78, 0x9c, 0xd9, 0x57, 0x6a, 0x1d, 0xa8, 0xdd, 0x1e, 0xec, 0xa5, 0x98, + 0x5e, 0xc2, 0xe6, 0xad, 0x01, 0x58, 0x86, 0xa8, 0xfe, 0xcf, 0x2c, 0x14, 0xa2, 0xf0, 0xbc, 0xe1, + 0x97, 0x5f, 0xd0, 0x09, 0x6c, 0x79, 0x77, 0x2f, 0x3d, 0x3c, 0xe1, 0xdf, 0x13, 0x0f, 0xcb, 0x54, + 0xe2, 0xeb, 0x11, 0x07, 0x3a, 0xe1, 0x49, 0x53, 0xae, 0x53, 0xcc, 0x7b, 0x47, 0xbe, 0x98, 0xa4, + 0xf6, 0xe7, 0x0c, 0x54, 0xaf, 0x0f, 0xa3, 0x1f, 0x43, 0x96, 0x17, 0x21, 0x59, 0x22, 0x0e, 0xee, + 0x30, 0x41, 0xa3, 0x8b, 0x99, 0x88, 0x9b, 0xce, 0x89, 0x38, 0x9f, 0x69, 0xdb, 0x61, 0xbd, 0xb8, + 0x13, 0x5f, 0xcb, 0xb6, 0x43, 0x3e, 0xd3, 0xb6, 0x79, 0x9d, 0x94, 0xb7, 0x40, 0x28, 0x82, 0x92, + 0x1e, 0xb6, 0x6a, 0x8f, 0xa0, 0x18, 0x4d, 0xbc, 0xd4, 0xce, 0x3f, 0x82, 0x62, 0x34, 0xc1, 0x52, + 0x1b, 0xfd, 0x7b, 0x05, 0x8a, 0x91, 0x70, 0xe0, 0x69, 0x3a, 0x59, 0x59, 0x1f, 0xce, 0x17, 0x1b, + 0xa2, 0xb0, 0xb6, 0x18, 0xa3, 0x4e, 0x2f, 0x60, 0xd8, 0x8f, 0x6a, 0x6b, 0xeb, 0x6a, 0x6d, 0x9d, + 0x57, 0x9e, 0x6f, 0xa9, 0xab, 0xf5, 0xdf, 0x71, 0xa7, 0x42, 0x59, 0x82, 0xda, 0x57, 0x9d, 0xfa, + 0xce, 0x1c, 0xbe, 0xd7, 0xdf, 0xfb, 0xef, 0xf9, 0xf4, 0x27, 0x15, 0xaa, 0xd7, 0xe5, 0x04, 0xda, + 0x87, 0x6c, 0x40, 0x9d, 0xf0, 0x5a, 0xcc, 0xab, 0x47, 0x5d, 0x46, 0x1d, 0xb7, 0x2f, 0xb1, 0x1c, + 0xc2, 0x8b, 0x99, 0x6f, 0x0d, 0xf0, 0x28, 0xba, 0x03, 0x8b, 0x82, 0x43, 0x94, 0x28, 0x86, 0x98, + 0x0d, 0x88, 0x1d, 0x0a, 0x8f, 0x85, 0xf1, 0x12, 0x85, 0x8e, 0xa1, 0x64, 0x06, 0x6c, 0x40, 0xa8, + 0xc3, 0x26, 0x0b, 0xe8, 0x8e, 0x24, 0xc5, 0x14, 0x88, 0xf4, 0x69, 0xe6, 0x94, 0xfa, 0x74, 0x7f, + 0x09, 0x31, 0xd6, 0x48, 0x66, 0xa7, 0x38, 0x9f, 0x72, 0x55, 0x29, 0x94, 0x22, 0x57, 0x27, 0x2b, + 0x52, 0x00, 0xa2, 0x1e, 0xac, 0xf8, 0x24, 0xa0, 0x16, 0x36, 0x86, 0x66, 0x0f, 0x0f, 0xb9, 0x0a, + 0xe1, 0xb3, 0x3d, 0x59, 0x66, 0xb6, 0xae, 0x20, 0x78, 0x2d, 0xf0, 0x72, 0xca, 0x8a, 0x9f, 0xe8, + 0xba, 0xa2, 0xde, 0x8b, 0x57, 0xd5, 0x7b, 0xad, 0x07, 0x95, 0x94, 0x54, 0x7a, 0x90, 0xbc, 0x61, + 0x8b, 0xc7, 0x32, 0x71, 0x83, 0x9f, 0xc2, 0xda, 0x8c, 0x8b, 0x4b, 0x5d, 0xe5, 0xbf, 0xa9, 0xb0, + 0x7e, 0x93, 0x5a, 0x45, 0x1d, 0x28, 0xdb, 0xd3, 0xe6, 0x02, 0xa7, 0x35, 0x79, 0xfc, 0x93, 0x50, + 0x9e, 0xb5, 0x2e, 0xb1, 0xd3, 0x1f, 0x48, 0x75, 0xaf, 0xea, 0x61, 0x6b, 0x9e, 0x5c, 0xc9, 0xa6, + 0xc9, 0x95, 0xdf, 0x28, 0xb7, 0xeb, 0x15, 0xf9, 0xf5, 0xf2, 0xa3, 0x25, 0xe5, 0xf9, 0x47, 0x97, + 0x2e, 0x6a, 0x8a, 0x74, 0xf9, 0xa5, 0x72, 0xab, 0x76, 0xc9, 0x8b, 0x15, 0xbc, 0xba, 0xeb, 0x0a, + 0xee, 0x28, 0x63, 0x0a, 0xcb, 0xcb, 0x98, 0xff, 0x43, 0x11, 0xc2, 0xa0, 0xfa, 0xbf, 0x3f, 0xcb, + 0xf5, 0xbf, 0x64, 0x60, 0x6d, 0xa6, 0x90, 0xa0, 0x26, 0x7c, 0x2d, 0x01, 0x36, 0xfc, 0xa0, 0xe7, + 0xe2, 0xf8, 0xfb, 0x1f, 0x25, 0x86, 0xba, 0x72, 0x24, 0x4e, 0x63, 0x99, 0x44, 0x1a, 0xfb, 0x32, + 0x4e, 0x63, 0x12, 0x2f, 0x72, 0x77, 0x29, 0xca, 0x43, 0x12, 0x89, 0xac, 0xeb, 0xb9, 0x2e, 0x97, + 0x2a, 0x7f, 0x67, 0xdc, 0x5d, 0x2a, 0xd9, 0xa9, 0xd7, 0x92, 0xdd, 0x7f, 0x9c, 0x88, 0xfe, 0x91, + 0x01, 0x34, 0xab, 0x0f, 0xd0, 0x67, 0x50, 0xf2, 0x5d, 0xc7, 0x48, 0x3e, 0x9c, 0x14, 0x7d, 0xd7, + 0xe9, 0x88, 0xb7, 0x93, 0x5b, 0xe2, 0x9b, 0x49, 0x8d, 0x6f, 0x76, 0x5e, 0x7c, 0x73, 0x37, 0xc4, + 0xd7, 0xbe, 0x1e, 0x5f, 0x35, 0xf5, 0xa3, 0x68, 0x76, 0x31, 0x4b, 0x05, 0x38, 0xff, 0xb1, 0x03, + 0x7c, 0x08, 0x95, 0xe4, 0x63, 0x02, 0xc7, 0x46, 0x32, 0xa4, 0x24, 0xe5, 0xc5, 0xe7, 0xc9, 0xf2, + 0x2e, 0xf1, 0xd3, 0x8e, 0xfa, 0x13, 0x28, 0x27, 0x1e, 0x12, 0x96, 0x86, 0x63, 0x28, 0x27, 0x6a, + 0x18, 0xda, 0x00, 0x15, 0x8f, 0x4d, 0x2b, 0x7c, 0x07, 0xea, 0xdc, 0xd3, 0x65, 0x13, 0x69, 0x90, + 0xf7, 0x28, 0x3e, 0x77, 0xc6, 0x92, 0xa1, 0x73, 0x4f, 0x0f, 0xdb, 0x1c, 0x41, 0x71, 0x1f, 0x8f, + 0xe5, 0xf9, 0xe7, 0x08, 0xd1, 0x6c, 0x57, 0x00, 0x84, 0x5e, 0x33, 0xd8, 0xc4, 0xc3, 0xf5, 0x5f, + 0x2b, 0xe1, 0xab, 0x0f, 0xe6, 0xf1, 0xa9, 0x41, 0xd1, 0x64, 0x0c, 0x8f, 0x3c, 0x71, 0x78, 0xf8, + 0x85, 0x8d, 0xdb, 0xa8, 0x05, 0xf7, 0x3d, 0x4c, 0x0d, 0x46, 0x27, 0x46, 0xf4, 0xb6, 0x91, 0x49, + 0x7b, 0xdb, 0x58, 0xf1, 0x30, 0x3d, 0xa3, 0x93, 0xb3, 0xf0, 0x85, 0x63, 0x93, 0x7f, 0x95, 0x70, + 0x02, 0xe2, 0x86, 0xb7, 0x52, 0x3c, 0x5e, 0x4c, 0x4e, 0xdc, 0xfa, 0x1f, 0x33, 0x00, 0xd3, 0xa7, + 0x00, 0xf4, 0x05, 0x54, 0xcc, 0xe1, 0x90, 0x5c, 0x1a, 0x84, 0x3a, 0x7d, 0xc7, 0x0d, 0x4f, 0x72, + 0x59, 0xf4, 0x9d, 0x88, 0x2e, 0x7e, 0x0e, 0xa5, 0x89, 0x14, 0x5b, 0xd1, 0x31, 0x96, 0xb8, 0x37, + 0xb2, 0x6f, 0x6a, 0x74, 0xa5, 0x52, 0x86, 0x46, 0x51, 0x4e, 0xff, 0x0a, 0x56, 0xf1, 0xd8, 0x23, + 0xd7, 0x4a, 0x62, 0x49, 0x5f, 0x91, 0xbd, 0x91, 0xd9, 0x2e, 0x14, 0x46, 0xe6, 0xd8, 0x30, 0xfb, + 0xf2, 0xdd, 0x67, 0xee, 0xc2, 0xf3, 0x23, 0x73, 0xdc, 0xea, 0x63, 0xf4, 0x12, 0xd6, 0xe4, 0xfc, + 0x16, 0xc5, 0x36, 0x76, 0x99, 0x63, 0x0e, 0xfd, 0xf0, 0x49, 0xa8, 0x36, 0x83, 0x6e, 0x13, 0x32, + 0x7c, 0xcb, 0xcf, 0x9f, 0x5e, 0x15, 0xa0, 0xa3, 0x29, 0xa6, 0xfe, 0x07, 0x15, 0xd0, 0xec, 0xab, + 0x0d, 0x7a, 0x05, 0xaa, 0x8d, 0x87, 0xe6, 0x64, 0x91, 0x8f, 0xc6, 0x19, 0x74, 0xe3, 0x98, 0x43, + 0x75, 0xc9, 0xc0, 0xa9, 0xcc, 0x5e, 0x94, 0x4c, 0x97, 0xa6, 0x6a, 0x71, 0xa8, 0x2e, 0x19, 0x6a, + 0xbf, 0xca, 0x80, 0x2a, 0xb8, 0xd1, 0xe7, 0x50, 0xf0, 0x30, 0xb5, 0xb0, 0x2b, 0x0f, 0xae, 0x2a, + 0x2a, 0x6b, 0xd4, 0x85, 0x0e, 0xa0, 0x7c, 0xee, 0x8c, 0xb1, 0x6d, 0xc8, 0x35, 0xa4, 0x1d, 0xa7, + 0xce, 0x3d, 0x1d, 0x84, 0xbd, 0xe4, 0xee, 0xc0, 0x1a, 0xdf, 0x20, 0x57, 0x86, 0x28, 0xe4, 0xc8, + 0xa6, 0x73, 0x54, 0x13, 0x28, 0xc9, 0xd4, 0x06, 0x08, 0x5d, 0x9a, 0x6e, 0xee, 0xbc, 0xba, 0x7e, + 0x2a, 0x8d, 0xf5, 0x04, 0xaa, 0xbd, 0x06, 0xf7, 0x07, 0x8c, 0x79, 0xd2, 0x0d, 0x71, 0xb7, 0x6a, + 0xef, 0x15, 0x50, 0x45, 0x5c, 0x52, 0xc2, 0xf0, 0x05, 0x94, 0x05, 0xd4, 0x67, 0x26, 0x0b, 0x7c, + 0x59, 0x29, 0xf9, 0x5a, 0x79, 0x67, 0x57, 0xf4, 0x71, 0x93, 0x3e, 0xf5, 0xac, 0xc8, 0x24, 0xba, + 0xd2, 0xc0, 0x3b, 0xa7, 0x26, 0x1c, 0xb0, 0x6b, 0x60, 0xf1, 0x7c, 0x97, 0x8b, 0x4c, 0x44, 0xe7, + 0x73, 0xf1, 0x38, 0xf7, 0x31, 0xd6, 0x59, 0x01, 0x10, 0x13, 0xc8, 0xf4, 0xf1, 0x02, 0x2a, 0xc9, + 0xa7, 0x64, 0x9e, 0x8e, 0xdc, 0x60, 0xd4, 0xc3, 0x54, 0xac, 0x73, 0x85, 0xa7, 0x23, 0xd9, 0x46, + 0xeb, 0x90, 0x73, 0xcd, 0xf0, 0x4b, 0x8c, 0xfb, 0x25, 0x5a, 0xed, 0xbc, 0x2c, 0x30, 0xf5, 0xaf, + 0x43, 0x21, 0x9c, 0x6c, 0x9a, 0x91, 0x39, 0x83, 0x12, 0x66, 0xe4, 0x76, 0xe3, 0xaf, 0x1f, 0xb6, + 0x94, 0xbf, 0x7f, 0xd8, 0x52, 0xde, 0x7f, 0xd8, 0x52, 0x7e, 0xba, 0x2d, 0x7d, 0x76, 0x48, 0xd3, + 0xf4, 0x9c, 0xe6, 0x0d, 0xff, 0xc0, 0xe8, 0xe5, 0xc5, 0xce, 0xef, 0xfd, 0x3b, 0x00, 0x00, 0xff, + 0xff, 0x73, 0x7c, 0x3f, 0xb9, 0xde, 0x18, 0x00, 0x00, +} + func (m *VirtualService) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) @@ -2286,6 +3133,9 @@ func (m *VirtualService) MarshalTo(dAtA []byte) (int, error) { i += copy(dAtA[i:], s) } } + if m.XXX_unrecognized != nil { + i += copy(dAtA[i:], m.XXX_unrecognized) + } return i, nil } @@ -2326,6 +3176,9 @@ func (m *Destination) MarshalTo(dAtA []byte) (int, error) { } i += n1 } + if m.XXX_unrecognized != nil { + i += copy(dAtA[i:], m.XXX_unrecognized) + } return i, nil } @@ -2541,6 +3394,9 @@ func (m *HTTPRoute) MarshalTo(dAtA []byte) (int, error) { } i += n9 } + if m.XXX_unrecognized != nil { + i += copy(dAtA[i:], m.XXX_unrecognized) + } return i, nil } @@ -2579,6 +3435,9 @@ func (m *Headers) MarshalTo(dAtA []byte) (int, error) { } i += n11 } + if m.XXX_unrecognized != nil { + i += copy(dAtA[i:], m.XXX_unrecognized) + } return i, nil } @@ -2646,6 +3505,9 @@ func (m *Headers_HeaderOperations) MarshalTo(dAtA []byte) (int, error) { i += copy(dAtA[i:], s) } } + if m.XXX_unrecognized != nil { + i += copy(dAtA[i:], m.XXX_unrecognized) + } return i, nil } @@ -2688,6 +3550,9 @@ func (m *TLSRoute) MarshalTo(dAtA []byte) (int, error) { i += n } } + if m.XXX_unrecognized != nil { + i += copy(dAtA[i:], m.XXX_unrecognized) + } return i, nil } @@ -2730,6 +3595,9 @@ func (m *TCPRoute) MarshalTo(dAtA []byte) (int, error) { i += n } } + if m.XXX_unrecognized != nil { + i += copy(dAtA[i:], m.XXX_unrecognized) + } return i, nil } @@ -2853,6 +3721,9 @@ func (m *HTTPMatchRequest) MarshalTo(dAtA []byte) (int, error) { i += copy(dAtA[i:], s) } } + if m.XXX_unrecognized != nil { + i += copy(dAtA[i:], m.XXX_unrecognized) + } return i, nil } @@ -2960,6 +3831,9 @@ func (m *HTTPRouteDestination) MarshalTo(dAtA []byte) (int, error) { } i += n18 } + if m.XXX_unrecognized != nil { + i += copy(dAtA[i:], m.XXX_unrecognized) + } return i, nil } @@ -2993,6 +3867,9 @@ func (m *RouteDestination) MarshalTo(dAtA []byte) (int, error) { i++ i = encodeVarintVirtualService(dAtA, i, uint64(m.Weight)) } + if m.XXX_unrecognized != nil { + i += copy(dAtA[i:], m.XXX_unrecognized) + } return i, nil } @@ -3069,6 +3946,9 @@ func (m *L4MatchAttributes) MarshalTo(dAtA []byte) (int, error) { i += copy(dAtA[i:], s) } } + if m.XXX_unrecognized != nil { + i += copy(dAtA[i:], m.XXX_unrecognized) + } return i, nil } @@ -3160,6 +4040,9 @@ func (m *TLSMatchAttributes) MarshalTo(dAtA []byte) (int, error) { i += copy(dAtA[i:], s) } } + if m.XXX_unrecognized != nil { + i += copy(dAtA[i:], m.XXX_unrecognized) + } return i, nil } @@ -3190,6 +4073,9 @@ func (m *HTTPRedirect) MarshalTo(dAtA []byte) (int, error) { i = encodeVarintVirtualService(dAtA, i, uint64(len(m.Authority))) i += copy(dAtA[i:], m.Authority) } + if m.XXX_unrecognized != nil { + i += copy(dAtA[i:], m.XXX_unrecognized) + } return i, nil } @@ -3220,6 +4106,9 @@ func (m *HTTPRewrite) MarshalTo(dAtA []byte) (int, error) { i = encodeVarintVirtualService(dAtA, i, uint64(len(m.Authority))) i += copy(dAtA[i:], m.Authority) } + if m.XXX_unrecognized != nil { + i += copy(dAtA[i:], m.XXX_unrecognized) + } return i, nil } @@ -3245,6 +4134,9 @@ func (m *StringMatch) MarshalTo(dAtA []byte) (int, error) { } i += nn20 } + if m.XXX_unrecognized != nil { + i += copy(dAtA[i:], m.XXX_unrecognized) + } return i, nil } @@ -3308,6 +4200,9 @@ func (m *HTTPRetry) MarshalTo(dAtA []byte) (int, error) { i = encodeVarintVirtualService(dAtA, i, uint64(len(m.RetryOn))) i += copy(dAtA[i:], m.RetryOn) } + if m.XXX_unrecognized != nil { + i += copy(dAtA[i:], m.XXX_unrecognized) + } return i, nil } @@ -3406,6 +4301,9 @@ func (m *CorsPolicy) MarshalTo(dAtA []byte) (int, error) { } i += n23 } + if m.XXX_unrecognized != nil { + i += copy(dAtA[i:], m.XXX_unrecognized) + } return i, nil } @@ -3444,6 +4342,9 @@ func (m *HTTPFaultInjection) MarshalTo(dAtA []byte) (int, error) { } i += n25 } + if m.XXX_unrecognized != nil { + i += copy(dAtA[i:], m.XXX_unrecognized) + } return i, nil } @@ -3484,6 +4385,9 @@ func (m *HTTPFaultInjection_Delay) MarshalTo(dAtA []byte) (int, error) { } i += n27 } + if m.XXX_unrecognized != nil { + i += copy(dAtA[i:], m.XXX_unrecognized) + } return i, nil } @@ -3552,6 +4456,9 @@ func (m *HTTPFaultInjection_Abort) MarshalTo(dAtA []byte) (int, error) { } i += n31 } + if m.XXX_unrecognized != nil { + i += copy(dAtA[i:], m.XXX_unrecognized) + } return i, nil } @@ -3600,6 +4507,9 @@ func (m *PortSelector) MarshalTo(dAtA []byte) (int, error) { } i += nn32 } + if m.XXX_unrecognized != nil { + i += copy(dAtA[i:], m.XXX_unrecognized) + } return i, nil } @@ -3636,9 +4546,12 @@ func (m *Percent) MarshalTo(dAtA []byte) (int, error) { if m.Value != 0 { dAtA[i] = 0x9 i++ - binary.LittleEndian.PutUint64(dAtA[i:], uint64(math.Float64bits(float64(m.Value)))) + encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(math.Float64bits(float64(m.Value)))) i += 8 } + if m.XXX_unrecognized != nil { + i += copy(dAtA[i:], m.XXX_unrecognized) + } return i, nil } @@ -3652,6 +4565,9 @@ func encodeVarintVirtualService(dAtA []byte, offset int, v uint64) int { return offset + 1 } func (m *VirtualService) Size() (n int) { + if m == nil { + return 0 + } var l int _ = l if len(m.Hosts) > 0 { @@ -3690,10 +4606,16 @@ func (m *VirtualService) Size() (n int) { n += 1 + l + sovVirtualService(uint64(l)) } } + if m.XXX_unrecognized != nil { + n += len(m.XXX_unrecognized) + } return n } func (m *Destination) Size() (n int) { + if m == nil { + return 0 + } var l int _ = l l = len(m.Host) @@ -3708,10 +4630,16 @@ func (m *Destination) Size() (n int) { l = m.Port.Size() n += 1 + l + sovVirtualService(uint64(l)) } + if m.XXX_unrecognized != nil { + n += len(m.XXX_unrecognized) + } return n } func (m *HTTPRoute) Size() (n int) { + if m == nil { + return 0 + } var l int _ = l if len(m.Match) > 0 { @@ -3797,10 +4725,16 @@ func (m *HTTPRoute) Size() (n int) { l = m.Headers.Size() n += 2 + l + sovVirtualService(uint64(l)) } + if m.XXX_unrecognized != nil { + n += len(m.XXX_unrecognized) + } return n } func (m *Headers) Size() (n int) { + if m == nil { + return 0 + } var l int _ = l if m.Request != nil { @@ -3811,10 +4745,16 @@ func (m *Headers) Size() (n int) { l = m.Response.Size() n += 1 + l + sovVirtualService(uint64(l)) } + if m.XXX_unrecognized != nil { + n += len(m.XXX_unrecognized) + } return n } func (m *Headers_HeaderOperations) Size() (n int) { + if m == nil { + return 0 + } var l int _ = l if len(m.Set) > 0 { @@ -3839,10 +4779,16 @@ func (m *Headers_HeaderOperations) Size() (n int) { n += 1 + l + sovVirtualService(uint64(l)) } } + if m.XXX_unrecognized != nil { + n += len(m.XXX_unrecognized) + } return n } func (m *TLSRoute) Size() (n int) { + if m == nil { + return 0 + } var l int _ = l if len(m.Match) > 0 { @@ -3857,10 +4803,16 @@ func (m *TLSRoute) Size() (n int) { n += 1 + l + sovVirtualService(uint64(l)) } } + if m.XXX_unrecognized != nil { + n += len(m.XXX_unrecognized) + } return n } func (m *TCPRoute) Size() (n int) { + if m == nil { + return 0 + } var l int _ = l if len(m.Match) > 0 { @@ -3875,10 +4827,16 @@ func (m *TCPRoute) Size() (n int) { n += 1 + l + sovVirtualService(uint64(l)) } } + if m.XXX_unrecognized != nil { + n += len(m.XXX_unrecognized) + } return n } func (m *HTTPMatchRequest) Size() (n int) { + if m == nil { + return 0 + } var l int _ = l if m.Uri != nil { @@ -3927,10 +4885,16 @@ func (m *HTTPMatchRequest) Size() (n int) { n += 1 + l + sovVirtualService(uint64(l)) } } + if m.XXX_unrecognized != nil { + n += len(m.XXX_unrecognized) + } return n } func (m *HTTPRouteDestination) Size() (n int) { + if m == nil { + return 0 + } var l int _ = l if m.Destination != nil { @@ -3972,10 +4936,16 @@ func (m *HTTPRouteDestination) Size() (n int) { l = m.Headers.Size() n += 1 + l + sovVirtualService(uint64(l)) } + if m.XXX_unrecognized != nil { + n += len(m.XXX_unrecognized) + } return n } func (m *RouteDestination) Size() (n int) { + if m == nil { + return 0 + } var l int _ = l if m.Destination != nil { @@ -3985,10 +4955,16 @@ func (m *RouteDestination) Size() (n int) { if m.Weight != 0 { n += 1 + sovVirtualService(uint64(m.Weight)) } + if m.XXX_unrecognized != nil { + n += len(m.XXX_unrecognized) + } return n } func (m *L4MatchAttributes) Size() (n int) { + if m == nil { + return 0 + } var l int _ = l if len(m.DestinationSubnets) > 0 { @@ -4018,10 +4994,16 @@ func (m *L4MatchAttributes) Size() (n int) { n += 1 + l + sovVirtualService(uint64(l)) } } + if m.XXX_unrecognized != nil { + n += len(m.XXX_unrecognized) + } return n } func (m *TLSMatchAttributes) Size() (n int) { + if m == nil { + return 0 + } var l int _ = l if len(m.SniHosts) > 0 { @@ -4057,10 +5039,16 @@ func (m *TLSMatchAttributes) Size() (n int) { n += 1 + l + sovVirtualService(uint64(l)) } } + if m.XXX_unrecognized != nil { + n += len(m.XXX_unrecognized) + } return n } func (m *HTTPRedirect) Size() (n int) { + if m == nil { + return 0 + } var l int _ = l l = len(m.Uri) @@ -4071,10 +5059,16 @@ func (m *HTTPRedirect) Size() (n int) { if l > 0 { n += 1 + l + sovVirtualService(uint64(l)) } + if m.XXX_unrecognized != nil { + n += len(m.XXX_unrecognized) + } return n } func (m *HTTPRewrite) Size() (n int) { + if m == nil { + return 0 + } var l int _ = l l = len(m.Uri) @@ -4085,19 +5079,31 @@ func (m *HTTPRewrite) Size() (n int) { if l > 0 { n += 1 + l + sovVirtualService(uint64(l)) } + if m.XXX_unrecognized != nil { + n += len(m.XXX_unrecognized) + } return n } func (m *StringMatch) Size() (n int) { + if m == nil { + return 0 + } var l int _ = l if m.MatchType != nil { n += m.MatchType.Size() } + if m.XXX_unrecognized != nil { + n += len(m.XXX_unrecognized) + } return n } func (m *StringMatch_Exact) Size() (n int) { + if m == nil { + return 0 + } var l int _ = l l = len(m.Exact) @@ -4105,6 +5111,9 @@ func (m *StringMatch_Exact) Size() (n int) { return n } func (m *StringMatch_Prefix) Size() (n int) { + if m == nil { + return 0 + } var l int _ = l l = len(m.Prefix) @@ -4112,6 +5121,9 @@ func (m *StringMatch_Prefix) Size() (n int) { return n } func (m *StringMatch_Regex) Size() (n int) { + if m == nil { + return 0 + } var l int _ = l l = len(m.Regex) @@ -4119,6 +5131,9 @@ func (m *StringMatch_Regex) Size() (n int) { return n } func (m *HTTPRetry) Size() (n int) { + if m == nil { + return 0 + } var l int _ = l if m.Attempts != 0 { @@ -4132,10 +5147,16 @@ func (m *HTTPRetry) Size() (n int) { if l > 0 { n += 1 + l + sovVirtualService(uint64(l)) } + if m.XXX_unrecognized != nil { + n += len(m.XXX_unrecognized) + } return n } func (m *CorsPolicy) Size() (n int) { + if m == nil { + return 0 + } var l int _ = l if len(m.AllowOrigin) > 0 { @@ -4170,10 +5191,16 @@ func (m *CorsPolicy) Size() (n int) { l = m.AllowCredentials.Size() n += 1 + l + sovVirtualService(uint64(l)) } + if m.XXX_unrecognized != nil { + n += len(m.XXX_unrecognized) + } return n } func (m *HTTPFaultInjection) Size() (n int) { + if m == nil { + return 0 + } var l int _ = l if m.Delay != nil { @@ -4184,10 +5211,16 @@ func (m *HTTPFaultInjection) Size() (n int) { l = m.Abort.Size() n += 1 + l + sovVirtualService(uint64(l)) } + if m.XXX_unrecognized != nil { + n += len(m.XXX_unrecognized) + } return n } func (m *HTTPFaultInjection_Delay) Size() (n int) { + if m == nil { + return 0 + } var l int _ = l if m.Percent != 0 { @@ -4200,10 +5233,16 @@ func (m *HTTPFaultInjection_Delay) Size() (n int) { l = m.Percentage.Size() n += 1 + l + sovVirtualService(uint64(l)) } + if m.XXX_unrecognized != nil { + n += len(m.XXX_unrecognized) + } return n } func (m *HTTPFaultInjection_Delay_FixedDelay) Size() (n int) { + if m == nil { + return 0 + } var l int _ = l if m.FixedDelay != nil { @@ -4213,6 +5252,9 @@ func (m *HTTPFaultInjection_Delay_FixedDelay) Size() (n int) { return n } func (m *HTTPFaultInjection_Delay_ExponentialDelay) Size() (n int) { + if m == nil { + return 0 + } var l int _ = l if m.ExponentialDelay != nil { @@ -4222,6 +5264,9 @@ func (m *HTTPFaultInjection_Delay_ExponentialDelay) Size() (n int) { return n } func (m *HTTPFaultInjection_Abort) Size() (n int) { + if m == nil { + return 0 + } var l int _ = l if m.Percent != 0 { @@ -4234,16 +5279,25 @@ func (m *HTTPFaultInjection_Abort) Size() (n int) { l = m.Percentage.Size() n += 1 + l + sovVirtualService(uint64(l)) } + if m.XXX_unrecognized != nil { + n += len(m.XXX_unrecognized) + } return n } func (m *HTTPFaultInjection_Abort_HttpStatus) Size() (n int) { + if m == nil { + return 0 + } var l int _ = l n += 1 + sovVirtualService(uint64(m.HttpStatus)) return n } func (m *HTTPFaultInjection_Abort_GrpcStatus) Size() (n int) { + if m == nil { + return 0 + } var l int _ = l l = len(m.GrpcStatus) @@ -4251,6 +5305,9 @@ func (m *HTTPFaultInjection_Abort_GrpcStatus) Size() (n int) { return n } func (m *HTTPFaultInjection_Abort_Http2Error) Size() (n int) { + if m == nil { + return 0 + } var l int _ = l l = len(m.Http2Error) @@ -4258,21 +5315,33 @@ func (m *HTTPFaultInjection_Abort_Http2Error) Size() (n int) { return n } func (m *PortSelector) Size() (n int) { + if m == nil { + return 0 + } var l int _ = l if m.Port != nil { n += m.Port.Size() } + if m.XXX_unrecognized != nil { + n += len(m.XXX_unrecognized) + } return n } func (m *PortSelector_Number) Size() (n int) { + if m == nil { + return 0 + } var l int _ = l n += 1 + sovVirtualService(uint64(m.Number)) return n } func (m *PortSelector_Name) Size() (n int) { + if m == nil { + return 0 + } var l int _ = l l = len(m.Name) @@ -4280,11 +5349,17 @@ func (m *PortSelector_Name) Size() (n int) { return n } func (m *Percent) Size() (n int) { + if m == nil { + return 0 + } var l int _ = l if m.Value != 0 { n += 9 } + if m.XXX_unrecognized != nil { + n += len(m.XXX_unrecognized) + } return n } @@ -4316,7 +5391,7 @@ func (m *VirtualService) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - wire |= (uint64(b) & 0x7F) << shift + wire |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -4344,7 +5419,7 @@ func (m *VirtualService) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLen |= (uint64(b) & 0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -4354,6 +5429,9 @@ func (m *VirtualService) Unmarshal(dAtA []byte) error { return ErrInvalidLengthVirtualService } postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthVirtualService + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -4373,7 +5451,7 @@ func (m *VirtualService) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLen |= (uint64(b) & 0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -4383,6 +5461,9 @@ func (m *VirtualService) Unmarshal(dAtA []byte) error { return ErrInvalidLengthVirtualService } postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthVirtualService + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -4402,7 +5483,7 @@ func (m *VirtualService) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - msglen |= (int(b) & 0x7F) << shift + msglen |= int(b&0x7F) << shift if b < 0x80 { break } @@ -4411,6 +5492,9 @@ func (m *VirtualService) Unmarshal(dAtA []byte) error { return ErrInvalidLengthVirtualService } postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthVirtualService + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -4433,7 +5517,7 @@ func (m *VirtualService) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - msglen |= (int(b) & 0x7F) << shift + msglen |= int(b&0x7F) << shift if b < 0x80 { break } @@ -4442,6 +5526,9 @@ func (m *VirtualService) Unmarshal(dAtA []byte) error { return ErrInvalidLengthVirtualService } postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthVirtualService + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -4464,7 +5551,7 @@ func (m *VirtualService) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - msglen |= (int(b) & 0x7F) << shift + msglen |= int(b&0x7F) << shift if b < 0x80 { break } @@ -4473,6 +5560,9 @@ func (m *VirtualService) Unmarshal(dAtA []byte) error { return ErrInvalidLengthVirtualService } postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthVirtualService + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -4495,7 +5585,7 @@ func (m *VirtualService) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLen |= (uint64(b) & 0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -4505,6 +5595,9 @@ func (m *VirtualService) Unmarshal(dAtA []byte) error { return ErrInvalidLengthVirtualService } postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthVirtualService + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -4519,9 +5612,13 @@ func (m *VirtualService) Unmarshal(dAtA []byte) error { if skippy < 0 { return ErrInvalidLengthVirtualService } + if (iNdEx + skippy) < 0 { + return ErrInvalidLengthVirtualService + } if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF } + m.XXX_unrecognized = append(m.XXX_unrecognized, dAtA[iNdEx:iNdEx+skippy]...) iNdEx += skippy } } @@ -4546,7 +5643,7 @@ func (m *Destination) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - wire |= (uint64(b) & 0x7F) << shift + wire |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -4574,7 +5671,7 @@ func (m *Destination) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLen |= (uint64(b) & 0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -4584,6 +5681,9 @@ func (m *Destination) Unmarshal(dAtA []byte) error { return ErrInvalidLengthVirtualService } postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthVirtualService + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -4603,7 +5703,7 @@ func (m *Destination) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLen |= (uint64(b) & 0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -4613,6 +5713,9 @@ func (m *Destination) Unmarshal(dAtA []byte) error { return ErrInvalidLengthVirtualService } postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthVirtualService + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -4632,7 +5735,7 @@ func (m *Destination) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - msglen |= (int(b) & 0x7F) << shift + msglen |= int(b&0x7F) << shift if b < 0x80 { break } @@ -4641,6 +5744,9 @@ func (m *Destination) Unmarshal(dAtA []byte) error { return ErrInvalidLengthVirtualService } postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthVirtualService + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -4660,9 +5766,13 @@ func (m *Destination) Unmarshal(dAtA []byte) error { if skippy < 0 { return ErrInvalidLengthVirtualService } + if (iNdEx + skippy) < 0 { + return ErrInvalidLengthVirtualService + } if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF } + m.XXX_unrecognized = append(m.XXX_unrecognized, dAtA[iNdEx:iNdEx+skippy]...) iNdEx += skippy } } @@ -4687,7 +5797,7 @@ func (m *HTTPRoute) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - wire |= (uint64(b) & 0x7F) << shift + wire |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -4715,7 +5825,7 @@ func (m *HTTPRoute) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - msglen |= (int(b) & 0x7F) << shift + msglen |= int(b&0x7F) << shift if b < 0x80 { break } @@ -4724,6 +5834,9 @@ func (m *HTTPRoute) Unmarshal(dAtA []byte) error { return ErrInvalidLengthVirtualService } postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthVirtualService + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -4746,7 +5859,7 @@ func (m *HTTPRoute) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - msglen |= (int(b) & 0x7F) << shift + msglen |= int(b&0x7F) << shift if b < 0x80 { break } @@ -4755,6 +5868,9 @@ func (m *HTTPRoute) Unmarshal(dAtA []byte) error { return ErrInvalidLengthVirtualService } postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthVirtualService + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -4777,7 +5893,7 @@ func (m *HTTPRoute) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - msglen |= (int(b) & 0x7F) << shift + msglen |= int(b&0x7F) << shift if b < 0x80 { break } @@ -4786,6 +5902,9 @@ func (m *HTTPRoute) Unmarshal(dAtA []byte) error { return ErrInvalidLengthVirtualService } postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthVirtualService + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -4810,7 +5929,7 @@ func (m *HTTPRoute) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - msglen |= (int(b) & 0x7F) << shift + msglen |= int(b&0x7F) << shift if b < 0x80 { break } @@ -4819,6 +5938,9 @@ func (m *HTTPRoute) Unmarshal(dAtA []byte) error { return ErrInvalidLengthVirtualService } postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthVirtualService + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -4843,7 +5965,7 @@ func (m *HTTPRoute) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - v |= (int(b) & 0x7F) << shift + v |= int(b&0x7F) << shift if b < 0x80 { break } @@ -4863,7 +5985,7 @@ func (m *HTTPRoute) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - msglen |= (int(b) & 0x7F) << shift + msglen |= int(b&0x7F) << shift if b < 0x80 { break } @@ -4872,11 +5994,14 @@ func (m *HTTPRoute) Unmarshal(dAtA []byte) error { return ErrInvalidLengthVirtualService } postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthVirtualService + } if postIndex > l { return io.ErrUnexpectedEOF } if m.Timeout == nil { - m.Timeout = &google_protobuf.Duration{} + m.Timeout = &types.Duration{} } if err := m.Timeout.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err @@ -4896,7 +6021,7 @@ func (m *HTTPRoute) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - msglen |= (int(b) & 0x7F) << shift + msglen |= int(b&0x7F) << shift if b < 0x80 { break } @@ -4905,6 +6030,9 @@ func (m *HTTPRoute) Unmarshal(dAtA []byte) error { return ErrInvalidLengthVirtualService } postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthVirtualService + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -4929,7 +6057,7 @@ func (m *HTTPRoute) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - msglen |= (int(b) & 0x7F) << shift + msglen |= int(b&0x7F) << shift if b < 0x80 { break } @@ -4938,6 +6066,9 @@ func (m *HTTPRoute) Unmarshal(dAtA []byte) error { return ErrInvalidLengthVirtualService } postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthVirtualService + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -4962,7 +6093,7 @@ func (m *HTTPRoute) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - msglen |= (int(b) & 0x7F) << shift + msglen |= int(b&0x7F) << shift if b < 0x80 { break } @@ -4971,6 +6102,9 @@ func (m *HTTPRoute) Unmarshal(dAtA []byte) error { return ErrInvalidLengthVirtualService } postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthVirtualService + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -4995,7 +6129,7 @@ func (m *HTTPRoute) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - msglen |= (int(b) & 0x7F) << shift + msglen |= int(b&0x7F) << shift if b < 0x80 { break } @@ -5004,6 +6138,9 @@ func (m *HTTPRoute) Unmarshal(dAtA []byte) error { return ErrInvalidLengthVirtualService } postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthVirtualService + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -5028,7 +6165,7 @@ func (m *HTTPRoute) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - msglen |= (int(b) & 0x7F) << shift + msglen |= int(b&0x7F) << shift if b < 0x80 { break } @@ -5037,6 +6174,9 @@ func (m *HTTPRoute) Unmarshal(dAtA []byte) error { return ErrInvalidLengthVirtualService } postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthVirtualService + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -5057,7 +6197,7 @@ func (m *HTTPRoute) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - wire |= (uint64(b) & 0x7F) << shift + wire |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -5074,7 +6214,7 @@ func (m *HTTPRoute) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLenmapkey |= (uint64(b) & 0x7F) << shift + stringLenmapkey |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -5084,6 +6224,9 @@ func (m *HTTPRoute) Unmarshal(dAtA []byte) error { return ErrInvalidLengthVirtualService } postStringIndexmapkey := iNdEx + intStringLenmapkey + if postStringIndexmapkey < 0 { + return ErrInvalidLengthVirtualService + } if postStringIndexmapkey > l { return io.ErrUnexpectedEOF } @@ -5100,7 +6243,7 @@ func (m *HTTPRoute) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLenmapvalue |= (uint64(b) & 0x7F) << shift + stringLenmapvalue |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -5110,6 +6253,9 @@ func (m *HTTPRoute) Unmarshal(dAtA []byte) error { return ErrInvalidLengthVirtualService } postStringIndexmapvalue := iNdEx + intStringLenmapvalue + if postStringIndexmapvalue < 0 { + return ErrInvalidLengthVirtualService + } if postStringIndexmapvalue > l { return io.ErrUnexpectedEOF } @@ -5146,7 +6292,7 @@ func (m *HTTPRoute) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLen |= (uint64(b) & 0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -5156,6 +6302,9 @@ func (m *HTTPRoute) Unmarshal(dAtA []byte) error { return ErrInvalidLengthVirtualService } postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthVirtualService + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -5175,7 +6324,7 @@ func (m *HTTPRoute) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - msglen |= (int(b) & 0x7F) << shift + msglen |= int(b&0x7F) << shift if b < 0x80 { break } @@ -5184,6 +6333,9 @@ func (m *HTTPRoute) Unmarshal(dAtA []byte) error { return ErrInvalidLengthVirtualService } postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthVirtualService + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -5204,7 +6356,7 @@ func (m *HTTPRoute) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - wire |= (uint64(b) & 0x7F) << shift + wire |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -5221,7 +6373,7 @@ func (m *HTTPRoute) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLenmapkey |= (uint64(b) & 0x7F) << shift + stringLenmapkey |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -5231,6 +6383,9 @@ func (m *HTTPRoute) Unmarshal(dAtA []byte) error { return ErrInvalidLengthVirtualService } postStringIndexmapkey := iNdEx + intStringLenmapkey + if postStringIndexmapkey < 0 { + return ErrInvalidLengthVirtualService + } if postStringIndexmapkey > l { return io.ErrUnexpectedEOF } @@ -5247,7 +6402,7 @@ func (m *HTTPRoute) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLenmapvalue |= (uint64(b) & 0x7F) << shift + stringLenmapvalue |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -5257,6 +6412,9 @@ func (m *HTTPRoute) Unmarshal(dAtA []byte) error { return ErrInvalidLengthVirtualService } postStringIndexmapvalue := iNdEx + intStringLenmapvalue + if postStringIndexmapvalue < 0 { + return ErrInvalidLengthVirtualService + } if postStringIndexmapvalue > l { return io.ErrUnexpectedEOF } @@ -5293,7 +6451,7 @@ func (m *HTTPRoute) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLen |= (uint64(b) & 0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -5303,6 +6461,9 @@ func (m *HTTPRoute) Unmarshal(dAtA []byte) error { return ErrInvalidLengthVirtualService } postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthVirtualService + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -5322,7 +6483,7 @@ func (m *HTTPRoute) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - msglen |= (int(b) & 0x7F) << shift + msglen |= int(b&0x7F) << shift if b < 0x80 { break } @@ -5331,6 +6492,9 @@ func (m *HTTPRoute) Unmarshal(dAtA []byte) error { return ErrInvalidLengthVirtualService } postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthVirtualService + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -5351,7 +6515,7 @@ func (m *HTTPRoute) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - wire |= (uint64(b) & 0x7F) << shift + wire |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -5368,7 +6532,7 @@ func (m *HTTPRoute) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLenmapkey |= (uint64(b) & 0x7F) << shift + stringLenmapkey |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -5378,6 +6542,9 @@ func (m *HTTPRoute) Unmarshal(dAtA []byte) error { return ErrInvalidLengthVirtualService } postStringIndexmapkey := iNdEx + intStringLenmapkey + if postStringIndexmapkey < 0 { + return ErrInvalidLengthVirtualService + } if postStringIndexmapkey > l { return io.ErrUnexpectedEOF } @@ -5394,7 +6561,7 @@ func (m *HTTPRoute) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLenmapvalue |= (uint64(b) & 0x7F) << shift + stringLenmapvalue |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -5404,6 +6571,9 @@ func (m *HTTPRoute) Unmarshal(dAtA []byte) error { return ErrInvalidLengthVirtualService } postStringIndexmapvalue := iNdEx + intStringLenmapvalue + if postStringIndexmapvalue < 0 { + return ErrInvalidLengthVirtualService + } if postStringIndexmapvalue > l { return io.ErrUnexpectedEOF } @@ -5440,7 +6610,7 @@ func (m *HTTPRoute) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - msglen |= (int(b) & 0x7F) << shift + msglen |= int(b&0x7F) << shift if b < 0x80 { break } @@ -5449,6 +6619,9 @@ func (m *HTTPRoute) Unmarshal(dAtA []byte) error { return ErrInvalidLengthVirtualService } postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthVirtualService + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -5468,9 +6641,13 @@ func (m *HTTPRoute) Unmarshal(dAtA []byte) error { if skippy < 0 { return ErrInvalidLengthVirtualService } + if (iNdEx + skippy) < 0 { + return ErrInvalidLengthVirtualService + } if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF } + m.XXX_unrecognized = append(m.XXX_unrecognized, dAtA[iNdEx:iNdEx+skippy]...) iNdEx += skippy } } @@ -5495,7 +6672,7 @@ func (m *Headers) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - wire |= (uint64(b) & 0x7F) << shift + wire |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -5523,7 +6700,7 @@ func (m *Headers) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - msglen |= (int(b) & 0x7F) << shift + msglen |= int(b&0x7F) << shift if b < 0x80 { break } @@ -5532,6 +6709,9 @@ func (m *Headers) Unmarshal(dAtA []byte) error { return ErrInvalidLengthVirtualService } postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthVirtualService + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -5556,7 +6736,7 @@ func (m *Headers) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - msglen |= (int(b) & 0x7F) << shift + msglen |= int(b&0x7F) << shift if b < 0x80 { break } @@ -5565,6 +6745,9 @@ func (m *Headers) Unmarshal(dAtA []byte) error { return ErrInvalidLengthVirtualService } postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthVirtualService + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -5584,9 +6767,13 @@ func (m *Headers) Unmarshal(dAtA []byte) error { if skippy < 0 { return ErrInvalidLengthVirtualService } + if (iNdEx + skippy) < 0 { + return ErrInvalidLengthVirtualService + } if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF } + m.XXX_unrecognized = append(m.XXX_unrecognized, dAtA[iNdEx:iNdEx+skippy]...) iNdEx += skippy } } @@ -5611,7 +6798,7 @@ func (m *Headers_HeaderOperations) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - wire |= (uint64(b) & 0x7F) << shift + wire |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -5639,7 +6826,7 @@ func (m *Headers_HeaderOperations) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - msglen |= (int(b) & 0x7F) << shift + msglen |= int(b&0x7F) << shift if b < 0x80 { break } @@ -5648,6 +6835,9 @@ func (m *Headers_HeaderOperations) Unmarshal(dAtA []byte) error { return ErrInvalidLengthVirtualService } postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthVirtualService + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -5668,7 +6858,7 @@ func (m *Headers_HeaderOperations) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - wire |= (uint64(b) & 0x7F) << shift + wire |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -5685,7 +6875,7 @@ func (m *Headers_HeaderOperations) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLenmapkey |= (uint64(b) & 0x7F) << shift + stringLenmapkey |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -5695,6 +6885,9 @@ func (m *Headers_HeaderOperations) Unmarshal(dAtA []byte) error { return ErrInvalidLengthVirtualService } postStringIndexmapkey := iNdEx + intStringLenmapkey + if postStringIndexmapkey < 0 { + return ErrInvalidLengthVirtualService + } if postStringIndexmapkey > l { return io.ErrUnexpectedEOF } @@ -5711,7 +6904,7 @@ func (m *Headers_HeaderOperations) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLenmapvalue |= (uint64(b) & 0x7F) << shift + stringLenmapvalue |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -5721,6 +6914,9 @@ func (m *Headers_HeaderOperations) Unmarshal(dAtA []byte) error { return ErrInvalidLengthVirtualService } postStringIndexmapvalue := iNdEx + intStringLenmapvalue + if postStringIndexmapvalue < 0 { + return ErrInvalidLengthVirtualService + } if postStringIndexmapvalue > l { return io.ErrUnexpectedEOF } @@ -5757,7 +6953,7 @@ func (m *Headers_HeaderOperations) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - msglen |= (int(b) & 0x7F) << shift + msglen |= int(b&0x7F) << shift if b < 0x80 { break } @@ -5766,6 +6962,9 @@ func (m *Headers_HeaderOperations) Unmarshal(dAtA []byte) error { return ErrInvalidLengthVirtualService } postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthVirtualService + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -5786,7 +6985,7 @@ func (m *Headers_HeaderOperations) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - wire |= (uint64(b) & 0x7F) << shift + wire |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -5803,7 +7002,7 @@ func (m *Headers_HeaderOperations) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLenmapkey |= (uint64(b) & 0x7F) << shift + stringLenmapkey |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -5813,6 +7012,9 @@ func (m *Headers_HeaderOperations) Unmarshal(dAtA []byte) error { return ErrInvalidLengthVirtualService } postStringIndexmapkey := iNdEx + intStringLenmapkey + if postStringIndexmapkey < 0 { + return ErrInvalidLengthVirtualService + } if postStringIndexmapkey > l { return io.ErrUnexpectedEOF } @@ -5829,7 +7031,7 @@ func (m *Headers_HeaderOperations) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLenmapvalue |= (uint64(b) & 0x7F) << shift + stringLenmapvalue |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -5839,6 +7041,9 @@ func (m *Headers_HeaderOperations) Unmarshal(dAtA []byte) error { return ErrInvalidLengthVirtualService } postStringIndexmapvalue := iNdEx + intStringLenmapvalue + if postStringIndexmapvalue < 0 { + return ErrInvalidLengthVirtualService + } if postStringIndexmapvalue > l { return io.ErrUnexpectedEOF } @@ -5875,7 +7080,7 @@ func (m *Headers_HeaderOperations) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLen |= (uint64(b) & 0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -5885,6 +7090,9 @@ func (m *Headers_HeaderOperations) Unmarshal(dAtA []byte) error { return ErrInvalidLengthVirtualService } postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthVirtualService + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -5899,9 +7107,13 @@ func (m *Headers_HeaderOperations) Unmarshal(dAtA []byte) error { if skippy < 0 { return ErrInvalidLengthVirtualService } + if (iNdEx + skippy) < 0 { + return ErrInvalidLengthVirtualService + } if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF } + m.XXX_unrecognized = append(m.XXX_unrecognized, dAtA[iNdEx:iNdEx+skippy]...) iNdEx += skippy } } @@ -5926,7 +7138,7 @@ func (m *TLSRoute) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - wire |= (uint64(b) & 0x7F) << shift + wire |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -5954,7 +7166,7 @@ func (m *TLSRoute) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - msglen |= (int(b) & 0x7F) << shift + msglen |= int(b&0x7F) << shift if b < 0x80 { break } @@ -5963,6 +7175,9 @@ func (m *TLSRoute) Unmarshal(dAtA []byte) error { return ErrInvalidLengthVirtualService } postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthVirtualService + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -5985,7 +7200,7 @@ func (m *TLSRoute) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - msglen |= (int(b) & 0x7F) << shift + msglen |= int(b&0x7F) << shift if b < 0x80 { break } @@ -5994,6 +7209,9 @@ func (m *TLSRoute) Unmarshal(dAtA []byte) error { return ErrInvalidLengthVirtualService } postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthVirtualService + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -6011,9 +7229,13 @@ func (m *TLSRoute) Unmarshal(dAtA []byte) error { if skippy < 0 { return ErrInvalidLengthVirtualService } + if (iNdEx + skippy) < 0 { + return ErrInvalidLengthVirtualService + } if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF } + m.XXX_unrecognized = append(m.XXX_unrecognized, dAtA[iNdEx:iNdEx+skippy]...) iNdEx += skippy } } @@ -6038,7 +7260,7 @@ func (m *TCPRoute) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - wire |= (uint64(b) & 0x7F) << shift + wire |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -6066,7 +7288,7 @@ func (m *TCPRoute) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - msglen |= (int(b) & 0x7F) << shift + msglen |= int(b&0x7F) << shift if b < 0x80 { break } @@ -6075,6 +7297,9 @@ func (m *TCPRoute) Unmarshal(dAtA []byte) error { return ErrInvalidLengthVirtualService } postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthVirtualService + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -6097,7 +7322,7 @@ func (m *TCPRoute) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - msglen |= (int(b) & 0x7F) << shift + msglen |= int(b&0x7F) << shift if b < 0x80 { break } @@ -6106,6 +7331,9 @@ func (m *TCPRoute) Unmarshal(dAtA []byte) error { return ErrInvalidLengthVirtualService } postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthVirtualService + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -6123,9 +7351,13 @@ func (m *TCPRoute) Unmarshal(dAtA []byte) error { if skippy < 0 { return ErrInvalidLengthVirtualService } + if (iNdEx + skippy) < 0 { + return ErrInvalidLengthVirtualService + } if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF } + m.XXX_unrecognized = append(m.XXX_unrecognized, dAtA[iNdEx:iNdEx+skippy]...) iNdEx += skippy } } @@ -6150,7 +7382,7 @@ func (m *HTTPMatchRequest) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - wire |= (uint64(b) & 0x7F) << shift + wire |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -6178,7 +7410,7 @@ func (m *HTTPMatchRequest) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - msglen |= (int(b) & 0x7F) << shift + msglen |= int(b&0x7F) << shift if b < 0x80 { break } @@ -6187,6 +7419,9 @@ func (m *HTTPMatchRequest) Unmarshal(dAtA []byte) error { return ErrInvalidLengthVirtualService } postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthVirtualService + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -6211,7 +7446,7 @@ func (m *HTTPMatchRequest) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - msglen |= (int(b) & 0x7F) << shift + msglen |= int(b&0x7F) << shift if b < 0x80 { break } @@ -6220,6 +7455,9 @@ func (m *HTTPMatchRequest) Unmarshal(dAtA []byte) error { return ErrInvalidLengthVirtualService } postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthVirtualService + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -6244,7 +7482,7 @@ func (m *HTTPMatchRequest) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - msglen |= (int(b) & 0x7F) << shift + msglen |= int(b&0x7F) << shift if b < 0x80 { break } @@ -6253,6 +7491,9 @@ func (m *HTTPMatchRequest) Unmarshal(dAtA []byte) error { return ErrInvalidLengthVirtualService } postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthVirtualService + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -6277,7 +7518,7 @@ func (m *HTTPMatchRequest) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - msglen |= (int(b) & 0x7F) << shift + msglen |= int(b&0x7F) << shift if b < 0x80 { break } @@ -6286,6 +7527,9 @@ func (m *HTTPMatchRequest) Unmarshal(dAtA []byte) error { return ErrInvalidLengthVirtualService } postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthVirtualService + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -6310,7 +7554,7 @@ func (m *HTTPMatchRequest) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - msglen |= (int(b) & 0x7F) << shift + msglen |= int(b&0x7F) << shift if b < 0x80 { break } @@ -6319,6 +7563,9 @@ func (m *HTTPMatchRequest) Unmarshal(dAtA []byte) error { return ErrInvalidLengthVirtualService } postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthVirtualService + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -6339,7 +7586,7 @@ func (m *HTTPMatchRequest) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - wire |= (uint64(b) & 0x7F) << shift + wire |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -6356,7 +7603,7 @@ func (m *HTTPMatchRequest) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLenmapkey |= (uint64(b) & 0x7F) << shift + stringLenmapkey |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -6366,6 +7613,9 @@ func (m *HTTPMatchRequest) Unmarshal(dAtA []byte) error { return ErrInvalidLengthVirtualService } postStringIndexmapkey := iNdEx + intStringLenmapkey + if postStringIndexmapkey < 0 { + return ErrInvalidLengthVirtualService + } if postStringIndexmapkey > l { return io.ErrUnexpectedEOF } @@ -6382,7 +7632,7 @@ func (m *HTTPMatchRequest) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - mapmsglen |= (int(b) & 0x7F) << shift + mapmsglen |= int(b&0x7F) << shift if b < 0x80 { break } @@ -6391,7 +7641,7 @@ func (m *HTTPMatchRequest) Unmarshal(dAtA []byte) error { return ErrInvalidLengthVirtualService } postmsgIndex := iNdEx + mapmsglen - if mapmsglen < 0 { + if postmsgIndex < 0 { return ErrInvalidLengthVirtualService } if postmsgIndex > l { @@ -6433,7 +7683,7 @@ func (m *HTTPMatchRequest) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - m.Port |= (uint32(b) & 0x7F) << shift + m.Port |= uint32(b&0x7F) << shift if b < 0x80 { break } @@ -6452,7 +7702,7 @@ func (m *HTTPMatchRequest) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - msglen |= (int(b) & 0x7F) << shift + msglen |= int(b&0x7F) << shift if b < 0x80 { break } @@ -6461,6 +7711,9 @@ func (m *HTTPMatchRequest) Unmarshal(dAtA []byte) error { return ErrInvalidLengthVirtualService } postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthVirtualService + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -6481,7 +7734,7 @@ func (m *HTTPMatchRequest) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - wire |= (uint64(b) & 0x7F) << shift + wire |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -6498,7 +7751,7 @@ func (m *HTTPMatchRequest) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLenmapkey |= (uint64(b) & 0x7F) << shift + stringLenmapkey |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -6508,6 +7761,9 @@ func (m *HTTPMatchRequest) Unmarshal(dAtA []byte) error { return ErrInvalidLengthVirtualService } postStringIndexmapkey := iNdEx + intStringLenmapkey + if postStringIndexmapkey < 0 { + return ErrInvalidLengthVirtualService + } if postStringIndexmapkey > l { return io.ErrUnexpectedEOF } @@ -6524,7 +7780,7 @@ func (m *HTTPMatchRequest) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLenmapvalue |= (uint64(b) & 0x7F) << shift + stringLenmapvalue |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -6534,6 +7790,9 @@ func (m *HTTPMatchRequest) Unmarshal(dAtA []byte) error { return ErrInvalidLengthVirtualService } postStringIndexmapvalue := iNdEx + intStringLenmapvalue + if postStringIndexmapvalue < 0 { + return ErrInvalidLengthVirtualService + } if postStringIndexmapvalue > l { return io.ErrUnexpectedEOF } @@ -6570,7 +7829,7 @@ func (m *HTTPMatchRequest) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLen |= (uint64(b) & 0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -6580,6 +7839,9 @@ func (m *HTTPMatchRequest) Unmarshal(dAtA []byte) error { return ErrInvalidLengthVirtualService } postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthVirtualService + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -6594,9 +7856,13 @@ func (m *HTTPMatchRequest) Unmarshal(dAtA []byte) error { if skippy < 0 { return ErrInvalidLengthVirtualService } + if (iNdEx + skippy) < 0 { + return ErrInvalidLengthVirtualService + } if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF } + m.XXX_unrecognized = append(m.XXX_unrecognized, dAtA[iNdEx:iNdEx+skippy]...) iNdEx += skippy } } @@ -6621,7 +7887,7 @@ func (m *HTTPRouteDestination) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - wire |= (uint64(b) & 0x7F) << shift + wire |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -6649,7 +7915,7 @@ func (m *HTTPRouteDestination) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - msglen |= (int(b) & 0x7F) << shift + msglen |= int(b&0x7F) << shift if b < 0x80 { break } @@ -6658,6 +7924,9 @@ func (m *HTTPRouteDestination) Unmarshal(dAtA []byte) error { return ErrInvalidLengthVirtualService } postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthVirtualService + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -6682,7 +7951,7 @@ func (m *HTTPRouteDestination) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - m.Weight |= (int32(b) & 0x7F) << shift + m.Weight |= int32(b&0x7F) << shift if b < 0x80 { break } @@ -6701,7 +7970,7 @@ func (m *HTTPRouteDestination) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLen |= (uint64(b) & 0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -6711,6 +7980,9 @@ func (m *HTTPRouteDestination) Unmarshal(dAtA []byte) error { return ErrInvalidLengthVirtualService } postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthVirtualService + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -6730,7 +8002,7 @@ func (m *HTTPRouteDestination) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - msglen |= (int(b) & 0x7F) << shift + msglen |= int(b&0x7F) << shift if b < 0x80 { break } @@ -6739,6 +8011,9 @@ func (m *HTTPRouteDestination) Unmarshal(dAtA []byte) error { return ErrInvalidLengthVirtualService } postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthVirtualService + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -6759,7 +8034,7 @@ func (m *HTTPRouteDestination) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - wire |= (uint64(b) & 0x7F) << shift + wire |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -6776,7 +8051,7 @@ func (m *HTTPRouteDestination) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLenmapkey |= (uint64(b) & 0x7F) << shift + stringLenmapkey |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -6786,6 +8061,9 @@ func (m *HTTPRouteDestination) Unmarshal(dAtA []byte) error { return ErrInvalidLengthVirtualService } postStringIndexmapkey := iNdEx + intStringLenmapkey + if postStringIndexmapkey < 0 { + return ErrInvalidLengthVirtualService + } if postStringIndexmapkey > l { return io.ErrUnexpectedEOF } @@ -6802,7 +8080,7 @@ func (m *HTTPRouteDestination) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLenmapvalue |= (uint64(b) & 0x7F) << shift + stringLenmapvalue |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -6812,6 +8090,9 @@ func (m *HTTPRouteDestination) Unmarshal(dAtA []byte) error { return ErrInvalidLengthVirtualService } postStringIndexmapvalue := iNdEx + intStringLenmapvalue + if postStringIndexmapvalue < 0 { + return ErrInvalidLengthVirtualService + } if postStringIndexmapvalue > l { return io.ErrUnexpectedEOF } @@ -6848,7 +8129,7 @@ func (m *HTTPRouteDestination) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLen |= (uint64(b) & 0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -6858,6 +8139,9 @@ func (m *HTTPRouteDestination) Unmarshal(dAtA []byte) error { return ErrInvalidLengthVirtualService } postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthVirtualService + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -6877,7 +8161,7 @@ func (m *HTTPRouteDestination) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - msglen |= (int(b) & 0x7F) << shift + msglen |= int(b&0x7F) << shift if b < 0x80 { break } @@ -6886,6 +8170,9 @@ func (m *HTTPRouteDestination) Unmarshal(dAtA []byte) error { return ErrInvalidLengthVirtualService } postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthVirtualService + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -6906,7 +8193,7 @@ func (m *HTTPRouteDestination) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - wire |= (uint64(b) & 0x7F) << shift + wire |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -6923,7 +8210,7 @@ func (m *HTTPRouteDestination) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLenmapkey |= (uint64(b) & 0x7F) << shift + stringLenmapkey |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -6933,6 +8220,9 @@ func (m *HTTPRouteDestination) Unmarshal(dAtA []byte) error { return ErrInvalidLengthVirtualService } postStringIndexmapkey := iNdEx + intStringLenmapkey + if postStringIndexmapkey < 0 { + return ErrInvalidLengthVirtualService + } if postStringIndexmapkey > l { return io.ErrUnexpectedEOF } @@ -6949,7 +8239,7 @@ func (m *HTTPRouteDestination) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLenmapvalue |= (uint64(b) & 0x7F) << shift + stringLenmapvalue |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -6959,6 +8249,9 @@ func (m *HTTPRouteDestination) Unmarshal(dAtA []byte) error { return ErrInvalidLengthVirtualService } postStringIndexmapvalue := iNdEx + intStringLenmapvalue + if postStringIndexmapvalue < 0 { + return ErrInvalidLengthVirtualService + } if postStringIndexmapvalue > l { return io.ErrUnexpectedEOF } @@ -6995,7 +8288,7 @@ func (m *HTTPRouteDestination) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - msglen |= (int(b) & 0x7F) << shift + msglen |= int(b&0x7F) << shift if b < 0x80 { break } @@ -7004,6 +8297,9 @@ func (m *HTTPRouteDestination) Unmarshal(dAtA []byte) error { return ErrInvalidLengthVirtualService } postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthVirtualService + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -7023,9 +8319,13 @@ func (m *HTTPRouteDestination) Unmarshal(dAtA []byte) error { if skippy < 0 { return ErrInvalidLengthVirtualService } + if (iNdEx + skippy) < 0 { + return ErrInvalidLengthVirtualService + } if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF } + m.XXX_unrecognized = append(m.XXX_unrecognized, dAtA[iNdEx:iNdEx+skippy]...) iNdEx += skippy } } @@ -7050,7 +8350,7 @@ func (m *RouteDestination) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - wire |= (uint64(b) & 0x7F) << shift + wire |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -7078,7 +8378,7 @@ func (m *RouteDestination) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - msglen |= (int(b) & 0x7F) << shift + msglen |= int(b&0x7F) << shift if b < 0x80 { break } @@ -7087,6 +8387,9 @@ func (m *RouteDestination) Unmarshal(dAtA []byte) error { return ErrInvalidLengthVirtualService } postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthVirtualService + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -7111,7 +8414,7 @@ func (m *RouteDestination) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - m.Weight |= (int32(b) & 0x7F) << shift + m.Weight |= int32(b&0x7F) << shift if b < 0x80 { break } @@ -7125,9 +8428,13 @@ func (m *RouteDestination) Unmarshal(dAtA []byte) error { if skippy < 0 { return ErrInvalidLengthVirtualService } + if (iNdEx + skippy) < 0 { + return ErrInvalidLengthVirtualService + } if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF } + m.XXX_unrecognized = append(m.XXX_unrecognized, dAtA[iNdEx:iNdEx+skippy]...) iNdEx += skippy } } @@ -7152,7 +8459,7 @@ func (m *L4MatchAttributes) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - wire |= (uint64(b) & 0x7F) << shift + wire |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -7180,7 +8487,7 @@ func (m *L4MatchAttributes) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLen |= (uint64(b) & 0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -7190,6 +8497,9 @@ func (m *L4MatchAttributes) Unmarshal(dAtA []byte) error { return ErrInvalidLengthVirtualService } postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthVirtualService + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -7209,7 +8519,7 @@ func (m *L4MatchAttributes) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - m.Port |= (uint32(b) & 0x7F) << shift + m.Port |= uint32(b&0x7F) << shift if b < 0x80 { break } @@ -7228,7 +8538,7 @@ func (m *L4MatchAttributes) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLen |= (uint64(b) & 0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -7238,6 +8548,9 @@ func (m *L4MatchAttributes) Unmarshal(dAtA []byte) error { return ErrInvalidLengthVirtualService } postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthVirtualService + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -7257,7 +8570,7 @@ func (m *L4MatchAttributes) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - msglen |= (int(b) & 0x7F) << shift + msglen |= int(b&0x7F) << shift if b < 0x80 { break } @@ -7266,6 +8579,9 @@ func (m *L4MatchAttributes) Unmarshal(dAtA []byte) error { return ErrInvalidLengthVirtualService } postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthVirtualService + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -7286,7 +8602,7 @@ func (m *L4MatchAttributes) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - wire |= (uint64(b) & 0x7F) << shift + wire |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -7303,7 +8619,7 @@ func (m *L4MatchAttributes) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLenmapkey |= (uint64(b) & 0x7F) << shift + stringLenmapkey |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -7313,6 +8629,9 @@ func (m *L4MatchAttributes) Unmarshal(dAtA []byte) error { return ErrInvalidLengthVirtualService } postStringIndexmapkey := iNdEx + intStringLenmapkey + if postStringIndexmapkey < 0 { + return ErrInvalidLengthVirtualService + } if postStringIndexmapkey > l { return io.ErrUnexpectedEOF } @@ -7329,7 +8648,7 @@ func (m *L4MatchAttributes) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLenmapvalue |= (uint64(b) & 0x7F) << shift + stringLenmapvalue |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -7339,6 +8658,9 @@ func (m *L4MatchAttributes) Unmarshal(dAtA []byte) error { return ErrInvalidLengthVirtualService } postStringIndexmapvalue := iNdEx + intStringLenmapvalue + if postStringIndexmapvalue < 0 { + return ErrInvalidLengthVirtualService + } if postStringIndexmapvalue > l { return io.ErrUnexpectedEOF } @@ -7375,7 +8697,7 @@ func (m *L4MatchAttributes) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLen |= (uint64(b) & 0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -7385,6 +8707,9 @@ func (m *L4MatchAttributes) Unmarshal(dAtA []byte) error { return ErrInvalidLengthVirtualService } postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthVirtualService + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -7399,9 +8724,13 @@ func (m *L4MatchAttributes) Unmarshal(dAtA []byte) error { if skippy < 0 { return ErrInvalidLengthVirtualService } + if (iNdEx + skippy) < 0 { + return ErrInvalidLengthVirtualService + } if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF } + m.XXX_unrecognized = append(m.XXX_unrecognized, dAtA[iNdEx:iNdEx+skippy]...) iNdEx += skippy } } @@ -7426,7 +8755,7 @@ func (m *TLSMatchAttributes) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - wire |= (uint64(b) & 0x7F) << shift + wire |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -7454,7 +8783,7 @@ func (m *TLSMatchAttributes) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLen |= (uint64(b) & 0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -7464,6 +8793,9 @@ func (m *TLSMatchAttributes) Unmarshal(dAtA []byte) error { return ErrInvalidLengthVirtualService } postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthVirtualService + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -7483,7 +8815,7 @@ func (m *TLSMatchAttributes) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLen |= (uint64(b) & 0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -7493,6 +8825,9 @@ func (m *TLSMatchAttributes) Unmarshal(dAtA []byte) error { return ErrInvalidLengthVirtualService } postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthVirtualService + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -7512,7 +8847,7 @@ func (m *TLSMatchAttributes) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - m.Port |= (uint32(b) & 0x7F) << shift + m.Port |= uint32(b&0x7F) << shift if b < 0x80 { break } @@ -7531,7 +8866,7 @@ func (m *TLSMatchAttributes) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLen |= (uint64(b) & 0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -7541,6 +8876,9 @@ func (m *TLSMatchAttributes) Unmarshal(dAtA []byte) error { return ErrInvalidLengthVirtualService } postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthVirtualService + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -7560,7 +8898,7 @@ func (m *TLSMatchAttributes) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - msglen |= (int(b) & 0x7F) << shift + msglen |= int(b&0x7F) << shift if b < 0x80 { break } @@ -7569,6 +8907,9 @@ func (m *TLSMatchAttributes) Unmarshal(dAtA []byte) error { return ErrInvalidLengthVirtualService } postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthVirtualService + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -7589,7 +8930,7 @@ func (m *TLSMatchAttributes) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - wire |= (uint64(b) & 0x7F) << shift + wire |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -7606,7 +8947,7 @@ func (m *TLSMatchAttributes) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLenmapkey |= (uint64(b) & 0x7F) << shift + stringLenmapkey |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -7616,6 +8957,9 @@ func (m *TLSMatchAttributes) Unmarshal(dAtA []byte) error { return ErrInvalidLengthVirtualService } postStringIndexmapkey := iNdEx + intStringLenmapkey + if postStringIndexmapkey < 0 { + return ErrInvalidLengthVirtualService + } if postStringIndexmapkey > l { return io.ErrUnexpectedEOF } @@ -7632,7 +8976,7 @@ func (m *TLSMatchAttributes) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLenmapvalue |= (uint64(b) & 0x7F) << shift + stringLenmapvalue |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -7642,6 +8986,9 @@ func (m *TLSMatchAttributes) Unmarshal(dAtA []byte) error { return ErrInvalidLengthVirtualService } postStringIndexmapvalue := iNdEx + intStringLenmapvalue + if postStringIndexmapvalue < 0 { + return ErrInvalidLengthVirtualService + } if postStringIndexmapvalue > l { return io.ErrUnexpectedEOF } @@ -7678,7 +9025,7 @@ func (m *TLSMatchAttributes) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLen |= (uint64(b) & 0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -7688,6 +9035,9 @@ func (m *TLSMatchAttributes) Unmarshal(dAtA []byte) error { return ErrInvalidLengthVirtualService } postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthVirtualService + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -7702,9 +9052,13 @@ func (m *TLSMatchAttributes) Unmarshal(dAtA []byte) error { if skippy < 0 { return ErrInvalidLengthVirtualService } + if (iNdEx + skippy) < 0 { + return ErrInvalidLengthVirtualService + } if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF } + m.XXX_unrecognized = append(m.XXX_unrecognized, dAtA[iNdEx:iNdEx+skippy]...) iNdEx += skippy } } @@ -7729,7 +9083,7 @@ func (m *HTTPRedirect) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - wire |= (uint64(b) & 0x7F) << shift + wire |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -7757,7 +9111,7 @@ func (m *HTTPRedirect) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLen |= (uint64(b) & 0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -7767,6 +9121,9 @@ func (m *HTTPRedirect) Unmarshal(dAtA []byte) error { return ErrInvalidLengthVirtualService } postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthVirtualService + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -7786,7 +9143,7 @@ func (m *HTTPRedirect) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLen |= (uint64(b) & 0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -7796,6 +9153,9 @@ func (m *HTTPRedirect) Unmarshal(dAtA []byte) error { return ErrInvalidLengthVirtualService } postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthVirtualService + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -7810,9 +9170,13 @@ func (m *HTTPRedirect) Unmarshal(dAtA []byte) error { if skippy < 0 { return ErrInvalidLengthVirtualService } + if (iNdEx + skippy) < 0 { + return ErrInvalidLengthVirtualService + } if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF } + m.XXX_unrecognized = append(m.XXX_unrecognized, dAtA[iNdEx:iNdEx+skippy]...) iNdEx += skippy } } @@ -7837,7 +9201,7 @@ func (m *HTTPRewrite) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - wire |= (uint64(b) & 0x7F) << shift + wire |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -7865,7 +9229,7 @@ func (m *HTTPRewrite) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLen |= (uint64(b) & 0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -7875,6 +9239,9 @@ func (m *HTTPRewrite) Unmarshal(dAtA []byte) error { return ErrInvalidLengthVirtualService } postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthVirtualService + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -7894,7 +9261,7 @@ func (m *HTTPRewrite) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLen |= (uint64(b) & 0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -7904,6 +9271,9 @@ func (m *HTTPRewrite) Unmarshal(dAtA []byte) error { return ErrInvalidLengthVirtualService } postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthVirtualService + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -7918,9 +9288,13 @@ func (m *HTTPRewrite) Unmarshal(dAtA []byte) error { if skippy < 0 { return ErrInvalidLengthVirtualService } + if (iNdEx + skippy) < 0 { + return ErrInvalidLengthVirtualService + } if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF } + m.XXX_unrecognized = append(m.XXX_unrecognized, dAtA[iNdEx:iNdEx+skippy]...) iNdEx += skippy } } @@ -7945,7 +9319,7 @@ func (m *StringMatch) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - wire |= (uint64(b) & 0x7F) << shift + wire |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -7973,7 +9347,7 @@ func (m *StringMatch) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLen |= (uint64(b) & 0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -7983,6 +9357,9 @@ func (m *StringMatch) Unmarshal(dAtA []byte) error { return ErrInvalidLengthVirtualService } postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthVirtualService + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -8002,7 +9379,7 @@ func (m *StringMatch) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLen |= (uint64(b) & 0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -8012,6 +9389,9 @@ func (m *StringMatch) Unmarshal(dAtA []byte) error { return ErrInvalidLengthVirtualService } postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthVirtualService + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -8031,7 +9411,7 @@ func (m *StringMatch) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLen |= (uint64(b) & 0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -8041,6 +9421,9 @@ func (m *StringMatch) Unmarshal(dAtA []byte) error { return ErrInvalidLengthVirtualService } postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthVirtualService + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -8055,9 +9438,13 @@ func (m *StringMatch) Unmarshal(dAtA []byte) error { if skippy < 0 { return ErrInvalidLengthVirtualService } + if (iNdEx + skippy) < 0 { + return ErrInvalidLengthVirtualService + } if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF } + m.XXX_unrecognized = append(m.XXX_unrecognized, dAtA[iNdEx:iNdEx+skippy]...) iNdEx += skippy } } @@ -8082,7 +9469,7 @@ func (m *HTTPRetry) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - wire |= (uint64(b) & 0x7F) << shift + wire |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -8110,7 +9497,7 @@ func (m *HTTPRetry) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - m.Attempts |= (int32(b) & 0x7F) << shift + m.Attempts |= int32(b&0x7F) << shift if b < 0x80 { break } @@ -8129,7 +9516,7 @@ func (m *HTTPRetry) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - msglen |= (int(b) & 0x7F) << shift + msglen |= int(b&0x7F) << shift if b < 0x80 { break } @@ -8138,11 +9525,14 @@ func (m *HTTPRetry) Unmarshal(dAtA []byte) error { return ErrInvalidLengthVirtualService } postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthVirtualService + } if postIndex > l { return io.ErrUnexpectedEOF } if m.PerTryTimeout == nil { - m.PerTryTimeout = &google_protobuf.Duration{} + m.PerTryTimeout = &types.Duration{} } if err := m.PerTryTimeout.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err @@ -8162,7 +9552,7 @@ func (m *HTTPRetry) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLen |= (uint64(b) & 0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -8172,6 +9562,9 @@ func (m *HTTPRetry) Unmarshal(dAtA []byte) error { return ErrInvalidLengthVirtualService } postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthVirtualService + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -8186,9 +9579,13 @@ func (m *HTTPRetry) Unmarshal(dAtA []byte) error { if skippy < 0 { return ErrInvalidLengthVirtualService } + if (iNdEx + skippy) < 0 { + return ErrInvalidLengthVirtualService + } if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF } + m.XXX_unrecognized = append(m.XXX_unrecognized, dAtA[iNdEx:iNdEx+skippy]...) iNdEx += skippy } } @@ -8213,7 +9610,7 @@ func (m *CorsPolicy) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - wire |= (uint64(b) & 0x7F) << shift + wire |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -8241,7 +9638,7 @@ func (m *CorsPolicy) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLen |= (uint64(b) & 0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -8251,6 +9648,9 @@ func (m *CorsPolicy) Unmarshal(dAtA []byte) error { return ErrInvalidLengthVirtualService } postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthVirtualService + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -8270,7 +9670,7 @@ func (m *CorsPolicy) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLen |= (uint64(b) & 0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -8280,6 +9680,9 @@ func (m *CorsPolicy) Unmarshal(dAtA []byte) error { return ErrInvalidLengthVirtualService } postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthVirtualService + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -8299,7 +9702,7 @@ func (m *CorsPolicy) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLen |= (uint64(b) & 0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -8309,6 +9712,9 @@ func (m *CorsPolicy) Unmarshal(dAtA []byte) error { return ErrInvalidLengthVirtualService } postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthVirtualService + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -8328,7 +9734,7 @@ func (m *CorsPolicy) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLen |= (uint64(b) & 0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -8338,6 +9744,9 @@ func (m *CorsPolicy) Unmarshal(dAtA []byte) error { return ErrInvalidLengthVirtualService } postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthVirtualService + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -8357,7 +9766,7 @@ func (m *CorsPolicy) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - msglen |= (int(b) & 0x7F) << shift + msglen |= int(b&0x7F) << shift if b < 0x80 { break } @@ -8366,11 +9775,14 @@ func (m *CorsPolicy) Unmarshal(dAtA []byte) error { return ErrInvalidLengthVirtualService } postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthVirtualService + } if postIndex > l { return io.ErrUnexpectedEOF } if m.MaxAge == nil { - m.MaxAge = &google_protobuf.Duration{} + m.MaxAge = &types.Duration{} } if err := m.MaxAge.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err @@ -8390,7 +9802,7 @@ func (m *CorsPolicy) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - msglen |= (int(b) & 0x7F) << shift + msglen |= int(b&0x7F) << shift if b < 0x80 { break } @@ -8399,11 +9811,14 @@ func (m *CorsPolicy) Unmarshal(dAtA []byte) error { return ErrInvalidLengthVirtualService } postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthVirtualService + } if postIndex > l { return io.ErrUnexpectedEOF } if m.AllowCredentials == nil { - m.AllowCredentials = &google_protobuf1.BoolValue{} + m.AllowCredentials = &types.BoolValue{} } if err := m.AllowCredentials.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err @@ -8418,9 +9833,13 @@ func (m *CorsPolicy) Unmarshal(dAtA []byte) error { if skippy < 0 { return ErrInvalidLengthVirtualService } + if (iNdEx + skippy) < 0 { + return ErrInvalidLengthVirtualService + } if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF } + m.XXX_unrecognized = append(m.XXX_unrecognized, dAtA[iNdEx:iNdEx+skippy]...) iNdEx += skippy } } @@ -8445,7 +9864,7 @@ func (m *HTTPFaultInjection) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - wire |= (uint64(b) & 0x7F) << shift + wire |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -8473,7 +9892,7 @@ func (m *HTTPFaultInjection) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - msglen |= (int(b) & 0x7F) << shift + msglen |= int(b&0x7F) << shift if b < 0x80 { break } @@ -8482,6 +9901,9 @@ func (m *HTTPFaultInjection) Unmarshal(dAtA []byte) error { return ErrInvalidLengthVirtualService } postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthVirtualService + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -8506,7 +9928,7 @@ func (m *HTTPFaultInjection) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - msglen |= (int(b) & 0x7F) << shift + msglen |= int(b&0x7F) << shift if b < 0x80 { break } @@ -8515,6 +9937,9 @@ func (m *HTTPFaultInjection) Unmarshal(dAtA []byte) error { return ErrInvalidLengthVirtualService } postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthVirtualService + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -8534,9 +9959,13 @@ func (m *HTTPFaultInjection) Unmarshal(dAtA []byte) error { if skippy < 0 { return ErrInvalidLengthVirtualService } + if (iNdEx + skippy) < 0 { + return ErrInvalidLengthVirtualService + } if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF } + m.XXX_unrecognized = append(m.XXX_unrecognized, dAtA[iNdEx:iNdEx+skippy]...) iNdEx += skippy } } @@ -8561,7 +9990,7 @@ func (m *HTTPFaultInjection_Delay) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - wire |= (uint64(b) & 0x7F) << shift + wire |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -8589,7 +10018,7 @@ func (m *HTTPFaultInjection_Delay) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - m.Percent |= (int32(b) & 0x7F) << shift + m.Percent |= int32(b&0x7F) << shift if b < 0x80 { break } @@ -8608,7 +10037,7 @@ func (m *HTTPFaultInjection_Delay) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - msglen |= (int(b) & 0x7F) << shift + msglen |= int(b&0x7F) << shift if b < 0x80 { break } @@ -8617,10 +10046,13 @@ func (m *HTTPFaultInjection_Delay) Unmarshal(dAtA []byte) error { return ErrInvalidLengthVirtualService } postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthVirtualService + } if postIndex > l { return io.ErrUnexpectedEOF } - v := &google_protobuf.Duration{} + v := &types.Duration{} if err := v.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } @@ -8640,7 +10072,7 @@ func (m *HTTPFaultInjection_Delay) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - msglen |= (int(b) & 0x7F) << shift + msglen |= int(b&0x7F) << shift if b < 0x80 { break } @@ -8649,10 +10081,13 @@ func (m *HTTPFaultInjection_Delay) Unmarshal(dAtA []byte) error { return ErrInvalidLengthVirtualService } postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthVirtualService + } if postIndex > l { return io.ErrUnexpectedEOF } - v := &google_protobuf.Duration{} + v := &types.Duration{} if err := v.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } @@ -8672,7 +10107,7 @@ func (m *HTTPFaultInjection_Delay) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - msglen |= (int(b) & 0x7F) << shift + msglen |= int(b&0x7F) << shift if b < 0x80 { break } @@ -8681,6 +10116,9 @@ func (m *HTTPFaultInjection_Delay) Unmarshal(dAtA []byte) error { return ErrInvalidLengthVirtualService } postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthVirtualService + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -8700,9 +10138,13 @@ func (m *HTTPFaultInjection_Delay) Unmarshal(dAtA []byte) error { if skippy < 0 { return ErrInvalidLengthVirtualService } + if (iNdEx + skippy) < 0 { + return ErrInvalidLengthVirtualService + } if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF } + m.XXX_unrecognized = append(m.XXX_unrecognized, dAtA[iNdEx:iNdEx+skippy]...) iNdEx += skippy } } @@ -8727,7 +10169,7 @@ func (m *HTTPFaultInjection_Abort) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - wire |= (uint64(b) & 0x7F) << shift + wire |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -8755,7 +10197,7 @@ func (m *HTTPFaultInjection_Abort) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - m.Percent |= (int32(b) & 0x7F) << shift + m.Percent |= int32(b&0x7F) << shift if b < 0x80 { break } @@ -8774,7 +10216,7 @@ func (m *HTTPFaultInjection_Abort) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - v |= (int32(b) & 0x7F) << shift + v |= int32(b&0x7F) << shift if b < 0x80 { break } @@ -8794,7 +10236,7 @@ func (m *HTTPFaultInjection_Abort) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLen |= (uint64(b) & 0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -8804,6 +10246,9 @@ func (m *HTTPFaultInjection_Abort) Unmarshal(dAtA []byte) error { return ErrInvalidLengthVirtualService } postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthVirtualService + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -8823,7 +10268,7 @@ func (m *HTTPFaultInjection_Abort) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLen |= (uint64(b) & 0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -8833,6 +10278,9 @@ func (m *HTTPFaultInjection_Abort) Unmarshal(dAtA []byte) error { return ErrInvalidLengthVirtualService } postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthVirtualService + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -8852,7 +10300,7 @@ func (m *HTTPFaultInjection_Abort) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - msglen |= (int(b) & 0x7F) << shift + msglen |= int(b&0x7F) << shift if b < 0x80 { break } @@ -8861,6 +10309,9 @@ func (m *HTTPFaultInjection_Abort) Unmarshal(dAtA []byte) error { return ErrInvalidLengthVirtualService } postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthVirtualService + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -8880,9 +10331,13 @@ func (m *HTTPFaultInjection_Abort) Unmarshal(dAtA []byte) error { if skippy < 0 { return ErrInvalidLengthVirtualService } + if (iNdEx + skippy) < 0 { + return ErrInvalidLengthVirtualService + } if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF } + m.XXX_unrecognized = append(m.XXX_unrecognized, dAtA[iNdEx:iNdEx+skippy]...) iNdEx += skippy } } @@ -8907,7 +10362,7 @@ func (m *PortSelector) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - wire |= (uint64(b) & 0x7F) << shift + wire |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -8935,7 +10390,7 @@ func (m *PortSelector) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - v |= (uint32(b) & 0x7F) << shift + v |= uint32(b&0x7F) << shift if b < 0x80 { break } @@ -8955,7 +10410,7 @@ func (m *PortSelector) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLen |= (uint64(b) & 0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -8965,6 +10420,9 @@ func (m *PortSelector) Unmarshal(dAtA []byte) error { return ErrInvalidLengthVirtualService } postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthVirtualService + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -8979,9 +10437,13 @@ func (m *PortSelector) Unmarshal(dAtA []byte) error { if skippy < 0 { return ErrInvalidLengthVirtualService } + if (iNdEx + skippy) < 0 { + return ErrInvalidLengthVirtualService + } if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF } + m.XXX_unrecognized = append(m.XXX_unrecognized, dAtA[iNdEx:iNdEx+skippy]...) iNdEx += skippy } } @@ -9006,7 +10468,7 @@ func (m *Percent) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - wire |= (uint64(b) & 0x7F) << shift + wire |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -9028,7 +10490,7 @@ func (m *Percent) Unmarshal(dAtA []byte) error { if (iNdEx + 8) > l { return io.ErrUnexpectedEOF } - v = uint64(binary.LittleEndian.Uint64(dAtA[iNdEx:])) + v = uint64(encoding_binary.LittleEndian.Uint64(dAtA[iNdEx:])) iNdEx += 8 m.Value = float64(math.Float64frombits(v)) default: @@ -9040,9 +10502,13 @@ func (m *Percent) Unmarshal(dAtA []byte) error { if skippy < 0 { return ErrInvalidLengthVirtualService } + if (iNdEx + skippy) < 0 { + return ErrInvalidLengthVirtualService + } if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF } + m.XXX_unrecognized = append(m.XXX_unrecognized, dAtA[iNdEx:iNdEx+skippy]...) iNdEx += skippy } } @@ -9106,10 +10572,13 @@ func skipVirtualService(dAtA []byte) (n int, err error) { break } } - iNdEx += length if length < 0 { return 0, ErrInvalidLengthVirtualService } + iNdEx += length + if iNdEx < 0 { + return 0, ErrInvalidLengthVirtualService + } return iNdEx, nil case 3: for { @@ -9138,6 +10607,9 @@ func skipVirtualService(dAtA []byte) (n int, err error) { return 0, err } iNdEx = start + next + if iNdEx < 0 { + return 0, ErrInvalidLengthVirtualService + } } return iNdEx, nil case 4: @@ -9156,123 +10628,3 @@ var ( ErrInvalidLengthVirtualService = fmt.Errorf("proto: negative length found during unmarshaling") ErrIntOverflowVirtualService = fmt.Errorf("proto: integer overflow") ) - -func init() { - proto.RegisterFile("networking/v1alpha3/virtual_service.proto", fileDescriptorVirtualService) -} - -var fileDescriptorVirtualService = []byte{ - // 1785 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x59, 0x4f, 0x73, 0xe3, 0x48, - 0x15, 0x1f, 0xd9, 0x96, 0xff, 0x3c, 0x3b, 0x19, 0xa7, 0xc9, 0x66, 0x15, 0xef, 0x56, 0xc8, 0x7a, - 0x59, 0x08, 0xb5, 0xac, 0x5d, 0x24, 0xb0, 0xa4, 0x96, 0x6c, 0x76, 0xed, 0x64, 0x66, 0x3d, 0xd4, - 0x0c, 0x49, 0xc9, 0x61, 0x0e, 0x5c, 0x54, 0xb2, 0xd4, 0xb1, 0xc5, 0xc8, 0x6a, 0xd1, 0x6a, 0x25, - 0x76, 0x71, 0xe4, 0xdf, 0x19, 0x8a, 0x2b, 0xc5, 0xf7, 0xe0, 0xc2, 0x95, 0x13, 0xc5, 0x27, 0xa0, - 0xa6, 0xe6, 0xc0, 0x95, 0xaf, 0x40, 0x75, 0xb7, 0x24, 0x2b, 0x71, 0x62, 0xd9, 0x61, 0xa0, 0x38, - 0xc5, 0xdd, 0xfd, 0x7e, 0xbf, 0x7e, 0xfd, 0xba, 0xfb, 0xbd, 0x9f, 0x3a, 0xf0, 0x6d, 0x0f, 0xb3, - 0x6b, 0x42, 0x5f, 0x39, 0xde, 0xb0, 0x7d, 0xf5, 0x5d, 0xd3, 0xf5, 0x47, 0xe6, 0x41, 0xfb, 0xca, - 0xa1, 0x2c, 0x34, 0x5d, 0x23, 0xc0, 0xf4, 0xca, 0xb1, 0x70, 0xcb, 0xa7, 0x84, 0x11, 0xb4, 0xed, - 0x04, 0xcc, 0x21, 0xad, 0x19, 0xa0, 0x15, 0x03, 0x1a, 0x3b, 0x43, 0x42, 0x86, 0x2e, 0x6e, 0x0b, - 0xc3, 0x41, 0x78, 0xd9, 0xb6, 0x43, 0x6a, 0x32, 0x87, 0x78, 0x12, 0x3a, 0x3f, 0x7e, 0x4d, 0x4d, - 0xdf, 0xc7, 0x34, 0x90, 0xe3, 0xcd, 0xdf, 0xe6, 0x60, 0xfd, 0xa5, 0x9c, 0xb4, 0x2f, 0xe7, 0x44, - 0x9b, 0xa0, 0x8e, 0x48, 0xc0, 0x02, 0x4d, 0xd9, 0xcd, 0xef, 0x55, 0x74, 0xd9, 0x40, 0x0d, 0x28, - 0x0f, 0x4d, 0x86, 0xaf, 0xcd, 0x69, 0xa0, 0xe5, 0xc4, 0x40, 0xd2, 0x46, 0x87, 0x50, 0x18, 0x31, - 0xe6, 0x6b, 0xf9, 0xdd, 0xfc, 0x5e, 0x75, 0xff, 0x1b, 0xad, 0x7b, 0xdd, 0x6d, 0xf5, 0x2e, 0x2e, - 0xce, 0x75, 0x12, 0x32, 0xac, 0x0b, 0x04, 0xfa, 0x3e, 0xe4, 0x99, 0xe5, 0x6b, 0x05, 0x01, 0xfc, - 0x70, 0x01, 0xf0, 0xe2, 0x24, 0xc2, 0x71, 0x7b, 0x01, 0x73, 0x03, 0x4d, 0xcd, 0x86, 0x3d, 0xef, - 0xc7, 0x30, 0x37, 0x40, 0xef, 0x41, 0x05, 0x4f, 0x7c, 0x42, 0x99, 0xc1, 0x88, 0x56, 0x94, 0x8b, - 0x90, 0x1d, 0x17, 0xa4, 0x79, 0x05, 0xd5, 0x53, 0x1c, 0x30, 0xc7, 0x13, 0xe1, 0x43, 0x08, 0x0a, - 0x7c, 0xe1, 0x9a, 0xb2, 0xab, 0xec, 0x55, 0x74, 0xf1, 0x1b, 0x6d, 0x41, 0x31, 0x08, 0x07, 0x01, - 0x66, 0x5a, 0x4e, 0xf4, 0x46, 0x2d, 0xf4, 0x43, 0x28, 0x70, 0x12, 0x2d, 0xbf, 0xab, 0xec, 0x55, - 0xf7, 0xbf, 0xb5, 0xc0, 0x9f, 0x73, 0x42, 0x59, 0x1f, 0xbb, 0xd8, 0x62, 0x84, 0xea, 0x02, 0xd4, - 0xfc, 0x17, 0x40, 0x25, 0x09, 0x0b, 0xea, 0x80, 0x3a, 0x36, 0x99, 0x35, 0x12, 0xc1, 0xaf, 0xee, - 0x7f, 0x9c, 0x11, 0xcb, 0x17, 0xdc, 0x56, 0xc7, 0x3f, 0x0f, 0x71, 0xc0, 0x74, 0x89, 0x44, 0x4f, - 0x40, 0xa5, 0x9c, 0x4b, 0x6c, 0x53, 0x75, 0xbf, 0xbd, 0xcc, 0x76, 0xa4, 0x56, 0xae, 0x4b, 0x34, - 0x3a, 0x81, 0x32, 0xc5, 0xb6, 0x43, 0xb1, 0xb5, 0xcc, 0xc2, 0x04, 0x53, 0x64, 0xae, 0x27, 0x40, - 0xf4, 0x25, 0x94, 0x28, 0xbe, 0xa6, 0x0e, 0xc3, 0x5a, 0x41, 0x70, 0x7c, 0x33, 0x93, 0x43, 0x58, - 0xeb, 0x31, 0x0c, 0x7d, 0x0c, 0x1b, 0xd7, 0x78, 0x10, 0x10, 0xeb, 0x15, 0x66, 0x46, 0xe8, 0x0f, - 0xa9, 0x69, 0x63, 0x4d, 0xdd, 0x55, 0xf6, 0xca, 0x7a, 0x3d, 0x19, 0xf8, 0x89, 0xec, 0x47, 0x07, - 0x50, 0x62, 0xce, 0x18, 0x93, 0x90, 0x69, 0x45, 0x31, 0xdd, 0x76, 0x4b, 0x9e, 0xff, 0x56, 0x7c, - 0xfe, 0x5b, 0xa7, 0xd1, 0xfd, 0xd0, 0x63, 0x4b, 0x74, 0xcc, 0x7d, 0x64, 0xd4, 0xc1, 0x81, 0x56, - 0x12, 0xa0, 0xcc, 0x03, 0x8c, 0x19, 0x9d, 0xea, 0x31, 0x08, 0x9d, 0x80, 0x7a, 0x69, 0x86, 0x2e, - 0xd3, 0xca, 0x02, 0xfd, 0x49, 0x06, 0xfa, 0x29, 0xb7, 0x7d, 0xe6, 0xfd, 0x0c, 0x5b, 0x32, 0xda, - 0x02, 0x8b, 0x8e, 0xa1, 0x38, 0x76, 0x28, 0x25, 0x54, 0xab, 0x64, 0xc6, 0x29, 0xbd, 0x59, 0x11, - 0x0a, 0x3d, 0x85, 0xaa, 0x45, 0x68, 0x60, 0xf8, 0xc4, 0x75, 0xac, 0xa9, 0x06, 0x82, 0xe4, 0xa3, - 0x05, 0x24, 0x27, 0x84, 0x06, 0xe7, 0xc2, 0x58, 0x07, 0x2b, 0xf9, 0x8d, 0x06, 0xb0, 0xce, 0xf3, - 0x83, 0x67, 0x1b, 0x23, 0x6c, 0xda, 0x98, 0x06, 0x5a, 0x55, 0x9c, 0xa2, 0x1f, 0x2c, 0x73, 0x8a, - 0x5a, 0x1d, 0x01, 0xed, 0x49, 0xe4, 0x13, 0x8f, 0xd1, 0x69, 0x37, 0xa7, 0x29, 0xfa, 0x9a, 0x99, - 0xee, 0x47, 0x9f, 0xc1, 0xbb, 0x14, 0x8f, 0xc9, 0x15, 0x36, 0x28, 0x0e, 0x7c, 0xe2, 0x05, 0x38, - 0x99, 0xac, 0xc6, 0x2f, 0xa5, 0xc0, 0xbc, 0x23, 0x4d, 0xf4, 0xc8, 0x22, 0xc6, 0xfe, 0x02, 0xde, - 0x8d, 0xfc, 0x9b, 0xc3, 0xae, 0x09, 0x47, 0xbf, 0x58, 0xc1, 0xd1, 0x5b, 0xe4, 0x33, 0x87, 0xdf, - 0x31, 0xef, 0x1a, 0x47, 0x87, 0xb0, 0x95, 0x38, 0x2e, 0xae, 0x5c, 0x32, 0xf7, 0x7a, 0xe2, 0xf7, - 0x66, 0xec, 0xb7, 0x30, 0x88, 0x91, 0x13, 0xd8, 0x4a, 0xdc, 0xbe, 0x89, 0x7c, 0x2c, 0xbc, 0x3e, - 0x5e, 0xc9, 0xeb, 0x34, 0xf5, 0xcc, 0xe9, 0x4d, 0xf3, 0x8e, 0x61, 0x74, 0x04, 0xa5, 0x78, 0xaa, - 0xba, 0x38, 0x14, 0xcd, 0x45, 0x53, 0x49, 0x4b, 0x3d, 0x86, 0x34, 0xbe, 0x04, 0x34, 0xbf, 0xa7, - 0xa8, 0x0e, 0xf9, 0x57, 0x78, 0x1a, 0xa5, 0x46, 0xfe, 0x93, 0xd7, 0x8c, 0x2b, 0xd3, 0x0d, 0x71, - 0x94, 0x18, 0x65, 0xe3, 0xb3, 0xdc, 0xa1, 0xd2, 0xe8, 0x41, 0xe3, 0xfe, 0x60, 0xaf, 0xc4, 0xf4, - 0x15, 0x6c, 0xdf, 0x1b, 0x80, 0x55, 0x88, 0x9a, 0xff, 0xcc, 0x43, 0x29, 0x0e, 0xcf, 0x0b, 0x7e, - 0xf9, 0x05, 0x9d, 0xc0, 0x56, 0xf7, 0x0f, 0xb2, 0xc3, 0x13, 0xfd, 0x3d, 0xf3, 0xb1, 0x4c, 0x25, - 0x81, 0x1e, 0x73, 0xa0, 0x33, 0x9e, 0x34, 0xe5, 0x3a, 0xc5, 0xbc, 0x0f, 0xe4, 0x4b, 0x48, 0x1a, - 0x7f, 0xce, 0x41, 0xfd, 0xf6, 0x30, 0xfa, 0x31, 0xe4, 0x79, 0x11, 0x92, 0x25, 0xe2, 0xe8, 0x01, - 0x13, 0xb4, 0xfa, 0x98, 0x89, 0xb8, 0xe9, 0x9c, 0x88, 0xf3, 0x99, 0xb6, 0x1d, 0xd5, 0x8b, 0x07, - 0xf1, 0x75, 0x6c, 0x3b, 0xe2, 0x33, 0x6d, 0x9b, 0xd7, 0x49, 0x79, 0x0b, 0x84, 0x22, 0xa8, 0xe8, - 0x51, 0xab, 0xf1, 0x29, 0x94, 0xe3, 0x89, 0x57, 0xda, 0xf9, 0x4f, 0xa1, 0x1c, 0x4f, 0xb0, 0xd2, - 0x46, 0xff, 0x5e, 0x81, 0x72, 0xac, 0x00, 0x78, 0x9a, 0x4e, 0x57, 0xd6, 0x4f, 0x16, 0xab, 0x06, - 0x51, 0x58, 0x3b, 0x8c, 0x51, 0x67, 0x10, 0x32, 0x1c, 0xc4, 0xb5, 0xb5, 0x73, 0xb3, 0xb6, 0x2e, - 0x2a, 0xcf, 0xf7, 0xd4, 0xd5, 0xe6, 0xef, 0xb8, 0x53, 0x91, 0x9a, 0x41, 0xdd, 0x9b, 0x4e, 0x7d, - 0x67, 0x01, 0xdf, 0xf3, 0xef, 0xfd, 0xf7, 0x7c, 0xfa, 0x93, 0x0a, 0xf5, 0xdb, 0x72, 0x02, 0x1d, - 0x42, 0x3e, 0xa4, 0x4e, 0x74, 0x2d, 0x16, 0xd5, 0xa3, 0x3e, 0xa3, 0x8e, 0x37, 0x94, 0x58, 0x0e, - 0xe1, 0xc5, 0x2c, 0xb0, 0x46, 0x78, 0x1c, 0xdf, 0x81, 0x65, 0xc1, 0x11, 0x4a, 0x14, 0x43, 0xcc, - 0x46, 0xc4, 0x8e, 0x84, 0xc7, 0xd2, 0x78, 0x89, 0x42, 0xa7, 0x50, 0x31, 0x43, 0x36, 0x22, 0xd4, - 0x61, 0xd3, 0x25, 0x74, 0x47, 0x9a, 0x62, 0x06, 0x44, 0xfa, 0x2c, 0x73, 0x4a, 0xa1, 0x79, 0xb8, - 0x82, 0x18, 0x6b, 0xa5, 0xb3, 0x53, 0x92, 0x4f, 0xb9, 0xaa, 0x14, 0x4a, 0x91, 0xab, 0x93, 0x35, - 0x29, 0x00, 0xd1, 0x00, 0xd6, 0x02, 0x12, 0x52, 0x0b, 0x1b, 0xae, 0x39, 0xc0, 0x2e, 0x57, 0x21, - 0x7c, 0xb6, 0xcf, 0x57, 0x99, 0xad, 0x2f, 0x08, 0x9e, 0x0b, 0xbc, 0x9c, 0xb2, 0x16, 0xa4, 0xba, - 0x6e, 0xa8, 0xf7, 0xf2, 0x4d, 0xf5, 0xde, 0x18, 0x40, 0x2d, 0x23, 0x95, 0x1e, 0xa5, 0x6f, 0xd8, - 0xf2, 0xb1, 0x4c, 0xdd, 0xe0, 0x2f, 0x60, 0x63, 0xce, 0xc5, 0x95, 0xae, 0xf2, 0xdf, 0x54, 0xd8, - 0xbc, 0x4b, 0xad, 0xa2, 0x1e, 0x54, 0xed, 0x59, 0x73, 0x89, 0xd3, 0x9a, 0x3e, 0xfe, 0x69, 0x28, - 0xcf, 0x5a, 0xd7, 0xd8, 0x19, 0x8e, 0xa4, 0xba, 0x57, 0xf5, 0xa8, 0xb5, 0x48, 0xae, 0xe4, 0xb3, - 0xe4, 0xca, 0x6f, 0x94, 0xfb, 0xf5, 0x8a, 0xfc, 0xe8, 0xf9, 0xd1, 0x8a, 0xf2, 0xfc, 0xad, 0x4b, - 0x17, 0x35, 0x43, 0xba, 0xfc, 0x52, 0xb9, 0x57, 0xbb, 0x14, 0xc5, 0x0a, 0x9e, 0x3d, 0x74, 0x05, - 0x0f, 0x94, 0x31, 0xa5, 0xd5, 0x65, 0xcc, 0xff, 0xa1, 0x08, 0x61, 0x50, 0xff, 0xdf, 0x9f, 0xe5, - 0xe6, 0x5f, 0x72, 0xb0, 0x31, 0x57, 0x48, 0x50, 0x1b, 0xbe, 0x96, 0x02, 0x1b, 0x41, 0x38, 0xf0, - 0x70, 0xf2, 0xfd, 0x8f, 0x52, 0x43, 0x7d, 0x39, 0x92, 0xa4, 0xb1, 0x5c, 0x2a, 0x8d, 0x7d, 0x98, - 0xa4, 0x31, 0x89, 0x17, 0xb9, 0xbb, 0x12, 0xe7, 0x21, 0x89, 0x44, 0xd6, 0xed, 0x5c, 0x57, 0xc8, - 0x94, 0xbf, 0x73, 0xee, 0xae, 0x94, 0xec, 0xd4, 0x5b, 0xc9, 0xee, 0x3f, 0x4e, 0x44, 0xff, 0xc8, - 0x01, 0x9a, 0xd7, 0x07, 0xe8, 0x3d, 0xa8, 0x04, 0x9e, 0x63, 0xa4, 0x1f, 0x4e, 0xca, 0x81, 0xe7, - 0xf4, 0xc4, 0xdb, 0xc9, 0x3d, 0xf1, 0xcd, 0x65, 0xc6, 0x37, 0xbf, 0x28, 0xbe, 0x85, 0x3b, 0xe2, - 0x6b, 0xdf, 0x8e, 0xaf, 0x9a, 0xf9, 0x51, 0x34, 0xbf, 0x98, 0x95, 0x02, 0x5c, 0x7c, 0xdb, 0x01, - 0x3e, 0x86, 0x5a, 0xfa, 0x31, 0x81, 0x63, 0x63, 0x19, 0x52, 0x91, 0xf2, 0xe2, 0xfd, 0x74, 0x79, - 0x97, 0xf8, 0x59, 0x47, 0xf3, 0x73, 0xa8, 0xa6, 0x1e, 0x12, 0x56, 0x86, 0x63, 0xa8, 0xa6, 0x6a, - 0x18, 0xda, 0x02, 0x15, 0x4f, 0x4c, 0x2b, 0x7a, 0x07, 0xea, 0x3d, 0xd2, 0x65, 0x13, 0x69, 0x50, - 0xf4, 0x29, 0xbe, 0x74, 0x26, 0x92, 0xa1, 0xf7, 0x48, 0x8f, 0xda, 0x1c, 0x41, 0xf1, 0x10, 0x4f, - 0xe4, 0xf9, 0xe7, 0x08, 0xd1, 0xec, 0xd6, 0x00, 0x84, 0x5e, 0x33, 0xd8, 0xd4, 0xc7, 0xcd, 0x5f, - 0x2b, 0xd1, 0xab, 0x0f, 0xe6, 0xf1, 0x69, 0x40, 0xd9, 0x64, 0x0c, 0x8f, 0x7d, 0x71, 0x78, 0xf8, - 0x85, 0x4d, 0xda, 0xa8, 0x03, 0x8f, 0x7d, 0x4c, 0x0d, 0x46, 0xa7, 0x46, 0xfc, 0xb6, 0x91, 0xcb, - 0x7a, 0xdb, 0x58, 0xf3, 0x31, 0xbd, 0xa0, 0xd3, 0x8b, 0xe8, 0x85, 0x63, 0x9b, 0x7f, 0x95, 0x70, - 0x02, 0xe2, 0x45, 0xb7, 0x52, 0x3c, 0x5e, 0x4c, 0xcf, 0xbc, 0xe6, 0x1f, 0x73, 0x00, 0xb3, 0xa7, - 0x00, 0xf4, 0x01, 0xd4, 0x4c, 0xd7, 0x25, 0xd7, 0x06, 0xa1, 0xce, 0xd0, 0xf1, 0xa2, 0x93, 0x5c, - 0x15, 0x7d, 0x67, 0xa2, 0x8b, 0x9f, 0x43, 0x69, 0x22, 0xc5, 0x56, 0x7c, 0x8c, 0x25, 0xee, 0x85, - 0xec, 0x9b, 0x19, 0xdd, 0xa8, 0x94, 0x91, 0x51, 0x9c, 0xd3, 0x3f, 0x82, 0x75, 0x3c, 0xf1, 0xc9, - 0xad, 0x92, 0x58, 0xd1, 0xd7, 0x64, 0x6f, 0x6c, 0xb6, 0x0f, 0xa5, 0xb1, 0x39, 0x31, 0xcc, 0xa1, - 0x7c, 0xf7, 0x59, 0xb8, 0xf0, 0xe2, 0xd8, 0x9c, 0x74, 0x86, 0x18, 0x7d, 0x05, 0x1b, 0x72, 0x7e, - 0x8b, 0x62, 0x1b, 0x7b, 0xcc, 0x31, 0xdd, 0x20, 0x7a, 0x12, 0x6a, 0xcc, 0xa1, 0xbb, 0x84, 0xb8, - 0x2f, 0xf9, 0xf9, 0xd3, 0xeb, 0x02, 0x74, 0x32, 0xc3, 0x34, 0xff, 0xa0, 0x02, 0x9a, 0x7f, 0xb5, - 0x41, 0xcf, 0x40, 0xb5, 0xb1, 0x6b, 0x4e, 0x97, 0xf9, 0x68, 0x9c, 0x43, 0xb7, 0x4e, 0x39, 0x54, - 0x97, 0x0c, 0x9c, 0xca, 0x1c, 0xc4, 0xc9, 0x74, 0x65, 0xaa, 0x0e, 0x87, 0xea, 0x92, 0xa1, 0xf1, - 0xab, 0x1c, 0xa8, 0x82, 0x1b, 0xbd, 0x0f, 0x25, 0x1f, 0x53, 0x0b, 0x7b, 0xf2, 0xe0, 0xaa, 0xa2, - 0xb2, 0xc6, 0x5d, 0xe8, 0x08, 0xaa, 0x97, 0xce, 0x04, 0xdb, 0x86, 0x5c, 0x43, 0xd6, 0x71, 0xea, - 0x3d, 0xd2, 0x41, 0xd8, 0x4b, 0xee, 0x1e, 0x6c, 0xf0, 0x0d, 0xf2, 0x64, 0x88, 0x22, 0x8e, 0x7c, - 0x36, 0x47, 0x3d, 0x85, 0x92, 0x4c, 0x5d, 0x80, 0xc8, 0xa5, 0xd9, 0xe6, 0x2e, 0xaa, 0xeb, 0xe7, - 0xd2, 0x58, 0x4f, 0xa1, 0xba, 0x1b, 0xf0, 0x78, 0xc4, 0x98, 0x2f, 0xdd, 0x10, 0x77, 0xab, 0xf1, - 0x5a, 0x01, 0x55, 0xc4, 0x25, 0x23, 0x0c, 0x1f, 0x40, 0x55, 0x40, 0x03, 0x66, 0xb2, 0x30, 0x90, - 0x95, 0x92, 0xaf, 0x95, 0x77, 0xf6, 0x45, 0x1f, 0x37, 0x19, 0x52, 0xdf, 0x8a, 0x4d, 0xe2, 0x2b, - 0x0d, 0xbc, 0x73, 0x66, 0xc2, 0x01, 0xfb, 0x06, 0x16, 0xcf, 0x77, 0x85, 0xd8, 0x44, 0x74, 0x3e, - 0x11, 0x8f, 0x73, 0x6f, 0x63, 0x9d, 0x35, 0x00, 0x31, 0x81, 0x4c, 0x1f, 0x4f, 0xa1, 0x96, 0x7e, - 0x4a, 0xe6, 0xe9, 0xc8, 0x0b, 0xc7, 0x03, 0x4c, 0xc5, 0x3a, 0xd7, 0x78, 0x3a, 0x92, 0x6d, 0xb4, - 0x09, 0x05, 0xcf, 0x8c, 0xbe, 0xc4, 0xb8, 0x5f, 0xa2, 0xd5, 0x2d, 0xca, 0x02, 0xd3, 0xfc, 0x3a, - 0x94, 0xa2, 0xc9, 0x66, 0x19, 0x99, 0x33, 0x28, 0x51, 0x46, 0xee, 0xb6, 0xfe, 0xfa, 0x66, 0x47, - 0xf9, 0xfb, 0x9b, 0x1d, 0xe5, 0xf5, 0x9b, 0x1d, 0xe5, 0xa7, 0xbb, 0xd2, 0x67, 0x87, 0xb4, 0x4d, - 0xdf, 0x69, 0xdf, 0xf1, 0x0f, 0x8c, 0x41, 0x51, 0xec, 0xfc, 0xc1, 0xbf, 0x03, 0x00, 0x00, 0xff, - 0xff, 0x3d, 0x3a, 0x29, 0x1e, 0xde, 0x18, 0x00, 0x00, -} diff --git a/policy/v1beta1/cfg.pb.go b/policy/v1beta1/cfg.pb.go index 30d0befa927..331e46b523c 100644 --- a/policy/v1beta1/cfg.pb.go +++ b/policy/v1beta1/cfg.pb.go @@ -1,59 +1,22 @@ // Code generated by protoc-gen-gogo. DO NOT EDIT. // source: policy/v1beta1/cfg.proto -/* - Package v1beta1 is a generated protocol buffer package. - - It is generated from these files: - policy/v1beta1/cfg.proto - policy/v1beta1/http_response.proto - policy/v1beta1/type.proto - policy/v1beta1/value_type.proto - - It has these top-level messages: - AttributeManifest - Rule - Action - Instance - Handler - Connection - Sampling - RandomSampling - RateLimitSampling - FractionalPercent - Authentication - Tls - OAuth - Mutual - DirectHttpResponse - Value - IPAddress - Duration - TimeStamp - DNSName - EmailAddress - Uri -*/ package v1beta1 -import proto "github.com/gogo/protobuf/proto" -import fmt "fmt" -import math "math" -import _ "github.com/gogo/protobuf/gogoproto" -import google_protobuf1 "github.com/gogo/protobuf/types" -import _ "github.com/gogo/protobuf/types" - -import time "time" - -import strconv "strconv" - -import strings "strings" -import reflect "reflect" -import sortkeys "github.com/gogo/protobuf/sortkeys" - -import types "github.com/gogo/protobuf/types" - -import io "io" +import ( + fmt "fmt" + _ "github.com/gogo/protobuf/gogoproto" + proto "github.com/gogo/protobuf/proto" + github_com_gogo_protobuf_sortkeys "github.com/gogo/protobuf/sortkeys" + github_com_gogo_protobuf_types "github.com/gogo/protobuf/types" + types "github.com/gogo/protobuf/types" + io "io" + math "math" + reflect "reflect" + strconv "strconv" + strings "strings" + time "time" +) // Reference imports to suppress errors if they are not otherwise used. var _ = proto.Marshal @@ -84,6 +47,7 @@ var Rule_HeaderOperationTemplate_Operation_name = map[int32]string{ 1: "REMOVE", 2: "APPEND", } + var Rule_HeaderOperationTemplate_Operation_value = map[string]int32{ "REPLACE": 0, "REMOVE": 1, @@ -91,7 +55,7 @@ var Rule_HeaderOperationTemplate_Operation_value = map[string]int32{ } func (Rule_HeaderOperationTemplate_Operation) EnumDescriptor() ([]byte, []int) { - return fileDescriptorCfg, []int{1, 0, 0} + return fileDescriptor_dfb7777e81b6b919, []int{1, 0, 0} } // Fraction percentages support several fixed denominator values. @@ -112,13 +76,14 @@ var FractionalPercent_DenominatorType_name = map[int32]string{ 0: "HUNDRED", 1: "TEN_THOUSAND", } + var FractionalPercent_DenominatorType_value = map[string]int32{ "HUNDRED": 0, "TEN_THOUSAND": 1, } func (FractionalPercent_DenominatorType) EnumDescriptor() ([]byte, []int) { - return fileDescriptorCfg, []int{9, 0} + return fileDescriptor_dfb7777e81b6b919, []int{9, 0} } // AuthHeader specifies how to pass access token with authorization header. @@ -137,12 +102,15 @@ var Tls_AuthHeader_name = map[int32]string{ 0: "PLAIN", 1: "BEARER", } + var Tls_AuthHeader_value = map[string]int32{ "PLAIN": 0, "BEARER": 1, } -func (Tls_AuthHeader) EnumDescriptor() ([]byte, []int) { return fileDescriptorCfg, []int{11, 0} } +func (Tls_AuthHeader) EnumDescriptor() ([]byte, []int) { + return fileDescriptor_dfb7777e81b6b919, []int{11, 0} +} // AttributeManifest describes a set of Attributes produced by some component // of an Istio deployment. @@ -166,12 +134,40 @@ type AttributeManifest struct { // attributes are described at https://istio.io/docs/reference/attribute-vocabulary.html. // Attributes not in that list should be named with a component-specific suffix such as // request.count-my.component. - Attributes map[string]*AttributeManifest_AttributeInfo `protobuf:"bytes,3,rep,name=attributes" json:"attributes,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value"` + Attributes map[string]*AttributeManifest_AttributeInfo `protobuf:"bytes,3,rep,name=attributes,proto3" json:"attributes,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` } -func (m *AttributeManifest) Reset() { *m = AttributeManifest{} } -func (*AttributeManifest) ProtoMessage() {} -func (*AttributeManifest) Descriptor() ([]byte, []int) { return fileDescriptorCfg, []int{0} } +func (m *AttributeManifest) Reset() { *m = AttributeManifest{} } +func (*AttributeManifest) ProtoMessage() {} +func (*AttributeManifest) Descriptor() ([]byte, []int) { + return fileDescriptor_dfb7777e81b6b919, []int{0} +} +func (m *AttributeManifest) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *AttributeManifest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_AttributeManifest.Marshal(b, m, deterministic) + } else { + b = b[:cap(b)] + n, err := m.MarshalTo(b) + if err != nil { + return nil, err + } + return b[:n], nil + } +} +func (m *AttributeManifest) XXX_Merge(src proto.Message) { + xxx_messageInfo_AttributeManifest.Merge(m, src) +} +func (m *AttributeManifest) XXX_Size() int { + return m.Size() +} +func (m *AttributeManifest) XXX_DiscardUnknown() { + xxx_messageInfo_AttributeManifest.DiscardUnknown(m) +} + +var xxx_messageInfo_AttributeManifest proto.InternalMessageInfo func (m *AttributeManifest) GetRevision() string { if m != nil { @@ -245,8 +241,34 @@ type AttributeManifest_AttributeInfo struct { func (m *AttributeManifest_AttributeInfo) Reset() { *m = AttributeManifest_AttributeInfo{} } func (*AttributeManifest_AttributeInfo) ProtoMessage() {} func (*AttributeManifest_AttributeInfo) Descriptor() ([]byte, []int) { - return fileDescriptorCfg, []int{0, 0} + return fileDescriptor_dfb7777e81b6b919, []int{0, 0} +} +func (m *AttributeManifest_AttributeInfo) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *AttributeManifest_AttributeInfo) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_AttributeManifest_AttributeInfo.Marshal(b, m, deterministic) + } else { + b = b[:cap(b)] + n, err := m.MarshalTo(b) + if err != nil { + return nil, err + } + return b[:n], nil + } +} +func (m *AttributeManifest_AttributeInfo) XXX_Merge(src proto.Message) { + xxx_messageInfo_AttributeManifest_AttributeInfo.Merge(m, src) } +func (m *AttributeManifest_AttributeInfo) XXX_Size() int { + return m.Size() +} +func (m *AttributeManifest_AttributeInfo) XXX_DiscardUnknown() { + xxx_messageInfo_AttributeManifest_AttributeInfo.DiscardUnknown(m) +} + +var xxx_messageInfo_AttributeManifest_AttributeInfo proto.InternalMessageInfo func (m *AttributeManifest_AttributeInfo) GetDescription() string { if m != nil { @@ -289,25 +311,53 @@ type Rule struct { // * `attr1 == "20" && attr2 == "30"` logical AND, OR, and NOT are also available Match string `protobuf:"bytes,1,opt,name=match,proto3" json:"match,omitempty"` // Optional. The actions that will be executed when match evaluates to `true`. - Actions []*Action `protobuf:"bytes,2,rep,name=actions" json:"actions,omitempty"` + Actions []*Action `protobuf:"bytes,2,rep,name=actions,proto3" json:"actions,omitempty"` // Optional. Templatized operations on the request headers using values produced by the // rule actions. Require the check action result to be OK. - RequestHeaderOperations []*Rule_HeaderOperationTemplate `protobuf:"bytes,3,rep,name=request_header_operations,json=requestHeaderOperations" json:"request_header_operations,omitempty"` + RequestHeaderOperations []*Rule_HeaderOperationTemplate `protobuf:"bytes,3,rep,name=request_header_operations,json=requestHeaderOperations,proto3" json:"request_header_operations,omitempty"` // Optional. Templatized operations on the response headers using values produced by the // rule actions. Require the check action result to be OK. - ResponseHeaderOperations []*Rule_HeaderOperationTemplate `protobuf:"bytes,4,rep,name=response_header_operations,json=responseHeaderOperations" json:"response_header_operations,omitempty"` + ResponseHeaderOperations []*Rule_HeaderOperationTemplate `protobuf:"bytes,4,rep,name=response_header_operations,json=responseHeaderOperations,proto3" json:"response_header_operations,omitempty"` // $hide_from_docs // Optional. Provides the ability to add a sampling configuration for Mixer rules. This sampling // will limit the scenarios in which the `actions` of the rule are executed. The sampling will // only take place after a `match` predicate has evaluated to true. // // Default behavior is no sampling (the `actions` are executed for all requests). - Sampling *Sampling `protobuf:"bytes,5,opt,name=sampling" json:"sampling,omitempty"` + Sampling *Sampling `protobuf:"bytes,5,opt,name=sampling,proto3" json:"sampling,omitempty"` } -func (m *Rule) Reset() { *m = Rule{} } -func (*Rule) ProtoMessage() {} -func (*Rule) Descriptor() ([]byte, []int) { return fileDescriptorCfg, []int{1} } +func (m *Rule) Reset() { *m = Rule{} } +func (*Rule) ProtoMessage() {} +func (*Rule) Descriptor() ([]byte, []int) { + return fileDescriptor_dfb7777e81b6b919, []int{1} +} +func (m *Rule) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *Rule) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_Rule.Marshal(b, m, deterministic) + } else { + b = b[:cap(b)] + n, err := m.MarshalTo(b) + if err != nil { + return nil, err + } + return b[:n], nil + } +} +func (m *Rule) XXX_Merge(src proto.Message) { + xxx_messageInfo_Rule.Merge(m, src) +} +func (m *Rule) XXX_Size() int { + return m.Size() +} +func (m *Rule) XXX_DiscardUnknown() { + xxx_messageInfo_Rule.DiscardUnknown(m) +} + +var xxx_messageInfo_Rule proto.InternalMessageInfo func (m *Rule) GetMatch() string { if m != nil { @@ -363,7 +413,7 @@ type Rule_HeaderOperationTemplate struct { // Required. Header name literal value. Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"` // Optional. Header value expressions. - Values []string `protobuf:"bytes,2,rep,name=values" json:"values,omitempty"` + Values []string `protobuf:"bytes,2,rep,name=values,proto3" json:"values,omitempty"` // Optional. Header operation type. Default operation is to replace the value of the header by name. Operation Rule_HeaderOperationTemplate_Operation `protobuf:"varint,3,opt,name=operation,proto3,enum=istio.policy.v1beta1.Rule_HeaderOperationTemplate_Operation" json:"operation,omitempty"` } @@ -371,8 +421,34 @@ type Rule_HeaderOperationTemplate struct { func (m *Rule_HeaderOperationTemplate) Reset() { *m = Rule_HeaderOperationTemplate{} } func (*Rule_HeaderOperationTemplate) ProtoMessage() {} func (*Rule_HeaderOperationTemplate) Descriptor() ([]byte, []int) { - return fileDescriptorCfg, []int{1, 0} + return fileDescriptor_dfb7777e81b6b919, []int{1, 0} +} +func (m *Rule_HeaderOperationTemplate) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *Rule_HeaderOperationTemplate) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_Rule_HeaderOperationTemplate.Marshal(b, m, deterministic) + } else { + b = b[:cap(b)] + n, err := m.MarshalTo(b) + if err != nil { + return nil, err + } + return b[:n], nil + } +} +func (m *Rule_HeaderOperationTemplate) XXX_Merge(src proto.Message) { + xxx_messageInfo_Rule_HeaderOperationTemplate.Merge(m, src) +} +func (m *Rule_HeaderOperationTemplate) XXX_Size() int { + return m.Size() } +func (m *Rule_HeaderOperationTemplate) XXX_DiscardUnknown() { + xxx_messageInfo_Rule_HeaderOperationTemplate.DiscardUnknown(m) +} + +var xxx_messageInfo_Rule_HeaderOperationTemplate proto.InternalMessageInfo func (m *Rule_HeaderOperationTemplate) GetName() string { if m != nil { @@ -413,14 +489,42 @@ type Action struct { // [Instance][istio.policy.v1beta1.Instance.name]s. // Referenced instances are evaluated by resolving the attributes/literals for all the fields. // The constructed objects are then passed to the `handler` referenced within this action. - Instances []string `protobuf:"bytes,3,rep,name=instances" json:"instances,omitempty"` + Instances []string `protobuf:"bytes,3,rep,name=instances,proto3" json:"instances,omitempty"` // Optional. A handle to refer to the results of the action. Name string `protobuf:"bytes,4,opt,name=name,proto3" json:"name,omitempty"` } -func (m *Action) Reset() { *m = Action{} } -func (*Action) ProtoMessage() {} -func (*Action) Descriptor() ([]byte, []int) { return fileDescriptorCfg, []int{2} } +func (m *Action) Reset() { *m = Action{} } +func (*Action) ProtoMessage() {} +func (*Action) Descriptor() ([]byte, []int) { + return fileDescriptor_dfb7777e81b6b919, []int{2} +} +func (m *Action) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *Action) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_Action.Marshal(b, m, deterministic) + } else { + b = b[:cap(b)] + n, err := m.MarshalTo(b) + if err != nil { + return nil, err + } + return b[:n], nil + } +} +func (m *Action) XXX_Merge(src proto.Message) { + xxx_messageInfo_Action.Merge(m, src) +} +func (m *Action) XXX_Size() int { + return m.Size() +} +func (m *Action) XXX_DiscardUnknown() { + xxx_messageInfo_Action.DiscardUnknown(m) +} + +var xxx_messageInfo_Action proto.InternalMessageInfo func (m *Action) GetHandler() string { if m != nil { @@ -481,7 +585,7 @@ type Instance struct { Template string `protobuf:"bytes,2,opt,name=template,proto3" json:"template,omitempty"` // Required. Depends on referenced template. Struct representation of a // proto defined by the template; this varies depending on the value of field `template`. - Params *google_protobuf1.Struct `protobuf:"bytes,3,opt,name=params" json:"params,omitempty"` + Params *types.Struct `protobuf:"bytes,3,opt,name=params,proto3" json:"params,omitempty"` // Optional. Defines attribute bindings to map the output of attribute-producing adapters back into // the attribute space. The variable `output` refers to the output template instance produced // by the adapter. @@ -494,12 +598,40 @@ type Instance struct { // # Fill the new attributes from the adapter produced output // source.namespace: output.source_namespace // ``` - AttributeBindings map[string]string `protobuf:"bytes,4,rep,name=attribute_bindings,json=attributeBindings" json:"attribute_bindings,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` + AttributeBindings map[string]string `protobuf:"bytes,4,rep,name=attribute_bindings,json=attributeBindings,proto3" json:"attribute_bindings,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` } -func (m *Instance) Reset() { *m = Instance{} } -func (*Instance) ProtoMessage() {} -func (*Instance) Descriptor() ([]byte, []int) { return fileDescriptorCfg, []int{3} } +func (m *Instance) Reset() { *m = Instance{} } +func (*Instance) ProtoMessage() {} +func (*Instance) Descriptor() ([]byte, []int) { + return fileDescriptor_dfb7777e81b6b919, []int{3} +} +func (m *Instance) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *Instance) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_Instance.Marshal(b, m, deterministic) + } else { + b = b[:cap(b)] + n, err := m.MarshalTo(b) + if err != nil { + return nil, err + } + return b[:n], nil + } +} +func (m *Instance) XXX_Merge(src proto.Message) { + xxx_messageInfo_Instance.Merge(m, src) +} +func (m *Instance) XXX_Size() int { + return m.Size() +} +func (m *Instance) XXX_DiscardUnknown() { + xxx_messageInfo_Instance.DiscardUnknown(m) +} + +var xxx_messageInfo_Instance proto.InternalMessageInfo func (m *Instance) GetName() string { if m != nil { @@ -522,7 +654,7 @@ func (m *Instance) GetTemplate() string { return "" } -func (m *Instance) GetParams() *google_protobuf1.Struct { +func (m *Instance) GetParams() *types.Struct { if m != nil { return m.Params } @@ -604,15 +736,43 @@ type Handler struct { Adapter string `protobuf:"bytes,2,opt,name=adapter,proto3" json:"adapter,omitempty"` // Optional. Depends on adapter implementation. Struct representation of a // proto defined by the adapter implementation; this varies depending on the value of field `adapter`. - Params *google_protobuf1.Struct `protobuf:"bytes,3,opt,name=params" json:"params,omitempty"` + Params *types.Struct `protobuf:"bytes,3,opt,name=params,proto3" json:"params,omitempty"` // Optional. Information on how to connect to the out-of-process adapter. // This is used if the adapter is not compiled into Mixer binary and is running as a separate process. - Connection *Connection `protobuf:"bytes,4,opt,name=connection" json:"connection,omitempty"` + Connection *Connection `protobuf:"bytes,4,opt,name=connection,proto3" json:"connection,omitempty"` } -func (m *Handler) Reset() { *m = Handler{} } -func (*Handler) ProtoMessage() {} -func (*Handler) Descriptor() ([]byte, []int) { return fileDescriptorCfg, []int{4} } +func (m *Handler) Reset() { *m = Handler{} } +func (*Handler) ProtoMessage() {} +func (*Handler) Descriptor() ([]byte, []int) { + return fileDescriptor_dfb7777e81b6b919, []int{4} +} +func (m *Handler) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *Handler) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_Handler.Marshal(b, m, deterministic) + } else { + b = b[:cap(b)] + n, err := m.MarshalTo(b) + if err != nil { + return nil, err + } + return b[:n], nil + } +} +func (m *Handler) XXX_Merge(src proto.Message) { + xxx_messageInfo_Handler.Merge(m, src) +} +func (m *Handler) XXX_Size() int { + return m.Size() +} +func (m *Handler) XXX_DiscardUnknown() { + xxx_messageInfo_Handler.DiscardUnknown(m) +} + +var xxx_messageInfo_Handler proto.InternalMessageInfo func (m *Handler) GetName() string { if m != nil { @@ -635,7 +795,7 @@ func (m *Handler) GetAdapter() string { return "" } -func (m *Handler) GetParams() *google_protobuf1.Struct { +func (m *Handler) GetParams() *types.Struct { if m != nil { return m.Params } @@ -655,15 +815,43 @@ type Connection struct { // The address of the backend. Address string `protobuf:"bytes,2,opt,name=address,proto3" json:"address,omitempty"` // Timeout for remote calls to the backend. - Timeout *time.Duration `protobuf:"bytes,3,opt,name=timeout,stdduration" json:"timeout,omitempty"` + Timeout *time.Duration `protobuf:"bytes,3,opt,name=timeout,proto3,stdduration" json:"timeout,omitempty"` // Auth config for the connection to the backend. If omitted, plain text will // be used. - Authentication *Authentication `protobuf:"bytes,4,opt,name=authentication" json:"authentication,omitempty"` + Authentication *Authentication `protobuf:"bytes,4,opt,name=authentication,proto3" json:"authentication,omitempty"` +} + +func (m *Connection) Reset() { *m = Connection{} } +func (*Connection) ProtoMessage() {} +func (*Connection) Descriptor() ([]byte, []int) { + return fileDescriptor_dfb7777e81b6b919, []int{5} +} +func (m *Connection) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *Connection) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_Connection.Marshal(b, m, deterministic) + } else { + b = b[:cap(b)] + n, err := m.MarshalTo(b) + if err != nil { + return nil, err + } + return b[:n], nil + } +} +func (m *Connection) XXX_Merge(src proto.Message) { + xxx_messageInfo_Connection.Merge(m, src) +} +func (m *Connection) XXX_Size() int { + return m.Size() +} +func (m *Connection) XXX_DiscardUnknown() { + xxx_messageInfo_Connection.DiscardUnknown(m) } -func (m *Connection) Reset() { *m = Connection{} } -func (*Connection) ProtoMessage() {} -func (*Connection) Descriptor() ([]byte, []int) { return fileDescriptorCfg, []int{5} } +var xxx_messageInfo_Connection proto.InternalMessageInfo func (m *Connection) GetAddress() string { if m != nil { @@ -692,15 +880,43 @@ func (m *Connection) GetAuthentication() *Authentication { // a request must be selected by all configured sampling strategies. type Sampling struct { // Optional. Provides filtering of actions based on random selection per request. - Random *RandomSampling `protobuf:"bytes,1,opt,name=random" json:"random,omitempty"` + Random *RandomSampling `protobuf:"bytes,1,opt,name=random,proto3" json:"random,omitempty"` // Optional. Provides filtering of actions based on number of requests observed within // a configured time window. - RateLimit *RateLimitSampling `protobuf:"bytes,2,opt,name=rate_limit,json=rateLimit" json:"rate_limit,omitempty"` + RateLimit *RateLimitSampling `protobuf:"bytes,2,opt,name=rate_limit,json=rateLimit,proto3" json:"rate_limit,omitempty"` } -func (m *Sampling) Reset() { *m = Sampling{} } -func (*Sampling) ProtoMessage() {} -func (*Sampling) Descriptor() ([]byte, []int) { return fileDescriptorCfg, []int{6} } +func (m *Sampling) Reset() { *m = Sampling{} } +func (*Sampling) ProtoMessage() {} +func (*Sampling) Descriptor() ([]byte, []int) { + return fileDescriptor_dfb7777e81b6b919, []int{6} +} +func (m *Sampling) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *Sampling) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_Sampling.Marshal(b, m, deterministic) + } else { + b = b[:cap(b)] + n, err := m.MarshalTo(b) + if err != nil { + return nil, err + } + return b[:n], nil + } +} +func (m *Sampling) XXX_Merge(src proto.Message) { + xxx_messageInfo_Sampling.Merge(m, src) +} +func (m *Sampling) XXX_Size() int { + return m.Size() +} +func (m *Sampling) XXX_DiscardUnknown() { + xxx_messageInfo_Sampling.DiscardUnknown(m) +} + +var xxx_messageInfo_Sampling proto.InternalMessageInfo func (m *Sampling) GetRandom() *RandomSampling { if m != nil { @@ -732,7 +948,7 @@ type RandomSampling struct { AttributeExpression string `protobuf:"bytes,1,opt,name=attribute_expression,json=attributeExpression,proto3" json:"attribute_expression,omitempty"` // The default sampling rate, expressed as a percentage. Defaults to 0% with a denominator // of 100. - PercentSampled *FractionalPercent `protobuf:"bytes,2,opt,name=percent_sampled,json=percentSampled" json:"percent_sampled,omitempty"` + PercentSampled *FractionalPercent `protobuf:"bytes,2,opt,name=percent_sampled,json=percentSampled,proto3" json:"percent_sampled,omitempty"` // By default sampling will be based on the value of the request header `x-request-id`. // This behavior will cause consistent sampling across `Rule`s and for the full trace of a // request through a mesh (across hosts). If that value is not present and/or @@ -742,9 +958,37 @@ type RandomSampling struct { UseIndependentRandomness bool `protobuf:"varint,3,opt,name=use_independent_randomness,json=useIndependentRandomness,proto3" json:"use_independent_randomness,omitempty"` } -func (m *RandomSampling) Reset() { *m = RandomSampling{} } -func (*RandomSampling) ProtoMessage() {} -func (*RandomSampling) Descriptor() ([]byte, []int) { return fileDescriptorCfg, []int{7} } +func (m *RandomSampling) Reset() { *m = RandomSampling{} } +func (*RandomSampling) ProtoMessage() {} +func (*RandomSampling) Descriptor() ([]byte, []int) { + return fileDescriptor_dfb7777e81b6b919, []int{7} +} +func (m *RandomSampling) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *RandomSampling) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_RandomSampling.Marshal(b, m, deterministic) + } else { + b = b[:cap(b)] + n, err := m.MarshalTo(b) + if err != nil { + return nil, err + } + return b[:n], nil + } +} +func (m *RandomSampling) XXX_Merge(src proto.Message) { + xxx_messageInfo_RandomSampling.Merge(m, src) +} +func (m *RandomSampling) XXX_Size() int { + return m.Size() +} +func (m *RandomSampling) XXX_DiscardUnknown() { + xxx_messageInfo_RandomSampling.DiscardUnknown(m) +} + +var xxx_messageInfo_RandomSampling proto.InternalMessageInfo func (m *RandomSampling) GetAttributeExpression() string { if m != nil { @@ -772,7 +1016,7 @@ func (m *RandomSampling) GetUseIndependentRandomness() bool { // occur over a period of time. type RateLimitSampling struct { // Window in which to enforce the sampling rate. - SamplingDuration time.Duration `protobuf:"bytes,1,opt,name=sampling_duration,json=samplingDuration,stdduration" json:"sampling_duration"` + SamplingDuration time.Duration `protobuf:"bytes,1,opt,name=sampling_duration,json=samplingDuration,proto3,stdduration" json:"sampling_duration"` // Number of entries to allow during the `sampling_duration` before sampling is enforced. MaxUnsampledEntries int64 `protobuf:"varint,2,opt,name=max_unsampled_entries,json=maxUnsampledEntries,proto3" json:"max_unsampled_entries,omitempty"` // The rate at which to sample entries once the unsampled limit has been reached. Sampling will be enforced @@ -780,9 +1024,37 @@ type RateLimitSampling struct { SamplingRate int64 `protobuf:"varint,3,opt,name=sampling_rate,json=samplingRate,proto3" json:"sampling_rate,omitempty"` } -func (m *RateLimitSampling) Reset() { *m = RateLimitSampling{} } -func (*RateLimitSampling) ProtoMessage() {} -func (*RateLimitSampling) Descriptor() ([]byte, []int) { return fileDescriptorCfg, []int{8} } +func (m *RateLimitSampling) Reset() { *m = RateLimitSampling{} } +func (*RateLimitSampling) ProtoMessage() {} +func (*RateLimitSampling) Descriptor() ([]byte, []int) { + return fileDescriptor_dfb7777e81b6b919, []int{8} +} +func (m *RateLimitSampling) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *RateLimitSampling) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_RateLimitSampling.Marshal(b, m, deterministic) + } else { + b = b[:cap(b)] + n, err := m.MarshalTo(b) + if err != nil { + return nil, err + } + return b[:n], nil + } +} +func (m *RateLimitSampling) XXX_Merge(src proto.Message) { + xxx_messageInfo_RateLimitSampling.Merge(m, src) +} +func (m *RateLimitSampling) XXX_Size() int { + return m.Size() +} +func (m *RateLimitSampling) XXX_DiscardUnknown() { + xxx_messageInfo_RateLimitSampling.DiscardUnknown(m) +} + +var xxx_messageInfo_RateLimitSampling proto.InternalMessageInfo func (m *RateLimitSampling) GetSamplingDuration() time.Duration { if m != nil { @@ -820,9 +1092,37 @@ type FractionalPercent struct { Denominator FractionalPercent_DenominatorType `protobuf:"varint,2,opt,name=denominator,proto3,enum=istio.policy.v1beta1.FractionalPercent_DenominatorType" json:"denominator,omitempty"` } -func (m *FractionalPercent) Reset() { *m = FractionalPercent{} } -func (*FractionalPercent) ProtoMessage() {} -func (*FractionalPercent) Descriptor() ([]byte, []int) { return fileDescriptorCfg, []int{9} } +func (m *FractionalPercent) Reset() { *m = FractionalPercent{} } +func (*FractionalPercent) ProtoMessage() {} +func (*FractionalPercent) Descriptor() ([]byte, []int) { + return fileDescriptor_dfb7777e81b6b919, []int{9} +} +func (m *FractionalPercent) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *FractionalPercent) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_FractionalPercent.Marshal(b, m, deterministic) + } else { + b = b[:cap(b)] + n, err := m.MarshalTo(b) + if err != nil { + return nil, err + } + return b[:n], nil + } +} +func (m *FractionalPercent) XXX_Merge(src proto.Message) { + xxx_messageInfo_FractionalPercent.Merge(m, src) +} +func (m *FractionalPercent) XXX_Size() int { + return m.Size() +} +func (m *FractionalPercent) XXX_DiscardUnknown() { + xxx_messageInfo_FractionalPercent.DiscardUnknown(m) +} + +var xxx_messageInfo_FractionalPercent proto.InternalMessageInfo func (m *FractionalPercent) GetNumerator() uint32 { if m != nil { @@ -847,9 +1147,37 @@ type Authentication struct { AuthType isAuthentication_AuthType `protobuf_oneof:"auth_type"` } -func (m *Authentication) Reset() { *m = Authentication{} } -func (*Authentication) ProtoMessage() {} -func (*Authentication) Descriptor() ([]byte, []int) { return fileDescriptorCfg, []int{10} } +func (m *Authentication) Reset() { *m = Authentication{} } +func (*Authentication) ProtoMessage() {} +func (*Authentication) Descriptor() ([]byte, []int) { + return fileDescriptor_dfb7777e81b6b919, []int{10} +} +func (m *Authentication) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *Authentication) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_Authentication.Marshal(b, m, deterministic) + } else { + b = b[:cap(b)] + n, err := m.MarshalTo(b) + if err != nil { + return nil, err + } + return b[:n], nil + } +} +func (m *Authentication) XXX_Merge(src proto.Message) { + xxx_messageInfo_Authentication.Merge(m, src) +} +func (m *Authentication) XXX_Size() int { + return m.Size() +} +func (m *Authentication) XXX_DiscardUnknown() { + xxx_messageInfo_Authentication.DiscardUnknown(m) +} + +var xxx_messageInfo_Authentication proto.InternalMessageInfo type isAuthentication_AuthType interface { isAuthentication_AuthType() @@ -859,10 +1187,10 @@ type isAuthentication_AuthType interface { } type Authentication_Tls struct { - Tls *Tls `protobuf:"bytes,1,opt,name=tls,oneof"` + Tls *Tls `protobuf:"bytes,1,opt,name=tls,proto3,oneof"` } type Authentication_Mutual struct { - Mutual *Mutual `protobuf:"bytes,2,opt,name=mutual,oneof"` + Mutual *Mutual `protobuf:"bytes,2,opt,name=mutual,proto3,oneof"` } func (*Authentication_Tls) isAuthentication_AuthType() {} @@ -948,12 +1276,12 @@ func _Authentication_OneofSizer(msg proto.Message) (n int) { switch x := m.AuthType.(type) { case *Authentication_Tls: s := proto.Size(x.Tls) - n += proto.SizeVarint(1<<3 | proto.WireBytes) + n += 1 // tag and wire n += proto.SizeVarint(uint64(s)) n += s case *Authentication_Mutual: s := proto.Size(x.Mutual) - n += proto.SizeVarint(2<<3 | proto.WireBytes) + n += 1 // tag and wire n += proto.SizeVarint(uint64(s)) n += s case nil: @@ -986,9 +1314,37 @@ type Tls struct { ServerName string `protobuf:"bytes,6,opt,name=server_name,json=serverName,proto3" json:"server_name,omitempty"` } -func (m *Tls) Reset() { *m = Tls{} } -func (*Tls) ProtoMessage() {} -func (*Tls) Descriptor() ([]byte, []int) { return fileDescriptorCfg, []int{11} } +func (m *Tls) Reset() { *m = Tls{} } +func (*Tls) ProtoMessage() {} +func (*Tls) Descriptor() ([]byte, []int) { + return fileDescriptor_dfb7777e81b6b919, []int{11} +} +func (m *Tls) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *Tls) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_Tls.Marshal(b, m, deterministic) + } else { + b = b[:cap(b)] + n, err := m.MarshalTo(b) + if err != nil { + return nil, err + } + return b[:n], nil + } +} +func (m *Tls) XXX_Merge(src proto.Message) { + xxx_messageInfo_Tls.Merge(m, src) +} +func (m *Tls) XXX_Size() int { + return m.Size() +} +func (m *Tls) XXX_DiscardUnknown() { + xxx_messageInfo_Tls.DiscardUnknown(m) +} + +var xxx_messageInfo_Tls proto.InternalMessageInfo type isTls_TokenSource interface { isTls_TokenSource() @@ -1007,7 +1363,7 @@ type Tls_TokenPath struct { TokenPath string `protobuf:"bytes,2,opt,name=token_path,json=tokenPath,proto3,oneof"` } type Tls_Oauth struct { - Oauth *OAuth `protobuf:"bytes,3,opt,name=oauth,oneof"` + Oauth *OAuth `protobuf:"bytes,3,opt,name=oauth,proto3,oneof"` } type Tls_AuthHeader_ struct { AuthHeader Tls_AuthHeader `protobuf:"varint,4,opt,name=auth_header,json=authHeader,proto3,enum=istio.policy.v1beta1.Tls_AuthHeader,oneof"` @@ -1159,12 +1515,12 @@ func _Tls_OneofSizer(msg proto.Message) (n int) { // token_source switch x := m.TokenSource.(type) { case *Tls_TokenPath: - n += proto.SizeVarint(2<<3 | proto.WireBytes) + n += 1 // tag and wire n += proto.SizeVarint(uint64(len(x.TokenPath))) n += len(x.TokenPath) case *Tls_Oauth: s := proto.Size(x.Oauth) - n += proto.SizeVarint(3<<3 | proto.WireBytes) + n += 1 // tag and wire n += proto.SizeVarint(uint64(s)) n += s case nil: @@ -1174,10 +1530,10 @@ func _Tls_OneofSizer(msg proto.Message) (n int) { // token_type switch x := m.TokenType.(type) { case *Tls_AuthHeader_: - n += proto.SizeVarint(4<<3 | proto.WireVarint) + n += 1 // tag and wire n += proto.SizeVarint(uint64(x.AuthHeader)) case *Tls_CustomHeader: - n += proto.SizeVarint(5<<3 | proto.WireBytes) + n += 1 // tag and wire n += proto.SizeVarint(uint64(len(x.CustomHeader))) n += len(x.CustomHeader) case nil: @@ -1197,14 +1553,42 @@ type OAuth struct { // REQUIRED. The Resource server's token endpoint URL. TokenUrl string `protobuf:"bytes,3,opt,name=token_url,json=tokenUrl,proto3" json:"token_url,omitempty"` // List of requested permissions. - Scopes []string `protobuf:"bytes,4,rep,name=scopes" json:"scopes,omitempty"` + Scopes []string `protobuf:"bytes,4,rep,name=scopes,proto3" json:"scopes,omitempty"` // Additional parameters for requests to the token endpoint. - EndpointParams map[string]string `protobuf:"bytes,5,rep,name=endpoint_params,json=endpointParams" json:"endpoint_params,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` + EndpointParams map[string]string `protobuf:"bytes,5,rep,name=endpoint_params,json=endpointParams,proto3" json:"endpoint_params,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` } -func (m *OAuth) Reset() { *m = OAuth{} } -func (*OAuth) ProtoMessage() {} -func (*OAuth) Descriptor() ([]byte, []int) { return fileDescriptorCfg, []int{12} } +func (m *OAuth) Reset() { *m = OAuth{} } +func (*OAuth) ProtoMessage() {} +func (*OAuth) Descriptor() ([]byte, []int) { + return fileDescriptor_dfb7777e81b6b919, []int{12} +} +func (m *OAuth) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *OAuth) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_OAuth.Marshal(b, m, deterministic) + } else { + b = b[:cap(b)] + n, err := m.MarshalTo(b) + if err != nil { + return nil, err + } + return b[:n], nil + } +} +func (m *OAuth) XXX_Merge(src proto.Message) { + xxx_messageInfo_OAuth.Merge(m, src) +} +func (m *OAuth) XXX_Size() int { + return m.Size() +} +func (m *OAuth) XXX_DiscardUnknown() { + xxx_messageInfo_OAuth.DiscardUnknown(m) +} + +var xxx_messageInfo_OAuth proto.InternalMessageInfo func (m *OAuth) GetClientId() string { if m != nil { @@ -1259,9 +1643,37 @@ type Mutual struct { ServerName string `protobuf:"bytes,4,opt,name=server_name,json=serverName,proto3" json:"server_name,omitempty"` } -func (m *Mutual) Reset() { *m = Mutual{} } -func (*Mutual) ProtoMessage() {} -func (*Mutual) Descriptor() ([]byte, []int) { return fileDescriptorCfg, []int{13} } +func (m *Mutual) Reset() { *m = Mutual{} } +func (*Mutual) ProtoMessage() {} +func (*Mutual) Descriptor() ([]byte, []int) { + return fileDescriptor_dfb7777e81b6b919, []int{13} +} +func (m *Mutual) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *Mutual) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_Mutual.Marshal(b, m, deterministic) + } else { + b = b[:cap(b)] + n, err := m.MarshalTo(b) + if err != nil { + return nil, err + } + return b[:n], nil + } +} +func (m *Mutual) XXX_Merge(src proto.Message) { + xxx_messageInfo_Mutual.Merge(m, src) +} +func (m *Mutual) XXX_Size() int { + return m.Size() +} +func (m *Mutual) XXX_DiscardUnknown() { + xxx_messageInfo_Mutual.DiscardUnknown(m) +} + +var xxx_messageInfo_Mutual proto.InternalMessageInfo func (m *Mutual) GetPrivateKey() string { if m != nil { @@ -1292,12 +1704,17 @@ func (m *Mutual) GetServerName() string { } func init() { + proto.RegisterEnum("istio.policy.v1beta1.Rule_HeaderOperationTemplate_Operation", Rule_HeaderOperationTemplate_Operation_name, Rule_HeaderOperationTemplate_Operation_value) + proto.RegisterEnum("istio.policy.v1beta1.FractionalPercent_DenominatorType", FractionalPercent_DenominatorType_name, FractionalPercent_DenominatorType_value) + proto.RegisterEnum("istio.policy.v1beta1.Tls_AuthHeader", Tls_AuthHeader_name, Tls_AuthHeader_value) proto.RegisterType((*AttributeManifest)(nil), "istio.policy.v1beta1.AttributeManifest") + proto.RegisterMapType((map[string]*AttributeManifest_AttributeInfo)(nil), "istio.policy.v1beta1.AttributeManifest.AttributesEntry") proto.RegisterType((*AttributeManifest_AttributeInfo)(nil), "istio.policy.v1beta1.AttributeManifest.AttributeInfo") proto.RegisterType((*Rule)(nil), "istio.policy.v1beta1.Rule") proto.RegisterType((*Rule_HeaderOperationTemplate)(nil), "istio.policy.v1beta1.Rule.HeaderOperationTemplate") proto.RegisterType((*Action)(nil), "istio.policy.v1beta1.Action") proto.RegisterType((*Instance)(nil), "istio.policy.v1beta1.Instance") + proto.RegisterMapType((map[string]string)(nil), "istio.policy.v1beta1.Instance.AttributeBindingsEntry") proto.RegisterType((*Handler)(nil), "istio.policy.v1beta1.Handler") proto.RegisterType((*Connection)(nil), "istio.policy.v1beta1.Connection") proto.RegisterType((*Sampling)(nil), "istio.policy.v1beta1.Sampling") @@ -1307,11 +1724,111 @@ func init() { proto.RegisterType((*Authentication)(nil), "istio.policy.v1beta1.Authentication") proto.RegisterType((*Tls)(nil), "istio.policy.v1beta1.Tls") proto.RegisterType((*OAuth)(nil), "istio.policy.v1beta1.OAuth") + proto.RegisterMapType((map[string]string)(nil), "istio.policy.v1beta1.OAuth.EndpointParamsEntry") proto.RegisterType((*Mutual)(nil), "istio.policy.v1beta1.Mutual") - proto.RegisterEnum("istio.policy.v1beta1.Rule_HeaderOperationTemplate_Operation", Rule_HeaderOperationTemplate_Operation_name, Rule_HeaderOperationTemplate_Operation_value) - proto.RegisterEnum("istio.policy.v1beta1.FractionalPercent_DenominatorType", FractionalPercent_DenominatorType_name, FractionalPercent_DenominatorType_value) - proto.RegisterEnum("istio.policy.v1beta1.Tls_AuthHeader", Tls_AuthHeader_name, Tls_AuthHeader_value) } + +func init() { proto.RegisterFile("policy/v1beta1/cfg.proto", fileDescriptor_dfb7777e81b6b919) } + +var fileDescriptor_dfb7777e81b6b919 = []byte{ + // 1519 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x57, 0xcf, 0x6f, 0x13, 0xc7, + 0x17, 0xf7, 0xc6, 0xb1, 0x13, 0x3f, 0x27, 0x8e, 0x33, 0xe4, 0x0b, 0xc6, 0x20, 0x27, 0x32, 0xdf, + 0xaf, 0xe0, 0xf0, 0xc5, 0x86, 0xa0, 0x42, 0x8b, 0x50, 0x55, 0x87, 0x98, 0x3a, 0x22, 0x24, 0xee, + 0xc4, 0xa1, 0x2d, 0x97, 0xd5, 0x64, 0x77, 0x92, 0xac, 0x58, 0xcf, 0x2e, 0xbb, 0xb3, 0x11, 0xb9, + 0xf5, 0xd0, 0xde, 0x39, 0x56, 0xea, 0xad, 0xa7, 0xf6, 0xd4, 0xff, 0xa0, 0xd7, 0x72, 0x44, 0xe2, + 0x92, 0x53, 0x5b, 0xc2, 0xa5, 0x97, 0x4a, 0x1c, 0xfa, 0x07, 0x54, 0xf3, 0x63, 0x77, 0x1d, 0xc7, + 0x46, 0x4d, 0x6f, 0x3b, 0xef, 0x7d, 0xde, 0xef, 0x37, 0xef, 0xcd, 0x42, 0xc5, 0xf7, 0x5c, 0xc7, + 0x3a, 0x6c, 0x1e, 0xdc, 0xdc, 0xa1, 0x9c, 0xdc, 0x6c, 0x5a, 0xbb, 0x7b, 0x0d, 0x3f, 0xf0, 0xb8, + 0x87, 0x16, 0x9c, 0x90, 0x3b, 0x5e, 0x43, 0xf1, 0x1b, 0x9a, 0x5f, 0x5d, 0xd8, 0xf3, 0xf6, 0x3c, + 0x09, 0x68, 0x8a, 0x2f, 0x85, 0xad, 0x5e, 0xde, 0xf3, 0xbc, 0x3d, 0x97, 0x36, 0xe5, 0x69, 0x27, + 0xda, 0x6d, 0x86, 0x3c, 0x88, 0x2c, 0xae, 0xb9, 0xb5, 0x61, 0xae, 0x1d, 0x05, 0x84, 0x3b, 0x1e, + 0xd3, 0xfc, 0xc5, 0x21, 0x1f, 0x0e, 0x88, 0x1b, 0x51, 0x93, 0x1f, 0xfa, 0x54, 0x01, 0xea, 0xdf, + 0x64, 0x61, 0xbe, 0xc5, 0x79, 0xe0, 0xec, 0x44, 0x9c, 0x3e, 0x22, 0xcc, 0xd9, 0xa5, 0x21, 0x47, + 0x55, 0x98, 0x0e, 0xe8, 0x81, 0x13, 0x3a, 0x1e, 0xab, 0x18, 0x4b, 0xc6, 0xb5, 0x02, 0x4e, 0xce, + 0x08, 0xc1, 0x24, 0x23, 0x7d, 0x5a, 0x99, 0x90, 0x74, 0xf9, 0x8d, 0x3e, 0x07, 0x20, 0xb1, 0x92, + 0xb0, 0x92, 0x5d, 0xca, 0x5e, 0x2b, 0x2e, 0xdf, 0x69, 0x8c, 0x8a, 0xb2, 0x71, 0xca, 0x58, 0x4a, + 0x09, 0xdb, 0x8c, 0x07, 0x87, 0x78, 0x40, 0x55, 0xf5, 0x19, 0xcc, 0x26, 0xec, 0x35, 0xb6, 0xeb, + 0xa1, 0x25, 0x28, 0xda, 0x34, 0xb4, 0x02, 0xc7, 0xe7, 0xa9, 0x73, 0x83, 0x24, 0xf4, 0x31, 0x40, + 0x1a, 0xa5, 0xf4, 0xb2, 0xb4, 0xbc, 0x38, 0xda, 0x97, 0xc7, 0x02, 0xd7, 0x3b, 0xf4, 0x29, 0x2e, + 0x1c, 0xc4, 0x9f, 0x55, 0x0e, 0x73, 0x43, 0x1e, 0xa1, 0x32, 0x64, 0x9f, 0xd2, 0x43, 0x6d, 0x4c, + 0x7c, 0xa2, 0x87, 0x90, 0x93, 0x12, 0x52, 0x7f, 0x71, 0xf9, 0x83, 0x33, 0xc7, 0x2a, 0x82, 0xc1, + 0x4a, 0xc7, 0xdd, 0x89, 0x0f, 0x8d, 0xfa, 0xcb, 0x49, 0x98, 0xc4, 0x91, 0x4b, 0xd1, 0x02, 0xe4, + 0xfa, 0x84, 0x5b, 0xfb, 0xda, 0x9a, 0x3a, 0xa0, 0xdb, 0x30, 0x45, 0x2c, 0x11, 0x5e, 0x58, 0x99, + 0x90, 0xd9, 0xbd, 0x3c, 0xc6, 0xa2, 0x04, 0xe1, 0x18, 0x8c, 0x18, 0x5c, 0x0c, 0xe8, 0xb3, 0x88, + 0x86, 0xdc, 0xdc, 0xa7, 0xc4, 0xa6, 0x81, 0xe9, 0xf9, 0x54, 0x75, 0x48, 0x5c, 0xa7, 0xe5, 0xd1, + 0x9a, 0x84, 0x33, 0x8d, 0x8e, 0x94, 0xd9, 0x8c, 0x45, 0x7a, 0xb4, 0xef, 0xbb, 0x84, 0x53, 0x7c, + 0x41, 0x2b, 0x1d, 0xe2, 0x87, 0xc8, 0x87, 0x6a, 0x40, 0x43, 0xdf, 0x63, 0x21, 0x1d, 0x61, 0x70, + 0xf2, 0x5f, 0x1b, 0xac, 0xc4, 0x5a, 0x4f, 0x59, 0xbc, 0x0b, 0xd3, 0x21, 0xe9, 0xfb, 0xae, 0xc3, + 0xf6, 0x2a, 0x39, 0x59, 0x8c, 0xda, 0x68, 0xfd, 0x5b, 0x1a, 0x85, 0x13, 0x7c, 0xf5, 0xb5, 0x01, + 0x17, 0xc6, 0x58, 0x4c, 0xda, 0xdc, 0x18, 0x68, 0xf3, 0xf3, 0x90, 0x97, 0x15, 0x53, 0x45, 0x28, + 0x60, 0x7d, 0x42, 0x4f, 0xa0, 0x90, 0x44, 0x59, 0xc9, 0xca, 0x8e, 0xbb, 0x77, 0xf6, 0x20, 0x1b, + 0x09, 0x05, 0xa7, 0xea, 0xea, 0x37, 0xa0, 0x90, 0xd0, 0x51, 0x11, 0xa6, 0x70, 0xbb, 0xbb, 0xde, + 0xba, 0xdf, 0x2e, 0x67, 0x10, 0x40, 0x1e, 0xb7, 0x1f, 0x6d, 0x3e, 0x6e, 0x97, 0x0d, 0xf1, 0xdd, + 0xea, 0x76, 0xdb, 0x1b, 0xab, 0xe5, 0x89, 0x7a, 0x0f, 0xf2, 0xaa, 0x0d, 0x50, 0x05, 0xa6, 0xf6, + 0x09, 0xb3, 0x5d, 0x1a, 0xe8, 0xdb, 0x1a, 0x1f, 0xd1, 0x65, 0x28, 0x38, 0x2c, 0xe4, 0x84, 0x59, + 0xfa, 0xbe, 0x16, 0x70, 0x4a, 0x48, 0x62, 0x9f, 0x4c, 0x63, 0xaf, 0xff, 0x32, 0x01, 0xd3, 0x6b, + 0x1a, 0x31, 0x32, 0x39, 0x0d, 0x98, 0xb7, 0xbc, 0xbe, 0xef, 0xb8, 0xd4, 0x36, 0xb9, 0x0e, 0xa9, + 0xf2, 0xd7, 0x9f, 0x3f, 0x2e, 0x49, 0x4c, 0x39, 0xe6, 0x25, 0x09, 0xae, 0xc2, 0x74, 0x02, 0x53, + 0xde, 0x25, 0x67, 0xd4, 0x84, 0xbc, 0x4f, 0x02, 0xd2, 0x0f, 0x65, 0x36, 0x8b, 0xcb, 0x17, 0x1a, + 0x6a, 0xce, 0x35, 0xe2, 0x39, 0xd7, 0xd8, 0x92, 0x53, 0x10, 0x6b, 0x18, 0xb2, 0x01, 0x25, 0x53, + 0xc3, 0xdc, 0x71, 0x98, 0xed, 0xb0, 0xbd, 0xb8, 0xdf, 0xc6, 0x5c, 0xce, 0x38, 0x98, 0xf4, 0x4e, + 0xae, 0x68, 0x39, 0x35, 0x86, 0xe6, 0xc9, 0x30, 0xbd, 0xba, 0x0a, 0xe7, 0x47, 0x83, 0x47, 0x4c, + 0x88, 0x85, 0xc1, 0x09, 0x51, 0x18, 0xbc, 0xea, 0x47, 0x06, 0x4c, 0x75, 0x74, 0x1d, 0x46, 0x25, + 0xf2, 0xff, 0x90, 0x24, 0xcb, 0x24, 0x36, 0xf1, 0x39, 0x0d, 0xd2, 0x3c, 0xce, 0xc5, 0xac, 0x96, + 0xe2, 0x88, 0x1a, 0xc7, 0x20, 0x5d, 0x63, 0x7d, 0x3c, 0x7b, 0x12, 0x3f, 0x01, 0xb0, 0x3c, 0xc6, + 0xa8, 0x6c, 0x1e, 0x59, 0xfc, 0xe2, 0xf2, 0xd2, 0xe8, 0xe4, 0xdd, 0x4f, 0x70, 0x78, 0x40, 0xa6, + 0xfe, 0x93, 0x01, 0x90, 0xb2, 0x94, 0x6f, 0x76, 0x40, 0xc3, 0x30, 0xf5, 0x4d, 0x1e, 0xd1, 0x47, + 0x30, 0xc5, 0x9d, 0x3e, 0xf5, 0x22, 0xae, 0x9d, 0xbb, 0x78, 0xca, 0xb9, 0x55, 0xbd, 0xc9, 0x56, + 0x26, 0xbf, 0xfd, 0x6d, 0xd1, 0xc0, 0x31, 0x1e, 0xad, 0x43, 0x89, 0x44, 0x7c, 0x9f, 0x32, 0xee, + 0x58, 0x64, 0xc0, 0xd3, 0xff, 0x8e, 0x99, 0x88, 0x27, 0xb0, 0x78, 0x48, 0xb6, 0xfe, 0xc2, 0x80, + 0xe9, 0x78, 0x32, 0xa0, 0x7b, 0x90, 0x0f, 0x08, 0xb3, 0xbd, 0xbe, 0xac, 0xc7, 0x58, 0x95, 0x58, + 0x62, 0x92, 0x79, 0xa2, 0x65, 0xd0, 0x03, 0x80, 0x80, 0x70, 0x6a, 0xba, 0x4e, 0xdf, 0xe1, 0x7a, + 0x31, 0x5c, 0x1d, 0xa7, 0x81, 0xd3, 0x75, 0x01, 0x4b, 0x94, 0x14, 0x82, 0x98, 0x54, 0x7f, 0x6d, + 0x40, 0xe9, 0xa4, 0x09, 0x74, 0x13, 0x16, 0xd2, 0xf6, 0xa6, 0xcf, 0x7d, 0x91, 0xc3, 0x74, 0xfd, + 0x9d, 0x4b, 0x78, 0xed, 0x84, 0x85, 0xba, 0x30, 0xe7, 0xd3, 0xc0, 0xa2, 0x8c, 0x9b, 0x72, 0xde, + 0x51, 0xfb, 0xfd, 0x2e, 0x3d, 0x08, 0xd4, 0xce, 0x20, 0x6e, 0x57, 0x89, 0xe1, 0x92, 0x96, 0xdf, + 0x52, 0xe2, 0xe8, 0x1e, 0x54, 0xa3, 0x90, 0x9a, 0x0e, 0xb3, 0xa9, 0x4f, 0x99, 0x2d, 0x34, 0xab, + 0xc8, 0x99, 0x28, 0xb0, 0x28, 0xe3, 0x34, 0xae, 0x44, 0x21, 0x5d, 0x4b, 0x01, 0x38, 0xe1, 0xd7, + 0x7f, 0x36, 0x60, 0xfe, 0x54, 0xd8, 0xa8, 0x0b, 0xf3, 0xf1, 0x34, 0x36, 0xe3, 0xa7, 0x8b, 0x4e, + 0xfe, 0x7b, 0x3a, 0x62, 0xfa, 0xe5, 0xaf, 0x8b, 0x19, 0xd9, 0x15, 0xe5, 0x58, 0x3a, 0xe6, 0xa1, + 0x65, 0xf8, 0x4f, 0x9f, 0x3c, 0x37, 0x23, 0xa6, 0xa3, 0x36, 0x29, 0xe3, 0x81, 0x43, 0x55, 0x07, + 0x66, 0xf1, 0xb9, 0x3e, 0x79, 0xbe, 0x1d, 0xf3, 0xda, 0x8a, 0x85, 0xae, 0xc0, 0x6c, 0xe2, 0x85, + 0xa8, 0x83, 0x0c, 0x26, 0x8b, 0x67, 0x62, 0xa2, 0xf0, 0x5b, 0x06, 0x70, 0x2a, 0x49, 0x62, 0x90, + 0xb2, 0xa8, 0x2f, 0xe6, 0xb3, 0x17, 0x48, 0xc7, 0x67, 0x71, 0x4a, 0x40, 0x5f, 0x8a, 0xd7, 0x0a, + 0xf3, 0xfa, 0x0e, 0x93, 0x7c, 0xf5, 0x18, 0xb9, 0xf3, 0x0f, 0x0b, 0xd0, 0x58, 0x4d, 0x45, 0xe5, + 0x23, 0x65, 0x50, 0x57, 0xfd, 0x06, 0xcc, 0x0d, 0xf1, 0xc5, 0x76, 0xe8, 0x6c, 0x6f, 0xac, 0xe2, + 0xf6, 0x6a, 0x39, 0x83, 0xca, 0x30, 0xd3, 0x6b, 0x6f, 0x98, 0xbd, 0xce, 0xe6, 0xf6, 0x56, 0x6b, + 0x63, 0xb5, 0x6c, 0xd4, 0xbf, 0x36, 0xa0, 0x74, 0xf2, 0x36, 0xa0, 0xeb, 0x90, 0xe5, 0x6e, 0x98, + 0x24, 0x7c, 0xa4, 0x5f, 0x3d, 0x37, 0xec, 0x64, 0xb0, 0xc0, 0xa1, 0xdb, 0x90, 0xef, 0x47, 0x3c, + 0x22, 0xae, 0x6e, 0xa5, 0x31, 0x8f, 0x90, 0x47, 0x12, 0xd3, 0xc9, 0x60, 0x8d, 0x5e, 0x29, 0x42, + 0x41, 0x5c, 0x3b, 0xf9, 0x22, 0xab, 0x1f, 0x4d, 0x40, 0xb6, 0xe7, 0x86, 0xe8, 0x2a, 0xcc, 0x59, + 0xc4, 0xb4, 0x68, 0xc0, 0x9d, 0x5d, 0xe1, 0x0f, 0x0d, 0x75, 0x3b, 0x97, 0x2c, 0x72, 0x7f, 0x80, + 0x8a, 0x16, 0x01, 0xb8, 0xf7, 0x94, 0x32, 0xd3, 0x27, 0x7c, 0x5f, 0x0d, 0x92, 0x4e, 0x06, 0x17, + 0x24, 0xad, 0x4b, 0xf8, 0x3e, 0xba, 0x05, 0x39, 0x4f, 0xe8, 0xd7, 0xa3, 0xe4, 0xd2, 0x68, 0xaf, + 0x36, 0x45, 0xec, 0x9d, 0x0c, 0x56, 0x58, 0xf4, 0x29, 0x14, 0xa5, 0x4f, 0xea, 0x95, 0x22, 0x67, + 0x48, 0x69, 0xdc, 0x85, 0xef, 0xb9, 0xa1, 0x9c, 0x23, 0x6a, 0x71, 0x77, 0x0c, 0x0c, 0x24, 0x39, + 0xa1, 0xff, 0xc1, 0xac, 0x15, 0x85, 0xdc, 0xeb, 0xc7, 0xaa, 0x72, 0xd2, 0x43, 0x03, 0xcf, 0x28, + 0xb2, 0x86, 0x2d, 0x42, 0x31, 0xa4, 0xc1, 0x01, 0x0d, 0x4c, 0x39, 0xf0, 0xf3, 0x32, 0x54, 0x50, + 0xa4, 0x0d, 0xb1, 0x60, 0xaf, 0x00, 0xa4, 0x36, 0x50, 0x01, 0x72, 0xdd, 0xf5, 0xd6, 0xda, 0x86, + 0xda, 0xf3, 0x2b, 0xed, 0x16, 0x6e, 0xe3, 0xb2, 0xb1, 0x52, 0x82, 0x19, 0x95, 0x8b, 0xd0, 0x8b, + 0x02, 0x8b, 0xae, 0xcc, 0xc4, 0xb9, 0x91, 0xa9, 0xfd, 0x6e, 0x02, 0x72, 0x32, 0x4c, 0x74, 0x09, + 0x0a, 0x96, 0xeb, 0x88, 0x2b, 0xea, 0xd8, 0xf1, 0x0b, 0x5e, 0x11, 0xd6, 0x6c, 0xd1, 0xee, 0x9a, + 0x19, 0x52, 0x2b, 0xa0, 0x5c, 0x0f, 0xe7, 0x19, 0x45, 0xdc, 0x92, 0x34, 0xa1, 0x41, 0x69, 0x8e, + 0x02, 0x57, 0x26, 0x56, 0xec, 0x67, 0x41, 0xd8, 0x0e, 0x5c, 0xf1, 0x10, 0x0a, 0x2d, 0xcf, 0xa7, + 0x6a, 0xc5, 0x16, 0xb0, 0x3e, 0xa1, 0x2f, 0x60, 0x8e, 0x32, 0xdb, 0xf7, 0x1c, 0xc6, 0x4d, 0xbd, + 0x7b, 0x72, 0x72, 0x07, 0x37, 0xdf, 0x53, 0x93, 0x46, 0x5b, 0x8b, 0x74, 0xa5, 0x84, 0xda, 0xbe, + 0x25, 0x7a, 0x82, 0x58, 0x6d, 0xc1, 0xb9, 0x11, 0xb0, 0x33, 0xed, 0xdd, 0xef, 0x0d, 0xc8, 0xab, + 0xd6, 0x14, 0xc5, 0xf0, 0x03, 0xe7, 0x40, 0x4c, 0xeb, 0x54, 0x1c, 0x34, 0xe9, 0x21, 0x3d, 0x44, + 0xd7, 0x01, 0xe9, 0x14, 0x0d, 0x34, 0xa8, 0x56, 0x39, 0xaf, 0x38, 0x03, 0x3d, 0x3a, 0xaa, 0x97, + 0xb3, 0x63, 0x7a, 0xf9, 0x44, 0x17, 0x4c, 0x0e, 0x77, 0xc1, 0xca, 0x67, 0xaf, 0xde, 0xd4, 0x32, + 0x47, 0x6f, 0x6a, 0x99, 0x77, 0x6f, 0x6a, 0xc6, 0x57, 0xc7, 0x35, 0xe3, 0x87, 0xe3, 0x9a, 0xf1, + 0xf2, 0xb8, 0x66, 0xbc, 0x3a, 0xae, 0x19, 0xbf, 0x1f, 0xd7, 0x8c, 0x3f, 0x8e, 0x6b, 0x99, 0x77, + 0xc7, 0x35, 0xe3, 0xc5, 0xdb, 0x5a, 0xe6, 0xd5, 0xdb, 0x5a, 0xe6, 0xe8, 0x6d, 0x2d, 0xf3, 0xe4, + 0x92, 0xca, 0xae, 0xe3, 0x35, 0x89, 0xef, 0x34, 0x4f, 0xfe, 0xf3, 0xed, 0xe4, 0xe5, 0x00, 0xbd, + 0xf5, 0x77, 0x00, 0x00, 0x00, 0xff, 0xff, 0x2a, 0x5a, 0x42, 0x6d, 0x90, 0x0e, 0x00, 0x00, +} + func (x Rule_HeaderOperationTemplate_Operation) String() string { s, ok := Rule_HeaderOperationTemplate_Operation_name[int32(x)] if ok { @@ -2053,7 +2570,7 @@ func (this *AttributeManifest) GoString() string { for k, _ := range this.Attributes { keysForAttributes = append(keysForAttributes, k) } - sortkeys.Strings(keysForAttributes) + github_com_gogo_protobuf_sortkeys.Strings(keysForAttributes) mapStringForAttributes := "map[string]*AttributeManifest_AttributeInfo{" for _, k := range keysForAttributes { mapStringForAttributes += fmt.Sprintf("%#v: %#v,", k, this.Attributes[k]) @@ -2138,7 +2655,7 @@ func (this *Instance) GoString() string { for k, _ := range this.AttributeBindings { keysForAttributeBindings = append(keysForAttributeBindings, k) } - sortkeys.Strings(keysForAttributeBindings) + github_com_gogo_protobuf_sortkeys.Strings(keysForAttributeBindings) mapStringForAttributeBindings := "map[string]string{" for _, k := range keysForAttributeBindings { mapStringForAttributeBindings += fmt.Sprintf("%#v: %#v,", k, this.AttributeBindings[k]) @@ -2325,7 +2842,7 @@ func (this *OAuth) GoString() string { for k, _ := range this.EndpointParams { keysForEndpointParams = append(keysForEndpointParams, k) } - sortkeys.Strings(keysForEndpointParams) + github_com_gogo_protobuf_sortkeys.Strings(keysForEndpointParams) mapStringForEndpointParams := "map[string]string{" for _, k := range keysForEndpointParams { mapStringForEndpointParams += fmt.Sprintf("%#v: %#v,", k, this.EndpointParams[k]) @@ -2763,8 +3280,8 @@ func (m *Connection) MarshalTo(dAtA []byte) (int, error) { if m.Timeout != nil { dAtA[i] = 0x1a i++ - i = encodeVarintCfg(dAtA, i, uint64(types.SizeOfStdDuration(*m.Timeout))) - n6, err := types.StdDurationMarshalTo(*m.Timeout, dAtA[i:]) + i = encodeVarintCfg(dAtA, i, uint64(github_com_gogo_protobuf_types.SizeOfStdDuration(*m.Timeout))) + n6, err := github_com_gogo_protobuf_types.StdDurationMarshalTo(*m.Timeout, dAtA[i:]) if err != nil { return 0, err } @@ -2882,8 +3399,8 @@ func (m *RateLimitSampling) MarshalTo(dAtA []byte) (int, error) { _ = l dAtA[i] = 0xa i++ - i = encodeVarintCfg(dAtA, i, uint64(types.SizeOfStdDuration(m.SamplingDuration))) - n11, err := types.StdDurationMarshalTo(m.SamplingDuration, dAtA[i:]) + i = encodeVarintCfg(dAtA, i, uint64(github_com_gogo_protobuf_types.SizeOfStdDuration(m.SamplingDuration))) + n11, err := github_com_gogo_protobuf_types.StdDurationMarshalTo(m.SamplingDuration, dAtA[i:]) if err != nil { return 0, err } @@ -3183,6 +3700,9 @@ func encodeVarintCfg(dAtA []byte, offset int, v uint64) int { return offset + 1 } func (m *AttributeManifest) Size() (n int) { + if m == nil { + return 0 + } var l int _ = l l = len(m.Revision) @@ -3210,6 +3730,9 @@ func (m *AttributeManifest) Size() (n int) { } func (m *AttributeManifest_AttributeInfo) Size() (n int) { + if m == nil { + return 0 + } var l int _ = l l = len(m.Description) @@ -3223,6 +3746,9 @@ func (m *AttributeManifest_AttributeInfo) Size() (n int) { } func (m *Rule) Size() (n int) { + if m == nil { + return 0 + } var l int _ = l l = len(m.Match) @@ -3255,6 +3781,9 @@ func (m *Rule) Size() (n int) { } func (m *Rule_HeaderOperationTemplate) Size() (n int) { + if m == nil { + return 0 + } var l int _ = l l = len(m.Name) @@ -3274,6 +3803,9 @@ func (m *Rule_HeaderOperationTemplate) Size() (n int) { } func (m *Action) Size() (n int) { + if m == nil { + return 0 + } var l int _ = l l = len(m.Handler) @@ -3294,6 +3826,9 @@ func (m *Action) Size() (n int) { } func (m *Instance) Size() (n int) { + if m == nil { + return 0 + } var l int _ = l l = len(m.Name) @@ -3324,6 +3859,9 @@ func (m *Instance) Size() (n int) { } func (m *Handler) Size() (n int) { + if m == nil { + return 0 + } var l int _ = l l = len(m.Name) @@ -3350,6 +3888,9 @@ func (m *Handler) Size() (n int) { } func (m *Connection) Size() (n int) { + if m == nil { + return 0 + } var l int _ = l l = len(m.Address) @@ -3357,7 +3898,7 @@ func (m *Connection) Size() (n int) { n += 1 + l + sovCfg(uint64(l)) } if m.Timeout != nil { - l = types.SizeOfStdDuration(*m.Timeout) + l = github_com_gogo_protobuf_types.SizeOfStdDuration(*m.Timeout) n += 1 + l + sovCfg(uint64(l)) } if m.Authentication != nil { @@ -3368,6 +3909,9 @@ func (m *Connection) Size() (n int) { } func (m *Sampling) Size() (n int) { + if m == nil { + return 0 + } var l int _ = l if m.Random != nil { @@ -3382,6 +3926,9 @@ func (m *Sampling) Size() (n int) { } func (m *RandomSampling) Size() (n int) { + if m == nil { + return 0 + } var l int _ = l l = len(m.AttributeExpression) @@ -3399,9 +3946,12 @@ func (m *RandomSampling) Size() (n int) { } func (m *RateLimitSampling) Size() (n int) { + if m == nil { + return 0 + } var l int _ = l - l = types.SizeOfStdDuration(m.SamplingDuration) + l = github_com_gogo_protobuf_types.SizeOfStdDuration(m.SamplingDuration) n += 1 + l + sovCfg(uint64(l)) if m.MaxUnsampledEntries != 0 { n += 1 + sovCfg(uint64(m.MaxUnsampledEntries)) @@ -3413,6 +3963,9 @@ func (m *RateLimitSampling) Size() (n int) { } func (m *FractionalPercent) Size() (n int) { + if m == nil { + return 0 + } var l int _ = l if m.Numerator != 0 { @@ -3425,6 +3978,9 @@ func (m *FractionalPercent) Size() (n int) { } func (m *Authentication) Size() (n int) { + if m == nil { + return 0 + } var l int _ = l if m.AuthType != nil { @@ -3434,6 +3990,9 @@ func (m *Authentication) Size() (n int) { } func (m *Authentication_Tls) Size() (n int) { + if m == nil { + return 0 + } var l int _ = l if m.Tls != nil { @@ -3443,6 +4002,9 @@ func (m *Authentication_Tls) Size() (n int) { return n } func (m *Authentication_Mutual) Size() (n int) { + if m == nil { + return 0 + } var l int _ = l if m.Mutual != nil { @@ -3452,6 +4014,9 @@ func (m *Authentication_Mutual) Size() (n int) { return n } func (m *Tls) Size() (n int) { + if m == nil { + return 0 + } var l int _ = l l = len(m.CaCertificates) @@ -3472,6 +4037,9 @@ func (m *Tls) Size() (n int) { } func (m *Tls_TokenPath) Size() (n int) { + if m == nil { + return 0 + } var l int _ = l l = len(m.TokenPath) @@ -3479,6 +4047,9 @@ func (m *Tls_TokenPath) Size() (n int) { return n } func (m *Tls_Oauth) Size() (n int) { + if m == nil { + return 0 + } var l int _ = l if m.Oauth != nil { @@ -3488,12 +4059,18 @@ func (m *Tls_Oauth) Size() (n int) { return n } func (m *Tls_AuthHeader_) Size() (n int) { + if m == nil { + return 0 + } var l int _ = l n += 1 + sovCfg(uint64(m.AuthHeader)) return n } func (m *Tls_CustomHeader) Size() (n int) { + if m == nil { + return 0 + } var l int _ = l l = len(m.CustomHeader) @@ -3501,6 +4078,9 @@ func (m *Tls_CustomHeader) Size() (n int) { return n } func (m *OAuth) Size() (n int) { + if m == nil { + return 0 + } var l int _ = l l = len(m.ClientId) @@ -3533,6 +4113,9 @@ func (m *OAuth) Size() (n int) { } func (m *Mutual) Size() (n int) { + if m == nil { + return 0 + } var l int _ = l l = len(m.PrivateKey) @@ -3575,7 +4158,7 @@ func (this *AttributeManifest) String() string { for k, _ := range this.Attributes { keysForAttributes = append(keysForAttributes, k) } - sortkeys.Strings(keysForAttributes) + github_com_gogo_protobuf_sortkeys.Strings(keysForAttributes) mapStringForAttributes := "map[string]*AttributeManifest_AttributeInfo{" for _, k := range keysForAttributes { mapStringForAttributes += fmt.Sprintf("%v: %v,", k, this.Attributes[k]) @@ -3646,7 +4229,7 @@ func (this *Instance) String() string { for k, _ := range this.AttributeBindings { keysForAttributeBindings = append(keysForAttributeBindings, k) } - sortkeys.Strings(keysForAttributeBindings) + github_com_gogo_protobuf_sortkeys.Strings(keysForAttributeBindings) mapStringForAttributeBindings := "map[string]string{" for _, k := range keysForAttributeBindings { mapStringForAttributeBindings += fmt.Sprintf("%v: %v,", k, this.AttributeBindings[k]) @@ -3655,7 +4238,7 @@ func (this *Instance) String() string { s := strings.Join([]string{`&Instance{`, `Name:` + fmt.Sprintf("%v", this.Name) + `,`, `Template:` + fmt.Sprintf("%v", this.Template) + `,`, - `Params:` + strings.Replace(fmt.Sprintf("%v", this.Params), "Struct", "google_protobuf1.Struct", 1) + `,`, + `Params:` + strings.Replace(fmt.Sprintf("%v", this.Params), "Struct", "types.Struct", 1) + `,`, `AttributeBindings:` + mapStringForAttributeBindings + `,`, `CompiledTemplate:` + fmt.Sprintf("%v", this.CompiledTemplate) + `,`, `}`, @@ -3669,7 +4252,7 @@ func (this *Handler) String() string { s := strings.Join([]string{`&Handler{`, `Name:` + fmt.Sprintf("%v", this.Name) + `,`, `Adapter:` + fmt.Sprintf("%v", this.Adapter) + `,`, - `Params:` + strings.Replace(fmt.Sprintf("%v", this.Params), "Struct", "google_protobuf1.Struct", 1) + `,`, + `Params:` + strings.Replace(fmt.Sprintf("%v", this.Params), "Struct", "types.Struct", 1) + `,`, `Connection:` + strings.Replace(fmt.Sprintf("%v", this.Connection), "Connection", "Connection", 1) + `,`, `CompiledAdapter:` + fmt.Sprintf("%v", this.CompiledAdapter) + `,`, `}`, @@ -3682,7 +4265,7 @@ func (this *Connection) String() string { } s := strings.Join([]string{`&Connection{`, `Address:` + fmt.Sprintf("%v", this.Address) + `,`, - `Timeout:` + strings.Replace(fmt.Sprintf("%v", this.Timeout), "Duration", "google_protobuf2.Duration", 1) + `,`, + `Timeout:` + strings.Replace(fmt.Sprintf("%v", this.Timeout), "Duration", "types.Duration", 1) + `,`, `Authentication:` + strings.Replace(fmt.Sprintf("%v", this.Authentication), "Authentication", "Authentication", 1) + `,`, `}`, }, "") @@ -3716,7 +4299,7 @@ func (this *RateLimitSampling) String() string { return "nil" } s := strings.Join([]string{`&RateLimitSampling{`, - `SamplingDuration:` + strings.Replace(strings.Replace(this.SamplingDuration.String(), "Duration", "google_protobuf2.Duration", 1), `&`, ``, 1) + `,`, + `SamplingDuration:` + strings.Replace(strings.Replace(this.SamplingDuration.String(), "Duration", "types.Duration", 1), `&`, ``, 1) + `,`, `MaxUnsampledEntries:` + fmt.Sprintf("%v", this.MaxUnsampledEntries) + `,`, `SamplingRate:` + fmt.Sprintf("%v", this.SamplingRate) + `,`, `}`, @@ -3825,7 +4408,7 @@ func (this *OAuth) String() string { for k, _ := range this.EndpointParams { keysForEndpointParams = append(keysForEndpointParams, k) } - sortkeys.Strings(keysForEndpointParams) + github_com_gogo_protobuf_sortkeys.Strings(keysForEndpointParams) mapStringForEndpointParams := "map[string]string{" for _, k := range keysForEndpointParams { mapStringForEndpointParams += fmt.Sprintf("%v: %v,", k, this.EndpointParams[k]) @@ -3877,7 +4460,7 @@ func (m *AttributeManifest) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - wire |= (uint64(b) & 0x7F) << shift + wire |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -3905,7 +4488,7 @@ func (m *AttributeManifest) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLen |= (uint64(b) & 0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -3915,6 +4498,9 @@ func (m *AttributeManifest) Unmarshal(dAtA []byte) error { return ErrInvalidLengthCfg } postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthCfg + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -3934,7 +4520,7 @@ func (m *AttributeManifest) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLen |= (uint64(b) & 0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -3944,6 +4530,9 @@ func (m *AttributeManifest) Unmarshal(dAtA []byte) error { return ErrInvalidLengthCfg } postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthCfg + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -3963,7 +4552,7 @@ func (m *AttributeManifest) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - msglen |= (int(b) & 0x7F) << shift + msglen |= int(b&0x7F) << shift if b < 0x80 { break } @@ -3972,6 +4561,9 @@ func (m *AttributeManifest) Unmarshal(dAtA []byte) error { return ErrInvalidLengthCfg } postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthCfg + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -3992,7 +4584,7 @@ func (m *AttributeManifest) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - wire |= (uint64(b) & 0x7F) << shift + wire |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -4009,7 +4601,7 @@ func (m *AttributeManifest) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLenmapkey |= (uint64(b) & 0x7F) << shift + stringLenmapkey |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -4019,6 +4611,9 @@ func (m *AttributeManifest) Unmarshal(dAtA []byte) error { return ErrInvalidLengthCfg } postStringIndexmapkey := iNdEx + intStringLenmapkey + if postStringIndexmapkey < 0 { + return ErrInvalidLengthCfg + } if postStringIndexmapkey > l { return io.ErrUnexpectedEOF } @@ -4035,7 +4630,7 @@ func (m *AttributeManifest) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - mapmsglen |= (int(b) & 0x7F) << shift + mapmsglen |= int(b&0x7F) << shift if b < 0x80 { break } @@ -4044,7 +4639,7 @@ func (m *AttributeManifest) Unmarshal(dAtA []byte) error { return ErrInvalidLengthCfg } postmsgIndex := iNdEx + mapmsglen - if mapmsglen < 0 { + if postmsgIndex < 0 { return ErrInvalidLengthCfg } if postmsgIndex > l { @@ -4081,6 +4676,9 @@ func (m *AttributeManifest) Unmarshal(dAtA []byte) error { if skippy < 0 { return ErrInvalidLengthCfg } + if (iNdEx + skippy) < 0 { + return ErrInvalidLengthCfg + } if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF } @@ -4108,7 +4706,7 @@ func (m *AttributeManifest_AttributeInfo) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - wire |= (uint64(b) & 0x7F) << shift + wire |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -4136,7 +4734,7 @@ func (m *AttributeManifest_AttributeInfo) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLen |= (uint64(b) & 0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -4146,6 +4744,9 @@ func (m *AttributeManifest_AttributeInfo) Unmarshal(dAtA []byte) error { return ErrInvalidLengthCfg } postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthCfg + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -4165,7 +4766,7 @@ func (m *AttributeManifest_AttributeInfo) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - m.ValueType |= (ValueType(b) & 0x7F) << shift + m.ValueType |= ValueType(b&0x7F) << shift if b < 0x80 { break } @@ -4179,6 +4780,9 @@ func (m *AttributeManifest_AttributeInfo) Unmarshal(dAtA []byte) error { if skippy < 0 { return ErrInvalidLengthCfg } + if (iNdEx + skippy) < 0 { + return ErrInvalidLengthCfg + } if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF } @@ -4206,7 +4810,7 @@ func (m *Rule) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - wire |= (uint64(b) & 0x7F) << shift + wire |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -4234,7 +4838,7 @@ func (m *Rule) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLen |= (uint64(b) & 0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -4244,6 +4848,9 @@ func (m *Rule) Unmarshal(dAtA []byte) error { return ErrInvalidLengthCfg } postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthCfg + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -4263,7 +4870,7 @@ func (m *Rule) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - msglen |= (int(b) & 0x7F) << shift + msglen |= int(b&0x7F) << shift if b < 0x80 { break } @@ -4272,6 +4879,9 @@ func (m *Rule) Unmarshal(dAtA []byte) error { return ErrInvalidLengthCfg } postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthCfg + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -4294,7 +4904,7 @@ func (m *Rule) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - msglen |= (int(b) & 0x7F) << shift + msglen |= int(b&0x7F) << shift if b < 0x80 { break } @@ -4303,6 +4913,9 @@ func (m *Rule) Unmarshal(dAtA []byte) error { return ErrInvalidLengthCfg } postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthCfg + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -4325,7 +4938,7 @@ func (m *Rule) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - msglen |= (int(b) & 0x7F) << shift + msglen |= int(b&0x7F) << shift if b < 0x80 { break } @@ -4334,6 +4947,9 @@ func (m *Rule) Unmarshal(dAtA []byte) error { return ErrInvalidLengthCfg } postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthCfg + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -4356,7 +4972,7 @@ func (m *Rule) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - msglen |= (int(b) & 0x7F) << shift + msglen |= int(b&0x7F) << shift if b < 0x80 { break } @@ -4365,6 +4981,9 @@ func (m *Rule) Unmarshal(dAtA []byte) error { return ErrInvalidLengthCfg } postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthCfg + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -4384,6 +5003,9 @@ func (m *Rule) Unmarshal(dAtA []byte) error { if skippy < 0 { return ErrInvalidLengthCfg } + if (iNdEx + skippy) < 0 { + return ErrInvalidLengthCfg + } if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF } @@ -4411,7 +5033,7 @@ func (m *Rule_HeaderOperationTemplate) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - wire |= (uint64(b) & 0x7F) << shift + wire |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -4439,7 +5061,7 @@ func (m *Rule_HeaderOperationTemplate) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLen |= (uint64(b) & 0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -4449,6 +5071,9 @@ func (m *Rule_HeaderOperationTemplate) Unmarshal(dAtA []byte) error { return ErrInvalidLengthCfg } postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthCfg + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -4468,7 +5093,7 @@ func (m *Rule_HeaderOperationTemplate) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLen |= (uint64(b) & 0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -4478,6 +5103,9 @@ func (m *Rule_HeaderOperationTemplate) Unmarshal(dAtA []byte) error { return ErrInvalidLengthCfg } postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthCfg + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -4497,7 +5125,7 @@ func (m *Rule_HeaderOperationTemplate) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - m.Operation |= (Rule_HeaderOperationTemplate_Operation(b) & 0x7F) << shift + m.Operation |= Rule_HeaderOperationTemplate_Operation(b&0x7F) << shift if b < 0x80 { break } @@ -4511,6 +5139,9 @@ func (m *Rule_HeaderOperationTemplate) Unmarshal(dAtA []byte) error { if skippy < 0 { return ErrInvalidLengthCfg } + if (iNdEx + skippy) < 0 { + return ErrInvalidLengthCfg + } if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF } @@ -4538,7 +5169,7 @@ func (m *Action) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - wire |= (uint64(b) & 0x7F) << shift + wire |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -4566,7 +5197,7 @@ func (m *Action) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLen |= (uint64(b) & 0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -4576,6 +5207,9 @@ func (m *Action) Unmarshal(dAtA []byte) error { return ErrInvalidLengthCfg } postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthCfg + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -4595,7 +5229,7 @@ func (m *Action) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLen |= (uint64(b) & 0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -4605,6 +5239,9 @@ func (m *Action) Unmarshal(dAtA []byte) error { return ErrInvalidLengthCfg } postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthCfg + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -4624,7 +5261,7 @@ func (m *Action) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLen |= (uint64(b) & 0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -4634,6 +5271,9 @@ func (m *Action) Unmarshal(dAtA []byte) error { return ErrInvalidLengthCfg } postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthCfg + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -4648,6 +5288,9 @@ func (m *Action) Unmarshal(dAtA []byte) error { if skippy < 0 { return ErrInvalidLengthCfg } + if (iNdEx + skippy) < 0 { + return ErrInvalidLengthCfg + } if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF } @@ -4675,7 +5318,7 @@ func (m *Instance) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - wire |= (uint64(b) & 0x7F) << shift + wire |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -4703,7 +5346,7 @@ func (m *Instance) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLen |= (uint64(b) & 0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -4713,6 +5356,9 @@ func (m *Instance) Unmarshal(dAtA []byte) error { return ErrInvalidLengthCfg } postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthCfg + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -4732,7 +5378,7 @@ func (m *Instance) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLen |= (uint64(b) & 0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -4742,6 +5388,9 @@ func (m *Instance) Unmarshal(dAtA []byte) error { return ErrInvalidLengthCfg } postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthCfg + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -4761,7 +5410,7 @@ func (m *Instance) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - msglen |= (int(b) & 0x7F) << shift + msglen |= int(b&0x7F) << shift if b < 0x80 { break } @@ -4770,11 +5419,14 @@ func (m *Instance) Unmarshal(dAtA []byte) error { return ErrInvalidLengthCfg } postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthCfg + } if postIndex > l { return io.ErrUnexpectedEOF } if m.Params == nil { - m.Params = &google_protobuf1.Struct{} + m.Params = &types.Struct{} } if err := m.Params.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err @@ -4794,7 +5446,7 @@ func (m *Instance) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - msglen |= (int(b) & 0x7F) << shift + msglen |= int(b&0x7F) << shift if b < 0x80 { break } @@ -4803,6 +5455,9 @@ func (m *Instance) Unmarshal(dAtA []byte) error { return ErrInvalidLengthCfg } postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthCfg + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -4823,7 +5478,7 @@ func (m *Instance) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - wire |= (uint64(b) & 0x7F) << shift + wire |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -4840,7 +5495,7 @@ func (m *Instance) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLenmapkey |= (uint64(b) & 0x7F) << shift + stringLenmapkey |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -4850,6 +5505,9 @@ func (m *Instance) Unmarshal(dAtA []byte) error { return ErrInvalidLengthCfg } postStringIndexmapkey := iNdEx + intStringLenmapkey + if postStringIndexmapkey < 0 { + return ErrInvalidLengthCfg + } if postStringIndexmapkey > l { return io.ErrUnexpectedEOF } @@ -4866,7 +5524,7 @@ func (m *Instance) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLenmapvalue |= (uint64(b) & 0x7F) << shift + stringLenmapvalue |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -4876,6 +5534,9 @@ func (m *Instance) Unmarshal(dAtA []byte) error { return ErrInvalidLengthCfg } postStringIndexmapvalue := iNdEx + intStringLenmapvalue + if postStringIndexmapvalue < 0 { + return ErrInvalidLengthCfg + } if postStringIndexmapvalue > l { return io.ErrUnexpectedEOF } @@ -4912,7 +5573,7 @@ func (m *Instance) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLen |= (uint64(b) & 0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -4922,6 +5583,9 @@ func (m *Instance) Unmarshal(dAtA []byte) error { return ErrInvalidLengthCfg } postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthCfg + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -4936,6 +5600,9 @@ func (m *Instance) Unmarshal(dAtA []byte) error { if skippy < 0 { return ErrInvalidLengthCfg } + if (iNdEx + skippy) < 0 { + return ErrInvalidLengthCfg + } if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF } @@ -4963,7 +5630,7 @@ func (m *Handler) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - wire |= (uint64(b) & 0x7F) << shift + wire |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -4991,7 +5658,7 @@ func (m *Handler) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLen |= (uint64(b) & 0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -5001,6 +5668,9 @@ func (m *Handler) Unmarshal(dAtA []byte) error { return ErrInvalidLengthCfg } postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthCfg + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -5020,7 +5690,7 @@ func (m *Handler) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLen |= (uint64(b) & 0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -5030,6 +5700,9 @@ func (m *Handler) Unmarshal(dAtA []byte) error { return ErrInvalidLengthCfg } postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthCfg + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -5049,7 +5722,7 @@ func (m *Handler) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - msglen |= (int(b) & 0x7F) << shift + msglen |= int(b&0x7F) << shift if b < 0x80 { break } @@ -5058,11 +5731,14 @@ func (m *Handler) Unmarshal(dAtA []byte) error { return ErrInvalidLengthCfg } postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthCfg + } if postIndex > l { return io.ErrUnexpectedEOF } if m.Params == nil { - m.Params = &google_protobuf1.Struct{} + m.Params = &types.Struct{} } if err := m.Params.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err @@ -5082,7 +5758,7 @@ func (m *Handler) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - msglen |= (int(b) & 0x7F) << shift + msglen |= int(b&0x7F) << shift if b < 0x80 { break } @@ -5091,6 +5767,9 @@ func (m *Handler) Unmarshal(dAtA []byte) error { return ErrInvalidLengthCfg } postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthCfg + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -5115,7 +5794,7 @@ func (m *Handler) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLen |= (uint64(b) & 0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -5125,6 +5804,9 @@ func (m *Handler) Unmarshal(dAtA []byte) error { return ErrInvalidLengthCfg } postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthCfg + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -5139,6 +5821,9 @@ func (m *Handler) Unmarshal(dAtA []byte) error { if skippy < 0 { return ErrInvalidLengthCfg } + if (iNdEx + skippy) < 0 { + return ErrInvalidLengthCfg + } if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF } @@ -5166,7 +5851,7 @@ func (m *Connection) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - wire |= (uint64(b) & 0x7F) << shift + wire |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -5194,7 +5879,7 @@ func (m *Connection) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLen |= (uint64(b) & 0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -5204,6 +5889,9 @@ func (m *Connection) Unmarshal(dAtA []byte) error { return ErrInvalidLengthCfg } postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthCfg + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -5223,7 +5911,7 @@ func (m *Connection) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - msglen |= (int(b) & 0x7F) << shift + msglen |= int(b&0x7F) << shift if b < 0x80 { break } @@ -5232,13 +5920,16 @@ func (m *Connection) Unmarshal(dAtA []byte) error { return ErrInvalidLengthCfg } postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthCfg + } if postIndex > l { return io.ErrUnexpectedEOF } if m.Timeout == nil { m.Timeout = new(time.Duration) } - if err := types.StdDurationUnmarshal(m.Timeout, dAtA[iNdEx:postIndex]); err != nil { + if err := github_com_gogo_protobuf_types.StdDurationUnmarshal(m.Timeout, dAtA[iNdEx:postIndex]); err != nil { return err } iNdEx = postIndex @@ -5256,7 +5947,7 @@ func (m *Connection) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - msglen |= (int(b) & 0x7F) << shift + msglen |= int(b&0x7F) << shift if b < 0x80 { break } @@ -5265,6 +5956,9 @@ func (m *Connection) Unmarshal(dAtA []byte) error { return ErrInvalidLengthCfg } postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthCfg + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -5284,6 +5978,9 @@ func (m *Connection) Unmarshal(dAtA []byte) error { if skippy < 0 { return ErrInvalidLengthCfg } + if (iNdEx + skippy) < 0 { + return ErrInvalidLengthCfg + } if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF } @@ -5311,7 +6008,7 @@ func (m *Sampling) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - wire |= (uint64(b) & 0x7F) << shift + wire |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -5339,7 +6036,7 @@ func (m *Sampling) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - msglen |= (int(b) & 0x7F) << shift + msglen |= int(b&0x7F) << shift if b < 0x80 { break } @@ -5348,6 +6045,9 @@ func (m *Sampling) Unmarshal(dAtA []byte) error { return ErrInvalidLengthCfg } postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthCfg + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -5372,7 +6072,7 @@ func (m *Sampling) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - msglen |= (int(b) & 0x7F) << shift + msglen |= int(b&0x7F) << shift if b < 0x80 { break } @@ -5381,6 +6081,9 @@ func (m *Sampling) Unmarshal(dAtA []byte) error { return ErrInvalidLengthCfg } postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthCfg + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -5400,6 +6103,9 @@ func (m *Sampling) Unmarshal(dAtA []byte) error { if skippy < 0 { return ErrInvalidLengthCfg } + if (iNdEx + skippy) < 0 { + return ErrInvalidLengthCfg + } if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF } @@ -5427,7 +6133,7 @@ func (m *RandomSampling) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - wire |= (uint64(b) & 0x7F) << shift + wire |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -5455,7 +6161,7 @@ func (m *RandomSampling) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLen |= (uint64(b) & 0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -5465,6 +6171,9 @@ func (m *RandomSampling) Unmarshal(dAtA []byte) error { return ErrInvalidLengthCfg } postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthCfg + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -5484,7 +6193,7 @@ func (m *RandomSampling) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - msglen |= (int(b) & 0x7F) << shift + msglen |= int(b&0x7F) << shift if b < 0x80 { break } @@ -5493,6 +6202,9 @@ func (m *RandomSampling) Unmarshal(dAtA []byte) error { return ErrInvalidLengthCfg } postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthCfg + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -5517,7 +6229,7 @@ func (m *RandomSampling) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - v |= (int(b) & 0x7F) << shift + v |= int(b&0x7F) << shift if b < 0x80 { break } @@ -5532,6 +6244,9 @@ func (m *RandomSampling) Unmarshal(dAtA []byte) error { if skippy < 0 { return ErrInvalidLengthCfg } + if (iNdEx + skippy) < 0 { + return ErrInvalidLengthCfg + } if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF } @@ -5559,7 +6274,7 @@ func (m *RateLimitSampling) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - wire |= (uint64(b) & 0x7F) << shift + wire |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -5587,7 +6302,7 @@ func (m *RateLimitSampling) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - msglen |= (int(b) & 0x7F) << shift + msglen |= int(b&0x7F) << shift if b < 0x80 { break } @@ -5596,10 +6311,13 @@ func (m *RateLimitSampling) Unmarshal(dAtA []byte) error { return ErrInvalidLengthCfg } postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthCfg + } if postIndex > l { return io.ErrUnexpectedEOF } - if err := types.StdDurationUnmarshal(&m.SamplingDuration, dAtA[iNdEx:postIndex]); err != nil { + if err := github_com_gogo_protobuf_types.StdDurationUnmarshal(&m.SamplingDuration, dAtA[iNdEx:postIndex]); err != nil { return err } iNdEx = postIndex @@ -5617,7 +6335,7 @@ func (m *RateLimitSampling) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - m.MaxUnsampledEntries |= (int64(b) & 0x7F) << shift + m.MaxUnsampledEntries |= int64(b&0x7F) << shift if b < 0x80 { break } @@ -5636,7 +6354,7 @@ func (m *RateLimitSampling) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - m.SamplingRate |= (int64(b) & 0x7F) << shift + m.SamplingRate |= int64(b&0x7F) << shift if b < 0x80 { break } @@ -5650,6 +6368,9 @@ func (m *RateLimitSampling) Unmarshal(dAtA []byte) error { if skippy < 0 { return ErrInvalidLengthCfg } + if (iNdEx + skippy) < 0 { + return ErrInvalidLengthCfg + } if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF } @@ -5677,7 +6398,7 @@ func (m *FractionalPercent) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - wire |= (uint64(b) & 0x7F) << shift + wire |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -5705,7 +6426,7 @@ func (m *FractionalPercent) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - m.Numerator |= (uint32(b) & 0x7F) << shift + m.Numerator |= uint32(b&0x7F) << shift if b < 0x80 { break } @@ -5724,7 +6445,7 @@ func (m *FractionalPercent) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - m.Denominator |= (FractionalPercent_DenominatorType(b) & 0x7F) << shift + m.Denominator |= FractionalPercent_DenominatorType(b&0x7F) << shift if b < 0x80 { break } @@ -5738,6 +6459,9 @@ func (m *FractionalPercent) Unmarshal(dAtA []byte) error { if skippy < 0 { return ErrInvalidLengthCfg } + if (iNdEx + skippy) < 0 { + return ErrInvalidLengthCfg + } if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF } @@ -5765,7 +6489,7 @@ func (m *Authentication) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - wire |= (uint64(b) & 0x7F) << shift + wire |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -5793,7 +6517,7 @@ func (m *Authentication) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - msglen |= (int(b) & 0x7F) << shift + msglen |= int(b&0x7F) << shift if b < 0x80 { break } @@ -5802,6 +6526,9 @@ func (m *Authentication) Unmarshal(dAtA []byte) error { return ErrInvalidLengthCfg } postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthCfg + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -5825,7 +6552,7 @@ func (m *Authentication) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - msglen |= (int(b) & 0x7F) << shift + msglen |= int(b&0x7F) << shift if b < 0x80 { break } @@ -5834,6 +6561,9 @@ func (m *Authentication) Unmarshal(dAtA []byte) error { return ErrInvalidLengthCfg } postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthCfg + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -5852,6 +6582,9 @@ func (m *Authentication) Unmarshal(dAtA []byte) error { if skippy < 0 { return ErrInvalidLengthCfg } + if (iNdEx + skippy) < 0 { + return ErrInvalidLengthCfg + } if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF } @@ -5879,7 +6612,7 @@ func (m *Tls) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - wire |= (uint64(b) & 0x7F) << shift + wire |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -5907,7 +6640,7 @@ func (m *Tls) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLen |= (uint64(b) & 0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -5917,6 +6650,9 @@ func (m *Tls) Unmarshal(dAtA []byte) error { return ErrInvalidLengthCfg } postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthCfg + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -5936,7 +6672,7 @@ func (m *Tls) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLen |= (uint64(b) & 0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -5946,6 +6682,9 @@ func (m *Tls) Unmarshal(dAtA []byte) error { return ErrInvalidLengthCfg } postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthCfg + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -5965,7 +6704,7 @@ func (m *Tls) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - msglen |= (int(b) & 0x7F) << shift + msglen |= int(b&0x7F) << shift if b < 0x80 { break } @@ -5974,6 +6713,9 @@ func (m *Tls) Unmarshal(dAtA []byte) error { return ErrInvalidLengthCfg } postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthCfg + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -5997,7 +6739,7 @@ func (m *Tls) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - v |= (Tls_AuthHeader(b) & 0x7F) << shift + v |= Tls_AuthHeader(b&0x7F) << shift if b < 0x80 { break } @@ -6017,7 +6759,7 @@ func (m *Tls) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLen |= (uint64(b) & 0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -6027,6 +6769,9 @@ func (m *Tls) Unmarshal(dAtA []byte) error { return ErrInvalidLengthCfg } postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthCfg + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -6046,7 +6791,7 @@ func (m *Tls) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLen |= (uint64(b) & 0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -6056,6 +6801,9 @@ func (m *Tls) Unmarshal(dAtA []byte) error { return ErrInvalidLengthCfg } postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthCfg + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -6070,6 +6818,9 @@ func (m *Tls) Unmarshal(dAtA []byte) error { if skippy < 0 { return ErrInvalidLengthCfg } + if (iNdEx + skippy) < 0 { + return ErrInvalidLengthCfg + } if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF } @@ -6097,7 +6848,7 @@ func (m *OAuth) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - wire |= (uint64(b) & 0x7F) << shift + wire |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -6125,7 +6876,7 @@ func (m *OAuth) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLen |= (uint64(b) & 0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -6135,6 +6886,9 @@ func (m *OAuth) Unmarshal(dAtA []byte) error { return ErrInvalidLengthCfg } postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthCfg + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -6154,7 +6908,7 @@ func (m *OAuth) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLen |= (uint64(b) & 0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -6164,6 +6918,9 @@ func (m *OAuth) Unmarshal(dAtA []byte) error { return ErrInvalidLengthCfg } postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthCfg + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -6183,7 +6940,7 @@ func (m *OAuth) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLen |= (uint64(b) & 0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -6193,6 +6950,9 @@ func (m *OAuth) Unmarshal(dAtA []byte) error { return ErrInvalidLengthCfg } postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthCfg + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -6212,7 +6972,7 @@ func (m *OAuth) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLen |= (uint64(b) & 0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -6222,6 +6982,9 @@ func (m *OAuth) Unmarshal(dAtA []byte) error { return ErrInvalidLengthCfg } postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthCfg + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -6241,7 +7004,7 @@ func (m *OAuth) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - msglen |= (int(b) & 0x7F) << shift + msglen |= int(b&0x7F) << shift if b < 0x80 { break } @@ -6250,6 +7013,9 @@ func (m *OAuth) Unmarshal(dAtA []byte) error { return ErrInvalidLengthCfg } postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthCfg + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -6270,7 +7036,7 @@ func (m *OAuth) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - wire |= (uint64(b) & 0x7F) << shift + wire |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -6287,7 +7053,7 @@ func (m *OAuth) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLenmapkey |= (uint64(b) & 0x7F) << shift + stringLenmapkey |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -6297,6 +7063,9 @@ func (m *OAuth) Unmarshal(dAtA []byte) error { return ErrInvalidLengthCfg } postStringIndexmapkey := iNdEx + intStringLenmapkey + if postStringIndexmapkey < 0 { + return ErrInvalidLengthCfg + } if postStringIndexmapkey > l { return io.ErrUnexpectedEOF } @@ -6313,7 +7082,7 @@ func (m *OAuth) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLenmapvalue |= (uint64(b) & 0x7F) << shift + stringLenmapvalue |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -6323,6 +7092,9 @@ func (m *OAuth) Unmarshal(dAtA []byte) error { return ErrInvalidLengthCfg } postStringIndexmapvalue := iNdEx + intStringLenmapvalue + if postStringIndexmapvalue < 0 { + return ErrInvalidLengthCfg + } if postStringIndexmapvalue > l { return io.ErrUnexpectedEOF } @@ -6354,6 +7126,9 @@ func (m *OAuth) Unmarshal(dAtA []byte) error { if skippy < 0 { return ErrInvalidLengthCfg } + if (iNdEx + skippy) < 0 { + return ErrInvalidLengthCfg + } if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF } @@ -6381,7 +7156,7 @@ func (m *Mutual) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - wire |= (uint64(b) & 0x7F) << shift + wire |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -6409,7 +7184,7 @@ func (m *Mutual) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLen |= (uint64(b) & 0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -6419,6 +7194,9 @@ func (m *Mutual) Unmarshal(dAtA []byte) error { return ErrInvalidLengthCfg } postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthCfg + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -6438,7 +7216,7 @@ func (m *Mutual) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLen |= (uint64(b) & 0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -6448,6 +7226,9 @@ func (m *Mutual) Unmarshal(dAtA []byte) error { return ErrInvalidLengthCfg } postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthCfg + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -6467,7 +7248,7 @@ func (m *Mutual) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLen |= (uint64(b) & 0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -6477,6 +7258,9 @@ func (m *Mutual) Unmarshal(dAtA []byte) error { return ErrInvalidLengthCfg } postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthCfg + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -6496,7 +7280,7 @@ func (m *Mutual) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLen |= (uint64(b) & 0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -6506,6 +7290,9 @@ func (m *Mutual) Unmarshal(dAtA []byte) error { return ErrInvalidLengthCfg } postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthCfg + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -6520,6 +7307,9 @@ func (m *Mutual) Unmarshal(dAtA []byte) error { if skippy < 0 { return ErrInvalidLengthCfg } + if (iNdEx + skippy) < 0 { + return ErrInvalidLengthCfg + } if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF } @@ -6586,10 +7376,13 @@ func skipCfg(dAtA []byte) (n int, err error) { break } } - iNdEx += length if length < 0 { return 0, ErrInvalidLengthCfg } + iNdEx += length + if iNdEx < 0 { + return 0, ErrInvalidLengthCfg + } return iNdEx, nil case 3: for { @@ -6618,6 +7411,9 @@ func skipCfg(dAtA []byte) (n int, err error) { return 0, err } iNdEx = start + next + if iNdEx < 0 { + return 0, ErrInvalidLengthCfg + } } return iNdEx, nil case 4: @@ -6636,104 +7432,3 @@ var ( ErrInvalidLengthCfg = fmt.Errorf("proto: negative length found during unmarshaling") ErrIntOverflowCfg = fmt.Errorf("proto: integer overflow") ) - -func init() { proto.RegisterFile("policy/v1beta1/cfg.proto", fileDescriptorCfg) } - -var fileDescriptorCfg = []byte{ - // 1513 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x57, 0x3f, 0x6f, 0x1b, 0x47, - 0x16, 0xe7, 0x8a, 0x22, 0x25, 0x3e, 0x4a, 0x14, 0x35, 0xd6, 0xd9, 0x34, 0x6d, 0x50, 0x02, 0x7d, - 0x07, 0xbb, 0x38, 0x93, 0xb6, 0x8c, 0xb3, 0xef, 0x0c, 0xe3, 0x70, 0x94, 0x45, 0x1f, 0x05, 0xcb, - 0x12, 0x31, 0xa2, 0x7c, 0x17, 0x37, 0x8b, 0xd1, 0xee, 0x48, 0x5a, 0x78, 0x77, 0x76, 0xbd, 0x3b, - 0x2b, 0x58, 0x5d, 0x8a, 0xa4, 0x77, 0x19, 0x20, 0x5d, 0xaa, 0xa4, 0xca, 0x37, 0x48, 0x1b, 0x97, - 0x06, 0xdc, 0xb8, 0x4a, 0x62, 0xa5, 0x49, 0x13, 0xc0, 0x45, 0x3e, 0x40, 0x30, 0x7f, 0x76, 0x97, - 0xa2, 0x48, 0x23, 0x4a, 0xb7, 0xf3, 0xfe, 0xff, 0xde, 0x7b, 0xf3, 0xde, 0x2c, 0xd4, 0x02, 0xdf, - 0x75, 0xac, 0xe3, 0xf6, 0xd1, 0xed, 0x3d, 0xca, 0xc9, 0xed, 0xb6, 0xb5, 0x7f, 0xd0, 0x0a, 0x42, - 0x9f, 0xfb, 0x68, 0xc9, 0x89, 0xb8, 0xe3, 0xb7, 0x14, 0xbf, 0xa5, 0xf9, 0xf5, 0xa5, 0x03, 0xff, - 0xc0, 0x97, 0x02, 0x6d, 0xf1, 0xa5, 0x64, 0xeb, 0x57, 0x0f, 0x7c, 0xff, 0xc0, 0xa5, 0x6d, 0x79, - 0xda, 0x8b, 0xf7, 0xdb, 0x11, 0x0f, 0x63, 0x8b, 0x6b, 0x6e, 0x63, 0x94, 0x6b, 0xc7, 0x21, 0xe1, - 0x8e, 0xcf, 0x34, 0x7f, 0x79, 0x24, 0x86, 0x23, 0xe2, 0xc6, 0xd4, 0xe4, 0xc7, 0x01, 0x55, 0x02, - 0xcd, 0xcf, 0xf3, 0xb0, 0xd8, 0xe1, 0x3c, 0x74, 0xf6, 0x62, 0x4e, 0x9f, 0x10, 0xe6, 0xec, 0xd3, - 0x88, 0xa3, 0x3a, 0xcc, 0x86, 0xf4, 0xc8, 0x89, 0x1c, 0x9f, 0xd5, 0x8c, 0x15, 0xe3, 0x46, 0x09, - 0xa7, 0x67, 0x84, 0x60, 0x9a, 0x11, 0x8f, 0xd6, 0xa6, 0x24, 0x5d, 0x7e, 0xa3, 0xff, 0x01, 0x90, - 0xc4, 0x48, 0x54, 0xcb, 0xaf, 0xe4, 0x6f, 0x94, 0x57, 0xef, 0xb5, 0xc6, 0xa1, 0x6c, 0x9d, 0x71, - 0x96, 0x51, 0xa2, 0x2e, 0xe3, 0xe1, 0x31, 0x1e, 0x32, 0x55, 0x7f, 0x01, 0xf3, 0x29, 0x7b, 0x83, - 0xed, 0xfb, 0x68, 0x05, 0xca, 0x36, 0x8d, 0xac, 0xd0, 0x09, 0x78, 0x16, 0xdc, 0x30, 0x09, 0xfd, - 0x1b, 0x20, 0x43, 0x29, 0xa3, 0xac, 0xac, 0x2e, 0x8f, 0x8f, 0xe5, 0xa9, 0x90, 0x1b, 0x1c, 0x07, - 0x14, 0x97, 0x8e, 0x92, 0xcf, 0x3a, 0x87, 0x85, 0x91, 0x88, 0x50, 0x15, 0xf2, 0xcf, 0xe9, 0xb1, - 0x76, 0x26, 0x3e, 0xd1, 0x63, 0x28, 0x48, 0x0d, 0x69, 0xbf, 0xbc, 0xfa, 0x8f, 0x73, 0x63, 0x15, - 0x60, 0xb0, 0xb2, 0x71, 0x7f, 0xea, 0x9f, 0x46, 0xf3, 0xf5, 0x34, 0x4c, 0xe3, 0xd8, 0xa5, 0x68, - 0x09, 0x0a, 0x1e, 0xe1, 0xd6, 0xa1, 0xf6, 0xa6, 0x0e, 0xe8, 0x2e, 0xcc, 0x10, 0x4b, 0xc0, 0x8b, - 0x6a, 0x53, 0x32, 0xbb, 0x57, 0x27, 0x78, 0x94, 0x42, 0x38, 0x11, 0x46, 0x0c, 0x2e, 0x87, 0xf4, - 0x45, 0x4c, 0x23, 0x6e, 0x1e, 0x52, 0x62, 0xd3, 0xd0, 0xf4, 0x03, 0xaa, 0x3a, 0x24, 0xa9, 0xd3, - 0xea, 0x78, 0x4b, 0x22, 0x98, 0x56, 0x4f, 0xea, 0x6c, 0x27, 0x2a, 0x03, 0xea, 0x05, 0x2e, 0xe1, - 0x14, 0x5f, 0xd2, 0x46, 0x47, 0xf8, 0x11, 0x0a, 0xa0, 0x1e, 0xd2, 0x28, 0xf0, 0x59, 0x44, 0xc7, - 0x38, 0x9c, 0xfe, 0xd3, 0x0e, 0x6b, 0x89, 0xd5, 0x33, 0x1e, 0xef, 0xc3, 0x6c, 0x44, 0xbc, 0xc0, - 0x75, 0xd8, 0x41, 0xad, 0x20, 0x8b, 0xd1, 0x18, 0x6f, 0x7f, 0x47, 0x4b, 0xe1, 0x54, 0xbe, 0xfe, - 0xd6, 0x80, 0x4b, 0x13, 0x3c, 0xa6, 0x6d, 0x6e, 0x0c, 0xb5, 0xf9, 0x45, 0x28, 0xca, 0x8a, 0xa9, - 0x22, 0x94, 0xb0, 0x3e, 0xa1, 0x67, 0x50, 0x4a, 0x51, 0xd6, 0xf2, 0xb2, 0xe3, 0x1e, 0x9c, 0x1f, - 0x64, 0x2b, 0xa5, 0xe0, 0xcc, 0x5c, 0xf3, 0x16, 0x94, 0x52, 0x3a, 0x2a, 0xc3, 0x0c, 0xee, 0xf6, - 0x37, 0x3b, 0x0f, 0xbb, 0xd5, 0x1c, 0x02, 0x28, 0xe2, 0xee, 0x93, 0xed, 0xa7, 0xdd, 0xaa, 0x21, - 0xbe, 0x3b, 0xfd, 0x7e, 0x77, 0x6b, 0xbd, 0x3a, 0xd5, 0x1c, 0x40, 0x51, 0xb5, 0x01, 0xaa, 0xc1, - 0xcc, 0x21, 0x61, 0xb6, 0x4b, 0x43, 0x7d, 0x5b, 0x93, 0x23, 0xba, 0x0a, 0x25, 0x87, 0x45, 0x9c, - 0x30, 0x4b, 0xdf, 0xd7, 0x12, 0xce, 0x08, 0x29, 0xf6, 0xe9, 0x0c, 0x7b, 0xf3, 0xfb, 0x29, 0x98, - 0xdd, 0xd0, 0x12, 0x63, 0x93, 0x53, 0x87, 0x59, 0xae, 0x91, 0x68, 0x6f, 0xe9, 0x19, 0xb5, 0xa1, - 0x18, 0x90, 0x90, 0x78, 0x91, 0xcc, 0x4e, 0x79, 0xf5, 0x52, 0x4b, 0xcd, 0xad, 0x56, 0x32, 0xb7, - 0x5a, 0x3b, 0x72, 0xaa, 0x61, 0x2d, 0x86, 0x6c, 0x40, 0xe9, 0x14, 0x30, 0xf7, 0x1c, 0x66, 0x3b, - 0xec, 0x20, 0xe9, 0x9f, 0x09, 0x97, 0x2d, 0x09, 0x2e, 0xbb, 0x63, 0x6b, 0x5a, 0x4f, 0x8d, 0x95, - 0x45, 0x32, 0x4a, 0x47, 0x2d, 0x58, 0xb4, 0x7c, 0x2f, 0x70, 0x5c, 0x6a, 0x9b, 0x69, 0xec, 0xbf, - 0xfd, 0xfa, 0xcd, 0x8a, 0x0c, 0xbf, 0x9a, 0xf0, 0x92, 0x02, 0xd5, 0xd7, 0xe1, 0xe2, 0x78, 0xe3, - 0x63, 0x26, 0xc4, 0xd2, 0xf0, 0x84, 0x28, 0x0d, 0x5f, 0xf5, 0x77, 0x06, 0xcc, 0xf4, 0x74, 0x1d, - 0xc6, 0x25, 0xb2, 0x06, 0x33, 0xc4, 0x26, 0x01, 0xcf, 0xaa, 0xa6, 0x8f, 0xe7, 0x4f, 0xe3, 0x7f, - 0x00, 0x2c, 0x9f, 0x31, 0x2a, 0xdb, 0x41, 0x96, 0xb3, 0xbc, 0xba, 0x32, 0x3e, 0x7d, 0x0f, 0x53, - 0x39, 0x3c, 0xa4, 0x83, 0xfe, 0x0e, 0x69, 0x1a, 0xcc, 0x24, 0xaa, 0x34, 0x43, 0x0b, 0x09, 0xab, - 0xa3, 0x38, 0xcd, 0x6f, 0x0d, 0x80, 0xcc, 0x90, 0x42, 0x62, 0x87, 0x34, 0x8a, 0x32, 0x24, 0xf2, - 0x88, 0xfe, 0x05, 0x33, 0xdc, 0xf1, 0xa8, 0x1f, 0x73, 0x0d, 0xe5, 0xf2, 0x19, 0x28, 0xeb, 0x7a, - 0x93, 0xad, 0x4d, 0x7f, 0xf1, 0xe3, 0xb2, 0x81, 0x13, 0x79, 0xb4, 0x09, 0x15, 0x12, 0xf3, 0x43, - 0xca, 0xb8, 0x63, 0x91, 0x21, 0x5c, 0x7f, 0x9d, 0x30, 0x11, 0x4f, 0xc9, 0xe2, 0x11, 0xdd, 0xe6, - 0x2b, 0x03, 0x66, 0x93, 0xc9, 0x80, 0x1e, 0x40, 0x31, 0x24, 0xcc, 0xf6, 0x3d, 0x59, 0x8f, 0x89, - 0x26, 0xb1, 0x94, 0x49, 0xe7, 0x89, 0xd6, 0x41, 0x8f, 0x00, 0x42, 0xc2, 0xa9, 0xe9, 0x3a, 0x9e, - 0xc3, 0xf5, 0x62, 0xb8, 0x3e, 0xc9, 0x02, 0xa7, 0x9b, 0x42, 0x2c, 0x35, 0x52, 0x0a, 0x13, 0x52, - 0xf3, 0xad, 0x01, 0x95, 0xd3, 0x2e, 0xd0, 0x6d, 0x58, 0xca, 0xae, 0x03, 0x7d, 0x19, 0x88, 0x1c, - 0x66, 0xeb, 0xef, 0x42, 0xca, 0xeb, 0xa6, 0x2c, 0xd4, 0x87, 0x85, 0x80, 0x86, 0x16, 0x65, 0xdc, - 0x94, 0xf3, 0x8e, 0xda, 0x1f, 0x0f, 0xe9, 0x51, 0xa8, 0x76, 0x06, 0x71, 0xfb, 0x4a, 0x0d, 0x57, - 0xb4, 0xfe, 0x8e, 0x52, 0x47, 0x0f, 0xa0, 0x1e, 0x47, 0xd4, 0x74, 0x98, 0x4d, 0x03, 0xca, 0x6c, - 0x61, 0x59, 0x21, 0x67, 0xa2, 0xc0, 0xa2, 0x8c, 0xb3, 0xb8, 0x16, 0x47, 0x74, 0x23, 0x13, 0xc0, - 0x29, 0xbf, 0xf9, 0x9d, 0x01, 0x8b, 0x67, 0x60, 0xa3, 0x3e, 0x2c, 0x26, 0xd3, 0xd8, 0x4c, 0x9e, - 0x2e, 0x3a, 0xf9, 0x1f, 0xe9, 0x88, 0xd9, 0xd7, 0x3f, 0x2c, 0xe7, 0x64, 0x57, 0x54, 0x13, 0xed, - 0x84, 0x87, 0x56, 0xe1, 0x2f, 0x1e, 0x79, 0x69, 0xc6, 0x4c, 0xa3, 0x36, 0x29, 0xe3, 0xa1, 0x43, - 0x55, 0x07, 0xe6, 0xf1, 0x05, 0x8f, 0xbc, 0xdc, 0x4d, 0x78, 0x5d, 0xc5, 0x42, 0xd7, 0x60, 0x3e, - 0x8d, 0x42, 0xd4, 0x41, 0x82, 0xc9, 0xe3, 0xb9, 0x84, 0x28, 0xe2, 0x96, 0x00, 0xce, 0x24, 0x49, - 0x0c, 0x52, 0x16, 0x7b, 0x62, 0x3e, 0xfb, 0xa1, 0x0c, 0x7c, 0x1e, 0x67, 0x04, 0xf4, 0x89, 0x78, - 0xad, 0x30, 0xdf, 0x73, 0x98, 0xe4, 0xab, 0xc7, 0xc8, 0xbd, 0x3f, 0x58, 0x80, 0xd6, 0x7a, 0xa6, - 0x2a, 0x1f, 0x29, 0xc3, 0xb6, 0x9a, 0xb7, 0x60, 0x61, 0x84, 0x2f, 0xb6, 0x43, 0x6f, 0x77, 0x6b, - 0x1d, 0x77, 0xd7, 0xab, 0x39, 0x54, 0x85, 0xb9, 0x41, 0x77, 0xcb, 0x1c, 0xf4, 0xb6, 0x77, 0x77, - 0x3a, 0x5b, 0xeb, 0x55, 0xa3, 0xf9, 0x99, 0x01, 0x95, 0xd3, 0xb7, 0x01, 0xdd, 0x84, 0x3c, 0x77, - 0xa3, 0x34, 0xe1, 0x63, 0xe3, 0x1a, 0xb8, 0x51, 0x2f, 0x87, 0x85, 0x1c, 0xba, 0x0b, 0x45, 0x2f, - 0xe6, 0x31, 0x71, 0x75, 0x2b, 0x4d, 0x78, 0x84, 0x3c, 0x91, 0x32, 0xbd, 0x1c, 0xd6, 0xd2, 0x6b, - 0x65, 0x28, 0x89, 0x6b, 0x27, 0x5f, 0x64, 0xcd, 0x77, 0x53, 0x90, 0x1f, 0xb8, 0x11, 0xba, 0x0e, - 0x0b, 0x16, 0x31, 0x2d, 0x1a, 0x72, 0x67, 0x5f, 0xc4, 0x43, 0x23, 0xdd, 0xce, 0x15, 0x8b, 0x3c, - 0x1c, 0xa2, 0xa2, 0x65, 0x00, 0xee, 0x3f, 0xa7, 0xcc, 0x0c, 0x08, 0x3f, 0x54, 0x83, 0xa4, 0x97, - 0xc3, 0x25, 0x49, 0xeb, 0x13, 0x7e, 0x88, 0xee, 0x40, 0xc1, 0x17, 0xf6, 0xf5, 0x28, 0xb9, 0x32, - 0x3e, 0xaa, 0x6d, 0x81, 0xbd, 0x97, 0xc3, 0x4a, 0x16, 0xfd, 0x17, 0xca, 0x32, 0x26, 0xf5, 0x4a, - 0x91, 0x33, 0xa4, 0x32, 0xe9, 0xc2, 0x0f, 0xdc, 0x48, 0xce, 0x11, 0xb5, 0xb8, 0x7b, 0x06, 0x06, - 0x92, 0x9e, 0xd0, 0xdf, 0x60, 0xde, 0x8a, 0x23, 0xee, 0x7b, 0x89, 0xa9, 0x82, 0x8c, 0xd0, 0xc0, - 0x73, 0x8a, 0xac, 0xc5, 0x96, 0xa1, 0x1c, 0xd1, 0xf0, 0x88, 0x86, 0xa6, 0x1c, 0xf8, 0x45, 0x09, - 0x15, 0x14, 0x69, 0x4b, 0x2c, 0xd8, 0x6b, 0x00, 0x99, 0x0f, 0x54, 0x82, 0x42, 0x7f, 0xb3, 0xb3, - 0xb1, 0xa5, 0xf6, 0xfc, 0x5a, 0xb7, 0x83, 0xbb, 0xb8, 0x6a, 0xac, 0x55, 0x60, 0x4e, 0xe5, 0x22, - 0xf2, 0xe3, 0xd0, 0xa2, 0x6b, 0x73, 0x49, 0x6e, 0x64, 0x6a, 0xbf, 0x9c, 0x82, 0x82, 0x84, 0x89, - 0xae, 0x40, 0xc9, 0x72, 0x1d, 0x71, 0x45, 0x1d, 0x3b, 0x79, 0xc1, 0x2b, 0xc2, 0x86, 0x2d, 0xda, - 0x5d, 0x33, 0x23, 0x6a, 0x85, 0x94, 0xeb, 0xe1, 0x3c, 0xa7, 0x88, 0x3b, 0x92, 0x26, 0x2c, 0x28, - 0xcb, 0x71, 0xe8, 0xca, 0xc4, 0x8a, 0x7d, 0x2e, 0x08, 0xbb, 0xa1, 0x2b, 0x1e, 0x42, 0x91, 0xe5, - 0x07, 0x54, 0xad, 0xe4, 0x12, 0xd6, 0x27, 0xf4, 0x7f, 0x58, 0xa0, 0xcc, 0x0e, 0x7c, 0x87, 0x71, - 0x53, 0x6f, 0xaa, 0x82, 0xdc, 0xd9, 0xed, 0x8f, 0xd4, 0xa4, 0xd5, 0xd5, 0x2a, 0x7d, 0xa9, 0xa1, - 0xb6, 0x75, 0x85, 0x9e, 0x22, 0xd6, 0x3b, 0x70, 0x61, 0x8c, 0xd8, 0xb9, 0xf6, 0xee, 0x57, 0x06, - 0x14, 0x55, 0x6b, 0x8a, 0x62, 0x04, 0xa1, 0x73, 0x24, 0xa6, 0x75, 0xa6, 0x0e, 0x9a, 0xf4, 0x98, - 0x1e, 0xa3, 0x9b, 0x80, 0x74, 0x8a, 0x86, 0x1a, 0x54, 0x9b, 0x5c, 0x54, 0x9c, 0xa1, 0x1e, 0x1d, - 0xd7, 0xcb, 0xf9, 0x09, 0xbd, 0x7c, 0xaa, 0x0b, 0xa6, 0x47, 0xbb, 0x60, 0x6d, 0xe3, 0xcd, 0xfb, - 0x46, 0xee, 0xdd, 0xfb, 0x46, 0xee, 0xc3, 0xfb, 0x86, 0xf1, 0xe9, 0x49, 0xc3, 0xf8, 0xfa, 0xa4, - 0x61, 0xbc, 0x3e, 0x69, 0x18, 0x6f, 0x4e, 0x1a, 0xc6, 0x4f, 0x27, 0x0d, 0xe3, 0x97, 0x93, 0x46, - 0xee, 0xc3, 0x49, 0xc3, 0x78, 0xf5, 0x73, 0x23, 0xf7, 0xec, 0x8a, 0xca, 0xaa, 0xe3, 0xb7, 0x49, - 0xe0, 0xb4, 0x4f, 0xff, 0xeb, 0xed, 0x15, 0xe5, 0xe0, 0xbc, 0xf3, 0x7b, 0x00, 0x00, 0x00, 0xff, - 0xff, 0xa6, 0xbe, 0xc2, 0x69, 0x88, 0x0e, 0x00, 0x00, -} diff --git a/policy/v1beta1/http_response.pb.go b/policy/v1beta1/http_response.pb.go index ec3d55e25f7..66955ad3b5d 100644 --- a/policy/v1beta1/http_response.pb.go +++ b/policy/v1beta1/http_response.pb.go @@ -3,23 +3,28 @@ package v1beta1 -import proto "github.com/gogo/protobuf/proto" -import fmt "fmt" -import math "math" - -import strconv "strconv" - -import strings "strings" -import reflect "reflect" -import sortkeys "github.com/gogo/protobuf/sortkeys" - -import io "io" +import ( + fmt "fmt" + proto "github.com/gogo/protobuf/proto" + github_com_gogo_protobuf_sortkeys "github.com/gogo/protobuf/sortkeys" + io "io" + math "math" + reflect "reflect" + strconv "strconv" + strings "strings" +) // Reference imports to suppress errors if they are not otherwise used. var _ = proto.Marshal var _ = fmt.Errorf var _ = math.Inf +// This is a compile-time assertion to ensure that this generated file +// is compatible with the proto package it is being compiled against. +// A compilation error at this line likely means your copy of the +// proto package needs to be updated. +const _ = proto.GoGoProtoPackageIsVersion2 // please upgrade the proto package + // HTTP response codes. // For more details: http://www.iana.org/assignments/http-status-codes/http-status-codes.xhtml type HttpStatusCode int32 @@ -145,6 +150,7 @@ var HttpStatusCode_name = map[int32]string{ 510: "NotExtended", 511: "NetworkAuthenticationRequired", } + var HttpStatusCode_value = map[string]int32{ "Empty": 0, "Continue": 100, @@ -205,7 +211,9 @@ var HttpStatusCode_value = map[string]int32{ "NetworkAuthenticationRequired": 511, } -func (HttpStatusCode) EnumDescriptor() ([]byte, []int) { return fileDescriptorHttpResponse, []int{0} } +func (HttpStatusCode) EnumDescriptor() ([]byte, []int) { + return fileDescriptor_dffd274153c8a074, []int{0} +} // Direct HTTP response for a client-facing error message which can be attached // to an RPC error. @@ -215,12 +223,40 @@ type DirectHttpResponse struct { // HTTP response body. Body string `protobuf:"bytes,2,opt,name=body,proto3" json:"body,omitempty"` // Optional HTTP response headers. - Headers map[string]string `protobuf:"bytes,3,rep,name=headers" json:"headers,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` + Headers map[string]string `protobuf:"bytes,3,rep,name=headers,proto3" json:"headers,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` } -func (m *DirectHttpResponse) Reset() { *m = DirectHttpResponse{} } -func (*DirectHttpResponse) ProtoMessage() {} -func (*DirectHttpResponse) Descriptor() ([]byte, []int) { return fileDescriptorHttpResponse, []int{0} } +func (m *DirectHttpResponse) Reset() { *m = DirectHttpResponse{} } +func (*DirectHttpResponse) ProtoMessage() {} +func (*DirectHttpResponse) Descriptor() ([]byte, []int) { + return fileDescriptor_dffd274153c8a074, []int{0} +} +func (m *DirectHttpResponse) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *DirectHttpResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_DirectHttpResponse.Marshal(b, m, deterministic) + } else { + b = b[:cap(b)] + n, err := m.MarshalTo(b) + if err != nil { + return nil, err + } + return b[:n], nil + } +} +func (m *DirectHttpResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_DirectHttpResponse.Merge(m, src) +} +func (m *DirectHttpResponse) XXX_Size() int { + return m.Size() +} +func (m *DirectHttpResponse) XXX_DiscardUnknown() { + xxx_messageInfo_DirectHttpResponse.DiscardUnknown(m) +} + +var xxx_messageInfo_DirectHttpResponse proto.InternalMessageInfo func (m *DirectHttpResponse) GetCode() HttpStatusCode { if m != nil { @@ -244,9 +280,83 @@ func (m *DirectHttpResponse) GetHeaders() map[string]string { } func init() { - proto.RegisterType((*DirectHttpResponse)(nil), "istio.policy.v1beta1.DirectHttpResponse") proto.RegisterEnum("istio.policy.v1beta1.HttpStatusCode", HttpStatusCode_name, HttpStatusCode_value) + proto.RegisterType((*DirectHttpResponse)(nil), "istio.policy.v1beta1.DirectHttpResponse") + proto.RegisterMapType((map[string]string)(nil), "istio.policy.v1beta1.DirectHttpResponse.HeadersEntry") +} + +func init() { proto.RegisterFile("policy/v1beta1/http_response.proto", fileDescriptor_dffd274153c8a074) } + +var fileDescriptor_dffd274153c8a074 = []byte{ + // 1042 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x74, 0x55, 0xcb, 0x6f, 0x14, 0xc7, + 0x13, 0xde, 0xd9, 0xe6, 0xe5, 0xc6, 0x98, 0xa6, 0x31, 0x3f, 0xfc, 0x83, 0x64, 0x64, 0xa1, 0x1c, + 0x50, 0x0e, 0xb6, 0x20, 0x8a, 0x84, 0xb8, 0x19, 0x63, 0x83, 0x15, 0xef, 0xe2, 0xac, 0x77, 0x39, + 0xe4, 0x12, 0xb5, 0xa7, 0x6b, 0x77, 0x5b, 0xcc, 0x76, 0x0d, 0x3d, 0xb5, 0x0b, 0x93, 0x53, 0xfe, + 0x04, 0xf2, 0x7e, 0xbf, 0x0e, 0x49, 0x50, 0x04, 0x21, 0x51, 0x72, 0xc9, 0x7f, 0x40, 0xde, 0x3e, + 0x72, 0x0c, 0xcb, 0x25, 0xb7, 0x70, 0xc8, 0x3b, 0x51, 0x12, 0x75, 0xef, 0x43, 0x46, 0x21, 0xb7, + 0xe9, 0x9a, 0xfa, 0xaa, 0xbe, 0xfa, 0xbe, 0x9a, 0x69, 0x7e, 0x24, 0xc3, 0xd4, 0x24, 0xc5, 0x7c, + 0xef, 0xd8, 0x06, 0x90, 0x3a, 0x36, 0xdf, 0x26, 0xca, 0x9e, 0x74, 0x90, 0x67, 0x68, 0x73, 0x98, + 0xcb, 0x1c, 0x12, 0xca, 0x69, 0x93, 0x93, 0xc1, 0xb9, 0x41, 0xe6, 0xdc, 0x30, 0xf3, 0xc8, 0x0f, + 0x11, 0x97, 0xa7, 0x8d, 0x83, 0x84, 0xce, 0x12, 0x65, 0xb5, 0x21, 0x44, 0x9e, 0xe0, 0xdb, 0x12, + 0xd4, 0x30, 0x13, 0xcd, 0x46, 0x47, 0xa7, 0x8e, 0x3f, 0x34, 0x77, 0x3f, 0xec, 0x9c, 0x47, 0xac, + 0x93, 0xa2, 0x6e, 0xbe, 0x88, 0x1a, 0x6a, 0x01, 0x21, 0x25, 0xdf, 0xb6, 0x81, 0xba, 0x98, 0x29, + 0xcf, 0x46, 0x47, 0x27, 0x6a, 0xe1, 0x59, 0x9e, 0xe3, 0x3b, 0xdb, 0xa0, 0x34, 0xb8, 0x7c, 0x86, + 0xcd, 0xb2, 0xa3, 0xbb, 0x8f, 0x3f, 0x7a, 0xff, 0x82, 0xff, 0x26, 0x32, 0x77, 0x76, 0x80, 0x5b, + 0xb2, 0xe4, 0x8a, 0xda, 0xa8, 0xca, 0xa1, 0x93, 0x7c, 0x72, 0xeb, 0x0b, 0x29, 0x38, 0xbb, 0x00, + 0x45, 0x60, 0x3b, 0x51, 0xf3, 0x8f, 0x72, 0x9a, 0x6f, 0xef, 0xa9, 0xb4, 0x0b, 0x43, 0x1e, 0x83, + 0xc3, 0xc9, 0xf2, 0x89, 0xe8, 0xe1, 0xcf, 0x26, 0xf8, 0xd4, 0xbd, 0xcc, 0xe5, 0x04, 0xdf, 0xbe, + 0xd4, 0xc9, 0xa8, 0x10, 0x25, 0x39, 0xc9, 0x77, 0x2d, 0xa2, 0x25, 0x63, 0xbb, 0x20, 0xb4, 0xdc, + 0xc9, 0xcb, 0xe7, 0x1e, 0x13, 0x37, 0x23, 0x39, 0xc9, 0x77, 0x2e, 0x3a, 0x50, 0x04, 0x5a, 0x7c, + 0x1e, 0xc9, 0x3d, 0x7c, 0xd7, 0x42, 0x92, 0x40, 0xe6, 0x8f, 0x5f, 0x44, 0x72, 0x96, 0x1f, 0xae, + 0xa2, 0x5d, 0xe8, 0x52, 0x1b, 0x9d, 0x21, 0x45, 0xa6, 0x07, 0x2b, 0xb6, 0x89, 0xae, 0xa3, 0xc8, + 0xa0, 0x15, 0x5f, 0x46, 0x72, 0x8a, 0x4f, 0x54, 0xd1, 0xd7, 0x05, 0x4b, 0xe2, 0xab, 0x48, 0xee, + 0xe3, 0x93, 0x35, 0xc8, 0x81, 0x46, 0xa1, 0xaf, 0x23, 0xb9, 0x9f, 0x4f, 0xad, 0x29, 0x47, 0x46, + 0xa5, 0xa3, 0xe0, 0x37, 0x91, 0x14, 0x7c, 0x77, 0xa5, 0x9b, 0x92, 0x19, 0x70, 0x15, 0xdf, 0x46, + 0x72, 0x9a, 0xef, 0x5d, 0x48, 0x1d, 0x28, 0x5d, 0xd4, 0x20, 0x43, 0xe7, 0x19, 0x6c, 0x46, 0x72, + 0x37, 0xdf, 0xb1, 0x52, 0x69, 0xe4, 0xa0, 0x45, 0x3f, 0xa4, 0x04, 0x50, 0x96, 0xc2, 0x62, 0x1b, + 0x4d, 0x02, 0xb9, 0xb8, 0x56, 0x96, 0x07, 0xb8, 0xa8, 0x60, 0x0f, 0xf4, 0x1a, 0xb8, 0x8e, 0xb2, + 0x60, 0x29, 0x2d, 0xc4, 0xf5, 0xb2, 0xe4, 0x7c, 0xfb, 0x32, 0x76, 0xad, 0x16, 0x1f, 0x96, 0xfd, + 0x58, 0xeb, 0x00, 0xe7, 0xa8, 0x0d, 0x4e, 0xdc, 0x28, 0xfb, 0xe6, 0x55, 0xa4, 0x0a, 0x6a, 0xd3, + 0x34, 0xa0, 0xc5, 0x47, 0x21, 0xa1, 0x91, 0xc3, 0x9a, 0xc3, 0xcb, 0x85, 0xf8, 0xb8, 0x2c, 0xff, + 0xc7, 0xf7, 0xd5, 0xa1, 0x93, 0xa1, 0x53, 0xae, 0xa8, 0x81, 0x0e, 0xe6, 0x89, 0x4f, 0x42, 0x7c, + 0xdc, 0x65, 0x1c, 0xff, 0xb4, 0x2c, 0xf7, 0x72, 0x7e, 0x4a, 0xe9, 0x1a, 0x5c, 0xec, 0x42, 0x4e, + 0xe2, 0x0a, 0xf3, 0x32, 0x34, 0xac, 0x1a, 0xe8, 0xf6, 0x14, 0x68, 0xf1, 0x0c, 0xf3, 0xe4, 0xd7, + 0x54, 0xd1, 0x09, 0xc8, 0x8b, 0x5d, 0xe3, 0x40, 0x8b, 0x67, 0x99, 0xd7, 0x6f, 0x19, 0xdd, 0x86, + 0xd1, 0x1a, 0xac, 0x78, 0x8e, 0x79, 0x22, 0x55, 0xa4, 0x01, 0xf1, 0xe7, 0x59, 0x98, 0x0d, 0xa8, + 0x8d, 0xba, 0x8a, 0xb4, 0x90, 0xa6, 0x78, 0x09, 0xb4, 0x78, 0x81, 0x49, 0xc9, 0xf7, 0xf8, 0x40, + 0x70, 0x4a, 0x6d, 0xa4, 0x20, 0x5e, 0x64, 0xde, 0xab, 0xc0, 0xdf, 0xbb, 0x05, 0x96, 0x4c, 0x12, + 0x3c, 0x1a, 0xf7, 0x7a, 0x89, 0x79, 0x23, 0x86, 0x14, 0xeb, 0xa6, 0x03, 0xd8, 0x25, 0xf1, 0x72, + 0x68, 0xb8, 0x88, 0xb6, 0x99, 0x9a, 0x84, 0xc4, 0x2b, 0x4c, 0x4e, 0xf0, 0x6d, 0x67, 0xd0, 0x82, + 0x78, 0x35, 0xa4, 0xaf, 0x82, 0x6d, 0x51, 0x7b, 0x5c, 0xe3, 0x35, 0x26, 0x0f, 0x72, 0xb9, 0xe6, + 0x20, 0x41, 0xab, 0x8d, 0x2f, 0xbf, 0xac, 0x4c, 0x0a, 0x5a, 0xbc, 0x3e, 0x1a, 0x2f, 0x45, 0xa5, + 0xeb, 0x88, 0xab, 0xca, 0xb5, 0x40, 0xbc, 0xc1, 0xbc, 0x30, 0x8d, 0xda, 0x8a, 0x8f, 0xa0, 0x6d, + 0x89, 0x37, 0x99, 0xfc, 0x3f, 0x9f, 0x6e, 0xd8, 0xbc, 0x9b, 0x0d, 0x1c, 0xae, 0x80, 0x36, 0xaa, + 0x5e, 0x64, 0x20, 0xde, 0x62, 0x72, 0x86, 0xef, 0xaf, 0x29, 0xdb, 0x82, 0x2a, 0xd2, 0xba, 0x22, + 0x93, 0x37, 0x4d, 0x18, 0xed, 0x6d, 0xe6, 0x65, 0x5f, 0xba, 0x9c, 0x41, 0x42, 0x6a, 0x4b, 0xcf, + 0x77, 0x02, 0x99, 0x8a, 0xc9, 0x07, 0x36, 0xc0, 0x58, 0xfe, 0x77, 0x43, 0xa9, 0x86, 0xcd, 0x1c, + 0x26, 0x90, 0xe7, 0xbe, 0xc8, 0x92, 0x25, 0x43, 0x85, 0x78, 0x8f, 0xf9, 0x7d, 0x5a, 0xc5, 0xe4, + 0x02, 0x68, 0xf1, 0x7e, 0x50, 0x77, 0x50, 0xec, 0x34, 0x64, 0x60, 0x35, 0xd8, 0xa4, 0x10, 0x57, + 0xc3, 0x28, 0x8d, 0xac, 0xe5, 0x94, 0x86, 0xf1, 0xe4, 0x1f, 0x04, 0xe6, 0x5b, 0x27, 0x1f, 0xbf, + 0xba, 0x16, 0x00, 0x75, 0xc4, 0x8a, 0xb2, 0xc5, 0x90, 0x43, 0x2e, 0xae, 0x07, 0x43, 0x86, 0xc7, + 0xc1, 0x17, 0xbd, 0x6c, 0x20, 0xd5, 0xf9, 0x58, 0x9d, 0x1b, 0x81, 0xe6, 0x8a, 0x25, 0x70, 0x56, + 0xa5, 0xeb, 0xe0, 0x7a, 0xe0, 0x96, 0x9c, 0x43, 0x27, 0x7e, 0x0c, 0xda, 0x57, 0x91, 0x56, 0x3a, + 0x59, 0x0a, 0x7e, 0x63, 0x40, 0x8b, 0x9f, 0xd8, 0x70, 0xcb, 0xce, 0x28, 0x82, 0x4b, 0xaa, 0x10, + 0x3f, 0x87, 0xf9, 0x3d, 0xce, 0x24, 0xd0, 0xb0, 0xaa, 0xa7, 0x4c, 0x1a, 0x04, 0xfb, 0x25, 0xc0, + 0x87, 0x69, 0x23, 0xa7, 0x7f, 0x65, 0xf2, 0x01, 0x7e, 0xf0, 0x6c, 0xbd, 0xbe, 0x76, 0x1e, 0x5c, + 0x6e, 0xd0, 0x7a, 0x95, 0x47, 0x36, 0x88, 0xdf, 0x98, 0x3c, 0xc4, 0x0f, 0x9c, 0x57, 0xce, 0x28, + 0x4b, 0x0b, 0x69, 0x8e, 0x55, 0x68, 0x21, 0x19, 0x45, 0x90, 0x8b, 0xdf, 0x87, 0x3c, 0xf3, 0x6e, + 0xb3, 0x69, 0x12, 0x03, 0x96, 0xd6, 0x09, 0x9d, 0x6a, 0x81, 0xf8, 0x23, 0xec, 0xf9, 0x2a, 0x62, + 0x76, 0x1a, 0x28, 0x58, 0x20, 0xfe, 0x64, 0xc3, 0x8f, 0x6b, 0xe9, 0x32, 0x79, 0x45, 0xb5, 0xf8, + 0x8b, 0xc9, 0x23, 0xfc, 0xc1, 0x2a, 0xd0, 0x25, 0x74, 0x17, 0xfe, 0x63, 0x37, 0xff, 0x66, 0xa7, + 0x1e, 0xdf, 0xbc, 0x1d, 0x97, 0x6e, 0xdd, 0x8e, 0x4b, 0x77, 0x6f, 0xc7, 0xd1, 0xd3, 0xfd, 0x38, + 0xba, 0xda, 0x8f, 0xa3, 0x9b, 0xfd, 0x38, 0xda, 0xec, 0xc7, 0xd1, 0x77, 0xfd, 0x38, 0xfa, 0xbe, + 0x1f, 0x97, 0xee, 0xf6, 0xe3, 0xe8, 0xca, 0x9d, 0xb8, 0xb4, 0x79, 0x27, 0x2e, 0xdd, 0xba, 0x13, + 0x97, 0x9e, 0x38, 0x3c, 0xf8, 0xd9, 0x1a, 0x9c, 0x57, 0x99, 0x99, 0xbf, 0xf7, 0xaa, 0xd8, 0xd8, + 0x11, 0x6e, 0x87, 0x47, 0xfe, 0x09, 0x00, 0x00, 0xff, 0xff, 0xea, 0x47, 0xf8, 0xf5, 0x43, 0x06, + 0x00, 0x00, } + func (x HttpStatusCode) String() string { s, ok := HttpStatusCode_name[int32(x)] if ok { @@ -301,7 +411,7 @@ func (this *DirectHttpResponse) GoString() string { for k, _ := range this.Headers { keysForHeaders = append(keysForHeaders, k) } - sortkeys.Strings(keysForHeaders) + github_com_gogo_protobuf_sortkeys.Strings(keysForHeaders) mapStringForHeaders := "map[string]string{" for _, k := range keysForHeaders { mapStringForHeaders += fmt.Sprintf("%#v: %#v,", k, this.Headers[k]) @@ -377,6 +487,9 @@ func encodeVarintHttpResponse(dAtA []byte, offset int, v uint64) int { return offset + 1 } func (m *DirectHttpResponse) Size() (n int) { + if m == nil { + return 0 + } var l int _ = l if m.Code != 0 { @@ -418,7 +531,7 @@ func (this *DirectHttpResponse) String() string { for k, _ := range this.Headers { keysForHeaders = append(keysForHeaders, k) } - sortkeys.Strings(keysForHeaders) + github_com_gogo_protobuf_sortkeys.Strings(keysForHeaders) mapStringForHeaders := "map[string]string{" for _, k := range keysForHeaders { mapStringForHeaders += fmt.Sprintf("%v: %v,", k, this.Headers[k]) @@ -455,7 +568,7 @@ func (m *DirectHttpResponse) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - wire |= (uint64(b) & 0x7F) << shift + wire |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -483,7 +596,7 @@ func (m *DirectHttpResponse) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - m.Code |= (HttpStatusCode(b) & 0x7F) << shift + m.Code |= HttpStatusCode(b&0x7F) << shift if b < 0x80 { break } @@ -502,7 +615,7 @@ func (m *DirectHttpResponse) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLen |= (uint64(b) & 0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -512,6 +625,9 @@ func (m *DirectHttpResponse) Unmarshal(dAtA []byte) error { return ErrInvalidLengthHttpResponse } postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthHttpResponse + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -531,7 +647,7 @@ func (m *DirectHttpResponse) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - msglen |= (int(b) & 0x7F) << shift + msglen |= int(b&0x7F) << shift if b < 0x80 { break } @@ -540,6 +656,9 @@ func (m *DirectHttpResponse) Unmarshal(dAtA []byte) error { return ErrInvalidLengthHttpResponse } postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthHttpResponse + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -560,7 +679,7 @@ func (m *DirectHttpResponse) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - wire |= (uint64(b) & 0x7F) << shift + wire |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -577,7 +696,7 @@ func (m *DirectHttpResponse) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLenmapkey |= (uint64(b) & 0x7F) << shift + stringLenmapkey |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -587,6 +706,9 @@ func (m *DirectHttpResponse) Unmarshal(dAtA []byte) error { return ErrInvalidLengthHttpResponse } postStringIndexmapkey := iNdEx + intStringLenmapkey + if postStringIndexmapkey < 0 { + return ErrInvalidLengthHttpResponse + } if postStringIndexmapkey > l { return io.ErrUnexpectedEOF } @@ -603,7 +725,7 @@ func (m *DirectHttpResponse) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLenmapvalue |= (uint64(b) & 0x7F) << shift + stringLenmapvalue |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -613,6 +735,9 @@ func (m *DirectHttpResponse) Unmarshal(dAtA []byte) error { return ErrInvalidLengthHttpResponse } postStringIndexmapvalue := iNdEx + intStringLenmapvalue + if postStringIndexmapvalue < 0 { + return ErrInvalidLengthHttpResponse + } if postStringIndexmapvalue > l { return io.ErrUnexpectedEOF } @@ -644,6 +769,9 @@ func (m *DirectHttpResponse) Unmarshal(dAtA []byte) error { if skippy < 0 { return ErrInvalidLengthHttpResponse } + if (iNdEx + skippy) < 0 { + return ErrInvalidLengthHttpResponse + } if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF } @@ -710,10 +838,13 @@ func skipHttpResponse(dAtA []byte) (n int, err error) { break } } - iNdEx += length if length < 0 { return 0, ErrInvalidLengthHttpResponse } + iNdEx += length + if iNdEx < 0 { + return 0, ErrInvalidLengthHttpResponse + } return iNdEx, nil case 3: for { @@ -742,6 +873,9 @@ func skipHttpResponse(dAtA []byte) (n int, err error) { return 0, err } iNdEx = start + next + if iNdEx < 0 { + return 0, ErrInvalidLengthHttpResponse + } } return iNdEx, nil case 4: @@ -760,74 +894,3 @@ var ( ErrInvalidLengthHttpResponse = fmt.Errorf("proto: negative length found during unmarshaling") ErrIntOverflowHttpResponse = fmt.Errorf("proto: integer overflow") ) - -func init() { proto.RegisterFile("policy/v1beta1/http_response.proto", fileDescriptorHttpResponse) } - -var fileDescriptorHttpResponse = []byte{ - // 1032 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x74, 0x55, 0x4b, 0x8f, 0x1b, 0x45, - 0x10, 0xde, 0x71, 0xe7, 0xb5, 0x9d, 0xcd, 0xa6, 0xd3, 0xd9, 0x90, 0x25, 0x01, 0x6b, 0x15, 0x71, - 0x88, 0x38, 0x78, 0x95, 0x20, 0xa4, 0x28, 0xb7, 0xcd, 0xc6, 0x9b, 0x58, 0xac, 0x1d, 0xcb, 0x6b, - 0xe7, 0xc0, 0x05, 0xf5, 0x4e, 0x97, 0xed, 0x56, 0xc6, 0x5d, 0x93, 0x9e, 0xb2, 0x93, 0xe1, 0xc4, - 0x4f, 0x08, 0xef, 0xf7, 0xeb, 0x00, 0x44, 0x28, 0x21, 0x20, 0xb8, 0xf0, 0x0f, 0xc2, 0x3b, 0x47, - 0x8e, 0xc4, 0x5c, 0xb8, 0x91, 0x03, 0x6f, 0x10, 0xa0, 0x6e, 0x3f, 0xb4, 0x11, 0xe1, 0x36, 0x5d, - 0x53, 0x5f, 0xd5, 0x57, 0xdf, 0x57, 0x33, 0xcd, 0x8f, 0xa4, 0x98, 0x98, 0x38, 0x5f, 0x1e, 0x1c, - 0xdb, 0x04, 0x52, 0xc7, 0x96, 0xbb, 0x44, 0xe9, 0x13, 0x0e, 0xb2, 0x14, 0x6d, 0x06, 0xa5, 0xd4, - 0x21, 0xa1, 0x5c, 0x30, 0x19, 0x19, 0x2c, 0x8d, 0x32, 0x4b, 0xe3, 0xcc, 0x23, 0x3f, 0x46, 0x5c, - 0x9e, 0x36, 0x0e, 0x62, 0x3a, 0x4b, 0x94, 0x36, 0xc6, 0x10, 0x79, 0x82, 0x6f, 0x8b, 0x51, 0xc3, - 0x62, 0xb4, 0x14, 0x1d, 0x9d, 0x3f, 0xfe, 0x50, 0xe9, 0x5e, 0xd8, 0x92, 0x47, 0x6c, 0x90, 0xa2, - 0x7e, 0xb6, 0x8a, 0x1a, 0x1a, 0x01, 0x21, 0x25, 0xdf, 0xb6, 0x89, 0x3a, 0x5f, 0x2c, 0x2c, 0x45, - 0x47, 0x67, 0x1b, 0xe1, 0x59, 0x9e, 0xe3, 0x3b, 0xbb, 0xa0, 0x34, 0xb8, 0x6c, 0x91, 0x2d, 0xb1, - 0xa3, 0xbb, 0x8f, 0x3f, 0x7a, 0xef, 0x82, 0xff, 0x25, 0x52, 0x3a, 0x3b, 0xc2, 0x95, 0x2d, 0xb9, - 0xbc, 0x31, 0xa9, 0x72, 0xe8, 0x24, 0x9f, 0xdb, 0xfa, 0x42, 0x0a, 0xce, 0x2e, 0x40, 0x1e, 0xd8, - 0xce, 0x36, 0xfc, 0xa3, 0x5c, 0xe0, 0xdb, 0x07, 0x2a, 0xe9, 0xc3, 0x98, 0xc7, 0xe8, 0x70, 0xb2, - 0x70, 0x22, 0x7a, 0xf8, 0xd3, 0x59, 0x3e, 0x7f, 0x37, 0x73, 0x39, 0xcb, 0xb7, 0x97, 0x7b, 0x29, - 0xe5, 0x62, 0x46, 0xce, 0xf1, 0x5d, 0xab, 0x68, 0xc9, 0xd8, 0x3e, 0x08, 0x2d, 0x77, 0xf2, 0xc2, - 0xb9, 0xc7, 0xc4, 0xcd, 0x48, 0xce, 0xf1, 0x9d, 0xab, 0x0e, 0x14, 0x81, 0x16, 0x9f, 0x45, 0x72, - 0x0f, 0xdf, 0xb5, 0x12, 0xc7, 0x90, 0xfa, 0xe3, 0xe7, 0x91, 0x5c, 0xe2, 0x87, 0x6b, 0x68, 0x57, - 0xfa, 0xd4, 0x45, 0x67, 0x48, 0x91, 0x19, 0x40, 0xc5, 0xb6, 0xd1, 0xf5, 0x14, 0x19, 0xb4, 0xe2, - 0x8b, 0x48, 0xce, 0xf3, 0xd9, 0x1a, 0xfa, 0xba, 0x60, 0x49, 0x7c, 0x19, 0xc9, 0x7d, 0x7c, 0xae, - 0x01, 0x19, 0xd0, 0x24, 0xf4, 0x55, 0x24, 0xf7, 0xf3, 0xf9, 0xba, 0x72, 0x64, 0x54, 0x32, 0x09, - 0x7e, 0x1d, 0x49, 0xc1, 0x77, 0x57, 0xfb, 0x09, 0x99, 0x11, 0x57, 0xf1, 0x4d, 0x24, 0x17, 0xf8, - 0xde, 0x95, 0xc4, 0x81, 0xd2, 0x79, 0x03, 0x52, 0x74, 0x9e, 0xc1, 0xad, 0x48, 0xee, 0xe6, 0x3b, - 0x2a, 0xd5, 0x56, 0x06, 0x5a, 0x0c, 0x43, 0x4a, 0x00, 0xa5, 0x09, 0xac, 0x76, 0xd1, 0xc4, 0x90, - 0x89, 0x6b, 0x05, 0x79, 0x80, 0x8b, 0x2a, 0x0e, 0x40, 0xd7, 0xc1, 0xf5, 0x94, 0x05, 0x4b, 0x49, - 0x2e, 0xae, 0x17, 0x24, 0xe7, 0xdb, 0xd7, 0xb0, 0x6f, 0xb5, 0xf8, 0xa0, 0xe0, 0xc7, 0xda, 0x00, - 0x38, 0x47, 0x5d, 0x70, 0xe2, 0x46, 0xc1, 0x37, 0xaf, 0x21, 0x55, 0x51, 0x9b, 0xb6, 0x01, 0x2d, - 0x3e, 0x0c, 0x09, 0xad, 0x0c, 0xea, 0x0e, 0x2f, 0xe7, 0xe2, 0xa3, 0x82, 0xbc, 0x8f, 0xef, 0x6b, - 0x42, 0x2f, 0x45, 0xa7, 0x5c, 0xde, 0x00, 0x1d, 0xcc, 0x13, 0x1f, 0x87, 0xf8, 0xb4, 0xcb, 0x34, - 0xfe, 0x49, 0x41, 0xee, 0xe5, 0xfc, 0x94, 0xd2, 0x0d, 0xb8, 0xd8, 0x87, 0x8c, 0xc4, 0x15, 0xe6, - 0x65, 0x68, 0x59, 0x35, 0xd2, 0xed, 0x49, 0xd0, 0xe2, 0x69, 0xe6, 0xc9, 0xd7, 0x55, 0xde, 0x0b, - 0xc8, 0x8b, 0x7d, 0xe3, 0x40, 0x8b, 0x67, 0x98, 0xd7, 0x6f, 0x0d, 0xdd, 0xa6, 0xd1, 0x1a, 0xac, - 0x78, 0x96, 0x79, 0x22, 0x35, 0xa4, 0x11, 0xf1, 0xe7, 0x58, 0x98, 0x0d, 0xa8, 0x8b, 0xba, 0x86, - 0xb4, 0x92, 0x24, 0x78, 0x09, 0xb4, 0x78, 0x9e, 0x49, 0xc9, 0xf7, 0xf8, 0x40, 0x70, 0x4a, 0x6d, - 0x26, 0x20, 0x5e, 0x60, 0xde, 0xab, 0xc0, 0xdf, 0xbb, 0x05, 0x96, 0x4c, 0x1c, 0x3c, 0x9a, 0xf6, - 0x7a, 0x91, 0x79, 0x23, 0xc6, 0x14, 0x9b, 0xa6, 0x07, 0xd8, 0x27, 0xf1, 0x52, 0x68, 0xb8, 0x8a, - 0xb6, 0x9d, 0x98, 0x98, 0xc4, 0xcb, 0x4c, 0xce, 0xf2, 0x6d, 0x67, 0xd0, 0x82, 0x78, 0x25, 0xa4, - 0xaf, 0x83, 0xed, 0x50, 0x77, 0x5a, 0xe3, 0x55, 0x26, 0x0f, 0x72, 0x59, 0x77, 0x10, 0xa3, 0xd5, - 0xc6, 0x97, 0x5f, 0x53, 0x26, 0x01, 0x2d, 0x5e, 0x9b, 0x8c, 0x97, 0xa0, 0xd2, 0x4d, 0xc4, 0x75, - 0xe5, 0x3a, 0x20, 0x5e, 0x67, 0x5e, 0x98, 0x56, 0xa3, 0xe2, 0x23, 0x68, 0x3b, 0xe2, 0x0d, 0x26, - 0xef, 0xe7, 0x0b, 0x2d, 0x9b, 0xf5, 0xd3, 0x91, 0xc3, 0x55, 0xd0, 0x46, 0x35, 0xf3, 0x14, 0xc4, - 0x9b, 0x4c, 0x2e, 0xf2, 0xfd, 0x0d, 0x65, 0x3b, 0x50, 0x43, 0xda, 0x50, 0x64, 0xb2, 0xb6, 0x09, - 0xa3, 0xbd, 0xc5, 0xbc, 0xec, 0xe5, 0xcb, 0x29, 0xc4, 0xa4, 0xb6, 0xf4, 0x7c, 0x3b, 0x90, 0xa9, - 0x9a, 0x6c, 0x64, 0x03, 0x4c, 0xe5, 0x7f, 0x27, 0x94, 0x6a, 0xd9, 0xd4, 0x61, 0x0c, 0x59, 0xe6, - 0x8b, 0x94, 0x2d, 0x19, 0xca, 0xc5, 0xbb, 0xcc, 0xef, 0xd3, 0x3a, 0xc6, 0x17, 0x40, 0x8b, 0xf7, - 0x82, 0xba, 0xa3, 0x62, 0xa7, 0x21, 0x05, 0xab, 0xc1, 0xc6, 0xb9, 0xb8, 0x1a, 0x46, 0x69, 0xa5, - 0x1d, 0xa7, 0x34, 0x4c, 0x27, 0x7f, 0x3f, 0x30, 0xdf, 0x3a, 0xf9, 0xf4, 0xd5, 0xb5, 0x00, 0x68, - 0x22, 0x56, 0x95, 0xcd, 0xc7, 0x1c, 0x32, 0x71, 0x3d, 0x18, 0x32, 0x3e, 0x8e, 0xbe, 0xe8, 0x35, - 0x03, 0x89, 0xce, 0xa6, 0xea, 0xdc, 0x08, 0x34, 0x2b, 0x96, 0xc0, 0x59, 0x95, 0x6c, 0x80, 0x1b, - 0x80, 0x2b, 0x3b, 0x87, 0x4e, 0xfc, 0x14, 0xb4, 0xaf, 0x21, 0x55, 0x7a, 0x69, 0x02, 0x7e, 0x63, - 0x40, 0x8b, 0x9f, 0xd9, 0x78, 0xcb, 0xce, 0x28, 0x82, 0x4b, 0x2a, 0x17, 0xbf, 0x84, 0xf9, 0x3d, - 0xce, 0xc4, 0xd0, 0xb2, 0x6a, 0xa0, 0x4c, 0x12, 0x04, 0xfb, 0x35, 0xc0, 0xc7, 0x69, 0x13, 0xa7, - 0x7f, 0x63, 0xf2, 0x01, 0x7e, 0xf0, 0x6c, 0xb3, 0x59, 0x3f, 0x0f, 0x2e, 0x33, 0x68, 0xbd, 0xca, - 0x13, 0x1b, 0xc4, 0xef, 0x4c, 0x1e, 0xe2, 0x07, 0xce, 0x2b, 0x67, 0x94, 0xa5, 0x95, 0x24, 0xc3, - 0x1a, 0x74, 0x90, 0x8c, 0x22, 0xc8, 0xc4, 0x1f, 0x63, 0x9e, 0x59, 0xbf, 0xdd, 0x36, 0xb1, 0x01, - 0x4b, 0x1b, 0x84, 0x4e, 0x75, 0x40, 0xfc, 0x19, 0xf6, 0x7c, 0x1d, 0x31, 0x3d, 0x0d, 0x14, 0x2c, - 0x10, 0x7f, 0xb1, 0xf1, 0xc7, 0x55, 0xbe, 0x4c, 0x5e, 0x51, 0x2d, 0xfe, 0x66, 0xf2, 0x08, 0x7f, - 0xb0, 0x06, 0x74, 0x09, 0xdd, 0x85, 0xff, 0xd9, 0xcd, 0x7f, 0xd8, 0xa9, 0xca, 0xad, 0xdb, 0xc5, - 0x99, 0x6f, 0x6f, 0x17, 0x67, 0xee, 0xdc, 0x2e, 0x46, 0x4f, 0x0d, 0x8b, 0xd1, 0xd5, 0x61, 0x31, - 0xba, 0x39, 0x2c, 0x46, 0xb7, 0x86, 0xc5, 0xe8, 0xbb, 0x61, 0x31, 0xfa, 0x61, 0x58, 0x9c, 0xb9, - 0x33, 0x2c, 0x46, 0x57, 0xbe, 0x2f, 0xce, 0x3c, 0x7e, 0x78, 0xf4, 0x93, 0x35, 0xb8, 0xac, 0x52, - 0xb3, 0x7c, 0xf7, 0x15, 0xb1, 0xb9, 0x23, 0xdc, 0x0a, 0x8f, 0xfc, 0x1b, 0x00, 0x00, 0xff, 0xff, - 0xd9, 0x97, 0x1d, 0x7f, 0x3b, 0x06, 0x00, 0x00, -} diff --git a/policy/v1beta1/type.pb.go b/policy/v1beta1/type.pb.go index c1a2ab10607..41c9dfa9f84 100644 --- a/policy/v1beta1/type.pb.go +++ b/policy/v1beta1/type.pb.go @@ -1,28 +1,33 @@ // Code generated by protoc-gen-gogo. DO NOT EDIT. // source: policy/v1beta1/type.proto -package v1beta1 - -import proto "github.com/gogo/protobuf/proto" -import fmt "fmt" -import math "math" -import google_protobuf2 "github.com/gogo/protobuf/types" -import google_protobuf3 "github.com/gogo/protobuf/types" - -import bytes "bytes" +// Describes the rules used to configure Mixer's policy and telemetry features. -import strings "strings" -import reflect "reflect" - -import binary "encoding/binary" +package v1beta1 -import io "io" +import ( + bytes "bytes" + encoding_binary "encoding/binary" + fmt "fmt" + proto "github.com/gogo/protobuf/proto" + types "github.com/gogo/protobuf/types" + io "io" + math "math" + reflect "reflect" + strings "strings" +) // Reference imports to suppress errors if they are not otherwise used. var _ = proto.Marshal var _ = fmt.Errorf var _ = math.Inf +// This is a compile-time assertion to ensure that this generated file +// is compatible with the proto package it is being compiled against. +// A compilation error at this line likely means your copy of the +// proto package needs to be updated. +const _ = proto.GoGoProtoPackageIsVersion2 // please upgrade the proto package + // An instance field of type Value denotes that the expression for the field is of dynamic type and can evalaute to any // [ValueType][istio.policy.v1beta1.ValueType] enum values. For example, when // authoring an instance configuration for a template that has a field `data` of type `istio.policy.v1beta1.Value`, @@ -47,9 +52,37 @@ type Value struct { Value isValue_Value `protobuf_oneof:"value"` } -func (m *Value) Reset() { *m = Value{} } -func (*Value) ProtoMessage() {} -func (*Value) Descriptor() ([]byte, []int) { return fileDescriptorType, []int{0} } +func (m *Value) Reset() { *m = Value{} } +func (*Value) ProtoMessage() {} +func (*Value) Descriptor() ([]byte, []int) { + return fileDescriptor_81aa672910c4f44d, []int{0} +} +func (m *Value) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *Value) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_Value.Marshal(b, m, deterministic) + } else { + b = b[:cap(b)] + n, err := m.MarshalTo(b) + if err != nil { + return nil, err + } + return b[:n], nil + } +} +func (m *Value) XXX_Merge(src proto.Message) { + xxx_messageInfo_Value.Merge(m, src) +} +func (m *Value) XXX_Size() int { + return m.Size() +} +func (m *Value) XXX_DiscardUnknown() { + xxx_messageInfo_Value.DiscardUnknown(m) +} + +var xxx_messageInfo_Value proto.InternalMessageInfo type isValue_Value interface { isValue_Value() @@ -71,22 +104,22 @@ type Value_BoolValue struct { BoolValue bool `protobuf:"varint,4,opt,name=bool_value,json=boolValue,proto3,oneof"` } type Value_IpAddressValue struct { - IpAddressValue *IPAddress `protobuf:"bytes,5,opt,name=ip_address_value,json=ipAddressValue,oneof"` + IpAddressValue *IPAddress `protobuf:"bytes,5,opt,name=ip_address_value,json=ipAddressValue,proto3,oneof"` } type Value_TimestampValue struct { - TimestampValue *TimeStamp `protobuf:"bytes,6,opt,name=timestamp_value,json=timestampValue,oneof"` + TimestampValue *TimeStamp `protobuf:"bytes,6,opt,name=timestamp_value,json=timestampValue,proto3,oneof"` } type Value_DurationValue struct { - DurationValue *Duration `protobuf:"bytes,7,opt,name=duration_value,json=durationValue,oneof"` + DurationValue *Duration `protobuf:"bytes,7,opt,name=duration_value,json=durationValue,proto3,oneof"` } type Value_EmailAddressValue struct { - EmailAddressValue *EmailAddress `protobuf:"bytes,8,opt,name=email_address_value,json=emailAddressValue,oneof"` + EmailAddressValue *EmailAddress `protobuf:"bytes,8,opt,name=email_address_value,json=emailAddressValue,proto3,oneof"` } type Value_DnsNameValue struct { - DnsNameValue *DNSName `protobuf:"bytes,9,opt,name=dns_name_value,json=dnsNameValue,oneof"` + DnsNameValue *DNSName `protobuf:"bytes,9,opt,name=dns_name_value,json=dnsNameValue,proto3,oneof"` } type Value_UriValue struct { - UriValue *Uri `protobuf:"bytes,10,opt,name=uri_value,json=uriValue,oneof"` + UriValue *Uri `protobuf:"bytes,10,opt,name=uri_value,json=uriValue,proto3,oneof"` } func (*Value_StringValue) isValue_Value() {} @@ -339,46 +372,46 @@ func _Value_OneofSizer(msg proto.Message) (n int) { // value switch x := m.Value.(type) { case *Value_StringValue: - n += proto.SizeVarint(1<<3 | proto.WireBytes) + n += 1 // tag and wire n += proto.SizeVarint(uint64(len(x.StringValue))) n += len(x.StringValue) case *Value_Int64Value: - n += proto.SizeVarint(2<<3 | proto.WireVarint) + n += 1 // tag and wire n += proto.SizeVarint(uint64(x.Int64Value)) case *Value_DoubleValue: - n += proto.SizeVarint(3<<3 | proto.WireFixed64) + n += 1 // tag and wire n += 8 case *Value_BoolValue: - n += proto.SizeVarint(4<<3 | proto.WireVarint) + n += 1 // tag and wire n += 1 case *Value_IpAddressValue: s := proto.Size(x.IpAddressValue) - n += proto.SizeVarint(5<<3 | proto.WireBytes) + n += 1 // tag and wire n += proto.SizeVarint(uint64(s)) n += s case *Value_TimestampValue: s := proto.Size(x.TimestampValue) - n += proto.SizeVarint(6<<3 | proto.WireBytes) + n += 1 // tag and wire n += proto.SizeVarint(uint64(s)) n += s case *Value_DurationValue: s := proto.Size(x.DurationValue) - n += proto.SizeVarint(7<<3 | proto.WireBytes) + n += 1 // tag and wire n += proto.SizeVarint(uint64(s)) n += s case *Value_EmailAddressValue: s := proto.Size(x.EmailAddressValue) - n += proto.SizeVarint(8<<3 | proto.WireBytes) + n += 1 // tag and wire n += proto.SizeVarint(uint64(s)) n += s case *Value_DnsNameValue: s := proto.Size(x.DnsNameValue) - n += proto.SizeVarint(9<<3 | proto.WireBytes) + n += 1 // tag and wire n += proto.SizeVarint(uint64(s)) n += s case *Value_UriValue: s := proto.Size(x.UriValue) - n += proto.SizeVarint(10<<3 | proto.WireBytes) + n += 1 // tag and wire n += proto.SizeVarint(uint64(s)) n += s case nil: @@ -398,9 +431,37 @@ type IPAddress struct { Value []byte `protobuf:"bytes,1,opt,name=value,proto3" json:"value,omitempty"` } -func (m *IPAddress) Reset() { *m = IPAddress{} } -func (*IPAddress) ProtoMessage() {} -func (*IPAddress) Descriptor() ([]byte, []int) { return fileDescriptorType, []int{1} } +func (m *IPAddress) Reset() { *m = IPAddress{} } +func (*IPAddress) ProtoMessage() {} +func (*IPAddress) Descriptor() ([]byte, []int) { + return fileDescriptor_81aa672910c4f44d, []int{1} +} +func (m *IPAddress) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *IPAddress) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_IPAddress.Marshal(b, m, deterministic) + } else { + b = b[:cap(b)] + n, err := m.MarshalTo(b) + if err != nil { + return nil, err + } + return b[:n], nil + } +} +func (m *IPAddress) XXX_Merge(src proto.Message) { + xxx_messageInfo_IPAddress.Merge(m, src) +} +func (m *IPAddress) XXX_Size() int { + return m.Size() +} +func (m *IPAddress) XXX_DiscardUnknown() { + xxx_messageInfo_IPAddress.DiscardUnknown(m) +} + +var xxx_messageInfo_IPAddress proto.InternalMessageInfo func (m *IPAddress) GetValue() []byte { if m != nil { @@ -416,14 +477,42 @@ func (m *IPAddress) GetValue() []byte { // type Duration type Duration struct { // Duration encoded as google.protobuf.Duration. - Value *google_protobuf2.Duration `protobuf:"bytes,1,opt,name=value" json:"value,omitempty"` + Value *types.Duration `protobuf:"bytes,1,opt,name=value,proto3" json:"value,omitempty"` +} + +func (m *Duration) Reset() { *m = Duration{} } +func (*Duration) ProtoMessage() {} +func (*Duration) Descriptor() ([]byte, []int) { + return fileDescriptor_81aa672910c4f44d, []int{2} +} +func (m *Duration) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *Duration) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_Duration.Marshal(b, m, deterministic) + } else { + b = b[:cap(b)] + n, err := m.MarshalTo(b) + if err != nil { + return nil, err + } + return b[:n], nil + } +} +func (m *Duration) XXX_Merge(src proto.Message) { + xxx_messageInfo_Duration.Merge(m, src) +} +func (m *Duration) XXX_Size() int { + return m.Size() +} +func (m *Duration) XXX_DiscardUnknown() { + xxx_messageInfo_Duration.DiscardUnknown(m) } -func (m *Duration) Reset() { *m = Duration{} } -func (*Duration) ProtoMessage() {} -func (*Duration) Descriptor() ([]byte, []int) { return fileDescriptorType, []int{2} } +var xxx_messageInfo_Duration proto.InternalMessageInfo -func (m *Duration) GetValue() *google_protobuf2.Duration { +func (m *Duration) GetValue() *types.Duration { if m != nil { return m.Value } @@ -437,14 +526,42 @@ func (m *Duration) GetValue() *google_protobuf2.Duration { // type TimeStamp type TimeStamp struct { // TimeStamp encoded as google.protobuf.Timestamp. - Value *google_protobuf3.Timestamp `protobuf:"bytes,1,opt,name=value" json:"value,omitempty"` + Value *types.Timestamp `protobuf:"bytes,1,opt,name=value,proto3" json:"value,omitempty"` } -func (m *TimeStamp) Reset() { *m = TimeStamp{} } -func (*TimeStamp) ProtoMessage() {} -func (*TimeStamp) Descriptor() ([]byte, []int) { return fileDescriptorType, []int{3} } +func (m *TimeStamp) Reset() { *m = TimeStamp{} } +func (*TimeStamp) ProtoMessage() {} +func (*TimeStamp) Descriptor() ([]byte, []int) { + return fileDescriptor_81aa672910c4f44d, []int{3} +} +func (m *TimeStamp) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *TimeStamp) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_TimeStamp.Marshal(b, m, deterministic) + } else { + b = b[:cap(b)] + n, err := m.MarshalTo(b) + if err != nil { + return nil, err + } + return b[:n], nil + } +} +func (m *TimeStamp) XXX_Merge(src proto.Message) { + xxx_messageInfo_TimeStamp.Merge(m, src) +} +func (m *TimeStamp) XXX_Size() int { + return m.Size() +} +func (m *TimeStamp) XXX_DiscardUnknown() { + xxx_messageInfo_TimeStamp.DiscardUnknown(m) +} -func (m *TimeStamp) GetValue() *google_protobuf3.Timestamp { +var xxx_messageInfo_TimeStamp proto.InternalMessageInfo + +func (m *TimeStamp) GetValue() *types.Timestamp { if m != nil { return m.Value } @@ -461,9 +578,37 @@ type DNSName struct { Value string `protobuf:"bytes,1,opt,name=value,proto3" json:"value,omitempty"` } -func (m *DNSName) Reset() { *m = DNSName{} } -func (*DNSName) ProtoMessage() {} -func (*DNSName) Descriptor() ([]byte, []int) { return fileDescriptorType, []int{4} } +func (m *DNSName) Reset() { *m = DNSName{} } +func (*DNSName) ProtoMessage() {} +func (*DNSName) Descriptor() ([]byte, []int) { + return fileDescriptor_81aa672910c4f44d, []int{4} +} +func (m *DNSName) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *DNSName) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_DNSName.Marshal(b, m, deterministic) + } else { + b = b[:cap(b)] + n, err := m.MarshalTo(b) + if err != nil { + return nil, err + } + return b[:n], nil + } +} +func (m *DNSName) XXX_Merge(src proto.Message) { + xxx_messageInfo_DNSName.Merge(m, src) +} +func (m *DNSName) XXX_Size() int { + return m.Size() +} +func (m *DNSName) XXX_DiscardUnknown() { + xxx_messageInfo_DNSName.DiscardUnknown(m) +} + +var xxx_messageInfo_DNSName proto.InternalMessageInfo func (m *DNSName) GetValue() string { if m != nil { @@ -483,9 +628,37 @@ type EmailAddress struct { Value string `protobuf:"bytes,1,opt,name=value,proto3" json:"value,omitempty"` } -func (m *EmailAddress) Reset() { *m = EmailAddress{} } -func (*EmailAddress) ProtoMessage() {} -func (*EmailAddress) Descriptor() ([]byte, []int) { return fileDescriptorType, []int{5} } +func (m *EmailAddress) Reset() { *m = EmailAddress{} } +func (*EmailAddress) ProtoMessage() {} +func (*EmailAddress) Descriptor() ([]byte, []int) { + return fileDescriptor_81aa672910c4f44d, []int{5} +} +func (m *EmailAddress) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *EmailAddress) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_EmailAddress.Marshal(b, m, deterministic) + } else { + b = b[:cap(b)] + n, err := m.MarshalTo(b) + if err != nil { + return nil, err + } + return b[:n], nil + } +} +func (m *EmailAddress) XXX_Merge(src proto.Message) { + xxx_messageInfo_EmailAddress.Merge(m, src) +} +func (m *EmailAddress) XXX_Size() int { + return m.Size() +} +func (m *EmailAddress) XXX_DiscardUnknown() { + xxx_messageInfo_EmailAddress.DiscardUnknown(m) +} + +var xxx_messageInfo_EmailAddress proto.InternalMessageInfo func (m *EmailAddress) GetValue() string { if m != nil { @@ -505,9 +678,37 @@ type Uri struct { Value string `protobuf:"bytes,1,opt,name=value,proto3" json:"value,omitempty"` } -func (m *Uri) Reset() { *m = Uri{} } -func (*Uri) ProtoMessage() {} -func (*Uri) Descriptor() ([]byte, []int) { return fileDescriptorType, []int{6} } +func (m *Uri) Reset() { *m = Uri{} } +func (*Uri) ProtoMessage() {} +func (*Uri) Descriptor() ([]byte, []int) { + return fileDescriptor_81aa672910c4f44d, []int{6} +} +func (m *Uri) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *Uri) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_Uri.Marshal(b, m, deterministic) + } else { + b = b[:cap(b)] + n, err := m.MarshalTo(b) + if err != nil { + return nil, err + } + return b[:n], nil + } +} +func (m *Uri) XXX_Merge(src proto.Message) { + xxx_messageInfo_Uri.Merge(m, src) +} +func (m *Uri) XXX_Size() int { + return m.Size() +} +func (m *Uri) XXX_DiscardUnknown() { + xxx_messageInfo_Uri.DiscardUnknown(m) +} + +var xxx_messageInfo_Uri proto.InternalMessageInfo func (m *Uri) GetValue() string { if m != nil { @@ -525,6 +726,46 @@ func init() { proto.RegisterType((*EmailAddress)(nil), "istio.policy.v1beta1.EmailAddress") proto.RegisterType((*Uri)(nil), "istio.policy.v1beta1.Uri") } + +func init() { proto.RegisterFile("policy/v1beta1/type.proto", fileDescriptor_81aa672910c4f44d) } + +var fileDescriptor_81aa672910c4f44d = []byte{ + // 524 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x94, 0x4f, 0x6f, 0xd3, 0x3e, + 0x18, 0xc7, 0xed, 0x5f, 0xd7, 0xb5, 0x79, 0xda, 0x5f, 0x81, 0xb2, 0x03, 0xeb, 0x84, 0x9b, 0x15, + 0x0e, 0x39, 0x25, 0x0c, 0x10, 0x42, 0x42, 0x1c, 0x98, 0x98, 0x08, 0x20, 0x4d, 0x90, 0x75, 0x1c, + 0xb8, 0x54, 0x09, 0x31, 0x95, 0xa5, 0x24, 0x8e, 0xf2, 0x67, 0xd2, 0x6e, 0xbc, 0x04, 0x5e, 0x06, + 0x2f, 0x85, 0x63, 0x6f, 0xec, 0x48, 0xd3, 0x0b, 0xc7, 0xbd, 0x04, 0x14, 0xdb, 0x09, 0xed, 0xc8, + 0xb8, 0xd5, 0x8f, 0x3f, 0xdf, 0x4f, 0xfd, 0x3c, 0xb6, 0x02, 0xbb, 0x31, 0x0f, 0xd8, 0xa7, 0x73, + 0xeb, 0xec, 0xc0, 0xa3, 0x99, 0x7b, 0x60, 0x65, 0xe7, 0x31, 0x35, 0xe3, 0x84, 0x67, 0x7c, 0xb8, + 0xc3, 0xd2, 0x8c, 0x71, 0x53, 0x02, 0xa6, 0x02, 0x46, 0x64, 0xce, 0xf9, 0x3c, 0xa0, 0x96, 0x60, + 0xbc, 0xfc, 0xb3, 0xe5, 0xe7, 0x89, 0x9b, 0x31, 0x1e, 0xc9, 0xd4, 0x68, 0x7c, 0x75, 0x3f, 0x63, + 0x21, 0x4d, 0x33, 0x37, 0x8c, 0x25, 0x30, 0xf9, 0xb1, 0x05, 0xed, 0x0f, 0x6e, 0x90, 0xd3, 0xe1, + 0x3d, 0xe8, 0xa7, 0x59, 0xc2, 0xa2, 0xf9, 0xec, 0xac, 0x5c, 0xdf, 0xc1, 0x3a, 0x36, 0x34, 0x1b, + 0x39, 0x3d, 0x59, 0x95, 0xd0, 0x3e, 0xf4, 0x58, 0x94, 0x3d, 0x79, 0xac, 0x98, 0xff, 0x74, 0x6c, + 0xb4, 0x6c, 0xe4, 0x80, 0x28, 0xd6, 0x1e, 0x9f, 0xe7, 0x5e, 0x40, 0x15, 0xd3, 0xd2, 0xb1, 0x81, + 0x4b, 0x8f, 0xac, 0x4a, 0x68, 0x0c, 0xe0, 0x71, 0x1e, 0x28, 0x64, 0x4b, 0xc7, 0x46, 0xd7, 0x46, + 0x8e, 0x56, 0xd6, 0x24, 0xf0, 0x16, 0x6e, 0xb2, 0x78, 0xe6, 0xfa, 0x7e, 0x42, 0xd3, 0x54, 0x61, + 0x6d, 0x1d, 0x1b, 0xbd, 0x87, 0x63, 0xb3, 0x69, 0x12, 0xe6, 0xeb, 0x77, 0x2f, 0x24, 0x6c, 0x23, + 0x67, 0xc0, 0x62, 0xb5, 0x90, 0xb2, 0x37, 0x70, 0xa3, 0xee, 0x5b, 0xb9, 0xb6, 0xff, 0xe5, 0x9a, + 0xb2, 0x90, 0x9e, 0x94, 0x70, 0xe9, 0xaa, 0x93, 0xd2, 0xf5, 0x0a, 0x06, 0xd5, 0x8c, 0x95, 0xaa, + 0x23, 0x54, 0xa4, 0x59, 0xf5, 0x52, 0xb1, 0x36, 0x72, 0xfe, 0xaf, 0x72, 0x52, 0x34, 0x85, 0xdb, + 0x34, 0x74, 0x59, 0x70, 0xa5, 0xc9, 0xae, 0xb0, 0x4d, 0x9a, 0x6d, 0x47, 0x65, 0xe0, 0x4f, 0x9f, + 0xb7, 0xe8, 0xda, 0x5a, 0x5a, 0x8f, 0x60, 0xe0, 0x47, 0xe9, 0x2c, 0x72, 0xc3, 0x6a, 0xfe, 0x9a, + 0x10, 0xde, 0xbd, 0xe6, 0x78, 0xc7, 0x27, 0xc7, 0x6e, 0x48, 0x6d, 0xe4, 0xf4, 0xfd, 0x28, 0x2d, + 0x7f, 0x4a, 0xcd, 0x53, 0xd0, 0xf2, 0x84, 0x29, 0x03, 0x08, 0xc3, 0x6e, 0xb3, 0xe1, 0x34, 0x61, + 0x36, 0x72, 0xba, 0x79, 0xc2, 0x44, 0xf2, 0xb0, 0x03, 0x6d, 0x91, 0x9a, 0xec, 0x83, 0x56, 0xdf, + 0xc9, 0x70, 0x47, 0x55, 0xc5, 0xab, 0xea, 0x3b, 0x0a, 0x79, 0x06, 0xdd, 0x6a, 0x3e, 0x43, 0x6b, + 0x9d, 0x28, 0xff, 0x4d, 0xbe, 0x5c, 0xb3, 0x7a, 0xb9, 0xf5, 0x24, 0xab, 0xf0, 0x73, 0xd0, 0xea, + 0x7b, 0x1a, 0x3e, 0xd8, 0x4c, 0x8f, 0xfe, 0x4a, 0x4f, 0xab, 0x5b, 0xac, 0xe2, 0x63, 0xe8, 0xa8, + 0xe6, 0x37, 0x0f, 0xa7, 0x55, 0xc0, 0x7d, 0xe8, 0xaf, 0x8f, 0xfb, 0x1a, 0x6a, 0x0f, 0x5a, 0xa7, + 0x09, 0x6b, 0xde, 0x3c, 0x7c, 0xbf, 0x58, 0x12, 0x74, 0xb1, 0x24, 0xe8, 0x72, 0x49, 0xf0, 0x97, + 0x82, 0xe0, 0x6f, 0x05, 0xc1, 0xdf, 0x0b, 0x82, 0x17, 0x05, 0xc1, 0x3f, 0x0b, 0x82, 0x7f, 0x15, + 0x04, 0x5d, 0x16, 0x04, 0x7f, 0x5d, 0x11, 0xb4, 0x58, 0x11, 0x74, 0xb1, 0x22, 0xe8, 0xe3, 0x9e, + 0x9c, 0x33, 0xe3, 0x96, 0x1b, 0x33, 0x6b, 0xf3, 0x8b, 0xe0, 0x6d, 0x8b, 0x8e, 0x1e, 0xfd, 0x0e, + 0x00, 0x00, 0xff, 0xff, 0x61, 0x78, 0xcb, 0x26, 0x2a, 0x04, 0x00, 0x00, +} + func (this *Value) Equal(that interface{}) bool { if that == nil { return this == nil @@ -1147,7 +1388,7 @@ func (m *Value_DoubleValue) MarshalTo(dAtA []byte) (int, error) { i := 0 dAtA[i] = 0x19 i++ - binary.LittleEndian.PutUint64(dAtA[i:], uint64(math.Float64bits(float64(m.DoubleValue)))) + encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(math.Float64bits(float64(m.DoubleValue)))) i += 8 return i, nil } @@ -1409,6 +1650,9 @@ func encodeVarintType(dAtA []byte, offset int, v uint64) int { return offset + 1 } func (m *Value) Size() (n int) { + if m == nil { + return 0 + } var l int _ = l if m.Value != nil { @@ -1418,6 +1662,9 @@ func (m *Value) Size() (n int) { } func (m *Value_StringValue) Size() (n int) { + if m == nil { + return 0 + } var l int _ = l l = len(m.StringValue) @@ -1425,24 +1672,36 @@ func (m *Value_StringValue) Size() (n int) { return n } func (m *Value_Int64Value) Size() (n int) { + if m == nil { + return 0 + } var l int _ = l n += 1 + sovType(uint64(m.Int64Value)) return n } func (m *Value_DoubleValue) Size() (n int) { + if m == nil { + return 0 + } var l int _ = l n += 9 return n } func (m *Value_BoolValue) Size() (n int) { + if m == nil { + return 0 + } var l int _ = l n += 2 return n } func (m *Value_IpAddressValue) Size() (n int) { + if m == nil { + return 0 + } var l int _ = l if m.IpAddressValue != nil { @@ -1452,6 +1711,9 @@ func (m *Value_IpAddressValue) Size() (n int) { return n } func (m *Value_TimestampValue) Size() (n int) { + if m == nil { + return 0 + } var l int _ = l if m.TimestampValue != nil { @@ -1461,6 +1723,9 @@ func (m *Value_TimestampValue) Size() (n int) { return n } func (m *Value_DurationValue) Size() (n int) { + if m == nil { + return 0 + } var l int _ = l if m.DurationValue != nil { @@ -1470,6 +1735,9 @@ func (m *Value_DurationValue) Size() (n int) { return n } func (m *Value_EmailAddressValue) Size() (n int) { + if m == nil { + return 0 + } var l int _ = l if m.EmailAddressValue != nil { @@ -1479,6 +1747,9 @@ func (m *Value_EmailAddressValue) Size() (n int) { return n } func (m *Value_DnsNameValue) Size() (n int) { + if m == nil { + return 0 + } var l int _ = l if m.DnsNameValue != nil { @@ -1488,6 +1759,9 @@ func (m *Value_DnsNameValue) Size() (n int) { return n } func (m *Value_UriValue) Size() (n int) { + if m == nil { + return 0 + } var l int _ = l if m.UriValue != nil { @@ -1497,6 +1771,9 @@ func (m *Value_UriValue) Size() (n int) { return n } func (m *IPAddress) Size() (n int) { + if m == nil { + return 0 + } var l int _ = l l = len(m.Value) @@ -1507,6 +1784,9 @@ func (m *IPAddress) Size() (n int) { } func (m *Duration) Size() (n int) { + if m == nil { + return 0 + } var l int _ = l if m.Value != nil { @@ -1517,6 +1797,9 @@ func (m *Duration) Size() (n int) { } func (m *TimeStamp) Size() (n int) { + if m == nil { + return 0 + } var l int _ = l if m.Value != nil { @@ -1527,6 +1810,9 @@ func (m *TimeStamp) Size() (n int) { } func (m *DNSName) Size() (n int) { + if m == nil { + return 0 + } var l int _ = l l = len(m.Value) @@ -1537,6 +1823,9 @@ func (m *DNSName) Size() (n int) { } func (m *EmailAddress) Size() (n int) { + if m == nil { + return 0 + } var l int _ = l l = len(m.Value) @@ -1547,6 +1836,9 @@ func (m *EmailAddress) Size() (n int) { } func (m *Uri) Size() (n int) { + if m == nil { + return 0 + } var l int _ = l l = len(m.Value) @@ -1694,7 +1986,7 @@ func (this *Duration) String() string { return "nil" } s := strings.Join([]string{`&Duration{`, - `Value:` + strings.Replace(fmt.Sprintf("%v", this.Value), "Duration", "google_protobuf2.Duration", 1) + `,`, + `Value:` + strings.Replace(fmt.Sprintf("%v", this.Value), "Duration", "types.Duration", 1) + `,`, `}`, }, "") return s @@ -1704,7 +1996,7 @@ func (this *TimeStamp) String() string { return "nil" } s := strings.Join([]string{`&TimeStamp{`, - `Value:` + strings.Replace(fmt.Sprintf("%v", this.Value), "Timestamp", "google_protobuf3.Timestamp", 1) + `,`, + `Value:` + strings.Replace(fmt.Sprintf("%v", this.Value), "Timestamp", "types.Timestamp", 1) + `,`, `}`, }, "") return s @@ -1762,7 +2054,7 @@ func (m *Value) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - wire |= (uint64(b) & 0x7F) << shift + wire |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -1790,7 +2082,7 @@ func (m *Value) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLen |= (uint64(b) & 0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -1800,6 +2092,9 @@ func (m *Value) Unmarshal(dAtA []byte) error { return ErrInvalidLengthType } postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthType + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -1819,7 +2114,7 @@ func (m *Value) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - v |= (int64(b) & 0x7F) << shift + v |= int64(b&0x7F) << shift if b < 0x80 { break } @@ -1833,7 +2128,7 @@ func (m *Value) Unmarshal(dAtA []byte) error { if (iNdEx + 8) > l { return io.ErrUnexpectedEOF } - v = uint64(binary.LittleEndian.Uint64(dAtA[iNdEx:])) + v = uint64(encoding_binary.LittleEndian.Uint64(dAtA[iNdEx:])) iNdEx += 8 m.Value = &Value_DoubleValue{float64(math.Float64frombits(v))} case 4: @@ -1850,7 +2145,7 @@ func (m *Value) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - v |= (int(b) & 0x7F) << shift + v |= int(b&0x7F) << shift if b < 0x80 { break } @@ -1871,7 +2166,7 @@ func (m *Value) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - msglen |= (int(b) & 0x7F) << shift + msglen |= int(b&0x7F) << shift if b < 0x80 { break } @@ -1880,6 +2175,9 @@ func (m *Value) Unmarshal(dAtA []byte) error { return ErrInvalidLengthType } postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthType + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -1903,7 +2201,7 @@ func (m *Value) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - msglen |= (int(b) & 0x7F) << shift + msglen |= int(b&0x7F) << shift if b < 0x80 { break } @@ -1912,6 +2210,9 @@ func (m *Value) Unmarshal(dAtA []byte) error { return ErrInvalidLengthType } postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthType + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -1935,7 +2236,7 @@ func (m *Value) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - msglen |= (int(b) & 0x7F) << shift + msglen |= int(b&0x7F) << shift if b < 0x80 { break } @@ -1944,6 +2245,9 @@ func (m *Value) Unmarshal(dAtA []byte) error { return ErrInvalidLengthType } postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthType + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -1967,7 +2271,7 @@ func (m *Value) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - msglen |= (int(b) & 0x7F) << shift + msglen |= int(b&0x7F) << shift if b < 0x80 { break } @@ -1976,6 +2280,9 @@ func (m *Value) Unmarshal(dAtA []byte) error { return ErrInvalidLengthType } postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthType + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -1999,7 +2306,7 @@ func (m *Value) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - msglen |= (int(b) & 0x7F) << shift + msglen |= int(b&0x7F) << shift if b < 0x80 { break } @@ -2008,6 +2315,9 @@ func (m *Value) Unmarshal(dAtA []byte) error { return ErrInvalidLengthType } postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthType + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -2031,7 +2341,7 @@ func (m *Value) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - msglen |= (int(b) & 0x7F) << shift + msglen |= int(b&0x7F) << shift if b < 0x80 { break } @@ -2040,6 +2350,9 @@ func (m *Value) Unmarshal(dAtA []byte) error { return ErrInvalidLengthType } postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthType + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -2058,6 +2371,9 @@ func (m *Value) Unmarshal(dAtA []byte) error { if skippy < 0 { return ErrInvalidLengthType } + if (iNdEx + skippy) < 0 { + return ErrInvalidLengthType + } if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF } @@ -2085,7 +2401,7 @@ func (m *IPAddress) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - wire |= (uint64(b) & 0x7F) << shift + wire |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -2113,7 +2429,7 @@ func (m *IPAddress) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - byteLen |= (int(b) & 0x7F) << shift + byteLen |= int(b&0x7F) << shift if b < 0x80 { break } @@ -2122,6 +2438,9 @@ func (m *IPAddress) Unmarshal(dAtA []byte) error { return ErrInvalidLengthType } postIndex := iNdEx + byteLen + if postIndex < 0 { + return ErrInvalidLengthType + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -2139,6 +2458,9 @@ func (m *IPAddress) Unmarshal(dAtA []byte) error { if skippy < 0 { return ErrInvalidLengthType } + if (iNdEx + skippy) < 0 { + return ErrInvalidLengthType + } if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF } @@ -2166,7 +2488,7 @@ func (m *Duration) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - wire |= (uint64(b) & 0x7F) << shift + wire |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -2194,7 +2516,7 @@ func (m *Duration) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - msglen |= (int(b) & 0x7F) << shift + msglen |= int(b&0x7F) << shift if b < 0x80 { break } @@ -2203,11 +2525,14 @@ func (m *Duration) Unmarshal(dAtA []byte) error { return ErrInvalidLengthType } postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthType + } if postIndex > l { return io.ErrUnexpectedEOF } if m.Value == nil { - m.Value = &google_protobuf2.Duration{} + m.Value = &types.Duration{} } if err := m.Value.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err @@ -2222,6 +2547,9 @@ func (m *Duration) Unmarshal(dAtA []byte) error { if skippy < 0 { return ErrInvalidLengthType } + if (iNdEx + skippy) < 0 { + return ErrInvalidLengthType + } if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF } @@ -2249,7 +2577,7 @@ func (m *TimeStamp) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - wire |= (uint64(b) & 0x7F) << shift + wire |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -2277,7 +2605,7 @@ func (m *TimeStamp) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - msglen |= (int(b) & 0x7F) << shift + msglen |= int(b&0x7F) << shift if b < 0x80 { break } @@ -2286,11 +2614,14 @@ func (m *TimeStamp) Unmarshal(dAtA []byte) error { return ErrInvalidLengthType } postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthType + } if postIndex > l { return io.ErrUnexpectedEOF } if m.Value == nil { - m.Value = &google_protobuf3.Timestamp{} + m.Value = &types.Timestamp{} } if err := m.Value.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err @@ -2305,6 +2636,9 @@ func (m *TimeStamp) Unmarshal(dAtA []byte) error { if skippy < 0 { return ErrInvalidLengthType } + if (iNdEx + skippy) < 0 { + return ErrInvalidLengthType + } if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF } @@ -2332,7 +2666,7 @@ func (m *DNSName) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - wire |= (uint64(b) & 0x7F) << shift + wire |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -2360,7 +2694,7 @@ func (m *DNSName) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLen |= (uint64(b) & 0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -2370,6 +2704,9 @@ func (m *DNSName) Unmarshal(dAtA []byte) error { return ErrInvalidLengthType } postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthType + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -2384,6 +2721,9 @@ func (m *DNSName) Unmarshal(dAtA []byte) error { if skippy < 0 { return ErrInvalidLengthType } + if (iNdEx + skippy) < 0 { + return ErrInvalidLengthType + } if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF } @@ -2411,7 +2751,7 @@ func (m *EmailAddress) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - wire |= (uint64(b) & 0x7F) << shift + wire |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -2439,7 +2779,7 @@ func (m *EmailAddress) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLen |= (uint64(b) & 0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -2449,6 +2789,9 @@ func (m *EmailAddress) Unmarshal(dAtA []byte) error { return ErrInvalidLengthType } postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthType + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -2463,6 +2806,9 @@ func (m *EmailAddress) Unmarshal(dAtA []byte) error { if skippy < 0 { return ErrInvalidLengthType } + if (iNdEx + skippy) < 0 { + return ErrInvalidLengthType + } if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF } @@ -2490,7 +2836,7 @@ func (m *Uri) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - wire |= (uint64(b) & 0x7F) << shift + wire |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -2518,7 +2864,7 @@ func (m *Uri) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLen |= (uint64(b) & 0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -2528,6 +2874,9 @@ func (m *Uri) Unmarshal(dAtA []byte) error { return ErrInvalidLengthType } postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthType + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -2542,6 +2891,9 @@ func (m *Uri) Unmarshal(dAtA []byte) error { if skippy < 0 { return ErrInvalidLengthType } + if (iNdEx + skippy) < 0 { + return ErrInvalidLengthType + } if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF } @@ -2608,10 +2960,13 @@ func skipType(dAtA []byte) (n int, err error) { break } } - iNdEx += length if length < 0 { return 0, ErrInvalidLengthType } + iNdEx += length + if iNdEx < 0 { + return 0, ErrInvalidLengthType + } return iNdEx, nil case 3: for { @@ -2640,6 +2995,9 @@ func skipType(dAtA []byte) (n int, err error) { return 0, err } iNdEx = start + next + if iNdEx < 0 { + return 0, ErrInvalidLengthType + } } return iNdEx, nil case 4: @@ -2658,42 +3016,3 @@ var ( ErrInvalidLengthType = fmt.Errorf("proto: negative length found during unmarshaling") ErrIntOverflowType = fmt.Errorf("proto: integer overflow") ) - -func init() { proto.RegisterFile("policy/v1beta1/type.proto", fileDescriptorType) } - -var fileDescriptorType = []byte{ - // 516 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x94, 0x4f, 0x6f, 0xd3, 0x30, - 0x18, 0x87, 0x6d, 0xba, 0xae, 0xcd, 0xdb, 0x52, 0x20, 0xec, 0xc0, 0x3a, 0xe1, 0x66, 0x85, 0x43, - 0x4e, 0x09, 0x03, 0x84, 0x90, 0x10, 0x07, 0x26, 0x26, 0x32, 0x90, 0x26, 0x94, 0x75, 0x1c, 0xb8, - 0x54, 0x09, 0x31, 0x95, 0xa5, 0x24, 0x8e, 0xf2, 0x67, 0xd2, 0x6e, 0x7c, 0x04, 0x3e, 0x06, 0x1f, - 0x85, 0xe3, 0x6e, 0x70, 0xa4, 0xe1, 0xc2, 0x71, 0x1f, 0x01, 0xc5, 0x76, 0x42, 0x3b, 0xb2, 0xdd, - 0xea, 0xd7, 0xcf, 0xef, 0xa9, 0xdf, 0xd7, 0x56, 0x60, 0x3b, 0xe1, 0x21, 0xfb, 0x74, 0x66, 0x9f, - 0xee, 0xf9, 0x34, 0xf7, 0xf6, 0xec, 0xfc, 0x2c, 0xa1, 0x56, 0x92, 0xf2, 0x9c, 0xeb, 0x5b, 0x2c, - 0xcb, 0x19, 0xb7, 0x24, 0x60, 0x29, 0x60, 0x4c, 0x16, 0x9c, 0x2f, 0x42, 0x6a, 0x0b, 0xc6, 0x2f, - 0x3e, 0xdb, 0x41, 0x91, 0x7a, 0x39, 0xe3, 0xb1, 0x4c, 0x8d, 0x27, 0x97, 0xf7, 0x73, 0x16, 0xd1, - 0x2c, 0xf7, 0xa2, 0x44, 0x02, 0xd3, 0x1f, 0x1b, 0xd0, 0xfd, 0xe0, 0x85, 0x05, 0xd5, 0x1f, 0xc0, - 0x30, 0xcb, 0x53, 0x16, 0x2f, 0xe6, 0xa7, 0xd5, 0xfa, 0x1e, 0x36, 0xb0, 0xa9, 0x39, 0xc8, 0x1d, - 0xc8, 0xaa, 0x84, 0x76, 0x61, 0xc0, 0xe2, 0xfc, 0xd9, 0x53, 0xc5, 0xdc, 0x30, 0xb0, 0xd9, 0x71, - 0x90, 0x0b, 0xa2, 0xd8, 0x78, 0x02, 0x5e, 0xf8, 0x21, 0x55, 0x4c, 0xc7, 0xc0, 0x26, 0xae, 0x3c, - 0xb2, 0x2a, 0xa1, 0x09, 0x80, 0xcf, 0x79, 0xa8, 0x90, 0x0d, 0x03, 0x9b, 0x7d, 0x07, 0xb9, 0x5a, - 0x55, 0x93, 0xc0, 0x3b, 0xb8, 0xcd, 0x92, 0xb9, 0x17, 0x04, 0x29, 0xcd, 0x32, 0x85, 0x75, 0x0d, - 0x6c, 0x0e, 0x1e, 0x4f, 0xac, 0xb6, 0x49, 0x58, 0x87, 0xef, 0x5f, 0x49, 0xd8, 0x41, 0xee, 0x88, - 0x25, 0x6a, 0x21, 0x65, 0x6f, 0xe1, 0x56, 0xd3, 0xb7, 0x72, 0x6d, 0x5e, 0xe7, 0x9a, 0xb1, 0x88, - 0x1e, 0x57, 0x70, 0xe5, 0x6a, 0x92, 0xd2, 0xf5, 0x06, 0x46, 0xf5, 0x8c, 0x95, 0xaa, 0x27, 0x54, - 0xa4, 0x5d, 0xf5, 0x5a, 0xb1, 0x0e, 0x72, 0x6f, 0xd6, 0x39, 0x29, 0x9a, 0xc1, 0x5d, 0x1a, 0x79, - 0x2c, 0xbc, 0xd4, 0x64, 0x5f, 0xd8, 0xa6, 0xed, 0xb6, 0x83, 0x2a, 0xf0, 0xaf, 0xcf, 0x3b, 0x74, - 0x65, 0x2d, 0xad, 0x07, 0x30, 0x0a, 0xe2, 0x6c, 0x1e, 0x7b, 0x51, 0x3d, 0x7f, 0x4d, 0x08, 0xef, - 0x5f, 0x71, 0xbc, 0xa3, 0xe3, 0x23, 0x2f, 0xa2, 0x0e, 0x72, 0x87, 0x41, 0x9c, 0x55, 0x3f, 0xa5, - 0xe6, 0x39, 0x68, 0x45, 0xca, 0x94, 0x01, 0x84, 0x61, 0xbb, 0xdd, 0x70, 0x92, 0x32, 0x07, 0xb9, - 0xfd, 0x22, 0x65, 0x22, 0xb9, 0xdf, 0x83, 0xae, 0x48, 0x4d, 0x77, 0x41, 0x6b, 0xee, 0x44, 0xdf, - 0x52, 0x55, 0xf1, 0xaa, 0x86, 0xae, 0x42, 0x5e, 0x40, 0xbf, 0x9e, 0x8f, 0x6e, 0xaf, 0x12, 0xd5, - 0xbf, 0xc9, 0x97, 0x6b, 0xd5, 0x2f, 0xb7, 0x99, 0x64, 0x1d, 0x7e, 0x09, 0x5a, 0x73, 0x4f, 0xfa, - 0xa3, 0xf5, 0xf4, 0xf8, 0xbf, 0xf4, 0xac, 0xbe, 0xc5, 0x3a, 0x3e, 0x81, 0x9e, 0x6a, 0x7e, 0xfd, - 0x70, 0x5a, 0x0d, 0x3c, 0x84, 0xe1, 0xea, 0xb8, 0xaf, 0xa0, 0x76, 0xa0, 0x73, 0x92, 0xb2, 0xf6, - 0xcd, 0xfd, 0xc3, 0xf3, 0x25, 0x41, 0x3f, 0x97, 0x04, 0x5d, 0x2c, 0x09, 0xfe, 0x52, 0x12, 0xfc, - 0xad, 0x24, 0xf8, 0x7b, 0x49, 0xf0, 0x79, 0x49, 0xf0, 0xaf, 0x92, 0xe0, 0x3f, 0x25, 0x41, 0x17, - 0x25, 0xc1, 0x5f, 0x7f, 0x13, 0xf4, 0x71, 0x47, 0xce, 0x97, 0x71, 0xdb, 0x4b, 0x98, 0xbd, 0xfe, - 0x25, 0xf0, 0x37, 0x45, 0x27, 0x4f, 0xfe, 0x06, 0x00, 0x00, 0xff, 0xff, 0xa5, 0x38, 0xb2, 0xa2, - 0x22, 0x04, 0x00, 0x00, -} diff --git a/policy/v1beta1/value_type.pb.go b/policy/v1beta1/value_type.pb.go index e7a28969a8b..1dbd9a04652 100644 --- a/policy/v1beta1/value_type.pb.go +++ b/policy/v1beta1/value_type.pb.go @@ -3,17 +3,24 @@ package v1beta1 -import proto "github.com/gogo/protobuf/proto" -import fmt "fmt" -import math "math" - -import strconv "strconv" +import ( + fmt "fmt" + proto "github.com/gogo/protobuf/proto" + math "math" + strconv "strconv" +) // Reference imports to suppress errors if they are not otherwise used. var _ = proto.Marshal var _ = fmt.Errorf var _ = math.Inf +// This is a compile-time assertion to ensure that this generated file +// is compatible with the proto package it is being compiled against. +// A compilation error at this line likely means your copy of the +// proto package needs to be updated. +const _ = proto.GoGoProtoPackageIsVersion2 // please upgrade the proto package + // ValueType describes the types that values in the Istio system can take. These // are used to describe the type of Attributes at run time, describe the type of // the result of evaluating an expression, and to describe the runtime type of @@ -61,6 +68,7 @@ var ValueType_name = map[int32]string{ 10: "DURATION", 11: "STRING_MAP", } + var ValueType_value = map[string]int32{ "VALUE_TYPE_UNSPECIFIED": 0, "STRING": 1, @@ -76,11 +84,40 @@ var ValueType_value = map[string]int32{ "STRING_MAP": 11, } -func (ValueType) EnumDescriptor() ([]byte, []int) { return fileDescriptorValueType, []int{0} } +func (ValueType) EnumDescriptor() ([]byte, []int) { + return fileDescriptor_72649b1dc07496e9, []int{0} +} func init() { proto.RegisterEnum("istio.policy.v1beta1.ValueType", ValueType_name, ValueType_value) } + +func init() { proto.RegisterFile("policy/v1beta1/value_type.proto", fileDescriptor_72649b1dc07496e9) } + +var fileDescriptor_72649b1dc07496e9 = []byte{ + // 309 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x54, 0x90, 0xcd, 0x4a, 0xfb, 0x40, + 0x14, 0x47, 0x67, 0xfe, 0xfd, 0xcc, 0xfd, 0x5b, 0x19, 0x07, 0x71, 0xa1, 0x70, 0xdd, 0xbb, 0x68, + 0x28, 0x8a, 0xfb, 0xa9, 0x19, 0x65, 0x20, 0x5f, 0x26, 0x93, 0x82, 0x6e, 0x42, 0x2b, 0x59, 0x04, + 0x0a, 0x09, 0x1a, 0x0b, 0xdd, 0xf9, 0x08, 0x3e, 0x86, 0xef, 0xe0, 0x0b, 0xb8, 0xec, 0xb2, 0x4b, + 0x3b, 0xdd, 0xb8, 0xec, 0x23, 0x48, 0x1b, 0x11, 0x5c, 0xde, 0xc3, 0xe1, 0xf2, 0xe3, 0xc0, 0x69, + 0x59, 0x4c, 0xf3, 0x87, 0xb9, 0x3d, 0x1b, 0x4c, 0xb2, 0x6a, 0x3c, 0xb0, 0x67, 0xe3, 0xe9, 0x73, + 0x96, 0x56, 0xf3, 0x32, 0xeb, 0x97, 0x8f, 0x45, 0x55, 0xf0, 0xc3, 0xfc, 0xa9, 0xca, 0x8b, 0x7e, + 0xad, 0xf5, 0x7f, 0xb4, 0xb3, 0x77, 0x0a, 0xd6, 0x68, 0xab, 0xea, 0x79, 0x99, 0xf1, 0x63, 0x38, + 0x1a, 0x09, 0x37, 0x91, 0xa9, 0xbe, 0x0b, 0x65, 0x9a, 0xf8, 0x71, 0x28, 0xaf, 0xd4, 0xb5, 0x92, + 0x0e, 0x23, 0x1c, 0xa0, 0x1d, 0xeb, 0x48, 0xf9, 0x37, 0x8c, 0x72, 0x0b, 0x5a, 0xca, 0xd7, 0x97, + 0x17, 0xec, 0xdf, 0x16, 0x3b, 0x41, 0x32, 0x74, 0x25, 0x6b, 0xf0, 0x2e, 0x34, 0x87, 0x41, 0xe0, + 0xb2, 0x26, 0xef, 0x81, 0xa5, 0x95, 0x27, 0x63, 0x2d, 0xbc, 0x90, 0xb5, 0xf8, 0x3e, 0x80, 0x0a, + 0x53, 0xe1, 0x38, 0x91, 0x8c, 0x63, 0xd6, 0xe6, 0x07, 0xd0, 0x93, 0x9e, 0x50, 0xee, 0x2f, 0xea, + 0xf0, 0x0e, 0x34, 0x92, 0x48, 0xb1, 0x2e, 0xdf, 0x83, 0xae, 0xe3, 0xc7, 0xa9, 0x2f, 0x3c, 0xc9, + 0xac, 0xdd, 0x95, 0x44, 0x42, 0xab, 0xc0, 0x67, 0xb0, 0xfd, 0x53, 0x6f, 0x48, 0x3d, 0x11, 0xb2, + 0xff, 0xc3, 0xdb, 0xc5, 0x0a, 0xc9, 0x72, 0x85, 0x64, 0xb3, 0x42, 0xfa, 0x62, 0x90, 0xbe, 0x19, + 0xa4, 0x1f, 0x06, 0xe9, 0xc2, 0x20, 0xfd, 0x34, 0x48, 0xbf, 0x0c, 0x92, 0x8d, 0x41, 0xfa, 0xba, + 0x46, 0xb2, 0x58, 0x23, 0x59, 0xae, 0x91, 0xdc, 0x9f, 0xd4, 0x25, 0xf2, 0xc2, 0x1e, 0x97, 0xb9, + 0xfd, 0xb7, 0xdb, 0xa4, 0xbd, 0xab, 0x75, 0xfe, 0x1d, 0x00, 0x00, 0xff, 0xff, 0xa4, 0x0e, 0x39, + 0x92, 0x50, 0x01, 0x00, 0x00, +} + func (x ValueType) String() string { s, ok := ValueType_name[int32(x)] if ok { @@ -88,28 +125,3 @@ func (x ValueType) String() string { } return strconv.Itoa(int(x)) } - -func init() { proto.RegisterFile("policy/v1beta1/value_type.proto", fileDescriptorValueType) } - -var fileDescriptorValueType = []byte{ - // 302 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x54, 0x90, 0x3f, 0x4b, 0xc3, 0x40, - 0x18, 0x87, 0x73, 0xf6, 0x6f, 0x5e, 0xad, 0x9c, 0x87, 0x38, 0x28, 0x9c, 0xbb, 0x43, 0x43, 0x51, - 0xdc, 0xaf, 0xe6, 0x94, 0x83, 0xe4, 0x12, 0x72, 0x97, 0x82, 0x2e, 0x47, 0x2b, 0x19, 0x02, 0x85, - 0x04, 0x8d, 0x85, 0x6e, 0x7e, 0x04, 0x3f, 0x86, 0xdf, 0xc1, 0x2f, 0xe0, 0xd8, 0xd1, 0xd1, 0x9e, - 0x8b, 0x63, 0x3f, 0x82, 0xa4, 0x11, 0xc1, 0xf1, 0x7d, 0x78, 0x78, 0xf9, 0xf1, 0xc0, 0x69, 0x59, - 0xcc, 0xf3, 0xfb, 0xa5, 0xb7, 0x18, 0xcd, 0xb2, 0x6a, 0x3a, 0xf2, 0x16, 0xd3, 0xf9, 0x53, 0x66, - 0xaa, 0x65, 0x99, 0x0d, 0xcb, 0x87, 0xa2, 0x2a, 0xc8, 0x61, 0xfe, 0x58, 0xe5, 0xc5, 0xb0, 0xd1, - 0x86, 0xbf, 0xda, 0xd9, 0x1b, 0x02, 0x77, 0x52, 0xab, 0x7a, 0x59, 0x66, 0xe4, 0x18, 0x8e, 0x26, - 0x2c, 0x48, 0xb9, 0xd1, 0xb7, 0x31, 0x37, 0xa9, 0x54, 0x31, 0xbf, 0x12, 0xd7, 0x82, 0xfb, 0xd8, - 0x21, 0x00, 0x5d, 0xa5, 0x13, 0x21, 0x6f, 0x30, 0x22, 0x2e, 0x74, 0x84, 0xd4, 0x97, 0x17, 0x78, - 0xa7, 0xc6, 0x7e, 0x94, 0x8e, 0x03, 0x8e, 0x5b, 0xa4, 0x0f, 0xed, 0x71, 0x14, 0x05, 0xb8, 0x4d, - 0x06, 0xe0, 0x6a, 0x11, 0x72, 0xa5, 0x59, 0x18, 0xe3, 0x0e, 0xd9, 0x07, 0x10, 0xb1, 0x61, 0xbe, - 0x9f, 0x70, 0xa5, 0x70, 0x97, 0x1c, 0xc0, 0x80, 0x87, 0x4c, 0x04, 0x7f, 0xa8, 0x47, 0x7a, 0xd0, - 0x4a, 0x13, 0x81, 0xfb, 0x64, 0x0f, 0xfa, 0xbe, 0x54, 0x46, 0xb2, 0x90, 0x63, 0x77, 0x7b, 0xa5, - 0x09, 0xd3, 0x22, 0x92, 0x18, 0xea, 0x3f, 0xcd, 0x06, 0x13, 0xb2, 0x18, 0xef, 0x8e, 0xc5, 0x6a, - 0x4d, 0x9d, 0x8f, 0x35, 0x75, 0x36, 0x6b, 0x8a, 0x9e, 0x2d, 0x45, 0xaf, 0x96, 0xa2, 0x77, 0x4b, - 0xd1, 0xca, 0x52, 0xf4, 0x69, 0x29, 0xfa, 0xb6, 0xd4, 0xd9, 0x58, 0x8a, 0x5e, 0xbe, 0xa8, 0x73, - 0x77, 0xd2, 0x14, 0xc8, 0x0b, 0x6f, 0x5a, 0xe6, 0xde, 0xff, 0x5e, 0xb3, 0xee, 0xb6, 0xd2, 0xf9, - 0x4f, 0x00, 0x00, 0x00, 0xff, 0xff, 0xd1, 0x41, 0xab, 0x82, 0x48, 0x01, 0x00, 0x00, -} diff --git a/rbac/v1alpha1/rbac.pb.go b/rbac/v1alpha1/rbac.pb.go index 87a6b890f03..297f24ca196 100644 --- a/rbac/v1alpha1/rbac.pb.go +++ b/rbac/v1alpha1/rbac.pb.go @@ -1,92 +1,77 @@ // Code generated by protoc-gen-gogo. DO NOT EDIT. // source: rbac/v1alpha1/rbac.proto -/* - Package v1alpha1 is a generated protocol buffer package. - - Istio RBAC (Role Based Access Control) defines ServiceRole and ServiceRoleBinding - objects. - - A ServiceRole specification includes a list of rules (permissions). Each rule has - the following standard fields: - - * services: a list of services. - * methods: HTTP methods. In the case of gRPC, this field is ignored because the value is always "POST". - * paths: HTTP paths or gRPC methods. Note that gRPC methods should be - presented in the form of "/packageName.serviceName/methodName" and are case sensitive. - - In addition to the standard fields, operators can also use custom keys in the `constraints` field, - the supported keys are listed in the "constraints and properties" page. - - Below is an example of ServiceRole object "product-viewer", which has "read" ("GET" and "HEAD") - access to "products.svc.cluster.local" service at versions "v1" and "v2". "path" is not specified, - so it applies to any path in the service. - - ```yaml - apiVersion: "rbac.istio.io/v1alpha1" - kind: ServiceRole - metadata: - name: products-viewer - namespace: default - spec: - rules: - - services: ["products.svc.cluster.local"] - methods: ["GET", "HEAD"] - constraints: - - key: "destination.labels[version]" - value: ["v1", "v2"] - ``` - - A ServiceRoleBinding specification includes two parts: - - * The `roleRef` field that refers to a ServiceRole object in the same namespace. - * A list of `subjects` that are assigned the roles. - - In addition to a simple `user` field, operators can also use custom keys in the `properties` field, - the supported keys are listed in the "constraints and properties" page. - - Below is an example of ServiceRoleBinding object "test-binding-products", which binds two subjects - to ServiceRole "product-viewer": - - * User "alice@yahoo.com" - * Services in "abc" namespace. - - ```yaml - apiVersion: "rbac.istio.io/v1alpha1" - kind: ServiceRoleBinding - metadata: - name: test-binding-products - namespace: default - spec: - subjects: - - user: alice@yahoo.com - - properties: - source.namespace: "abc" - roleRef: - kind: ServiceRole - name: "products-viewer" - ``` - - It is generated from these files: - rbac/v1alpha1/rbac.proto - - It has these top-level messages: - WorkloadSelector - AuthorizationPolicy - ServiceRole - AccessRule - ServiceRoleBinding - Subject - RoleRef - RbacConfig -*/ -package v1alpha1 +// Istio RBAC (Role Based Access Control) defines ServiceRole and ServiceRoleBinding +// objects. +// +// A ServiceRole specification includes a list of rules (permissions). Each rule has +// the following standard fields: +// +// * services: a list of services. +// * methods: HTTP methods. In the case of gRPC, this field is ignored because the value is always "POST". +// * paths: HTTP paths or gRPC methods. Note that gRPC methods should be +// presented in the form of "/packageName.serviceName/methodName" and are case sensitive. +// +// In addition to the standard fields, operators can also use custom keys in the `constraints` field, +// the supported keys are listed in the "constraints and properties" page. +// +// Below is an example of ServiceRole object "product-viewer", which has "read" ("GET" and "HEAD") +// access to "products.svc.cluster.local" service at versions "v1" and "v2". "path" is not specified, +// so it applies to any path in the service. +// +// ```yaml +// apiVersion: "rbac.istio.io/v1alpha1" +// kind: ServiceRole +// metadata: +// name: products-viewer +// namespace: default +// spec: +// rules: +// - services: ["products.svc.cluster.local"] +// methods: ["GET", "HEAD"] +// constraints: +// - key: "destination.labels[version]" +// value: ["v1", "v2"] +// ``` +// +// A ServiceRoleBinding specification includes two parts: +// +// * The `roleRef` field that refers to a ServiceRole object in the same namespace. +// * A list of `subjects` that are assigned the roles. +// +// In addition to a simple `user` field, operators can also use custom keys in the `properties` field, +// the supported keys are listed in the "constraints and properties" page. +// +// Below is an example of ServiceRoleBinding object "test-binding-products", which binds two subjects +// to ServiceRole "product-viewer": +// +// * User "alice@yahoo.com" +// * Services in "abc" namespace. +// +// ```yaml +// apiVersion: "rbac.istio.io/v1alpha1" +// kind: ServiceRoleBinding +// metadata: +// name: test-binding-products +// namespace: default +// spec: +// subjects: +// - user: alice@yahoo.com +// - properties: +// source.namespace: "abc" +// roleRef: +// kind: ServiceRole +// name: "products-viewer" +// ``` -import proto "github.com/gogo/protobuf/proto" -import fmt "fmt" -import math "math" +package v1alpha1 -import io "io" +import ( + fmt "fmt" + proto "github.com/gogo/protobuf/proto" + io "io" + math "math" +) // Reference imports to suppress errors if they are not otherwise used. var _ = proto.Marshal @@ -119,6 +104,7 @@ var EnforcementMode_name = map[int32]string{ 0: "ENFORCED", 1: "PERMISSIVE", } + var EnforcementMode_value = map[string]int32{ "ENFORCED": 0, "PERMISSIVE": 1, @@ -127,7 +113,10 @@ var EnforcementMode_value = map[string]int32{ func (x EnforcementMode) String() string { return proto.EnumName(EnforcementMode_name, int32(x)) } -func (EnforcementMode) EnumDescriptor() ([]byte, []int) { return fileDescriptorRbac, []int{0} } + +func (EnforcementMode) EnumDescriptor() ([]byte, []int) { + return fileDescriptor_3462954d26c055c0, []int{0} +} type RbacConfig_Mode int32 @@ -151,6 +140,7 @@ var RbacConfig_Mode_name = map[int32]string{ 2: "ON_WITH_INCLUSION", 3: "ON_WITH_EXCLUSION", } + var RbacConfig_Mode_value = map[string]int32{ "OFF": 0, "ON": 1, @@ -161,7 +151,10 @@ var RbacConfig_Mode_value = map[string]int32{ func (x RbacConfig_Mode) String() string { return proto.EnumName(RbacConfig_Mode_name, int32(x)) } -func (RbacConfig_Mode) EnumDescriptor() ([]byte, []int) { return fileDescriptorRbac, []int{7, 0} } + +func (RbacConfig_Mode) EnumDescriptor() ([]byte, []int) { + return fileDescriptor_3462954d26c055c0, []int{7, 0} +} // $hide_from_docs // This is forked from the networking/v1alpha3/sidecar.proto to avoid a direct @@ -179,13 +172,44 @@ type WorkloadSelector struct { // this sidecar configuration should be applied. The scope of label // search is restricted to the configuration namespace in which the the // resource is present. - Labels map[string]string `protobuf:"bytes,1,rep,name=labels" json:"labels,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` + Labels map[string]string `protobuf:"bytes,1,rep,name=labels,proto3" json:"labels,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` } -func (m *WorkloadSelector) Reset() { *m = WorkloadSelector{} } -func (m *WorkloadSelector) String() string { return proto.CompactTextString(m) } -func (*WorkloadSelector) ProtoMessage() {} -func (*WorkloadSelector) Descriptor() ([]byte, []int) { return fileDescriptorRbac, []int{0} } +func (m *WorkloadSelector) Reset() { *m = WorkloadSelector{} } +func (m *WorkloadSelector) String() string { return proto.CompactTextString(m) } +func (*WorkloadSelector) ProtoMessage() {} +func (*WorkloadSelector) Descriptor() ([]byte, []int) { + return fileDescriptor_3462954d26c055c0, []int{0} +} +func (m *WorkloadSelector) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *WorkloadSelector) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_WorkloadSelector.Marshal(b, m, deterministic) + } else { + b = b[:cap(b)] + n, err := m.MarshalTo(b) + if err != nil { + return nil, err + } + return b[:n], nil + } +} +func (m *WorkloadSelector) XXX_Merge(src proto.Message) { + xxx_messageInfo_WorkloadSelector.Merge(m, src) +} +func (m *WorkloadSelector) XXX_Size() int { + return m.Size() +} +func (m *WorkloadSelector) XXX_DiscardUnknown() { + xxx_messageInfo_WorkloadSelector.DiscardUnknown(m) +} + +var xxx_messageInfo_WorkloadSelector proto.InternalMessageInfo func (m *WorkloadSelector) GetLabels() map[string]string { if m != nil { @@ -203,16 +227,47 @@ type AuthorizationPolicy struct { // select all pods/VMs. // The scope of label search is platform dependent. On Kubernetes, for example, // the scope includes pods running in the same namespace as the authorization policy itself. - WorkloadSelector *WorkloadSelector `protobuf:"bytes,1,opt,name=workload_selector,json=workloadSelector" json:"workload_selector,omitempty"` + WorkloadSelector *WorkloadSelector `protobuf:"bytes,1,opt,name=workload_selector,json=workloadSelector,proto3" json:"workload_selector,omitempty"` // $hide_from_docs // A list of bindings that specify the subjects and permissions to the selected workload. - Allow []*ServiceRoleBinding `protobuf:"bytes,2,rep,name=allow" json:"allow,omitempty"` + Allow []*ServiceRoleBinding `protobuf:"bytes,2,rep,name=allow,proto3" json:"allow,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` +} + +func (m *AuthorizationPolicy) Reset() { *m = AuthorizationPolicy{} } +func (m *AuthorizationPolicy) String() string { return proto.CompactTextString(m) } +func (*AuthorizationPolicy) ProtoMessage() {} +func (*AuthorizationPolicy) Descriptor() ([]byte, []int) { + return fileDescriptor_3462954d26c055c0, []int{1} +} +func (m *AuthorizationPolicy) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *AuthorizationPolicy) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_AuthorizationPolicy.Marshal(b, m, deterministic) + } else { + b = b[:cap(b)] + n, err := m.MarshalTo(b) + if err != nil { + return nil, err + } + return b[:n], nil + } +} +func (m *AuthorizationPolicy) XXX_Merge(src proto.Message) { + xxx_messageInfo_AuthorizationPolicy.Merge(m, src) +} +func (m *AuthorizationPolicy) XXX_Size() int { + return m.Size() +} +func (m *AuthorizationPolicy) XXX_DiscardUnknown() { + xxx_messageInfo_AuthorizationPolicy.DiscardUnknown(m) } -func (m *AuthorizationPolicy) Reset() { *m = AuthorizationPolicy{} } -func (m *AuthorizationPolicy) String() string { return proto.CompactTextString(m) } -func (*AuthorizationPolicy) ProtoMessage() {} -func (*AuthorizationPolicy) Descriptor() ([]byte, []int) { return fileDescriptorRbac, []int{1} } +var xxx_messageInfo_AuthorizationPolicy proto.InternalMessageInfo func (m *AuthorizationPolicy) GetWorkloadSelector() *WorkloadSelector { if m != nil { @@ -231,13 +286,44 @@ func (m *AuthorizationPolicy) GetAllow() []*ServiceRoleBinding { // ServiceRole specification contains a list of access rules (permissions). type ServiceRole struct { // Required. The set of access rules (permissions) that the role has. - Rules []*AccessRule `protobuf:"bytes,1,rep,name=rules" json:"rules,omitempty"` + Rules []*AccessRule `protobuf:"bytes,1,rep,name=rules,proto3" json:"rules,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` +} + +func (m *ServiceRole) Reset() { *m = ServiceRole{} } +func (m *ServiceRole) String() string { return proto.CompactTextString(m) } +func (*ServiceRole) ProtoMessage() {} +func (*ServiceRole) Descriptor() ([]byte, []int) { + return fileDescriptor_3462954d26c055c0, []int{2} +} +func (m *ServiceRole) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *ServiceRole) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_ServiceRole.Marshal(b, m, deterministic) + } else { + b = b[:cap(b)] + n, err := m.MarshalTo(b) + if err != nil { + return nil, err + } + return b[:n], nil + } +} +func (m *ServiceRole) XXX_Merge(src proto.Message) { + xxx_messageInfo_ServiceRole.Merge(m, src) +} +func (m *ServiceRole) XXX_Size() int { + return m.Size() +} +func (m *ServiceRole) XXX_DiscardUnknown() { + xxx_messageInfo_ServiceRole.DiscardUnknown(m) } -func (m *ServiceRole) Reset() { *m = ServiceRole{} } -func (m *ServiceRole) String() string { return proto.CompactTextString(m) } -func (*ServiceRole) ProtoMessage() {} -func (*ServiceRole) Descriptor() ([]byte, []int) { return fileDescriptorRbac, []int{2} } +var xxx_messageInfo_ServiceRole proto.InternalMessageInfo func (m *ServiceRole) GetRules() []*AccessRule { if m != nil { @@ -254,17 +340,17 @@ type AccessRule struct { // "bookstore.mtv.cluster.local" (exact match), or "bookstore*" (prefix match), // or "*.mtv.cluster.local" (suffix match). // If set to ["*"], it refers to all services in the namespace. - Services []string `protobuf:"bytes,1,rep,name=services" json:"services,omitempty"` + Services []string `protobuf:"bytes,1,rep,name=services,proto3" json:"services,omitempty"` // $hide_from_docs // Optional. A list of HTTP hosts. This is matched against the HOST header in // a HTTP request. Exact match, prefix match and suffix match are supported. // For example, the host "test.abc.com" matches "test.abc.com" (exact match), // or "*.abc.com" (prefix match), or "test.abc.*" (suffix match). // If not specified, it matches to any host. - Hosts []string `protobuf:"bytes,5,rep,name=hosts" json:"hosts,omitempty"` + Hosts []string `protobuf:"bytes,5,rep,name=hosts,proto3" json:"hosts,omitempty"` // $hide_from_docs // Optional. A list of HTTP hosts that must not be matched. - NotHosts []string `protobuf:"bytes,6,rep,name=not_hosts,json=notHosts" json:"not_hosts,omitempty"` + NotHosts []string `protobuf:"bytes,6,rep,name=not_hosts,json=notHosts,proto3" json:"not_hosts,omitempty"` // Optional. A list of HTTP paths or gRPC methods. // gRPC methods must be presented as fully-qualified name in the form of // "/packageName.serviceName/methodName" and are case sensitive. @@ -272,35 +358,66 @@ type AccessRule struct { // the path "/books/review" matches "/books/review" (exact match), // or "/books/*" (prefix match), or "*/review" (suffix match). // If not specified, it matches to any path. - Paths []string `protobuf:"bytes,2,rep,name=paths" json:"paths,omitempty"` + Paths []string `protobuf:"bytes,2,rep,name=paths,proto3" json:"paths,omitempty"` // $hide_from_docs // Optional. A list of HTTP paths or gRPC methods that must not be matched. - NotPaths []string `protobuf:"bytes,7,rep,name=not_paths,json=notPaths" json:"not_paths,omitempty"` + NotPaths []string `protobuf:"bytes,7,rep,name=not_paths,json=notPaths,proto3" json:"not_paths,omitempty"` // Optional. A list of HTTP methods (e.g., "GET", "POST"). // It is ignored in gRPC case because the value is always "POST". // If not specified, it matches to any methods. - Methods []string `protobuf:"bytes,3,rep,name=methods" json:"methods,omitempty"` + Methods []string `protobuf:"bytes,3,rep,name=methods,proto3" json:"methods,omitempty"` // $hide_from_docs // Optional. A list of HTTP methods that must not be matched. // Note: It's an error to set methods and not_methods at the same time. - NotMethods []string `protobuf:"bytes,8,rep,name=not_methods,json=notMethods" json:"not_methods,omitempty"` + NotMethods []string `protobuf:"bytes,8,rep,name=not_methods,json=notMethods,proto3" json:"not_methods,omitempty"` // $hide_from_docs // Optional. A list of port numbers of the request. If not specified, it matches // to any port number. // Note: It's an error to set ports and not_ports at the same time. - Ports []int32 `protobuf:"varint,9,rep,packed,name=ports" json:"ports,omitempty"` + Ports []int32 `protobuf:"varint,9,rep,packed,name=ports,proto3" json:"ports,omitempty"` // $hide_from_docs // Optional. A list of port numbers that must not be matched. // Note: It's an error to set ports and not_ports at the same time. - NotPorts []int32 `protobuf:"varint,10,rep,packed,name=not_ports,json=notPorts" json:"not_ports,omitempty"` + NotPorts []int32 `protobuf:"varint,10,rep,packed,name=not_ports,json=notPorts,proto3" json:"not_ports,omitempty"` // Optional. Extra constraints in the ServiceRole specification. - Constraints []*AccessRule_Constraint `protobuf:"bytes,4,rep,name=constraints" json:"constraints,omitempty"` + Constraints []*AccessRule_Constraint `protobuf:"bytes,4,rep,name=constraints,proto3" json:"constraints,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` +} + +func (m *AccessRule) Reset() { *m = AccessRule{} } +func (m *AccessRule) String() string { return proto.CompactTextString(m) } +func (*AccessRule) ProtoMessage() {} +func (*AccessRule) Descriptor() ([]byte, []int) { + return fileDescriptor_3462954d26c055c0, []int{3} +} +func (m *AccessRule) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *AccessRule) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_AccessRule.Marshal(b, m, deterministic) + } else { + b = b[:cap(b)] + n, err := m.MarshalTo(b) + if err != nil { + return nil, err + } + return b[:n], nil + } +} +func (m *AccessRule) XXX_Merge(src proto.Message) { + xxx_messageInfo_AccessRule.Merge(m, src) +} +func (m *AccessRule) XXX_Size() int { + return m.Size() +} +func (m *AccessRule) XXX_DiscardUnknown() { + xxx_messageInfo_AccessRule.DiscardUnknown(m) } -func (m *AccessRule) Reset() { *m = AccessRule{} } -func (m *AccessRule) String() string { return proto.CompactTextString(m) } -func (*AccessRule) ProtoMessage() {} -func (*AccessRule) Descriptor() ([]byte, []int) { return fileDescriptorRbac, []int{3} } +var xxx_messageInfo_AccessRule proto.InternalMessageInfo func (m *AccessRule) GetServices() []string { if m != nil { @@ -380,13 +497,44 @@ type AccessRule_Constraint struct { // Exact match, prefix match, and suffix match are supported. // For example, the value "v1alpha2" matches "v1alpha2" (exact match), // or "v1*" (prefix match), or "*alpha2" (suffix match). - Values []string `protobuf:"bytes,2,rep,name=values" json:"values,omitempty"` + Values []string `protobuf:"bytes,2,rep,name=values,proto3" json:"values,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` } -func (m *AccessRule_Constraint) Reset() { *m = AccessRule_Constraint{} } -func (m *AccessRule_Constraint) String() string { return proto.CompactTextString(m) } -func (*AccessRule_Constraint) ProtoMessage() {} -func (*AccessRule_Constraint) Descriptor() ([]byte, []int) { return fileDescriptorRbac, []int{3, 0} } +func (m *AccessRule_Constraint) Reset() { *m = AccessRule_Constraint{} } +func (m *AccessRule_Constraint) String() string { return proto.CompactTextString(m) } +func (*AccessRule_Constraint) ProtoMessage() {} +func (*AccessRule_Constraint) Descriptor() ([]byte, []int) { + return fileDescriptor_3462954d26c055c0, []int{3, 0} +} +func (m *AccessRule_Constraint) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *AccessRule_Constraint) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_AccessRule_Constraint.Marshal(b, m, deterministic) + } else { + b = b[:cap(b)] + n, err := m.MarshalTo(b) + if err != nil { + return nil, err + } + return b[:n], nil + } +} +func (m *AccessRule_Constraint) XXX_Merge(src proto.Message) { + xxx_messageInfo_AccessRule_Constraint.Merge(m, src) +} +func (m *AccessRule_Constraint) XXX_Size() int { + return m.Size() +} +func (m *AccessRule_Constraint) XXX_DiscardUnknown() { + xxx_messageInfo_AccessRule_Constraint.DiscardUnknown(m) +} + +var xxx_messageInfo_AccessRule_Constraint proto.InternalMessageInfo func (m *AccessRule_Constraint) GetKey() string { if m != nil { @@ -405,18 +553,49 @@ func (m *AccessRule_Constraint) GetValues() []string { // ServiceRoleBinding assigns a ServiceRole to a list of subjects. type ServiceRoleBinding struct { // Required. List of subjects that are assigned the ServiceRole object. - Subjects []*Subject `protobuf:"bytes,1,rep,name=subjects" json:"subjects,omitempty"` + Subjects []*Subject `protobuf:"bytes,1,rep,name=subjects,proto3" json:"subjects,omitempty"` // Required. Reference to the ServiceRole object. - RoleRef *RoleRef `protobuf:"bytes,2,opt,name=roleRef" json:"roleRef,omitempty"` + RoleRef *RoleRef `protobuf:"bytes,2,opt,name=roleRef,proto3" json:"roleRef,omitempty"` // $hide_from_docs // Indicates enforcement mode of the ServiceRoleBinding. - Mode EnforcementMode `protobuf:"varint,3,opt,name=mode,proto3,enum=istio.rbac.v1alpha1.EnforcementMode" json:"mode,omitempty"` + Mode EnforcementMode `protobuf:"varint,3,opt,name=mode,proto3,enum=istio.rbac.v1alpha1.EnforcementMode" json:"mode,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` +} + +func (m *ServiceRoleBinding) Reset() { *m = ServiceRoleBinding{} } +func (m *ServiceRoleBinding) String() string { return proto.CompactTextString(m) } +func (*ServiceRoleBinding) ProtoMessage() {} +func (*ServiceRoleBinding) Descriptor() ([]byte, []int) { + return fileDescriptor_3462954d26c055c0, []int{4} +} +func (m *ServiceRoleBinding) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *ServiceRoleBinding) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_ServiceRoleBinding.Marshal(b, m, deterministic) + } else { + b = b[:cap(b)] + n, err := m.MarshalTo(b) + if err != nil { + return nil, err + } + return b[:n], nil + } +} +func (m *ServiceRoleBinding) XXX_Merge(src proto.Message) { + xxx_messageInfo_ServiceRoleBinding.Merge(m, src) +} +func (m *ServiceRoleBinding) XXX_Size() int { + return m.Size() +} +func (m *ServiceRoleBinding) XXX_DiscardUnknown() { + xxx_messageInfo_ServiceRoleBinding.DiscardUnknown(m) } -func (m *ServiceRoleBinding) Reset() { *m = ServiceRoleBinding{} } -func (m *ServiceRoleBinding) String() string { return proto.CompactTextString(m) } -func (*ServiceRoleBinding) ProtoMessage() {} -func (*ServiceRoleBinding) Descriptor() ([]byte, []int) { return fileDescriptorRbac, []int{4} } +var xxx_messageInfo_ServiceRoleBinding proto.InternalMessageInfo func (m *ServiceRoleBinding) GetSubjects() []*Subject { if m != nil { @@ -448,43 +627,74 @@ type Subject struct { // Optional. A list of subject names. This is matched to the // `source.principal` attribute. If one of subject names is "*", it matches to a subject with any name. // Prefix and suffix matches are supported. - Names []string `protobuf:"bytes,4,rep,name=names" json:"names,omitempty"` + Names []string `protobuf:"bytes,4,rep,name=names,proto3" json:"names,omitempty"` // $hide_from_docs // Optional. A list of subject names that must not be matched. - NotNames []string `protobuf:"bytes,5,rep,name=not_names,json=notNames" json:"not_names,omitempty"` + NotNames []string `protobuf:"bytes,5,rep,name=not_names,json=notNames,proto3" json:"not_names,omitempty"` // $hide_from_docs // Optional. The group that the subject belongs to. // Deprecated. Use groups and not_groups instead. - Group string `protobuf:"bytes,2,opt,name=group,proto3" json:"group,omitempty"` + Group string `protobuf:"bytes,2,opt,name=group,proto3" json:"group,omitempty"` // Deprecated: Do not use. // $hide_from_docs // Optional. A list of groups that the subject represents. This is matched to the // `request.auth.claims[groups]` attribute. If not specified, it applies to any groups. - Groups []string `protobuf:"bytes,6,rep,name=groups" json:"groups,omitempty"` + Groups []string `protobuf:"bytes,6,rep,name=groups,proto3" json:"groups,omitempty"` // $hide_from_docs // Optional. A list of groups that must not be matched. - NotGroups []string `protobuf:"bytes,7,rep,name=not_groups,json=notGroups" json:"not_groups,omitempty"` + NotGroups []string `protobuf:"bytes,7,rep,name=not_groups,json=notGroups,proto3" json:"not_groups,omitempty"` // $hide_from_docs // Optional. A list of namespaces that the subject represents. This is matched to // the `source.namespace` attribute. If not specified, it applies to any namespaces. - Namespaces []string `protobuf:"bytes,8,rep,name=namespaces" json:"namespaces,omitempty"` + Namespaces []string `protobuf:"bytes,8,rep,name=namespaces,proto3" json:"namespaces,omitempty"` // $hide_from_docs // Optional. A list of namespaces that must not be matched. - NotNamespaces []string `protobuf:"bytes,9,rep,name=not_namespaces,json=notNamespaces" json:"not_namespaces,omitempty"` + NotNamespaces []string `protobuf:"bytes,9,rep,name=not_namespaces,json=notNamespaces,proto3" json:"not_namespaces,omitempty"` // $hide_from_docs // Optional. A list of IP address or CIDR ranges that the subject represents. // E.g. 192.168.100.2 or 10.1.0.0/16. If not specified, it applies to any IP addresses. - Ips []string `protobuf:"bytes,10,rep,name=ips" json:"ips,omitempty"` + Ips []string `protobuf:"bytes,10,rep,name=ips,proto3" json:"ips,omitempty"` // $hide_from_docs // Optional. A list of IP addresses or CIDR ranges that must not be matched. - NotIps []string `protobuf:"bytes,11,rep,name=not_ips,json=notIps" json:"not_ips,omitempty"` + NotIps []string `protobuf:"bytes,11,rep,name=not_ips,json=notIps,proto3" json:"not_ips,omitempty"` // Optional. The set of properties that identify the subject. - Properties map[string]string `protobuf:"bytes,3,rep,name=properties" json:"properties,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` + Properties map[string]string `protobuf:"bytes,3,rep,name=properties,proto3" json:"properties,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` +} + +func (m *Subject) Reset() { *m = Subject{} } +func (m *Subject) String() string { return proto.CompactTextString(m) } +func (*Subject) ProtoMessage() {} +func (*Subject) Descriptor() ([]byte, []int) { + return fileDescriptor_3462954d26c055c0, []int{5} +} +func (m *Subject) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *Subject) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_Subject.Marshal(b, m, deterministic) + } else { + b = b[:cap(b)] + n, err := m.MarshalTo(b) + if err != nil { + return nil, err + } + return b[:n], nil + } +} +func (m *Subject) XXX_Merge(src proto.Message) { + xxx_messageInfo_Subject.Merge(m, src) +} +func (m *Subject) XXX_Size() int { + return m.Size() +} +func (m *Subject) XXX_DiscardUnknown() { + xxx_messageInfo_Subject.DiscardUnknown(m) } -func (m *Subject) Reset() { *m = Subject{} } -func (m *Subject) String() string { return proto.CompactTextString(m) } -func (*Subject) ProtoMessage() {} -func (*Subject) Descriptor() ([]byte, []int) { return fileDescriptorRbac, []int{5} } +var xxx_messageInfo_Subject proto.InternalMessageInfo func (m *Subject) GetUser() string { if m != nil { @@ -507,6 +717,7 @@ func (m *Subject) GetNotNames() []string { return nil } +// Deprecated: Do not use. func (m *Subject) GetGroup() string { if m != nil { return m.Group @@ -570,13 +781,44 @@ type RoleRef struct { Kind string `protobuf:"bytes,1,opt,name=kind,proto3" json:"kind,omitempty"` // Required. The name of the ServiceRole object being referenced. // The ServiceRole object must be in the same namespace as the ServiceRoleBinding object. - Name string `protobuf:"bytes,2,opt,name=name,proto3" json:"name,omitempty"` + Name string `protobuf:"bytes,2,opt,name=name,proto3" json:"name,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` +} + +func (m *RoleRef) Reset() { *m = RoleRef{} } +func (m *RoleRef) String() string { return proto.CompactTextString(m) } +func (*RoleRef) ProtoMessage() {} +func (*RoleRef) Descriptor() ([]byte, []int) { + return fileDescriptor_3462954d26c055c0, []int{6} +} +func (m *RoleRef) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *RoleRef) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_RoleRef.Marshal(b, m, deterministic) + } else { + b = b[:cap(b)] + n, err := m.MarshalTo(b) + if err != nil { + return nil, err + } + return b[:n], nil + } +} +func (m *RoleRef) XXX_Merge(src proto.Message) { + xxx_messageInfo_RoleRef.Merge(m, src) +} +func (m *RoleRef) XXX_Size() int { + return m.Size() +} +func (m *RoleRef) XXX_DiscardUnknown() { + xxx_messageInfo_RoleRef.DiscardUnknown(m) } -func (m *RoleRef) Reset() { *m = RoleRef{} } -func (m *RoleRef) String() string { return proto.CompactTextString(m) } -func (*RoleRef) ProtoMessage() {} -func (*RoleRef) Descriptor() ([]byte, []int) { return fileDescriptorRbac, []int{6} } +var xxx_messageInfo_RoleRef proto.InternalMessageInfo func (m *RoleRef) GetKind() string { if m != nil { @@ -617,23 +859,54 @@ type RbacConfig struct { Mode RbacConfig_Mode `protobuf:"varint,1,opt,name=mode,proto3,enum=istio.rbac.v1alpha1.RbacConfig_Mode" json:"mode,omitempty"` // A list of services or namespaces that should be enforced by Istio RBAC policies. Note: This field have // effect only when mode is ON_WITH_INCLUSION and will be ignored for any other modes. - Inclusion *RbacConfig_Target `protobuf:"bytes,2,opt,name=inclusion" json:"inclusion,omitempty"` + Inclusion *RbacConfig_Target `protobuf:"bytes,2,opt,name=inclusion,proto3" json:"inclusion,omitempty"` // A list of services or namespaces that should not be enforced by Istio RBAC policies. Note: This field have // effect only when mode is ON_WITH_EXCLUSION and will be ignored for any other modes. - Exclusion *RbacConfig_Target `protobuf:"bytes,3,opt,name=exclusion" json:"exclusion,omitempty"` + Exclusion *RbacConfig_Target `protobuf:"bytes,3,opt,name=exclusion,proto3" json:"exclusion,omitempty"` // $hide_from_docs // Indicates enforcement mode of the RbacConfig, in ENFORCED mode by default. // It's used to verify new RbacConfig work as expected before rolling to production. // When setting as PERMISSIVE, RBAC isn't enforced and has no impact on users. // RBAC engine run RbacConfig in PERMISSIVE mode and logs stats. // Invalid to set RbacConfig in PERMISSIVE and ServiceRoleBinding in ENFORCED mode. - EnforcementMode EnforcementMode `protobuf:"varint,4,opt,name=enforcement_mode,json=enforcementMode,proto3,enum=istio.rbac.v1alpha1.EnforcementMode" json:"enforcement_mode,omitempty"` + EnforcementMode EnforcementMode `protobuf:"varint,4,opt,name=enforcement_mode,json=enforcementMode,proto3,enum=istio.rbac.v1alpha1.EnforcementMode" json:"enforcement_mode,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` +} + +func (m *RbacConfig) Reset() { *m = RbacConfig{} } +func (m *RbacConfig) String() string { return proto.CompactTextString(m) } +func (*RbacConfig) ProtoMessage() {} +func (*RbacConfig) Descriptor() ([]byte, []int) { + return fileDescriptor_3462954d26c055c0, []int{7} +} +func (m *RbacConfig) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *RbacConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_RbacConfig.Marshal(b, m, deterministic) + } else { + b = b[:cap(b)] + n, err := m.MarshalTo(b) + if err != nil { + return nil, err + } + return b[:n], nil + } +} +func (m *RbacConfig) XXX_Merge(src proto.Message) { + xxx_messageInfo_RbacConfig.Merge(m, src) +} +func (m *RbacConfig) XXX_Size() int { + return m.Size() +} +func (m *RbacConfig) XXX_DiscardUnknown() { + xxx_messageInfo_RbacConfig.DiscardUnknown(m) } -func (m *RbacConfig) Reset() { *m = RbacConfig{} } -func (m *RbacConfig) String() string { return proto.CompactTextString(m) } -func (*RbacConfig) ProtoMessage() {} -func (*RbacConfig) Descriptor() ([]byte, []int) { return fileDescriptorRbac, []int{7} } +var xxx_messageInfo_RbacConfig proto.InternalMessageInfo func (m *RbacConfig) GetMode() RbacConfig_Mode { if m != nil { @@ -666,18 +939,49 @@ func (m *RbacConfig) GetEnforcementMode() EnforcementMode { // Target defines a list of services or namespaces. type RbacConfig_Target struct { // A list of services. - Services []string `protobuf:"bytes,1,rep,name=services" json:"services,omitempty"` + Services []string `protobuf:"bytes,1,rep,name=services,proto3" json:"services,omitempty"` // $hide_from_docs // A list of workloads. - WorkloadSelectors []*WorkloadSelector `protobuf:"bytes,3,rep,name=workload_selectors,json=workloadSelectors" json:"workload_selectors,omitempty"` + WorkloadSelectors []*WorkloadSelector `protobuf:"bytes,3,rep,name=workload_selectors,json=workloadSelectors,proto3" json:"workload_selectors,omitempty"` // A list of namespaces. - Namespaces []string `protobuf:"bytes,2,rep,name=namespaces" json:"namespaces,omitempty"` + Namespaces []string `protobuf:"bytes,2,rep,name=namespaces,proto3" json:"namespaces,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` +} + +func (m *RbacConfig_Target) Reset() { *m = RbacConfig_Target{} } +func (m *RbacConfig_Target) String() string { return proto.CompactTextString(m) } +func (*RbacConfig_Target) ProtoMessage() {} +func (*RbacConfig_Target) Descriptor() ([]byte, []int) { + return fileDescriptor_3462954d26c055c0, []int{7, 0} +} +func (m *RbacConfig_Target) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *RbacConfig_Target) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_RbacConfig_Target.Marshal(b, m, deterministic) + } else { + b = b[:cap(b)] + n, err := m.MarshalTo(b) + if err != nil { + return nil, err + } + return b[:n], nil + } +} +func (m *RbacConfig_Target) XXX_Merge(src proto.Message) { + xxx_messageInfo_RbacConfig_Target.Merge(m, src) +} +func (m *RbacConfig_Target) XXX_Size() int { + return m.Size() +} +func (m *RbacConfig_Target) XXX_DiscardUnknown() { + xxx_messageInfo_RbacConfig_Target.DiscardUnknown(m) } -func (m *RbacConfig_Target) Reset() { *m = RbacConfig_Target{} } -func (m *RbacConfig_Target) String() string { return proto.CompactTextString(m) } -func (*RbacConfig_Target) ProtoMessage() {} -func (*RbacConfig_Target) Descriptor() ([]byte, []int) { return fileDescriptorRbac, []int{7, 0} } +var xxx_messageInfo_RbacConfig_Target proto.InternalMessageInfo func (m *RbacConfig_Target) GetServices() []string { if m != nil { @@ -701,19 +1005,85 @@ func (m *RbacConfig_Target) GetNamespaces() []string { } func init() { + proto.RegisterEnum("istio.rbac.v1alpha1.EnforcementMode", EnforcementMode_name, EnforcementMode_value) + proto.RegisterEnum("istio.rbac.v1alpha1.RbacConfig_Mode", RbacConfig_Mode_name, RbacConfig_Mode_value) proto.RegisterType((*WorkloadSelector)(nil), "istio.rbac.v1alpha1.WorkloadSelector") + proto.RegisterMapType((map[string]string)(nil), "istio.rbac.v1alpha1.WorkloadSelector.LabelsEntry") proto.RegisterType((*AuthorizationPolicy)(nil), "istio.rbac.v1alpha1.AuthorizationPolicy") proto.RegisterType((*ServiceRole)(nil), "istio.rbac.v1alpha1.ServiceRole") proto.RegisterType((*AccessRule)(nil), "istio.rbac.v1alpha1.AccessRule") proto.RegisterType((*AccessRule_Constraint)(nil), "istio.rbac.v1alpha1.AccessRule.Constraint") proto.RegisterType((*ServiceRoleBinding)(nil), "istio.rbac.v1alpha1.ServiceRoleBinding") proto.RegisterType((*Subject)(nil), "istio.rbac.v1alpha1.Subject") + proto.RegisterMapType((map[string]string)(nil), "istio.rbac.v1alpha1.Subject.PropertiesEntry") proto.RegisterType((*RoleRef)(nil), "istio.rbac.v1alpha1.RoleRef") proto.RegisterType((*RbacConfig)(nil), "istio.rbac.v1alpha1.RbacConfig") proto.RegisterType((*RbacConfig_Target)(nil), "istio.rbac.v1alpha1.RbacConfig.Target") - proto.RegisterEnum("istio.rbac.v1alpha1.EnforcementMode", EnforcementMode_name, EnforcementMode_value) - proto.RegisterEnum("istio.rbac.v1alpha1.RbacConfig_Mode", RbacConfig_Mode_name, RbacConfig_Mode_value) } + +func init() { proto.RegisterFile("rbac/v1alpha1/rbac.proto", fileDescriptor_3462954d26c055c0) } + +var fileDescriptor_3462954d26c055c0 = []byte{ + // 898 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x56, 0xcd, 0x6e, 0x23, 0x45, + 0x10, 0xde, 0xf1, 0xf8, 0x27, 0x53, 0x86, 0x64, 0xd2, 0xbb, 0xc0, 0xc8, 0x40, 0x36, 0xb2, 0x58, + 0xb0, 0x56, 0xc8, 0x56, 0x82, 0x58, 0x05, 0xa4, 0x3d, 0x6c, 0x12, 0x87, 0xb5, 0x94, 0xd8, 0x51, + 0x3b, 0xb0, 0x88, 0x8b, 0x35, 0x1e, 0x77, 0xe2, 0x26, 0x93, 0xee, 0x51, 0x4f, 0x4f, 0x42, 0x38, + 0x72, 0xe1, 0x15, 0x10, 0x27, 0x8e, 0x3c, 0x06, 0x47, 0x8e, 0x3c, 0x02, 0xca, 0x93, 0xa0, 0xee, + 0x9e, 0x1e, 0x7b, 0xbd, 0x26, 0x9b, 0xdc, 0xba, 0xea, 0xab, 0xaf, 0xaa, 0xab, 0xea, 0xf3, 0xb4, + 0x21, 0x10, 0xe3, 0x30, 0xea, 0x5c, 0x6e, 0x85, 0x71, 0x32, 0x0d, 0xb7, 0x3a, 0xca, 0x6a, 0x27, + 0x82, 0x4b, 0x8e, 0x1e, 0xd2, 0x54, 0x52, 0xde, 0xd6, 0x1e, 0x8b, 0x37, 0x7f, 0x73, 0xc0, 0x7f, + 0xc5, 0xc5, 0x79, 0xcc, 0xc3, 0xc9, 0x90, 0xc4, 0x24, 0x92, 0x5c, 0xa0, 0x1e, 0x54, 0xe3, 0x70, + 0x4c, 0xe2, 0x34, 0x70, 0x36, 0xdd, 0x56, 0x7d, 0x7b, 0xab, 0xbd, 0x84, 0xda, 0x5e, 0xa4, 0xb5, + 0x0f, 0x35, 0xa7, 0xcb, 0xa4, 0xb8, 0xc6, 0x79, 0x82, 0xc6, 0x57, 0x50, 0x9f, 0x73, 0x23, 0x1f, + 0xdc, 0x73, 0x72, 0x1d, 0x38, 0x9b, 0x4e, 0xcb, 0xc3, 0xea, 0x88, 0x1e, 0x41, 0xe5, 0x32, 0x8c, + 0x33, 0x12, 0x94, 0xb4, 0xcf, 0x18, 0x5f, 0x97, 0x76, 0x9c, 0xe6, 0x9f, 0x0e, 0x3c, 0x7c, 0x91, + 0xc9, 0x29, 0x17, 0xf4, 0xe7, 0x50, 0x52, 0xce, 0x8e, 0x79, 0x4c, 0xa3, 0x6b, 0x84, 0x61, 0xfd, + 0x2a, 0x2f, 0x3d, 0x4a, 0xf3, 0xda, 0x3a, 0x63, 0x7d, 0xfb, 0xc9, 0x9d, 0x2e, 0x8a, 0xfd, 0xab, + 0xc5, 0x8e, 0x9f, 0x43, 0x25, 0x8c, 0x63, 0x7e, 0x15, 0x94, 0x74, 0xc3, 0x9f, 0x2d, 0xcd, 0x33, + 0x24, 0xe2, 0x92, 0x46, 0x04, 0xf3, 0x98, 0xec, 0x52, 0x36, 0xa1, 0xec, 0x0c, 0x1b, 0x56, 0x73, + 0x1f, 0xea, 0x73, 0x20, 0xfa, 0x12, 0x2a, 0x22, 0x8b, 0x89, 0x1d, 0xdf, 0xe3, 0xa5, 0xd9, 0x5e, + 0x44, 0x11, 0x49, 0x53, 0x9c, 0xc5, 0x04, 0x9b, 0xe8, 0xe6, 0x2f, 0x2e, 0xc0, 0xcc, 0x8b, 0x1a, + 0xb0, 0x92, 0x9a, 0xa4, 0x26, 0x91, 0x87, 0x0b, 0x5b, 0x4d, 0x6d, 0xca, 0x53, 0x99, 0x06, 0x15, + 0x0d, 0x18, 0x03, 0x7d, 0x08, 0x1e, 0xe3, 0x72, 0x64, 0x90, 0xaa, 0xa1, 0x30, 0x2e, 0x5f, 0x6a, + 0xf0, 0x11, 0x54, 0x92, 0x50, 0x4e, 0x53, 0xdd, 0xa2, 0x87, 0x8d, 0x61, 0x29, 0x06, 0xa9, 0x15, + 0x94, 0x63, 0x0d, 0x06, 0x50, 0xbb, 0x20, 0x72, 0xca, 0x27, 0x69, 0xe0, 0x6a, 0xc8, 0x9a, 0xe8, + 0x31, 0xd4, 0x15, 0xcd, 0xa2, 0x2b, 0x1a, 0x05, 0xc6, 0xe5, 0x51, 0x1e, 0xa0, 0xaa, 0x71, 0x21, + 0xd3, 0xc0, 0xdb, 0x74, 0x5b, 0x15, 0x6c, 0x8c, 0xa2, 0x9a, 0x46, 0x40, 0x23, 0xba, 0x9a, 0x06, + 0x0f, 0xa1, 0x1e, 0x71, 0x96, 0x4a, 0x11, 0x52, 0x26, 0xd3, 0xa0, 0xac, 0x67, 0xf7, 0xf4, 0x2d, + 0xb3, 0x6b, 0xef, 0x15, 0x14, 0x3c, 0x4f, 0x6f, 0x3c, 0x03, 0x98, 0x41, 0x4b, 0x74, 0xf7, 0x3e, + 0x54, 0xb5, 0xd4, 0xec, 0x3c, 0x72, 0xab, 0xf9, 0x97, 0x03, 0xe8, 0xcd, 0x45, 0xa3, 0x1d, 0x58, + 0x49, 0xb3, 0xf1, 0x8f, 0x24, 0x92, 0x76, 0xab, 0x1f, 0x2d, 0xd7, 0x88, 0x09, 0xc2, 0x45, 0x34, + 0x7a, 0x06, 0x35, 0xc1, 0x63, 0x82, 0xc9, 0xa9, 0x96, 0xf8, 0xff, 0x11, 0xb1, 0x89, 0xc1, 0x36, + 0x18, 0xed, 0x40, 0xf9, 0x82, 0x4f, 0x48, 0xe0, 0x6e, 0x3a, 0xad, 0xd5, 0xed, 0x4f, 0x96, 0x92, + 0xba, 0xec, 0x94, 0x8b, 0x88, 0x5c, 0x10, 0x26, 0x8f, 0xf8, 0x84, 0x60, 0xcd, 0x68, 0xfe, 0xe1, + 0x42, 0x2d, 0xbf, 0x07, 0x42, 0x50, 0xce, 0x52, 0x22, 0xf2, 0xce, 0xf5, 0x59, 0xed, 0x86, 0x85, + 0x17, 0xc4, 0x8c, 0xd8, 0xc3, 0xc6, 0xb0, 0xbb, 0x31, 0x48, 0xa5, 0x50, 0x42, 0x5f, 0x83, 0x01, + 0x54, 0xce, 0x04, 0xcf, 0x12, 0xf3, 0x2b, 0xdd, 0x2d, 0x05, 0x0e, 0x36, 0x0e, 0x35, 0x47, 0x7d, + 0xb0, 0x82, 0xcb, 0x2d, 0xf4, 0x31, 0x28, 0x39, 0x8c, 0x72, 0xcc, 0x28, 0x4b, 0x15, 0xf8, 0xc6, + 0xc0, 0x1b, 0x00, 0xba, 0x52, 0x12, 0x2a, 0x79, 0x5b, 0xfd, 0x14, 0x1e, 0xf4, 0x04, 0x56, 0x8b, + 0xdb, 0x98, 0x18, 0x4f, 0xc7, 0xbc, 0x6b, 0xaf, 0x64, 0xc2, 0x7c, 0x70, 0x69, 0x62, 0xa4, 0xe4, + 0x61, 0x75, 0x44, 0x1f, 0x40, 0x4d, 0x11, 0x95, 0xb7, 0x6e, 0x2e, 0xc4, 0xb8, 0xec, 0x25, 0x4a, + 0x5e, 0x90, 0x08, 0x9e, 0x10, 0x21, 0x29, 0x31, 0x7a, 0xae, 0x6f, 0x7f, 0x7e, 0xdb, 0x0e, 0xdb, + 0xc7, 0x45, 0xb8, 0xf9, 0xa6, 0xcd, 0xf1, 0x1b, 0xcf, 0x61, 0x6d, 0x01, 0xbe, 0xd7, 0xb7, 0x6d, + 0x0b, 0x6a, 0xf9, 0xc2, 0xd5, 0x86, 0xce, 0x29, 0x9b, 0xd8, 0x0d, 0xa9, 0xb3, 0xf2, 0xa9, 0xce, + 0x73, 0x9e, 0x3e, 0x37, 0x7f, 0x2d, 0x03, 0xe0, 0x71, 0x18, 0xed, 0x71, 0x76, 0x4a, 0xcf, 0x0a, + 0x79, 0x38, 0xb7, 0xc8, 0x63, 0x16, 0xde, 0x9e, 0xc9, 0x03, 0xed, 0x83, 0x47, 0x59, 0x14, 0x67, + 0x29, 0xe5, 0x2c, 0x97, 0xe4, 0xa7, 0x6f, 0xa3, 0x9f, 0x84, 0xe2, 0x8c, 0x48, 0x3c, 0x23, 0xaa, + 0x2c, 0xe4, 0x27, 0x9b, 0xc5, 0xbd, 0x5f, 0x96, 0x82, 0x88, 0x06, 0xe0, 0x93, 0x99, 0x86, 0x47, + 0xba, 0xa3, 0xf2, 0x3d, 0x04, 0xbf, 0x46, 0x5e, 0x77, 0x34, 0x7e, 0x77, 0xa0, 0x6a, 0xca, 0xdc, + 0xfa, 0xfd, 0x3c, 0x01, 0xf4, 0xc6, 0x1b, 0x62, 0x45, 0x71, 0xc7, 0x47, 0x64, 0x7d, 0xf1, 0x11, + 0x59, 0x14, 0x75, 0x69, 0x51, 0xd4, 0xcd, 0x2e, 0x94, 0xd5, 0x25, 0x51, 0x0d, 0xdc, 0xc1, 0xc1, + 0x81, 0xff, 0x00, 0x55, 0xa1, 0x34, 0xe8, 0xfb, 0x0e, 0x7a, 0x0f, 0xd6, 0x07, 0xfd, 0xd1, 0xab, + 0xde, 0xc9, 0xcb, 0x51, 0xaf, 0xbf, 0x77, 0xf8, 0xed, 0xb0, 0x37, 0xe8, 0xfb, 0xa5, 0x79, 0x77, + 0xf7, 0x7b, 0xeb, 0x76, 0x9f, 0x76, 0x60, 0x6d, 0x61, 0x0e, 0xe8, 0x1d, 0x58, 0xe9, 0xf6, 0x0f, + 0x06, 0x78, 0xaf, 0xbb, 0xef, 0x3f, 0x40, 0xab, 0x00, 0xc7, 0x5d, 0x7c, 0xd4, 0x1b, 0x0e, 0x7b, + 0xdf, 0x75, 0x7d, 0x67, 0xb7, 0xf5, 0xf7, 0xcd, 0x86, 0xf3, 0xcf, 0xcd, 0x86, 0xf3, 0xef, 0xcd, + 0x86, 0xf3, 0x43, 0xc3, 0xb4, 0x47, 0x79, 0x27, 0x4c, 0x68, 0xe7, 0xb5, 0xbf, 0x0b, 0xe3, 0xaa, + 0xfe, 0xab, 0xf0, 0xc5, 0x7f, 0x01, 0x00, 0x00, 0xff, 0xff, 0x63, 0x73, 0xac, 0x2f, 0x46, 0x08, + 0x00, 0x00, +} + func (m *WorkloadSelector) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) @@ -746,6 +1116,9 @@ func (m *WorkloadSelector) MarshalTo(dAtA []byte) (int, error) { i += copy(dAtA[i:], v) } } + if m.XXX_unrecognized != nil { + i += copy(dAtA[i:], m.XXX_unrecognized) + } return i, nil } @@ -786,6 +1159,9 @@ func (m *AuthorizationPolicy) MarshalTo(dAtA []byte) (int, error) { i += n } } + if m.XXX_unrecognized != nil { + i += copy(dAtA[i:], m.XXX_unrecognized) + } return i, nil } @@ -816,6 +1192,9 @@ func (m *ServiceRole) MarshalTo(dAtA []byte) (int, error) { i += n } } + if m.XXX_unrecognized != nil { + i += copy(dAtA[i:], m.XXX_unrecognized) + } return i, nil } @@ -987,6 +1366,9 @@ func (m *AccessRule) MarshalTo(dAtA []byte) (int, error) { i = encodeVarintRbac(dAtA, i, uint64(j4)) i += copy(dAtA[i:], dAtA5[:j4]) } + if m.XXX_unrecognized != nil { + i += copy(dAtA[i:], m.XXX_unrecognized) + } return i, nil } @@ -1026,6 +1408,9 @@ func (m *AccessRule_Constraint) MarshalTo(dAtA []byte) (int, error) { i += copy(dAtA[i:], s) } } + if m.XXX_unrecognized != nil { + i += copy(dAtA[i:], m.XXX_unrecognized) + } return i, nil } @@ -1071,6 +1456,9 @@ func (m *ServiceRoleBinding) MarshalTo(dAtA []byte) (int, error) { i++ i = encodeVarintRbac(dAtA, i, uint64(m.Mode)) } + if m.XXX_unrecognized != nil { + i += copy(dAtA[i:], m.XXX_unrecognized) + } return i, nil } @@ -1238,6 +1626,9 @@ func (m *Subject) MarshalTo(dAtA []byte) (int, error) { i += copy(dAtA[i:], s) } } + if m.XXX_unrecognized != nil { + i += copy(dAtA[i:], m.XXX_unrecognized) + } return i, nil } @@ -1268,6 +1659,9 @@ func (m *RoleRef) MarshalTo(dAtA []byte) (int, error) { i = encodeVarintRbac(dAtA, i, uint64(len(m.Name))) i += copy(dAtA[i:], m.Name) } + if m.XXX_unrecognized != nil { + i += copy(dAtA[i:], m.XXX_unrecognized) + } return i, nil } @@ -1316,6 +1710,9 @@ func (m *RbacConfig) MarshalTo(dAtA []byte) (int, error) { i++ i = encodeVarintRbac(dAtA, i, uint64(m.EnforcementMode)) } + if m.XXX_unrecognized != nil { + i += copy(dAtA[i:], m.XXX_unrecognized) + } return i, nil } @@ -1376,6 +1773,9 @@ func (m *RbacConfig_Target) MarshalTo(dAtA []byte) (int, error) { i += n } } + if m.XXX_unrecognized != nil { + i += copy(dAtA[i:], m.XXX_unrecognized) + } return i, nil } @@ -1389,6 +1789,9 @@ func encodeVarintRbac(dAtA []byte, offset int, v uint64) int { return offset + 1 } func (m *WorkloadSelector) Size() (n int) { + if m == nil { + return 0 + } var l int _ = l if len(m.Labels) > 0 { @@ -1399,10 +1802,16 @@ func (m *WorkloadSelector) Size() (n int) { n += mapEntrySize + 1 + sovRbac(uint64(mapEntrySize)) } } + if m.XXX_unrecognized != nil { + n += len(m.XXX_unrecognized) + } return n } func (m *AuthorizationPolicy) Size() (n int) { + if m == nil { + return 0 + } var l int _ = l if m.WorkloadSelector != nil { @@ -1415,10 +1824,16 @@ func (m *AuthorizationPolicy) Size() (n int) { n += 1 + l + sovRbac(uint64(l)) } } + if m.XXX_unrecognized != nil { + n += len(m.XXX_unrecognized) + } return n } func (m *ServiceRole) Size() (n int) { + if m == nil { + return 0 + } var l int _ = l if len(m.Rules) > 0 { @@ -1427,10 +1842,16 @@ func (m *ServiceRole) Size() (n int) { n += 1 + l + sovRbac(uint64(l)) } } + if m.XXX_unrecognized != nil { + n += len(m.XXX_unrecognized) + } return n } func (m *AccessRule) Size() (n int) { + if m == nil { + return 0 + } var l int _ = l if len(m.Services) > 0 { @@ -1495,10 +1916,16 @@ func (m *AccessRule) Size() (n int) { } n += 1 + sovRbac(uint64(l)) + l } + if m.XXX_unrecognized != nil { + n += len(m.XXX_unrecognized) + } return n } func (m *AccessRule_Constraint) Size() (n int) { + if m == nil { + return 0 + } var l int _ = l l = len(m.Key) @@ -1511,10 +1938,16 @@ func (m *AccessRule_Constraint) Size() (n int) { n += 1 + l + sovRbac(uint64(l)) } } + if m.XXX_unrecognized != nil { + n += len(m.XXX_unrecognized) + } return n } func (m *ServiceRoleBinding) Size() (n int) { + if m == nil { + return 0 + } var l int _ = l if len(m.Subjects) > 0 { @@ -1530,10 +1963,16 @@ func (m *ServiceRoleBinding) Size() (n int) { if m.Mode != 0 { n += 1 + sovRbac(uint64(m.Mode)) } + if m.XXX_unrecognized != nil { + n += len(m.XXX_unrecognized) + } return n } func (m *Subject) Size() (n int) { + if m == nil { + return 0 + } var l int _ = l l = len(m.User) @@ -1600,10 +2039,16 @@ func (m *Subject) Size() (n int) { n += 1 + l + sovRbac(uint64(l)) } } + if m.XXX_unrecognized != nil { + n += len(m.XXX_unrecognized) + } return n } func (m *RoleRef) Size() (n int) { + if m == nil { + return 0 + } var l int _ = l l = len(m.Kind) @@ -1614,10 +2059,16 @@ func (m *RoleRef) Size() (n int) { if l > 0 { n += 1 + l + sovRbac(uint64(l)) } + if m.XXX_unrecognized != nil { + n += len(m.XXX_unrecognized) + } return n } func (m *RbacConfig) Size() (n int) { + if m == nil { + return 0 + } var l int _ = l if m.Mode != 0 { @@ -1634,10 +2085,16 @@ func (m *RbacConfig) Size() (n int) { if m.EnforcementMode != 0 { n += 1 + sovRbac(uint64(m.EnforcementMode)) } + if m.XXX_unrecognized != nil { + n += len(m.XXX_unrecognized) + } return n } func (m *RbacConfig_Target) Size() (n int) { + if m == nil { + return 0 + } var l int _ = l if len(m.Services) > 0 { @@ -1658,6 +2115,9 @@ func (m *RbacConfig_Target) Size() (n int) { n += 1 + l + sovRbac(uint64(l)) } } + if m.XXX_unrecognized != nil { + n += len(m.XXX_unrecognized) + } return n } @@ -1689,7 +2149,7 @@ func (m *WorkloadSelector) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - wire |= (uint64(b) & 0x7F) << shift + wire |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -1717,7 +2177,7 @@ func (m *WorkloadSelector) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - msglen |= (int(b) & 0x7F) << shift + msglen |= int(b&0x7F) << shift if b < 0x80 { break } @@ -1726,6 +2186,9 @@ func (m *WorkloadSelector) Unmarshal(dAtA []byte) error { return ErrInvalidLengthRbac } postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthRbac + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -1746,7 +2209,7 @@ func (m *WorkloadSelector) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - wire |= (uint64(b) & 0x7F) << shift + wire |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -1763,7 +2226,7 @@ func (m *WorkloadSelector) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLenmapkey |= (uint64(b) & 0x7F) << shift + stringLenmapkey |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -1773,6 +2236,9 @@ func (m *WorkloadSelector) Unmarshal(dAtA []byte) error { return ErrInvalidLengthRbac } postStringIndexmapkey := iNdEx + intStringLenmapkey + if postStringIndexmapkey < 0 { + return ErrInvalidLengthRbac + } if postStringIndexmapkey > l { return io.ErrUnexpectedEOF } @@ -1789,7 +2255,7 @@ func (m *WorkloadSelector) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLenmapvalue |= (uint64(b) & 0x7F) << shift + stringLenmapvalue |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -1799,6 +2265,9 @@ func (m *WorkloadSelector) Unmarshal(dAtA []byte) error { return ErrInvalidLengthRbac } postStringIndexmapvalue := iNdEx + intStringLenmapvalue + if postStringIndexmapvalue < 0 { + return ErrInvalidLengthRbac + } if postStringIndexmapvalue > l { return io.ErrUnexpectedEOF } @@ -1830,9 +2299,13 @@ func (m *WorkloadSelector) Unmarshal(dAtA []byte) error { if skippy < 0 { return ErrInvalidLengthRbac } + if (iNdEx + skippy) < 0 { + return ErrInvalidLengthRbac + } if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF } + m.XXX_unrecognized = append(m.XXX_unrecognized, dAtA[iNdEx:iNdEx+skippy]...) iNdEx += skippy } } @@ -1857,7 +2330,7 @@ func (m *AuthorizationPolicy) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - wire |= (uint64(b) & 0x7F) << shift + wire |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -1885,7 +2358,7 @@ func (m *AuthorizationPolicy) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - msglen |= (int(b) & 0x7F) << shift + msglen |= int(b&0x7F) << shift if b < 0x80 { break } @@ -1894,6 +2367,9 @@ func (m *AuthorizationPolicy) Unmarshal(dAtA []byte) error { return ErrInvalidLengthRbac } postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthRbac + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -1918,7 +2394,7 @@ func (m *AuthorizationPolicy) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - msglen |= (int(b) & 0x7F) << shift + msglen |= int(b&0x7F) << shift if b < 0x80 { break } @@ -1927,6 +2403,9 @@ func (m *AuthorizationPolicy) Unmarshal(dAtA []byte) error { return ErrInvalidLengthRbac } postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthRbac + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -1944,9 +2423,13 @@ func (m *AuthorizationPolicy) Unmarshal(dAtA []byte) error { if skippy < 0 { return ErrInvalidLengthRbac } + if (iNdEx + skippy) < 0 { + return ErrInvalidLengthRbac + } if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF } + m.XXX_unrecognized = append(m.XXX_unrecognized, dAtA[iNdEx:iNdEx+skippy]...) iNdEx += skippy } } @@ -1971,7 +2454,7 @@ func (m *ServiceRole) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - wire |= (uint64(b) & 0x7F) << shift + wire |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -1999,7 +2482,7 @@ func (m *ServiceRole) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - msglen |= (int(b) & 0x7F) << shift + msglen |= int(b&0x7F) << shift if b < 0x80 { break } @@ -2008,6 +2491,9 @@ func (m *ServiceRole) Unmarshal(dAtA []byte) error { return ErrInvalidLengthRbac } postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthRbac + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -2025,9 +2511,13 @@ func (m *ServiceRole) Unmarshal(dAtA []byte) error { if skippy < 0 { return ErrInvalidLengthRbac } + if (iNdEx + skippy) < 0 { + return ErrInvalidLengthRbac + } if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF } + m.XXX_unrecognized = append(m.XXX_unrecognized, dAtA[iNdEx:iNdEx+skippy]...) iNdEx += skippy } } @@ -2052,7 +2542,7 @@ func (m *AccessRule) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - wire |= (uint64(b) & 0x7F) << shift + wire |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -2080,7 +2570,7 @@ func (m *AccessRule) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLen |= (uint64(b) & 0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -2090,6 +2580,9 @@ func (m *AccessRule) Unmarshal(dAtA []byte) error { return ErrInvalidLengthRbac } postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthRbac + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -2109,7 +2602,7 @@ func (m *AccessRule) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLen |= (uint64(b) & 0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -2119,6 +2612,9 @@ func (m *AccessRule) Unmarshal(dAtA []byte) error { return ErrInvalidLengthRbac } postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthRbac + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -2138,7 +2634,7 @@ func (m *AccessRule) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLen |= (uint64(b) & 0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -2148,6 +2644,9 @@ func (m *AccessRule) Unmarshal(dAtA []byte) error { return ErrInvalidLengthRbac } postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthRbac + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -2167,7 +2666,7 @@ func (m *AccessRule) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - msglen |= (int(b) & 0x7F) << shift + msglen |= int(b&0x7F) << shift if b < 0x80 { break } @@ -2176,6 +2675,9 @@ func (m *AccessRule) Unmarshal(dAtA []byte) error { return ErrInvalidLengthRbac } postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthRbac + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -2198,7 +2700,7 @@ func (m *AccessRule) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLen |= (uint64(b) & 0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -2208,6 +2710,9 @@ func (m *AccessRule) Unmarshal(dAtA []byte) error { return ErrInvalidLengthRbac } postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthRbac + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -2227,7 +2732,7 @@ func (m *AccessRule) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLen |= (uint64(b) & 0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -2237,6 +2742,9 @@ func (m *AccessRule) Unmarshal(dAtA []byte) error { return ErrInvalidLengthRbac } postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthRbac + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -2256,7 +2764,7 @@ func (m *AccessRule) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLen |= (uint64(b) & 0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -2266,6 +2774,9 @@ func (m *AccessRule) Unmarshal(dAtA []byte) error { return ErrInvalidLengthRbac } postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthRbac + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -2285,7 +2796,7 @@ func (m *AccessRule) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLen |= (uint64(b) & 0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -2295,6 +2806,9 @@ func (m *AccessRule) Unmarshal(dAtA []byte) error { return ErrInvalidLengthRbac } postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthRbac + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -2312,7 +2826,7 @@ func (m *AccessRule) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - v |= (int32(b) & 0x7F) << shift + v |= int32(b&0x7F) << shift if b < 0x80 { break } @@ -2329,7 +2843,7 @@ func (m *AccessRule) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - packedLen |= (int(b) & 0x7F) << shift + packedLen |= int(b&0x7F) << shift if b < 0x80 { break } @@ -2338,9 +2852,23 @@ func (m *AccessRule) Unmarshal(dAtA []byte) error { return ErrInvalidLengthRbac } postIndex := iNdEx + packedLen + if postIndex < 0 { + return ErrInvalidLengthRbac + } if postIndex > l { return io.ErrUnexpectedEOF } + var elementCount int + var count int + for _, integer := range dAtA[iNdEx:postIndex] { + if integer < 128 { + count++ + } + } + elementCount = count + if elementCount != 0 && len(m.Ports) == 0 { + m.Ports = make([]int32, 0, elementCount) + } for iNdEx < postIndex { var v int32 for shift := uint(0); ; shift += 7 { @@ -2352,7 +2880,7 @@ func (m *AccessRule) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - v |= (int32(b) & 0x7F) << shift + v |= int32(b&0x7F) << shift if b < 0x80 { break } @@ -2374,7 +2902,7 @@ func (m *AccessRule) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - v |= (int32(b) & 0x7F) << shift + v |= int32(b&0x7F) << shift if b < 0x80 { break } @@ -2391,7 +2919,7 @@ func (m *AccessRule) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - packedLen |= (int(b) & 0x7F) << shift + packedLen |= int(b&0x7F) << shift if b < 0x80 { break } @@ -2400,9 +2928,23 @@ func (m *AccessRule) Unmarshal(dAtA []byte) error { return ErrInvalidLengthRbac } postIndex := iNdEx + packedLen + if postIndex < 0 { + return ErrInvalidLengthRbac + } if postIndex > l { return io.ErrUnexpectedEOF } + var elementCount int + var count int + for _, integer := range dAtA[iNdEx:postIndex] { + if integer < 128 { + count++ + } + } + elementCount = count + if elementCount != 0 && len(m.NotPorts) == 0 { + m.NotPorts = make([]int32, 0, elementCount) + } for iNdEx < postIndex { var v int32 for shift := uint(0); ; shift += 7 { @@ -2414,7 +2956,7 @@ func (m *AccessRule) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - v |= (int32(b) & 0x7F) << shift + v |= int32(b&0x7F) << shift if b < 0x80 { break } @@ -2433,9 +2975,13 @@ func (m *AccessRule) Unmarshal(dAtA []byte) error { if skippy < 0 { return ErrInvalidLengthRbac } + if (iNdEx + skippy) < 0 { + return ErrInvalidLengthRbac + } if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF } + m.XXX_unrecognized = append(m.XXX_unrecognized, dAtA[iNdEx:iNdEx+skippy]...) iNdEx += skippy } } @@ -2460,7 +3006,7 @@ func (m *AccessRule_Constraint) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - wire |= (uint64(b) & 0x7F) << shift + wire |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -2488,7 +3034,7 @@ func (m *AccessRule_Constraint) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLen |= (uint64(b) & 0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -2498,6 +3044,9 @@ func (m *AccessRule_Constraint) Unmarshal(dAtA []byte) error { return ErrInvalidLengthRbac } postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthRbac + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -2517,7 +3066,7 @@ func (m *AccessRule_Constraint) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLen |= (uint64(b) & 0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -2527,6 +3076,9 @@ func (m *AccessRule_Constraint) Unmarshal(dAtA []byte) error { return ErrInvalidLengthRbac } postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthRbac + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -2541,9 +3093,13 @@ func (m *AccessRule_Constraint) Unmarshal(dAtA []byte) error { if skippy < 0 { return ErrInvalidLengthRbac } + if (iNdEx + skippy) < 0 { + return ErrInvalidLengthRbac + } if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF } + m.XXX_unrecognized = append(m.XXX_unrecognized, dAtA[iNdEx:iNdEx+skippy]...) iNdEx += skippy } } @@ -2568,7 +3124,7 @@ func (m *ServiceRoleBinding) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - wire |= (uint64(b) & 0x7F) << shift + wire |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -2596,7 +3152,7 @@ func (m *ServiceRoleBinding) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - msglen |= (int(b) & 0x7F) << shift + msglen |= int(b&0x7F) << shift if b < 0x80 { break } @@ -2605,6 +3161,9 @@ func (m *ServiceRoleBinding) Unmarshal(dAtA []byte) error { return ErrInvalidLengthRbac } postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthRbac + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -2627,7 +3186,7 @@ func (m *ServiceRoleBinding) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - msglen |= (int(b) & 0x7F) << shift + msglen |= int(b&0x7F) << shift if b < 0x80 { break } @@ -2636,6 +3195,9 @@ func (m *ServiceRoleBinding) Unmarshal(dAtA []byte) error { return ErrInvalidLengthRbac } postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthRbac + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -2660,7 +3222,7 @@ func (m *ServiceRoleBinding) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - m.Mode |= (EnforcementMode(b) & 0x7F) << shift + m.Mode |= EnforcementMode(b&0x7F) << shift if b < 0x80 { break } @@ -2674,9 +3236,13 @@ func (m *ServiceRoleBinding) Unmarshal(dAtA []byte) error { if skippy < 0 { return ErrInvalidLengthRbac } + if (iNdEx + skippy) < 0 { + return ErrInvalidLengthRbac + } if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF } + m.XXX_unrecognized = append(m.XXX_unrecognized, dAtA[iNdEx:iNdEx+skippy]...) iNdEx += skippy } } @@ -2701,7 +3267,7 @@ func (m *Subject) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - wire |= (uint64(b) & 0x7F) << shift + wire |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -2729,7 +3295,7 @@ func (m *Subject) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLen |= (uint64(b) & 0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -2739,6 +3305,9 @@ func (m *Subject) Unmarshal(dAtA []byte) error { return ErrInvalidLengthRbac } postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthRbac + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -2758,7 +3327,7 @@ func (m *Subject) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLen |= (uint64(b) & 0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -2768,6 +3337,9 @@ func (m *Subject) Unmarshal(dAtA []byte) error { return ErrInvalidLengthRbac } postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthRbac + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -2787,7 +3359,7 @@ func (m *Subject) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - msglen |= (int(b) & 0x7F) << shift + msglen |= int(b&0x7F) << shift if b < 0x80 { break } @@ -2796,6 +3368,9 @@ func (m *Subject) Unmarshal(dAtA []byte) error { return ErrInvalidLengthRbac } postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthRbac + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -2816,7 +3391,7 @@ func (m *Subject) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - wire |= (uint64(b) & 0x7F) << shift + wire |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -2833,7 +3408,7 @@ func (m *Subject) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLenmapkey |= (uint64(b) & 0x7F) << shift + stringLenmapkey |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -2843,6 +3418,9 @@ func (m *Subject) Unmarshal(dAtA []byte) error { return ErrInvalidLengthRbac } postStringIndexmapkey := iNdEx + intStringLenmapkey + if postStringIndexmapkey < 0 { + return ErrInvalidLengthRbac + } if postStringIndexmapkey > l { return io.ErrUnexpectedEOF } @@ -2859,7 +3437,7 @@ func (m *Subject) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLenmapvalue |= (uint64(b) & 0x7F) << shift + stringLenmapvalue |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -2869,6 +3447,9 @@ func (m *Subject) Unmarshal(dAtA []byte) error { return ErrInvalidLengthRbac } postStringIndexmapvalue := iNdEx + intStringLenmapvalue + if postStringIndexmapvalue < 0 { + return ErrInvalidLengthRbac + } if postStringIndexmapvalue > l { return io.ErrUnexpectedEOF } @@ -2905,7 +3486,7 @@ func (m *Subject) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLen |= (uint64(b) & 0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -2915,6 +3496,9 @@ func (m *Subject) Unmarshal(dAtA []byte) error { return ErrInvalidLengthRbac } postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthRbac + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -2934,7 +3518,7 @@ func (m *Subject) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLen |= (uint64(b) & 0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -2944,6 +3528,9 @@ func (m *Subject) Unmarshal(dAtA []byte) error { return ErrInvalidLengthRbac } postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthRbac + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -2963,7 +3550,7 @@ func (m *Subject) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLen |= (uint64(b) & 0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -2973,6 +3560,9 @@ func (m *Subject) Unmarshal(dAtA []byte) error { return ErrInvalidLengthRbac } postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthRbac + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -2992,7 +3582,7 @@ func (m *Subject) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLen |= (uint64(b) & 0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -3002,6 +3592,9 @@ func (m *Subject) Unmarshal(dAtA []byte) error { return ErrInvalidLengthRbac } postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthRbac + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -3021,7 +3614,7 @@ func (m *Subject) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLen |= (uint64(b) & 0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -3031,6 +3624,9 @@ func (m *Subject) Unmarshal(dAtA []byte) error { return ErrInvalidLengthRbac } postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthRbac + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -3050,7 +3646,7 @@ func (m *Subject) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLen |= (uint64(b) & 0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -3060,6 +3656,9 @@ func (m *Subject) Unmarshal(dAtA []byte) error { return ErrInvalidLengthRbac } postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthRbac + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -3079,7 +3678,7 @@ func (m *Subject) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLen |= (uint64(b) & 0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -3089,6 +3688,9 @@ func (m *Subject) Unmarshal(dAtA []byte) error { return ErrInvalidLengthRbac } postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthRbac + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -3108,7 +3710,7 @@ func (m *Subject) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLen |= (uint64(b) & 0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -3118,6 +3720,9 @@ func (m *Subject) Unmarshal(dAtA []byte) error { return ErrInvalidLengthRbac } postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthRbac + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -3132,9 +3737,13 @@ func (m *Subject) Unmarshal(dAtA []byte) error { if skippy < 0 { return ErrInvalidLengthRbac } + if (iNdEx + skippy) < 0 { + return ErrInvalidLengthRbac + } if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF } + m.XXX_unrecognized = append(m.XXX_unrecognized, dAtA[iNdEx:iNdEx+skippy]...) iNdEx += skippy } } @@ -3159,7 +3768,7 @@ func (m *RoleRef) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - wire |= (uint64(b) & 0x7F) << shift + wire |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -3187,7 +3796,7 @@ func (m *RoleRef) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLen |= (uint64(b) & 0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -3197,6 +3806,9 @@ func (m *RoleRef) Unmarshal(dAtA []byte) error { return ErrInvalidLengthRbac } postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthRbac + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -3216,7 +3828,7 @@ func (m *RoleRef) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLen |= (uint64(b) & 0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -3226,6 +3838,9 @@ func (m *RoleRef) Unmarshal(dAtA []byte) error { return ErrInvalidLengthRbac } postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthRbac + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -3240,9 +3855,13 @@ func (m *RoleRef) Unmarshal(dAtA []byte) error { if skippy < 0 { return ErrInvalidLengthRbac } + if (iNdEx + skippy) < 0 { + return ErrInvalidLengthRbac + } if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF } + m.XXX_unrecognized = append(m.XXX_unrecognized, dAtA[iNdEx:iNdEx+skippy]...) iNdEx += skippy } } @@ -3267,7 +3886,7 @@ func (m *RbacConfig) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - wire |= (uint64(b) & 0x7F) << shift + wire |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -3295,7 +3914,7 @@ func (m *RbacConfig) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - m.Mode |= (RbacConfig_Mode(b) & 0x7F) << shift + m.Mode |= RbacConfig_Mode(b&0x7F) << shift if b < 0x80 { break } @@ -3314,7 +3933,7 @@ func (m *RbacConfig) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - msglen |= (int(b) & 0x7F) << shift + msglen |= int(b&0x7F) << shift if b < 0x80 { break } @@ -3323,6 +3942,9 @@ func (m *RbacConfig) Unmarshal(dAtA []byte) error { return ErrInvalidLengthRbac } postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthRbac + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -3347,7 +3969,7 @@ func (m *RbacConfig) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - msglen |= (int(b) & 0x7F) << shift + msglen |= int(b&0x7F) << shift if b < 0x80 { break } @@ -3356,6 +3978,9 @@ func (m *RbacConfig) Unmarshal(dAtA []byte) error { return ErrInvalidLengthRbac } postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthRbac + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -3380,7 +4005,7 @@ func (m *RbacConfig) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - m.EnforcementMode |= (EnforcementMode(b) & 0x7F) << shift + m.EnforcementMode |= EnforcementMode(b&0x7F) << shift if b < 0x80 { break } @@ -3394,9 +4019,13 @@ func (m *RbacConfig) Unmarshal(dAtA []byte) error { if skippy < 0 { return ErrInvalidLengthRbac } + if (iNdEx + skippy) < 0 { + return ErrInvalidLengthRbac + } if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF } + m.XXX_unrecognized = append(m.XXX_unrecognized, dAtA[iNdEx:iNdEx+skippy]...) iNdEx += skippy } } @@ -3421,7 +4050,7 @@ func (m *RbacConfig_Target) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - wire |= (uint64(b) & 0x7F) << shift + wire |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -3449,7 +4078,7 @@ func (m *RbacConfig_Target) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLen |= (uint64(b) & 0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -3459,6 +4088,9 @@ func (m *RbacConfig_Target) Unmarshal(dAtA []byte) error { return ErrInvalidLengthRbac } postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthRbac + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -3478,7 +4110,7 @@ func (m *RbacConfig_Target) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLen |= (uint64(b) & 0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -3488,6 +4120,9 @@ func (m *RbacConfig_Target) Unmarshal(dAtA []byte) error { return ErrInvalidLengthRbac } postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthRbac + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -3507,7 +4142,7 @@ func (m *RbacConfig_Target) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - msglen |= (int(b) & 0x7F) << shift + msglen |= int(b&0x7F) << shift if b < 0x80 { break } @@ -3516,6 +4151,9 @@ func (m *RbacConfig_Target) Unmarshal(dAtA []byte) error { return ErrInvalidLengthRbac } postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthRbac + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -3533,9 +4171,13 @@ func (m *RbacConfig_Target) Unmarshal(dAtA []byte) error { if skippy < 0 { return ErrInvalidLengthRbac } + if (iNdEx + skippy) < 0 { + return ErrInvalidLengthRbac + } if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF } + m.XXX_unrecognized = append(m.XXX_unrecognized, dAtA[iNdEx:iNdEx+skippy]...) iNdEx += skippy } } @@ -3599,10 +4241,13 @@ func skipRbac(dAtA []byte) (n int, err error) { break } } - iNdEx += length if length < 0 { return 0, ErrInvalidLengthRbac } + iNdEx += length + if iNdEx < 0 { + return 0, ErrInvalidLengthRbac + } return iNdEx, nil case 3: for { @@ -3631,6 +4276,9 @@ func skipRbac(dAtA []byte) (n int, err error) { return 0, err } iNdEx = start + next + if iNdEx < 0 { + return 0, ErrInvalidLengthRbac + } } return iNdEx, nil case 4: @@ -3649,66 +4297,3 @@ var ( ErrInvalidLengthRbac = fmt.Errorf("proto: negative length found during unmarshaling") ErrIntOverflowRbac = fmt.Errorf("proto: integer overflow") ) - -func init() { proto.RegisterFile("rbac/v1alpha1/rbac.proto", fileDescriptorRbac) } - -var fileDescriptorRbac = []byte{ - // 902 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x56, 0x4f, 0x6f, 0x23, 0x35, - 0x14, 0xdf, 0xc9, 0xe4, 0x4f, 0xe7, 0x05, 0xda, 0xa9, 0x17, 0x96, 0x51, 0x80, 0x6e, 0x15, 0xb1, - 0x10, 0xad, 0x50, 0xa2, 0x16, 0xb1, 0x2a, 0x48, 0x7b, 0xd8, 0xb6, 0x29, 0x1b, 0xa9, 0x4d, 0x2a, - 0xa7, 0xb0, 0x88, 0x4b, 0x34, 0x99, 0xb8, 0x8d, 0xe9, 0xc4, 0x1e, 0xd9, 0x4e, 0x4b, 0x39, 0x72, - 0xe1, 0x2b, 0x20, 0x4e, 0x1c, 0xf9, 0x18, 0x1c, 0x39, 0xf2, 0x11, 0x50, 0x3f, 0x09, 0xb2, 0x3d, - 0x33, 0x49, 0xd3, 0xd0, 0x6d, 0x6f, 0x7e, 0x7f, 0x7e, 0xef, 0xfd, 0x9e, 0xdf, 0xcf, 0x99, 0x40, - 0x20, 0x86, 0x61, 0xd4, 0xba, 0xd8, 0x0a, 0xe3, 0x64, 0x1c, 0x6e, 0xb5, 0xb4, 0xd5, 0x4c, 0x04, - 0x57, 0x1c, 0x3d, 0xa6, 0x52, 0x51, 0xde, 0x34, 0x9e, 0x2c, 0x5e, 0xff, 0xcd, 0x01, 0xff, 0x0d, - 0x17, 0xe7, 0x31, 0x0f, 0x47, 0x7d, 0x12, 0x93, 0x48, 0x71, 0x81, 0x3a, 0x50, 0x8e, 0xc3, 0x21, - 0x89, 0x65, 0xe0, 0x6c, 0xba, 0x8d, 0xea, 0xf6, 0x56, 0x73, 0x09, 0xb4, 0xb9, 0x08, 0x6b, 0x1e, - 0x1a, 0x4c, 0x9b, 0x29, 0x71, 0x85, 0xd3, 0x02, 0xb5, 0xaf, 0xa0, 0x3a, 0xe7, 0x46, 0x3e, 0xb8, - 0xe7, 0xe4, 0x2a, 0x70, 0x36, 0x9d, 0x86, 0x87, 0xf5, 0x11, 0xbd, 0x07, 0xa5, 0x8b, 0x30, 0x9e, - 0x92, 0xa0, 0x60, 0x7c, 0xd6, 0xf8, 0xba, 0xb0, 0xe3, 0xd4, 0xff, 0x74, 0xe0, 0xf1, 0xab, 0xa9, - 0x1a, 0x73, 0x41, 0x7f, 0x0e, 0x15, 0xe5, 0xec, 0x98, 0xc7, 0x34, 0xba, 0x42, 0x18, 0xd6, 0x2f, - 0xd3, 0xd6, 0x03, 0x99, 0xf6, 0x36, 0x15, 0xab, 0xdb, 0xcf, 0xee, 0x45, 0x14, 0xfb, 0x97, 0x8b, - 0x13, 0xbf, 0x84, 0x52, 0x18, 0xc7, 0xfc, 0x32, 0x28, 0x98, 0x81, 0x3f, 0x5b, 0x5a, 0xa7, 0x4f, - 0xc4, 0x05, 0x8d, 0x08, 0xe6, 0x31, 0xd9, 0xa5, 0x6c, 0x44, 0xd9, 0x19, 0xb6, 0xa8, 0xfa, 0x3e, - 0x54, 0xe7, 0x82, 0xe8, 0x4b, 0x28, 0x89, 0x69, 0x4c, 0xb2, 0xeb, 0x7b, 0xba, 0xb4, 0xda, 0xab, - 0x28, 0x22, 0x52, 0xe2, 0x69, 0x4c, 0xb0, 0xcd, 0xae, 0xff, 0xe2, 0x02, 0xcc, 0xbc, 0xa8, 0x06, - 0x2b, 0xd2, 0x16, 0xb5, 0x85, 0x3c, 0x9c, 0xdb, 0xfa, 0xd6, 0x92, 0x50, 0x8d, 0xa5, 0xe1, 0xeb, - 0x61, 0x6b, 0xa0, 0x00, 0x2a, 0x13, 0xa2, 0xc6, 0x7c, 0x24, 0x03, 0xd7, 0xf8, 0x33, 0x13, 0x1d, - 0x42, 0x35, 0xe2, 0x4c, 0x2a, 0x11, 0x52, 0xa6, 0x64, 0x50, 0x34, 0xbc, 0x9e, 0xbf, 0x85, 0x57, - 0x73, 0x2f, 0x87, 0xe0, 0x79, 0xb8, 0xee, 0x3e, 0xe6, 0x52, 0xc9, 0xa0, 0x64, 0xbb, 0x1b, 0x03, - 0x7d, 0x08, 0x1e, 0xe3, 0x6a, 0x60, 0x23, 0x65, 0x4b, 0x98, 0x71, 0xf5, 0x7a, 0x3e, 0x68, 0x49, - 0x57, 0xf2, 0xe0, 0xb1, 0xe1, 0xfd, 0x14, 0xaa, 0x3a, 0x98, 0x71, 0x5f, 0x31, 0x61, 0x60, 0x5c, - 0x1d, 0xa5, 0xf4, 0xf5, 0xb8, 0x5c, 0x28, 0x19, 0x78, 0x9b, 0x6e, 0xa3, 0x84, 0xad, 0x91, 0xd7, - 0x34, 0x11, 0x30, 0x11, 0x53, 0x53, 0xdb, 0xb5, 0x17, 0x00, 0x33, 0xfa, 0x4b, 0x74, 0xf7, 0x04, - 0xca, 0x46, 0x6a, 0xd9, 0x15, 0xa6, 0x56, 0xfd, 0x2f, 0x07, 0xd0, 0xed, 0x45, 0xa3, 0x1d, 0x58, - 0x91, 0xd3, 0xe1, 0x8f, 0x24, 0x52, 0xd9, 0x56, 0x3f, 0x5a, 0xae, 0x11, 0x9b, 0x84, 0xf3, 0x6c, - 0xf4, 0x02, 0x2a, 0x82, 0xc7, 0x04, 0x93, 0x53, 0x23, 0xf1, 0xff, 0x03, 0x62, 0x9b, 0x83, 0xb3, - 0x64, 0xb4, 0x03, 0xc5, 0x09, 0x1f, 0x91, 0xc0, 0xdd, 0x74, 0x1a, 0xab, 0xdb, 0x9f, 0x2c, 0x05, - 0xb5, 0xd9, 0x29, 0x17, 0x11, 0x99, 0x10, 0xa6, 0x8e, 0xf8, 0x88, 0x60, 0x83, 0xa8, 0xff, 0xe1, - 0x42, 0x25, 0xe5, 0x81, 0x10, 0x14, 0xa7, 0x92, 0x88, 0x74, 0x72, 0x73, 0x46, 0x01, 0x94, 0xce, - 0x04, 0x9f, 0x26, 0xf6, 0xc9, 0xed, 0x16, 0x02, 0x07, 0x5b, 0x07, 0x3a, 0x04, 0x48, 0x04, 0x4f, - 0x88, 0x50, 0x94, 0x58, 0x0d, 0x55, 0xb7, 0x3f, 0xbf, 0x6b, 0xce, 0xe6, 0x71, 0x9e, 0x6e, 0xdf, - 0xfd, 0x1c, 0x5e, 0x6f, 0x8d, 0x85, 0x13, 0x62, 0xe5, 0xe6, 0x61, 0x6b, 0x64, 0x5b, 0xb3, 0x91, - 0x52, 0xae, 0x84, 0xae, 0x09, 0x3e, 0x81, 0xb2, 0x61, 0x92, 0x09, 0x28, 0xb5, 0xd0, 0xc7, 0xa0, - 0xe5, 0x30, 0x48, 0x63, 0x56, 0x3f, 0xba, 0xcc, 0x37, 0x36, 0xbc, 0x01, 0x60, 0xea, 0x25, 0xa1, - 0x7e, 0x2c, 0x99, 0x7e, 0x72, 0x0f, 0x7a, 0x06, 0xab, 0x79, 0x4f, 0x9b, 0xe3, 0x99, 0x9c, 0x77, - 0xb3, 0xc6, 0x36, 0xcd, 0x07, 0x97, 0x26, 0x56, 0x4a, 0x1e, 0xd6, 0x47, 0xf4, 0x01, 0x54, 0x34, - 0x50, 0x7b, 0xab, 0x96, 0x10, 0xe3, 0xaa, 0x93, 0xc8, 0xda, 0x4b, 0x58, 0x5b, 0x18, 0xfd, 0x41, - 0xbf, 0x6d, 0x5b, 0x50, 0x49, 0x17, 0xae, 0x37, 0x74, 0x4e, 0xd9, 0x28, 0xdb, 0x90, 0x3e, 0x6b, - 0x9f, 0xe6, 0x9a, 0xe2, 0xcc, 0xb9, 0xfe, 0x6b, 0x11, 0x00, 0x0f, 0xc3, 0x68, 0x8f, 0xb3, 0x53, - 0x7a, 0x96, 0xcb, 0xc3, 0xb9, 0x43, 0x1e, 0xb3, 0xf4, 0xe6, 0x4c, 0x1e, 0x68, 0x1f, 0x3c, 0xca, - 0xa2, 0x78, 0x2a, 0x29, 0x67, 0xa9, 0x24, 0x3f, 0x7d, 0x1b, 0xfc, 0x24, 0x14, 0x67, 0x44, 0xe1, - 0x19, 0x50, 0x57, 0x21, 0x3f, 0x65, 0x55, 0xdc, 0x87, 0x55, 0xc9, 0x81, 0xa8, 0x07, 0x3e, 0x99, - 0x69, 0x78, 0x60, 0x26, 0x2a, 0x3e, 0x40, 0xf0, 0x6b, 0xe4, 0xa6, 0xa3, 0xf6, 0xbb, 0x03, 0x65, - 0xdb, 0xe6, 0xce, 0xdf, 0xcf, 0x9b, 0x82, 0x29, 0xdc, 0x12, 0xcc, 0x09, 0xa0, 0x5b, 0xdf, 0x98, - 0xec, 0x41, 0xdc, 0xf3, 0x23, 0xb3, 0xbe, 0xf8, 0x91, 0x91, 0xf5, 0x36, 0x14, 0x35, 0x49, 0x54, - 0x01, 0xb7, 0x77, 0x70, 0xe0, 0x3f, 0x42, 0x65, 0x28, 0xf4, 0xba, 0xbe, 0x83, 0xde, 0x87, 0xf5, - 0x5e, 0x77, 0xf0, 0xa6, 0x73, 0xf2, 0x7a, 0xd0, 0xe9, 0xee, 0x1d, 0x7e, 0xdb, 0xef, 0xf4, 0xba, - 0x7e, 0x61, 0xde, 0xdd, 0xfe, 0x3e, 0x73, 0xbb, 0xcf, 0x5b, 0xb0, 0xb6, 0x70, 0x0f, 0xe8, 0x1d, - 0x58, 0x69, 0x77, 0x0f, 0x7a, 0x78, 0xaf, 0xbd, 0xef, 0x3f, 0x42, 0xab, 0x00, 0xc7, 0x6d, 0x7c, - 0xd4, 0xe9, 0xf7, 0x3b, 0xdf, 0xb5, 0x7d, 0x67, 0xb7, 0xf1, 0xf7, 0xf5, 0x86, 0xf3, 0xcf, 0xf5, - 0x86, 0xf3, 0xef, 0xf5, 0x86, 0xf3, 0x43, 0xcd, 0xd2, 0xa7, 0xbc, 0x15, 0x26, 0xb4, 0x75, 0xe3, - 0xef, 0xc2, 0xb0, 0x6c, 0xfe, 0x2a, 0x7c, 0xf1, 0x5f, 0x00, 0x00, 0x00, 0xff, 0xff, 0xd5, 0x1c, - 0xa3, 0xc1, 0x46, 0x08, 0x00, 0x00, -} diff --git a/tools/all/Dockerfile b/tools/all/Dockerfile index 0c8c47956e2..b46089cf9b0 100644 --- a/tools/all/Dockerfile +++ b/tools/all/Dockerfile @@ -8,7 +8,7 @@ RUN apk update && \ FROM gcr.io/istio-testing/protolock:2018-10-23 as protolock -FROM gcr.io/istio-testing/protoc:2018-06-12 +FROM docker.io/rshriram/protoc:2019-02-25 COPY --from=protolock \ /usr/bin/protolock \ diff --git a/tools/all/build-and-push.sh b/tools/all/build-and-push.sh index 4f4a2d5eb35..89742b25fe3 100755 --- a/tools/all/build-and-push.sh +++ b/tools/all/build-and-push.sh @@ -4,9 +4,10 @@ # place and procedure for generation. PLEASE use with caution # (read: not for general usage). -HUB=gcr.io/istio-testing +HUB=docker.io/rshriram +#gcr.io/istio-testing VERSION=$(date +%Y-%m-%d) docker build --no-cache -t $HUB/api-build-tools:$VERSION . -gcloud docker -- push $HUB/api-build-tools:$VERSION +docker push $HUB/api-build-tools:$VERSION diff --git a/tools/protoc/build-and-push.sh b/tools/protoc/build-and-push.sh index ab6ad5fbce2..295c4c953c5 100755 --- a/tools/protoc/build-and-push.sh +++ b/tools/protoc/build-and-push.sh @@ -4,9 +4,10 @@ # place and procedure for generation. PLEASE use with caution # (read: not for general usage). -HUB=gcr.io/istio-testing +HUB=docker.io/rshriram +#gcr.io/istio-testing VERSION=$(date +%Y-%m-%d) docker build --no-cache -t $HUB/protoc:$VERSION . -gcloud docker -- push $HUB/protoc:$VERSION +docker push $HUB/protoc:$VERSION From e952b50f9ba2479684364449b63a0f4d41b332f0 Mon Sep 17 00:00:00 2001 From: Shriram Rajagopalan Date: Mon, 25 Feb 2019 16:06:16 -0500 Subject: [PATCH 2/3] fixes Signed-off-by: Shriram Rajagopalan --- Makefile | 2 +- .../http/jwt_auth/v2alpha1/config.pb.go | 2523 +++++++++++++++++ .../tcp_cluster_rewrite/v2alpha1/config.pb.go | 410 +++ tools/all/Dockerfile | 2 +- tools/all/build-and-push.sh | 5 +- tools/protoc/build-and-push.sh | 5 +- 6 files changed, 2939 insertions(+), 8 deletions(-) create mode 100644 envoy/config/filter/http/jwt_auth/v2alpha1/config.pb.go create mode 100644 envoy/config/filter/network/tcp_cluster_rewrite/v2alpha1/config.pb.go diff --git a/Makefile b/Makefile index 11836164658..9cd932cdca1 100644 --- a/Makefile +++ b/Makefile @@ -328,7 +328,7 @@ envoy_pb_pythons := $(envoy_protos:.proto=_pb2.py) generate-envoy-go: $(envoy_pb_gos) $(envoy_pb_doc) # Envoy APIs is internal APIs, documents is not required. -$(envoy_pb_gos): $(envoy_protos) +$(envoy_pb_gos): %.pb.go : %.proto ## Generate envoy/*/*.pb.go @$(docker_lock) status @$(docker_gen) $(gogofast_plugin) $< diff --git a/envoy/config/filter/http/jwt_auth/v2alpha1/config.pb.go b/envoy/config/filter/http/jwt_auth/v2alpha1/config.pb.go new file mode 100644 index 00000000000..87ce22a8f38 --- /dev/null +++ b/envoy/config/filter/http/jwt_auth/v2alpha1/config.pb.go @@ -0,0 +1,2523 @@ +// Code generated by protoc-gen-gogo. DO NOT EDIT. +// source: envoy/config/filter/http/jwt_auth/v2alpha1/config.proto + +package v2alpha1 + +import ( + fmt "fmt" + proto "github.com/gogo/protobuf/proto" + types "github.com/gogo/protobuf/types" + io "io" + math "math" +) + +// Reference imports to suppress errors if they are not otherwise used. +var _ = proto.Marshal +var _ = fmt.Errorf +var _ = math.Inf + +// This is a compile-time assertion to ensure that this generated file +// is compatible with the proto package it is being compiled against. +// A compilation error at this line likely means your copy of the +// proto package needs to be updated. +const _ = proto.GoGoProtoPackageIsVersion2 // please upgrade the proto package + +// Copied from @envoy/api/envoy/api/v2/core/http_uri.proto +// Envoy external URI descriptor +type HttpUri struct { + // The HTTP server URI. It should be a full FQDN with protocol, host and path. + // + // Example: + // + // .. code-block:: yaml + // + // uri: https://www.googleapis.com/oauth2/v1/certs + // + Uri string `protobuf:"bytes,1,opt,name=uri,proto3" json:"uri,omitempty"` + // Specify how `uri` is to be fetched. Today, this requires an explicit + // cluster, but in the future we may support dynamic cluster creation or + // inline DNS resolution. See `issue + // `_. + // + // Types that are valid to be assigned to HttpUpstreamType: + // *HttpUri_Cluster + HttpUpstreamType isHttpUri_HttpUpstreamType `protobuf_oneof:"http_upstream_type"` + // Sets the maximum duration in milliseconds that a response can take to arrive upon request. + Timeout *types.Duration `protobuf:"bytes,3,opt,name=timeout,proto3" json:"timeout,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` +} + +func (m *HttpUri) Reset() { *m = HttpUri{} } +func (m *HttpUri) String() string { return proto.CompactTextString(m) } +func (*HttpUri) ProtoMessage() {} +func (*HttpUri) Descriptor() ([]byte, []int) { + return fileDescriptor_7c36de3e06e3b641, []int{0} +} +func (m *HttpUri) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *HttpUri) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_HttpUri.Marshal(b, m, deterministic) + } else { + b = b[:cap(b)] + n, err := m.MarshalTo(b) + if err != nil { + return nil, err + } + return b[:n], nil + } +} +func (m *HttpUri) XXX_Merge(src proto.Message) { + xxx_messageInfo_HttpUri.Merge(m, src) +} +func (m *HttpUri) XXX_Size() int { + return m.Size() +} +func (m *HttpUri) XXX_DiscardUnknown() { + xxx_messageInfo_HttpUri.DiscardUnknown(m) +} + +var xxx_messageInfo_HttpUri proto.InternalMessageInfo + +type isHttpUri_HttpUpstreamType interface { + isHttpUri_HttpUpstreamType() + MarshalTo([]byte) (int, error) + Size() int +} + +type HttpUri_Cluster struct { + Cluster string `protobuf:"bytes,2,opt,name=cluster,proto3,oneof"` +} + +func (*HttpUri_Cluster) isHttpUri_HttpUpstreamType() {} + +func (m *HttpUri) GetHttpUpstreamType() isHttpUri_HttpUpstreamType { + if m != nil { + return m.HttpUpstreamType + } + return nil +} + +func (m *HttpUri) GetUri() string { + if m != nil { + return m.Uri + } + return "" +} + +func (m *HttpUri) GetCluster() string { + if x, ok := m.GetHttpUpstreamType().(*HttpUri_Cluster); ok { + return x.Cluster + } + return "" +} + +func (m *HttpUri) GetTimeout() *types.Duration { + if m != nil { + return m.Timeout + } + return nil +} + +// XXX_OneofFuncs is for the internal use of the proto package. +func (*HttpUri) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) { + return _HttpUri_OneofMarshaler, _HttpUri_OneofUnmarshaler, _HttpUri_OneofSizer, []interface{}{ + (*HttpUri_Cluster)(nil), + } +} + +func _HttpUri_OneofMarshaler(msg proto.Message, b *proto.Buffer) error { + m := msg.(*HttpUri) + // http_upstream_type + switch x := m.HttpUpstreamType.(type) { + case *HttpUri_Cluster: + _ = b.EncodeVarint(2<<3 | proto.WireBytes) + _ = b.EncodeStringBytes(x.Cluster) + case nil: + default: + return fmt.Errorf("HttpUri.HttpUpstreamType has unexpected type %T", x) + } + return nil +} + +func _HttpUri_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) { + m := msg.(*HttpUri) + switch tag { + case 2: // http_upstream_type.cluster + if wire != proto.WireBytes { + return true, proto.ErrInternalBadWireType + } + x, err := b.DecodeStringBytes() + m.HttpUpstreamType = &HttpUri_Cluster{x} + return true, err + default: + return false, nil + } +} + +func _HttpUri_OneofSizer(msg proto.Message) (n int) { + m := msg.(*HttpUri) + // http_upstream_type + switch x := m.HttpUpstreamType.(type) { + case *HttpUri_Cluster: + n += 1 // tag and wire + n += proto.SizeVarint(uint64(len(x.Cluster))) + n += len(x.Cluster) + case nil: + default: + panic(fmt.Sprintf("proto: unexpected type %T in oneof", x)) + } + return n +} + +// Copied from @envoy/api/envoy/api/v2/core/base.proto +// Data source consisting of either a file or an inline value. +type DataSource struct { + // Types that are valid to be assigned to Specifier: + // *DataSource_Filename + // *DataSource_InlineBytes + // *DataSource_InlineString + Specifier isDataSource_Specifier `protobuf_oneof:"specifier"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` +} + +func (m *DataSource) Reset() { *m = DataSource{} } +func (m *DataSource) String() string { return proto.CompactTextString(m) } +func (*DataSource) ProtoMessage() {} +func (*DataSource) Descriptor() ([]byte, []int) { + return fileDescriptor_7c36de3e06e3b641, []int{1} +} +func (m *DataSource) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *DataSource) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_DataSource.Marshal(b, m, deterministic) + } else { + b = b[:cap(b)] + n, err := m.MarshalTo(b) + if err != nil { + return nil, err + } + return b[:n], nil + } +} +func (m *DataSource) XXX_Merge(src proto.Message) { + xxx_messageInfo_DataSource.Merge(m, src) +} +func (m *DataSource) XXX_Size() int { + return m.Size() +} +func (m *DataSource) XXX_DiscardUnknown() { + xxx_messageInfo_DataSource.DiscardUnknown(m) +} + +var xxx_messageInfo_DataSource proto.InternalMessageInfo + +type isDataSource_Specifier interface { + isDataSource_Specifier() + MarshalTo([]byte) (int, error) + Size() int +} + +type DataSource_Filename struct { + Filename string `protobuf:"bytes,1,opt,name=filename,proto3,oneof"` +} +type DataSource_InlineBytes struct { + InlineBytes []byte `protobuf:"bytes,2,opt,name=inline_bytes,json=inlineBytes,proto3,oneof"` +} +type DataSource_InlineString struct { + InlineString string `protobuf:"bytes,3,opt,name=inline_string,json=inlineString,proto3,oneof"` +} + +func (*DataSource_Filename) isDataSource_Specifier() {} +func (*DataSource_InlineBytes) isDataSource_Specifier() {} +func (*DataSource_InlineString) isDataSource_Specifier() {} + +func (m *DataSource) GetSpecifier() isDataSource_Specifier { + if m != nil { + return m.Specifier + } + return nil +} + +func (m *DataSource) GetFilename() string { + if x, ok := m.GetSpecifier().(*DataSource_Filename); ok { + return x.Filename + } + return "" +} + +func (m *DataSource) GetInlineBytes() []byte { + if x, ok := m.GetSpecifier().(*DataSource_InlineBytes); ok { + return x.InlineBytes + } + return nil +} + +func (m *DataSource) GetInlineString() string { + if x, ok := m.GetSpecifier().(*DataSource_InlineString); ok { + return x.InlineString + } + return "" +} + +// XXX_OneofFuncs is for the internal use of the proto package. +func (*DataSource) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) { + return _DataSource_OneofMarshaler, _DataSource_OneofUnmarshaler, _DataSource_OneofSizer, []interface{}{ + (*DataSource_Filename)(nil), + (*DataSource_InlineBytes)(nil), + (*DataSource_InlineString)(nil), + } +} + +func _DataSource_OneofMarshaler(msg proto.Message, b *proto.Buffer) error { + m := msg.(*DataSource) + // specifier + switch x := m.Specifier.(type) { + case *DataSource_Filename: + _ = b.EncodeVarint(1<<3 | proto.WireBytes) + _ = b.EncodeStringBytes(x.Filename) + case *DataSource_InlineBytes: + _ = b.EncodeVarint(2<<3 | proto.WireBytes) + _ = b.EncodeRawBytes(x.InlineBytes) + case *DataSource_InlineString: + _ = b.EncodeVarint(3<<3 | proto.WireBytes) + _ = b.EncodeStringBytes(x.InlineString) + case nil: + default: + return fmt.Errorf("DataSource.Specifier has unexpected type %T", x) + } + return nil +} + +func _DataSource_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) { + m := msg.(*DataSource) + switch tag { + case 1: // specifier.filename + if wire != proto.WireBytes { + return true, proto.ErrInternalBadWireType + } + x, err := b.DecodeStringBytes() + m.Specifier = &DataSource_Filename{x} + return true, err + case 2: // specifier.inline_bytes + if wire != proto.WireBytes { + return true, proto.ErrInternalBadWireType + } + x, err := b.DecodeRawBytes(true) + m.Specifier = &DataSource_InlineBytes{x} + return true, err + case 3: // specifier.inline_string + if wire != proto.WireBytes { + return true, proto.ErrInternalBadWireType + } + x, err := b.DecodeStringBytes() + m.Specifier = &DataSource_InlineString{x} + return true, err + default: + return false, nil + } +} + +func _DataSource_OneofSizer(msg proto.Message) (n int) { + m := msg.(*DataSource) + // specifier + switch x := m.Specifier.(type) { + case *DataSource_Filename: + n += 1 // tag and wire + n += proto.SizeVarint(uint64(len(x.Filename))) + n += len(x.Filename) + case *DataSource_InlineBytes: + n += 1 // tag and wire + n += proto.SizeVarint(uint64(len(x.InlineBytes))) + n += len(x.InlineBytes) + case *DataSource_InlineString: + n += 1 // tag and wire + n += proto.SizeVarint(uint64(len(x.InlineString))) + n += len(x.InlineString) + case nil: + default: + panic(fmt.Sprintf("proto: unexpected type %T in oneof", x)) + } + return n +} + +// This message specifies how a JSON Web Token (JWT) can be verified. JWT format is defined +// `here `_. Please see `OAuth2.0 +// `_ and `OIDC1.0 `_ for +// the authentication flow. +// +// Example: +// +// .. code-block:: yaml +// +// issuer: https://example.com +// audiences: +// - bookstore_android.apps.googleusercontent.com +// bookstore_web.apps.googleusercontent.com +// remote_jwks: +// - http_uri: +// - uri: https://example.com/.well-known/jwks.json +// cluster: example_jwks_cluster +// cache_duration: +// - seconds: 300 +// +// [#not-implemented-hide:] +type JwtRule struct { + // Identifies the principal that issued the JWT. See `here + // `_. Usually a URL or an email address. + // + // Example: https://securetoken.google.com + // Example: 1234567-compute@developer.gserviceaccount.com + // + Issuer string `protobuf:"bytes,1,opt,name=issuer,proto3" json:"issuer,omitempty"` + // The list of JWT `audiences `_. that are + // allowed to access. A JWT containing any of these audiences will be accepted. If not specified, + // will not check audiences in the token. + // + // Example: + // + // .. code-block:: yaml + // + // audiences: + // - bookstore_android.apps.googleusercontent.com + // bookstore_web.apps.googleusercontent.com + // + Audiences []string `protobuf:"bytes,2,rep,name=audiences,proto3" json:"audiences,omitempty"` + // `JSON Web Key Set `_ is needed. to validate + // signature of the JWT. This field specifies where to fetch JWKS. + // + // Types that are valid to be assigned to JwksSourceSpecifier: + // *JwtRule_RemoteJwks + // *JwtRule_LocalJwks + JwksSourceSpecifier isJwtRule_JwksSourceSpecifier `protobuf_oneof:"jwks_source_specifier"` + // If false, the JWT is removed in the request after a success verification. If true, the JWT is + // not removed in the request. Default value is false. + Forward bool `protobuf:"varint,5,opt,name=forward,proto3" json:"forward,omitempty"` + // Specify the HTTP headers to extract JWT token. For examples, following config: + // + // .. code-block:: yaml + // + // from_headers: + // - name: x-goog-iap-jwt-assertion + // + // can be used to extract token from header:: + // + // x-goog-iap-jwt-assertion: . + // + FromHeaders []*JwtHeader `protobuf:"bytes,6,rep,name=from_headers,json=fromHeaders,proto3" json:"from_headers,omitempty"` + // JWT is sent in a query parameter. `jwt_params` represents the query parameter names. + // + // For example, if config is: + // + // .. code-block:: yaml + // + // from_params: + // - jwt_token + // + // The JWT format in query parameter is:: + // + // /path?jwt_token= + // + FromParams []string `protobuf:"bytes,7,rep,name=from_params,json=fromParams,proto3" json:"from_params,omitempty"` + // This field specifies the header name to forward a successfully verified JWT payload to the + // backend. The forwarded data is:: + // + // base64_encoded(jwt_payload_in_JSON) + // + // If it is not specified, the payload will not be forwarded. + // Multiple JWTs in a request from different issuers will be supported. Multiple JWTs from the + // same issuer will not be supported. Each issuer can config this `forward_payload_header`. If + // multiple JWTs from different issuers want to forward their payloads, their + // `forward_payload_header` should be different. + ForwardPayloadHeader string `protobuf:"bytes,8,opt,name=forward_payload_header,json=forwardPayloadHeader,proto3" json:"forward_payload_header,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` +} + +func (m *JwtRule) Reset() { *m = JwtRule{} } +func (m *JwtRule) String() string { return proto.CompactTextString(m) } +func (*JwtRule) ProtoMessage() {} +func (*JwtRule) Descriptor() ([]byte, []int) { + return fileDescriptor_7c36de3e06e3b641, []int{2} +} +func (m *JwtRule) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *JwtRule) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_JwtRule.Marshal(b, m, deterministic) + } else { + b = b[:cap(b)] + n, err := m.MarshalTo(b) + if err != nil { + return nil, err + } + return b[:n], nil + } +} +func (m *JwtRule) XXX_Merge(src proto.Message) { + xxx_messageInfo_JwtRule.Merge(m, src) +} +func (m *JwtRule) XXX_Size() int { + return m.Size() +} +func (m *JwtRule) XXX_DiscardUnknown() { + xxx_messageInfo_JwtRule.DiscardUnknown(m) +} + +var xxx_messageInfo_JwtRule proto.InternalMessageInfo + +type isJwtRule_JwksSourceSpecifier interface { + isJwtRule_JwksSourceSpecifier() + MarshalTo([]byte) (int, error) + Size() int +} + +type JwtRule_RemoteJwks struct { + RemoteJwks *RemoteJwks `protobuf:"bytes,3,opt,name=remote_jwks,json=remoteJwks,proto3,oneof"` +} +type JwtRule_LocalJwks struct { + LocalJwks *DataSource `protobuf:"bytes,4,opt,name=local_jwks,json=localJwks,proto3,oneof"` +} + +func (*JwtRule_RemoteJwks) isJwtRule_JwksSourceSpecifier() {} +func (*JwtRule_LocalJwks) isJwtRule_JwksSourceSpecifier() {} + +func (m *JwtRule) GetJwksSourceSpecifier() isJwtRule_JwksSourceSpecifier { + if m != nil { + return m.JwksSourceSpecifier + } + return nil +} + +func (m *JwtRule) GetIssuer() string { + if m != nil { + return m.Issuer + } + return "" +} + +func (m *JwtRule) GetAudiences() []string { + if m != nil { + return m.Audiences + } + return nil +} + +func (m *JwtRule) GetRemoteJwks() *RemoteJwks { + if x, ok := m.GetJwksSourceSpecifier().(*JwtRule_RemoteJwks); ok { + return x.RemoteJwks + } + return nil +} + +func (m *JwtRule) GetLocalJwks() *DataSource { + if x, ok := m.GetJwksSourceSpecifier().(*JwtRule_LocalJwks); ok { + return x.LocalJwks + } + return nil +} + +func (m *JwtRule) GetForward() bool { + if m != nil { + return m.Forward + } + return false +} + +func (m *JwtRule) GetFromHeaders() []*JwtHeader { + if m != nil { + return m.FromHeaders + } + return nil +} + +func (m *JwtRule) GetFromParams() []string { + if m != nil { + return m.FromParams + } + return nil +} + +func (m *JwtRule) GetForwardPayloadHeader() string { + if m != nil { + return m.ForwardPayloadHeader + } + return "" +} + +// XXX_OneofFuncs is for the internal use of the proto package. +func (*JwtRule) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) { + return _JwtRule_OneofMarshaler, _JwtRule_OneofUnmarshaler, _JwtRule_OneofSizer, []interface{}{ + (*JwtRule_RemoteJwks)(nil), + (*JwtRule_LocalJwks)(nil), + } +} + +func _JwtRule_OneofMarshaler(msg proto.Message, b *proto.Buffer) error { + m := msg.(*JwtRule) + // jwks_source_specifier + switch x := m.JwksSourceSpecifier.(type) { + case *JwtRule_RemoteJwks: + _ = b.EncodeVarint(3<<3 | proto.WireBytes) + if err := b.EncodeMessage(x.RemoteJwks); err != nil { + return err + } + case *JwtRule_LocalJwks: + _ = b.EncodeVarint(4<<3 | proto.WireBytes) + if err := b.EncodeMessage(x.LocalJwks); err != nil { + return err + } + case nil: + default: + return fmt.Errorf("JwtRule.JwksSourceSpecifier has unexpected type %T", x) + } + return nil +} + +func _JwtRule_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) { + m := msg.(*JwtRule) + switch tag { + case 3: // jwks_source_specifier.remote_jwks + if wire != proto.WireBytes { + return true, proto.ErrInternalBadWireType + } + msg := new(RemoteJwks) + err := b.DecodeMessage(msg) + m.JwksSourceSpecifier = &JwtRule_RemoteJwks{msg} + return true, err + case 4: // jwks_source_specifier.local_jwks + if wire != proto.WireBytes { + return true, proto.ErrInternalBadWireType + } + msg := new(DataSource) + err := b.DecodeMessage(msg) + m.JwksSourceSpecifier = &JwtRule_LocalJwks{msg} + return true, err + default: + return false, nil + } +} + +func _JwtRule_OneofSizer(msg proto.Message) (n int) { + m := msg.(*JwtRule) + // jwks_source_specifier + switch x := m.JwksSourceSpecifier.(type) { + case *JwtRule_RemoteJwks: + s := proto.Size(x.RemoteJwks) + n += 1 // tag and wire + n += proto.SizeVarint(uint64(s)) + n += s + case *JwtRule_LocalJwks: + s := proto.Size(x.LocalJwks) + n += 1 // tag and wire + n += proto.SizeVarint(uint64(s)) + n += s + case nil: + default: + panic(fmt.Sprintf("proto: unexpected type %T in oneof", x)) + } + return n +} + +// This message specifies how to fetch JWKS from remote and how to cache it. +type RemoteJwks struct { + // The HTTP URI to fetch the JWKS. For example: + // + // .. code-block:: yaml + // + // http_uri: + // - uri: https://www.googleapis.com/oauth2/v1/certs + // cluster: jwt.www.googleapis.com|443 + // + HttpUri *HttpUri `protobuf:"bytes,1,opt,name=http_uri,json=httpUri,proto3" json:"http_uri,omitempty"` + // Duration after which the cached JWKS should be expired. If not specified, default cache + // duration is 5 minutes. + CacheDuration *types.Duration `protobuf:"bytes,2,opt,name=cache_duration,json=cacheDuration,proto3" json:"cache_duration,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` +} + +func (m *RemoteJwks) Reset() { *m = RemoteJwks{} } +func (m *RemoteJwks) String() string { return proto.CompactTextString(m) } +func (*RemoteJwks) ProtoMessage() {} +func (*RemoteJwks) Descriptor() ([]byte, []int) { + return fileDescriptor_7c36de3e06e3b641, []int{3} +} +func (m *RemoteJwks) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *RemoteJwks) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_RemoteJwks.Marshal(b, m, deterministic) + } else { + b = b[:cap(b)] + n, err := m.MarshalTo(b) + if err != nil { + return nil, err + } + return b[:n], nil + } +} +func (m *RemoteJwks) XXX_Merge(src proto.Message) { + xxx_messageInfo_RemoteJwks.Merge(m, src) +} +func (m *RemoteJwks) XXX_Size() int { + return m.Size() +} +func (m *RemoteJwks) XXX_DiscardUnknown() { + xxx_messageInfo_RemoteJwks.DiscardUnknown(m) +} + +var xxx_messageInfo_RemoteJwks proto.InternalMessageInfo + +func (m *RemoteJwks) GetHttpUri() *HttpUri { + if m != nil { + return m.HttpUri + } + return nil +} + +func (m *RemoteJwks) GetCacheDuration() *types.Duration { + if m != nil { + return m.CacheDuration + } + return nil +} + +// This message specifies a header location to extract JWT token. +type JwtHeader struct { + // The HTTP header name. + Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"` + // The value prefix. The value format is "value_prefix" + // For example, for "Authorization: Bearer ", value_prefix="Bearer " with a space at the + // end. + ValuePrefix string `protobuf:"bytes,2,opt,name=value_prefix,json=valuePrefix,proto3" json:"value_prefix,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` +} + +func (m *JwtHeader) Reset() { *m = JwtHeader{} } +func (m *JwtHeader) String() string { return proto.CompactTextString(m) } +func (*JwtHeader) ProtoMessage() {} +func (*JwtHeader) Descriptor() ([]byte, []int) { + return fileDescriptor_7c36de3e06e3b641, []int{4} +} +func (m *JwtHeader) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *JwtHeader) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_JwtHeader.Marshal(b, m, deterministic) + } else { + b = b[:cap(b)] + n, err := m.MarshalTo(b) + if err != nil { + return nil, err + } + return b[:n], nil + } +} +func (m *JwtHeader) XXX_Merge(src proto.Message) { + xxx_messageInfo_JwtHeader.Merge(m, src) +} +func (m *JwtHeader) XXX_Size() int { + return m.Size() +} +func (m *JwtHeader) XXX_DiscardUnknown() { + xxx_messageInfo_JwtHeader.DiscardUnknown(m) +} + +var xxx_messageInfo_JwtHeader proto.InternalMessageInfo + +func (m *JwtHeader) GetName() string { + if m != nil { + return m.Name + } + return "" +} + +func (m *JwtHeader) GetValuePrefix() string { + if m != nil { + return m.ValuePrefix + } + return "" +} + +// This is the Envoy HTTP filter config for JWT authentication. +// [#not-implemented-hide:] +type JwtAuthentication struct { + // List of JWT rules to valide. + Rules []*JwtRule `protobuf:"bytes,1,rep,name=rules,proto3" json:"rules,omitempty"` + // If true, the request is allowed if JWT is missing or JWT verification fails. + // Default is false, a request without JWT or failed JWT verification is not allowed. + AllowMissingOrFailed bool `protobuf:"varint,2,opt,name=allow_missing_or_failed,json=allowMissingOrFailed,proto3" json:"allow_missing_or_failed,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` +} + +func (m *JwtAuthentication) Reset() { *m = JwtAuthentication{} } +func (m *JwtAuthentication) String() string { return proto.CompactTextString(m) } +func (*JwtAuthentication) ProtoMessage() {} +func (*JwtAuthentication) Descriptor() ([]byte, []int) { + return fileDescriptor_7c36de3e06e3b641, []int{5} +} +func (m *JwtAuthentication) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *JwtAuthentication) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_JwtAuthentication.Marshal(b, m, deterministic) + } else { + b = b[:cap(b)] + n, err := m.MarshalTo(b) + if err != nil { + return nil, err + } + return b[:n], nil + } +} +func (m *JwtAuthentication) XXX_Merge(src proto.Message) { + xxx_messageInfo_JwtAuthentication.Merge(m, src) +} +func (m *JwtAuthentication) XXX_Size() int { + return m.Size() +} +func (m *JwtAuthentication) XXX_DiscardUnknown() { + xxx_messageInfo_JwtAuthentication.DiscardUnknown(m) +} + +var xxx_messageInfo_JwtAuthentication proto.InternalMessageInfo + +func (m *JwtAuthentication) GetRules() []*JwtRule { + if m != nil { + return m.Rules + } + return nil +} + +func (m *JwtAuthentication) GetAllowMissingOrFailed() bool { + if m != nil { + return m.AllowMissingOrFailed + } + return false +} + +func init() { + proto.RegisterType((*HttpUri)(nil), "istio.envoy.config.filter.http.jwt_auth.v2alpha1.HttpUri") + proto.RegisterType((*DataSource)(nil), "istio.envoy.config.filter.http.jwt_auth.v2alpha1.DataSource") + proto.RegisterType((*JwtRule)(nil), "istio.envoy.config.filter.http.jwt_auth.v2alpha1.JwtRule") + proto.RegisterType((*RemoteJwks)(nil), "istio.envoy.config.filter.http.jwt_auth.v2alpha1.RemoteJwks") + proto.RegisterType((*JwtHeader)(nil), "istio.envoy.config.filter.http.jwt_auth.v2alpha1.JwtHeader") + proto.RegisterType((*JwtAuthentication)(nil), "istio.envoy.config.filter.http.jwt_auth.v2alpha1.JwtAuthentication") +} + +func init() { + proto.RegisterFile("envoy/config/filter/http/jwt_auth/v2alpha1/config.proto", fileDescriptor_7c36de3e06e3b641) +} + +var fileDescriptor_7c36de3e06e3b641 = []byte{ + // 678 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x54, 0xc1, 0x6e, 0xd3, 0x4a, + 0x14, 0x8d, 0x5f, 0xda, 0x26, 0xb9, 0x4e, 0x9f, 0xde, 0x1b, 0x95, 0xd6, 0x54, 0x55, 0x08, 0x41, + 0x48, 0x59, 0xd9, 0x90, 0x82, 0xaa, 0x0a, 0x16, 0x10, 0x15, 0x14, 0x45, 0x42, 0xad, 0xa6, 0xb0, + 0x41, 0x82, 0xd1, 0xd4, 0x19, 0x27, 0xd3, 0x8e, 0x3d, 0xd6, 0xcc, 0xb8, 0x26, 0x5b, 0xf8, 0x0c, + 0xb6, 0x7c, 0x0c, 0x4b, 0x3e, 0x01, 0x75, 0xc7, 0x5f, 0x20, 0x8f, 0xed, 0x66, 0x87, 0x68, 0x77, + 0x73, 0xcf, 0x9d, 0x7b, 0xee, 0xf1, 0xb9, 0x73, 0x0d, 0x07, 0x2c, 0xb9, 0x94, 0xcb, 0x20, 0x94, + 0x49, 0xc4, 0xe7, 0x41, 0xc4, 0x85, 0x61, 0x2a, 0x58, 0x18, 0x93, 0x06, 0xe7, 0xb9, 0x21, 0x34, + 0x33, 0x8b, 0xe0, 0x72, 0x44, 0x45, 0xba, 0xa0, 0x8f, 0xab, 0x4b, 0x7e, 0xaa, 0xa4, 0x91, 0xe8, + 0x11, 0xd7, 0x86, 0x4b, 0xdf, 0x96, 0xfb, 0x55, 0xa6, 0x2c, 0xf7, 0x8b, 0x72, 0xbf, 0x2e, 0xf7, + 0xeb, 0xf2, 0xdd, 0xde, 0x5c, 0xca, 0xb9, 0x60, 0x81, 0xad, 0x3f, 0xcb, 0xa2, 0x60, 0x96, 0x29, + 0x6a, 0xb8, 0x4c, 0x4a, 0xc6, 0xc1, 0x67, 0x07, 0x5a, 0x13, 0x63, 0xd2, 0x77, 0x8a, 0xa3, 0xff, + 0xa0, 0x99, 0x29, 0xee, 0x39, 0x7d, 0x67, 0xd8, 0xc1, 0xc5, 0x11, 0xed, 0x42, 0x2b, 0x14, 0x99, + 0x36, 0x4c, 0x79, 0xff, 0x14, 0xe8, 0xa4, 0x81, 0x6b, 0x00, 0xed, 0x43, 0xcb, 0xf0, 0x98, 0xc9, + 0xcc, 0x78, 0xcd, 0xbe, 0x33, 0x74, 0x47, 0x77, 0xfd, 0xb2, 0x97, 0x5f, 0xf7, 0xf2, 0x8f, 0xaa, + 0x5e, 0xb8, 0xbe, 0x39, 0xde, 0x02, 0x54, 0x08, 0x25, 0x59, 0xaa, 0x8d, 0x62, 0x34, 0x26, 0x66, + 0x99, 0xb2, 0xc1, 0x17, 0x07, 0xe0, 0x88, 0x1a, 0x7a, 0x2a, 0x33, 0x15, 0x32, 0xb4, 0x07, 0xed, + 0x88, 0x0b, 0x96, 0xd0, 0x98, 0x95, 0x62, 0x26, 0x0d, 0x7c, 0x8d, 0xa0, 0x07, 0xd0, 0xe5, 0x89, + 0xe0, 0x09, 0x23, 0x67, 0x4b, 0xc3, 0xb4, 0x15, 0xd6, 0x9d, 0x34, 0xb0, 0x5b, 0xa2, 0xe3, 0x02, + 0x44, 0x0f, 0x61, 0xb3, 0xba, 0xa4, 0x8d, 0xe2, 0xc9, 0xdc, 0x4a, 0x2c, 0x78, 0xaa, 0xda, 0x53, + 0x8b, 0x8e, 0x5d, 0xe8, 0xe8, 0x94, 0x85, 0x3c, 0xe2, 0x4c, 0x0d, 0x7e, 0x35, 0xa1, 0x35, 0xcd, + 0x0d, 0xce, 0x04, 0x43, 0xdb, 0xb0, 0xc1, 0xb5, 0xce, 0x98, 0xaa, 0xdc, 0xa8, 0x22, 0xb4, 0x07, + 0x1d, 0x9a, 0xcd, 0x38, 0x4b, 0x42, 0xdb, 0xb9, 0x39, 0xec, 0xe0, 0x15, 0x80, 0x08, 0xb8, 0x8a, + 0xc5, 0xd2, 0x30, 0x72, 0x9e, 0x5f, 0xe8, 0xca, 0x96, 0xe7, 0xfe, 0x4d, 0x87, 0xe6, 0x63, 0x4b, + 0x32, 0xcd, 0x2f, 0xf4, 0xa4, 0x81, 0x41, 0x5d, 0x47, 0xe8, 0x03, 0x80, 0x90, 0x21, 0x15, 0x25, + 0xff, 0xda, 0x6d, 0xf9, 0x57, 0x5e, 0x4f, 0x1a, 0xb8, 0x63, 0x19, 0x2d, 0xbd, 0x07, 0xad, 0x48, + 0xaa, 0x9c, 0xaa, 0x99, 0xb7, 0xde, 0x77, 0x86, 0x6d, 0x5c, 0x87, 0xe8, 0x23, 0x74, 0x23, 0x25, + 0x63, 0xb2, 0x60, 0x74, 0xc6, 0x94, 0xf6, 0x36, 0xfa, 0xcd, 0xa1, 0x3b, 0x7a, 0x76, 0xf3, 0xd6, + 0xd3, 0xdc, 0x4c, 0x2c, 0x07, 0x76, 0x0b, 0xc2, 0xf2, 0xac, 0xd1, 0x3d, 0xb0, 0x21, 0x49, 0xa9, + 0xa2, 0xb1, 0xf6, 0x5a, 0xd6, 0x59, 0x28, 0xa0, 0x13, 0x8b, 0xa0, 0x27, 0xb0, 0x5d, 0x69, 0x21, + 0x29, 0x5d, 0x0a, 0x49, 0x67, 0x95, 0x16, 0xaf, 0x6d, 0x07, 0xb4, 0x55, 0x65, 0x4f, 0xca, 0x64, + 0xc9, 0x3b, 0xde, 0x81, 0x3b, 0x85, 0x53, 0x44, 0xdb, 0x8f, 0x25, 0xab, 0x59, 0x7f, 0x73, 0x00, + 0x56, 0x2e, 0xa3, 0xb7, 0xd0, 0x2e, 0x9f, 0x65, 0xf5, 0xfc, 0xdd, 0xd1, 0xe1, 0xcd, 0x3f, 0xad, + 0x5a, 0x23, 0xdc, 0x5a, 0x54, 0xfb, 0xf4, 0x02, 0xfe, 0x0d, 0x69, 0xb8, 0x60, 0xa4, 0xde, 0x39, + 0xfb, 0x56, 0xff, 0xb8, 0x28, 0x9b, 0xb6, 0xa0, 0x0e, 0x07, 0x63, 0xe8, 0x5c, 0x1b, 0x86, 0x10, + 0xac, 0xad, 0x56, 0x02, 0xdb, 0x33, 0xba, 0x0f, 0xdd, 0x4b, 0x2a, 0x32, 0x46, 0x52, 0xc5, 0x22, + 0xfe, 0xa9, 0xdc, 0x52, 0xec, 0x5a, 0xec, 0xc4, 0x42, 0x83, 0xaf, 0x0e, 0xfc, 0x3f, 0xcd, 0xcd, + 0xcb, 0xcc, 0x2c, 0x58, 0x62, 0x78, 0x68, 0x99, 0xd1, 0x31, 0xac, 0xab, 0x4c, 0x30, 0xed, 0x39, + 0x76, 0x92, 0x87, 0xb7, 0x9a, 0x64, 0xb1, 0x2a, 0xb8, 0xe4, 0x41, 0x4f, 0x61, 0x87, 0x0a, 0x21, + 0x73, 0x12, 0x73, 0xad, 0x79, 0x32, 0x27, 0x52, 0x91, 0x88, 0x72, 0xc1, 0x66, 0x56, 0x54, 0x1b, + 0x6f, 0xd9, 0xf4, 0x9b, 0x32, 0x7b, 0xac, 0x5e, 0xdb, 0xdc, 0xf8, 0xd5, 0xf7, 0xab, 0x9e, 0xf3, + 0xe3, 0xaa, 0xe7, 0xfc, 0xbc, 0xea, 0x39, 0xef, 0x0f, 0x4a, 0x15, 0x5c, 0x06, 0x34, 0xe5, 0xc1, + 0xdf, 0xff, 0x25, 0xcf, 0x36, 0xac, 0x95, 0xfb, 0xbf, 0x03, 0x00, 0x00, 0xff, 0xff, 0x1b, 0x4f, + 0x9e, 0x6b, 0x5a, 0x05, 0x00, 0x00, +} + +func (m *HttpUri) Marshal() (dAtA []byte, err error) { + size := m.Size() + dAtA = make([]byte, size) + n, err := m.MarshalTo(dAtA) + if err != nil { + return nil, err + } + return dAtA[:n], nil +} + +func (m *HttpUri) MarshalTo(dAtA []byte) (int, error) { + var i int + _ = i + var l int + _ = l + if len(m.Uri) > 0 { + dAtA[i] = 0xa + i++ + i = encodeVarintConfig(dAtA, i, uint64(len(m.Uri))) + i += copy(dAtA[i:], m.Uri) + } + if m.HttpUpstreamType != nil { + nn1, err := m.HttpUpstreamType.MarshalTo(dAtA[i:]) + if err != nil { + return 0, err + } + i += nn1 + } + if m.Timeout != nil { + dAtA[i] = 0x1a + i++ + i = encodeVarintConfig(dAtA, i, uint64(m.Timeout.Size())) + n2, err := m.Timeout.MarshalTo(dAtA[i:]) + if err != nil { + return 0, err + } + i += n2 + } + if m.XXX_unrecognized != nil { + i += copy(dAtA[i:], m.XXX_unrecognized) + } + return i, nil +} + +func (m *HttpUri_Cluster) MarshalTo(dAtA []byte) (int, error) { + i := 0 + dAtA[i] = 0x12 + i++ + i = encodeVarintConfig(dAtA, i, uint64(len(m.Cluster))) + i += copy(dAtA[i:], m.Cluster) + return i, nil +} +func (m *DataSource) Marshal() (dAtA []byte, err error) { + size := m.Size() + dAtA = make([]byte, size) + n, err := m.MarshalTo(dAtA) + if err != nil { + return nil, err + } + return dAtA[:n], nil +} + +func (m *DataSource) MarshalTo(dAtA []byte) (int, error) { + var i int + _ = i + var l int + _ = l + if m.Specifier != nil { + nn3, err := m.Specifier.MarshalTo(dAtA[i:]) + if err != nil { + return 0, err + } + i += nn3 + } + if m.XXX_unrecognized != nil { + i += copy(dAtA[i:], m.XXX_unrecognized) + } + return i, nil +} + +func (m *DataSource_Filename) MarshalTo(dAtA []byte) (int, error) { + i := 0 + dAtA[i] = 0xa + i++ + i = encodeVarintConfig(dAtA, i, uint64(len(m.Filename))) + i += copy(dAtA[i:], m.Filename) + return i, nil +} +func (m *DataSource_InlineBytes) MarshalTo(dAtA []byte) (int, error) { + i := 0 + if m.InlineBytes != nil { + dAtA[i] = 0x12 + i++ + i = encodeVarintConfig(dAtA, i, uint64(len(m.InlineBytes))) + i += copy(dAtA[i:], m.InlineBytes) + } + return i, nil +} +func (m *DataSource_InlineString) MarshalTo(dAtA []byte) (int, error) { + i := 0 + dAtA[i] = 0x1a + i++ + i = encodeVarintConfig(dAtA, i, uint64(len(m.InlineString))) + i += copy(dAtA[i:], m.InlineString) + return i, nil +} +func (m *JwtRule) Marshal() (dAtA []byte, err error) { + size := m.Size() + dAtA = make([]byte, size) + n, err := m.MarshalTo(dAtA) + if err != nil { + return nil, err + } + return dAtA[:n], nil +} + +func (m *JwtRule) MarshalTo(dAtA []byte) (int, error) { + var i int + _ = i + var l int + _ = l + if len(m.Issuer) > 0 { + dAtA[i] = 0xa + i++ + i = encodeVarintConfig(dAtA, i, uint64(len(m.Issuer))) + i += copy(dAtA[i:], m.Issuer) + } + if len(m.Audiences) > 0 { + for _, s := range m.Audiences { + dAtA[i] = 0x12 + i++ + l = len(s) + for l >= 1<<7 { + dAtA[i] = uint8(uint64(l)&0x7f | 0x80) + l >>= 7 + i++ + } + dAtA[i] = uint8(l) + i++ + i += copy(dAtA[i:], s) + } + } + if m.JwksSourceSpecifier != nil { + nn4, err := m.JwksSourceSpecifier.MarshalTo(dAtA[i:]) + if err != nil { + return 0, err + } + i += nn4 + } + if m.Forward { + dAtA[i] = 0x28 + i++ + if m.Forward { + dAtA[i] = 1 + } else { + dAtA[i] = 0 + } + i++ + } + if len(m.FromHeaders) > 0 { + for _, msg := range m.FromHeaders { + dAtA[i] = 0x32 + i++ + i = encodeVarintConfig(dAtA, i, uint64(msg.Size())) + n, err := msg.MarshalTo(dAtA[i:]) + if err != nil { + return 0, err + } + i += n + } + } + if len(m.FromParams) > 0 { + for _, s := range m.FromParams { + dAtA[i] = 0x3a + i++ + l = len(s) + for l >= 1<<7 { + dAtA[i] = uint8(uint64(l)&0x7f | 0x80) + l >>= 7 + i++ + } + dAtA[i] = uint8(l) + i++ + i += copy(dAtA[i:], s) + } + } + if len(m.ForwardPayloadHeader) > 0 { + dAtA[i] = 0x42 + i++ + i = encodeVarintConfig(dAtA, i, uint64(len(m.ForwardPayloadHeader))) + i += copy(dAtA[i:], m.ForwardPayloadHeader) + } + if m.XXX_unrecognized != nil { + i += copy(dAtA[i:], m.XXX_unrecognized) + } + return i, nil +} + +func (m *JwtRule_RemoteJwks) MarshalTo(dAtA []byte) (int, error) { + i := 0 + if m.RemoteJwks != nil { + dAtA[i] = 0x1a + i++ + i = encodeVarintConfig(dAtA, i, uint64(m.RemoteJwks.Size())) + n5, err := m.RemoteJwks.MarshalTo(dAtA[i:]) + if err != nil { + return 0, err + } + i += n5 + } + return i, nil +} +func (m *JwtRule_LocalJwks) MarshalTo(dAtA []byte) (int, error) { + i := 0 + if m.LocalJwks != nil { + dAtA[i] = 0x22 + i++ + i = encodeVarintConfig(dAtA, i, uint64(m.LocalJwks.Size())) + n6, err := m.LocalJwks.MarshalTo(dAtA[i:]) + if err != nil { + return 0, err + } + i += n6 + } + return i, nil +} +func (m *RemoteJwks) Marshal() (dAtA []byte, err error) { + size := m.Size() + dAtA = make([]byte, size) + n, err := m.MarshalTo(dAtA) + if err != nil { + return nil, err + } + return dAtA[:n], nil +} + +func (m *RemoteJwks) MarshalTo(dAtA []byte) (int, error) { + var i int + _ = i + var l int + _ = l + if m.HttpUri != nil { + dAtA[i] = 0xa + i++ + i = encodeVarintConfig(dAtA, i, uint64(m.HttpUri.Size())) + n7, err := m.HttpUri.MarshalTo(dAtA[i:]) + if err != nil { + return 0, err + } + i += n7 + } + if m.CacheDuration != nil { + dAtA[i] = 0x12 + i++ + i = encodeVarintConfig(dAtA, i, uint64(m.CacheDuration.Size())) + n8, err := m.CacheDuration.MarshalTo(dAtA[i:]) + if err != nil { + return 0, err + } + i += n8 + } + if m.XXX_unrecognized != nil { + i += copy(dAtA[i:], m.XXX_unrecognized) + } + return i, nil +} + +func (m *JwtHeader) Marshal() (dAtA []byte, err error) { + size := m.Size() + dAtA = make([]byte, size) + n, err := m.MarshalTo(dAtA) + if err != nil { + return nil, err + } + return dAtA[:n], nil +} + +func (m *JwtHeader) MarshalTo(dAtA []byte) (int, error) { + var i int + _ = i + var l int + _ = l + if len(m.Name) > 0 { + dAtA[i] = 0xa + i++ + i = encodeVarintConfig(dAtA, i, uint64(len(m.Name))) + i += copy(dAtA[i:], m.Name) + } + if len(m.ValuePrefix) > 0 { + dAtA[i] = 0x12 + i++ + i = encodeVarintConfig(dAtA, i, uint64(len(m.ValuePrefix))) + i += copy(dAtA[i:], m.ValuePrefix) + } + if m.XXX_unrecognized != nil { + i += copy(dAtA[i:], m.XXX_unrecognized) + } + return i, nil +} + +func (m *JwtAuthentication) Marshal() (dAtA []byte, err error) { + size := m.Size() + dAtA = make([]byte, size) + n, err := m.MarshalTo(dAtA) + if err != nil { + return nil, err + } + return dAtA[:n], nil +} + +func (m *JwtAuthentication) MarshalTo(dAtA []byte) (int, error) { + var i int + _ = i + var l int + _ = l + if len(m.Rules) > 0 { + for _, msg := range m.Rules { + dAtA[i] = 0xa + i++ + i = encodeVarintConfig(dAtA, i, uint64(msg.Size())) + n, err := msg.MarshalTo(dAtA[i:]) + if err != nil { + return 0, err + } + i += n + } + } + if m.AllowMissingOrFailed { + dAtA[i] = 0x10 + i++ + if m.AllowMissingOrFailed { + dAtA[i] = 1 + } else { + dAtA[i] = 0 + } + i++ + } + if m.XXX_unrecognized != nil { + i += copy(dAtA[i:], m.XXX_unrecognized) + } + return i, nil +} + +func encodeVarintConfig(dAtA []byte, offset int, v uint64) int { + for v >= 1<<7 { + dAtA[offset] = uint8(v&0x7f | 0x80) + v >>= 7 + offset++ + } + dAtA[offset] = uint8(v) + return offset + 1 +} +func (m *HttpUri) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + l = len(m.Uri) + if l > 0 { + n += 1 + l + sovConfig(uint64(l)) + } + if m.HttpUpstreamType != nil { + n += m.HttpUpstreamType.Size() + } + if m.Timeout != nil { + l = m.Timeout.Size() + n += 1 + l + sovConfig(uint64(l)) + } + if m.XXX_unrecognized != nil { + n += len(m.XXX_unrecognized) + } + return n +} + +func (m *HttpUri_Cluster) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + l = len(m.Cluster) + n += 1 + l + sovConfig(uint64(l)) + return n +} +func (m *DataSource) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + if m.Specifier != nil { + n += m.Specifier.Size() + } + if m.XXX_unrecognized != nil { + n += len(m.XXX_unrecognized) + } + return n +} + +func (m *DataSource_Filename) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + l = len(m.Filename) + n += 1 + l + sovConfig(uint64(l)) + return n +} +func (m *DataSource_InlineBytes) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + if m.InlineBytes != nil { + l = len(m.InlineBytes) + n += 1 + l + sovConfig(uint64(l)) + } + return n +} +func (m *DataSource_InlineString) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + l = len(m.InlineString) + n += 1 + l + sovConfig(uint64(l)) + return n +} +func (m *JwtRule) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + l = len(m.Issuer) + if l > 0 { + n += 1 + l + sovConfig(uint64(l)) + } + if len(m.Audiences) > 0 { + for _, s := range m.Audiences { + l = len(s) + n += 1 + l + sovConfig(uint64(l)) + } + } + if m.JwksSourceSpecifier != nil { + n += m.JwksSourceSpecifier.Size() + } + if m.Forward { + n += 2 + } + if len(m.FromHeaders) > 0 { + for _, e := range m.FromHeaders { + l = e.Size() + n += 1 + l + sovConfig(uint64(l)) + } + } + if len(m.FromParams) > 0 { + for _, s := range m.FromParams { + l = len(s) + n += 1 + l + sovConfig(uint64(l)) + } + } + l = len(m.ForwardPayloadHeader) + if l > 0 { + n += 1 + l + sovConfig(uint64(l)) + } + if m.XXX_unrecognized != nil { + n += len(m.XXX_unrecognized) + } + return n +} + +func (m *JwtRule_RemoteJwks) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + if m.RemoteJwks != nil { + l = m.RemoteJwks.Size() + n += 1 + l + sovConfig(uint64(l)) + } + return n +} +func (m *JwtRule_LocalJwks) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + if m.LocalJwks != nil { + l = m.LocalJwks.Size() + n += 1 + l + sovConfig(uint64(l)) + } + return n +} +func (m *RemoteJwks) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + if m.HttpUri != nil { + l = m.HttpUri.Size() + n += 1 + l + sovConfig(uint64(l)) + } + if m.CacheDuration != nil { + l = m.CacheDuration.Size() + n += 1 + l + sovConfig(uint64(l)) + } + if m.XXX_unrecognized != nil { + n += len(m.XXX_unrecognized) + } + return n +} + +func (m *JwtHeader) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + l = len(m.Name) + if l > 0 { + n += 1 + l + sovConfig(uint64(l)) + } + l = len(m.ValuePrefix) + if l > 0 { + n += 1 + l + sovConfig(uint64(l)) + } + if m.XXX_unrecognized != nil { + n += len(m.XXX_unrecognized) + } + return n +} + +func (m *JwtAuthentication) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + if len(m.Rules) > 0 { + for _, e := range m.Rules { + l = e.Size() + n += 1 + l + sovConfig(uint64(l)) + } + } + if m.AllowMissingOrFailed { + n += 2 + } + if m.XXX_unrecognized != nil { + n += len(m.XXX_unrecognized) + } + return n +} + +func sovConfig(x uint64) (n int) { + for { + n++ + x >>= 7 + if x == 0 { + break + } + } + return n +} +func sozConfig(x uint64) (n int) { + return sovConfig(uint64((x << 1) ^ uint64((int64(x) >> 63)))) +} +func (m *HttpUri) Unmarshal(dAtA []byte) error { + l := len(dAtA) + iNdEx := 0 + for iNdEx < l { + preIndex := iNdEx + var wire uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowConfig + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + wire |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + fieldNum := int32(wire >> 3) + wireType := int(wire & 0x7) + if wireType == 4 { + return fmt.Errorf("proto: HttpUri: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: HttpUri: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + case 1: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Uri", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowConfig + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + stringLen |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + intStringLen := int(stringLen) + if intStringLen < 0 { + return ErrInvalidLengthConfig + } + postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthConfig + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.Uri = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex + case 2: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Cluster", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowConfig + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + stringLen |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + intStringLen := int(stringLen) + if intStringLen < 0 { + return ErrInvalidLengthConfig + } + postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthConfig + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.HttpUpstreamType = &HttpUri_Cluster{string(dAtA[iNdEx:postIndex])} + iNdEx = postIndex + case 3: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Timeout", wireType) + } + var msglen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowConfig + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + msglen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if msglen < 0 { + return ErrInvalidLengthConfig + } + postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthConfig + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + if m.Timeout == nil { + m.Timeout = &types.Duration{} + } + if err := m.Timeout.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex + default: + iNdEx = preIndex + skippy, err := skipConfig(dAtA[iNdEx:]) + if err != nil { + return err + } + if skippy < 0 { + return ErrInvalidLengthConfig + } + if (iNdEx + skippy) < 0 { + return ErrInvalidLengthConfig + } + if (iNdEx + skippy) > l { + return io.ErrUnexpectedEOF + } + m.XXX_unrecognized = append(m.XXX_unrecognized, dAtA[iNdEx:iNdEx+skippy]...) + iNdEx += skippy + } + } + + if iNdEx > l { + return io.ErrUnexpectedEOF + } + return nil +} +func (m *DataSource) Unmarshal(dAtA []byte) error { + l := len(dAtA) + iNdEx := 0 + for iNdEx < l { + preIndex := iNdEx + var wire uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowConfig + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + wire |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + fieldNum := int32(wire >> 3) + wireType := int(wire & 0x7) + if wireType == 4 { + return fmt.Errorf("proto: DataSource: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: DataSource: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + case 1: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Filename", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowConfig + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + stringLen |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + intStringLen := int(stringLen) + if intStringLen < 0 { + return ErrInvalidLengthConfig + } + postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthConfig + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.Specifier = &DataSource_Filename{string(dAtA[iNdEx:postIndex])} + iNdEx = postIndex + case 2: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field InlineBytes", wireType) + } + var byteLen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowConfig + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + byteLen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if byteLen < 0 { + return ErrInvalidLengthConfig + } + postIndex := iNdEx + byteLen + if postIndex < 0 { + return ErrInvalidLengthConfig + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + v := make([]byte, postIndex-iNdEx) + copy(v, dAtA[iNdEx:postIndex]) + m.Specifier = &DataSource_InlineBytes{v} + iNdEx = postIndex + case 3: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field InlineString", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowConfig + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + stringLen |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + intStringLen := int(stringLen) + if intStringLen < 0 { + return ErrInvalidLengthConfig + } + postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthConfig + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.Specifier = &DataSource_InlineString{string(dAtA[iNdEx:postIndex])} + iNdEx = postIndex + default: + iNdEx = preIndex + skippy, err := skipConfig(dAtA[iNdEx:]) + if err != nil { + return err + } + if skippy < 0 { + return ErrInvalidLengthConfig + } + if (iNdEx + skippy) < 0 { + return ErrInvalidLengthConfig + } + if (iNdEx + skippy) > l { + return io.ErrUnexpectedEOF + } + m.XXX_unrecognized = append(m.XXX_unrecognized, dAtA[iNdEx:iNdEx+skippy]...) + iNdEx += skippy + } + } + + if iNdEx > l { + return io.ErrUnexpectedEOF + } + return nil +} +func (m *JwtRule) Unmarshal(dAtA []byte) error { + l := len(dAtA) + iNdEx := 0 + for iNdEx < l { + preIndex := iNdEx + var wire uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowConfig + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + wire |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + fieldNum := int32(wire >> 3) + wireType := int(wire & 0x7) + if wireType == 4 { + return fmt.Errorf("proto: JwtRule: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: JwtRule: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + case 1: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Issuer", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowConfig + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + stringLen |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + intStringLen := int(stringLen) + if intStringLen < 0 { + return ErrInvalidLengthConfig + } + postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthConfig + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.Issuer = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex + case 2: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Audiences", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowConfig + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + stringLen |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + intStringLen := int(stringLen) + if intStringLen < 0 { + return ErrInvalidLengthConfig + } + postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthConfig + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.Audiences = append(m.Audiences, string(dAtA[iNdEx:postIndex])) + iNdEx = postIndex + case 3: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field RemoteJwks", wireType) + } + var msglen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowConfig + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + msglen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if msglen < 0 { + return ErrInvalidLengthConfig + } + postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthConfig + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + v := &RemoteJwks{} + if err := v.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + m.JwksSourceSpecifier = &JwtRule_RemoteJwks{v} + iNdEx = postIndex + case 4: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field LocalJwks", wireType) + } + var msglen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowConfig + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + msglen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if msglen < 0 { + return ErrInvalidLengthConfig + } + postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthConfig + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + v := &DataSource{} + if err := v.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + m.JwksSourceSpecifier = &JwtRule_LocalJwks{v} + iNdEx = postIndex + case 5: + if wireType != 0 { + return fmt.Errorf("proto: wrong wireType = %d for field Forward", wireType) + } + var v int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowConfig + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + v |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + m.Forward = bool(v != 0) + case 6: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field FromHeaders", wireType) + } + var msglen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowConfig + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + msglen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if msglen < 0 { + return ErrInvalidLengthConfig + } + postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthConfig + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.FromHeaders = append(m.FromHeaders, &JwtHeader{}) + if err := m.FromHeaders[len(m.FromHeaders)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex + case 7: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field FromParams", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowConfig + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + stringLen |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + intStringLen := int(stringLen) + if intStringLen < 0 { + return ErrInvalidLengthConfig + } + postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthConfig + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.FromParams = append(m.FromParams, string(dAtA[iNdEx:postIndex])) + iNdEx = postIndex + case 8: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field ForwardPayloadHeader", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowConfig + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + stringLen |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + intStringLen := int(stringLen) + if intStringLen < 0 { + return ErrInvalidLengthConfig + } + postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthConfig + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.ForwardPayloadHeader = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex + default: + iNdEx = preIndex + skippy, err := skipConfig(dAtA[iNdEx:]) + if err != nil { + return err + } + if skippy < 0 { + return ErrInvalidLengthConfig + } + if (iNdEx + skippy) < 0 { + return ErrInvalidLengthConfig + } + if (iNdEx + skippy) > l { + return io.ErrUnexpectedEOF + } + m.XXX_unrecognized = append(m.XXX_unrecognized, dAtA[iNdEx:iNdEx+skippy]...) + iNdEx += skippy + } + } + + if iNdEx > l { + return io.ErrUnexpectedEOF + } + return nil +} +func (m *RemoteJwks) Unmarshal(dAtA []byte) error { + l := len(dAtA) + iNdEx := 0 + for iNdEx < l { + preIndex := iNdEx + var wire uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowConfig + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + wire |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + fieldNum := int32(wire >> 3) + wireType := int(wire & 0x7) + if wireType == 4 { + return fmt.Errorf("proto: RemoteJwks: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: RemoteJwks: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + case 1: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field HttpUri", wireType) + } + var msglen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowConfig + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + msglen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if msglen < 0 { + return ErrInvalidLengthConfig + } + postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthConfig + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + if m.HttpUri == nil { + m.HttpUri = &HttpUri{} + } + if err := m.HttpUri.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex + case 2: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field CacheDuration", wireType) + } + var msglen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowConfig + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + msglen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if msglen < 0 { + return ErrInvalidLengthConfig + } + postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthConfig + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + if m.CacheDuration == nil { + m.CacheDuration = &types.Duration{} + } + if err := m.CacheDuration.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex + default: + iNdEx = preIndex + skippy, err := skipConfig(dAtA[iNdEx:]) + if err != nil { + return err + } + if skippy < 0 { + return ErrInvalidLengthConfig + } + if (iNdEx + skippy) < 0 { + return ErrInvalidLengthConfig + } + if (iNdEx + skippy) > l { + return io.ErrUnexpectedEOF + } + m.XXX_unrecognized = append(m.XXX_unrecognized, dAtA[iNdEx:iNdEx+skippy]...) + iNdEx += skippy + } + } + + if iNdEx > l { + return io.ErrUnexpectedEOF + } + return nil +} +func (m *JwtHeader) Unmarshal(dAtA []byte) error { + l := len(dAtA) + iNdEx := 0 + for iNdEx < l { + preIndex := iNdEx + var wire uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowConfig + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + wire |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + fieldNum := int32(wire >> 3) + wireType := int(wire & 0x7) + if wireType == 4 { + return fmt.Errorf("proto: JwtHeader: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: JwtHeader: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + case 1: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Name", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowConfig + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + stringLen |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + intStringLen := int(stringLen) + if intStringLen < 0 { + return ErrInvalidLengthConfig + } + postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthConfig + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.Name = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex + case 2: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field ValuePrefix", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowConfig + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + stringLen |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + intStringLen := int(stringLen) + if intStringLen < 0 { + return ErrInvalidLengthConfig + } + postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthConfig + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.ValuePrefix = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex + default: + iNdEx = preIndex + skippy, err := skipConfig(dAtA[iNdEx:]) + if err != nil { + return err + } + if skippy < 0 { + return ErrInvalidLengthConfig + } + if (iNdEx + skippy) < 0 { + return ErrInvalidLengthConfig + } + if (iNdEx + skippy) > l { + return io.ErrUnexpectedEOF + } + m.XXX_unrecognized = append(m.XXX_unrecognized, dAtA[iNdEx:iNdEx+skippy]...) + iNdEx += skippy + } + } + + if iNdEx > l { + return io.ErrUnexpectedEOF + } + return nil +} +func (m *JwtAuthentication) Unmarshal(dAtA []byte) error { + l := len(dAtA) + iNdEx := 0 + for iNdEx < l { + preIndex := iNdEx + var wire uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowConfig + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + wire |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + fieldNum := int32(wire >> 3) + wireType := int(wire & 0x7) + if wireType == 4 { + return fmt.Errorf("proto: JwtAuthentication: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: JwtAuthentication: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + case 1: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Rules", wireType) + } + var msglen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowConfig + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + msglen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if msglen < 0 { + return ErrInvalidLengthConfig + } + postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthConfig + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.Rules = append(m.Rules, &JwtRule{}) + if err := m.Rules[len(m.Rules)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex + case 2: + if wireType != 0 { + return fmt.Errorf("proto: wrong wireType = %d for field AllowMissingOrFailed", wireType) + } + var v int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowConfig + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + v |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + m.AllowMissingOrFailed = bool(v != 0) + default: + iNdEx = preIndex + skippy, err := skipConfig(dAtA[iNdEx:]) + if err != nil { + return err + } + if skippy < 0 { + return ErrInvalidLengthConfig + } + if (iNdEx + skippy) < 0 { + return ErrInvalidLengthConfig + } + if (iNdEx + skippy) > l { + return io.ErrUnexpectedEOF + } + m.XXX_unrecognized = append(m.XXX_unrecognized, dAtA[iNdEx:iNdEx+skippy]...) + iNdEx += skippy + } + } + + if iNdEx > l { + return io.ErrUnexpectedEOF + } + return nil +} +func skipConfig(dAtA []byte) (n int, err error) { + l := len(dAtA) + iNdEx := 0 + for iNdEx < l { + var wire uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return 0, ErrIntOverflowConfig + } + if iNdEx >= l { + return 0, io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + wire |= (uint64(b) & 0x7F) << shift + if b < 0x80 { + break + } + } + wireType := int(wire & 0x7) + switch wireType { + case 0: + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return 0, ErrIntOverflowConfig + } + if iNdEx >= l { + return 0, io.ErrUnexpectedEOF + } + iNdEx++ + if dAtA[iNdEx-1] < 0x80 { + break + } + } + return iNdEx, nil + case 1: + iNdEx += 8 + return iNdEx, nil + case 2: + var length int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return 0, ErrIntOverflowConfig + } + if iNdEx >= l { + return 0, io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + length |= (int(b) & 0x7F) << shift + if b < 0x80 { + break + } + } + if length < 0 { + return 0, ErrInvalidLengthConfig + } + iNdEx += length + if iNdEx < 0 { + return 0, ErrInvalidLengthConfig + } + return iNdEx, nil + case 3: + for { + var innerWire uint64 + var start int = iNdEx + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return 0, ErrIntOverflowConfig + } + if iNdEx >= l { + return 0, io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + innerWire |= (uint64(b) & 0x7F) << shift + if b < 0x80 { + break + } + } + innerWireType := int(innerWire & 0x7) + if innerWireType == 4 { + break + } + next, err := skipConfig(dAtA[start:]) + if err != nil { + return 0, err + } + iNdEx = start + next + if iNdEx < 0 { + return 0, ErrInvalidLengthConfig + } + } + return iNdEx, nil + case 4: + return iNdEx, nil + case 5: + iNdEx += 4 + return iNdEx, nil + default: + return 0, fmt.Errorf("proto: illegal wireType %d", wireType) + } + } + panic("unreachable") +} + +var ( + ErrInvalidLengthConfig = fmt.Errorf("proto: negative length found during unmarshaling") + ErrIntOverflowConfig = fmt.Errorf("proto: integer overflow") +) diff --git a/envoy/config/filter/network/tcp_cluster_rewrite/v2alpha1/config.pb.go b/envoy/config/filter/network/tcp_cluster_rewrite/v2alpha1/config.pb.go new file mode 100644 index 00000000000..f0e9caa049c --- /dev/null +++ b/envoy/config/filter/network/tcp_cluster_rewrite/v2alpha1/config.pb.go @@ -0,0 +1,410 @@ +// Code generated by protoc-gen-gogo. DO NOT EDIT. +// source: envoy/config/filter/network/tcp_cluster_rewrite/v2alpha1/config.proto + +package v2alpha1 + +import ( + fmt "fmt" + proto "github.com/gogo/protobuf/proto" + io "io" + math "math" +) + +// Reference imports to suppress errors if they are not otherwise used. +var _ = proto.Marshal +var _ = fmt.Errorf +var _ = math.Inf + +// This is a compile-time assertion to ensure that this generated file +// is compatible with the proto package it is being compiled against. +// A compilation error at this line likely means your copy of the +// proto package needs to be updated. +const _ = proto.GoGoProtoPackageIsVersion2 // please upgrade the proto package + +// TcpClusterRewrite is the config for the TCP cluster rewrite filter. +type TcpClusterRewrite struct { + // Specifies the regex pattern to be matched in the cluster name. + ClusterPattern string `protobuf:"bytes,1,opt,name=cluster_pattern,json=clusterPattern,proto3" json:"cluster_pattern,omitempty"` + // Specifies the replacement for the matched cluster pattern. + ClusterReplacement string `protobuf:"bytes,2,opt,name=cluster_replacement,json=clusterReplacement,proto3" json:"cluster_replacement,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` +} + +func (m *TcpClusterRewrite) Reset() { *m = TcpClusterRewrite{} } +func (m *TcpClusterRewrite) String() string { return proto.CompactTextString(m) } +func (*TcpClusterRewrite) ProtoMessage() {} +func (*TcpClusterRewrite) Descriptor() ([]byte, []int) { + return fileDescriptor_3df0613c72936227, []int{0} +} +func (m *TcpClusterRewrite) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *TcpClusterRewrite) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_TcpClusterRewrite.Marshal(b, m, deterministic) + } else { + b = b[:cap(b)] + n, err := m.MarshalTo(b) + if err != nil { + return nil, err + } + return b[:n], nil + } +} +func (m *TcpClusterRewrite) XXX_Merge(src proto.Message) { + xxx_messageInfo_TcpClusterRewrite.Merge(m, src) +} +func (m *TcpClusterRewrite) XXX_Size() int { + return m.Size() +} +func (m *TcpClusterRewrite) XXX_DiscardUnknown() { + xxx_messageInfo_TcpClusterRewrite.DiscardUnknown(m) +} + +var xxx_messageInfo_TcpClusterRewrite proto.InternalMessageInfo + +func (m *TcpClusterRewrite) GetClusterPattern() string { + if m != nil { + return m.ClusterPattern + } + return "" +} + +func (m *TcpClusterRewrite) GetClusterReplacement() string { + if m != nil { + return m.ClusterReplacement + } + return "" +} + +func init() { + proto.RegisterType((*TcpClusterRewrite)(nil), "istio.envoy.config.filter.network.tcp_cluster_rewrite.v2alpha1.TcpClusterRewrite") +} + +func init() { + proto.RegisterFile("envoy/config/filter/network/tcp_cluster_rewrite/v2alpha1/config.proto", fileDescriptor_3df0613c72936227) +} + +var fileDescriptor_3df0613c72936227 = []byte{ + // 213 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x72, 0x4d, 0xcd, 0x2b, 0xcb, + 0xaf, 0xd4, 0x4f, 0xce, 0xcf, 0x4b, 0xcb, 0x4c, 0xd7, 0x4f, 0xcb, 0xcc, 0x29, 0x49, 0x2d, 0xd2, + 0xcf, 0x4b, 0x2d, 0x29, 0xcf, 0x2f, 0xca, 0xd6, 0x2f, 0x49, 0x2e, 0x88, 0x4f, 0xce, 0x29, 0x2d, + 0x2e, 0x49, 0x2d, 0x8a, 0x2f, 0x4a, 0x2d, 0x2f, 0xca, 0x2c, 0x49, 0xd5, 0x2f, 0x33, 0x4a, 0xcc, + 0x29, 0xc8, 0x48, 0x34, 0x84, 0x6a, 0xd1, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0xb2, 0xcb, 0x2c, + 0x2e, 0xc9, 0xcc, 0xd7, 0x03, 0x1b, 0xa6, 0x07, 0x95, 0x81, 0x18, 0xa6, 0x07, 0x35, 0x4c, 0x0f, + 0x8b, 0x61, 0x7a, 0x30, 0xc3, 0x94, 0x72, 0xb9, 0x04, 0x43, 0x92, 0x0b, 0x9c, 0x21, 0xd2, 0x41, + 0x10, 0x59, 0x21, 0x75, 0x2e, 0x7e, 0x98, 0x86, 0x82, 0xc4, 0x92, 0x92, 0xd4, 0xa2, 0x3c, 0x09, + 0x46, 0x05, 0x46, 0x0d, 0xce, 0x20, 0x3e, 0xa8, 0x70, 0x00, 0x44, 0x54, 0x48, 0x9f, 0x4b, 0x18, + 0x61, 0x72, 0x41, 0x4e, 0x62, 0x72, 0x6a, 0x6e, 0x6a, 0x5e, 0x89, 0x04, 0x13, 0x58, 0xb1, 0x50, + 0x32, 0xcc, 0x54, 0xb8, 0x8c, 0x53, 0xf0, 0x89, 0x47, 0x72, 0x8c, 0x17, 0x1e, 0xc9, 0x31, 0x3e, + 0x78, 0x24, 0xc7, 0x18, 0xe5, 0x0a, 0x71, 0x7c, 0x66, 0xbe, 0x7e, 0x62, 0x41, 0xa6, 0x3e, 0xb9, + 0x01, 0x92, 0xc4, 0x06, 0x0e, 0x0a, 0x63, 0x40, 0x00, 0x00, 0x00, 0xff, 0xff, 0xda, 0x0d, 0xa4, + 0x2b, 0x53, 0x01, 0x00, 0x00, +} + +func (m *TcpClusterRewrite) Marshal() (dAtA []byte, err error) { + size := m.Size() + dAtA = make([]byte, size) + n, err := m.MarshalTo(dAtA) + if err != nil { + return nil, err + } + return dAtA[:n], nil +} + +func (m *TcpClusterRewrite) MarshalTo(dAtA []byte) (int, error) { + var i int + _ = i + var l int + _ = l + if len(m.ClusterPattern) > 0 { + dAtA[i] = 0xa + i++ + i = encodeVarintConfig(dAtA, i, uint64(len(m.ClusterPattern))) + i += copy(dAtA[i:], m.ClusterPattern) + } + if len(m.ClusterReplacement) > 0 { + dAtA[i] = 0x12 + i++ + i = encodeVarintConfig(dAtA, i, uint64(len(m.ClusterReplacement))) + i += copy(dAtA[i:], m.ClusterReplacement) + } + if m.XXX_unrecognized != nil { + i += copy(dAtA[i:], m.XXX_unrecognized) + } + return i, nil +} + +func encodeVarintConfig(dAtA []byte, offset int, v uint64) int { + for v >= 1<<7 { + dAtA[offset] = uint8(v&0x7f | 0x80) + v >>= 7 + offset++ + } + dAtA[offset] = uint8(v) + return offset + 1 +} +func (m *TcpClusterRewrite) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + l = len(m.ClusterPattern) + if l > 0 { + n += 1 + l + sovConfig(uint64(l)) + } + l = len(m.ClusterReplacement) + if l > 0 { + n += 1 + l + sovConfig(uint64(l)) + } + if m.XXX_unrecognized != nil { + n += len(m.XXX_unrecognized) + } + return n +} + +func sovConfig(x uint64) (n int) { + for { + n++ + x >>= 7 + if x == 0 { + break + } + } + return n +} +func sozConfig(x uint64) (n int) { + return sovConfig(uint64((x << 1) ^ uint64((int64(x) >> 63)))) +} +func (m *TcpClusterRewrite) Unmarshal(dAtA []byte) error { + l := len(dAtA) + iNdEx := 0 + for iNdEx < l { + preIndex := iNdEx + var wire uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowConfig + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + wire |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + fieldNum := int32(wire >> 3) + wireType := int(wire & 0x7) + if wireType == 4 { + return fmt.Errorf("proto: TcpClusterRewrite: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: TcpClusterRewrite: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + case 1: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field ClusterPattern", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowConfig + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + stringLen |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + intStringLen := int(stringLen) + if intStringLen < 0 { + return ErrInvalidLengthConfig + } + postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthConfig + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.ClusterPattern = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex + case 2: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field ClusterReplacement", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowConfig + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + stringLen |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + intStringLen := int(stringLen) + if intStringLen < 0 { + return ErrInvalidLengthConfig + } + postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthConfig + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.ClusterReplacement = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex + default: + iNdEx = preIndex + skippy, err := skipConfig(dAtA[iNdEx:]) + if err != nil { + return err + } + if skippy < 0 { + return ErrInvalidLengthConfig + } + if (iNdEx + skippy) < 0 { + return ErrInvalidLengthConfig + } + if (iNdEx + skippy) > l { + return io.ErrUnexpectedEOF + } + m.XXX_unrecognized = append(m.XXX_unrecognized, dAtA[iNdEx:iNdEx+skippy]...) + iNdEx += skippy + } + } + + if iNdEx > l { + return io.ErrUnexpectedEOF + } + return nil +} +func skipConfig(dAtA []byte) (n int, err error) { + l := len(dAtA) + iNdEx := 0 + for iNdEx < l { + var wire uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return 0, ErrIntOverflowConfig + } + if iNdEx >= l { + return 0, io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + wire |= (uint64(b) & 0x7F) << shift + if b < 0x80 { + break + } + } + wireType := int(wire & 0x7) + switch wireType { + case 0: + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return 0, ErrIntOverflowConfig + } + if iNdEx >= l { + return 0, io.ErrUnexpectedEOF + } + iNdEx++ + if dAtA[iNdEx-1] < 0x80 { + break + } + } + return iNdEx, nil + case 1: + iNdEx += 8 + return iNdEx, nil + case 2: + var length int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return 0, ErrIntOverflowConfig + } + if iNdEx >= l { + return 0, io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + length |= (int(b) & 0x7F) << shift + if b < 0x80 { + break + } + } + if length < 0 { + return 0, ErrInvalidLengthConfig + } + iNdEx += length + if iNdEx < 0 { + return 0, ErrInvalidLengthConfig + } + return iNdEx, nil + case 3: + for { + var innerWire uint64 + var start int = iNdEx + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return 0, ErrIntOverflowConfig + } + if iNdEx >= l { + return 0, io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + innerWire |= (uint64(b) & 0x7F) << shift + if b < 0x80 { + break + } + } + innerWireType := int(innerWire & 0x7) + if innerWireType == 4 { + break + } + next, err := skipConfig(dAtA[start:]) + if err != nil { + return 0, err + } + iNdEx = start + next + if iNdEx < 0 { + return 0, ErrInvalidLengthConfig + } + } + return iNdEx, nil + case 4: + return iNdEx, nil + case 5: + iNdEx += 4 + return iNdEx, nil + default: + return 0, fmt.Errorf("proto: illegal wireType %d", wireType) + } + } + panic("unreachable") +} + +var ( + ErrInvalidLengthConfig = fmt.Errorf("proto: negative length found during unmarshaling") + ErrIntOverflowConfig = fmt.Errorf("proto: integer overflow") +) diff --git a/tools/all/Dockerfile b/tools/all/Dockerfile index b46089cf9b0..0c8c47956e2 100644 --- a/tools/all/Dockerfile +++ b/tools/all/Dockerfile @@ -8,7 +8,7 @@ RUN apk update && \ FROM gcr.io/istio-testing/protolock:2018-10-23 as protolock -FROM docker.io/rshriram/protoc:2019-02-25 +FROM gcr.io/istio-testing/protoc:2018-06-12 COPY --from=protolock \ /usr/bin/protolock \ diff --git a/tools/all/build-and-push.sh b/tools/all/build-and-push.sh index 89742b25fe3..4f4a2d5eb35 100755 --- a/tools/all/build-and-push.sh +++ b/tools/all/build-and-push.sh @@ -4,10 +4,9 @@ # place and procedure for generation. PLEASE use with caution # (read: not for general usage). -HUB=docker.io/rshriram -#gcr.io/istio-testing +HUB=gcr.io/istio-testing VERSION=$(date +%Y-%m-%d) docker build --no-cache -t $HUB/api-build-tools:$VERSION . -docker push $HUB/api-build-tools:$VERSION +gcloud docker -- push $HUB/api-build-tools:$VERSION diff --git a/tools/protoc/build-and-push.sh b/tools/protoc/build-and-push.sh index 295c4c953c5..ab6ad5fbce2 100755 --- a/tools/protoc/build-and-push.sh +++ b/tools/protoc/build-and-push.sh @@ -4,10 +4,9 @@ # place and procedure for generation. PLEASE use with caution # (read: not for general usage). -HUB=docker.io/rshriram -#gcr.io/istio-testing +HUB=gcr.io/istio-testing VERSION=$(date +%Y-%m-%d) docker build --no-cache -t $HUB/protoc:$VERSION . -docker push $HUB/protoc:$VERSION +gcloud docker -- push $HUB/protoc:$VERSION From c0bc2d721550332f90dbbc234a7cce77c19c0067 Mon Sep 17 00:00:00 2001 From: Shriram Rajagopalan Date: Mon, 25 Feb 2019 16:23:58 -0500 Subject: [PATCH 3/3] fix Signed-off-by: Shriram Rajagopalan --- .circleci/config.yml | 2 +- Makefile | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 048a8d72cc2..c43aa5f7655 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -2,7 +2,7 @@ version: 2 defaults: &defaults working_directory: /src/istio.io/api docker: - - image: docker.io/rshriram/api-build-tools:2019-02-25 + - image: gcr.io/istio-testing/api-build-tools:2019-02-25 environment: GOPATH: /go OUT_PATH: /src diff --git a/Makefile b/Makefile index 9cd932cdca1..8066ab8f06d 100644 --- a/Makefile +++ b/Makefile @@ -13,9 +13,9 @@ out_path = $(OUT_PATH) docker_lock = protolock docker_tool = prototool else -gen_img := docker.io/rshriram/protoc:2019-02-25 +gen_img := gcr.io/istio-testing/protoc:2019-02-25 lock_img := gcr.io/istio-testing/protolock:2018-10-23 -all_img := docker.io/rshriram/api-build-tools:2019-02-25 +all_img := gcr.io/istio-testing/api-build-tools:2019-02-25 pwd := $(shell pwd) mount_dir := /src repo_dir := istio.io/api