Dump all service logs even if there is any error (#2642)

Allow to dump all service logs even if one of them fails. For instance,
it could fail in the scenario that one of the containers was not created
due to other failures.

Author: mrodm

internal/stack/dump.go

@@ -6,6 +6,7 @@ package stack
 
 import (
 	"context"
+	"errors"
 	"fmt"
 	"os"
 	"path/filepath"
@@ -75,7 +76,17 @@ func dumpStackLogs(ctx context.Context, options DumpOptions) ([]DumpResult, erro
 		}
 	}
 
+	var logsPath string
+	if options.Output != "" {
+		logsPath = filepath.Join(options.Output, "logs")
+		err = os.MkdirAll(logsPath, 0755)
+		if err != nil {
+			return nil, fmt.Errorf("can't create output location (path: %s): %w", logsPath, err)
+		}
+	}
+
 	var results []DumpResult
+	var containerErrors error
 	for _, serviceName := range services {
 		if len(options.Services) > 0 && !slices.Contains(options.Services, serviceName) {
 			continue
@@ -85,7 +96,8 @@ func dumpStackLogs(ctx context.Context, options DumpOptions) ([]DumpResult, erro
 
 		content, err := dockerComposeLogsSince(ctx, serviceName, options.Profile, options.Since)
 		if err != nil {
-			return nil, fmt.Errorf("can't fetch service logs (service: %s): %v", serviceName, err)
+			containerErrors = errors.Join(containerErrors, fmt.Errorf("can't fetch service logs (service: %s): %v", serviceName, err))
+			continue
 		}
 		if options.Output == "" {
 			results = append(results, DumpResult{
@@ -99,30 +111,30 @@ func dumpStackLogs(ctx context.Context, options DumpOptions) ([]DumpResult, erro
 			ServiceName: serviceName,
 		}
 
-		logsPath := filepath.Join(options.Output, "logs")
-		err = os.MkdirAll(logsPath, 0755)
-		if err != nil {
-			return nil, fmt.Errorf("can't create output location (path: %s): %w", logsPath, err)
-		}
-
 		logPath, err := writeLogFiles(logsPath, serviceName, content)
 		if err != nil {
-			return nil, fmt.Errorf("can't write log files for service %q: %w", serviceName, err)
+			containerErrors = errors.Join(containerErrors, fmt.Errorf("can't write log files for service %q: %w", serviceName, err))
+			continue
 		}
 		result.LogsFile = logPath
 
 		switch serviceName {
 		case elasticAgentService, fleetServerService:
 			logPath, err := copyDockerInternalLogs(serviceName, logsPath, options.Profile)
 			if err != nil {
-				return nil, fmt.Errorf("can't copy internal logs (service: %s): %w", serviceName, err)
+				containerErrors = errors.Join(containerErrors, fmt.Errorf("can't copy internal logs for service %q: %w", serviceName, err))
+				continue
 			}
 			result.InternalLogsDir = logPath
 		}
 
 		results = append(results, result)
 	}
 
+	if containerErrors != nil {
+		return nil, fmt.Errorf("failed to dump stack logs: %w", containerErrors)
+	}
+
 	return results, nil
 }
 

scripts/test-build-install-zip-file.sh

@@ -31,9 +31,14 @@ trap cleanup EXIT
 
 installAndVerifyPackage() {
   local zipFile="$1"
-  local PACKAGE_NAME_VERSION
+
+  local PACKAGE_NAME_VERSION=""
   PACKAGE_NAME_VERSION=$(basename "${zipFile}" .zip)
 
+  # Replace dash with a slash in the file name to match the API endpoint format
+  # e.g. "apache-999.999.999" becomes "apache/999.999.999"
+  PACKAGE_NAME_VERSION="${PACKAGE_NAME_VERSION//-/\/}"
+
   elastic-package install -v --zip "${zipFile}"
 
   # check that the package is installed

scripts/test-build-install-zip.sh

@@ -19,12 +19,12 @@ cleanup() {
   exit $r
 }
 
+trap cleanup EXIT
+
 testype() {
   basename "$(dirname "$1")"
 }
 
-trap cleanup EXIT
-
 OLDPWD=$PWD
 # Build packages
 export ELASTIC_PACKAGE_SIGNER_PRIVATE_KEYFILE="$OLDPWD/scripts/gpg-private.asc"
@@ -57,9 +57,8 @@ for d in test/packages/*/*/; do
   if [ "$(testype $d)" == "false_positives" ]; then
     continue
   fi
-  package_name=$(cat "${d}/manifest.yml" | yq -r .name)
-  package_version=$(cat "${d}/manifest.yml" | yq -r .version)
-  PACKAGE_NAME_VERSION="${package_name}-${package_version}"
+  package_name=$(yq -r '.name' "${d}/manifest.yml")
+  package_version=$(yq -r '.version' "${d}/manifest.yml")
 
   elastic-package install -C "$d" -v
 
@@ -69,5 +68,5 @@ for d in test/packages/*/*/; do
     --cacert "${ELASTIC_PACKAGE_CA_CERT}" \
     -H 'content-type: application/json' \
     -H 'kbn-xsrf: true' \
-    -f "${ELASTIC_PACKAGE_KIBANA_HOST}/api/fleet/epm/packages/${PACKAGE_NAME_VERSION}" | grep -q '"status":"installed"'
+    -f "${ELASTIC_PACKAGE_KIBANA_HOST}/api/fleet/epm/packages/${package_name}/${package_version}" | grep -q '"status":"installed"'
 done