remove WithContext in favor of WithBaseContext

thaJeztah · thaJeztah · commit d0da194d3e00 · 2024-02-26T16:56:59.000+01:00
Signed-off-by: Sebastiaan van Stijn &lt;github@gone.nl&gt;
diff --git a/cli/command/cli_options.go b/cli/command/cli_options.go
@@ -107,12 +107,3 @@ func WithAPIClient(c client.APIClient) CLIOption {
 		return nil
 	}
 }
-
-// WithContext sets the base context for the cli
-// This is used internally for operations may require a context to propagate tracing.
-func WithContext(ctx context.Context) CLIOption {
-	return func(cli *DockerCli) error {
-		cli.baseCtx = ctx
-		return nil
-	}
-}
diff --git a/cmd/docker/docker.go b/cmd/docker/docker.go
@@ -86,7 +86,7 @@ func newDockerCommand(dockerCli *command.DockerCli) *cli.TopLevelCommand {
 
 			ctx, _ := otel.Tracer("").Start(cmd.Context(), name)
 			cmd.SetContext(ctx)
-			_ = dockerCli.Apply(command.WithContext(ctx))
+			_ = dockerCli.Apply(command.WithBaseContext(ctx))
 			return nil
 		},
 		PersistentPostRun: func(cmd *cobra.Command, args []string) {

Original file line number	Diff line number	Diff line change
`@@ -107,12 +107,3 @@ func WithAPIClient(c client.APIClient) CLIOption {`
`107`	`107`	`return nil`
`108`	`108`	`}`
`109`	`109`	`}`
`110`		`-`
`111`		`-// WithContext sets the base context for the cli`
`112`		`-// This is used internally for operations may require a context to propagate tracing.`
`113`		`-func WithContext(ctx context.Context) CLIOption {`
`114`		`- return func(cli *DockerCli) error {`
`115`		`- cli.baseCtx = ctx`
`116`		`- return nil`
`117`		`- }`
`118`		`-}`