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/osbase/logtree/leveled.go b/osbase/logtree/leveled.go
index 701d8d0..0ca6e48 100644
--- a/osbase/logtree/leveled.go
+++ b/osbase/logtree/leveled.go
@@ -25,13 +25,13 @@
func SeverityFromProto(s lpb.LeveledLogSeverity) (logging.Severity, error) {
switch s {
- case lpb.LeveledLogSeverity_INFO:
+ case lpb.LeveledLogSeverity_LEVELED_LOG_SEVERITY_INFO:
return logging.INFO, nil
- case lpb.LeveledLogSeverity_WARNING:
+ case lpb.LeveledLogSeverity_LEVELED_LOG_SEVERITY_WARNING:
return logging.WARNING, nil
- case lpb.LeveledLogSeverity_ERROR:
+ case lpb.LeveledLogSeverity_LEVELED_LOG_SEVERITY_ERROR:
return logging.ERROR, nil
- case lpb.LeveledLogSeverity_FATAL:
+ case lpb.LeveledLogSeverity_LEVELED_LOG_SEVERITY_FATAL:
return logging.FATAL, nil
default:
return "", fmt.Errorf("unknown severity value %d", s)
@@ -41,14 +41,14 @@
func SeverityToProto(s logging.Severity) lpb.LeveledLogSeverity {
switch s {
case logging.INFO:
- return lpb.LeveledLogSeverity_INFO
+ return lpb.LeveledLogSeverity_LEVELED_LOG_SEVERITY_INFO
case logging.WARNING:
- return lpb.LeveledLogSeverity_WARNING
+ return lpb.LeveledLogSeverity_LEVELED_LOG_SEVERITY_WARNING
case logging.ERROR:
- return lpb.LeveledLogSeverity_ERROR
+ return lpb.LeveledLogSeverity_LEVELED_LOG_SEVERITY_ERROR
case logging.FATAL:
- return lpb.LeveledLogSeverity_FATAL
+ return lpb.LeveledLogSeverity_LEVELED_LOG_SEVERITY_FATAL
default:
- return lpb.LeveledLogSeverity_INVALID
+ return lpb.LeveledLogSeverity_LEVELED_LOG_SEVERITY_INVALID
}
}
diff --git a/osbase/logtree/proto/BUILD.bazel b/osbase/logtree/proto/BUILD.bazel
index b7b76d4..9a87f5c 100644
--- a/osbase/logtree/proto/BUILD.bazel
+++ b/osbase/logtree/proto/BUILD.bazel
@@ -7,7 +7,6 @@
name = "proto_proto_lint_test",
except_rules = [
"PACKAGE_VERSION_SUFFIX",
- "ENUM_VALUE_PREFIX", # TODO: evaluate correctness
"ENUM_ZERO_VALUE_SUFFIX", # TODO: evaluate correctness
],
protos = [":proto_proto"],
diff --git a/osbase/logtree/proto/logtree.proto b/osbase/logtree/proto/logtree.proto
index fb80a71..ce905cc 100644
--- a/osbase/logtree/proto/logtree.proto
+++ b/osbase/logtree/proto/logtree.proto
@@ -22,11 +22,11 @@
// Severity level corresponding to //osbase/logtree.Severity.
enum LeveledLogSeverity {
- INVALID = 0;
- INFO = 1;
- WARNING = 2;
- ERROR = 3;
- FATAL = 4;
+ LEVELED_LOG_SEVERITY_INVALID = 0;
+ LEVELED_LOG_SEVERITY_INFO = 1;
+ LEVELED_LOG_SEVERITY_WARNING = 2;
+ LEVELED_LOG_SEVERITY_ERROR = 3;
+ LEVELED_LOG_SEVERITY_FATAL = 4;
}
// LogEntry corresponding to logtree.LogEntry in //osbase/logtree.