Skip to content

Commit 4fc9f29

Browse files
agneumagneum
committed
chore: update linter and fix new warnings
1 parent 947630e commit 4fc9f29

File tree

21 files changed

+33
-109
lines changed

21 files changed

+33
-109
lines changed

‎engine/.golangci.yml

-3
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,6 @@ linters-settings:
6666

6767
linters:
6868
enable:
69-
- deadcode
7069
- depguard
7170
- dupl
7271
- errcheck
@@ -83,10 +82,8 @@ linters:
8382
- misspell
8483
- prealloc
8584
- revive
86-
- structcheck
8785
- stylecheck
8886
- unconvert
89-
- varcheck
9087
- unused
9188
- unparam
9289
- wsl

‎engine/Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ help: ## Display the help message
3434
all: clean build ## Build all binary components of the project
3535

3636
install-lint: ## Install the linter to $GOPATH/bin which is expected to be in $PATH
37-
curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin v1.45.2
37+
curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin v1.52.2
3838

3939
run-lint: ## Run linters
4040
golangci-lint run

‎engine/cmd/cli/commands/clone/actions.go

+1-5
Original file line numberDiff line numberDiff line change
@@ -402,11 +402,7 @@ func forward(cliCtx *cli.Context) error {
402402

403403
log.Msg(fmt.Sprintf("The clone is available by address: %s", tunnel.Endpoints.Local))
404404

405-
if err := tunnel.Listen(cliCtx.Context); err != nil {
406-
return err
407-
}
408-
409-
return nil
405+
return tunnel.Listen(cliCtx.Context)
410406
}
411407

412408
func retrieveClonePort(cliCtx *cli.Context, wg *sync.WaitGroup, remoteHost *url.URL) (string, error) {

‎engine/cmd/cli/commands/clone/command_list.go

+1-5
Original file line numberDiff line numberDiff line change
@@ -225,11 +225,7 @@ func CommandList() []*cli.Command {
225225
return err
226226
}
227227

228-
if err := commands.CheckForwardingServerURL(ctxCli); err != nil {
229-
return err
230-
}
231-
232-
return nil
228+
return commands.CheckForwardingServerURL(ctxCli)
233229
},
234230
Action: forward,
235231
},

‎engine/cmd/cli/commands/config/file.go

+1-5
Original file line numberDiff line numberDiff line change
@@ -77,9 +77,5 @@ func SaveConfig(filename string, cfg *CLIConfig) error {
7777
return err
7878
}
7979

80-
if err := os.WriteFile(filename, configData, 0600); err != nil {
81-
return err
82-
}
83-
84-
return nil
80+
return os.WriteFile(filename, configData, 0600)
8581
}

‎engine/cmd/cli/commands/global/actions.go

+1-5
Original file line numberDiff line numberDiff line change
@@ -77,9 +77,5 @@ func forward(cliCtx *cli.Context) error {
7777

7878
log.Msg(fmt.Sprintf("The connection is available by address: %s", tunnel.Endpoints.Local))
7979

80-
if err := tunnel.Listen(cliCtx.Context); err != nil {
81-
return err
82-
}
83-
84-
return nil
80+
return tunnel.Listen(cliCtx.Context)
8581
}

‎engine/cmd/cli/main.go

+1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
// Package main contains the starting point of the CLI tool.
12
package main
23

34
import (

‎engine/cmd/database-lab/main.go

+1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
// - Validate configs in all components.
77
// - Tests.
88

9+
// Package main contains the starting point of the DLE server.
910
package main
1011

1112
import (

‎engine/cmd/runci/main.go

+1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
// Package main contains the starting point of the CI Checker tool.
12
package main
23

34
import (

‎engine/internal/billing/billing.go

+1-5
Original file line numberDiff line numberDiff line change
@@ -86,11 +86,7 @@ func (b *Billing) RegisterInstance(ctx context.Context, systemMetrics models.Sys
8686
}
8787

8888
// To check billing state immediately.
89-
if err := b.SendUsage(ctx, systemMetrics); err != nil {
90-
return err
91-
}
92-
93-
return nil
89+
return b.SendUsage(ctx, systemMetrics)
9490
}
9591

9692
// CollectUsage periodically collects usage statistics of the instance.

‎engine/internal/observer/observer.go

+1-5
Original file line numberDiff line numberDiff line change
@@ -131,11 +131,7 @@ func (o *Observer) processCSVLogFile(ctx context.Context, buf io.Writer, filenam
131131
}
132132
}()
133133

134-
if err := o.scanCSVLogFile(ctx, logFile, buf, obsClone); err != nil {
135-
return err
136-
}
137-
138-
return nil
134+
return o.scanCSVLogFile(ctx, logFile, buf, obsClone)
139135
}
140136

