fix: config version migration

zeromake · May 8, 2020 · 3c8d2ff · 3c8d2ff
1 parent 7681c53
commit 3c8d2ff
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/internal/command/cli.go b/internal/command/cli.go
@@ -103,7 +103,7 @@ func WithConfig(config *config.Config) DebugCliOption {
 }
 
 // WithClientConfig set docker config
-func WithClientConfig(dockerConfig config.DockerConfig) DebugCliOption {
+func WithClientConfig(dockerConfig *config.DockerConfig) DebugCliOption {
 	return func(cli *DebugCli) error {
 		if cli.client != nil {
 			err := cli.client.Close()

diff --git a/internal/command/config.go b/internal/command/config.go
@@ -27,7 +27,7 @@ func init() {
 				}
 				return errors.Errorf("not find %s config", name)
 			}
-			conf.DockerConfig[name] = *cfg
+			conf.DockerConfig[name] = cfg
 			return conf.Save()
 		},
 	}

diff --git a/internal/command/root.go b/internal/command/root.go
@@ -84,7 +84,7 @@ func buildCli(options execOptions) (*DebugCli, error) {
 		return nil, errors.New("not set image")
 	}
 	if options.host != "" {
-		dockerConfig := config.DockerConfig{
+		dockerConfig := &config.DockerConfig{
 			Host: options.host,
 		}
 		if options.certDir != "" {

diff --git a/internal/config/config.go b/internal/config/config.go
@@ -67,7 +67,7 @@ type Config struct {
 	Image               string                  `toml:"image"`
 	Timeout             time.Duration           `toml:"timeout"`
 	DockerConfigDefault string                  `toml:"config_default"`
-	DockerConfig        map[string]DockerConfig `toml:"config"`
+	DockerConfig        map[string]*DockerConfig `toml:"config"`
 }
 
 // Save save to default file
@@ -144,8 +144,8 @@ func InitConfig() (*Config, error) {
 		Timeout:             time.Second * 10,
 		MountDir:            "/mnt/container",
 		DockerConfigDefault: "default",
-		DockerConfig: map[string]DockerConfig{
-			"default": dc,
+		DockerConfig: map[string]*DockerConfig{
+			"default": &dc,
 		},
 	}
 	file, err := os.OpenFile(ConfigFile, os.O_CREATE|os.O_RDWR|os.O_TRUNC, 0644)