ci/lint: fixed several issues following golangci-lint update

mvisonneau · mvisonneau · commit c7351f9ae4cc · 2024-09-27T13:24:35.000+02:00
diff --git a/.golangci.yml b/.golangci.yml
@@ -1,25 +1,19 @@
 linters:
   enable-all: true
   disable:
-    # Deprecated ones
-    - golint
-    - ifshort
-    - interfacer
-    - maligned
-    - nosnakecase
-    - scopelint
+    # Deprecated
+    - gomnd
 
     # We don't want these ones
-    - exhaustivestruct
     - forcetypeassert
     - gochecknoglobals
     - godox
-    - goerr113
     - ireturn
     - nakedret
     - testpackage
     - varnamelen
     - interfacebloat
+    - wsl
 
     # TODO
     - tagliatelle
@@ -29,7 +23,7 @@ linters:
     - gomoddirectives
     - forbidigo
     - goconst
-    - gomnd
+    - mnd
     - lll
     - dupl
     - depguard
diff --git a/.revive.toml b/.revive.toml
diff --git a/pkg/controller/environments.go b/pkg/controller/environments.go
@@ -130,6 +130,7 @@ func (c *Controller) PullEnvironmentMetrics(ctx context.Context, env schemas.Env
 			if err = c.Store.GetMetric(ctx, &behindCommitsCountMetric); err != nil {
 				return err
 			}
+
 			envBehindCommitCount = behindCommitsCountMetric.Value
 		}
 	}
diff --git a/pkg/controller/jobs.go b/pkg/controller/jobs.go
@@ -161,6 +161,7 @@ func (c *Controller) ProcessJobMetrics(ctx context.Context, ref schemas.Ref, job
 
 	if jobRunCountExists && ((lastJob.ID != job.ID && jobTriggered) || (lastJob.ID == job.ID && jobTriggered && !lastJobTriggered)) {
 		storeGetMetric(ctx, c.Store, &jobRunCount)
+
 		jobRunCount.Value++
 	}
 
diff --git a/pkg/controller/metrics.go b/pkg/controller/metrics.go
@@ -230,6 +230,7 @@ func emitStatusMetric(ctx context.Context, s store.Store, metricKind schemas.Met
 
 				continue
 			}
+
 			statusMetric.Value = 0
 		}
 
