From fdf7a768f477e96268cd7c4ba77add0c2f8f7b6d Mon Sep 17 00:00:00 2001 From: Gyanendra Mishra Date: Mon, 27 Feb 2023 17:19:12 +0000 Subject: [PATCH] handle multiline errors that might happen with kurtosis clean --- engine/server/engine/enclave_manager/enclave_manager.go | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/engine/server/engine/enclave_manager/enclave_manager.go b/engine/server/engine/enclave_manager/enclave_manager.go index b6af43469b..5330eb042a 100644 --- a/engine/server/engine/enclave_manager/enclave_manager.go +++ b/engine/server/engine/enclave_manager/enclave_manager.go @@ -2,6 +2,7 @@ package enclave_manager import ( "context" + "fmt" "github.com/kurtosis-tech/kurtosis/api/golang/engine/kurtosis_engine_rpc_api_bindings" "github.com/kurtosis-tech/kurtosis/container-engine-lib/lib/backend_impls/docker/docker_manager/types" "github.com/kurtosis-tech/kurtosis/container-engine-lib/lib/backend_interface" @@ -297,12 +298,13 @@ func (manager *EnclaveManager) Clean(ctx context.Context, shouldCleanAll bool) ( if len(removalErrors) > 0 { logrus.Errorf("Errors occurred removing the following enclaves") var removalErrorStrings []string - for _, err = range removalErrors { + for idx, err := range removalErrors { logrus.Errorf("Error '%v'", err.Error()) - removalErrorStrings = append(removalErrorStrings, err.Error()) + indexedResultErrStr := fmt.Sprintf(">>>>>>>>>>>>>>>>> ERROR %v <<<<<<<<<<<<<<<<<\n%v", idx, err.Error()) + removalErrorStrings = append(removalErrorStrings, indexedResultErrStr) } joinedRemovalErrors := strings.Join(removalErrorStrings, errorDelimiter) - return nil, stacktrace.NewError("Following errors occurred while removing some enclaves '%v'", joinedRemovalErrors) + return nil, stacktrace.NewError("Following errors occurred while removing some enclaves :\n%v", joinedRemovalErrors) } if len(successfullyRemovedArtifactIds) > 0 {