From d46398dbefc0cb44071daa6cb10fa88832d7ae63 Mon Sep 17 00:00:00 2001 From: Christopher Crone Date: Thu, 14 May 2020 09:48:53 +0200 Subject: [PATCH 1/9] Refactor config into package * Move CLI config management into cli/config * Add ability to save current context * Remove ability to rename the config file as this was never used Signed-off-by: Christopher Crone --- cli/config/config.go | 96 ++++++++++++++++++++++++ context/config.go => cli/config/flags.go | 54 ++++++------- cli/config/keys.go | 34 +++++++++ cli/main.go | 15 ++-- context/flags.go | 24 ++---- go.mod | 1 - 6 files changed, 165 insertions(+), 59 deletions(-) create mode 100644 cli/config/config.go rename context/config.go => cli/config/flags.go (50%) create mode 100644 cli/config/keys.go diff --git a/cli/config/config.go b/cli/config/config.go new file mode 100644 index 000000000..38f9ebecc --- /dev/null +++ b/cli/config/config.go @@ -0,0 +1,96 @@ +/* + Copyright (c) 2020 Docker Inc. + + Permission is hereby granted, free of charge, to any person + obtaining a copy of this software and associated documentation + files (the "Software"), to deal in the Software without + restriction, including without limitation the rights to use, copy, + modify, merge, publish, distribute, sublicense, and/or sell copies + of the Software, and to permit persons to whom the Software is + furnished to do so, subject to the following conditions: + + The above copyright notice and this permission notice shall be + included in all copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + EXPRESS OR IMPLIED, + INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. + IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT + HOLDERS BE LIABLE FOR ANY CLAIM, + DAMAGES OR OTHER LIABILITY, + WHETHER IN AN ACTION OF CONTRACT, + TORT OR OTHERWISE, + ARISING FROM, OUT OF OR IN CONNECTION WITH + THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +*/ + +package config + +import ( + "encoding/json" + "io/ioutil" + "os" + "path/filepath" + + "github.com/pkg/errors" +) + +// LoadFile loads the docker configuration +func LoadFile(dir string) (*File, error) { + f := &File{} + err := loadFile(configFilePath(dir), &f) + if err != nil { + return nil, err + } + return f, nil +} + +// WriteCurrentContext writes the selected current context to the Docker +// configuration file. Note, the validity of the context is not checked. +func WriteCurrentContext(dir string, name string) error { + m := map[string]interface{}{} + path := configFilePath(dir) + err := loadFile(path, &m) + if err != nil { + return err + } + // Match existing CLI behavior + if name == "default" { + delete(m, currentContextKey) + } else { + m[currentContextKey] = name + } + return writeFile(path, m) +} + +func writeFile(path string, content map[string]interface{}) error { + d, err := json.MarshalIndent(content, "", "\t") + if err != nil { + return errors.Wrap(err, "unable to marshal config") + } + err = ioutil.WriteFile(path, d, 0644) + return errors.Wrap(err, "unable to write config file") +} + +func loadFile(path string, dest interface{}) error { + data, err := ioutil.ReadFile(path) + if err != nil { + if os.IsNotExist(err) { + // Not an error if there is no config, we're just using defaults + return nil + } + return errors.Wrap(err, "unable to read config file") + } + err = json.Unmarshal(data, dest) + return errors.Wrap(err, "unable to unmarshal config") +} + +func configFilePath(dir string) string { + return filepath.Join(dir, ConfigFileName) +} + +// File contains the current context from the docker configuration file +type File struct { + CurrentContext string `json:"currentContext,omitempty"` +} diff --git a/context/config.go b/cli/config/flags.go similarity index 50% rename from context/config.go rename to cli/config/flags.go index f9caad374..de0c04f07 100644 --- a/context/config.go +++ b/cli/config/flags.go @@ -25,44 +25,36 @@ THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -package context +package config import ( - "encoding/json" - "fmt" "os" "path/filepath" + + "github.com/spf13/pflag" ) -// LoadConfigFile loads the docker configuration -func LoadConfigFile(configDir string, configFileName string) (*ConfigFile, error) { - filename := filepath.Join(configDir, configFileName) - configFile := &ConfigFile{ - Filename: filename, - } +const ( + // ConfigFileName is the name of config file + ConfigFileName = "config.json" + // ConfigFileDir is the default folder where the config file is stored + ConfigFileDir = ".docker" + // ConfigFlagName is the name of the config flag + ConfigFlagName = "config" +) - if _, err := os.Stat(filename); err == nil { - file, err := os.Open(filename) - if err != nil { - return nil, fmt.Errorf("can't read %s: %w", filename, err) - } - // nolint errcheck - defer file.Close() - err = json.NewDecoder(file).Decode(&configFile) - if err != nil { - err = fmt.Errorf("can't read %s: %w", filename, err) - } - return configFile, err - } else if !os.IsNotExist(err) { - // if file is there but we can't stat it for any reason other - // than it doesn't exist then stop - return nil, fmt.Errorf("can't read %s: %w", filename, err) - } - return configFile, nil +// ConfigFlags are the global CLI flags +// nolint stutter +type ConfigFlags struct { + Config string } -// ConfigFile contains the current context from the docker configuration file -type ConfigFile struct { - Filename string `json:"-"` // Note: for internal use only - CurrentContext string `json:"currentContext,omitempty"` +// AddConfigFlags adds persistent (global) flags +func (c *ConfigFlags) AddConfigFlags(flags *pflag.FlagSet) { + flags.StringVar(&c.Config, ConfigFlagName, filepath.Join(home(), ConfigFileDir), "Location of the client config files `DIRECTORY`") +} + +func home() string { + home, _ := os.UserHomeDir() + return home } diff --git a/cli/config/keys.go b/cli/config/keys.go new file mode 100644 index 000000000..5ac2f5982 --- /dev/null +++ b/cli/config/keys.go @@ -0,0 +1,34 @@ +/* + Copyright (c) 2020 Docker Inc. + + Permission is hereby granted, free of charge, to any person + obtaining a copy of this software and associated documentation + files (the "Software"), to deal in the Software without + restriction, including without limitation the rights to use, copy, + modify, merge, publish, distribute, sublicense, and/or sell copies + of the Software, and to permit persons to whom the Software is + furnished to do so, subject to the following conditions: + + The above copyright notice and this permission notice shall be + included in all copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + EXPRESS OR IMPLIED, + INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. + IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT + HOLDERS BE LIABLE FOR ANY CLAIM, + DAMAGES OR OTHER LIABILITY, + WHETHER IN AN ACTION OF CONTRACT, + TORT OR OTHERWISE, + ARISING FROM, OUT OF OR IN CONNECTION WITH + THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +*/ + +package config + +const ( + // currentContextKey is the key used in the Docker config file to set the + // default context + currentContextKey = "currentContext" +) diff --git a/cli/main.go b/cli/main.go index ef7b08cb3..fa73d8ce3 100644 --- a/cli/main.go +++ b/cli/main.go @@ -48,6 +48,7 @@ import ( "github.com/docker/api/cli/cmd" "github.com/docker/api/cli/cmd/compose" "github.com/docker/api/cli/cmd/run" + cliconfig "github.com/docker/api/cli/config" apicontext "github.com/docker/api/context" "github.com/docker/api/context/store" ) @@ -57,7 +58,8 @@ var ( ) type mainOpts struct { - apicontext.Flags + apicontext.ContextFlags + cliconfig.ConfigFlags debug bool } @@ -123,7 +125,8 @@ func main() { }) root.PersistentFlags().BoolVarP(&opts.debug, "debug", "d", false, "enable debug output in the logs") - opts.AddFlags(root.PersistentFlags()) + opts.AddConfigFlags(root.PersistentFlags()) + opts.AddContextFlags(root.PersistentFlags()) // populate the opts with the global flags _ = root.PersistentFlags().Parse(os.Args[1:]) @@ -134,7 +137,7 @@ func main() { ctx, cancel := newSigContext() defer cancel() - config, err := apicontext.LoadConfigFile(opts.Config, "config.json") + config, err := cliconfig.LoadFile(opts.Config) if err != nil { logrus.Fatal("unable ot find configuration") } @@ -146,15 +149,11 @@ func main() { currentContext = "default" } - ctx = apicontext.WithCurrentContext(ctx, currentContext) - if err != nil { - logrus.Fatal(err) - } - s, err := store.New(store.WithRoot(opts.Config)) if err != nil { logrus.Fatal(err) } + ctx = apicontext.WithCurrentContext(ctx, currentContext) ctx = store.WithContextStore(ctx, s) if err = root.ExecuteContext(ctx); err != nil { diff --git a/context/flags.go b/context/flags.go index b8f03a2dd..9af7c86cb 100644 --- a/context/flags.go +++ b/context/flags.go @@ -29,31 +29,17 @@ package context import ( "os" - "path/filepath" - "github.com/mitchellh/go-homedir" "github.com/spf13/pflag" ) -const ( - // ConfigFileName is the name of config file - ConfigFileName = "config.json" - configFileDir = ".docker" -) - -// Flags are the global cli flags -type Flags struct { - Config string +// ContextFlags are the global CLI flags +// nolint stutter +type ContextFlags struct { Context string } -// AddFlags adds persistent (global) flags -func (c *Flags) AddFlags(flags *pflag.FlagSet) { - flags.StringVar(&c.Config, "config", filepath.Join(home(), configFileDir), "Location of the client config files `DIRECTORY`") +// AddContextFlags adds persistent (global) flags +func (c *ContextFlags) AddContextFlags(flags *pflag.FlagSet) { flags.StringVarP(&c.Context, "context", "c", os.Getenv("DOCKER_CONTEXT"), "context") } - -func home() string { - home, _ := homedir.Dir() - return home -} diff --git a/go.mod b/go.mod index b81d1316a..be5addf88 100644 --- a/go.mod +++ b/go.mod @@ -23,7 +23,6 @@ require ( github.com/gorilla/mux v1.7.4 // indirect github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 github.com/hashicorp/go-multierror v1.1.0 - github.com/mitchellh/go-homedir v1.1.0 github.com/morikuni/aec v1.0.0 // indirect github.com/onsi/gomega v1.9.0 github.com/opencontainers/go-digest v1.0.0-rc1 From 96907f13e17aca2af9e697d24801824f46af25c2 Mon Sep 17 00:00:00 2001 From: Christopher Crone Date: Thu, 14 May 2020 09:53:49 +0200 Subject: [PATCH 2/9] Add forbidden error Signed-off-by: Christopher Crone --- errdefs/errors.go | 7 +++++++ errdefs/errors_test.go | 14 ++++++++++++++ 2 files changed, 21 insertions(+) diff --git a/errdefs/errors.go b/errdefs/errors.go index ff944d1c1..1bd21d9f8 100644 --- a/errdefs/errors.go +++ b/errdefs/errors.go @@ -36,6 +36,8 @@ var ( ErrNotFound = errors.New("not found") // ErrAlreadyExists is returned when an object already exists ErrAlreadyExists = errors.New("already exists") + // ErrForbidden is returned when an operation is not permitted + ErrForbidden = errors.New("forbidden") // ErrUnknown is returned when the error type is unmapped ErrUnknown = errors.New("unknown") ) @@ -50,6 +52,11 @@ func IsAlreadyExistsError(err error) bool { return errors.Is(err, ErrAlreadyExists) } +// IsForbiddenError returns true if the unwrapped error is ErrForbidden +func IsForbiddenError(err error) bool { + return errors.Is(err, ErrForbidden) +} + // IsUnknownError returns true if the unwrapped error is ErrUnknown func IsUnknownError(err error) bool { return errors.Is(err, ErrUnknown) diff --git a/errdefs/errors_test.go b/errdefs/errors_test.go index a2c2e48e8..29f0684d5 100644 --- a/errdefs/errors_test.go +++ b/errdefs/errors_test.go @@ -47,3 +47,17 @@ func TestIsAlreadyExists(t *testing.T) { require.False(t, IsAlreadyExistsError(errors.New("another error"))) } + +func TestIsForbidden(t *testing.T) { + err := errors.Wrap(ErrForbidden, `object "name"`) + require.True(t, IsForbiddenError(err)) + + require.False(t, IsForbiddenError(errors.New("another error"))) +} + +func TestIsUnknown(t *testing.T) { + err := errors.Wrap(ErrUnknown, `object "name"`) + require.True(t, IsUnknownError(err)) + + require.False(t, IsUnknownError(errors.New("another error"))) +} From ad8a16a9221aa962184c7dceaf3c83eddafca56f Mon Sep 17 00:00:00 2001 From: Christopher Crone Date: Thu, 14 May 2020 09:55:40 +0200 Subject: [PATCH 3/9] Do not allow changing default context Signed-off-by: Christopher Crone --- context/store/store.go | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/context/store/store.go b/context/store/store.go index 51ad0ea96..91c3f0e4e 100644 --- a/context/store/store.go +++ b/context/store/store.go @@ -36,9 +36,15 @@ import ( "path/filepath" "reflect" - "github.com/docker/api/errdefs" "github.com/opencontainers/go-digest" "github.com/pkg/errors" + + "github.com/docker/api/errdefs" +) + +const ( + // DefaultContextName is an automatically generated local context + DefaultContextName = "default" ) const ( @@ -187,6 +193,9 @@ func (s *store) GetType(meta *Metadata) string { } func (s *store) Create(name string, data TypedContext) error { + if name == DefaultContextName { + return errors.Wrap(errdefs.ErrAlreadyExists, objectName(name)) + } dir := contextdirOf(name) metaDir := filepath.Join(s.root, contextsDir, metadataDir, dir) if _, err := os.Stat(metaDir); !os.IsNotExist(err) { @@ -242,6 +251,9 @@ func (s *store) List() ([]*Metadata, error) { } func (s *store) Remove(name string) error { + if name == DefaultContextName { + return errors.Wrap(errdefs.ErrForbidden, objectName(name)) + } dir := filepath.Join(s.root, contextsDir, metadataDir, contextdirOf(name)) // Check if directory exists because os.RemoveAll returns nil if it doesn't if _, err := os.Stat(dir); os.IsNotExist(err) { From 9bf2924c2418331179327fb65e0076c5fe927bf7 Mon Sep 17 00:00:00 2001 From: Christopher Crone Date: Thu, 14 May 2020 09:59:12 +0200 Subject: [PATCH 4/9] Remove logrus.Fatal Signed-off-by: Christopher Crone --- cli/main.go | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/cli/main.go b/cli/main.go index fa73d8ce3..66b96b92c 100644 --- a/cli/main.go +++ b/cli/main.go @@ -30,13 +30,13 @@ package main import ( "context" "fmt" - "log" "os" "os/exec" "os/signal" "path/filepath" "syscall" + "github.com/pkg/errors" "github.com/sirupsen/logrus" "github.com/spf13/cobra" @@ -68,7 +68,7 @@ func init() { // into the env of this cli for development path, err := filepath.Abs(filepath.Dir(os.Args[0])) if err != nil { - log.Fatal(err) + fatal(errors.Wrap(err, "unable to get absolute bin path")) } if err := os.Setenv("PATH", fmt.Sprintf("%s:%s", os.Getenv("PATH"), path)); err != nil { panic(err) @@ -139,7 +139,7 @@ func main() { config, err := cliconfig.LoadFile(opts.Config) if err != nil { - logrus.Fatal("unable ot find configuration") + fatal(errors.Wrap(err, "unable to find configuration file")) } currentContext := opts.Context if currentContext == "" { @@ -151,7 +151,7 @@ func main() { s, err := store.New(store.WithRoot(opts.Config)) if err != nil { - logrus.Fatal(err) + fatal(errors.Wrap(err, "unable to create context store")) } ctx = apicontext.WithCurrentContext(ctx, currentContext) ctx = store.WithContextStore(ctx, s) @@ -200,3 +200,8 @@ func execMoby(ctx context.Context) { os.Exit(0) } } + +func fatal(err error) { + fmt.Fprint(os.Stderr, err) + os.Exit(1) +} From c92a9b12d9507c0e4119d3e158b8b982f026e366 Mon Sep 17 00:00:00 2001 From: Christopher Crone Date: Thu, 14 May 2020 09:59:48 +0200 Subject: [PATCH 5/9] Add help to context commands Signed-off-by: Christopher Crone --- cli/cmd/context.go | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/cli/cmd/context.go b/cli/cmd/context.go index 6207e0698..2fde17daa 100644 --- a/cli/cmd/context.go +++ b/cli/cmd/context.go @@ -84,6 +84,7 @@ func createCommand() *cobra.Command { func listCommand() *cobra.Command { cmd := &cobra.Command{ Use: "list", + Short: "List available contexts", Aliases: []string{"ls"}, Args: cobra.NoArgs, RunE: func(cmd *cobra.Command, args []string) error { @@ -95,7 +96,8 @@ func listCommand() *cobra.Command { func removeCommand() *cobra.Command { return &cobra.Command{ - Use: "rm", + Use: "rm CONTEXT [CONTEXT...]", + Short: "Remove one or more contexts", Aliases: []string{"remove"}, Args: cobra.MinimumNArgs(1), RunE: func(cmd *cobra.Command, args []string) error { From 8720a62c37408c33bf999f30d4ba2108994f9c3e Mon Sep 17 00:00:00 2001 From: Christopher Crone Date: Thu, 14 May 2020 10:00:02 +0200 Subject: [PATCH 6/9] Add context use command Signed-off-by: Christopher Crone --- cli/cmd/context.go | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/cli/cmd/context.go b/cli/cmd/context.go index 2fde17daa..651d2f4d1 100644 --- a/cli/cmd/context.go +++ b/cli/cmd/context.go @@ -34,8 +34,10 @@ import ( "text/tabwriter" "github.com/hashicorp/go-multierror" + "github.com/pkg/errors" "github.com/spf13/cobra" + cliconfig "github.com/docker/api/cli/config" "github.com/docker/api/context/store" ) @@ -50,6 +52,7 @@ func ContextCommand() *cobra.Command { createCommand(), listCommand(), removeCommand(), + useCommand(), ) return cmd @@ -106,6 +109,21 @@ func removeCommand() *cobra.Command { } } +func useCommand() *cobra.Command { + return &cobra.Command{ + Use: "use CONTEXT", + Short: "Set the default context", + Args: cobra.ExactArgs(1), + RunE: func(cmd *cobra.Command, args []string) error { + config := cmd.Flag(cliconfig.ConfigFlagName) + if config == nil || config.Value.String() == "" { + panic(errors.New("no value for config directory")) + } + return runUse(cmd.Context(), config.Value.String(), args[0]) + }, + } +} + func runCreate(ctx context.Context, opts createOpts, name string, contextType string) error { switch contextType { case "aci": @@ -162,3 +180,18 @@ func runRemove(ctx context.Context, args []string) error { } return errs.ErrorOrNil() } + +func runUse(ctx context.Context, configDir string, name string) error { + s := store.ContextStore(ctx) + // Match behavior of existing CLI + if name != store.DefaultContextName { + if _, err := s.Get(name, nil); err != nil { + return err + } + } + if err := cliconfig.WriteCurrentContext(configDir, name); err != nil { + return err + } + fmt.Println(name) + return nil +} From 90e11cf3495b67df009274639897e724f0e3a045 Mon Sep 17 00:00:00 2001 From: Christopher Crone Date: Thu, 14 May 2020 10:15:29 +0200 Subject: [PATCH 7/9] e2e: Use new context use command Signed-off-by: Christopher Crone --- tests/e2e/e2e.go | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/tests/e2e/e2e.go b/tests/e2e/e2e.go index d20173ed3..504cd31ea 100644 --- a/tests/e2e/e2e.go +++ b/tests/e2e/e2e.go @@ -20,7 +20,7 @@ func main() { }) It("should be initialized with default context", func() { - NewCommand("docker", "context", "use", "default").ExecOrDie() + NewDockerCommand("context", "use", "default").ExecOrDie() output := NewCommand("docker", "context", "ls").ExecOrDie() Expect(output).To(Not(ContainSubstring("test-example"))) Expect(output).To(ContainSubstring("default *")) @@ -52,9 +52,10 @@ func main() { //Expect(output).To(ContainSubstring("test-example context acitest created")) }) defer NewDockerCommand("context", "rm", "test-example").ExecOrDie() + defer NewDockerCommand("context", "use", "default").ExecOrDie() It("uses the test context", func() { - currentContext := NewCommand("docker", "context", "use", "test-example").ExecOrDie() + currentContext := NewDockerCommand("context", "use", "test-example").ExecOrDie() Expect(currentContext).To(ContainSubstring("test-example")) output := NewCommand("docker", "context", "ls").ExecOrDie() Expect(output).To(ContainSubstring("test-example *")) From 11b4bd19f571f16f786bfca2451a14a3afe452e8 Mon Sep 17 00:00:00 2001 From: Christopher Crone Date: Thu, 14 May 2020 18:29:09 +0200 Subject: [PATCH 8/9] Refactor global CLI options Signed-off-by: Christopher Crone --- cli/cmd/context.go | 14 +++++--------- cli/main.go | 18 ++++++++---------- cli/options/options.go | 40 ++++++++++++++++++++++++++++++++++++++++ 3 files changed, 53 insertions(+), 19 deletions(-) create mode 100644 cli/options/options.go diff --git a/cli/cmd/context.go b/cli/cmd/context.go index 651d2f4d1..bc044b92d 100644 --- a/cli/cmd/context.go +++ b/cli/cmd/context.go @@ -34,15 +34,15 @@ import ( "text/tabwriter" "github.com/hashicorp/go-multierror" - "github.com/pkg/errors" "github.com/spf13/cobra" cliconfig "github.com/docker/api/cli/config" + cliopts "github.com/docker/api/cli/options" "github.com/docker/api/context/store" ) // ContextCommand manages contexts -func ContextCommand() *cobra.Command { +func ContextCommand(opts *cliopts.GlobalOpts) *cobra.Command { cmd := &cobra.Command{ Use: "context", Short: "Manage contexts", @@ -52,7 +52,7 @@ func ContextCommand() *cobra.Command { createCommand(), listCommand(), removeCommand(), - useCommand(), + useCommand(opts), ) return cmd @@ -109,17 +109,13 @@ func removeCommand() *cobra.Command { } } -func useCommand() *cobra.Command { +func useCommand(opts *cliopts.GlobalOpts) *cobra.Command { return &cobra.Command{ Use: "use CONTEXT", Short: "Set the default context", Args: cobra.ExactArgs(1), RunE: func(cmd *cobra.Command, args []string) error { - config := cmd.Flag(cliconfig.ConfigFlagName) - if config == nil || config.Value.String() == "" { - panic(errors.New("no value for config directory")) - } - return runUse(cmd.Context(), config.Value.String(), args[0]) + return runUse(cmd.Context(), opts.Config, args[0]) }, } } diff --git a/cli/main.go b/cli/main.go index 66b96b92c..649a799e6 100644 --- a/cli/main.go +++ b/cli/main.go @@ -49,6 +49,7 @@ import ( "github.com/docker/api/cli/cmd/compose" "github.com/docker/api/cli/cmd/run" cliconfig "github.com/docker/api/cli/config" + cliopts "github.com/docker/api/cli/options" apicontext "github.com/docker/api/context" "github.com/docker/api/context/store" ) @@ -57,12 +58,6 @@ var ( runningOwnCommand bool ) -type mainOpts struct { - apicontext.ContextFlags - cliconfig.ConfigFlags - debug bool -} - func init() { // initial hack to get the path of the project's bin dir // into the env of this cli for development @@ -86,7 +81,7 @@ func isOwnCommand(cmd *cobra.Command) bool { } func main() { - var opts mainOpts + var opts cliopts.GlobalOpts root := &cobra.Command{ Use: "docker", Long: "docker for the 2020s", @@ -105,7 +100,7 @@ func main() { } root.AddCommand( - cmd.ContextCommand(), + cmd.ContextCommand(&opts), cmd.PsCommand(), cmd.ServeCommand(), run.Command(), @@ -124,19 +119,22 @@ func main() { helpFunc(cmd, args) }) - root.PersistentFlags().BoolVarP(&opts.debug, "debug", "d", false, "enable debug output in the logs") + root.PersistentFlags().BoolVarP(&opts.Debug, "debug", "d", false, "enable debug output in the logs") opts.AddConfigFlags(root.PersistentFlags()) opts.AddContextFlags(root.PersistentFlags()) // populate the opts with the global flags _ = root.PersistentFlags().Parse(os.Args[1:]) - if opts.debug { + if opts.Debug { logrus.SetLevel(logrus.DebugLevel) } ctx, cancel := newSigContext() defer cancel() + if opts.Config == "" { + fatal(errors.New("config path cannot be empty")) + } config, err := cliconfig.LoadFile(opts.Config) if err != nil { fatal(errors.Wrap(err, "unable to find configuration file")) diff --git a/cli/options/options.go b/cli/options/options.go new file mode 100644 index 000000000..ac97dbfab --- /dev/null +++ b/cli/options/options.go @@ -0,0 +1,40 @@ +/* + Copyright (c) 2020 Docker Inc. + + Permission is hereby granted, free of charge, to any person + obtaining a copy of this software and associated documentation + files (the "Software"), to deal in the Software without + restriction, including without limitation the rights to use, copy, + modify, merge, publish, distribute, sublicense, and/or sell copies + of the Software, and to permit persons to whom the Software is + furnished to do so, subject to the following conditions: + + The above copyright notice and this permission notice shall be + included in all copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + EXPRESS OR IMPLIED, + INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. + IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT + HOLDERS BE LIABLE FOR ANY CLAIM, + DAMAGES OR OTHER LIABILITY, + WHETHER IN AN ACTION OF CONTRACT, + TORT OR OTHERWISE, + ARISING FROM, OUT OF OR IN CONNECTION WITH + THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +*/ + +package options + +import ( + apicontext "github.com/docker/api/context" + cliconfig "github.com/docker/api/cli/config" +) + +// GlobalOpts contains the global CLI options +type GlobalOpts struct { + apicontext.ContextFlags + cliconfig.ConfigFlags + Debug bool +} From a1e83109cd1acf7a8217c097ad8cca39d906c468 Mon Sep 17 00:00:00 2001 From: Christopher Crone Date: Thu, 14 May 2020 19:18:33 +0200 Subject: [PATCH 9/9] Replace require with assert for errors test Signed-off-by: Christopher Crone --- errdefs/errors_test.go | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/errdefs/errors_test.go b/errdefs/errors_test.go index 29f0684d5..9fb5eaf51 100644 --- a/errdefs/errors_test.go +++ b/errdefs/errors_test.go @@ -31,33 +31,33 @@ import ( "testing" "github.com/pkg/errors" - "github.com/stretchr/testify/require" + "github.com/stretchr/testify/assert" ) func TestIsNotFound(t *testing.T) { err := errors.Wrap(ErrNotFound, `object "name"`) - require.True(t, IsNotFoundError(err)) + assert.True(t, IsNotFoundError(err)) - require.False(t, IsNotFoundError(errors.New("another error"))) + assert.False(t, IsNotFoundError(errors.New("another error"))) } func TestIsAlreadyExists(t *testing.T) { err := errors.Wrap(ErrAlreadyExists, `object "name"`) - require.True(t, IsAlreadyExistsError(err)) + assert.True(t, IsAlreadyExistsError(err)) - require.False(t, IsAlreadyExistsError(errors.New("another error"))) + assert.False(t, IsAlreadyExistsError(errors.New("another error"))) } func TestIsForbidden(t *testing.T) { err := errors.Wrap(ErrForbidden, `object "name"`) - require.True(t, IsForbiddenError(err)) + assert.True(t, IsForbiddenError(err)) - require.False(t, IsForbiddenError(errors.New("another error"))) + assert.False(t, IsForbiddenError(errors.New("another error"))) } func TestIsUnknown(t *testing.T) { err := errors.Wrap(ErrUnknown, `object "name"`) - require.True(t, IsUnknownError(err)) + assert.True(t, IsUnknownError(err)) - require.False(t, IsUnknownError(errors.New("another error"))) + assert.False(t, IsUnknownError(errors.New("another error"))) }