treewide: Fix RPC_REQUEST_STANDARD_NAME and RPC_RESPONSE_STANDARD_NAME
Change-Id: I190ade92c04313961edd4787196568216d028ba8
Reviewed-on: https://review.monogon.dev/c/monogon/+/3818
Tested-by: Jenkins CI
Reviewed-by: Lorenz Brun <lorenz@monogon.tech>
diff --git a/metropolis/cli/dbg/main.go b/metropolis/cli/dbg/main.go
index 1845ad1..4a3d32e 100644
--- a/metropolis/cli/dbg/main.go
+++ b/metropolis/cli/dbg/main.go
@@ -77,24 +77,24 @@
case "logs":
logsCmd.Parse(os.Args[2:])
dn := logsCmd.Arg(0)
- req := &apb.GetLogsRequest{
+ req := &apb.LogsRequest{
Dn: dn,
- BacklogMode: apb.GetLogsRequest_BACKLOG_MODE_DISABLE,
- StreamMode: apb.GetLogsRequest_STREAM_MODE_DISABLE,
+ BacklogMode: apb.LogsRequest_BACKLOG_MODE_DISABLE,
+ StreamMode: apb.LogsRequest_STREAM_MODE_DISABLE,
Filters: nil,
}
switch *logsTailN {
case 0:
case -1:
- req.BacklogMode = apb.GetLogsRequest_BACKLOG_MODE_ALL
+ req.BacklogMode = apb.LogsRequest_BACKLOG_MODE_ALL
default:
- req.BacklogMode = apb.GetLogsRequest_BACKLOG_MODE_COUNT
+ req.BacklogMode = apb.LogsRequest_BACKLOG_MODE_COUNT
req.BacklogCount = int64(*logsTailN)
}
if *logsStream {
- req.StreamMode = apb.GetLogsRequest_STREAM_MODE_UNBUFFERED
+ req.StreamMode = apb.LogsRequest_STREAM_MODE_UNBUFFERED
}
if *logsRecursive {
@@ -103,7 +103,7 @@
})
}
- stream, err := debugClient.GetLogs(ctx, req)
+ stream, err := debugClient.Logs(ctx, req)
if err != nil {
fmt.Fprintf(os.Stderr, "Failed to get logs: %v\n", err)
os.Exit(1)
diff --git a/metropolis/cli/metroctl/cmd_node_logs.go b/metropolis/cli/metroctl/cmd_node_logs.go
index 36ccd00..5baf2f6 100644
--- a/metropolis/cli/metroctl/cmd_node_logs.go
+++ b/metropolis/cli/metroctl/cmd_node_logs.go
@@ -97,9 +97,9 @@
}
nmgmt := api.NewNodeManagementClient(cl)
- streamMode := api.GetLogsRequest_STREAM_MODE_DISABLE
+ streamMode := api.LogsRequest_STREAM_MODE_DISABLE
if logFlags.follow {
- streamMode = api.GetLogsRequest_STREAM_MODE_UNBUFFERED
+ streamMode = api.LogsRequest_STREAM_MODE_UNBUFFERED
}
var filters []*cpb.LogFilter
if !logFlags.exact {
@@ -109,17 +109,17 @@
},
})
}
- backlogMode := api.GetLogsRequest_BACKLOG_MODE_ALL
+ backlogMode := api.LogsRequest_BACKLOG_MODE_ALL
var backlogCount int64
switch {
case logFlags.backlog > 0:
- backlogMode = api.GetLogsRequest_BACKLOG_MODE_COUNT
+ backlogMode = api.LogsRequest_BACKLOG_MODE_COUNT
backlogCount = int64(logFlags.backlog)
case logFlags.backlog == 0:
- backlogMode = api.GetLogsRequest_BACKLOG_MODE_DISABLE
+ backlogMode = api.LogsRequest_BACKLOG_MODE_DISABLE
}
- srv, err := nmgmt.Logs(ctx, &api.GetLogsRequest{
+ srv, err := nmgmt.Logs(ctx, &api.LogsRequest{
Dn: logFlags.dn,
BacklogMode: backlogMode,
BacklogCount: backlogCount,