kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity

Replace api/client imports with cli/command in experimental files.

Browse source 
Using

git grep -l 'client\.DockerCli' cli/command/stack/ | xargs sed -i -e 's/client\.DockerCli/command\.Dockercli/g'

Signed-off-by: Daniel Nephin <dnephin@docker.com>
This commit is contained in:
Daniel Nephin 2016-09-08 14:54:01 -04:00
parent 0640a14b4f
commit 9c2b935812
19 changed files with 59 additions and 59 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
cli/command/commands/commands.go
View file

@ -16,7 +16,7 @@ import (
"github.com/spf13/cobra"
)
// AddCommands adds all the commands from api/client to the root command
// AddCommands adds all the commands from cli/command to the root command
func AddCommands(cmd *cobra.Command, dockerCli *command.DockerCli) {
cmd.AddCommand(
node.NewNodeCommand(dockerCli),

4
cli/command/plugin/cmd_experimental.go
View file

@ -5,13 +5,13 @@ package plugin
import (
"fmt"
"github.com/docker/docker/api/client"
"github.com/docker/docker/cli"
"github.com/docker/docker/cli/command"
"github.com/spf13/cobra"
)
// NewPluginCommand returns a cobra command for `plugin` subcommands
func NewPluginCommand(rootCmd *cobra.Command, dockerCli *client.DockerCli) {
func NewPluginCommand(rootCmd *cobra.Command, dockerCli *command.DockerCli) {
cmd := &cobra.Command{
Use: "plugin",
Short: "Manage Docker plugins",

6
cli/command/plugin/disable.go
View file

@ -5,14 +5,14 @@ package plugin
import (
"fmt"
"github.com/docker/docker/api/client"
"github.com/docker/docker/cli"
"github.com/docker/docker/cli/command"
"github.com/docker/docker/reference"
"github.com/spf13/cobra"
"golang.org/x/net/context"
)
func newDisableCommand(dockerCli *client.DockerCli) *cobra.Command {
func newDisableCommand(dockerCli *command.DockerCli) *cobra.Command {
cmd := &cobra.Command{
Use: "disable PLUGIN",
Short: "Disable a plugin",
@ -25,7 +25,7 @@ func newDisableCommand(dockerCli *client.DockerCli) *cobra.Command {
return cmd
}
func runDisable(dockerCli *client.DockerCli, name string) error {
func runDisable(dockerCli *command.DockerCli, name string) error {
named, err := reference.ParseNamed(name) // FIXME: validate
if err != nil {
return err

6
cli/command/plugin/enable.go
View file

@ -5,14 +5,14 @@ package plugin
import (
"fmt"
"github.com/docker/docker/api/client"
"github.com/docker/docker/cli"
"github.com/docker/docker/cli/command"
"github.com/docker/docker/reference"
"github.com/spf13/cobra"
"golang.org/x/net/context"
)
func newEnableCommand(dockerCli *client.DockerCli) *cobra.Command {
func newEnableCommand(dockerCli *command.DockerCli) *cobra.Command {
cmd := &cobra.Command{
Use: "enable PLUGIN",
Short: "Enable a plugin",
@ -25,7 +25,7 @@ func newEnableCommand(dockerCli *client.DockerCli) *cobra.Command {
return cmd
}
func runEnable(dockerCli *client.DockerCli, name string) error {
func runEnable(dockerCli *command.DockerCli, name string) error {
named, err := reference.ParseNamed(name) // FIXME: validate
if err != nil {
return err

8
cli/command/plugin/inspect.go
View file

@ -5,9 +5,9 @@ package plugin
import (
"fmt"
"github.com/docker/docker/api/client"
"github.com/docker/docker/api/client/inspect"
"github.com/docker/docker/cli"
"github.com/docker/docker/cli/command"
"github.com/docker/docker/cli/command/inspect"
"github.com/docker/docker/reference"
"github.com/spf13/cobra"
"golang.org/x/net/context"
@ -18,7 +18,7 @@ type inspectOptions struct {
format string
}
func newInspectCommand(dockerCli *client.DockerCli) *cobra.Command {
func newInspectCommand(dockerCli *command.DockerCli) *cobra.Command {
var opts inspectOptions
cmd := &cobra.Command{
@ -36,7 +36,7 @@ func newInspectCommand(dockerCli *client.DockerCli) *cobra.Command {
return cmd
}
func runInspect(dockerCli *client.DockerCli, opts inspectOptions) error {
func runInspect(dockerCli *command.DockerCli, opts inspectOptions) error {
client := dockerCli.Client()
ctx := context.Background()
getRef := func(name string) (interface{}, []byte, error) {

10
cli/command/plugin/install.go
View file

@ -7,9 +7,9 @@ import (
"fmt"
"strings"
"github.com/docker/docker/api/client"
"github.com/docker/docker/api/types"
"github.com/docker/docker/cli"
"github.com/docker/docker/cli/command"
"github.com/docker/docker/reference"
"github.com/docker/docker/registry"
"github.com/spf13/cobra"
@ -22,7 +22,7 @@ type pluginOptions struct {
disable bool
}
func newInstallCommand(dockerCli *client.DockerCli) *cobra.Command {
func newInstallCommand(dockerCli *command.DockerCli) *cobra.Command {
var options pluginOptions
cmd := &cobra.Command{
Use: "install [OPTIONS] PLUGIN",
@ -41,7 +41,7 @@ func newInstallCommand(dockerCli *client.DockerCli) *cobra.Command {
return cmd
}
func runInstall(dockerCli *client.DockerCli, opts pluginOptions) error {
func runInstall(dockerCli *command.DockerCli, opts pluginOptions) error {
named, err := reference.ParseNamed(opts.name) // FIXME: validate
if err != nil {
return err
@ -63,7 +63,7 @@ func runInstall(dockerCli *client.DockerCli, opts pluginOptions) error {
authConfig := dockerCli.ResolveAuthConfig(ctx, repoInfo.Index)
encodedAuth, err := client.EncodeAuthToBase64(authConfig)
encodedAuth, err := command.EncodeAuthToBase64(authConfig)
if err != nil {
return err
}
@ -85,7 +85,7 @@ func runInstall(dockerCli *client.DockerCli, opts pluginOptions) error {
return nil
}
func acceptPrivileges(dockerCli *client.DockerCli, name string) func(privileges types.PluginPrivileges) (bool, error) {
func acceptPrivileges(dockerCli *command.DockerCli, name string) func(privileges types.PluginPrivileges) (bool, error) {
return func(privileges types.PluginPrivileges) (bool, error) {
fmt.Fprintf(dockerCli.Out(), "Plugin %q is requesting the following privileges:\n", name)
for _, privilege := range privileges {

6
cli/command/plugin/list.go
View file

@ -7,8 +7,8 @@ import (
"strings"
"text/tabwriter"
"github.com/docker/docker/api/client"
"github.com/docker/docker/cli"
"github.com/docker/docker/cli/command"
"github.com/docker/docker/pkg/stringutils"
"github.com/spf13/cobra"
"golang.org/x/net/context"
@ -18,7 +18,7 @@ type listOptions struct {
noTrunc bool
}
func newListCommand(dockerCli *client.DockerCli) *cobra.Command {
func newListCommand(dockerCli *command.DockerCli) *cobra.Command {
var opts listOptions
cmd := &cobra.Command{
@ -38,7 +38,7 @@ func newListCommand(dockerCli *client.DockerCli) *cobra.Command {
return cmd
}
func runList(dockerCli *client.DockerCli, opts listOptions) error {
func runList(dockerCli *command.DockerCli, opts listOptions) error {
plugins, err := dockerCli.Client().PluginList(context.Background())
if err != nil {
return err

8
cli/command/plugin/push.go
View file

@ -7,14 +7,14 @@ import (
"golang.org/x/net/context"
"github.com/docker/docker/api/client"
"github.com/docker/docker/cli"
"github.com/docker/docker/cli/command"
"github.com/docker/docker/reference"
"github.com/docker/docker/registry"
"github.com/spf13/cobra"
)
func newPushCommand(dockerCli *client.DockerCli) *cobra.Command {
func newPushCommand(dockerCli *command.DockerCli) *cobra.Command {
cmd := &cobra.Command{
Use: "push PLUGIN",
Short: "Push a plugin",
@ -26,7 +26,7 @@ func newPushCommand(dockerCli *client.DockerCli) *cobra.Command {
return cmd
}
func runPush(dockerCli *client.DockerCli, name string) error {
func runPush(dockerCli *command.DockerCli, name string) error {
named, err := reference.ParseNamed(name) // FIXME: validate
if err != nil {
return err
@ -47,7 +47,7 @@ func runPush(dockerCli *client.DockerCli, name string) error {
}
authConfig := dockerCli.ResolveAuthConfig(ctx, repoInfo.Index)
encodedAuth, err := client.EncodeAuthToBase64(authConfig)
encodedAuth, err := command.EncodeAuthToBase64(authConfig)
if err != nil {
return err
}

6
cli/command/plugin/remove.go
View file

@ -5,9 +5,9 @@ package plugin
import (
"fmt"
"github.com/docker/docker/api/client"
"github.com/docker/docker/api/types"
"github.com/docker/docker/cli"
"github.com/docker/docker/cli/command"
"github.com/docker/docker/reference"
"github.com/spf13/cobra"
"golang.org/x/net/context"
@ -19,7 +19,7 @@ type rmOptions struct {
plugins []string
}
func newRemoveCommand(dockerCli *client.DockerCli) *cobra.Command {
func newRemoveCommand(dockerCli *command.DockerCli) *cobra.Command {
var opts rmOptions
cmd := &cobra.Command{
@ -38,7 +38,7 @@ func newRemoveCommand(dockerCli *client.DockerCli) *cobra.Command {
return cmd
}
func runRemove(dockerCli *client.DockerCli, opts *rmOptions) error {
func runRemove(dockerCli *command.DockerCli, opts *rmOptions) error {
ctx := context.Background()
var errs cli.Errors

6
cli/command/plugin/set.go
View file

@ -7,13 +7,13 @@ import (
"golang.org/x/net/context"
"github.com/docker/docker/api/client"
"github.com/docker/docker/cli"
"github.com/docker/docker/cli/command"
"github.com/docker/docker/reference"
"github.com/spf13/cobra"
)
func newSetCommand(dockerCli *client.DockerCli) *cobra.Command {
func newSetCommand(dockerCli *command.DockerCli) *cobra.Command {
cmd := &cobra.Command{
Use: "set PLUGIN key1=value1 [key2=value2...]",
Short: "Change settings for a plugin",
@ -26,7 +26,7 @@ func newSetCommand(dockerCli *client.DockerCli) *cobra.Command {
return cmd
}
func runSet(dockerCli *client.DockerCli, name string, args []string) error {
func runSet(dockerCli *command.DockerCli, name string, args []string) error {
named, err := reference.ParseNamed(name) // FIXME: validate
if err != nil {
return err

6
cli/command/stack/cmd.go
View file

@ -5,13 +5,13 @@ package stack
import (
"fmt"
"github.com/docker/docker/api/client"
"github.com/docker/docker/cli"
"github.com/docker/docker/cli/command"
"github.com/spf13/cobra"
)
// NewStackCommand returns a cobra command for `stack` subcommands
func NewStackCommand(dockerCli *client.DockerCli) *cobra.Command {
func NewStackCommand(dockerCli *command.DockerCli) *cobra.Command {
cmd := &cobra.Command{
Use: "stack",
Short: "Manage Docker stacks",
@ -31,7 +31,7 @@ func NewStackCommand(dockerCli *client.DockerCli) *cobra.Command {
}
// NewTopLevelDeployCommand returns a command for `docker deploy`
func NewTopLevelDeployCommand(dockerCli *client.DockerCli) *cobra.Command {
func NewTopLevelDeployCommand(dockerCli *command.DockerCli) *cobra.Command {
cmd := newDeployCommand(dockerCli)
// Remove the aliases at the top level
cmd.Aliases = []string{}

8
cli/command/stack/config.go
View file

@ -3,9 +3,9 @@
package stack
import (
"github.com/docker/docker/api/client"
"github.com/docker/docker/api/client/bundlefile"
"github.com/docker/docker/cli"
"github.com/docker/docker/cli/command"
"github.com/docker/docker/cli/command/bundlefile"
"github.com/spf13/cobra"
)
@ -14,7 +14,7 @@ type configOptions struct {
namespace string
}
func newConfigCommand(dockerCli *client.DockerCli) *cobra.Command {
func newConfigCommand(dockerCli *command.DockerCli) *cobra.Command {
var opts configOptions
cmd := &cobra.Command{
@ -32,7 +32,7 @@ func newConfigCommand(dockerCli *client.DockerCli) *cobra.Command {
return cmd
}
func runConfig(dockerCli *client.DockerCli, opts configOptions) error {
func runConfig(dockerCli *command.DockerCli, opts configOptions) error {
bundle, err := loadBundlefile(dockerCli.Err(), opts.namespace, opts.bundlefile)
if err != nil {
return err

12
cli/command/stack/deploy.go
View file

@ -8,11 +8,11 @@ import (
"github.com/spf13/cobra"
"golang.org/x/net/context"
"github.com/docker/docker/api/client"
"github.com/docker/docker/api/client/bundlefile"
"github.com/docker/docker/api/types"
"github.com/docker/docker/api/types/swarm"
"github.com/docker/docker/cli"
"github.com/docker/docker/cli/command"
"github.com/docker/docker/cli/command/bundlefile"
)
const (
@ -25,7 +25,7 @@ type deployOptions struct {
sendRegistryAuth bool
}
func newDeployCommand(dockerCli *client.DockerCli) *cobra.Command {
func newDeployCommand(dockerCli *command.DockerCli) *cobra.Command {
var opts deployOptions
cmd := &cobra.Command{
@ -45,7 +45,7 @@ func newDeployCommand(dockerCli *client.DockerCli) *cobra.Command {
return cmd
}
func runDeploy(dockerCli *client.DockerCli, opts deployOptions) error {
func runDeploy(dockerCli *command.DockerCli, opts deployOptions) error {
bundle, err := loadBundlefile(dockerCli.Err(), opts.namespace, opts.bundlefile)
if err != nil {
return err
@ -85,7 +85,7 @@ func getUniqueNetworkNames(services map[string]bundlefile.Service) []string {
func updateNetworks(
ctx context.Context,
dockerCli *client.DockerCli,
dockerCli *command.DockerCli,
networks []string,
namespace string,
) error {
@ -133,7 +133,7 @@ func convertNetworks(networks []string, namespace string, name string) []swarm.N
func deployServices(
ctx context.Context,
dockerCli *client.DockerCli,
dockerCli *command.DockerCli,
services map[string]bundlefile.Service,
namespace string,
sendAuth bool,

2
cli/command/stack/opts.go
View file

@ -7,7 +7,7 @@ import (
"io"
"os"
"github.com/docker/docker/api/client/bundlefile"
"github.com/docker/docker/cli/command/bundlefile"
"github.com/spf13/pflag"
)

10
cli/command/stack/ps.go
View file

@ -7,12 +7,12 @@ import (
"golang.org/x/net/context"
"github.com/docker/docker/api/client"
"github.com/docker/docker/api/client/idresolver"
"github.com/docker/docker/api/client/task"
"github.com/docker/docker/api/types"
"github.com/docker/docker/api/types/swarm"
"github.com/docker/docker/cli"
"github.com/docker/docker/cli/command"
"github.com/docker/docker/cli/command/idresolver"
"github.com/docker/docker/cli/command/task"
"github.com/docker/docker/opts"
"github.com/spf13/cobra"
)
@ -25,7 +25,7 @@ type psOptions struct {
noResolve bool
}
func newPsCommand(dockerCli *client.DockerCli) *cobra.Command {
func newPsCommand(dockerCli *command.DockerCli) *cobra.Command {
opts := psOptions{filter: opts.NewFilterOpt()}
cmd := &cobra.Command{
@ -46,7 +46,7 @@ func newPsCommand(dockerCli *client.DockerCli) *cobra.Command {
return cmd
}
func runPS(dockerCli *client.DockerCli, opts psOptions) error {
func runPS(dockerCli *command.DockerCli, opts psOptions) error {
namespace := opts.namespace
client := dockerCli.Client()
ctx := context.Background()

6
cli/command/stack/remove.go
View file

@ -7,8 +7,8 @@ import (
"golang.org/x/net/context"
"github.com/docker/docker/api/client"
"github.com/docker/docker/cli"
"github.com/docker/docker/cli/command"
"github.com/spf13/cobra"
)
@ -16,7 +16,7 @@ type removeOptions struct {
namespace string
}
func newRemoveCommand(dockerCli *client.DockerCli) *cobra.Command {
func newRemoveCommand(dockerCli *command.DockerCli) *cobra.Command {
var opts removeOptions
cmd := &cobra.Command{
@ -32,7 +32,7 @@ func newRemoveCommand(dockerCli *client.DockerCli) *cobra.Command {
return cmd
}
func runRemove(dockerCli *client.DockerCli, opts removeOptions) error {
func runRemove(dockerCli *command.DockerCli, opts removeOptions) error {
namespace := opts.namespace
client := dockerCli.Client()
stderr := dockerCli.Err()

8
cli/command/stack/services.go
View file

@ -7,11 +7,11 @@ import (
"golang.org/x/net/context"
"github.com/docker/docker/api/client"
"github.com/docker/docker/api/client/service"
"github.com/docker/docker/api/types"
"github.com/docker/docker/api/types/filters"
"github.com/docker/docker/cli"
"github.com/docker/docker/cli/command"
"github.com/docker/docker/cli/command/service"
"github.com/docker/docker/opts"
"github.com/spf13/cobra"
)
@ -26,7 +26,7 @@ type servicesOptions struct {
namespace string
}
func newServicesCommand(dockerCli *client.DockerCli) *cobra.Command {
func newServicesCommand(dockerCli *command.DockerCli) *cobra.Command {
opts := servicesOptions{filter: opts.NewFilterOpt()}
cmd := &cobra.Command{
@ -45,7 +45,7 @@ func newServicesCommand(dockerCli *client.DockerCli) *cobra.Command {
return cmd
}
func runServices(dockerCli *client.DockerCli, opts servicesOptions) error {
func runServices(dockerCli *command.DockerCli, opts servicesOptions) error {
ctx := context.Background()
client := dockerCli.Client()

2
pkg/signal/signal_unix.go
View file

@ -6,7 +6,7 @@ import (
"syscall"
)
// Signals used in api/client (no windows equivalent, use
// Signals used in cli/command (no windows equivalent, use
// invalid signals so they don't get handled)
const (

2
pkg/signal/signal_windows.go
View file

@ -6,7 +6,7 @@ import (
"syscall"
)
// Signals used in api/client (no windows equivalent, use
// Signals used in cli/command (no windows equivalent, use
// invalid signals so they don't get handled)
const (
SIGCHLD = syscall.Signal(0xff)