Fix all golangci-lint issues (closes #32) #51
@ -382,22 +382,22 @@ func (h *Handlers) HandleAppDeployments() http.HandlerFunc {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// defaultLogTail is the default number of log lines to fetch.
|
// DefaultLogTail is the default number of log lines to fetch.
|
||||||
const defaultLogTail = "500"
|
const DefaultLogTail = "500"
|
||||||
|
|
||||||
// maxLogTail is the maximum allowed value for the tail parameter.
|
// maxLogTail is the maximum allowed value for the tail parameter.
|
||||||
const maxLogTail = 500
|
const maxLogTail = 500
|
||||||
|
|
||||||
// sanitizeTail validates and clamps the tail query parameter.
|
// SanitizeTail validates and clamps the tail query parameter.
|
||||||
// It returns a numeric string clamped to maxLogTail, or the default if invalid.
|
// It returns a numeric string clamped to maxLogTail, or the default if invalid.
|
||||||
func sanitizeTail(raw string) string {
|
func SanitizeTail(raw string) string {
|
||||||
if raw == "" {
|
if raw == "" {
|
||||||
return defaultLogTail
|
return DefaultLogTail
|
||||||
}
|
}
|
||||||
|
|
||||||
n, err := strconv.Atoi(raw)
|
n, err := strconv.Atoi(raw)
|
||||||
if err != nil || n < 1 {
|
if err != nil || n < 1 {
|
||||||
return defaultLogTail
|
return DefaultLogTail
|
||||||
}
|
}
|
||||||
|
|
||||||
if n > maxLogTail {
|
if n > maxLogTail {
|
||||||
@ -428,7 +428,7 @@ func (h *Handlers) HandleAppLogs() http.HandlerFunc {
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
tail := sanitizeTail(request.URL.Query().Get("tail"))
|
tail := SanitizeTail(request.URL.Query().Get("tail"))
|
||||||
|
|
||||||
logs, logsErr := h.docker.ContainerLogs(
|
logs, logsErr := h.docker.ContainerLogs(
|
||||||
request.Context(),
|
request.Context(),
|
||||||
|
|||||||
@ -1,9 +0,0 @@
|
|||||||
package handlers
|
|
||||||
|
|
||||||
// ExportedSanitizeTail wraps sanitizeTail for external tests.
|
|
||||||
func ExportedSanitizeTail(input string) string {
|
|
||||||
return sanitizeTail(input)
|
|
||||||
}
|
|
||||||
|
|
||||||
// ExportedDefaultLogTail exports defaultLogTail for external tests.
|
|
||||||
const ExportedDefaultLogTail = defaultLogTail
|
|
||||||
@ -14,16 +14,16 @@ func TestSanitizeTail(t *testing.T) {
|
|||||||
input string
|
input string
|
||||||
expected string
|
expected string
|
||||||
}{
|
}{
|
||||||
{"empty uses default", "", handlers.ExportedDefaultLogTail},
|
{"empty uses default", "", handlers.DefaultLogTail},
|
||||||
{"valid small number", "50", "50"},
|
{"valid small number", "50", "50"},
|
||||||
{"valid max boundary", "500", "500"},
|
{"valid max boundary", "500", "500"},
|
||||||
{"exceeds max clamped", "501", "500"},
|
{"exceeds max clamped", "501", "500"},
|
||||||
{"very large clamped", "999999", "500"},
|
{"very large clamped", "999999", "500"},
|
||||||
{"non-numeric uses default", "abc", handlers.ExportedDefaultLogTail},
|
{"non-numeric uses default", "abc", handlers.DefaultLogTail},
|
||||||
{"all keyword uses default", "all", handlers.ExportedDefaultLogTail},
|
{"all keyword uses default", "all", handlers.DefaultLogTail},
|
||||||
{"negative uses default", "-1", handlers.ExportedDefaultLogTail},
|
{"negative uses default", "-1", handlers.DefaultLogTail},
|
||||||
{"zero uses default", "0", handlers.ExportedDefaultLogTail},
|
{"zero uses default", "0", handlers.DefaultLogTail},
|
||||||
{"float uses default", "1.5", handlers.ExportedDefaultLogTail},
|
{"float uses default", "1.5", handlers.DefaultLogTail},
|
||||||
{"one is valid", "1", "1"},
|
{"one is valid", "1", "1"},
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -31,7 +31,7 @@ func TestSanitizeTail(t *testing.T) {
|
|||||||
t.Run(tc.name, func(t *testing.T) {
|
t.Run(tc.name, func(t *testing.T) {
|
||||||
t.Parallel()
|
t.Parallel()
|
||||||
|
|
||||||
got := handlers.ExportedSanitizeTail(tc.input)
|
got := handlers.SanitizeTail(tc.input)
|
||||||
if got != tc.expected {
|
if got != tc.expected {
|
||||||
t.Errorf("sanitizeTail(%q) = %q, want %q", tc.input, got, tc.expected)
|
t.Errorf("sanitizeTail(%q) = %q, want %q", tc.input, got, tc.expected)
|
||||||
}
|
}
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user