diff --git a/builtin/credential/cert/test-fixtures/keys/cert.pem b/builtin/credential/cert/test-fixtures/keys/cert.pem index 942d26698b12..5b7fa1aed069 100644 --- a/builtin/credential/cert/test-fixtures/keys/cert.pem +++ b/builtin/credential/cert/test-fixtures/keys/cert.pem @@ -1,22 +1,18 @@ -----BEGIN CERTIFICATE----- -MIIDtTCCAp2gAwIBAgIUf+jhKTFBnqSs34II0WS1L4QsbbAwDQYJKoZIhvcNAQEL -BQAwFjEUMBIGA1UEAxMLZXhhbXBsZS5jb20wHhcNMTYwMjI5MDIyNzQxWhcNMjUw -MTA1MTAyODExWjAbMRkwFwYDVQQDExBjZXJ0LmV4YW1wbGUuY29tMIIBIjANBgkq -hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAsZx0Svr82YJpFpIy4fJNW5fKA6B8mhxS -TRAVnygAftetT8puHflY0ss7Y6X2OXjsU0PRn+1PswtivhKi+eLtgWkUF9cFYFGn -SgMld6ZWRhNheZhA6ZfQmeM/BF2pa5HK2SDF36ljgjL9T+nWrru2Uv0BCoHzLAmi -YYMiIWplidMmMO5NTRG3k+3AN0TkfakB6JVzjLGhTcXdOcVEMXkeQVqJMAuGouU5 -donyqtnaHuIJGuUdy54YDnX86txhOQhAv6r7dHXzZxS4pmLvw8UI1rsSf/GLcUVG -B+5+AAGF5iuHC3N2DTl4xz3FcN4Cb4w9pbaQ7+mCzz+anqiJfyr2nwIDAQABo4H1 -MIHyMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAdBgNVHQ4EFgQUm++e -HpyM3p708bgZJuRYEdX1o+UwHwYDVR0jBBgwFoAUncSzT/6HMexyuiU9/7EgHu+o -k5swOwYIKwYBBQUHAQEELzAtMCsGCCsGAQUFBzAChh9odHRwOi8vMTI3LjAuMC4x -OjgyMDAvdjEvcGtpL2NhMCEGA1UdEQQaMBiCEGNlcnQuZXhhbXBsZS5jb22HBH8A -AAEwMQYDVR0fBCowKDAmoCSgIoYgaHR0cDovLzEyNy4wLjAuMTo4MjAwL3YxL3Br -aS9jcmwwDQYJKoZIhvcNAQELBQADggEBABsuvmPSNjjKTVN6itWzdQy+SgMIrwfs -X1Yb9Lefkkwmp9ovKFNQxa4DucuCuzXcQrbKwWTfHGgR8ct4rf30xCRoA7dbQWq4 -aYqNKFWrRaBRAaaYZ/O1ApRTOrXqRx9Eqr0H1BXLsoAq+mWassL8sf6siae+CpwA -KqBko5G0dNXq5T4i2LQbmoQSVetIrCJEeMrU+idkuqfV2h1BQKgSEhFDABjFdTCN -QDAHsEHsi2M4/jRW9fqEuhHSDfl2n7tkFUI8wTHUUCl7gXwweJ4qtaSXIwKXYzNj -xqKHA8Purc1Yfybz4iE1JCROi9fInKlzr5xABq8nb9Qc/J9DIQM+Xmk= +MIIC2zCCAcOgAwIBAgIJAJIiPq+77hewMA0GCSqGSIb3DQEBCwUAMBYxFDASBgNV +BAMTC2V4YW1wbGUuY29tMCAXDTI1MDEwNjE0MzgzMloYDzIwNTAwMTA3MTQzODMy +WjAbMRkwFwYDVQQDExBjZXJ0LmV4YW1wbGUuY29tMIIBIjANBgkqhkiG9w0BAQEF +AAOCAQ8AMIIBCgKCAQEAsZx0Svr82YJpFpIy4fJNW5fKA6B8mhxSTRAVnygAftet +T8puHflY0ss7Y6X2OXjsU0PRn+1PswtivhKi+eLtgWkUF9cFYFGnSgMld6ZWRhNh +eZhA6ZfQmeM/BF2pa5HK2SDF36ljgjL9T+nWrru2Uv0BCoHzLAmiYYMiIWplidMm +MO5NTRG3k+3AN0TkfakB6JVzjLGhTcXdOcVEMXkeQVqJMAuGouU5donyqtnaHuIJ +GuUdy54YDnX86txhOQhAv6r7dHXzZxS4pmLvw8UI1rsSf/GLcUVGB+5+AAGF5iuH +C3N2DTl4xz3FcN4Cb4w9pbaQ7+mCzz+anqiJfyr2nwIDAQABoyUwIzAhBgNVHREE +GjAYghBjZXJ0LmV4YW1wbGUuY29thwR/AAABMA0GCSqGSIb3DQEBCwUAA4IBAQB/ +0M2jZ8cZJW23s1xpMDS5u2ScrW4QdpVsPbuBu5dxi3SNx7MK0CbvcNVUEZE0WV6b +rCYvYS0+SBi0skudHRV7IeRADPcvzbXY/AdFktWt0adtQ/5B/DKeZIRrnhGtlzhD +m8b3TTnKLoGdV7iS5HO8emvlzaihY/5PjObkztLRLLDRmBAOwYv4z/xBhEqZJRV1 +Ztywy/Qy5srNJug+sHmj8JlBldob/Ohk7Eon04XvXMuCIBptPG/QytnmgGbDGghD +WO/HpCWBh6GHrwzQtof8y7Upxi16i5DSiFbRwNXgRyST4W/ChpZoggvOJ/RI4o2g +5serAZLPfBGztdRbTef2 -----END CERTIFICATE----- diff --git a/builtin/credential/cert/test-fixtures/keys/rebuild-cert.md b/builtin/credential/cert/test-fixtures/keys/rebuild-cert.md new file mode 100644 index 000000000000..6a69ff78e460 --- /dev/null +++ b/builtin/credential/cert/test-fixtures/keys/rebuild-cert.md @@ -0,0 +1,6 @@ +To rebuild the cert.pem within this folder run the following commands + +```shell +$ openssl x509 -in cert.pem -signkey key.pem -x509toreq -out cert.csr +$ openssl x509 -req -in cert.csr -CA ../root/rootcacert.pem -CAkey ../root/rootcakey.pem -CAcreateserial -out cert.pem -days 9132 -sha256 -extensions v3_req -extfile <(echo "[v3_req]\nsubjectAltName=DNS:cert.example.com,IP:127.0.0.1") +``` diff --git a/builtin/logical/pki/metadata.pb.go b/builtin/logical/pki/metadata.pb.go index fe8da60ea29f..53574ddc5ebb 100644 --- a/builtin/logical/pki/metadata.pb.go +++ b/builtin/logical/pki/metadata.pb.go @@ -3,7 +3,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.35.2 +// protoc-gen-go v1.36.0 // protoc (unknown) // source: builtin/logical/pki/metadata.proto @@ -25,14 +25,13 @@ const ( ) type CertificateMetadata struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - + state protoimpl.MessageState `protogen:"open.v1"` IssuerId string `protobuf:"bytes,1,opt,name=issuer_id,json=issuerId,proto3" json:"issuer_id,omitempty"` Role string `protobuf:"bytes,2,opt,name=role,proto3" json:"role,omitempty"` Expiration *timestamppb.Timestamp `protobuf:"bytes,3,opt,name=expiration,proto3" json:"expiration,omitempty"` ClientMetadata []byte `protobuf:"bytes,4,opt,name=client_metadata,json=clientMetadata,proto3,oneof" json:"client_metadata,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *CertificateMetadata) Reset() { diff --git a/helper/forwarding/types.pb.go b/helper/forwarding/types.pb.go index f3b1d9f60da0..3f262195d674 100644 --- a/helper/forwarding/types.pb.go +++ b/helper/forwarding/types.pb.go @@ -3,7 +3,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.35.2 +// protoc-gen-go v1.36.0 // protoc (unknown) // source: helper/forwarding/types.proto @@ -24,20 +24,19 @@ const ( ) type Request struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - + state protoimpl.MessageState `protogen:"open.v1"` // 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,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"` + 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" protobuf_val:"bytes,2,opt,name=value"` Body []byte `protobuf:"bytes,5,opt,name=body,proto3" json:"body,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"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *Request) Reset() { @@ -120,12 +119,9 @@ func (x *Request) GetPeerCertificates() [][]byte { } type URL struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - - Scheme string `protobuf:"bytes,1,opt,name=scheme,proto3" json:"scheme,omitempty"` - Opaque string `protobuf:"bytes,2,opt,name=opaque,proto3" json:"opaque,omitempty"` + state protoimpl.MessageState `protogen:"open.v1"` + 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; @@ -134,8 +130,10 @@ type URL struct { 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,proto3" json:"raw_query,omitempty"` - Fragment string `protobuf:"bytes,9,opt,name=fragment,proto3" 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"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *URL) Reset() { @@ -218,11 +216,10 @@ func (x *URL) GetFragment() string { } type HeaderEntry struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` + Values []string `protobuf:"bytes,1,rep,name=values,proto3" json:"values,omitempty"` unknownFields protoimpl.UnknownFields - - Values []string `protobuf:"bytes,1,rep,name=values,proto3" json:"values,omitempty"` + sizeCache protoimpl.SizeCache } func (x *HeaderEntry) Reset() { @@ -263,10 +260,7 @@ func (x *HeaderEntry) GetValues() []string { } type Response struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - + state protoimpl.MessageState `protogen:"open.v1"` // Not used right now but reserving in case it turns out that streaming // makes things more economical on the gRPC side // uint64 id = 1; @@ -274,8 +268,10 @@ type Response struct { 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,proto3" json:"header_entries,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` + 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" protobuf_val:"bytes,2,opt,name=value"` LastRemoteWal uint64 `protobuf:"varint,5,opt,name=last_remote_wal,json=lastRemoteWal,proto3" json:"last_remote_wal,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *Response) Reset() { diff --git a/helper/identity/mfa/types.pb.go b/helper/identity/mfa/types.pb.go index 5d8a57367d39..730f6d77f70b 100644 --- a/helper/identity/mfa/types.pb.go +++ b/helper/identity/mfa/types.pb.go @@ -3,7 +3,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.35.2 +// protoc-gen-go v1.36.0 // protoc (unknown) // source: helper/identity/mfa/types.proto @@ -28,10 +28,7 @@ const ( // Configuration information differs by type. Handler of each type should know // what to expect from the Config field. type Config struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - + state protoimpl.MessageState `protogen:"open.v1"` // @inject_tag: sentinel:"-" Type string `protobuf:"bytes,1,opt,name=type,proto3" json:"type,omitempty" sentinel:"-"` // @inject_tag: sentinel:"-" @@ -44,7 +41,7 @@ type Config struct { UsernameFormat string `protobuf:"bytes,5,opt,name=username_format,json=usernameFormat,proto3" json:"username_format,omitempty" sentinel:"-"` // @inject_tag: sentinel:"-" // - // Types that are assignable to Config: + // Types that are valid to be assigned to Config: // // *Config_TOTPConfig // *Config_OktaConfig @@ -52,7 +49,9 @@ type Config struct { // *Config_PingIDConfig Config isConfig_Config `protobuf_oneof:"config" sentinel:"-"` // @inject_tag: sentinel:"-" - NamespaceID string `protobuf:"bytes,10,opt,name=namespace_id,json=namespaceID,proto3" json:"namespace_id,omitempty" sentinel:"-"` + NamespaceID string `protobuf:"bytes,10,opt,name=namespace_id,json=namespaceID,proto3" json:"namespace_id,omitempty" sentinel:"-"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *Config) Reset() { @@ -120,37 +119,45 @@ func (x *Config) GetUsernameFormat() string { return "" } -func (m *Config) GetConfig() isConfig_Config { - if m != nil { - return m.Config +func (x *Config) GetConfig() isConfig_Config { + if x != nil { + return x.Config } return nil } func (x *Config) GetTOTPConfig() *TOTPConfig { - if x, ok := x.GetConfig().(*Config_TOTPConfig); ok { - return x.TOTPConfig + if x != nil { + if x, ok := x.Config.(*Config_TOTPConfig); ok { + return x.TOTPConfig + } } return nil } func (x *Config) GetOktaConfig() *OktaConfig { - if x, ok := x.GetConfig().(*Config_OktaConfig); ok { - return x.OktaConfig + if x != nil { + if x, ok := x.Config.(*Config_OktaConfig); ok { + return x.OktaConfig + } } return nil } func (x *Config) GetDuoConfig() *DuoConfig { - if x, ok := x.GetConfig().(*Config_DuoConfig); ok { - return x.DuoConfig + if x != nil { + if x, ok := x.Config.(*Config_DuoConfig); ok { + return x.DuoConfig + } } return nil } func (x *Config) GetPingIDConfig() *PingIDConfig { - if x, ok := x.GetConfig().(*Config_PingIDConfig); ok { - return x.PingIDConfig + if x != nil { + if x, ok := x.Config.(*Config_PingIDConfig); ok { + return x.PingIDConfig + } } return nil } @@ -196,10 +203,7 @@ func (*Config_PingIDConfig) isConfig_Config() {} // by the information stored in the entity and not from the values in the // configuration. type TOTPConfig struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - + state protoimpl.MessageState `protogen:"open.v1"` // @inject_tag: sentinel:"-" Issuer string `protobuf:"bytes,1,opt,name=issuer,proto3" json:"issuer,omitempty" sentinel:"-"` // @inject_tag: sentinel:"-" @@ -216,6 +220,8 @@ type TOTPConfig struct { QRSize int32 `protobuf:"varint,7,opt,name=qr_size,json=qrSize,proto3" json:"qr_size,omitempty" sentinel:"-"` // @inject_tag: sentinel:"-" MaxValidationAttempts uint32 `protobuf:"varint,8,opt,name=max_validation_attempts,json=maxValidationAttempts,proto3" json:"max_validation_attempts,omitempty" sentinel:"-"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *TOTPConfig) Reset() { @@ -307,10 +313,7 @@ func (x *TOTPConfig) GetMaxValidationAttempts() uint32 { // DuoConfig represents the configuration information required to perform // Duo authentication. type DuoConfig struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - + state protoimpl.MessageState `protogen:"open.v1"` // @inject_tag: sentinel:"-" IntegrationKey string `protobuf:"bytes,1,opt,name=integration_key,json=integrationKey,proto3" json:"integration_key,omitempty" sentinel:"-"` // @inject_tag: sentinel:"-" @@ -320,7 +323,9 @@ type DuoConfig struct { // @inject_tag: sentinel:"-" PushInfo string `protobuf:"bytes,4,opt,name=push_info,json=pushInfo,proto3" json:"push_info,omitempty" sentinel:"-"` // @inject_tag: sentinel:"-" - UsePasscode bool `protobuf:"varint,5,opt,name=use_passcode,json=usePasscode,proto3" json:"use_passcode,omitempty" sentinel:"-"` + UsePasscode bool `protobuf:"varint,5,opt,name=use_passcode,json=usePasscode,proto3" json:"use_passcode,omitempty" sentinel:"-"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *DuoConfig) Reset() { @@ -391,10 +396,7 @@ func (x *DuoConfig) GetUsePasscode() bool { // OktaConfig contains Okta configuration parameters required to perform Okta // authentication. type OktaConfig struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - + state protoimpl.MessageState `protogen:"open.v1"` // @inject_tag: sentinel:"-" OrgName string `protobuf:"bytes,1,opt,name=org_name,json=orgName,proto3" json:"org_name,omitempty" sentinel:"-"` // @inject_tag: sentinel:"-" @@ -404,7 +406,9 @@ type OktaConfig struct { // @inject_tag: sentinel:"-" BaseURL string `protobuf:"bytes,4,opt,name=base_url,json=baseUrl,proto3" json:"base_url,omitempty" sentinel:"-"` // @inject_tag: sentinel:"-" - PrimaryEmail bool `protobuf:"varint,5,opt,name=primary_email,json=primaryEmail,proto3" json:"primary_email,omitempty" sentinel:"-"` + PrimaryEmail bool `protobuf:"varint,5,opt,name=primary_email,json=primaryEmail,proto3" json:"primary_email,omitempty" sentinel:"-"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *OktaConfig) Reset() { @@ -474,10 +478,7 @@ func (x *OktaConfig) GetPrimaryEmail() bool { // PingIDConfig contains PingID configuration information type PingIDConfig struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - + state protoimpl.MessageState `protogen:"open.v1"` // @inject_tag: sentinel:"-" UseBase64Key string `protobuf:"bytes,1,opt,name=use_base64_key,json=useBase64Key,proto3" json:"use_base64_key,omitempty" sentinel:"-"` // @inject_tag: sentinel:"-" @@ -492,6 +493,8 @@ type PingIDConfig struct { AdminURL string `protobuf:"bytes,6,opt,name=admin_url,json=adminUrl,proto3" json:"admin_url,omitempty" sentinel:"-"` // @inject_tag: sentinel:"-" AuthenticatorURL string `protobuf:"bytes,7,opt,name=authenticator_url,json=authenticatorUrl,proto3" json:"authenticator_url,omitempty" sentinel:"-"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *PingIDConfig) Reset() { @@ -576,16 +579,15 @@ func (x *PingIDConfig) GetAuthenticatorURL() string { // Secret represents all the types of secrets which the entity can hold. // Each MFA type should add a secret type to the oneof block in this message. type Secret struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - + state protoimpl.MessageState `protogen:"open.v1"` // @inject_tag: sentinel:"-" MethodName string `protobuf:"bytes,1,opt,name=method_name,json=methodName,proto3" json:"method_name,omitempty" sentinel:"-"` - // Types that are assignable to Value: + // Types that are valid to be assigned to Value: // // *Secret_TOTPSecret - Value isSecret_Value `protobuf_oneof:"value"` + Value isSecret_Value `protobuf_oneof:"value"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *Secret) Reset() { @@ -625,16 +627,18 @@ func (x *Secret) GetMethodName() string { return "" } -func (m *Secret) GetValue() isSecret_Value { - if m != nil { - return m.Value +func (x *Secret) GetValue() isSecret_Value { + if x != nil { + return x.Value } return nil } func (x *Secret) GetTOTPSecret() *TOTPSecret { - if x, ok := x.GetValue().(*Secret_TOTPSecret); ok { - return x.TOTPSecret + if x != nil { + if x, ok := x.Value.(*Secret_TOTPSecret); ok { + return x.TOTPSecret + } } return nil } @@ -654,10 +658,7 @@ func (*Secret_TOTPSecret) isSecret_Value() {} // particular MFA method. This information is used to validate the MFA // credential supplied over the API during request time. type TOTPSecret struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - + state protoimpl.MessageState `protogen:"open.v1"` // @inject_tag: sentinel:"-" Issuer string `protobuf:"bytes,1,opt,name=issuer,proto3" json:"issuer,omitempty" sentinel:"-"` // @inject_tag: sentinel:"-" @@ -674,7 +675,9 @@ type TOTPSecret struct { // @inject_tag: sentinel:"-" AccountName string `protobuf:"bytes,8,opt,name=account_name,json=accountName,proto3" json:"account_name,omitempty" sentinel:"-"` // @inject_tag: sentinel:"-" - Key string `protobuf:"bytes,9,opt,name=key,proto3" json:"key,omitempty" sentinel:"-"` + Key string `protobuf:"bytes,9,opt,name=key,proto3" json:"key,omitempty" sentinel:"-"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *TOTPSecret) Reset() { @@ -766,18 +769,17 @@ func (x *TOTPSecret) GetKey() string { // MFAEnforcementConfig is what the user provides to the // mfa/login_enforcement endpoint. type MFAEnforcementConfig struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - - Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"` - NamespaceID string `protobuf:"bytes,2,opt,name=namespace_id,json=namespaceID,proto3" json:"namespace_id,omitempty"` - MFAMethodIDs []string `protobuf:"bytes,3,rep,name=mfa_method_ids,json=mfaMethodIds,proto3" json:"mfa_method_ids,omitempty"` - AuthMethodAccessors []string `protobuf:"bytes,4,rep,name=auth_method_accessors,json=authMethodAccessors,proto3" json:"auth_method_accessors,omitempty"` - AuthMethodTypes []string `protobuf:"bytes,5,rep,name=auth_method_types,json=authMethodTypes,proto3" json:"auth_method_types,omitempty"` - IdentityGroupIds []string `protobuf:"bytes,6,rep,name=identity_group_ids,json=identityGroupIds,proto3" json:"identity_group_ids,omitempty"` - IdentityEntityIDs []string `protobuf:"bytes,7,rep,name=identity_entity_ids,json=identityEntityIds,proto3" json:"identity_entity_ids,omitempty"` - ID string `protobuf:"bytes,8,opt,name=id,proto3" json:"id,omitempty"` + state protoimpl.MessageState `protogen:"open.v1"` + Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"` + NamespaceID string `protobuf:"bytes,2,opt,name=namespace_id,json=namespaceID,proto3" json:"namespace_id,omitempty"` + MFAMethodIDs []string `protobuf:"bytes,3,rep,name=mfa_method_ids,json=mfaMethodIds,proto3" json:"mfa_method_ids,omitempty"` + AuthMethodAccessors []string `protobuf:"bytes,4,rep,name=auth_method_accessors,json=authMethodAccessors,proto3" json:"auth_method_accessors,omitempty"` + AuthMethodTypes []string `protobuf:"bytes,5,rep,name=auth_method_types,json=authMethodTypes,proto3" json:"auth_method_types,omitempty"` + IdentityGroupIds []string `protobuf:"bytes,6,rep,name=identity_group_ids,json=identityGroupIds,proto3" json:"identity_group_ids,omitempty"` + IdentityEntityIDs []string `protobuf:"bytes,7,rep,name=identity_entity_ids,json=identityEntityIds,proto3" json:"identity_entity_ids,omitempty"` + ID string `protobuf:"bytes,8,opt,name=id,proto3" json:"id,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *MFAEnforcementConfig) Reset() { diff --git a/helper/identity/types.pb.go b/helper/identity/types.pb.go index a3055992823f..6483f082a8c8 100644 --- a/helper/identity/types.pb.go +++ b/helper/identity/types.pb.go @@ -3,7 +3,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.35.2 +// protoc-gen-go v1.36.0 // protoc (unknown) // source: helper/identity/types.proto @@ -27,10 +27,7 @@ const ( // Group represents an identity group. type Group struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - + state protoimpl.MessageState `protogen:"open.v1"` // ID is the unique identifier for this group // @inject_tag: sentinel:"-" ID string `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty" sentinel:"-"` @@ -51,7 +48,7 @@ type Group struct { MemberEntityIDs []string `protobuf:"bytes,5,rep,name=member_entity_ids,json=memberEntityIDs,proto3" json:"member_entity_ids,omitempty" sentinel:"-"` // Metadata represents the custom data tied with this group // @inject_tag: sentinel:"-" - Metadata map[string]string `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" sentinel:"-"` + Metadata map[string]string `protobuf:"bytes,6,rep,name=metadata,proto3" json:"metadata,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value" sentinel:"-"` // CreationTime is the time at which this group was created // @inject_tag: sentinel:"-" CreationTime *timestamppb.Timestamp `protobuf:"bytes,7,opt,name=creation_time,json=creationTime,proto3" json:"creation_time,omitempty" sentinel:"-"` @@ -81,7 +78,9 @@ type Group struct { // belongs to. Do not return this value over the API when reading the // group. // @inject_tag: sentinel:"-" - NamespaceID string `protobuf:"bytes,13,opt,name=namespace_id,json=namespaceID,proto3" json:"namespace_id,omitempty" sentinel:"-"` + NamespaceID string `protobuf:"bytes,13,opt,name=namespace_id,json=namespaceID,proto3" json:"namespace_id,omitempty" sentinel:"-"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *Group) Reset() { @@ -208,11 +207,10 @@ func (x *Group) GetNamespaceID() string { // LocalAliases holds the aliases belonging to an entity that are local to the // cluster. type LocalAliases struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` + Aliases []*Alias `protobuf:"bytes,1,rep,name=aliases,proto3" json:"aliases,omitempty"` unknownFields protoimpl.UnknownFields - - Aliases []*Alias `protobuf:"bytes,1,rep,name=aliases,proto3" json:"aliases,omitempty"` + sizeCache protoimpl.SizeCache } func (x *LocalAliases) Reset() { @@ -255,10 +253,7 @@ func (x *LocalAliases) GetAliases() []*Alias { // Entity represents an entity that gets persisted and indexed. // Entity is fundamentally composed of zero or many aliases. type Entity struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - + state protoimpl.MessageState `protogen:"open.v1"` // 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. @@ -281,7 +276,7 @@ type Entity struct { // on this explicit metadata. This enables virtual groupings of entities // based on its metadata. // @inject_tag: sentinel:"-" - Metadata map[string]string `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" sentinel:"-"` + Metadata map[string]string `protobuf:"bytes,4,rep,name=metadata,proto3" json:"metadata,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value" sentinel:"-"` // CreationTime is the time at which this entity is first created. // @inject_tag: sentinel:"-" CreationTime *timestamppb.Timestamp `protobuf:"bytes,5,opt,name=creation_time,json=creationTime,proto3" json:"creation_time,omitempty" sentinel:"-"` @@ -307,7 +302,7 @@ type Entity struct { // MFASecrets holds the MFA secrets indexed by the identifier of the MFA // method configuration. // @inject_tag: sentinel:"-" - MFASecrets map[string]*mfa.Secret `protobuf:"bytes,10,rep,name=mfa_secrets,json=mfaSecrets,proto3" json:"mfa_secrets,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3" sentinel:"-"` + MFASecrets map[string]*mfa.Secret `protobuf:"bytes,10,rep,name=mfa_secrets,json=mfaSecrets,proto3" json:"mfa_secrets,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value" sentinel:"-"` // Disabled indicates whether tokens associated with the account should not // be able to be used // @inject_tag: sentinel:"-" @@ -316,7 +311,9 @@ type Entity struct { // belongs to. Do not return this value over the API when reading the // entity. // @inject_tag: sentinel:"-" - NamespaceID string `protobuf:"bytes,12,opt,name=namespace_id,json=namespaceID,proto3" json:"namespace_id,omitempty" sentinel:"-"` + NamespaceID string `protobuf:"bytes,12,opt,name=namespace_id,json=namespaceID,proto3" json:"namespace_id,omitempty" sentinel:"-"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *Entity) Reset() { @@ -437,10 +434,7 @@ func (x *Entity) GetNamespaceID() string { // entity object in storage and also represents in an in-memory index of an // alias object. type Alias struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - + state protoimpl.MessageState `protogen:"open.v1"` // ID is the unique identifier that represents this alias // @inject_tag: sentinel:"-" ID string `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty" sentinel:"-"` @@ -464,7 +458,7 @@ type Alias struct { // which enables virtual grouping of aliases. Aliases will be indexed // against their metadata. // @inject_tag: sentinel:"-" - Metadata map[string]string `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" sentinel:"-"` + Metadata map[string]string `protobuf:"bytes,6,rep,name=metadata,proto3" json:"metadata,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value" sentinel:"-"` // 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 @@ -489,7 +483,7 @@ type Alias struct { NamespaceID string `protobuf:"bytes,11,opt,name=namespace_id,json=namespaceID,proto3" json:"namespace_id,omitempty" sentinel:"-"` // Custom Metadata represents the custom data tied to this alias // @inject_tag: sentinel:"-" - CustomMetadata map[string]string `protobuf:"bytes,12,rep,name=custom_metadata,json=customMetadata,proto3" json:"custom_metadata,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3" sentinel:"-"` + CustomMetadata map[string]string `protobuf:"bytes,12,rep,name=custom_metadata,json=customMetadata,proto3" json:"custom_metadata,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value" sentinel:"-"` // Local indicates if the alias only belongs to the cluster where it was // created. If true, the alias will be stored in a location that is ignored by // the performance replication subsystem. @@ -500,6 +494,8 @@ type Alias struct { // during invalidation of local aliases in performance standbys. // @inject_tag: sentinel:"-" LocalBucketKey string `protobuf:"bytes,14,opt,name=local_bucket_key,json=localBucketKey,proto3" json:"local_bucket_key,omitempty" sentinel:"-"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *Alias) Reset() { @@ -632,20 +628,19 @@ func (x *Alias) GetLocalBucketKey() string { // Deprecated. Retained for backwards compatibility. type EntityStorageEntry struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - + state protoimpl.MessageState `protogen:"open.v1"` Personas []*PersonaIndexEntry `protobuf:"bytes,1,rep,name=personas,proto3" json:"personas,omitempty"` ID string `protobuf:"bytes,2,opt,name=id,proto3" json:"id,omitempty"` Name string `protobuf:"bytes,3,opt,name=name,proto3" json:"name,omitempty"` - Metadata map[string]string `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"` + Metadata map[string]string `protobuf:"bytes,4,rep,name=metadata,proto3" json:"metadata,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"` CreationTime *timestamppb.Timestamp `protobuf:"bytes,5,opt,name=creation_time,json=creationTime,proto3" json:"creation_time,omitempty"` LastUpdateTime *timestamppb.Timestamp `protobuf:"bytes,6,opt,name=last_update_time,json=lastUpdateTime,proto3" json:"last_update_time,omitempty"` MergedEntityIDs []string `protobuf:"bytes,7,rep,name=merged_entity_ids,json=mergedEntityIDs,proto3" json:"merged_entity_ids,omitempty"` Policies []string `protobuf:"bytes,8,rep,name=policies,proto3" json:"policies,omitempty"` BucketKeyHash string `protobuf:"bytes,9,opt,name=bucket_key_hash,json=bucketKeyHash,proto3" json:"bucket_key_hash,omitempty"` - MFASecrets map[string]*mfa.Secret `protobuf:"bytes,10,rep,name=mfa_secrets,json=mfaSecrets,proto3" json:"mfa_secrets,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` + MFASecrets map[string]*mfa.Secret `protobuf:"bytes,10,rep,name=mfa_secrets,json=mfaSecrets,proto3" json:"mfa_secrets,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *EntityStorageEntry) Reset() { @@ -750,20 +745,19 @@ func (x *EntityStorageEntry) GetMFASecrets() map[string]*mfa.Secret { // Deprecated. Retained for backwards compatibility. type PersonaIndexEntry struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - + state protoimpl.MessageState `protogen:"open.v1"` ID string `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"` EntityID string `protobuf:"bytes,2,opt,name=entity_id,json=entityId,proto3" json:"entity_id,omitempty"` MountType string `protobuf:"bytes,3,opt,name=mount_type,json=mountType,proto3" json:"mount_type,omitempty"` MountAccessor string `protobuf:"bytes,4,opt,name=mount_accessor,json=mountAccessor,proto3" json:"mount_accessor,omitempty"` MountPath string `protobuf:"bytes,5,opt,name=mount_path,json=mountPath,proto3" json:"mount_path,omitempty"` - Metadata map[string]string `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"` + Metadata map[string]string `protobuf:"bytes,6,rep,name=metadata,proto3" json:"metadata,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"` Name string `protobuf:"bytes,7,opt,name=name,proto3" json:"name,omitempty"` CreationTime *timestamppb.Timestamp `protobuf:"bytes,8,opt,name=creation_time,json=creationTime,proto3" json:"creation_time,omitempty"` LastUpdateTime *timestamppb.Timestamp `protobuf:"bytes,9,opt,name=last_update_time,json=lastUpdateTime,proto3" json:"last_update_time,omitempty"` MergedFromEntityIDs []string `protobuf:"bytes,10,rep,name=merged_from_entity_ids,json=mergedFromEntityIDs,proto3" json:"merged_from_entity_ids,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *PersonaIndexEntry) Reset() { diff --git a/helper/storagepacker/types.pb.go b/helper/storagepacker/types.pb.go index a2893799fc4c..3bb573ce07ac 100644 --- a/helper/storagepacker/types.pb.go +++ b/helper/storagepacker/types.pb.go @@ -3,7 +3,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.35.2 +// protoc-gen-go v1.36.0 // protoc (unknown) // source: helper/storagepacker/types.proto @@ -26,10 +26,7 @@ const ( // Item represents an entry that gets inserted into the storage packer type Item struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - + state protoimpl.MessageState `protogen:"open.v1"` // ID must be provided by the caller; the same value, if used with GetItem, // can be used to fetch the item. However, when iterating through a bucket, // this ID will be an internal ID. In other words, outside of the use-case @@ -37,7 +34,9 @@ type Item struct { // consistent with what they passed in. ID string `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"` // message is the contents of the item - Message *anypb.Any `protobuf:"bytes,2,opt,name=message,proto3" json:"message,omitempty"` + Message *anypb.Any `protobuf:"bytes,2,opt,name=message,proto3" json:"message,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *Item) Reset() { @@ -91,16 +90,15 @@ func (x *Item) GetMessage() *anypb.Any { // to become independent buckets. Hence, this can grow infinitely in terms of // storage space for items that get inserted. type Bucket struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - + state protoimpl.MessageState `protogen:"open.v1"` // Key is the storage path where the bucket gets stored Key string `protobuf:"bytes,1,opt,name=key,proto3" json:"key,omitempty"` // Items holds the items contained within this bucket. Used by v1. Items []*Item `protobuf:"bytes,2,rep,name=items,proto3" json:"items,omitempty"` // ItemMap stores a mapping of item ID to message. Used by v2. - ItemMap map[string]*anypb.Any `protobuf:"bytes,3,rep,name=item_map,json=itemMap,proto3" json:"item_map,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` + ItemMap map[string]*anypb.Any `protobuf:"bytes,3,rep,name=item_map,json=itemMap,proto3" json:"item_map,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *Bucket) Reset() { diff --git a/physical/raft/types.pb.go b/physical/raft/types.pb.go index 301664e42274..2538564d816a 100644 --- a/physical/raft/types.pb.go +++ b/physical/raft/types.pb.go @@ -3,7 +3,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.35.2 +// protoc-gen-go v1.36.0 // protoc (unknown) // source: physical/raft/types.proto @@ -24,10 +24,7 @@ const ( ) type LogOperation struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - + state protoimpl.MessageState `protogen:"open.v1"` // OpType is the Operation type OpType uint32 `protobuf:"varint,1,opt,name=op_type,json=opType,proto3" json:"op_type,omitempty"` // Flags is an opaque value, currently unused. Reserved. @@ -35,7 +32,9 @@ type LogOperation struct { // Key that is being affected Key string `protobuf:"bytes,3,opt,name=key,proto3" json:"key,omitempty"` // Value is optional, corresponds to the key - Value []byte `protobuf:"bytes,4,opt,name=value,proto3" json:"value,omitempty"` + Value []byte `protobuf:"bytes,4,opt,name=value,proto3" json:"value,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *LogOperation) Reset() { @@ -97,11 +96,10 @@ func (x *LogOperation) GetValue() []byte { } type LogData struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` + Operations []*LogOperation `protobuf:"bytes,1,rep,name=operations,proto3" json:"operations,omitempty"` unknownFields protoimpl.UnknownFields - - Operations []*LogOperation `protobuf:"bytes,1,rep,name=operations,proto3" json:"operations,omitempty"` + sizeCache protoimpl.SizeCache } func (x *LogData) Reset() { @@ -142,12 +140,11 @@ func (x *LogData) GetOperations() []*LogOperation { } type IndexValue struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` + Term uint64 `protobuf:"varint,1,opt,name=term,proto3" json:"term,omitempty"` + Index uint64 `protobuf:"varint,2,opt,name=index,proto3" json:"index,omitempty"` unknownFields protoimpl.UnknownFields - - Term uint64 `protobuf:"varint,1,opt,name=term,proto3" json:"term,omitempty"` - Index uint64 `protobuf:"varint,2,opt,name=index,proto3" json:"index,omitempty"` + sizeCache protoimpl.SizeCache } func (x *IndexValue) Reset() { @@ -195,13 +192,12 @@ func (x *IndexValue) GetIndex() uint64 { } type Server struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` + Suffrage int32 `protobuf:"varint,1,opt,name=suffrage,proto3" json:"suffrage,omitempty"` + Id string `protobuf:"bytes,2,opt,name=id,proto3" json:"id,omitempty"` + Address string `protobuf:"bytes,3,opt,name=address,proto3" json:"address,omitempty"` unknownFields protoimpl.UnknownFields - - Suffrage int32 `protobuf:"varint,1,opt,name=suffrage,proto3" json:"suffrage,omitempty"` - Id string `protobuf:"bytes,2,opt,name=id,proto3" json:"id,omitempty"` - Address string `protobuf:"bytes,3,opt,name=address,proto3" json:"address,omitempty"` + sizeCache protoimpl.SizeCache } func (x *Server) Reset() { @@ -256,12 +252,11 @@ func (x *Server) GetAddress() string { } type ConfigurationValue struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` + Index uint64 `protobuf:"varint,1,opt,name=index,proto3" json:"index,omitempty"` + Servers []*Server `protobuf:"bytes,2,rep,name=servers,proto3" json:"servers,omitempty"` unknownFields protoimpl.UnknownFields - - Index uint64 `protobuf:"varint,1,opt,name=index,proto3" json:"index,omitempty"` - Servers []*Server `protobuf:"bytes,2,rep,name=servers,proto3" json:"servers,omitempty"` + sizeCache protoimpl.SizeCache } func (x *ConfigurationValue) Reset() { @@ -309,11 +304,10 @@ func (x *ConfigurationValue) GetServers() []*Server { } type LocalNodeConfigValue struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - - DesiredSuffrage string `protobuf:"bytes,1,opt,name=desired_suffrage,json=desiredSuffrage,proto3" json:"desired_suffrage,omitempty"` + state protoimpl.MessageState `protogen:"open.v1"` + DesiredSuffrage string `protobuf:"bytes,1,opt,name=desired_suffrage,json=desiredSuffrage,proto3" json:"desired_suffrage,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *LocalNodeConfigValue) Reset() { diff --git a/sdk/database/dbplugin/database.pb.go b/sdk/database/dbplugin/database.pb.go index d48c5f107bdc..7a4f43bca536 100644 --- a/sdk/database/dbplugin/database.pb.go +++ b/sdk/database/dbplugin/database.pb.go @@ -3,7 +3,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.35.2 +// protoc-gen-go v1.36.0 // protoc (unknown) // source: sdk/database/dbplugin/database.proto @@ -26,12 +26,11 @@ const ( // Deprecated: Marked as deprecated in sdk/database/dbplugin/database.proto. type InitializeRequest struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - - Config []byte `protobuf:"bytes,1,opt,name=config,proto3" json:"config,omitempty"` - VerifyConnection bool `protobuf:"varint,2,opt,name=verify_connection,json=verifyConnection,proto3" json:"verify_connection,omitempty"` + state protoimpl.MessageState `protogen:"open.v1"` + Config []byte `protobuf:"bytes,1,opt,name=config,proto3" json:"config,omitempty"` + VerifyConnection bool `protobuf:"varint,2,opt,name=verify_connection,json=verifyConnection,proto3" json:"verify_connection,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *InitializeRequest) Reset() { @@ -79,12 +78,11 @@ func (x *InitializeRequest) GetVerifyConnection() bool { } type InitRequest struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - - Config []byte `protobuf:"bytes,1,opt,name=config,proto3" json:"config,omitempty"` - VerifyConnection bool `protobuf:"varint,2,opt,name=verify_connection,json=verifyConnection,proto3" json:"verify_connection,omitempty"` + state protoimpl.MessageState `protogen:"open.v1"` + Config []byte `protobuf:"bytes,1,opt,name=config,proto3" json:"config,omitempty"` + VerifyConnection bool `protobuf:"varint,2,opt,name=verify_connection,json=verifyConnection,proto3" json:"verify_connection,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *InitRequest) Reset() { @@ -132,13 +130,12 @@ func (x *InitRequest) GetVerifyConnection() bool { } type CreateUserRequest struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - + state protoimpl.MessageState `protogen:"open.v1"` 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 *timestamppb.Timestamp `protobuf:"bytes,3,opt,name=expiration,proto3" json:"expiration,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *CreateUserRequest) Reset() { @@ -193,13 +190,12 @@ func (x *CreateUserRequest) GetExpiration() *timestamppb.Timestamp { } type RenewUserRequest struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` + 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 *timestamppb.Timestamp `protobuf:"bytes,3,opt,name=expiration,proto3" json:"expiration,omitempty"` unknownFields protoimpl.UnknownFields - - 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 *timestamppb.Timestamp `protobuf:"bytes,3,opt,name=expiration,proto3" json:"expiration,omitempty"` + sizeCache protoimpl.SizeCache } func (x *RenewUserRequest) Reset() { @@ -254,12 +250,11 @@ func (x *RenewUserRequest) GetExpiration() *timestamppb.Timestamp { } type RevokeUserRequest struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` + Statements *Statements `protobuf:"bytes,1,opt,name=statements,proto3" json:"statements,omitempty"` + Username string `protobuf:"bytes,2,opt,name=username,proto3" json:"username,omitempty"` unknownFields protoimpl.UnknownFields - - Statements *Statements `protobuf:"bytes,1,opt,name=statements,proto3" json:"statements,omitempty"` - Username string `protobuf:"bytes,2,opt,name=username,proto3" json:"username,omitempty"` + sizeCache protoimpl.SizeCache } func (x *RevokeUserRequest) Reset() { @@ -307,11 +302,10 @@ func (x *RevokeUserRequest) GetUsername() string { } type RotateRootCredentialsRequest struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` + Statements []string `protobuf:"bytes,1,rep,name=statements,proto3" json:"statements,omitempty"` unknownFields protoimpl.UnknownFields - - Statements []string `protobuf:"bytes,1,rep,name=statements,proto3" json:"statements,omitempty"` + sizeCache protoimpl.SizeCache } func (x *RotateRootCredentialsRequest) Reset() { @@ -352,10 +346,7 @@ func (x *RotateRootCredentialsRequest) GetStatements() []string { } type Statements struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - + state protoimpl.MessageState `protogen:"open.v1"` // DEPRECATED, will be removed in 0.12 // // Deprecated: Marked as deprecated in sdk/database/dbplugin/database.proto. @@ -377,6 +368,8 @@ type Statements struct { Rollback []string `protobuf:"bytes,7,rep,name=rollback,proto3" json:"rollback,omitempty"` Renewal []string `protobuf:"bytes,8,rep,name=renewal,proto3" json:"renewal,omitempty"` Rotation []string `protobuf:"bytes,9,rep,name=rotation,proto3" json:"rotation,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *Statements) Reset() { @@ -477,12 +470,11 @@ func (x *Statements) GetRotation() []string { } type UsernameConfig struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` + DisplayName string `protobuf:"bytes,1,opt,name=DisplayName,proto3" json:"DisplayName,omitempty"` + RoleName string `protobuf:"bytes,2,opt,name=RoleName,proto3" json:"RoleName,omitempty"` unknownFields protoimpl.UnknownFields - - DisplayName string `protobuf:"bytes,1,opt,name=DisplayName,proto3" json:"DisplayName,omitempty"` - RoleName string `protobuf:"bytes,2,opt,name=RoleName,proto3" json:"RoleName,omitempty"` + sizeCache protoimpl.SizeCache } func (x *UsernameConfig) Reset() { @@ -530,11 +522,10 @@ func (x *UsernameConfig) GetRoleName() string { } type InitResponse struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` + Config []byte `protobuf:"bytes,1,opt,name=config,proto3" json:"config,omitempty"` unknownFields protoimpl.UnknownFields - - Config []byte `protobuf:"bytes,1,opt,name=config,proto3" json:"config,omitempty"` + sizeCache protoimpl.SizeCache } func (x *InitResponse) Reset() { @@ -575,12 +566,11 @@ func (x *InitResponse) GetConfig() []byte { } type CreateUserResponse struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` + Username string `protobuf:"bytes,1,opt,name=username,proto3" json:"username,omitempty"` + Password string `protobuf:"bytes,2,opt,name=password,proto3" json:"password,omitempty"` unknownFields protoimpl.UnknownFields - - Username string `protobuf:"bytes,1,opt,name=username,proto3" json:"username,omitempty"` - Password string `protobuf:"bytes,2,opt,name=password,proto3" json:"password,omitempty"` + sizeCache protoimpl.SizeCache } func (x *CreateUserResponse) Reset() { @@ -628,11 +618,10 @@ func (x *CreateUserResponse) GetPassword() string { } type TypeResponse struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` + Type string `protobuf:"bytes,1,opt,name=type,proto3" json:"type,omitempty"` unknownFields protoimpl.UnknownFields - - Type string `protobuf:"bytes,1,opt,name=type,proto3" json:"type,omitempty"` + sizeCache protoimpl.SizeCache } func (x *TypeResponse) Reset() { @@ -673,11 +662,10 @@ func (x *TypeResponse) GetType() string { } type RotateRootCredentialsResponse struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` + Config []byte `protobuf:"bytes,1,opt,name=config,proto3" json:"config,omitempty"` unknownFields protoimpl.UnknownFields - - Config []byte `protobuf:"bytes,1,opt,name=config,proto3" json:"config,omitempty"` + sizeCache protoimpl.SizeCache } func (x *RotateRootCredentialsResponse) Reset() { @@ -718,9 +706,9 @@ func (x *RotateRootCredentialsResponse) GetConfig() []byte { } type Empty struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *Empty) Reset() { @@ -754,11 +742,10 @@ func (*Empty) Descriptor() ([]byte, []int) { } type GenerateCredentialsResponse struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` + Password string `protobuf:"bytes,1,opt,name=password,proto3" json:"password,omitempty"` unknownFields protoimpl.UnknownFields - - Password string `protobuf:"bytes,1,opt,name=password,proto3" json:"password,omitempty"` + sizeCache protoimpl.SizeCache } func (x *GenerateCredentialsResponse) Reset() { @@ -799,13 +786,12 @@ func (x *GenerateCredentialsResponse) GetPassword() string { } type StaticUserConfig struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` + Username string `protobuf:"bytes,1,opt,name=username,proto3" json:"username,omitempty"` + Password string `protobuf:"bytes,2,opt,name=password,proto3" json:"password,omitempty"` + Create bool `protobuf:"varint,3,opt,name=create,proto3" json:"create,omitempty"` unknownFields protoimpl.UnknownFields - - Username string `protobuf:"bytes,1,opt,name=username,proto3" json:"username,omitempty"` - Password string `protobuf:"bytes,2,opt,name=password,proto3" json:"password,omitempty"` - Create bool `protobuf:"varint,3,opt,name=create,proto3" json:"create,omitempty"` + sizeCache protoimpl.SizeCache } func (x *StaticUserConfig) Reset() { @@ -860,12 +846,11 @@ func (x *StaticUserConfig) GetCreate() bool { } type SetCredentialsRequest struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - - Statements *Statements `protobuf:"bytes,1,opt,name=statements,proto3" json:"statements,omitempty"` - StaticUserConfig *StaticUserConfig `protobuf:"bytes,2,opt,name=static_user_config,json=staticUserConfig,proto3" json:"static_user_config,omitempty"` + state protoimpl.MessageState `protogen:"open.v1"` + Statements *Statements `protobuf:"bytes,1,opt,name=statements,proto3" json:"statements,omitempty"` + StaticUserConfig *StaticUserConfig `protobuf:"bytes,2,opt,name=static_user_config,json=staticUserConfig,proto3" json:"static_user_config,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *SetCredentialsRequest) Reset() { @@ -913,12 +898,11 @@ func (x *SetCredentialsRequest) GetStaticUserConfig() *StaticUserConfig { } type SetCredentialsResponse struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` + Username string `protobuf:"bytes,1,opt,name=username,proto3" json:"username,omitempty"` + Password string `protobuf:"bytes,2,opt,name=password,proto3" json:"password,omitempty"` unknownFields protoimpl.UnknownFields - - Username string `protobuf:"bytes,1,opt,name=username,proto3" json:"username,omitempty"` - Password string `protobuf:"bytes,2,opt,name=password,proto3" json:"password,omitempty"` + sizeCache protoimpl.SizeCache } func (x *SetCredentialsResponse) Reset() { diff --git a/sdk/database/dbplugin/v5/proto/database.pb.go b/sdk/database/dbplugin/v5/proto/database.pb.go index 594d77a8c7a2..3ca3ddb13cd8 100644 --- a/sdk/database/dbplugin/v5/proto/database.pb.go +++ b/sdk/database/dbplugin/v5/proto/database.pb.go @@ -3,7 +3,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.35.2 +// protoc-gen-go v1.36.0 // protoc (unknown) // source: sdk/database/dbplugin/v5/proto/database.proto @@ -29,12 +29,11 @@ const ( // Initialize() // /////////////// type InitializeRequest struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - - ConfigData *structpb.Struct `protobuf:"bytes,1,opt,name=config_data,json=configData,proto3" json:"config_data,omitempty"` - VerifyConnection bool `protobuf:"varint,2,opt,name=verify_connection,json=verifyConnection,proto3" json:"verify_connection,omitempty"` + state protoimpl.MessageState `protogen:"open.v1"` + ConfigData *structpb.Struct `protobuf:"bytes,1,opt,name=config_data,json=configData,proto3" json:"config_data,omitempty"` + VerifyConnection bool `protobuf:"varint,2,opt,name=verify_connection,json=verifyConnection,proto3" json:"verify_connection,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *InitializeRequest) Reset() { @@ -82,11 +81,10 @@ func (x *InitializeRequest) GetVerifyConnection() bool { } type InitializeResponse struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` + ConfigData *structpb.Struct `protobuf:"bytes,1,opt,name=config_data,json=configData,proto3" json:"config_data,omitempty"` unknownFields protoimpl.UnknownFields - - ConfigData *structpb.Struct `protobuf:"bytes,1,opt,name=config_data,json=configData,proto3" json:"config_data,omitempty"` + sizeCache protoimpl.SizeCache } func (x *InitializeResponse) Reset() { @@ -127,10 +125,7 @@ func (x *InitializeResponse) GetConfigData() *structpb.Struct { } type NewUserRequest struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - + state protoimpl.MessageState `protogen:"open.v1"` UsernameConfig *UsernameConfig `protobuf:"bytes,1,opt,name=username_config,json=usernameConfig,proto3" json:"username_config,omitempty"` Password string `protobuf:"bytes,2,opt,name=password,proto3" json:"password,omitempty"` Expiration *timestamppb.Timestamp `protobuf:"bytes,3,opt,name=expiration,proto3" json:"expiration,omitempty"` @@ -139,6 +134,8 @@ type NewUserRequest struct { CredentialType int32 `protobuf:"varint,6,opt,name=credential_type,json=credentialType,proto3" json:"credential_type,omitempty"` PublicKey []byte `protobuf:"bytes,7,opt,name=public_key,json=publicKey,proto3" json:"public_key,omitempty"` Subject string `protobuf:"bytes,8,opt,name=subject,proto3" json:"subject,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *NewUserRequest) Reset() { @@ -228,12 +225,11 @@ func (x *NewUserRequest) GetSubject() string { } type UsernameConfig struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` + DisplayName string `protobuf:"bytes,1,opt,name=display_name,json=displayName,proto3" json:"display_name,omitempty"` + RoleName string `protobuf:"bytes,2,opt,name=role_name,json=roleName,proto3" json:"role_name,omitempty"` unknownFields protoimpl.UnknownFields - - DisplayName string `protobuf:"bytes,1,opt,name=display_name,json=displayName,proto3" json:"display_name,omitempty"` - RoleName string `protobuf:"bytes,2,opt,name=role_name,json=roleName,proto3" json:"role_name,omitempty"` + sizeCache protoimpl.SizeCache } func (x *UsernameConfig) Reset() { @@ -281,11 +277,10 @@ func (x *UsernameConfig) GetRoleName() string { } type NewUserResponse struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` + Username string `protobuf:"bytes,1,opt,name=username,proto3" json:"username,omitempty"` unknownFields protoimpl.UnknownFields - - Username string `protobuf:"bytes,1,opt,name=username,proto3" json:"username,omitempty"` + sizeCache protoimpl.SizeCache } func (x *NewUserResponse) Reset() { @@ -329,16 +324,15 @@ func (x *NewUserResponse) GetUsername() string { // UpdateUser() // /////////////// type UpdateUserRequest struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - - Username string `protobuf:"bytes,1,opt,name=username,proto3" json:"username,omitempty"` - Password *ChangePassword `protobuf:"bytes,2,opt,name=password,proto3" json:"password,omitempty"` - Expiration *ChangeExpiration `protobuf:"bytes,3,opt,name=expiration,proto3" json:"expiration,omitempty"` - PublicKey *ChangePublicKey `protobuf:"bytes,4,opt,name=public_key,json=publicKey,proto3" json:"public_key,omitempty"` - CredentialType int32 `protobuf:"varint,5,opt,name=credential_type,json=credentialType,proto3" json:"credential_type,omitempty"` - SelfManagedPassword string `protobuf:"bytes,6,opt,name=self_managed_password,json=selfManagedPassword,proto3" json:"self_managed_password,omitempty"` + state protoimpl.MessageState `protogen:"open.v1"` + Username string `protobuf:"bytes,1,opt,name=username,proto3" json:"username,omitempty"` + Password *ChangePassword `protobuf:"bytes,2,opt,name=password,proto3" json:"password,omitempty"` + Expiration *ChangeExpiration `protobuf:"bytes,3,opt,name=expiration,proto3" json:"expiration,omitempty"` + PublicKey *ChangePublicKey `protobuf:"bytes,4,opt,name=public_key,json=publicKey,proto3" json:"public_key,omitempty"` + CredentialType int32 `protobuf:"varint,5,opt,name=credential_type,json=credentialType,proto3" json:"credential_type,omitempty"` + SelfManagedPassword string `protobuf:"bytes,6,opt,name=self_managed_password,json=selfManagedPassword,proto3" json:"self_managed_password,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *UpdateUserRequest) Reset() { @@ -414,12 +408,11 @@ func (x *UpdateUserRequest) GetSelfManagedPassword() string { } type ChangePassword struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` + NewPassword string `protobuf:"bytes,1,opt,name=new_password,json=newPassword,proto3" json:"new_password,omitempty"` + Statements *Statements `protobuf:"bytes,2,opt,name=statements,proto3" json:"statements,omitempty"` unknownFields protoimpl.UnknownFields - - NewPassword string `protobuf:"bytes,1,opt,name=new_password,json=newPassword,proto3" json:"new_password,omitempty"` - Statements *Statements `protobuf:"bytes,2,opt,name=statements,proto3" json:"statements,omitempty"` + sizeCache protoimpl.SizeCache } func (x *ChangePassword) Reset() { @@ -467,12 +460,11 @@ func (x *ChangePassword) GetStatements() *Statements { } type ChangePublicKey struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` + NewPublicKey []byte `protobuf:"bytes,1,opt,name=new_public_key,json=newPublicKey,proto3" json:"new_public_key,omitempty"` + Statements *Statements `protobuf:"bytes,2,opt,name=statements,proto3" json:"statements,omitempty"` unknownFields protoimpl.UnknownFields - - NewPublicKey []byte `protobuf:"bytes,1,opt,name=new_public_key,json=newPublicKey,proto3" json:"new_public_key,omitempty"` - Statements *Statements `protobuf:"bytes,2,opt,name=statements,proto3" json:"statements,omitempty"` + sizeCache protoimpl.SizeCache } func (x *ChangePublicKey) Reset() { @@ -520,12 +512,11 @@ func (x *ChangePublicKey) GetStatements() *Statements { } type ChangeExpiration struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - + state protoimpl.MessageState `protogen:"open.v1"` NewExpiration *timestamppb.Timestamp `protobuf:"bytes,1,opt,name=new_expiration,json=newExpiration,proto3" json:"new_expiration,omitempty"` Statements *Statements `protobuf:"bytes,2,opt,name=statements,proto3" json:"statements,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *ChangeExpiration) Reset() { @@ -573,9 +564,9 @@ func (x *ChangeExpiration) GetStatements() *Statements { } type UpdateUserResponse struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *UpdateUserResponse) Reset() { @@ -612,12 +603,11 @@ func (*UpdateUserResponse) Descriptor() ([]byte, []int) { // DeleteUser() // /////////////// type DeleteUserRequest struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` + Username string `protobuf:"bytes,1,opt,name=username,proto3" json:"username,omitempty"` + Statements *Statements `protobuf:"bytes,2,opt,name=statements,proto3" json:"statements,omitempty"` unknownFields protoimpl.UnknownFields - - Username string `protobuf:"bytes,1,opt,name=username,proto3" json:"username,omitempty"` - Statements *Statements `protobuf:"bytes,2,opt,name=statements,proto3" json:"statements,omitempty"` + sizeCache protoimpl.SizeCache } func (x *DeleteUserRequest) Reset() { @@ -665,9 +655,9 @@ func (x *DeleteUserRequest) GetStatements() *Statements { } type DeleteUserResponse struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *DeleteUserResponse) Reset() { @@ -704,11 +694,10 @@ func (*DeleteUserResponse) Descriptor() ([]byte, []int) { // Type() // /////////////// type TypeResponse struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` + Type string `protobuf:"bytes,1,opt,name=Type,proto3" json:"Type,omitempty"` unknownFields protoimpl.UnknownFields - - Type string `protobuf:"bytes,1,opt,name=Type,proto3" json:"Type,omitempty"` + sizeCache protoimpl.SizeCache } func (x *TypeResponse) Reset() { @@ -752,11 +741,10 @@ func (x *TypeResponse) GetType() string { // General purpose // /////////////// type Statements struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` + Commands []string `protobuf:"bytes,1,rep,name=Commands,proto3" json:"Commands,omitempty"` unknownFields protoimpl.UnknownFields - - Commands []string `protobuf:"bytes,1,rep,name=Commands,proto3" json:"Commands,omitempty"` + sizeCache protoimpl.SizeCache } func (x *Statements) Reset() { @@ -797,9 +785,9 @@ func (x *Statements) GetCommands() []string { } type Empty struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *Empty) Reset() { diff --git a/sdk/helper/clientcountutil/generation/generate_data.pb.go b/sdk/helper/clientcountutil/generation/generate_data.pb.go index 02f621b173d6..13062203a82d 100644 --- a/sdk/helper/clientcountutil/generation/generate_data.pb.go +++ b/sdk/helper/clientcountutil/generation/generate_data.pb.go @@ -3,7 +3,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.35.2 +// protoc-gen-go v1.36.0 // protoc (unknown) // source: sdk/helper/clientcountutil/generation/generate_data.proto @@ -82,12 +82,11 @@ func (WriteOptions) EnumDescriptor() ([]byte, []int) { } type ActivityLogMockInput struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` + Write []WriteOptions `protobuf:"varint,1,rep,packed,name=write,proto3,enum=generation.WriteOptions" json:"write,omitempty"` + Data []*Data `protobuf:"bytes,2,rep,name=data,proto3" json:"data,omitempty"` unknownFields protoimpl.UnknownFields - - Write []WriteOptions `protobuf:"varint,1,rep,packed,name=write,proto3,enum=generation.WriteOptions" json:"write,omitempty"` - Data []*Data `protobuf:"bytes,2,rep,name=data,proto3" json:"data,omitempty"` + sizeCache protoimpl.SizeCache } func (x *ActivityLogMockInput) Reset() { @@ -135,16 +134,13 @@ func (x *ActivityLogMockInput) GetData() []*Data { } type Data struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - - // Types that are assignable to Month: + state protoimpl.MessageState `protogen:"open.v1"` + // Types that are valid to be assigned to Month: // // *Data_CurrentMonth // *Data_MonthsAgo Month isData_Month `protobuf_oneof:"month"` - // Types that are assignable to Clients: + // Types that are valid to be assigned to Clients: // // *Data_All // *Data_Segments @@ -152,6 +148,8 @@ type Data struct { EmptySegmentIndexes []int32 `protobuf:"varint,5,rep,packed,name=empty_segment_indexes,json=emptySegmentIndexes,proto3" json:"empty_segment_indexes,omitempty"` SkipSegmentIndexes []int32 `protobuf:"varint,6,rep,packed,name=skip_segment_indexes,json=skipSegmentIndexes,proto3" json:"skip_segment_indexes,omitempty"` NumSegments int32 `protobuf:"varint,7,opt,name=num_segments,json=numSegments,proto3" json:"num_segments,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *Data) Reset() { @@ -184,44 +182,52 @@ func (*Data) Descriptor() ([]byte, []int) { return file_sdk_helper_clientcountutil_generation_generate_data_proto_rawDescGZIP(), []int{1} } -func (m *Data) GetMonth() isData_Month { - if m != nil { - return m.Month +func (x *Data) GetMonth() isData_Month { + if x != nil { + return x.Month } return nil } func (x *Data) GetCurrentMonth() bool { - if x, ok := x.GetMonth().(*Data_CurrentMonth); ok { - return x.CurrentMonth + if x != nil { + if x, ok := x.Month.(*Data_CurrentMonth); ok { + return x.CurrentMonth + } } return false } func (x *Data) GetMonthsAgo() int32 { - if x, ok := x.GetMonth().(*Data_MonthsAgo); ok { - return x.MonthsAgo + if x != nil { + if x, ok := x.Month.(*Data_MonthsAgo); ok { + return x.MonthsAgo + } } return 0 } -func (m *Data) GetClients() isData_Clients { - if m != nil { - return m.Clients +func (x *Data) GetClients() isData_Clients { + if x != nil { + return x.Clients } return nil } func (x *Data) GetAll() *Clients { - if x, ok := x.GetClients().(*Data_All); ok { - return x.All + if x != nil { + if x, ok := x.Clients.(*Data_All); ok { + return x.All + } } return nil } func (x *Data) GetSegments() *Segments { - if x, ok := x.GetClients().(*Data_Segments); ok { - return x.Segments + if x != nil { + if x, ok := x.Clients.(*Data_Segments); ok { + return x.Segments + } } return nil } @@ -280,11 +286,10 @@ func (*Data_All) isData_Clients() {} func (*Data_Segments) isData_Clients() {} type Segments struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` + Segments []*Segment `protobuf:"bytes,1,rep,name=segments,proto3" json:"segments,omitempty"` unknownFields protoimpl.UnknownFields - - Segments []*Segment `protobuf:"bytes,1,rep,name=segments,proto3" json:"segments,omitempty"` + sizeCache protoimpl.SizeCache } func (x *Segments) Reset() { @@ -325,12 +330,11 @@ func (x *Segments) GetSegments() []*Segment { } type Segment struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` + SegmentIndex *int32 `protobuf:"varint,1,opt,name=segment_index,json=segmentIndex,proto3,oneof" json:"segment_index,omitempty"` + Clients *Clients `protobuf:"bytes,2,opt,name=clients,proto3" json:"clients,omitempty"` unknownFields protoimpl.UnknownFields - - SegmentIndex *int32 `protobuf:"varint,1,opt,name=segment_index,json=segmentIndex,proto3,oneof" json:"segment_index,omitempty"` - Clients *Clients `protobuf:"bytes,2,opt,name=clients,proto3" json:"clients,omitempty"` + sizeCache protoimpl.SizeCache } func (x *Segment) Reset() { @@ -378,11 +382,10 @@ func (x *Segment) GetClients() *Clients { } type Clients struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` + Clients []*Client `protobuf:"bytes,1,rep,name=clients,proto3" json:"clients,omitempty"` unknownFields protoimpl.UnknownFields - - Clients []*Client `protobuf:"bytes,1,rep,name=clients,proto3" json:"clients,omitempty"` + sizeCache protoimpl.SizeCache } func (x *Clients) Reset() { @@ -423,17 +426,16 @@ func (x *Clients) GetClients() []*Client { } type Client struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - - Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"` - Count int32 `protobuf:"varint,2,opt,name=count,proto3" json:"count,omitempty"` - Repeated bool `protobuf:"varint,3,opt,name=repeated,proto3" json:"repeated,omitempty"` - RepeatedFromMonth int32 `protobuf:"varint,4,opt,name=repeated_from_month,json=repeatedFromMonth,proto3" json:"repeated_from_month,omitempty"` - Namespace string `protobuf:"bytes,5,opt,name=namespace,proto3" json:"namespace,omitempty"` - Mount string `protobuf:"bytes,6,opt,name=mount,proto3" json:"mount,omitempty"` - ClientType string `protobuf:"bytes,7,opt,name=client_type,json=clientType,proto3" json:"client_type,omitempty"` + state protoimpl.MessageState `protogen:"open.v1"` + Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"` + Count int32 `protobuf:"varint,2,opt,name=count,proto3" json:"count,omitempty"` + Repeated bool `protobuf:"varint,3,opt,name=repeated,proto3" json:"repeated,omitempty"` + RepeatedFromMonth int32 `protobuf:"varint,4,opt,name=repeated_from_month,json=repeatedFromMonth,proto3" json:"repeated_from_month,omitempty"` + Namespace string `protobuf:"bytes,5,opt,name=namespace,proto3" json:"namespace,omitempty"` + Mount string `protobuf:"bytes,6,opt,name=mount,proto3" json:"mount,omitempty"` + ClientType string `protobuf:"bytes,7,opt,name=client_type,json=clientType,proto3" json:"client_type,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *Client) Reset() { diff --git a/sdk/helper/pluginutil/multiplexing.pb.go b/sdk/helper/pluginutil/multiplexing.pb.go index c6b2fe4942c1..5c96a16a470b 100644 --- a/sdk/helper/pluginutil/multiplexing.pb.go +++ b/sdk/helper/pluginutil/multiplexing.pb.go @@ -3,7 +3,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.35.2 +// protoc-gen-go v1.36.0 // protoc (unknown) // source: sdk/helper/pluginutil/multiplexing.proto @@ -24,9 +24,9 @@ const ( ) type MultiplexingSupportRequest struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *MultiplexingSupportRequest) Reset() { @@ -60,11 +60,10 @@ func (*MultiplexingSupportRequest) Descriptor() ([]byte, []int) { } type MultiplexingSupportResponse struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` + Supported bool `protobuf:"varint,1,opt,name=supported,proto3" json:"supported,omitempty"` unknownFields protoimpl.UnknownFields - - Supported bool `protobuf:"varint,1,opt,name=supported,proto3" json:"supported,omitempty"` + sizeCache protoimpl.SizeCache } func (x *MultiplexingSupportResponse) Reset() { diff --git a/sdk/logical/event.pb.go b/sdk/logical/event.pb.go index 4197adec5fcb..14128d08c9a7 100644 --- a/sdk/logical/event.pb.go +++ b/sdk/logical/event.pb.go @@ -3,7 +3,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.35.2 +// protoc-gen-go v1.36.0 // protoc (unknown) // source: sdk/logical/event.proto @@ -26,10 +26,7 @@ const ( // EventPluginInfo contains data related to the plugin that generated an event. type EventPluginInfo struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - + state protoimpl.MessageState `protogen:"open.v1"` // The type of plugin this event originated from, i.e., "auth" or "secrets. MountClass string `protobuf:"bytes,1,opt,name=mount_class,json=mountClass,proto3" json:"mount_class,omitempty"` // Unique ID of the mount entry, e.g., "kv_957bb7d8" @@ -41,7 +38,9 @@ type EventPluginInfo struct { // Plugin version of the plugin this event originated from, e.g., "v0.13.3+builtin" PluginVersion string `protobuf:"bytes,5,opt,name=plugin_version,json=pluginVersion,proto3" json:"plugin_version,omitempty"` // Mount version that this event originated from, i.e., if KVv2, then "2". Usually empty. - Version string `protobuf:"bytes,6,opt,name=version,proto3" json:"version,omitempty"` + Version string `protobuf:"bytes,6,opt,name=version,proto3" json:"version,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *EventPluginInfo) Reset() { @@ -118,10 +117,7 @@ func (x *EventPluginInfo) GetVersion() string { // EventData contains event data in a CloudEvents container. type EventData struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - + state protoimpl.MessageState `protogen:"open.v1"` // ID identifies the event. It is required. The combination of // CloudEvents Source (i.e., Vault cluster) + ID must be unique. // Events with the same Source + ID can be assumed to be duplicates @@ -135,7 +131,9 @@ type EventData struct { // Any IDs that the event relates to, i.e., UUIDs, paths. EntityIds []string `protobuf:"bytes,3,rep,name=entity_ids,json=entityIds,proto3" json:"entity_ids,omitempty"` // Human-readable note. - Note string `protobuf:"bytes,4,opt,name=note,proto3" json:"note,omitempty"` + Note string `protobuf:"bytes,4,opt,name=note,proto3" json:"note,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *EventData) Reset() { @@ -199,15 +197,14 @@ func (x *EventData) GetNote() string { // EventReceived is used to consume events and includes additional metadata regarding // the event type and plugin information. type EventReceived struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - - Event *EventData `protobuf:"bytes,1,opt,name=event,proto3" json:"event,omitempty"` + state protoimpl.MessageState `protogen:"open.v1"` + Event *EventData `protobuf:"bytes,1,opt,name=event,proto3" json:"event,omitempty"` // namespace path - Namespace string `protobuf:"bytes,2,opt,name=namespace,proto3" json:"namespace,omitempty"` - EventType string `protobuf:"bytes,3,opt,name=event_type,json=eventType,proto3" json:"event_type,omitempty"` - PluginInfo *EventPluginInfo `protobuf:"bytes,4,opt,name=plugin_info,json=pluginInfo,proto3" json:"plugin_info,omitempty"` + Namespace string `protobuf:"bytes,2,opt,name=namespace,proto3" json:"namespace,omitempty"` + EventType string `protobuf:"bytes,3,opt,name=event_type,json=eventType,proto3" json:"event_type,omitempty"` + PluginInfo *EventPluginInfo `protobuf:"bytes,4,opt,name=plugin_info,json=pluginInfo,proto3" json:"plugin_info,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *EventReceived) Reset() { diff --git a/sdk/logical/identity.pb.go b/sdk/logical/identity.pb.go index bccf313866fa..4e4fec68e1d3 100644 --- a/sdk/logical/identity.pb.go +++ b/sdk/logical/identity.pb.go @@ -3,7 +3,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.35.2 +// protoc-gen-go v1.36.0 // protoc (unknown) // source: sdk/logical/identity.proto @@ -24,10 +24,7 @@ const ( ) type Entity struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - + state protoimpl.MessageState `protogen:"open.v1"` // ID is the unique identifier for the entity ID string `protobuf:"bytes,1,opt,name=ID,proto3" json:"ID,omitempty"` // Name is the human-friendly unique identifier for the entity @@ -35,12 +32,14 @@ type Entity struct { // Aliases contains thhe alias mappings for the given entity Aliases []*Alias `protobuf:"bytes,3,rep,name=aliases,proto3" json:"aliases,omitempty"` // Metadata represents the custom data tied to this entity - Metadata map[string]string `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"` + Metadata map[string]string `protobuf:"bytes,4,rep,name=metadata,proto3" json:"metadata,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"` // Disabled is true if the entity is disabled. Disabled bool `protobuf:"varint,5,opt,name=disabled,proto3" json:"disabled,omitempty"` // NamespaceID is the identifier of the namespace to which this entity // belongs to. - NamespaceID string `protobuf:"bytes,6,opt,name=namespace_id,json=namespaceID,proto3" json:"namespace_id,omitempty"` + NamespaceID string `protobuf:"bytes,6,opt,name=namespace_id,json=namespaceID,proto3" json:"namespace_id,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *Entity) Reset() { @@ -116,10 +115,7 @@ func (x *Entity) GetNamespaceID() string { } type Alias struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - + state protoimpl.MessageState `protogen:"open.v1"` // MountType is the backend mount's type to which this identity belongs 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 @@ -133,18 +129,20 @@ type Alias struct { // a significant performance impact at scale. See the SDK's // "aliasmetadata" package for a helper that eases and standardizes // using this safely. - Metadata map[string]string `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"` + Metadata map[string]string `protobuf:"bytes,4,rep,name=metadata,proto3" json:"metadata,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"` // ID is the unique identifier for the alias ID string `protobuf:"bytes,5,opt,name=ID,proto3" json:"ID,omitempty"` // NamespaceID is the identifier of the namespace to which this alias // belongs. NamespaceID string `protobuf:"bytes,6,opt,name=namespace_id,json=namespaceID,proto3" json:"namespace_id,omitempty"` // Custom Metadata represents the custom data tied to this alias - CustomMetadata map[string]string `protobuf:"bytes,7,rep,name=custom_metadata,json=customMetadata,proto3" json:"custom_metadata,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` + CustomMetadata map[string]string `protobuf:"bytes,7,rep,name=custom_metadata,json=customMetadata,proto3" json:"custom_metadata,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"` // Local indicates if the alias only belongs to the cluster where it was // created. If true, the alias will be stored in a location that are ignored // by the performance replication subsystem. - Local bool `protobuf:"varint,8,opt,name=local,proto3" json:"local,omitempty"` + Local bool `protobuf:"varint,8,opt,name=local,proto3" json:"local,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *Alias) Reset() { @@ -234,19 +232,18 @@ func (x *Alias) GetLocal() bool { } type Group struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - + state protoimpl.MessageState `protogen:"open.v1"` // ID is the unique identifier for the group ID string `protobuf:"bytes,1,opt,name=ID,proto3" json:"ID,omitempty"` // Name is the human-friendly unique identifier for the group Name string `protobuf:"bytes,2,opt,name=name,proto3" json:"name,omitempty"` // Metadata represents the custom data tied to this group - Metadata map[string]string `protobuf:"bytes,3,rep,name=metadata,proto3" json:"metadata,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` + Metadata map[string]string `protobuf:"bytes,3,rep,name=metadata,proto3" json:"metadata,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"` // NamespaceID is the identifier of the namespace to which this group // belongs to. - NamespaceID string `protobuf:"bytes,4,opt,name=namespace_id,json=namespaceID,proto3" json:"namespace_id,omitempty"` + NamespaceID string `protobuf:"bytes,4,opt,name=namespace_id,json=namespaceID,proto3" json:"namespace_id,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *Group) Reset() { @@ -308,14 +305,13 @@ func (x *Group) GetNamespaceID() string { } type MFAMethodID struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` + Type string `protobuf:"bytes,1,opt,name=type,proto3" json:"type,omitempty"` + ID string `protobuf:"bytes,2,opt,name=id,proto3" json:"id,omitempty"` + UsesPasscode bool `protobuf:"varint,3,opt,name=uses_passcode,json=usesPasscode,proto3" json:"uses_passcode,omitempty"` + Name string `protobuf:"bytes,4,opt,name=name,proto3" json:"name,omitempty"` unknownFields protoimpl.UnknownFields - - Type string `protobuf:"bytes,1,opt,name=type,proto3" json:"type,omitempty"` - ID string `protobuf:"bytes,2,opt,name=id,proto3" json:"id,omitempty"` - UsesPasscode bool `protobuf:"varint,3,opt,name=uses_passcode,json=usesPasscode,proto3" json:"uses_passcode,omitempty"` - Name string `protobuf:"bytes,4,opt,name=name,proto3" json:"name,omitempty"` + sizeCache protoimpl.SizeCache } func (x *MFAMethodID) Reset() { @@ -377,11 +373,10 @@ func (x *MFAMethodID) GetName() string { } type MFAConstraintAny struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` + Any []*MFAMethodID `protobuf:"bytes,1,rep,name=any,proto3" json:"any,omitempty"` unknownFields protoimpl.UnknownFields - - Any []*MFAMethodID `protobuf:"bytes,1,rep,name=any,proto3" json:"any,omitempty"` + sizeCache protoimpl.SizeCache } func (x *MFAConstraintAny) Reset() { @@ -422,12 +417,11 @@ func (x *MFAConstraintAny) GetAny() []*MFAMethodID { } type MFARequirement struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - + state protoimpl.MessageState `protogen:"open.v1"` MFARequestID string `protobuf:"bytes,1,opt,name=mfa_request_id,json=mfaRequestId,proto3" json:"mfa_request_id,omitempty"` - MFAConstraints map[string]*MFAConstraintAny `protobuf:"bytes,2,rep,name=mfa_constraints,json=mfaConstraints,proto3" json:"mfa_constraints,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` + MFAConstraints map[string]*MFAConstraintAny `protobuf:"bytes,2,rep,name=mfa_constraints,json=mfaConstraints,proto3" json:"mfa_constraints,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *MFARequirement) Reset() { diff --git a/sdk/logical/plugin.pb.go b/sdk/logical/plugin.pb.go index 9da3a80e3f7b..641e55425074 100644 --- a/sdk/logical/plugin.pb.go +++ b/sdk/logical/plugin.pb.go @@ -3,7 +3,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.35.2 +// protoc-gen-go v1.36.0 // protoc (unknown) // source: sdk/logical/plugin.proto @@ -25,10 +25,7 @@ const ( ) type PluginEnvironment struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - + state protoimpl.MessageState `protogen:"open.v1"` // VaultVersion is the version of the Vault server VaultVersion string `protobuf:"bytes,1,opt,name=vault_version,json=vaultVersion,proto3" json:"vault_version,omitempty"` // VaultVersionPrerelease is the prerelease information of the Vault server @@ -37,6 +34,8 @@ type PluginEnvironment struct { VaultVersionMetadata string `protobuf:"bytes,3,opt,name=vault_version_metadata,json=vaultVersionMetadata,proto3" json:"vault_version_metadata,omitempty"` // VaultBuildDate is the build date of the Vault server VaultBuildDate *timestamppb.Timestamp `protobuf:"bytes,4,opt,name=vault_build_date,json=vaultBuildDate,proto3" json:"vault_build_date,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *PluginEnvironment) Reset() { diff --git a/sdk/logical/version.pb.go b/sdk/logical/version.pb.go index 66cd5872124f..7ffdb0e3cae9 100644 --- a/sdk/logical/version.pb.go +++ b/sdk/logical/version.pb.go @@ -3,7 +3,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.35.2 +// protoc-gen-go v1.36.0 // protoc (unknown) // source: sdk/logical/version.proto @@ -24,9 +24,9 @@ const ( ) type Empty struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *Empty) Reset() { @@ -61,11 +61,10 @@ func (*Empty) Descriptor() ([]byte, []int) { // VersionReply is the reply for the Version method. type VersionReply struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` + PluginVersion string `protobuf:"bytes,1,opt,name=plugin_version,json=pluginVersion,proto3" json:"plugin_version,omitempty"` unknownFields protoimpl.UnknownFields - - PluginVersion string `protobuf:"bytes,1,opt,name=plugin_version,json=pluginVersion,proto3" json:"plugin_version,omitempty"` + sizeCache protoimpl.SizeCache } func (x *VersionReply) Reset() { diff --git a/sdk/plugin/pb/backend.pb.go b/sdk/plugin/pb/backend.pb.go index 4813700b0d52..c969b61bfe02 100644 --- a/sdk/plugin/pb/backend.pb.go +++ b/sdk/plugin/pb/backend.pb.go @@ -3,7 +3,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.35.2 +// protoc-gen-go v1.36.0 // protoc (unknown) // source: sdk/plugin/pb/backend.proto @@ -26,9 +26,9 @@ const ( ) type Empty struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *Empty) Reset() { @@ -62,11 +62,10 @@ func (*Empty) Descriptor() ([]byte, []int) { } type Header struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` + Header []string `protobuf:"bytes,1,rep,name=header,proto3" json:"header,omitempty"` unknownFields protoimpl.UnknownFields - - Header []string `protobuf:"bytes,1,rep,name=header,proto3" json:"header,omitempty"` + sizeCache protoimpl.SizeCache } func (x *Header) Reset() { @@ -107,10 +106,7 @@ func (x *Header) GetHeader() []string { } type ProtoError struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - + state protoimpl.MessageState `protogen:"open.v1"` // Error type can be one of: // ErrTypeUnknown uint32 = iota // ErrTypeUserError @@ -123,9 +119,11 @@ type ProtoError struct { // ErrTypePermissionDenied // ErrTypeMultiAuthzPending // ErrTypeUnrecoverable - ErrType uint32 `protobuf:"varint,1,opt,name=err_type,json=errType,proto3" json:"err_type,omitempty"` - ErrMsg string `protobuf:"bytes,2,opt,name=err_msg,json=errMsg,proto3" json:"err_msg,omitempty"` - ErrCode int64 `protobuf:"varint,3,opt,name=err_code,json=errCode,proto3" json:"err_code,omitempty"` + ErrType uint32 `protobuf:"varint,1,opt,name=err_type,json=errType,proto3" json:"err_type,omitempty"` + ErrMsg string `protobuf:"bytes,2,opt,name=err_msg,json=errMsg,proto3" json:"err_msg,omitempty"` + ErrCode int64 `protobuf:"varint,3,opt,name=err_code,json=errCode,proto3" json:"err_code,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *ProtoError) Reset() { @@ -181,10 +179,7 @@ func (x *ProtoError) GetErrCode() int64 { // Paths is the structure of special paths that is used for SpecialPaths. type Paths struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - + state protoimpl.MessageState `protogen:"open.v1"` // Root are the paths that require a root token to access Root []string `protobuf:"bytes,1,rep,name=root,proto3" json:"root,omitempty"` // Unauthenticated are the paths that can be accessed without any auth. @@ -209,7 +204,9 @@ type Paths struct { // Limited paths are storage paths that require special-case request limiting. // // See note in /sdk/logical/logical.go. - Limited []string `protobuf:"bytes,7,rep,name=limited,proto3" json:"limited,omitempty"` + Limited []string `protobuf:"bytes,7,rep,name=limited,proto3" json:"limited,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *Paths) Reset() { @@ -292,10 +289,7 @@ func (x *Paths) GetLimited() []string { } type Request struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - + state protoimpl.MessageState `protogen:"open.v1"` // ID is the uuid associated with each request ID string `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"` // If set, the name given to the replication secondary where this request @@ -319,7 +313,7 @@ type Request struct { // 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 `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"` + Headers map[string]*Header `protobuf:"bytes,8,rep,name=headers,proto3" json:"headers,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"` // 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 @@ -361,7 +355,9 @@ type Request struct { // Connection will be non-nil only for credential providers to // inspect the connection information and potentially use it for // authentication/protection. - Connection *Connection `protobuf:"bytes,20,opt,name=connection,proto3" json:"connection,omitempty"` + Connection *Connection `protobuf:"bytes,20,opt,name=connection,proto3" json:"connection,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *Request) Reset() { @@ -535,11 +531,8 @@ func (x *Request) GetConnection() *Connection { } type Auth struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - - LeaseOptions *LeaseOptions `protobuf:"bytes,1,opt,name=lease_options,json=leaseOptions,proto3" json:"lease_options,omitempty"` + state protoimpl.MessageState `protogen:"open.v1"` + LeaseOptions *LeaseOptions `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. @@ -557,7 +550,7 @@ type Auth struct { // 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 `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"` + Metadata map[string]string `protobuf:"bytes,5,rep,name=metadata,proto3" json:"metadata,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"` // 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. @@ -599,6 +592,8 @@ type Auth struct { TokenType uint32 `protobuf:"varint,17,opt,name=token_type,json=tokenType,proto3" json:"token_type,omitempty"` // Whether the default policy should be added automatically by core NoDefaultPolicy bool `protobuf:"varint,18,opt,name=no_default_policy,json=noDefaultPolicy,proto3" json:"no_default_policy,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *Auth) Reset() { @@ -758,32 +753,31 @@ func (x *Auth) GetNoDefaultPolicy() bool { } type TokenEntry struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - - ID string `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"` - Accessor string `protobuf:"bytes,2,opt,name=accessor,proto3" json:"accessor,omitempty"` - Parent string `protobuf:"bytes,3,opt,name=parent,proto3" json:"parent,omitempty"` - Policies []string `protobuf:"bytes,4,rep,name=policies,proto3" json:"policies,omitempty"` - Path string `protobuf:"bytes,5,opt,name=path,proto3" json:"path,omitempty"` - Meta map[string]string `protobuf:"bytes,6,rep,name=meta,proto3" json:"meta,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` - DisplayName string `protobuf:"bytes,7,opt,name=display_name,json=displayName,proto3" json:"display_name,omitempty"` - NumUses int64 `protobuf:"varint,8,opt,name=num_uses,json=numUses,proto3" json:"num_uses,omitempty"` - CreationTime int64 `protobuf:"varint,9,opt,name=creation_time,json=creationTime,proto3" json:"creation_time,omitempty"` - TTL int64 `protobuf:"varint,10,opt,name=ttl,proto3" json:"ttl,omitempty"` - ExplicitMaxTTL int64 `protobuf:"varint,11,opt,name=explicit_max_ttl,json=explicitMaxTtl,proto3" json:"explicit_max_ttl,omitempty"` - Role string `protobuf:"bytes,12,opt,name=role,proto3" json:"role,omitempty"` - Period int64 `protobuf:"varint,13,opt,name=period,proto3" json:"period,omitempty"` - EntityID string `protobuf:"bytes,14,opt,name=entity_id,json=entityId,proto3" json:"entity_id,omitempty"` - BoundCIDRs []string `protobuf:"bytes,15,rep,name=bound_cidrs,json=boundCidrs,proto3" json:"bound_cidrs,omitempty"` - NamespaceID string `protobuf:"bytes,16,opt,name=namespace_id,json=namespaceID,proto3" json:"namespace_id,omitempty"` - CubbyholeID string `protobuf:"bytes,17,opt,name=cubbyhole_id,json=cubbyholeId,proto3" json:"cubbyhole_id,omitempty"` - Type uint32 `protobuf:"varint,18,opt,name=type,proto3" json:"type,omitempty"` - InternalMeta map[string]string `protobuf:"bytes,19,rep,name=internal_meta,json=internalMeta,proto3" json:"internal_meta,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` - InlinePolicy string `protobuf:"bytes,20,opt,name=inline_policy,json=inlinePolicy,proto3" json:"inline_policy,omitempty"` - NoIdentityPolicies bool `protobuf:"varint,21,opt,name=no_identity_policies,json=noIdentityPolicies,proto3" json:"no_identity_policies,omitempty"` - ExternalID string `protobuf:"bytes,22,opt,name=external_id,json=externalId,proto3" json:"external_id,omitempty"` + state protoimpl.MessageState `protogen:"open.v1"` + ID string `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"` + Accessor string `protobuf:"bytes,2,opt,name=accessor,proto3" json:"accessor,omitempty"` + Parent string `protobuf:"bytes,3,opt,name=parent,proto3" json:"parent,omitempty"` + Policies []string `protobuf:"bytes,4,rep,name=policies,proto3" json:"policies,omitempty"` + Path string `protobuf:"bytes,5,opt,name=path,proto3" json:"path,omitempty"` + Meta map[string]string `protobuf:"bytes,6,rep,name=meta,proto3" json:"meta,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"` + DisplayName string `protobuf:"bytes,7,opt,name=display_name,json=displayName,proto3" json:"display_name,omitempty"` + NumUses int64 `protobuf:"varint,8,opt,name=num_uses,json=numUses,proto3" json:"num_uses,omitempty"` + CreationTime int64 `protobuf:"varint,9,opt,name=creation_time,json=creationTime,proto3" json:"creation_time,omitempty"` + TTL int64 `protobuf:"varint,10,opt,name=ttl,proto3" json:"ttl,omitempty"` + ExplicitMaxTTL int64 `protobuf:"varint,11,opt,name=explicit_max_ttl,json=explicitMaxTtl,proto3" json:"explicit_max_ttl,omitempty"` + Role string `protobuf:"bytes,12,opt,name=role,proto3" json:"role,omitempty"` + Period int64 `protobuf:"varint,13,opt,name=period,proto3" json:"period,omitempty"` + EntityID string `protobuf:"bytes,14,opt,name=entity_id,json=entityId,proto3" json:"entity_id,omitempty"` + BoundCIDRs []string `protobuf:"bytes,15,rep,name=bound_cidrs,json=boundCidrs,proto3" json:"bound_cidrs,omitempty"` + NamespaceID string `protobuf:"bytes,16,opt,name=namespace_id,json=namespaceID,proto3" json:"namespace_id,omitempty"` + CubbyholeID string `protobuf:"bytes,17,opt,name=cubbyhole_id,json=cubbyholeId,proto3" json:"cubbyhole_id,omitempty"` + Type uint32 `protobuf:"varint,18,opt,name=type,proto3" json:"type,omitempty"` + InternalMeta map[string]string `protobuf:"bytes,19,rep,name=internal_meta,json=internalMeta,proto3" json:"internal_meta,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"` + InlinePolicy string `protobuf:"bytes,20,opt,name=inline_policy,json=inlinePolicy,proto3" json:"inline_policy,omitempty"` + NoIdentityPolicies bool `protobuf:"varint,21,opt,name=no_identity_policies,json=noIdentityPolicies,proto3" json:"no_identity_policies,omitempty"` + ExternalID string `protobuf:"bytes,22,opt,name=external_id,json=externalId,proto3" json:"external_id,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *TokenEntry) Reset() { @@ -971,15 +965,14 @@ func (x *TokenEntry) GetExternalID() string { } type LeaseOptions struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` + TTL int64 `protobuf:"varint,1,opt,name=TTL,proto3" json:"TTL,omitempty"` + Renewable bool `protobuf:"varint,2,opt,name=renewable,proto3" json:"renewable,omitempty"` + Increment int64 `protobuf:"varint,3,opt,name=increment,proto3" json:"increment,omitempty"` + IssueTime *timestamppb.Timestamp `protobuf:"bytes,4,opt,name=issue_time,json=issueTime,proto3" json:"issue_time,omitempty"` + MaxTTL int64 `protobuf:"varint,5,opt,name=MaxTTL,proto3" json:"MaxTTL,omitempty"` unknownFields protoimpl.UnknownFields - - TTL int64 `protobuf:"varint,1,opt,name=TTL,proto3" json:"TTL,omitempty"` - Renewable bool `protobuf:"varint,2,opt,name=renewable,proto3" json:"renewable,omitempty"` - Increment int64 `protobuf:"varint,3,opt,name=increment,proto3" json:"increment,omitempty"` - IssueTime *timestamppb.Timestamp `protobuf:"bytes,4,opt,name=issue_time,json=issueTime,proto3" json:"issue_time,omitempty"` - MaxTTL int64 `protobuf:"varint,5,opt,name=MaxTTL,proto3" json:"MaxTTL,omitempty"` + sizeCache protoimpl.SizeCache } func (x *LeaseOptions) Reset() { @@ -1048,11 +1041,8 @@ func (x *LeaseOptions) GetMaxTTL() int64 { } type Secret struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - - LeaseOptions *LeaseOptions `protobuf:"bytes,1,opt,name=lease_options,json=leaseOptions,proto3" json:"lease_options,omitempty"` + state protoimpl.MessageState `protogen:"open.v1"` + LeaseOptions *LeaseOptions `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. @@ -1060,7 +1050,9 @@ type Secret struct { // 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 `protobuf:"bytes,3,opt,name=lease_id,json=leaseId,proto3" json:"lease_id,omitempty"` + LeaseID string `protobuf:"bytes,3,opt,name=lease_id,json=leaseId,proto3" json:"lease_id,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *Secret) Reset() { @@ -1115,10 +1107,7 @@ func (x *Secret) GetLeaseID() string { } type Response struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - + state protoimpl.MessageState `protogen:"open.v1"` // Secret, if not nil, denotes that this response represents a secret. Secret *Secret `protobuf:"bytes,1,opt,name=secret,proto3" json:"secret,omitempty"` // Auth, if not nil, contains the authentication information for @@ -1142,10 +1131,12 @@ type Response struct { // Headers will contain the http headers from the response. This value will // be used in the audit broker to ensure we are auditing only the allowed // headers. - Headers map[string]*Header `protobuf:"bytes,7,rep,name=headers,proto3" json:"headers,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` + Headers map[string]*Header `protobuf:"bytes,7,rep,name=headers,proto3" json:"headers,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"` // MountType, if non-empty, provides some information about what kind // of mount this secret came from. - MountType string `protobuf:"bytes,8,opt,name=mount_type,json=mountType,proto3" json:"mount_type,omitempty"` + MountType string `protobuf:"bytes,8,opt,name=mount_type,json=mountType,proto3" json:"mount_type,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *Response) Reset() { @@ -1235,10 +1226,7 @@ func (x *Response) GetMountType() string { } type ResponseWrapInfo struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - + state protoimpl.MessageState `protogen:"open.v1"` // Setting to non-zero specifies that the response should be wrapped. // Specifies the desired TTL of the wrapping token. TTL int64 `protobuf:"varint,1,opt,name=TTL,proto3" json:"TTL,omitempty"` @@ -1261,7 +1249,9 @@ type ResponseWrapInfo struct { // the wrapped response. CreationPath string `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 `protobuf:"varint,9,opt,name=seal_wrap,json=sealWrap,proto3" json:"seal_wrap,omitempty"` + SealWrap bool `protobuf:"varint,9,opt,name=seal_wrap,json=sealWrap,proto3" json:"seal_wrap,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *ResponseWrapInfo) Reset() { @@ -1358,10 +1348,7 @@ func (x *ResponseWrapInfo) GetSealWrap() bool { } type RequestWrapInfo struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - + state protoimpl.MessageState `protogen:"open.v1"` // Setting to non-zero specifies that the response should be wrapped. // Specifies the desired TTL of the wrapping token. TTL int64 `protobuf:"varint,1,opt,name=TTL,proto3" json:"TTL,omitempty"` @@ -1370,7 +1357,9 @@ type RequestWrapInfo struct { Format string `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 `protobuf:"varint,3,opt,name=seal_wrap,json=sealWrap,proto3" json:"seal_wrap,omitempty"` + SealWrap bool `protobuf:"varint,3,opt,name=seal_wrap,json=sealWrap,proto3" json:"seal_wrap,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *RequestWrapInfo) Reset() { @@ -1426,12 +1415,11 @@ func (x *RequestWrapInfo) GetSealWrap() bool { // HandleRequestArgs is the args for HandleRequest method. type HandleRequestArgs struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` + StorageID uint32 `protobuf:"varint,1,opt,name=storage_id,json=storageId,proto3" json:"storage_id,omitempty"` + Request *Request `protobuf:"bytes,2,opt,name=request,proto3" json:"request,omitempty"` unknownFields protoimpl.UnknownFields - - StorageID uint32 `protobuf:"varint,1,opt,name=storage_id,json=storageId,proto3" json:"storage_id,omitempty"` - Request *Request `protobuf:"bytes,2,opt,name=request,proto3" json:"request,omitempty"` + sizeCache protoimpl.SizeCache } func (x *HandleRequestArgs) Reset() { @@ -1480,12 +1468,11 @@ func (x *HandleRequestArgs) GetRequest() *Request { // HandleRequestReply is the reply for HandleRequest method. type HandleRequestReply struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` + Response *Response `protobuf:"bytes,1,opt,name=response,proto3" json:"response,omitempty"` + Err *ProtoError `protobuf:"bytes,2,opt,name=err,proto3" json:"err,omitempty"` unknownFields protoimpl.UnknownFields - - Response *Response `protobuf:"bytes,1,opt,name=response,proto3" json:"response,omitempty"` - Err *ProtoError `protobuf:"bytes,2,opt,name=err,proto3" json:"err,omitempty"` + sizeCache protoimpl.SizeCache } func (x *HandleRequestReply) Reset() { @@ -1534,9 +1521,9 @@ func (x *HandleRequestReply) GetErr() *ProtoError { // InitializeArgs is the args for Initialize method. type InitializeArgs struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *InitializeArgs) Reset() { @@ -1571,11 +1558,10 @@ func (*InitializeArgs) Descriptor() ([]byte, []int) { // InitializeReply is the reply for Initialize method. type InitializeReply struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` + Err *ProtoError `protobuf:"bytes,1,opt,name=err,proto3" json:"err,omitempty"` unknownFields protoimpl.UnknownFields - - Err *ProtoError `protobuf:"bytes,1,opt,name=err,proto3" json:"err,omitempty"` + sizeCache protoimpl.SizeCache } func (x *InitializeReply) Reset() { @@ -1617,11 +1603,10 @@ func (x *InitializeReply) GetErr() *ProtoError { // SpecialPathsReply is the reply for SpecialPaths method. type SpecialPathsReply struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` + Paths *Paths `protobuf:"bytes,1,opt,name=paths,proto3" json:"paths,omitempty"` unknownFields protoimpl.UnknownFields - - Paths *Paths `protobuf:"bytes,1,opt,name=paths,proto3" json:"paths,omitempty"` + sizeCache protoimpl.SizeCache } func (x *SpecialPathsReply) Reset() { @@ -1663,12 +1648,11 @@ func (x *SpecialPathsReply) GetPaths() *Paths { // HandleExistenceCheckArgs is the args for HandleExistenceCheck method. type HandleExistenceCheckArgs struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` + StorageID uint32 `protobuf:"varint,1,opt,name=storage_id,json=storageId,proto3" json:"storage_id,omitempty"` + Request *Request `protobuf:"bytes,2,opt,name=request,proto3" json:"request,omitempty"` unknownFields protoimpl.UnknownFields - - StorageID uint32 `protobuf:"varint,1,opt,name=storage_id,json=storageId,proto3" json:"storage_id,omitempty"` - Request *Request `protobuf:"bytes,2,opt,name=request,proto3" json:"request,omitempty"` + sizeCache protoimpl.SizeCache } func (x *HandleExistenceCheckArgs) Reset() { @@ -1717,13 +1701,12 @@ func (x *HandleExistenceCheckArgs) GetRequest() *Request { // HandleExistenceCheckReply is the reply for HandleExistenceCheck method. type HandleExistenceCheckReply struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` + CheckFound bool `protobuf:"varint,1,opt,name=check_found,json=checkFound,proto3" json:"check_found,omitempty"` + Exists bool `protobuf:"varint,2,opt,name=exists,proto3" json:"exists,omitempty"` + Err *ProtoError `protobuf:"bytes,3,opt,name=err,proto3" json:"err,omitempty"` unknownFields protoimpl.UnknownFields - - CheckFound bool `protobuf:"varint,1,opt,name=check_found,json=checkFound,proto3" json:"check_found,omitempty"` - Exists bool `protobuf:"varint,2,opt,name=exists,proto3" json:"exists,omitempty"` - Err *ProtoError `protobuf:"bytes,3,opt,name=err,proto3" json:"err,omitempty"` + sizeCache protoimpl.SizeCache } func (x *HandleExistenceCheckReply) Reset() { @@ -1779,13 +1762,12 @@ func (x *HandleExistenceCheckReply) GetErr() *ProtoError { // SetupArgs is the args for Setup method. type SetupArgs struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` + BrokerID uint32 `protobuf:"varint,1,opt,name=broker_id,json=brokerId,proto3" json:"broker_id,omitempty"` + Config map[string]string `protobuf:"bytes,2,rep,name=Config,proto3" json:"Config,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"` + BackendUUID string `protobuf:"bytes,3,opt,name=backendUUID,proto3" json:"backendUUID,omitempty"` unknownFields protoimpl.UnknownFields - - BrokerID uint32 `protobuf:"varint,1,opt,name=broker_id,json=brokerId,proto3" json:"broker_id,omitempty"` - Config map[string]string `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 `protobuf:"bytes,3,opt,name=backendUUID,proto3" json:"backendUUID,omitempty"` + sizeCache protoimpl.SizeCache } func (x *SetupArgs) Reset() { @@ -1841,11 +1823,10 @@ func (x *SetupArgs) GetBackendUUID() string { // SetupReply is the reply for Setup method. type SetupReply struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` + Err string `protobuf:"bytes,1,opt,name=err,proto3" json:"err,omitempty"` unknownFields protoimpl.UnknownFields - - Err string `protobuf:"bytes,1,opt,name=err,proto3" json:"err,omitempty"` + sizeCache protoimpl.SizeCache } func (x *SetupReply) Reset() { @@ -1887,11 +1868,10 @@ func (x *SetupReply) GetErr() string { // TypeReply is the reply for the Type method. type TypeReply struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` + Type uint32 `protobuf:"varint,1,opt,name=type,proto3" json:"type,omitempty"` unknownFields protoimpl.UnknownFields - - Type uint32 `protobuf:"varint,1,opt,name=type,proto3" json:"type,omitempty"` + sizeCache protoimpl.SizeCache } func (x *TypeReply) Reset() { @@ -1932,11 +1912,10 @@ func (x *TypeReply) GetType() uint32 { } type InvalidateKeyArgs struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` + Key string `protobuf:"bytes,1,opt,name=key,proto3" json:"key,omitempty"` unknownFields protoimpl.UnknownFields - - Key string `protobuf:"bytes,1,opt,name=key,proto3" json:"key,omitempty"` + sizeCache protoimpl.SizeCache } func (x *InvalidateKeyArgs) Reset() { @@ -1977,13 +1956,12 @@ func (x *InvalidateKeyArgs) GetKey() string { } type StorageEntry struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` + Key string `protobuf:"bytes,1,opt,name=key,proto3" json:"key,omitempty"` + Value []byte `protobuf:"bytes,2,opt,name=value,proto3" json:"value,omitempty"` + SealWrap bool `protobuf:"varint,3,opt,name=seal_wrap,json=sealWrap,proto3" json:"seal_wrap,omitempty"` unknownFields protoimpl.UnknownFields - - Key string `protobuf:"bytes,1,opt,name=key,proto3" json:"key,omitempty"` - Value []byte `protobuf:"bytes,2,opt,name=value,proto3" json:"value,omitempty"` - SealWrap bool `protobuf:"varint,3,opt,name=seal_wrap,json=sealWrap,proto3" json:"seal_wrap,omitempty"` + sizeCache protoimpl.SizeCache } func (x *StorageEntry) Reset() { @@ -2038,11 +2016,10 @@ func (x *StorageEntry) GetSealWrap() bool { } type StorageListArgs struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` + Prefix string `protobuf:"bytes,1,opt,name=prefix,proto3" json:"prefix,omitempty"` unknownFields protoimpl.UnknownFields - - Prefix string `protobuf:"bytes,1,opt,name=prefix,proto3" json:"prefix,omitempty"` + sizeCache protoimpl.SizeCache } func (x *StorageListArgs) Reset() { @@ -2083,12 +2060,11 @@ func (x *StorageListArgs) GetPrefix() string { } type StorageListReply struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` + Keys []string `protobuf:"bytes,1,rep,name=keys,proto3" json:"keys,omitempty"` + Err string `protobuf:"bytes,2,opt,name=err,proto3" json:"err,omitempty"` unknownFields protoimpl.UnknownFields - - Keys []string `protobuf:"bytes,1,rep,name=keys,proto3" json:"keys,omitempty"` - Err string `protobuf:"bytes,2,opt,name=err,proto3" json:"err,omitempty"` + sizeCache protoimpl.SizeCache } func (x *StorageListReply) Reset() { @@ -2136,11 +2112,10 @@ func (x *StorageListReply) GetErr() string { } type StorageGetArgs struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` + Key string `protobuf:"bytes,1,opt,name=key,proto3" json:"key,omitempty"` unknownFields protoimpl.UnknownFields - - Key string `protobuf:"bytes,1,opt,name=key,proto3" json:"key,omitempty"` + sizeCache protoimpl.SizeCache } func (x *StorageGetArgs) Reset() { @@ -2181,12 +2156,11 @@ func (x *StorageGetArgs) GetKey() string { } type StorageGetReply struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` + Entry *StorageEntry `protobuf:"bytes,1,opt,name=entry,proto3" json:"entry,omitempty"` + Err string `protobuf:"bytes,2,opt,name=err,proto3" json:"err,omitempty"` unknownFields protoimpl.UnknownFields - - Entry *StorageEntry `protobuf:"bytes,1,opt,name=entry,proto3" json:"entry,omitempty"` - Err string `protobuf:"bytes,2,opt,name=err,proto3" json:"err,omitempty"` + sizeCache protoimpl.SizeCache } func (x *StorageGetReply) Reset() { @@ -2234,11 +2208,10 @@ func (x *StorageGetReply) GetErr() string { } type StoragePutArgs struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` + Entry *StorageEntry `protobuf:"bytes,1,opt,name=entry,proto3" json:"entry,omitempty"` unknownFields protoimpl.UnknownFields - - Entry *StorageEntry `protobuf:"bytes,1,opt,name=entry,proto3" json:"entry,omitempty"` + sizeCache protoimpl.SizeCache } func (x *StoragePutArgs) Reset() { @@ -2279,11 +2252,10 @@ func (x *StoragePutArgs) GetEntry() *StorageEntry { } type StoragePutReply struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` + Err string `protobuf:"bytes,1,opt,name=err,proto3" json:"err,omitempty"` unknownFields protoimpl.UnknownFields - - Err string `protobuf:"bytes,1,opt,name=err,proto3" json:"err,omitempty"` + sizeCache protoimpl.SizeCache } func (x *StoragePutReply) Reset() { @@ -2324,11 +2296,10 @@ func (x *StoragePutReply) GetErr() string { } type StorageDeleteArgs struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` + Key string `protobuf:"bytes,1,opt,name=key,proto3" json:"key,omitempty"` unknownFields protoimpl.UnknownFields - - Key string `protobuf:"bytes,1,opt,name=key,proto3" json:"key,omitempty"` + sizeCache protoimpl.SizeCache } func (x *StorageDeleteArgs) Reset() { @@ -2369,11 +2340,10 @@ func (x *StorageDeleteArgs) GetKey() string { } type StorageDeleteReply struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` + Err string `protobuf:"bytes,1,opt,name=err,proto3" json:"err,omitempty"` unknownFields protoimpl.UnknownFields - - Err string `protobuf:"bytes,1,opt,name=err,proto3" json:"err,omitempty"` + sizeCache protoimpl.SizeCache } func (x *StorageDeleteReply) Reset() { @@ -2414,11 +2384,10 @@ func (x *StorageDeleteReply) GetErr() string { } type TTLReply struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` + TTL int64 `protobuf:"varint,1,opt,name=TTL,proto3" json:"TTL,omitempty"` unknownFields protoimpl.UnknownFields - - TTL int64 `protobuf:"varint,1,opt,name=TTL,proto3" json:"TTL,omitempty"` + sizeCache protoimpl.SizeCache } func (x *TTLReply) Reset() { @@ -2459,11 +2428,10 @@ func (x *TTLReply) GetTTL() int64 { } type TaintedReply struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` + Tainted bool `protobuf:"varint,1,opt,name=tainted,proto3" json:"tainted,omitempty"` unknownFields protoimpl.UnknownFields - - Tainted bool `protobuf:"varint,1,opt,name=tainted,proto3" json:"tainted,omitempty"` + sizeCache protoimpl.SizeCache } func (x *TaintedReply) Reset() { @@ -2504,11 +2472,10 @@ func (x *TaintedReply) GetTainted() bool { } type CachingDisabledReply struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` + Disabled bool `protobuf:"varint,1,opt,name=disabled,proto3" json:"disabled,omitempty"` unknownFields protoimpl.UnknownFields - - Disabled bool `protobuf:"varint,1,opt,name=disabled,proto3" json:"disabled,omitempty"` + sizeCache protoimpl.SizeCache } func (x *CachingDisabledReply) Reset() { @@ -2549,11 +2516,10 @@ func (x *CachingDisabledReply) GetDisabled() bool { } type ReplicationStateReply struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` + State int32 `protobuf:"varint,1,opt,name=state,proto3" json:"state,omitempty"` unknownFields protoimpl.UnknownFields - - State int32 `protobuf:"varint,1,opt,name=state,proto3" json:"state,omitempty"` + sizeCache protoimpl.SizeCache } func (x *ReplicationStateReply) Reset() { @@ -2594,13 +2560,12 @@ func (x *ReplicationStateReply) GetState() int32 { } type ResponseWrapDataArgs struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` + Data string `protobuf:"bytes,1,opt,name=data,proto3" json:"data,omitempty"` + TTL int64 `protobuf:"varint,2,opt,name=TTL,proto3" json:"TTL,omitempty"` + JWT bool `protobuf:"varint,3,opt,name=JWT,proto3" json:"JWT,omitempty"` unknownFields protoimpl.UnknownFields - - Data string `protobuf:"bytes,1,opt,name=data,proto3" json:"data,omitempty"` - TTL int64 `protobuf:"varint,2,opt,name=TTL,proto3" json:"TTL,omitempty"` - JWT bool `protobuf:"varint,3,opt,name=JWT,proto3" json:"JWT,omitempty"` + sizeCache protoimpl.SizeCache } func (x *ResponseWrapDataArgs) Reset() { @@ -2655,12 +2620,11 @@ func (x *ResponseWrapDataArgs) GetJWT() bool { } type ResponseWrapDataReply struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` + WrapInfo *ResponseWrapInfo `protobuf:"bytes,1,opt,name=wrap_info,json=wrapInfo,proto3" json:"wrap_info,omitempty"` + Err string `protobuf:"bytes,2,opt,name=err,proto3" json:"err,omitempty"` unknownFields protoimpl.UnknownFields - - WrapInfo *ResponseWrapInfo `protobuf:"bytes,1,opt,name=wrap_info,json=wrapInfo,proto3" json:"wrap_info,omitempty"` - Err string `protobuf:"bytes,2,opt,name=err,proto3" json:"err,omitempty"` + sizeCache protoimpl.SizeCache } func (x *ResponseWrapDataReply) Reset() { @@ -2708,11 +2672,10 @@ func (x *ResponseWrapDataReply) GetErr() string { } type MlockEnabledReply struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` + Enabled bool `protobuf:"varint,1,opt,name=enabled,proto3" json:"enabled,omitempty"` unknownFields protoimpl.UnknownFields - - Enabled bool `protobuf:"varint,1,opt,name=enabled,proto3" json:"enabled,omitempty"` + sizeCache protoimpl.SizeCache } func (x *MlockEnabledReply) Reset() { @@ -2753,11 +2716,10 @@ func (x *MlockEnabledReply) GetEnabled() bool { } type LocalMountReply struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` + Local bool `protobuf:"varint,1,opt,name=local,proto3" json:"local,omitempty"` unknownFields protoimpl.UnknownFields - - Local bool `protobuf:"varint,1,opt,name=local,proto3" json:"local,omitempty"` + sizeCache protoimpl.SizeCache } func (x *LocalMountReply) Reset() { @@ -2798,11 +2760,10 @@ func (x *LocalMountReply) GetLocal() bool { } type EntityInfoArgs struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` + EntityID string `protobuf:"bytes,1,opt,name=entity_id,json=entityId,proto3" json:"entity_id,omitempty"` unknownFields protoimpl.UnknownFields - - EntityID string `protobuf:"bytes,1,opt,name=entity_id,json=entityId,proto3" json:"entity_id,omitempty"` + sizeCache protoimpl.SizeCache } func (x *EntityInfoArgs) Reset() { @@ -2843,12 +2804,11 @@ func (x *EntityInfoArgs) GetEntityID() string { } type EntityInfoReply struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` + Entity *logical.Entity `protobuf:"bytes,1,opt,name=entity,proto3" json:"entity,omitempty"` + Err string `protobuf:"bytes,2,opt,name=err,proto3" json:"err,omitempty"` unknownFields protoimpl.UnknownFields - - Entity *logical.Entity `protobuf:"bytes,1,opt,name=entity,proto3" json:"entity,omitempty"` - Err string `protobuf:"bytes,2,opt,name=err,proto3" json:"err,omitempty"` + sizeCache protoimpl.SizeCache } func (x *EntityInfoReply) Reset() { @@ -2896,12 +2856,11 @@ func (x *EntityInfoReply) GetErr() string { } type GroupsForEntityReply struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` + Groups []*logical.Group `protobuf:"bytes,1,rep,name=groups,proto3" json:"groups,omitempty"` + Err string `protobuf:"bytes,2,opt,name=err,proto3" json:"err,omitempty"` unknownFields protoimpl.UnknownFields - - Groups []*logical.Group `protobuf:"bytes,1,rep,name=groups,proto3" json:"groups,omitempty"` - Err string `protobuf:"bytes,2,opt,name=err,proto3" json:"err,omitempty"` + sizeCache protoimpl.SizeCache } func (x *GroupsForEntityReply) Reset() { @@ -2949,12 +2908,11 @@ func (x *GroupsForEntityReply) GetErr() string { } type PluginEnvReply struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - + state protoimpl.MessageState `protogen:"open.v1"` PluginEnvironment *logical.PluginEnvironment `protobuf:"bytes,1,opt,name=plugin_environment,json=pluginEnvironment,proto3" json:"plugin_environment,omitempty"` Err string `protobuf:"bytes,2,opt,name=err,proto3" json:"err,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *PluginEnvReply) Reset() { @@ -3002,11 +2960,10 @@ func (x *PluginEnvReply) GetErr() string { } type GeneratePasswordFromPolicyRequest struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` + PolicyName string `protobuf:"bytes,1,opt,name=policy_name,json=policyName,proto3" json:"policy_name,omitempty"` unknownFields protoimpl.UnknownFields - - PolicyName string `protobuf:"bytes,1,opt,name=policy_name,json=policyName,proto3" json:"policy_name,omitempty"` + sizeCache protoimpl.SizeCache } func (x *GeneratePasswordFromPolicyRequest) Reset() { @@ -3047,11 +3004,10 @@ func (x *GeneratePasswordFromPolicyRequest) GetPolicyName() string { } type GeneratePasswordFromPolicyReply struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` + Password string `protobuf:"bytes,1,opt,name=password,proto3" json:"password,omitempty"` unknownFields protoimpl.UnknownFields - - Password string `protobuf:"bytes,1,opt,name=password,proto3" json:"password,omitempty"` + sizeCache protoimpl.SizeCache } func (x *GeneratePasswordFromPolicyReply) Reset() { @@ -3092,13 +3048,12 @@ func (x *GeneratePasswordFromPolicyReply) GetPassword() string { } type ClusterInfoReply struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` + ClusterName string `protobuf:"bytes,1,opt,name=cluster_name,json=clusterName,proto3" json:"cluster_name,omitempty"` + ClusterID string `protobuf:"bytes,2,opt,name=cluster_id,json=clusterId,proto3" json:"cluster_id,omitempty"` + Err string `protobuf:"bytes,3,opt,name=err,proto3" json:"err,omitempty"` unknownFields protoimpl.UnknownFields - - ClusterName string `protobuf:"bytes,1,opt,name=cluster_name,json=clusterName,proto3" json:"cluster_name,omitempty"` - ClusterID string `protobuf:"bytes,2,opt,name=cluster_id,json=clusterId,proto3" json:"cluster_id,omitempty"` - Err string `protobuf:"bytes,3,opt,name=err,proto3" json:"err,omitempty"` + sizeCache protoimpl.SizeCache } func (x *ClusterInfoReply) Reset() { @@ -3153,12 +3108,11 @@ func (x *ClusterInfoReply) GetErr() string { } type GenerateIdentityTokenRequest struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` + Audience string `protobuf:"bytes,1,opt,name=audience,proto3" json:"audience,omitempty"` + TTL int64 `protobuf:"varint,2,opt,name=ttl,proto3" json:"ttl,omitempty"` unknownFields protoimpl.UnknownFields - - Audience string `protobuf:"bytes,1,opt,name=audience,proto3" json:"audience,omitempty"` - TTL int64 `protobuf:"varint,2,opt,name=ttl,proto3" json:"ttl,omitempty"` + sizeCache protoimpl.SizeCache } func (x *GenerateIdentityTokenRequest) Reset() { @@ -3206,12 +3160,11 @@ func (x *GenerateIdentityTokenRequest) GetTTL() int64 { } type GenerateIdentityTokenResponse struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` + Token string `protobuf:"bytes,1,opt,name=token,proto3" json:"token,omitempty"` + TTL int64 `protobuf:"varint,2,opt,name=ttl,proto3" json:"ttl,omitempty"` unknownFields protoimpl.UnknownFields - - Token string `protobuf:"bytes,1,opt,name=token,proto3" json:"token,omitempty"` - TTL int64 `protobuf:"varint,2,opt,name=ttl,proto3" json:"ttl,omitempty"` + sizeCache protoimpl.SizeCache } func (x *GenerateIdentityTokenResponse) Reset() { @@ -3259,10 +3212,7 @@ func (x *GenerateIdentityTokenResponse) GetTTL() int64 { } type Connection struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - + state protoimpl.MessageState `protogen:"open.v1"` // RemoteAddr is the network address that sent the request. RemoteAddr string `protobuf:"bytes,1,opt,name=remote_addr,json=remoteAddr,proto3" json:"remote_addr,omitempty"` // RemotePort is the network port that sent the request. @@ -3270,6 +3220,8 @@ type Connection struct { // ConnectionState is the marshalled tls.ConnectionState from the original // request ConnectionState *ConnectionState `protobuf:"bytes,2,opt,name=connection_state,json=connectionState,proto3" json:"connection_state,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *Connection) Reset() { @@ -3324,22 +3276,21 @@ func (x *Connection) GetConnectionState() *ConnectionState { } type ConnectionState struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - - Version uint32 `protobuf:"varint,1,opt,name=version,proto3" json:"version,omitempty"` - HandshakeComplete bool `protobuf:"varint,2,opt,name=handshake_complete,json=handshakeComplete,proto3" json:"handshake_complete,omitempty"` - DidResume bool `protobuf:"varint,3,opt,name=did_resume,json=didResume,proto3" json:"did_resume,omitempty"` - CipherSuite uint32 `protobuf:"varint,4,opt,name=cipher_suite,json=cipherSuite,proto3" json:"cipher_suite,omitempty"` - NegotiatedProtocol string `protobuf:"bytes,5,opt,name=negotiated_protocol,json=negotiatedProtocol,proto3" json:"negotiated_protocol,omitempty"` - NegotiatedProtocolIsMutual bool `protobuf:"varint,6,opt,name=negotiated_protocol_is_mutual,json=negotiatedProtocolIsMutual,proto3" json:"negotiated_protocol_is_mutual,omitempty"` - ServerName string `protobuf:"bytes,7,opt,name=server_name,json=serverName,proto3" json:"server_name,omitempty"` - PeerCertificates *CertificateChain `protobuf:"bytes,8,opt,name=peer_certificates,json=peerCertificates,proto3" json:"peer_certificates,omitempty"` - VerifiedChains []*CertificateChain `protobuf:"bytes,9,rep,name=verified_chains,json=verifiedChains,proto3" json:"verified_chains,omitempty"` - SignedCertificateTimestamps [][]byte `protobuf:"bytes,10,rep,name=signed_certificate_timestamps,json=signedCertificateTimestamps,proto3" json:"signed_certificate_timestamps,omitempty"` - OcspResponse []byte `protobuf:"bytes,11,opt,name=ocsp_response,json=ocspResponse,proto3" json:"ocsp_response,omitempty"` - TlsUnique []byte `protobuf:"bytes,12,opt,name=tls_unique,json=tlsUnique,proto3" json:"tls_unique,omitempty"` + state protoimpl.MessageState `protogen:"open.v1"` + Version uint32 `protobuf:"varint,1,opt,name=version,proto3" json:"version,omitempty"` + HandshakeComplete bool `protobuf:"varint,2,opt,name=handshake_complete,json=handshakeComplete,proto3" json:"handshake_complete,omitempty"` + DidResume bool `protobuf:"varint,3,opt,name=did_resume,json=didResume,proto3" json:"did_resume,omitempty"` + CipherSuite uint32 `protobuf:"varint,4,opt,name=cipher_suite,json=cipherSuite,proto3" json:"cipher_suite,omitempty"` + NegotiatedProtocol string `protobuf:"bytes,5,opt,name=negotiated_protocol,json=negotiatedProtocol,proto3" json:"negotiated_protocol,omitempty"` + NegotiatedProtocolIsMutual bool `protobuf:"varint,6,opt,name=negotiated_protocol_is_mutual,json=negotiatedProtocolIsMutual,proto3" json:"negotiated_protocol_is_mutual,omitempty"` + ServerName string `protobuf:"bytes,7,opt,name=server_name,json=serverName,proto3" json:"server_name,omitempty"` + PeerCertificates *CertificateChain `protobuf:"bytes,8,opt,name=peer_certificates,json=peerCertificates,proto3" json:"peer_certificates,omitempty"` + VerifiedChains []*CertificateChain `protobuf:"bytes,9,rep,name=verified_chains,json=verifiedChains,proto3" json:"verified_chains,omitempty"` + SignedCertificateTimestamps [][]byte `protobuf:"bytes,10,rep,name=signed_certificate_timestamps,json=signedCertificateTimestamps,proto3" json:"signed_certificate_timestamps,omitempty"` + OcspResponse []byte `protobuf:"bytes,11,opt,name=ocsp_response,json=ocspResponse,proto3" json:"ocsp_response,omitempty"` + TlsUnique []byte `protobuf:"bytes,12,opt,name=tls_unique,json=tlsUnique,proto3" json:"tls_unique,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *ConnectionState) Reset() { @@ -3457,11 +3408,10 @@ func (x *ConnectionState) GetTlsUnique() []byte { } type Certificate struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` + Asn1Data []byte `protobuf:"bytes,1,opt,name=asn1_data,json=asn1Data,proto3" json:"asn1_data,omitempty"` unknownFields protoimpl.UnknownFields - - Asn1Data []byte `protobuf:"bytes,1,opt,name=asn1_data,json=asn1Data,proto3" json:"asn1_data,omitempty"` + sizeCache protoimpl.SizeCache } func (x *Certificate) Reset() { @@ -3502,11 +3452,10 @@ func (x *Certificate) GetAsn1Data() []byte { } type CertificateChain struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` + Certificates []*Certificate `protobuf:"bytes,1,rep,name=certificates,proto3" json:"certificates,omitempty"` unknownFields protoimpl.UnknownFields - - Certificates []*Certificate `protobuf:"bytes,1,rep,name=certificates,proto3" json:"certificates,omitempty"` + sizeCache protoimpl.SizeCache } func (x *CertificateChain) Reset() { @@ -3547,12 +3496,11 @@ func (x *CertificateChain) GetCertificates() []*Certificate { } type SendEventRequest struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` + EventType string `protobuf:"bytes,1,opt,name=event_type,json=eventType,proto3" json:"event_type,omitempty"` + Event *logical.EventData `protobuf:"bytes,2,opt,name=event,proto3" json:"event,omitempty"` unknownFields protoimpl.UnknownFields - - EventType string `protobuf:"bytes,1,opt,name=event_type,json=eventType,proto3" json:"event_type,omitempty"` - Event *logical.EventData `protobuf:"bytes,2,opt,name=event,proto3" json:"event,omitempty"` + sizeCache protoimpl.SizeCache } func (x *SendEventRequest) Reset() { diff --git a/vault/activity/activity_log.pb.go b/vault/activity/activity_log.pb.go index aa7ce5d5919c..88a8bc08f7d9 100644 --- a/vault/activity/activity_log.pb.go +++ b/vault/activity/activity_log.pb.go @@ -3,7 +3,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.35.2 +// protoc-gen-go v1.36.1 // protoc (unknown) // source: vault/activity/activity_log.proto @@ -27,12 +27,9 @@ const ( // can store clients associated with entities or nonEntity clients, and really // is a ClientRecord, not specifically an EntityRecord. type EntityRecord struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - - ClientID string `protobuf:"bytes,1,opt,name=client_id,json=clientId,proto3" json:"client_id,omitempty"` - NamespaceID string `protobuf:"bytes,2,opt,name=namespace_id,json=namespaceID,proto3" json:"namespace_id,omitempty"` + state protoimpl.MessageState `protogen:"open.v1"` + ClientID string `protobuf:"bytes,1,opt,name=client_id,json=clientId,proto3" json:"client_id,omitempty"` + NamespaceID string `protobuf:"bytes,2,opt,name=namespace_id,json=namespaceID,proto3" json:"namespace_id,omitempty"` // using the Timestamp type would cost us an extra // 4 bytes per record to store nanoseconds. Timestamp int64 `protobuf:"varint,3,opt,name=timestamp,proto3" json:"timestamp,omitempty"` @@ -44,7 +41,9 @@ type EntityRecord struct { MountAccessor string `protobuf:"bytes,5,opt,name=mount_accessor,json=mountAccessor,proto3" json:"mount_accessor,omitempty"` // client_type identifies the source of the entity record (entity, // non-entity, acme, etc.) - ClientType string `protobuf:"bytes,6,opt,name=client_type,json=clientType,proto3" json:"client_type,omitempty"` + ClientType string `protobuf:"bytes,6,opt,name=client_type,json=clientType,proto3" json:"client_type,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *EntityRecord) Reset() { @@ -120,10 +119,7 @@ func (x *EntityRecord) GetClientType() string { } type LogFragment struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - + state protoimpl.MessageState `protogen:"open.v1"` // hostname (or node ID?) where the fragment originated, // used for debugging. OriginatingNode string `protobuf:"bytes,1,opt,name=originating_node,json=originatingNode,proto3" json:"originating_node,omitempty"` @@ -131,10 +127,9 @@ type LogFragment struct { Clients []*EntityRecord `protobuf:"bytes,2,rep,name=clients,proto3" json:"clients,omitempty"` // token counts not yet in a log segment, // indexed by namespace ID - NonEntityTokens map[string]uint64 `protobuf:"bytes,3,rep,name=non_entity_tokens,json=nonEntityTokens,proto3" json:"non_entity_tokens,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` - // the cluster id that this fragment originated from - // this is used when a fragment is sent from a secondary - OriginatingCluster string `protobuf:"bytes,4,opt,name=originating_cluster,json=originatingCluster,proto3" json:"originating_cluster,omitempty"` + NonEntityTokens map[string]uint64 `protobuf:"bytes,3,rep,name=non_entity_tokens,json=nonEntityTokens,proto3" json:"non_entity_tokens,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"varint,2,opt,name=value"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *LogFragment) Reset() { @@ -188,21 +183,13 @@ func (x *LogFragment) GetNonEntityTokens() map[string]uint64 { return nil } -func (x *LogFragment) GetOriginatingCluster() string { - if x != nil { - return x.OriginatingCluster - } - return "" -} - // This activity log stores records for both clients with entities // and clients without entities type EntityActivityLog struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` + Clients []*EntityRecord `protobuf:"bytes,1,rep,name=clients,proto3" json:"clients,omitempty"` unknownFields protoimpl.UnknownFields - - Clients []*EntityRecord `protobuf:"bytes,1,rep,name=clients,proto3" json:"clients,omitempty"` + sizeCache protoimpl.SizeCache } func (x *EntityActivityLog) Reset() { @@ -243,11 +230,10 @@ func (x *EntityActivityLog) GetClients() []*EntityRecord { } type TokenCount struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - - CountByNamespaceID map[string]uint64 `protobuf:"bytes,1,rep,name=count_by_namespace_id,json=countByNamespaceId,proto3" json:"count_by_namespace_id,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` + state protoimpl.MessageState `protogen:"open.v1"` + CountByNamespaceID map[string]uint64 `protobuf:"bytes,1,rep,name=count_by_namespace_id,json=countByNamespaceId,proto3" json:"count_by_namespace_id,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"varint,2,opt,name=value"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *TokenCount) Reset() { @@ -288,9 +274,9 @@ func (x *TokenCount) GetCountByNamespaceID() map[string]uint64 { } type LogFragmentResponse struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *LogFragmentResponse) Reset() { @@ -342,7 +328,7 @@ var file_vault_activity_activity_log_proto_rawDesc = []byte{ 0x01, 0x28, 0x09, 0x52, 0x0d, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x41, 0x63, 0x63, 0x65, 0x73, 0x73, 0x6f, 0x72, 0x12, 0x1f, 0x0a, 0x0b, 0x63, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x5f, 0x74, 0x79, 0x70, 0x65, 0x18, 0x06, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x63, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x54, - 0x79, 0x70, 0x65, 0x22, 0xb7, 0x02, 0x0a, 0x0b, 0x4c, 0x6f, 0x67, 0x46, 0x72, 0x61, 0x67, 0x6d, + 0x79, 0x70, 0x65, 0x22, 0x86, 0x02, 0x0a, 0x0b, 0x4c, 0x6f, 0x67, 0x46, 0x72, 0x61, 0x67, 0x6d, 0x65, 0x6e, 0x74, 0x12, 0x29, 0x0a, 0x10, 0x6f, 0x72, 0x69, 0x67, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6e, 0x67, 0x5f, 0x6e, 0x6f, 0x64, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0f, 0x6f, 0x72, 0x69, 0x67, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6e, 0x67, 0x4e, 0x6f, 0x64, 0x65, 0x12, 0x30, @@ -354,35 +340,32 @@ var file_vault_activity_activity_log_proto_rawDesc = []byte{ 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x2e, 0x4c, 0x6f, 0x67, 0x46, 0x72, 0x61, 0x67, 0x6d, 0x65, 0x6e, 0x74, 0x2e, 0x4e, 0x6f, 0x6e, 0x45, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x0f, 0x6e, 0x6f, 0x6e, 0x45, 0x6e, 0x74, 0x69, - 0x74, 0x79, 0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x73, 0x12, 0x2f, 0x0a, 0x13, 0x6f, 0x72, 0x69, 0x67, - 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6e, 0x67, 0x5f, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x18, - 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x12, 0x6f, 0x72, 0x69, 0x67, 0x69, 0x6e, 0x61, 0x74, 0x69, - 0x6e, 0x67, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x1a, 0x42, 0x0a, 0x14, 0x4e, 0x6f, 0x6e, - 0x45, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x73, 0x45, 0x6e, 0x74, 0x72, - 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, - 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, - 0x28, 0x04, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x45, 0x0a, - 0x11, 0x45, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x41, 0x63, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x4c, - 0x6f, 0x67, 0x12, 0x30, 0x0a, 0x07, 0x63, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x73, 0x18, 0x01, 0x20, - 0x03, 0x28, 0x0b, 0x32, 0x16, 0x2e, 0x61, 0x63, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x2e, 0x45, - 0x6e, 0x74, 0x69, 0x74, 0x79, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x52, 0x07, 0x63, 0x6c, 0x69, - 0x65, 0x6e, 0x74, 0x73, 0x22, 0xb4, 0x01, 0x0a, 0x0a, 0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x43, 0x6f, - 0x75, 0x6e, 0x74, 0x12, 0x5f, 0x0a, 0x15, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x5f, 0x62, 0x79, 0x5f, - 0x6e, 0x61, 0x6d, 0x65, 0x73, 0x70, 0x61, 0x63, 0x65, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x03, - 0x28, 0x0b, 0x32, 0x2c, 0x2e, 0x61, 0x63, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x2e, 0x54, 0x6f, - 0x6b, 0x65, 0x6e, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x2e, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x42, 0x79, - 0x4e, 0x61, 0x6d, 0x65, 0x73, 0x70, 0x61, 0x63, 0x65, 0x49, 0x64, 0x45, 0x6e, 0x74, 0x72, 0x79, - 0x52, 0x12, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x42, 0x79, 0x4e, 0x61, 0x6d, 0x65, 0x73, 0x70, 0x61, - 0x63, 0x65, 0x49, 0x64, 0x1a, 0x45, 0x0a, 0x17, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x42, 0x79, 0x4e, - 0x61, 0x6d, 0x65, 0x73, 0x70, 0x61, 0x63, 0x65, 0x49, 0x64, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, - 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, - 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x04, - 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x15, 0x0a, 0x13, 0x4c, - 0x6f, 0x67, 0x46, 0x72, 0x61, 0x67, 0x6d, 0x65, 0x6e, 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, - 0x73, 0x65, 0x42, 0x2b, 0x5a, 0x29, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, - 0x2f, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2f, 0x76, 0x61, 0x75, 0x6c, 0x74, - 0x2f, 0x76, 0x61, 0x75, 0x6c, 0x74, 0x2f, 0x61, 0x63, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x62, - 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x74, 0x79, 0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x73, 0x1a, 0x42, 0x0a, 0x14, 0x4e, 0x6f, 0x6e, 0x45, + 0x6e, 0x74, 0x69, 0x74, 0x79, 0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, + 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, + 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, + 0x04, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x45, 0x0a, 0x11, + 0x45, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x41, 0x63, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x4c, 0x6f, + 0x67, 0x12, 0x30, 0x0a, 0x07, 0x63, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x73, 0x18, 0x01, 0x20, 0x03, + 0x28, 0x0b, 0x32, 0x16, 0x2e, 0x61, 0x63, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x2e, 0x45, 0x6e, + 0x74, 0x69, 0x74, 0x79, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x52, 0x07, 0x63, 0x6c, 0x69, 0x65, + 0x6e, 0x74, 0x73, 0x22, 0xb4, 0x01, 0x0a, 0x0a, 0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x43, 0x6f, 0x75, + 0x6e, 0x74, 0x12, 0x5f, 0x0a, 0x15, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x5f, 0x62, 0x79, 0x5f, 0x6e, + 0x61, 0x6d, 0x65, 0x73, 0x70, 0x61, 0x63, 0x65, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x03, 0x28, + 0x0b, 0x32, 0x2c, 0x2e, 0x61, 0x63, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x2e, 0x54, 0x6f, 0x6b, + 0x65, 0x6e, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x2e, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x42, 0x79, 0x4e, + 0x61, 0x6d, 0x65, 0x73, 0x70, 0x61, 0x63, 0x65, 0x49, 0x64, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, + 0x12, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x42, 0x79, 0x4e, 0x61, 0x6d, 0x65, 0x73, 0x70, 0x61, 0x63, + 0x65, 0x49, 0x64, 0x1a, 0x45, 0x0a, 0x17, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x42, 0x79, 0x4e, 0x61, + 0x6d, 0x65, 0x73, 0x70, 0x61, 0x63, 0x65, 0x49, 0x64, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, + 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, + 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x04, 0x52, + 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x15, 0x0a, 0x13, 0x4c, 0x6f, + 0x67, 0x46, 0x72, 0x61, 0x67, 0x6d, 0x65, 0x6e, 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, + 0x65, 0x42, 0x2b, 0x5a, 0x29, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, + 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2f, 0x76, 0x61, 0x75, 0x6c, 0x74, 0x2f, + 0x76, 0x61, 0x75, 0x6c, 0x74, 0x2f, 0x61, 0x63, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x62, 0x06, + 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( diff --git a/vault/activity/activity_log.proto b/vault/activity/activity_log.proto index ac68db1c4e2a..cb0a6b94e8d7 100644 --- a/vault/activity/activity_log.proto +++ b/vault/activity/activity_log.proto @@ -38,10 +38,6 @@ message LogFragment { // token counts not yet in a log segment, // indexed by namespace ID map non_entity_tokens = 3; - - // the cluster id that this fragment originated from - // this is used when a fragment is sent from a secondary - string originating_cluster = 4; } // This activity log stores records for both clients with entities diff --git a/vault/activity_log.go b/vault/activity_log.go index fd3721adef41..62678dbdd838 100644 --- a/vault/activity_log.go +++ b/vault/activity_log.go @@ -53,9 +53,8 @@ const ( ActivityLogLocalPrefix = "sys/counters/activity/local/log/" ActivityPrefix = "sys/counters/activity/" - // Time to wait before a perf standby sends data to the active node, or - // before the active node of a performance secondary sends global data to the primary. - activityFragmentSendInterval = 10 * time.Minute + // Time to wait on perf standby before sending fragment + activityFragmentStandbyTime = 10 * time.Minute // Time between writes of segment to storage activitySegmentInterval = 10 * time.Minute @@ -141,17 +140,13 @@ type ActivityLog struct { // ActivityLog.l protects the configuration settings, except enable, and any modifications // to the current segment. - // Acquire "l" before fragmentLock and globalFragmentLock if both must be held. + // Acquire "l" before fragmentLock if both must be held. l sync.RWMutex // fragmentLock protects enable, partialMonthClientTracker, fragment, // standbyFragmentsReceived. fragmentLock sync.RWMutex - // globalFragmentLock protects enable secondaryGlobalClientFragments, currentGlobalFragment - // and globalPartialMonthClientTracker - globalFragmentLock sync.RWMutex - // enabled indicates if the activity log is enabled for this cluster. // This is protected by fragmentLock so we can check with only // a single synchronization call. @@ -174,17 +169,13 @@ type ActivityLog struct { nodeID string // current log fragment (may be nil) - fragment *activity.LogFragment + fragment *activity.LogFragment + fragmentCreation time.Time // Channel to signal a new fragment has been created // so it's appropriate to start the timer. newFragmentCh chan struct{} - // Channel to signal a new global fragment has been created - // so it's appropriate to start the timer. Once the timer finishes - // the secondary will send currentGlobalFragment to the primary - newGlobalClientFragmentCh chan struct{} - // Channel for sending fragment immediately sendCh chan struct{} @@ -197,9 +188,6 @@ type ActivityLog struct { // Fragments received from performance standbys standbyFragmentsReceived []*activity.LogFragment - // Fragments of global clients received from performance secondaries - secondaryGlobalClientFragments []*activity.LogFragment - // precomputed queries queryStore *activity.PrecomputedQueryStore defaultReportMonths int @@ -219,9 +207,6 @@ type ActivityLog struct { // partialMonthClientTracker tracks active clients this month. Protected by fragmentLock. partialMonthClientTracker map[string]*activity.EntityRecord - // globalPartialMonthClientTracker tracks active clients this month. Protected by globalFragmentLock. - globalPartialMonthClientTracker map[string]*activity.EntityRecord - inprocessExport *atomic.Bool // clock is used to support manipulating time in unit and integration tests @@ -229,9 +214,6 @@ type ActivityLog struct { // precomputedQueryWritten receives an element whenever a precomputed query // is written. It's used for unit testing precomputedQueryWritten chan struct{} - - // currentGlobalFragment tracks the global clients of all the clients in memory - currentGlobalFragment *activity.LogFragment } // These non-persistent configuration options allow us to disable @@ -254,10 +236,6 @@ type ActivityLogCoreConfig struct { Clock timeutil.Clock DisableInvalidation bool - - // GlobalFragmentSendInterval sets the interval to send global data from the secondary to the primary - // This is only for testing purposes - GlobalFragmentSendInterval time.Duration } // ActivityLogExportRecord is the output structure for activity export @@ -328,19 +306,17 @@ func NewActivityLog(core *Core, logger log.Logger, view *BarrierView, metrics me clock = timeutil.DefaultClock{} } a := &ActivityLog{ - core: core, - configOverrides: &core.activityLogConfig, - logger: logger, - view: view, - metrics: metrics, - nodeID: hostname, - newFragmentCh: make(chan struct{}, 1), - newGlobalClientFragmentCh: make(chan struct{}, 1), - sendCh: make(chan struct{}, 1), // buffered so it can be triggered by fragment size - doneCh: make(chan struct{}, 1), - partialMonthClientTracker: make(map[string]*activity.EntityRecord), - globalPartialMonthClientTracker: make(map[string]*activity.EntityRecord), - clock: clock, + core: core, + configOverrides: &core.activityLogConfig, + logger: logger, + view: view, + metrics: metrics, + nodeID: hostname, + newFragmentCh: make(chan struct{}, 1), + sendCh: make(chan struct{}, 1), // buffered so it can be triggered by fragment size + doneCh: make(chan struct{}, 1), + partialMonthClientTracker: make(map[string]*activity.EntityRecord), + clock: clock, currentSegment: segmentInfo{ startTimestamp: 0, currentClients: &activity.EntityActivityLog{ @@ -354,10 +330,9 @@ func NewActivityLog(core *Core, logger log.Logger, view *BarrierView, metrics me }, clientSequenceNumber: 0, }, - standbyFragmentsReceived: make([]*activity.LogFragment, 0), - secondaryGlobalClientFragments: make([]*activity.LogFragment, 0), - inprocessExport: atomic.NewBool(false), - precomputedQueryWritten: make(chan struct{}), + standbyFragmentsReceived: make([]*activity.LogFragment, 0), + inprocessExport: atomic.NewBool(false), + precomputedQueryWritten: make(chan struct{}), } config, err := a.loadConfigOrDefault(core.activeContext) @@ -404,38 +379,10 @@ func (a *ActivityLog) saveCurrentSegmentToStorageLocked(ctx context.Context, for a.fragmentLock.Lock() localFragment := a.fragment a.fragment = nil - standbys := a.standbyFragmentsReceived a.standbyFragmentsReceived = make([]*activity.LogFragment, 0) a.fragmentLock.Unlock() - a.globalFragmentLock.Lock() - secondaryGlobalClients := a.secondaryGlobalClientFragments - a.secondaryGlobalClientFragments = make([]*activity.LogFragment, 0) - globalClients := a.currentGlobalFragment - a.currentGlobalFragment = nil - a.globalFragmentLock.Unlock() - - if !a.core.IsPerfSecondary() { - if a.currentGlobalFragment != nil { - a.metrics.IncrCounterWithLabels([]string{"core", "activity", "global_fragment_size"}, - float32(len(globalClients.Clients)), - []metricsutil.Label{ - {"type", "client"}, - }) - } - var globalReceivedFragmentTotal int - for _, globalReceivedFragment := range secondaryGlobalClients { - globalReceivedFragmentTotal += len(globalReceivedFragment.Clients) - } - a.metrics.IncrCounterWithLabels([]string{"core", "activity", "global_received_fragment_size"}, - float32(globalReceivedFragmentTotal), - []metricsutil.Label{ - {"type", "client"}, - }) - - } - // If segment start time is zero, do not update or write // (even if force is true). This can happen if activityLog is // disabled after a save as been triggered. @@ -511,6 +458,7 @@ func (a *ActivityLog) saveCurrentSegmentToStorageLocked(ctx context.Context, for } } a.currentSegment.currentClients.Clients = segmentClients + err := a.saveCurrentSegmentInternal(ctx, force) if err != nil { // The current fragment(s) have already been placed into the in-memory @@ -793,19 +741,14 @@ func (a *ActivityLog) loadPriorEntitySegment(ctx context.Context, startTime time a.l.RLock() a.fragmentLock.Lock() - a.globalFragmentLock.Lock() // Handle the (unlikely) case where the end of the month has been reached while background loading. // Or the feature has been disabled. if a.enabled && startTime.Unix() == a.currentSegment.startTimestamp { for _, ent := range out.Clients { a.partialMonthClientTracker[ent.ClientID] = ent - if local, _ := a.isClientLocal(ent); !local { - a.globalPartialMonthClientTracker[ent.ClientID] = ent - } } } a.fragmentLock.Unlock() - a.globalFragmentLock.Unlock() a.l.RUnlock() return nil @@ -846,9 +789,6 @@ func (a *ActivityLog) loadCurrentClientSegment(ctx context.Context, startTime ti for _, client := range out.Clients { a.partialMonthClientTracker[client.ClientID] = client - if local, _ := a.isClientLocal(client); !local { - a.globalPartialMonthClientTracker[client.ClientID] = client - } } return nil @@ -972,11 +912,8 @@ func (a *ActivityLog) resetCurrentLog() { a.fragment = nil a.partialMonthClientTracker = make(map[string]*activity.EntityRecord) - a.currentGlobalFragment = nil - a.globalPartialMonthClientTracker = make(map[string]*activity.EntityRecord) a.standbyFragmentsReceived = make([]*activity.LogFragment, 0) - a.secondaryGlobalClientFragments = make([]*activity.LogFragment, 0) } func (a *ActivityLog) deleteLogWorker(ctx context.Context, startTimestamp int64, whenDone chan struct{}) { @@ -1032,8 +969,6 @@ func (a *ActivityLog) refreshFromStoredLog(ctx context.Context, wg *sync.WaitGro defer a.l.Unlock() a.fragmentLock.Lock() defer a.fragmentLock.Unlock() - a.globalFragmentLock.Lock() - defer a.globalFragmentLock.Unlock() decreasingLogTimes, err := a.getMostRecentActivityLogSegment(ctx, now) if err != nil { @@ -1291,9 +1226,6 @@ func (c *Core) setupActivityLogLocked(ctx context.Context, wg *sync.WaitGroup, r } else { if !c.activityLogConfig.DisableFragmentWorker { go manager.activeFragmentWorker(ctx) - if c.IsPerfSecondary() { - go manager.secondaryFragmentWorker(ctx) - } } doRegeneration := !reload && !manager.hasRegeneratedACME(ctx) @@ -1445,97 +1377,6 @@ func (a *ActivityLog) StartOfNextMonth() time.Time { return timeutil.StartOfNextMonth(segmentStart) } -// secondaryFragmentWorker handles scheduling global client fragments -// to send via RPC to the primary; it runs on performance secondaries -func (a *ActivityLog) secondaryFragmentWorker(ctx context.Context) { - timer := a.clock.NewTimer(time.Duration(0)) - fragmentWaiting := false - // Eat first event, so timer is stopped - <-timer.C - - endOfMonth := a.clock.NewTimer(a.StartOfNextMonth().Sub(a.clock.Now())) - if a.configOverrides.DisableTimers { - endOfMonth.Stop() - } - sendInterval := activityFragmentSendInterval - // This changes the interval to a duration that was set for testing purposes - if a.configOverrides.GlobalFragmentSendInterval.Microseconds() > 0 { - sendInterval = a.configOverrides.GlobalFragmentSendInterval - } - - sendFunc := func() { - ctx, cancel := context.WithTimeout(ctx, activityFragmentSendTimeout) - defer cancel() - err := a.sendGlobalClients(ctx) - if err != nil { - a.logger.Warn("activity log global fragment lost", "error", err) - } - } - - for { - select { - case <-a.doneCh: - // Shutting down activity log. - if fragmentWaiting && !timer.Stop() { - <-timer.C - } - if !endOfMonth.Stop() { - <-endOfMonth.C - } - return - case <-a.newGlobalClientFragmentCh: - // New fragment created, start the timer if not - // already running - if !fragmentWaiting { - fragmentWaiting = true - if !a.configOverrides.DisableTimers { - a.logger.Trace("reset global fragment timer") - timer.Reset(sendInterval) - } - } - case <-timer.C: - a.logger.Trace("sending global fragment on timer expiration") - fragmentWaiting = false - sendFunc() - case <-a.sendCh: - a.logger.Trace("sending global fragment on request") - // It might be that we get sendCh before fragmentCh - // if a fragment is created and then immediately fills - // up to its limit. So we attempt to send even if the timer's - // not running. - if fragmentWaiting { - fragmentWaiting = false - if !timer.Stop() { - <-timer.C - } - } - sendFunc() - case <-endOfMonth.C: - a.logger.Trace("sending global fragment on end of month") - // Flush the current fragment, if any - if fragmentWaiting { - fragmentWaiting = false - if !timer.Stop() { - <-timer.C - } - } - sendFunc() - - // clear active entity set - a.globalFragmentLock.Lock() - a.globalPartialMonthClientTracker = make(map[string]*activity.EntityRecord) - - a.globalFragmentLock.Unlock() - - // Set timer for next month. - // The current segment *probably* hasn't been set yet (via invalidation), - // so don't rely on it. - target := timeutil.StartOfNextMonth(a.clock.Now().UTC()) - endOfMonth.Reset(target.Sub(a.clock.Now())) - } - } -} - // perfStandbyFragmentWorker handles scheduling fragments // to send via RPC; it runs on perf standby nodes only. func (a *ActivityLog) perfStandbyFragmentWorker(ctx context.Context) { @@ -1576,7 +1417,7 @@ func (a *ActivityLog) perfStandbyFragmentWorker(ctx context.Context) { fragmentWaiting = true if !a.configOverrides.DisableTimers { a.logger.Trace("reset fragment timer") - timer.Reset(activityFragmentSendInterval) + timer.Reset(activityFragmentStandbyTime) } } case <-timer.C: @@ -1789,13 +1630,8 @@ func (c *Core) ResetActivityLog() []*activity.LogFragment { allFragments = append(allFragments, a.standbyFragmentsReceived...) a.standbyFragmentsReceived = make([]*activity.LogFragment, 0) - a.secondaryGlobalClientFragments = make([]*activity.LogFragment, 0) a.partialMonthClientTracker = make(map[string]*activity.EntityRecord) a.fragmentLock.Unlock() - - a.globalFragmentLock.Lock() - a.globalPartialMonthClientTracker = make(map[string]*activity.EntityRecord) - a.globalFragmentLock.Unlock() return allFragments } @@ -1846,9 +1682,6 @@ func (a *ActivityLog) AddActivityToFragment(clientID string, namespaceID string, a.fragmentLock.Lock() defer a.fragmentLock.Unlock() - a.globalFragmentLock.Lock() - defer a.globalFragmentLock.Unlock() - // Re-check entity ID after re-acquiring lock _, present = a.partialMonthClientTracker[clientID] if present { @@ -1856,7 +1689,6 @@ func (a *ActivityLog) AddActivityToFragment(clientID string, namespaceID string, } a.createCurrentFragment() - a.createCurrentGlobalFragment() clientRecord := &activity.EntityRecord{ ClientID: clientID, @@ -1875,39 +1707,9 @@ func (a *ActivityLog) AddActivityToFragment(clientID string, namespaceID string, } a.fragment.Clients = append(a.fragment.Clients, clientRecord) - - // Check if the client is local - if local, _ := a.isClientLocal(clientRecord); !local { - // If the client is not local and has not already been seen, then add the client - // to the current global fragment - if _, ok := a.globalPartialMonthClientTracker[clientRecord.ClientID]; !ok { - a.globalPartialMonthClientTracker[clientRecord.ClientID] = clientRecord - a.currentGlobalFragment.Clients = append(a.currentGlobalFragment.Clients, clientRecord) - } - } a.partialMonthClientTracker[clientRecord.ClientID] = clientRecord } -// isClientLocal checks whether the given client is on a local mount. -// In all other cases, we will assume it is a global client. -func (a *ActivityLog) isClientLocal(client *activity.EntityRecord) (bool, error) { - if !utf8.ValidString(client.ClientID) { - return false, fmt.Errorf("client ID %q is not a valid string", client.ClientID) - } - // Tokens are not replicated to performance secondary clusters - if client.GetClientType() == nonEntityTokenActivityType { - return true, nil - } - mountEntry := a.core.router.MatchingMountByAccessor(client.MountAccessor) - // If the mount entry is nil, this means the mount has been deleted. We will assume it was replicated because we do not want to - // over count clients - if mountEntry != nil && mountEntry.Local { - return true, nil - } - - return false, nil -} - // Create the current fragment if it doesn't already exist. // Must be called with the lock held. func (a *ActivityLog) createCurrentFragment() { @@ -1917,46 +1719,14 @@ func (a *ActivityLog) createCurrentFragment() { Clients: make([]*activity.EntityRecord, 0, 120), NonEntityTokens: make(map[string]uint64), } + a.fragmentCreation = a.clock.Now().UTC() + // Signal that a new segment is available, start // the timer to send it. a.newFragmentCh <- struct{}{} } } -// Create the current fragment to track global clients seen -// on cluster. Must be called with the globalFragmentLock held -func (a *ActivityLog) createCurrentGlobalFragment() { - if a.currentGlobalFragment == nil { - a.currentGlobalFragment = &activity.LogFragment{ - OriginatingCluster: a.core.ClusterID(), - Clients: make([]*activity.EntityRecord, 0), - } - - if a.core.IsPerfSecondary() { - // Signal that a new global segment is available, start - // the timer to send it - a.newGlobalClientFragmentCh <- struct{}{} - } - } -} - -func (a *ActivityLog) receivedGlobalClientFragments(fragment *activity.LogFragment) { - a.logger.Trace("received fragment from secondary", "cluster_id", fragment.GetOriginatingCluster()) - - a.globalFragmentLock.Lock() - defer a.globalFragmentLock.Unlock() - - if !a.enabled { - return - } - - for _, e := range fragment.Clients { - a.globalPartialMonthClientTracker[e.ClientID] = e - } - - a.secondaryGlobalClientFragments = append(a.secondaryGlobalClientFragments, fragment) -} - func (a *ActivityLog) receivedFragment(fragment *activity.LogFragment) { a.logger.Trace("received fragment from standby", "node", fragment.OriginatingNode) @@ -1967,19 +1737,8 @@ func (a *ActivityLog) receivedFragment(fragment *activity.LogFragment) { return } - a.globalFragmentLock.Lock() - defer a.globalFragmentLock.Unlock() - a.createCurrentGlobalFragment() - for _, e := range fragment.Clients { a.partialMonthClientTracker[e.ClientID] = e - - // If the client is global, then add to global maps and keep in a global fragment - if local, _ := a.isClientLocal(e); !local { - a.globalPartialMonthClientTracker[e.ClientID] = e - a.currentGlobalFragment.Clients = append(a.currentGlobalFragment.Clients, e) - } - } a.standbyFragmentsReceived = append(a.standbyFragmentsReceived, fragment) @@ -2928,7 +2687,6 @@ func (a *ActivityLog) retentionWorker(ctx context.Context, currentTime time.Time // Periodic report of number of active entities, with the current month. // We don't break this down by namespace because that would require going to storage (that information // is not currently stored in memory.) -// TODO: to deprecate. These metrics are not useful anymore func (a *ActivityLog) PartialMonthMetrics(ctx context.Context) ([]metricsutil.GaugeLabelValues, error) { a.fragmentLock.RLock() defer a.fragmentLock.RUnlock() diff --git a/vault/activity_log_stubs_oss.go b/vault/activity_log_stubs_oss.go deleted file mode 100644 index 7d2457360563..000000000000 --- a/vault/activity_log_stubs_oss.go +++ /dev/null @@ -1,15 +0,0 @@ -// Copyright (c) HashiCorp, Inc. -// SPDX-License-Identifier: BUSL-1.1 - -//go:build !enterprise - -package vault - -import "context" - -//go:generate go run github.com/hashicorp/vault/tools/stubmaker - -// sendGlobalClients is a no-op on CE -func (a *ActivityLog) sendGlobalClients(ctx context.Context) error { - return nil -} diff --git a/vault/activity_log_test.go b/vault/activity_log_test.go index 59747d6953a1..d5e221f0197a 100644 --- a/vault/activity_log_test.go +++ b/vault/activity_log_test.go @@ -45,7 +45,7 @@ func TestActivityLog_Creation(t *testing.T) { if a.logger == nil || a.view == nil { t.Fatal("activity log not initialized") } - if a.fragment != nil || a.currentGlobalFragment != nil { + if a.fragment != nil { t.Fatal("activity log already has fragment") } @@ -54,18 +54,15 @@ func TestActivityLog_Creation(t *testing.T) { ts := time.Now() a.AddEntityToFragment(entity_id, namespace_id, ts.Unix()) - if a.fragment == nil || a.currentGlobalFragment == nil { + if a.fragment == nil { t.Fatal("no fragment created") } if a.fragment.OriginatingNode != a.nodeID { t.Errorf("mismatched node ID, %q vs %q", a.fragment.OriginatingNode, a.nodeID) } - if a.currentGlobalFragment.OriginatingCluster != a.core.ClusterID() { - t.Errorf("mismatched cluster ID, %q vs %q", a.currentGlobalFragment.GetOriginatingCluster(), a.core.ClusterID()) - } - if a.fragment.Clients == nil || a.currentGlobalFragment.Clients == nil { + if a.fragment.Clients == nil { t.Fatal("no fragment entity slice") } @@ -76,9 +73,6 @@ func TestActivityLog_Creation(t *testing.T) { if len(a.fragment.Clients) != 1 { t.Fatalf("wrong number of entities %v", len(a.fragment.Clients)) } - if len(a.currentGlobalFragment.Clients) != 1 { - t.Fatalf("wrong number of entities %v", len(a.currentGlobalFragment.Clients)) - } er := a.fragment.Clients[0] if er.ClientID != entity_id { @@ -91,17 +85,6 @@ func TestActivityLog_Creation(t *testing.T) { t.Errorf("mimatched timestamp, %v vs %v", er.Timestamp, ts.Unix()) } - er = a.currentGlobalFragment.Clients[0] - if er.ClientID != entity_id { - t.Errorf("mimatched entity ID, %q vs %q", er.ClientID, entity_id) - } - if er.NamespaceID != namespace_id { - t.Errorf("mimatched namespace ID, %q vs %q", er.NamespaceID, namespace_id) - } - if er.Timestamp != ts.Unix() { - t.Errorf("mimatched timestamp, %v vs %v", er.Timestamp, ts.Unix()) - } - // Reset and test the other code path a.fragment = nil a.AddTokenToFragment(namespace_id) @@ -135,7 +118,7 @@ func TestActivityLog_Creation_WrappingTokens(t *testing.T) { t.Fatal("activity log not initialized") } a.fragmentLock.Lock() - if a.fragment != nil || a.currentGlobalFragment != nil { + if a.fragment != nil { t.Fatal("activity log already has fragment") } a.fragmentLock.Unlock() @@ -156,7 +139,7 @@ func TestActivityLog_Creation_WrappingTokens(t *testing.T) { } a.fragmentLock.Lock() - if a.fragment != nil || a.currentGlobalFragment != nil { + if a.fragment != nil { t.Fatal("fragment created") } a.fragmentLock.Unlock() @@ -176,7 +159,7 @@ func TestActivityLog_Creation_WrappingTokens(t *testing.T) { } a.fragmentLock.Lock() - if a.fragment != nil || a.currentGlobalFragment != nil { + if a.fragment != nil { t.Fatal("fragment created") } a.fragmentLock.Unlock() @@ -215,16 +198,13 @@ func TestActivityLog_UniqueEntities(t *testing.T) { a.AddEntityToFragment(id2, "root", t3.Unix()) a.AddEntityToFragment(id1, "root", t3.Unix()) - if a.fragment == nil || a.currentGlobalFragment == nil { + if a.fragment == nil { t.Fatal("no current fragment") } if len(a.fragment.Clients) != 2 { t.Fatalf("number of entities is %v", len(a.fragment.Clients)) } - if len(a.currentGlobalFragment.Clients) != 2 { - t.Fatalf("number of entities is %v", len(a.currentGlobalFragment.Clients)) - } for i, e := range a.fragment.Clients { expectedID := id1 @@ -244,24 +224,6 @@ func TestActivityLog_UniqueEntities(t *testing.T) { t.Errorf("%v: expected %v, got %v", i, expectedTime, e.Timestamp) } } - for i, e := range a.currentGlobalFragment.Clients { - expectedID := id1 - expectedTime := t1.Unix() - expectedNS := "root" - if i == 1 { - expectedID = id2 - expectedTime = t2.Unix() - } - if e.ClientID != expectedID { - t.Errorf("%v: expected %q, got %q", i, expectedID, e.ClientID) - } - if e.NamespaceID != expectedNS { - t.Errorf("%v: expected %q, got %q", i, expectedNS, e.NamespaceID) - } - if e.Timestamp != expectedTime { - t.Errorf("%v: expected %v, got %v", i, expectedTime, e.Timestamp) - } - } checkExpectedEntitiesInMap(t, a, []string{id1, id2}) } @@ -345,7 +307,7 @@ func TestActivityLog_SaveTokensToStorage(t *testing.T) { if err != nil { t.Fatalf("got error writing tokens to storage: %v", err) } - if a.fragment != nil || a.currentGlobalFragment != nil { + if a.fragment != nil { t.Errorf("fragment was not reset after write to storage") } @@ -377,7 +339,7 @@ func TestActivityLog_SaveTokensToStorage(t *testing.T) { if err != nil { t.Fatalf("got error writing tokens to storage: %v", err) } - if a.fragment != nil || a.currentGlobalFragment != nil { + if a.fragment != nil { t.Errorf("fragment was not reset after write to storage") } @@ -446,7 +408,7 @@ func TestActivityLog_SaveTokensToStorageDoesNotUpdateTokenCount(t *testing.T) { } // Assert that new elements have been written to the fragment - if a.fragment != nil || a.currentGlobalFragment != nil { + if a.fragment != nil { t.Errorf("fragment was not reset after write to storage") } @@ -509,7 +471,7 @@ func TestActivityLog_SaveEntitiesToStorage(t *testing.T) { if err != nil { t.Fatalf("got error writing entities to storage: %v", err) } - if a.fragment != nil || a.currentGlobalFragment != nil { + if a.fragment != nil { t.Errorf("fragment was not reset after write to storage") } @@ -1290,8 +1252,6 @@ func (a *ActivityLog) resetEntitiesInMemory(t *testing.T) { defer a.l.Unlock() a.fragmentLock.Lock() defer a.fragmentLock.Unlock() - a.globalFragmentLock.Lock() - defer a.globalFragmentLock.Unlock() a.currentSegment = segmentInfo{ startTimestamp: time.Time{}.Unix(), currentClients: &activity.EntityActivityLog{ @@ -1302,7 +1262,6 @@ func (a *ActivityLog) resetEntitiesInMemory(t *testing.T) { } a.partialMonthClientTracker = make(map[string]*activity.EntityRecord) - a.globalPartialMonthClientTracker = make(map[string]*activity.EntityRecord) } // TestActivityLog_loadCurrentClientSegment writes entity segments and calls loadCurrentClientSegment, then verifies @@ -4808,26 +4767,15 @@ func TestAddActivityToFragment(t *testing.T) { numClientsBefore := len(a.fragment.Clients) a.fragmentLock.RUnlock() - a.globalFragmentLock.RLock() - globalClientsBefore := len(a.currentGlobalFragment.Clients) - a.globalFragmentLock.RUnlock() - a.AddActivityToFragment(tc.id, ns, 0, tc.activityType, mount) a.fragmentLock.RLock() defer a.fragmentLock.RUnlock() numClientsAfter := len(a.fragment.Clients) - a.globalFragmentLock.RLock() - defer a.globalFragmentLock.RUnlock() - globalClientsAfter := len(a.currentGlobalFragment.Clients) if tc.isAdded { require.Equal(t, numClientsBefore+1, numClientsAfter) - if tc.activityType != nonEntityTokenActivityType { - require.Equal(t, globalClientsBefore+1, globalClientsAfter) - } } else { require.Equal(t, numClientsBefore, numClientsAfter) - require.Equal(t, globalClientsBefore, globalClientsAfter) } require.Contains(t, a.partialMonthClientTracker, tc.expectedID) @@ -4839,17 +4787,6 @@ func TestAddActivityToFragment(t *testing.T) { MountAccessor: mount, ClientType: tc.activityType, }, a.partialMonthClientTracker[tc.expectedID])) - if tc.activityType != nonEntityTokenActivityType { - require.Contains(t, a.globalPartialMonthClientTracker, tc.expectedID) - require.True(t, proto.Equal(&activity.EntityRecord{ - ClientID: tc.expectedID, - NamespaceID: ns, - Timestamp: 0, - NonEntity: tc.isNonEntity, - MountAccessor: mount, - ClientType: tc.activityType, - }, a.globalPartialMonthClientTracker[tc.expectedID])) - } }) } } diff --git a/vault/activity_log_testing_util.go b/vault/activity_log_testing_util.go index 42fd3ca7f8cd..bbaae9551191 100644 --- a/vault/activity_log_testing_util.go +++ b/vault/activity_log_testing_util.go @@ -63,11 +63,11 @@ func (c *Core) GetActiveClients() map[string]*activity.EntityRecord { out := make(map[string]*activity.EntityRecord) c.stateLock.RLock() - c.activityLog.globalFragmentLock.RLock() - for k, v := range c.activityLog.globalPartialMonthClientTracker { + c.activityLog.fragmentLock.RLock() + for k, v := range c.activityLog.partialMonthClientTracker { out[k] = v } - c.activityLog.globalFragmentLock.RUnlock() + c.activityLog.fragmentLock.RUnlock() c.stateLock.RUnlock() return out @@ -247,11 +247,3 @@ func (a *ActivityLog) GetEnabled() bool { func (c *Core) GetActivityLog() *ActivityLog { return c.activityLog } - -func (c *Core) GetActiveGlobalFragment() *activity.LogFragment { - return c.activityLog.currentGlobalFragment -} - -func (c *Core) GetSecondaryGlobalFragments() []*activity.LogFragment { - return c.activityLog.secondaryGlobalClientFragments -} diff --git a/vault/diagnose/tls_verification_test.go b/vault/diagnose/tls_verification_test.go index 769330fb776d..9a7640fba1d0 100644 --- a/vault/diagnose/tls_verification_test.go +++ b/vault/diagnose/tls_verification_test.go @@ -14,6 +14,7 @@ import ( pkihelper "github.com/hashicorp/vault/helper/testhelpers/pki" "github.com/hashicorp/vault/internalshared/configutil" + "github.com/stretchr/testify/require" ) // TestTLSValidCert is the positive test case to show that specifying a valid cert and key @@ -124,13 +125,14 @@ func TestTLSExpiredCert(t *testing.T) { // TestTLSMismatchedCryptographicInfo verifies that a cert and key of differing cryptographic // types, when specified together, is met with a unique error message. func TestTLSMismatchedCryptographicInfo(t *testing.T) { + testCaFiles := pkihelper.GenerateCertWithRoot(t) listeners := []*configutil.Listener{ { Type: "tcp", Address: "127.0.0.1:443", ClusterAddress: "127.0.0.1:8201", - TLSCertFile: "./../../api/test-fixtures/keys/cert.pem", - TLSKeyFile: "./test-fixtures/ecdsa.key", + TLSCertFile: testCaFiles.Leaf.CertFile, + TLSKeyFile: "./test-fixtures/goodkey.pem", // pkihelper uses EC keys, this file is an RSA key TLSMinVersion: "tls10", TLSDisableClientCerts: true, }, @@ -148,7 +150,7 @@ func TestTLSMismatchedCryptographicInfo(t *testing.T) { Type: "tcp", Address: "127.0.0.1:443", ClusterAddress: "127.0.0.1:8201", - TLSCertFile: "./test-fixtures/ecdsa.crt", + TLSCertFile: testCaFiles.Leaf.CertFile, TLSKeyFile: "./../../api/test-fixtures/keys/key.pem", TLSClientCAFile: "./../../api/test-fixtures/root/rootcacert.pem", TLSMinVersion: "tls10", @@ -189,13 +191,15 @@ func TestTLSMultiKeys(t *testing.T) { // TestTLSCertAsKey verifies that a unique error message is thrown when a cert is specified twice. func TestTLSCertAsKey(t *testing.T) { + testCaFiles := pkihelper.GenerateCertWithRoot(t) + listeners := []*configutil.Listener{ { Type: "tcp", Address: "127.0.0.1:443", ClusterAddress: "127.0.0.1:8201", - TLSCertFile: "./../../api/test-fixtures/keys/cert.pem", - TLSKeyFile: "./../../api/test-fixtures/keys/cert.pem", + TLSCertFile: testCaFiles.Leaf.CertFile, + TLSKeyFile: testCaFiles.Leaf.CertFile, TLSMinVersion: "tls10", TLSDisableClientCerts: true, }, @@ -213,13 +217,21 @@ func TestTLSCertAsKey(t *testing.T) { // the root. The root certificate used in this test is the Baltimore Cyber Trust root // certificate, downloaded from: https://www.digicert.com/kb/digicert-root-certificates.htm func TestTLSInvalidRoot(t *testing.T) { + testCaFiles := pkihelper.GenerateCertWithRoot(t) + otherRoot := pkihelper.GenerateRootCa(t) + + tempDir := t.TempDir() + mixedRoots := filepath.Join(tempDir, "leaf-with-bad-root.pem") + err := os.WriteFile(mixedRoots, append(pem.EncodeToMemory(testCaFiles.Leaf.CertPem), pem.EncodeToMemory(otherRoot.CertPem)...), 0o644) + require.NoError(t, err, "Failed to write file %s", mixedRoots) + listeners := []*configutil.Listener{ { Type: "tcp", Address: "127.0.0.1:443", ClusterAddress: "127.0.0.1:8201", - TLSCertFile: "./test-fixtures/goodcertbadroot.pem", - TLSKeyFile: "./test-fixtures/goodkey.pem", + TLSCertFile: mixedRoots, + TLSKeyFile: testCaFiles.Leaf.KeyFile, TLSMinVersion: "tls10", TLSDisableClientCerts: true, }, @@ -237,13 +249,15 @@ func TestTLSInvalidRoot(t *testing.T) { // is still accepted by diagnose as valid. This is an acceptable, though less secure, // server configuration. func TestTLSNoRoot(t *testing.T) { + testCaFiles := pkihelper.GenerateCertWithRoot(t) + listeners := []*configutil.Listener{ { Type: "tcp", Address: "127.0.0.1:443", ClusterAddress: "127.0.0.1:8201", - TLSCertFile: "./../../api/test-fixtures/keys/cert.pem", - TLSKeyFile: "./test-fixtures/goodkey.pem", + TLSCertFile: testCaFiles.Leaf.CertFile, + TLSKeyFile: testCaFiles.Leaf.KeyFile, TLSMinVersion: "tls10", TLSDisableClientCerts: true, }, @@ -258,14 +272,16 @@ func TestTLSNoRoot(t *testing.T) { // TestTLSInvalidMinVersion checks that a listener with an invalid minimum configured // version errors appropriately. func TestTLSInvalidMinVersion(t *testing.T) { + testCaFiles := pkihelper.GenerateCertWithRoot(t) + listeners := []*configutil.Listener{ { Type: "tcp", Address: "127.0.0.1:443", ClusterAddress: "127.0.0.1:8201", - TLSCertFile: "./../../api/test-fixtures/keys/cert.pem", - TLSKeyFile: "./../../api/test-fixtures/keys/key.pem", - TLSClientCAFile: "./../../api/test-fixtures/root/rootcacert.pem", + TLSCertFile: testCaFiles.Leaf.CertFile, + TLSKeyFile: testCaFiles.Leaf.KeyFile, + TLSClientCAFile: testCaFiles.RootCa.CertFile, TLSMinVersion: "0", TLSDisableClientCerts: true, }, @@ -282,14 +298,16 @@ func TestTLSInvalidMinVersion(t *testing.T) { // TestTLSInvalidMaxVersion checks that a listener with an invalid maximum configured // version errors appropriately. func TestTLSInvalidMaxVersion(t *testing.T) { + testCaFiles := pkihelper.GenerateCertWithRoot(t) + listeners := []*configutil.Listener{ { Type: "tcp", Address: "127.0.0.1:443", ClusterAddress: "127.0.0.1:8201", - TLSCertFile: "./../../api/test-fixtures/keys/cert.pem", - TLSKeyFile: "./../../api/test-fixtures/keys/key.pem", - TLSClientCAFile: "./../../api/test-fixtures/root/rootcacert.pem", + TLSCertFile: testCaFiles.Leaf.CertFile, + TLSKeyFile: testCaFiles.Leaf.KeyFile, + TLSClientCAFile: testCaFiles.RootCa.CertFile, TLSMaxVersion: "0", TLSDisableClientCerts: true, }, @@ -549,13 +567,15 @@ func TestTLSMultipleRootInClientCACert(t *testing.T) { // TestTLSSelfSignedCerts tests invalid self-signed cert as TLSClientCAFile func TestTLSSelfSignedCert(t *testing.T) { + testCaFiles := pkihelper.GenerateCertWithRoot(t) + listeners := []*configutil.Listener{ { Type: "tcp", Address: "127.0.0.1:443", ClusterAddress: "127.0.0.1:8201", - TLSCertFile: "./../../api/test-fixtures/keys/cert.pem", - TLSKeyFile: "./../../api/test-fixtures/keys/key.pem", + TLSCertFile: testCaFiles.Leaf.CertFile, + TLSKeyFile: testCaFiles.Leaf.KeyFile, TLSClientCAFile: "test-fixtures/selfSignedCert.pem", TLSMinVersion: "tls10", TLSRequireAndVerifyClientCert: true, diff --git a/vault/hcp_link/proto/link_control/link_control.pb.go b/vault/hcp_link/proto/link_control/link_control.pb.go index 952f0b0359a2..179d5ad87bba 100644 --- a/vault/hcp_link/proto/link_control/link_control.pb.go +++ b/vault/hcp_link/proto/link_control/link_control.pb.go @@ -3,7 +3,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.35.2 +// protoc-gen-go v1.36.0 // protoc (unknown) // source: vault/hcp_link/proto/link_control/link_control.proto @@ -24,9 +24,9 @@ const ( ) type PurgePolicyRequest struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *PurgePolicyRequest) Reset() { @@ -60,9 +60,9 @@ func (*PurgePolicyRequest) Descriptor() ([]byte, []int) { } type PurgePolicyResponse struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *PurgePolicyResponse) Reset() { diff --git a/vault/hcp_link/proto/meta/meta.pb.go b/vault/hcp_link/proto/meta/meta.pb.go index 55ed3f7fe8b3..d28ad9546c05 100644 --- a/vault/hcp_link/proto/meta/meta.pb.go +++ b/vault/hcp_link/proto/meta/meta.pb.go @@ -3,7 +3,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.35.2 +// protoc-gen-go v1.36.0 // protoc (unknown) // source: vault/hcp_link/proto/meta/meta.proto @@ -24,9 +24,9 @@ const ( ) type ListNamespacesRequest struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *ListNamespacesRequest) Reset() { @@ -60,11 +60,10 @@ func (*ListNamespacesRequest) Descriptor() ([]byte, []int) { } type ListNamespacesResponse struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` + Paths []string `protobuf:"bytes,1,rep,name=Paths,proto3" json:"Paths,omitempty"` unknownFields protoimpl.UnknownFields - - Paths []string `protobuf:"bytes,1,rep,name=Paths,proto3" json:"Paths,omitempty"` + sizeCache protoimpl.SizeCache } func (x *ListNamespacesResponse) Reset() { @@ -105,9 +104,9 @@ func (x *ListNamespacesResponse) GetPaths() []string { } type ListMountsRequest struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *ListMountsRequest) Reset() { @@ -141,13 +140,12 @@ func (*ListMountsRequest) Descriptor() ([]byte, []int) { } type Mount struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` + Path string `protobuf:"bytes,1,opt,name=Path,proto3" json:"Path,omitempty"` + Type string `protobuf:"bytes,2,opt,name=Type,proto3" json:"Type,omitempty"` + Description string `protobuf:"bytes,3,opt,name=Description,proto3" json:"Description,omitempty"` unknownFields protoimpl.UnknownFields - - Path string `protobuf:"bytes,1,opt,name=Path,proto3" json:"Path,omitempty"` - Type string `protobuf:"bytes,2,opt,name=Type,proto3" json:"Type,omitempty"` - Description string `protobuf:"bytes,3,opt,name=Description,proto3" json:"Description,omitempty"` + sizeCache protoimpl.SizeCache } func (x *Mount) Reset() { @@ -202,11 +200,10 @@ func (x *Mount) GetDescription() string { } type ListMountsResponse struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` + Mounts []*Mount `protobuf:"bytes,1,rep,name=Mounts,proto3" json:"Mounts,omitempty"` unknownFields protoimpl.UnknownFields - - Mounts []*Mount `protobuf:"bytes,1,rep,name=Mounts,proto3" json:"Mounts,omitempty"` + sizeCache protoimpl.SizeCache } func (x *ListMountsResponse) Reset() { @@ -247,9 +244,9 @@ func (x *ListMountsResponse) GetMounts() []*Mount { } type ListAuthsRequest struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *ListAuthsRequest) Reset() { @@ -283,13 +280,12 @@ func (*ListAuthsRequest) Descriptor() ([]byte, []int) { } type Auth struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` + Path string `protobuf:"bytes,1,opt,name=Path,proto3" json:"Path,omitempty"` + Type string `protobuf:"bytes,2,opt,name=Type,proto3" json:"Type,omitempty"` + Description string `protobuf:"bytes,3,opt,name=Description,proto3" json:"Description,omitempty"` unknownFields protoimpl.UnknownFields - - Path string `protobuf:"bytes,1,opt,name=Path,proto3" json:"Path,omitempty"` - Type string `protobuf:"bytes,2,opt,name=Type,proto3" json:"Type,omitempty"` - Description string `protobuf:"bytes,3,opt,name=Description,proto3" json:"Description,omitempty"` + sizeCache protoimpl.SizeCache } func (x *Auth) Reset() { @@ -344,11 +340,10 @@ func (x *Auth) GetDescription() string { } type ListAuthResponse struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` + Auths []*Auth `protobuf:"bytes,1,rep,name=Auths,proto3" json:"Auths,omitempty"` unknownFields protoimpl.UnknownFields - - Auths []*Auth `protobuf:"bytes,1,rep,name=Auths,proto3" json:"Auths,omitempty"` + sizeCache protoimpl.SizeCache } func (x *ListAuthResponse) Reset() { @@ -389,9 +384,9 @@ func (x *ListAuthResponse) GetAuths() []*Auth { } type GetClusterStatusRequest struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *GetClusterStatusRequest) Reset() { @@ -425,11 +420,10 @@ func (*GetClusterStatusRequest) Descriptor() ([]byte, []int) { } type HANode struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` + Hostname string `protobuf:"bytes,1,opt,name=Hostname,proto3" json:"Hostname,omitempty"` unknownFields protoimpl.UnknownFields - - Hostname string `protobuf:"bytes,1,opt,name=Hostname,proto3" json:"Hostname,omitempty"` + sizeCache protoimpl.SizeCache } func (x *HANode) Reset() { @@ -470,12 +464,11 @@ func (x *HANode) GetHostname() string { } type HAStatus struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` + Enabled bool `protobuf:"varint,1,opt,name=Enabled,proto3" json:"Enabled,omitempty"` + Nodes []*HANode `protobuf:"bytes,2,rep,name=Nodes,proto3" json:"Nodes,omitempty"` unknownFields protoimpl.UnknownFields - - Enabled bool `protobuf:"varint,1,opt,name=Enabled,proto3" json:"Enabled,omitempty"` - Nodes []*HANode `protobuf:"bytes,2,rep,name=Nodes,proto3" json:"Nodes,omitempty"` + sizeCache protoimpl.SizeCache } func (x *HAStatus) Reset() { @@ -523,10 +516,7 @@ func (x *HAStatus) GetNodes() []*HANode { } type RaftServer struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - + state protoimpl.MessageState `protogen:"open.v1"` // NodeID is the name of the server NodeID string `protobuf:"bytes,1,opt,name=NodeID,proto3" json:"NodeID,omitempty"` // Address is the IP:port of the server, used for Raft communications @@ -537,7 +527,9 @@ type RaftServer struct { ProtocolVersion string `protobuf:"bytes,4,opt,name=ProtocolVersion,proto3" json:"ProtocolVersion,omitempty"` // Voter is true if this server has a vote in the cluster. This might // be false if the server is staging and still coming online. - Voter bool `protobuf:"varint,5,opt,name=Voter,proto3" json:"Voter,omitempty"` + Voter bool `protobuf:"varint,5,opt,name=Voter,proto3" json:"Voter,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *RaftServer) Reset() { @@ -606,11 +598,10 @@ func (x *RaftServer) GetVoter() bool { } type RaftConfiguration struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` + Servers []*RaftServer `protobuf:"bytes,1,rep,name=Servers,proto3" json:"Servers,omitempty"` unknownFields protoimpl.UnknownFields - - Servers []*RaftServer `protobuf:"bytes,1,rep,name=Servers,proto3" json:"Servers,omitempty"` + sizeCache protoimpl.SizeCache } func (x *RaftConfiguration) Reset() { @@ -651,12 +642,11 @@ func (x *RaftConfiguration) GetServers() []*RaftServer { } type AutopilotServer struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` + ID string `protobuf:"bytes,1,opt,name=ID,proto3" json:"ID,omitempty"` + Healthy bool `protobuf:"varint,2,opt,name=Healthy,proto3" json:"Healthy,omitempty"` unknownFields protoimpl.UnknownFields - - ID string `protobuf:"bytes,1,opt,name=ID,proto3" json:"ID,omitempty"` - Healthy bool `protobuf:"varint,2,opt,name=Healthy,proto3" json:"Healthy,omitempty"` + sizeCache protoimpl.SizeCache } func (x *AutopilotServer) Reset() { @@ -704,12 +694,11 @@ func (x *AutopilotServer) GetHealthy() bool { } type AutopilotStatus struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` + Healthy bool `protobuf:"varint,1,opt,name=Healthy,proto3" json:"Healthy,omitempty"` + Servers []*AutopilotServer `protobuf:"bytes,2,rep,name=Servers,proto3" json:"Servers,omitempty"` unknownFields protoimpl.UnknownFields - - Healthy bool `protobuf:"varint,1,opt,name=Healthy,proto3" json:"Healthy,omitempty"` - Servers []*AutopilotServer `protobuf:"bytes,2,rep,name=Servers,proto3" json:"Servers,omitempty"` + sizeCache protoimpl.SizeCache } func (x *AutopilotStatus) Reset() { @@ -757,13 +746,12 @@ func (x *AutopilotStatus) GetServers() []*AutopilotServer { } type RaftStatus struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - - RaftConfiguration *RaftConfiguration `protobuf:"bytes,1,opt,name=RaftConfiguration,proto3" json:"RaftConfiguration,omitempty"` - AutopilotStatus *AutopilotStatus `protobuf:"bytes,2,opt,name=AutopilotStatus,proto3" json:"AutopilotStatus,omitempty"` - QuorumWarning string `protobuf:"bytes,3,opt,name=QuorumWarning,proto3" json:"QuorumWarning,omitempty"` + state protoimpl.MessageState `protogen:"open.v1"` + RaftConfiguration *RaftConfiguration `protobuf:"bytes,1,opt,name=RaftConfiguration,proto3" json:"RaftConfiguration,omitempty"` + AutopilotStatus *AutopilotStatus `protobuf:"bytes,2,opt,name=AutopilotStatus,proto3" json:"AutopilotStatus,omitempty"` + QuorumWarning string `protobuf:"bytes,3,opt,name=QuorumWarning,proto3" json:"QuorumWarning,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *RaftStatus) Reset() { @@ -818,15 +806,14 @@ func (x *RaftStatus) GetQuorumWarning() string { } type GetClusterStatusResponse struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` + ClusterID string `protobuf:"bytes,1,opt,name=ClusterID,proto3" json:"ClusterID,omitempty"` + HAStatus *HAStatus `protobuf:"bytes,2,opt,name=HAStatus,proto3" json:"HAStatus,omitempty"` + RaftStatus *RaftStatus `protobuf:"bytes,3,opt,name=RaftStatus,proto3" json:"RaftStatus,omitempty"` + StorageType string `protobuf:"bytes,4,opt,name=StorageType,proto3" json:"StorageType,omitempty"` + ClusterName string `protobuf:"bytes,5,opt,name=ClusterName,proto3" json:"ClusterName,omitempty"` unknownFields protoimpl.UnknownFields - - ClusterID string `protobuf:"bytes,1,opt,name=ClusterID,proto3" json:"ClusterID,omitempty"` - HAStatus *HAStatus `protobuf:"bytes,2,opt,name=HAStatus,proto3" json:"HAStatus,omitempty"` - RaftStatus *RaftStatus `protobuf:"bytes,3,opt,name=RaftStatus,proto3" json:"RaftStatus,omitempty"` - StorageType string `protobuf:"bytes,4,opt,name=StorageType,proto3" json:"StorageType,omitempty"` - ClusterName string `protobuf:"bytes,5,opt,name=ClusterName,proto3" json:"ClusterName,omitempty"` + sizeCache protoimpl.SizeCache } func (x *GetClusterStatusResponse) Reset() { diff --git a/vault/hcp_link/proto/node_status/status.pb.go b/vault/hcp_link/proto/node_status/status.pb.go index 1b275364c4a4..58929533da06 100644 --- a/vault/hcp_link/proto/node_status/status.pb.go +++ b/vault/hcp_link/proto/node_status/status.pb.go @@ -3,7 +3,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.35.2 +// protoc-gen-go v1.36.0 // protoc (unknown) // source: vault/hcp_link/proto/node_status/status.proto @@ -84,11 +84,10 @@ func (LogLevel) EnumDescriptor() ([]byte, []int) { } type RaftStatus struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` + IsVoter bool `protobuf:"varint,1,opt,name=IsVoter,proto3" json:"IsVoter,omitempty"` unknownFields protoimpl.UnknownFields - - IsVoter bool `protobuf:"varint,1,opt,name=IsVoter,proto3" json:"IsVoter,omitempty"` + sizeCache protoimpl.SizeCache } func (x *RaftStatus) Reset() { @@ -129,10 +128,7 @@ func (x *RaftStatus) GetIsVoter() bool { } type LinkedClusterNodeStatusResponse struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - + state protoimpl.MessageState `protogen:"open.v1"` Type string `protobuf:"bytes,1,opt,name=Type,proto3" json:"Type,omitempty"` Initialized bool `protobuf:"varint,2,opt,name=Initialized,proto3" json:"Initialized,omitempty"` Sealed bool `protobuf:"varint,3,opt,name=Sealed,proto3" json:"Sealed,omitempty"` @@ -155,6 +151,8 @@ type LinkedClusterNodeStatusResponse struct { LogLevel LogLevel `protobuf:"varint,20,opt,name=LogLevel,proto3,enum=hashicorp.vault.hcp_link.node_status.LogLevel" json:"LogLevel,omitempty"` ActiveTime *timestamppb.Timestamp `protobuf:"bytes,21,opt,name=ActiveTime,proto3" json:"ActiveTime,omitempty"` RaftStatus *RaftStatus `protobuf:"bytes,22,opt,name=RaftStatus,proto3" json:"RaftStatus,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *LinkedClusterNodeStatusResponse) Reset() { diff --git a/vault/request_forwarding_service.pb.go b/vault/request_forwarding_service.pb.go index f414f016ad90..48f1d04ab361 100644 --- a/vault/request_forwarding_service.pb.go +++ b/vault/request_forwarding_service.pb.go @@ -3,7 +3,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.35.2 +// protoc-gen-go v1.36.0 // protoc (unknown) // source: vault/request_forwarding_service.proto @@ -27,11 +27,8 @@ const ( ) type EchoRequest struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - - Message string `protobuf:"bytes,1,opt,name=message,proto3" json:"message,omitempty"` + state protoimpl.MessageState `protogen:"open.v1"` + 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,proto3" json:"cluster_addr,omitempty"` @@ -52,6 +49,8 @@ type EchoRequest struct { // clock_skew_millis is the server time minus the local time ClockSkewMillis int64 `protobuf:"varint,14,opt,name=clock_skew_millis,json=clockSkewMillis,proto3" json:"clock_skew_millis,omitempty"` ReplicationPrimaryCanaryAgeMillis int64 `protobuf:"varint,15,opt,name=replication_primary_canary_age_millis,json=replicationPrimaryCanaryAgeMillis,proto3" json:"replication_primary_canary_age_millis,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *EchoRequest) Reset() { @@ -190,18 +189,17 @@ func (x *EchoRequest) GetReplicationPrimaryCanaryAgeMillis() int64 { } type EchoReply struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - - 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"` - RaftAppliedIndex uint64 `protobuf:"varint,4,opt,name=raft_applied_index,json=raftAppliedIndex,proto3" json:"raft_applied_index,omitempty"` - RaftNodeID string `protobuf:"bytes,5,opt,name=raft_node_id,json=raftNodeId,proto3" json:"raft_node_id,omitempty"` - NodeInfo *NodeInformation `protobuf:"bytes,6,opt,name=node_info,json=nodeInfo,proto3" json:"node_info,omitempty"` + state protoimpl.MessageState `protogen:"open.v1"` + 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"` + RaftAppliedIndex uint64 `protobuf:"varint,4,opt,name=raft_applied_index,json=raftAppliedIndex,proto3" json:"raft_applied_index,omitempty"` + RaftNodeID string `protobuf:"bytes,5,opt,name=raft_node_id,json=raftNodeId,proto3" json:"raft_node_id,omitempty"` + NodeInfo *NodeInformation `protobuf:"bytes,6,opt,name=node_info,json=nodeInfo,proto3" json:"node_info,omitempty"` // now is the time on the server - Now *timestamppb.Timestamp `protobuf:"bytes,7,opt,name=now,proto3" json:"now,omitempty"` + Now *timestamppb.Timestamp `protobuf:"bytes,7,opt,name=now,proto3" json:"now,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *EchoReply) Reset() { @@ -284,16 +282,15 @@ func (x *EchoReply) GetNow() *timestamppb.Timestamp { } type NodeInformation struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - - ClusterAddr string `protobuf:"bytes,1,opt,name=cluster_addr,json=clusterAddr,proto3" json:"cluster_addr,omitempty"` - ApiAddr string `protobuf:"bytes,2,opt,name=api_addr,json=apiAddr,proto3" json:"api_addr,omitempty"` - Mode string `protobuf:"bytes,3,opt,name=mode,proto3" json:"mode,omitempty"` - NodeID string `protobuf:"bytes,4,opt,name=node_id,json=nodeId,proto3" json:"node_id,omitempty"` - ReplicationState uint32 `protobuf:"varint,5,opt,name=replication_state,json=replicationState,proto3" json:"replication_state,omitempty"` - Hostname string `protobuf:"bytes,6,opt,name=hostname,proto3" json:"hostname,omitempty"` + state protoimpl.MessageState `protogen:"open.v1"` + ClusterAddr string `protobuf:"bytes,1,opt,name=cluster_addr,json=clusterAddr,proto3" json:"cluster_addr,omitempty"` + ApiAddr string `protobuf:"bytes,2,opt,name=api_addr,json=apiAddr,proto3" json:"api_addr,omitempty"` + Mode string `protobuf:"bytes,3,opt,name=mode,proto3" json:"mode,omitempty"` + NodeID string `protobuf:"bytes,4,opt,name=node_id,json=nodeId,proto3" json:"node_id,omitempty"` + ReplicationState uint32 `protobuf:"varint,5,opt,name=replication_state,json=replicationState,proto3" json:"replication_state,omitempty"` + Hostname string `protobuf:"bytes,6,opt,name=hostname,proto3" json:"hostname,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *NodeInformation) Reset() { @@ -369,14 +366,13 @@ func (x *NodeInformation) GetHostname() string { } type ClientKey struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` + Type string `protobuf:"bytes,1,opt,name=type,proto3" json:"type,omitempty"` + X []byte `protobuf:"bytes,2,opt,name=x,proto3" json:"x,omitempty"` + Y []byte `protobuf:"bytes,3,opt,name=y,proto3" json:"y,omitempty"` + D []byte `protobuf:"bytes,4,opt,name=d,proto3" json:"d,omitempty"` unknownFields protoimpl.UnknownFields - - Type string `protobuf:"bytes,1,opt,name=type,proto3" json:"type,omitempty"` - X []byte `protobuf:"bytes,2,opt,name=x,proto3" json:"x,omitempty"` - Y []byte `protobuf:"bytes,3,opt,name=y,proto3" json:"y,omitempty"` - D []byte `protobuf:"bytes,4,opt,name=d,proto3" json:"d,omitempty"` + sizeCache protoimpl.SizeCache } func (x *ClientKey) Reset() { @@ -438,9 +434,9 @@ func (x *ClientKey) GetD() []byte { } type PerfStandbyElectionInput struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *PerfStandbyElectionInput) Reset() { @@ -474,16 +470,15 @@ func (*PerfStandbyElectionInput) Descriptor() ([]byte, []int) { } type PerfStandbyElectionResponse struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - - ID string `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"` - ClusterID string `protobuf:"bytes,2,opt,name=cluster_id,json=clusterId,proto3" json:"cluster_id,omitempty"` - PrimaryClusterAddr string `protobuf:"bytes,3,opt,name=primary_cluster_addr,json=primaryClusterAddr,proto3" json:"primary_cluster_addr,omitempty"` - CaCert []byte `protobuf:"bytes,4,opt,name=ca_cert,json=caCert,proto3" json:"ca_cert,omitempty"` - ClientCert []byte `protobuf:"bytes,5,opt,name=client_cert,json=clientCert,proto3" json:"client_cert,omitempty"` - ClientKey *ClientKey `protobuf:"bytes,6,opt,name=client_key,json=clientKey,proto3" json:"client_key,omitempty"` + state protoimpl.MessageState `protogen:"open.v1"` + ID string `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"` + ClusterID string `protobuf:"bytes,2,opt,name=cluster_id,json=clusterId,proto3" json:"cluster_id,omitempty"` + PrimaryClusterAddr string `protobuf:"bytes,3,opt,name=primary_cluster_addr,json=primaryClusterAddr,proto3" json:"primary_cluster_addr,omitempty"` + CaCert []byte `protobuf:"bytes,4,opt,name=ca_cert,json=caCert,proto3" json:"ca_cert,omitempty"` + ClientCert []byte `protobuf:"bytes,5,opt,name=client_cert,json=clientCert,proto3" json:"client_cert,omitempty"` + ClientKey *ClientKey `protobuf:"bytes,6,opt,name=client_key,json=clientKey,proto3" json:"client_key,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *PerfStandbyElectionResponse) Reset() { diff --git a/vault/seal/multi_wrap_value.pb.go b/vault/seal/multi_wrap_value.pb.go index 9a2d943e6ef7..acd94cc1a062 100644 --- a/vault/seal/multi_wrap_value.pb.go +++ b/vault/seal/multi_wrap_value.pb.go @@ -3,7 +3,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.35.2 +// protoc-gen-go v1.36.0 // protoc (unknown) // source: vault/seal/multi_wrap_value.proto @@ -26,14 +26,13 @@ const ( // MultiWrapValue can be used to keep track of different encryptions of a value. type MultiWrapValue struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - + state protoimpl.MessageState `protogen:"open.v1"` // Generation is used to keep track of when the MultiWrapValue was generated. Generation uint64 `protobuf:"varint,1,opt,name=generation,proto3" json:"generation,omitempty"` // Slots has a BlobInfo for each key used to encrypt the value. - Slots []*v2.BlobInfo `protobuf:"bytes,2,rep,name=slots,proto3" json:"slots,omitempty"` + Slots []*v2.BlobInfo `protobuf:"bytes,2,rep,name=slots,proto3" json:"slots,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *MultiWrapValue) Reset() { diff --git a/vault/tokens/token.pb.go b/vault/tokens/token.pb.go index 95b13f57c3bd..f3c3cd7963a1 100644 --- a/vault/tokens/token.pb.go +++ b/vault/tokens/token.pb.go @@ -3,7 +3,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.35.2 +// protoc-gen-go v1.36.0 // protoc (unknown) // source: vault/tokens/token.proto @@ -25,13 +25,12 @@ const ( // SignedToken type SignedToken struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` + TokenVersion uint64 `protobuf:"varint,1,opt,name=token_version,json=tokenVersion,proto3" json:"token_version,omitempty"` // always 1 for now + Hmac []byte `protobuf:"bytes,2,opt,name=hmac,proto3" json:"hmac,omitempty"` // HMAC of token + Token []byte `protobuf:"bytes,3,opt,name=token,proto3" json:"token,omitempty"` // protobuf-marshalled Token message unknownFields protoimpl.UnknownFields - - TokenVersion uint64 `protobuf:"varint,1,opt,name=token_version,json=tokenVersion,proto3" json:"token_version,omitempty"` // always 1 for now - Hmac []byte `protobuf:"bytes,2,opt,name=hmac,proto3" json:"hmac,omitempty"` // HMAC of token - Token []byte `protobuf:"bytes,3,opt,name=token,proto3" json:"token,omitempty"` // protobuf-marshalled Token message + sizeCache protoimpl.SizeCache } func (x *SignedToken) Reset() { @@ -86,13 +85,12 @@ func (x *SignedToken) GetToken() []byte { } type Token struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` + Random string `protobuf:"bytes,1,opt,name=random,proto3" json:"random,omitempty"` // unencoded equiv of former $randbase62 + LocalIndex uint64 `protobuf:"varint,2,opt,name=local_index,json=localIndex,proto3" json:"local_index,omitempty"` // required storage state to have this token + IndexEpoch uint32 `protobuf:"varint,3,opt,name=index_epoch,json=indexEpoch,proto3" json:"index_epoch,omitempty"` unknownFields protoimpl.UnknownFields - - Random string `protobuf:"bytes,1,opt,name=random,proto3" json:"random,omitempty"` // unencoded equiv of former $randbase62 - LocalIndex uint64 `protobuf:"varint,2,opt,name=local_index,json=localIndex,proto3" json:"local_index,omitempty"` // required storage state to have this token - IndexEpoch uint32 `protobuf:"varint,3,opt,name=index_epoch,json=indexEpoch,proto3" json:"index_epoch,omitempty"` + sizeCache protoimpl.SizeCache } func (x *Token) Reset() { diff --git a/website/content/docs/concepts/integrated-storage/migrate-consul-storage.mdx b/website/content/docs/concepts/integrated-storage/migrate-consul-storage.mdx new file mode 100644 index 000000000000..c476e175e29d --- /dev/null +++ b/website/content/docs/concepts/integrated-storage/migrate-consul-storage.mdx @@ -0,0 +1,276 @@ +--- +layout: docs +page_title: Migrate Consul storage to Integrated Storage +description: Learn how to migrate Vault from Consul storage to Integrated Storage. +--- + +# Migrate Consul storage to Integrated Storage + +This guidance provides steps to migrate Vault server storage from Consul to +Integrated Storage. + + + +Integrated Storage requires **Vault 1.4** or later. + + + + + +Before continuing with this guidance, be sure to read the [Migration checklist](/vault/docs/concepts/integrated-storage/migration-checklist) +first. + +Also, review the [upgrade guide](/vault/docs/upgrading) to learn about version specific +details related to your current Vault version or versions between your current +version and the intended upgrade version. + + + +Use the following workflow to migrate Consul storage to Integrated Storage, +noting the recommendations specific to Vault Enterprise and Enterprise Replication. + +## Snapshot Vault data + +You should take a snapshot of the Vault data using [Consul +Snapshot](/consul/commands/snapshot) before performing an upgrade or Vault +storage migration. + +[Consul Enterprise](/consul/docs/enterprise) users can use the +[automated Snapshot Agent](/consul/commands/snapshot/agent) to +periodically capture and retain snapshots in a specified destination. +You can use the latest available snapshot to restore in case of issues +with upgrading or migrating the storage. + +### Snapshot Vault data + +Execute the following command from either directly on a Consul server, or +any system running a Consul client agent connected to the server cluster that +holds the Vault data. + +```shell-session +$ consul snapshot save backup.snap +Saved and verified snapshot to index 1394 +``` + +The snapshot file `backup.snap` will be present in the current working +directory. + +### Inspect the snapshot + +The snapshot file is a gzip compressed archive. You can perform some +inspection on the snapshot file via the `consul snapshot inspect` +command and also manually by decompressing the file and examining its contents. + +```shell-session +$ consul snapshot inspect backup.snap + +ID 2-1394-1515172423763 +Size 481887 +Index 1394 +Term 2 +Version 1 +``` + +This output shows the snapshot ID, size in bytes, plus the snapshot index, term, +and version. You can compare this with the server (for example, with +`consul info`) and is useful to detect any data corruption. + + + + Refer to [Datacenter backups](/consul/tutorials/production-deploy/backup-and-restore) for more information. + + + +## Migrate Vault storage + +If you have a multi-datacenter Vault Enterprise Replication deployments, skip to +the [Vault Enterprise Replication](#vault-enterprise-replications) section. + + + + Vault will need to be offline during the migration process. + + + +Perform the migration step on one of the nodes in the cluster which will become +the leader node. + +To walkthrough the migration steps, assume that the following is your **new** +Vault server configuration. + +```hcl +# Storage configuration +storage "raft" { + path = "/vault/raft/" + node_id = "node_1" +} + +listener "tcp" { + address = "0.0.0.0:8200" + cluster_address = "0.0.0.0:8201" + tls_cert_file = "/path/to/fullchain.pem" + tls_key_file = "/path/to/privkey.pem" +} + +api_addr = "https://13.57.14.206:8200" +cluster_addr = "https://10.0.101.22:8201" +disable_mlock = true +ui=true +``` + +Notice that the `path` value is `/vault/raft/` and `node_id` value is +`node_1`. (Refer to the [server configuration documentation](/vault/docs/configuration/storage/raft) +for details.) + + + + When using Integrated Storage , it is strongly recommended to +set `disable_mlock` to `true`, and to disable memory swapping on the system. + + + +1. Create a migration configuration file (e.g. `migrate.hcl`). + + ```hcl + storage_source "consul" { + address = "127.0.0.1:8500" + path = "vault" + } + + storage_destination "raft" { + path = "/vault/raft/" + node_id = "node_1" + } + + cluster_addr = "https://10.0.101.22:8201" + ``` + + The `storage_source` stanza should be the current storage type (`consul`) + configuration, and the `storage_destination` points to the [Integrated Storage + (`raft`) + configuration](/vault/docs/configuration/storage/raft). + + The `path` and `node_id` values must match the values you set in the server + configuration file. + + + + The `/vault/raft/` path must exist on the host machine. The + migration command will not create the folder for you. + + + +1. Execute the `vault operator` command to perform the migration. + + ```shell-session + $ vault operator migrate -config=migrate.hcl + ``` + + Refer to the Vault command documentation on [operator + migrate](/vault/docs/commands/operator/migrate#migrating-to-integrated-raft-storage) + for more information. + +1. You can start the Vault server using the new server configuration pointing to + the `raft` storage and unseal. + + At this point, there is just one raft cluster member. + + ```shell-session + $ vault operator raft list-peers + + Node Address State Voter + ---- ------- ----- ----- + node_1 https://10.0.101.22:8201 leader true + ``` + +1. Start the remaining Vault nodes in the cluster and add each node to the + cluster using the `vault operator raft join` command. If the configuration + enables [`retry_join`](/vault/docs/configuration/storage/raft#retry_join-stanza), + then there is no need to invoke the `raft join` command. The follower + nodes join the cluster automatically in this case. + + ```shell-session + $ vault operator raft join https://13.57.14.206:8200 + ``` + + While `https://13.57.14.206:8200` is the leader node's `api_addr`. + + If you are not familiar with how the HA cluster with Integrated Storage works, + read the [Vault HA Cluster with Integrated + Storage](/vault/tutorials/raft/raft-storage) tutorial to familiarize yourself with + the Integrated Storage. + +## Vault Enterprise Replication + +If you have multi-datacenter Vault Enterprise Replication deployments such as +the diagram, read the recommendation in this section. + + + +![Vault Enterprise Replication](/img/vault-ent-replication.png) + + + +### Recommended approach for Vault Enterprise + +1. Stop the DR secondary cluster (Cluster 4 in the diagram above as an example). + +1. [Create a new Vault cluster](/vault/tutorials/raft/raft-storage) configured with + Integrated Storage (Cluster 5 in the diagram) and [add it as a new DR + secondary](/vault/tutorials/enterprise/disaster-recovery#enable-dr-secondary-replication). + + + + ![Vault Enterprise Replication](/img/vault-ent-replication-2.png) + + + +1. As some workload comes through, monitor that the [DR secondary cluster is + catching up with its primary + cluster](/vault/tutorials/monitoring/monitor-replication#are-my-dr-clusters-in-sync) + (Cluster 2) which is still using Consul as storage. If there is no + issue, you can stop and decommission the old secondary cluster (Cluster 4) at this + point. + +1. Stop the primary cluster (Cluster 2) and [promote the DR + secondary](/vault/tutorials/enterprise/disaster-recovery#promote-dr-secondary-to-primary) + (Cluster 5) to be the new primary. + + If the cluster is a performance secondary, check to make sure that it is + [syncing up with its performance + primary](/vault/tutorials/monitoring/monitor-replication#are-my-performance-clusters-in-sync) + (Cluster 1). + +1. Repeat the step by creating a new cluster configured with Integrated Storage + (Cluster 6) and add it as a DR secondary to the new primary (Cluster 5). + + + + ![Vault Enterprise Replication](/img/vault-ent-replication-3.png) + + + + Monitor that [it syncs up with its + primary](/vault/tutorials/monitoring/monitor-replication#are-my-dr-clusters-in-sync) + as some workload comes through. Finally, you can terminate the old primary + cluster (Cluster 2). + +Repeat the same workflow to migrate the Vault data to Integrated Storage on the +performance primary (Cluster 1) and its DR secondary (Cluster 3). + +## Post-migration health check + +Once you migrate the storage, verify that the cluster is healthy, and check +logs for any unusual errors related to cluster health. Refer to the +following guidance to learn more: + +- [Troubleshooting Vault - Vault Logs](/vault/tutorials/monitoring/troubleshooting-vault#vault-logs) +- If you have Vault Enterprise Replication environment, refer to the [Monitoring Vault Replication](/vault/tutorials/monitoring/monitor-replication) + +## Help and reference + +- Vault command documentation on [operator migrate](/vault/docs/commands/operator/migrate#migrating-to-integrated-raft-storage) +- [Integrated Storage documentation](/vault/docs/internals/integrated-storage) +- [Integrated Storage Concepts](/vault/docs/concepts/integrated-storage) +- [Upgrading Vault guide](/vault/docs/upgrading) +- [Inspect Data in Integrated Storage](/vault/tutorials/monitoring/inspect-data-integrated-storage) diff --git a/website/data/docs-nav-data.json b/website/data/docs-nav-data.json index 6a12ed1bd2cc..b90a8a9af906 100644 --- a/website/data/docs-nav-data.json +++ b/website/data/docs-nav-data.json @@ -267,6 +267,10 @@ { "title": "Migration checklist", "path": "concepts/integrated-storage/migration-checklist" + }, + { + "title": "Migrate Consul storage", + "path": "concepts/integrated-storage/migrate-consul-storage" } ] }, diff --git a/website/public/img/vault-ent-replication-2.png b/website/public/img/vault-ent-replication-2.png new file mode 100644 index 000000000000..b859c937f533 Binary files /dev/null and b/website/public/img/vault-ent-replication-2.png differ diff --git a/website/public/img/vault-ent-replication-3.png b/website/public/img/vault-ent-replication-3.png new file mode 100644 index 000000000000..b4b5a34ef223 Binary files /dev/null and b/website/public/img/vault-ent-replication-3.png differ diff --git a/website/public/img/vault-ent-replication.png b/website/public/img/vault-ent-replication.png new file mode 100644 index 000000000000..f912ed626f97 Binary files /dev/null and b/website/public/img/vault-ent-replication.png differ