Improvement to extended data

- add validation: edFolder can not be the same as working dir
- update extended data to not clear edFolder

Author: ycrash

internal/capture/extended_data.go

@@ -33,11 +33,6 @@ func (ed *ExtendedData) Run() (Result, error) {
 		return Result{Msg: errMsg, Ok: false}, err
 	}
 
-	// Clear existing files in the data folder
-	if err := ed.clearDataFolder(); err != nil {
-		logger.Log("ExtendedData: failed to clear data folder: %v", err)
-	}
-
 	// Execute the custom script with timeout
 	if err := ed.executeScript(); err != nil {
 		// We log the error but continue to upload any files that might have been generated
@@ -56,23 +51,6 @@ func (ed *ExtendedData) Run() (Result, error) {
 	return ed.uploadCapturedFiles()
 }
 
-// clearDataFolder removes all files from the data folder
-func (ed *ExtendedData) clearDataFolder() error {
-	entries, err := os.ReadDir(ed.DataFolder)
-	if err != nil {
-		return fmt.Errorf("ExtendedData: failed to read data folder: %w", err)
-	}
-
-	for _, entry := range entries {
-		path := filepath.Join(ed.DataFolder, entry.Name())
-		if err := os.RemoveAll(path); err != nil {
-			return fmt.Errorf("ExtendedData: failed to remove %s: %w", path, err)
-		}
-	}
-
-	return nil
-}
-
 // executeScript runs the custom script with a timeout
 func (ed *ExtendedData) executeScript() error {
 	logger.Log("ExtendedData: executing custom script: %s", ed.Script)
@@ -200,7 +178,6 @@ func (ed *ExtendedData) uploadCapturedFiles() (Result, error) {
 	successCount := 0
 	failCount := 0
 	var lastError error
-
 	uploadMsgs := []string{}
 
 	// Filter files with "ed-" prefix

internal/cli/validation.go

@@ -4,6 +4,7 @@ import "C"
 import (
 	"errors"
 	"os"
+	"path/filepath"
 
 	"yc-agent/internal/config"
 	"yc-agent/internal/logger"
@@ -41,5 +42,33 @@ func validate() error {
 		return ErrInvalidArgumentCantContinue
 	}
 
+	// Validate edDataFolder is not the current working directory
+	if config.GlobalConfig.EdDataFolder != "" {
+		currentDir, err := os.Getwd()
+		if err != nil {
+			logger.Log("Failed to get current working directory: %v", err)
+			return ErrInvalidArgumentCantContinue
+		}
+
+		edDataFolderAbs, err := filepath.Abs(config.GlobalConfig.EdDataFolder)
+		if err != nil {
+			logger.Log("Failed to resolve edDataFolder path '%s': %v", config.GlobalConfig.EdDataFolder, err)
+			return ErrInvalidArgumentCantContinue
+		}
+
+		currentDirAbs, err := filepath.Abs(currentDir)
+		if err != nil {
+			logger.Log("Failed to resolve current directory path: %v", err)
+			return ErrInvalidArgumentCantContinue
+		}
+
+		if edDataFolderAbs == currentDirAbs {
+			logger.Log("ERROR: edDataFolder cannot be the current working directory")
+			logger.Log("Current directory: %s", currentDirAbs)
+			logger.Log("edDataFolder: %s", edDataFolderAbs)
+			return ErrInvalidArgumentCantContinue
+		}
+	}
+
 	return nil
 }

internal/config/config.go

@@ -92,7 +92,7 @@ type Options struct {
 
 	// Extended Data
 	EdScript     string `yaml:"edScript" usage:"Extended Data: Path to a custom script that collects extended diagnostics data"`
-	EdDataFolder string `yaml:"edDataFolder" usage:"Extended Data: Directory path where artifacts generated by (-edScript) will be stored and collected. WARNING: All existing files in this folder will be cleared before script execution"`
+	EdDataFolder string `yaml:"edDataFolder" usage:"Extended Data: Directory path where artifacts generated by (-edScript) will be stored and collected."`
 
 	HttpClientTimeout time.Duration `yaml:"httpClientTimeout" usage:"HTTP client timeout for API requests (e.g., 1m, 30s). Default is 60 seconds."`
 }