Set/Delete props unified errors output (#823)

jfrog · Sep 9, 2020 · 8478648 · 8478648
1 parent 8611088
commit 8478648
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/artifactory/commands/generic/deleteprops.go b/artifactory/commands/generic/deleteprops.go
@@ -30,19 +30,19 @@ func (deleteProps *DeletePropsCommand) Run() error {
 	if err != nil {
 		return err
 	}
-	reader, searchErr := searchItems(deleteProps.Spec(), servicesManager)
-	if searchErr != nil {
-		return searchErr
+	reader, err := searchItems(deleteProps.Spec(), servicesManager)
+	if err != nil {
+		return err
 	}
 	defer reader.Close()
 	propsParams := GetPropsParams(reader, deleteProps.props)
 	success, err := servicesManager.DeleteProps(propsParams)
 	result := deleteProps.Result()
 	result.SetSuccessCount(success)
 	totalLength, totalLengthErr := reader.Length()
+	result.SetFailCount(totalLength - success)
 	if totalLengthErr != nil {
 		return totalLengthErr
 	}
-	result.SetFailCount(totalLength - success)
 	return err
 }
diff --git a/artifactory/commands/generic/setprops.go b/artifactory/commands/generic/setprops.go
@@ -31,7 +31,10 @@ func (setProps *SetPropsCommand) Run() error {
 		return err
 	}
 
-	reader, searchErr := searchItems(setProps.Spec(), servicesManager)
+	reader, err := searchItems(setProps.Spec(), servicesManager)
+	if err != nil {
+		return err
+	}
 	defer reader.Close()
 	propsParams := GetPropsParams(reader, setProps.props)
 	success, err := servicesManager.SetProps(propsParams)
@@ -40,9 +43,6 @@ func (setProps *SetPropsCommand) Run() error {
 	result.SetSuccessCount(success)
 	totalLength, totalLengthErr := reader.Length()
 	result.SetFailCount(totalLength - success)
-	if err == nil {
-		return searchErr
-	}
 	if totalLengthErr != nil {
 		return totalLengthErr
 	}