commit da11486352f2aaccfa271a8aaf06a3bef09b0a3a
author Serge Bazanski <serge@monogon.tech> Wed Mar 29 17:46:42 2023 +0200
committer Serge Bazanski <serge@monogon.tech> Thu Mar 30 14:19:03 2023 +0000
tree c5a4f5488061d4c0a8660014bc4f4838361ee4aa
parent bc7397214147701d6e70141ff70bf6e84f9aab62

metropolis/proto: move log-related types to common

Having them in API is kinda weird, especially as we're
generating/parsing them from a few libraries already.

Change-Id: I87b4b51f151443c60b87e3e50753c395fcf6e845
Reviewed-on: https://review.monogon.dev/c/monogon/+/1437
Tested-by: Jenkins CI
Reviewed-by: Lorenz Brun <lorenz@monogon.tech>

metropolis/node/core/BUILD.bazel

diff --git a/metropolis/node/core/BUILD.bazel b/metropolis/node/core/BUILD.bazel
index 37897e5..281266b 100644
--- a/metropolis/node/core/BUILD.bazel
+++ b/metropolis/node/core/BUILD.bazel
@@ -35,6 +35,7 @@
         "//metropolis/pkg/supervisor",
         "//metropolis/pkg/tpm",
         "//metropolis/proto/api",
+        "//metropolis/proto/common",
         "@com_github_containerd_containerd//:containerd",
         "@com_github_containerd_containerd//namespaces",
         "@org_golang_google_grpc//:go_default_library",

metropolis/node/core/debug_service_enabled.go

diff --git a/metropolis/node/core/debug_service_enabled.go b/metropolis/node/core/debug_service_enabled.go
index fc77edb..3494270 100644
--- a/metropolis/node/core/debug_service_enabled.go
+++ b/metropolis/node/core/debug_service_enabled.go
@@ -37,6 +37,7 @@
 	"source.monogon.dev/metropolis/pkg/logtree"
 	"source.monogon.dev/metropolis/pkg/supervisor"
 	apb "source.monogon.dev/metropolis/proto/api"
+	cpb "source.monogon.dev/metropolis/proto/common"
 )
 
 const (
@@ -139,13 +140,13 @@
 	// Parse proto filters into logtree options.
 	for i, filter := range req.Filters {
 		switch inner := filter.Filter.(type) {
-		case *apb.LogFilter_WithChildren_:
+		case *cpb.LogFilter_WithChildren_:
 			options = append(options, logtree.WithChildren())
-		case *apb.LogFilter_OnlyRaw_:
+		case *cpb.LogFilter_OnlyRaw_:
 			options = append(options, logtree.OnlyRaw())
-		case *apb.LogFilter_OnlyLeveled_:
+		case *cpb.LogFilter_OnlyLeveled_:
 			options = append(options, logtree.OnlyLeveled())
-		case *apb.LogFilter_LeveledWithMinimumSeverity_:
+		case *cpb.LogFilter_LeveledWithMinimumSeverity_:
 			severity, err := logtree.SeverityFromProto(inner.LeveledWithMinimumSeverity.Minimum)
 			if err != nil {
 				return status.Errorf(codes.InvalidArgument, "filter %d has invalid severity: %v", i, err)
@@ -179,7 +180,7 @@
 	maxChunkSize := 2000
 
 	// Serve all backlog entries in chunks.
-	chunk := make([]*apb.LogEntry, 0, maxChunkSize)
+	chunk := make([]*cpb.LogEntry, 0, maxChunkSize)
 	for _, entry := range reader.Backlog {
 		p := entry.Proto()
 		if p == nil {
@@ -195,7 +196,7 @@
 			if err != nil {
 				return err
 			}
-			chunk = make([]*apb.LogEntry, 0, maxChunkSize)
+			chunk = make([]*cpb.LogEntry, 0, maxChunkSize)
 		}
 	}
 
@@ -207,7 +208,7 @@
 		if err != nil {
 			return err
 		}
-		chunk = make([]*apb.LogEntry, 0, maxChunkSize)
+		chunk = make([]*cpb.LogEntry, 0, maxChunkSize)
 	}
 
 	// Start serving streaming data, if streaming has been requested.
@@ -227,7 +228,7 @@
 			continue
 		}
 		err := srv.Send(&apb.GetLogsResponse{
-			StreamEntries: []*apb.LogEntry{p},
+			StreamEntries: []*cpb.LogEntry{p},
 		})
 		if err != nil {
 			return err