Merge branch 'main' into woodpecker-fix-log-tail-cpu-lock

.cspell.json

@@ -79,7 +79,18 @@
     "HEALTHCHECK",
     "devx",
     "gomod",
-    "laszlocph"
+    "laszlocph",
+    "charmbracelet",
+    "GODEBUG",
+    "netdns",
+    "BUILDPLATFORM",
+    "repology",
+    "WORKDIR",
+    "corepack",
+    "binutils",
+    "nocolor",
+    "logfile",
+    "Keyfunc"
   ],
   "ignorePaths": [
     "**/node_modules/**/*",
@@ -103,10 +114,8 @@
     "agent/",
     "cli/",
     "cmd/",
-    "docker/",
     "docs/",
     "pipeline/",
-    "shared/",
     "server/"
   ],
   "enableFiletypes": ["dockercompose"]

agent/rpc/client_grpc.go

@@ -53,6 +53,7 @@ func (c *client) Close() error {
 
 func (c *client) newBackOff() backoff.BackOff {
 	b := backoff.NewExponentialBackOff()
+	b.MaxElapsedTime = 0
 	b.MaxInterval = 10 * time.Second          //nolint: gomnd
 	b.InitialInterval = 10 * time.Millisecond //nolint: gomnd
 	return b

pipeline/backend/docker/docker.go

@@ -213,7 +213,7 @@ func (e *docker) StartStep(ctx context.Context, step *backend.Step, taskUUID str
 	}
 
 	// add default volumes to the host configuration
-	hostConfig.Binds = utils.DedupStrings(append(hostConfig.Binds, e.volumes...))
+	hostConfig.Binds = utils.DeduplicateStrings(append(hostConfig.Binds, e.volumes...))
 
 	_, err := e.client.ContainerCreate(ctx, config, hostConfig, nil, nil, containerName)
 	if client.IsErrNotFound(err) {

server/forge/bitbucket/bitbucket.go

@@ -17,6 +17,7 @@ package bitbucket
 
 import (
 	"context"
+	"errors"
 	"fmt"
 	"net/http"
 	"net/url"
@@ -232,9 +233,15 @@ func (c *config) Repos(ctx context.Context, u *model.User) ([]*model.Repo, error
 func (c *config) File(ctx context.Context, u *model.User, r *model.Repo, p *model.Pipeline, f string) ([]byte, error) {
 	config, err := c.newClient(ctx, u).FindSource(r.Owner, r.Name, p.Commit, f)
 	if err != nil {
+		var rspErr internal.Error
+		if ok := errors.As(err, &rspErr); ok && rspErr.Status == http.StatusNotFound {
+			return nil, &forge_types.ErrConfigNotFound{
+				Configs: []string{f},
+			}
+		}
 		return nil, err
 	}
-	return []byte(*config), err
+	return []byte(*config), nil
 }
 
 // Dir fetches a folder from the bitbucket repository
@@ -245,6 +252,12 @@ func (c *config) Dir(ctx context.Context, u *model.User, r *model.Repo, p *model
 	for {
 		filesResp, err := client.GetRepoFiles(r.Owner, r.Name, p.Commit, f, page)
 		if err != nil {
+			var rspErr internal.Error
+			if ok := errors.As(err, &rspErr); ok && rspErr.Status == http.StatusNotFound {
+				return nil, &forge_types.ErrConfigNotFound{
+					Configs: []string{f},
+				}
+			}
 			return nil, err
 		}
 		for _, file := range filesResp.Values {

server/forge/bitbucket/bitbucket_test.go

@@ -18,6 +18,7 @@ package bitbucket
 import (
 	"bytes"
 	"context"
+	"errors"
 	"net/http"
 	"net/http/httptest"
 	"testing"
@@ -179,6 +180,7 @@ func Test_bitbucket(t *testing.T) {
 			g.It("Should handle not found error", func() {
 				_, err := c.File(ctx, fakeUser, fakeRepo, fakePipeline, "file_not_found")
 				g.Assert(err).IsNotNil()
+				g.Assert(errors.Is(err, &types.ErrConfigNotFound{})).IsTrue()
 			})
 		})
 
@@ -222,8 +224,9 @@ func Test_bitbucket(t *testing.T) {
 				g.Assert(string(files[0].Data)).Equal("dummy payload")
 			})
 			g.It("Should handle not found errors", func() {
-				_, err := c.Dir(ctx, fakeUser, fakeRepo, fakePipeline, "/dir_not_found")
+				_, err := c.Dir(ctx, fakeUser, fakeRepo, fakePipeline, "dir_not_found/")
 				g.Assert(err).IsNotNil()
+				g.Assert(errors.Is(err, &types.ErrConfigNotFound{})).IsTrue()
 			})
 		})
 

server/forge/gitea/helper.go

@@ -118,7 +118,7 @@ func getChangedFilesFromPushHook(hook *pushHook) []string {
 	files = append(files, hook.HeadCommit.Removed...)
 	files = append(files, hook.HeadCommit.Modified...)
 
-	return utils.DedupStrings(files)
+	return utils.DeduplicateStrings(files)
 }
 
 // helper function that extracts the Pipeline data from a Gitea tag hook

server/forge/github/github.go

@@ -630,7 +630,7 @@ func (c *client) loadChangedFilesFromPullRequest(ctx context.Context, pull *gith
 
 			opts.Page = resp.NextPage
 		}
-		return utils.DedupStrings(fileList), nil
+		return utils.DeduplicateStrings(fileList), nil
 	})
 
 	return pipeline, err

server/forge/github/parse.go

@@ -215,5 +215,5 @@ func getChangedFilesFromCommits(commits []*github.HeadCommit) []string {
 		files = append(files, cm.Removed...)
 		files = append(files, cm.Modified...)
 	}
-	return utils.DedupStrings(files)
+	return utils.DeduplicateStrings(files)
 }

server/forge/gitlab/convert.go

@@ -189,7 +189,7 @@ func convertPushHook(hook *gitlab.PushEvent) (*model.Repo, *model.Pipeline, erro
 		files = append(files, cm.Removed...)
 		files = append(files, cm.Modified...)
 	}
-	pipeline.ChangedFiles = utils.DedupStrings(files)
+	pipeline.ChangedFiles = utils.DeduplicateStrings(files)
 
 	return repo, pipeline, nil
 }

server/forge/gitlab/gitlab.go

@@ -808,7 +808,7 @@ func (g *GitLab) loadChangedFilesFromMergeRequest(ctx context.Context, tmpRepo *
 	for _, file := range changes {
 		files = append(files, file.NewPath, file.OldPath)
 	}
-	pipeline.ChangedFiles = utils.DedupStrings(files)
+	pipeline.ChangedFiles = utils.DeduplicateStrings(files)
 
 	return pipeline, nil
 }

shared/token/token.go

@@ -139,19 +139,19 @@ func keyFunc(token *Token, fn SecretFunc) jwt.Keyfunc {
 
 		// extract the token kind and cast to
 		// the expected type.
-		kindv, ok := claims["type"]
+		kind, ok := claims["type"]
 		if !ok {
 			return nil, jwt.ErrInvalidType
 		}
-		token.Kind, _ = kindv.(string)
+		token.Kind, _ = kind.(string)
 
 		// extract the token value and cast to
 		// expected type.
-		textv, ok := claims["text"]
+		text, ok := claims["text"]
 		if !ok {
 			return nil, jwt.ErrInvalidType
 		}
-		token.Text, _ = textv.(string)
+		token.Text, _ = text.(string)
 
 		// invoke the callback function to retrieve
 		// the secret key used to verify

shared/utils/strings.go

@@ -14,8 +14,8 @@
 
 package utils
 
-// DedupStrings deduplicate string list, empty items are dropped
-func DedupStrings(src []string) []string {
+// DeduplicateStrings deduplicate string list, empty items are dropped
+func DeduplicateStrings(src []string) []string {
 	m := make(map[string]struct{}, len(src))
 	dst := make([]string, 0, len(src))
 

shared/utils/strings_test.go

@@ -21,7 +21,7 @@ import (
 	"github.com/stretchr/testify/assert"
 )
 
-func TestDedupStrings(t *testing.T) {
+func TestDeduplicateStrings(t *testing.T) {
 	tests := []struct {
 		in  []string
 		out []string
@@ -37,7 +37,7 @@ func TestDedupStrings(t *testing.T) {
 	}}
 
 	for _, tc := range tests {
-		result := DedupStrings(tc.in)
+		result := DeduplicateStrings(tc.in)
 		sort.Strings(result)
 		if len(tc.out) == 0 {
 			assert.Len(t, result, 0)