Update dependencies

.github/workflows/golangci-lint.yml

@@ -19,9 +19,12 @@ jobs:
         with:
           go-version-file: .go-version
       - name: golangci-lint
-        uses: golangci/golangci-lint-action@v3.4.0
+        uses: golangci/golangci-lint-action@v6.0.1
         with:
-          version: v1.51.2
-          args: --timeout=30m --whole-files
-          # Optional: show only new issues if it's a pull request. The default value is `false`.
-          only-new-issues: true
+          # Optional: version of golangci-lint to use in form of v1.2 or v1.2.3 or `latest` to use the latest version
+          version: v1.59.1
+          # Optional: golangci-lint command line arguments.
+          args: --timeout=30m
+          # Optional: if set to true then the all caching functionality will be complete disabled,
+          #           takes precedence over all other caching options.
+          skip-cache: true

.go-version

@@ -1 +1 @@
-1.20.5
+1.22.5

.goreleaser.yml

@@ -19,12 +19,14 @@ builds:
     main: ./cli/main.go
     binary: op
 archives:
-  - replacements:
-      darwin: Darwin
-      linux: Linux
-      windows: Windows
-      386: i386
-      amd64: x86_64
+  - id: rename_arch
+    name_template: >-
+      {{- .ProjectName }}_
+      {{- title .Os }}_
+      {{- if eq .Arch "amd64" }}x86_64
+      {{- else if eq .Arch "386" }}i386
+      {{- else }}{{ .Arch }}{{ end }}
+      {{- if .Arm }}v{{ .Arm }}{{ end -}}
 checksum:
   name_template: 'checksums.txt'
 snapshot:

internal/deploy/compose.go

@@ -16,7 +16,7 @@
 	"go.elastic.co/apm/v2"
 
 	log "github.com/sirupsen/logrus"
-	tc "github.com/testcontainers/testcontainers-go"
+	tc "github.com/testcontainers/testcontainers-go/modules/compose"
 )
 
 // ServiceManager manages lifecycle of a service
@@ -212,8 +212,8 @@
 		composeFilePaths = append(composeFilePaths, composeFilePath)
 	}
 
 	compose := tc.NewLocalDockerCompose(composeFilePaths, profile.Name)
 	dc := compose.
 		WithCommand(command).
 		WithEnv(env)
 

internal/deploy/docker_client.go

@@ -23,7 +23,10 @@
 	"github.com/cenkalti/backoff/v4"
 	"github.com/docker/cli/cli/connhelper"
 	"github.com/docker/docker/api/types"
+	"github.com/docker/docker/api/types/container"
 	"github.com/docker/docker/api/types/filters"
+	imageTypes "github.com/docker/docker/api/types/image"
+	"github.com/docker/docker/api/types/registry"
 	"github.com/docker/docker/client"
 	"github.com/docker/docker/pkg/stdcopy"
 	"github.com/elastic/e2e-testing/internal/shell"
@@ -138,7 +141,7 @@
 		}
 	}
 
-	err = dockerClient.CopyToContainer(ctx, containerName, parentDir, &buffer, types.CopyToContainerOptions{AllowOverwriteDirWithFile: true})
+	err = dockerClient.CopyToContainer(ctx, containerName, parentDir, &buffer, container.CopyToContainerOptions{AllowOverwriteDirWithFile: true})
 	if err != nil {
 		log.WithFields(log.Fields{
 			"container": containerName,
@@ -176,7 +179,7 @@
 	}).Trace("Creating command to be executed in container")
 
 	response, err := dockerClient.ContainerExecCreate(
 		ctx, containerName, types.ExecConfig{
 			User:         user,
 			Tty:          tty,
 			AttachStdin:  false,
@@ -207,7 +210,7 @@
 		"tty":       tty,
 	}).Trace("Command to be executed in container created")
 
 	resp, err := dockerClient.ContainerExecAttach(ctx, response.ID, types.ExecStartCheck{
 		Detach: detach,
 		Tty:    tty,
 	})
@@ -315,7 +318,7 @@
 	labelFilters := filters.NewArgs()
 	labelFilters.Add("name", service.Name)
 
-	containers, err := dockerClient.ContainerList(context.Background(), types.ContainerListOptions{All: true, Filters: labelFilters})
+	containers, err := dockerClient.ContainerList(context.Background(), container.ListOptions{All: true, Filters: labelFilters})
 	if err != nil {
 		log.WithFields(log.Fields{
 			"error":  err,
@@ -342,7 +345,7 @@
 	defer dockerClient.Close()
 	ctx := context.Background()
 
-	containers, err := dockerClient.ContainerList(ctx, types.ContainerListOptions{})
+	containers, err := dockerClient.ContainerList(ctx, container.ListOptions{})
 	if err != nil {
 		return []types.Container{}, err
 	}
@@ -355,7 +358,7 @@
 	defer dockerClient.Close()
 	ctx := context.Background()
 
-	options := types.ContainerRemoveOptions{
+	options := container.RemoveOptions{
 		Force:         true,
 		RemoveVolumes: true,
 	}
@@ -544,7 +547,7 @@
 
 	platform := "linux/" + utils.GetArchitecture()
 
-	authConfig := types.AuthConfig{
+	authConfig := registry.AuthConfig{
 		Username: os.Getenv("DOCKER_USER"),
 		Password: os.Getenv("DOCKER_PASSWORD"),
 	}
@@ -555,7 +558,7 @@
 	}).Info("Pulling Docker images...")
 
 	for _, image := range images {
-		options := types.ImagePullOptions{
+		options := imageTypes.PullOptions{
 			Platform: platform,
 		}