From 0b91317cdebfe9eec8bb8b5f29ae4b2a93cc412f Mon Sep 17 00:00:00 2001 From: Anbraten <6918444+anbraten@users.noreply.github.com> Date: Thu, 8 Feb 2024 22:49:07 +0100 Subject: [PATCH] Fix linter (#3354) --- pipeline/backend/kubernetes/kubernetes.go | 4 ++-- pipeline/frontend/yaml/compiler/option.go | 2 +- server/logging/log_test.go | 6 +++--- server/pipeline/queue.go | 6 +++--- server/pubsub/pub_test.go | 2 +- server/router/middleware/session/agent.go | 2 +- server/router/middleware/session/user.go | 2 +- server/store/datastore/migration/migration.go | 2 +- woodpecker-go/woodpecker/client_test.go | 2 +- 9 files changed, 14 insertions(+), 14 deletions(-) diff --git a/pipeline/backend/kubernetes/kubernetes.go b/pipeline/backend/kubernetes/kubernetes.go index 299dc2595..69b2a7dde 100644 --- a/pipeline/backend/kubernetes/kubernetes.go +++ b/pipeline/backend/kubernetes/kubernetes.go @@ -230,7 +230,7 @@ func (e *kube) WaitStep(ctx context.Context, step *types.Step, taskUUID string) finished := make(chan bool) - podUpdated := func(old, new any) { + podUpdated := func(_, new any) { pod, ok := new.(*v1.Pod) if !ok { log.Error().Msgf("could not parse pod: %v", new) @@ -307,7 +307,7 @@ func (e *kube) TailStep(ctx context.Context, step *types.Step, taskUUID string) up := make(chan bool) - podUpdated := func(old, new any) { + podUpdated := func(_, new any) { pod, ok := new.(*v1.Pod) if !ok { log.Error().Msgf("could not parse pod: %v", new) diff --git a/pipeline/frontend/yaml/compiler/option.go b/pipeline/frontend/yaml/compiler/option.go index afe9dfe95..3fb651756 100644 --- a/pipeline/frontend/yaml/compiler/option.go +++ b/pipeline/frontend/yaml/compiler/option.go @@ -36,7 +36,7 @@ func WithOption(option Option, b bool) Option { case b: return option default: - return func(compiler *Compiler) {} + return func(_ *Compiler) {} } } diff --git a/server/logging/log_test.go b/server/logging/log_test.go index 3ca442e2a..90565a48f 100644 --- a/server/logging/log_test.go +++ b/server/logging/log_test.go @@ -42,10 +42,10 @@ func TestLogging(t *testing.T) { logger := New() assert.NoError(t, logger.Open(ctx, testStepID)) go func() { - assert.NoError(t, logger.Tail(ctx, testStepID, func(entry ...*model.LogEntry) { wg.Done() })) + assert.NoError(t, logger.Tail(ctx, testStepID, func(_ ...*model.LogEntry) { wg.Done() })) }() go func() { - assert.NoError(t, logger.Tail(ctx, testStepID, func(entry ...*model.LogEntry) { wg.Done() })) + assert.NoError(t, logger.Tail(ctx, testStepID, func(_ ...*model.LogEntry) { wg.Done() })) }() <-time.After(500 * time.Millisecond) @@ -60,7 +60,7 @@ func TestLogging(t *testing.T) { wg.Add(1) go func() { - assert.NoError(t, logger.Tail(ctx, testStepID, func(entry ...*model.LogEntry) { wg.Done() })) + assert.NoError(t, logger.Tail(ctx, testStepID, func(_ ...*model.LogEntry) { wg.Done() })) }() <-time.After(500 * time.Millisecond) diff --git a/server/pipeline/queue.go b/server/pipeline/queue.go index c8b1fc77e..73bf30fd8 100644 --- a/server/pipeline/queue.go +++ b/server/pipeline/queue.go @@ -38,7 +38,7 @@ func queuePipeline(ctx context.Context, repo *model.Repo, pipelineItems []*stepb task.Labels[k] = v } task.Labels["repo"] = repo.FullName - task.Dependencies = taskIds(item.DependsOn, pipelineItems) + task.Dependencies = taskIDs(item.DependsOn, pipelineItems) task.RunOn = item.RunsOn task.DepStatus = make(map[string]model.StatusValue) @@ -57,11 +57,11 @@ func queuePipeline(ctx context.Context, repo *model.Repo, pipelineItems []*stepb return server.Config.Services.Queue.PushAtOnce(ctx, tasks) } -func taskIds(dependsOn []string, pipelineItems []*stepbuilder.Item) (taskIds []string) { +func taskIDs(dependsOn []string, pipelineItems []*stepbuilder.Item) (taskIDs []string) { for _, dep := range dependsOn { for _, pipelineItem := range pipelineItems { if pipelineItem.Workflow.Name == dep { - taskIds = append(taskIds, fmt.Sprint(pipelineItem.Workflow.ID)) + taskIDs = append(taskIDs, fmt.Sprint(pipelineItem.Workflow.ID)) } } } diff --git a/server/pubsub/pub_test.go b/server/pubsub/pub_test.go index 3a0d51558..a8af81ede 100644 --- a/server/pubsub/pub_test.go +++ b/server/pubsub/pub_test.go @@ -41,7 +41,7 @@ func TestPubsub(t *testing.T) { broker.Subscribe(ctx, func(message Message) { assert.Equal(t, testMessage, message); wg.Done() }) }() go func() { - broker.Subscribe(ctx, func(message Message) { wg.Done() }) + broker.Subscribe(ctx, func(_ Message) { wg.Done() }) }() <-time.After(500 * time.Millisecond) diff --git a/server/router/middleware/session/agent.go b/server/router/middleware/session/agent.go index 7f873e03f..3f96a57c0 100644 --- a/server/router/middleware/session/agent.go +++ b/server/router/middleware/session/agent.go @@ -29,7 +29,7 @@ func AuthorizeAgent(c *gin.Context) { return } - parsed, err := token.ParseRequest(c.Request, func(t *token.Token) (string, error) { + parsed, err := token.ParseRequest(c.Request, func(_ *token.Token) (string, error) { return secret, nil }) switch { diff --git a/server/router/middleware/session/user.go b/server/router/middleware/session/user.go index 3dd9735ba..a622f9c92 100644 --- a/server/router/middleware/session/user.go +++ b/server/router/middleware/session/user.go @@ -55,7 +55,7 @@ func SetUser() gin.HandlerFunc { // this means the user is accessing with a web browser, // so we should implement CSRF protection measures. if t.Kind == token.SessToken { - err = token.CheckCsrf(c.Request, func(t *token.Token) (string, error) { + err = token.CheckCsrf(c.Request, func(_ *token.Token) (string, error) { return user.Hash, nil }) // if csrf token validation fails, exit immediately diff --git a/server/store/datastore/migration/migration.go b/server/store/datastore/migration/migration.go index ceb001c5c..6799c3e8e 100644 --- a/server/store/datastore/migration/migration.go +++ b/server/store/datastore/migration/migration.go @@ -90,7 +90,7 @@ func Migrate(e *xorm.Engine, allowLong bool) error { if oldCount < 1 || err != nil { // allow new schema initialization if old migrations table is empty or it does not exist (err != nil) // schema initialization will always run if we call `InitSchema` - m.InitSchema(func(engine *xorm.Engine) error { + m.InitSchema(func(_ *xorm.Engine) error { // do nothing on schema init, models are synced in any case below return nil }) diff --git a/woodpecker-go/woodpecker/client_test.go b/woodpecker-go/woodpecker/client_test.go index 15d6ab876..a5ad5a2b7 100644 --- a/woodpecker-go/woodpecker/client_test.go +++ b/woodpecker-go/woodpecker/client_test.go @@ -26,7 +26,7 @@ import ( ) func Test_QueueInfo(t *testing.T) { - fixtureHandler := func(w http.ResponseWriter, r *http.Request) { + fixtureHandler := func(w http.ResponseWriter, _ *http.Request) { fmt.Fprint(w, `{ "pending": null, "running": [