Skip to content

Commit 9b4fcce

Browse files
ndeloofndeloof
committed
introduce WithPrompt to configure compose backend to use a plugable UI component for user interaction
Signed-off-by: Nicolas De Loof <[email protected]>
1 parent da5c57c commit 9b4fcce

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

46 files changed

+152
-136
lines changed

‎cmd/compose/alpha.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import (
2121
)
2222

2323
// alphaCommand groups all experimental subcommands
24-
func alphaCommand(p *ProjectOptions, dockerCli command.Cli, backend api.Service) *cobra.Command {
24+
func alphaCommand(p *ProjectOptions, dockerCli command.Cli, backend api.Compose) *cobra.Command {
2525
cmd := &cobra.Command{
2626
Short: "Experimental commands",
2727
Use: "alpha [COMMAND]",

‎cmd/compose/attach.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ type attachOpts struct {
3535
proxy bool
3636
}
3737

38-
func attachCommand(p *ProjectOptions, dockerCli command.Cli, backend api.Service) *cobra.Command {
38+
func attachCommand(p *ProjectOptions, dockerCli command.Cli, backend api.Compose) *cobra.Command {
3939
opts := attachOpts{
4040
composeOptions: &composeOptions{
4141
ProjectOptions: p,
@@ -63,7 +63,7 @@ func attachCommand(p *ProjectOptions, dockerCli command.Cli, backend api.Service
6363
return runCmd
6464
}
6565

66-
func runAttach(ctx context.Context, dockerCli command.Cli, backend api.Service, opts attachOpts) error {
66+
func runAttach(ctx context.Context, dockerCli command.Cli, backend api.Compose, opts attachOpts) error {
6767
projectName, err := opts.toProjectName(ctx, dockerCli)
6868
if err != nil {
6969
return err

‎cmd/compose/build.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ func (opts buildOptions) toAPIBuildOptions(services []string) (api.BuildOptions,
9090
}, nil
9191
}
9292

93-
func buildCommand(p *ProjectOptions, dockerCli command.Cli, backend api.Service) *cobra.Command {
93+
func buildCommand(p *ProjectOptions, dockerCli command.Cli, backend api.Compose) *cobra.Command {
9494
opts := buildOptions{
9595
ProjectOptions: p,
9696
}
@@ -148,7 +148,7 @@ func buildCommand(p *ProjectOptions, dockerCli command.Cli, backend api.Service)
148148
return cmd
149149
}
150150

151-
func runBuild(ctx context.Context, dockerCli command.Cli, backend api.Service, opts buildOptions, services []string) error {
151+
func runBuild(ctx context.Context, dockerCli command.Cli, backend api.Compose, opts buildOptions, services []string) error {
152152
opts.All = true // do not drop resources as build may involve some dependencies by additional_contexts
153153
project, _, err := opts.ToProject(ctx, dockerCli, nil, cli.WithResolvedPaths(true), cli.WithoutEnvironmentResolution)
154154
if err != nil {

‎cmd/compose/commit.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ type commitOptions struct {
3939
index int
4040
}
4141

42-
func commitCommand(p *ProjectOptions, dockerCli command.Cli, backend api.Service) *cobra.Command {
42+
func commitCommand(p *ProjectOptions, dockerCli command.Cli, backend api.Compose) *cobra.Command {
4343
options := commitOptions{
4444
ProjectOptions: p,
4545
}
@@ -73,7 +73,7 @@ func commitCommand(p *ProjectOptions, dockerCli command.Cli, backend api.Service
7373
return cmd
7474
}
7575

76-
func runCommit(ctx context.Context, dockerCli command.Cli, backend api.Service, options commitOptions) error {
76+
func runCommit(ctx context.Context, dockerCli command.Cli, backend api.Compose, options commitOptions) error {
7777
projectName, err := options.toProjectName(ctx, dockerCli)
7878
if err != nil {
7979
return err

‎cmd/compose/completion.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ func completeServiceNames(dockerCli command.Cli, p *ProjectOptions) validArgsFn
5252
}
5353
}
5454

55-
func completeProjectNames(backend api.Service) func(cmd *cobra.Command, args []string, toComplete string) ([]string, cobra.ShellCompDirective) {
55+
func completeProjectNames(backend api.Compose) func(cmd *cobra.Command, args []string, toComplete string) ([]string, cobra.ShellCompDirective) {
5656
return func(cmd *cobra.Command, args []string, toComplete string) ([]string, cobra.ShellCompDirective) {
5757
list, err := backend.List(cmd.Context(), api.ListOptions{
5858
All: true,

‎cmd/compose/compose.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -416,7 +416,7 @@ func RunningAsStandalone() bool {
416416
}
417417

418418
// RootCommand returns the compose command with its child commands
419-
func RootCommand(dockerCli command.Cli, backend api.Service) *cobra.Command { //nolint:gocyclo
419+
func RootCommand(dockerCli command.Cli, backend api.Compose) *cobra.Command { //nolint:gocyclo
420420
// filter out useless commandConn.CloseWrite warning message that can occur
421421
// when using a remote context that is unreachable: "commandConn.CloseWrite: commandconn: failed to wait: signal: killed"
422422
// https://github.com/docker/cli/blob/e1f24d3c93df6752d3c27c8d61d18260f141310c/cli/connhelper/commandconn/commandconn.go#L203-L215

‎cmd/compose/cp.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ type copyOptions struct {
3838
copyUIDGID bool
3939
}
4040

41-
func copyCommand(p *ProjectOptions, dockerCli command.Cli, backend api.Service) *cobra.Command {
41+
func copyCommand(p *ProjectOptions, dockerCli command.Cli, backend api.Compose) *cobra.Command {
4242
opts := copyOptions{
4343
ProjectOptions: p,
4444
}
@@ -73,7 +73,7 @@ func copyCommand(p *ProjectOptions, dockerCli command.Cli, backend api.Service)
7373
return copyCmd
7474
}
7575

76-
func runCopy(ctx context.Context, dockerCli command.Cli, backend api.Service, opts copyOptions) error {
76+
func runCopy(ctx context.Context, dockerCli command.Cli, backend api.Compose, opts copyOptions) error {
7777
name, err := opts.toProjectName(ctx, dockerCli)
7878
if err != nil {
7979
return err

‎cmd/compose/create.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ type createOptions struct {
5151
AssumeYes bool
5252
}
5353

54-
func createCommand(p *ProjectOptions, dockerCli command.Cli, backend api.Service) *cobra.Command {
54+
func createCommand(p *ProjectOptions, dockerCli command.Cli, backend api.Compose) *cobra.Command {
5555
opts := createOptions{}
5656
buildOpts := buildOptions{
5757
ProjectOptions: p,
@@ -95,7 +95,7 @@ func createCommand(p *ProjectOptions, dockerCli command.Cli, backend api.Service
9595
return cmd
9696
}
9797

98-
func runCreate(ctx context.Context, _ command.Cli, backend api.Service, createOpts createOptions, buildOpts buildOptions, project *types.Project, services []string) error {
98+
func runCreate(ctx context.Context, _ command.Cli, backend api.Compose, createOpts createOptions, buildOpts buildOptions, project *types.Project, services []string) error {
9999
if err := createOpts.Apply(project); err != nil {
100100
return err
101101
}

‎cmd/compose/down.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ type downOptions struct {
4040
images string
4141
}
4242

43-
func downCommand(p *ProjectOptions, dockerCli command.Cli, backend api.Service) *cobra.Command {
43+
func downCommand(p *ProjectOptions, dockerCli command.Cli, backend api.Compose) *cobra.Command {
4444
opts := downOptions{
4545
ProjectOptions: p,
4646
}
@@ -77,7 +77,7 @@ func downCommand(p *ProjectOptions, dockerCli command.Cli, backend api.Service)
7777
return downCmd
7878
}
7979

80-
func runDown(ctx context.Context, dockerCli command.Cli, backend api.Service, opts downOptions, services []string) error {
80+
func runDown(ctx context.Context, dockerCli command.Cli, backend api.Compose, opts downOptions, services []string) error {
8181
project, name, err := opts.projectOrName(ctx, dockerCli, services...)
8282
if err != nil {
8383
return err

‎cmd/compose/events.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ type eventsOpts struct {
3434
until string
3535
}
3636

37-
func eventsCommand(p *ProjectOptions, dockerCli command.Cli, backend api.Service) *cobra.Command {
37+
func eventsCommand(p *ProjectOptions, dockerCli command.Cli, backend api.Compose) *cobra.Command {
3838
opts := eventsOpts{
3939
composeOptions: &composeOptions{
4040
ProjectOptions: p,
@@ -55,7 +55,7 @@ func eventsCommand(p *ProjectOptions, dockerCli command.Cli, backend api.Service
5555
return cmd
5656
}
5757

58-
func runEvents(ctx context.Context, dockerCli command.Cli, backend api.Service, opts eventsOpts, services []string) error {
58+
func runEvents(ctx context.Context, dockerCli command.Cli, backend api.Compose, opts eventsOpts, services []string) error {
5959
name, err := opts.toProjectName(ctx, dockerCli)
6060
if err != nil {
6161
return err

0 commit comments

Comments
 (0)