rebase fixes

Signed-off-by: Simon Ferquel <[email protected]>

cli/command/context/create.go

@@ -1,8 +1,6 @@
 package context
 
 import (
-	"os"
-
 	"github.com/docker/cli/cli"
 	"github.com/docker/cli/cli/command"
 	"github.com/docker/cli/cli/context/docker"
@@ -48,7 +46,7 @@ func (o *createOptions) addFlags(flags *pflag.FlagSet) {
 }
 
 func (o *createOptions) process(cli command.Cli, s store.Store) error {
-	if _, err := s.GetContextMetadata(o.name); !os.IsNotExist(err) {
+	if _, err := s.GetContextMetadata(o.name); !store.IsErrContextDoesNotExist(err) {
 		if err != nil {
 			return errors.Wrap(err, "error while getting existing contexts")
 		}

cli/command/context/export.go

@@ -47,6 +47,9 @@ func newExportCommand(dockerCli command.Cli) *cobra.Command {
 }
 func runExport(dockerCli command.Cli, opts *exportOptions) error {
 	ctxMeta, err := dockerCli.ContextStore().GetContextMetadata(opts.contextName)
+	if err != nil {
+		return err
+	}
 	var writer io.Writer
 	if opts.dest == "-" {
 		writer = dockerCli.Out()
@@ -59,9 +62,6 @@ func runExport(dockerCli command.Cli, opts *exportOptions) error {
 		writer = f
 	}
 
-	if err != nil {
-		return err
-	}
 	if !opts.kubeconfig {
 		reader := store.Export(opts.contextName, dockerCli.ContextStore())
 		defer reader.Close()

cli/command/context/import.go

@@ -50,7 +50,9 @@ func newImportCommand(dockerCli command.Cli) *cobra.Command {
 				return err
 			}
 			if opts.use {
-				return dockerCli.ContextStore().SetCurrentContext(opts.name)
+				cfg := dockerCli.ConfigFile()
+				cfg.CurrentContext = opts.name
+				return cfg.Save()
 			}
 			return nil
 		},

cli/command/context/use.go

@@ -16,7 +16,9 @@ func newUseCommand(dockerCli command.Cli) *cobra.Command {
 			if _, err := dockerCli.ContextStore().GetContextMetadata(name); err != nil {
 				return err
 			}
-			return dockerCli.ContextStore().SetCurrentContext(name)
+			cfg := dockerCli.ConfigFile()
+			cfg.CurrentContext = name
+			return cfg.Save()
 		},
 	}
 	return cmd