From 3b1ad2be97af053424f96814ab0c287241d1e9bd Mon Sep 17 00:00:00 2001 From: tarat44 <32471142+tarat44@users.noreply.github.com> Date: Tue, 5 Oct 2021 00:35:56 -0400 Subject: [PATCH] fix protos --- proto/pbservice/healthcheck.pb.go | 84 +++++++++---------------------- 1 file changed, 23 insertions(+), 61 deletions(-) diff --git a/proto/pbservice/healthcheck.pb.go b/proto/pbservice/healthcheck.pb.go index 34517c79ab..207088462f 100644 --- a/proto/pbservice/healthcheck.pb.go +++ b/proto/pbservice/healthcheck.pb.go @@ -27,7 +27,7 @@ var _ = time.Kitchen // 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.ProtoPackageIsVersion2 // please upgrade the proto package +const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package // HealthCheck represents a single check on a given node // @@ -1888,10 +1888,7 @@ func (m *HealthCheck) Unmarshal(dAtA []byte) error { if err != nil { return err } - if skippy < 0 { - return ErrInvalidLengthHealthcheck - } - if (iNdEx + skippy) < 0 { + if (skippy < 0) || (iNdEx+skippy) < 0 { return ErrInvalidLengthHealthcheck } if (iNdEx + skippy) > l { @@ -1973,10 +1970,7 @@ func (m *HeaderValue) Unmarshal(dAtA []byte) error { if err != nil { return err } - if skippy < 0 { - return ErrInvalidLengthHealthcheck - } - if (iNdEx + skippy) < 0 { + if (skippy < 0) || (iNdEx+skippy) < 0 { return ErrInvalidLengthHealthcheck } if (iNdEx + skippy) > l { @@ -2190,7 +2184,7 @@ func (m *HealthCheckDefinition) Unmarshal(dAtA []byte) error { if err != nil { return err } - if skippy < 0 { + if (skippy < 0) || (iNdEx+skippy) < 0 { return ErrInvalidLengthHealthcheck } if (iNdEx + skippy) > postIndex { @@ -2750,10 +2744,7 @@ func (m *HealthCheckDefinition) Unmarshal(dAtA []byte) error { if err != nil { return err } - if skippy < 0 { - return ErrInvalidLengthHealthcheck - } - if (iNdEx + skippy) < 0 { + if (skippy < 0) || (iNdEx+skippy) < 0 { return ErrInvalidLengthHealthcheck } if (iNdEx + skippy) > l { @@ -3503,7 +3494,7 @@ func (m *CheckType) Unmarshal(dAtA []byte) error { if err != nil { return err } - if skippy < 0 { + if (skippy < 0) || (iNdEx+skippy) < 0 { return ErrInvalidLengthHealthcheck } if (iNdEx + skippy) > postIndex { @@ -3776,10 +3767,7 @@ func (m *CheckType) Unmarshal(dAtA []byte) error { if err != nil { return err } - if skippy < 0 { - return ErrInvalidLengthHealthcheck - } - if (iNdEx + skippy) < 0 { + if (skippy < 0) || (iNdEx+skippy) < 0 { return ErrInvalidLengthHealthcheck } if (iNdEx + skippy) > l { @@ -3797,6 +3785,7 @@ func (m *CheckType) Unmarshal(dAtA []byte) error { func skipHealthcheck(dAtA []byte) (n int, err error) { l := len(dAtA) iNdEx := 0 + depth := 0 for iNdEx < l { var wire uint64 for shift := uint(0); ; shift += 7 { @@ -3828,10 +3817,8 @@ func skipHealthcheck(dAtA []byte) (n int, err error) { break } } - return iNdEx, nil case 1: iNdEx += 8 - return iNdEx, nil case 2: var length int for shift := uint(0); ; shift += 7 { @@ -3852,55 +3839,30 @@ func skipHealthcheck(dAtA []byte) (n int, err error) { return 0, ErrInvalidLengthHealthcheck } iNdEx += length - if iNdEx < 0 { - return 0, ErrInvalidLengthHealthcheck - } - return iNdEx, nil case 3: - for { - var innerWire uint64 - var start int = iNdEx - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return 0, ErrIntOverflowHealthcheck - } - 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 := skipHealthcheck(dAtA[start:]) - if err != nil { - return 0, err - } - iNdEx = start + next - if iNdEx < 0 { - return 0, ErrInvalidLengthHealthcheck - } - } - return iNdEx, nil + depth++ case 4: - return iNdEx, nil + if depth == 0 { + return 0, ErrUnexpectedEndOfGroupHealthcheck + } + depth-- case 5: iNdEx += 4 - return iNdEx, nil default: return 0, fmt.Errorf("proto: illegal wireType %d", wireType) } + if iNdEx < 0 { + return 0, ErrInvalidLengthHealthcheck + } + if depth == 0 { + return iNdEx, nil + } } - panic("unreachable") + return 0, io.ErrUnexpectedEOF } var ( - ErrInvalidLengthHealthcheck = fmt.Errorf("proto: negative length found during unmarshaling") - ErrIntOverflowHealthcheck = fmt.Errorf("proto: integer overflow") + ErrInvalidLengthHealthcheck = fmt.Errorf("proto: negative length found during unmarshaling") + ErrIntOverflowHealthcheck = fmt.Errorf("proto: integer overflow") + ErrUnexpectedEndOfGroupHealthcheck = fmt.Errorf("proto: unexpected end of group") )