From 064b6c287c41aca84f54313de6661dafd3984542 Mon Sep 17 00:00:00 2001
From: Igor Shishkin <me@teran.dev>
Date: Tue, 3 Sep 2024 04:49:06 +0300
Subject: [PATCH] Add errorlint linter (#226)

Signed-off-by: Igor Shishkin <me@teran.dev>
---
 .golangci.yml                                  | 1 +
 publisher/presenter/html/handlers.go           | 2 +-
 repositories/metadata/postgresql/postgresql.go | 2 +-
 service/service.go                             | 4 ++--
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/.golangci.yml b/.golangci.yml
index 7bf1341..2eabb99 100644
--- a/.golangci.yml
+++ b/.golangci.yml
@@ -11,6 +11,7 @@ linters:
     - err113
     - errcheck
     - errchkjson
+    - errorlint
     - errname
     - goconst
     - gocritic
diff --git a/publisher/presenter/html/handlers.go b/publisher/presenter/html/handlers.go
index 8ddbea9..ed1a7c8 100644
--- a/publisher/presenter/html/handlers.go
+++ b/publisher/presenter/html/handlers.go
@@ -243,7 +243,7 @@ func (h *handlers) ErrorHandler(err error, c echo.Context) {
 	code := 500
 	templateFilename := serverErrorTemplateFilename
 
-	v, ok := err.(*echo.HTTPError)
+	v, ok := err.(*echo.HTTPError) // nolint:errorlint
 	if ok {
 		code = v.Code
 		if v.Code == http.StatusNotFound {
diff --git a/repositories/metadata/postgresql/postgresql.go b/repositories/metadata/postgresql/postgresql.go
index 63bfbed..92934b9 100644
--- a/repositories/metadata/postgresql/postgresql.go
+++ b/repositories/metadata/postgresql/postgresql.go
@@ -38,7 +38,7 @@ func mapSQLErrors(err error) error {
 		return metadata.ErrNotFound
 	}
 
-	if err, ok := err.(*pq.Error); ok {
+	if err, ok := err.(*pq.Error); ok { // nolint:errorlint
 		if err.Code == "23505" {
 			return metadata.ErrConflict
 		}
diff --git a/service/service.go b/service/service.go
index 2631be4..f7e76d4 100644
--- a/service/service.go
+++ b/service/service.go
@@ -279,8 +279,8 @@ func (s *service) DeleteObject(ctx context.Context, namespace, container, versio
 }
 
 func mapMetadataErrors(err error) error {
-	switch err {
-	case metadata.ErrNotFound:
+	switch {
+	case errors.Is(err, metadata.ErrNotFound):
 		return ErrNotFound
 	default:
 		return err