141137
func (o *Observer) scanCSVLogFile(ctx context.Context, reader io.Reader, writer io.Writer, obsClone *ObservingClone) error {

‎engine/internal/observer/observing_clone.go

+2-6
Original file line numberDiff line numberDiff line change
@@ -393,7 +393,7 @@ func (c *ObservingClone) storeArtifacts() error {
393393
}
394394

395395
if err := c.collectCurrentState(ctx); err != nil {
396-
return err
396+
return errors.Wrap(err, "failed to collect current state")
397397
}
398398

399399
return nil
@@ -412,11 +412,7 @@ func (c *ObservingClone) collectCurrentState(ctx context.Context) error {
412412
return err
413413
}
414414

415-
if err := c.countLogErrors(ctx, &c.session.state.LogErrors); err != nil {
416-
return err
417-
}
418-
419-
return nil
415+
return c.countLogErrors(ctx, &c.session.state.LogErrors)
420416
}
421417

422418
func (c *ObservingClone) discoverLogFields(ctx context.Context) error {

‎engine/internal/observer/stats.go

+1-5
Original file line numberDiff line numberDiff line change
@@ -381,11 +381,7 @@ func initStatFile(filename string) error {
381381
return err
382382
}
383383

384-
if err := os.Chmod(filename, 0666); err != nil {
385-
return err
386-
}
387-
388-
return nil
384+
return os.Chmod(filename, 0666)
389385
}
390386

391387
// IsAvailableArtifactType checks if artifact type is available.

‎engine/internal/provision/databases/postgres/pgconfig/configuration.go

+8-40
Original file line numberDiff line numberDiff line change
@@ -295,11 +295,7 @@ func (m *Manager) adjustGeneralConfigs() error {
295295

296296
// AppendGeneralConfig appends configuration parameters to a general configuration file.
297297
func (m *Manager) AppendGeneralConfig(cfg map[string]string) error {
298-
if err := appendExtraConf(m.getConfigPath(PgConfName), cfg); err != nil {
299-
return err
300-
}
301-
302-
return nil
298+
return appendExtraConf(m.getConfigPath(PgConfName), cfg)
303299
}
304300

305301
// AdjustRecoveryFiles adjusts a recovery files.
@@ -332,11 +328,7 @@ func (m *Manager) ApplyRecovery(cfg map[string]string) error {
332328
return err
333329
}
334330

335-
if err := appendExtraConf(m.recoveryPath(), cfg); err != nil {
336-
return err
337-
}
338-
339-
return nil
331+
return appendExtraConf(m.recoveryPath(), cfg)
340332
}
341333

342334
// ReadRecoveryConfig reads a recovery configuration file.
@@ -363,11 +355,7 @@ func (m *Manager) RemoveRecoveryConfig() error {
363355
return err
364356
}
365357

366-
if err := m.removeOptionally(m.recoverySignalPath()); err != nil {
367-
return err
368-
}
369-
370-
return nil
358+
return m.removeOptionally(m.recoverySignalPath())
371359
}
372360

