From 8513c0076ad1021b4b8c86919da023310f873ff4 Mon Sep 17 00:00:00 2001 From: javascriptizer Date: Thu, 13 Jun 2024 17:26:14 +0300 Subject: [PATCH] chore: lint --- service/chat/internal/config/config.go | 8 ++++---- service/cli/cmd/cmd.go | 9 +++++++-- service/cli/cmd/connect_chat.go | 2 +- service/cli/cmd/create_chat.go | 4 ++-- service/cli/cmd/login.go | 4 ++-- service/cli/cmd/register.go | 8 ++++---- service/cli/cmd/send_mesage.go | 4 ++-- service/cli/internal/app/adapter.go | 2 +- service/cli/internal/manager/token_file.go | 23 +++++++++++++++------- 9 files changed, 39 insertions(+), 25 deletions(-) diff --git a/service/chat/internal/config/config.go b/service/chat/internal/config/config.go index f5e94f4..3c150e9 100644 --- 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 index 7a24c19..b632d0b 100644 --- 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 index 85b7593..de27a00 100644 --- 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 index 2c7215b..028de48 100644 --- 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 index 33af8a0..b48e9ed 100644 --- 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 index 788f6ba..3242016 100644 --- 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 index 783f053..e67af30 100644 --- 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 index 82ec79d..956f468 100644 --- 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 index ddb6646..99b00a8 100644 --- 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 }