Command results reader close err is ignored (#2282)

jfrog · Oct 24, 2023 · efae903 · efae903
1 parent 3ad6e0c
commit efae903
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 8 deletions.
diff --git a/access_test.go b/access_test.go
@@ -175,9 +175,9 @@ const (
 )
 
 var atcTestCases = []struct {
-	name                string
-	args                []string
-	shouldExpire        bool
+	name         string
+	args         []string
+	shouldExpire bool
 	// The expected expiry or -1 if we use the default expiry value
 	expectedExpiry      int
 	expectedScope       string

diff --git a/utils/cliutils/utils.go b/utils/cliutils/utils.go
@@ -776,12 +776,9 @@ func isEnvFailNoOp() bool {
 	return strings.ToLower(os.Getenv(coreutils.FailNoOp)) == "true"
 }
 
-func CleanupResult(result *commandUtils.Result, originError *error) {
+func CleanupResult(result *commandUtils.Result, err *error) {
 	if result != nil && result.Reader() != nil {
-		e := result.Reader().Close()
-		if originError == nil {
-			*originError = e
-		}
+		*err = errors.Join(*err, result.Reader().Close())
 	}
 }