Update cleanup to remove service logs from independent Elastic Agents

README.md

@@ -272,7 +272,7 @@ _Context: package_
 
 Use this command to clean resources used for building the package.
 
-The command will remove built package files (in build/), files needed for managing the development stack (in ~/.elastic-package/stack/development) and stack service logs (in ~/.elastic-package/tmp/service_logs).
+The command will remove built package files (in build/), files needed for managing the development stack (in ~/.elastic-package/stack/development) and stack service logs (in ~/.elastic-package/tmp/service_logs and ~/.elastic-package/profiles/<profile>/service_logs/).
 
 ### `elastic-package create`
 

cmd/clean.go

@@ -11,11 +11,12 @@ import (
 
 	"github.com/elastic/elastic-package/internal/cleanup"
 	"github.com/elastic/elastic-package/internal/cobraext"
+	"github.com/elastic/elastic-package/internal/install"
 )
 
 const cleanLongDescription = `Use this command to clean resources used for building the package.
 
-The command will remove built package files (in build/), files needed for managing the development stack (in ~/.elastic-package/stack/development) and stack service logs (in ~/.elastic-package/tmp/service_logs).`
+The command will remove built package files (in build/), files needed for managing the development stack (in ~/.elastic-package/stack/development) and stack service logs (in ~/.elastic-package/tmp/service_logs and ~/.elastic-package/profiles/<profile>/service_logs/).`
 
 func setupCleanCommand() *cobraext.Command {
 	cmd := &cobra.Command{
@@ -25,13 +26,19 @@ func setupCleanCommand() *cobraext.Command {
 		Args:  cobra.NoArgs,
 		RunE:  cleanCommandAction,
 	}
+	cmd.PersistentFlags().StringP(cobraext.ProfileFlagName, "p", "", fmt.Sprintf(cobraext.ProfileFlagDescription, install.ProfileNameEnvVar))
 
 	return cobraext.NewCommand(cmd, cobraext.ContextPackage)
 }
 
 func cleanCommandAction(cmd *cobra.Command, args []string) error {
 	cmd.Println("Clean used resources")
 
+	profile, err := cobraext.GetProfileFlag(cmd)
+	if err != nil {
+		return err
+	}
+
 	target, err := cleanup.Build()
 	if err != nil {
 		return fmt.Errorf("can't clean build resources: %w", err)
@@ -57,6 +64,14 @@ func cleanCommandAction(cmd *cobra.Command, args []string) error {
 		cmd.Printf("Temporary service logs removed: %s\n", target)
 	}
 
+	target, err = cleanup.ServiceLogsIndependentAgents(profile)
+	if err != nil {
+		return fmt.Errorf("can't clean temporary service logs: %w", err)
+	}
+	if target != "" {
+		cmd.Printf("Temporary service logs (independent Elastic Agents) removed: %s\n", target)
+	}
+
 	cmd.Println("Done")
 	return nil
 }

cmd/testrunner.go

@@ -79,7 +79,7 @@ func setupTestCommand() *cobraext.Command {
 	cmd.PersistentFlags().StringP(cobraext.ProfileFlagName, "p", "", fmt.Sprintf(cobraext.ProfileFlagDescription, install.ProfileNameEnvVar))
 
 	// Just used in pipeline and system tests
-	// Keep it here for backwards compatbility
+	// Keep it here for backwards compatibility
 	cmd.PersistentFlags().DurationP(cobraext.DeferCleanupFlagName, "", 0, cobraext.DeferCleanupFlagDescription)
 
 	assetCmd := getTestRunnerAssetCommand()
@@ -743,7 +743,6 @@ func processResults(results []testrunner.TestResult, testType testrunner.TestTyp
 		}
 	}
 	return nil
-
 }
 
 func validateDataStreamsFlag(packageRootPath string, dataStreams []string) error {

internal/agentdeployer/directories.go

@@ -17,8 +17,12 @@ const (
 	deployerDir    = "deployer"
 )
 
+func ServiceLogsDir(profile *profile.Profile) string {
+	return filepath.Join(profile.ProfilePath, serviceLogsDir)
+}
+
 func CreateServiceLogsDir(profile *profile.Profile, name string) (string, error) {
-	dirPath := filepath.Join(profile.ProfilePath, serviceLogsDir, name)
+	dirPath := filepath.Join(ServiceLogsDir(profile), name)
 	err := os.MkdirAll(dirPath, 0755)
 	if err != nil {
 		return "", fmt.Errorf("mkdir failed for service logs (path: %s): %w", dirPath, err)

internal/cleanup/service_logs.go

@@ -6,10 +6,15 @@ package cleanup
 
 import (
 	"fmt"
+	"os"
+	"path/filepath"
 
+	"github.com/elastic/elastic-package/internal/agentdeployer"
 	"github.com/elastic/elastic-package/internal/configuration/locations"
 	"github.com/elastic/elastic-package/internal/files"
 	"github.com/elastic/elastic-package/internal/logger"
+	"github.com/elastic/elastic-package/internal/packages"
+	"github.com/elastic/elastic-package/internal/profile"
 )
 
 // ServiceLogs function removes service logs from temporary directory in the `~/.elastic-package`.
@@ -26,5 +31,33 @@ func ServiceLogs() (string, error) {
 	if err != nil {
 		return "", fmt.Errorf("can't remove content (path: %s): %w", locationManager.ServiceLogDir(), err)
 	}
+
 	return locationManager.ServiceLogDir(), nil
 }
+
+// ServiceLogs function removes service logs from temporary directory in the `~/.elastic-package`.
+func ServiceLogsIndependentAgents(profile *profile.Profile) (string, error) {
+	logger.Debug("Clean all service logs from independent Elastic Agents")
+
+	packageRootPath, err := packages.MustFindPackageRoot()
+	if err != nil {
+		return "", fmt.Errorf("locating package root failed: %w", err)
+	}
+
+	packageFolder := filepath.Base(packageRootPath)
+	serviceLogsDir := agentdeployer.ServiceLogsDir(profile)
+
+	folderGlob := fmt.Sprintf("%s/agent-%s-*", serviceLogsDir, packageFolder)
+	folders, err := filepath.Glob(folderGlob)
+	if err != nil {
+		return "", fmt.Errorf("pattern malformed: %w", err)
+	}
+	for _, f := range folders {
+		logger.Debugf("Remove folder (path: %s)", f)
+		if err := os.RemoveAll(f); err != nil {
+			return "", fmt.Errorf("can't remove folder (path: %s): %w", f, err)
+		}
+	}
+
+	return folderGlob, nil
+}

internal/stack/clients.go

@@ -111,7 +111,7 @@ func NewKibanaClientFromProfile(profile *profile.Profile, customOptions ...kiban
 
 	kibanaHost, found := os.LookupEnv(KibanaHostEnv)
 	if !found {
-		// Using backgound context on initial call to avoid context cancellation.
+		// Using background context on initial call to avoid context cancellation.
 		status, err := Status(context.Background(), Options{Profile: profile})
 		if err != nil {
 			return nil, fmt.Errorf("failed to check status of stack in current profile: %w", err)