From f3a41fdd74452c52d93a35957d89873ea67c502e Mon Sep 17 00:00:00 2001 From: Berger Eugene Date: Wed, 2 Oct 2024 14:05:37 +0300 Subject: [PATCH] fix-lint: replace fmt.Errorf with errors.New --- src/app/project_runner.go | 4 ++-- src/client/client.go | 3 ++- src/client/project.go | 5 +++-- src/client/restart.go | 3 ++- src/client/scale_process.go | 3 ++- src/client/start.go | 3 ++- src/client/stop.go | 5 +++-- src/command/command_wrapper_pty.go | 3 ++- src/loader/validators.go | 13 +++++++------ src/tui/proc-editor.go | 2 +- src/tui/proc-table.go | 3 ++- src/tui/procstate_sorter.go | 3 ++- 12 files changed, 30 insertions(+), 20 deletions(-) diff --git a/src/app/project_runner.go b/src/app/project_runner.go index 3950db32..28818ca0 100644 --- a/src/app/project_runner.go +++ b/src/app/project_runner.go @@ -319,7 +319,7 @@ func (p *ProjectRunner) StopProcesses(names []string) (map[string]string, error) if successes == 0 { return stopped, fmt.Errorf("no such processes or not running: %v", names) } - return stopped, fmt.Errorf("failed to stop some processes") + return stopped, errors.New("failed to stop some processes") } return stopped, nil } @@ -398,7 +398,7 @@ func (p *ProjectRunner) SetProcessPassword(name, pass string) error { } } - return fmt.Errorf("password not accepted") + return errors.New("password not accepted") } diff --git a/src/client/client.go b/src/client/client.go index d94cffab..e18e865a 100644 --- a/src/client/client.go +++ b/src/client/client.go @@ -2,6 +2,7 @@ package client import ( "context" + "errors" "fmt" "github.com/f1bonacc1/process-compose/src/pclog" "github.com/f1bonacc1/process-compose/src/types" @@ -161,7 +162,7 @@ func (p *PcClient) GetProjectState(withMemory bool) (*types.ProjectState, error) } func (p *PcClient) SetProcessPassword(_, _ string) error { - return fmt.Errorf("set process password not allowed for PC client") + return errors.New("set process password not allowed for PC client") } func (p *PcClient) UpdateProject(project *types.Project) (map[string]string, error) { diff --git a/src/client/project.go b/src/client/project.go index 9016118c..1d3ab10b 100644 --- a/src/client/project.go +++ b/src/client/project.go @@ -3,6 +3,7 @@ package client import ( "bytes" "encoding/json" + "errors" "fmt" "github.com/f1bonacc1/process-compose/src/types" "github.com/rs/zerolog/log" @@ -76,7 +77,7 @@ func (p *PcClient) updateProject(project *types.Project) (map[string]string, err log.Err(err).Msg("failed to decode err update project") return nil, err } - return nil, fmt.Errorf(respErr.Error) + return nil, errors.New(respErr.Error) } func (p *PcClient) reloadProject() (map[string]string, error) { @@ -102,5 +103,5 @@ func (p *PcClient) reloadProject() (map[string]string, error) { log.Err(err).Msg("failed to decode err update project") return nil, err } - return nil, fmt.Errorf(respErr.Error) + return nil, errors.New(respErr.Error) } diff --git a/src/client/restart.go b/src/client/restart.go index e7dfc321..b5fbaa51 100644 --- a/src/client/restart.go +++ b/src/client/restart.go @@ -2,6 +2,7 @@ package client import ( "encoding/json" + "errors" "fmt" "github.com/rs/zerolog/log" "net/http" @@ -22,5 +23,5 @@ func (p *PcClient) restartProcess(name string) error { log.Error().Msgf("failed to decode restart process %s response: %v", name, err) return err } - return fmt.Errorf(respErr.Error) + return errors.New(respErr.Error) } diff --git a/src/client/scale_process.go b/src/client/scale_process.go index 23c342b9..e440f26b 100644 --- a/src/client/scale_process.go +++ b/src/client/scale_process.go @@ -2,6 +2,7 @@ package client import ( "encoding/json" + "errors" "fmt" "github.com/rs/zerolog/log" "net/http" @@ -26,5 +27,5 @@ func (p *PcClient) scaleProcess(name string, scale int) error { log.Error().Msgf("failed to decode scale process %s response: %v", name, err) return err } - return fmt.Errorf(respErr.Error) + return errors.New(respErr.Error) } diff --git a/src/client/start.go b/src/client/start.go index 790f3911..e60fd2d8 100644 --- a/src/client/start.go +++ b/src/client/start.go @@ -2,6 +2,7 @@ package client import ( "encoding/json" + "errors" "fmt" "github.com/rs/zerolog/log" "net/http" @@ -22,5 +23,5 @@ func (p *PcClient) startProcess(name string) error { log.Error().Msgf("failed to decode start process %s response: %v", name, err) return err } - return fmt.Errorf(respErr.Error) + return errors.New(respErr.Error) } diff --git a/src/client/stop.go b/src/client/stop.go index cf39976f..138bce6c 100644 --- a/src/client/stop.go +++ b/src/client/stop.go @@ -3,6 +3,7 @@ package client import ( "bytes" "encoding/json" + "errors" "fmt" "github.com/rs/zerolog/log" "net/http" @@ -28,7 +29,7 @@ func (p *PcClient) stopProcess(name string) error { log.Error().Msgf("failed to decode stop process %s response: %v", name, err) return err } - return fmt.Errorf(respErr.Error) + return errors.New(respErr.Error) } func (p *PcClient) stopProcesses(names []string) (map[string]string, error) { @@ -62,5 +63,5 @@ func (p *PcClient) stopProcesses(names []string) (map[string]string, error) { log.Err(err).Msgf("failed to decode err stop processes %v", names) return nil, err } - return nil, fmt.Errorf(respErr.Error) + return nil, errors.New(respErr.Error) } diff --git a/src/command/command_wrapper_pty.go b/src/command/command_wrapper_pty.go index 4dd9dceb..29d1e0b6 100644 --- a/src/command/command_wrapper_pty.go +++ b/src/command/command_wrapper_pty.go @@ -1,6 +1,7 @@ package command import ( + "errors" "fmt" "github.com/creack/pty" "golang.org/x/term" @@ -39,7 +40,7 @@ func (c *CmdWrapperPty) StdoutPipe() (io.ReadCloser, error) { } func (c *CmdWrapperPty) StderrPipe() (io.ReadCloser, error) { - return nil, fmt.Errorf("not supported in PTY") + return nil, errors.New("not supported in PTY") } func (c *CmdWrapperPty) StdinPipe() (io.WriteCloser, error) { if c.ptmx == nil { diff --git a/src/loader/validators.go b/src/loader/validators.go index ef4737e7..e7b4703d 100644 --- a/src/loader/validators.go +++ b/src/loader/validators.go @@ -1,6 +1,7 @@ package loader import ( + "errors" "fmt" "github.com/f1bonacc1/process-compose/src/types" "github.com/rs/zerolog" @@ -114,7 +115,7 @@ func validateHealthDependencyHasHealthCheck(p *types.Project) error { if !ok { errStr := fmt.Sprintf("dependency process '%s' in process '%s' is not defined", depName, procName) if p.IsStrict { - return fmt.Errorf(errStr) + return errors.New(errStr) } log.Error().Msg(errStr) continue @@ -122,14 +123,14 @@ func validateHealthDependencyHasHealthCheck(p *types.Project) error { if dep.Condition == types.ProcessConditionHealthy && depProc.ReadinessProbe == nil && depProc.LivenessProbe == nil { errStr := fmt.Sprintf("health dependency defined in '%s' but no health check exists in '%s'", procName, depName) if p.IsStrict { - return fmt.Errorf(errStr) + return errors.New(errStr) } log.Error().Msg(errStr) } if dep.Condition == types.ProcessConditionLogReady && depProc.ReadyLogLine == "" { errStr := fmt.Sprintf("log ready dependency defined in '%s' but no ready log line exists in '%s'", procName, depName) log.Error().Msg(errStr) - return fmt.Errorf(errStr) + return errors.New(errStr) } } } @@ -141,7 +142,7 @@ func validateNoIncompatibleHealthChecks(p *types.Project) error { if proc.ReadinessProbe != nil && proc.ReadyLogLine != "" { errStr := fmt.Sprintf("'ready_log_line' and readiness probe defined in '%s' are incompatible", procName) log.Error().Msg(errStr) - return fmt.Errorf(errStr) + return errors.New(errStr) } } return nil @@ -154,7 +155,7 @@ func validateDependencyIsEnabled(p *types.Project) error { if !ok { errStr := fmt.Sprintf("dependency process '%s' in process '%s' is not defined", depName, procName) if p.IsStrict { - return fmt.Errorf(errStr) + return errors.New(errStr) } log.Error().Msg(errStr) continue @@ -162,7 +163,7 @@ func validateDependencyIsEnabled(p *types.Project) error { if depProc.Disabled { errStr := fmt.Sprintf("dependency process '%s' in process '%s' is disabled", depName, procName) if p.IsStrict { - return fmt.Errorf(errStr) + return errors.New(errStr) } log.Error().Msg(errStr) } diff --git a/src/tui/proc-editor.go b/src/tui/proc-editor.go index 9271daa8..0e1b5e49 100644 --- a/src/tui/proc-editor.go +++ b/src/tui/proc-editor.go @@ -130,5 +130,5 @@ func findTextEditor() (string, error) { } } - return "", fmt.Errorf("no text editor found") + return "", errors.New("no text editor found") } diff --git a/src/tui/proc-table.go b/src/tui/proc-table.go index 99a129e8..e646e83f 100644 --- a/src/tui/proc-table.go +++ b/src/tui/proc-table.go @@ -2,6 +2,7 @@ package tui import ( "context" + "errors" "fmt" "github.com/f1bonacc1/process-compose/src/types" "github.com/gdamore/tcell/v2" @@ -159,7 +160,7 @@ func (pv *pcView) isPassModeNeeded(state *types.ProcessState) bool { func (pv *pcView) getSelectedProcState() (*types.ProcessState, error) { name := pv.getSelectedProcName() if len(name) == 0 { - return nil, fmt.Errorf("no process selected") + return nil, errors.New("no process selected") } return pv.project.GetProcessState(name) } diff --git a/src/tui/procstate_sorter.go b/src/tui/procstate_sorter.go index 473099a9..318030e8 100644 --- a/src/tui/procstate_sorter.go +++ b/src/tui/procstate_sorter.go @@ -1,6 +1,7 @@ package tui import ( + "errors" "fmt" "github.com/f1bonacc1/process-compose/src/types" "sort" @@ -81,7 +82,7 @@ type sortFn func(i, j int) bool func sortProcessesState(sortBy ColumnID, asc bool, states *types.ProcessesState) error { if states == nil { - return fmt.Errorf("empty states") + return errors.New("empty states") } sorter := getSorter(sortBy, states) if !asc {