From 81320cee59ed034a65a64d2d07d40db6a1e24109 Mon Sep 17 00:00:00 2001 From: Venil Noronha Date: Fri, 17 Aug 2018 09:30:35 -0700 Subject: [PATCH] Revert copy envoy.type.Percent and its usage Signed-off-by: Venil Noronha --- Makefile | 35 +- envoy/types/percent.pb.go | 314 ----------------- envoy/types/percent.proto | 31 -- .../istio.networking.v1alpha3.pb.html | 35 +- networking/v1alpha3/virtual_service.pb.go | 329 ++++++++---------- networking/v1alpha3/virtual_service.proto | 11 +- python/istio_api/envoy/types/percent_pb2.py | 73 ---- .../v1alpha3/virtual_service_pb2.py | 107 +++--- 8 files changed, 208 insertions(+), 727 deletions(-) delete mode 100644 envoy/types/percent.pb.go delete mode 100644 envoy/types/percent.proto delete mode 100644 python/istio_api/envoy/types/percent_pb2.py diff --git a/Makefile b/Makefile index 2bddf405b0..770e4878d9 100644 --- a/Makefile +++ b/Makefile @@ -310,39 +310,26 @@ clean-authn: ##################### envoy_path := envoy -envoy_types_protos := $(shell find $(envoy_path) -type f -path '*/types/*' -name '*.proto' | sort) -envoy_types_pb_gos := $(envoy_types_protos:.proto=.pb.go) -envoy_types_pb_pythons := $(envoy_types_protos:.proto=_pb2.py) -envoy_v2alpha1_protos := $(shell find $(envoy_path) -type f -path '*/v2alpha1/*' -name '*.proto' | sort) -envoy_v2alpha1_pb_gos := $(envoy_v2alpha1_protos:.proto=.pb.go) -envoy_v2alpha1_pb_pythons := $(envoy_v2alpha1_protos:.proto=_pb2.py) - -generate-envoy-go: $(envoy_types_pb_gos) $(envoy_v2alpha1_pb_gos) $(envoy_pb_doc) - -# Envoy types are internal types, documents is not required. -$(envoy_types_pb_gos): $(envoy_types_protos) - ## Generate envoy/*/types/*.pb.go - @$(docker_gen) $(gogofast_plugin) $^ +envoy_protos := $(shell find $(envoy_path) -type f -name '*.proto' | sort) +envoy_pb_gos := $(envoy_protos:.proto=.pb.go) +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_v2alpha1_pb_gos): $(envoy_v2alpha1_protos) - ## Generate envoy/*/v2alpha1/*.pb.go +$(envoy_pb_gos): $(envoy_protos) + ## Generate envoy/*/*.pb.go @$(docker_gen) $(gogofast_plugin) $^ -generate-envoy-python: $(envoy_types_pb_pythons) $(envoy_v2alpha1_pb_pythons) - -# Envoy types are internal types, documents is not required. -$(envoy_types_pb_pythons): $(envoy_types_protos) - ## Generate envoy/*/types/*_pb2.py - @$(docker_gen) $(protoc_gen_python_plugin) $^ +generate-envoy-python: $(envoy_pb_pythons) # Envoy APIs is internal APIs, documents is not required. -$(envoy_v2alpha1_pb_pythons): $(envoy_v2alpha1_protos) - ## Generate envoy/*/v2alpha1/*_pb2.py +$(envoy_pb_pythons): $(envoy_protos) + ## Generate envoy/*/*_pb2.py @$(docker_gen) $(protoc_gen_python_plugin) $^ clean-envoy: - rm -f $(envoy_types_pb_gos) $(envoy_v2alpha1_pb_gos) + rm -f $(envoy_pb_gos) ##################### # common/... diff --git a/envoy/types/percent.pb.go b/envoy/types/percent.pb.go deleted file mode 100644 index a8ecebdf69..0000000000 --- a/envoy/types/percent.pb.go +++ /dev/null @@ -1,314 +0,0 @@ -// Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: envoy/types/percent.proto - -/* -Package types is a generated protocol buffer package. - -It is generated from these files: - envoy/types/percent.proto - -It has these top-level messages: - Percent -*/ -package types - -import proto "github.com/gogo/protobuf/proto" -import fmt "fmt" -import math "math" -import _ "github.com/gogo/protobuf/gogoproto" - -import binary "encoding/binary" - -import io "io" - -// 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/type/percent.proto -// Identifies a percentage, in the range [0.0, 100.0]. -type Percent struct { - Value float64 `protobuf:"fixed64,1,opt,name=value,proto3" json:"value,omitempty"` -} - -func (m *Percent) Reset() { *m = Percent{} } -func (m *Percent) String() string { return proto.CompactTextString(m) } -func (*Percent) ProtoMessage() {} -func (*Percent) Descriptor() ([]byte, []int) { return fileDescriptorPercent, []int{0} } - -func (m *Percent) GetValue() float64 { - if m != nil { - return m.Value - } - return 0 -} - -func init() { - proto.RegisterType((*Percent)(nil), "istio.envoy.types.Percent") -} -func (this *Percent) Equal(that interface{}) bool { - if that == nil { - return this == nil - } - - that1, ok := that.(*Percent) - if !ok { - that2, ok := that.(Percent) - if ok { - that1 = &that2 - } else { - return false - } - } - if that1 == nil { - return this == nil - } else if this == nil { - return false - } - if this.Value != that1.Value { - return false - } - return true -} -func (m *Percent) 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 *Percent) MarshalTo(dAtA []byte) (int, error) { - var i int - _ = i - var l int - _ = l - if m.Value != 0 { - dAtA[i] = 0x9 - i++ - binary.LittleEndian.PutUint64(dAtA[i:], uint64(math.Float64bits(float64(m.Value)))) - i += 8 - } - return i, nil -} - -func encodeVarintPercent(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 *Percent) Size() (n int) { - var l int - _ = l - if m.Value != 0 { - n += 9 - } - return n -} - -func sovPercent(x uint64) (n int) { - for { - n++ - x >>= 7 - if x == 0 { - break - } - } - return n -} -func sozPercent(x uint64) (n int) { - return sovPercent(uint64((x << 1) ^ uint64((int64(x) >> 63)))) -} -func (m *Percent) 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 ErrIntOverflowPercent - } - 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: Percent: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: Percent: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: - if wireType != 1 { - return fmt.Errorf("proto: wrong wireType = %d for field Value", wireType) - } - var v uint64 - if (iNdEx + 8) > l { - return io.ErrUnexpectedEOF - } - v = uint64(binary.LittleEndian.Uint64(dAtA[iNdEx:])) - iNdEx += 8 - m.Value = float64(math.Float64frombits(v)) - default: - iNdEx = preIndex - skippy, err := skipPercent(dAtA[iNdEx:]) - if err != nil { - return err - } - if skippy < 0 { - return ErrInvalidLengthPercent - } - if (iNdEx + skippy) > l { - return io.ErrUnexpectedEOF - } - iNdEx += skippy - } - } - - if iNdEx > l { - return io.ErrUnexpectedEOF - } - return nil -} -func skipPercent(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, ErrIntOverflowPercent - } - 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, ErrIntOverflowPercent - } - 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, ErrIntOverflowPercent - } - 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, ErrInvalidLengthPercent - } - return iNdEx, nil - case 3: - for { - var innerWire uint64 - var start int = iNdEx - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return 0, ErrIntOverflowPercent - } - 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 := skipPercent(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 ( - ErrInvalidLengthPercent = fmt.Errorf("proto: negative length found during unmarshaling") - ErrIntOverflowPercent = fmt.Errorf("proto: integer overflow") -) - -func init() { proto.RegisterFile("envoy/types/percent.proto", fileDescriptorPercent) } - -var fileDescriptorPercent = []byte{ - // 139 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x92, 0x4c, 0xcd, 0x2b, 0xcb, - 0xaf, 0xd4, 0x2f, 0xa9, 0x2c, 0x48, 0x2d, 0xd6, 0x2f, 0x48, 0x2d, 0x4a, 0x4e, 0xcd, 0x2b, 0xd1, - 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x12, 0xcc, 0x2c, 0x2e, 0xc9, 0xcc, 0xd7, 0x03, 0x2b, 0xd0, - 0x03, 0x2b, 0x90, 0x12, 0x49, 0xcf, 0x4f, 0xcf, 0x07, 0xcb, 0xea, 0x83, 0x58, 0x10, 0x85, 0x4a, - 0xf2, 0x5c, 0xec, 0x01, 0x10, 0x9d, 0x42, 0x22, 0x5c, 0xac, 0x65, 0x89, 0x39, 0xa5, 0xa9, 0x12, - 0x8c, 0x0a, 0x8c, 0x1a, 0x8c, 0x41, 0x10, 0x8e, 0x93, 0xd6, 0x8a, 0x47, 0x72, 0x8c, 0x27, 0x1e, - 0xc9, 0x31, 0x5e, 0x78, 0x24, 0xc7, 0xf8, 0xe0, 0x91, 0x1c, 0x63, 0x94, 0x04, 0xc4, 0xec, 0xcc, - 0x7c, 0xfd, 0xc4, 0x82, 0x4c, 0x7d, 0x24, 0x37, 0x24, 0xb1, 0x81, 0xcd, 0x34, 0x06, 0x04, 0x00, - 0x00, 0xff, 0xff, 0x03, 0xac, 0x3e, 0x8e, 0x99, 0x00, 0x00, 0x00, -} diff --git a/envoy/types/percent.proto b/envoy/types/percent.proto deleted file mode 100644 index 5e1cca73d2..0000000000 --- a/envoy/types/percent.proto +++ /dev/null @@ -1,31 +0,0 @@ -// Copyright 2018 Istio Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -syntax = "proto3"; - -// $title: Internal type for percentage implementation on Envoy. - -package istio.envoy.types; - -import "gogoproto/gogo.proto"; - -// Using "types" for the package name as "type" is a keyword in Golang. -option go_package = "istio.io/api/envoy/types"; -option (gogoproto.equal_all) = true; - -// Copied from @envoy/api/envoy/type/percent.proto -// Identifies a percentage, in the range [0.0, 100.0]. -message Percent { - double value = 1; -} diff --git a/networking/v1alpha3/istio.networking.v1alpha3.pb.html b/networking/v1alpha3/istio.networking.v1alpha3.pb.html index 98c7ee7b23..3abc04d041 100644 --- a/networking/v1alpha3/istio.networking.v1alpha3.pb.html +++ b/networking/v1alpha3/istio.networking.v1alpha3.pb.html @@ -6,7 +6,7 @@ generator: protoc-gen-docs aliases: - /docs/reference/config/istio.routing.v1alpha1/ -number_of_entries: 50 +number_of_entries: 49 ---

Configuration affecting traffic routing. Here are a few terms useful to define in the context of traffic routing.

@@ -1291,8 +1291,7 @@

HTTPFaultInjection.Abort

subset: v1 fault: abort: - percentage: - value: 0.001 + percentage: 0.001 httpStatus: 400 @@ -1330,7 +1329,7 @@

HTTPFaultInjection.Abort

percentage -istio.envoy.types.Percent +double

Percentage of requests to be aborted with the error code provided.

@@ -1363,8 +1362,7 @@

HTTPFaultInjection.Delay

subset: v1 fault: delay: - percentage: - value: 0.001 + percentage: 0.001 fixedDelay: 5s @@ -1402,7 +1400,7 @@

HTTPFaultInjection.Delay

percentage -istio.envoy.types.Percent +double

Percentage of requests on which the delay will be injected.

@@ -3739,26 +3737,3 @@

VirtualService

-

istio.envoy.types.Percent

-
-

Copied from @envoy/api/envoy/type/percent.proto -Identifies a percentage, in the range [0.0, 100.0].

