chore: errcheck

Technical Debt: errcheck Check the return value to ensure that any issues are caught and handled appropriately. Signed-off-by: Ryan Johnson <[email protected]>
vmware · Jan 22, 2025 · 8a39b99 · 8a39b99
1 parent f8e6e50
commit 8a39b99
Show file tree

Hide file tree

Showing 19 changed files with 158 additions and 37 deletions.
diff --git a/hcx/activation.go b/hcx/activation.go
@@ -35,7 +35,11 @@ func PostActivate(c *Client, body ActivateBody) (ActivateBody, error) {
 	resp := ActivateBody{}
 
 	buf := new(bytes.Buffer)
-	json.NewEncoder(buf).Encode(body)
+	err := json.NewEncoder(buf).Encode(body)
+	if err != nil {
+		fmt.Println(err)
+		return resp, err
+	}
 
 	req, err := http.NewRequest("POST", fmt.Sprintf("%s:9443/api/admin/global/config/hcx", c.HostURL), buf)
 	if err != nil {
@@ -94,7 +98,11 @@ func DeleteActivate(c *Client, body ActivateBody) (ActivateBody, error) {
 	resp := ActivateBody{}
 
 	buf := new(bytes.Buffer)
-	json.NewEncoder(buf).Encode(body)
+	err := json.NewEncoder(buf).Encode(body)
+	if err != nil {
+		fmt.Println(err)
+		return resp, err
+	}
 
 	req, err := http.NewRequest("DELETE", fmt.Sprintf("%s:9443/api/admin/global/config/hcx", c.HostURL), buf)
 	if err != nil {

diff --git a/hcx/certificate.go b/hcx/certificate.go
@@ -26,7 +26,11 @@ func InsertCertificate(c *Client, body InsertCertificateBody) (InsertCertificate
 	resp := InsertCertificateResult{}
 
 	buf := new(bytes.Buffer)
-	json.NewEncoder(buf).Encode(body)
+	err := json.NewEncoder(buf).Encode(body)
+	if err != nil {
+		fmt.Println(err)
+		return resp, err
+	}
 
 	req, err := http.NewRequest("POST", fmt.Sprintf("%s/hybridity/api/admin/certificates", c.HostURL), buf)
 	if err != nil {

diff --git a/hcx/client.go b/hcx/client.go
@@ -114,7 +114,10 @@ func (c *Client) HcxConnectorAuthenticate() error {
 
 		// Check if SSO is ready
 		var xmlmessage Entries
-		xml.Unmarshal(body, &xmlmessage)
+		err = xml.Unmarshal(body, &xmlmessage)
+		if err != nil {
+			return err
+		}
 
 		certificate_pb := false
 		for _, j := range xmlmessage.Entry {

diff --git a/hcx/compute_profile.go b/hcx/compute_profile.go
@@ -102,7 +102,11 @@ func InsertComputeProfile(c *Client, body InsertComputeProfileBody) (InsertCompu
 	resp := InsertComputeProfileResult{}
 
 	buf := new(bytes.Buffer)
-	json.NewEncoder(buf).Encode(body)
+	err := json.NewEncoder(buf).Encode(body)
+	if err != nil {
+		fmt.Println(err)
+		return resp, err
+	}
 
 	req, err := http.NewRequest("POST", fmt.Sprintf("%s/hybridity/api/interconnect/computeProfiles", c.HostURL), buf)
 	if err != nil {

diff --git a/hcx/l2_extension.go b/hcx/l2_extension.go
@@ -80,7 +80,11 @@ func InsertL2Extension(c *Client, body InsertL2ExtensionBody) (InsertL2Extention
 	resp := InsertL2ExtentionResult{}
 
 	buf := new(bytes.Buffer)
-	json.NewEncoder(buf).Encode(body)
+	err := json.NewEncoder(buf).Encode(body)
+	if err != nil {
+		fmt.Println(err)
+		return resp, err
+	}
 
 	req, err := http.NewRequest("POST", fmt.Sprintf("%s/hybridity/api/l2Extensions", c.HostURL), buf)
 	if err != nil {

diff --git a/hcx/location.go b/hcx/location.go
@@ -33,7 +33,10 @@ type GetLocationResult struct {
 func SetLocation(c *Client, body SetLocationBody) error {
 
 	buf := new(bytes.Buffer)
-	json.NewEncoder(buf).Encode(body)
+	err := json.NewEncoder(buf).Encode(body)
+	if err != nil {
+		return err
+	}
 
 	req, err := http.NewRequest("PUT", fmt.Sprintf("%s:9443/api/admin/global/config/location", c.HostURL), buf)
 	if err != nil {

diff --git a/hcx/network_profile.go b/hcx/network_profile.go
@@ -74,7 +74,11 @@ func InsertNetworkProfile(c *Client, body NetworkProfileBody) (NetworkProfileRes
 	resp := NetworkProfileResult{}
 
 	buf := new(bytes.Buffer)
-	json.NewEncoder(buf).Encode(body)
+	err := json.NewEncoder(buf).Encode(body)
+	if err != nil {
+		fmt.Println(err)
+		return resp, err
+	}
 
 	req, err := http.NewRequest("POST", fmt.Sprintf("%s/admin/hybridity/api/networks", c.HostURL), buf)
 	if err != nil {
@@ -111,7 +115,11 @@ func GetNetworkProfile(c *Client, name string) (NetworkProfileBody, error) {
 	}
 
 	buf := new(bytes.Buffer)
-	json.NewEncoder(buf).Encode(body)
+	err := json.NewEncoder(buf).Encode(body)
+	if err != nil {
+		fmt.Println(err)
+		return NetworkProfileBody{}, err
+	}
 
 	req, err := http.NewRequest("POST", fmt.Sprintf("%s/hybridity/api/networks?action=queryIpUsage", c.HostURL), buf)
 	if err != nil {
@@ -154,7 +162,11 @@ func GetNetworkProfileById(c *Client, id string) (NetworkProfileBody, error) {
 	}
 
 	buf := new(bytes.Buffer)
-	json.NewEncoder(buf).Encode(body)
+	err := json.NewEncoder(buf).Encode(body)
+	if err != nil {
+		fmt.Println(err)
+		return NetworkProfileBody{}, err
+	}
 
 	req, err := http.NewRequest("POST", fmt.Sprintf("%s/hybridity/api/networks?action=queryIpUsage", c.HostURL), buf)
 	if err != nil {
@@ -219,7 +231,11 @@ func UpdateNetworkProfile(c *Client, body NetworkProfileBody) (NetworkProfileRes
 	resp := NetworkProfileResult{}
 
 	buf := new(bytes.Buffer)
-	json.NewEncoder(buf).Encode(body)
+	err := json.NewEncoder(buf).Encode(body)
+	if err != nil {
+		fmt.Println(err)
+		return resp, err
+	}
 
 	req, err := http.NewRequest("PUT", fmt.Sprintf("%s/hybridity/api/networks/%s", c.HostURL, body.ObjectId), buf)
 	if err != nil {

diff --git a/hcx/role_mapping.go b/hcx/role_mapping.go
@@ -28,7 +28,11 @@ func PutRoleMapping(c *Client, body []RoleMapping) (RoleMappingResult, error) {
 	resp := RoleMappingResult{}
 
 	buf := new(bytes.Buffer)
-	json.NewEncoder(buf).Encode(body)
+	err := json.NewEncoder(buf).Encode(body)
+	if err != nil {
+		fmt.Println(err)
+		return resp, err
+	}
 
 	req, err := http.NewRequest("PUT", fmt.Sprintf("%s:9443/api/admin/global/config/roleMappings", c.HostURL), buf)
 	if err != nil {

diff --git a/hcx/service_mesh.go b/hcx/service_mesh.go
@@ -65,7 +65,11 @@ func InsertServiceMesh(c *Client, body InsertServiceMeshBody) (InsertServiceMesh
 	resp := InsertServiceMeshResult{}
 
 	buf := new(bytes.Buffer)
-	json.NewEncoder(buf).Encode(body)
+	err := json.NewEncoder(buf).Encode(body)
+	if err != nil {
+		fmt.Println(err)
+		return resp, err
+	}
 
 	req, err := http.NewRequest("POST", fmt.Sprintf("%s/hybridity/api/interconnect/serviceMesh", c.HostURL), buf)
 	if err != nil {

diff --git a/hcx/site_pairing.go b/hcx/site_pairing.go
@@ -66,7 +66,11 @@ func InsertSitePairing(c *Client, body RemoteCloudConfigBody) (PostRemoteCloudCo
 	resp := PostRemoteCloudConfigResult{}
 
 	buf := new(bytes.Buffer)
-	json.NewEncoder(buf).Encode(body)
+	err := json.NewEncoder(buf).Encode(body)
+	if err != nil {
+		fmt.Println(err)
+		return resp, err
+	}
 
 	req, err := http.NewRequest("POST", fmt.Sprintf("%s/hybridity/api/cloudConfigs", c.HostURL), buf)
 	if err != nil {

diff --git a/hcx/sso.go b/hcx/sso.go
@@ -75,7 +75,11 @@ func InsertSSO(c *Client, body InsertSSOBody) (InsertSSOResult, error) {
 	resp := InsertSSOResult{}
 
 	buf := new(bytes.Buffer)
-	json.NewEncoder(buf).Encode(body)
+	err := json.NewEncoder(buf).Encode(body)
+	if err != nil {
+		fmt.Println(err)
+		return resp, err
+	}
 
 	req, err := http.NewRequest("POST", fmt.Sprintf("%s:9443/api/admin/global/config/lookupservice", c.HostURL), buf)
 	if err != nil {
@@ -106,7 +110,11 @@ func UpdateSSO(c *Client, body InsertSSOBody) (InsertSSOResult, error) {
 	resp := InsertSSOResult{}
 
 	buf := new(bytes.Buffer)
-	json.NewEncoder(buf).Encode(body)
+	err := json.NewEncoder(buf).Encode(body)
+	if err != nil {
+		fmt.Println(err)
+		return resp, err
+	}
 
 	req, err := http.NewRequest("POST", fmt.Sprintf("%s:9443/api/admin/global/config/lookupservice/%s", c.HostURL, body.Data.Items[0].Config.UUID), buf)
 	if err != nil {

diff --git a/hcx/utils.go b/hcx/utils.go
@@ -302,7 +302,11 @@ func GetLocalContainer(c *Client) (PostResouceContainerListResultDataItem, error
 	}
 
 	buf := new(bytes.Buffer)
-	json.NewEncoder(buf).Encode(body)
+	err := json.NewEncoder(buf).Encode(body)
+	if err != nil {
+		fmt.Println(err)
+		return PostResouceContainerListResultDataItem{}, err
+	}
 
 	resp := PostResouceContainerListResult{}
 
@@ -342,7 +346,11 @@ func GetRemoteContainer(c *Client) (PostResouceContainerListResultDataItem, erro
 	}
 
 	buf := new(bytes.Buffer)
-	json.NewEncoder(buf).Encode(body)
+	err := json.NewEncoder(buf).Encode(body)
+	if err != nil {
+		fmt.Println(err)
+		return PostResouceContainerListResultDataItem{}, err
+	}
 
 	resp := PostResouceContainerListResult{}
 
@@ -381,7 +389,11 @@ func GetNetworkBacking(c *Client, endpointid string, network string, network_typ
 	}
 
 	buf := new(bytes.Buffer)
-	json.NewEncoder(buf).Encode(body)
+	err := json.NewEncoder(buf).Encode(body)
+	if err != nil {
+		fmt.Println(err)
+		return Dvpg{}, err
+	}
 
 	resp := PostNetworkBackingResult{}
 
@@ -461,7 +473,11 @@ func GetVcDatastore(c *Client, datastore_name string, vcuuid string, cluster str
 	}
 
 	buf := new(bytes.Buffer)
-	json.NewEncoder(buf).Encode(body)
+	err := json.NewEncoder(buf).Encode(body)
+	if err != nil {
+		fmt.Println(err)
+		return GetVcDatastoreResultDataItem{}, err
+	}
 
 	resp := GetVcDatastoreResult{}
 
@@ -506,7 +522,11 @@ func GetVcDvs(c *Client, dvs_name string, vcuuid string, cluster string) (GetVcD
 	}
 
 	buf := new(bytes.Buffer)
-	json.NewEncoder(buf).Encode(body)
+	err := json.NewEncoder(buf).Encode(body)
+	if err != nil {
+		fmt.Println(err)
+		return GetVcDvsResultDataItem{}, err
+	}
 
 	resp := GetVcDvsResult{}
 
@@ -549,7 +569,11 @@ func GetRemoteCloudList(c *Client) (PostCloudListResult, error) {
 	}
 
 	buf := new(bytes.Buffer)
-	json.NewEncoder(buf).Encode(body)
+	err := json.NewEncoder(buf).Encode(body)
+	if err != nil {
+		fmt.Println(err)
+		return PostCloudListResult{}, err
+	}
 
 	resp := PostCloudListResult{}
 
@@ -586,7 +610,11 @@ func GetLocalCloudList(c *Client) (PostCloudListResult, error) {
 	}
 
 	buf := new(bytes.Buffer)
-	json.NewEncoder(buf).Encode(body)
+	err := json.NewEncoder(buf).Encode(body)
+	if err != nil {
+		fmt.Println(err)
+		return PostCloudListResult{}, err
+	}
 
 	resp := PostCloudListResult{}
 
@@ -624,7 +652,11 @@ func GetAppliance(c *Client, endpointId string, service_mesh_id string) (GetAppl
 	}
 
 	buf := new(bytes.Buffer)
-	json.NewEncoder(buf).Encode(body)
+	err := json.NewEncoder(buf).Encode(body)
+	if err != nil {
+		fmt.Println(err)
+		return GetApplianceResultItem{}, err
+	}
 
 	resp := GetApplianceResult{}
 
@@ -669,7 +701,11 @@ func GetAppliances(c *Client, endpointId string, service_mesh_id string) ([]GetA
 	}
 
 	buf := new(bytes.Buffer)
-	json.NewEncoder(buf).Encode(body)
+	err := json.NewEncoder(buf).Encode(body)
+	if err != nil {
+		fmt.Println(err)
+		return []GetApplianceResultItem{}, err
+	}
 
 	resp := GetApplianceResult{}
 

diff --git a/hcx/vcenter.go b/hcx/vcenter.go
@@ -45,7 +45,11 @@ func InsertvCenter(c *Client, body InsertvCenterBody) (InsertvCenterResult, erro
 	resp := InsertvCenterResult{}
 
 	buf := new(bytes.Buffer)
-	json.NewEncoder(buf).Encode(body)
+	err := json.NewEncoder(buf).Encode(body)
+	if err != nil {
+		fmt.Println(err)
+		return resp, err
+	}
 
 	req, err := http.NewRequest("POST", fmt.Sprintf("%s:9443/api/admin/global/config/vcenter", c.HostURL), buf)
 	if err != nil {

diff --git a/hcx/vmc.go b/hcx/vmc.go
@@ -99,7 +99,11 @@ func HcxCloudAuthenticate(client *Client, token string) error {
 	}
 
 	buf := new(bytes.Buffer)
-	json.NewEncoder(buf).Encode(body)
+	err := json.NewEncoder(buf).Encode(body)
+	if err != nil {
+		fmt.Println(err)
+		return err
+	}
 
 	req, err := http.NewRequest("POST", fmt.Sprintf("%s/api/sessions", c.HostURL), buf)
 	if err != nil {

diff --git a/resource_compute_profile.go b/resource_compute_profile.go
@@ -290,12 +290,12 @@ func resourceComputeProfileCreate(ctx context.Context, d *schema.ResourceData, m
 	}
 
 	buf := new(bytes.Buffer)
-	json.NewEncoder(buf).Encode(body)
+	if err := json.NewEncoder(buf).Encode(body); err != nil {
+		return diag.FromErr(err)
+	}
 
 	res2, err := hcx.InsertComputeProfile(client, body)
-
 	if err != nil {
-		//return diag.FromErr(errors.New(fmt.Sprintf("%s", buf)))
 		return diag.FromErr(err)
 	}
 

diff --git a/resource_l2_extension.go b/resource_l2_extension.go
@@ -147,7 +147,9 @@ func resourceL2ExtensionCreate(ctx context.Context, d *schema.ResourceData, m in
 	}
 
 	buf := new(bytes.Buffer)
-	json.NewEncoder(buf).Encode(body)
+	if err := json.NewEncoder(buf).Encode(body); err != nil {
+		return diag.FromErr(err)
+	}
 
 	res2, err := hcx.InsertL2Extension(client, body)
 

diff --git a/resource_service_mesh.go b/resource_service_mesh.go
@@ -172,12 +172,13 @@ func resourceServiceMeshCreate(ctx context.Context, d *schema.ResourceData, m in
 	}
 
 	buf := new(bytes.Buffer)
-	json.NewEncoder(buf).Encode(body)
+	if err := json.NewEncoder(buf).Encode(body); err != nil {
+		return diag.FromErr(err)
+	}
 
 	res2, err := hcx.InsertServiceMesh(client, body)
 
 	if err != nil {
-		//return diag.FromErr(errors.New(fmt.Sprintf("%s", buf)))
 		return diag.FromErr(err)
 	}