diff --git a/proto/spire/api/agent/logger/v1/logger.pb.go b/proto/spire/api/agent/logger/v1/logger.pb.go index f2e5ce3..dd1a7b3 100644 --- a/proto/spire/api/agent/logger/v1/logger.pb.go +++ b/proto/spire/api/agent/logger/v1/logger.pb.go @@ -83,92 +83,7 @@ func (x AdjustLoggerRequest_LogAdjustment) Number() protoreflect.EnumNumber { // Deprecated: Use AdjustLoggerRequest_LogAdjustment.Descriptor instead. func (AdjustLoggerRequest_LogAdjustment) EnumDescriptor() ([]byte, []int) { - return file_spire_api_agent_logger_v1_logger_proto_rawDescGZIP(), []int{5, 0} -} - -type CountLoggersRequest struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields -} - -func (x *CountLoggersRequest) Reset() { - *x = CountLoggersRequest{} - if protoimpl.UnsafeEnabled { - mi := &file_spire_api_agent_logger_v1_logger_proto_msgTypes[0] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } -} - -func (x *CountLoggersRequest) String() string { - return protoimpl.X.MessageStringOf(x) -} - -func (*CountLoggersRequest) ProtoMessage() {} - -func (x *CountLoggersRequest) ProtoReflect() protoreflect.Message { - mi := &file_spire_api_agent_logger_v1_logger_proto_msgTypes[0] - if protoimpl.UnsafeEnabled && x != nil { - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - if ms.LoadMessageInfo() == nil { - ms.StoreMessageInfo(mi) - } - return ms - } - return mi.MessageOf(x) -} - -// Deprecated: Use CountLoggersRequest.ProtoReflect.Descriptor instead. -func (*CountLoggersRequest) Descriptor() ([]byte, []int) { - return file_spire_api_agent_logger_v1_logger_proto_rawDescGZIP(), []int{0} -} - -type CountLoggersResponse struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - - Count int32 `protobuf:"varint,1,opt,name=count,proto3" json:"count,omitempty"` -} - -func (x *CountLoggersResponse) Reset() { - *x = CountLoggersResponse{} - if protoimpl.UnsafeEnabled { - mi := &file_spire_api_agent_logger_v1_logger_proto_msgTypes[1] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } -} - -func (x *CountLoggersResponse) String() string { - return protoimpl.X.MessageStringOf(x) -} - -func (*CountLoggersResponse) ProtoMessage() {} - -func (x *CountLoggersResponse) ProtoReflect() protoreflect.Message { - mi := &file_spire_api_agent_logger_v1_logger_proto_msgTypes[1] - if protoimpl.UnsafeEnabled && x != nil { - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - if ms.LoadMessageInfo() == nil { - ms.StoreMessageInfo(mi) - } - return ms - } - return mi.MessageOf(x) -} - -// Deprecated: Use CountLoggersResponse.ProtoReflect.Descriptor instead. -func (*CountLoggersResponse) Descriptor() ([]byte, []int) { - return file_spire_api_agent_logger_v1_logger_proto_rawDescGZIP(), []int{1} -} - -func (x *CountLoggersResponse) GetCount() int32 { - if x != nil { - return x.Count - } - return 0 + return file_spire_api_agent_logger_v1_logger_proto_rawDescGZIP(), []int{3, 0} } type ListLoggersRequest struct { @@ -176,21 +91,21 @@ type ListLoggersRequest struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - // Filters the agents returned by the list operation. - Filter *ListLoggersRequest_Filter `protobuf:"bytes,1,opt,name=filter,proto3" json:"filter,omitempty"` - // An output mask indicating which agent fields are set in the response. - OutputMask *types.LoggerMask `protobuf:"bytes,2,opt,name=output_mask,json=outputMask,proto3" json:"output_mask,omitempty"` - // The maximum number of results to return. The server may further - // constrain this value, or if zero, choose its own. + // The name of the logger tree being requested, "" is the root logger + RootName string `protobuf:"bytes,1,opt,name=root_name,json=rootName,proto3" json:"root_name,omitempty"` + // Control over whether sub-loggers under the root should be returned + WithSubloggers bool `protobuf:"varint,2,opt,name=with_subloggers,json=withSubloggers,proto3" json:"with_subloggers,omitempty"` + // The maximum number of loggers to return. If zero, the agent may + // impose its own page size PageSize int32 `protobuf:"varint,3,opt,name=page_size,json=pageSize,proto3" json:"page_size,omitempty"` - // The next_page_token value returned from a previous request, if any. + // The page of partial responses being requested, "" for the first page. PageToken string `protobuf:"bytes,4,opt,name=page_token,json=pageToken,proto3" json:"page_token,omitempty"` } func (x *ListLoggersRequest) Reset() { *x = ListLoggersRequest{} if protoimpl.UnsafeEnabled { - mi := &file_spire_api_agent_logger_v1_logger_proto_msgTypes[2] + mi := &file_spire_api_agent_logger_v1_logger_proto_msgTypes[0] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -203,7 +118,7 @@ func (x *ListLoggersRequest) String() string { func (*ListLoggersRequest) ProtoMessage() {} func (x *ListLoggersRequest) ProtoReflect() protoreflect.Message { - mi := &file_spire_api_agent_logger_v1_logger_proto_msgTypes[2] + mi := &file_spire_api_agent_logger_v1_logger_proto_msgTypes[0] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -216,21 +131,21 @@ func (x *ListLoggersRequest) ProtoReflect() protoreflect.Message { // Deprecated: Use ListLoggersRequest.ProtoReflect.Descriptor instead. func (*ListLoggersRequest) Descriptor() ([]byte, []int) { - return file_spire_api_agent_logger_v1_logger_proto_rawDescGZIP(), []int{2} + return file_spire_api_agent_logger_v1_logger_proto_rawDescGZIP(), []int{0} } -func (x *ListLoggersRequest) GetFilter() *ListLoggersRequest_Filter { +func (x *ListLoggersRequest) GetRootName() string { if x != nil { - return x.Filter + return x.RootName } - return nil + return "" } -func (x *ListLoggersRequest) GetOutputMask() *types.LoggerMask { +func (x *ListLoggersRequest) GetWithSubloggers() bool { if x != nil { - return x.OutputMask + return x.WithSubloggers } - return nil + return false } func (x *ListLoggersRequest) GetPageSize() int32 { @@ -252,18 +167,17 @@ type ListLoggersResponse struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - // The agents. + // The returned loggers. Loggers []*types.Logger `protobuf:"bytes,1,rep,name=loggers,proto3" json:"loggers,omitempty"` - // The page token for the next request. Empty if there are no more results. - // This field should be checked by clients even when a page_size was not - // requested, since the server may choose its own (see page_size). + // The page of the next page of partial responses, + // "" when returning the last page. NextPageToken string `protobuf:"bytes,2,opt,name=next_page_token,json=nextPageToken,proto3" json:"next_page_token,omitempty"` } func (x *ListLoggersResponse) Reset() { *x = ListLoggersResponse{} if protoimpl.UnsafeEnabled { - mi := &file_spire_api_agent_logger_v1_logger_proto_msgTypes[3] + mi := &file_spire_api_agent_logger_v1_logger_proto_msgTypes[1] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -276,7 +190,7 @@ func (x *ListLoggersResponse) String() string { func (*ListLoggersResponse) ProtoMessage() {} func (x *ListLoggersResponse) ProtoReflect() protoreflect.Message { - mi := &file_spire_api_agent_logger_v1_logger_proto_msgTypes[3] + mi := &file_spire_api_agent_logger_v1_logger_proto_msgTypes[1] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -289,7 +203,7 @@ func (x *ListLoggersResponse) ProtoReflect() protoreflect.Message { // Deprecated: Use ListLoggersResponse.ProtoReflect.Descriptor instead. func (*ListLoggersResponse) Descriptor() ([]byte, []int) { - return file_spire_api_agent_logger_v1_logger_proto_rawDescGZIP(), []int{3} + return file_spire_api_agent_logger_v1_logger_proto_rawDescGZIP(), []int{1} } func (x *ListLoggersResponse) GetLoggers() []*types.Logger { @@ -311,16 +225,14 @@ type GetLoggerRequest struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - // Required. The SPIFFE ID of the agent. + // The logger being requested, "" for the root logger Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"` - // An output mask indicating which agent fields are set in the response. - OutputMask *types.LoggerMask `protobuf:"bytes,2,opt,name=output_mask,json=outputMask,proto3" json:"output_mask,omitempty"` } func (x *GetLoggerRequest) Reset() { *x = GetLoggerRequest{} if protoimpl.UnsafeEnabled { - mi := &file_spire_api_agent_logger_v1_logger_proto_msgTypes[4] + mi := &file_spire_api_agent_logger_v1_logger_proto_msgTypes[2] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -333,7 +245,7 @@ func (x *GetLoggerRequest) String() string { func (*GetLoggerRequest) ProtoMessage() {} func (x *GetLoggerRequest) ProtoReflect() protoreflect.Message { - mi := &file_spire_api_agent_logger_v1_logger_proto_msgTypes[4] + mi := &file_spire_api_agent_logger_v1_logger_proto_msgTypes[2] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -346,7 +258,7 @@ func (x *GetLoggerRequest) ProtoReflect() protoreflect.Message { // Deprecated: Use GetLoggerRequest.ProtoReflect.Descriptor instead. func (*GetLoggerRequest) Descriptor() ([]byte, []int) { - return file_spire_api_agent_logger_v1_logger_proto_rawDescGZIP(), []int{4} + return file_spire_api_agent_logger_v1_logger_proto_rawDescGZIP(), []int{2} } func (x *GetLoggerRequest) GetName() string { @@ -356,28 +268,23 @@ func (x *GetLoggerRequest) GetName() string { return "" } -func (x *GetLoggerRequest) GetOutputMask() *types.LoggerMask { - if x != nil { - return x.OutputMask - } - return nil -} - type AdjustLoggerRequest struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - // Required. The SPIFFE ID of the agent. - Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"` - LogLevel AdjustLoggerRequest_LogAdjustment `protobuf:"varint,2,opt,name=log_level,json=logLevel,proto3,enum=spire.api.agent.logger.v1.AdjustLoggerRequest_LogAdjustment" json:"log_level,omitempty"` - AdjustSubloggers bool `protobuf:"varint,3,opt,name=adjust_subloggers,json=adjustSubloggers,proto3" json:"adjust_subloggers,omitempty"` + // The logger being adjusted, "" for the root logger + Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"` + // The new level the logger should assume + LogLevel AdjustLoggerRequest_LogAdjustment `protobuf:"varint,2,opt,name=log_level,json=logLevel,proto3,enum=spire.api.agent.logger.v1.AdjustLoggerRequest_LogAdjustment" json:"log_level,omitempty"` + // Control over whether sub-loggers should also be adjusted + IncludeSubloggers bool `protobuf:"varint,3,opt,name=include_subloggers,json=includeSubloggers,proto3" json:"include_subloggers,omitempty"` } func (x *AdjustLoggerRequest) Reset() { *x = AdjustLoggerRequest{} if protoimpl.UnsafeEnabled { - mi := &file_spire_api_agent_logger_v1_logger_proto_msgTypes[5] + mi := &file_spire_api_agent_logger_v1_logger_proto_msgTypes[3] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -390,7 +297,7 @@ func (x *AdjustLoggerRequest) String() string { func (*AdjustLoggerRequest) ProtoMessage() {} func (x *AdjustLoggerRequest) ProtoReflect() protoreflect.Message { - mi := &file_spire_api_agent_logger_v1_logger_proto_msgTypes[5] + mi := &file_spire_api_agent_logger_v1_logger_proto_msgTypes[3] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -403,7 +310,7 @@ func (x *AdjustLoggerRequest) ProtoReflect() protoreflect.Message { // Deprecated: Use AdjustLoggerRequest.ProtoReflect.Descriptor instead. func (*AdjustLoggerRequest) Descriptor() ([]byte, []int) { - return file_spire_api_agent_logger_v1_logger_proto_rawDescGZIP(), []int{5} + return file_spire_api_agent_logger_v1_logger_proto_rawDescGZIP(), []int{3} } func (x *AdjustLoggerRequest) GetName() string { @@ -420,65 +327,9 @@ func (x *AdjustLoggerRequest) GetLogLevel() AdjustLoggerRequest_LogAdjustment { return AdjustLoggerRequest_PANIC_LEVEL } -func (x *AdjustLoggerRequest) GetAdjustSubloggers() bool { - if x != nil { - return x.AdjustSubloggers - } - return false -} - -type ListLoggersRequest_Filter struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - - // Filters agents to those matching the attestation type. - ByName string `protobuf:"bytes,1,opt,name=by_name,json=byName,proto3" json:"by_name,omitempty"` - WithSubloggers bool `protobuf:"varint,2,opt,name=with_subloggers,json=withSubloggers,proto3" json:"with_subloggers,omitempty"` -} - -func (x *ListLoggersRequest_Filter) Reset() { - *x = ListLoggersRequest_Filter{} - if protoimpl.UnsafeEnabled { - mi := &file_spire_api_agent_logger_v1_logger_proto_msgTypes[6] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } -} - -func (x *ListLoggersRequest_Filter) String() string { - return protoimpl.X.MessageStringOf(x) -} - -func (*ListLoggersRequest_Filter) ProtoMessage() {} - -func (x *ListLoggersRequest_Filter) ProtoReflect() protoreflect.Message { - mi := &file_spire_api_agent_logger_v1_logger_proto_msgTypes[6] - if protoimpl.UnsafeEnabled && x != nil { - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - if ms.LoadMessageInfo() == nil { - ms.StoreMessageInfo(mi) - } - return ms - } - return mi.MessageOf(x) -} - -// Deprecated: Use ListLoggersRequest_Filter.ProtoReflect.Descriptor instead. -func (*ListLoggersRequest_Filter) Descriptor() ([]byte, []int) { - return file_spire_api_agent_logger_v1_logger_proto_rawDescGZIP(), []int{2, 0} -} - -func (x *ListLoggersRequest_Filter) GetByName() string { - if x != nil { - return x.ByName - } - return "" -} - -func (x *ListLoggersRequest_Filter) GetWithSubloggers() bool { +func (x *AdjustLoggerRequest) GetIncludeSubloggers() bool { if x != nil { - return x.WithSubloggers + return x.IncludeSubloggers } return false } @@ -493,95 +344,71 @@ var file_spire_api_agent_logger_v1_logger_proto_rawDesc = []byte{ 0x2e, 0x76, 0x31, 0x1a, 0x1b, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x65, 0x6d, 0x70, 0x74, 0x79, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x1c, 0x73, 0x70, 0x69, 0x72, 0x65, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x74, 0x79, 0x70, 0x65, - 0x73, 0x2f, 0x6c, 0x6f, 0x67, 0x67, 0x65, 0x72, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x15, - 0x0a, 0x13, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x4c, 0x6f, 0x67, 0x67, 0x65, 0x72, 0x73, 0x52, 0x65, - 0x71, 0x75, 0x65, 0x73, 0x74, 0x22, 0x2c, 0x0a, 0x14, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x4c, 0x6f, - 0x67, 0x67, 0x65, 0x72, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x14, 0x0a, - 0x05, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x63, 0x6f, - 0x75, 0x6e, 0x74, 0x22, 0xa8, 0x02, 0x0a, 0x12, 0x4c, 0x69, 0x73, 0x74, 0x4c, 0x6f, 0x67, 0x67, - 0x65, 0x72, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x4c, 0x0a, 0x06, 0x66, 0x69, - 0x6c, 0x74, 0x65, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x34, 0x2e, 0x73, 0x70, 0x69, + 0x73, 0x2f, 0x6c, 0x6f, 0x67, 0x67, 0x65, 0x72, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x96, + 0x01, 0x0a, 0x12, 0x4c, 0x69, 0x73, 0x74, 0x4c, 0x6f, 0x67, 0x67, 0x65, 0x72, 0x73, 0x52, 0x65, + 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x1b, 0x0a, 0x09, 0x72, 0x6f, 0x6f, 0x74, 0x5f, 0x6e, 0x61, + 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x72, 0x6f, 0x6f, 0x74, 0x4e, 0x61, + 0x6d, 0x65, 0x12, 0x27, 0x0a, 0x0f, 0x77, 0x69, 0x74, 0x68, 0x5f, 0x73, 0x75, 0x62, 0x6c, 0x6f, + 0x67, 0x67, 0x65, 0x72, 0x73, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0e, 0x77, 0x69, 0x74, + 0x68, 0x53, 0x75, 0x62, 0x6c, 0x6f, 0x67, 0x67, 0x65, 0x72, 0x73, 0x12, 0x1b, 0x0a, 0x09, 0x70, + 0x61, 0x67, 0x65, 0x5f, 0x73, 0x69, 0x7a, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, + 0x70, 0x61, 0x67, 0x65, 0x53, 0x69, 0x7a, 0x65, 0x12, 0x1d, 0x0a, 0x0a, 0x70, 0x61, 0x67, 0x65, + 0x5f, 0x74, 0x6f, 0x6b, 0x65, 0x6e, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x70, 0x61, + 0x67, 0x65, 0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x22, 0x70, 0x0a, 0x13, 0x4c, 0x69, 0x73, 0x74, 0x4c, + 0x6f, 0x67, 0x67, 0x65, 0x72, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x31, + 0x0a, 0x07, 0x6c, 0x6f, 0x67, 0x67, 0x65, 0x72, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, + 0x17, 0x2e, 0x73, 0x70, 0x69, 0x72, 0x65, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x74, 0x79, 0x70, 0x65, + 0x73, 0x2e, 0x4c, 0x6f, 0x67, 0x67, 0x65, 0x72, 0x52, 0x07, 0x6c, 0x6f, 0x67, 0x67, 0x65, 0x72, + 0x73, 0x12, 0x26, 0x0a, 0x0f, 0x6e, 0x65, 0x78, 0x74, 0x5f, 0x70, 0x61, 0x67, 0x65, 0x5f, 0x74, + 0x6f, 0x6b, 0x65, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0d, 0x6e, 0x65, 0x78, 0x74, + 0x50, 0x61, 0x67, 0x65, 0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x22, 0x26, 0x0a, 0x10, 0x47, 0x65, 0x74, + 0x4c, 0x6f, 0x67, 0x67, 0x65, 0x72, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x12, 0x0a, + 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, + 0x65, 0x22, 0xcd, 0x02, 0x0a, 0x13, 0x41, 0x64, 0x6a, 0x75, 0x73, 0x74, 0x4c, 0x6f, 0x67, 0x67, + 0x65, 0x72, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, + 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x59, 0x0a, + 0x09, 0x6c, 0x6f, 0x67, 0x5f, 0x6c, 0x65, 0x76, 0x65, 0x6c, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0e, + 0x32, 0x3c, 0x2e, 0x73, 0x70, 0x69, 0x72, 0x65, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x61, 0x67, 0x65, + 0x6e, 0x74, 0x2e, 0x6c, 0x6f, 0x67, 0x67, 0x65, 0x72, 0x2e, 0x76, 0x31, 0x2e, 0x41, 0x64, 0x6a, + 0x75, 0x73, 0x74, 0x4c, 0x6f, 0x67, 0x67, 0x65, 0x72, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, + 0x2e, 0x4c, 0x6f, 0x67, 0x41, 0x64, 0x6a, 0x75, 0x73, 0x74, 0x6d, 0x65, 0x6e, 0x74, 0x52, 0x08, + 0x6c, 0x6f, 0x67, 0x4c, 0x65, 0x76, 0x65, 0x6c, 0x12, 0x2d, 0x0a, 0x12, 0x69, 0x6e, 0x63, 0x6c, + 0x75, 0x64, 0x65, 0x5f, 0x73, 0x75, 0x62, 0x6c, 0x6f, 0x67, 0x67, 0x65, 0x72, 0x73, 0x18, 0x03, + 0x20, 0x01, 0x28, 0x08, 0x52, 0x11, 0x69, 0x6e, 0x63, 0x6c, 0x75, 0x64, 0x65, 0x53, 0x75, 0x62, + 0x6c, 0x6f, 0x67, 0x67, 0x65, 0x72, 0x73, 0x22, 0x97, 0x01, 0x0a, 0x0d, 0x4c, 0x6f, 0x67, 0x41, + 0x64, 0x6a, 0x75, 0x73, 0x74, 0x6d, 0x65, 0x6e, 0x74, 0x12, 0x0f, 0x0a, 0x0b, 0x50, 0x41, 0x4e, + 0x49, 0x43, 0x5f, 0x4c, 0x45, 0x56, 0x45, 0x4c, 0x10, 0x00, 0x12, 0x0f, 0x0a, 0x0b, 0x46, 0x41, + 0x54, 0x41, 0x4c, 0x5f, 0x4c, 0x45, 0x56, 0x45, 0x4c, 0x10, 0x01, 0x12, 0x0f, 0x0a, 0x0b, 0x45, + 0x52, 0x52, 0x4f, 0x52, 0x5f, 0x4c, 0x45, 0x56, 0x45, 0x4c, 0x10, 0x02, 0x12, 0x0e, 0x0a, 0x0a, + 0x57, 0x41, 0x52, 0x4e, 0x5f, 0x4c, 0x45, 0x56, 0x45, 0x4c, 0x10, 0x03, 0x12, 0x0e, 0x0a, 0x0a, + 0x49, 0x4e, 0x46, 0x4f, 0x5f, 0x4c, 0x45, 0x56, 0x45, 0x4c, 0x10, 0x04, 0x12, 0x0f, 0x0a, 0x0b, + 0x44, 0x45, 0x42, 0x55, 0x47, 0x5f, 0x4c, 0x45, 0x56, 0x45, 0x4c, 0x10, 0x05, 0x12, 0x0f, 0x0a, + 0x0b, 0x54, 0x52, 0x41, 0x43, 0x45, 0x5f, 0x4c, 0x45, 0x56, 0x45, 0x4c, 0x10, 0x06, 0x12, 0x11, + 0x0a, 0x0d, 0x44, 0x45, 0x46, 0x41, 0x55, 0x4c, 0x54, 0x5f, 0x4c, 0x45, 0x56, 0x45, 0x4c, 0x10, + 0x07, 0x32, 0xa1, 0x02, 0x0a, 0x06, 0x4c, 0x6f, 0x67, 0x67, 0x65, 0x72, 0x12, 0x6c, 0x0a, 0x0b, + 0x4c, 0x69, 0x73, 0x74, 0x4c, 0x6f, 0x67, 0x67, 0x65, 0x72, 0x73, 0x12, 0x2d, 0x2e, 0x73, 0x70, + 0x69, 0x72, 0x65, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x2e, 0x6c, 0x6f, + 0x67, 0x67, 0x65, 0x72, 0x2e, 0x76, 0x31, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x4c, 0x6f, 0x67, 0x67, + 0x65, 0x72, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x2e, 0x2e, 0x73, 0x70, 0x69, 0x72, 0x65, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x2e, 0x6c, 0x6f, 0x67, 0x67, 0x65, 0x72, 0x2e, 0x76, 0x31, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x4c, 0x6f, 0x67, 0x67, 0x65, - 0x72, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x2e, 0x46, 0x69, 0x6c, 0x74, 0x65, 0x72, - 0x52, 0x06, 0x66, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x12, 0x3c, 0x0a, 0x0b, 0x6f, 0x75, 0x74, 0x70, - 0x75, 0x74, 0x5f, 0x6d, 0x61, 0x73, 0x6b, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1b, 0x2e, - 0x73, 0x70, 0x69, 0x72, 0x65, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2e, - 0x4c, 0x6f, 0x67, 0x67, 0x65, 0x72, 0x4d, 0x61, 0x73, 0x6b, 0x52, 0x0a, 0x6f, 0x75, 0x74, 0x70, - 0x75, 0x74, 0x4d, 0x61, 0x73, 0x6b, 0x12, 0x1b, 0x0a, 0x09, 0x70, 0x61, 0x67, 0x65, 0x5f, 0x73, - 0x69, 0x7a, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x70, 0x61, 0x67, 0x65, 0x53, - 0x69, 0x7a, 0x65, 0x12, 0x1d, 0x0a, 0x0a, 0x70, 0x61, 0x67, 0x65, 0x5f, 0x74, 0x6f, 0x6b, 0x65, - 0x6e, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x70, 0x61, 0x67, 0x65, 0x54, 0x6f, 0x6b, - 0x65, 0x6e, 0x1a, 0x4a, 0x0a, 0x06, 0x46, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x12, 0x17, 0x0a, 0x07, - 0x62, 0x79, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x62, - 0x79, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x27, 0x0a, 0x0f, 0x77, 0x69, 0x74, 0x68, 0x5f, 0x73, 0x75, - 0x62, 0x6c, 0x6f, 0x67, 0x67, 0x65, 0x72, 0x73, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0e, - 0x77, 0x69, 0x74, 0x68, 0x53, 0x75, 0x62, 0x6c, 0x6f, 0x67, 0x67, 0x65, 0x72, 0x73, 0x22, 0x70, - 0x0a, 0x13, 0x4c, 0x69, 0x73, 0x74, 0x4c, 0x6f, 0x67, 0x67, 0x65, 0x72, 0x73, 0x52, 0x65, 0x73, - 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x31, 0x0a, 0x07, 0x6c, 0x6f, 0x67, 0x67, 0x65, 0x72, 0x73, - 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x17, 0x2e, 0x73, 0x70, 0x69, 0x72, 0x65, 0x2e, 0x61, - 0x70, 0x69, 0x2e, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2e, 0x4c, 0x6f, 0x67, 0x67, 0x65, 0x72, 0x52, - 0x07, 0x6c, 0x6f, 0x67, 0x67, 0x65, 0x72, 0x73, 0x12, 0x26, 0x0a, 0x0f, 0x6e, 0x65, 0x78, 0x74, - 0x5f, 0x70, 0x61, 0x67, 0x65, 0x5f, 0x74, 0x6f, 0x6b, 0x65, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, - 0x09, 0x52, 0x0d, 0x6e, 0x65, 0x78, 0x74, 0x50, 0x61, 0x67, 0x65, 0x54, 0x6f, 0x6b, 0x65, 0x6e, - 0x22, 0x64, 0x0a, 0x10, 0x47, 0x65, 0x74, 0x4c, 0x6f, 0x67, 0x67, 0x65, 0x72, 0x52, 0x65, 0x71, - 0x75, 0x65, 0x73, 0x74, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, - 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x3c, 0x0a, 0x0b, 0x6f, 0x75, 0x74, 0x70, - 0x75, 0x74, 0x5f, 0x6d, 0x61, 0x73, 0x6b, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1b, 0x2e, - 0x73, 0x70, 0x69, 0x72, 0x65, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2e, - 0x4c, 0x6f, 0x67, 0x67, 0x65, 0x72, 0x4d, 0x61, 0x73, 0x6b, 0x52, 0x0a, 0x6f, 0x75, 0x74, 0x70, - 0x75, 0x74, 0x4d, 0x61, 0x73, 0x6b, 0x22, 0xcb, 0x02, 0x0a, 0x13, 0x41, 0x64, 0x6a, 0x75, 0x73, - 0x74, 0x4c, 0x6f, 0x67, 0x67, 0x65, 0x72, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x12, - 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, - 0x6d, 0x65, 0x12, 0x59, 0x0a, 0x09, 0x6c, 0x6f, 0x67, 0x5f, 0x6c, 0x65, 0x76, 0x65, 0x6c, 0x18, - 0x02, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x3c, 0x2e, 0x73, 0x70, 0x69, 0x72, 0x65, 0x2e, 0x61, 0x70, - 0x69, 0x2e, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x2e, 0x6c, 0x6f, 0x67, 0x67, 0x65, 0x72, 0x2e, 0x76, - 0x31, 0x2e, 0x41, 0x64, 0x6a, 0x75, 0x73, 0x74, 0x4c, 0x6f, 0x67, 0x67, 0x65, 0x72, 0x52, 0x65, - 0x71, 0x75, 0x65, 0x73, 0x74, 0x2e, 0x4c, 0x6f, 0x67, 0x41, 0x64, 0x6a, 0x75, 0x73, 0x74, 0x6d, - 0x65, 0x6e, 0x74, 0x52, 0x08, 0x6c, 0x6f, 0x67, 0x4c, 0x65, 0x76, 0x65, 0x6c, 0x12, 0x2b, 0x0a, - 0x11, 0x61, 0x64, 0x6a, 0x75, 0x73, 0x74, 0x5f, 0x73, 0x75, 0x62, 0x6c, 0x6f, 0x67, 0x67, 0x65, - 0x72, 0x73, 0x18, 0x03, 0x20, 0x01, 0x28, 0x08, 0x52, 0x10, 0x61, 0x64, 0x6a, 0x75, 0x73, 0x74, - 0x53, 0x75, 0x62, 0x6c, 0x6f, 0x67, 0x67, 0x65, 0x72, 0x73, 0x22, 0x97, 0x01, 0x0a, 0x0d, 0x4c, - 0x6f, 0x67, 0x41, 0x64, 0x6a, 0x75, 0x73, 0x74, 0x6d, 0x65, 0x6e, 0x74, 0x12, 0x0f, 0x0a, 0x0b, - 0x50, 0x41, 0x4e, 0x49, 0x43, 0x5f, 0x4c, 0x45, 0x56, 0x45, 0x4c, 0x10, 0x00, 0x12, 0x0f, 0x0a, - 0x0b, 0x46, 0x41, 0x54, 0x41, 0x4c, 0x5f, 0x4c, 0x45, 0x56, 0x45, 0x4c, 0x10, 0x01, 0x12, 0x0f, - 0x0a, 0x0b, 0x45, 0x52, 0x52, 0x4f, 0x52, 0x5f, 0x4c, 0x45, 0x56, 0x45, 0x4c, 0x10, 0x02, 0x12, - 0x0e, 0x0a, 0x0a, 0x57, 0x41, 0x52, 0x4e, 0x5f, 0x4c, 0x45, 0x56, 0x45, 0x4c, 0x10, 0x03, 0x12, - 0x0e, 0x0a, 0x0a, 0x49, 0x4e, 0x46, 0x4f, 0x5f, 0x4c, 0x45, 0x56, 0x45, 0x4c, 0x10, 0x04, 0x12, - 0x0f, 0x0a, 0x0b, 0x44, 0x45, 0x42, 0x55, 0x47, 0x5f, 0x4c, 0x45, 0x56, 0x45, 0x4c, 0x10, 0x05, - 0x12, 0x0f, 0x0a, 0x0b, 0x54, 0x52, 0x41, 0x43, 0x45, 0x5f, 0x4c, 0x45, 0x56, 0x45, 0x4c, 0x10, - 0x06, 0x12, 0x11, 0x0a, 0x0d, 0x44, 0x45, 0x46, 0x41, 0x55, 0x4c, 0x54, 0x5f, 0x4c, 0x45, 0x56, - 0x45, 0x4c, 0x10, 0x07, 0x32, 0x92, 0x03, 0x0a, 0x06, 0x4c, 0x6f, 0x67, 0x67, 0x65, 0x72, 0x12, - 0x6f, 0x0a, 0x0c, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x4c, 0x6f, 0x67, 0x67, 0x65, 0x72, 0x73, 0x12, - 0x2e, 0x2e, 0x73, 0x70, 0x69, 0x72, 0x65, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x61, 0x67, 0x65, 0x6e, - 0x74, 0x2e, 0x6c, 0x6f, 0x67, 0x67, 0x65, 0x72, 0x2e, 0x76, 0x31, 0x2e, 0x43, 0x6f, 0x75, 0x6e, - 0x74, 0x4c, 0x6f, 0x67, 0x67, 0x65, 0x72, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, - 0x2f, 0x2e, 0x73, 0x70, 0x69, 0x72, 0x65, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x61, 0x67, 0x65, 0x6e, - 0x74, 0x2e, 0x6c, 0x6f, 0x67, 0x67, 0x65, 0x72, 0x2e, 0x76, 0x31, 0x2e, 0x43, 0x6f, 0x75, 0x6e, - 0x74, 0x4c, 0x6f, 0x67, 0x67, 0x65, 0x72, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, - 0x12, 0x6c, 0x0a, 0x0b, 0x4c, 0x69, 0x73, 0x74, 0x4c, 0x6f, 0x67, 0x67, 0x65, 0x72, 0x73, 0x12, - 0x2d, 0x2e, 0x73, 0x70, 0x69, 0x72, 0x65, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x61, 0x67, 0x65, 0x6e, - 0x74, 0x2e, 0x6c, 0x6f, 0x67, 0x67, 0x65, 0x72, 0x2e, 0x76, 0x31, 0x2e, 0x4c, 0x69, 0x73, 0x74, - 0x4c, 0x6f, 0x67, 0x67, 0x65, 0x72, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x2e, - 0x2e, 0x73, 0x70, 0x69, 0x72, 0x65, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x61, 0x67, 0x65, 0x6e, 0x74, - 0x2e, 0x6c, 0x6f, 0x67, 0x67, 0x65, 0x72, 0x2e, 0x76, 0x31, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x4c, - 0x6f, 0x67, 0x67, 0x65, 0x72, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x51, - 0x0a, 0x09, 0x47, 0x65, 0x74, 0x4c, 0x6f, 0x67, 0x67, 0x65, 0x72, 0x12, 0x2b, 0x2e, 0x73, 0x70, - 0x69, 0x72, 0x65, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x2e, 0x6c, 0x6f, - 0x67, 0x67, 0x65, 0x72, 0x2e, 0x76, 0x31, 0x2e, 0x47, 0x65, 0x74, 0x4c, 0x6f, 0x67, 0x67, 0x65, - 0x72, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x17, 0x2e, 0x73, 0x70, 0x69, 0x72, 0x65, - 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2e, 0x4c, 0x6f, 0x67, 0x67, 0x65, - 0x72, 0x12, 0x56, 0x0a, 0x0c, 0x41, 0x64, 0x6a, 0x75, 0x73, 0x74, 0x4c, 0x6f, 0x67, 0x67, 0x65, - 0x72, 0x12, 0x2e, 0x2e, 0x73, 0x70, 0x69, 0x72, 0x65, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x61, 0x67, - 0x65, 0x6e, 0x74, 0x2e, 0x6c, 0x6f, 0x67, 0x67, 0x65, 0x72, 0x2e, 0x76, 0x31, 0x2e, 0x41, 0x64, - 0x6a, 0x75, 0x73, 0x74, 0x4c, 0x6f, 0x67, 0x67, 0x65, 0x72, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, - 0x74, 0x1a, 0x16, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, - 0x62, 0x75, 0x66, 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x42, 0x4a, 0x5a, 0x48, 0x67, 0x69, 0x74, - 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x73, 0x70, 0x69, 0x66, 0x66, 0x65, 0x2f, 0x73, - 0x70, 0x69, 0x72, 0x65, 0x2d, 0x61, 0x70, 0x69, 0x2d, 0x73, 0x64, 0x6b, 0x2f, 0x70, 0x72, 0x6f, - 0x74, 0x6f, 0x2f, 0x73, 0x70, 0x69, 0x72, 0x65, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x61, 0x67, 0x65, - 0x6e, 0x74, 0x2f, 0x6c, 0x6f, 0x67, 0x67, 0x65, 0x72, 0x2f, 0x76, 0x31, 0x3b, 0x6c, 0x6f, 0x67, - 0x67, 0x65, 0x72, 0x76, 0x31, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x72, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x51, 0x0a, 0x09, 0x47, 0x65, + 0x74, 0x4c, 0x6f, 0x67, 0x67, 0x65, 0x72, 0x12, 0x2b, 0x2e, 0x73, 0x70, 0x69, 0x72, 0x65, 0x2e, + 0x61, 0x70, 0x69, 0x2e, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x2e, 0x6c, 0x6f, 0x67, 0x67, 0x65, 0x72, + 0x2e, 0x76, 0x31, 0x2e, 0x47, 0x65, 0x74, 0x4c, 0x6f, 0x67, 0x67, 0x65, 0x72, 0x52, 0x65, 0x71, + 0x75, 0x65, 0x73, 0x74, 0x1a, 0x17, 0x2e, 0x73, 0x70, 0x69, 0x72, 0x65, 0x2e, 0x61, 0x70, 0x69, + 0x2e, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2e, 0x4c, 0x6f, 0x67, 0x67, 0x65, 0x72, 0x12, 0x56, 0x0a, + 0x0c, 0x41, 0x64, 0x6a, 0x75, 0x73, 0x74, 0x4c, 0x6f, 0x67, 0x67, 0x65, 0x72, 0x12, 0x2e, 0x2e, + 0x73, 0x70, 0x69, 0x72, 0x65, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x2e, + 0x6c, 0x6f, 0x67, 0x67, 0x65, 0x72, 0x2e, 0x76, 0x31, 0x2e, 0x41, 0x64, 0x6a, 0x75, 0x73, 0x74, + 0x4c, 0x6f, 0x67, 0x67, 0x65, 0x72, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x16, 0x2e, + 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, + 0x45, 0x6d, 0x70, 0x74, 0x79, 0x42, 0x4a, 0x5a, 0x48, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, + 0x63, 0x6f, 0x6d, 0x2f, 0x73, 0x70, 0x69, 0x66, 0x66, 0x65, 0x2f, 0x73, 0x70, 0x69, 0x72, 0x65, + 0x2d, 0x61, 0x70, 0x69, 0x2d, 0x73, 0x64, 0x6b, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x73, + 0x70, 0x69, 0x72, 0x65, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x2f, 0x6c, + 0x6f, 0x67, 0x67, 0x65, 0x72, 0x2f, 0x76, 0x31, 0x3b, 0x6c, 0x6f, 0x67, 0x67, 0x65, 0x72, 0x76, + 0x31, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( @@ -597,39 +424,30 @@ func file_spire_api_agent_logger_v1_logger_proto_rawDescGZIP() []byte { } var file_spire_api_agent_logger_v1_logger_proto_enumTypes = make([]protoimpl.EnumInfo, 1) -var file_spire_api_agent_logger_v1_logger_proto_msgTypes = make([]protoimpl.MessageInfo, 7) +var file_spire_api_agent_logger_v1_logger_proto_msgTypes = make([]protoimpl.MessageInfo, 4) var file_spire_api_agent_logger_v1_logger_proto_goTypes = []interface{}{ (AdjustLoggerRequest_LogAdjustment)(0), // 0: spire.api.agent.logger.v1.AdjustLoggerRequest.LogAdjustment - (*CountLoggersRequest)(nil), // 1: spire.api.agent.logger.v1.CountLoggersRequest - (*CountLoggersResponse)(nil), // 2: spire.api.agent.logger.v1.CountLoggersResponse - (*ListLoggersRequest)(nil), // 3: spire.api.agent.logger.v1.ListLoggersRequest - (*ListLoggersResponse)(nil), // 4: spire.api.agent.logger.v1.ListLoggersResponse - (*GetLoggerRequest)(nil), // 5: spire.api.agent.logger.v1.GetLoggerRequest - (*AdjustLoggerRequest)(nil), // 6: spire.api.agent.logger.v1.AdjustLoggerRequest - (*ListLoggersRequest_Filter)(nil), // 7: spire.api.agent.logger.v1.ListLoggersRequest.Filter - (*types.LoggerMask)(nil), // 8: spire.api.types.LoggerMask - (*types.Logger)(nil), // 9: spire.api.types.Logger - (*emptypb.Empty)(nil), // 10: google.protobuf.Empty + (*ListLoggersRequest)(nil), // 1: spire.api.agent.logger.v1.ListLoggersRequest + (*ListLoggersResponse)(nil), // 2: spire.api.agent.logger.v1.ListLoggersResponse + (*GetLoggerRequest)(nil), // 3: spire.api.agent.logger.v1.GetLoggerRequest + (*AdjustLoggerRequest)(nil), // 4: spire.api.agent.logger.v1.AdjustLoggerRequest + (*types.Logger)(nil), // 5: spire.api.types.Logger + (*emptypb.Empty)(nil), // 6: google.protobuf.Empty } var file_spire_api_agent_logger_v1_logger_proto_depIdxs = []int32{ - 7, // 0: spire.api.agent.logger.v1.ListLoggersRequest.filter:type_name -> spire.api.agent.logger.v1.ListLoggersRequest.Filter - 8, // 1: spire.api.agent.logger.v1.ListLoggersRequest.output_mask:type_name -> spire.api.types.LoggerMask - 9, // 2: spire.api.agent.logger.v1.ListLoggersResponse.loggers:type_name -> spire.api.types.Logger - 8, // 3: spire.api.agent.logger.v1.GetLoggerRequest.output_mask:type_name -> spire.api.types.LoggerMask - 0, // 4: spire.api.agent.logger.v1.AdjustLoggerRequest.log_level:type_name -> spire.api.agent.logger.v1.AdjustLoggerRequest.LogAdjustment - 1, // 5: spire.api.agent.logger.v1.Logger.CountLoggers:input_type -> spire.api.agent.logger.v1.CountLoggersRequest - 3, // 6: spire.api.agent.logger.v1.Logger.ListLoggers:input_type -> spire.api.agent.logger.v1.ListLoggersRequest - 5, // 7: spire.api.agent.logger.v1.Logger.GetLogger:input_type -> spire.api.agent.logger.v1.GetLoggerRequest - 6, // 8: spire.api.agent.logger.v1.Logger.AdjustLogger:input_type -> spire.api.agent.logger.v1.AdjustLoggerRequest - 2, // 9: spire.api.agent.logger.v1.Logger.CountLoggers:output_type -> spire.api.agent.logger.v1.CountLoggersResponse - 4, // 10: spire.api.agent.logger.v1.Logger.ListLoggers:output_type -> spire.api.agent.logger.v1.ListLoggersResponse - 9, // 11: spire.api.agent.logger.v1.Logger.GetLogger:output_type -> spire.api.types.Logger - 10, // 12: spire.api.agent.logger.v1.Logger.AdjustLogger:output_type -> google.protobuf.Empty - 9, // [9:13] is the sub-list for method output_type - 5, // [5:9] is the sub-list for method input_type - 5, // [5:5] is the sub-list for extension type_name - 5, // [5:5] is the sub-list for extension extendee - 0, // [0:5] is the sub-list for field type_name + 5, // 0: spire.api.agent.logger.v1.ListLoggersResponse.loggers:type_name -> spire.api.types.Logger + 0, // 1: spire.api.agent.logger.v1.AdjustLoggerRequest.log_level:type_name -> spire.api.agent.logger.v1.AdjustLoggerRequest.LogAdjustment + 1, // 2: spire.api.agent.logger.v1.Logger.ListLoggers:input_type -> spire.api.agent.logger.v1.ListLoggersRequest + 3, // 3: spire.api.agent.logger.v1.Logger.GetLogger:input_type -> spire.api.agent.logger.v1.GetLoggerRequest + 4, // 4: spire.api.agent.logger.v1.Logger.AdjustLogger:input_type -> spire.api.agent.logger.v1.AdjustLoggerRequest + 2, // 5: spire.api.agent.logger.v1.Logger.ListLoggers:output_type -> spire.api.agent.logger.v1.ListLoggersResponse + 5, // 6: spire.api.agent.logger.v1.Logger.GetLogger:output_type -> spire.api.types.Logger + 6, // 7: spire.api.agent.logger.v1.Logger.AdjustLogger:output_type -> google.protobuf.Empty + 5, // [5:8] is the sub-list for method output_type + 2, // [2:5] is the sub-list for method input_type + 2, // [2:2] is the sub-list for extension type_name + 2, // [2:2] is the sub-list for extension extendee + 0, // [0:2] is the sub-list for field type_name } func init() { file_spire_api_agent_logger_v1_logger_proto_init() } @@ -639,30 +457,6 @@ func file_spire_api_agent_logger_v1_logger_proto_init() { } if !protoimpl.UnsafeEnabled { file_spire_api_agent_logger_v1_logger_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*CountLoggersRequest); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_spire_api_agent_logger_v1_logger_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*CountLoggersResponse); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_spire_api_agent_logger_v1_logger_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*ListLoggersRequest); i { case 0: return &v.state @@ -674,7 +468,7 @@ func file_spire_api_agent_logger_v1_logger_proto_init() { return nil } } - file_spire_api_agent_logger_v1_logger_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} { + file_spire_api_agent_logger_v1_logger_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*ListLoggersResponse); i { case 0: return &v.state @@ -686,7 +480,7 @@ func file_spire_api_agent_logger_v1_logger_proto_init() { return nil } } - file_spire_api_agent_logger_v1_logger_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} { + file_spire_api_agent_logger_v1_logger_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*GetLoggerRequest); i { case 0: return &v.state @@ -698,7 +492,7 @@ func file_spire_api_agent_logger_v1_logger_proto_init() { return nil } } - file_spire_api_agent_logger_v1_logger_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} { + file_spire_api_agent_logger_v1_logger_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*AdjustLoggerRequest); i { case 0: return &v.state @@ -710,18 +504,6 @@ func file_spire_api_agent_logger_v1_logger_proto_init() { return nil } } - file_spire_api_agent_logger_v1_logger_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*ListLoggersRequest_Filter); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } } type x struct{} out := protoimpl.TypeBuilder{ @@ -729,7 +511,7 @@ func file_spire_api_agent_logger_v1_logger_proto_init() { GoPackagePath: reflect.TypeOf(x{}).PkgPath(), RawDescriptor: file_spire_api_agent_logger_v1_logger_proto_rawDesc, NumEnums: 1, - NumMessages: 7, + NumMessages: 4, NumExtensions: 0, NumServices: 1, }, diff --git a/proto/spire/api/agent/logger/v1/logger.proto b/proto/spire/api/agent/logger/v1/logger.proto index 4595535..49aa6b1 100644 --- a/proto/spire/api/agent/logger/v1/logger.proto +++ b/proto/spire/api/agent/logger/v1/logger.proto @@ -6,78 +6,53 @@ import "google/protobuf/empty.proto"; import "spire/api/types/logger.proto"; service Logger { - // Count agents. - // - // The caller must be local or present an admin X509-SVID. - rpc CountLoggers(CountLoggersRequest) returns (CountLoggersResponse); - // Lists loggers. // // The caller must be local or present an admin X509-SVID. rpc ListLoggers(ListLoggersRequest) returns (ListLoggersResponse); - // Gets an agent. + // Gets an logger. // // The caller must be local or present an admin X509-SVID. rpc GetLogger(GetLoggerRequest) returns (spire.api.types.Logger); - // Deletes an agent. The agent can come back into the trust domain through - - // the Issuer AttestAgent RPC. + // Adjusts logger levels. // // The caller must be local or present an admin X509-SVID. rpc AdjustLogger(AdjustLoggerRequest) returns (google.protobuf.Empty); } -message CountLoggersRequest { -} - -message CountLoggersResponse { - int32 count = 1; -} - message ListLoggersRequest { - message Filter { - // Filters agents to those matching the attestation type. - string by_name = 1; - - bool with_subloggers = 2; - } - - // Filters the agents returned by the list operation. - Filter filter = 1; + // The name of the logger tree being requested, "" is the root logger + string root_name = 1; - // An output mask indicating which agent fields are set in the response. - spire.api.types.LoggerMask output_mask = 2; + // Control over whether sub-loggers under the root should be returned + bool with_subloggers = 2; - // The maximum number of results to return. The server may further - // constrain this value, or if zero, choose its own. + // The maximum number of loggers to return. If zero, the agent may + // impose its own page size int32 page_size = 3; - // The next_page_token value returned from a previous request, if any. + // The page of partial responses being requested, "" for the first page. string page_token = 4; } message ListLoggersResponse { - // The agents. + // The returned loggers. repeated spire.api.types.Logger loggers = 1; - // The page token for the next request. Empty if there are no more results. - // This field should be checked by clients even when a page_size was not - // requested, since the server may choose its own (see page_size). + // The page of the next page of partial responses, + // "" when returning the last page. string next_page_token = 2; } message GetLoggerRequest { - // Required. The SPIFFE ID of the agent. + // The logger being requested, "" for the root logger string name = 1; - - // An output mask indicating which agent fields are set in the response. - spire.api.types.LoggerMask output_mask = 2; } message AdjustLoggerRequest { - // Required. The SPIFFE ID of the agent. + // The logger being adjusted, "" for the root logger string name = 1; enum LogAdjustment { @@ -91,8 +66,10 @@ message AdjustLoggerRequest { DEFAULT_LEVEL = 7; } + // The new level the logger should assume LogAdjustment log_level = 2; - bool adjust_subloggers = 3; + // Control over whether sub-loggers should also be adjusted + bool include_subloggers = 3; } diff --git a/proto/spire/api/agent/logger/v1/logger_grpc.pb.go b/proto/spire/api/agent/logger/v1/logger_grpc.pb.go index f8b8a10..0b63120 100644 --- a/proto/spire/api/agent/logger/v1/logger_grpc.pb.go +++ b/proto/spire/api/agent/logger/v1/logger_grpc.pb.go @@ -19,19 +19,15 @@ const _ = grpc.SupportPackageIsVersion7 // // For semantics around ctx use and closing/ending streaming RPCs, please refer to https://pkg.go.dev/google.golang.org/grpc/?tab=doc#ClientConn.NewStream. type LoggerClient interface { - // Count agents. - // - // The caller must be local or present an admin X509-SVID. - CountLoggers(ctx context.Context, in *CountLoggersRequest, opts ...grpc.CallOption) (*CountLoggersResponse, error) // Lists loggers. // // The caller must be local or present an admin X509-SVID. ListLoggers(ctx context.Context, in *ListLoggersRequest, opts ...grpc.CallOption) (*ListLoggersResponse, error) - // Gets an agent. + // Gets an logger. // // The caller must be local or present an admin X509-SVID. GetLogger(ctx context.Context, in *GetLoggerRequest, opts ...grpc.CallOption) (*types.Logger, error) - // the Issuer AttestAgent RPC. + // Adjusts logger levels. // // The caller must be local or present an admin X509-SVID. AdjustLogger(ctx context.Context, in *AdjustLoggerRequest, opts ...grpc.CallOption) (*emptypb.Empty, error) @@ -45,15 +41,6 @@ func NewLoggerClient(cc grpc.ClientConnInterface) LoggerClient { return &loggerClient{cc} } -func (c *loggerClient) CountLoggers(ctx context.Context, in *CountLoggersRequest, opts ...grpc.CallOption) (*CountLoggersResponse, error) { - out := new(CountLoggersResponse) - err := c.cc.Invoke(ctx, "/spire.api.agent.logger.v1.Logger/CountLoggers", in, out, opts...) - if err != nil { - return nil, err - } - return out, nil -} - func (c *loggerClient) ListLoggers(ctx context.Context, in *ListLoggersRequest, opts ...grpc.CallOption) (*ListLoggersResponse, error) { out := new(ListLoggersResponse) err := c.cc.Invoke(ctx, "/spire.api.agent.logger.v1.Logger/ListLoggers", in, out, opts...) @@ -85,19 +72,15 @@ func (c *loggerClient) AdjustLogger(ctx context.Context, in *AdjustLoggerRequest // All implementations must embed UnimplementedLoggerServer // for forward compatibility type LoggerServer interface { - // Count agents. - // - // The caller must be local or present an admin X509-SVID. - CountLoggers(context.Context, *CountLoggersRequest) (*CountLoggersResponse, error) // Lists loggers. // // The caller must be local or present an admin X509-SVID. ListLoggers(context.Context, *ListLoggersRequest) (*ListLoggersResponse, error) - // Gets an agent. + // Gets an logger. // // The caller must be local or present an admin X509-SVID. GetLogger(context.Context, *GetLoggerRequest) (*types.Logger, error) - // the Issuer AttestAgent RPC. + // Adjusts logger levels. // // The caller must be local or present an admin X509-SVID. AdjustLogger(context.Context, *AdjustLoggerRequest) (*emptypb.Empty, error) @@ -108,9 +91,6 @@ type LoggerServer interface { type UnimplementedLoggerServer struct { } -func (UnimplementedLoggerServer) CountLoggers(context.Context, *CountLoggersRequest) (*CountLoggersResponse, error) { - return nil, status.Errorf(codes.Unimplemented, "method CountLoggers not implemented") -} func (UnimplementedLoggerServer) ListLoggers(context.Context, *ListLoggersRequest) (*ListLoggersResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method ListLoggers not implemented") } @@ -133,24 +113,6 @@ func RegisterLoggerServer(s grpc.ServiceRegistrar, srv LoggerServer) { s.RegisterService(&_Logger_serviceDesc, srv) } -func _Logger_CountLoggers_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(CountLoggersRequest) - if err := dec(in); err != nil { - return nil, err - } - if interceptor == nil { - return srv.(LoggerServer).CountLoggers(ctx, in) - } - info := &grpc.UnaryServerInfo{ - Server: srv, - FullMethod: "/spire.api.agent.logger.v1.Logger/CountLoggers", - } - handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(LoggerServer).CountLoggers(ctx, req.(*CountLoggersRequest)) - } - return interceptor(ctx, in, info, handler) -} - func _Logger_ListLoggers_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { in := new(ListLoggersRequest) if err := dec(in); err != nil { @@ -209,10 +171,6 @@ var _Logger_serviceDesc = grpc.ServiceDesc{ ServiceName: "spire.api.agent.logger.v1.Logger", HandlerType: (*LoggerServer)(nil), Methods: []grpc.MethodDesc{ - { - MethodName: "CountLoggers", - Handler: _Logger_CountLoggers_Handler, - }, { MethodName: "ListLoggers", Handler: _Logger_ListLoggers_Handler, diff --git a/proto/spire/api/server/logger/v1/logger.pb.go b/proto/spire/api/server/logger/v1/logger.pb.go index 8db898c..761de43 100644 --- a/proto/spire/api/server/logger/v1/logger.pb.go +++ b/proto/spire/api/server/logger/v1/logger.pb.go @@ -83,92 +83,7 @@ func (x AdjustLoggerRequest_LogAdjustment) Number() protoreflect.EnumNumber { // Deprecated: Use AdjustLoggerRequest_LogAdjustment.Descriptor instead. func (AdjustLoggerRequest_LogAdjustment) EnumDescriptor() ([]byte, []int) { - return file_spire_api_server_logger_v1_logger_proto_rawDescGZIP(), []int{5, 0} -} - -type CountLoggersRequest struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields -} - -func (x *CountLoggersRequest) Reset() { - *x = CountLoggersRequest{} - if protoimpl.UnsafeEnabled { - mi := &file_spire_api_server_logger_v1_logger_proto_msgTypes[0] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } -} - -func (x *CountLoggersRequest) String() string { - return protoimpl.X.MessageStringOf(x) -} - -func (*CountLoggersRequest) ProtoMessage() {} - -func (x *CountLoggersRequest) ProtoReflect() protoreflect.Message { - mi := &file_spire_api_server_logger_v1_logger_proto_msgTypes[0] - if protoimpl.UnsafeEnabled && x != nil { - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - if ms.LoadMessageInfo() == nil { - ms.StoreMessageInfo(mi) - } - return ms - } - return mi.MessageOf(x) -} - -// Deprecated: Use CountLoggersRequest.ProtoReflect.Descriptor instead. -func (*CountLoggersRequest) Descriptor() ([]byte, []int) { - return file_spire_api_server_logger_v1_logger_proto_rawDescGZIP(), []int{0} -} - -type CountLoggersResponse struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - - Count int32 `protobuf:"varint,1,opt,name=count,proto3" json:"count,omitempty"` -} - -func (x *CountLoggersResponse) Reset() { - *x = CountLoggersResponse{} - if protoimpl.UnsafeEnabled { - mi := &file_spire_api_server_logger_v1_logger_proto_msgTypes[1] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } -} - -func (x *CountLoggersResponse) String() string { - return protoimpl.X.MessageStringOf(x) -} - -func (*CountLoggersResponse) ProtoMessage() {} - -func (x *CountLoggersResponse) ProtoReflect() protoreflect.Message { - mi := &file_spire_api_server_logger_v1_logger_proto_msgTypes[1] - if protoimpl.UnsafeEnabled && x != nil { - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - if ms.LoadMessageInfo() == nil { - ms.StoreMessageInfo(mi) - } - return ms - } - return mi.MessageOf(x) -} - -// Deprecated: Use CountLoggersResponse.ProtoReflect.Descriptor instead. -func (*CountLoggersResponse) Descriptor() ([]byte, []int) { - return file_spire_api_server_logger_v1_logger_proto_rawDescGZIP(), []int{1} -} - -func (x *CountLoggersResponse) GetCount() int32 { - if x != nil { - return x.Count - } - return 0 + return file_spire_api_server_logger_v1_logger_proto_rawDescGZIP(), []int{3, 0} } type ListLoggersRequest struct { @@ -176,21 +91,21 @@ type ListLoggersRequest struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - // Filters the agents returned by the list operation. - Filter *ListLoggersRequest_Filter `protobuf:"bytes,1,opt,name=filter,proto3" json:"filter,omitempty"` - // An output mask indicating which agent fields are set in the response. - OutputMask *types.LoggerMask `protobuf:"bytes,2,opt,name=output_mask,json=outputMask,proto3" json:"output_mask,omitempty"` - // The maximum number of results to return. The server may further - // constrain this value, or if zero, choose its own. + // The name of the logger tree being requested, "" is the root logger + RootName string `protobuf:"bytes,1,opt,name=root_name,json=rootName,proto3" json:"root_name,omitempty"` + // Control over whether sub-loggers under the root should be returned + WithSubloggers bool `protobuf:"varint,2,opt,name=with_subloggers,json=withSubloggers,proto3" json:"with_subloggers,omitempty"` + // The maximum number of loggers to return. If zero, the server may + // impose its own page size PageSize int32 `protobuf:"varint,3,opt,name=page_size,json=pageSize,proto3" json:"page_size,omitempty"` - // The next_page_token value returned from a previous request, if any. + // The page of partial responses being requested, "" for the first page. PageToken string `protobuf:"bytes,4,opt,name=page_token,json=pageToken,proto3" json:"page_token,omitempty"` } func (x *ListLoggersRequest) Reset() { *x = ListLoggersRequest{} if protoimpl.UnsafeEnabled { - mi := &file_spire_api_server_logger_v1_logger_proto_msgTypes[2] + mi := &file_spire_api_server_logger_v1_logger_proto_msgTypes[0] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -203,7 +118,7 @@ func (x *ListLoggersRequest) String() string { func (*ListLoggersRequest) ProtoMessage() {} func (x *ListLoggersRequest) ProtoReflect() protoreflect.Message { - mi := &file_spire_api_server_logger_v1_logger_proto_msgTypes[2] + mi := &file_spire_api_server_logger_v1_logger_proto_msgTypes[0] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -216,21 +131,21 @@ func (x *ListLoggersRequest) ProtoReflect() protoreflect.Message { // Deprecated: Use ListLoggersRequest.ProtoReflect.Descriptor instead. func (*ListLoggersRequest) Descriptor() ([]byte, []int) { - return file_spire_api_server_logger_v1_logger_proto_rawDescGZIP(), []int{2} + return file_spire_api_server_logger_v1_logger_proto_rawDescGZIP(), []int{0} } -func (x *ListLoggersRequest) GetFilter() *ListLoggersRequest_Filter { +func (x *ListLoggersRequest) GetRootName() string { if x != nil { - return x.Filter + return x.RootName } - return nil + return "" } -func (x *ListLoggersRequest) GetOutputMask() *types.LoggerMask { +func (x *ListLoggersRequest) GetWithSubloggers() bool { if x != nil { - return x.OutputMask + return x.WithSubloggers } - return nil + return false } func (x *ListLoggersRequest) GetPageSize() int32 { @@ -252,18 +167,17 @@ type ListLoggersResponse struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - // The agents. + // The returned loggers. Loggers []*types.Logger `protobuf:"bytes,1,rep,name=loggers,proto3" json:"loggers,omitempty"` - // The page token for the next request. Empty if there are no more results. - // This field should be checked by clients even when a page_size was not - // requested, since the server may choose its own (see page_size). + // The page of the next page of partial responses, + // "" when returning the last page. NextPageToken string `protobuf:"bytes,2,opt,name=next_page_token,json=nextPageToken,proto3" json:"next_page_token,omitempty"` } func (x *ListLoggersResponse) Reset() { *x = ListLoggersResponse{} if protoimpl.UnsafeEnabled { - mi := &file_spire_api_server_logger_v1_logger_proto_msgTypes[3] + mi := &file_spire_api_server_logger_v1_logger_proto_msgTypes[1] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -276,7 +190,7 @@ func (x *ListLoggersResponse) String() string { func (*ListLoggersResponse) ProtoMessage() {} func (x *ListLoggersResponse) ProtoReflect() protoreflect.Message { - mi := &file_spire_api_server_logger_v1_logger_proto_msgTypes[3] + mi := &file_spire_api_server_logger_v1_logger_proto_msgTypes[1] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -289,7 +203,7 @@ func (x *ListLoggersResponse) ProtoReflect() protoreflect.Message { // Deprecated: Use ListLoggersResponse.ProtoReflect.Descriptor instead. func (*ListLoggersResponse) Descriptor() ([]byte, []int) { - return file_spire_api_server_logger_v1_logger_proto_rawDescGZIP(), []int{3} + return file_spire_api_server_logger_v1_logger_proto_rawDescGZIP(), []int{1} } func (x *ListLoggersResponse) GetLoggers() []*types.Logger { @@ -311,16 +225,14 @@ type GetLoggerRequest struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - // Required. The SPIFFE ID of the agent. + // The logger being requested, "" for the root logger Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"` - // An output mask indicating which agent fields are set in the response. - OutputMask *types.LoggerMask `protobuf:"bytes,2,opt,name=output_mask,json=outputMask,proto3" json:"output_mask,omitempty"` } func (x *GetLoggerRequest) Reset() { *x = GetLoggerRequest{} if protoimpl.UnsafeEnabled { - mi := &file_spire_api_server_logger_v1_logger_proto_msgTypes[4] + mi := &file_spire_api_server_logger_v1_logger_proto_msgTypes[2] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -333,7 +245,7 @@ func (x *GetLoggerRequest) String() string { func (*GetLoggerRequest) ProtoMessage() {} func (x *GetLoggerRequest) ProtoReflect() protoreflect.Message { - mi := &file_spire_api_server_logger_v1_logger_proto_msgTypes[4] + mi := &file_spire_api_server_logger_v1_logger_proto_msgTypes[2] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -346,7 +258,7 @@ func (x *GetLoggerRequest) ProtoReflect() protoreflect.Message { // Deprecated: Use GetLoggerRequest.ProtoReflect.Descriptor instead. func (*GetLoggerRequest) Descriptor() ([]byte, []int) { - return file_spire_api_server_logger_v1_logger_proto_rawDescGZIP(), []int{4} + return file_spire_api_server_logger_v1_logger_proto_rawDescGZIP(), []int{2} } func (x *GetLoggerRequest) GetName() string { @@ -356,28 +268,23 @@ func (x *GetLoggerRequest) GetName() string { return "" } -func (x *GetLoggerRequest) GetOutputMask() *types.LoggerMask { - if x != nil { - return x.OutputMask - } - return nil -} - type AdjustLoggerRequest struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - // Required. The SPIFFE ID of the agent. - Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"` - LogLevel AdjustLoggerRequest_LogAdjustment `protobuf:"varint,2,opt,name=log_level,json=logLevel,proto3,enum=spire.api.server.logger.v1.AdjustLoggerRequest_LogAdjustment" json:"log_level,omitempty"` - AdjustSubloggers bool `protobuf:"varint,3,opt,name=adjust_subloggers,json=adjustSubloggers,proto3" json:"adjust_subloggers,omitempty"` + // The logger being adjusted, "" for the root logger + Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"` + // The new level the logger should assume + LogLevel AdjustLoggerRequest_LogAdjustment `protobuf:"varint,2,opt,name=log_level,json=logLevel,proto3,enum=spire.api.server.logger.v1.AdjustLoggerRequest_LogAdjustment" json:"log_level,omitempty"` + // Control over whether sub-loggers should also be adjusted + IncludeSubloggers bool `protobuf:"varint,3,opt,name=include_subloggers,json=includeSubloggers,proto3" json:"include_subloggers,omitempty"` } func (x *AdjustLoggerRequest) Reset() { *x = AdjustLoggerRequest{} if protoimpl.UnsafeEnabled { - mi := &file_spire_api_server_logger_v1_logger_proto_msgTypes[5] + mi := &file_spire_api_server_logger_v1_logger_proto_msgTypes[3] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -390,7 +297,7 @@ func (x *AdjustLoggerRequest) String() string { func (*AdjustLoggerRequest) ProtoMessage() {} func (x *AdjustLoggerRequest) ProtoReflect() protoreflect.Message { - mi := &file_spire_api_server_logger_v1_logger_proto_msgTypes[5] + mi := &file_spire_api_server_logger_v1_logger_proto_msgTypes[3] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -403,7 +310,7 @@ func (x *AdjustLoggerRequest) ProtoReflect() protoreflect.Message { // Deprecated: Use AdjustLoggerRequest.ProtoReflect.Descriptor instead. func (*AdjustLoggerRequest) Descriptor() ([]byte, []int) { - return file_spire_api_server_logger_v1_logger_proto_rawDescGZIP(), []int{5} + return file_spire_api_server_logger_v1_logger_proto_rawDescGZIP(), []int{3} } func (x *AdjustLoggerRequest) GetName() string { @@ -420,65 +327,9 @@ func (x *AdjustLoggerRequest) GetLogLevel() AdjustLoggerRequest_LogAdjustment { return AdjustLoggerRequest_PANIC_LEVEL } -func (x *AdjustLoggerRequest) GetAdjustSubloggers() bool { - if x != nil { - return x.AdjustSubloggers - } - return false -} - -type ListLoggersRequest_Filter struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - - // Filters agents to those matching the attestation type. - ByName string `protobuf:"bytes,1,opt,name=by_name,json=byName,proto3" json:"by_name,omitempty"` - WithSubloggers bool `protobuf:"varint,2,opt,name=with_subloggers,json=withSubloggers,proto3" json:"with_subloggers,omitempty"` -} - -func (x *ListLoggersRequest_Filter) Reset() { - *x = ListLoggersRequest_Filter{} - if protoimpl.UnsafeEnabled { - mi := &file_spire_api_server_logger_v1_logger_proto_msgTypes[6] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } -} - -func (x *ListLoggersRequest_Filter) String() string { - return protoimpl.X.MessageStringOf(x) -} - -func (*ListLoggersRequest_Filter) ProtoMessage() {} - -func (x *ListLoggersRequest_Filter) ProtoReflect() protoreflect.Message { - mi := &file_spire_api_server_logger_v1_logger_proto_msgTypes[6] - if protoimpl.UnsafeEnabled && x != nil { - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - if ms.LoadMessageInfo() == nil { - ms.StoreMessageInfo(mi) - } - return ms - } - return mi.MessageOf(x) -} - -// Deprecated: Use ListLoggersRequest_Filter.ProtoReflect.Descriptor instead. -func (*ListLoggersRequest_Filter) Descriptor() ([]byte, []int) { - return file_spire_api_server_logger_v1_logger_proto_rawDescGZIP(), []int{2, 0} -} - -func (x *ListLoggersRequest_Filter) GetByName() string { - if x != nil { - return x.ByName - } - return "" -} - -func (x *ListLoggersRequest_Filter) GetWithSubloggers() bool { +func (x *AdjustLoggerRequest) GetIncludeSubloggers() bool { if x != nil { - return x.WithSubloggers + return x.IncludeSubloggers } return false } @@ -494,95 +345,71 @@ var file_spire_api_server_logger_v1_logger_proto_rawDesc = []byte{ 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x65, 0x6d, 0x70, 0x74, 0x79, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x1c, 0x73, 0x70, 0x69, 0x72, 0x65, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2f, 0x6c, 0x6f, 0x67, 0x67, 0x65, 0x72, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, - 0x22, 0x15, 0x0a, 0x13, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x4c, 0x6f, 0x67, 0x67, 0x65, 0x72, 0x73, - 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x22, 0x2c, 0x0a, 0x14, 0x43, 0x6f, 0x75, 0x6e, 0x74, + 0x22, 0x96, 0x01, 0x0a, 0x12, 0x4c, 0x69, 0x73, 0x74, 0x4c, 0x6f, 0x67, 0x67, 0x65, 0x72, 0x73, + 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x1b, 0x0a, 0x09, 0x72, 0x6f, 0x6f, 0x74, 0x5f, + 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x72, 0x6f, 0x6f, 0x74, + 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x27, 0x0a, 0x0f, 0x77, 0x69, 0x74, 0x68, 0x5f, 0x73, 0x75, 0x62, + 0x6c, 0x6f, 0x67, 0x67, 0x65, 0x72, 0x73, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0e, 0x77, + 0x69, 0x74, 0x68, 0x53, 0x75, 0x62, 0x6c, 0x6f, 0x67, 0x67, 0x65, 0x72, 0x73, 0x12, 0x1b, 0x0a, + 0x09, 0x70, 0x61, 0x67, 0x65, 0x5f, 0x73, 0x69, 0x7a, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, + 0x52, 0x08, 0x70, 0x61, 0x67, 0x65, 0x53, 0x69, 0x7a, 0x65, 0x12, 0x1d, 0x0a, 0x0a, 0x70, 0x61, + 0x67, 0x65, 0x5f, 0x74, 0x6f, 0x6b, 0x65, 0x6e, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, + 0x70, 0x61, 0x67, 0x65, 0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x22, 0x70, 0x0a, 0x13, 0x4c, 0x69, 0x73, + 0x74, 0x4c, 0x6f, 0x67, 0x67, 0x65, 0x72, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, + 0x12, 0x31, 0x0a, 0x07, 0x6c, 0x6f, 0x67, 0x67, 0x65, 0x72, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, + 0x0b, 0x32, 0x17, 0x2e, 0x73, 0x70, 0x69, 0x72, 0x65, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x74, 0x79, + 0x70, 0x65, 0x73, 0x2e, 0x4c, 0x6f, 0x67, 0x67, 0x65, 0x72, 0x52, 0x07, 0x6c, 0x6f, 0x67, 0x67, + 0x65, 0x72, 0x73, 0x12, 0x26, 0x0a, 0x0f, 0x6e, 0x65, 0x78, 0x74, 0x5f, 0x70, 0x61, 0x67, 0x65, + 0x5f, 0x74, 0x6f, 0x6b, 0x65, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0d, 0x6e, 0x65, + 0x78, 0x74, 0x50, 0x61, 0x67, 0x65, 0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x22, 0x26, 0x0a, 0x10, 0x47, + 0x65, 0x74, 0x4c, 0x6f, 0x67, 0x67, 0x65, 0x72, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, + 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, + 0x61, 0x6d, 0x65, 0x22, 0xce, 0x02, 0x0a, 0x13, 0x41, 0x64, 0x6a, 0x75, 0x73, 0x74, 0x4c, 0x6f, + 0x67, 0x67, 0x65, 0x72, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x12, 0x0a, 0x04, 0x6e, + 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, + 0x5a, 0x0a, 0x09, 0x6c, 0x6f, 0x67, 0x5f, 0x6c, 0x65, 0x76, 0x65, 0x6c, 0x18, 0x02, 0x20, 0x01, + 0x28, 0x0e, 0x32, 0x3d, 0x2e, 0x73, 0x70, 0x69, 0x72, 0x65, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x73, + 0x65, 0x72, 0x76, 0x65, 0x72, 0x2e, 0x6c, 0x6f, 0x67, 0x67, 0x65, 0x72, 0x2e, 0x76, 0x31, 0x2e, + 0x41, 0x64, 0x6a, 0x75, 0x73, 0x74, 0x4c, 0x6f, 0x67, 0x67, 0x65, 0x72, 0x52, 0x65, 0x71, 0x75, + 0x65, 0x73, 0x74, 0x2e, 0x4c, 0x6f, 0x67, 0x41, 0x64, 0x6a, 0x75, 0x73, 0x74, 0x6d, 0x65, 0x6e, + 0x74, 0x52, 0x08, 0x6c, 0x6f, 0x67, 0x4c, 0x65, 0x76, 0x65, 0x6c, 0x12, 0x2d, 0x0a, 0x12, 0x69, + 0x6e, 0x63, 0x6c, 0x75, 0x64, 0x65, 0x5f, 0x73, 0x75, 0x62, 0x6c, 0x6f, 0x67, 0x67, 0x65, 0x72, + 0x73, 0x18, 0x03, 0x20, 0x01, 0x28, 0x08, 0x52, 0x11, 0x69, 0x6e, 0x63, 0x6c, 0x75, 0x64, 0x65, + 0x53, 0x75, 0x62, 0x6c, 0x6f, 0x67, 0x67, 0x65, 0x72, 0x73, 0x22, 0x97, 0x01, 0x0a, 0x0d, 0x4c, + 0x6f, 0x67, 0x41, 0x64, 0x6a, 0x75, 0x73, 0x74, 0x6d, 0x65, 0x6e, 0x74, 0x12, 0x0f, 0x0a, 0x0b, + 0x50, 0x41, 0x4e, 0x49, 0x43, 0x5f, 0x4c, 0x45, 0x56, 0x45, 0x4c, 0x10, 0x00, 0x12, 0x0f, 0x0a, + 0x0b, 0x46, 0x41, 0x54, 0x41, 0x4c, 0x5f, 0x4c, 0x45, 0x56, 0x45, 0x4c, 0x10, 0x01, 0x12, 0x0f, + 0x0a, 0x0b, 0x45, 0x52, 0x52, 0x4f, 0x52, 0x5f, 0x4c, 0x45, 0x56, 0x45, 0x4c, 0x10, 0x02, 0x12, + 0x0e, 0x0a, 0x0a, 0x57, 0x41, 0x52, 0x4e, 0x5f, 0x4c, 0x45, 0x56, 0x45, 0x4c, 0x10, 0x03, 0x12, + 0x0e, 0x0a, 0x0a, 0x49, 0x4e, 0x46, 0x4f, 0x5f, 0x4c, 0x45, 0x56, 0x45, 0x4c, 0x10, 0x04, 0x12, + 0x0f, 0x0a, 0x0b, 0x44, 0x45, 0x42, 0x55, 0x47, 0x5f, 0x4c, 0x45, 0x56, 0x45, 0x4c, 0x10, 0x05, + 0x12, 0x0f, 0x0a, 0x0b, 0x54, 0x52, 0x41, 0x43, 0x45, 0x5f, 0x4c, 0x45, 0x56, 0x45, 0x4c, 0x10, + 0x06, 0x12, 0x11, 0x0a, 0x0d, 0x44, 0x45, 0x46, 0x41, 0x55, 0x4c, 0x54, 0x5f, 0x4c, 0x45, 0x56, + 0x45, 0x4c, 0x10, 0x07, 0x32, 0xa5, 0x02, 0x0a, 0x06, 0x4c, 0x6f, 0x67, 0x67, 0x65, 0x72, 0x12, + 0x6e, 0x0a, 0x0b, 0x4c, 0x69, 0x73, 0x74, 0x4c, 0x6f, 0x67, 0x67, 0x65, 0x72, 0x73, 0x12, 0x2e, + 0x2e, 0x73, 0x70, 0x69, 0x72, 0x65, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x65, + 0x72, 0x2e, 0x6c, 0x6f, 0x67, 0x67, 0x65, 0x72, 0x2e, 0x76, 0x31, 0x2e, 0x4c, 0x69, 0x73, 0x74, + 0x4c, 0x6f, 0x67, 0x67, 0x65, 0x72, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x2f, + 0x2e, 0x73, 0x70, 0x69, 0x72, 0x65, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x65, + 0x72, 0x2e, 0x6c, 0x6f, 0x67, 0x67, 0x65, 0x72, 0x2e, 0x76, 0x31, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x4c, 0x6f, 0x67, 0x67, 0x65, 0x72, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, - 0x14, 0x0a, 0x05, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, - 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x22, 0xa9, 0x02, 0x0a, 0x12, 0x4c, 0x69, 0x73, 0x74, 0x4c, 0x6f, - 0x67, 0x67, 0x65, 0x72, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x4d, 0x0a, 0x06, - 0x66, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x35, 0x2e, 0x73, + 0x52, 0x0a, 0x09, 0x47, 0x65, 0x74, 0x4c, 0x6f, 0x67, 0x67, 0x65, 0x72, 0x12, 0x2c, 0x2e, 0x73, 0x70, 0x69, 0x72, 0x65, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x65, 0x72, 0x2e, - 0x6c, 0x6f, 0x67, 0x67, 0x65, 0x72, 0x2e, 0x76, 0x31, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x4c, 0x6f, - 0x67, 0x67, 0x65, 0x72, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x2e, 0x46, 0x69, 0x6c, - 0x74, 0x65, 0x72, 0x52, 0x06, 0x66, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x12, 0x3c, 0x0a, 0x0b, 0x6f, - 0x75, 0x74, 0x70, 0x75, 0x74, 0x5f, 0x6d, 0x61, 0x73, 0x6b, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, - 0x32, 0x1b, 0x2e, 0x73, 0x70, 0x69, 0x72, 0x65, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x74, 0x79, 0x70, - 0x65, 0x73, 0x2e, 0x4c, 0x6f, 0x67, 0x67, 0x65, 0x72, 0x4d, 0x61, 0x73, 0x6b, 0x52, 0x0a, 0x6f, - 0x75, 0x74, 0x70, 0x75, 0x74, 0x4d, 0x61, 0x73, 0x6b, 0x12, 0x1b, 0x0a, 0x09, 0x70, 0x61, 0x67, - 0x65, 0x5f, 0x73, 0x69, 0x7a, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x70, 0x61, - 0x67, 0x65, 0x53, 0x69, 0x7a, 0x65, 0x12, 0x1d, 0x0a, 0x0a, 0x70, 0x61, 0x67, 0x65, 0x5f, 0x74, - 0x6f, 0x6b, 0x65, 0x6e, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x70, 0x61, 0x67, 0x65, - 0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x1a, 0x4a, 0x0a, 0x06, 0x46, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x12, - 0x17, 0x0a, 0x07, 0x62, 0x79, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, - 0x52, 0x06, 0x62, 0x79, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x27, 0x0a, 0x0f, 0x77, 0x69, 0x74, 0x68, - 0x5f, 0x73, 0x75, 0x62, 0x6c, 0x6f, 0x67, 0x67, 0x65, 0x72, 0x73, 0x18, 0x02, 0x20, 0x01, 0x28, - 0x08, 0x52, 0x0e, 0x77, 0x69, 0x74, 0x68, 0x53, 0x75, 0x62, 0x6c, 0x6f, 0x67, 0x67, 0x65, 0x72, - 0x73, 0x22, 0x70, 0x0a, 0x13, 0x4c, 0x69, 0x73, 0x74, 0x4c, 0x6f, 0x67, 0x67, 0x65, 0x72, 0x73, - 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x31, 0x0a, 0x07, 0x6c, 0x6f, 0x67, 0x67, - 0x65, 0x72, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x17, 0x2e, 0x73, 0x70, 0x69, 0x72, - 0x65, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2e, 0x4c, 0x6f, 0x67, 0x67, - 0x65, 0x72, 0x52, 0x07, 0x6c, 0x6f, 0x67, 0x67, 0x65, 0x72, 0x73, 0x12, 0x26, 0x0a, 0x0f, 0x6e, - 0x65, 0x78, 0x74, 0x5f, 0x70, 0x61, 0x67, 0x65, 0x5f, 0x74, 0x6f, 0x6b, 0x65, 0x6e, 0x18, 0x02, - 0x20, 0x01, 0x28, 0x09, 0x52, 0x0d, 0x6e, 0x65, 0x78, 0x74, 0x50, 0x61, 0x67, 0x65, 0x54, 0x6f, - 0x6b, 0x65, 0x6e, 0x22, 0x64, 0x0a, 0x10, 0x47, 0x65, 0x74, 0x4c, 0x6f, 0x67, 0x67, 0x65, 0x72, - 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, - 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x3c, 0x0a, 0x0b, 0x6f, - 0x75, 0x74, 0x70, 0x75, 0x74, 0x5f, 0x6d, 0x61, 0x73, 0x6b, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, - 0x32, 0x1b, 0x2e, 0x73, 0x70, 0x69, 0x72, 0x65, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x74, 0x79, 0x70, - 0x65, 0x73, 0x2e, 0x4c, 0x6f, 0x67, 0x67, 0x65, 0x72, 0x4d, 0x61, 0x73, 0x6b, 0x52, 0x0a, 0x6f, - 0x75, 0x74, 0x70, 0x75, 0x74, 0x4d, 0x61, 0x73, 0x6b, 0x22, 0xcc, 0x02, 0x0a, 0x13, 0x41, 0x64, - 0x6a, 0x75, 0x73, 0x74, 0x4c, 0x6f, 0x67, 0x67, 0x65, 0x72, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, - 0x74, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, - 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x5a, 0x0a, 0x09, 0x6c, 0x6f, 0x67, 0x5f, 0x6c, 0x65, 0x76, - 0x65, 0x6c, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x3d, 0x2e, 0x73, 0x70, 0x69, 0x72, 0x65, - 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x65, 0x72, 0x2e, 0x6c, 0x6f, 0x67, 0x67, - 0x65, 0x72, 0x2e, 0x76, 0x31, 0x2e, 0x41, 0x64, 0x6a, 0x75, 0x73, 0x74, 0x4c, 0x6f, 0x67, 0x67, - 0x65, 0x72, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x2e, 0x4c, 0x6f, 0x67, 0x41, 0x64, 0x6a, - 0x75, 0x73, 0x74, 0x6d, 0x65, 0x6e, 0x74, 0x52, 0x08, 0x6c, 0x6f, 0x67, 0x4c, 0x65, 0x76, 0x65, - 0x6c, 0x12, 0x2b, 0x0a, 0x11, 0x61, 0x64, 0x6a, 0x75, 0x73, 0x74, 0x5f, 0x73, 0x75, 0x62, 0x6c, - 0x6f, 0x67, 0x67, 0x65, 0x72, 0x73, 0x18, 0x03, 0x20, 0x01, 0x28, 0x08, 0x52, 0x10, 0x61, 0x64, - 0x6a, 0x75, 0x73, 0x74, 0x53, 0x75, 0x62, 0x6c, 0x6f, 0x67, 0x67, 0x65, 0x72, 0x73, 0x22, 0x97, - 0x01, 0x0a, 0x0d, 0x4c, 0x6f, 0x67, 0x41, 0x64, 0x6a, 0x75, 0x73, 0x74, 0x6d, 0x65, 0x6e, 0x74, - 0x12, 0x0f, 0x0a, 0x0b, 0x50, 0x41, 0x4e, 0x49, 0x43, 0x5f, 0x4c, 0x45, 0x56, 0x45, 0x4c, 0x10, - 0x00, 0x12, 0x0f, 0x0a, 0x0b, 0x46, 0x41, 0x54, 0x41, 0x4c, 0x5f, 0x4c, 0x45, 0x56, 0x45, 0x4c, - 0x10, 0x01, 0x12, 0x0f, 0x0a, 0x0b, 0x45, 0x52, 0x52, 0x4f, 0x52, 0x5f, 0x4c, 0x45, 0x56, 0x45, - 0x4c, 0x10, 0x02, 0x12, 0x0e, 0x0a, 0x0a, 0x57, 0x41, 0x52, 0x4e, 0x5f, 0x4c, 0x45, 0x56, 0x45, - 0x4c, 0x10, 0x03, 0x12, 0x0e, 0x0a, 0x0a, 0x49, 0x4e, 0x46, 0x4f, 0x5f, 0x4c, 0x45, 0x56, 0x45, - 0x4c, 0x10, 0x04, 0x12, 0x0f, 0x0a, 0x0b, 0x44, 0x45, 0x42, 0x55, 0x47, 0x5f, 0x4c, 0x45, 0x56, - 0x45, 0x4c, 0x10, 0x05, 0x12, 0x0f, 0x0a, 0x0b, 0x54, 0x52, 0x41, 0x43, 0x45, 0x5f, 0x4c, 0x45, - 0x56, 0x45, 0x4c, 0x10, 0x06, 0x12, 0x11, 0x0a, 0x0d, 0x44, 0x45, 0x46, 0x41, 0x55, 0x4c, 0x54, - 0x5f, 0x4c, 0x45, 0x56, 0x45, 0x4c, 0x10, 0x07, 0x32, 0x98, 0x03, 0x0a, 0x06, 0x4c, 0x6f, 0x67, - 0x67, 0x65, 0x72, 0x12, 0x71, 0x0a, 0x0c, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x4c, 0x6f, 0x67, 0x67, - 0x65, 0x72, 0x73, 0x12, 0x2f, 0x2e, 0x73, 0x70, 0x69, 0x72, 0x65, 0x2e, 0x61, 0x70, 0x69, 0x2e, + 0x6c, 0x6f, 0x67, 0x67, 0x65, 0x72, 0x2e, 0x76, 0x31, 0x2e, 0x47, 0x65, 0x74, 0x4c, 0x6f, 0x67, + 0x67, 0x65, 0x72, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x17, 0x2e, 0x73, 0x70, 0x69, + 0x72, 0x65, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2e, 0x4c, 0x6f, 0x67, + 0x67, 0x65, 0x72, 0x12, 0x57, 0x0a, 0x0c, 0x41, 0x64, 0x6a, 0x75, 0x73, 0x74, 0x4c, 0x6f, 0x67, + 0x67, 0x65, 0x72, 0x12, 0x2f, 0x2e, 0x73, 0x70, 0x69, 0x72, 0x65, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x65, 0x72, 0x2e, 0x6c, 0x6f, 0x67, 0x67, 0x65, 0x72, 0x2e, 0x76, 0x31, - 0x2e, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x4c, 0x6f, 0x67, 0x67, 0x65, 0x72, 0x73, 0x52, 0x65, 0x71, - 0x75, 0x65, 0x73, 0x74, 0x1a, 0x30, 0x2e, 0x73, 0x70, 0x69, 0x72, 0x65, 0x2e, 0x61, 0x70, 0x69, - 0x2e, 0x73, 0x65, 0x72, 0x76, 0x65, 0x72, 0x2e, 0x6c, 0x6f, 0x67, 0x67, 0x65, 0x72, 0x2e, 0x76, - 0x31, 0x2e, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x4c, 0x6f, 0x67, 0x67, 0x65, 0x72, 0x73, 0x52, 0x65, - 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x6e, 0x0a, 0x0b, 0x4c, 0x69, 0x73, 0x74, 0x4c, 0x6f, - 0x67, 0x67, 0x65, 0x72, 0x73, 0x12, 0x2e, 0x2e, 0x73, 0x70, 0x69, 0x72, 0x65, 0x2e, 0x61, 0x70, - 0x69, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x65, 0x72, 0x2e, 0x6c, 0x6f, 0x67, 0x67, 0x65, 0x72, 0x2e, - 0x76, 0x31, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x4c, 0x6f, 0x67, 0x67, 0x65, 0x72, 0x73, 0x52, 0x65, - 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x2f, 0x2e, 0x73, 0x70, 0x69, 0x72, 0x65, 0x2e, 0x61, 0x70, - 0x69, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x65, 0x72, 0x2e, 0x6c, 0x6f, 0x67, 0x67, 0x65, 0x72, 0x2e, - 0x76, 0x31, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x4c, 0x6f, 0x67, 0x67, 0x65, 0x72, 0x73, 0x52, 0x65, - 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x52, 0x0a, 0x09, 0x47, 0x65, 0x74, 0x4c, 0x6f, 0x67, - 0x67, 0x65, 0x72, 0x12, 0x2c, 0x2e, 0x73, 0x70, 0x69, 0x72, 0x65, 0x2e, 0x61, 0x70, 0x69, 0x2e, - 0x73, 0x65, 0x72, 0x76, 0x65, 0x72, 0x2e, 0x6c, 0x6f, 0x67, 0x67, 0x65, 0x72, 0x2e, 0x76, 0x31, - 0x2e, 0x47, 0x65, 0x74, 0x4c, 0x6f, 0x67, 0x67, 0x65, 0x72, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, - 0x74, 0x1a, 0x17, 0x2e, 0x73, 0x70, 0x69, 0x72, 0x65, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x74, 0x79, - 0x70, 0x65, 0x73, 0x2e, 0x4c, 0x6f, 0x67, 0x67, 0x65, 0x72, 0x12, 0x57, 0x0a, 0x0c, 0x41, 0x64, - 0x6a, 0x75, 0x73, 0x74, 0x4c, 0x6f, 0x67, 0x67, 0x65, 0x72, 0x12, 0x2f, 0x2e, 0x73, 0x70, 0x69, - 0x72, 0x65, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x65, 0x72, 0x2e, 0x6c, 0x6f, - 0x67, 0x67, 0x65, 0x72, 0x2e, 0x76, 0x31, 0x2e, 0x41, 0x64, 0x6a, 0x75, 0x73, 0x74, 0x4c, 0x6f, - 0x67, 0x67, 0x65, 0x72, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x16, 0x2e, 0x67, 0x6f, - 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x45, 0x6d, - 0x70, 0x74, 0x79, 0x42, 0x4b, 0x5a, 0x49, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, - 0x6d, 0x2f, 0x73, 0x70, 0x69, 0x66, 0x66, 0x65, 0x2f, 0x73, 0x70, 0x69, 0x72, 0x65, 0x2d, 0x61, - 0x70, 0x69, 0x2d, 0x73, 0x64, 0x6b, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x73, 0x70, 0x69, - 0x72, 0x65, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x73, 0x65, 0x72, 0x76, 0x65, 0x72, 0x2f, 0x6c, 0x6f, - 0x67, 0x67, 0x65, 0x72, 0x2f, 0x76, 0x31, 0x3b, 0x6c, 0x6f, 0x67, 0x67, 0x65, 0x72, 0x76, 0x31, - 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x2e, 0x41, 0x64, 0x6a, 0x75, 0x73, 0x74, 0x4c, 0x6f, 0x67, 0x67, 0x65, 0x72, 0x52, 0x65, 0x71, + 0x75, 0x65, 0x73, 0x74, 0x1a, 0x16, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, + 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x42, 0x4b, 0x5a, 0x49, + 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x73, 0x70, 0x69, 0x66, 0x66, + 0x65, 0x2f, 0x73, 0x70, 0x69, 0x72, 0x65, 0x2d, 0x61, 0x70, 0x69, 0x2d, 0x73, 0x64, 0x6b, 0x2f, + 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x73, 0x70, 0x69, 0x72, 0x65, 0x2f, 0x61, 0x70, 0x69, 0x2f, + 0x73, 0x65, 0x72, 0x76, 0x65, 0x72, 0x2f, 0x6c, 0x6f, 0x67, 0x67, 0x65, 0x72, 0x2f, 0x76, 0x31, + 0x3b, 0x6c, 0x6f, 0x67, 0x67, 0x65, 0x72, 0x76, 0x31, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, + 0x33, } var ( @@ -598,39 +425,30 @@ func file_spire_api_server_logger_v1_logger_proto_rawDescGZIP() []byte { } var file_spire_api_server_logger_v1_logger_proto_enumTypes = make([]protoimpl.EnumInfo, 1) -var file_spire_api_server_logger_v1_logger_proto_msgTypes = make([]protoimpl.MessageInfo, 7) +var file_spire_api_server_logger_v1_logger_proto_msgTypes = make([]protoimpl.MessageInfo, 4) var file_spire_api_server_logger_v1_logger_proto_goTypes = []interface{}{ (AdjustLoggerRequest_LogAdjustment)(0), // 0: spire.api.server.logger.v1.AdjustLoggerRequest.LogAdjustment - (*CountLoggersRequest)(nil), // 1: spire.api.server.logger.v1.CountLoggersRequest - (*CountLoggersResponse)(nil), // 2: spire.api.server.logger.v1.CountLoggersResponse - (*ListLoggersRequest)(nil), // 3: spire.api.server.logger.v1.ListLoggersRequest - (*ListLoggersResponse)(nil), // 4: spire.api.server.logger.v1.ListLoggersResponse - (*GetLoggerRequest)(nil), // 5: spire.api.server.logger.v1.GetLoggerRequest - (*AdjustLoggerRequest)(nil), // 6: spire.api.server.logger.v1.AdjustLoggerRequest - (*ListLoggersRequest_Filter)(nil), // 7: spire.api.server.logger.v1.ListLoggersRequest.Filter - (*types.LoggerMask)(nil), // 8: spire.api.types.LoggerMask - (*types.Logger)(nil), // 9: spire.api.types.Logger - (*emptypb.Empty)(nil), // 10: google.protobuf.Empty + (*ListLoggersRequest)(nil), // 1: spire.api.server.logger.v1.ListLoggersRequest + (*ListLoggersResponse)(nil), // 2: spire.api.server.logger.v1.ListLoggersResponse + (*GetLoggerRequest)(nil), // 3: spire.api.server.logger.v1.GetLoggerRequest + (*AdjustLoggerRequest)(nil), // 4: spire.api.server.logger.v1.AdjustLoggerRequest + (*types.Logger)(nil), // 5: spire.api.types.Logger + (*emptypb.Empty)(nil), // 6: google.protobuf.Empty } var file_spire_api_server_logger_v1_logger_proto_depIdxs = []int32{ - 7, // 0: spire.api.server.logger.v1.ListLoggersRequest.filter:type_name -> spire.api.server.logger.v1.ListLoggersRequest.Filter - 8, // 1: spire.api.server.logger.v1.ListLoggersRequest.output_mask:type_name -> spire.api.types.LoggerMask - 9, // 2: spire.api.server.logger.v1.ListLoggersResponse.loggers:type_name -> spire.api.types.Logger - 8, // 3: spire.api.server.logger.v1.GetLoggerRequest.output_mask:type_name -> spire.api.types.LoggerMask - 0, // 4: spire.api.server.logger.v1.AdjustLoggerRequest.log_level:type_name -> spire.api.server.logger.v1.AdjustLoggerRequest.LogAdjustment - 1, // 5: spire.api.server.logger.v1.Logger.CountLoggers:input_type -> spire.api.server.logger.v1.CountLoggersRequest - 3, // 6: spire.api.server.logger.v1.Logger.ListLoggers:input_type -> spire.api.server.logger.v1.ListLoggersRequest - 5, // 7: spire.api.server.logger.v1.Logger.GetLogger:input_type -> spire.api.server.logger.v1.GetLoggerRequest - 6, // 8: spire.api.server.logger.v1.Logger.AdjustLogger:input_type -> spire.api.server.logger.v1.AdjustLoggerRequest - 2, // 9: spire.api.server.logger.v1.Logger.CountLoggers:output_type -> spire.api.server.logger.v1.CountLoggersResponse - 4, // 10: spire.api.server.logger.v1.Logger.ListLoggers:output_type -> spire.api.server.logger.v1.ListLoggersResponse - 9, // 11: spire.api.server.logger.v1.Logger.GetLogger:output_type -> spire.api.types.Logger - 10, // 12: spire.api.server.logger.v1.Logger.AdjustLogger:output_type -> google.protobuf.Empty - 9, // [9:13] is the sub-list for method output_type - 5, // [5:9] is the sub-list for method input_type - 5, // [5:5] is the sub-list for extension type_name - 5, // [5:5] is the sub-list for extension extendee - 0, // [0:5] is the sub-list for field type_name + 5, // 0: spire.api.server.logger.v1.ListLoggersResponse.loggers:type_name -> spire.api.types.Logger + 0, // 1: spire.api.server.logger.v1.AdjustLoggerRequest.log_level:type_name -> spire.api.server.logger.v1.AdjustLoggerRequest.LogAdjustment + 1, // 2: spire.api.server.logger.v1.Logger.ListLoggers:input_type -> spire.api.server.logger.v1.ListLoggersRequest + 3, // 3: spire.api.server.logger.v1.Logger.GetLogger:input_type -> spire.api.server.logger.v1.GetLoggerRequest + 4, // 4: spire.api.server.logger.v1.Logger.AdjustLogger:input_type -> spire.api.server.logger.v1.AdjustLoggerRequest + 2, // 5: spire.api.server.logger.v1.Logger.ListLoggers:output_type -> spire.api.server.logger.v1.ListLoggersResponse + 5, // 6: spire.api.server.logger.v1.Logger.GetLogger:output_type -> spire.api.types.Logger + 6, // 7: spire.api.server.logger.v1.Logger.AdjustLogger:output_type -> google.protobuf.Empty + 5, // [5:8] is the sub-list for method output_type + 2, // [2:5] is the sub-list for method input_type + 2, // [2:2] is the sub-list for extension type_name + 2, // [2:2] is the sub-list for extension extendee + 0, // [0:2] is the sub-list for field type_name } func init() { file_spire_api_server_logger_v1_logger_proto_init() } @@ -640,30 +458,6 @@ func file_spire_api_server_logger_v1_logger_proto_init() { } if !protoimpl.UnsafeEnabled { file_spire_api_server_logger_v1_logger_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*CountLoggersRequest); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_spire_api_server_logger_v1_logger_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*CountLoggersResponse); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_spire_api_server_logger_v1_logger_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*ListLoggersRequest); i { case 0: return &v.state @@ -675,7 +469,7 @@ func file_spire_api_server_logger_v1_logger_proto_init() { return nil } } - file_spire_api_server_logger_v1_logger_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} { + file_spire_api_server_logger_v1_logger_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*ListLoggersResponse); i { case 0: return &v.state @@ -687,7 +481,7 @@ func file_spire_api_server_logger_v1_logger_proto_init() { return nil } } - file_spire_api_server_logger_v1_logger_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} { + file_spire_api_server_logger_v1_logger_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*GetLoggerRequest); i { case 0: return &v.state @@ -699,7 +493,7 @@ func file_spire_api_server_logger_v1_logger_proto_init() { return nil } } - file_spire_api_server_logger_v1_logger_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} { + file_spire_api_server_logger_v1_logger_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*AdjustLoggerRequest); i { case 0: return &v.state @@ -711,18 +505,6 @@ func file_spire_api_server_logger_v1_logger_proto_init() { return nil } } - file_spire_api_server_logger_v1_logger_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*ListLoggersRequest_Filter); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } } type x struct{} out := protoimpl.TypeBuilder{ @@ -730,7 +512,7 @@ func file_spire_api_server_logger_v1_logger_proto_init() { GoPackagePath: reflect.TypeOf(x{}).PkgPath(), RawDescriptor: file_spire_api_server_logger_v1_logger_proto_rawDesc, NumEnums: 1, - NumMessages: 7, + NumMessages: 4, NumExtensions: 0, NumServices: 1, }, diff --git a/proto/spire/api/server/logger/v1/logger.proto b/proto/spire/api/server/logger/v1/logger.proto index 53f8db9..1516dbc 100644 --- a/proto/spire/api/server/logger/v1/logger.proto +++ b/proto/spire/api/server/logger/v1/logger.proto @@ -6,78 +6,53 @@ import "google/protobuf/empty.proto"; import "spire/api/types/logger.proto"; service Logger { - // Count agents. - // - // The caller must be local or present an admin X509-SVID. - rpc CountLoggers(CountLoggersRequest) returns (CountLoggersResponse); - // Lists loggers. // // The caller must be local or present an admin X509-SVID. rpc ListLoggers(ListLoggersRequest) returns (ListLoggersResponse); - // Gets an agent. + // Gets an logger. // // The caller must be local or present an admin X509-SVID. rpc GetLogger(GetLoggerRequest) returns (spire.api.types.Logger); - // Deletes an agent. The agent can come back into the trust domain through - - // the Issuer AttestAgent RPC. + // Adjusts logger levels. // // The caller must be local or present an admin X509-SVID. rpc AdjustLogger(AdjustLoggerRequest) returns (google.protobuf.Empty); } -message CountLoggersRequest { -} - -message CountLoggersResponse { - int32 count = 1; -} - message ListLoggersRequest { - message Filter { - // Filters agents to those matching the attestation type. - string by_name = 1; - - bool with_subloggers = 2; - } - - // Filters the agents returned by the list operation. - Filter filter = 1; + // The name of the logger tree being requested, "" is the root logger + string root_name = 1; - // An output mask indicating which agent fields are set in the response. - spire.api.types.LoggerMask output_mask = 2; + // Control over whether sub-loggers under the root should be returned + bool with_subloggers = 2; - // The maximum number of results to return. The server may further - // constrain this value, or if zero, choose its own. + // The maximum number of loggers to return. If zero, the server may + // impose its own page size int32 page_size = 3; - // The next_page_token value returned from a previous request, if any. + // The page of partial responses being requested, "" for the first page. string page_token = 4; } message ListLoggersResponse { - // The agents. + // The returned loggers. repeated spire.api.types.Logger loggers = 1; - // The page token for the next request. Empty if there are no more results. - // This field should be checked by clients even when a page_size was not - // requested, since the server may choose its own (see page_size). + // The page of the next page of partial responses, + // "" when returning the last page. string next_page_token = 2; } message GetLoggerRequest { - // Required. The SPIFFE ID of the agent. + // The logger being requested, "" for the root logger string name = 1; - - // An output mask indicating which agent fields are set in the response. - spire.api.types.LoggerMask output_mask = 2; } message AdjustLoggerRequest { - // Required. The SPIFFE ID of the agent. + // The logger being adjusted, "" for the root logger string name = 1; enum LogAdjustment { @@ -91,8 +66,10 @@ message AdjustLoggerRequest { DEFAULT_LEVEL = 7; } + // The new level the logger should assume LogAdjustment log_level = 2; - bool adjust_subloggers = 3; + // Control over whether sub-loggers should also be adjusted + bool include_subloggers = 3; } diff --git a/proto/spire/api/server/logger/v1/logger_grpc.pb.go b/proto/spire/api/server/logger/v1/logger_grpc.pb.go index 5ec0741..3deb677 100644 --- a/proto/spire/api/server/logger/v1/logger_grpc.pb.go +++ b/proto/spire/api/server/logger/v1/logger_grpc.pb.go @@ -19,19 +19,15 @@ const _ = grpc.SupportPackageIsVersion7 // // For semantics around ctx use and closing/ending streaming RPCs, please refer to https://pkg.go.dev/google.golang.org/grpc/?tab=doc#ClientConn.NewStream. type LoggerClient interface { - // Count agents. - // - // The caller must be local or present an admin X509-SVID. - CountLoggers(ctx context.Context, in *CountLoggersRequest, opts ...grpc.CallOption) (*CountLoggersResponse, error) // Lists loggers. // // The caller must be local or present an admin X509-SVID. ListLoggers(ctx context.Context, in *ListLoggersRequest, opts ...grpc.CallOption) (*ListLoggersResponse, error) - // Gets an agent. + // Gets an logger. // // The caller must be local or present an admin X509-SVID. GetLogger(ctx context.Context, in *GetLoggerRequest, opts ...grpc.CallOption) (*types.Logger, error) - // the Issuer AttestAgent RPC. + // Adjusts logger levels. // // The caller must be local or present an admin X509-SVID. AdjustLogger(ctx context.Context, in *AdjustLoggerRequest, opts ...grpc.CallOption) (*emptypb.Empty, error) @@ -45,15 +41,6 @@ func NewLoggerClient(cc grpc.ClientConnInterface) LoggerClient { return &loggerClient{cc} } -func (c *loggerClient) CountLoggers(ctx context.Context, in *CountLoggersRequest, opts ...grpc.CallOption) (*CountLoggersResponse, error) { - out := new(CountLoggersResponse) - err := c.cc.Invoke(ctx, "/spire.api.server.logger.v1.Logger/CountLoggers", in, out, opts...) - if err != nil { - return nil, err - } - return out, nil -} - func (c *loggerClient) ListLoggers(ctx context.Context, in *ListLoggersRequest, opts ...grpc.CallOption) (*ListLoggersResponse, error) { out := new(ListLoggersResponse) err := c.cc.Invoke(ctx, "/spire.api.server.logger.v1.Logger/ListLoggers", in, out, opts...) @@ -85,19 +72,15 @@ func (c *loggerClient) AdjustLogger(ctx context.Context, in *AdjustLoggerRequest // All implementations must embed UnimplementedLoggerServer // for forward compatibility type LoggerServer interface { - // Count agents. - // - // The caller must be local or present an admin X509-SVID. - CountLoggers(context.Context, *CountLoggersRequest) (*CountLoggersResponse, error) // Lists loggers. // // The caller must be local or present an admin X509-SVID. ListLoggers(context.Context, *ListLoggersRequest) (*ListLoggersResponse, error) - // Gets an agent. + // Gets an logger. // // The caller must be local or present an admin X509-SVID. GetLogger(context.Context, *GetLoggerRequest) (*types.Logger, error) - // the Issuer AttestAgent RPC. + // Adjusts logger levels. // // The caller must be local or present an admin X509-SVID. AdjustLogger(context.Context, *AdjustLoggerRequest) (*emptypb.Empty, error) @@ -108,9 +91,6 @@ type LoggerServer interface { type UnimplementedLoggerServer struct { } -func (UnimplementedLoggerServer) CountLoggers(context.Context, *CountLoggersRequest) (*CountLoggersResponse, error) { - return nil, status.Errorf(codes.Unimplemented, "method CountLoggers not implemented") -} func (UnimplementedLoggerServer) ListLoggers(context.Context, *ListLoggersRequest) (*ListLoggersResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method ListLoggers not implemented") } @@ -133,24 +113,6 @@ func RegisterLoggerServer(s grpc.ServiceRegistrar, srv LoggerServer) { s.RegisterService(&_Logger_serviceDesc, srv) } -func _Logger_CountLoggers_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(CountLoggersRequest) - if err := dec(in); err != nil { - return nil, err - } - if interceptor == nil { - return srv.(LoggerServer).CountLoggers(ctx, in) - } - info := &grpc.UnaryServerInfo{ - Server: srv, - FullMethod: "/spire.api.server.logger.v1.Logger/CountLoggers", - } - handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(LoggerServer).CountLoggers(ctx, req.(*CountLoggersRequest)) - } - return interceptor(ctx, in, info, handler) -} - func _Logger_ListLoggers_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { in := new(ListLoggersRequest) if err := dec(in); err != nil { @@ -209,10 +171,6 @@ var _Logger_serviceDesc = grpc.ServiceDesc{ ServiceName: "spire.api.server.logger.v1.Logger", HandlerType: (*LoggerServer)(nil), Methods: []grpc.MethodDesc{ - { - MethodName: "CountLoggers", - Handler: _Logger_CountLoggers_Handler, - }, { MethodName: "ListLoggers", Handler: _Logger_ListLoggers_Handler, diff --git a/proto/spire/api/types/logger.pb.go b/proto/spire/api/types/logger.pb.go index d9fb560..804672e 100644 --- a/proto/spire/api/types/logger.pb.go +++ b/proto/spire/api/types/logger.pb.go @@ -148,63 +148,6 @@ func (x *Logger) GetDefaultLevel() Logger_LogLevel { return Logger_PANIC_LEVEL } -type LoggerMask struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - - // attestation_type field mask - CurrentLevel bool `protobuf:"varint,2,opt,name=current_level,json=currentLevel,proto3" json:"current_level,omitempty"` - // x509svid_serial_number field mask - DefaultLevel bool `protobuf:"varint,3,opt,name=default_level,json=defaultLevel,proto3" json:"default_level,omitempty"` -} - -func (x *LoggerMask) Reset() { - *x = LoggerMask{} - if protoimpl.UnsafeEnabled { - mi := &file_spire_api_types_logger_proto_msgTypes[1] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } -} - -func (x *LoggerMask) String() string { - return protoimpl.X.MessageStringOf(x) -} - -func (*LoggerMask) ProtoMessage() {} - -func (x *LoggerMask) ProtoReflect() protoreflect.Message { - mi := &file_spire_api_types_logger_proto_msgTypes[1] - if protoimpl.UnsafeEnabled && x != nil { - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - if ms.LoadMessageInfo() == nil { - ms.StoreMessageInfo(mi) - } - return ms - } - return mi.MessageOf(x) -} - -// Deprecated: Use LoggerMask.ProtoReflect.Descriptor instead. -func (*LoggerMask) Descriptor() ([]byte, []int) { - return file_spire_api_types_logger_proto_rawDescGZIP(), []int{1} -} - -func (x *LoggerMask) GetCurrentLevel() bool { - if x != nil { - return x.CurrentLevel - } - return false -} - -func (x *LoggerMask) GetDefaultLevel() bool { - if x != nil { - return x.DefaultLevel - } - return false -} - var File_spire_api_types_logger_proto protoreflect.FileDescriptor var file_spire_api_types_logger_proto_rawDesc = []byte{ @@ -231,17 +174,11 @@ var file_spire_api_types_logger_proto_rawDesc = []byte{ 0x41, 0x52, 0x4e, 0x5f, 0x4c, 0x45, 0x56, 0x45, 0x4c, 0x10, 0x03, 0x12, 0x0e, 0x0a, 0x0a, 0x49, 0x4e, 0x46, 0x4f, 0x5f, 0x4c, 0x45, 0x56, 0x45, 0x4c, 0x10, 0x04, 0x12, 0x0f, 0x0a, 0x0b, 0x44, 0x45, 0x42, 0x55, 0x47, 0x5f, 0x4c, 0x45, 0x56, 0x45, 0x4c, 0x10, 0x05, 0x12, 0x0f, 0x0a, 0x0b, - 0x54, 0x52, 0x41, 0x43, 0x45, 0x5f, 0x4c, 0x45, 0x56, 0x45, 0x4c, 0x10, 0x06, 0x22, 0x56, 0x0a, - 0x0a, 0x4c, 0x6f, 0x67, 0x67, 0x65, 0x72, 0x4d, 0x61, 0x73, 0x6b, 0x12, 0x23, 0x0a, 0x0d, 0x63, - 0x75, 0x72, 0x72, 0x65, 0x6e, 0x74, 0x5f, 0x6c, 0x65, 0x76, 0x65, 0x6c, 0x18, 0x02, 0x20, 0x01, - 0x28, 0x08, 0x52, 0x0c, 0x63, 0x75, 0x72, 0x72, 0x65, 0x6e, 0x74, 0x4c, 0x65, 0x76, 0x65, 0x6c, - 0x12, 0x23, 0x0a, 0x0d, 0x64, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x5f, 0x6c, 0x65, 0x76, 0x65, - 0x6c, 0x18, 0x03, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0c, 0x64, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, - 0x4c, 0x65, 0x76, 0x65, 0x6c, 0x42, 0x37, 0x5a, 0x35, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, - 0x63, 0x6f, 0x6d, 0x2f, 0x73, 0x70, 0x69, 0x66, 0x66, 0x65, 0x2f, 0x73, 0x70, 0x69, 0x72, 0x65, - 0x2d, 0x61, 0x70, 0x69, 0x2d, 0x73, 0x64, 0x6b, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x73, - 0x70, 0x69, 0x72, 0x65, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x74, 0x79, 0x70, 0x65, 0x73, 0x62, 0x06, - 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x54, 0x52, 0x41, 0x43, 0x45, 0x5f, 0x4c, 0x45, 0x56, 0x45, 0x4c, 0x10, 0x06, 0x42, 0x37, 0x5a, + 0x35, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x73, 0x70, 0x69, 0x66, + 0x66, 0x65, 0x2f, 0x73, 0x70, 0x69, 0x72, 0x65, 0x2d, 0x61, 0x70, 0x69, 0x2d, 0x73, 0x64, 0x6b, + 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x73, 0x70, 0x69, 0x72, 0x65, 0x2f, 0x61, 0x70, 0x69, + 0x2f, 0x74, 0x79, 0x70, 0x65, 0x73, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( @@ -257,11 +194,10 @@ func file_spire_api_types_logger_proto_rawDescGZIP() []byte { } var file_spire_api_types_logger_proto_enumTypes = make([]protoimpl.EnumInfo, 1) -var file_spire_api_types_logger_proto_msgTypes = make([]protoimpl.MessageInfo, 2) +var file_spire_api_types_logger_proto_msgTypes = make([]protoimpl.MessageInfo, 1) var file_spire_api_types_logger_proto_goTypes = []interface{}{ (Logger_LogLevel)(0), // 0: spire.api.types.Logger.LogLevel (*Logger)(nil), // 1: spire.api.types.Logger - (*LoggerMask)(nil), // 2: spire.api.types.LoggerMask } var file_spire_api_types_logger_proto_depIdxs = []int32{ 0, // 0: spire.api.types.Logger.current_level:type_name -> spire.api.types.Logger.LogLevel @@ -291,18 +227,6 @@ func file_spire_api_types_logger_proto_init() { return nil } } - file_spire_api_types_logger_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*LoggerMask); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } } type x struct{} out := protoimpl.TypeBuilder{ @@ -310,7 +234,7 @@ func file_spire_api_types_logger_proto_init() { GoPackagePath: reflect.TypeOf(x{}).PkgPath(), RawDescriptor: file_spire_api_types_logger_proto_rawDesc, NumEnums: 1, - NumMessages: 2, + NumMessages: 1, NumExtensions: 0, NumServices: 0, }, diff --git a/proto/spire/api/types/logger.proto b/proto/spire/api/types/logger.proto index b53aed9..49cd72e 100644 --- a/proto/spire/api/types/logger.proto +++ b/proto/spire/api/types/logger.proto @@ -24,10 +24,3 @@ message Logger { LogLevel default_level = 3; } -message LoggerMask { - // attestation_type field mask - bool current_level = 2; - - // x509svid_serial_number field mask - bool default_level = 3; -}