From 07832c4df11e257f5e2dd1e9674ae53fe4fcd21e Mon Sep 17 00:00:00 2001 From: Nicolas De loof Date: Mon, 27 Apr 2026 11:32:00 +0000 Subject: [PATCH] refactor: fix lint issues from cleanup changes Assisted-By: docker-agent Signed-off-by: Nicolas De loof --- cmd/compose/backend.go | 3 +-- cmd/compose/kill.go | 2 +- cmd/compose/pause.go | 4 ++-- cmd/compose/restart.go | 2 +- cmd/compose/start.go | 2 +- cmd/compose/stop.go | 2 +- pkg/compose/down.go | 6 +++--- pkg/compose/kill_test.go | 6 +++--- pkg/compose/logs_test.go | 4 ++-- pkg/compose/ps_test.go | 2 +- pkg/compose/remove.go | 2 +- pkg/utils/set.go | 1 - 12 files changed, 17 insertions(+), 19 deletions(-) diff --git a/cmd/compose/backend.go b/cmd/compose/backend.go index fd70d723c..cc7d07ac7 100644 --- a/cmd/compose/backend.go +++ b/cmd/compose/backend.go @@ -17,7 +17,6 @@ package compose import ( - "context" "time" "github.com/docker/cli/cli/command" @@ -27,7 +26,7 @@ import ( ) // withBackend creates a compose backend and passes it to fn. -func withBackend(ctx context.Context, dockerCli command.Cli, opts *BackendOptions, fn func(api.Compose) error) error { +func withBackend(dockerCli command.Cli, opts *BackendOptions, fn func(api.Compose) error) error { backend, err := compose.NewComposeService(dockerCli, opts.Options...) if err != nil { return err diff --git a/cmd/compose/kill.go b/cmd/compose/kill.go index a577c4c77..1ec83153b 100644 --- a/cmd/compose/kill.go +++ b/cmd/compose/kill.go @@ -62,7 +62,7 @@ func runKill(ctx context.Context, dockerCli command.Cli, backendOptions *Backend return err } - return withBackend(ctx, dockerCli, backendOptions, func(backend api.Compose) error { + return withBackend(dockerCli, backendOptions, func(backend api.Compose) error { err := backend.Kill(ctx, name, api.KillOptions{ RemoveOrphans: opts.removeOrphans, Project: project, diff --git a/cmd/compose/pause.go b/cmd/compose/pause.go index c28b247ce..8b8fb4a5f 100644 --- a/cmd/compose/pause.go +++ b/cmd/compose/pause.go @@ -49,7 +49,7 @@ func runPause(ctx context.Context, dockerCli command.Cli, backendOptions *Backen if err != nil { return err } - return withBackend(ctx, dockerCli, backendOptions, func(backend api.Compose) error { + return withBackend(dockerCli, backendOptions, func(backend api.Compose) error { return backend.Pause(ctx, name, api.PauseOptions{ Services: services, Project: project, @@ -81,7 +81,7 @@ func runUnPause(ctx context.Context, dockerCli command.Cli, backendOptions *Back if err != nil { return err } - return withBackend(ctx, dockerCli, backendOptions, func(backend api.Compose) error { + return withBackend(dockerCli, backendOptions, func(backend api.Compose) error { return backend.UnPause(ctx, name, api.PauseOptions{ Services: services, Project: project, diff --git a/cmd/compose/restart.go b/cmd/compose/restart.go index 69b53f091..a9d97c502 100644 --- a/cmd/compose/restart.go +++ b/cmd/compose/restart.go @@ -67,7 +67,7 @@ func runRestart(ctx context.Context, dockerCli command.Cli, backendOptions *Back } } - return withBackend(ctx, dockerCli, backendOptions, func(backend api.Compose) error { + return withBackend(dockerCli, backendOptions, func(backend api.Compose) error { return backend.Restart(ctx, name, api.RestartOptions{ Timeout: optionalTimeout(opts.timeout, opts.timeChanged), Services: services, diff --git a/cmd/compose/start.go b/cmd/compose/start.go index 544503cb0..062efb680 100644 --- a/cmd/compose/start.go +++ b/cmd/compose/start.go @@ -61,7 +61,7 @@ func runStart(ctx context.Context, dockerCli command.Cli, backendOptions *Backen if opts.waitTimeout > 0 { timeout = time.Duration(opts.waitTimeout) * time.Second } - return withBackend(ctx, dockerCli, backendOptions, func(backend api.Compose) error { + return withBackend(dockerCli, backendOptions, func(backend api.Compose) error { return backend.Start(ctx, name, api.StartOptions{ AttachTo: services, Project: project, diff --git a/cmd/compose/stop.go b/cmd/compose/stop.go index 39dc41e14..be5dec26f 100644 --- a/cmd/compose/stop.go +++ b/cmd/compose/stop.go @@ -57,7 +57,7 @@ func runStop(ctx context.Context, dockerCli command.Cli, backendOptions *Backend if err != nil { return err } - return withBackend(ctx, dockerCli, backendOptions, func(backend api.Compose) error { + return withBackend(dockerCli, backendOptions, func(backend api.Compose) error { return backend.Stop(ctx, name, api.StopOptions{ Timeout: optionalTimeout(opts.timeout, opts.timeChanged), Services: services, diff --git a/pkg/compose/down.go b/pkg/compose/down.go index 6b4f2f78c..abc6f3a82 100644 --- a/pkg/compose/down.go +++ b/pkg/compose/down.go @@ -252,7 +252,7 @@ func (s *composeService) removeNetwork(ctx context.Context, composeNetworkName s func (s *composeService) removeImage(ctx context.Context, image string) error { id := fmt.Sprintf("Image %s", image) - return s.removeResource(ctx, id, func() error { + return s.removeResource(id, func() error { _, err := s.apiClient().ImageRemove(ctx, image, client.ImageRemoveOptions{}) return err }) @@ -267,7 +267,7 @@ func (s *composeService) removeVolume(ctx context.Context, id string) error { return nil } - return s.removeResource(ctx, resource, func() error { + return s.removeResource(resource, func() error { _, err := s.apiClient().VolumeRemove(ctx, id, client.VolumeRemoveOptions{ Force: true, }) @@ -277,7 +277,7 @@ func (s *composeService) removeVolume(ctx context.Context, id string) error { // removeResource emits a "Removing" progress event, calls op, then emits the appropriate // completion event based on the error: nil→Removed, conflict→still-in-use warning, not-found→gone warning. -func (s *composeService) removeResource(ctx context.Context, eventID string, op func() error) error { +func (s *composeService) removeResource(eventID string, op func() error) error { s.events.On(newEvent(eventID, api.Working, "Removing")) err := op() if err == nil { diff --git a/pkg/compose/kill_test.go b/pkg/compose/kill_test.go index 9b9a0e078..a55ea6f2d 100644 --- a/pkg/compose/kill_test.go +++ b/pkg/compose/kill_test.go @@ -44,7 +44,7 @@ func TestKillAll(t *testing.T) { name := strings.ToLower(testProject) api.EXPECT().ContainerList(t.Context(), client.ContainerListOptions{ - Filters: projectFilter(name).Add("label", api.ConfigHashLabel), + Filters: projectFilter(name).Add("label", compose.ConfigHashLabel), }).Return(client.ContainerListResult{ Items: []container.Summary{ testContainer("service1", "123", false), @@ -83,7 +83,7 @@ func TestKillSignal(t *testing.T) { name := strings.ToLower(testProject) listOptions := client.ContainerListOptions{ - Filters: projectFilter(name).Add("label", serviceFilter(serviceName), api.ConfigHashLabel), + Filters: projectFilter(name).Add("label", serviceFilter(serviceName), compose.ConfigHashLabel), } api.EXPECT().ContainerList(t.Context(), listOptions).Return(client.ContainerListResult{ @@ -145,7 +145,7 @@ func anyCancellableContext() gomock.Matcher { } func projectFilterListOpt(withOneOff bool) client.ContainerListOptions { - filter := projectFilter(strings.ToLower(testProject)).Add("label", api.ConfigHashLabel) + filter := projectFilter(strings.ToLower(testProject)).Add("label", compose.ConfigHashLabel) if !withOneOff { filter.Add("label", oneOffFilter(false)) } diff --git a/pkg/compose/logs_test.go b/pkg/compose/logs_test.go index fe9d4238c..b0499f156 100644 --- a/pkg/compose/logs_test.go +++ b/pkg/compose/logs_test.go @@ -98,7 +98,7 @@ func TestComposeService_Logs_Demux(t *testing.T) { api.EXPECT().ContainerList(t.Context(), client.ContainerListOptions{ All: true, - Filters: projectFilter(name).Add("label", oneOffFilter(false), api.ConfigHashLabel), + Filters: projectFilter(name).Add("label", oneOffFilter(false), compose.ConfigHashLabel), }).Return( client.ContainerListResult{ Items: []containerType.Summary{ @@ -166,7 +166,7 @@ func TestComposeService_Logs_ServiceFiltering(t *testing.T) { api.EXPECT().ContainerList(t.Context(), client.ContainerListOptions{ All: true, - Filters: projectFilter(name).Add("label", oneOffFilter(false), api.ConfigHashLabel), + Filters: projectFilter(name).Add("label", oneOffFilter(false), compose.ConfigHashLabel), }).Return( client.ContainerListResult{ Items: []containerType.Summary{ diff --git a/pkg/compose/ps_test.go b/pkg/compose/ps_test.go index 3027fc51c..390da2835 100644 --- a/pkg/compose/ps_test.go +++ b/pkg/compose/ps_test.go @@ -38,7 +38,7 @@ func TestPs(t *testing.T) { assert.NilError(t, err) listOpts := client.ContainerListOptions{ - Filters: projectFilter(strings.ToLower(testProject)).Add("label", api.ConfigHashLabel, oneOffFilter(false)), + Filters: projectFilter(strings.ToLower(testProject)).Add("label", compose.ConfigHashLabel, oneOffFilter(false)), All: false, } c1, inspect1 := containerDetails("service1", "123", containerType.StateRunning, containerType.Healthy, 0) diff --git a/pkg/compose/remove.go b/pkg/compose/remove.go index b9bf0f336..017de4a00 100644 --- a/pkg/compose/remove.go +++ b/pkg/compose/remove.go @@ -27,7 +27,7 @@ import ( "github.com/docker/compose/v5/pkg/api" ) -func (s *composeService) Remove(ctx context.Context, projectName string, options api.RemoveOptions) error { +func (s *composeService) Remove(ctx context.Context, projectName string, options api.RemoveOptions) error { //nolint:gocyclo projectName = strings.ToLower(projectName) if options.Stop { diff --git a/pkg/utils/set.go b/pkg/utils/set.go index 1086176a0..3ebe85dcf 100644 --- a/pkg/utils/set.go +++ b/pkg/utils/set.go @@ -74,4 +74,3 @@ func (s Set[T]) Diff(other Set[T]) Set[T] { } return out } -