add copilot recommendations

Author: istvano

httputils.go

@@ -4,7 +4,6 @@ import (
 	"encoding/base64"
 	"encoding/json"
 	"fmt"
-	"io/ioutil"
 	"net/http"
 	"net/url"
 	"strings"
@@ -32,7 +31,7 @@ func CheckForOldCouchbaseCapellaVersion(hostname, username, password string) (is
 		return false, err
 	}
 	defer resp.Body.Close()
-	body, err := ioutil.ReadAll(resp.Body)
+	body, err := io.ReadAll(resp.Body)
 	if err != nil {
 		return false, err
 	}
@@ -65,7 +64,7 @@ func getRootCAfromCouchbaseCapella(url string) (Base64pemCA string, err error) {
 		return "", err
 	}
 	defer resp.Body.Close()
-	body, err := ioutil.ReadAll(resp.Body)
+	body, err := io.ReadAll(resp.Body)
 	if err != nil {
 		return "", err
 	}
@@ -136,7 +135,7 @@ func checkBucketReady(address, username, password, bucket string) (err error) {
 		return err
 	}
 	defer resp.Body.Close()
-	body, err := ioutil.ReadAll(resp.Body)
+	body, err := io.ReadAll(resp.Body)
 	if err != nil {
 		return err
 	}
@@ -268,7 +267,7 @@ func NewCapellaClient(baseUrl string, accessKey string, secretKey string) *Capel
 }
 
 func Unmarshal(body io.Reader, v interface{}) error {
-	rb, err := ioutil.ReadAll(body)
+	rb, err := io.ReadAll(body)
 	if err != nil {
 		return err
 	}
@@ -302,8 +301,13 @@ func CreateCapellaDbCredUser(baseUrl string, cloudAPIclustersEndPoint string, ac
 
 	ep := c.baseURL + cloudAPIclustersEndPoint + "/users"
 	resp, err := c.sendRequest(http.MethodPost, ep, string(data))
-	if resp != nil && resp.StatusCode != http.StatusCreated {
+	if err != nil {
+		return err
+	}
+	if resp != nil {
 		defer resp.Body.Close()
+	}
+	if resp != nil && resp.StatusCode != http.StatusCreated {
 		// obfuscate password in the log
 		obfData := fmt.Sprintf("{\"name\":\"%s\", \"password\":\"[password]\", \"access\":%v}", username, string(adata))
 		b, err1 := io.ReadAll(resp.Body)
@@ -314,9 +318,6 @@ func CreateCapellaDbCredUser(baseUrl string, cloudAPIclustersEndPoint string, ac
 		return fmt.Errorf("failed during capella user creation, response = %s, ep = %s, user = %v, payload = %v, access=%s, secret=%s",
 			string(b), ep, username, obfData, accessKey, secretKey)
 	}
-	if err != nil {
-		return err
-	}
 
 	return nil
 }
@@ -356,7 +357,7 @@ func UpdateCapellaDbCredUser(baseUrl string, cloudAPIclustersEndPoint string, ac
 		}
 		defer resp.Body.Close()
 
-		body, err := ioutil.ReadAll(resp.Body)
+		body, err := io.ReadAll(resp.Body)
 		if err != nil {
 			return "", fmt.Errorf("failed during capella user id fetch unmarshal, response = %v, ep = %s, error=%v",
 				resp, ep, err)
@@ -381,13 +382,16 @@ func DeleteCapellaDbCredUser(baseUrl string, cloudAPIclustersEndPoint string, ac
 	}
 	ep := c.baseURL + cloudAPIclustersEndPoint + "/users/" + userId
 	resp, err := c.sendRequest(http.MethodDelete, ep, "")
-	if resp != nil && resp.StatusCode != http.StatusNoContent {
-		return fmt.Errorf("failed during capella user deletion, response = %v, ep = %s",
-			resp, ep)
-	}
 	if err != nil {
 		return err
 	}
+	if resp == nil {
+		return fmt.Errorf("failed during capella user deletion, response is nil, ep = %s", ep)
+	}
+	if resp.StatusCode != http.StatusNoContent {
+		return fmt.Errorf("failed during capella user deletion, response = %v, ep = %s",
+			resp, ep)
+	}
 	return nil
 }
 
@@ -439,7 +443,7 @@ func getDbCredId(baseUrl string, cloudAPIclustersEndPoint string, accessKey stri
 		} else {
 			defer resp.Body.Close()
 
-			body, err := ioutil.ReadAll(resp.Body)
+			body, err := io.ReadAll(resp.Body)
 			if err != nil {
 				return dbUserId, fmt.Errorf("failed during capella user id fetch unmarshal, response = %v, ep = %s, error=%v",
 					resp, ep, err)