metropolis/pkg/logtree: move logtree protobuf definition to logtree pkg
Before this change we had the LogEntry message inside the metropolis
common proto file. This splits it out into the logtree package to make
it standalone in a future change.
Change-Id: Idb26a829d6174efa946a6c4ce0f1b984cb2f18a2
Reviewed-on: https://review.monogon.dev/c/monogon/+/3080
Tested-by: Jenkins CI
Reviewed-by: Serge Bazanski <serge@monogon.tech>
diff --git a/metropolis/pkg/logtree/logtree_entry.go b/metropolis/pkg/logtree/logtree_entry.go
index 6bd8752..d1c700e 100644
--- a/metropolis/pkg/logtree/logtree_entry.go
+++ b/metropolis/pkg/logtree/logtree_entry.go
@@ -23,7 +23,7 @@
"github.com/mitchellh/go-wordwrap"
"source.monogon.dev/metropolis/pkg/logbuffer"
- cpb "source.monogon.dev/metropolis/proto/common"
+ lpb "source.monogon.dev/metropolis/pkg/logtree/proto"
)
// LogEntry contains a log entry, combining both leveled and raw logging into a
@@ -207,19 +207,19 @@
// Proto converts this LogEntry to proto. Returned value may be nil if given
// LogEntry is invalid, eg. contains neither a Raw nor Leveled entry.
-func (l *LogEntry) Proto() *cpb.LogEntry {
- p := &cpb.LogEntry{
+func (l *LogEntry) Proto() *lpb.LogEntry {
+ p := &lpb.LogEntry{
Dn: string(l.DN),
}
switch {
case l.Leveled != nil:
leveled := l.Leveled
- p.Kind = &cpb.LogEntry_Leveled_{
+ p.Kind = &lpb.LogEntry_Leveled_{
Leveled: leveled.Proto(),
}
case l.Raw != nil:
raw := l.Raw
- p.Kind = &cpb.LogEntry_Raw_{
+ p.Kind = &lpb.LogEntry_Raw_{
Raw: raw.ProtoLog(),
}
default:
@@ -231,7 +231,7 @@
// LogEntryFromProto parses a proto LogEntry back into internal structure.
// This can be used in log proto API consumers to easily print received log
// entries.
-func LogEntryFromProto(l *cpb.LogEntry) (*LogEntry, error) {
+func LogEntryFromProto(l *lpb.LogEntry) (*LogEntry, error) {
dn := DN(l.Dn)
if _, err := dn.Path(); err != nil {
return nil, fmt.Errorf("could not convert DN: %w", err)
@@ -240,13 +240,13 @@
DN: dn,
}
switch inner := l.Kind.(type) {
- case *cpb.LogEntry_Leveled_:
+ case *lpb.LogEntry_Leveled_:
leveled, err := LeveledPayloadFromProto(inner.Leveled)
if err != nil {
return nil, fmt.Errorf("could not convert leveled entry: %w", err)
}
res.Leveled = leveled
- case *cpb.LogEntry_Raw_:
+ case *lpb.LogEntry_Raw_:
line, err := logbuffer.LineFromLogProto(inner.Raw)
if err != nil {
return nil, fmt.Errorf("could not convert raw entry: %w", err)