refactor: simplify negotiateONTAPAPI

NetApp · Nov 13, 2024 · 7e2926b · 7e2926b
1 parent 2c3c057
commit 7e2926b
Showing 1 changed file with 3 additions and 14 deletions.
diff --git a/cmd/collectors/ontap.go b/cmd/collectors/ontap.go
@@ -13,23 +13,12 @@ import (
 
 func GatherClusterInfo(pollerName string, cred *auth.Credentials) (conf.Remote, error) {
 
-	var (
-		err error
-	)
-
-	remoteZapi, err := checkZapi(pollerName, cred)
-	if err != nil {
-		return conf.Remote{}, err
-	}
-
-	remoteRest, err := checkRest(pollerName, cred)
-	if err != nil {
-		return remoteZapi, err
-	}
+	remoteZapi, errZapi := checkZapi(pollerName, cred)
+	remoteRest, errRest := checkRest(pollerName, cred)
 
 	remoteRest.ZAPIsExist = remoteZapi.ZAPIsExist
 
-	return remoteRest, nil
+	return remoteRest, errors.Join(errZapi, errRest)
 }
 
 func checkRest(pollerName string, cred *auth.Credentials) (conf.Remote, error) {