From cd8074d501ba7559e202e1dbc4ed009e03985ee5 Mon Sep 17 00:00:00 2001 From: Nicolas De Loof Date: Mon, 14 Mar 2022 08:16:26 +0100 Subject: [PATCH] kill only need project name Signed-off-by: Nicolas De Loof --- cmd/compose/kill.go | 29 ++++++++++++++++++++++++----- pkg/api/api.go | 2 +- pkg/api/proxy.go | 7 ++----- pkg/compose/kill.go | 16 ++++++++-------- pkg/compose/kill_test.go | 17 ++++++----------- pkg/compose/up.go | 2 +- 6 files changed, 42 insertions(+), 31 deletions(-) diff --git a/cmd/compose/kill.go b/cmd/compose/kill.go index a39fda67c..eb17f1f1c 100644 --- a/cmd/compose/kill.go +++ b/cmd/compose/kill.go @@ -19,25 +19,44 @@ package compose import ( "context" - "github.com/compose-spec/compose-go/types" "github.com/spf13/cobra" "github.com/docker/compose/v2/pkg/api" ) +type killOptions struct { + *projectOptions + signal string +} + func killCommand(p *projectOptions, backend api.Service) *cobra.Command { - var opts api.KillOptions + opts := killOptions{ + projectOptions: p, + } cmd := &cobra.Command{ Use: "kill [options] [SERVICE...]", Short: "Force stop service containers.", - RunE: p.WithProject(func(ctx context.Context, project *types.Project) error { - return backend.Kill(ctx, project, opts) + RunE: Adapt(func(ctx context.Context, args []string) error { + return runKill(ctx, backend, opts, args) }), ValidArgsFunction: serviceCompletion(p), } flags := cmd.Flags() - flags.StringVarP(&opts.Signal, "signal", "s", "SIGKILL", "SIGNAL to send to the container.") + flags.StringVarP(&opts.signal, "signal", "s", "SIGKILL", "SIGNAL to send to the container.") return cmd } + +func runKill(ctx context.Context, backend api.Service, opts killOptions, services []string) error { + projectName, err := opts.toProjectName() + if err != nil { + return err + } + + return backend.Kill(ctx, projectName, api.KillOptions{ + Services: services, + Signal: opts.signal, + }) + +} diff --git a/pkg/api/api.go b/pkg/api/api.go index 8be8f985f..9aac0ec7a 100644 --- a/pkg/api/api.go +++ b/pkg/api/api.go @@ -54,7 +54,7 @@ type Service interface { // Convert translate compose model into backend's native format Convert(ctx context.Context, project *types.Project, options ConvertOptions) ([]byte, error) // Kill executes the equivalent to a `compose kill` - Kill(ctx context.Context, project *types.Project, options KillOptions) error + Kill(ctx context.Context, project string, options KillOptions) error // RunOneOffContainer creates a service oneoff container and starts its dependencies RunOneOffContainer(ctx context.Context, project *types.Project, opts RunOptions) (int, error) // Remove executes the equivalent to a `compose rm` diff --git a/pkg/api/proxy.go b/pkg/api/proxy.go index 577e549f7..44adf646e 100644 --- a/pkg/api/proxy.go +++ b/pkg/api/proxy.go @@ -37,7 +37,7 @@ type ServiceProxy struct { PsFn func(ctx context.Context, projectName string, options PsOptions) ([]ContainerSummary, error) ListFn func(ctx context.Context, options ListOptions) ([]Stack, error) ConvertFn func(ctx context.Context, project *types.Project, options ConvertOptions) ([]byte, error) - KillFn func(ctx context.Context, project *types.Project, options KillOptions) error + KillFn func(ctx context.Context, project string, options KillOptions) error RunOneOffContainerFn func(ctx context.Context, project *types.Project, opts RunOptions) (int, error) RemoveFn func(ctx context.Context, project string, options RemoveOptions) error ExecFn func(ctx context.Context, project string, opts RunOptions) (int, error) @@ -219,13 +219,10 @@ func (s *ServiceProxy) Convert(ctx context.Context, project *types.Project, opti } // Kill implements Service interface -func (s *ServiceProxy) Kill(ctx context.Context, project *types.Project, options KillOptions) error { +func (s *ServiceProxy) Kill(ctx context.Context, project string, options KillOptions) error { if s.KillFn == nil { return ErrNotImplemented } - for _, i := range s.interceptors { - i(ctx, project) - } return s.KillFn(ctx, project, options) } diff --git a/pkg/compose/kill.go b/pkg/compose/kill.go index 91a31c822..afba4f01d 100644 --- a/pkg/compose/kill.go +++ b/pkg/compose/kill.go @@ -18,8 +18,8 @@ package compose import ( "context" + "fmt" - "github.com/compose-spec/compose-go/types" moby "github.com/docker/docker/api/types" "golang.org/x/sync/errgroup" @@ -27,29 +27,29 @@ import ( "github.com/docker/compose/v2/pkg/progress" ) -func (s *composeService) Kill(ctx context.Context, project *types.Project, options api.KillOptions) error { +func (s *composeService) Kill(ctx context.Context, project string, options api.KillOptions) error { return progress.Run(ctx, func(ctx context.Context) error { return s.kill(ctx, project, options) }) } -func (s *composeService) kill(ctx context.Context, project *types.Project, options api.KillOptions) error { +func (s *composeService) kill(ctx context.Context, project string, options api.KillOptions) error { w := progress.ContextWriter(ctx) services := options.Services - if len(services) == 0 { - services = project.ServiceNames() - } var containers Containers - containers, err := s.getContainers(ctx, project.Name, oneOffInclude, false, services...) + containers, err := s.getContainers(ctx, project, oneOffInclude, false, services...) if err != nil { return err } + if len(containers) == 0 { + fmt.Fprintf(s.stderr(), "no container to kill") + } + eg, ctx := errgroup.WithContext(ctx) containers. - filter(isService(project.ServiceNames()...)). forEach(func(container moby.Container) { eg.Go(func() error { eventName := getContainerProgressName(container) diff --git a/pkg/compose/kill_test.go b/pkg/compose/kill_test.go index b8dcc3d68..9680afe30 100644 --- a/pkg/compose/kill_test.go +++ b/pkg/compose/kill_test.go @@ -22,7 +22,6 @@ import ( "strings" "testing" - "github.com/compose-spec/compose-go/types" moby "github.com/docker/docker/api/types" "github.com/docker/docker/api/types/filters" "github.com/golang/mock/gomock" @@ -45,18 +44,18 @@ func TestKillAll(t *testing.T) { tested.dockerCli = cli cli.EXPECT().Client().Return(api).AnyTimes() - project := types.Project{Name: strings.ToLower(testProject), Services: []types.ServiceConfig{testService("service1"), testService("service2")}} + name := strings.ToLower(testProject) ctx := context.Background() api.EXPECT().ContainerList(ctx, moby.ContainerListOptions{ - Filters: filters.NewArgs(projectFilter(strings.ToLower(testProject))), + Filters: filters.NewArgs(projectFilter(name)), }).Return( []moby.Container{testContainer("service1", "123", false), testContainer("service1", "456", false), testContainer("service2", "789", false)}, nil) api.EXPECT().ContainerKill(anyCancellableContext(), "123", "").Return(nil) api.EXPECT().ContainerKill(anyCancellableContext(), "456", "").Return(nil) api.EXPECT().ContainerKill(anyCancellableContext(), "789", "").Return(nil) - err := tested.kill(ctx, &project, compose.KillOptions{}) + err := tested.kill(ctx, name, compose.KillOptions{}) assert.NilError(t, err) } @@ -70,23 +69,19 @@ func TestKillSignal(t *testing.T) { tested.dockerCli = cli cli.EXPECT().Client().Return(api).AnyTimes() - project := types.Project{Name: strings.ToLower(testProject), Services: []types.ServiceConfig{testService(serviceName)}} + name := strings.ToLower(testProject) listOptions := moby.ContainerListOptions{ - Filters: filters.NewArgs(projectFilter(strings.ToLower(testProject)), serviceFilter(serviceName)), + Filters: filters.NewArgs(projectFilter(name), serviceFilter(serviceName)), } ctx := context.Background() api.EXPECT().ContainerList(ctx, listOptions).Return([]moby.Container{testContainer(serviceName, "123", false)}, nil) api.EXPECT().ContainerKill(anyCancellableContext(), "123", "SIGTERM").Return(nil) - err := tested.kill(ctx, &project, compose.KillOptions{Services: []string{serviceName}, Signal: "SIGTERM"}) + err := tested.kill(ctx, name, compose.KillOptions{Services: []string{serviceName}, Signal: "SIGTERM"}) assert.NilError(t, err) } -func testService(name string) types.ServiceConfig { - return types.ServiceConfig{Name: name} -} - func testContainer(service string, id string, oneOff bool) moby.Container { return moby.Container{ ID: id, diff --git a/pkg/compose/up.go b/pkg/compose/up.go index 3ee07f1cc..d8e8d050f 100644 --- a/pkg/compose/up.go +++ b/pkg/compose/up.go @@ -60,7 +60,7 @@ func (s *composeService) Up(ctx context.Context, project *types.Project, options return progress.Run(ctx, func(ctx context.Context) error { go func() { <-signalChan - s.Kill(ctx, project, api.KillOptions{ // nolint:errcheck + s.Kill(ctx, project.Name, api.KillOptions{ // nolint:errcheck Services: options.Create.Services, }) }()