include nil reference check during retires

Comcast · Feb 4, 2025 · fc8cccf · fc8cccf
1 parent fb6d814
commit fc8cccf
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 0 deletions.
diff --git a/exporter/helpers.go b/exporter/helpers.go
@@ -253,6 +253,9 @@ func getDIMMEndpoints(url, host string, client *retryablehttp.Client) (oem.Colle
 			for retryCount < 1 && resp.StatusCode == http.StatusNotFound {
 				time.Sleep(client.RetryWaitMin)
 				resp, err = common.DoRequest(client, req)
+				if err != nil {
+					return dimms, err
+				}
 				retryCount = retryCount + 1
 			}
 			if err != nil {
@@ -297,6 +300,9 @@ func getDriveEndpoint(url, host string, client *retryablehttp.Client) (oem.Gener
 			for retryCount < 3 && resp.StatusCode == http.StatusNotFound {
 				time.Sleep(client.RetryWaitMin)
 				resp, err = common.DoRequest(client, req)
+				if err != nil {
+					return drive, err
+				}
 				retryCount = retryCount + 1
 			}
 			if err != nil {
@@ -473,6 +479,9 @@ func getProcessorEndpoints(url, host string, client *retryablehttp.Client) (oem.
 			for retryCount < 3 && resp.StatusCode == http.StatusNotFound {
 				time.Sleep(client.RetryWaitMin)
 				resp, err = common.DoRequest(client, req)
+				if err != nil {
+					return processors, err
+				}
 				retryCount = retryCount + 1
 			}
 			if err != nil {

diff --git a/plugins/nuova/helpers.go b/plugins/nuova/helpers.go
@@ -85,6 +85,9 @@ func checkRaidController(url, host string, client *retryablehttp.Client) (bool,
 			for retryCount < 1 && resp.StatusCode == http.StatusNotFound {
 				time.Sleep(client.RetryWaitMin)
 				resp, err = common.DoRequest(client, req)
+				if err != nil {
+					return false, nil
+				}
 				retryCount = retryCount + 1
 			}
 			if err != nil {