github/zot
1
0
Fork 0
mirror of https://github.com/project-zot/zot.git synced 2026-06-16 04:17:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

lint: upgrade golangci-lint

Browse Source 
Signed-off-by: Ramkumar Chinchani <rchincha@cisco.com>
This commit is contained in:
Ramkumar Chinchani
2021-12-13 19:23:31 +00:00
committed by Ravi Chamarthy
parent 5f04092e71
commit ac3801ea2d
71 changed files with 3038 additions and 2575 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/log/log.go
+6 -4
View File
@@ -10,6 +10,8 @@ import (
"github.com/rs/zerolog"
)
const defaultPerms = 0o0600
// Logger extends zerolog's Logger.
type Logger struct {
zerolog.Logger
@@ -21,8 +23,8 @@ func (l Logger) Println(v ...interface{}) {
func NewLogger(level string, output string) Logger {
zerolog.TimeFieldFormat = time.RFC3339Nano
lvl, err := zerolog.ParseLevel(level)
lvl, err := zerolog.ParseLevel(level)
if err != nil {
panic(err)
}
@@ -34,7 +36,7 @@ func NewLogger(level string, output string) Logger {
if output == "" {
log = zerolog.New(os.Stdout)
} else {
file, err := os.OpenFile(output, os.O_APPEND|os.O_WRONLY|os.O_CREATE, 0600)
file, err := os.OpenFile(output, os.O_APPEND|os.O_WRONLY|os.O_CREATE, defaultPerms)
if err != nil {
panic(err)
}
@@ -46,8 +48,8 @@ func NewLogger(level string, output string) Logger {
func NewAuditLogger(level string, audit string) *Logger {
zerolog.TimeFieldFormat = time.RFC3339Nano
lvl, err := zerolog.ParseLevel(level)
lvl, err := zerolog.ParseLevel(level)
if err != nil {
panic(err)
}
@@ -56,7 +58,7 @@ func NewAuditLogger(level string, audit string) *Logger {
var auditLog zerolog.Logger
auditFile, err := os.OpenFile(audit, os.O_APPEND|os.O_WRONLY|os.O_CREATE, 0600)
auditFile, err := os.OpenFile(audit, os.O_APPEND|os.O_WRONLY|os.O_CREATE, defaultPerms)
if err != nil {
panic(err)
}
pkg/log/log_test.go
+5 -5
View File
@@ -32,7 +32,7 @@ const (
type AuditLog struct {
Level string `json:"level"`
ClientIP string `json:"clientIP"`
ClientIP string `json:"clientIP"` //nolint:tagliatelle // keep IP
Subject string `json:"subject"`
Action string `json:"action"`
Object string `json:"object"`
@@ -71,11 +71,11 @@ func TestAuditLogMessages(t *testing.T) {
},
}
c := api.NewController(conf)
c.Config.Storage.RootDirectory = dir
ctlr := api.NewController(conf)
ctlr.Config.Storage.RootDirectory = dir
go func() {
// this blocks
if err := c.Run(); err != nil {
if err := ctlr.Run(); err != nil {
return
}
}()
@@ -91,7 +91,7 @@ func TestAuditLogMessages(t *testing.T) {
defer func() {
ctx := context.Background()
_ = c.Server.Shutdown(ctx)
_ = ctlr.Server.Shutdown(ctx)
}()
Convey("Open auditLog file", func() {