chore: lint

javascriptizer1 · Jun 13, 2024 · 8513c00 · 8513c00
1 parent 8cc8865
commit 8513c00
Show file tree

Hide file tree

Showing 9 changed files with 39 additions and 25 deletions.
diff --git a/service/chat/internal/config/config.go b/service/chat/internal/config/config.go
@@ -11,11 +11,11 @@ import (
 )
 
 type Config struct {
-	Env        string `env:"ENV" env-default:"local"`
-	GRPC       GRPCConfig
+	Env      string `env:"ENV" env-default:"local"`
+	GRPC     GRPCConfig
 	GRPCAuth GRPCAuthConfig
-	HTTP       HTTPConfig
-	DB         DBConfig
+	HTTP     HTTPConfig
+	DB       DBConfig
 }
 
 type GRPCConfig struct {

diff --git a/service/cli/cmd/cmd.go b/service/cli/cmd/cmd.go
@@ -17,8 +17,13 @@ func Execute() {
 		Use:     "gchat",
 		Short:   "CLI client for chat service",
 		Version: "0.0.1",
-		PersistentPreRun: func(cmd *cobra.Command, args []string) {
-			sp.TokenManager(ctx).Load()
+		PersistentPreRun: func(_ *cobra.Command, _ []string) {
+			err := sp.TokenManager(ctx).Load()
+
+			if err != nil {
+				colog.Warn("load config error: %v", err)
+			}
+
 		},
 	}
 

diff --git a/service/cli/cmd/connect_chat.go b/service/cli/cmd/connect_chat.go
@@ -30,5 +30,5 @@ func newConnectChatCommand(ctx context.Context, sp *app.ServiceProvider) *cobra.
 
 func addConnectChatFlags(cmd *cobra.Command) {
 	cmd.Flags().String("chat-id", "", "ID of the chat")
-	cmd.MarkFlagRequired("chat-id")
+	_ = cmd.MarkFlagRequired("chat-id")
 }
diff --git a/service/cli/cmd/create_chat.go b/service/cli/cmd/create_chat.go
@@ -39,6 +39,6 @@ func newCreateChatCommand(ctx context.Context, sp *app.ServiceProvider) *cobra.C
 }
 
 func addCreateChatFlags(cmd *cobra.Command) {
-	cmd.Flags().StringArray("emails", []string{}, "Emails of the users in the chat")
-	cmd.MarkFlagRequired("emails")
+	_ = cmd.Flags().StringArray("emails", []string{}, "Emails of the users in the chat")
+	_ = cmd.MarkFlagRequired("emails")
 }
diff --git a/service/cli/cmd/login.go b/service/cli/cmd/login.go
@@ -43,6 +43,6 @@ func newLoginCommand(ctx context.Context, sp *app.ServiceProvider) *cobra.Comman
 func addLoginFlags(cmd *cobra.Command) {
 	cmd.Flags().StringP("login", "l", "", "Email of the user")
 	cmd.Flags().StringP("password", "p", "", "Password of the user")
-	cmd.MarkFlagRequired("login")
-	cmd.MarkFlagRequired("password")
+	_ = cmd.MarkFlagRequired("login")
+	_ = cmd.MarkFlagRequired("password")
 }
diff --git a/service/cli/cmd/register.go b/service/cli/cmd/register.go
@@ -68,8 +68,8 @@ func addRegisterFlags(cmd *cobra.Command) {
 	cmd.Flags().StringP("email", "e", "", "Email of the user")
 	cmd.Flags().StringP("password", "p", "", "Password of the user")
 	cmd.Flags().StringP("password-confirm", "c", "", "Password confirmation")
-	cmd.MarkFlagRequired("name")
-	cmd.MarkFlagRequired("email")
-	cmd.MarkFlagRequired("password")
-	cmd.MarkFlagRequired("password-confirm")
+	_ = cmd.MarkFlagRequired("name")
+	_ = cmd.MarkFlagRequired("email")
+	_ = cmd.MarkFlagRequired("password")
+	_ = cmd.MarkFlagRequired("password-confirm")
 }
diff --git a/service/cli/cmd/send_mesage.go b/service/cli/cmd/send_mesage.go
@@ -41,6 +41,6 @@ func newSendMessageCommand(ctx context.Context, sp *app.ServiceProvider) *cobra.
 func addSendMessageFlags(cmd *cobra.Command) {
 	cmd.Flags().String("chat-id", "", "ID of the chat")
 	cmd.Flags().String("text", "", "Text of the message")
-	cmd.MarkFlagRequired("chat-id")
-	cmd.MarkFlagRequired("text")
+	_ = cmd.MarkFlagRequired("chat-id")
+	_ = cmd.MarkFlagRequired("text")
 }
diff --git a/service/cli/internal/app/adapter.go b/service/cli/internal/app/adapter.go
@@ -9,7 +9,7 @@ import (
 )
 
 type TokenManager interface {
-	Load()
+	Load() error
 	Save() error
 	SetTokens(accessToken, refreshToken string) error
 	AccessToken() string

diff --git a/service/cli/internal/manager/token_file.go b/service/cli/internal/manager/token_file.go
@@ -26,18 +26,25 @@ func NewFileTokenManager(filePath string) *FileTokenManager {
 	}
 }
 
-func (tm *FileTokenManager) Load() {
+func (tm *FileTokenManager) Load() error {
+	var e error
 	tm.once.Do(func() {
 		tm.mu.Lock()
 
 		defer tm.mu.Unlock()
 
-		file, _ := os.Open(tm.filePath)
+		file, err := os.Open(tm.filePath)
+		e = err
 
-		defer file.Close()
+		defer func() {
+			_ = file.Close()
+		}()
 
-		json.NewDecoder(file).Decode(&tm.token)
+		err = json.NewDecoder(file).Decode(&tm.token)
+		e = err
 	})
+
+	return e
 }
 
 func (tm *FileTokenManager) Save() error {
@@ -55,7 +62,9 @@ func (tm *FileTokenManager) Save() error {
 		return err
 	}
 
-	defer file.Close()
+	defer func() {
+		_ = file.Close()
+	}()
 
 	err = json.NewEncoder(file).Encode(&tm.token)
 
@@ -99,8 +108,8 @@ func (tm *FileTokenManager) ensureDirExists() error {
 
 	if _, err := os.Stat(dir); os.IsNotExist(err) {
 
-		err := os.MkdirAll(dir, 0755)
-		
+		err := os.MkdirAll(dir, 0750)
+
 		if err != nil {
 			return err
 		}