Skip to content

Commit 14d3c1b

Browse files
dmygerdmyger
committed
format: apply 'staticcheck' linter fixes Go source
Part of #TNTP-2939
1 parent f9d3edc commit 14d3c1b

21 files changed

+48
-47
lines changed

‎cli/binary/switch.go

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -86,9 +86,7 @@ func ChooseVersion(binDir string, program search.Program) (string, error) {
8686
}
8787
_, version, err := versionSelect.Run()
8888
version = cleanString(version)
89-
if strings.HasSuffix(version, " [active]") {
90-
version = strings.TrimSuffix(version, " [active]")
91-
}
89+
version = strings.TrimSuffix(version, " [active]")
9290

9391
return version, err
9492
}

‎cli/cmd/cluster.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -560,7 +560,7 @@ func checkRolesChangeFlags(isAdd bool) error {
560560
if !isAdd {
561561
action = "removed"
562562
}
563-
if rolesChangeCtx.IsGlobal == false && rolesChangeCtx.GroupName == "" &&
563+
if !rolesChangeCtx.IsGlobal && rolesChangeCtx.GroupName == "" &&
564564
rolesChangeCtx.ReplicasetName == "" && rolesChangeCtx.InstName == "" {
565565

566566
return util.NewArgError(fmt.Sprintf("need to provide flag(s) with scope roles will %s",

‎cli/cmd/kill.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ func NewKillCmd() *cobra.Command {
4444

4545
func askConfirmation(args []string) (bool, error) {
4646
var err error
47-
var confirm bool = true
47+
confirm := true
4848
if !forceKill {
4949
confirmationMsg := "Kill all instances?"
5050
if len(args) > 0 {

‎cli/cmd/pack.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ func checkFlags(packCtx *pack.PackCtx) error {
125125
" but you are not packaging RPM or DEB. Flag will be ignored")
126126
}
127127
case pack.Rpm, pack.Deb:
128-
if packCtx.Archive.All == true {
128+
if packCtx.Archive.All {
129129
log.Warnf("You specified the --all flag," +
130130
" but you are not packaging a tarball. Flag will be ignored")
131131
}

‎cli/cmd/stop.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ func internalStopWithConfirmationModule(cmdCtx *cmdcontext.CmdCtx, args []string
4242
return errNoConfig
4343
}
4444

45-
if !(autoYes || cmdCtx.Cli.NoPrompt) {
45+
if !autoYes && !cmdCtx.Cli.NoPrompt {
4646
instancesToConfirm := ""
4747
if len(args) == 0 {
4848
instancesToConfirm = "all instances"
@@ -74,7 +74,7 @@ func internalStopModule(cmdCtx *cmdcontext.CmdCtx, args []string) error {
7474
}
7575

7676
var runningCtx running.RunningCtx
77-
var err error = running.FillCtx(cliOpts, cmdCtx, &runningCtx, args, running.ConfigLoadSkip)
77+
err := running.FillCtx(cliOpts, cmdCtx, &runningCtx, args, running.ConfigLoadSkip)
7878
if err != nil {
7979
return err
8080
}

‎cli/configure/configure.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -269,7 +269,7 @@ func decodeConfig(input map[string]any, cfg *config.CliOpts) error {
269269
func GetCliOpts(configurePath string, repository integrity.Repository) (
270270
*config.CliOpts, string, error,
271271
) {
272-
var cfg *config.CliOpts = GetDefaultCliOpts()
272+
cfg := GetDefaultCliOpts()
273273
// Config could not be processed.
274274
configPath, err := util.GetYamlFileName(configurePath, true)
275275
// Before loading configure file, we'll initialize integrity checking.

‎cli/console/console.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ func (c *Console) addStmt(part string) bool {
152152
}
153153

154154
has_delim := c.cleanupDelimiter()
155-
c.livePrefixEnabled = !(has_delim && c.impl.Handler.Validate(c.input))
155+
c.livePrefixEnabled = !has_delim || !c.impl.Handler.Validate(c.input)
156156
return !c.livePrefixEnabled
157157
}
158158

‎cli/daemon/process.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ func (process *Process) startSignalHandling() {
5454

5555
for {
5656
select {
57-
case _ = <-sigTermChan:
57+
case <-sigTermChan:
5858
process.Stop()
5959
}
6060
}

‎cli/daemon/process_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ func TestProcessBase(t *testing.T) {
4040

4141
// Check is daemon alive.
4242
waitProcessChanges()
43-
alive, err = IsDaemonAlive(pid)
43+
alive, _ = IsDaemonAlive(pid)
4444
require.False(t, alive, "Can't stop daemon.")
4545

4646
_, err = os.Stat(TestProcessPidFile)

‎cli/install/install.go

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -284,9 +284,10 @@ func programDependenciesInstalled(program search.Program) error {
284284
programs := []Package{}
285285
packages := []string{}
286286
osName, _ := detectOsName()
287-
if program == search.ProgramTt {
287+
switch program {
288+
case search.ProgramTt:
288289
programs = []Package{{"mage", "mage"}, {"git", "git"}}
289-
} else if program == search.ProgramCe {
290+
case search.ProgramCe:
290291
if osName == "darwin" {
291292
programs = []Package{
292293
{"cmake", "cmake"},
@@ -1276,7 +1277,8 @@ func isUpdatePossible(installCtx InstallCtx,
12761277
return false, err
12771278
}
12781279

1279-
if program == search.ProgramCe {
1280+
switch program {
1281+
case search.ProgramCe:
12801282
tarantoolBin := cmdcontext.TarantoolCli{
12811283
Executable: pathToBin,
12821284
}
@@ -1291,7 +1293,7 @@ func isUpdatePossible(installCtx InstallCtx,
12911293
"of an installed %s", program)
12921294
}
12931295
curBinHash = binVersion.Hash[1:]
1294-
} else if program == search.ProgramTt {
1296+
case search.ProgramTt:
12951297
ttVer, err := cmdcontext.GetTtVersion(pathToBin)
12961298
if err != nil {
12971299
return false, err

‎cli/pack/archive_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ func TestGetTarPackageName(t *testing.T) {
8282

8383
for _, testCase := range testCases {
8484
t.Run(testCase.name, func(t *testing.T) {
85-
suffix, err := getTgzSuffix()
85+
suffix, _ := getTgzSuffix()
8686
packageName, err := getPackageFileName(testCase.packCtx, testCase.opts, suffix, true)
8787
require.ErrorIs(t, err, testCase.expectedError)
8888
require.Equalf(t, testCase.expectedName, packageName,

‎cli/pack/deb_control_dir.go

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -99,10 +99,11 @@ func createControlDir(cmdCtx cmdcontext.CmdCtx, packCtx PackCtx,
9999

100100
// getDebRelation returns a correct relation string from the passed one.
101101
func getDebRelation(relation string) string {
102-
if relation == ">" || relation == "<" {
102+
switch relation {
103+
case ">", "<":
103104
// Deb format uses >> and << instead of > and <
104105
return fmt.Sprintf("%s%s", relation, relation)
105-
} else if relation == "==" {
106+
case "==":
106107
return "="
107108
}
108109

@@ -175,9 +176,10 @@ func getLexer() *stateful.Definition {
175176
// inside the passed directory.
176177
func initScript(destDirPath, scriptName string, mp map[string]interface{}) error {
177178
var scriptTemplate string
178-
if scriptName == PostInstScriptName {
179+
switch scriptName {
180+
case PostInstScriptName:
179181
scriptTemplate = postInstScriptContent
180-
} else if scriptName == PreInstScriptName {
182+
case PreInstScriptName:
181183
scriptTemplate = debPreInstScriptContent
182184
}
183185

‎cli/pack/rpm_tagset_test.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ func TestPackTag(t *testing.T) {
133133
Value: []int16{1},
134134
}
135135

136-
packed, err = packTag(err64Tag)
136+
_, err = packTag(err64Tag)
137137
assert.EqualError(err, "INT64 value should be []int64")
138138

139139
// INT32
@@ -142,7 +142,7 @@ func TestPackTag(t *testing.T) {
142142
Value: []int16{1},
143143
}
144144

145-
packed, err = packTag(err32Tag)
145+
_, err = packTag(err32Tag)
146146
assert.EqualError(err, "INT32 value should be []int32")
147147

148148
// NULL
@@ -151,7 +151,7 @@ func TestPackTag(t *testing.T) {
151151
Value: []int16{1},
152152
}
153153

154-
packed, err = packTag(errNullTag)
154+
_, err = packTag(errNullTag)
155155
assert.EqualError(err, "NULL value should be nil")
156156

157157
// BIN
@@ -160,7 +160,7 @@ func TestPackTag(t *testing.T) {
160160
Value: []int16{1},
161161
}
162162

163-
packed, err = packTag(errBinTag)
163+
_, err = packTag(errBinTag)
164164
assert.EqualError(err, "BIN and CHAR values should be []byte")
165165

166166
// STRING
@@ -169,7 +169,7 @@ func TestPackTag(t *testing.T) {
169169
Value: []int16{1},
170170
}
171171

172-
packed, err = packTag(errStringTag)
172+
_, err = packTag(errStringTag)
173173
assert.EqualError(err, "STRING value should be string")
174174

175175
// ARRAY STRING
@@ -178,7 +178,7 @@ func TestPackTag(t *testing.T) {
178178
Value: []int16{1},
179179
}
180180

181-
packed, err = packTag(errArrStringTag)
181+
_, err = packTag(errArrStringTag)
182182
assert.EqualError(err, "STRING_ARRAY value should be []string")
183183
}
184184

‎cli/replicaset/orchestrator.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ var knownOrchestrators = []Orchestrator{
3636
// PraseOrchestrator parses an orchestrator from the string.
3737
func ParseOrchestrator(str string) Orchestrator {
3838
for _, o := range knownOrchestrators {
39-
if strings.ToLower(str) == strings.ToLower(o.String()) {
39+
if strings.EqualFold(str, o.String()) {
4040
return o
4141
}
4242
}

‎cli/replicaset/orchestrators_test.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,8 +72,7 @@ func TestNewReplicasetGetter(t *testing.T) {
7272
for _, oc := range orchestratorCases {
7373
for _, tc := range cases {
7474
t.Run(oc.Name+"_"+tc.Name, func(t *testing.T) {
75-
var getter replicaset.Discoverer
76-
getter = oc.New(tc.Evaler)
75+
getter := oc.New(tc.Evaler)
7776
assert.NotNil(t, getter)
7877
})
7978
}

‎cli/running/process_controller.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ type processController struct {
3333
// start starts the process.
3434
func (pc *processController) start() error {
3535
// Start an Instance.
36-
if err := pc.Cmd.Start(); err != nil {
36+
if err := pc.Start(); err != nil {
3737
return err
3838
}
3939
pc.done = false
@@ -59,10 +59,10 @@ func (pc *processController) Wait() error {
5959

6060
// SendSignal sends a signal to tarantool instance.
6161
func (pc *processController) SendSignal(sig os.Signal) error {
62-
if pc.Cmd == nil || pc.Cmd.Process == nil {
62+
if pc.Cmd == nil || pc.Process == nil {
6363
return fmt.Errorf("the instance hasn't started yet")
6464
}
65-
return pc.Cmd.Process.Signal(sig)
65+
return pc.Process.Signal(sig)
6666
}
6767

6868
// IsAlive verifies that the Instance is alive by sending a "0" signal.
@@ -104,7 +104,7 @@ func (pc *processController) StopWithSignal(waitTimeout time.Duration, stopSigna
104104
case <-time.After(waitTimeout):
105105
if pc.IsAlive() {
106106
// Send "SIGKILL" signal if process is still alive.
107-
if err := pc.Cmd.Process.Kill(); err != nil {
107+
if err := pc.Process.Kill(); err != nil {
108108
return fmt.Errorf("failed to send SIGKILL to instance: %s", err)
109109
} else {
110110
// Wait for the process to terminate.

‎cli/running/process_controller_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ func TestProcessController(t *testing.T) {
4949
err = dpc.Stop(5 * time.Second)
5050
var exitError *exec.ExitError
5151
require.True(t, errors.As(err, &exitError))
52-
assert.Equal(t, 10, exitError.ProcessState.ExitCode())
52+
assert.Equal(t, 10, exitError.ExitCode())
5353
require.NoError(t, waitForMsgInBuffer(&outBuf, "interrupted", 5*time.Second))
5454
assert.False(t, dpc.IsAlive())
5555

‎cli/running/running.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -899,7 +899,7 @@ func Logrotate(run *InstanceCtx) error {
899899
return fmt.Errorf("%s: the instance is not running, it must be started", fullInstanceName)
900900
}
901901

902-
alive, err := process_utils.IsProcessAlive(pid)
902+
alive, _ := process_utils.IsProcessAlive(pid)
903903
if !alive {
904904
return errors.New(instStateDead.String())
905905
}

‎cli/ttlog/logger.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ func (logger *writerLogger) Rotate() error {
6464

6565
// GetOpts returns the parameters that were used to create the logger.
6666
func (logger *writerLogger) GetOpts() LoggerOpts {
67-
return LoggerOpts{Prefix: logger.Logger.Prefix()}
67+
return LoggerOpts{Prefix: logger.Prefix()}
6868
}
6969

7070
// Close implements io.Closer, no-op.

‎magefile.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ func applyPatch(path string) error {
128128
return err
129129
}
130130

131-
err = sh.Run(
131+
sh.Run(
132132
"patch", "-d", cartridgePath, "-N", "-p1", "-V", "none", "-i", path,
133133
)
134134

@@ -206,8 +206,8 @@ func appendTags(args []string) ([]string, error) {
206206
tags = append(tags, "openssl_static")
207207
case BuildTypeShared:
208208
default:
209-
return []string{}, fmt.Errorf("Unsupported build type: %s, supported: "+
210-
"%s, %s, %s\n",
209+
return []string{}, fmt.Errorf("unsupported build type: %s, supported: "+
210+
"%s, %s, %s",
211211
buildType, BuildTypeNoCgo, BuildTypeStatic, BuildTypeShared)
212212
}
213213
return append(append(args, "-tags"), strings.Join(tags, ",")), nil
@@ -232,7 +232,7 @@ func buildTt(argUpdaters ...optsUpdater) error {
232232
packagePath)
233233
err = sh.RunWith(getBuildEnvironment(), goExecutableName, args...)
234234
if err != nil {
235-
return fmt.Errorf("Failed to build tt executable: %s", err)
235+
return fmt.Errorf("failed to build tt executable: %s", err)
236236
}
237237

238238
return nil

‎magefile.publish.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ func getPatterns(distro Distro) ([]string, error) {
8181
return []string{"*.deb", "*.dsc"}, nil
8282
}
8383

84-
return nil, fmt.Errorf("Unknown OS: %s", distro.OS)
84+
return nil, fmt.Errorf("unknown OS: %s", distro.OS)
8585
}
8686

8787
// PublishRWS puts packages to RWS (Repository Web Service).
@@ -93,19 +93,19 @@ func PublishRWS() error {
9393

9494
patterns, perr := getPatterns(targetDistro)
9595
if perr != nil {
96-
return fmt.Errorf("Failed to publish package for %s/%s: %s",
96+
return fmt.Errorf("failed to publish package for %s/%s: %s",
9797
targetDistro.OS, targetDistro.Dist, perr)
9898
}
9999

100100
files, ferr := walkMatch(distPath, patterns)
101101
if ferr != nil {
102-
return fmt.Errorf("Failed to publish package for %s/%s: %s",
102+
return fmt.Errorf("failed to publish package for %s/%s: %s",
103103
targetDistro.OS, targetDistro.Dist, ferr)
104104
}
105105

106106
rwsUrlPart := os.Getenv("RWS_URL_PART")
107107
if rwsUrlPart == "" {
108-
return fmt.Errorf("Failed to publish package: RWS_URL_PART is not set")
108+
return fmt.Errorf("failed to publish package: RWS_URL_PART is not set")
109109
}
110110

111111
flags := []string{
@@ -123,15 +123,15 @@ func PublishRWS() error {
123123

124124
rwsAuth := os.Getenv("RWS_AUTH")
125125
if rwsAuth == "" {
126-
return fmt.Errorf("Failed to publish package: RWS_AUTH is not set")
126+
return fmt.Errorf("failed to publish package: RWS_AUTH is not set")
127127
}
128128
flags = append(flags, "-u", rwsAuth)
129129

130130
cmd := exec.Command("curl", flags...)
131131

132132
output, err := cmd.CombinedOutput()
133133
if err != nil {
134-
return fmt.Errorf("Failed to publish package for %s/%s: %s, %s",
134+
return fmt.Errorf("failed to publish package for %s/%s: %s, %s",
135135
targetDistro.OS, targetDistro.Dist, err, output)
136136
}
137137
}

0 commit comments

Comments
 (0)