From cf614d046c28b04be8505edf2f83ecfb9b789673 Mon Sep 17 00:00:00 2001 From: mojtaba-esk Date: Fri, 31 Jan 2025 12:51:20 +0330 Subject: [PATCH] fixed linter complains --- cmd/api/api.go | 12 ++++++------ cmd/main.go | 3 ++- internal/api/v1/api.go | 10 +++++----- internal/api/v1/handlers/instance.go | 3 ++- internal/api/v1/handlers/test.go | 5 +++-- internal/api/v1/handlers/user.go | 2 +- internal/api/v1/handlers/utils.go | 3 ++- internal/api/v1/services/test.go | 2 +- internal/api/v1/services/user.go | 3 ++- 9 files changed, 24 insertions(+), 19 deletions(-) diff --git a/cmd/api/api.go b/cmd/api/api.go index e9dde26..d474bd0 100644 --- a/cmd/api/api.go +++ b/cmd/api/api.go @@ -4,15 +4,15 @@ import ( "context" "fmt" - "github.com/celestiaorg/knuu/internal/api/v1" - "github.com/celestiaorg/knuu/internal/api/v1/services" - "github.com/celestiaorg/knuu/internal/database" - "github.com/sirupsen/logrus" - "gorm.io/gorm/logger" - "github.com/gin-gonic/gin" + "github.com/sirupsen/logrus" "github.com/spf13/cobra" "github.com/spf13/pflag" + "gorm.io/gorm/logger" + + "github.com/celestiaorg/knuu/internal/api/v1" + "github.com/celestiaorg/knuu/internal/api/v1/services" + "github.com/celestiaorg/knuu/internal/database" ) const ( diff --git a/cmd/main.go b/cmd/main.go index b7ce832..2c79e61 100644 --- a/cmd/main.go +++ b/cmd/main.go @@ -1,8 +1,9 @@ package main import ( - "github.com/celestiaorg/knuu/cmd/root" "github.com/sirupsen/logrus" + + "github.com/celestiaorg/knuu/cmd/root" ) func main() { diff --git a/internal/api/v1/api.go b/internal/api/v1/api.go index 87b35f3..dc05113 100644 --- a/internal/api/v1/api.go +++ b/internal/api/v1/api.go @@ -5,16 +5,16 @@ import ( "fmt" "net/http" + "github.com/gin-gonic/gin" + "github.com/rs/cors" + "github.com/sirupsen/logrus" + "gorm.io/gorm" + "github.com/celestiaorg/knuu/internal/api/v1/handlers" "github.com/celestiaorg/knuu/internal/api/v1/middleware" "github.com/celestiaorg/knuu/internal/api/v1/services" "github.com/celestiaorg/knuu/internal/database/models" "github.com/celestiaorg/knuu/internal/database/repos" - "github.com/sirupsen/logrus" - - "github.com/gin-gonic/gin" - "github.com/rs/cors" - "gorm.io/gorm" ) const ( diff --git a/internal/api/v1/handlers/instance.go b/internal/api/v1/handlers/instance.go index 2d4a979..cf0674e 100644 --- a/internal/api/v1/handlers/instance.go +++ b/internal/api/v1/handlers/instance.go @@ -3,9 +3,10 @@ package handlers import ( "net/http" - "github.com/celestiaorg/knuu/internal/api/v1/services" "github.com/gin-gonic/gin" "github.com/sirupsen/logrus" + + "github.com/celestiaorg/knuu/internal/api/v1/services" ) func (h *TestHandler) CreateInstance(c *gin.Context) { diff --git a/internal/api/v1/handlers/test.go b/internal/api/v1/handlers/test.go index 5e6b9a1..4c23026 100644 --- a/internal/api/v1/handlers/test.go +++ b/internal/api/v1/handlers/test.go @@ -5,10 +5,11 @@ import ( "fmt" "net/http" - "github.com/celestiaorg/knuu/internal/api/v1/services" - "github.com/celestiaorg/knuu/internal/database/models" "github.com/gin-gonic/gin" "github.com/sirupsen/logrus" + + "github.com/celestiaorg/knuu/internal/api/v1/services" + "github.com/celestiaorg/knuu/internal/database/models" ) type TestHandler struct { diff --git a/internal/api/v1/handlers/user.go b/internal/api/v1/handlers/user.go index 1279b4d..5afdd4d 100644 --- a/internal/api/v1/handlers/user.go +++ b/internal/api/v1/handlers/user.go @@ -7,9 +7,9 @@ import ( "github.com/celestiaorg/knuu/internal/api/v1/middleware" "github.com/celestiaorg/knuu/internal/api/v1/services" "github.com/celestiaorg/knuu/internal/database/models" - "github.com/sirupsen/logrus" "github.com/gin-gonic/gin" + "github.com/sirupsen/logrus" ) type UserHandler struct { diff --git a/internal/api/v1/handlers/utils.go b/internal/api/v1/handlers/utils.go index 0c8db9e..9b5b381 100644 --- a/internal/api/v1/handlers/utils.go +++ b/internal/api/v1/handlers/utils.go @@ -3,9 +3,10 @@ package handlers import ( "errors" + "github.com/gin-gonic/gin" + "github.com/celestiaorg/knuu/internal/api/v1/middleware" "github.com/celestiaorg/knuu/internal/database/models" - "github.com/gin-gonic/gin" ) func getUserFromContext(c *gin.Context) (*models.User, error) { diff --git a/internal/api/v1/services/test.go b/internal/api/v1/services/test.go index 36027e1..1ea0bb2 100644 --- a/internal/api/v1/services/test.go +++ b/internal/api/v1/services/test.go @@ -9,6 +9,7 @@ import ( "sync" "time" + "github.com/sirupsen/logrus" apierrs "k8s.io/apimachinery/pkg/api/errors" "github.com/celestiaorg/knuu/internal/database" @@ -17,7 +18,6 @@ import ( "github.com/celestiaorg/knuu/pkg/k8s" "github.com/celestiaorg/knuu/pkg/knuu" "github.com/celestiaorg/knuu/pkg/minio" - "github.com/sirupsen/logrus" ) const ( diff --git a/internal/api/v1/services/user.go b/internal/api/v1/services/user.go index 34c7ba3..d101ea9 100644 --- a/internal/api/v1/services/user.go +++ b/internal/api/v1/services/user.go @@ -3,9 +3,10 @@ package services import ( "context" + "golang.org/x/crypto/bcrypt" + "github.com/celestiaorg/knuu/internal/database/models" "github.com/celestiaorg/knuu/internal/database/repos" - "golang.org/x/crypto/bcrypt" ) type UserService interface {