chore(lint): Optimize a large number of lint detection issues

go-fries · Jan 5, 2024 · 0dd406f · 0dd406f
1 parent 456e986
commit 0dd406f
Show file tree

Hide file tree

Showing 6 changed files with 32 additions and 43 deletions.
diff --git a/.golangci.yml b/.golangci.yml
@@ -2,27 +2,6 @@ linters:
   disable-all: true
 
   enable:
-#    - gosimple
-#    - govet
-#    - ineffassign
-#    - staticcheck
-#    - bodyclose
-#    - dupl
-#    - exportloopref
-#    - funlen
-#    - gocognit
-#    - goconst
-#    - gocritic
-#    - gocyclo
-#    - stylecheck
-#    - whitespace
-#    - goprintffuncname
-#    - gosec
-#    - interfacer
-#    - maligned
-#    - prealloc
-#    - revive
-#    - errorlint
     - bodyclose
     - dogsled
     - durationcheck

diff --git a/cache/redis/store.go b/cache/redis/store.go
@@ -74,13 +74,17 @@ func (s *Store) Get(ctx context.Context, key string, dest interface{}) error {
 }
 
 func (s *Store) Put(ctx context.Context, key string, value interface{}, ttl time.Duration) (bool, error) {
-	if valued, err := s.opts.codec.Marshal(value); err != nil {
+	valued, err := s.opts.codec.Marshal(value)
+	if err != nil {
 		return false, err
-	} else if r := s.redis.Set(ctx, s.opts.prefix+key, valued, ttl); r.Err() != nil {
+	}
+
+	r := s.redis.Set(ctx, s.opts.prefix+key, valued, ttl)
+	if r.Err() != nil {
 		return false, r.Err()
-	} else {
-		return r.Val() == "OK", nil
 	}
+
+	return r.Val() == "OK", nil
 }
 
 func (s *Store) Increment(ctx context.Context, key string, value int) (int, error) {
@@ -102,29 +106,35 @@ func (s *Store) Decrement(ctx context.Context, key string, value int) (int, erro
 }
 
 func (s *Store) Forever(ctx context.Context, key string, value interface{}) (bool, error) {
-	if valued, err := s.opts.codec.Marshal(value); err != nil {
+	valued, err := s.opts.codec.Marshal(value)
+	if err != nil {
 		return false, err
-	} else if r := s.redis.Set(ctx, s.opts.prefix+key, valued, redis.KeepTTL); r.Err() != nil {
+	}
+
+	r := s.redis.Set(ctx, s.opts.prefix+key, valued, redis.KeepTTL)
+	if r.Err() != nil {
 		return false, r.Err()
-	} else {
-		return r.Val() == "OK", nil
 	}
+
+	return r.Val() == "OK", nil
 }
 
 func (s *Store) Forget(ctx context.Context, key string) (bool, error) {
-	if r := s.redis.Del(ctx, s.opts.prefix+key); r.Err() != nil {
+	r := s.redis.Del(ctx, s.opts.prefix+key)
+	if r.Err() != nil {
 		return false, r.Err()
-	} else {
-		return r.Val() > 0, nil
 	}
+
+	return r.Val() > 0, nil
 }
 
 func (s *Store) Flush(ctx context.Context) (bool, error) {
-	if r := s.redis.FlushAll(ctx); r.Err() != nil {
+	r := s.redis.FlushAll(ctx)
+	if r.Err() != nil {
 		return false, r.Err()
-	} else {
-		return r.Val() == "OK", nil
 	}
+
+	return r.Val() == "OK", nil
 }
 
 func (s *Store) GetPrefix() string {

diff --git a/crontab/server.go b/crontab/server.go
@@ -106,7 +106,7 @@ func (s *Server) start() {
 	s.log("crontab: server started")
 }
 
-func (s *Server) Stop(ctx context.Context) error {
+func (s *Server) Stop(_ context.Context) error {
 	s.log("crontab: server stopping")
 
 	close(s.stoped)

diff --git a/gorm/adapter/logger.go b/gorm/adapter/logger.go
@@ -30,12 +30,12 @@ func NewLogger(l log.Logger, config logger.Config) logger.Interface {
 	)
 
 	if config.Colorful {
-		infoStr = logger.Green + "%s\n" + logger.Reset + logger.Green + "[info] " + logger.Reset
+		infoStr = logger.Green + "%s\n" + logger.Reset + logger.Green + "[info] " + logger.Reset //nolint:goconst
 		warnStr = logger.BlueBold + "%s\n" + logger.Reset + logger.Magenta + "[warn] " + logger.Reset
 		errStr = logger.Magenta + "%s\n" + logger.Reset + logger.Red + "[error] " + logger.Reset
-		traceStr = logger.Green + "%s\n" + logger.Reset + logger.Yellow + "[%.3fms] " + logger.BlueBold + "[rows:%v]" + logger.Reset + " %s"
-		traceWarnStr = logger.Green + "%s " + logger.Yellow + "%s\n" + logger.Reset + logger.RedBold + "[%.3fms] " + logger.Yellow + "[rows:%v]" + logger.Magenta + " %s" + logger.Reset
-		traceErrStr = logger.RedBold + "%s " + logger.MagentaBold + "%s\n" + logger.Reset + logger.Yellow + "[%.3fms] " + logger.BlueBold + "[rows:%v]" + logger.Reset + " %s"
+		traceStr = logger.Green + "%s\n" + logger.Reset + logger.Yellow + "[%.3fms] " + logger.BlueBold + "[rows:%v]" + logger.Reset + " %s"                                             //nolint:goconst,lll
+		traceWarnStr = logger.Green + "%s " + logger.Yellow + "%s\n" + logger.Reset + logger.RedBold + "[%.3fms] " + logger.Yellow + "[rows:%v]" + logger.Magenta + " %s" + logger.Reset //nolint:lll
+		traceErrStr = logger.RedBold + "%s " + logger.MagentaBold + "%s\n" + logger.Reset + logger.Yellow + "[%.3fms] " + logger.BlueBold + "[rows:%v]" + logger.Reset + " %s"           //nolint:lll
 	}
 
 	return &loggerAdapter{

diff --git a/helper/helper_test.go b/helper/helper_test.go
@@ -21,7 +21,7 @@ func TestTap(t *testing.T) {
 	assert.Equal(t, "foo", f.Name)
 
 	f = Tap(&Foo{Name: "foo"}, func(foo interface{}) {
-		foo.(*Foo).Name = "bar"
+		foo.(*Foo).Name = "bar" //nolint:goconst
 	}).(*Foo)
 	assert.Equal(t, "bar", f.Name)
 

diff --git a/udp/server.go b/udp/server.go
@@ -82,7 +82,7 @@ func NewServer(address string, opts ...Option) *Server {
 	return s
 }
 
-func (s *Server) Start(ctx context.Context) (err error) {
+func (s *Server) Start(_ context.Context) (err error) {
 	s.conn, err = net.ListenPacket("udp", s.address)
 	if err != nil {
 		return
@@ -134,7 +134,7 @@ func (s *Server) handle(message *Message) {
 	s.handler(message)
 }
 
-func (s *Server) Stop(ctx context.Context) error {
+func (s *Server) Stop(_ context.Context) error {
 	log.Println("udp server: stopping")
 
 	s.stop()