Skip to content

Commit 997edc8

Browse files
authored
Add new enums.LogLevel to indicate skaffold's standard output (#6507)
* add new log level to indicate skaffold's standard output * fix description of new log level
1 parent da9ffe3 commit 997edc8

File tree

7 files changed

+218
-208
lines changed

7 files changed

+218
-208
lines changed

docs/content/en/docs/references/api/grpc.md

+1
Original file line numberDiff line numberDiff line change
@@ -862,6 +862,7 @@ Enum indicating the log level of a line of output
862862
| FATAL | 4 | Fatal Level |
863863
| PANIC | 5 | Panic Level |
864864
| TRACE | 6 | Trace Level |
865+
| STANDARD | 7 | User-visible output level |
865866

866867

867868

pkg/skaffold/event/v2/logger.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ func (l logger) Write(p []byte) (int, error) {
4444
handler.handleSkaffoldLogEvent(&proto.SkaffoldLogEvent{
4545
TaskId: fmt.Sprintf("%s-%d", l.Phase, handler.iteration),
4646
SubtaskId: l.SubtaskID,
47-
Level: -1,
47+
Level: enums.LogLevel_STANDARD,
4848
Message: string(p),
4949
})
5050

pkg/skaffold/event/v2/status_check.go

+3-2
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ import (
2020
"fmt"
2121

2222
"github.com/GoogleContainerTools/skaffold/pkg/skaffold/constants"
23+
"github.com/GoogleContainerTools/skaffold/proto/enums"
2324
proto "github.com/GoogleContainerTools/skaffold/proto/v2"
2425
)
2526

@@ -37,7 +38,7 @@ func ResourceStatusCheckEventCompletedMessage(r string, message string, ae proto
3738
TaskId: fmt.Sprintf("%s-%d", constants.Deploy, handler.iteration),
3839
SubtaskId: r,
3940
Message: message,
40-
Level: -1,
41+
Level: enums.LogLevel_STANDARD,
4142
})
4243
}
4344

@@ -81,7 +82,7 @@ func ResourceStatusCheckEventUpdatedMessage(r string, message string, ae proto.A
8182
TaskId: fmt.Sprintf("%s-%d", constants.Deploy, handler.iteration),
8283
SubtaskId: r,
8384
Message: fmt.Sprintf("%s %s\n", message, ae.Message),
84-
Level: -1,
85+
Level: enums.LogLevel_STANDARD,
8586
})
8687
}
8788

proto/enums/enums.pb.go

+209-205
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

proto/enums/enums.proto

+2
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,8 @@ enum LogLevel {
9999
PANIC = 5;
100100
// Trace Level
101101
TRACE = 6;
102+
// User-visible output level
103+
STANDARD = 7;
102104
}
103105

104106
// Enum for Status codes<br>

proto/v1/skaffold.pb.go

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

proto/v2/skaffold.pb.go

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)