Move config and logs under ~/.cloudcanal-cli

Author: Arlowen

README.md

@@ -55,7 +55,7 @@ cloudcanal jobs list --type SYNC --output json
 配置文件默认保存在：
 
 ```text
-~/.cloudcanal/config.json
+~/.cloudcanal-cli/config.json
 ```
 
 最小配置示例：

docs/cloudcanal-cli-usage.md

@@ -50,7 +50,7 @@ curl -fsSL https://raw.githubusercontent.com/Arlowen/cloudcanal-openapi-cli/main
 首次启动会进入初始化向导，配置文件默认保存到：
 
 ```text
-~/.cloudcanal/config.json
+~/.cloudcanal-cli/config.json
 ```
 
 配置格式：

internal/config/config.go

@@ -111,17 +111,28 @@ func (c AppConfig) HTTPReadRetryBackoffMillisValue() int {
 }
 
 type Service struct {
-	path string
+	path           string
+	defaultManaged bool
 }
 
 func NewService(path string) *Service {
+	defaultManaged := false
 	if strings.TrimSpace(path) == "" {
 		path = DefaultPath()
+		defaultManaged = true
 	}
-	return &Service{path: path}
+	return &Service{path: path, defaultManaged: defaultManaged}
 }
 
 func DefaultPath() string {
+	home, err := os.UserHomeDir()
+	if err != nil {
+		return ".cloudcanal-cli/config.json"
+	}
+	return filepath.Join(home, ".cloudcanal-cli", "config.json")
+}
+
+func LegacyDefaultPath() string {
 	home, err := os.UserHomeDir()
 	if err != nil {
 		return ".cloudcanal/config.json"
@@ -135,15 +146,32 @@ func (s *Service) Path() string {
 
 func (s *Service) Exists() bool {
 	_, err := os.Stat(s.path)
-	return err == nil
+	if err == nil {
+		return true
+	}
+	if s.defaultManaged {
+		_, legacyErr := os.Stat(LegacyDefaultPath())
+		return legacyErr == nil
+	}
+	return false
 }
 
 func (s *Service) Load() (AppConfig, error) {
-	data, err := os.ReadFile(s.path)
+	cfg, err := s.loadFromPath(s.path)
+	if err == nil {
+		return cfg, nil
+	}
+	if s.defaultManaged && errors.Is(err, os.ErrNotExist) {
+		return s.loadFromLegacyPath()
+	}
+	return AppConfig{}, err
+}
+
+func (s *Service) loadFromPath(path string) (AppConfig, error) {
+	data, err := os.ReadFile(path)
 	if err != nil {
 		return AppConfig{}, err
 	}
-
 	var cfg AppConfig
 	if err := json.Unmarshal(data, &cfg); err != nil {
 		return AppConfig{}, errors.New(i18n.T("config.invalidJSON"))
@@ -155,6 +183,19 @@ func (s *Service) Load() (AppConfig, error) {
 	return cfg, nil
 }
 
+func (s *Service) loadFromLegacyPath() (AppConfig, error) {
+	legacyPath := LegacyDefaultPath()
+	cfg, err := s.loadFromPath(legacyPath)
+	if err != nil {
+		return AppConfig{}, err
+	}
+	if err := s.Save(cfg); err == nil {
+		_ = os.Remove(legacyPath)
+		_ = os.Remove(filepath.Dir(legacyPath))
+	}
+	return cfg, nil
+}
+
 func (s *Service) Save(cfg AppConfig) error {
 	cfg = cfg.WithDefaults()
 	if err := cfg.Validate(); err != nil {

scripts/all_build.sh

@@ -8,7 +8,11 @@ source "$SCRIPT_DIR/lib/log.sh"
 
 BIN_DIR="$ROOT_DIR/bin"
 BIN_PATH="$BIN_DIR/cloudcanal"
-LOG_DIR="$(mktemp -d "${TMPDIR:-/tmp}/cloudcanal-openapi-cli-build.XXXXXX")"
+CLI_HOME_DIR="${HOME}/.cloudcanal-cli"
+LOG_ROOT_DIR="${CLI_HOME_DIR}/logs"
+
+mkdir -p "$LOG_ROOT_DIR"
+LOG_DIR="$(mktemp -d "${LOG_ROOT_DIR}/cloudcanal-openapi-cli-build.XXXXXX")"
 
 cleanup() {
   rm -rf "$LOG_DIR"

test/config/config_test.go

@@ -77,3 +77,70 @@ func TestConfigNetworkSettingsDefaultsAndValidation(t *testing.T) {
 		t.Fatal("Validate() error = nil, want non-nil for negative retry count")
 	}
 }
+
+func TestDefaultPathUsesCloudCanalCLIDirectory(t *testing.T) {
+	home := t.TempDir()
+	t.Setenv("HOME", home)
+
+	got := config.DefaultPath()
+	want := filepath.Join(home, ".cloudcanal-cli", "config.json")
+	if got != want {
+		t.Fatalf("DefaultPath() = %q, want %q", got, want)
+	}
+}
+
+func TestServiceLoadMigratesLegacyDefaultConfig(t *testing.T) {
+	home := t.TempDir()
+	t.Setenv("HOME", home)
+
+	legacyPath := config.LegacyDefaultPath()
+	if err := os.MkdirAll(filepath.Dir(legacyPath), 0o755); err != nil {
+		t.Fatalf("MkdirAll() error = %v", err)
+	}
+	content := []byte(`{"apiBaseUrl":"https://cc.example.com","accessKey":"legacy-ak","secretKey":"legacy-sk","language":"zh"}`)
+	if err := os.WriteFile(legacyPath, content, 0o600); err != nil {
+		t.Fatalf("WriteFile() error = %v", err)
+	}
+
+	service := config.NewService("")
+	if !service.Exists() {
+		t.Fatal("Exists() = false, want true when only legacy config exists")
+	}
+
+	loaded, err := service.Load()
+	if err != nil {
+		t.Fatalf("Load() error = %v", err)
+	}
+	if loaded.APIBaseURL != "https://cc.example.com" || loaded.AccessKey != "legacy-ak" || loaded.SecretKey != "legacy-sk" || loaded.Language != "zh" {
+		t.Fatalf("loaded config = %+v, want legacy values", loaded)
+	}
+
+	newPath := config.DefaultPath()
+	if _, err := os.Stat(newPath); err != nil {
+		t.Fatalf("new config path stat error = %v", err)
+	}
+	if _, err := os.Stat(legacyPath); !os.IsNotExist(err) {
+		t.Fatalf("legacy config still exists, stat err = %v", err)
+	}
+}
+
+func TestServiceLoadWithCustomPathDoesNotReadLegacyConfig(t *testing.T) {
+	home := t.TempDir()
+	t.Setenv("HOME", home)
+
+	legacyPath := config.LegacyDefaultPath()
+	if err := os.MkdirAll(filepath.Dir(legacyPath), 0o755); err != nil {
+		t.Fatalf("MkdirAll() error = %v", err)
+	}
+	if err := os.WriteFile(legacyPath, []byte(`{"apiBaseUrl":"https://cc.example.com","accessKey":"legacy-ak","secretKey":"legacy-sk"}`), 0o600); err != nil {
+		t.Fatalf("WriteFile() error = %v", err)
+	}
+
+	service := config.NewService(filepath.Join(t.TempDir(), "config.json"))
+	if service.Exists() {
+		t.Fatal("Exists() = true, want false for custom path without file")
+	}
+	if _, err := service.Load(); !os.IsNotExist(err) {
+		t.Fatalf("Load() error = %v, want os.ErrNotExist", err)
+	}
+}