From c96db982047f7fae10084932685a8a4319ec3532 Mon Sep 17 00:00:00 2001 From: Kayhan Alizadeh Date: Sun, 12 Nov 2023 20:37:58 +0800 Subject: [PATCH] chore(linter): update golang-ci config (#70) --- .golangci.yml | 6 ++++++ config/config.go | 12 ++++++------ config/config_test.go | 4 ++-- 3 files changed, 14 insertions(+), 8 deletions(-) diff --git a/.golangci.yml b/.golangci.yml index 68db5b0..f3dd374 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -18,6 +18,12 @@ linters: - nonamedreturns - nlreturn - ireturn + - gofumpt + - tagalign + - funlen + - errname + - errorlint + - forcetypeassert linters-settings: diff --git a/config/config.go b/config/config.go index c200174..89420dd 100644 --- a/config/config.go +++ b/config/config.go @@ -13,8 +13,8 @@ import ( var configBytes []byte var ( - InvalidUserLength = errors.New("invalid user length") - CommandAtSameTime = errors.New("can't have all cmds and specific cmd at same time") + ErrInvalidUserLength = errors.New("invalid user length") + ErrSpecificAndAllCommandSameAtTime = errors.New("can't have all cmds and specific cmd at same time") ) type Config struct { @@ -42,7 +42,7 @@ type User struct { func (conf *Config) BasicCheck() error { if len(conf.Users) == 0 { - return InvalidUserLength + return ErrInvalidUserLength } for _, u := range conf.Users { @@ -55,7 +55,7 @@ func (conf *Config) BasicCheck() error { } if allCmds && len(u.Cmds) > 1 { - return CommandAtSameTime + return ErrSpecificAndAllCommandSameAtTime } } @@ -72,9 +72,9 @@ func DefaultConfig() *Config { WriteToFile: true, Path: "log.ttrace", }, - Name: "time_trace", + Name: "time_trace", } - + rootUser := User{ Name: "root", Password: "super_secret_password", diff --git a/config/config_test.go b/config/config_test.go index 89d062f..777258a 100644 --- a/config/config_test.go +++ b/config/config_test.go @@ -52,10 +52,10 @@ func TestBasicCheck(t *testing.T) { c.Users = []User{} err = c.BasicCheck() - assert.Error(t, InvalidUserLength, err) + assert.Error(t, ErrInvalidUserLength, err) c.Users = []User{DefaultConfig().Users[0]} c.Users[0].Cmds = []string{"*", "GET"} err = c.BasicCheck() - assert.Error(t, CommandAtSameTime, err) + assert.Error(t, ErrSpecificAndAllCommandSameAtTime, err) }