373361
func (m *Manager) removeOptionally(filepath string) error {
@@ -384,20 +372,12 @@ func (m *Manager) removeOptionally(filepath string) error {
384372
// ApplyPgControl applies significant configuration parameters extracted by the pg_control tool.
385373
func (m *Manager) ApplyPgControl(pgControl map[string]string) error {
386374
// TODO (akartasov): add a label check to skip an already initialized pg_control config.
387-
if err := m.rewriteConfig(m.getConfigPath(pgControlName), pgControl); err != nil {
388-
return err
389-
}
390-
391-
return nil
375+
return m.rewriteConfig(m.getConfigPath(pgControlName), pgControl)
392376
}
393377

394378
// ApplySync applies configuration parameters for sync instance.
395379
func (m *Manager) ApplySync(cfg map[string]string) error {
396-
if err := m.rewriteConfig(m.getConfigPath(syncConfigName), cfg); err != nil {
397-
return err
398-
}
399-
400-
return nil
380+
return m.rewriteConfig(m.getConfigPath(syncConfigName), cfg)
401381
}
402382

403383
// TruncateSyncConfig truncates a sync configuration file.
@@ -407,11 +387,7 @@ func (m *Manager) TruncateSyncConfig() error {
407387

408388
// ApplyPromotion applies promotion configuration parameters.
409389
func (m *Manager) ApplyPromotion(cfg map[string]string) error {
410-
if err := m.rewriteConfig(m.getConfigPath(promotionConfigName), cfg); err != nil {
411-
return err
412-
}
413-
414-
return nil
390+
return m.rewriteConfig(m.getConfigPath(promotionConfigName), cfg)
415391
}
416392

417393
// TruncatePromotionConfig truncates a promotion configuration file.
@@ -421,20 +397,12 @@ func (m *Manager) TruncatePromotionConfig() error {
421397

422398
// ApplySnapshot applies snapshot configuration parameters.
423399
func (m *Manager) ApplySnapshot(cfg map[string]string) error {
424-
if err := m.rewriteConfig(m.getConfigPath(snapshotConfigName), cfg); err != nil {
425-
return err
426-
}
427-
428-
return nil
400+
return m.rewriteConfig(m.getConfigPath(snapshotConfigName), cfg)
429401
}
430402

431403
// ApplyUserConfig applies user-defined configuration.
432404
func (m *Manager) ApplyUserConfig(cfg map[string]string) error {
433-
if err := m.rewriteConfig(m.getConfigPath(userConfigName), cfg); err != nil {
434-
return err
435-
}
436-
437-
return nil
405+
return m.rewriteConfig(m.getConfigPath(userConfigName), cfg)
438406
}
439407

440408
// getConfigPath builds a path of the Database Lab config file.

‎engine/internal/provision/docker/docker.go

+1-5
Original file line numberDiff line numberDiff line change
@@ -186,11 +186,7 @@ func createSocketCloneDir(socketCloneDir string) error {
186186
return err
187187
}
188188

189-
if err := os.Chmod(socketCloneDir, 0777); err != nil {
190-
return err
191-
}
192-
193-
return nil
189+
return os.Chmod(socketCloneDir, 0777)
194190
}
195191

196192
// StopContainer stops specified container.

‎engine/internal/provision/mode_local_test.go

+6-6
Original file line numberDiff line numberDiff line change
@@ -62,27 +62,27 @@ type mockFSManager struct {
6262
cloneList []string
6363
}
6464

65-
func (m mockFSManager) CreateClone(name, snapshotID string) error {
65+
func (m mockFSManager) CreateClone(_, _ string) error {
6666
return nil
6767
}
6868

69-
func (m mockFSManager) DestroyClone(name string) error {
69+
func (m mockFSManager) DestroyClone(_ string) error {
7070
return nil
7171
}
7272

7373
func (m mockFSManager) ListClonesNames() ([]string, error) {
7474
return m.cloneList, nil
7575
}
7676

77-
func (m mockFSManager) CreateSnapshot(poolSuffix, dataStateAt string) (snapshotName string, err error) {
77+
func (m mockFSManager) CreateSnapshot(_, _ string) (snapshotName string, err error) {
7878
return "", nil
7979
}
8080

81-
func (m mockFSManager) DestroySnapshot(snapshotName string) (err error) {
81+
func (m mockFSManager) DestroySnapshot(_ string) (err error) {
8282
return nil
8383
}
8484

85-
func (m mockFSManager) CleanupSnapshots(retentionLimit int) ([]string, error) {
85+
func (m mockFSManager) CleanupSnapshots(_ int) ([]string, error) {
8686
return nil, nil
8787
}
8888

@@ -93,7 +93,7 @@ func (m mockFSManager) SnapshotList() []resources.Snapshot {
9393
func (m mockFSManager) RefreshSnapshotList() {
9494
}
9595

96-
func (m mockFSManager) GetSessionState(name string) (*resources.SessionState, error) {
96+
func (m mockFSManager) GetSessionState(_ string) (*resources.SessionState, error) {
9797
return nil, nil
9898
}
9999

‎engine/internal/provision/thinclones/zfs/zfs.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -346,7 +346,7 @@ func getSnapshotName(pool, dataStateAt string) string {
346346
}
347347

348348
// RollbackSnapshot rollbacks ZFS snapshot.
349-
func RollbackSnapshot(r runners.Runner, pool string, snapshot string) error {
349+
func RollbackSnapshot(r runners.Runner, _ string, snapshot string) error {
350350
cmd := fmt.Sprintf("zfs rollback -f -r %s", snapshot)
351351

352352
if _, err := r.Run(cmd, true); err != nil {

‎engine/internal/retrieval/dbmarker/dbmarker.go

+1-5
Original file line numberDiff line numberDiff line change
@@ -96,11 +96,7 @@ func (m *Marker) SaveConfig(cfg *Config) error {
9696
return err
9797
}
9898

99-
if err := os.WriteFile(m.buildFileName(), configData, 0600); err != nil {
100-
return err
101-
}
102-
103-
return nil
99+
return os.WriteFile(m.buildFileName(), configData, 0600)
104100
}
105101

106102
// buildFileName builds a DBMarker config filename.

‎engine/internal/retrieval/engine/postgres/physical/custom.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,6 @@ func (c *custom) GetRecoveryConfig(pgVersion float64) map[string]string {
5050
}
5151

5252
// Init initialize custom recovery tool to work in provided container.
53-
func (c *custom) Init(ctx context.Context, containerID string) error {
53+
func (c *custom) Init(_ context.Context, _ string) error {
5454
return nil
5555
}

‎engine/internal/retrieval/engine/postgres/physical/pgbackrest.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,6 @@ func (p *pgbackrest) GetRecoveryConfig(pgVersion float64) map[string]string {
5757
}
5858

5959
// Init initialize pgbackrest tool.
60-
func (p *pgbackrest) Init(ctx context.Context, containerID string) error {
60+
func (p *pgbackrest) Init(_ context.Context, _ string) error {
6161
return nil
6262
}

‎engine/internal/retrieval/engine/postgres/snapshot/physical.go

+1-5
Original file line numberDiff line numberDiff line change
@@ -210,11 +210,7 @@ func (p *PhysicalInitial) validateConfig() error {
210210
strings.Join(notSupportedSysctls, ", "))
211211
}
212212

213-
if err := p.validateScheduler(); err != nil {
214-
return err
215-
}
216-
217-
return nil
213+
return p.validateScheduler()
218214
}
219215

220216
func (p *PhysicalInitial) hasSchedulingOptions() bool {

0 commit comments

Comments
 (0)