treewide: Fix ENUM_VALUE_PREFIX rule exception
Change-Id: Ibc2fd66711f6aa347e88e2379c12db1898373700
Reviewed-on: https://review.monogon.dev/c/monogon/+/3804
Tested-by: Jenkins CI
Reviewed-by: Leopold Schabel <leo@monogon.tech>
diff --git a/metropolis/node/core/mgmt/power.go b/metropolis/node/core/mgmt/power.go
index 05a5649..9273ab3 100644
--- a/metropolis/node/core/mgmt/power.go
+++ b/metropolis/node/core/mgmt/power.go
@@ -19,23 +19,23 @@
// Do not yet perform any system-wide actions here as the request might
// still get rejected. There is another switch statement for that below.
switch req.Type {
- case apb.RebootRequest_KEXEC:
+ case apb.RebootRequest_TYPE_KEXEC:
method = unix.LINUX_REBOOT_CMD_KEXEC
- case apb.RebootRequest_FIRMWARE:
+ case apb.RebootRequest_TYPE_FIRMWARE:
method = unix.LINUX_REBOOT_CMD_RESTART
- case apb.RebootRequest_POWER_OFF:
+ case apb.RebootRequest_TYPE_POWER_OFF:
method = unix.LINUX_REBOOT_CMD_POWER_OFF
default:
return nil, status.Error(codes.Unimplemented, "unimplemented type value")
}
switch req.NextBoot {
- case apb.RebootRequest_START_NORMAL:
- case apb.RebootRequest_START_ROLLBACK:
+ case apb.RebootRequest_NEXT_BOOT_START_NORMAL:
+ case apb.RebootRequest_NEXT_BOOT_START_ROLLBACK:
if err := s.UpdateService.Rollback(); err != nil {
return nil, status.Errorf(codes.Unavailable, "performing rollback failed: %v", err)
}
- case apb.RebootRequest_START_FIRMWARE_UI:
- if req.Type == apb.RebootRequest_KEXEC {
+ case apb.RebootRequest_NEXT_BOOT_START_FIRMWARE_UI:
+ if req.Type == apb.RebootRequest_TYPE_KEXEC {
return nil, status.Error(codes.InvalidArgument, "START_FIRMWARE_UI cannot be used with KEXEC type")
}
supp, err := efivarfs.OSIndicationsSupported()
@@ -50,11 +50,11 @@
}
switch req.Type {
- case apb.RebootRequest_KEXEC:
+ case apb.RebootRequest_TYPE_KEXEC:
if err := s.UpdateService.KexecLoadNext(); err != nil {
return nil, status.Errorf(codes.Unavailable, "failed to stage kexec kernel: %v", err)
}
- case apb.RebootRequest_FIRMWARE:
+ case apb.RebootRequest_TYPE_FIRMWARE:
// Best-effort, if it fails this will still be a firmware reboot.
os.WriteFile("/sys/kernel/reboot/mode", []byte("cold"), 0644)
}
diff --git a/metropolis/node/core/mgmt/svc_logs.go b/metropolis/node/core/mgmt/svc_logs.go
index ef5c1d7..6e27bf8 100644
--- a/metropolis/node/core/mgmt/svc_logs.go
+++ b/metropolis/node/core/mgmt/svc_logs.go
@@ -77,10 +77,10 @@
// Turn backlog mode into logtree option(s).
switch req.BacklogMode {
- case api.GetLogsRequest_BACKLOG_DISABLE:
- case api.GetLogsRequest_BACKLOG_ALL:
+ case api.GetLogsRequest_BACKLOG_MODE_DISABLE:
+ case api.GetLogsRequest_BACKLOG_MODE_ALL:
options = append(options, logtree.WithBacklog(logtree.BacklogAllAvailable))
- case api.GetLogsRequest_BACKLOG_COUNT:
+ case api.GetLogsRequest_BACKLOG_MODE_COUNT:
count := int(req.BacklogCount)
if count <= 0 {
return status.Errorf(codes.InvalidArgument, "backlog_count must be > 0 if backlog_mode is BACKLOG_COUNT")
@@ -93,8 +93,8 @@
// Turn stream mode into logtree option(s).
streamEnable := false
switch req.StreamMode {
- case api.GetLogsRequest_STREAM_DISABLE:
- case api.GetLogsRequest_STREAM_UNBUFFERED:
+ case api.GetLogsRequest_STREAM_MODE_DISABLE:
+ case api.GetLogsRequest_STREAM_MODE_UNBUFFERED:
streamEnable = true
options = append(options, logtree.WithStream())
}
diff --git a/metropolis/node/core/mgmt/svc_logs_test.go b/metropolis/node/core/mgmt/svc_logs_test.go
index dec1459..e91d2a3 100644
--- a/metropolis/node/core/mgmt/svc_logs_test.go
+++ b/metropolis/node/core/mgmt/svc_logs_test.go
@@ -75,11 +75,11 @@
var sev lpb.LeveledLogSeverity
switch severity {
case "i":
- sev = lpb.LeveledLogSeverity_INFO
+ sev = lpb.LeveledLogSeverity_LEVELED_LOG_SEVERITY_INFO
case "w":
- sev = lpb.LeveledLogSeverity_WARNING
+ sev = lpb.LeveledLogSeverity_LEVELED_LOG_SEVERITY_WARNING
case "e":
- sev = lpb.LeveledLogSeverity_ERROR
+ sev = lpb.LeveledLogSeverity_LEVELED_LOG_SEVERITY_ERROR
}
return &lpb.LogEntry{
Dn: dn, Kind: &lpb.LogEntry_Leveled_{
@@ -130,18 +130,18 @@
var backlogCount int64
switch {
case backlog < 0:
- backlogMode = api.GetLogsRequest_BACKLOG_ALL
+ backlogMode = api.GetLogsRequest_BACKLOG_MODE_ALL
case backlog > 0:
- backlogMode = api.GetLogsRequest_BACKLOG_COUNT
+ backlogMode = api.GetLogsRequest_BACKLOG_MODE_COUNT
backlogCount = backlog
case backlog == 0:
- backlogMode = api.GetLogsRequest_BACKLOG_DISABLE
+ backlogMode = api.GetLogsRequest_BACKLOG_MODE_DISABLE
}
return &api.GetLogsRequest{
Dn: dn,
BacklogMode: backlogMode,
BacklogCount: backlogCount,
- StreamMode: api.GetLogsRequest_STREAM_DISABLE,
+ StreamMode: api.GetLogsRequest_STREAM_MODE_DISABLE,
}
}
mkRecursive := func(in *api.GetLogsRequest) *api.GetLogsRequest {
@@ -220,8 +220,8 @@
mgmt := api.NewNodeManagementClient(cl)
srv, err := mgmt.Logs(ctx, &api.GetLogsRequest{
Dn: "",
- BacklogMode: api.GetLogsRequest_BACKLOG_ALL,
- StreamMode: api.GetLogsRequest_STREAM_UNBUFFERED,
+ BacklogMode: api.GetLogsRequest_BACKLOG_MODE_ALL,
+ StreamMode: api.GetLogsRequest_STREAM_MODE_UNBUFFERED,
Filters: []*cpb.LogFilter{
{
Filter: &cpb.LogFilter_WithChildren_{
@@ -299,13 +299,13 @@
{
req: &api.GetLogsRequest{
Dn: "main",
- BacklogMode: api.GetLogsRequest_BACKLOG_ALL,
- StreamMode: api.GetLogsRequest_STREAM_DISABLE,
+ BacklogMode: api.GetLogsRequest_BACKLOG_MODE_ALL,
+ StreamMode: api.GetLogsRequest_STREAM_MODE_DISABLE,
Filters: []*cpb.LogFilter{
{
Filter: &cpb.LogFilter_LeveledWithMinimumSeverity_{
LeveledWithMinimumSeverity: &cpb.LogFilter_LeveledWithMinimumSeverity{
- Minimum: lpb.LeveledLogSeverity_WARNING,
+ Minimum: lpb.LeveledLogSeverity_LEVELED_LOG_SEVERITY_WARNING,
},
},
},
@@ -320,8 +320,8 @@
{
req: &api.GetLogsRequest{
Dn: "main",
- BacklogMode: api.GetLogsRequest_BACKLOG_ALL,
- StreamMode: api.GetLogsRequest_STREAM_DISABLE,
+ BacklogMode: api.GetLogsRequest_BACKLOG_MODE_ALL,
+ StreamMode: api.GetLogsRequest_STREAM_MODE_DISABLE,
Filters: []*cpb.LogFilter{
{
Filter: &cpb.LogFilter_OnlyRaw_{
@@ -338,8 +338,8 @@
{
req: &api.GetLogsRequest{
Dn: "main",
- BacklogMode: api.GetLogsRequest_BACKLOG_ALL,
- StreamMode: api.GetLogsRequest_STREAM_DISABLE,
+ BacklogMode: api.GetLogsRequest_BACKLOG_MODE_ALL,
+ StreamMode: api.GetLogsRequest_STREAM_MODE_DISABLE,
Filters: []*cpb.LogFilter{
{
Filter: &cpb.LogFilter_OnlyLeveled_{
diff --git a/metropolis/node/core/mgmt/update.go b/metropolis/node/core/mgmt/update.go
index eb838dd..6a7e13e 100644
--- a/metropolis/node/core/mgmt/update.go
+++ b/metropolis/node/core/mgmt/update.go
@@ -17,16 +17,16 @@
} else {
return nil, status.Error(codes.Aborted, "another UpdateNode RPC is in progress on this node")
}
- if req.ActivationMode == apb.ActivationMode_ACTIVATION_INVALID {
+ if req.ActivationMode == apb.ActivationMode_ACTIVATION_MODE_INVALID {
return nil, status.Errorf(codes.InvalidArgument, "activation_mode needs to be explicitly specified")
}
- if err := s.UpdateService.InstallBundle(ctx, req.BundleUrl, req.ActivationMode == apb.ActivationMode_ACTIVATION_KEXEC); err != nil {
+ if err := s.UpdateService.InstallBundle(ctx, req.BundleUrl, req.ActivationMode == apb.ActivationMode_ACTIVATION_MODE_KEXEC); err != nil {
return nil, status.Errorf(codes.Unavailable, "error installing update: %v", err)
}
- if req.ActivationMode != apb.ActivationMode_ACTIVATION_NONE {
+ if req.ActivationMode != apb.ActivationMode_ACTIVATION_MODE_NONE {
methodString, method := "reboot", unix.LINUX_REBOOT_CMD_RESTART
- if req.ActivationMode == apb.ActivationMode_ACTIVATION_KEXEC {
+ if req.ActivationMode == apb.ActivationMode_ACTIVATION_MODE_KEXEC {
methodString = "kexec"
method = unix.LINUX_REBOOT_CMD_KEXEC
}