- - - - - - - - - - - - - - - - -
FieldTypeDescription
valuedouble -
-
diff --git a/networking/v1alpha3/virtual_service.pb.go b/networking/v1alpha3/virtual_service.pb.go index b996cc5b62..a74263db4f 100644 --- a/networking/v1alpha3/virtual_service.pb.go +++ b/networking/v1alpha3/virtual_service.pb.go @@ -6,9 +6,10 @@ package v1alpha3 import proto "github.com/gogo/protobuf/proto" import fmt "fmt" import math "math" -import istio_envoy_types "istio.io/api/envoy/types" import google_protobuf "github.com/gogo/protobuf/types" -import google_protobuf2 "github.com/gogo/protobuf/types" +import google_protobuf1 "github.com/gogo/protobuf/types" + +import binary "encoding/binary" import io "io" @@ -1358,7 +1359,7 @@ type CorsPolicy struct { // 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_protobuf2.BoolValue `protobuf:"bytes,6,opt,name=allow_credentials,json=allowCredentials" json:"allow_credentials,omitempty"` + AllowCredentials *google_protobuf1.BoolValue `protobuf:"bytes,6,opt,name=allow_credentials,json=allowCredentials" json:"allow_credentials,omitempty"` } func (m *CorsPolicy) Reset() { *m = CorsPolicy{} } @@ -1401,7 +1402,7 @@ func (m *CorsPolicy) GetMaxAge() *google_protobuf.Duration { return nil } -func (m *CorsPolicy) GetAllowCredentials() *google_protobuf2.BoolValue { +func (m *CorsPolicy) GetAllowCredentials() *google_protobuf1.BoolValue { if m != nil { return m.AllowCredentials } @@ -1469,8 +1470,7 @@ func (m *HTTPFaultInjection) GetAbort() *HTTPFaultInjection_Abort { // subset: v1 // fault: // delay: -// percentage: -// value: 0.001 +// percentage: 0.001 // fixedDelay: 5s // ``` // @@ -1487,7 +1487,7 @@ type HTTPFaultInjection_Delay struct { // *HTTPFaultInjection_Delay_ExponentialDelay HttpDelayType isHTTPFaultInjection_Delay_HttpDelayType `protobuf_oneof:"http_delay_type"` // Percentage of requests on which the delay will be injected. - Percentage *istio_envoy_types.Percent `protobuf:"bytes,5,opt,name=percentage" json:"percentage,omitempty"` + Percentage float64 `protobuf:"fixed64,5,opt,name=percentage,proto3" json:"percentage,omitempty"` } func (m *HTTPFaultInjection_Delay) Reset() { *m = HTTPFaultInjection_Delay{} } @@ -1541,11 +1541,11 @@ func (m *HTTPFaultInjection_Delay) GetExponentialDelay() *google_protobuf.Durati return nil } -func (m *HTTPFaultInjection_Delay) GetPercentage() *istio_envoy_types.Percent { +func (m *HTTPFaultInjection_Delay) GetPercentage() float64 { if m != nil { return m.Percentage } - return nil + return 0 } // XXX_OneofFuncs is for the internal use of the proto package. @@ -1641,8 +1641,7 @@ func _HTTPFaultInjection_Delay_OneofSizer(msg proto.Message) (n int) { // subset: v1 // fault: // abort: -// percentage: -// value: 0.001 +// percentage: 0.001 // httpStatus: 400 // ``` // @@ -1661,7 +1660,7 @@ type HTTPFaultInjection_Abort struct { // *HTTPFaultInjection_Abort_Http2Error ErrorType isHTTPFaultInjection_Abort_ErrorType `protobuf_oneof:"error_type"` // Percentage of requests to be aborted with the error code provided. - Percentage *istio_envoy_types.Percent `protobuf:"bytes,5,opt,name=percentage" json:"percentage,omitempty"` + Percentage float64 `protobuf:"fixed64,5,opt,name=percentage,proto3" json:"percentage,omitempty"` } func (m *HTTPFaultInjection_Abort) Reset() { *m = HTTPFaultInjection_Abort{} } @@ -1726,11 +1725,11 @@ func (m *HTTPFaultInjection_Abort) GetHttp2Error() string { return "" } -func (m *HTTPFaultInjection_Abort) GetPercentage() *istio_envoy_types.Percent { +func (m *HTTPFaultInjection_Abort) GetPercentage() float64 { if m != nil { return m.Percentage } - return nil + return 0 } // XXX_OneofFuncs is for the internal use of the proto package. @@ -2939,15 +2938,11 @@ func (m *HTTPFaultInjection_Delay) MarshalTo(dAtA []byte) (int, error) { } i += nn21 } - if m.Percentage != nil { - dAtA[i] = 0x2a + if m.Percentage != 0 { + dAtA[i] = 0x29 i++ - i = encodeVarintVirtualService(dAtA, i, uint64(m.Percentage.Size())) - n22, err := m.Percentage.MarshalTo(dAtA[i:]) - if err != nil { - return 0, err - } - i += n22 + binary.LittleEndian.PutUint64(dAtA[i:], uint64(math.Float64bits(float64(m.Percentage)))) + i += 8 } return i, nil } @@ -2958,11 +2953,11 @@ func (m *HTTPFaultInjection_Delay_FixedDelay) MarshalTo(dAtA []byte) (int, error dAtA[i] = 0x12 i++ i = encodeVarintVirtualService(dAtA, i, uint64(m.FixedDelay.Size())) - n23, err := m.FixedDelay.MarshalTo(dAtA[i:]) + n22, err := m.FixedDelay.MarshalTo(dAtA[i:]) if err != nil { return 0, err } - i += n23 + i += n22 } return i, nil } @@ -2972,11 +2967,11 @@ func (m *HTTPFaultInjection_Delay_ExponentialDelay) MarshalTo(dAtA []byte) (int, dAtA[i] = 0x1a i++ i = encodeVarintVirtualService(dAtA, i, uint64(m.ExponentialDelay.Size())) - n24, err := m.ExponentialDelay.MarshalTo(dAtA[i:]) + n23, err := m.ExponentialDelay.MarshalTo(dAtA[i:]) if err != nil { return 0, err } - i += n24 + i += n23 } return i, nil } @@ -3001,21 +2996,17 @@ func (m *HTTPFaultInjection_Abort) MarshalTo(dAtA []byte) (int, error) { i = encodeVarintVirtualService(dAtA, i, uint64(m.Percent)) } if m.ErrorType != nil { - nn25, err := m.ErrorType.MarshalTo(dAtA[i:]) + nn24, err := m.ErrorType.MarshalTo(dAtA[i:]) if err != nil { return 0, err } - i += nn25 + i += nn24 } - if m.Percentage != nil { - dAtA[i] = 0x2a + if m.Percentage != 0 { + dAtA[i] = 0x29 i++ - i = encodeVarintVirtualService(dAtA, i, uint64(m.Percentage.Size())) - n26, err := m.Percentage.MarshalTo(dAtA[i:]) - if err != nil { - return 0, err - } - i += n26 + binary.LittleEndian.PutUint64(dAtA[i:], uint64(math.Float64bits(float64(m.Percentage)))) + i += 8 } return i, nil } @@ -3059,11 +3050,11 @@ func (m *PortSelector) MarshalTo(dAtA []byte) (int, error) { var l int _ = l if m.Port != nil { - nn27, err := m.Port.MarshalTo(dAtA[i:]) + nn25, err := m.Port.MarshalTo(dAtA[i:]) if err != nil { return 0, err } - i += nn27 + i += nn25 } return i, nil } @@ -3514,9 +3505,8 @@ func (m *HTTPFaultInjection_Delay) Size() (n int) { if m.HttpDelayType != nil { n += m.HttpDelayType.Size() } - if m.Percentage != nil { - l = m.Percentage.Size() - n += 1 + l + sovVirtualService(uint64(l)) + if m.Percentage != 0 { + n += 9 } return n } @@ -3548,9 +3538,8 @@ func (m *HTTPFaultInjection_Abort) Size() (n int) { if m.ErrorType != nil { n += m.ErrorType.Size() } - if m.Percentage != nil { - l = m.Percentage.Size() - n += 1 + l + sovVirtualService(uint64(l)) + if m.Percentage != 0 { + n += 9 } return n } @@ -6497,7 +6486,7 @@ func (m *CorsPolicy) Unmarshal(dAtA []byte) error { return io.ErrUnexpectedEOF } if m.AllowCredentials == nil { - m.AllowCredentials = &google_protobuf2.BoolValue{} + m.AllowCredentials = &google_protobuf1.BoolValue{} } if err := m.AllowCredentials.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err @@ -6753,38 +6742,16 @@ func (m *HTTPFaultInjection_Delay) Unmarshal(dAtA []byte) error { m.HttpDelayType = &HTTPFaultInjection_Delay_ExponentialDelay{v} iNdEx = postIndex case 5: - if wireType != 2 { + if wireType != 1 { return fmt.Errorf("proto: wrong wireType = %d for field Percentage", wireType) } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowVirtualService - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= (int(b) & 0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthVirtualService - } - postIndex := iNdEx + msglen - if postIndex > l { + var v uint64 + if (iNdEx + 8) > l { return io.ErrUnexpectedEOF } - if m.Percentage == nil { - m.Percentage = &istio_envoy_types.Percent{} - } - if err := m.Percentage.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex + v = uint64(binary.LittleEndian.Uint64(dAtA[iNdEx:])) + iNdEx += 8 + m.Percentage = float64(math.Float64frombits(v)) default: iNdEx = preIndex skippy, err := skipVirtualService(dAtA[iNdEx:]) @@ -6933,38 +6900,16 @@ func (m *HTTPFaultInjection_Abort) Unmarshal(dAtA []byte) error { m.ErrorType = &HTTPFaultInjection_Abort_Http2Error{string(dAtA[iNdEx:postIndex])} iNdEx = postIndex case 5: - if wireType != 2 { + if wireType != 1 { return fmt.Errorf("proto: wrong wireType = %d for field Percentage", wireType) } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowVirtualService - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= (int(b) & 0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthVirtualService - } - postIndex := iNdEx + msglen - if postIndex > l { + var v uint64 + if (iNdEx + 8) > l { return io.ErrUnexpectedEOF } - if m.Percentage == nil { - m.Percentage = &istio_envoy_types.Percent{} - } - if err := m.Percentage.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex + v = uint64(binary.LittleEndian.Uint64(dAtA[iNdEx:])) + iNdEx += 8 + m.Percentage = float64(math.Float64frombits(v)) default: iNdEx = preIndex skippy, err := skipVirtualService(dAtA[iNdEx:]) @@ -7195,98 +7140,96 @@ func init() { } var fileDescriptorVirtualService = []byte{ - // 1480 bytes of a gzipped FileDescriptorProto + // 1452 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x98, 0xcd, 0x6e, 0xdb, 0xc6, 0x13, 0xc0, 0x43, 0x49, 0x94, 0xad, 0x91, 0x9c, 0xd8, 0xfb, 0xcf, 0x3f, 0x65, 0xd4, 0xc0, 0x70, - 0x94, 0xa6, 0x75, 0x91, 0x86, 0x42, 0xed, 0x7e, 0x18, 0x69, 0xe2, 0xc4, 0x1f, 0x49, 0x15, 0x20, - 0x41, 0x0d, 0xda, 0x4d, 0x81, 0x1e, 0x4a, 0x50, 0xd4, 0x58, 0x62, 0x42, 0x71, 0xd9, 0xdd, 0xa5, - 0x6d, 0xdd, 0xfb, 0x04, 0xed, 0xb9, 0xe8, 0xa3, 0xf4, 0xda, 0x63, 0x8f, 0x3d, 0x15, 0x85, 0x8f, - 0x7d, 0x86, 0x1e, 0x8a, 0xdd, 0x25, 0x25, 0xc6, 0x4e, 0xf4, 0x81, 0xa4, 0x37, 0xed, 0x70, 0x7e, - 0xb3, 0xbb, 0xb3, 0x33, 0xb3, 0xb3, 0x82, 0x0f, 0x23, 0x14, 0xc7, 0x94, 0xbd, 0x08, 0xa2, 0x6e, - 0xf3, 0xe8, 0x63, 0x2f, 0x8c, 0x7b, 0xde, 0x7a, 0xf3, 0x28, 0x60, 0x22, 0xf1, 0x42, 0x97, 0x23, - 0x3b, 0x0a, 0x7c, 0xb4, 0x63, 0x46, 0x05, 0x25, 0x57, 0x03, 0x2e, 0x02, 0x6a, 0x8f, 0x00, 0x3b, - 0x03, 0xea, 0x57, 0x31, 0x3a, 0xa2, 0x83, 0xa6, 0x18, 0xc4, 0xc8, 0x9b, 0x31, 0x32, 0x1f, 0x23, - 0xa1, 0xa9, 0xfa, 0x72, 0x97, 0xd2, 0x6e, 0x88, 0x4d, 0x35, 0x6a, 0x27, 0x87, 0xcd, 0x4e, 0xc2, - 0x3c, 0x11, 0xd0, 0xe8, 0x75, 0xdf, 0x8f, 0x99, 0x17, 0xc7, 0xc8, 0xb8, 0xfe, 0xde, 0xf8, 0xdb, - 0x80, 0x8b, 0xcf, 0xf4, 0x7a, 0xf6, 0xf5, 0x72, 0xc8, 0x65, 0x30, 0x7b, 0x94, 0x0b, 0x6e, 0x19, - 0x2b, 0xc5, 0xd5, 0x8a, 0xa3, 0x07, 0xa4, 0x0e, 0xf3, 0x5d, 0x4f, 0xe0, 0xb1, 0x37, 0xe0, 0x56, - 0x41, 0x7d, 0x18, 0x8e, 0xc9, 0x06, 0x94, 0x7a, 0x42, 0xc4, 0x56, 0x71, 0xa5, 0xb8, 0x5a, 0x5d, - 0x7b, 0xcf, 0x7e, 0xed, 0x4e, 0xec, 0xd6, 0xc1, 0xc1, 0x9e, 0x43, 0x13, 0x81, 0x8e, 0x22, 0xc8, - 0xa7, 0x50, 0x14, 0x7e, 0x6c, 0x95, 0x14, 0x78, 0x63, 0x0c, 0x78, 0xb0, 0x93, 0x72, 0x52, 0x5f, - 0x61, 0x21, 0xb7, 0xcc, 0xc9, 0xd8, 0x93, 0xfd, 0x0c, 0x0b, 0x79, 0xe3, 0x08, 0xaa, 0xbb, 0xc8, - 0x45, 0x10, 0x29, 0x0f, 0x11, 0x02, 0x25, 0xb9, 0x37, 0xcb, 0x58, 0x31, 0x56, 0x2b, 0x8e, 0xfa, - 0x4d, 0xae, 0x40, 0x99, 0x27, 0x6d, 0x8e, 0xc2, 0x2a, 0x28, 0x69, 0x3a, 0x22, 0x5f, 0x40, 0x29, - 0xa6, 0x4c, 0x58, 0xc5, 0x15, 0x63, 0xb5, 0xba, 0xf6, 0xc1, 0x98, 0x29, 0xf7, 0x28, 0x13, 0xfb, - 0x18, 0xa2, 0x2f, 0x28, 0x73, 0x14, 0xd4, 0x38, 0x2d, 0x43, 0x65, 0xb8, 0x73, 0xb2, 0x05, 0x66, - 0xdf, 0x13, 0x7e, 0x4f, 0xf9, 0xb7, 0xba, 0x76, 0x6b, 0x82, 0xbb, 0x9e, 0x4a, 0x5d, 0x07, 0xbf, - 0x4f, 0x90, 0x0b, 0x47, 0x93, 0x64, 0x1b, 0x4c, 0x26, 0x6d, 0xa9, 0x93, 0xa8, 0xae, 0x7d, 0x34, - 0xc6, 0x44, 0x6e, 0xc3, 0xdf, 0x60, 0xd0, 0xed, 0x09, 0x47, 0xa3, 0x64, 0x07, 0xe6, 0x19, 0x76, - 0x02, 0x86, 0xfe, 0x34, 0xbb, 0x52, 0xcb, 0x4f, 0xd5, 0x9d, 0x21, 0x48, 0x1e, 0xc0, 0x1c, 0xc3, - 0x63, 0x16, 0x08, 0xb4, 0x4a, 0xca, 0xc6, 0xfb, 0x13, 0x6d, 0x28, 0x6d, 0x27, 0xc3, 0xc8, 0x2d, - 0x58, 0x3a, 0xc6, 0x36, 0xa7, 0xfe, 0x0b, 0x14, 0x6e, 0x12, 0x77, 0x99, 0xd7, 0x41, 0xcb, 0x5c, - 0x31, 0x56, 0xe7, 0x9d, 0xc5, 0xe1, 0x87, 0xaf, 0xb5, 0x9c, 0xac, 0xc3, 0x9c, 0x08, 0xfa, 0x48, - 0x13, 0x61, 0x95, 0xd5, 0x74, 0x57, 0x6d, 0x1d, 0xdf, 0x76, 0x16, 0xdf, 0xf6, 0x6e, 0x1a, 0xff, - 0x4e, 0xa6, 0x49, 0x36, 0xe5, 0x1a, 0x05, 0x0b, 0x90, 0x5b, 0x73, 0x0a, 0x9a, 0x18, 0xa0, 0x28, - 0xd8, 0xc0, 0xc9, 0x20, 0xb2, 0x03, 0xe6, 0xa1, 0x97, 0x84, 0xc2, 0x9a, 0x57, 0xf4, 0xed, 0x09, - 0xf4, 0x23, 0xa9, 0xfb, 0x38, 0x7a, 0x8e, 0xbe, 0x5a, 0x86, 0x66, 0xc9, 0x26, 0x94, 0xfb, 0x01, - 0x63, 0x94, 0x59, 0x95, 0x89, 0x7e, 0xca, 0x1d, 0x99, 0x93, 0x52, 0xe4, 0x11, 0x54, 0x7d, 0xca, - 0xb8, 0x1b, 0xd3, 0x30, 0xf0, 0x07, 0x16, 0x28, 0x23, 0x37, 0xc7, 0x18, 0xd9, 0xa1, 0x8c, 0xef, - 0x29, 0x65, 0x07, 0xfc, 0xe1, 0x6f, 0xf2, 0x1d, 0x5c, 0x94, 0xf9, 0x1f, 0x75, 0xdc, 0x1e, 0x7a, - 0x1d, 0x64, 0xdc, 0xaa, 0xaa, 0x10, 0xfa, 0x7c, 0x9a, 0xa4, 0xb5, 0xb7, 0x14, 0xda, 0xd2, 0xe4, - 0xc3, 0x48, 0xba, 0x69, 0xc1, 0xcb, 0xcb, 0xc8, 0x67, 0xf0, 0x0e, 0xc3, 0x3e, 0x3d, 0x42, 0x97, - 0x21, 0x8f, 0x69, 0xc4, 0x71, 0x38, 0x51, 0x4d, 0x55, 0x8d, 0xff, 0xeb, 0xcf, 0x4e, 0xfa, 0x35, - 0xe5, 0xea, 0x0f, 0x80, 0x9c, 0x37, 0x4e, 0x16, 0xa1, 0xf8, 0x02, 0x07, 0x69, 0x82, 0xca, 0x9f, - 0xb2, 0x38, 0x1d, 0x79, 0x61, 0x82, 0x69, 0x7a, 0xea, 0xc1, 0x9d, 0xc2, 0x86, 0xd1, 0xf8, 0xc9, - 0x80, 0xf9, 0x2c, 0xdd, 0xe5, 0x99, 0xe5, 0x73, 0xec, 0xf6, 0xf8, 0x12, 0xa1, 0x52, 0x6c, 0x4b, - 0x08, 0x16, 0xb4, 0x13, 0x81, 0xfc, 0x2d, 0x66, 0x59, 0xe3, 0x47, 0xb9, 0xaa, 0xb4, 0x76, 0x49, - 0x83, 0xf9, 0x55, 0x8d, 0x33, 0xf8, 0xe4, 0x93, 0xff, 0x70, 0x51, 0xbf, 0x98, 0xb0, 0x78, 0xb6, - 0xb4, 0x90, 0x0d, 0x28, 0x26, 0x2c, 0x50, 0xbe, 0x1e, 0x1f, 0x9e, 0xfb, 0x82, 0x05, 0x51, 0x57, - 0xb3, 0x12, 0x91, 0xb1, 0xcd, 0xfd, 0x1e, 0xf6, 0xf5, 0xa1, 0x4c, 0x0f, 0xa7, 0x94, 0xca, 0x0d, - 0x14, 0x3d, 0xda, 0x49, 0xeb, 0xd0, 0xd4, 0xbc, 0xa6, 0xc8, 0x2e, 0x54, 0xbc, 0x44, 0xf4, 0x28, - 0x0b, 0xc4, 0x60, 0x8a, 0x32, 0x94, 0x37, 0x31, 0x02, 0x89, 0x03, 0x73, 0x59, 0xa4, 0xea, 0x7b, - 0x65, 0x63, 0x86, 0xc2, 0x6c, 0xbf, 0x94, 0x13, 0x99, 0x21, 0x79, 0xc3, 0xa8, 0x5b, 0x43, 0x16, - 0xab, 0x05, 0x7d, 0x19, 0x90, 0x36, 0x2c, 0x70, 0x9a, 0x30, 0x1f, 0xdd, 0xd0, 0x6b, 0x63, 0x28, - 0x8b, 0x92, 0x9c, 0xed, 0xde, 0x2c, 0xb3, 0xed, 0x2b, 0x03, 0x4f, 0x14, 0xaf, 0xa7, 0xac, 0xf1, - 0x9c, 0xe8, 0xa5, 0xcb, 0x7a, 0xfe, 0xe5, 0xcb, 0xba, 0xde, 0x86, 0xda, 0x84, 0x1c, 0xbb, 0x9b, - 0xcf, 0xb1, 0xe9, 0x7d, 0x39, 0xca, 0xc5, 0xfa, 0x7d, 0x58, 0x3a, 0xb7, 0xc4, 0x99, 0x92, 0x39, - 0x81, 0xa5, 0x73, 0xd1, 0x4b, 0x5a, 0x50, 0xed, 0x8c, 0x84, 0x53, 0x44, 0x6a, 0xbe, 0x90, 0xe6, - 0x51, 0x79, 0xcb, 0x1f, 0x2b, 0x9b, 0x6a, 0x66, 0xd3, 0x49, 0x47, 0x8d, 0x5f, 0x0b, 0xb0, 0x74, - 0x2e, 0xf3, 0x48, 0x13, 0xfe, 0x97, 0x83, 0x5d, 0x9e, 0xb4, 0x23, 0x1c, 0xb6, 0x47, 0x24, 0xf7, - 0x69, 0x5f, 0x7f, 0x19, 0x1e, 0x7b, 0x21, 0x77, 0xec, 0x37, 0x86, 0xc7, 0xae, 0x79, 0x15, 0xeb, - 0x95, 0xec, 0xdc, 0x34, 0x49, 0xfc, 0xb3, 0xb1, 0xa1, 0x1b, 0xa3, 0xcd, 0x59, 0x0a, 0xc5, 0x4c, - 0xc1, 0x61, 0x9e, 0x09, 0x8e, 0x37, 0x3e, 0xb8, 0x3f, 0x0b, 0x40, 0xce, 0x57, 0x54, 0xf2, 0x2e, - 0x54, 0x78, 0x14, 0xb8, 0xf9, 0xbe, 0x72, 0x9e, 0x47, 0x41, 0x4b, 0xb5, 0x96, 0xaf, 0xf1, 0x6f, - 0x61, 0xa2, 0x7f, 0x8b, 0xe3, 0xfc, 0x5b, 0x7a, 0x85, 0x7f, 0x3b, 0x67, 0xfd, 0xab, 0x33, 0xfd, - 0xfe, 0x4c, 0xd7, 0xc3, 0x4c, 0x0e, 0x2e, 0xbf, 0x6d, 0x07, 0x6f, 0x42, 0x2d, 0xdf, 0x8b, 0x49, - 0x36, 0x2b, 0xdb, 0x15, 0x5d, 0x8e, 0xaf, 0xe5, 0xcb, 0xa1, 0xe6, 0x47, 0x82, 0xc6, 0x3d, 0xa8, - 0xe6, 0xfa, 0xb0, 0x99, 0x71, 0x84, 0x6a, 0x2e, 0xe7, 0xc9, 0x15, 0x30, 0xf1, 0xc4, 0xf3, 0xd3, - 0x1e, 0xba, 0x75, 0xc1, 0xd1, 0x43, 0x62, 0x41, 0x39, 0x66, 0x78, 0x18, 0x9c, 0x68, 0x0b, 0xad, - 0x0b, 0x4e, 0x3a, 0x96, 0x04, 0xc3, 0x2e, 0x9e, 0xe8, 0xf8, 0x97, 0x84, 0x1a, 0x6e, 0xd7, 0x00, - 0xd4, 0x05, 0xe7, 0xca, 0x57, 0x4e, 0xe3, 0x79, 0xda, 0x30, 0xcb, 0x4e, 0x4c, 0xfa, 0xd3, 0x13, - 0x02, 0xfb, 0xb1, 0x8a, 0x1d, 0x99, 0xaf, 0xc3, 0x31, 0xd9, 0x82, 0x4b, 0x31, 0x32, 0x57, 0xb0, - 0x81, 0x9b, 0x75, 0x86, 0x85, 0x49, 0x9d, 0xe1, 0x42, 0x8c, 0xec, 0x80, 0x0d, 0x0e, 0xb4, 0x7e, - 0xe3, 0xe7, 0x02, 0xc0, 0xa8, 0x5b, 0x22, 0xd7, 0xa1, 0xe6, 0x85, 0x21, 0x3d, 0x76, 0x29, 0x0b, - 0xba, 0x41, 0x94, 0x46, 0x6b, 0x55, 0xc9, 0xbe, 0x52, 0x22, 0x19, 0x6b, 0x5a, 0x45, 0x5f, 0x40, - 0x59, 0xa8, 0x6a, 0xee, 0xa9, 0x96, 0x8d, 0x94, 0xb2, 0x5b, 0xa5, 0x98, 0x53, 0xca, 0xda, 0xa5, - 0x9b, 0x70, 0x11, 0x4f, 0x62, 0x9a, 0xeb, 0x92, 0x4a, 0x4a, 0x6b, 0x41, 0x4b, 0x33, 0xb5, 0x35, - 0x98, 0xeb, 0x7b, 0x27, 0xae, 0xd7, 0xd5, 0xad, 0xf1, 0xd8, 0xdd, 0x95, 0xfb, 0xde, 0xc9, 0x56, - 0x17, 0xc9, 0x97, 0xb0, 0xa4, 0xe7, 0xf7, 0x19, 0x76, 0x30, 0x12, 0x81, 0x17, 0xf2, 0xb4, 0x6b, - 0xae, 0x9f, 0xa3, 0xb7, 0x29, 0x0d, 0x9f, 0xc9, 0x18, 0x73, 0x16, 0x15, 0xb4, 0x33, 0x62, 0x1a, - 0x3f, 0x98, 0x40, 0xce, 0x37, 0xb6, 0xe4, 0x31, 0x98, 0x1d, 0x0c, 0xbd, 0x41, 0x5a, 0x87, 0xd7, - 0x67, 0x6a, 0x8b, 0xed, 0x5d, 0x89, 0x3a, 0xda, 0x82, 0x34, 0xe5, 0xb5, 0xb3, 0x82, 0x39, 0xb3, - 0xa9, 0x2d, 0x89, 0x3a, 0xda, 0x42, 0xfd, 0x1f, 0x03, 0x4c, 0x65, 0x9b, 0x5c, 0x83, 0xb9, 0xf4, - 0xa9, 0xac, 0x83, 0x66, 0xbb, 0x60, 0x19, 0x4e, 0x26, 0x22, 0x77, 0xa1, 0x7a, 0x18, 0x9c, 0x60, - 0xc7, 0xd5, 0x7b, 0x98, 0x14, 0x33, 0xad, 0x0b, 0x0e, 0x28, 0x7d, 0x6d, 0xbb, 0x05, 0x4b, 0xf2, - 0x80, 0x22, 0xed, 0xa2, 0xd4, 0x46, 0x71, 0xb2, 0x8d, 0xc5, 0x1c, 0xa5, 0x2d, 0xdd, 0x01, 0x48, - 0x97, 0x34, 0x3a, 0xdc, 0x7a, 0xba, 0x7f, 0xf5, 0xea, 0xb7, 0xd5, 0xab, 0xdf, 0xde, 0xd3, 0x4a, - 0x4e, 0x4e, 0x7b, 0x7b, 0x09, 0x2e, 0xc9, 0x47, 0xb4, 0x9e, 0x5e, 0xe5, 0x4d, 0xfd, 0x0f, 0x03, - 0x4c, 0xe5, 0x8f, 0x09, 0xdb, 0xbf, 0x0e, 0x55, 0x85, 0x72, 0xe1, 0x89, 0x84, 0xeb, 0x5b, 0x50, - 0xee, 0x51, 0x0a, 0xf7, 0x95, 0x4c, 0xaa, 0x74, 0x59, 0xec, 0x67, 0x2a, 0x59, 0xba, 0x82, 0x14, - 0x8e, 0x54, 0x24, 0xb0, 0xe6, 0xa2, 0x7a, 0xd9, 0x94, 0x32, 0x15, 0x25, 0x7c, 0xa8, 0xde, 0x2d, - 0x6f, 0xb2, 0xbf, 0x1a, 0x80, 0x32, 0xac, 0x4b, 0xc2, 0x23, 0xa8, 0xe5, 0x9f, 0xd6, 0xb2, 0xc4, - 0x44, 0x49, 0xbf, 0x8d, 0x4c, 0xed, 0x6f, 0x41, 0x96, 0x18, 0x3d, 0x26, 0x97, 0xa1, 0x14, 0x79, - 0x69, 0x37, 0x2a, 0xd7, 0xa3, 0x46, 0xdb, 0x65, 0x7d, 0x69, 0x6c, 0xdb, 0xbf, 0x9d, 0x2e, 0x1b, - 0xbf, 0x9f, 0x2e, 0x1b, 0x7f, 0x9d, 0x2e, 0x1b, 0xdf, 0xae, 0xe8, 0xa5, 0x04, 0xb4, 0xe9, 0xc5, - 0x41, 0xf3, 0x15, 0xff, 0xd6, 0xb4, 0xcb, 0xea, 0x20, 0xd7, 0xff, 0x0d, 0x00, 0x00, 0xff, 0xff, - 0x53, 0x83, 0x3f, 0xb8, 0xcb, 0x11, 0x00, 0x00, + 0x94, 0xa6, 0x75, 0x91, 0x46, 0x46, 0xed, 0x7e, 0x18, 0x6d, 0xe2, 0xc4, 0x1f, 0x49, 0x15, 0x20, + 0x41, 0x03, 0xca, 0x4d, 0x81, 0x1e, 0x4a, 0x50, 0xd4, 0x58, 0x62, 0x42, 0x71, 0xd9, 0xdd, 0xa5, + 0x25, 0xbd, 0x46, 0x7b, 0x2e, 0xfa, 0x22, 0x05, 0x7a, 0xed, 0xa1, 0x87, 0x3e, 0x41, 0x11, 0xf8, + 0xd8, 0xa7, 0x28, 0x76, 0x97, 0x94, 0x18, 0x2b, 0xd1, 0x07, 0x9a, 0xde, 0xb4, 0xb3, 0xf3, 0x9b, + 0xdd, 0x9d, 0x9d, 0x99, 0x1d, 0x0a, 0x3e, 0x0c, 0x51, 0xf4, 0x29, 0x7b, 0xe1, 0x87, 0x9d, 0xad, + 0xd3, 0x8f, 0xdd, 0x20, 0xea, 0xba, 0x3b, 0x5b, 0xa7, 0x3e, 0x13, 0xb1, 0x1b, 0x38, 0x1c, 0xd9, + 0xa9, 0xef, 0x61, 0x3d, 0x62, 0x54, 0x50, 0x72, 0xd5, 0xe7, 0xc2, 0xa7, 0xf5, 0x31, 0x50, 0x4f, + 0x81, 0xea, 0x7a, 0x87, 0xd2, 0x4e, 0x80, 0x5b, 0x4a, 0xb1, 0x15, 0x9f, 0x6c, 0xb5, 0x63, 0xe6, + 0x0a, 0x9f, 0x86, 0x1a, 0x9d, 0x9c, 0xef, 0x33, 0x37, 0x8a, 0x90, 0x71, 0x3d, 0x5f, 0xfb, 0xdb, + 0x80, 0x8b, 0xcf, 0xf4, 0xa2, 0x4d, 0xbd, 0x26, 0xb9, 0x0c, 0x66, 0x97, 0x72, 0xc1, 0x2d, 0x63, + 0x23, 0xbf, 0x59, 0xb2, 0xf5, 0x80, 0x54, 0x61, 0xb9, 0xe3, 0x0a, 0xec, 0xbb, 0x43, 0x6e, 0xe5, + 0xd4, 0xc4, 0x68, 0x4c, 0x76, 0xa1, 0xd0, 0x15, 0x22, 0xb2, 0xf2, 0x1b, 0xf9, 0xcd, 0xf2, 0xf6, + 0x7b, 0xf5, 0x37, 0x6e, 0xb7, 0xde, 0x38, 0x3e, 0x7e, 0x6a, 0xd3, 0x58, 0xa0, 0xad, 0x08, 0xf2, + 0x29, 0xe4, 0x85, 0x17, 0x59, 0x05, 0x05, 0xde, 0x98, 0x02, 0x1e, 0x1f, 0x26, 0x9c, 0xd4, 0x57, + 0x58, 0xc0, 0x2d, 0x73, 0x36, 0xf6, 0xb8, 0x99, 0x62, 0x01, 0xaf, 0x9d, 0x42, 0xf9, 0x08, 0xb9, + 0xf0, 0x43, 0xe5, 0x21, 0x42, 0xa0, 0x20, 0xcf, 0x66, 0x19, 0x1b, 0xc6, 0x66, 0xc9, 0x56, 0xbf, + 0xc9, 0x15, 0x28, 0xf2, 0xb8, 0xc5, 0x51, 0x58, 0x39, 0x25, 0x4d, 0x46, 0xe4, 0x4b, 0x28, 0x44, + 0x94, 0x09, 0x2b, 0xbf, 0x61, 0x6c, 0x96, 0xb7, 0x3f, 0x98, 0xb2, 0xe4, 0x53, 0xca, 0x44, 0x13, + 0x03, 0xf4, 0x04, 0x65, 0xb6, 0x82, 0x6a, 0x67, 0x45, 0x28, 0x8d, 0x4e, 0x4e, 0xf6, 0xc1, 0xec, + 0xb9, 0xc2, 0xeb, 0x2a, 0xff, 0x96, 0xb7, 0x6f, 0xcd, 0x70, 0xd7, 0x13, 0xa9, 0x6b, 0xe3, 0x0f, + 0x31, 0x72, 0x61, 0x6b, 0x92, 0x1c, 0x80, 0xc9, 0xa4, 0x2d, 0x75, 0x13, 0xe5, 0xed, 0x8f, 0xa6, + 0x98, 0xc8, 0x1c, 0xf8, 0x5b, 0xf4, 0x3b, 0x5d, 0x61, 0x6b, 0x94, 0x1c, 0xc2, 0x32, 0xc3, 0xb6, + 0xcf, 0xd0, 0x9b, 0xe7, 0x54, 0x6a, 0xfb, 0x89, 0xba, 0x3d, 0x02, 0xc9, 0x7d, 0x58, 0x62, 0xd8, + 0x67, 0xbe, 0x40, 0xab, 0xa0, 0x6c, 0xbc, 0x3f, 0xd3, 0x86, 0xd2, 0xb6, 0x53, 0x8c, 0xdc, 0x82, + 0xb5, 0x3e, 0xb6, 0x38, 0xf5, 0x5e, 0xa0, 0x70, 0xe2, 0xa8, 0xc3, 0xdc, 0x36, 0x5a, 0xe6, 0x86, + 0xb1, 0xb9, 0x6c, 0xaf, 0x8e, 0x26, 0xbe, 0xd1, 0x72, 0xb2, 0x03, 0x4b, 0xc2, 0xef, 0x21, 0x8d, + 0x85, 0x55, 0x54, 0xcb, 0x5d, 0xad, 0xeb, 0xf8, 0xae, 0xa7, 0xf1, 0x5d, 0x3f, 0x4a, 0xe2, 0xdf, + 0x4e, 0x35, 0xc9, 0x9e, 0xdc, 0xa3, 0x60, 0x3e, 0x72, 0x6b, 0x49, 0x41, 0x33, 0x03, 0x14, 0x05, + 0x1b, 0xda, 0x29, 0x44, 0x0e, 0xc1, 0x3c, 0x71, 0xe3, 0x40, 0x58, 0xcb, 0x8a, 0xbe, 0x3d, 0x83, + 0x7e, 0x28, 0x75, 0x1f, 0x85, 0xcf, 0xd1, 0x53, 0xdb, 0xd0, 0x2c, 0xd9, 0x83, 0x62, 0xcf, 0x67, + 0x8c, 0x32, 0xab, 0x34, 0xd3, 0x4f, 0x99, 0x2b, 0xb3, 0x13, 0x8a, 0x3c, 0x84, 0xb2, 0x47, 0x19, + 0x77, 0x22, 0x1a, 0xf8, 0xde, 0xd0, 0x02, 0x65, 0xe4, 0xe6, 0x14, 0x23, 0x87, 0x94, 0xf1, 0xa7, + 0x4a, 0xd9, 0x06, 0x6f, 0xf4, 0x9b, 0x7c, 0x0f, 0x17, 0x65, 0xfe, 0x87, 0x6d, 0xa7, 0x8b, 0x6e, + 0x1b, 0x19, 0xb7, 0xca, 0x2a, 0x84, 0x3e, 0x9f, 0x27, 0x69, 0xeb, 0xfb, 0x0a, 0x6d, 0x68, 0xf2, + 0x41, 0x28, 0xdd, 0xb4, 0xe2, 0x66, 0x65, 0xe4, 0x33, 0x78, 0x87, 0x61, 0x8f, 0x9e, 0xa2, 0xc3, + 0x90, 0x47, 0x34, 0xe4, 0x38, 0x5a, 0xa8, 0xa2, 0xaa, 0xc6, 0xff, 0xf5, 0xb4, 0x9d, 0xcc, 0x26, + 0x5c, 0xf5, 0x3e, 0x90, 0x49, 0xe3, 0x64, 0x15, 0xf2, 0x2f, 0x70, 0x98, 0x24, 0xa8, 0xfc, 0x29, + 0x8b, 0xd3, 0xa9, 0x1b, 0xc4, 0x98, 0xa4, 0xa7, 0x1e, 0x7c, 0x91, 0xdb, 0x35, 0x6a, 0x3f, 0x19, + 0xb0, 0x9c, 0xa6, 0xbb, 0xbc, 0xb3, 0x6c, 0x8e, 0xdd, 0x9e, 0x5e, 0x22, 0x54, 0x8a, 0xed, 0x0b, + 0xc1, 0xfc, 0x56, 0x2c, 0x90, 0xbf, 0xc5, 0x2c, 0xab, 0xfd, 0x28, 0x77, 0x95, 0xd4, 0x2e, 0x69, + 0x30, 0xbb, 0xab, 0x69, 0x06, 0x1f, 0x7f, 0xf2, 0x1f, 0x6e, 0xea, 0x17, 0x13, 0x56, 0xcf, 0x97, + 0x16, 0xb2, 0x0b, 0xf9, 0x98, 0xf9, 0xca, 0xd7, 0xd3, 0xc3, 0xb3, 0x29, 0x98, 0x1f, 0x76, 0x34, + 0x2b, 0x11, 0x19, 0xdb, 0xdc, 0xeb, 0x62, 0x4f, 0x5f, 0xca, 0xfc, 0x70, 0x42, 0xa9, 0xdc, 0x40, + 0xd1, 0xa5, 0xed, 0xa4, 0x0e, 0xcd, 0xcd, 0x6b, 0x8a, 0x1c, 0x41, 0xc9, 0x8d, 0x45, 0x97, 0x32, + 0x5f, 0x0c, 0xe7, 0x28, 0x43, 0x59, 0x13, 0x63, 0x90, 0xd8, 0xb0, 0x94, 0x46, 0xaa, 0x7e, 0x57, + 0x76, 0x17, 0x28, 0xcc, 0xf5, 0x57, 0x72, 0x22, 0x35, 0x24, 0x5f, 0x18, 0xf5, 0x6a, 0xc8, 0x62, + 0xb5, 0xa2, 0x1f, 0x03, 0xd2, 0x82, 0x15, 0x4e, 0x63, 0xe6, 0xa1, 0x13, 0xb8, 0x2d, 0x0c, 0x64, + 0x51, 0x92, 0xab, 0xdd, 0x5d, 0x64, 0xb5, 0xa6, 0x32, 0xf0, 0x58, 0xf1, 0x7a, 0xc9, 0x0a, 0xcf, + 0x88, 0x5e, 0x79, 0xac, 0x97, 0x5f, 0x7d, 0xac, 0xab, 0x2d, 0xa8, 0xcc, 0xc8, 0xb1, 0x3b, 0xd9, + 0x1c, 0x9b, 0xdf, 0x97, 0xe3, 0x5c, 0xac, 0xde, 0x83, 0xb5, 0x89, 0x2d, 0x2e, 0x94, 0xcc, 0x31, + 0xac, 0x4d, 0x44, 0x2f, 0x69, 0x40, 0xb9, 0x3d, 0x16, 0xce, 0x11, 0xa9, 0xd9, 0x42, 0x9a, 0x45, + 0xe5, 0x2b, 0xdf, 0x57, 0x36, 0xd5, 0xca, 0xa6, 0x9d, 0x8c, 0x6a, 0xbf, 0xe5, 0x60, 0x6d, 0x22, + 0xf3, 0xc8, 0x16, 0xfc, 0x2f, 0x03, 0x3b, 0x3c, 0x6e, 0x85, 0x38, 0x6a, 0x8f, 0x48, 0x66, 0xaa, + 0xa9, 0x67, 0x46, 0xd7, 0x9e, 0xcb, 0x5c, 0xfb, 0x8d, 0xd1, 0xb5, 0x6b, 0x5e, 0xc5, 0x7a, 0x29, + 0xbd, 0x37, 0x4d, 0x12, 0xef, 0x7c, 0x6c, 0xe8, 0xc6, 0x68, 0x6f, 0x91, 0x42, 0xb1, 0x50, 0x70, + 0x98, 0xe7, 0x82, 0xe3, 0x5f, 0x5f, 0xdc, 0x5f, 0x39, 0x20, 0x93, 0x15, 0x95, 0xbc, 0x0b, 0x25, + 0x1e, 0xfa, 0x4e, 0xb6, 0xaf, 0x5c, 0xe6, 0xa1, 0xdf, 0x50, 0xad, 0xe5, 0x1b, 0xfc, 0x9b, 0x9b, + 0xe9, 0xdf, 0xfc, 0x34, 0xff, 0x16, 0x5e, 0xe3, 0xdf, 0xf6, 0x79, 0xff, 0xea, 0x4c, 0xbf, 0xb7, + 0xd0, 0xf3, 0xb0, 0x90, 0x83, 0x8b, 0x6f, 0xdb, 0xc1, 0x7b, 0x50, 0xc9, 0xf6, 0x62, 0x92, 0x4d, + 0xcb, 0x76, 0x49, 0x97, 0xe3, 0x6b, 0xd9, 0x72, 0xa8, 0xf9, 0xb1, 0xa0, 0x76, 0x17, 0xca, 0x99, + 0x3e, 0x6c, 0x61, 0x1c, 0xa1, 0x9c, 0xc9, 0x79, 0x72, 0x05, 0x4c, 0x1c, 0xb8, 0x5e, 0xd2, 0x43, + 0x37, 0x2e, 0xd8, 0x7a, 0x48, 0x2c, 0x28, 0x46, 0x0c, 0x4f, 0xfc, 0x81, 0xb6, 0xd0, 0xb8, 0x60, + 0x27, 0x63, 0x49, 0x30, 0xec, 0xe0, 0x40, 0xc7, 0xbf, 0x24, 0xd4, 0xf0, 0xa0, 0x02, 0xa0, 0x1e, + 0x38, 0x47, 0x0c, 0x23, 0xac, 0x3d, 0x4f, 0x1a, 0x66, 0xd9, 0x89, 0x49, 0x7f, 0xba, 0x42, 0x60, + 0x2f, 0x52, 0xb1, 0x23, 0xf3, 0x75, 0x34, 0x26, 0xfb, 0x70, 0x29, 0x42, 0xe6, 0x08, 0x36, 0x74, + 0xd2, 0xce, 0x30, 0x37, 0xab, 0x33, 0x5c, 0x89, 0x90, 0x1d, 0xb3, 0xe1, 0xb1, 0xd6, 0xaf, 0xfd, + 0x9c, 0x03, 0x18, 0x77, 0x4b, 0xe4, 0x3a, 0x54, 0xdc, 0x20, 0xa0, 0x7d, 0x87, 0x32, 0xbf, 0xe3, + 0x87, 0x49, 0xb4, 0x96, 0x95, 0xec, 0x6b, 0x25, 0x92, 0xb1, 0xa6, 0x55, 0xf4, 0x03, 0x94, 0x86, + 0xaa, 0xe6, 0x9e, 0x68, 0xd9, 0x58, 0x29, 0x7d, 0x55, 0xf2, 0x19, 0xa5, 0xb4, 0x5d, 0xba, 0x09, + 0x17, 0x71, 0x10, 0xd1, 0x4c, 0x97, 0x54, 0x50, 0x5a, 0x2b, 0x5a, 0x9a, 0xaa, 0x6d, 0xc3, 0x52, + 0xcf, 0x1d, 0x38, 0x6e, 0x47, 0xb7, 0xc6, 0x53, 0x4f, 0x57, 0xec, 0xb9, 0x83, 0xfd, 0x0e, 0x92, + 0xaf, 0x60, 0x4d, 0xaf, 0xef, 0x31, 0x6c, 0x63, 0x28, 0x7c, 0x37, 0xe0, 0x49, 0xd7, 0x5c, 0x9d, + 0xa0, 0x0f, 0x28, 0x0d, 0x9e, 0xc9, 0x18, 0xb3, 0x57, 0x15, 0x74, 0x38, 0x66, 0x6a, 0x7f, 0x14, + 0x80, 0x4c, 0x36, 0xb6, 0xe4, 0x11, 0x98, 0x6d, 0x0c, 0xdc, 0x61, 0x52, 0x87, 0x77, 0x16, 0x6a, + 0x8b, 0xeb, 0x47, 0x12, 0xb5, 0xb5, 0x05, 0x69, 0xca, 0x6d, 0xa5, 0x05, 0x73, 0x61, 0x53, 0xfb, + 0x12, 0xb5, 0xb5, 0x85, 0xea, 0x4b, 0x03, 0x4c, 0x65, 0x9b, 0x5c, 0x83, 0xa5, 0x08, 0x99, 0x87, + 0xa1, 0x0e, 0x4e, 0xf3, 0x20, 0x67, 0x19, 0x76, 0x2a, 0x22, 0x77, 0xa0, 0x7c, 0xe2, 0x0f, 0xb0, + 0xed, 0xe8, 0x33, 0xcc, 0x8a, 0x99, 0xc6, 0x05, 0x1b, 0x94, 0xbe, 0xb6, 0xdd, 0x80, 0x35, 0x79, + 0x41, 0xa1, 0x76, 0x51, 0x62, 0x23, 0x3f, 0xdb, 0xc6, 0x6a, 0x86, 0xd2, 0x96, 0xd6, 0x01, 0x92, + 0x2d, 0xa5, 0x97, 0x6b, 0xd8, 0x19, 0xc9, 0xc1, 0x1a, 0x5c, 0x92, 0x1f, 0xca, 0x7a, 0x09, 0x95, + 0x1b, 0xd5, 0x5f, 0x0d, 0x30, 0xd5, 0x99, 0x67, 0x1c, 0xf1, 0x3a, 0x94, 0x15, 0xca, 0x85, 0x2b, + 0x62, 0xae, 0x5f, 0x3a, 0x79, 0x0e, 0x29, 0x6c, 0x2a, 0x99, 0x54, 0xe9, 0xb0, 0xc8, 0x4b, 0x55, + 0xd2, 0x94, 0x04, 0x29, 0x1c, 0xab, 0x48, 0x60, 0xdb, 0x41, 0xf5, 0xf5, 0x52, 0x48, 0x55, 0x94, + 0xf0, 0x81, 0xfa, 0x36, 0x99, 0x75, 0x86, 0x0a, 0x80, 0x82, 0x75, 0x6a, 0x3f, 0x84, 0x4a, 0xf6, + 0x13, 0x59, 0x96, 0x8a, 0x30, 0xee, 0xb5, 0x90, 0xa9, 0x33, 0xac, 0xc8, 0x52, 0xa1, 0xc7, 0xe4, + 0x32, 0x14, 0x42, 0x37, 0xe9, 0x2a, 0xe5, 0x9a, 0x6a, 0x74, 0x50, 0xd4, 0xc5, 0xff, 0xa0, 0xfe, + 0xfb, 0xd9, 0xba, 0xf1, 0xe7, 0xd9, 0xba, 0xf1, 0xf2, 0x6c, 0xdd, 0xf8, 0x6e, 0x43, 0x87, 0x8c, + 0x4f, 0xb7, 0xdc, 0xc8, 0xdf, 0x7a, 0xcd, 0x5f, 0x2b, 0xad, 0xa2, 0xba, 0x90, 0x9d, 0x7f, 0x02, + 0x00, 0x00, 0xff, 0xff, 0x5f, 0x54, 0x46, 0x0f, 0x78, 0x11, 0x00, 0x00, } diff --git a/networking/v1alpha3/virtual_service.proto b/networking/v1alpha3/virtual_service.proto index 3df709ea6d..4cdf985980 100644 --- a/networking/v1alpha3/virtual_service.proto +++ b/networking/v1alpha3/virtual_service.proto @@ -14,7 +14,6 @@ syntax = "proto3"; -import "envoy/types/percent.proto"; import "google/protobuf/duration.proto"; import "google/protobuf/wrappers.proto"; @@ -939,8 +938,7 @@ message HTTPFaultInjection { // subset: v1 // fault: // delay: - // percentage: - // value: 0.001 + // percentage: 0.001 // fixedDelay: 5s // ``` // @@ -963,7 +961,7 @@ message HTTPFaultInjection { } // Percentage of requests on which the delay will be injected. - istio.envoy.types.Percent percentage = 5; + double percentage = 5; } // Abort specification is used to prematurely abort a request with a @@ -985,8 +983,7 @@ message HTTPFaultInjection { // subset: v1 // fault: // abort: - // percentage: - // value: 0.001 + // percentage: 0.001 // httpStatus: 400 // ``` // @@ -1012,7 +1009,7 @@ message HTTPFaultInjection { } // Percentage of requests to be aborted with the error code provided. - istio.envoy.types.Percent percentage = 5; + double percentage = 5; } } diff --git a/python/istio_api/envoy/types/percent_pb2.py b/python/istio_api/envoy/types/percent_pb2.py deleted file mode 100644 index 7a83319f09..0000000000 --- a/python/istio_api/envoy/types/percent_pb2.py +++ /dev/null @@ -1,73 +0,0 @@ -# Generated by the protocol buffer compiler. DO NOT EDIT! -# source: envoy/types/percent.proto - -import sys -_b=sys.version_info[0]<3 and (lambda x:x) or (lambda x:x.encode('latin1')) -from google.protobuf import descriptor as _descriptor -from google.protobuf import message as _message -from google.protobuf import reflection as _reflection -from google.protobuf import symbol_database as _symbol_database -from google.protobuf import descriptor_pb2 -# @@protoc_insertion_point(imports) - -_sym_db = _symbol_database.Default() - - -from gogoproto import gogo_pb2 as gogoproto_dot_gogo__pb2 - - -DESCRIPTOR = _descriptor.FileDescriptor( - name='envoy/types/percent.proto', - package='istio.envoy.types', - syntax='proto3', - serialized_pb=_b('\n\x19\x65nvoy/types/percent.proto\x12\x11istio.envoy.types\x1a\x14gogoproto/gogo.proto\"\x18\n\x07Percent\x12\r\n\x05value\x18\x01 \x01(\x01\x42\x1eZ\x18istio.io/api/envoy/types\xa8\xe2\x1e\x01\x62\x06proto3') - , - dependencies=[gogoproto_dot_gogo__pb2.DESCRIPTOR,]) - - - - -_PERCENT = _descriptor.Descriptor( - name='Percent', - full_name='istio.envoy.types.Percent', - filename=None, - file=DESCRIPTOR, - containing_type=None, - fields=[ - _descriptor.FieldDescriptor( - name='value', full_name='istio.envoy.types.Percent.value', index=0, - number=1, type=1, cpp_type=5, label=1, - has_default_value=False, default_value=float(0), - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - options=None, file=DESCRIPTOR), - ], - extensions=[ - ], - nested_types=[], - enum_types=[ - ], - options=None, - is_extendable=False, - syntax='proto3', - extension_ranges=[], - oneofs=[ - ], - serialized_start=70, - serialized_end=94, -) - -DESCRIPTOR.message_types_by_name['Percent'] = _PERCENT -_sym_db.RegisterFileDescriptor(DESCRIPTOR) - -Percent = _reflection.GeneratedProtocolMessageType('Percent', (_message.Message,), dict( - DESCRIPTOR = _PERCENT, - __module__ = 'envoy.types.percent_pb2' - # @@protoc_insertion_point(class_scope:istio.envoy.types.Percent) - )) -_sym_db.RegisterMessage(Percent) - - -DESCRIPTOR.has_options = True -DESCRIPTOR._options = _descriptor._ParseOptions(descriptor_pb2.FileOptions(), _b('Z\030istio.io/api/envoy/types\250\342\036\001')) -# @@protoc_insertion_point(module_scope) diff --git a/python/istio_api/networking/v1alpha3/virtual_service_pb2.py b/python/istio_api/networking/v1alpha3/virtual_service_pb2.py index 04c00de863..6741a395de 100644 --- a/python/istio_api/networking/v1alpha3/virtual_service_pb2.py +++ b/python/istio_api/networking/v1alpha3/virtual_service_pb2.py @@ -13,7 +13,6 @@ _sym_db = _symbol_database.Default() -from envoy.types import percent_pb2 as envoy_dot_types_dot_percent__pb2 from google.protobuf import duration_pb2 as google_dot_protobuf_dot_duration__pb2 from google.protobuf import wrappers_pb2 as google_dot_protobuf_dot_wrappers__pb2 @@ -22,9 +21,9 @@ name='networking/v1alpha3/virtual_service.proto', package='istio.networking.v1alpha3', syntax='proto3', - serialized_pb=_b('\n)networking/v1alpha3/virtual_service.proto\x12\x19istio.networking.v1alpha3\x1a\x19\x65nvoy/types/percent.proto\x1a\x1egoogle/protobuf/duration.proto\x1a\x1egoogle/protobuf/wrappers.proto\"\xc9\x01\n\x0eVirtualService\x12\r\n\x05hosts\x18\x01 \x03(\t\x12\x10\n\x08gateways\x18\x02 \x03(\t\x12\x32\n\x04http\x18\x03 \x03(\x0b\x32$.istio.networking.v1alpha3.HTTPRoute\x12\x30\n\x03tls\x18\x05 \x03(\x0b\x32#.istio.networking.v1alpha3.TLSRoute\x12\x30\n\x03tcp\x18\x04 \x03(\x0b\x32#.istio.networking.v1alpha3.TCPRoute\"b\n\x0b\x44\x65stination\x12\x0c\n\x04host\x18\x01 \x01(\t\x12\x0e\n\x06subset\x18\x02 \x01(\t\x12\x35\n\x04port\x18\x03 \x01(\x0b\x32\'.istio.networking.v1alpha3.PortSelector\"\xd0\x05\n\tHTTPRoute\x12:\n\x05match\x18\x01 \x03(\x0b\x32+.istio.networking.v1alpha3.HTTPMatchRequest\x12;\n\x05route\x18\x02 \x03(\x0b\x32,.istio.networking.v1alpha3.DestinationWeight\x12\x39\n\x08redirect\x18\x03 \x01(\x0b\x32\'.istio.networking.v1alpha3.HTTPRedirect\x12\x37\n\x07rewrite\x18\x04 \x01(\x0b\x32&.istio.networking.v1alpha3.HTTPRewrite\x12\x19\n\x11websocket_upgrade\x18\x05 \x01(\x08\x12*\n\x07timeout\x18\x06 \x01(\x0b\x32\x19.google.protobuf.Duration\x12\x35\n\x07retries\x18\x07 \x01(\x0b\x32$.istio.networking.v1alpha3.HTTPRetry\x12<\n\x05\x66\x61ult\x18\x08 \x01(\x0b\x32-.istio.networking.v1alpha3.HTTPFaultInjection\x12\x36\n\x06mirror\x18\t \x01(\x0b\x32&.istio.networking.v1alpha3.Destination\x12:\n\x0b\x63ors_policy\x18\n \x01(\x0b\x32%.istio.networking.v1alpha3.CorsPolicy\x12O\n\x0e\x61ppend_headers\x18\x0b \x03(\x0b\x32\x37.istio.networking.v1alpha3.HTTPRoute.AppendHeadersEntry\x12\x1f\n\x17remove_response_headers\x18\x0c \x03(\t\x1a\x34\n\x12\x41ppendHeadersEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\t:\x02\x38\x01\"\x85\x01\n\x08TLSRoute\x12<\n\x05match\x18\x01 \x03(\x0b\x32-.istio.networking.v1alpha3.TLSMatchAttributes\x12;\n\x05route\x18\x02 \x03(\x0b\x32,.istio.networking.v1alpha3.DestinationWeight\"\x84\x01\n\x08TCPRoute\x12;\n\x05match\x18\x01 \x03(\x0b\x32,.istio.networking.v1alpha3.L4MatchAttributes\x12;\n\x05route\x18\x02 \x03(\x0b\x32,.istio.networking.v1alpha3.DestinationWeight\"\xc0\x04\n\x10HTTPMatchRequest\x12\x33\n\x03uri\x18\x01 \x01(\x0b\x32&.istio.networking.v1alpha3.StringMatch\x12\x36\n\x06scheme\x18\x02 \x01(\x0b\x32&.istio.networking.v1alpha3.StringMatch\x12\x36\n\x06method\x18\x03 \x01(\x0b\x32&.istio.networking.v1alpha3.StringMatch\x12\x39\n\tauthority\x18\x04 \x01(\x0b\x32&.istio.networking.v1alpha3.StringMatch\x12I\n\x07headers\x18\x05 \x03(\x0b\x32\x38.istio.networking.v1alpha3.HTTPMatchRequest.HeadersEntry\x12\x0c\n\x04port\x18\x06 \x01(\r\x12T\n\rsource_labels\x18\x07 \x03(\x0b\x32=.istio.networking.v1alpha3.HTTPMatchRequest.SourceLabelsEntry\x12\x10\n\x08gateways\x18\x08 \x03(\t\x1aV\n\x0cHeadersEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\x35\n\x05value\x18\x02 \x01(\x0b\x32&.istio.networking.v1alpha3.StringMatch:\x02\x38\x01\x1a\x33\n\x11SourceLabelsEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\t:\x02\x38\x01\"`\n\x11\x44\x65stinationWeight\x12;\n\x0b\x64\x65stination\x18\x01 \x01(\x0b\x32&.istio.networking.v1alpha3.Destination\x12\x0e\n\x06weight\x18\x02 \x01(\x05\"\xf3\x01\n\x11L4MatchAttributes\x12\x1b\n\x13\x64\x65stination_subnets\x18\x01 \x03(\t\x12\x0c\n\x04port\x18\x02 \x01(\r\x12\x15\n\rsource_subnet\x18\x03 \x01(\t\x12U\n\rsource_labels\x18\x04 \x03(\x0b\x32>.istio.networking.v1alpha3.L4MatchAttributes.SourceLabelsEntry\x12\x10\n\x08gateways\x18\x05 \x03(\t\x1a\x33\n\x11SourceLabelsEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\t:\x02\x38\x01\"\x88\x02\n\x12TLSMatchAttributes\x12\x11\n\tsni_hosts\x18\x01 \x03(\t\x12\x1b\n\x13\x64\x65stination_subnets\x18\x02 \x03(\t\x12\x0c\n\x04port\x18\x03 \x01(\r\x12\x15\n\rsource_subnet\x18\x04 \x01(\t\x12V\n\rsource_labels\x18\x05 \x03(\x0b\x32?.istio.networking.v1alpha3.TLSMatchAttributes.SourceLabelsEntry\x12\x10\n\x08gateways\x18\x06 \x03(\t\x1a\x33\n\x11SourceLabelsEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\t:\x02\x38\x01\".\n\x0cHTTPRedirect\x12\x0b\n\x03uri\x18\x01 \x01(\t\x12\x11\n\tauthority\x18\x02 \x01(\t\"-\n\x0bHTTPRewrite\x12\x0b\n\x03uri\x18\x01 \x01(\t\x12\x11\n\tauthority\x18\x02 \x01(\t\"O\n\x0bStringMatch\x12\x0f\n\x05\x65xact\x18\x01 \x01(\tH\x00\x12\x10\n\x06prefix\x18\x02 \x01(\tH\x00\x12\x0f\n\x05regex\x18\x03 \x01(\tH\x00\x42\x0c\n\nmatch_type\"Q\n\tHTTPRetry\x12\x10\n\x08\x61ttempts\x18\x01 \x01(\x05\x12\x32\n\x0fper_try_timeout\x18\x02 \x01(\x0b\x32\x19.google.protobuf.Duration\"\xcb\x01\n\nCorsPolicy\x12\x14\n\x0c\x61llow_origin\x18\x01 \x03(\t\x12\x15\n\rallow_methods\x18\x02 \x03(\t\x12\x15\n\rallow_headers\x18\x03 \x03(\t\x12\x16\n\x0e\x65xpose_headers\x18\x04 \x03(\t\x12*\n\x07max_age\x18\x05 \x01(\x0b\x32\x19.google.protobuf.Duration\x12\x35\n\x11\x61llow_credentials\x18\x06 \x01(\x0b\x32\x1a.google.protobuf.BoolValue\"\x8a\x04\n\x12HTTPFaultInjection\x12\x42\n\x05\x64\x65lay\x18\x01 \x01(\x0b\x32\x33.istio.networking.v1alpha3.HTTPFaultInjection.Delay\x12\x42\n\x05\x61\x62ort\x18\x02 \x01(\x0b\x32\x33.istio.networking.v1alpha3.HTTPFaultInjection.Abort\x1a\xc9\x01\n\x05\x44\x65lay\x12\x13\n\x07percent\x18\x01 \x01(\x05\x42\x02\x18\x01\x12\x30\n\x0b\x66ixed_delay\x18\x02 \x01(\x0b\x32\x19.google.protobuf.DurationH\x00\x12\x36\n\x11\x65xponential_delay\x18\x03 \x01(\x0b\x32\x19.google.protobuf.DurationH\x00\x12.\n\npercentage\x18\x05 \x01(\x0b\x32\x1a.istio.envoy.types.PercentB\x11\n\x0fhttp_delay_type\x1a\x9f\x01\n\x05\x41\x62ort\x12\x13\n\x07percent\x18\x01 \x01(\x05\x42\x02\x18\x01\x12\x15\n\x0bhttp_status\x18\x02 \x01(\x05H\x00\x12\x15\n\x0bgrpc_status\x18\x03 \x01(\tH\x00\x12\x15\n\x0bhttp2_error\x18\x04 \x01(\tH\x00\x12.\n\npercentage\x18\x05 \x01(\x0b\x32\x1a.istio.envoy.types.PercentB\x0c\n\nerror_type\"8\n\x0cPortSelector\x12\x10\n\x06number\x18\x01 \x01(\rH\x00\x12\x0e\n\x04name\x18\x02 \x01(\tH\x00\x42\x06\n\x04portB\"Z istio.io/api/networking/v1alpha3b\x06proto3') + serialized_pb=_b('\n)networking/v1alpha3/virtual_service.proto\x12\x19istio.networking.v1alpha3\x1a\x1egoogle/protobuf/duration.proto\x1a\x1egoogle/protobuf/wrappers.proto\"\xc9\x01\n\x0eVirtualService\x12\r\n\x05hosts\x18\x01 \x03(\t\x12\x10\n\x08gateways\x18\x02 \x03(\t\x12\x32\n\x04http\x18\x03 \x03(\x0b\x32$.istio.networking.v1alpha3.HTTPRoute\x12\x30\n\x03tls\x18\x05 \x03(\x0b\x32#.istio.networking.v1alpha3.TLSRoute\x12\x30\n\x03tcp\x18\x04 \x03(\x0b\x32#.istio.networking.v1alpha3.TCPRoute\"b\n\x0b\x44\x65stination\x12\x0c\n\x04host\x18\x01 \x01(\t\x12\x0e\n\x06subset\x18\x02 \x01(\t\x12\x35\n\x04port\x18\x03 \x01(\x0b\x32\'.istio.networking.v1alpha3.PortSelector\"\xd0\x05\n\tHTTPRoute\x12:\n\x05match\x18\x01 \x03(\x0b\x32+.istio.networking.v1alpha3.HTTPMatchRequest\x12;\n\x05route\x18\x02 \x03(\x0b\x32,.istio.networking.v1alpha3.DestinationWeight\x12\x39\n\x08redirect\x18\x03 \x01(\x0b\x32\'.istio.networking.v1alpha3.HTTPRedirect\x12\x37\n\x07rewrite\x18\x04 \x01(\x0b\x32&.istio.networking.v1alpha3.HTTPRewrite\x12\x19\n\x11websocket_upgrade\x18\x05 \x01(\x08\x12*\n\x07timeout\x18\x06 \x01(\x0b\x32\x19.google.protobuf.Duration\x12\x35\n\x07retries\x18\x07 \x01(\x0b\x32$.istio.networking.v1alpha3.HTTPRetry\x12<\n\x05\x66\x61ult\x18\x08 \x01(\x0b\x32-.istio.networking.v1alpha3.HTTPFaultInjection\x12\x36\n\x06mirror\x18\t \x01(\x0b\x32&.istio.networking.v1alpha3.Destination\x12:\n\x0b\x63ors_policy\x18\n \x01(\x0b\x32%.istio.networking.v1alpha3.CorsPolicy\x12O\n\x0e\x61ppend_headers\x18\x0b \x03(\x0b\x32\x37.istio.networking.v1alpha3.HTTPRoute.AppendHeadersEntry\x12\x1f\n\x17remove_response_headers\x18\x0c \x03(\t\x1a\x34\n\x12\x41ppendHeadersEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\t:\x02\x38\x01\"\x85\x01\n\x08TLSRoute\x12<\n\x05match\x18\x01 \x03(\x0b\x32-.istio.networking.v1alpha3.TLSMatchAttributes\x12;\n\x05route\x18\x02 \x03(\x0b\x32,.istio.networking.v1alpha3.DestinationWeight\"\x84\x01\n\x08TCPRoute\x12;\n\x05match\x18\x01 \x03(\x0b\x32,.istio.networking.v1alpha3.L4MatchAttributes\x12;\n\x05route\x18\x02 \x03(\x0b\x32,.istio.networking.v1alpha3.DestinationWeight\"\xc0\x04\n\x10HTTPMatchRequest\x12\x33\n\x03uri\x18\x01 \x01(\x0b\x32&.istio.networking.v1alpha3.StringMatch\x12\x36\n\x06scheme\x18\x02 \x01(\x0b\x32&.istio.networking.v1alpha3.StringMatch\x12\x36\n\x06method\x18\x03 \x01(\x0b\x32&.istio.networking.v1alpha3.StringMatch\x12\x39\n\tauthority\x18\x04 \x01(\x0b\x32&.istio.networking.v1alpha3.StringMatch\x12I\n\x07headers\x18\x05 \x03(\x0b\x32\x38.istio.networking.v1alpha3.HTTPMatchRequest.HeadersEntry\x12\x0c\n\x04port\x18\x06 \x01(\r\x12T\n\rsource_labels\x18\x07 \x03(\x0b\x32=.istio.networking.v1alpha3.HTTPMatchRequest.SourceLabelsEntry\x12\x10\n\x08gateways\x18\x08 \x03(\t\x1aV\n\x0cHeadersEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\x35\n\x05value\x18\x02 \x01(\x0b\x32&.istio.networking.v1alpha3.StringMatch:\x02\x38\x01\x1a\x33\n\x11SourceLabelsEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\t:\x02\x38\x01\"`\n\x11\x44\x65stinationWeight\x12;\n\x0b\x64\x65stination\x18\x01 \x01(\x0b\x32&.istio.networking.v1alpha3.Destination\x12\x0e\n\x06weight\x18\x02 \x01(\x05\"\xf3\x01\n\x11L4MatchAttributes\x12\x1b\n\x13\x64\x65stination_subnets\x18\x01 \x03(\t\x12\x0c\n\x04port\x18\x02 \x01(\r\x12\x15\n\rsource_subnet\x18\x03 \x01(\t\x12U\n\rsource_labels\x18\x04 \x03(\x0b\x32>.istio.networking.v1alpha3.L4MatchAttributes.SourceLabelsEntry\x12\x10\n\x08gateways\x18\x05 \x03(\t\x1a\x33\n\x11SourceLabelsEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\t:\x02\x38\x01\"\x88\x02\n\x12TLSMatchAttributes\x12\x11\n\tsni_hosts\x18\x01 \x03(\t\x12\x1b\n\x13\x64\x65stination_subnets\x18\x02 \x03(\t\x12\x0c\n\x04port\x18\x03 \x01(\r\x12\x15\n\rsource_subnet\x18\x04 \x01(\t\x12V\n\rsource_labels\x18\x05 \x03(\x0b\x32?.istio.networking.v1alpha3.TLSMatchAttributes.SourceLabelsEntry\x12\x10\n\x08gateways\x18\x06 \x03(\t\x1a\x33\n\x11SourceLabelsEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\t:\x02\x38\x01\".\n\x0cHTTPRedirect\x12\x0b\n\x03uri\x18\x01 \x01(\t\x12\x11\n\tauthority\x18\x02 \x01(\t\"-\n\x0bHTTPRewrite\x12\x0b\n\x03uri\x18\x01 \x01(\t\x12\x11\n\tauthority\x18\x02 \x01(\t\"O\n\x0bStringMatch\x12\x0f\n\x05\x65xact\x18\x01 \x01(\tH\x00\x12\x10\n\x06prefix\x18\x02 \x01(\tH\x00\x12\x0f\n\x05regex\x18\x03 \x01(\tH\x00\x42\x0c\n\nmatch_type\"Q\n\tHTTPRetry\x12\x10\n\x08\x61ttempts\x18\x01 \x01(\x05\x12\x32\n\x0fper_try_timeout\x18\x02 \x01(\x0b\x32\x19.google.protobuf.Duration\"\xcb\x01\n\nCorsPolicy\x12\x14\n\x0c\x61llow_origin\x18\x01 \x03(\t\x12\x15\n\rallow_methods\x18\x02 \x03(\t\x12\x15\n\rallow_headers\x18\x03 \x03(\t\x12\x16\n\x0e\x65xpose_headers\x18\x04 \x03(\t\x12*\n\x07max_age\x18\x05 \x01(\x0b\x32\x19.google.protobuf.Duration\x12\x35\n\x11\x61llow_credentials\x18\x06 \x01(\x0b\x32\x1a.google.protobuf.BoolValue\"\xd2\x03\n\x12HTTPFaultInjection\x12\x42\n\x05\x64\x65lay\x18\x01 \x01(\x0b\x32\x33.istio.networking.v1alpha3.HTTPFaultInjection.Delay\x12\x42\n\x05\x61\x62ort\x18\x02 \x01(\x0b\x32\x33.istio.networking.v1alpha3.HTTPFaultInjection.Abort\x1a\xad\x01\n\x05\x44\x65lay\x12\x13\n\x07percent\x18\x01 \x01(\x05\x42\x02\x18\x01\x12\x30\n\x0b\x66ixed_delay\x18\x02 \x01(\x0b\x32\x19.google.protobuf.DurationH\x00\x12\x36\n\x11\x65xponential_delay\x18\x03 \x01(\x0b\x32\x19.google.protobuf.DurationH\x00\x12\x12\n\npercentage\x18\x05 \x01(\x01\x42\x11\n\x0fhttp_delay_type\x1a\x83\x01\n\x05\x41\x62ort\x12\x13\n\x07percent\x18\x01 \x01(\x05\x42\x02\x18\x01\x12\x15\n\x0bhttp_status\x18\x02 \x01(\x05H\x00\x12\x15\n\x0bgrpc_status\x18\x03 \x01(\tH\x00\x12\x15\n\x0bhttp2_error\x18\x04 \x01(\tH\x00\x12\x12\n\npercentage\x18\x05 \x01(\x01\x42\x0c\n\nerror_type\"8\n\x0cPortSelector\x12\x10\n\x06number\x18\x01 \x01(\rH\x00\x12\x0e\n\x04name\x18\x02 \x01(\tH\x00\x42\x06\n\x04portB\"Z istio.io/api/networking/v1alpha3b\x06proto3') , - dependencies=[envoy_dot_types_dot_percent__pb2.DESCRIPTOR,google_dot_protobuf_dot_duration__pb2.DESCRIPTOR,google_dot_protobuf_dot_wrappers__pb2.DESCRIPTOR,]) + dependencies=[google_dot_protobuf_dot_duration__pb2.DESCRIPTOR,google_dot_protobuf_dot_wrappers__pb2.DESCRIPTOR,]) @@ -83,8 +82,8 @@ extension_ranges=[], oneofs=[ ], - serialized_start=164, - serialized_end=365, + serialized_start=137, + serialized_end=338, ) @@ -128,8 +127,8 @@ extension_ranges=[], oneofs=[ ], - serialized_start=367, - serialized_end=465, + serialized_start=340, + serialized_end=438, ) @@ -166,8 +165,8 @@ extension_ranges=[], oneofs=[ ], - serialized_start=1136, - serialized_end=1188, + serialized_start=1109, + serialized_end=1161, ) _HTTPROUTE = _descriptor.Descriptor( @@ -273,8 +272,8 @@ extension_ranges=[], oneofs=[ ], - serialized_start=468, - serialized_end=1188, + serialized_start=441, + serialized_end=1161, ) @@ -311,8 +310,8 @@ extension_ranges=[], oneofs=[ ], - serialized_start=1191, - serialized_end=1324, + serialized_start=1164, + serialized_end=1297, ) @@ -349,8 +348,8 @@ extension_ranges=[], oneofs=[ ], - serialized_start=1327, - serialized_end=1459, + serialized_start=1300, + serialized_end=1432, ) @@ -387,8 +386,8 @@ extension_ranges=[], oneofs=[ ], - serialized_start=1899, - serialized_end=1985, + serialized_start=1872, + serialized_end=1958, ) _HTTPMATCHREQUEST_SOURCELABELSENTRY = _descriptor.Descriptor( @@ -424,8 +423,8 @@ extension_ranges=[], oneofs=[ ], - serialized_start=1987, - serialized_end=2038, + serialized_start=1960, + serialized_end=2011, ) _HTTPMATCHREQUEST = _descriptor.Descriptor( @@ -503,8 +502,8 @@ extension_ranges=[], oneofs=[ ], - serialized_start=1462, - serialized_end=2038, + serialized_start=1435, + serialized_end=2011, ) @@ -541,8 +540,8 @@ extension_ranges=[], oneofs=[ ], - serialized_start=2040, - serialized_end=2136, + serialized_start=2013, + serialized_end=2109, ) @@ -579,8 +578,8 @@ extension_ranges=[], oneofs=[ ], - serialized_start=1987, - serialized_end=2038, + serialized_start=1960, + serialized_end=2011, ) _L4MATCHATTRIBUTES = _descriptor.Descriptor( @@ -637,8 +636,8 @@ extension_ranges=[], oneofs=[ ], - serialized_start=2139, - serialized_end=2382, + serialized_start=2112, + serialized_end=2355, ) @@ -675,8 +674,8 @@ extension_ranges=[], oneofs=[ ], - serialized_start=1987, - serialized_end=2038, + serialized_start=1960, + serialized_end=2011, ) _TLSMATCHATTRIBUTES = _descriptor.Descriptor( @@ -740,8 +739,8 @@ extension_ranges=[], oneofs=[ ], - serialized_start=2385, - serialized_end=2649, + serialized_start=2358, + serialized_end=2622, ) @@ -778,8 +777,8 @@ extension_ranges=[], oneofs=[ ], - serialized_start=2651, - serialized_end=2697, + serialized_start=2624, + serialized_end=2670, ) @@ -816,8 +815,8 @@ extension_ranges=[], oneofs=[ ], - serialized_start=2699, - serialized_end=2744, + serialized_start=2672, + serialized_end=2717, ) @@ -864,8 +863,8 @@ name='match_type', full_name='istio.networking.v1alpha3.StringMatch.match_type', index=0, containing_type=None, fields=[]), ], - serialized_start=2746, - serialized_end=2825, + serialized_start=2719, + serialized_end=2798, ) @@ -902,8 +901,8 @@ extension_ranges=[], oneofs=[ ], - serialized_start=2827, - serialized_end=2908, + serialized_start=2800, + serialized_end=2881, ) @@ -968,8 +967,8 @@ extension_ranges=[], oneofs=[ ], - serialized_start=2911, - serialized_end=3114, + serialized_start=2884, + serialized_end=3087, ) @@ -1003,8 +1002,8 @@ options=None, file=DESCRIPTOR), _descriptor.FieldDescriptor( name='percentage', full_name='istio.networking.v1alpha3.HTTPFaultInjection.Delay.percentage', index=3, - number=5, type=11, cpp_type=10, label=1, - has_default_value=False, default_value=None, + number=5, type=1, cpp_type=5, label=1, + has_default_value=False, default_value=float(0), message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None, file=DESCRIPTOR), @@ -1023,8 +1022,8 @@ name='http_delay_type', full_name='istio.networking.v1alpha3.HTTPFaultInjection.Delay.http_delay_type', index=0, containing_type=None, fields=[]), ], - serialized_start=3276, - serialized_end=3477, + serialized_start=3249, + serialized_end=3422, ) _HTTPFAULTINJECTION_ABORT = _descriptor.Descriptor( @@ -1064,8 +1063,8 @@ options=None, file=DESCRIPTOR), _descriptor.FieldDescriptor( name='percentage', full_name='istio.networking.v1alpha3.HTTPFaultInjection.Abort.percentage', index=4, - number=5, type=11, cpp_type=10, label=1, - has_default_value=False, default_value=None, + number=5, type=1, cpp_type=5, label=1, + has_default_value=False, default_value=float(0), message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None, file=DESCRIPTOR), @@ -1084,8 +1083,8 @@ name='error_type', full_name='istio.networking.v1alpha3.HTTPFaultInjection.Abort.error_type', index=0, containing_type=None, fields=[]), ], - serialized_start=3480, - serialized_end=3639, + serialized_start=3425, + serialized_end=3556, ) _HTTPFAULTINJECTION = _descriptor.Descriptor( @@ -1121,8 +1120,8 @@ extension_ranges=[], oneofs=[ ], - serialized_start=3117, - serialized_end=3639, + serialized_start=3090, + serialized_end=3556, ) @@ -1162,8 +1161,8 @@ name='port', full_name='istio.networking.v1alpha3.PortSelector.port', index=0, containing_type=None, fields=[]), ], - serialized_start=3641, - serialized_end=3697, + serialized_start=3558, + serialized_end=3614, ) _VIRTUALSERVICE.fields_by_name['http'].message_type = _HTTPROUTE @@ -1213,7 +1212,6 @@ _CORSPOLICY.fields_by_name['allow_credentials'].message_type = google_dot_protobuf_dot_wrappers__pb2._BOOLVALUE _HTTPFAULTINJECTION_DELAY.fields_by_name['fixed_delay'].message_type = google_dot_protobuf_dot_duration__pb2._DURATION _HTTPFAULTINJECTION_DELAY.fields_by_name['exponential_delay'].message_type = google_dot_protobuf_dot_duration__pb2._DURATION -_HTTPFAULTINJECTION_DELAY.fields_by_name['percentage'].message_type = envoy_dot_types_dot_percent__pb2._PERCENT _HTTPFAULTINJECTION_DELAY.containing_type = _HTTPFAULTINJECTION _HTTPFAULTINJECTION_DELAY.oneofs_by_name['http_delay_type'].fields.append( _HTTPFAULTINJECTION_DELAY.fields_by_name['fixed_delay']) @@ -1221,7 +1219,6 @@ _HTTPFAULTINJECTION_DELAY.oneofs_by_name['http_delay_type'].fields.append( _HTTPFAULTINJECTION_DELAY.fields_by_name['exponential_delay']) _HTTPFAULTINJECTION_DELAY.fields_by_name['exponential_delay'].containing_oneof = _HTTPFAULTINJECTION_DELAY.oneofs_by_name['http_delay_type'] -_HTTPFAULTINJECTION_ABORT.fields_by_name['percentage'].message_type = envoy_dot_types_dot_percent__pb2._PERCENT _HTTPFAULTINJECTION_ABORT.containing_type = _HTTPFAULTINJECTION _HTTPFAULTINJECTION_ABORT.oneofs_by_name['error_type'].fields.append( _HTTPFAULTINJECTION_ABORT.fields_by_name['http_status'])