From bbc6d07c38c5a06c0475fdb3f214193961b53651 Mon Sep 17 00:00:00 2001 From: Daniel Nephin Date: Tue, 6 Oct 2020 16:40:44 -0400 Subject: [PATCH] proto: add Namespace to EnterpriseMeta By adding Namespace to the OSS EnterpriseMeta we reduce the differences between OSS and Enterprise which simplifies the code quite a bit. --- proto/pbcommon/common.pb.binary.go | 10 + proto/pbcommon/common.pb.go | 245 +++++++++++++++++--- proto/pbcommon/common.proto | 7 + proto/pbcommon/common_oss.pb.binary.go | 20 -- proto/pbcommon/common_oss.pb.go | 303 ------------------------- proto/pbcommon/common_oss.proto | 11 - proto/pbconnect/connect.pb.go | 86 +++---- proto/pbconnect/connect.proto | 1 - proto/pbservice/healthcheck.pb.go | 125 +++++----- proto/pbservice/healthcheck.proto | 1 - proto/pbservice/node.pb.go | 96 ++++---- proto/pbservice/node.proto | 1 - proto/pbservice/service.pb.go | 132 +++++------ proto/pbservice/service.proto | 2 +- 14 files changed, 445 insertions(+), 595 deletions(-) delete mode 100644 proto/pbcommon/common_oss.pb.binary.go delete mode 100644 proto/pbcommon/common_oss.pb.go delete mode 100644 proto/pbcommon/common_oss.proto diff --git a/proto/pbcommon/common.pb.binary.go b/proto/pbcommon/common.pb.binary.go index bce5619caf..df36ec0ded 100644 --- a/proto/pbcommon/common.pb.binary.go +++ b/proto/pbcommon/common.pb.binary.go @@ -56,3 +56,13 @@ func (msg *QueryMeta) MarshalBinary() ([]byte, error) { func (msg *QueryMeta) UnmarshalBinary(b []byte) error { return proto.Unmarshal(b, msg) } + +// MarshalBinary implements encoding.BinaryMarshaler +func (msg *EnterpriseMeta) MarshalBinary() ([]byte, error) { + return proto.Marshal(msg) +} + +// UnmarshalBinary implements encoding.BinaryUnmarshaler +func (msg *EnterpriseMeta) UnmarshalBinary(b []byte) error { + return proto.Unmarshal(b, msg) +} diff --git a/proto/pbcommon/common.pb.go b/proto/pbcommon/common.pb.go index 1eed90447c..5eb9dab64c 100644 --- a/proto/pbcommon/common.pb.go +++ b/proto/pbcommon/common.pb.go @@ -393,54 +393,97 @@ func (m *QueryMeta) GetConsistencyLevel() string { return "" } +// EnterpriseMeta contains metadata that is only used by the Enterprise version +// of Consul. +type EnterpriseMeta struct { + // Namespace in which the entity exists. + Namespace string `protobuf:"bytes,1,opt,name=Namespace,proto3" json:"Namespace,omitempty"` +} + +func (m *EnterpriseMeta) Reset() { *m = EnterpriseMeta{} } +func (m *EnterpriseMeta) String() string { return proto.CompactTextString(m) } +func (*EnterpriseMeta) ProtoMessage() {} +func (*EnterpriseMeta) Descriptor() ([]byte, []int) { + return fileDescriptor_a6f5ac44994d718c, []int{5} +} +func (m *EnterpriseMeta) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *EnterpriseMeta) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_EnterpriseMeta.Marshal(b, m, deterministic) + } else { + b = b[:cap(b)] + n, err := m.MarshalToSizedBuffer(b) + if err != nil { + return nil, err + } + return b[:n], nil + } +} +func (m *EnterpriseMeta) XXX_Merge(src proto.Message) { + xxx_messageInfo_EnterpriseMeta.Merge(m, src) +} +func (m *EnterpriseMeta) XXX_Size() int { + return m.Size() +} +func (m *EnterpriseMeta) XXX_DiscardUnknown() { + xxx_messageInfo_EnterpriseMeta.DiscardUnknown(m) +} + +var xxx_messageInfo_EnterpriseMeta proto.InternalMessageInfo + func init() { proto.RegisterType((*RaftIndex)(nil), "common.RaftIndex") proto.RegisterType((*TargetDatacenter)(nil), "common.TargetDatacenter") proto.RegisterType((*WriteRequest)(nil), "common.WriteRequest") proto.RegisterType((*QueryOptions)(nil), "common.QueryOptions") proto.RegisterType((*QueryMeta)(nil), "common.QueryMeta") + proto.RegisterType((*EnterpriseMeta)(nil), "common.EnterpriseMeta") } func init() { proto.RegisterFile("proto/pbcommon/common.proto", fileDescriptor_a6f5ac44994d718c) } var fileDescriptor_a6f5ac44994d718c = []byte{ - // 569 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x54, 0x41, 0x8f, 0xd2, 0x40, - 0x18, 0x6d, 0x95, 0x45, 0xfa, 0xc1, 0x1a, 0x9c, 0x6c, 0x4c, 0xc5, 0xa4, 0x90, 0xc6, 0x18, 0x42, - 0x94, 0x26, 0xeb, 0x6d, 0x3d, 0x2d, 0xec, 0x6a, 0x36, 0xd2, 0x6c, 0xac, 0x18, 0x13, 0x6f, 0x43, - 0xf9, 0x28, 0x8d, 0xa5, 0x83, 0xd3, 0xe9, 0x2e, 0xfc, 0x03, 0x8f, 0x1e, 0x37, 0x9e, 0xfc, 0x21, - 0xfe, 0x00, 0x8e, 0x7b, 0xf4, 0xb4, 0x2a, 0xfc, 0x03, 0x7f, 0x81, 0xe9, 0x14, 0xd6, 0x22, 0x7b, - 0xc0, 0x53, 0xfb, 0x5e, 0xdf, 0x9b, 0x79, 0xf3, 0xcd, 0x4b, 0xe1, 0xe1, 0x98, 0x33, 0xc1, 0xac, - 0x71, 0xcf, 0x65, 0xa3, 0x11, 0x0b, 0xad, 0xf4, 0xd1, 0x94, 0x2c, 0xc9, 0xa7, 0xa8, 0x62, 0x78, - 0x8c, 0x79, 0x01, 0x5a, 0x92, 0xed, 0xc5, 0x03, 0xab, 0x1f, 0x73, 0x2a, 0xfc, 0x95, 0xae, 0xb2, - 0xe7, 0x31, 0x8f, 0xa5, 0x0b, 0x25, 0x6f, 0x29, 0x6b, 0x8e, 0x40, 0x73, 0xe8, 0x40, 0x9c, 0x84, - 0x7d, 0x9c, 0x10, 0x0b, 0x8a, 0x6d, 0x8e, 0x54, 0xa0, 0x84, 0xba, 0x5a, 0x53, 0xeb, 0xb9, 0xd6, - 0xee, 0xef, 0xab, 0xaa, 0xd6, 0xc3, 0xc9, 0x98, 0x1f, 0x98, 0x4f, 0x4d, 0x27, 0xab, 0x48, 0x0c, - 0x36, 0xeb, 0xfb, 0x83, 0x69, 0x6a, 0xb8, 0x75, 0xa3, 0x21, 0xa3, 0x30, 0xf7, 0xa1, 0xdc, 0xa5, - 0xdc, 0x43, 0x71, 0x44, 0x05, 0x75, 0x31, 0x14, 0xc8, 0x89, 0x01, 0xf0, 0x17, 0xc9, 0x4d, 0x35, - 0x27, 0xc3, 0x98, 0x0d, 0x28, 0xbd, 0xe3, 0xbe, 0x40, 0x07, 0x3f, 0xc6, 0x18, 0x09, 0xb2, 0x07, - 0x3b, 0x5d, 0xf6, 0x01, 0xc3, 0xa5, 0x34, 0x05, 0x07, 0xb9, 0x4f, 0x5f, 0xab, 0xaa, 0xf9, 0x25, - 0x07, 0xa5, 0xd7, 0x31, 0xf2, 0xe9, 0xe9, 0x38, 0x39, 0x7a, 0x74, 0xb3, 0x98, 0x3c, 0x82, 0x5d, - 0xdb, 0x0f, 0xa5, 0x30, 0x93, 0xdc, 0x59, 0x27, 0xc9, 0x4b, 0x28, 0xd9, 0x74, 0x22, 0x89, 0xae, - 0x3f, 0x42, 0xfd, 0x76, 0x4d, 0xad, 0x17, 0xf7, 0x1f, 0x34, 0xd3, 0x41, 0x37, 0x57, 0x83, 0x6e, - 0x1e, 0x2d, 0x07, 0xdd, 0x2a, 0xcc, 0xae, 0xaa, 0xca, 0xc5, 0x8f, 0xaa, 0xea, 0xac, 0x19, 0x93, - 0x13, 0x1e, 0x06, 0x01, 0x3b, 0x7f, 0x23, 0x68, 0x80, 0x7a, 0xae, 0xa6, 0xd6, 0x0b, 0x4e, 0x86, - 0x21, 0x4f, 0xe0, 0x5e, 0x72, 0x38, 0x9f, 0x63, 0x9b, 0x85, 0x91, 0x1f, 0x09, 0x0c, 0x85, 0xbe, - 0x23, 0x65, 0x9b, 0x1f, 0x48, 0x05, 0x0a, 0x6f, 0x23, 0x6c, 0x53, 0x77, 0x88, 0x7a, 0x5e, 0x8a, - 0xae, 0x31, 0x39, 0x85, 0xb2, 0x4d, 0x27, 0x72, 0xd5, 0x55, 0x2a, 0xfd, 0xce, 0xf6, 0xb1, 0x37, - 0xcc, 0xe4, 0x39, 0xe4, 0x6d, 0x3a, 0x39, 0xf4, 0x50, 0x2f, 0x6c, 0xbf, 0xcc, 0xd2, 0x42, 0x1e, - 0xc3, 0x5d, 0x3b, 0x8e, 0x84, 0x83, 0x67, 0x34, 0xf0, 0xfb, 0x54, 0xa0, 0xae, 0xc9, 0xbc, 0xff, - 0xb0, 0xc9, 0xa0, 0xe5, 0xae, 0x27, 0x83, 0x63, 0xce, 0x19, 0xd7, 0xe1, 0x3f, 0x06, 0x9d, 0x35, - 0x92, 0xfb, 0x90, 0x7f, 0xe1, 0x07, 0x49, 0x8d, 0x8a, 0xf2, 0xba, 0x97, 0x68, 0x59, 0x8e, 0x6f, - 0x2a, 0x68, 0xf2, 0x52, 0x6c, 0x14, 0x34, 0x69, 0x46, 0xa6, 0xe6, 0x4e, 0x0a, 0xc8, 0x31, 0x14, - 0x3b, 0x34, 0x12, 0x6d, 0x16, 0x0a, 0xea, 0x0a, 0xd9, 0x8b, 0x2d, 0x93, 0x64, 0x7d, 0xa4, 0x06, - 0xc5, 0x57, 0x21, 0x3b, 0x0f, 0x3b, 0x48, 0xfb, 0xc8, 0x65, 0x73, 0x0a, 0x4e, 0x96, 0x22, 0x0d, - 0x28, 0x5f, 0xdf, 0xa9, 0x3b, 0xed, 0xe0, 0x19, 0x06, 0xb2, 0x19, 0x9a, 0xb3, 0xc1, 0xa7, 0xf1, - 0x5b, 0x9d, 0xd9, 0x2f, 0x43, 0x99, 0xcd, 0x0d, 0xf5, 0x72, 0x6e, 0xa8, 0x3f, 0xe7, 0x86, 0xfa, - 0x79, 0x61, 0x28, 0x17, 0x0b, 0x43, 0xb9, 0x5c, 0x18, 0xca, 0xf7, 0x85, 0xa1, 0xbc, 0x6f, 0x78, - 0xbe, 0x18, 0xc6, 0xbd, 0xa6, 0xcb, 0x46, 0xd6, 0x90, 0x46, 0x43, 0xdf, 0x65, 0x7c, 0x6c, 0xb9, - 0x2c, 0x8c, 0xe2, 0xc0, 0x5a, 0xff, 0x87, 0xf4, 0xf2, 0x12, 0x3f, 0xfb, 0x13, 0x00, 0x00, 0xff, - 0xff, 0x33, 0x18, 0xfc, 0x09, 0x5c, 0x04, 0x00, 0x00, + // 594 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x54, 0xcf, 0x4e, 0xd4, 0x40, + 0x1c, 0x6e, 0x75, 0x59, 0xb7, 0xbf, 0x05, 0x82, 0x13, 0x62, 0x2a, 0x9a, 0xee, 0xa6, 0x31, 0x86, + 0x10, 0x6d, 0x13, 0xbc, 0xe1, 0x09, 0x16, 0x34, 0xc4, 0xad, 0xc4, 0x8a, 0x31, 0xf1, 0x36, 0xdb, + 0xfd, 0x6d, 0x77, 0x62, 0xdb, 0xa9, 0xd3, 0x29, 0x2c, 0x6f, 0xe0, 0xd1, 0x23, 0xf1, 0xe4, 0x83, + 0xf8, 0x00, 0x1c, 0x39, 0x7a, 0x42, 0x65, 0xdf, 0xc0, 0x27, 0x30, 0x9d, 0x16, 0x28, 0xc2, 0x01, + 0x4f, 0xbb, 0xdf, 0xd7, 0xef, 0x9b, 0xf9, 0xfd, 0xf9, 0x5a, 0x78, 0x90, 0x0a, 0x2e, 0xb9, 0x9b, + 0x0e, 0x02, 0x1e, 0xc7, 0x3c, 0x71, 0xcb, 0x1f, 0x47, 0xb1, 0xa4, 0x59, 0xa2, 0x25, 0x2b, 0xe4, + 0x3c, 0x8c, 0xd0, 0x55, 0xec, 0x20, 0x1f, 0xb9, 0xc3, 0x5c, 0x50, 0xc9, 0xce, 0x74, 0x4b, 0x8b, + 0x21, 0x0f, 0x79, 0x79, 0x50, 0xf1, 0xaf, 0x64, 0xed, 0x18, 0x0c, 0x9f, 0x8e, 0xe4, 0x76, 0x32, + 0xc4, 0x09, 0x71, 0xa1, 0xdd, 0x13, 0x48, 0x25, 0x2a, 0x68, 0xea, 0x5d, 0x7d, 0xb9, 0xb1, 0x31, + 0xf7, 0xe7, 0xa4, 0x63, 0x0c, 0x70, 0x92, 0x8a, 0x35, 0xfb, 0xa9, 0xed, 0xd7, 0x15, 0x85, 0xc1, + 0xe3, 0x43, 0x36, 0x3a, 0x28, 0x0d, 0xb7, 0xae, 0x35, 0xd4, 0x14, 0xf6, 0x2a, 0x2c, 0xec, 0x52, + 0x11, 0xa2, 0xdc, 0xa4, 0x92, 0x06, 0x98, 0x48, 0x14, 0xc4, 0x02, 0xb8, 0x40, 0xea, 0x52, 0xc3, + 0xaf, 0x31, 0xf6, 0x0a, 0xcc, 0xbe, 0x17, 0x4c, 0xa2, 0x8f, 0x9f, 0x72, 0xcc, 0x24, 0x59, 0x84, + 0x99, 0x5d, 0xfe, 0x11, 0x93, 0x4a, 0x5a, 0x82, 0xb5, 0xc6, 0xe7, 0x6f, 0x1d, 0xdd, 0xfe, 0xda, + 0x80, 0xd9, 0x37, 0x39, 0x8a, 0x83, 0x9d, 0xb4, 0x68, 0x3d, 0xbb, 0x5e, 0x4c, 0x1e, 0xc1, 0x9c, + 0xc7, 0x12, 0x25, 0xac, 0x55, 0xee, 0x5f, 0x26, 0xc9, 0x4b, 0x98, 0xf5, 0xe8, 0x44, 0x11, 0xbb, + 0x2c, 0x46, 0xf3, 0x76, 0x57, 0x5f, 0x6e, 0xaf, 0xde, 0x77, 0xca, 0x41, 0x3b, 0x67, 0x83, 0x76, + 0x36, 0xab, 0x41, 0x6f, 0xb4, 0x8e, 0x4e, 0x3a, 0xda, 0xe1, 0xcf, 0x8e, 0xee, 0x5f, 0x32, 0x16, + 0x1d, 0xae, 0x47, 0x11, 0xdf, 0x7f, 0x2b, 0x69, 0x84, 0x66, 0xa3, 0xab, 0x2f, 0xb7, 0xfc, 0x1a, + 0x43, 0x9e, 0xc0, 0xdd, 0xa2, 0x39, 0x26, 0xb0, 0xc7, 0x93, 0x8c, 0x65, 0x12, 0x13, 0x69, 0xce, + 0x28, 0xd9, 0xd5, 0x07, 0x64, 0x09, 0x5a, 0xef, 0x32, 0xec, 0xd1, 0x60, 0x8c, 0x66, 0x53, 0x89, + 0xce, 0x31, 0xd9, 0x81, 0x05, 0x8f, 0x4e, 0xd4, 0xa9, 0x67, 0x55, 0x99, 0x77, 0x6e, 0x5e, 0xf6, + 0x15, 0x33, 0x79, 0x0e, 0x4d, 0x8f, 0x4e, 0xd6, 0x43, 0x34, 0x5b, 0x37, 0x3f, 0xa6, 0xb2, 0x90, + 0xc7, 0x30, 0xef, 0xe5, 0x99, 0xf4, 0x71, 0x8f, 0x46, 0x6c, 0x48, 0x25, 0x9a, 0x86, 0xaa, 0xf7, + 0x1f, 0xb6, 0x18, 0xb4, 0xba, 0x75, 0x7b, 0xb4, 0x25, 0x04, 0x17, 0x26, 0xfc, 0xc7, 0xa0, 0xeb, + 0x46, 0x72, 0x0f, 0x9a, 0x2f, 0x58, 0x54, 0xc4, 0xa8, 0xad, 0xd6, 0x5d, 0xa1, 0x2a, 0x1c, 0xdf, + 0x75, 0x30, 0xd4, 0x52, 0x3c, 0x94, 0xb4, 0x48, 0x46, 0x2d, 0xe6, 0x7e, 0x09, 0xc8, 0x16, 0xb4, + 0xfb, 0x34, 0x93, 0x3d, 0x9e, 0x48, 0x1a, 0x48, 0x95, 0x8b, 0x1b, 0x56, 0x52, 0xf7, 0x91, 0x2e, + 0xb4, 0x5f, 0x25, 0x7c, 0x3f, 0xe9, 0x23, 0x1d, 0xa2, 0x50, 0xc9, 0x69, 0xf9, 0x75, 0x8a, 0xac, + 0xc0, 0xc2, 0xf9, 0x4e, 0x83, 0x83, 0x3e, 0xee, 0x61, 0xa4, 0x92, 0x61, 0xf8, 0x57, 0xf8, 0xaa, + 0x7c, 0x07, 0xe6, 0xb7, 0x8a, 0x17, 0x22, 0x15, 0x2c, 0x43, 0xd5, 0xc2, 0x43, 0x30, 0x5e, 0xd3, + 0x18, 0xb3, 0x94, 0x06, 0x58, 0x05, 0xfc, 0x82, 0xd8, 0xe8, 0x1f, 0xfd, 0xb6, 0xb4, 0xa3, 0x53, + 0x4b, 0x3f, 0x3e, 0xb5, 0xf4, 0x5f, 0xa7, 0x96, 0xfe, 0x65, 0x6a, 0x69, 0x87, 0x53, 0x4b, 0x3b, + 0x9e, 0x5a, 0xda, 0x8f, 0xa9, 0xa5, 0x7d, 0x58, 0x09, 0x99, 0x1c, 0xe7, 0x03, 0x27, 0xe0, 0xb1, + 0x3b, 0xa6, 0xd9, 0x98, 0x05, 0x5c, 0xa4, 0x6e, 0xc0, 0x93, 0x2c, 0x8f, 0xdc, 0xcb, 0xdf, 0x9c, + 0x41, 0x53, 0xe1, 0x67, 0x7f, 0x03, 0x00, 0x00, 0xff, 0xff, 0xee, 0xfb, 0xa8, 0x19, 0x8c, 0x04, + 0x00, 0x00, } func (m *RaftIndex) Marshal() (dAtA []byte, err error) { @@ -703,6 +746,36 @@ func (m *QueryMeta) MarshalToSizedBuffer(dAtA []byte) (int, error) { return len(dAtA) - i, nil } +func (m *EnterpriseMeta) Marshal() (dAtA []byte, err error) { + size := m.Size() + dAtA = make([]byte, size) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) + if err != nil { + return nil, err + } + return dAtA[:n], nil +} + +func (m *EnterpriseMeta) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *EnterpriseMeta) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + _ = i + var l int + _ = l + if len(m.Namespace) > 0 { + i -= len(m.Namespace) + copy(dAtA[i:], m.Namespace) + i = encodeVarintCommon(dAtA, i, uint64(len(m.Namespace))) + i-- + dAtA[i] = 0xa + } + return len(dAtA) - i, nil +} + func encodeVarintCommon(dAtA []byte, offset int, v uint64) int { offset -= sovCommon(v) base := offset @@ -816,6 +889,19 @@ func (m *QueryMeta) Size() (n int) { return n } +func (m *EnterpriseMeta) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + l = len(m.Namespace) + if l > 0 { + n += 1 + l + sovCommon(uint64(l)) + } + return n +} + func sovCommon(x uint64) (n int) { return (math_bits.Len64(x|1) + 6) / 7 } @@ -1588,6 +1674,91 @@ func (m *QueryMeta) Unmarshal(dAtA []byte) error { } return nil } +func (m *EnterpriseMeta) 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 ErrIntOverflowCommon + } + 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: EnterpriseMeta: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: EnterpriseMeta: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + case 1: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Namespace", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowCommon + } + 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 ErrInvalidLengthCommon + } + postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthCommon + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.Namespace = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex + default: + iNdEx = preIndex + skippy, err := skipCommon(dAtA[iNdEx:]) + if err != nil { + return err + } + if skippy < 0 { + return ErrInvalidLengthCommon + } + if (iNdEx + skippy) < 0 { + return ErrInvalidLengthCommon + } + if (iNdEx + skippy) > l { + return io.ErrUnexpectedEOF + } + iNdEx += skippy + } + } + + if iNdEx > l { + return io.ErrUnexpectedEOF + } + return nil +} func skipCommon(dAtA []byte) (n int, err error) { l := len(dAtA) iNdEx := 0 diff --git a/proto/pbcommon/common.proto b/proto/pbcommon/common.proto index 4b8dafce67..cd0694c832 100644 --- a/proto/pbcommon/common.proto +++ b/proto/pbcommon/common.proto @@ -133,3 +133,10 @@ message QueryMeta { // the request was served by a leader. string ConsistencyLevel = 4; } + +// EnterpriseMeta contains metadata that is only used by the Enterprise version +// of Consul. +message EnterpriseMeta { + // Namespace in which the entity exists. + string Namespace = 1; +} \ No newline at end of file diff --git a/proto/pbcommon/common_oss.pb.binary.go b/proto/pbcommon/common_oss.pb.binary.go deleted file mode 100644 index 649eefb043..0000000000 --- a/proto/pbcommon/common_oss.pb.binary.go +++ /dev/null @@ -1,20 +0,0 @@ -// +build !consulent - -// Code generated by protoc-gen-go-binary. DO NOT EDIT. -// source: proto/pbcommon/common_oss.proto - -package pbcommon - -import ( - "github.com/golang/protobuf/proto" -) - -// MarshalBinary implements encoding.BinaryMarshaler -func (msg *EnterpriseMeta) MarshalBinary() ([]byte, error) { - return proto.Marshal(msg) -} - -// UnmarshalBinary implements encoding.BinaryUnmarshaler -func (msg *EnterpriseMeta) UnmarshalBinary(b []byte) error { - return proto.Unmarshal(b, msg) -} diff --git a/proto/pbcommon/common_oss.pb.go b/proto/pbcommon/common_oss.pb.go deleted file mode 100644 index 3936dd25bc..0000000000 --- a/proto/pbcommon/common_oss.pb.go +++ /dev/null @@ -1,303 +0,0 @@ -// +build !consulent - -// Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: proto/pbcommon/common_oss.proto - -package pbcommon - -import ( - fmt "fmt" - proto "github.com/golang/protobuf/proto" - io "io" - math "math" - math_bits "math/bits" -) - -// 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.ProtoPackageIsVersion2 // please upgrade the proto package - -type EnterpriseMeta struct { - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` -} - -func (m *EnterpriseMeta) Reset() { *m = EnterpriseMeta{} } -func (m *EnterpriseMeta) String() string { return proto.CompactTextString(m) } -func (*EnterpriseMeta) ProtoMessage() {} -func (*EnterpriseMeta) Descriptor() ([]byte, []int) { - return fileDescriptor_8f9d7cd54dd4e173, []int{0} -} -func (m *EnterpriseMeta) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *EnterpriseMeta) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_EnterpriseMeta.Marshal(b, m, deterministic) - } else { - b = b[:cap(b)] - n, err := m.MarshalToSizedBuffer(b) - if err != nil { - return nil, err - } - return b[:n], nil - } -} -func (m *EnterpriseMeta) XXX_Merge(src proto.Message) { - xxx_messageInfo_EnterpriseMeta.Merge(m, src) -} -func (m *EnterpriseMeta) XXX_Size() int { - return m.Size() -} -func (m *EnterpriseMeta) XXX_DiscardUnknown() { - xxx_messageInfo_EnterpriseMeta.DiscardUnknown(m) -} - -var xxx_messageInfo_EnterpriseMeta proto.InternalMessageInfo - -func init() { - proto.RegisterType((*EnterpriseMeta)(nil), "common.EnterpriseMeta") -} - -func init() { proto.RegisterFile("proto/pbcommon/common_oss.proto", fileDescriptor_8f9d7cd54dd4e173) } - -var fileDescriptor_8f9d7cd54dd4e173 = []byte{ - // 127 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x92, 0x2f, 0x28, 0xca, 0x2f, - 0xc9, 0xd7, 0x2f, 0x48, 0x4a, 0xce, 0xcf, 0xcd, 0xcd, 0xcf, 0xd3, 0x87, 0x50, 0xf1, 0xf9, 0xc5, - 0xc5, 0x7a, 0x60, 0x19, 0x21, 0x36, 0x88, 0x88, 0x92, 0x00, 0x17, 0x9f, 0x6b, 0x5e, 0x49, 0x6a, - 0x51, 0x41, 0x51, 0x66, 0x71, 0xaa, 0x6f, 0x6a, 0x49, 0xa2, 0x93, 0xcd, 0x89, 0x47, 0x72, 0x8c, - 0x17, 0x1e, 0xc9, 0x31, 0x3e, 0x78, 0x24, 0xc7, 0x38, 0xe3, 0xb1, 0x1c, 0x43, 0x94, 0x56, 0x7a, - 0x66, 0x49, 0x46, 0x69, 0x92, 0x5e, 0x72, 0x7e, 0xae, 0x7e, 0x46, 0x62, 0x71, 0x46, 0x66, 0x72, - 0x7e, 0x51, 0x81, 0x7e, 0x72, 0x7e, 0x5e, 0x71, 0x69, 0x8e, 0x3e, 0xaa, 0x45, 0x49, 0x6c, 0x60, - 0xbe, 0x31, 0x20, 0x00, 0x00, 0xff, 0xff, 0x2f, 0x9b, 0x6f, 0x83, 0x81, 0x00, 0x00, 0x00, -} - -func (m *EnterpriseMeta) Marshal() (dAtA []byte, err error) { - size := m.Size() - dAtA = make([]byte, size) - n, err := m.MarshalToSizedBuffer(dAtA[:size]) - if err != nil { - return nil, err - } - return dAtA[:n], nil -} - -func (m *EnterpriseMeta) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *EnterpriseMeta) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - if m.XXX_unrecognized != nil { - i -= len(m.XXX_unrecognized) - copy(dAtA[i:], m.XXX_unrecognized) - } - return len(dAtA) - i, nil -} - -func encodeVarintCommonOss(dAtA []byte, offset int, v uint64) int { - offset -= sovCommonOss(v) - base := offset - for v >= 1<<7 { - dAtA[offset] = uint8(v&0x7f | 0x80) - v >>= 7 - offset++ - } - dAtA[offset] = uint8(v) - return base -} -func (m *EnterpriseMeta) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - if m.XXX_unrecognized != nil { - n += len(m.XXX_unrecognized) - } - return n -} - -func sovCommonOss(x uint64) (n int) { - return (math_bits.Len64(x|1) + 6) / 7 -} -func sozCommonOss(x uint64) (n int) { - return sovCommonOss(uint64((x << 1) ^ uint64((int64(x) >> 63)))) -} -func (m *EnterpriseMeta) 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 ErrIntOverflowCommonOss - } - 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: EnterpriseMeta: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: EnterpriseMeta: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - default: - iNdEx = preIndex - skippy, err := skipCommonOss(dAtA[iNdEx:]) - if err != nil { - return err - } - if skippy < 0 { - return ErrInvalidLengthCommonOss - } - if (iNdEx + skippy) < 0 { - return ErrInvalidLengthCommonOss - } - 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 skipCommonOss(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, ErrIntOverflowCommonOss - } - 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, ErrIntOverflowCommonOss - } - 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, ErrIntOverflowCommonOss - } - 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, ErrInvalidLengthCommonOss - } - iNdEx += length - if iNdEx < 0 { - return 0, ErrInvalidLengthCommonOss - } - return iNdEx, nil - case 3: - for { - var innerWire uint64 - var start int = iNdEx - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return 0, ErrIntOverflowCommonOss - } - 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 := skipCommonOss(dAtA[start:]) - if err != nil { - return 0, err - } - iNdEx = start + next - if iNdEx < 0 { - return 0, ErrInvalidLengthCommonOss - } - } - 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 ( - ErrInvalidLengthCommonOss = fmt.Errorf("proto: negative length found during unmarshaling") - ErrIntOverflowCommonOss = fmt.Errorf("proto: integer overflow") -) diff --git a/proto/pbcommon/common_oss.proto b/proto/pbcommon/common_oss.proto deleted file mode 100644 index a3a87199ad..0000000000 --- a/proto/pbcommon/common_oss.proto +++ /dev/null @@ -1,11 +0,0 @@ -// +build !consulent - -syntax = "proto3"; - -package common; - -option go_package = "github.com/hashicorp/consul/proto/pbcommon"; - -message EnterpriseMeta { - // no fields in oss -} \ No newline at end of file diff --git a/proto/pbconnect/connect.pb.go b/proto/pbconnect/connect.pb.go index 849c17664f..74bc71fea3 100644 --- a/proto/pbconnect/connect.pb.go +++ b/proto/pbconnect/connect.pb.go @@ -474,49 +474,49 @@ func init() { func init() { proto.RegisterFile("proto/pbconnect/connect.proto", fileDescriptor_80627e709958eb04) } var fileDescriptor_80627e709958eb04 = []byte{ - // 667 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x54, 0xdf, 0x6a, 0x13, 0x4f, - 0x14, 0xfe, 0x6d, 0xf3, 0x77, 0x4f, 0xda, 0xf4, 0xd7, 0xf9, 0xfd, 0x28, 0x43, 0xc4, 0x74, 0x09, - 0x2a, 0x01, 0x25, 0x2b, 0x15, 0x44, 0x44, 0x0b, 0x69, 0xd3, 0x8b, 0x50, 0x1a, 0xeb, 0xb4, 0x7a, - 0xe1, 0x8d, 0x6c, 0x92, 0x93, 0x74, 0x20, 0xbb, 0x13, 0x66, 0x67, 0x4b, 0xf3, 0x26, 0xbe, 0x81, - 0x8f, 0xa2, 0x97, 0x3e, 0x82, 0xd4, 0xe7, 0x10, 0x64, 0x66, 0x77, 0x93, 0xdd, 0x58, 0xc8, 0x55, - 0xe6, 0x7c, 0xdf, 0x37, 0xb3, 0xe7, 0xcc, 0xf7, 0x65, 0xe0, 0xe1, 0x5c, 0x0a, 0x25, 0xdc, 0xf9, - 0x70, 0x24, 0x82, 0x00, 0x47, 0xca, 0x4d, 0x7e, 0x3b, 0x06, 0x27, 0x95, 0xa4, 0x6c, 0x1c, 0x4c, - 0x85, 0x98, 0xce, 0xd0, 0x35, 0xf0, 0x30, 0x9a, 0xb8, 0x8a, 0xfb, 0x18, 0x2a, 0xcf, 0x9f, 0xc7, - 0xca, 0xc6, 0x83, 0xd5, 0x41, 0xbe, 0x2f, 0x02, 0x37, 0xfe, 0x49, 0xc8, 0x83, 0x7b, 0xc9, 0xcf, - 0x22, 0x0c, 0x63, 0x41, 0xeb, 0xab, 0x05, 0x95, 0x93, 0x2e, 0x13, 0x42, 0x85, 0xa4, 0x05, 0xdb, - 0xdd, 0x91, 0xe2, 0x37, 0xa8, 0xcb, 0x7e, 0x8f, 0x5a, 0x8e, 0xd5, 0xb6, 0x59, 0x0e, 0x23, 0x0e, - 0xd4, 0xae, 0x64, 0x14, 0xaa, 0x9e, 0xf0, 0x3d, 0x1e, 0xd0, 0x2d, 0x23, 0xc9, 0x42, 0xe4, 0x31, - 0x94, 0xcc, 0x71, 0xb4, 0xe0, 0x14, 0xda, 0xb5, 0xc3, 0xdd, 0x4e, 0x3a, 0x58, 0xfc, 0x19, 0x16, - 0xb3, 0xc4, 0x05, 0xfb, 0x7d, 0x84, 0x72, 0x71, 0x8e, 0xca, 0xa3, 0x45, 0xc7, 0x6a, 0xd7, 0x0e, - 0xf7, 0x3a, 0x49, 0xef, 0x4b, 0x82, 0xad, 0x34, 0xad, 0xdf, 0x45, 0x28, 0xc7, 0x47, 0x90, 0x3a, - 0x6c, 0x2d, 0xdb, 0xdb, 0xea, 0xf7, 0x08, 0x81, 0xe2, 0xc0, 0xf3, 0x31, 0xe9, 0xc6, 0xac, 0xf5, - 0x30, 0x97, 0x28, 0xb9, 0x37, 0x1b, 0x44, 0xfe, 0x10, 0x25, 0x2d, 0x38, 0x56, 0xbb, 0xc8, 0x72, - 0x98, 0xd1, 0xf0, 0x69, 0xc0, 0x83, 0xe9, 0x19, 0x2e, 0xfa, 0x3d, 0xd3, 0x86, 0xcd, 0x72, 0x18, - 0x79, 0x0e, 0xff, 0x9d, 0xde, 0x2a, 0x94, 0x81, 0x37, 0xcb, 0x0e, 0x5e, 0x32, 0xd2, 0xfb, 0x28, - 0xf2, 0x0a, 0xec, 0x81, 0x50, 0xc7, 0x38, 0x11, 0x12, 0x69, 0xd9, 0x4c, 0xd6, 0xe8, 0xc4, 0x2e, - 0x76, 0x52, 0x17, 0x3b, 0x57, 0xa9, 0x8b, 0x6c, 0x25, 0x26, 0x2f, 0xa1, 0x3a, 0x10, 0xaa, 0x3b, - 0x51, 0x28, 0x69, 0x65, 0xe3, 0xc6, 0xa5, 0x96, 0x34, 0xa0, 0xaa, 0xef, 0xe5, 0x04, 0xa5, 0xa2, - 0x55, 0xd3, 0xd8, 0xb2, 0x26, 0xcf, 0x60, 0xaf, 0x1f, 0x28, 0x94, 0x3e, 0x8e, 0xb9, 0xa7, 0x50, - 0x63, 0x21, 0xb5, 0x9d, 0x42, 0xdb, 0x66, 0x7f, 0x13, 0xda, 0xde, 0x64, 0x7a, 0x73, 0x18, 0xc4, - 0xf6, 0x66, 0x20, 0xd2, 0x04, 0x58, 0xdd, 0x0f, 0xad, 0x19, 0x41, 0x06, 0x21, 0xfb, 0x50, 0x8e, - 0x03, 0x43, 0xb7, 0x1d, 0xab, 0x5d, 0x65, 0x49, 0x45, 0x8e, 0x60, 0x9b, 0x09, 0xe5, 0x29, 0x1c, - 0xbf, 0x8b, 0x54, 0x57, 0xd1, 0x9d, 0x8d, 0xf3, 0xe5, 0xf4, 0xe4, 0x09, 0xd4, 0x2f, 0x24, 0xbf, - 0xf1, 0x14, 0x9e, 0xe1, 0xe2, 0x6a, 0x31, 0x47, 0x5a, 0x37, 0xdf, 0x5e, 0x43, 0xf3, 0xba, 0x63, - 0xae, 0x42, 0xba, 0xeb, 0x58, 0xed, 0x12, 0x5b, 0x43, 0x75, 0xfe, 0x98, 0x37, 0x51, 0xfd, 0x60, - 0x8c, 0xb7, 0xf4, 0xdf, 0x7c, 0xfe, 0x96, 0x04, 0x5b, 0x69, 0x5a, 0xdf, 0x0a, 0x00, 0xfd, 0x30, - 0x8c, 0x70, 0x6c, 0xee, 0x61, 0x3d, 0x5f, 0xc9, 0x9f, 0x25, 0x97, 0x2f, 0x0a, 0x15, 0xad, 0xbd, - 0x38, 0x3d, 0x4f, 0xa2, 0x99, 0x96, 0xe4, 0x11, 0xec, 0xac, 0xfa, 0xd1, 0x7c, 0xc1, 0xf0, 0x79, - 0x50, 0xef, 0xbf, 0x44, 0x79, 0xc3, 0x47, 0x98, 0x44, 0x33, 0x2d, 0x8d, 0x0b, 0xf1, 0xf2, 0x03, - 0xeb, 0x27, 0x61, 0xcc, 0x20, 0xe4, 0x7f, 0x28, 0x75, 0xa7, 0x18, 0x28, 0x93, 0x3f, 0x9b, 0xc5, - 0x85, 0xce, 0x89, 0x59, 0xe8, 0x3d, 0x95, 0x38, 0x27, 0x69, 0x4d, 0x5e, 0x03, 0x7c, 0xf4, 0x66, - 0x7c, 0x1c, 0xa7, 0xaf, 0xba, 0xd1, 0x9d, 0x8c, 0x9a, 0xbc, 0x81, 0x9a, 0xa9, 0x92, 0xcc, 0xdb, - 0x1b, 0x37, 0x67, 0xe5, 0xe4, 0x08, 0xea, 0xa7, 0x3a, 0x88, 0x73, 0xc9, 0x43, 0x34, 0xcf, 0x01, - 0x98, 0x03, 0xf6, 0x53, 0x3b, 0xf2, 0x2c, 0x5b, 0x53, 0xe7, 0x9d, 0xac, 0x6d, 0x76, 0xf2, 0xf8, - 0xed, 0xf7, 0xbb, 0xa6, 0xf5, 0xe3, 0xae, 0x69, 0xfd, 0xbc, 0x6b, 0x5a, 0x5f, 0x7e, 0x35, 0xff, - 0xf9, 0xf4, 0x74, 0xca, 0xd5, 0x75, 0x34, 0xd4, 0xbb, 0xdc, 0x6b, 0x2f, 0xbc, 0xe6, 0x23, 0x21, - 0xe7, 0xfa, 0x45, 0x0e, 0xa3, 0x99, 0xbb, 0xf6, 0x50, 0x0f, 0xcb, 0x06, 0x78, 0xf1, 0x27, 0x00, - 0x00, 0xff, 0xff, 0xcf, 0xc8, 0x31, 0xb3, 0xc2, 0x05, 0x00, 0x00, + // 659 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x54, 0xdd, 0x6a, 0xdb, 0x4a, + 0x10, 0x3e, 0x8a, 0x7f, 0x35, 0x4e, 0x9c, 0x93, 0x3d, 0x87, 0xb0, 0xf8, 0x70, 0x5c, 0x61, 0xda, + 0x62, 0x68, 0xb1, 0x4a, 0x0a, 0xa5, 0x94, 0x36, 0xe0, 0xc4, 0xb9, 0x10, 0x21, 0x6e, 0xba, 0x49, + 0x7b, 0xd1, 0x3b, 0xd9, 0x1e, 0x3b, 0x0b, 0x96, 0xd6, 0xac, 0x56, 0x21, 0x7e, 0x93, 0xbe, 0x41, + 0x1f, 0xa5, 0xbd, 0xec, 0x23, 0x94, 0xf4, 0x39, 0x0a, 0x65, 0x57, 0x92, 0x2d, 0xb9, 0x05, 0x5f, + 0x79, 0xe7, 0x9b, 0x6f, 0x46, 0x33, 0xfb, 0x7d, 0x5e, 0xf8, 0x7f, 0x21, 0x85, 0x12, 0xee, 0x62, + 0x34, 0x16, 0x61, 0x88, 0x63, 0xe5, 0xa6, 0xbf, 0x3d, 0x83, 0x93, 0x5a, 0x1a, 0xb6, 0x1e, 0xcc, + 0x84, 0x98, 0xcd, 0xd1, 0x35, 0xf0, 0x28, 0x9e, 0xba, 0x8a, 0x07, 0x18, 0x29, 0x3f, 0x58, 0x24, + 0xcc, 0xd6, 0x7f, 0xeb, 0x46, 0x41, 0x20, 0x42, 0x37, 0xf9, 0x49, 0x92, 0x9d, 0xcf, 0x16, 0xd4, + 0x4e, 0xfb, 0x4c, 0x08, 0x15, 0x91, 0x0e, 0xec, 0xf6, 0xc7, 0x8a, 0xdf, 0xa2, 0x0e, 0xbd, 0x01, + 0xb5, 0x1c, 0xab, 0x6b, 0xb3, 0x02, 0x46, 0x1c, 0x68, 0x5c, 0xcb, 0x38, 0x52, 0x03, 0x11, 0xf8, + 0x3c, 0xa4, 0x3b, 0x86, 0x92, 0x87, 0xc8, 0x23, 0xa8, 0x98, 0x76, 0xb4, 0xe4, 0x94, 0xba, 0x8d, + 0xa3, 0xfd, 0x5e, 0x36, 0x77, 0xf2, 0x19, 0x96, 0x64, 0x89, 0x0b, 0xf6, 0xbb, 0x18, 0xe5, 0xf2, + 0x02, 0x95, 0x4f, 0xcb, 0x8e, 0xd5, 0x6d, 0x1c, 0x1d, 0xf4, 0xd2, 0xd1, 0x56, 0x09, 0xb6, 0xe6, + 0x74, 0x7e, 0x96, 0xa1, 0x9a, 0xb4, 0x20, 0x4d, 0xd8, 0x59, 0x8d, 0xb7, 0xe3, 0x0d, 0x08, 0x81, + 0xf2, 0xd0, 0x0f, 0x30, 0x9d, 0xc6, 0x9c, 0xf5, 0x32, 0x57, 0x28, 0xb9, 0x3f, 0x1f, 0xc6, 0xc1, + 0x08, 0x25, 0x2d, 0x39, 0x56, 0xb7, 0xcc, 0x0a, 0x98, 0xe1, 0xf0, 0x59, 0xc8, 0xc3, 0xd9, 0x39, + 0x2e, 0xbd, 0x81, 0x19, 0xc3, 0x66, 0x05, 0x8c, 0x3c, 0x83, 0x7f, 0xce, 0xee, 0x14, 0xca, 0xd0, + 0x9f, 0xe7, 0x17, 0xaf, 0x18, 0xea, 0x9f, 0x52, 0xe4, 0x25, 0xd8, 0x43, 0xa1, 0x4e, 0x70, 0x2a, + 0x24, 0xd2, 0xaa, 0xd9, 0xac, 0xd5, 0x4b, 0x44, 0xea, 0x65, 0x22, 0xf5, 0xae, 0x33, 0x91, 0xd8, + 0x9a, 0x4c, 0x5e, 0x40, 0x7d, 0x28, 0x54, 0x7f, 0xaa, 0x50, 0xd2, 0xda, 0xd6, 0xc2, 0x15, 0x97, + 0xb4, 0xa0, 0xae, 0xef, 0xe5, 0x14, 0xa5, 0xa2, 0x75, 0x33, 0xd8, 0x2a, 0x26, 0x4f, 0xe1, 0xc0, + 0x0b, 0x15, 0xca, 0x00, 0x27, 0xdc, 0x57, 0xa8, 0xb1, 0x88, 0xda, 0x4e, 0xa9, 0x6b, 0xb3, 0xdf, + 0x13, 0x5a, 0xde, 0x74, 0x7b, 0xd3, 0x0c, 0x12, 0x79, 0x73, 0x10, 0x69, 0x03, 0xac, 0xef, 0x87, + 0x36, 0x0c, 0x21, 0x87, 0x90, 0x43, 0xa8, 0x26, 0x86, 0xa1, 0xbb, 0x8e, 0xd5, 0xad, 0xb3, 0x34, + 0x22, 0xc7, 0xb0, 0xcb, 0x84, 0xf2, 0x15, 0x4e, 0xde, 0xc6, 0xaa, 0xaf, 0xe8, 0xde, 0xd6, 0xfd, + 0x0a, 0x7c, 0xf2, 0x18, 0x9a, 0x97, 0x92, 0xdf, 0xfa, 0x0a, 0xcf, 0x71, 0x79, 0xbd, 0x5c, 0x20, + 0x6d, 0x9a, 0x6f, 0x6f, 0xa0, 0x45, 0xde, 0x09, 0x57, 0x11, 0xdd, 0x77, 0xac, 0x6e, 0x85, 0x6d, + 0xa0, 0xda, 0x7f, 0xcc, 0x9f, 0x2a, 0x2f, 0x9c, 0xe0, 0x1d, 0xfd, 0xbb, 0xe8, 0xbf, 0x55, 0x82, + 0xad, 0x39, 0x9d, 0x2f, 0x25, 0x00, 0x2f, 0x8a, 0x62, 0x9c, 0x98, 0x7b, 0xd8, 0xf4, 0x57, 0xfa, + 0x67, 0x29, 0xf8, 0x8b, 0x42, 0x4d, 0x73, 0x2f, 0xcf, 0x2e, 0x52, 0x6b, 0x66, 0x21, 0x79, 0x08, + 0x7b, 0xeb, 0x79, 0x74, 0xbe, 0x64, 0xf2, 0x45, 0x50, 0xd7, 0x5f, 0xa1, 0xbc, 0xe5, 0x63, 0x4c, + 0xad, 0x99, 0x85, 0x46, 0x85, 0xe4, 0xf8, 0x9e, 0x79, 0xa9, 0x19, 0x73, 0x08, 0xf9, 0x17, 0x2a, + 0xfd, 0x19, 0x86, 0xca, 0xf8, 0xcf, 0x66, 0x49, 0xa0, 0x7d, 0x62, 0x0e, 0xba, 0xa6, 0x96, 0xf8, + 0x24, 0x8b, 0xc9, 0x2b, 0x80, 0x0f, 0xfe, 0x9c, 0x4f, 0x12, 0xf7, 0xd5, 0xb7, 0xaa, 0x93, 0x63, + 0x93, 0xd7, 0xd0, 0x30, 0x51, 0xea, 0x79, 0x7b, 0x6b, 0x71, 0x9e, 0x4e, 0x8e, 0xa1, 0x79, 0xa6, + 0x8d, 0xb8, 0x90, 0x3c, 0x42, 0xf3, 0x1c, 0x80, 0x69, 0x70, 0x98, 0xc9, 0x51, 0xcc, 0xb2, 0x0d, + 0x76, 0x51, 0xc9, 0xc6, 0x76, 0x25, 0x4f, 0xde, 0x7c, 0xbd, 0x6f, 0x5b, 0xdf, 0xee, 0xdb, 0xd6, + 0xf7, 0xfb, 0xb6, 0xf5, 0xe9, 0x47, 0xfb, 0xaf, 0x8f, 0x4f, 0x66, 0x5c, 0xdd, 0xc4, 0x23, 0x5d, + 0xe5, 0xde, 0xf8, 0xd1, 0x0d, 0x1f, 0x0b, 0xb9, 0xd0, 0x0f, 0x6e, 0x14, 0xcf, 0xdd, 0x8d, 0x77, + 0x78, 0x54, 0x35, 0xc0, 0xf3, 0x5f, 0x01, 0x00, 0x00, 0xff, 0xff, 0xa9, 0x98, 0x92, 0x5c, 0xa1, + 0x05, 0x00, 0x00, } func (m *CARoots) Marshal() (dAtA []byte, err error) { diff --git a/proto/pbconnect/connect.proto b/proto/pbconnect/connect.proto index 897cfec8fa..0b2d10b46a 100644 --- a/proto/pbconnect/connect.proto +++ b/proto/pbconnect/connect.proto @@ -6,7 +6,6 @@ option go_package = "github.com/hashicorp/consul/proto/pbconnect"; import "google/protobuf/timestamp.proto"; import "proto/pbcommon/common.proto"; -import "proto/pbcommon/common_oss.proto"; // CARoots is the list of all currently trusted CA Roots. message CARoots { diff --git a/proto/pbservice/healthcheck.pb.go b/proto/pbservice/healthcheck.pb.go index 676d8c2b9e..9fa10e4d47 100644 --- a/proto/pbservice/healthcheck.pb.go +++ b/proto/pbservice/healthcheck.pb.go @@ -281,71 +281,70 @@ func init() { func init() { proto.RegisterFile("proto/pbservice/healthcheck.proto", fileDescriptor_8a6f7448747c9fbe) } var fileDescriptor_8a6f7448747c9fbe = []byte{ - // 1009 bytes of a gzipped FileDescriptorProto + // 999 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x56, 0x4d, 0x6f, 0xe3, 0x44, - 0x18, 0x8e, 0x9b, 0x36, 0x8d, 0x27, 0x6d, 0xb7, 0x1d, 0xba, 0x65, 0xb6, 0x20, 0x27, 0x04, 0x0e, + 0x18, 0x8e, 0x9b, 0x8f, 0xc6, 0x93, 0x6d, 0xb7, 0x1d, 0xba, 0x65, 0xb6, 0x20, 0x37, 0x04, 0x0e, 0x41, 0x14, 0x47, 0x2a, 0x02, 0x01, 0x12, 0xa0, 0x26, 0xd9, 0x8f, 0xa0, 0x76, 0x09, 0x8e, 0xd9, - 0x03, 0x17, 0xe4, 0x3a, 0x93, 0xc4, 0x8a, 0xe3, 0x89, 0xc6, 0xe3, 0xaa, 0xe1, 0xca, 0x1f, 0xe0, - 0xb8, 0x3f, 0xa9, 0xc7, 0x8a, 0x13, 0xa7, 0x02, 0xed, 0x99, 0x3f, 0xc0, 0x09, 0xcd, 0x3b, 0x76, - 0xea, 0x6c, 0xbc, 0xa4, 0xac, 0x76, 0x4f, 0x7e, 0xe7, 0xfd, 0x98, 0x8f, 0xf7, 0x7d, 0x9e, 0x27, - 0x41, 0xef, 0x4d, 0x38, 0x13, 0xac, 0x3e, 0x39, 0x0d, 0x29, 0x3f, 0xf3, 0x5c, 0x5a, 0x1f, 0x52, - 0xc7, 0x17, 0x43, 0x77, 0x48, 0xdd, 0x91, 0x09, 0x31, 0xac, 0xcf, 0x82, 0xfb, 0xc6, 0x80, 0xb1, - 0x81, 0x4f, 0xeb, 0x10, 0x38, 0x8d, 0xfa, 0xf5, 0x5e, 0xc4, 0x1d, 0xe1, 0xb1, 0x40, 0xa5, 0xee, - 0xbf, 0x93, 0xec, 0xe6, 0xb2, 0xf1, 0x98, 0x05, 0x75, 0xf5, 0x89, 0x83, 0xe5, 0xcc, 0xe0, 0x4f, - 0x2c, 0x0c, 0xe3, 0x84, 0xdd, 0x01, 0x1b, 0x30, 0x95, 0x24, 0x2d, 0xe5, 0xad, 0xfe, 0xb2, 0x8a, - 0x4a, 0x4f, 0xe0, 0x52, 0x4d, 0x79, 0x29, 0x8c, 0xd1, 0xea, 0x53, 0xd6, 0xa3, 0x44, 0xab, 0x68, - 0x35, 0xdd, 0x02, 0x1b, 0x3f, 0x46, 0xeb, 0x10, 0x6c, 0xb7, 0xc8, 0x8a, 0x74, 0x37, 0x3e, 0xfe, - 0xe7, 0xaa, 0xfc, 0xe1, 0xc0, 0x13, 0xc3, 0xe8, 0xd4, 0x74, 0xd9, 0xb8, 0x3e, 0x74, 0xc2, 0xa1, - 0xe7, 0x32, 0x3e, 0xa9, 0xbb, 0x2c, 0x08, 0x23, 0xbf, 0x2e, 0xa6, 0x13, 0x1a, 0x9a, 0x71, 0x91, - 0x95, 0x54, 0xc3, 0xe6, 0xce, 0x98, 0x92, 0x7c, 0xbc, 0xb9, 0x33, 0xa6, 0x78, 0x0f, 0x15, 0xba, - 0xc2, 0x11, 0x51, 0x48, 0x56, 0xc1, 0x1b, 0xaf, 0xf0, 0x2e, 0x5a, 0x7b, 0xca, 0x04, 0x0d, 0xc9, - 0x1a, 0xb8, 0xd5, 0x42, 0x66, 0x7f, 0x17, 0x89, 0x49, 0x24, 0x48, 0x41, 0x65, 0xab, 0x15, 0x7e, - 0x17, 0xe9, 0x5d, 0xd5, 0xc5, 0x76, 0x8b, 0xac, 0x43, 0xe8, 0xd6, 0x81, 0x2b, 0xa8, 0x14, 0x2f, - 0xe0, 0xf8, 0x22, 0xc4, 0xd3, 0xae, 0x54, 0x86, 0xed, 0x0c, 0x42, 0xa2, 0x57, 0xf2, 0xa9, 0x0c, - 0xe9, 0x92, 0x77, 0xb7, 0xa7, 0x13, 0x4a, 0x36, 0xd4, 0xdd, 0xa5, 0x8d, 0x1f, 0x21, 0xd4, 0xa2, - 0x7d, 0x2f, 0xf0, 0xe4, 0x90, 0x08, 0xaa, 0x68, 0xb5, 0xd2, 0x61, 0xc5, 0x9c, 0x0d, 0xd4, 0x4c, - 0x35, 0xf6, 0x36, 0xaf, 0xb1, 0x7a, 0x71, 0x55, 0xce, 0x59, 0xa9, 0x4a, 0xfc, 0x05, 0xd2, 0x2d, - 0xa7, 0x2f, 0xda, 0x41, 0x8f, 0x9e, 0x93, 0x12, 0x6c, 0xb3, 0x63, 0xc6, 0xd3, 0x9d, 0x05, 0x1a, - 0x45, 0x59, 0x77, 0x79, 0x55, 0xd6, 0xac, 0xdb, 0x6c, 0xdc, 0x42, 0x5b, 0x0f, 0x03, 0x41, 0xf9, - 0x84, 0x7b, 0x21, 0x3d, 0xa1, 0xc2, 0x21, 0x9b, 0x50, 0xbf, 0x97, 0xd4, 0xcf, 0x47, 0xe3, 0xc3, - 0x5f, 0xa8, 0xa9, 0xbe, 0x0f, 0x20, 0xe8, 0x51, 0xfe, 0xcc, 0xf1, 0x23, 0x2a, 0x7b, 0x0f, 0x06, - 0xd1, 0xa0, 0x0f, 0x6a, 0x51, 0xfd, 0xad, 0x80, 0xee, 0x67, 0xbe, 0x48, 0xf6, 0xe6, 0x89, 0x6d, - 0x77, 0x12, 0xd0, 0x48, 0x1b, 0x7f, 0x80, 0x36, 0xed, 0xe3, 0x6e, 0x77, 0xe4, 0x4d, 0x9e, 0x51, - 0xee, 0xf5, 0xa7, 0x00, 0x9d, 0xa2, 0x35, 0xef, 0xc4, 0xdf, 0xa2, 0x82, 0x3a, 0x98, 0xe4, 0x2b, - 0xf9, 0x5a, 0xe9, 0xf0, 0x60, 0x59, 0xf7, 0x4c, 0x95, 0xfe, 0x30, 0x10, 0x7c, 0x1a, 0x3f, 0x26, - 0xde, 0x41, 0x62, 0xe3, 0x84, 0x8a, 0x21, 0xeb, 0x25, 0x48, 0x52, 0x2b, 0x79, 0xbb, 0x06, 0xeb, - 0x4d, 0x09, 0x56, 0xb7, 0x93, 0x36, 0xde, 0x46, 0x79, 0xbb, 0xd9, 0x89, 0xb1, 0x25, 0x4d, 0xfc, - 0x0d, 0x2a, 0xb6, 0x65, 0x53, 0xce, 0x1c, 0x1f, 0xb0, 0x55, 0x3a, 0x7c, 0x60, 0x2a, 0x3e, 0x9a, - 0x09, 0x1f, 0xcd, 0x56, 0xcc, 0x47, 0x35, 0x8a, 0xe7, 0x7f, 0x94, 0x35, 0x6b, 0x56, 0x24, 0x1f, - 0xac, 0xc0, 0x78, 0xe2, 0x9c, 0x77, 0xbd, 0x9f, 0x29, 0xd1, 0x2b, 0x5a, 0x6d, 0xd3, 0x9a, 0x77, - 0xe2, 0xaf, 0xd0, 0xba, 0xed, 0x8d, 0x29, 0x8b, 0x04, 0xc0, 0xf4, 0x8e, 0xa7, 0x24, 0x35, 0x78, - 0x84, 0x8c, 0x16, 0xe5, 0x74, 0xe0, 0x85, 0x82, 0xf2, 0x26, 0xf7, 0x84, 0xe7, 0x3a, 0x7e, 0x0c, - 0xd3, 0xa3, 0xbe, 0xa0, 0x1c, 0xc0, 0x7d, 0xc7, 0x5d, 0x97, 0x6c, 0x85, 0x0d, 0x84, 0xba, 0x2e, - 0xf7, 0x26, 0xe2, 0x88, 0x0f, 0x42, 0x82, 0x00, 0x0b, 0x29, 0x0f, 0x3e, 0x40, 0x3b, 0x2d, 0xe6, - 0x8e, 0x28, 0x6f, 0xb2, 0x40, 0x38, 0x5e, 0x40, 0x79, 0xbb, 0x05, 0xf0, 0xd5, 0xad, 0xc5, 0x80, - 0x04, 0x55, 0x77, 0x48, 0x7d, 0x3f, 0x66, 0x90, 0x5a, 0xc8, 0xe1, 0x3c, 0xb6, 0x3a, 0x4d, 0x40, - 0xad, 0x6e, 0x81, 0x2d, 0xcf, 0x95, 0xdf, 0x1f, 0x42, 0x6a, 0x1f, 0x77, 0xc9, 0x16, 0xe0, 0x26, - 0xe5, 0x91, 0x64, 0x3f, 0xf2, 0x3d, 0x27, 0x04, 0xa1, 0xba, 0xa7, 0xc8, 0x3e, 0x73, 0xe0, 0x2a, - 0xda, 0x80, 0x45, 0xfc, 0x14, 0xb2, 0x0d, 0x09, 0x73, 0x3e, 0xfc, 0x29, 0xca, 0xdb, 0xf6, 0x31, - 0xd9, 0xb9, 0x7b, 0xaf, 0x64, 0xfe, 0xfe, 0xf7, 0x09, 0x4d, 0x00, 0x7e, 0x12, 0x44, 0x23, 0x3a, - 0x8d, 0x51, 0x2f, 0x4d, 0x7c, 0x80, 0xd6, 0xce, 0x80, 0x38, 0x2b, 0x31, 0x09, 0xe7, 0xd0, 0x9c, - 0xf0, 0xcb, 0x52, 0x49, 0x5f, 0xae, 0x7c, 0xae, 0x55, 0xff, 0x2e, 0x22, 0x1d, 0x20, 0x0e, 0x82, - 0x92, 0x52, 0x5a, 0xed, 0xb5, 0x28, 0xed, 0x4a, 0xa6, 0xd2, 0xe6, 0xb3, 0x95, 0x76, 0x35, 0xad, - 0xb4, 0xf3, 0xc3, 0x5f, 0x5b, 0x18, 0x7e, 0xc2, 0xf9, 0x42, 0x8a, 0xf3, 0x5f, 0xcf, 0xd8, 0xbc, - 0x0b, 0x6c, 0x4e, 0x6b, 0xe1, 0xec, 0x91, 0x77, 0x62, 0xf0, 0x7a, 0x26, 0x83, 0xf7, 0x17, 0x19, - 0x5c, 0xcc, 0x66, 0xb0, 0xfe, 0x2a, 0x0c, 0x9e, 0xc3, 0x15, 0x5a, 0x86, 0xab, 0x52, 0x06, 0xae, - 0x32, 0x19, 0xb1, 0xb1, 0x94, 0x11, 0x9b, 0x59, 0x8c, 0xd8, 0x7a, 0x29, 0x23, 0xee, 0x2d, 0x30, - 0x62, 0x41, 0x6c, 0xb7, 0xb3, 0xc4, 0x36, 0xa5, 0x3d, 0x3b, 0xaf, 0xa0, 0x3d, 0x31, 0x69, 0xf0, - 0xff, 0x23, 0x0d, 0x3e, 0x44, 0xbb, 0xdd, 0xc8, 0x75, 0x69, 0x18, 0x36, 0x68, 0x9f, 0x71, 0xda, - 0x71, 0xc2, 0xd0, 0x0b, 0x06, 0xe4, 0x7e, 0x45, 0xab, 0xad, 0x59, 0x99, 0x31, 0xfc, 0x19, 0xda, - 0x7b, 0xe4, 0x78, 0x7e, 0xc4, 0x69, 0x1c, 0x48, 0xf4, 0x89, 0xec, 0x41, 0xd5, 0x4b, 0xa2, 0x72, - 0x82, 0x1d, 0xce, 0xce, 0xa7, 0x80, 0xcc, 0xb7, 0xd5, 0x04, 0x67, 0x8e, 0x59, 0x14, 0xda, 0x4b, - 0x52, 0x51, 0xe8, 0xf1, 0x72, 0x69, 0x7d, 0xeb, 0xf5, 0x49, 0xeb, 0xc2, 0x8f, 0xc5, 0x03, 0x78, - 0xd7, 0xbc, 0xf3, 0x0d, 0xe8, 0x4d, 0xe3, 0xe4, 0xe2, 0x2f, 0x23, 0x77, 0x71, 0x6d, 0x68, 0x97, - 0xd7, 0x86, 0xf6, 0xe7, 0xb5, 0xa1, 0xfd, 0x7a, 0x63, 0xe4, 0x9e, 0xdf, 0x18, 0xb9, 0xcb, 0x1b, - 0x23, 0xf7, 0xfb, 0x8d, 0x91, 0xfb, 0xf1, 0xa3, 0xff, 0x92, 0x9b, 0x17, 0xfe, 0xcf, 0x9e, 0x16, - 0xc0, 0xf1, 0xc9, 0xbf, 0x01, 0x00, 0x00, 0xff, 0xff, 0x40, 0x1f, 0x5b, 0xd8, 0xe9, 0x0a, 0x00, - 0x00, + 0x03, 0x37, 0xd7, 0x99, 0x24, 0x56, 0x1c, 0x4f, 0x34, 0x1e, 0x57, 0x0d, 0x57, 0xfe, 0x00, 0xc7, + 0xfd, 0x49, 0x3d, 0x56, 0x9c, 0x38, 0x15, 0x68, 0xcf, 0xfc, 0x01, 0x4e, 0x68, 0xde, 0xb1, 0x53, + 0x67, 0xe3, 0x25, 0x65, 0xb5, 0x9c, 0xf2, 0x7e, 0xce, 0x78, 0xde, 0xf7, 0x79, 0x9e, 0x16, 0xbd, + 0x37, 0xe5, 0x4c, 0xb0, 0xc6, 0xf4, 0x34, 0xa4, 0xfc, 0xcc, 0x73, 0x69, 0x63, 0x44, 0x1d, 0x5f, + 0x8c, 0xdc, 0x11, 0x75, 0xc7, 0x26, 0xe4, 0xb0, 0x3e, 0x4f, 0xee, 0x19, 0x43, 0xc6, 0x86, 0x3e, + 0x6d, 0x40, 0xe2, 0x34, 0x1a, 0x34, 0xfa, 0x11, 0x77, 0x84, 0xc7, 0x02, 0x55, 0xba, 0xf7, 0x4e, + 0x72, 0x9a, 0xcb, 0x26, 0x13, 0x16, 0x34, 0xd4, 0x4f, 0x9c, 0xdc, 0x19, 0xb2, 0x21, 0x53, 0x05, + 0xd2, 0x52, 0xd1, 0xda, 0xcf, 0x05, 0x54, 0x79, 0x0a, 0x77, 0xb6, 0xe4, 0x9d, 0x18, 0xa3, 0xc2, + 0x33, 0xd6, 0xa7, 0x44, 0xab, 0x6a, 0x75, 0xdd, 0x02, 0x1b, 0x3f, 0x41, 0xeb, 0x90, 0xec, 0xb4, + 0xc9, 0x9a, 0x0c, 0x37, 0x3f, 0xfe, 0xfb, 0x6a, 0xff, 0xc3, 0xa1, 0x27, 0x46, 0xd1, 0xa9, 0xe9, + 0xb2, 0x49, 0x63, 0xe4, 0x84, 0x23, 0xcf, 0x65, 0x7c, 0xda, 0x70, 0x59, 0x10, 0x46, 0x7e, 0x43, + 0xcc, 0xa6, 0x34, 0x34, 0xe3, 0x26, 0x2b, 0xe9, 0x86, 0xc3, 0x9d, 0x09, 0x25, 0xf9, 0xf8, 0x70, + 0x67, 0x42, 0xf1, 0x2e, 0x2a, 0xf5, 0x84, 0x23, 0xa2, 0x90, 0x14, 0x20, 0x1a, 0x7b, 0x78, 0x07, + 0x15, 0x9f, 0x31, 0x41, 0x43, 0x52, 0x84, 0xb0, 0x72, 0x64, 0xf5, 0x77, 0x91, 0x98, 0x46, 0x82, + 0x94, 0x54, 0xb5, 0xf2, 0xf0, 0xbb, 0x48, 0xef, 0xa9, 0x21, 0x75, 0xda, 0x64, 0x1d, 0x52, 0xb7, + 0x01, 0x5c, 0x45, 0x95, 0xd8, 0x81, 0xeb, 0xcb, 0x90, 0x4f, 0x87, 0x52, 0x15, 0xb6, 0x33, 0x0c, + 0x89, 0x5e, 0xcd, 0xa7, 0x2a, 0x64, 0x48, 0x7e, 0xbb, 0x3d, 0x9b, 0x52, 0x72, 0x4f, 0x7d, 0xbb, + 0xb4, 0xf1, 0x63, 0x84, 0xda, 0x74, 0xe0, 0x05, 0x9e, 0xdc, 0x01, 0x41, 0x55, 0xad, 0x5e, 0x39, + 0xac, 0x9a, 0xf3, 0x7d, 0x99, 0xa9, 0xc1, 0xde, 0xd6, 0x35, 0x0b, 0x17, 0x57, 0xfb, 0x39, 0x2b, + 0xd5, 0x89, 0xbf, 0x40, 0xba, 0xe5, 0x0c, 0x44, 0x27, 0xe8, 0xd3, 0x73, 0x52, 0x81, 0x63, 0xb6, + 0xcd, 0x78, 0x79, 0xf3, 0x44, 0xb3, 0x2c, 0xfb, 0x2e, 0xaf, 0xf6, 0x35, 0xeb, 0xb6, 0x1a, 0xb7, + 0xd1, 0xe6, 0xa3, 0x40, 0x50, 0x3e, 0xe5, 0x5e, 0x48, 0x4f, 0xa8, 0x70, 0xc8, 0x06, 0xf4, 0xef, + 0x26, 0xfd, 0x8b, 0xd9, 0xf8, 0xf2, 0x97, 0x7a, 0x6a, 0xef, 0x03, 0x08, 0xfa, 0x94, 0x3f, 0x77, + 0xfc, 0x88, 0xca, 0xd9, 0x83, 0x41, 0x34, 0x98, 0x83, 0x72, 0x6a, 0xbf, 0x96, 0xd0, 0x83, 0xcc, + 0x17, 0xc9, 0xd9, 0x3c, 0xb5, 0xed, 0x6e, 0x02, 0x1a, 0x69, 0xe3, 0x0f, 0xd0, 0x86, 0x7d, 0xdc, + 0xeb, 0x8d, 0xbd, 0xe9, 0x73, 0xca, 0xbd, 0xc1, 0x0c, 0xa0, 0x53, 0xb6, 0x16, 0x83, 0xf8, 0x5b, + 0x54, 0x52, 0x17, 0x93, 0x7c, 0x35, 0x5f, 0xaf, 0x1c, 0x1e, 0xac, 0x9a, 0x9e, 0xa9, 0xca, 0x1f, + 0x05, 0x82, 0xcf, 0xe2, 0xc7, 0xc4, 0x27, 0x48, 0x6c, 0x9c, 0x50, 0x31, 0x62, 0xfd, 0x04, 0x49, + 0xca, 0x93, 0x5f, 0xd7, 0x64, 0xfd, 0x19, 0xc1, 0xea, 0xeb, 0xa4, 0x8d, 0xb7, 0x50, 0xde, 0x6e, + 0x75, 0x63, 0x6c, 0x49, 0x13, 0x7f, 0x83, 0xca, 0x1d, 0x39, 0x94, 0x33, 0xc7, 0x07, 0x6c, 0x55, + 0x0e, 0x1f, 0x9a, 0x8a, 0x6e, 0x66, 0x42, 0x37, 0xb3, 0x1d, 0xd3, 0x4d, 0xad, 0xe2, 0xc5, 0xef, + 0xfb, 0x9a, 0x35, 0x6f, 0x92, 0x0f, 0x56, 0x60, 0x3c, 0x71, 0xce, 0x7b, 0xde, 0x4f, 0x94, 0xe8, + 0x55, 0xad, 0xbe, 0x61, 0x2d, 0x06, 0xf1, 0x57, 0x68, 0xdd, 0xf6, 0x26, 0x94, 0x45, 0x02, 0x60, + 0x7a, 0xc7, 0x5b, 0x92, 0x1e, 0x3c, 0x46, 0x46, 0x9b, 0x72, 0x3a, 0xf4, 0x42, 0x41, 0x79, 0x8b, + 0x7b, 0xc2, 0x73, 0x1d, 0x3f, 0x86, 0xe9, 0xd1, 0x40, 0x50, 0x0e, 0xe0, 0xbe, 0xe3, 0xa9, 0x2b, + 0x8e, 0xc2, 0x06, 0x42, 0x3d, 0x97, 0x7b, 0x53, 0x71, 0xc4, 0x87, 0x21, 0x41, 0x80, 0x85, 0x54, + 0x04, 0x1f, 0xa0, 0xed, 0x36, 0x73, 0xc7, 0x94, 0xb7, 0x58, 0x20, 0x1c, 0x2f, 0xa0, 0xbc, 0xd3, + 0x06, 0xf8, 0xea, 0xd6, 0x72, 0x42, 0x82, 0xaa, 0x37, 0xa2, 0xbe, 0x1f, 0x33, 0x48, 0x39, 0x72, + 0x39, 0x4f, 0xac, 0x6e, 0x0b, 0x50, 0xab, 0x5b, 0x60, 0xcb, 0x7b, 0xe5, 0xef, 0x0f, 0x21, 0xb5, + 0x8f, 0x7b, 0x64, 0x13, 0x70, 0x93, 0x8a, 0x48, 0xb2, 0x1f, 0xf9, 0x9e, 0x13, 0x82, 0x50, 0xdd, + 0x57, 0x64, 0x9f, 0x07, 0x70, 0x0d, 0xdd, 0x03, 0x27, 0x7e, 0x0a, 0xd9, 0x82, 0x82, 0x85, 0x18, + 0xfe, 0x14, 0xe5, 0x6d, 0xfb, 0x98, 0x6c, 0xdf, 0x7d, 0x56, 0xb2, 0x7e, 0xef, 0xfb, 0x84, 0x26, + 0x00, 0x3f, 0x09, 0xa2, 0x31, 0x9d, 0xc5, 0xa8, 0x97, 0x26, 0x3e, 0x40, 0xc5, 0x33, 0x20, 0xce, + 0x5a, 0x4c, 0xc2, 0x05, 0x34, 0x27, 0xfc, 0xb2, 0x54, 0xd1, 0x97, 0x6b, 0x9f, 0x6b, 0xb5, 0xbf, + 0xca, 0x48, 0x07, 0x88, 0x83, 0xa0, 0xa4, 0x94, 0x56, 0x7b, 0x23, 0x4a, 0xbb, 0x96, 0xa9, 0xb4, + 0xf9, 0x6c, 0xa5, 0x2d, 0xa4, 0x95, 0x76, 0x71, 0xf9, 0xc5, 0xa5, 0xe5, 0x27, 0x9c, 0x2f, 0xa5, + 0x38, 0xff, 0xf5, 0x9c, 0xcd, 0x3b, 0xc0, 0xe6, 0xb4, 0x16, 0xce, 0x1f, 0x79, 0x27, 0x06, 0xaf, + 0x67, 0x32, 0x78, 0x6f, 0x99, 0xc1, 0xe5, 0x6c, 0x06, 0xeb, 0xaf, 0xc3, 0xe0, 0x05, 0x5c, 0xa1, + 0x55, 0xb8, 0xaa, 0x64, 0xe0, 0x2a, 0x93, 0x11, 0xf7, 0x56, 0x32, 0x62, 0x23, 0x8b, 0x11, 0x9b, + 0xaf, 0x64, 0xc4, 0xfd, 0x25, 0x46, 0x2c, 0x89, 0xed, 0x56, 0x96, 0xd8, 0xa6, 0xb4, 0x67, 0xfb, + 0x35, 0xb4, 0x27, 0x26, 0x0d, 0xfe, 0x6f, 0xa4, 0xc1, 0x87, 0x68, 0xa7, 0x17, 0xb9, 0x2e, 0x0d, + 0xc3, 0x26, 0x1d, 0x30, 0x4e, 0xbb, 0x4e, 0x18, 0x7a, 0xc1, 0x90, 0x3c, 0xa8, 0x6a, 0xf5, 0xa2, + 0x95, 0x99, 0xc3, 0x9f, 0xa1, 0xdd, 0xc7, 0x8e, 0xe7, 0x47, 0x9c, 0xc6, 0x89, 0x44, 0x9f, 0xc8, + 0x2e, 0x74, 0xbd, 0x22, 0x2b, 0x37, 0xd8, 0xe5, 0xec, 0x7c, 0x06, 0xc8, 0x7c, 0x5b, 0x6d, 0x70, + 0x1e, 0x98, 0x67, 0x61, 0xbc, 0x24, 0x95, 0x85, 0x19, 0xaf, 0x96, 0xd6, 0xb7, 0xde, 0x9c, 0xb4, + 0x2e, 0xfd, 0xb1, 0x78, 0x08, 0xef, 0x5a, 0x0c, 0xfe, 0x0f, 0x7a, 0xd3, 0x3c, 0xb9, 0xf8, 0xd3, + 0xc8, 0x5d, 0x5c, 0x1b, 0xda, 0xe5, 0xb5, 0xa1, 0xfd, 0x71, 0x6d, 0x68, 0xbf, 0xdc, 0x18, 0xb9, + 0x17, 0x37, 0x46, 0xee, 0xf2, 0xc6, 0xc8, 0xfd, 0x76, 0x63, 0xe4, 0x7e, 0xfc, 0xe8, 0xdf, 0xe4, + 0xe6, 0xa5, 0x7f, 0x57, 0x4f, 0x4b, 0x10, 0xf8, 0xe4, 0x9f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x3e, + 0x9a, 0xda, 0xd9, 0xc8, 0x0a, 0x00, 0x00, } func (m *HealthCheck) Marshal() (dAtA []byte, err error) { diff --git a/proto/pbservice/healthcheck.proto b/proto/pbservice/healthcheck.proto index 7a14b31c8f..be0e88d679 100644 --- a/proto/pbservice/healthcheck.proto +++ b/proto/pbservice/healthcheck.proto @@ -6,7 +6,6 @@ option go_package = "github.com/hashicorp/consul/proto/pbservice"; import "google/protobuf/duration.proto"; import "proto/pbcommon/common.proto"; -import "proto/pbcommon/common_oss.proto"; // This fake import path is replaced by the build script with a versioned path import "gogoproto/gogo.proto"; diff --git a/proto/pbservice/node.pb.go b/proto/pbservice/node.pb.go index 4f8df95608..6201233f18 100644 --- a/proto/pbservice/node.pb.go +++ b/proto/pbservice/node.pb.go @@ -226,54 +226,54 @@ func init() { func init() { proto.RegisterFile("proto/pbservice/node.proto", fileDescriptor_bbc215b78fa95fe5) } var fileDescriptor_bbc215b78fa95fe5 = []byte{ - // 746 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x55, 0x5d, 0x6f, 0xd3, 0x30, - 0x14, 0x6d, 0xda, 0x74, 0x5d, 0x3d, 0xd8, 0x87, 0x35, 0x21, 0x53, 0xb4, 0xb4, 0x0c, 0x1e, 0x26, - 0x6d, 0x24, 0x88, 0x0f, 0x41, 0x11, 0x42, 0x5a, 0xd7, 0x49, 0x54, 0xb0, 0x31, 0x65, 0x93, 0x90, - 0x40, 0x08, 0xb9, 0x89, 0x97, 0x46, 0xeb, 0xe2, 0xca, 0x76, 0xa7, 0xf5, 0x0f, 0xf0, 0xcc, 0x23, - 0xfc, 0xa3, 0xf1, 0xb6, 0x47, 0x9e, 0x2a, 0x58, 0xff, 0xc5, 0x9e, 0x90, 0x1d, 0xb7, 0x4b, 0xb3, - 0x32, 0x31, 0x89, 0x27, 0x3b, 0xf7, 0x9c, 0x7b, 0x7c, 0xed, 0x7b, 0x6e, 0x0b, 0x4a, 0x1d, 0x46, - 0x05, 0x75, 0x3a, 0x4d, 0x4e, 0xd8, 0x51, 0xe8, 0x11, 0x27, 0xa2, 0x3e, 0xb1, 0x55, 0x10, 0x16, - 0x47, 0xd1, 0xd2, 0x9d, 0x21, 0xcd, 0xa3, 0x87, 0x87, 0x34, 0x72, 0xe2, 0x25, 0xe6, 0x95, 0xca, - 0x13, 0xc1, 0xcf, 0x94, 0x73, 0x4d, 0xb8, 0x9b, 0x3e, 0xa4, 0x45, 0x70, 0x5b, 0xb4, 0xbc, 0x16, - 0xf1, 0x0e, 0x34, 0x65, 0x29, 0x4d, 0xd1, 0xab, 0x86, 0x17, 0x03, 0x1a, 0xd0, 0x98, 0x22, 0x77, - 0x71, 0x74, 0xf9, 0xbb, 0x01, 0xe6, 0x37, 0xa4, 0xc8, 0x6e, 0x4c, 0xde, 0xa6, 0x3e, 0x81, 0xf7, - 0x80, 0x29, 0x57, 0x64, 0x54, 0x8c, 0x95, 0x99, 0x47, 0x73, 0xf6, 0x48, 0xd2, 0x96, 0x61, 0x57, - 0x81, 0xf0, 0x21, 0x28, 0xe8, 0x1c, 0x94, 0x55, 0xbc, 0x5b, 0x29, 0x9e, 0x46, 0xdd, 0x21, 0x0d, - 0xda, 0x60, 0x4a, 0x1d, 0xc5, 0x51, 0xae, 0x92, 0x4b, 0x25, 0xbc, 0x56, 0xd7, 0x51, 0xb0, 0xab, - 0x59, 0xcb, 0x3f, 0x72, 0x71, 0x1d, 0xf0, 0x25, 0xc8, 0x36, 0xea, 0xaa, 0x9a, 0x62, 0x6d, 0xed, - 0xbc, 0x5f, 0x5e, 0x09, 0x42, 0xd1, 0xea, 0x36, 0x6d, 0x8f, 0x1e, 0x3a, 0x2d, 0xcc, 0x5b, 0xa1, - 0x47, 0x59, 0xc7, 0xf1, 0x68, 0xc4, 0xbb, 0x6d, 0x47, 0xf4, 0x3a, 0x84, 0xab, 0x02, 0x1a, 0x75, - 0x37, 0xdb, 0xa8, 0x43, 0xa8, 0x6f, 0x23, 0xab, 0x2c, 0xea, 0xe2, 0x11, 0x28, 0xac, 0xfb, 0x3e, - 0x23, 0x5c, 0xd6, 0x22, 0xc3, 0xc3, 0x4f, 0x68, 0x01, 0x50, 0xc7, 0x02, 0x7b, 0x24, 0x12, 0x84, - 0x21, 0x53, 0x81, 0x89, 0x08, 0xdc, 0x06, 0x73, 0x7b, 0x38, 0x08, 0x88, 0xaf, 0x13, 0x08, 0x47, - 0x79, 0x75, 0x9b, 0xfb, 0xa9, 0xeb, 0xdb, 0x29, 0xda, 0x66, 0x24, 0x58, 0xcf, 0x4d, 0x27, 0xc3, - 0x07, 0xc0, 0xdc, 0x22, 0x02, 0xa3, 0x29, 0x25, 0x72, 0x3b, 0x2d, 0x22, 0xb1, 0x38, 0x53, 0xd1, - 0x60, 0x15, 0x14, 0x5d, 0xbc, 0x2f, 0x1a, 0x91, 0x4f, 0x8e, 0x51, 0x41, 0xbd, 0xfb, 0x82, 0xad, - 0xad, 0x34, 0x02, 0x6a, 0xd3, 0x27, 0xfd, 0x72, 0xe6, 0xb4, 0x5f, 0x36, 0xdc, 0x0b, 0x76, 0xa9, - 0x06, 0x16, 0x27, 0x95, 0x04, 0xe7, 0x41, 0xee, 0x80, 0xf4, 0xe2, 0xe7, 0x75, 0xe5, 0x16, 0x2e, - 0x82, 0xfc, 0x11, 0x6e, 0x77, 0x87, 0x4f, 0x16, 0x7f, 0xbc, 0xc8, 0x3e, 0x37, 0x4a, 0xcf, 0x40, - 0x71, 0x54, 0xd1, 0x75, 0x12, 0x97, 0xbf, 0x14, 0xc0, 0x4c, 0xc2, 0x14, 0x70, 0x0b, 0x98, 0x6f, - 0xc2, 0xc8, 0xd7, 0x4d, 0xad, 0x9e, 0xf7, 0xcb, 0x4f, 0xaf, 0x6a, 0x2a, 0x0e, 0x48, 0x24, 0x1c, - 0x2e, 0x58, 0xd7, 0x13, 0xdc, 0xd6, 0x22, 0x52, 0xc0, 0x55, 0x32, 0x70, 0x56, 0x39, 0x24, 0x3e, - 0x55, 0xf6, 0x1c, 0x5d, 0x98, 0x53, 0xf7, 0x77, 0x78, 0x30, 0x04, 0xe6, 0x1e, 0x0e, 0x38, 0x32, - 0x2b, 0x39, 0xe9, 0x06, 0xb9, 0x4f, 0xba, 0x21, 0x3f, 0xee, 0x86, 0x8f, 0x97, 0xbb, 0x3d, 0xa7, - 0x1a, 0xb5, 0x3a, 0xd9, 0xec, 0x13, 0x9b, 0x5e, 0x33, 0x65, 0x3b, 0x2e, 0xb7, 0xfe, 0xc9, 0x58, - 0xeb, 0x2b, 0x7f, 0x51, 0x4c, 0x3b, 0x00, 0x02, 0x73, 0x87, 0x32, 0xa1, 0x9a, 0x9f, 0x77, 0xd5, - 0x1e, 0xae, 0x81, 0xc2, 0x7b, 0x12, 0x06, 0x2d, 0xc1, 0xd1, 0xb4, 0xf2, 0x04, 0x4c, 0x88, 0x69, - 0xc4, 0x1d, 0x52, 0xe0, 0x1a, 0x58, 0xd8, 0x8c, 0x70, 0xb3, 0x4d, 0xf6, 0x70, 0xf0, 0xee, 0x88, - 0x30, 0x16, 0xfa, 0x04, 0x15, 0x2b, 0xc6, 0xca, 0xb4, 0x7b, 0x19, 0x80, 0x55, 0x90, 0xdf, 0x61, - 0xf4, 0xb8, 0x87, 0x66, 0x94, 0xf2, 0x52, 0x42, 0x79, 0x83, 0x46, 0x11, 0xf1, 0x84, 0x82, 0x37, - 0x68, 0xb4, 0x1f, 0x06, 0xfa, 0xaa, 0x71, 0x06, 0xac, 0x82, 0x82, 0xa6, 0xa0, 0x1b, 0x2a, 0x39, - 0x69, 0x6f, 0x7d, 0x3f, 0x4d, 0xd0, 0x89, 0x43, 0x3e, 0x7c, 0x05, 0x4a, 0x6f, 0xa9, 0x87, 0xdb, - 0xed, 0x9e, 0x4b, 0x82, 0x90, 0x0b, 0xc2, 0x88, 0xbf, 0xce, 0x77, 0x43, 0x9f, 0x78, 0x98, 0xa1, - 0x9b, 0xaa, 0xd8, 0x2b, 0x18, 0xb0, 0x0e, 0x66, 0x37, 0xe5, 0xbc, 0x76, 0x58, 0xc8, 0x89, 0x7a, - 0xe5, 0x79, 0xfd, 0x23, 0xa5, 0x87, 0x65, 0x1c, 0xd5, 0xc7, 0xa7, 0x72, 0xc6, 0xa7, 0x6d, 0xf6, - 0x5a, 0xd3, 0xf6, 0xe9, 0x9f, 0xa7, 0xcd, 0x49, 0x0e, 0xcd, 0xc4, 0x37, 0xd2, 0x12, 0xff, 0x63, - 0x10, 0x6b, 0x5b, 0x27, 0xbf, 0xad, 0xcc, 0xc9, 0x99, 0x65, 0x9c, 0x9e, 0x59, 0xc6, 0xaf, 0x33, - 0xcb, 0xf8, 0x3a, 0xb0, 0x32, 0xdf, 0x06, 0x56, 0xe6, 0x74, 0x60, 0x65, 0x7e, 0x0e, 0xac, 0xcc, - 0x87, 0xd5, 0xab, 0x06, 0x31, 0xf5, 0x1f, 0xd3, 0x9c, 0x52, 0x81, 0xc7, 0x7f, 0x02, 0x00, 0x00, - 0xff, 0xff, 0x1c, 0x8f, 0xa3, 0x91, 0x05, 0x07, 0x00, 0x00, + // 741 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x55, 0x4d, 0x4f, 0x1b, 0x3b, + 0x14, 0xcd, 0x24, 0x13, 0x42, 0xcc, 0x7b, 0x7c, 0x58, 0xe8, 0xc9, 0x2f, 0x4f, 0x4c, 0xf2, 0x68, + 0x17, 0x48, 0xd0, 0x99, 0xaa, 0x1f, 0x6a, 0x53, 0x55, 0x95, 0x08, 0x41, 0x6a, 0xd4, 0x42, 0xd1, + 0x80, 0x54, 0xa9, 0x55, 0x17, 0xce, 0x8c, 0x99, 0x8c, 0x08, 0xe3, 0xc8, 0x76, 0x10, 0xf9, 0x03, + 0x5d, 0x77, 0xd9, 0xfe, 0x23, 0xba, 0x63, 0xd9, 0x55, 0xd4, 0x92, 0x7f, 0xc1, 0xaa, 0xb2, 0xc7, + 0x13, 0x26, 0x43, 0x8a, 0x8a, 0xd4, 0x95, 0x3d, 0xf7, 0x9e, 0x7b, 0x7c, 0xed, 0x73, 0x6e, 0x02, + 0x2a, 0x3d, 0x46, 0x05, 0x75, 0x7a, 0x6d, 0x4e, 0xd8, 0x49, 0xe8, 0x11, 0x27, 0xa2, 0x3e, 0xb1, + 0x55, 0x10, 0x96, 0xc7, 0xd1, 0xca, 0x7f, 0x09, 0xcc, 0xa3, 0xc7, 0xc7, 0x34, 0x72, 0xe2, 0x25, + 0xc6, 0x55, 0xfe, 0xcf, 0x72, 0x74, 0x08, 0xee, 0x8a, 0x8e, 0xd7, 0x21, 0xde, 0x91, 0x86, 0xac, + 0x64, 0x21, 0x7a, 0xd5, 0xe9, 0xe5, 0x80, 0x06, 0x34, 0x86, 0xc8, 0x5d, 0x1c, 0x5d, 0xfd, 0x62, + 0x80, 0xc5, 0x2d, 0x49, 0xb2, 0x1f, 0x83, 0x77, 0xa9, 0x4f, 0xe0, 0x1d, 0x60, 0xca, 0x15, 0x19, + 0x35, 0x63, 0x6d, 0xee, 0xc1, 0x82, 0x3d, 0xa6, 0xb4, 0x65, 0xd8, 0x55, 0x49, 0x78, 0x1f, 0x94, + 0x74, 0x0d, 0xca, 0x2b, 0xdc, 0x3f, 0x19, 0x9c, 0xce, 0xba, 0x09, 0x0c, 0xda, 0x60, 0x46, 0x1d, + 0xc5, 0x51, 0xa1, 0x56, 0xc8, 0x14, 0xbc, 0x54, 0xd7, 0x51, 0x69, 0x57, 0xa3, 0x56, 0xbf, 0x16, + 0xe2, 0x3e, 0xe0, 0x73, 0x90, 0x6f, 0x35, 0x55, 0x37, 0xe5, 0xc6, 0xc6, 0xe5, 0xb0, 0xba, 0x16, + 0x84, 0xa2, 0xd3, 0x6f, 0xdb, 0x1e, 0x3d, 0x76, 0x3a, 0x98, 0x77, 0x42, 0x8f, 0xb2, 0x9e, 0xe3, + 0xd1, 0x88, 0xf7, 0xbb, 0x8e, 0x18, 0xf4, 0x08, 0x57, 0x0d, 0xb4, 0x9a, 0x6e, 0xbe, 0xd5, 0x84, + 0x50, 0xdf, 0x46, 0x76, 0x59, 0xd6, 0xcd, 0x23, 0x50, 0xda, 0xf4, 0x7d, 0x46, 0xb8, 0xec, 0x45, + 0x86, 0x93, 0x4f, 0x68, 0x01, 0xd0, 0xc4, 0x02, 0x7b, 0x24, 0x12, 0x84, 0x21, 0x53, 0x25, 0x53, + 0x11, 0xb8, 0x0b, 0x16, 0x0e, 0x70, 0x10, 0x10, 0x5f, 0x17, 0x10, 0x8e, 0x8a, 0xea, 0x36, 0x77, + 0x33, 0xd7, 0xb7, 0x33, 0xb0, 0xed, 0x48, 0xb0, 0x81, 0x9b, 0x2d, 0x86, 0xf7, 0x80, 0xb9, 0x43, + 0x04, 0x46, 0x33, 0x8a, 0xe4, 0xdf, 0x2c, 0x89, 0xcc, 0xc5, 0x95, 0x0a, 0x06, 0xeb, 0xa0, 0xec, + 0xe2, 0x43, 0xd1, 0x8a, 0x7c, 0x72, 0x8a, 0x4a, 0xea, 0xdd, 0x97, 0x6c, 0xed, 0x94, 0x71, 0xa2, + 0x31, 0x7b, 0x36, 0xac, 0xe6, 0xce, 0x87, 0x55, 0xc3, 0xbd, 0x42, 0x57, 0x1a, 0x60, 0x79, 0x5a, + 0x4b, 0x70, 0x11, 0x14, 0x8e, 0xc8, 0x20, 0x7e, 0x5e, 0x57, 0x6e, 0xe1, 0x32, 0x28, 0x9e, 0xe0, + 0x6e, 0x3f, 0x79, 0xb2, 0xf8, 0xe3, 0x59, 0xfe, 0xa9, 0x51, 0x79, 0x02, 0xca, 0xe3, 0x8e, 0x6e, + 0x53, 0xb8, 0xfa, 0xb1, 0x04, 0xe6, 0x52, 0xa6, 0x80, 0x3b, 0xc0, 0x7c, 0x15, 0x46, 0xbe, 0x16, + 0xb5, 0x7e, 0x39, 0xac, 0x3e, 0xbe, 0x49, 0x54, 0x1c, 0x90, 0x48, 0x38, 0x5c, 0xb0, 0xbe, 0x27, + 0xb8, 0xad, 0x49, 0x24, 0x81, 0xab, 0x68, 0xe0, 0xbc, 0x72, 0x48, 0x7c, 0xaa, 0xd4, 0x1c, 0x5d, + 0x99, 0x53, 0xeb, 0x9b, 0x1c, 0x0c, 0x81, 0x79, 0x80, 0x03, 0x8e, 0xcc, 0x5a, 0x41, 0xba, 0x41, + 0xee, 0xd3, 0x6e, 0x28, 0x4e, 0xba, 0xe1, 0xfd, 0x75, 0xb5, 0x17, 0x94, 0x50, 0xeb, 0xd3, 0xcd, + 0x3e, 0x55, 0xf4, 0x86, 0x29, 0xe5, 0xb8, 0x2e, 0xfd, 0xa3, 0x09, 0xe9, 0x6b, 0xbf, 0x60, 0xcc, + 0x3a, 0x00, 0x02, 0x73, 0x8f, 0x32, 0xa1, 0xc4, 0x2f, 0xba, 0x6a, 0x0f, 0x37, 0x40, 0xe9, 0x2d, + 0x09, 0x83, 0x8e, 0xe0, 0x68, 0x56, 0x79, 0x02, 0xa6, 0xc8, 0x74, 0xc6, 0x4d, 0x20, 0x70, 0x03, + 0x2c, 0x6d, 0x47, 0xb8, 0xdd, 0x25, 0x07, 0x38, 0x78, 0x73, 0x42, 0x18, 0x0b, 0x7d, 0x82, 0xca, + 0x35, 0x63, 0x6d, 0xd6, 0xbd, 0x9e, 0x80, 0x75, 0x50, 0xdc, 0x63, 0xf4, 0x74, 0x80, 0xe6, 0x14, + 0xf3, 0x4a, 0x8a, 0x79, 0x8b, 0x46, 0x11, 0xf1, 0x84, 0x4a, 0x6f, 0xd1, 0xe8, 0x30, 0x0c, 0xf4, + 0x55, 0xe3, 0x0a, 0x58, 0x07, 0x25, 0x0d, 0x41, 0x7f, 0xa9, 0xe2, 0xb4, 0xbd, 0xf5, 0xfd, 0x34, + 0x40, 0x17, 0x26, 0x78, 0xf8, 0x02, 0x54, 0x5e, 0x53, 0x0f, 0x77, 0xbb, 0x03, 0x97, 0x04, 0x21, + 0x17, 0x84, 0x11, 0x7f, 0x93, 0xef, 0x87, 0x3e, 0xf1, 0x30, 0x43, 0x7f, 0xab, 0x66, 0x6f, 0x40, + 0xc0, 0x26, 0x98, 0xdf, 0x96, 0xf3, 0xda, 0x63, 0x21, 0x27, 0xea, 0x95, 0x17, 0xf5, 0x8f, 0x94, + 0x1e, 0x96, 0xc9, 0xac, 0x3e, 0x3e, 0x53, 0x33, 0x39, 0x6d, 0xf3, 0xb7, 0x9a, 0xb6, 0x0f, 0xbf, + 0x3d, 0x6d, 0x4e, 0x7a, 0x68, 0xa6, 0xbe, 0x91, 0xa6, 0xf8, 0x13, 0x83, 0xd8, 0xd8, 0x39, 0xfb, + 0x61, 0xe5, 0xce, 0x2e, 0x2c, 0xe3, 0xfc, 0xc2, 0x32, 0xbe, 0x5f, 0x58, 0xc6, 0xa7, 0x91, 0x95, + 0xfb, 0x3c, 0xb2, 0x72, 0xe7, 0x23, 0x2b, 0xf7, 0x6d, 0x64, 0xe5, 0xde, 0xad, 0xdf, 0x34, 0x88, + 0x99, 0xff, 0x98, 0xf6, 0x8c, 0x0a, 0x3c, 0xfc, 0x19, 0x00, 0x00, 0xff, 0xff, 0x94, 0x92, 0x8e, + 0x95, 0xe4, 0x06, 0x00, 0x00, } func (m *CheckServiceNode) Marshal() (dAtA []byte, err error) { diff --git a/proto/pbservice/node.proto b/proto/pbservice/node.proto index ab52453fc8..ce1cd31156 100644 --- a/proto/pbservice/node.proto +++ b/proto/pbservice/node.proto @@ -5,7 +5,6 @@ package pbservice; option go_package = "github.com/hashicorp/consul/proto/pbservice"; import "proto/pbcommon/common.proto"; -import "proto/pbcommon/common_oss.proto"; import "proto/pbservice/healthcheck.proto"; import "proto/pbservice/service.proto"; diff --git a/proto/pbservice/service.pb.go b/proto/pbservice/service.pb.go index 6ae557c135..8922de3ec3 100644 --- a/proto/pbservice/service.pb.go +++ b/proto/pbservice/service.pb.go @@ -556,73 +556,73 @@ func init() { func init() { proto.RegisterFile("proto/pbservice/service.proto", fileDescriptor_cbb99233b75fb80b) } var fileDescriptor_cbb99233b75fb80b = []byte{ - // 1052 bytes of a gzipped FileDescriptorProto + // 1048 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x56, 0xdd, 0x6e, 0x1b, 0x45, - 0x14, 0xf6, 0xfa, 0x27, 0xb6, 0x4f, 0x42, 0x7e, 0xa6, 0x26, 0x2c, 0x51, 0xeb, 0x84, 0x15, 0x42, - 0x11, 0x44, 0xeb, 0x36, 0x51, 0x29, 0xad, 0x54, 0x24, 0x12, 0x07, 0x54, 0xd1, 0x14, 0xb3, 0x09, - 0xaa, 0x40, 0x42, 0x68, 0xb2, 0x9e, 0xac, 0x57, 0xb1, 0x77, 0xac, 0x9d, 0x49, 0xa8, 0x2f, 0xfb, - 0x06, 0x5c, 0xf2, 0x18, 0x3c, 0x46, 0x24, 0x6e, 0x7a, 0xc9, 0x55, 0x04, 0xc9, 0x5b, 0xf4, 0x0a, - 0xcd, 0x99, 0xd9, 0xcd, 0x7a, 0xd7, 0x44, 0xc0, 0x95, 0x67, 0xce, 0x39, 0xdf, 0x77, 0x76, 0xcf, - 0xf7, 0xcd, 0xac, 0xe1, 0xde, 0x38, 0xe6, 0x92, 0x77, 0xc6, 0xc7, 0x82, 0xc5, 0xe7, 0xa1, 0xcf, - 0x3a, 0xe6, 0xd7, 0xc5, 0x38, 0x69, 0xa6, 0x89, 0xb5, 0xbb, 0x01, 0xe7, 0xc1, 0x90, 0x75, 0x30, - 0x71, 0x7c, 0x76, 0xd2, 0x11, 0x32, 0x3e, 0xf3, 0xa5, 0x2e, 0x5c, 0x5b, 0x4f, 0x78, 0x7c, 0x3e, - 0x1a, 0xf1, 0xa8, 0xa3, 0x7f, 0x7e, 0xe2, 0x42, 0x98, 0x82, 0x0f, 0xf2, 0x8d, 0x06, 0x8c, 0x0e, - 0xe5, 0xc0, 0x1f, 0x30, 0xff, 0xd4, 0x94, 0xb4, 0x02, 0x1e, 0x70, 0x5d, 0xa6, 0x56, 0x3a, 0xea, - 0xfc, 0x5e, 0x01, 0xb2, 0xc7, 0xa3, 0x88, 0xf9, 0xb2, 0x17, 0xf3, 0x57, 0x93, 0x3d, 0x1e, 0x9d, - 0x84, 0x01, 0xf9, 0x14, 0x56, 0xbb, 0x4c, 0xc8, 0x30, 0xa2, 0x32, 0xe4, 0xd1, 0xa1, 0x26, 0x7d, - 0x41, 0x47, 0xcc, 0xb6, 0x36, 0xac, 0xcd, 0xa6, 0xf7, 0x0f, 0x59, 0xb2, 0x0d, 0xad, 0x62, 0xe6, - 0x59, 0xd7, 0x2e, 0x23, 0x6a, 0x66, 0x8e, 0xdc, 0x87, 0x3b, 0xcf, 0xb9, 0x4f, 0x87, 0x26, 0xf2, - 0x45, 0xbf, 0x1f, 0x33, 0x21, 0xec, 0x0a, 0x42, 0x66, 0xa5, 0xc8, 0xc7, 0xb0, 0x9c, 0x0d, 0xf7, - 0x78, 0x2c, 0xed, 0xea, 0x86, 0xb5, 0x59, 0xf3, 0x0a, 0x71, 0xf2, 0x10, 0xe6, 0xf4, 0x3b, 0xd9, - 0xb5, 0x0d, 0x6b, 0x73, 0x7e, 0xfb, 0x3d, 0x57, 0x4f, 0xda, 0x4d, 0x26, 0xed, 0x1e, 0xe2, 0xa4, - 0x77, 0xab, 0x17, 0x97, 0xeb, 0x96, 0x67, 0x8a, 0xc9, 0x23, 0x68, 0x7e, 0x37, 0x16, 0x32, 0x66, - 0x74, 0x24, 0xec, 0xb9, 0x8d, 0xca, 0xe6, 0xfc, 0xf6, 0x1d, 0x37, 0x1d, 0xaf, 0x9b, 0xe4, 0x10, - 0x55, 0xf2, 0x6e, 0x6a, 0x49, 0x17, 0xe6, 0x0f, 0x98, 0x18, 0x7c, 0x45, 0x25, 0xfb, 0x99, 0x4e, - 0xec, 0x3a, 0x36, 0xbd, 0x9b, 0x81, 0x66, 0xb2, 0xba, 0x97, 0xe1, 0xc8, 0xc2, 0xd4, 0x53, 0xef, - 0xbf, 0x1a, 0x73, 0xc1, 0xec, 0x86, 0x79, 0xea, 0x1b, 0x02, 0x9d, 0x98, 0xc2, 0x9a, 0x62, 0xe7, - 0x75, 0x05, 0x1a, 0xc9, 0xa3, 0x90, 0x4d, 0x58, 0xca, 0xcc, 0xfb, 0x68, 0x32, 0x4e, 0xc4, 0xcb, - 0x87, 0x73, 0xaa, 0x29, 0x21, 0xc5, 0x98, 0xfa, 0x6c, 0x86, 0x6a, 0x69, 0x2e, 0xc7, 0x8e, 0xd6, - 0xa8, 0x14, 0xd8, 0xd1, 0x13, 0x6d, 0x80, 0x2e, 0x95, 0xd4, 0x67, 0x91, 0x64, 0x31, 0xea, 0xd4, - 0xf4, 0x32, 0x91, 0x54, 0xcd, 0xdd, 0x30, 0xea, 0x27, 0xe2, 0xd7, 0xb0, 0xaa, 0x10, 0x27, 0x1f, - 0xc2, 0x3b, 0x69, 0x0c, 0x65, 0x9f, 0x43, 0xd9, 0xa7, 0x83, 0x19, 0xcd, 0xeb, 0xff, 0x45, 0xf3, - 0x9c, 0x74, 0x8d, 0xff, 0x25, 0x9d, 0x13, 0xc1, 0xa2, 0xf1, 0x9f, 0x39, 0x57, 0x64, 0x15, 0xe6, - 0x5e, 0x50, 0x19, 0x9e, 0xeb, 0xf9, 0x37, 0x3c, 0xb3, 0x23, 0x5d, 0x58, 0x3c, 0x0c, 0xfb, 0xcc, - 0xa7, 0xb1, 0x01, 0xe0, 0x04, 0xa7, 0x5b, 0x9a, 0x4c, 0x97, 0x9d, 0x84, 0x51, 0xa8, 0x46, 0xea, - 0xe5, 0x30, 0xce, 0xf7, 0xb0, 0x90, 0x75, 0x84, 0xea, 0xb6, 0xa7, 0x8e, 0xbd, 0x48, 0xba, 0xe9, - 0x1d, 0x79, 0x00, 0xb5, 0x1e, 0x95, 0x03, 0x61, 0x97, 0xd1, 0xcd, 0xef, 0x16, 0x1c, 0xa5, 0xb2, - 0xe6, 0x85, 0x74, 0xa5, 0xf3, 0x9b, 0x05, 0x70, 0x93, 0x23, 0x0e, 0x2c, 0x3c, 0x0f, 0x85, 0x64, - 0x11, 0x8b, 0x71, 0xf6, 0x16, 0xce, 0x7e, 0x2a, 0x46, 0x08, 0x54, 0x55, 0xad, 0xb1, 0x0e, 0xae, - 0x53, 0xd1, 0xd4, 0x06, 0x81, 0x95, 0x8c, 0x68, 0x49, 0x90, 0xac, 0x41, 0xa3, 0xa7, 0xe4, 0xf1, - 0xf9, 0xd0, 0x98, 0x24, 0xdd, 0x2b, 0xb3, 0xf5, 0x68, 0x2c, 0x58, 0xff, 0xcb, 0x98, 0x8f, 0xf0, - 0x7d, 0xd0, 0x21, 0x0d, 0x2f, 0x1f, 0x76, 0x4e, 0x60, 0xa5, 0xa0, 0x12, 0xf9, 0x16, 0xaa, 0x07, - 0xbc, 0x6f, 0xec, 0xbf, 0xfb, 0xf4, 0xed, 0xe5, 0xfa, 0xe3, 0x20, 0x94, 0x83, 0xb3, 0x63, 0xd7, - 0xe7, 0xa3, 0xce, 0x80, 0x8a, 0x41, 0xe8, 0xf3, 0x78, 0xdc, 0xf1, 0x79, 0x24, 0xce, 0x86, 0x1d, - 0x1a, 0xb0, 0x48, 0x9a, 0x0b, 0x58, 0x64, 0x45, 0x57, 0x24, 0x1e, 0x52, 0x39, 0xaf, 0xeb, 0xb0, - 0x52, 0xd0, 0x86, 0x1c, 0x40, 0xf5, 0xeb, 0x30, 0xea, 0x9b, 0x46, 0x8f, 0xdf, 0x5e, 0xae, 0x3f, - 0xfc, 0xf7, 0x8d, 0x0c, 0x9d, 0x22, 0xf0, 0x90, 0x86, 0x2c, 0x42, 0x39, 0xbd, 0x3b, 0xcb, 0xcf, - 0xba, 0x6a, 0xb8, 0x99, 0x83, 0x86, 0x6b, 0x15, 0x3b, 0xa2, 0x81, 0xb0, 0xab, 0x1b, 0x15, 0x15, - 0x53, 0x6b, 0x62, 0x43, 0x7d, 0xfa, 0x20, 0x25, 0x5b, 0x42, 0x61, 0xe9, 0x88, 0x06, 0x01, 0x4b, - 0x0e, 0x14, 0x13, 0xf6, 0x32, 0xda, 0xe1, 0xc1, 0x6d, 0x9e, 0x73, 0x73, 0x98, 0xfd, 0x48, 0xc6, - 0x13, 0x63, 0x95, 0x3c, 0x1f, 0x79, 0x02, 0xd5, 0x03, 0x26, 0xa9, 0xb9, 0x34, 0x3f, 0xba, 0x95, - 0x57, 0x15, 0x22, 0x99, 0x87, 0x18, 0x74, 0x8f, 0x32, 0x48, 0x1d, 0x0d, 0x82, 0x6b, 0x72, 0x1f, - 0x6a, 0x5a, 0x71, 0x7d, 0x1e, 0x5b, 0x19, 0x42, 0x8c, 0xab, 0x1b, 0x2c, 0xb1, 0x2d, 0x06, 0xc8, - 0x56, 0x7a, 0x02, 0x9a, 0xf8, 0x0c, 0x33, 0x21, 0xe9, 0xb9, 0xd8, 0x82, 0xfa, 0x4b, 0x16, 0x06, - 0x03, 0x29, 0x6c, 0xc0, 0x0e, 0x24, 0x53, 0x6e, 0x32, 0x5e, 0x52, 0x42, 0x5a, 0x50, 0x3b, 0xe2, - 0xa7, 0x2c, 0xb2, 0xe7, 0x71, 0xb0, 0x7a, 0x43, 0xb6, 0x60, 0x65, 0x3f, 0xa2, 0xc7, 0x43, 0x76, - 0x44, 0x83, 0x6f, 0xce, 0x59, 0x1c, 0x87, 0x7d, 0x66, 0x2f, 0xa0, 0x43, 0x8b, 0x09, 0xb2, 0x03, - 0x35, 0xfc, 0xd6, 0xda, 0x8b, 0xd8, 0xef, 0x5e, 0xf6, 0xf1, 0x0a, 0x9f, 0x62, 0x4f, 0xd7, 0xaa, - 0xcb, 0x62, 0x5f, 0x5d, 0x97, 0xe3, 0x38, 0x14, 0x0c, 0x07, 0xbc, 0x82, 0xe8, 0x55, 0x57, 0xff, - 0x19, 0x70, 0xa7, 0xb3, 0x66, 0x22, 0x39, 0x0c, 0xd9, 0x81, 0xba, 0x69, 0x61, 0x2f, 0x21, 0xfc, - 0xfd, 0xa2, 0x3e, 0xa6, 0xc0, 0x4b, 0x2a, 0xd7, 0x7e, 0x84, 0xd6, 0x2c, 0x03, 0x90, 0x65, 0xa8, - 0x9c, 0xb2, 0x89, 0xf9, 0xa8, 0xa8, 0x25, 0xe9, 0x40, 0xed, 0x9c, 0x0e, 0xcf, 0xf4, 0x97, 0x63, - 0x26, 0xb9, 0xa1, 0xf0, 0x74, 0xdd, 0x93, 0xf2, 0x67, 0xd6, 0xda, 0x23, 0x68, 0xa6, 0x3e, 0x98, - 0xc1, 0xd9, 0xca, 0x72, 0x36, 0x33, 0x40, 0xe7, 0xf3, 0xf4, 0xa6, 0x4d, 0xec, 0x9d, 0x31, 0xbe, - 0x35, 0x6d, 0xfc, 0xc4, 0x59, 0xe5, 0x1b, 0x67, 0x39, 0x4f, 0x53, 0xe5, 0x15, 0xb0, 0x47, 0x85, - 0x08, 0xa3, 0xc0, 0xdc, 0x6a, 0xc9, 0x56, 0x65, 0x5e, 0xd2, 0x38, 0x52, 0x19, 0x8d, 0x4d, 0xb6, - 0xbb, 0x07, 0x17, 0x7f, 0xb5, 0x4b, 0x17, 0x57, 0x6d, 0xeb, 0xcd, 0x55, 0xdb, 0xfa, 0xf3, 0xaa, - 0x6d, 0xfd, 0x72, 0xdd, 0x2e, 0xfd, 0x7a, 0xdd, 0x2e, 0xbd, 0xb9, 0x6e, 0x97, 0xfe, 0xb8, 0x6e, - 0x97, 0x7e, 0xf8, 0xe4, 0xb6, 0xc3, 0x9f, 0xfb, 0xc7, 0x76, 0x3c, 0x87, 0x81, 0x9d, 0xbf, 0x03, - 0x00, 0x00, 0xff, 0xff, 0x90, 0xb6, 0xca, 0xac, 0x34, 0x0a, 0x00, 0x00, + 0x14, 0xf6, 0xfa, 0x27, 0xb6, 0x4f, 0x42, 0x7e, 0xa6, 0x26, 0x2c, 0xa1, 0x75, 0xcc, 0x0a, 0x21, + 0x0b, 0x22, 0xbb, 0x4d, 0x54, 0x4a, 0x2b, 0x15, 0x89, 0xc4, 0x01, 0x55, 0xd4, 0xc5, 0x6c, 0x8c, + 0x2a, 0x90, 0xb8, 0x18, 0xaf, 0x27, 0xeb, 0x55, 0xec, 0x1d, 0x6b, 0x67, 0x1c, 0xea, 0xcb, 0xbe, + 0x01, 0x97, 0x3c, 0x06, 0x8f, 0x11, 0x89, 0x9b, 0x5e, 0x72, 0x15, 0x41, 0xf2, 0x16, 0xbd, 0x42, + 0x73, 0x76, 0x76, 0xb3, 0xde, 0x35, 0x11, 0x70, 0xe5, 0x99, 0xf3, 0x9d, 0xf3, 0x9d, 0xdd, 0xf3, + 0x7d, 0x33, 0x6b, 0xb8, 0x37, 0x0d, 0xb8, 0xe4, 0xed, 0xe9, 0x40, 0xb0, 0xe0, 0xdc, 0x73, 0x58, + 0x5b, 0xff, 0xb6, 0x30, 0x4e, 0xaa, 0x31, 0xb0, 0x73, 0xd7, 0xe5, 0xdc, 0x1d, 0xb3, 0x36, 0x02, + 0x83, 0xd9, 0x69, 0x5b, 0xc8, 0x60, 0xe6, 0xc8, 0x30, 0x71, 0xe7, 0x83, 0x88, 0xc7, 0xe1, 0x93, + 0x09, 0xf7, 0xdb, 0xe1, 0x8f, 0x06, 0x3f, 0x4c, 0x37, 0x19, 0x31, 0x3a, 0x96, 0x23, 0x67, 0xc4, + 0x9c, 0x33, 0x9d, 0x52, 0x73, 0xb9, 0xcb, 0xc3, 0x34, 0xb5, 0x0a, 0xa3, 0xd6, 0xef, 0x05, 0x20, + 0x47, 0xdc, 0xf7, 0x99, 0x23, 0x7b, 0x01, 0x7f, 0x35, 0x3f, 0xe2, 0xfe, 0xa9, 0xe7, 0x92, 0xcf, + 0x60, 0xbb, 0xc3, 0x84, 0xf4, 0x7c, 0x2a, 0x3d, 0xee, 0x9f, 0x84, 0xa4, 0x2f, 0xe8, 0x84, 0x99, + 0x46, 0xc3, 0x68, 0x56, 0xed, 0x7f, 0x40, 0xc9, 0x3e, 0xd4, 0xb2, 0xc8, 0xb3, 0x8e, 0x99, 0xc7, + 0xaa, 0xa5, 0x18, 0xb9, 0x0f, 0x77, 0x9e, 0x73, 0x87, 0x8e, 0x75, 0xe4, 0xcb, 0xe1, 0x30, 0x60, + 0x42, 0x98, 0x05, 0x2c, 0x59, 0x06, 0x91, 0x4f, 0x60, 0x33, 0x19, 0xee, 0xf1, 0x40, 0x9a, 0xc5, + 0x86, 0xd1, 0x2c, 0xd9, 0x99, 0x38, 0x79, 0x08, 0x2b, 0xe1, 0x3b, 0x99, 0xa5, 0x86, 0xd1, 0x5c, + 0xdd, 0x7f, 0xaf, 0x15, 0x4e, 0xb9, 0x15, 0x4d, 0xb9, 0x75, 0x82, 0x53, 0x3e, 0x2c, 0x5e, 0x5c, + 0xee, 0x1a, 0xb6, 0x4e, 0x26, 0x8f, 0xa0, 0xfa, 0xfd, 0x54, 0xc8, 0x80, 0xd1, 0x89, 0x30, 0x57, + 0x1a, 0x85, 0xe6, 0xea, 0xfe, 0x9d, 0x56, 0x3c, 0xde, 0x56, 0x84, 0x61, 0x55, 0xce, 0xbe, 0xc9, + 0x25, 0x1d, 0x58, 0xed, 0x32, 0x31, 0xfa, 0x9a, 0x4a, 0xf6, 0x33, 0x9d, 0x9b, 0x65, 0x6c, 0x7a, + 0x37, 0x51, 0x9a, 0x40, 0xc3, 0x5e, 0x9a, 0x23, 0x59, 0xa6, 0x9e, 0xfa, 0xf8, 0xd5, 0x94, 0x0b, + 0x66, 0x56, 0xf4, 0x53, 0xdf, 0x10, 0x84, 0xc0, 0x42, 0xad, 0x4e, 0xb6, 0x5e, 0x17, 0xa0, 0x12, + 0x3d, 0x0a, 0x69, 0xc2, 0x46, 0x62, 0xde, 0xfd, 0xf9, 0x34, 0x12, 0x2f, 0x1d, 0x4e, 0xa9, 0xa6, + 0x84, 0x14, 0x53, 0xea, 0xb0, 0x25, 0xaa, 0xc5, 0x58, 0x8a, 0x1d, 0xad, 0x51, 0xc8, 0xb0, 0xa3, + 0x27, 0xea, 0x00, 0x1d, 0x2a, 0xa9, 0xc3, 0x7c, 0xc9, 0x02, 0xd4, 0xa9, 0x6a, 0x27, 0x22, 0xb1, + 0x9a, 0x87, 0x9e, 0x3f, 0x8c, 0xc4, 0x2f, 0x61, 0x56, 0x26, 0x4e, 0x3e, 0x82, 0x77, 0xe2, 0x18, + 0xca, 0xbe, 0x82, 0xb2, 0x2f, 0x06, 0x13, 0x9a, 0x97, 0xff, 0x8b, 0xe6, 0x29, 0xe9, 0x2a, 0xff, + 0x4b, 0x3a, 0xcb, 0x87, 0x75, 0xed, 0x3f, 0x7d, 0xae, 0xc8, 0x36, 0xac, 0xbc, 0xa0, 0xd2, 0x3b, + 0x0f, 0xe7, 0x5f, 0xb1, 0xf5, 0x8e, 0x74, 0x60, 0xfd, 0xc4, 0x1b, 0x32, 0x87, 0x06, 0xba, 0x00, + 0x27, 0xb8, 0xd8, 0x52, 0x23, 0x1d, 0x76, 0xea, 0xf9, 0x9e, 0x1a, 0xa9, 0x9d, 0xaa, 0xb1, 0x7e, + 0x80, 0xb5, 0xa4, 0x23, 0x54, 0xb7, 0x23, 0x75, 0xec, 0x45, 0xd4, 0x2d, 0xdc, 0x91, 0x07, 0x50, + 0xea, 0x51, 0x39, 0x12, 0x66, 0x1e, 0xdd, 0xfc, 0x6e, 0xc6, 0x51, 0x0a, 0xd5, 0x2f, 0x14, 0x66, + 0x5a, 0xbf, 0x19, 0x00, 0x37, 0x18, 0xb1, 0x60, 0xed, 0xb9, 0x27, 0x24, 0xf3, 0x59, 0x80, 0xb3, + 0x37, 0x70, 0xf6, 0x0b, 0x31, 0x42, 0xa0, 0xa8, 0x72, 0xb5, 0x75, 0x70, 0x1d, 0x8b, 0xa6, 0x36, + 0x58, 0x58, 0x48, 0x88, 0x16, 0x05, 0xc9, 0x0e, 0x54, 0x7a, 0x4a, 0x1e, 0x87, 0x8f, 0xb5, 0x49, + 0xe2, 0xbd, 0x32, 0x5b, 0x8f, 0x06, 0x82, 0x0d, 0xbf, 0x0a, 0xf8, 0x04, 0xdf, 0x07, 0x1d, 0x52, + 0xb1, 0xd3, 0x61, 0xeb, 0x14, 0xb6, 0x32, 0x2a, 0x91, 0xef, 0xa0, 0xd8, 0xe5, 0x43, 0x6d, 0xff, + 0xc3, 0xa7, 0x6f, 0x2f, 0x77, 0x1f, 0xbb, 0x9e, 0x1c, 0xcd, 0x06, 0x2d, 0x87, 0x4f, 0xda, 0x23, + 0x2a, 0x46, 0x9e, 0xc3, 0x83, 0x69, 0xdb, 0xe1, 0xbe, 0x98, 0x8d, 0xdb, 0xd4, 0x65, 0xbe, 0xd4, + 0x97, 0xaf, 0x48, 0x8a, 0xae, 0x48, 0x6c, 0xa4, 0xb2, 0x5e, 0x97, 0x61, 0x2b, 0xa3, 0x0d, 0xe9, + 0x42, 0xf1, 0x1b, 0xcf, 0x1f, 0xea, 0x46, 0x8f, 0xdf, 0x5e, 0xee, 0x3e, 0xfc, 0xf7, 0x8d, 0x34, + 0x9d, 0x22, 0xb0, 0x91, 0x86, 0xac, 0x43, 0x3e, 0xbe, 0x3b, 0xf3, 0xcf, 0x3a, 0x6a, 0xb8, 0x89, + 0x83, 0x86, 0x6b, 0x15, 0xeb, 0x53, 0x57, 0x98, 0xc5, 0x46, 0x41, 0xc5, 0xd4, 0x9a, 0x98, 0x50, + 0x5e, 0x3c, 0x48, 0xd1, 0x96, 0x50, 0xd8, 0xe8, 0x53, 0xd7, 0x65, 0xd1, 0x81, 0x62, 0xc2, 0xdc, + 0x44, 0x3b, 0x3c, 0xb8, 0xcd, 0x73, 0xad, 0x54, 0xcd, 0xb1, 0x2f, 0x83, 0xb9, 0xb6, 0x4a, 0x9a, + 0x8f, 0x3c, 0x81, 0x62, 0x97, 0x49, 0xaa, 0x2f, 0xcd, 0x8f, 0x6f, 0xe5, 0x55, 0x89, 0x48, 0x66, + 0x63, 0x0d, 0xba, 0x47, 0x19, 0xa4, 0x8c, 0x06, 0xc1, 0x35, 0xb9, 0x0f, 0xa5, 0x50, 0xf1, 0xf0, + 0x3c, 0xd6, 0x12, 0x84, 0x18, 0x57, 0x37, 0x58, 0x64, 0x5b, 0x0c, 0x90, 0xbd, 0xf8, 0x04, 0x54, + 0xf1, 0x19, 0x96, 0x96, 0xc4, 0xe7, 0x62, 0x0f, 0xca, 0x2f, 0x99, 0xe7, 0x8e, 0xa4, 0x30, 0x01, + 0x3b, 0x90, 0x44, 0xba, 0x46, 0xec, 0x28, 0x85, 0xd4, 0xa0, 0xd4, 0xe7, 0x67, 0xcc, 0x37, 0x57, + 0x71, 0xb0, 0xe1, 0x86, 0xec, 0xc1, 0xd6, 0xb1, 0x4f, 0x07, 0x63, 0xd6, 0xa7, 0xee, 0xb7, 0xe7, + 0x2c, 0x08, 0xbc, 0x21, 0x33, 0xd7, 0xd0, 0xa1, 0x59, 0x80, 0x1c, 0x40, 0x09, 0xbf, 0xb5, 0xe6, + 0x3a, 0xf6, 0xbb, 0x97, 0x7c, 0xbc, 0xcc, 0xa7, 0xd8, 0x0e, 0x73, 0xd5, 0x65, 0x71, 0xac, 0xae, + 0xcb, 0x69, 0xe0, 0x09, 0x86, 0x03, 0xde, 0xc2, 0xea, 0xed, 0x96, 0xfe, 0x23, 0xb0, 0x88, 0xea, + 0x89, 0xa4, 0x6a, 0xc8, 0x01, 0x94, 0x75, 0x0b, 0x73, 0x03, 0xcb, 0xdf, 0xcf, 0xea, 0xa3, 0x13, + 0xec, 0x28, 0x73, 0xe7, 0x27, 0xa8, 0x2d, 0x33, 0x00, 0xd9, 0x84, 0xc2, 0x19, 0x9b, 0xeb, 0x8f, + 0x8a, 0x5a, 0x92, 0x36, 0x94, 0xce, 0xe9, 0x78, 0x16, 0x7e, 0x39, 0x96, 0x92, 0x6b, 0x0a, 0x3b, + 0xcc, 0x7b, 0x92, 0xff, 0xdc, 0xd8, 0x79, 0x04, 0xd5, 0xd8, 0x07, 0x4b, 0x38, 0x6b, 0x49, 0xce, + 0x6a, 0xa2, 0xd0, 0xfa, 0x22, 0xbe, 0x69, 0x23, 0x7b, 0x27, 0x8c, 0x6f, 0x2c, 0x1a, 0x3f, 0x72, + 0x56, 0xfe, 0xc6, 0x59, 0xd6, 0xd3, 0x58, 0x79, 0x55, 0xd8, 0xa3, 0x42, 0x78, 0xbe, 0xab, 0x6f, + 0xb5, 0x68, 0xab, 0x90, 0x97, 0x34, 0xf0, 0x15, 0x12, 0xd6, 0x46, 0xdb, 0xc3, 0xee, 0xc5, 0x5f, + 0xf5, 0xdc, 0xc5, 0x55, 0xdd, 0x78, 0x73, 0x55, 0x37, 0xfe, 0xbc, 0xaa, 0x1b, 0xbf, 0x5c, 0xd7, + 0x73, 0xbf, 0x5e, 0xd7, 0x73, 0x6f, 0xae, 0xeb, 0xb9, 0x3f, 0xae, 0xeb, 0xb9, 0x1f, 0x3f, 0xbd, + 0xed, 0xf0, 0xa7, 0xfe, 0xb1, 0x0d, 0x56, 0x30, 0x70, 0xf0, 0x77, 0x00, 0x00, 0x00, 0xff, 0xff, + 0x62, 0x98, 0x42, 0xf5, 0x30, 0x0a, 0x00, 0x00, } func (m *ConnectProxyConfig) Marshal() (dAtA []byte, err error) { diff --git a/proto/pbservice/service.proto b/proto/pbservice/service.proto index b51faff305..b40a93911c 100644 --- a/proto/pbservice/service.proto +++ b/proto/pbservice/service.proto @@ -5,7 +5,7 @@ package pbservice; option go_package = "github.com/hashicorp/consul/proto/pbservice"; import "google/protobuf/struct.proto"; -import "proto/pbcommon/common_oss.proto"; +import "proto/pbcommon/common.proto"; import "proto/pbservice/healthcheck.proto"; // This fake import path is replaced by the build script with a versioned path