From 28890ee198c04574d0633d437e368f1823760670 Mon Sep 17 00:00:00 2001 From: Jeff Mitchell Date: Tue, 10 Jul 2018 20:49:48 -0400 Subject: [PATCH] Make proto It appears the only thing that actually change is that the tag got `proto3` values added. --- .../logical/database/dbplugin/database.pb.go | 78 ++--- helper/forwarding/types.pb.go | 42 +-- helper/identity/types.pb.go | 74 ++--- helper/storagepacker/types.pb.go | 16 +- logical/identity.pb.go | 20 +- logical/plugin/pb/backend.pb.go | 314 +++++++++--------- physical/types.pb.go | 8 +- vault/request_forwarding_service.pb.go | 20 +- 8 files changed, 286 insertions(+), 286 deletions(-) diff --git a/builtin/logical/database/dbplugin/database.pb.go b/builtin/logical/database/dbplugin/database.pb.go index 3c5bb984d..4025148f3 100644 --- a/builtin/logical/database/dbplugin/database.pb.go +++ b/builtin/logical/database/dbplugin/database.pb.go @@ -27,7 +27,7 @@ const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package // Deprecated: Do not use. type InitializeRequest struct { Config []byte `protobuf:"bytes,1,opt,name=config,proto3" json:"config,omitempty"` - VerifyConnection bool `protobuf:"varint,2,opt,name=verify_connection,json=verifyConnection" json:"verify_connection,omitempty"` + VerifyConnection bool `protobuf:"varint,2,opt,name=verify_connection,json=verifyConnection,proto3" json:"verify_connection,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -37,7 +37,7 @@ func (m *InitializeRequest) Reset() { *m = InitializeRequest{} } func (m *InitializeRequest) String() string { return proto.CompactTextString(m) } func (*InitializeRequest) ProtoMessage() {} func (*InitializeRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_database_a524e050c674f25f, []int{0} + return fileDescriptor_database_4b48b7d6479beb92, []int{0} } func (m *InitializeRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_InitializeRequest.Unmarshal(m, b) @@ -73,7 +73,7 @@ func (m *InitializeRequest) GetVerifyConnection() bool { type InitRequest struct { Config []byte `protobuf:"bytes,1,opt,name=config,proto3" json:"config,omitempty"` - VerifyConnection bool `protobuf:"varint,2,opt,name=verify_connection,json=verifyConnection" json:"verify_connection,omitempty"` + VerifyConnection bool `protobuf:"varint,2,opt,name=verify_connection,json=verifyConnection,proto3" json:"verify_connection,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -83,7 +83,7 @@ func (m *InitRequest) Reset() { *m = InitRequest{} } func (m *InitRequest) String() string { return proto.CompactTextString(m) } func (*InitRequest) ProtoMessage() {} func (*InitRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_database_a524e050c674f25f, []int{1} + return fileDescriptor_database_4b48b7d6479beb92, []int{1} } func (m *InitRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_InitRequest.Unmarshal(m, b) @@ -118,9 +118,9 @@ func (m *InitRequest) GetVerifyConnection() bool { } type CreateUserRequest struct { - Statements *Statements `protobuf:"bytes,1,opt,name=statements" json:"statements,omitempty"` - UsernameConfig *UsernameConfig `protobuf:"bytes,2,opt,name=username_config,json=usernameConfig" json:"username_config,omitempty"` - Expiration *timestamp.Timestamp `protobuf:"bytes,3,opt,name=expiration" json:"expiration,omitempty"` + Statements *Statements `protobuf:"bytes,1,opt,name=statements,proto3" json:"statements,omitempty"` + UsernameConfig *UsernameConfig `protobuf:"bytes,2,opt,name=username_config,json=usernameConfig,proto3" json:"username_config,omitempty"` + Expiration *timestamp.Timestamp `protobuf:"bytes,3,opt,name=expiration,proto3" json:"expiration,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -130,7 +130,7 @@ func (m *CreateUserRequest) Reset() { *m = CreateUserRequest{} } func (m *CreateUserRequest) String() string { return proto.CompactTextString(m) } func (*CreateUserRequest) ProtoMessage() {} func (*CreateUserRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_database_a524e050c674f25f, []int{2} + return fileDescriptor_database_4b48b7d6479beb92, []int{2} } func (m *CreateUserRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_CreateUserRequest.Unmarshal(m, b) @@ -172,9 +172,9 @@ func (m *CreateUserRequest) GetExpiration() *timestamp.Timestamp { } type RenewUserRequest struct { - Statements *Statements `protobuf:"bytes,1,opt,name=statements" json:"statements,omitempty"` - Username string `protobuf:"bytes,2,opt,name=username" json:"username,omitempty"` - Expiration *timestamp.Timestamp `protobuf:"bytes,3,opt,name=expiration" json:"expiration,omitempty"` + Statements *Statements `protobuf:"bytes,1,opt,name=statements,proto3" json:"statements,omitempty"` + Username string `protobuf:"bytes,2,opt,name=username,proto3" json:"username,omitempty"` + Expiration *timestamp.Timestamp `protobuf:"bytes,3,opt,name=expiration,proto3" json:"expiration,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -184,7 +184,7 @@ func (m *RenewUserRequest) Reset() { *m = RenewUserRequest{} } func (m *RenewUserRequest) String() string { return proto.CompactTextString(m) } func (*RenewUserRequest) ProtoMessage() {} func (*RenewUserRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_database_a524e050c674f25f, []int{3} + return fileDescriptor_database_4b48b7d6479beb92, []int{3} } func (m *RenewUserRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_RenewUserRequest.Unmarshal(m, b) @@ -226,8 +226,8 @@ func (m *RenewUserRequest) GetExpiration() *timestamp.Timestamp { } type RevokeUserRequest struct { - Statements *Statements `protobuf:"bytes,1,opt,name=statements" json:"statements,omitempty"` - Username string `protobuf:"bytes,2,opt,name=username" json:"username,omitempty"` + Statements *Statements `protobuf:"bytes,1,opt,name=statements,proto3" json:"statements,omitempty"` + Username string `protobuf:"bytes,2,opt,name=username,proto3" json:"username,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -237,7 +237,7 @@ func (m *RevokeUserRequest) Reset() { *m = RevokeUserRequest{} } func (m *RevokeUserRequest) String() string { return proto.CompactTextString(m) } func (*RevokeUserRequest) ProtoMessage() {} func (*RevokeUserRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_database_a524e050c674f25f, []int{4} + return fileDescriptor_database_4b48b7d6479beb92, []int{4} } func (m *RevokeUserRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_RevokeUserRequest.Unmarshal(m, b) @@ -272,7 +272,7 @@ func (m *RevokeUserRequest) GetUsername() string { } type RotateRootCredentialsRequest struct { - Statements []string `protobuf:"bytes,1,rep,name=statements" json:"statements,omitempty"` + Statements []string `protobuf:"bytes,1,rep,name=statements,proto3" json:"statements,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -282,7 +282,7 @@ func (m *RotateRootCredentialsRequest) Reset() { *m = RotateRootCredenti func (m *RotateRootCredentialsRequest) String() string { return proto.CompactTextString(m) } func (*RotateRootCredentialsRequest) ProtoMessage() {} func (*RotateRootCredentialsRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_database_a524e050c674f25f, []int{5} + return fileDescriptor_database_4b48b7d6479beb92, []int{5} } func (m *RotateRootCredentialsRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_RotateRootCredentialsRequest.Unmarshal(m, b) @@ -311,17 +311,17 @@ func (m *RotateRootCredentialsRequest) GetStatements() []string { type Statements struct { // DEPRECATED, will be removed in 0.12 - CreationStatements string `protobuf:"bytes,1,opt,name=creation_statements,json=creationStatements" json:"creation_statements,omitempty"` // Deprecated: Do not use. + CreationStatements string `protobuf:"bytes,1,opt,name=creation_statements,json=creationStatements,proto3" json:"creation_statements,omitempty"` // Deprecated: Do not use. // DEPRECATED, will be removed in 0.12 - RevocationStatements string `protobuf:"bytes,2,opt,name=revocation_statements,json=revocationStatements" json:"revocation_statements,omitempty"` // Deprecated: Do not use. + RevocationStatements string `protobuf:"bytes,2,opt,name=revocation_statements,json=revocationStatements,proto3" json:"revocation_statements,omitempty"` // Deprecated: Do not use. // DEPRECATED, will be removed in 0.12 - RollbackStatements string `protobuf:"bytes,3,opt,name=rollback_statements,json=rollbackStatements" json:"rollback_statements,omitempty"` // Deprecated: Do not use. + RollbackStatements string `protobuf:"bytes,3,opt,name=rollback_statements,json=rollbackStatements,proto3" json:"rollback_statements,omitempty"` // Deprecated: Do not use. // DEPRECATED, will be removed in 0.12 - RenewStatements string `protobuf:"bytes,4,opt,name=renew_statements,json=renewStatements" json:"renew_statements,omitempty"` // Deprecated: Do not use. - Creation []string `protobuf:"bytes,5,rep,name=creation" json:"creation,omitempty"` - Revocation []string `protobuf:"bytes,6,rep,name=revocation" json:"revocation,omitempty"` - Rollback []string `protobuf:"bytes,7,rep,name=rollback" json:"rollback,omitempty"` - Renewal []string `protobuf:"bytes,8,rep,name=renewal" json:"renewal,omitempty"` + RenewStatements string `protobuf:"bytes,4,opt,name=renew_statements,json=renewStatements,proto3" json:"renew_statements,omitempty"` // Deprecated: Do not use. + Creation []string `protobuf:"bytes,5,rep,name=creation,proto3" json:"creation,omitempty"` + Revocation []string `protobuf:"bytes,6,rep,name=revocation,proto3" json:"revocation,omitempty"` + Rollback []string `protobuf:"bytes,7,rep,name=rollback,proto3" json:"rollback,omitempty"` + Renewal []string `protobuf:"bytes,8,rep,name=renewal,proto3" json:"renewal,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -331,7 +331,7 @@ func (m *Statements) Reset() { *m = Statements{} } func (m *Statements) String() string { return proto.CompactTextString(m) } func (*Statements) ProtoMessage() {} func (*Statements) Descriptor() ([]byte, []int) { - return fileDescriptor_database_a524e050c674f25f, []int{6} + return fileDescriptor_database_4b48b7d6479beb92, []int{6} } func (m *Statements) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_Statements.Unmarshal(m, b) @@ -412,8 +412,8 @@ func (m *Statements) GetRenewal() []string { } type UsernameConfig struct { - DisplayName string `protobuf:"bytes,1,opt,name=DisplayName" json:"DisplayName,omitempty"` - RoleName string `protobuf:"bytes,2,opt,name=RoleName" json:"RoleName,omitempty"` + DisplayName string `protobuf:"bytes,1,opt,name=DisplayName,proto3" json:"DisplayName,omitempty"` + RoleName string `protobuf:"bytes,2,opt,name=RoleName,proto3" json:"RoleName,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -423,7 +423,7 @@ func (m *UsernameConfig) Reset() { *m = UsernameConfig{} } func (m *UsernameConfig) String() string { return proto.CompactTextString(m) } func (*UsernameConfig) ProtoMessage() {} func (*UsernameConfig) Descriptor() ([]byte, []int) { - return fileDescriptor_database_a524e050c674f25f, []int{7} + return fileDescriptor_database_4b48b7d6479beb92, []int{7} } func (m *UsernameConfig) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_UsernameConfig.Unmarshal(m, b) @@ -468,7 +468,7 @@ func (m *InitResponse) Reset() { *m = InitResponse{} } func (m *InitResponse) String() string { return proto.CompactTextString(m) } func (*InitResponse) ProtoMessage() {} func (*InitResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_database_a524e050c674f25f, []int{8} + return fileDescriptor_database_4b48b7d6479beb92, []int{8} } func (m *InitResponse) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_InitResponse.Unmarshal(m, b) @@ -496,8 +496,8 @@ func (m *InitResponse) GetConfig() []byte { } type CreateUserResponse struct { - Username string `protobuf:"bytes,1,opt,name=username" json:"username,omitempty"` - Password string `protobuf:"bytes,2,opt,name=password" json:"password,omitempty"` + Username string `protobuf:"bytes,1,opt,name=username,proto3" json:"username,omitempty"` + Password string `protobuf:"bytes,2,opt,name=password,proto3" json:"password,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -507,7 +507,7 @@ func (m *CreateUserResponse) Reset() { *m = CreateUserResponse{} } func (m *CreateUserResponse) String() string { return proto.CompactTextString(m) } func (*CreateUserResponse) ProtoMessage() {} func (*CreateUserResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_database_a524e050c674f25f, []int{9} + return fileDescriptor_database_4b48b7d6479beb92, []int{9} } func (m *CreateUserResponse) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_CreateUserResponse.Unmarshal(m, b) @@ -542,7 +542,7 @@ func (m *CreateUserResponse) GetPassword() string { } type TypeResponse struct { - Type string `protobuf:"bytes,1,opt,name=type" json:"type,omitempty"` + Type string `protobuf:"bytes,1,opt,name=type,proto3" json:"type,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -552,7 +552,7 @@ func (m *TypeResponse) Reset() { *m = TypeResponse{} } func (m *TypeResponse) String() string { return proto.CompactTextString(m) } func (*TypeResponse) ProtoMessage() {} func (*TypeResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_database_a524e050c674f25f, []int{10} + return fileDescriptor_database_4b48b7d6479beb92, []int{10} } func (m *TypeResponse) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_TypeResponse.Unmarshal(m, b) @@ -590,7 +590,7 @@ func (m *RotateRootCredentialsResponse) Reset() { *m = RotateRootCredent func (m *RotateRootCredentialsResponse) String() string { return proto.CompactTextString(m) } func (*RotateRootCredentialsResponse) ProtoMessage() {} func (*RotateRootCredentialsResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_database_a524e050c674f25f, []int{11} + return fileDescriptor_database_4b48b7d6479beb92, []int{11} } func (m *RotateRootCredentialsResponse) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_RotateRootCredentialsResponse.Unmarshal(m, b) @@ -627,7 +627,7 @@ func (m *Empty) Reset() { *m = Empty{} } func (m *Empty) String() string { return proto.CompactTextString(m) } func (*Empty) ProtoMessage() {} func (*Empty) Descriptor() ([]byte, []int) { - return fileDescriptor_database_a524e050c674f25f, []int{12} + return fileDescriptor_database_4b48b7d6479beb92, []int{12} } func (m *Empty) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_Empty.Unmarshal(m, b) @@ -968,10 +968,10 @@ var _Database_serviceDesc = grpc.ServiceDesc{ } func init() { - proto.RegisterFile("builtin/logical/database/dbplugin/database.proto", fileDescriptor_database_a524e050c674f25f) + proto.RegisterFile("builtin/logical/database/dbplugin/database.proto", fileDescriptor_database_4b48b7d6479beb92) } -var fileDescriptor_database_a524e050c674f25f = []byte{ +var fileDescriptor_database_4b48b7d6479beb92 = []byte{ // 724 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x55, 0xd1, 0x4e, 0xdb, 0x4a, 0x10, 0x95, 0x93, 0x00, 0xc9, 0x80, 0x80, 0xec, 0x05, 0x64, 0xf9, 0x72, 0x6f, 0x91, 0x1f, 0x28, diff --git a/helper/forwarding/types.pb.go b/helper/forwarding/types.pb.go index 0e5338c3c..1389fd1d4 100644 --- a/helper/forwarding/types.pb.go +++ b/helper/forwarding/types.pb.go @@ -22,12 +22,12 @@ type Request struct { // Not used right now but reserving in case it turns out that streaming // makes things more economical on the gRPC side // uint64 id = 1; - Method string `protobuf:"bytes,2,opt,name=method" json:"method,omitempty"` - Url *URL `protobuf:"bytes,3,opt,name=url" json:"url,omitempty"` - HeaderEntries map[string]*HeaderEntry `protobuf:"bytes,4,rep,name=header_entries,json=headerEntries" json:"header_entries,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"` + Method string `protobuf:"bytes,2,opt,name=method,proto3" json:"method,omitempty"` + Url *URL `protobuf:"bytes,3,opt,name=url,proto3" json:"url,omitempty"` + HeaderEntries map[string]*HeaderEntry `protobuf:"bytes,4,rep,name=header_entries,json=headerEntries,proto3" json:"header_entries,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` Body []byte `protobuf:"bytes,5,opt,name=body,proto3" json:"body,omitempty"` - Host string `protobuf:"bytes,6,opt,name=host" json:"host,omitempty"` - RemoteAddr string `protobuf:"bytes,7,opt,name=remote_addr,json=remoteAddr" json:"remote_addr,omitempty"` + Host string `protobuf:"bytes,6,opt,name=host,proto3" json:"host,omitempty"` + RemoteAddr string `protobuf:"bytes,7,opt,name=remote_addr,json=remoteAddr,proto3" json:"remote_addr,omitempty"` PeerCertificates [][]byte `protobuf:"bytes,8,rep,name=peer_certificates,json=peerCertificates,proto3" json:"peer_certificates,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` @@ -38,7 +38,7 @@ func (m *Request) Reset() { *m = Request{} } func (m *Request) String() string { return proto.CompactTextString(m) } func (*Request) ProtoMessage() {} func (*Request) Descriptor() ([]byte, []int) { - return fileDescriptor_types_6ebfa235129f89d8, []int{0} + return fileDescriptor_types_7ccf0973261c4726, []int{0} } func (m *Request) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_Request.Unmarshal(m, b) @@ -108,18 +108,18 @@ func (m *Request) GetPeerCertificates() [][]byte { } type URL struct { - Scheme string `protobuf:"bytes,1,opt,name=scheme" json:"scheme,omitempty"` - Opaque string `protobuf:"bytes,2,opt,name=opaque" json:"opaque,omitempty"` + Scheme string `protobuf:"bytes,1,opt,name=scheme,proto3" json:"scheme,omitempty"` + Opaque string `protobuf:"bytes,2,opt,name=opaque,proto3" json:"opaque,omitempty"` // This isn't needed now but might be in the future, so we'll skip the // number to keep the ordering in net/url // UserInfo user = 3; - Host string `protobuf:"bytes,4,opt,name=host" json:"host,omitempty"` - Path string `protobuf:"bytes,5,opt,name=path" json:"path,omitempty"` - RawPath string `protobuf:"bytes,6,opt,name=raw_path,json=rawPath" json:"raw_path,omitempty"` + Host string `protobuf:"bytes,4,opt,name=host,proto3" json:"host,omitempty"` + Path string `protobuf:"bytes,5,opt,name=path,proto3" json:"path,omitempty"` + RawPath string `protobuf:"bytes,6,opt,name=raw_path,json=rawPath,proto3" json:"raw_path,omitempty"` // This also isn't needed right now, but we'll reserve the number // bool force_query = 7; - RawQuery string `protobuf:"bytes,8,opt,name=raw_query,json=rawQuery" json:"raw_query,omitempty"` - Fragment string `protobuf:"bytes,9,opt,name=fragment" json:"fragment,omitempty"` + RawQuery string `protobuf:"bytes,8,opt,name=raw_query,json=rawQuery,proto3" json:"raw_query,omitempty"` + Fragment string `protobuf:"bytes,9,opt,name=fragment,proto3" json:"fragment,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -129,7 +129,7 @@ func (m *URL) Reset() { *m = URL{} } func (m *URL) String() string { return proto.CompactTextString(m) } func (*URL) ProtoMessage() {} func (*URL) Descriptor() ([]byte, []int) { - return fileDescriptor_types_6ebfa235129f89d8, []int{1} + return fileDescriptor_types_7ccf0973261c4726, []int{1} } func (m *URL) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_URL.Unmarshal(m, b) @@ -199,7 +199,7 @@ func (m *URL) GetFragment() string { } type HeaderEntry struct { - Values []string `protobuf:"bytes,1,rep,name=values" json:"values,omitempty"` + Values []string `protobuf:"bytes,1,rep,name=values,proto3" json:"values,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -209,7 +209,7 @@ func (m *HeaderEntry) Reset() { *m = HeaderEntry{} } func (m *HeaderEntry) String() string { return proto.CompactTextString(m) } func (*HeaderEntry) ProtoMessage() {} func (*HeaderEntry) Descriptor() ([]byte, []int) { - return fileDescriptor_types_6ebfa235129f89d8, []int{2} + return fileDescriptor_types_7ccf0973261c4726, []int{2} } func (m *HeaderEntry) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_HeaderEntry.Unmarshal(m, b) @@ -240,11 +240,11 @@ type Response struct { // Not used right now but reserving in case it turns out that streaming // makes things more economical on the gRPC side // uint64 id = 1; - StatusCode uint32 `protobuf:"varint,2,opt,name=status_code,json=statusCode" json:"status_code,omitempty"` + StatusCode uint32 `protobuf:"varint,2,opt,name=status_code,json=statusCode,proto3" json:"status_code,omitempty"` Body []byte `protobuf:"bytes,3,opt,name=body,proto3" json:"body,omitempty"` // Added in 0.6.2 to ensure that the content-type is set appropriately, as // well as any other information - HeaderEntries map[string]*HeaderEntry `protobuf:"bytes,4,rep,name=header_entries,json=headerEntries" json:"header_entries,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"` + HeaderEntries map[string]*HeaderEntry `protobuf:"bytes,4,rep,name=header_entries,json=headerEntries,proto3" json:"header_entries,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -254,7 +254,7 @@ func (m *Response) Reset() { *m = Response{} } func (m *Response) String() string { return proto.CompactTextString(m) } func (*Response) ProtoMessage() {} func (*Response) Descriptor() ([]byte, []int) { - return fileDescriptor_types_6ebfa235129f89d8, []int{3} + return fileDescriptor_types_7ccf0973261c4726, []int{3} } func (m *Response) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_Response.Unmarshal(m, b) @@ -305,10 +305,10 @@ func init() { } func init() { - proto.RegisterFile("helper/forwarding/types.proto", fileDescriptor_types_6ebfa235129f89d8) + proto.RegisterFile("helper/forwarding/types.proto", fileDescriptor_types_7ccf0973261c4726) } -var fileDescriptor_types_6ebfa235129f89d8 = []byte{ +var fileDescriptor_types_7ccf0973261c4726 = []byte{ // 475 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x53, 0x4f, 0x8f, 0xd3, 0x3e, 0x10, 0x55, 0x9a, 0x6e, 0xff, 0x4c, 0x77, 0x7f, 0xbf, 0xc5, 0x07, 0x30, 0x8b, 0x10, 0xa1, 0x12, diff --git a/helper/identity/types.pb.go b/helper/identity/types.pb.go index e26dcea22..6df572f47 100644 --- a/helper/identity/types.pb.go +++ b/helper/identity/types.pb.go @@ -22,41 +22,41 @@ const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package // Group represents an identity group. type Group struct { // ID is the unique identifier for this group - ID string `sentinel:"" protobuf:"bytes,1,opt,name=id" json:"id,omitempty"` + ID string `sentinel:"" protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"` // Name is the unique name for this group - Name string `sentinel:"" protobuf:"bytes,2,opt,name=name" json:"name,omitempty"` + Name string `sentinel:"" protobuf:"bytes,2,opt,name=name,proto3" json:"name,omitempty"` // Policies are the vault policies to be granted to members of this group - Policies []string `sentinel:"" protobuf:"bytes,3,rep,name=policies" json:"policies,omitempty"` + Policies []string `sentinel:"" protobuf:"bytes,3,rep,name=policies,proto3" json:"policies,omitempty"` // ParentGroupIDs are the identifiers of those groups to which this group is a // member of. These will serve as references to the parent group in the // hierarchy. - ParentGroupIDs []string `sentinel:"" protobuf:"bytes,4,rep,name=parent_group_ids,json=parentGroupIds" json:"parent_group_ids,omitempty"` + ParentGroupIDs []string `sentinel:"" protobuf:"bytes,4,rep,name=parent_group_ids,json=parentGroupIds,proto3" json:"parent_group_ids,omitempty"` // MemberEntityIDs are the identifiers of entities which are members of this // group - MemberEntityIDs []string `sentinel:"" protobuf:"bytes,5,rep,name=member_entity_ids,json=memberEntityIDs" json:"member_entity_ids,omitempty"` + MemberEntityIDs []string `sentinel:"" protobuf:"bytes,5,rep,name=member_entity_ids,json=memberEntityIDs,proto3" json:"member_entity_ids,omitempty"` // Metadata represents the custom data tied with this group - Metadata map[string]string `sentinel:"" protobuf:"bytes,6,rep,name=metadata" json:"metadata,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"` + Metadata map[string]string `sentinel:"" protobuf:"bytes,6,rep,name=metadata,proto3" json:"metadata,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` // CreationTime is the time at which this group was created - CreationTime *timestamp.Timestamp `sentinel:"" protobuf:"bytes,7,opt,name=creation_time,json=creationTime" json:"creation_time,omitempty"` + CreationTime *timestamp.Timestamp `sentinel:"" protobuf:"bytes,7,opt,name=creation_time,json=creationTime,proto3" json:"creation_time,omitempty"` // LastUpdateTime is the time at which this group was last modified - LastUpdateTime *timestamp.Timestamp `sentinel:"" protobuf:"bytes,8,opt,name=last_update_time,json=lastUpdateTime" json:"last_update_time,omitempty"` + LastUpdateTime *timestamp.Timestamp `sentinel:"" protobuf:"bytes,8,opt,name=last_update_time,json=lastUpdateTime,proto3" json:"last_update_time,omitempty"` // ModifyIndex tracks the number of updates to the group. It is useful to detect // updates to the groups. - ModifyIndex uint64 `sentinel:"" protobuf:"varint,9,opt,name=modify_index,json=modifyIndex" json:"modify_index,omitempty"` + ModifyIndex uint64 `sentinel:"" protobuf:"varint,9,opt,name=modify_index,json=modifyIndex,proto3" json:"modify_index,omitempty"` // BucketKeyHash is the MD5 hash of the storage bucket key into which this // group is stored in the underlying storage. This is useful to find all // the groups belonging to a particular bucket during invalidation of the // storage key. - BucketKeyHash string `sentinel:"" protobuf:"bytes,10,opt,name=bucket_key_hash,json=bucketKeyHash" json:"bucket_key_hash,omitempty"` + BucketKeyHash string `sentinel:"" protobuf:"bytes,10,opt,name=bucket_key_hash,json=bucketKeyHash,proto3" json:"bucket_key_hash,omitempty"` // Alias is used to mark this group as an internal mapping of a group that // is external to the identity store. Alias can only be set if the 'type' // is set to 'external'. - Alias *Alias `sentinel:"" protobuf:"bytes,11,opt,name=alias" json:"alias,omitempty"` + Alias *Alias `sentinel:"" protobuf:"bytes,11,opt,name=alias,proto3" json:"alias,omitempty"` // Type indicates if this group is an internal group or an external group. // Memberships of the internal groups can be managed over the API whereas // the memberships on the external group --for which a corresponding alias // will be set-- will be managed automatically. - Type string `sentinel:"" protobuf:"bytes,12,opt,name=type" json:"type,omitempty"` + Type string `sentinel:"" protobuf:"bytes,12,opt,name=type,proto3" json:"type,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -66,7 +66,7 @@ func (m *Group) Reset() { *m = Group{} } func (m *Group) String() string { return proto.CompactTextString(m) } func (*Group) ProtoMessage() {} func (*Group) Descriptor() ([]byte, []int) { - return fileDescriptor_types_d1c3c8d60c8e2caa, []int{0} + return fileDescriptor_types_01b7fd3cfabd028f, []int{0} } func (m *Group) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_Group.Unmarshal(m, b) @@ -176,44 +176,44 @@ type Entity struct { // Aliases are the identities that this entity is made of. This can be // empty as well to favor being able to create the entity first and then // incrementally adding aliases. - Aliases []*Alias `sentinel:"" protobuf:"bytes,1,rep,name=aliases" json:"aliases,omitempty"` + Aliases []*Alias `sentinel:"" protobuf:"bytes,1,rep,name=aliases,proto3" json:"aliases,omitempty"` // ID is the unique identifier of the entity which always be a UUID. This // should never be allowed to be updated. - ID string `sentinel:"" protobuf:"bytes,2,opt,name=id" json:"id,omitempty"` + ID string `sentinel:"" protobuf:"bytes,2,opt,name=id,proto3" json:"id,omitempty"` // Name is a unique identifier of the entity which is intended to be // human-friendly. The default name might not be human friendly since it // gets suffixed by a UUID, but it can optionally be updated, unlike the ID // field. - Name string `sentinel:"" protobuf:"bytes,3,opt,name=name" json:"name,omitempty"` + Name string `sentinel:"" protobuf:"bytes,3,opt,name=name,proto3" json:"name,omitempty"` // Metadata represents the explicit metadata which is set by the // clients. This is useful to tie any information pertaining to the // aliases. This is a non-unique field of entity, meaning multiple // entities can have the same metadata set. Entities will be indexed based // on this explicit metadata. This enables virtual groupings of entities // based on its metadata. - Metadata map[string]string `sentinel:"" protobuf:"bytes,4,rep,name=metadata" json:"metadata,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"` + Metadata map[string]string `sentinel:"" protobuf:"bytes,4,rep,name=metadata,proto3" json:"metadata,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` // CreationTime is the time at which this entity is first created. - CreationTime *timestamp.Timestamp `sentinel:"" protobuf:"bytes,5,opt,name=creation_time,json=creationTime" json:"creation_time,omitempty"` + CreationTime *timestamp.Timestamp `sentinel:"" protobuf:"bytes,5,opt,name=creation_time,json=creationTime,proto3" json:"creation_time,omitempty"` // LastUpdateTime is the most recent time at which the properties of this // entity got modified. This is helpful in filtering out entities based on // its age and to take action on them, if desired. - LastUpdateTime *timestamp.Timestamp `sentinel:"" protobuf:"bytes,6,opt,name=last_update_time,json=lastUpdateTime" json:"last_update_time,omitempty"` + LastUpdateTime *timestamp.Timestamp `sentinel:"" protobuf:"bytes,6,opt,name=last_update_time,json=lastUpdateTime,proto3" json:"last_update_time,omitempty"` // MergedEntityIDs are the entities which got merged to this one. Entities // will be indexed based on all the entities that got merged into it. This // helps to apply the actions on this entity on the tokens that are merged // to the merged entities. Merged entities will be deleted entirely and // this is the only trackable trail of its earlier presence. - MergedEntityIDs []string `sentinel:"" protobuf:"bytes,7,rep,name=merged_entity_ids,json=mergedEntityIDs" json:"merged_entity_ids,omitempty"` + MergedEntityIDs []string `sentinel:"" protobuf:"bytes,7,rep,name=merged_entity_ids,json=mergedEntityIDs,proto3" json:"merged_entity_ids,omitempty"` // Policies the entity is entitled to - Policies []string `sentinel:"" protobuf:"bytes,8,rep,name=policies" json:"policies,omitempty"` + Policies []string `sentinel:"" protobuf:"bytes,8,rep,name=policies,proto3" json:"policies,omitempty"` // BucketKeyHash is the MD5 hash of the storage bucket key into which this // entity is stored in the underlying storage. This is useful to find all // the entities belonging to a particular bucket during invalidation of the // storage key. - BucketKeyHash string `sentinel:"" protobuf:"bytes,9,opt,name=bucket_key_hash,json=bucketKeyHash" json:"bucket_key_hash,omitempty"` + BucketKeyHash string `sentinel:"" protobuf:"bytes,9,opt,name=bucket_key_hash,json=bucketKeyHash,proto3" json:"bucket_key_hash,omitempty"` // Disabled indicates whether tokens associated with the account should not // be able to be used - Disabled bool `sentinel:"" protobuf:"varint,11,opt,name=disabled" json:"disabled,omitempty"` + Disabled bool `sentinel:"" protobuf:"varint,11,opt,name=disabled,proto3" json:"disabled,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -223,7 +223,7 @@ func (m *Entity) Reset() { *m = Entity{} } func (m *Entity) String() string { return proto.CompactTextString(m) } func (*Entity) ProtoMessage() {} func (*Entity) Descriptor() ([]byte, []int) { - return fileDescriptor_types_d1c3c8d60c8e2caa, []int{1} + return fileDescriptor_types_01b7fd3cfabd028f, []int{1} } func (m *Entity) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_Entity.Unmarshal(m, b) @@ -318,37 +318,37 @@ func (m *Entity) GetDisabled() bool { // alias object. type Alias struct { // ID is the unique identifier that represents this alias - ID string `sentinel:"" protobuf:"bytes,1,opt,name=id" json:"id,omitempty"` + ID string `sentinel:"" protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"` // CanonicalID is the entity identifier to which this alias belongs to - CanonicalID string `sentinel:"" protobuf:"bytes,2,opt,name=canonical_id,json=canonicalId" json:"canonical_id,omitempty"` + CanonicalID string `sentinel:"" protobuf:"bytes,2,opt,name=canonical_id,json=canonicalId,proto3" json:"canonical_id,omitempty"` // MountType is the backend mount's type to which this alias belongs to. // This enables categorically querying aliases of specific backend types. - MountType string `sentinel:"" protobuf:"bytes,3,opt,name=mount_type,json=mountType" json:"mount_type,omitempty"` + MountType string `sentinel:"" protobuf:"bytes,3,opt,name=mount_type,json=mountType,proto3" json:"mount_type,omitempty"` // MountAccessor is the backend mount's accessor to which this alias // belongs to. - MountAccessor string `sentinel:"" protobuf:"bytes,4,opt,name=mount_accessor,json=mountAccessor" json:"mount_accessor,omitempty"` + MountAccessor string `sentinel:"" protobuf:"bytes,4,opt,name=mount_accessor,json=mountAccessor,proto3" json:"mount_accessor,omitempty"` // MountPath is the backend mount's path to which the Maccessor belongs to. This // field is not used for any operational purposes. This is only returned when // alias is read, only as a nicety. - MountPath string `sentinel:"" protobuf:"bytes,5,opt,name=mount_path,json=mountPath" json:"mount_path,omitempty"` + MountPath string `sentinel:"" protobuf:"bytes,5,opt,name=mount_path,json=mountPath,proto3" json:"mount_path,omitempty"` // Metadata is the explicit metadata that clients set against an entity // which enables virtual grouping of aliases. Aliases will be indexed // against their metadata. - Metadata map[string]string `sentinel:"" protobuf:"bytes,6,rep,name=metadata" json:"metadata,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"` + Metadata map[string]string `sentinel:"" protobuf:"bytes,6,rep,name=metadata,proto3" json:"metadata,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` // Name is the identifier of this alias in its authentication source. // This does not uniquely identify an alias in Vault. This in conjunction // with MountAccessor form to be the factors that represent an alias in a // unique way. Aliases will be indexed based on this combined uniqueness // factor. - Name string `sentinel:"" protobuf:"bytes,7,opt,name=name" json:"name,omitempty"` + Name string `sentinel:"" protobuf:"bytes,7,opt,name=name,proto3" json:"name,omitempty"` // CreationTime is the time at which this alias was first created - CreationTime *timestamp.Timestamp `sentinel:"" protobuf:"bytes,8,opt,name=creation_time,json=creationTime" json:"creation_time,omitempty"` + CreationTime *timestamp.Timestamp `sentinel:"" protobuf:"bytes,8,opt,name=creation_time,json=creationTime,proto3" json:"creation_time,omitempty"` // LastUpdateTime is the most recent time at which the properties of this // alias got modified. This is helpful in filtering out aliases based // on its age and to take action on them, if desired. - LastUpdateTime *timestamp.Timestamp `sentinel:"" protobuf:"bytes,9,opt,name=last_update_time,json=lastUpdateTime" json:"last_update_time,omitempty"` + LastUpdateTime *timestamp.Timestamp `sentinel:"" protobuf:"bytes,9,opt,name=last_update_time,json=lastUpdateTime,proto3" json:"last_update_time,omitempty"` // MergedFromCanonicalIDs is the FIFO history of merging activity - MergedFromCanonicalIDs []string `sentinel:"" protobuf:"bytes,10,rep,name=merged_from_canonical_ids,json=mergedFromCanonicalIds" json:"merged_from_canonical_ids,omitempty"` + MergedFromCanonicalIDs []string `sentinel:"" protobuf:"bytes,10,rep,name=merged_from_canonical_ids,json=mergedFromCanonicalIds,proto3" json:"merged_from_canonical_ids,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -358,7 +358,7 @@ func (m *Alias) Reset() { *m = Alias{} } func (m *Alias) String() string { return proto.CompactTextString(m) } func (*Alias) ProtoMessage() {} func (*Alias) Descriptor() ([]byte, []int) { - return fileDescriptor_types_d1c3c8d60c8e2caa, []int{2} + return fileDescriptor_types_01b7fd3cfabd028f, []int{2} } func (m *Alias) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_Alias.Unmarshal(m, b) @@ -457,9 +457,9 @@ func init() { proto.RegisterMapType((map[string]string)(nil), "identity.Alias.MetadataEntry") } -func init() { proto.RegisterFile("helper/identity/types.proto", fileDescriptor_types_d1c3c8d60c8e2caa) } +func init() { proto.RegisterFile("helper/identity/types.proto", fileDescriptor_types_01b7fd3cfabd028f) } -var fileDescriptor_types_d1c3c8d60c8e2caa = []byte{ +var fileDescriptor_types_01b7fd3cfabd028f = []byte{ // 656 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x95, 0x5d, 0x6f, 0xd3, 0x3c, 0x14, 0xc7, 0xd5, 0xa6, 0x2f, 0xe9, 0x69, 0xd7, 0xed, 0xb1, 0x1e, 0xa1, 0x50, 0x34, 0xe8, 0x26, diff --git a/helper/storagepacker/types.pb.go b/helper/storagepacker/types.pb.go index 2e82344ad..68ba2ef6e 100644 --- a/helper/storagepacker/types.pb.go +++ b/helper/storagepacker/types.pb.go @@ -20,8 +20,8 @@ var _ = math.Inf const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package type Item struct { - ID string `sentinel:"" protobuf:"bytes,1,opt,name=id" json:"id,omitempty"` - Message *any.Any `sentinel:"" protobuf:"bytes,2,opt,name=message" json:"message,omitempty"` + ID string `sentinel:"" protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"` + Message *any.Any `sentinel:"" protobuf:"bytes,2,opt,name=message,proto3" json:"message,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -31,7 +31,7 @@ func (m *Item) Reset() { *m = Item{} } func (m *Item) String() string { return proto.CompactTextString(m) } func (*Item) ProtoMessage() {} func (*Item) Descriptor() ([]byte, []int) { - return fileDescriptor_types_d6d76d5cfa424ba8, []int{0} + return fileDescriptor_types_6092d91e5958c3db, []int{0} } func (m *Item) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_Item.Unmarshal(m, b) @@ -66,8 +66,8 @@ func (m *Item) GetMessage() *any.Any { } type Bucket struct { - Key string `sentinel:"" protobuf:"bytes,1,opt,name=key" json:"key,omitempty"` - Items []*Item `sentinel:"" protobuf:"bytes,2,rep,name=items" json:"items,omitempty"` + Key string `sentinel:"" protobuf:"bytes,1,opt,name=key,proto3" json:"key,omitempty"` + Items []*Item `sentinel:"" protobuf:"bytes,2,rep,name=items,proto3" json:"items,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -77,7 +77,7 @@ func (m *Bucket) Reset() { *m = Bucket{} } func (m *Bucket) String() string { return proto.CompactTextString(m) } func (*Bucket) ProtoMessage() {} func (*Bucket) Descriptor() ([]byte, []int) { - return fileDescriptor_types_d6d76d5cfa424ba8, []int{1} + return fileDescriptor_types_6092d91e5958c3db, []int{1} } func (m *Bucket) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_Bucket.Unmarshal(m, b) @@ -117,10 +117,10 @@ func init() { } func init() { - proto.RegisterFile("helper/storagepacker/types.proto", fileDescriptor_types_d6d76d5cfa424ba8) + proto.RegisterFile("helper/storagepacker/types.proto", fileDescriptor_types_6092d91e5958c3db) } -var fileDescriptor_types_d6d76d5cfa424ba8 = []byte{ +var fileDescriptor_types_6092d91e5958c3db = []byte{ // 219 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x6c, 0x8f, 0x41, 0x4b, 0xc3, 0x40, 0x10, 0x85, 0x49, 0xaa, 0x15, 0xb7, 0x28, 0xb2, 0x7a, 0x88, 0x9e, 0x42, 0x4f, 0xf1, 0x32, 0x83, diff --git a/logical/identity.pb.go b/logical/identity.pb.go index 0deed7254..2bb3301f7 100644 --- a/logical/identity.pb.go +++ b/logical/identity.pb.go @@ -20,11 +20,11 @@ const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package type Entity struct { // ID is the unique identifier for the entity - ID string `protobuf:"bytes,1,opt,name=ID" json:"ID,omitempty"` + ID string `protobuf:"bytes,1,opt,name=ID,proto3" json:"ID,omitempty"` // Name is the human-friendly unique identifier for the entity - Name string `protobuf:"bytes,2,opt,name=name" json:"name,omitempty"` + Name string `protobuf:"bytes,2,opt,name=name,proto3" json:"name,omitempty"` // Aliases contains thhe alias mappings for the given entity - Aliases []*Alias `protobuf:"bytes,3,rep,name=aliases" json:"aliases,omitempty"` + Aliases []*Alias `protobuf:"bytes,3,rep,name=aliases,proto3" json:"aliases,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -34,7 +34,7 @@ func (m *Entity) Reset() { *m = Entity{} } func (m *Entity) String() string { return proto.CompactTextString(m) } func (*Entity) ProtoMessage() {} func (*Entity) Descriptor() ([]byte, []int) { - return fileDescriptor_identity_63bdeae5187a0ba9, []int{0} + return fileDescriptor_identity_6481f5f23202c059, []int{0} } func (m *Entity) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_Entity.Unmarshal(m, b) @@ -77,12 +77,12 @@ func (m *Entity) GetAliases() []*Alias { type Alias struct { // MountType is the backend mount's type to which this identity belongs - MountType string `protobuf:"bytes,1,opt,name=mount_type,json=mountType" json:"mount_type,omitempty"` + MountType string `protobuf:"bytes,1,opt,name=mount_type,json=mountType,proto3" json:"mount_type,omitempty"` // MountAccessor is the identifier of the mount entry to which this // identity belongs - MountAccessor string `protobuf:"bytes,2,opt,name=mount_accessor,json=mountAccessor" json:"mount_accessor,omitempty"` + MountAccessor string `protobuf:"bytes,2,opt,name=mount_accessor,json=mountAccessor,proto3" json:"mount_accessor,omitempty"` // Name is the identifier of this identity in its authentication source - Name string `protobuf:"bytes,3,opt,name=name" json:"name,omitempty"` + Name string `protobuf:"bytes,3,opt,name=name,proto3" json:"name,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -92,7 +92,7 @@ func (m *Alias) Reset() { *m = Alias{} } func (m *Alias) String() string { return proto.CompactTextString(m) } func (*Alias) ProtoMessage() {} func (*Alias) Descriptor() ([]byte, []int) { - return fileDescriptor_identity_63bdeae5187a0ba9, []int{1} + return fileDescriptor_identity_6481f5f23202c059, []int{1} } func (m *Alias) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_Alias.Unmarshal(m, b) @@ -138,9 +138,9 @@ func init() { proto.RegisterType((*Alias)(nil), "logical.Alias") } -func init() { proto.RegisterFile("logical/identity.proto", fileDescriptor_identity_63bdeae5187a0ba9) } +func init() { proto.RegisterFile("logical/identity.proto", fileDescriptor_identity_6481f5f23202c059) } -var fileDescriptor_identity_63bdeae5187a0ba9 = []byte{ +var fileDescriptor_identity_6481f5f23202c059 = []byte{ // 209 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x44, 0xcf, 0x31, 0x6b, 0x85, 0x30, 0x14, 0x05, 0x60, 0xd4, 0x56, 0xf1, 0x96, 0x3a, 0x64, 0x28, 0x2e, 0x05, 0x91, 0x16, 0x9c, 0x12, diff --git a/logical/plugin/pb/backend.pb.go b/logical/plugin/pb/backend.pb.go index 85596c188..713b24464 100644 --- a/logical/plugin/pb/backend.pb.go +++ b/logical/plugin/pb/backend.pb.go @@ -35,7 +35,7 @@ func (m *Empty) Reset() { *m = Empty{} } func (m *Empty) String() string { return proto.CompactTextString(m) } func (*Empty) ProtoMessage() {} func (*Empty) Descriptor() ([]byte, []int) { - return fileDescriptor_backend_b95a338e744ea757, []int{0} + return fileDescriptor_backend_47c8b1854cae270c, []int{0} } func (m *Empty) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_Empty.Unmarshal(m, b) @@ -56,7 +56,7 @@ func (m *Empty) XXX_DiscardUnknown() { var xxx_messageInfo_Empty proto.InternalMessageInfo type Header struct { - Header []string `sentinel:"" protobuf:"bytes,1,rep,name=header" json:"header,omitempty"` + Header []string `sentinel:"" protobuf:"bytes,1,rep,name=header,proto3" json:"header,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -66,7 +66,7 @@ func (m *Header) Reset() { *m = Header{} } func (m *Header) String() string { return proto.CompactTextString(m) } func (*Header) ProtoMessage() {} func (*Header) Descriptor() ([]byte, []int) { - return fileDescriptor_backend_b95a338e744ea757, []int{1} + return fileDescriptor_backend_47c8b1854cae270c, []int{1} } func (m *Header) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_Header.Unmarshal(m, b) @@ -105,9 +105,9 @@ type ProtoError struct { // ErrTypeInvalidRequest // ErrTypePermissionDenied // ErrTypeMultiAuthzPending - ErrType uint32 `sentinel:"" protobuf:"varint,1,opt,name=err_type,json=errType" json:"err_type,omitempty"` - ErrMsg string `sentinel:"" protobuf:"bytes,2,opt,name=err_msg,json=errMsg" json:"err_msg,omitempty"` - ErrCode int64 `sentinel:"" protobuf:"varint,3,opt,name=err_code,json=errCode" json:"err_code,omitempty"` + ErrType uint32 `sentinel:"" protobuf:"varint,1,opt,name=err_type,json=errType,proto3" json:"err_type,omitempty"` + ErrMsg string `sentinel:"" protobuf:"bytes,2,opt,name=err_msg,json=errMsg,proto3" json:"err_msg,omitempty"` + ErrCode int64 `sentinel:"" protobuf:"varint,3,opt,name=err_code,json=errCode,proto3" json:"err_code,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -117,7 +117,7 @@ func (m *ProtoError) Reset() { *m = ProtoError{} } func (m *ProtoError) String() string { return proto.CompactTextString(m) } func (*ProtoError) ProtoMessage() {} func (*ProtoError) Descriptor() ([]byte, []int) { - return fileDescriptor_backend_b95a338e744ea757, []int{2} + return fileDescriptor_backend_47c8b1854cae270c, []int{2} } func (m *ProtoError) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_ProtoError.Unmarshal(m, b) @@ -161,16 +161,16 @@ func (m *ProtoError) GetErrCode() int64 { // Paths is the structure of special paths that is used for SpecialPaths. type Paths struct { // Root are the paths that require a root token to access - Root []string `sentinel:"" protobuf:"bytes,1,rep,name=root" json:"root,omitempty"` + Root []string `sentinel:"" protobuf:"bytes,1,rep,name=root,proto3" json:"root,omitempty"` // Unauthenticated are the paths that can be accessed without any auth. - Unauthenticated []string `sentinel:"" protobuf:"bytes,2,rep,name=unauthenticated" json:"unauthenticated,omitempty"` + Unauthenticated []string `sentinel:"" protobuf:"bytes,2,rep,name=unauthenticated,proto3" json:"unauthenticated,omitempty"` // LocalStorage are paths (prefixes) that are local to this instance; this // indicates that these paths should not be replicated - LocalStorage []string `sentinel:"" protobuf:"bytes,3,rep,name=local_storage,json=localStorage" json:"local_storage,omitempty"` + LocalStorage []string `sentinel:"" protobuf:"bytes,3,rep,name=local_storage,json=localStorage,proto3" json:"local_storage,omitempty"` // SealWrapStorage are storage paths that, when using a capable seal, // should be seal wrapped with extra encryption. It is exact matching // unless it ends with '/' in which case it will be treated as a prefix. - SealWrapStorage []string `sentinel:"" protobuf:"bytes,4,rep,name=seal_wrap_storage,json=sealWrapStorage" json:"seal_wrap_storage,omitempty"` + SealWrapStorage []string `sentinel:"" protobuf:"bytes,4,rep,name=seal_wrap_storage,json=sealWrapStorage,proto3" json:"seal_wrap_storage,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -180,7 +180,7 @@ func (m *Paths) Reset() { *m = Paths{} } func (m *Paths) String() string { return proto.CompactTextString(m) } func (*Paths) ProtoMessage() {} func (*Paths) Descriptor() ([]byte, []int) { - return fileDescriptor_backend_b95a338e744ea757, []int{3} + return fileDescriptor_backend_47c8b1854cae270c, []int{3} } func (m *Paths) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_Paths.Unmarshal(m, b) @@ -230,71 +230,71 @@ func (m *Paths) GetSealWrapStorage() []string { type Request struct { // ID is the uuid associated with each request - ID string `sentinel:"" protobuf:"bytes,1,opt,name=id" json:"id,omitempty"` + ID string `sentinel:"" protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"` // If set, the name given to the replication secondary where this request // originated - ReplicationCluster string `sentinel:"" protobuf:"bytes,2,opt,name=ReplicationCluster" json:"ReplicationCluster,omitempty"` + ReplicationCluster string `sentinel:"" protobuf:"bytes,2,opt,name=ReplicationCluster,proto3" json:"ReplicationCluster,omitempty"` // Operation is the requested operation type - Operation string `sentinel:"" protobuf:"bytes,3,opt,name=operation" json:"operation,omitempty"` + Operation string `sentinel:"" protobuf:"bytes,3,opt,name=operation,proto3" json:"operation,omitempty"` // Path is the part of the request path not consumed by the // routing. As an example, if the original request path is "prod/aws/foo" // and the AWS logical backend is mounted at "prod/aws/", then the // final path is "foo" since the mount prefix is trimmed. - Path string `sentinel:"" protobuf:"bytes,4,opt,name=path" json:"path,omitempty"` + Path string `sentinel:"" protobuf:"bytes,4,opt,name=path,proto3" json:"path,omitempty"` // Request data is a JSON object that must have keys with string type. - Data string `sentinel:"" protobuf:"bytes,5,opt,name=data" json:"data,omitempty"` + Data string `sentinel:"" protobuf:"bytes,5,opt,name=data,proto3" json:"data,omitempty"` // Secret will be non-nil only for Revoke and Renew operations // to represent the secret that was returned prior. - Secret *Secret `sentinel:"" protobuf:"bytes,6,opt,name=secret" json:"secret,omitempty"` + Secret *Secret `sentinel:"" protobuf:"bytes,6,opt,name=secret,proto3" json:"secret,omitempty"` // Auth will be non-nil only for Renew operations // to represent the auth that was returned prior. - Auth *Auth `sentinel:"" protobuf:"bytes,7,opt,name=auth" json:"auth,omitempty"` + Auth *Auth `sentinel:"" protobuf:"bytes,7,opt,name=auth,proto3" json:"auth,omitempty"` // Headers will contain the http headers from the request. This value will // be used in the audit broker to ensure we are auditing only the allowed // headers. - Headers map[string]*Header `sentinel:"" protobuf:"bytes,8,rep,name=headers" json:"headers,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"` + Headers map[string]*Header `sentinel:"" protobuf:"bytes,8,rep,name=headers,proto3" json:"headers,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` // ClientToken is provided to the core so that the identity // can be verified and ACLs applied. This value is passed // through to the logical backends but after being salted and // hashed. - ClientToken string `sentinel:"" protobuf:"bytes,9,opt,name=client_token,json=clientToken" json:"client_token,omitempty"` + ClientToken string `sentinel:"" protobuf:"bytes,9,opt,name=client_token,json=clientToken,proto3" json:"client_token,omitempty"` // ClientTokenAccessor is provided to the core so that the it can get // logged as part of request audit logging. - ClientTokenAccessor string `sentinel:"" protobuf:"bytes,10,opt,name=client_token_accessor,json=clientTokenAccessor" json:"client_token_accessor,omitempty"` + ClientTokenAccessor string `sentinel:"" protobuf:"bytes,10,opt,name=client_token_accessor,json=clientTokenAccessor,proto3" json:"client_token_accessor,omitempty"` // DisplayName is provided to the logical backend to help associate // dynamic secrets with the source entity. This is not a sensitive // name, but is useful for operators. - DisplayName string `sentinel:"" protobuf:"bytes,11,opt,name=display_name,json=displayName" json:"display_name,omitempty"` + DisplayName string `sentinel:"" protobuf:"bytes,11,opt,name=display_name,json=displayName,proto3" json:"display_name,omitempty"` // MountPoint is provided so that a logical backend can generate // paths relative to itself. The `Path` is effectively the client // request path with the MountPoint trimmed off. - MountPoint string `sentinel:"" protobuf:"bytes,12,opt,name=mount_point,json=mountPoint" json:"mount_point,omitempty"` + MountPoint string `sentinel:"" protobuf:"bytes,12,opt,name=mount_point,json=mountPoint,proto3" json:"mount_point,omitempty"` // MountType is provided so that a logical backend can make decisions // based on the specific mount type (e.g., if a mount type has different // aliases, generating different defaults depending on the alias) - MountType string `sentinel:"" protobuf:"bytes,13,opt,name=mount_type,json=mountType" json:"mount_type,omitempty"` + MountType string `sentinel:"" protobuf:"bytes,13,opt,name=mount_type,json=mountType,proto3" json:"mount_type,omitempty"` // MountAccessor is provided so that identities returned by the authentication // backends can be tied to the mount it belongs to. - MountAccessor string `sentinel:"" protobuf:"bytes,14,opt,name=mount_accessor,json=mountAccessor" json:"mount_accessor,omitempty"` + MountAccessor string `sentinel:"" protobuf:"bytes,14,opt,name=mount_accessor,json=mountAccessor,proto3" json:"mount_accessor,omitempty"` // WrapInfo contains requested response wrapping parameters - WrapInfo *RequestWrapInfo `sentinel:"" protobuf:"bytes,15,opt,name=wrap_info,json=wrapInfo" json:"wrap_info,omitempty"` + WrapInfo *RequestWrapInfo `sentinel:"" protobuf:"bytes,15,opt,name=wrap_info,json=wrapInfo,proto3" json:"wrap_info,omitempty"` // ClientTokenRemainingUses represents the allowed number of uses left on the // token supplied - ClientTokenRemainingUses int64 `sentinel:"" protobuf:"varint,16,opt,name=client_token_remaining_uses,json=clientTokenRemainingUses" json:"client_token_remaining_uses,omitempty"` + ClientTokenRemainingUses int64 `sentinel:"" protobuf:"varint,16,opt,name=client_token_remaining_uses,json=clientTokenRemainingUses,proto3" json:"client_token_remaining_uses,omitempty"` // EntityID is the identity of the caller extracted out of the token used // to make this request - EntityID string `sentinel:"" protobuf:"bytes,17,opt,name=entity_id,json=entityId" json:"entity_id,omitempty"` + EntityID string `sentinel:"" protobuf:"bytes,17,opt,name=entity_id,json=entityId,proto3" json:"entity_id,omitempty"` // PolicyOverride indicates that the requestor wishes to override // soft-mandatory Sentinel policies - PolicyOverride bool `sentinel:"" protobuf:"varint,18,opt,name=policy_override,json=policyOverride" json:"policy_override,omitempty"` + PolicyOverride bool `sentinel:"" protobuf:"varint,18,opt,name=policy_override,json=policyOverride,proto3" json:"policy_override,omitempty"` // Whether the request is unauthenticated, as in, had no client token // attached. Useful in some situations where the client token is not made // accessible. - Unauthenticated bool `sentinel:"" protobuf:"varint,19,opt,name=unauthenticated" json:"unauthenticated,omitempty"` + Unauthenticated bool `sentinel:"" protobuf:"varint,19,opt,name=unauthenticated,proto3" json:"unauthenticated,omitempty"` // Connection will be non-nil only for credential providers to // inspect the connection information and potentially use it for // authentication/protection. - Connection *Connection `sentinel:"" protobuf:"bytes,20,opt,name=connection" json:"connection,omitempty"` + Connection *Connection `sentinel:"" protobuf:"bytes,20,opt,name=connection,proto3" json:"connection,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -304,7 +304,7 @@ func (m *Request) Reset() { *m = Request{} } func (m *Request) String() string { return proto.CompactTextString(m) } func (*Request) ProtoMessage() {} func (*Request) Descriptor() ([]byte, []int) { - return fileDescriptor_backend_b95a338e744ea757, []int{4} + return fileDescriptor_backend_47c8b1854cae270c, []int{4} } func (m *Request) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_Request.Unmarshal(m, b) @@ -465,55 +465,55 @@ func (m *Request) GetConnection() *Connection { } type Auth struct { - LeaseOptions *LeaseOptions `sentinel:"" protobuf:"bytes,1,opt,name=lease_options,json=leaseOptions" json:"lease_options,omitempty"` + LeaseOptions *LeaseOptions `sentinel:"" protobuf:"bytes,1,opt,name=lease_options,json=leaseOptions,proto3" json:"lease_options,omitempty"` // InternalData is a JSON object that is stored with the auth struct. // This will be sent back during a Renew/Revoke for storing internal data // used for those operations. - InternalData string `sentinel:"" protobuf:"bytes,2,opt,name=internal_data,json=internalData" json:"internal_data,omitempty"` + InternalData string `sentinel:"" protobuf:"bytes,2,opt,name=internal_data,json=internalData,proto3" json:"internal_data,omitempty"` // DisplayName is a non-security sensitive identifier that is // applicable to this Auth. It is used for logging and prefixing // of dynamic secrets. For example, DisplayName may be "armon" for // the github credential backend. If the client token is used to // generate a SQL credential, the user may be "github-armon-uuid". // This is to help identify the source without using audit tables. - DisplayName string `sentinel:"" protobuf:"bytes,3,opt,name=display_name,json=displayName" json:"display_name,omitempty"` + DisplayName string `sentinel:"" protobuf:"bytes,3,opt,name=display_name,json=displayName,proto3" json:"display_name,omitempty"` // Policies is the list of policies that the authenticated user // is associated with. - Policies []string `sentinel:"" protobuf:"bytes,4,rep,name=policies" json:"policies,omitempty"` + Policies []string `sentinel:"" protobuf:"bytes,4,rep,name=policies,proto3" json:"policies,omitempty"` // Metadata is used to attach arbitrary string-type metadata to // an authenticated user. This metadata will be outputted into the // audit log. - Metadata map[string]string `sentinel:"" protobuf:"bytes,5,rep,name=metadata" json:"metadata,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"` + Metadata map[string]string `sentinel:"" protobuf:"bytes,5,rep,name=metadata,proto3" json:"metadata,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` // ClientToken is the token that is generated for the authentication. // This will be filled in by Vault core when an auth structure is // returned. Setting this manually will have no effect. - ClientToken string `sentinel:"" protobuf:"bytes,6,opt,name=client_token,json=clientToken" json:"client_token,omitempty"` + ClientToken string `sentinel:"" protobuf:"bytes,6,opt,name=client_token,json=clientToken,proto3" json:"client_token,omitempty"` // Accessor is the identifier for the ClientToken. This can be used // to perform management functionalities (especially revocation) when // ClientToken in the audit logs are obfuscated. Accessor can be used // to revoke a ClientToken and to lookup the capabilities of the ClientToken, // both without actually knowing the ClientToken. - Accessor string `sentinel:"" protobuf:"bytes,7,opt,name=accessor" json:"accessor,omitempty"` + Accessor string `sentinel:"" protobuf:"bytes,7,opt,name=accessor,proto3" json:"accessor,omitempty"` // Period indicates that the token generated using this Auth object // should never expire. The token should be renewed within the duration // specified by this period. - Period int64 `sentinel:"" protobuf:"varint,8,opt,name=period" json:"period,omitempty"` + Period int64 `sentinel:"" protobuf:"varint,8,opt,name=period,proto3" json:"period,omitempty"` // Number of allowed uses of the issued token - NumUses int64 `sentinel:"" protobuf:"varint,9,opt,name=num_uses,json=numUses" json:"num_uses,omitempty"` + NumUses int64 `sentinel:"" protobuf:"varint,9,opt,name=num_uses,json=numUses,proto3" json:"num_uses,omitempty"` // EntityID is the identifier of the entity in identity store to which the // identity of the authenticating client belongs to. - EntityID string `sentinel:"" protobuf:"bytes,10,opt,name=entity_id,json=entityId" json:"entity_id,omitempty"` + EntityID string `sentinel:"" protobuf:"bytes,10,opt,name=entity_id,json=entityId,proto3" json:"entity_id,omitempty"` // Alias is the information about the authenticated client returned by // the auth backend - Alias *logical.Alias `sentinel:"" protobuf:"bytes,11,opt,name=alias" json:"alias,omitempty"` + Alias *logical.Alias `sentinel:"" protobuf:"bytes,11,opt,name=alias,proto3" json:"alias,omitempty"` // GroupAliases are the informational mappings of external groups which an // authenticated user belongs to. This is used to check if there are // mappings groups for the group aliases in identity store. For all the // matching groups, the entity ID of the user will be added. - GroupAliases []*logical.Alias `sentinel:"" protobuf:"bytes,12,rep,name=group_aliases,json=groupAliases" json:"group_aliases,omitempty"` + GroupAliases []*logical.Alias `sentinel:"" protobuf:"bytes,12,rep,name=group_aliases,json=groupAliases,proto3" json:"group_aliases,omitempty"` // If set, restricts usage of the certificates to client IPs falling within // the range of the specified CIDR(s). - BoundCidrs []string `sentinel:"" protobuf:"bytes,13,rep,name=bound_cidrs,json=boundCidrs" json:"bound_cidrs,omitempty"` + BoundCidrs []string `sentinel:"" protobuf:"bytes,13,rep,name=bound_cidrs,json=boundCidrs,proto3" json:"bound_cidrs,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -523,7 +523,7 @@ func (m *Auth) Reset() { *m = Auth{} } func (m *Auth) String() string { return proto.CompactTextString(m) } func (*Auth) ProtoMessage() {} func (*Auth) Descriptor() ([]byte, []int) { - return fileDescriptor_backend_b95a338e744ea757, []int{5} + return fileDescriptor_backend_47c8b1854cae270c, []int{5} } func (m *Auth) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_Auth.Unmarshal(m, b) @@ -635,11 +635,11 @@ func (m *Auth) GetBoundCidrs() []string { } type LeaseOptions struct { - TTL int64 `sentinel:"" protobuf:"varint,1,opt,name=TTL" json:"TTL,omitempty"` - Renewable bool `sentinel:"" protobuf:"varint,2,opt,name=renewable" json:"renewable,omitempty"` - Increment int64 `sentinel:"" protobuf:"varint,3,opt,name=increment" json:"increment,omitempty"` - IssueTime *timestamp.Timestamp `sentinel:"" protobuf:"bytes,4,opt,name=issue_time,json=issueTime" json:"issue_time,omitempty"` - MaxTTL int64 `sentinel:"" protobuf:"varint,5,opt,name=MaxTTL" json:"MaxTTL,omitempty"` + TTL int64 `sentinel:"" protobuf:"varint,1,opt,name=TTL,proto3" json:"TTL,omitempty"` + Renewable bool `sentinel:"" protobuf:"varint,2,opt,name=renewable,proto3" json:"renewable,omitempty"` + Increment int64 `sentinel:"" protobuf:"varint,3,opt,name=increment,proto3" json:"increment,omitempty"` + IssueTime *timestamp.Timestamp `sentinel:"" protobuf:"bytes,4,opt,name=issue_time,json=issueTime,proto3" json:"issue_time,omitempty"` + MaxTTL int64 `sentinel:"" protobuf:"varint,5,opt,name=MaxTTL,proto3" json:"MaxTTL,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -649,7 +649,7 @@ func (m *LeaseOptions) Reset() { *m = LeaseOptions{} } func (m *LeaseOptions) String() string { return proto.CompactTextString(m) } func (*LeaseOptions) ProtoMessage() {} func (*LeaseOptions) Descriptor() ([]byte, []int) { - return fileDescriptor_backend_b95a338e744ea757, []int{6} + return fileDescriptor_backend_47c8b1854cae270c, []int{6} } func (m *LeaseOptions) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_LeaseOptions.Unmarshal(m, b) @@ -705,15 +705,15 @@ func (m *LeaseOptions) GetMaxTTL() int64 { } type Secret struct { - LeaseOptions *LeaseOptions `sentinel:"" protobuf:"bytes,1,opt,name=lease_options,json=leaseOptions" json:"lease_options,omitempty"` + LeaseOptions *LeaseOptions `sentinel:"" protobuf:"bytes,1,opt,name=lease_options,json=leaseOptions,proto3" json:"lease_options,omitempty"` // InternalData is a JSON object that is stored with the secret. // This will be sent back during a Renew/Revoke for storing internal data // used for those operations. - InternalData string `sentinel:"" protobuf:"bytes,2,opt,name=internal_data,json=internalData" json:"internal_data,omitempty"` + InternalData string `sentinel:"" protobuf:"bytes,2,opt,name=internal_data,json=internalData,proto3" json:"internal_data,omitempty"` // LeaseID is the ID returned to the user to manage this secret. // This is generated by Vault core. Any set value will be ignored. // For requests, this will always be blank. - LeaseID string `sentinel:"" protobuf:"bytes,3,opt,name=lease_id,json=leaseId" json:"lease_id,omitempty"` + LeaseID string `sentinel:"" protobuf:"bytes,3,opt,name=lease_id,json=leaseId,proto3" json:"lease_id,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -723,7 +723,7 @@ func (m *Secret) Reset() { *m = Secret{} } func (m *Secret) String() string { return proto.CompactTextString(m) } func (*Secret) ProtoMessage() {} func (*Secret) Descriptor() ([]byte, []int) { - return fileDescriptor_backend_b95a338e744ea757, []int{7} + return fileDescriptor_backend_47c8b1854cae270c, []int{7} } func (m *Secret) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_Secret.Unmarshal(m, b) @@ -766,25 +766,25 @@ func (m *Secret) GetLeaseID() string { type Response struct { // Secret, if not nil, denotes that this response represents a secret. - Secret *Secret `sentinel:"" protobuf:"bytes,1,opt,name=secret" json:"secret,omitempty"` + Secret *Secret `sentinel:"" protobuf:"bytes,1,opt,name=secret,proto3" json:"secret,omitempty"` // Auth, if not nil, contains the authentication information for // this response. This is only checked and means something for // credential backends. - Auth *Auth `sentinel:"" protobuf:"bytes,2,opt,name=auth" json:"auth,omitempty"` + Auth *Auth `sentinel:"" protobuf:"bytes,2,opt,name=auth,proto3" json:"auth,omitempty"` // Response data is a JSON object that must have string keys. For // secrets, this data is sent down to the user as-is. To store internal // data that you don't want the user to see, store it in // Secret.InternalData. - Data string `sentinel:"" protobuf:"bytes,3,opt,name=data" json:"data,omitempty"` + Data string `sentinel:"" protobuf:"bytes,3,opt,name=data,proto3" json:"data,omitempty"` // Redirect is an HTTP URL to redirect to for further authentication. // This is only valid for credential backends. This will be blanked // for any logical backend and ignored. - Redirect string `sentinel:"" protobuf:"bytes,4,opt,name=redirect" json:"redirect,omitempty"` + Redirect string `sentinel:"" protobuf:"bytes,4,opt,name=redirect,proto3" json:"redirect,omitempty"` // Warnings allow operations or backends to return warnings in response // to user actions without failing the action outright. - Warnings []string `sentinel:"" protobuf:"bytes,5,rep,name=warnings" json:"warnings,omitempty"` + Warnings []string `sentinel:"" protobuf:"bytes,5,rep,name=warnings,proto3" json:"warnings,omitempty"` // Information for wrapping the response in a cubbyhole - WrapInfo *ResponseWrapInfo `sentinel:"" protobuf:"bytes,6,opt,name=wrap_info,json=wrapInfo" json:"wrap_info,omitempty"` + WrapInfo *ResponseWrapInfo `sentinel:"" protobuf:"bytes,6,opt,name=wrap_info,json=wrapInfo,proto3" json:"wrap_info,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -794,7 +794,7 @@ func (m *Response) Reset() { *m = Response{} } func (m *Response) String() string { return proto.CompactTextString(m) } func (*Response) ProtoMessage() {} func (*Response) Descriptor() ([]byte, []int) { - return fileDescriptor_backend_b95a338e744ea757, []int{8} + return fileDescriptor_backend_47c8b1854cae270c, []int{8} } func (m *Response) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_Response.Unmarshal(m, b) @@ -859,27 +859,27 @@ func (m *Response) GetWrapInfo() *ResponseWrapInfo { type ResponseWrapInfo struct { // Setting to non-zero specifies that the response should be wrapped. // Specifies the desired TTL of the wrapping token. - TTL int64 `sentinel:"" protobuf:"varint,1,opt,name=TTL" json:"TTL,omitempty"` + TTL int64 `sentinel:"" protobuf:"varint,1,opt,name=TTL,proto3" json:"TTL,omitempty"` // The token containing the wrapped response - Token string `sentinel:"" protobuf:"bytes,2,opt,name=token" json:"token,omitempty"` + Token string `sentinel:"" protobuf:"bytes,2,opt,name=token,proto3" json:"token,omitempty"` // The token accessor for the wrapped response token - Accessor string `sentinel:"" protobuf:"bytes,3,opt,name=accessor" json:"accessor,omitempty"` + Accessor string `sentinel:"" protobuf:"bytes,3,opt,name=accessor,proto3" json:"accessor,omitempty"` // The creation time. This can be used with the TTL to figure out an // expected expiration. - CreationTime *timestamp.Timestamp `sentinel:"" protobuf:"bytes,4,opt,name=creation_time,json=creationTime" json:"creation_time,omitempty"` + CreationTime *timestamp.Timestamp `sentinel:"" protobuf:"bytes,4,opt,name=creation_time,json=creationTime,proto3" json:"creation_time,omitempty"` // If the contained response is the output of a token creation call, the // created token's accessor will be accessible here - WrappedAccessor string `sentinel:"" protobuf:"bytes,5,opt,name=wrapped_accessor,json=wrappedAccessor" json:"wrapped_accessor,omitempty"` + WrappedAccessor string `sentinel:"" protobuf:"bytes,5,opt,name=wrapped_accessor,json=wrappedAccessor,proto3" json:"wrapped_accessor,omitempty"` // WrappedEntityID is the entity identifier of the caller who initiated the // wrapping request - WrappedEntityID string `sentinel:"" protobuf:"bytes,6,opt,name=wrapped_entity_id,json=wrappedEntityID" json:"wrapped_entity_id,omitempty"` + WrappedEntityID string `sentinel:"" protobuf:"bytes,6,opt,name=wrapped_entity_id,json=wrappedEntityID,proto3" json:"wrapped_entity_id,omitempty"` // The format to use. This doesn't get returned, it's only internal. - Format string `sentinel:"" protobuf:"bytes,7,opt,name=format" json:"format,omitempty"` + Format string `sentinel:"" protobuf:"bytes,7,opt,name=format,proto3" json:"format,omitempty"` // CreationPath is the original request path that was used to create // the wrapped response. - CreationPath string `sentinel:"" protobuf:"bytes,8,opt,name=creation_path,json=creationPath" json:"creation_path,omitempty"` + CreationPath string `sentinel:"" protobuf:"bytes,8,opt,name=creation_path,json=creationPath,proto3" json:"creation_path,omitempty"` // Controls seal wrapping behavior downstream for specific use cases - SealWrap bool `sentinel:"" protobuf:"varint,9,opt,name=seal_wrap,json=sealWrap" json:"seal_wrap,omitempty"` + SealWrap bool `sentinel:"" protobuf:"varint,9,opt,name=seal_wrap,json=sealWrap,proto3" json:"seal_wrap,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -889,7 +889,7 @@ func (m *ResponseWrapInfo) Reset() { *m = ResponseWrapInfo{} } func (m *ResponseWrapInfo) String() string { return proto.CompactTextString(m) } func (*ResponseWrapInfo) ProtoMessage() {} func (*ResponseWrapInfo) Descriptor() ([]byte, []int) { - return fileDescriptor_backend_b95a338e744ea757, []int{9} + return fileDescriptor_backend_47c8b1854cae270c, []int{9} } func (m *ResponseWrapInfo) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_ResponseWrapInfo.Unmarshal(m, b) @@ -975,13 +975,13 @@ func (m *ResponseWrapInfo) GetSealWrap() bool { type RequestWrapInfo struct { // Setting to non-zero specifies that the response should be wrapped. // Specifies the desired TTL of the wrapping token. - TTL int64 `sentinel:"" protobuf:"varint,1,opt,name=TTL" json:"TTL,omitempty"` + TTL int64 `sentinel:"" protobuf:"varint,1,opt,name=TTL,proto3" json:"TTL,omitempty"` // The format to use for the wrapped response; if not specified it's a bare // token - Format string `sentinel:"" protobuf:"bytes,2,opt,name=format" json:"format,omitempty"` + Format string `sentinel:"" protobuf:"bytes,2,opt,name=format,proto3" json:"format,omitempty"` // A flag to conforming backends that data for a given request should be // seal wrapped - SealWrap bool `sentinel:"" protobuf:"varint,3,opt,name=seal_wrap,json=sealWrap" json:"seal_wrap,omitempty"` + SealWrap bool `sentinel:"" protobuf:"varint,3,opt,name=seal_wrap,json=sealWrap,proto3" json:"seal_wrap,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -991,7 +991,7 @@ func (m *RequestWrapInfo) Reset() { *m = RequestWrapInfo{} } func (m *RequestWrapInfo) String() string { return proto.CompactTextString(m) } func (*RequestWrapInfo) ProtoMessage() {} func (*RequestWrapInfo) Descriptor() ([]byte, []int) { - return fileDescriptor_backend_b95a338e744ea757, []int{10} + return fileDescriptor_backend_47c8b1854cae270c, []int{10} } func (m *RequestWrapInfo) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_RequestWrapInfo.Unmarshal(m, b) @@ -1034,8 +1034,8 @@ func (m *RequestWrapInfo) GetSealWrap() bool { // HandleRequestArgs is the args for HandleRequest method. type HandleRequestArgs struct { - StorageID uint32 `sentinel:"" protobuf:"varint,1,opt,name=storage_id,json=storageId" json:"storage_id,omitempty"` - Request *Request `sentinel:"" protobuf:"bytes,2,opt,name=request" json:"request,omitempty"` + StorageID uint32 `sentinel:"" protobuf:"varint,1,opt,name=storage_id,json=storageId,proto3" json:"storage_id,omitempty"` + Request *Request `sentinel:"" protobuf:"bytes,2,opt,name=request,proto3" json:"request,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -1045,7 +1045,7 @@ func (m *HandleRequestArgs) Reset() { *m = HandleRequestArgs{} } func (m *HandleRequestArgs) String() string { return proto.CompactTextString(m) } func (*HandleRequestArgs) ProtoMessage() {} func (*HandleRequestArgs) Descriptor() ([]byte, []int) { - return fileDescriptor_backend_b95a338e744ea757, []int{11} + return fileDescriptor_backend_47c8b1854cae270c, []int{11} } func (m *HandleRequestArgs) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_HandleRequestArgs.Unmarshal(m, b) @@ -1081,8 +1081,8 @@ func (m *HandleRequestArgs) GetRequest() *Request { // HandleRequestReply is the reply for HandleRequest method. type HandleRequestReply struct { - Response *Response `sentinel:"" protobuf:"bytes,1,opt,name=response" json:"response,omitempty"` - Err *ProtoError `sentinel:"" protobuf:"bytes,2,opt,name=err" json:"err,omitempty"` + Response *Response `sentinel:"" protobuf:"bytes,1,opt,name=response,proto3" json:"response,omitempty"` + Err *ProtoError `sentinel:"" protobuf:"bytes,2,opt,name=err,proto3" json:"err,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -1092,7 +1092,7 @@ func (m *HandleRequestReply) Reset() { *m = HandleRequestReply{} } func (m *HandleRequestReply) String() string { return proto.CompactTextString(m) } func (*HandleRequestReply) ProtoMessage() {} func (*HandleRequestReply) Descriptor() ([]byte, []int) { - return fileDescriptor_backend_b95a338e744ea757, []int{12} + return fileDescriptor_backend_47c8b1854cae270c, []int{12} } func (m *HandleRequestReply) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_HandleRequestReply.Unmarshal(m, b) @@ -1128,7 +1128,7 @@ func (m *HandleRequestReply) GetErr() *ProtoError { // SpecialPathsReply is the reply for SpecialPaths method. type SpecialPathsReply struct { - Paths *Paths `sentinel:"" protobuf:"bytes,1,opt,name=paths" json:"paths,omitempty"` + Paths *Paths `sentinel:"" protobuf:"bytes,1,opt,name=paths,proto3" json:"paths,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -1138,7 +1138,7 @@ func (m *SpecialPathsReply) Reset() { *m = SpecialPathsReply{} } func (m *SpecialPathsReply) String() string { return proto.CompactTextString(m) } func (*SpecialPathsReply) ProtoMessage() {} func (*SpecialPathsReply) Descriptor() ([]byte, []int) { - return fileDescriptor_backend_b95a338e744ea757, []int{13} + return fileDescriptor_backend_47c8b1854cae270c, []int{13} } func (m *SpecialPathsReply) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_SpecialPathsReply.Unmarshal(m, b) @@ -1167,8 +1167,8 @@ func (m *SpecialPathsReply) GetPaths() *Paths { // HandleExistenceCheckArgs is the args for HandleExistenceCheck method. type HandleExistenceCheckArgs struct { - StorageID uint32 `sentinel:"" protobuf:"varint,1,opt,name=storage_id,json=storageId" json:"storage_id,omitempty"` - Request *Request `sentinel:"" protobuf:"bytes,2,opt,name=request" json:"request,omitempty"` + StorageID uint32 `sentinel:"" protobuf:"varint,1,opt,name=storage_id,json=storageId,proto3" json:"storage_id,omitempty"` + Request *Request `sentinel:"" protobuf:"bytes,2,opt,name=request,proto3" json:"request,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -1178,7 +1178,7 @@ func (m *HandleExistenceCheckArgs) Reset() { *m = HandleExistenceCheckAr func (m *HandleExistenceCheckArgs) String() string { return proto.CompactTextString(m) } func (*HandleExistenceCheckArgs) ProtoMessage() {} func (*HandleExistenceCheckArgs) Descriptor() ([]byte, []int) { - return fileDescriptor_backend_b95a338e744ea757, []int{14} + return fileDescriptor_backend_47c8b1854cae270c, []int{14} } func (m *HandleExistenceCheckArgs) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_HandleExistenceCheckArgs.Unmarshal(m, b) @@ -1214,9 +1214,9 @@ func (m *HandleExistenceCheckArgs) GetRequest() *Request { // HandleExistenceCheckReply is the reply for HandleExistenceCheck method. type HandleExistenceCheckReply struct { - CheckFound bool `sentinel:"" protobuf:"varint,1,opt,name=check_found,json=checkFound" json:"check_found,omitempty"` - Exists bool `sentinel:"" protobuf:"varint,2,opt,name=exists" json:"exists,omitempty"` - Err *ProtoError `sentinel:"" protobuf:"bytes,3,opt,name=err" json:"err,omitempty"` + CheckFound bool `sentinel:"" protobuf:"varint,1,opt,name=check_found,json=checkFound,proto3" json:"check_found,omitempty"` + Exists bool `sentinel:"" protobuf:"varint,2,opt,name=exists,proto3" json:"exists,omitempty"` + Err *ProtoError `sentinel:"" protobuf:"bytes,3,opt,name=err,proto3" json:"err,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -1226,7 +1226,7 @@ func (m *HandleExistenceCheckReply) Reset() { *m = HandleExistenceCheckR func (m *HandleExistenceCheckReply) String() string { return proto.CompactTextString(m) } func (*HandleExistenceCheckReply) ProtoMessage() {} func (*HandleExistenceCheckReply) Descriptor() ([]byte, []int) { - return fileDescriptor_backend_b95a338e744ea757, []int{15} + return fileDescriptor_backend_47c8b1854cae270c, []int{15} } func (m *HandleExistenceCheckReply) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_HandleExistenceCheckReply.Unmarshal(m, b) @@ -1269,9 +1269,9 @@ func (m *HandleExistenceCheckReply) GetErr() *ProtoError { // SetupArgs is the args for Setup method. type SetupArgs struct { - BrokerID uint32 `sentinel:"" protobuf:"varint,1,opt,name=broker_id,json=brokerId" json:"broker_id,omitempty"` - Config map[string]string `sentinel:"" protobuf:"bytes,2,rep,name=Config" json:"Config,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"` - BackendUUID string `sentinel:"" protobuf:"bytes,3,opt,name=backendUUID" json:"backendUUID,omitempty"` + BrokerID uint32 `sentinel:"" protobuf:"varint,1,opt,name=broker_id,json=brokerId,proto3" json:"broker_id,omitempty"` + Config map[string]string `sentinel:"" protobuf:"bytes,2,rep,name=Config,proto3" json:"Config,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` + BackendUUID string `sentinel:"" protobuf:"bytes,3,opt,name=backendUUID,proto3" json:"backendUUID,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -1281,7 +1281,7 @@ func (m *SetupArgs) Reset() { *m = SetupArgs{} } func (m *SetupArgs) String() string { return proto.CompactTextString(m) } func (*SetupArgs) ProtoMessage() {} func (*SetupArgs) Descriptor() ([]byte, []int) { - return fileDescriptor_backend_b95a338e744ea757, []int{16} + return fileDescriptor_backend_47c8b1854cae270c, []int{16} } func (m *SetupArgs) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_SetupArgs.Unmarshal(m, b) @@ -1324,7 +1324,7 @@ func (m *SetupArgs) GetBackendUUID() string { // SetupReply is the reply for Setup method. type SetupReply struct { - Err string `sentinel:"" protobuf:"bytes,1,opt,name=err" json:"err,omitempty"` + Err string `sentinel:"" protobuf:"bytes,1,opt,name=err,proto3" json:"err,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -1334,7 +1334,7 @@ func (m *SetupReply) Reset() { *m = SetupReply{} } func (m *SetupReply) String() string { return proto.CompactTextString(m) } func (*SetupReply) ProtoMessage() {} func (*SetupReply) Descriptor() ([]byte, []int) { - return fileDescriptor_backend_b95a338e744ea757, []int{17} + return fileDescriptor_backend_47c8b1854cae270c, []int{17} } func (m *SetupReply) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_SetupReply.Unmarshal(m, b) @@ -1363,7 +1363,7 @@ func (m *SetupReply) GetErr() string { // TypeReply is the reply for the Type method. type TypeReply struct { - Type uint32 `sentinel:"" protobuf:"varint,1,opt,name=type" json:"type,omitempty"` + Type uint32 `sentinel:"" protobuf:"varint,1,opt,name=type,proto3" json:"type,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -1373,7 +1373,7 @@ func (m *TypeReply) Reset() { *m = TypeReply{} } func (m *TypeReply) String() string { return proto.CompactTextString(m) } func (*TypeReply) ProtoMessage() {} func (*TypeReply) Descriptor() ([]byte, []int) { - return fileDescriptor_backend_b95a338e744ea757, []int{18} + return fileDescriptor_backend_47c8b1854cae270c, []int{18} } func (m *TypeReply) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_TypeReply.Unmarshal(m, b) @@ -1401,7 +1401,7 @@ func (m *TypeReply) GetType() uint32 { } type InvalidateKeyArgs struct { - Key string `sentinel:"" protobuf:"bytes,1,opt,name=key" json:"key,omitempty"` + Key string `sentinel:"" protobuf:"bytes,1,opt,name=key,proto3" json:"key,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -1411,7 +1411,7 @@ func (m *InvalidateKeyArgs) Reset() { *m = InvalidateKeyArgs{} } func (m *InvalidateKeyArgs) String() string { return proto.CompactTextString(m) } func (*InvalidateKeyArgs) ProtoMessage() {} func (*InvalidateKeyArgs) Descriptor() ([]byte, []int) { - return fileDescriptor_backend_b95a338e744ea757, []int{19} + return fileDescriptor_backend_47c8b1854cae270c, []int{19} } func (m *InvalidateKeyArgs) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_InvalidateKeyArgs.Unmarshal(m, b) @@ -1439,9 +1439,9 @@ func (m *InvalidateKeyArgs) GetKey() string { } type StorageEntry struct { - Key string `sentinel:"" protobuf:"bytes,1,opt,name=key" json:"key,omitempty"` + Key string `sentinel:"" protobuf:"bytes,1,opt,name=key,proto3" json:"key,omitempty"` Value []byte `sentinel:"" protobuf:"bytes,2,opt,name=value,proto3" json:"value,omitempty"` - SealWrap bool `sentinel:"" protobuf:"varint,3,opt,name=seal_wrap,json=sealWrap" json:"seal_wrap,omitempty"` + SealWrap bool `sentinel:"" protobuf:"varint,3,opt,name=seal_wrap,json=sealWrap,proto3" json:"seal_wrap,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -1451,7 +1451,7 @@ func (m *StorageEntry) Reset() { *m = StorageEntry{} } func (m *StorageEntry) String() string { return proto.CompactTextString(m) } func (*StorageEntry) ProtoMessage() {} func (*StorageEntry) Descriptor() ([]byte, []int) { - return fileDescriptor_backend_b95a338e744ea757, []int{20} + return fileDescriptor_backend_47c8b1854cae270c, []int{20} } func (m *StorageEntry) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_StorageEntry.Unmarshal(m, b) @@ -1493,7 +1493,7 @@ func (m *StorageEntry) GetSealWrap() bool { } type StorageListArgs struct { - Prefix string `sentinel:"" protobuf:"bytes,1,opt,name=prefix" json:"prefix,omitempty"` + Prefix string `sentinel:"" protobuf:"bytes,1,opt,name=prefix,proto3" json:"prefix,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -1503,7 +1503,7 @@ func (m *StorageListArgs) Reset() { *m = StorageListArgs{} } func (m *StorageListArgs) String() string { return proto.CompactTextString(m) } func (*StorageListArgs) ProtoMessage() {} func (*StorageListArgs) Descriptor() ([]byte, []int) { - return fileDescriptor_backend_b95a338e744ea757, []int{21} + return fileDescriptor_backend_47c8b1854cae270c, []int{21} } func (m *StorageListArgs) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_StorageListArgs.Unmarshal(m, b) @@ -1531,8 +1531,8 @@ func (m *StorageListArgs) GetPrefix() string { } type StorageListReply struct { - Keys []string `sentinel:"" protobuf:"bytes,1,rep,name=keys" json:"keys,omitempty"` - Err string `sentinel:"" protobuf:"bytes,2,opt,name=err" json:"err,omitempty"` + Keys []string `sentinel:"" protobuf:"bytes,1,rep,name=keys,proto3" json:"keys,omitempty"` + Err string `sentinel:"" protobuf:"bytes,2,opt,name=err,proto3" json:"err,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -1542,7 +1542,7 @@ func (m *StorageListReply) Reset() { *m = StorageListReply{} } func (m *StorageListReply) String() string { return proto.CompactTextString(m) } func (*StorageListReply) ProtoMessage() {} func (*StorageListReply) Descriptor() ([]byte, []int) { - return fileDescriptor_backend_b95a338e744ea757, []int{22} + return fileDescriptor_backend_47c8b1854cae270c, []int{22} } func (m *StorageListReply) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_StorageListReply.Unmarshal(m, b) @@ -1577,7 +1577,7 @@ func (m *StorageListReply) GetErr() string { } type StorageGetArgs struct { - Key string `sentinel:"" protobuf:"bytes,1,opt,name=key" json:"key,omitempty"` + Key string `sentinel:"" protobuf:"bytes,1,opt,name=key,proto3" json:"key,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -1587,7 +1587,7 @@ func (m *StorageGetArgs) Reset() { *m = StorageGetArgs{} } func (m *StorageGetArgs) String() string { return proto.CompactTextString(m) } func (*StorageGetArgs) ProtoMessage() {} func (*StorageGetArgs) Descriptor() ([]byte, []int) { - return fileDescriptor_backend_b95a338e744ea757, []int{23} + return fileDescriptor_backend_47c8b1854cae270c, []int{23} } func (m *StorageGetArgs) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_StorageGetArgs.Unmarshal(m, b) @@ -1615,8 +1615,8 @@ func (m *StorageGetArgs) GetKey() string { } type StorageGetReply struct { - Entry *StorageEntry `sentinel:"" protobuf:"bytes,1,opt,name=entry" json:"entry,omitempty"` - Err string `sentinel:"" protobuf:"bytes,2,opt,name=err" json:"err,omitempty"` + Entry *StorageEntry `sentinel:"" protobuf:"bytes,1,opt,name=entry,proto3" json:"entry,omitempty"` + Err string `sentinel:"" protobuf:"bytes,2,opt,name=err,proto3" json:"err,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -1626,7 +1626,7 @@ func (m *StorageGetReply) Reset() { *m = StorageGetReply{} } func (m *StorageGetReply) String() string { return proto.CompactTextString(m) } func (*StorageGetReply) ProtoMessage() {} func (*StorageGetReply) Descriptor() ([]byte, []int) { - return fileDescriptor_backend_b95a338e744ea757, []int{24} + return fileDescriptor_backend_47c8b1854cae270c, []int{24} } func (m *StorageGetReply) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_StorageGetReply.Unmarshal(m, b) @@ -1661,7 +1661,7 @@ func (m *StorageGetReply) GetErr() string { } type StoragePutArgs struct { - Entry *StorageEntry `sentinel:"" protobuf:"bytes,1,opt,name=entry" json:"entry,omitempty"` + Entry *StorageEntry `sentinel:"" protobuf:"bytes,1,opt,name=entry,proto3" json:"entry,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -1671,7 +1671,7 @@ func (m *StoragePutArgs) Reset() { *m = StoragePutArgs{} } func (m *StoragePutArgs) String() string { return proto.CompactTextString(m) } func (*StoragePutArgs) ProtoMessage() {} func (*StoragePutArgs) Descriptor() ([]byte, []int) { - return fileDescriptor_backend_b95a338e744ea757, []int{25} + return fileDescriptor_backend_47c8b1854cae270c, []int{25} } func (m *StoragePutArgs) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_StoragePutArgs.Unmarshal(m, b) @@ -1699,7 +1699,7 @@ func (m *StoragePutArgs) GetEntry() *StorageEntry { } type StoragePutReply struct { - Err string `sentinel:"" protobuf:"bytes,1,opt,name=err" json:"err,omitempty"` + Err string `sentinel:"" protobuf:"bytes,1,opt,name=err,proto3" json:"err,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -1709,7 +1709,7 @@ func (m *StoragePutReply) Reset() { *m = StoragePutReply{} } func (m *StoragePutReply) String() string { return proto.CompactTextString(m) } func (*StoragePutReply) ProtoMessage() {} func (*StoragePutReply) Descriptor() ([]byte, []int) { - return fileDescriptor_backend_b95a338e744ea757, []int{26} + return fileDescriptor_backend_47c8b1854cae270c, []int{26} } func (m *StoragePutReply) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_StoragePutReply.Unmarshal(m, b) @@ -1737,7 +1737,7 @@ func (m *StoragePutReply) GetErr() string { } type StorageDeleteArgs struct { - Key string `sentinel:"" protobuf:"bytes,1,opt,name=key" json:"key,omitempty"` + Key string `sentinel:"" protobuf:"bytes,1,opt,name=key,proto3" json:"key,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -1747,7 +1747,7 @@ func (m *StorageDeleteArgs) Reset() { *m = StorageDeleteArgs{} } func (m *StorageDeleteArgs) String() string { return proto.CompactTextString(m) } func (*StorageDeleteArgs) ProtoMessage() {} func (*StorageDeleteArgs) Descriptor() ([]byte, []int) { - return fileDescriptor_backend_b95a338e744ea757, []int{27} + return fileDescriptor_backend_47c8b1854cae270c, []int{27} } func (m *StorageDeleteArgs) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_StorageDeleteArgs.Unmarshal(m, b) @@ -1775,7 +1775,7 @@ func (m *StorageDeleteArgs) GetKey() string { } type StorageDeleteReply struct { - Err string `sentinel:"" protobuf:"bytes,1,opt,name=err" json:"err,omitempty"` + Err string `sentinel:"" protobuf:"bytes,1,opt,name=err,proto3" json:"err,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -1785,7 +1785,7 @@ func (m *StorageDeleteReply) Reset() { *m = StorageDeleteReply{} } func (m *StorageDeleteReply) String() string { return proto.CompactTextString(m) } func (*StorageDeleteReply) ProtoMessage() {} func (*StorageDeleteReply) Descriptor() ([]byte, []int) { - return fileDescriptor_backend_b95a338e744ea757, []int{28} + return fileDescriptor_backend_47c8b1854cae270c, []int{28} } func (m *StorageDeleteReply) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_StorageDeleteReply.Unmarshal(m, b) @@ -1813,7 +1813,7 @@ func (m *StorageDeleteReply) GetErr() string { } type TTLReply struct { - TTL int64 `sentinel:"" protobuf:"varint,1,opt,name=TTL" json:"TTL,omitempty"` + TTL int64 `sentinel:"" protobuf:"varint,1,opt,name=TTL,proto3" json:"TTL,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -1823,7 +1823,7 @@ func (m *TTLReply) Reset() { *m = TTLReply{} } func (m *TTLReply) String() string { return proto.CompactTextString(m) } func (*TTLReply) ProtoMessage() {} func (*TTLReply) Descriptor() ([]byte, []int) { - return fileDescriptor_backend_b95a338e744ea757, []int{29} + return fileDescriptor_backend_47c8b1854cae270c, []int{29} } func (m *TTLReply) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_TTLReply.Unmarshal(m, b) @@ -1851,8 +1851,8 @@ func (m *TTLReply) GetTTL() int64 { } type SudoPrivilegeArgs struct { - Path string `sentinel:"" protobuf:"bytes,1,opt,name=path" json:"path,omitempty"` - Token string `sentinel:"" protobuf:"bytes,2,opt,name=token" json:"token,omitempty"` + Path string `sentinel:"" protobuf:"bytes,1,opt,name=path,proto3" json:"path,omitempty"` + Token string `sentinel:"" protobuf:"bytes,2,opt,name=token,proto3" json:"token,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -1862,7 +1862,7 @@ func (m *SudoPrivilegeArgs) Reset() { *m = SudoPrivilegeArgs{} } func (m *SudoPrivilegeArgs) String() string { return proto.CompactTextString(m) } func (*SudoPrivilegeArgs) ProtoMessage() {} func (*SudoPrivilegeArgs) Descriptor() ([]byte, []int) { - return fileDescriptor_backend_b95a338e744ea757, []int{30} + return fileDescriptor_backend_47c8b1854cae270c, []int{30} } func (m *SudoPrivilegeArgs) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_SudoPrivilegeArgs.Unmarshal(m, b) @@ -1897,7 +1897,7 @@ func (m *SudoPrivilegeArgs) GetToken() string { } type SudoPrivilegeReply struct { - Sudo bool `sentinel:"" protobuf:"varint,1,opt,name=sudo" json:"sudo,omitempty"` + Sudo bool `sentinel:"" protobuf:"varint,1,opt,name=sudo,proto3" json:"sudo,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -1907,7 +1907,7 @@ func (m *SudoPrivilegeReply) Reset() { *m = SudoPrivilegeReply{} } func (m *SudoPrivilegeReply) String() string { return proto.CompactTextString(m) } func (*SudoPrivilegeReply) ProtoMessage() {} func (*SudoPrivilegeReply) Descriptor() ([]byte, []int) { - return fileDescriptor_backend_b95a338e744ea757, []int{31} + return fileDescriptor_backend_47c8b1854cae270c, []int{31} } func (m *SudoPrivilegeReply) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_SudoPrivilegeReply.Unmarshal(m, b) @@ -1935,7 +1935,7 @@ func (m *SudoPrivilegeReply) GetSudo() bool { } type TaintedReply struct { - Tainted bool `sentinel:"" protobuf:"varint,1,opt,name=tainted" json:"tainted,omitempty"` + Tainted bool `sentinel:"" protobuf:"varint,1,opt,name=tainted,proto3" json:"tainted,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -1945,7 +1945,7 @@ func (m *TaintedReply) Reset() { *m = TaintedReply{} } func (m *TaintedReply) String() string { return proto.CompactTextString(m) } func (*TaintedReply) ProtoMessage() {} func (*TaintedReply) Descriptor() ([]byte, []int) { - return fileDescriptor_backend_b95a338e744ea757, []int{32} + return fileDescriptor_backend_47c8b1854cae270c, []int{32} } func (m *TaintedReply) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_TaintedReply.Unmarshal(m, b) @@ -1973,7 +1973,7 @@ func (m *TaintedReply) GetTainted() bool { } type CachingDisabledReply struct { - Disabled bool `sentinel:"" protobuf:"varint,1,opt,name=disabled" json:"disabled,omitempty"` + Disabled bool `sentinel:"" protobuf:"varint,1,opt,name=disabled,proto3" json:"disabled,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -1983,7 +1983,7 @@ func (m *CachingDisabledReply) Reset() { *m = CachingDisabledReply{} } func (m *CachingDisabledReply) String() string { return proto.CompactTextString(m) } func (*CachingDisabledReply) ProtoMessage() {} func (*CachingDisabledReply) Descriptor() ([]byte, []int) { - return fileDescriptor_backend_b95a338e744ea757, []int{33} + return fileDescriptor_backend_47c8b1854cae270c, []int{33} } func (m *CachingDisabledReply) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_CachingDisabledReply.Unmarshal(m, b) @@ -2011,7 +2011,7 @@ func (m *CachingDisabledReply) GetDisabled() bool { } type ReplicationStateReply struct { - State int32 `sentinel:"" protobuf:"varint,1,opt,name=state" json:"state,omitempty"` + State int32 `sentinel:"" protobuf:"varint,1,opt,name=state,proto3" json:"state,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -2021,7 +2021,7 @@ func (m *ReplicationStateReply) Reset() { *m = ReplicationStateReply{} } func (m *ReplicationStateReply) String() string { return proto.CompactTextString(m) } func (*ReplicationStateReply) ProtoMessage() {} func (*ReplicationStateReply) Descriptor() ([]byte, []int) { - return fileDescriptor_backend_b95a338e744ea757, []int{34} + return fileDescriptor_backend_47c8b1854cae270c, []int{34} } func (m *ReplicationStateReply) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_ReplicationStateReply.Unmarshal(m, b) @@ -2049,9 +2049,9 @@ func (m *ReplicationStateReply) GetState() int32 { } type ResponseWrapDataArgs struct { - Data string `sentinel:"" protobuf:"bytes,1,opt,name=data" json:"data,omitempty"` - TTL int64 `sentinel:"" protobuf:"varint,2,opt,name=TTL" json:"TTL,omitempty"` - JWT bool `sentinel:"" protobuf:"varint,3,opt,name=JWT" json:"JWT,omitempty"` + Data string `sentinel:"" protobuf:"bytes,1,opt,name=data,proto3" json:"data,omitempty"` + TTL int64 `sentinel:"" protobuf:"varint,2,opt,name=TTL,proto3" json:"TTL,omitempty"` + JWT bool `sentinel:"" protobuf:"varint,3,opt,name=JWT,proto3" json:"JWT,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -2061,7 +2061,7 @@ func (m *ResponseWrapDataArgs) Reset() { *m = ResponseWrapDataArgs{} } func (m *ResponseWrapDataArgs) String() string { return proto.CompactTextString(m) } func (*ResponseWrapDataArgs) ProtoMessage() {} func (*ResponseWrapDataArgs) Descriptor() ([]byte, []int) { - return fileDescriptor_backend_b95a338e744ea757, []int{35} + return fileDescriptor_backend_47c8b1854cae270c, []int{35} } func (m *ResponseWrapDataArgs) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_ResponseWrapDataArgs.Unmarshal(m, b) @@ -2103,8 +2103,8 @@ func (m *ResponseWrapDataArgs) GetJWT() bool { } type ResponseWrapDataReply struct { - WrapInfo *ResponseWrapInfo `sentinel:"" protobuf:"bytes,1,opt,name=wrap_info,json=wrapInfo" json:"wrap_info,omitempty"` - Err string `sentinel:"" protobuf:"bytes,2,opt,name=err" json:"err,omitempty"` + WrapInfo *ResponseWrapInfo `sentinel:"" protobuf:"bytes,1,opt,name=wrap_info,json=wrapInfo,proto3" json:"wrap_info,omitempty"` + Err string `sentinel:"" protobuf:"bytes,2,opt,name=err,proto3" json:"err,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -2114,7 +2114,7 @@ func (m *ResponseWrapDataReply) Reset() { *m = ResponseWrapDataReply{} } func (m *ResponseWrapDataReply) String() string { return proto.CompactTextString(m) } func (*ResponseWrapDataReply) ProtoMessage() {} func (*ResponseWrapDataReply) Descriptor() ([]byte, []int) { - return fileDescriptor_backend_b95a338e744ea757, []int{36} + return fileDescriptor_backend_47c8b1854cae270c, []int{36} } func (m *ResponseWrapDataReply) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_ResponseWrapDataReply.Unmarshal(m, b) @@ -2149,7 +2149,7 @@ func (m *ResponseWrapDataReply) GetErr() string { } type MlockEnabledReply struct { - Enabled bool `sentinel:"" protobuf:"varint,1,opt,name=enabled" json:"enabled,omitempty"` + Enabled bool `sentinel:"" protobuf:"varint,1,opt,name=enabled,proto3" json:"enabled,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -2159,7 +2159,7 @@ func (m *MlockEnabledReply) Reset() { *m = MlockEnabledReply{} } func (m *MlockEnabledReply) String() string { return proto.CompactTextString(m) } func (*MlockEnabledReply) ProtoMessage() {} func (*MlockEnabledReply) Descriptor() ([]byte, []int) { - return fileDescriptor_backend_b95a338e744ea757, []int{37} + return fileDescriptor_backend_47c8b1854cae270c, []int{37} } func (m *MlockEnabledReply) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_MlockEnabledReply.Unmarshal(m, b) @@ -2187,7 +2187,7 @@ func (m *MlockEnabledReply) GetEnabled() bool { } type LocalMountReply struct { - Local bool `sentinel:"" protobuf:"varint,1,opt,name=local" json:"local,omitempty"` + Local bool `sentinel:"" protobuf:"varint,1,opt,name=local,proto3" json:"local,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -2197,7 +2197,7 @@ func (m *LocalMountReply) Reset() { *m = LocalMountReply{} } func (m *LocalMountReply) String() string { return proto.CompactTextString(m) } func (*LocalMountReply) ProtoMessage() {} func (*LocalMountReply) Descriptor() ([]byte, []int) { - return fileDescriptor_backend_b95a338e744ea757, []int{38} + return fileDescriptor_backend_47c8b1854cae270c, []int{38} } func (m *LocalMountReply) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_LocalMountReply.Unmarshal(m, b) @@ -2225,7 +2225,7 @@ func (m *LocalMountReply) GetLocal() bool { } type EntityInfoArgs struct { - EntityID string `sentinel:"" protobuf:"bytes,1,opt,name=entity_id,json=entityId" json:"entity_id,omitempty"` + EntityID string `sentinel:"" protobuf:"bytes,1,opt,name=entity_id,json=entityId,proto3" json:"entity_id,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -2235,7 +2235,7 @@ func (m *EntityInfoArgs) Reset() { *m = EntityInfoArgs{} } func (m *EntityInfoArgs) String() string { return proto.CompactTextString(m) } func (*EntityInfoArgs) ProtoMessage() {} func (*EntityInfoArgs) Descriptor() ([]byte, []int) { - return fileDescriptor_backend_b95a338e744ea757, []int{39} + return fileDescriptor_backend_47c8b1854cae270c, []int{39} } func (m *EntityInfoArgs) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_EntityInfoArgs.Unmarshal(m, b) @@ -2263,8 +2263,8 @@ func (m *EntityInfoArgs) GetEntityID() string { } type EntityInfoReply struct { - Entity *logical.Entity `sentinel:"" protobuf:"bytes,1,opt,name=entity" json:"entity,omitempty"` - Err string `sentinel:"" protobuf:"bytes,2,opt,name=err" json:"err,omitempty"` + Entity *logical.Entity `sentinel:"" protobuf:"bytes,1,opt,name=entity,proto3" json:"entity,omitempty"` + Err string `sentinel:"" protobuf:"bytes,2,opt,name=err,proto3" json:"err,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -2274,7 +2274,7 @@ func (m *EntityInfoReply) Reset() { *m = EntityInfoReply{} } func (m *EntityInfoReply) String() string { return proto.CompactTextString(m) } func (*EntityInfoReply) ProtoMessage() {} func (*EntityInfoReply) Descriptor() ([]byte, []int) { - return fileDescriptor_backend_b95a338e744ea757, []int{40} + return fileDescriptor_backend_47c8b1854cae270c, []int{40} } func (m *EntityInfoReply) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_EntityInfoReply.Unmarshal(m, b) @@ -2310,7 +2310,7 @@ func (m *EntityInfoReply) GetErr() string { type Connection struct { // RemoteAddr is the network address that sent the request. - RemoteAddr string `sentinel:"" protobuf:"bytes,1,opt,name=remote_addr,json=remoteAddr" json:"remote_addr,omitempty"` + RemoteAddr string `sentinel:"" protobuf:"bytes,1,opt,name=remote_addr,json=remoteAddr,proto3" json:"remote_addr,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -2320,7 +2320,7 @@ func (m *Connection) Reset() { *m = Connection{} } func (m *Connection) String() string { return proto.CompactTextString(m) } func (*Connection) ProtoMessage() {} func (*Connection) Descriptor() ([]byte, []int) { - return fileDescriptor_backend_b95a338e744ea757, []int{41} + return fileDescriptor_backend_47c8b1854cae270c, []int{41} } func (m *Connection) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_Connection.Unmarshal(m, b) @@ -3288,10 +3288,10 @@ var _SystemView_serviceDesc = grpc.ServiceDesc{ } func init() { - proto.RegisterFile("logical/plugin/pb/backend.proto", fileDescriptor_backend_b95a338e744ea757) + proto.RegisterFile("logical/plugin/pb/backend.proto", fileDescriptor_backend_47c8b1854cae270c) } -var fileDescriptor_backend_b95a338e744ea757 = []byte{ +var fileDescriptor_backend_47c8b1854cae270c = []byte{ // 2201 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x58, 0x5f, 0x73, 0xdb, 0xc6, 0x11, 0x1f, 0xfe, 0x07, 0x97, 0xa4, 0x28, 0x9d, 0x15, 0x17, 0xa6, 0x9d, 0x9a, 0x45, 0x6a, 0x9b, diff --git a/physical/types.pb.go b/physical/types.pb.go index c403cee7f..855209d19 100644 --- a/physical/types.pb.go +++ b/physical/types.pb.go @@ -22,7 +22,7 @@ type SealWrapEntry struct { Ciphertext []byte `protobuf:"bytes,1,opt,name=ciphertext,proto3" json:"ciphertext,omitempty"` IV []byte `protobuf:"bytes,2,opt,name=iv,proto3" json:"iv,omitempty"` HMAC []byte `protobuf:"bytes,3,opt,name=hmac,proto3" json:"hmac,omitempty"` - Wrapped bool `protobuf:"varint,4,opt,name=wrapped" json:"wrapped,omitempty"` + Wrapped bool `protobuf:"varint,4,opt,name=wrapped,proto3" json:"wrapped,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -32,7 +32,7 @@ func (m *SealWrapEntry) Reset() { *m = SealWrapEntry{} } func (m *SealWrapEntry) String() string { return proto.CompactTextString(m) } func (*SealWrapEntry) ProtoMessage() {} func (*SealWrapEntry) Descriptor() ([]byte, []int) { - return fileDescriptor_types_ce937ceb0910505a, []int{0} + return fileDescriptor_types_0f1d299b2a49592e, []int{0} } func (m *SealWrapEntry) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_SealWrapEntry.Unmarshal(m, b) @@ -84,9 +84,9 @@ func init() { proto.RegisterType((*SealWrapEntry)(nil), "physical.SealWrapEntry") } -func init() { proto.RegisterFile("physical/types.proto", fileDescriptor_types_ce937ceb0910505a) } +func init() { proto.RegisterFile("physical/types.proto", fileDescriptor_types_0f1d299b2a49592e) } -var fileDescriptor_types_ce937ceb0910505a = []byte{ +var fileDescriptor_types_0f1d299b2a49592e = []byte{ // 173 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x4c, 0xce, 0xb1, 0x0a, 0xc2, 0x30, 0x10, 0xc6, 0x71, 0x5a, 0x8b, 0x96, 0x43, 0x1d, 0x82, 0x43, 0x26, 0x29, 0x8a, 0xd0, 0xa9, 0x19, diff --git a/vault/request_forwarding_service.pb.go b/vault/request_forwarding_service.pb.go index cfe102478..1461feced 100644 --- a/vault/request_forwarding_service.pb.go +++ b/vault/request_forwarding_service.pb.go @@ -25,13 +25,13 @@ var _ = math.Inf const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package type EchoRequest struct { - Message string `protobuf:"bytes,1,opt,name=message" json:"message,omitempty"` + Message string `protobuf:"bytes,1,opt,name=message,proto3" json:"message,omitempty"` // ClusterAddr is used to send up a standby node's address to the active // node upon heartbeat - ClusterAddr string `protobuf:"bytes,2,opt,name=cluster_addr,json=clusterAddr" json:"cluster_addr,omitempty"` + ClusterAddr string `protobuf:"bytes,2,opt,name=cluster_addr,json=clusterAddr,proto3" json:"cluster_addr,omitempty"` // ClusterAddrs is used to send up a list of cluster addresses to a dr // primary from a dr secondary - ClusterAddrs []string `protobuf:"bytes,3,rep,name=cluster_addrs,json=clusterAddrs" json:"cluster_addrs,omitempty"` + ClusterAddrs []string `protobuf:"bytes,3,rep,name=cluster_addrs,json=clusterAddrs,proto3" json:"cluster_addrs,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -41,7 +41,7 @@ func (m *EchoRequest) Reset() { *m = EchoRequest{} } func (m *EchoRequest) String() string { return proto.CompactTextString(m) } func (*EchoRequest) ProtoMessage() {} func (*EchoRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_request_forwarding_service_2fdb694b57983716, []int{0} + return fileDescriptor_request_forwarding_service_9602fb43b1d0ebdf, []int{0} } func (m *EchoRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_EchoRequest.Unmarshal(m, b) @@ -83,9 +83,9 @@ func (m *EchoRequest) GetClusterAddrs() []string { } type EchoReply struct { - Message string `protobuf:"bytes,1,opt,name=message" json:"message,omitempty"` - ClusterAddrs []string `protobuf:"bytes,2,rep,name=cluster_addrs,json=clusterAddrs" json:"cluster_addrs,omitempty"` - ReplicationState uint32 `protobuf:"varint,3,opt,name=replication_state,json=replicationState" json:"replication_state,omitempty"` + Message string `protobuf:"bytes,1,opt,name=message,proto3" json:"message,omitempty"` + ClusterAddrs []string `protobuf:"bytes,2,rep,name=cluster_addrs,json=clusterAddrs,proto3" json:"cluster_addrs,omitempty"` + ReplicationState uint32 `protobuf:"varint,3,opt,name=replication_state,json=replicationState,proto3" json:"replication_state,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -95,7 +95,7 @@ func (m *EchoReply) Reset() { *m = EchoReply{} } func (m *EchoReply) String() string { return proto.CompactTextString(m) } func (*EchoReply) ProtoMessage() {} func (*EchoReply) Descriptor() ([]byte, []int) { - return fileDescriptor_request_forwarding_service_2fdb694b57983716, []int{1} + return fileDescriptor_request_forwarding_service_9602fb43b1d0ebdf, []int{1} } func (m *EchoReply) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_EchoReply.Unmarshal(m, b) @@ -247,10 +247,10 @@ var _RequestForwarding_serviceDesc = grpc.ServiceDesc{ } func init() { - proto.RegisterFile("vault/request_forwarding_service.proto", fileDescriptor_request_forwarding_service_2fdb694b57983716) + proto.RegisterFile("vault/request_forwarding_service.proto", fileDescriptor_request_forwarding_service_9602fb43b1d0ebdf) } -var fileDescriptor_request_forwarding_service_2fdb694b57983716 = []byte{ +var fileDescriptor_request_forwarding_service_9602fb43b1d0ebdf = []byte{ // 297 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x91, 0x41, 0x4b, 0xfb, 0x40, 0x10, 0xc5, 0x9b, 0xf6, 0xff, 0x57, 0xba, 0x6d, 0xa5, 0x5d, 0x3d, 0x84, 0x82, 0x10, 0x23, 0x48,