diff --git a/pkg/gitlab/branches_test.go b/pkg/gitlab/branches_test.go
@@ -21,7 +21,9 @@ func TestGetProjectBranches(t *testing.T) {
 			assert.Equal(t, []string{"100"}, r.URL.Query()["per_page"])
 			currentPage, err := strconv.Atoi(r.URL.Query()["page"][0])
 			assert.NoError(t, err)
+
 			nextPage := currentPage + 1
+
 			if currentPage == 2 {
 				nextPage = currentPage
 			}
diff --git a/pkg/gitlab/client.go b/pkg/gitlab/client.go
@@ -126,7 +126,7 @@ func (c *Client) ReadinessCheck(ctx context.Context) healthcheck.Check {
 			return fmt.Errorf("HTTP error: empty response")
 		}
 
-		if err == nil && resp.StatusCode != 200 {
+		if err == nil && resp.StatusCode != http.StatusOK {
 			return fmt.Errorf("HTTP error: %d", resp.StatusCode)
 		}
 
diff --git a/pkg/monitor/ui/ui.go b/pkg/monitor/ui/ui.go
@@ -287,12 +287,14 @@ func (m *model) View() string {
 	// TABS
 	{
 		renderedTabs := []string{}
+
 		for tabID, t := range tabs {
 			if m.tabID == tabID {
 				renderedTabs = append(renderedTabs, activeTab.Render(string(t)))
 
 				continue
 			}
+
 			renderedTabs = append(renderedTabs, inactiveTab.Render(string(t)))
 		}
 
diff --git a/pkg/ratelimit/ratelimit.go b/pkg/ratelimit/ratelimit.go
@@ -7,7 +7,7 @@ import (
 
 // Limiter ..
 type Limiter interface {
-	Take(context.Context) time.Duration
+	Take(ctx context.Context) time.Duration
 }
 
 // Take ..
diff --git a/pkg/store/local.go b/pkg/store/local.go
@@ -331,6 +331,7 @@ func (l *Local) UnqueueTask(_ context.Context, tt schemas.TaskType, uniqueID str
 		defer l.tasksMutex.Unlock()
 
 		delete(l.tasks[tt], uniqueID)
+
 		l.executedTasksCount++
 	}
 
diff --git a/pkg/store/store.go b/pkg/store/store.go
@@ -13,37 +13,37 @@ import (
 
 // Store ..
 type Store interface {
-	SetProject(context.Context, schemas.Project) error
-	DelProject(context.Context, schemas.ProjectKey) error
-	GetProject(context.Context, *schemas.Project) error
-	ProjectExists(context.Context, schemas.ProjectKey) (bool, error)
-	Projects(context.Context) (schemas.Projects, error)
-	ProjectsCount(context.Context) (int64, error)
-	SetEnvironment(context.Context, schemas.Environment) error
-	DelEnvironment(context.Context, schemas.EnvironmentKey) error
-	GetEnvironment(context.Context, *schemas.Environment) error
-	EnvironmentExists(context.Context, schemas.EnvironmentKey) (bool, error)
-	Environments(context.Context) (schemas.Environments, error)
-	EnvironmentsCount(context.Context) (int64, error)
-	SetRef(context.Context, schemas.Ref) error
-	DelRef(context.Context, schemas.RefKey) error
-	GetRef(context.Context, *schemas.Ref) error
-	RefExists(context.Context, schemas.RefKey) (bool, error)
-	Refs(context.Context) (schemas.Refs, error)
-	RefsCount(context.Context) (int64, error)
-	SetMetric(context.Context, schemas.Metric) error
-	DelMetric(context.Context, schemas.MetricKey) error
-	GetMetric(context.Context, *schemas.Metric) error
-	MetricExists(context.Context, schemas.MetricKey) (bool, error)
-	Metrics(context.Context) (schemas.Metrics, error)
-	MetricsCount(context.Context) (int64, error)
+	SetProject(ctx context.Context, p schemas.Project) error
+	DelProject(ctx context.Context, pk schemas.ProjectKey) error
+	GetProject(ctx context.Context, p *schemas.Project) error
+	ProjectExists(ctx context.Context, pk schemas.ProjectKey) (bool, error)
+	Projects(ctx context.Context) (schemas.Projects, error)
+	ProjectsCount(ctx context.Context) (int64, error)
+	SetEnvironment(ctx context.Context, e schemas.Environment) error
+	DelEnvironment(ctx context.Context, ek schemas.EnvironmentKey) error
+	GetEnvironment(ctx context.Context, e *schemas.Environment) error
+	EnvironmentExists(ctx context.Context, ek schemas.EnvironmentKey) (bool, error)
+	Environments(ctx context.Context) (schemas.Environments, error)
+	EnvironmentsCount(ctx context.Context) (int64, error)
+	SetRef(ctx context.Context, r schemas.Ref) error
+	DelRef(ctx context.Context, rk schemas.RefKey) error
+	GetRef(ctx context.Context, r *schemas.Ref) error
+	RefExists(ctx context.Context, rk schemas.RefKey) (bool, error)
+	Refs(ctx context.Context) (schemas.Refs, error)
+	RefsCount(ctx context.Context) (int64, error)
+	SetMetric(ctx context.Context, m schemas.Metric) error
+	DelMetric(ctx context.Context, mk schemas.MetricKey) error
+	GetMetric(ctx context.Context, m *schemas.Metric) error
+	MetricExists(ctx context.Context, mk schemas.MetricKey) (bool, error)
+	Metrics(ctx context.Context) (schemas.Metrics, error)
+	MetricsCount(ctx context.Context) (int64, error)
 
 	// Helpers to keep track of currently queued tasks and avoid scheduling them
 	// twice at the risk of ending up with loads of dangling goroutines being locked
-	QueueTask(context.Context, schemas.TaskType, string, string) (bool, error)
-	UnqueueTask(context.Context, schemas.TaskType, string) error
-	CurrentlyQueuedTasksCount(context.Context) (uint64, error)
-	ExecutedTasksCount(context.Context) (uint64, error)
+	QueueTask(ctx context.Context, tt schemas.TaskType, taskUUID, processUUID string) (bool, error)
+	UnqueueTask(ctx context.Context, tt schemas.TaskType, taskUUID string) error
+	CurrentlyQueuedTasksCount(ctx context.Context) (uint64, error)
+	ExecutedTasksCount(ctx context.Context) (uint64, error)
 }
 
 // NewLocalStore ..

Original file line number	Diff line number	Diff line change
`@@ -130,6 +130,7 @@ func (c *Controller) PullEnvironmentMetrics(ctx context.Context, env schemas.Env`
`130`	`130`	`if err = c.Store.GetMetric(ctx, &behindCommitsCountMetric); err != nil {`
`131`	`131`	`return err`
`132`	`132`	`}`
	`133`	`+`
`133`	`134`	`envBehindCommitCount = behindCommitsCountMetric.Value`
`134`	`135`	`}`
`135`	`136`	`}`
Original file line number	Diff line number	Diff line change
`@@ -161,6 +161,7 @@ func (c *Controller) ProcessJobMetrics(ctx context.Context, ref schemas.Ref, job`
`161`	`161`
`162`	`162`	`if jobRunCountExists && ((lastJob.ID != job.ID && jobTriggered) \|\| (lastJob.ID == job.ID && jobTriggered && !lastJobTriggered)) {`
`163`	`163`	`storeGetMetric(ctx, c.Store, &jobRunCount)`
	`164`	`+`
`164`	`165`	`jobRunCount.Value++`
`165`	`166`	`}`
`166`	`167`
Original file line number	Diff line number	Diff line change
`@@ -230,6 +230,7 @@ func emitStatusMetric(ctx context.Context, s store.Store, metricKind schemas.Met`
`230`	`230`
`231`	`231`	`continue`
`232`	`232`	`}`
	`233`	`+`
`233`	`234`	`statusMetric.Value = 0`
`234`	`235`	`}`
`235`	`236`
Original file line number	Diff line number	Diff line change
`@@ -126,7 +126,7 @@ func (c *Client) ReadinessCheck(ctx context.Context) healthcheck.Check {`
`126`	`126`	`return fmt.Errorf("HTTP error: empty response")`
`127`	`127`	`}`
`128`	`128`
`129`		`- if err == nil && resp.StatusCode != 200 {`
	`129`	`+ if err == nil && resp.StatusCode != http.StatusOK {`
`130`	`130`	`return fmt.Errorf("HTTP error: %d", resp.StatusCode)`
`131`	`131`	`}`
`132`	`132`
Original file line number	Diff line number	Diff line change
`@@ -287,12 +287,14 @@ func (m *model) View() string {`
`287`	`287`	`// TABS`
`288`	`288`	`{`
`289`	`289`	`renderedTabs := []string{}`
	`290`	`+`
`290`	`291`	`for tabID, t := range tabs {`
`291`	`292`	`if m.tabID == tabID {`
`292`	`293`	`renderedTabs = append(renderedTabs, activeTab.Render(string(t)))`
`293`	`294`
`294`	`295`	`continue`
`295`	`296`	`}`
	`297`	`+`
`296`	`298`	`renderedTabs = append(renderedTabs, inactiveTab.Render(string(t)))`
`297`	`299`	`}`
`298`	`300`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ import (`
`7`	`7`
`8`	`8`	`// Limiter ..`
`9`	`9`	`type Limiter interface {`
`10`		`- Take(context.Context) time.Duration`
	`10`	`+ Take(ctx context.Context) time.Duration`
`11`	`11`	`}`
`12`	`12`
`13`	`13`	`// Take ..`
Original file line number	Diff line number	Diff line change
`@@ -331,6 +331,7 @@ func (l *Local) UnqueueTask(_ context.Context, tt schemas.TaskType, uniqueID str`
`331`	`331`	`defer l.tasksMutex.Unlock()`
`332`	`332`
`333`	`333`	`delete(l.tasks[tt], uniqueID)`
	`334`	`+`
`334`	`335`	`l.executedTasksCount++`
`335`	`336`	`}`
`336`	`337`