remove err from 401 if

chrroberts-pure · chrroberts-pure · commit 8e288b391843 · 2024-03-18T17:57:57.000-05:00
diff --git a/internal/rest-client/alerts.go b/internal/rest-client/alerts.go
@@ -43,10 +43,7 @@ func (fa *FAClient) GetAlerts(filter string) *AlertsList {
 
 	if res.StatusCode() == 401 {
 		fa.RefreshSession()
-		_, err = req.Get(uri)
-		if err != nil {
-			fa.Error = err
-		}
+		req.Get(uri)
 	}
 
 	return result
diff --git a/internal/rest-client/arrays.go b/internal/rest-client/arrays.go
@@ -63,15 +63,12 @@ func (fa *FAClient) GetArrays() *ArraysList {
 	if err != nil {
 		fa.Error = err
 	}
-
 	if res.StatusCode() == 401 {
 		fa.RefreshSession()
-		_, err = fa.RestClient.R().
+		fa.RestClient.R().
 			SetResult(&result).
 			Get(uri)
-		if err != nil {
-			fa.Error = err
-		}
+
 	}
 
 	return result
diff --git a/internal/rest-client/arrays_performance.go b/internal/rest-client/arrays_performance.go
@@ -52,15 +52,12 @@ func (fa *FAClient) GetArraysPerformance() *ArraysPerformanceList {
 	if err != nil {
 		fa.Error = err
 	}
-
 	if res.StatusCode() == 401 {
 		fa.RefreshSession()
-		_, err = fa.RestClient.R().
+		fa.RestClient.R().
 			SetResult(&result).
 			Get(uri)
-		if err != nil {
-			fa.Error = err
-		}
+
 	}
 
 	return result
diff --git a/internal/rest-client/connections.go b/internal/rest-client/connections.go
@@ -42,15 +42,12 @@ func (fa *FAClient) GetConnections() *ConnectionsList {
 	if err != nil {
 		fa.Error = err
 	}
-
 	if res.StatusCode() == 401 {
 		fa.RefreshSession()
-		_, err = fa.RestClient.R().
+		fa.RestClient.R().
 			SetResult(&result).
 			Get(uri)
-		if err != nil {
-			fa.Error = err
-		}
+
 	}
 
 	return result
diff --git a/internal/rest-client/directories.go b/internal/rest-client/directories.go
@@ -49,18 +49,16 @@ func (fa *FAClient) GetDirectories() *DirectoriesList {
 	res, err := fa.RestClient.R().
 		SetResult(&result).
 		Get(uri)
+
 	if err != nil {
 		fa.Error = err
 	}
-
 	if res.StatusCode() == 401 {
 		fa.RefreshSession()
-		_, err = fa.RestClient.R().
+		fa.RestClient.R().
 			SetResult(&result).
 			Get(uri)
-		if err != nil {
-			fa.Error = err
-		}
+
 	}
 
 	return result
diff --git a/internal/rest-client/directories_performance.go b/internal/rest-client/directories_performance.go
@@ -34,15 +34,12 @@ func (fa *FAClient) GetDirectoriesPerformance() *DirectoriesPerformanceList {
 	if err != nil {
 		fa.Error = err
 	}
-
 	if res.StatusCode() == 401 {
 		fa.RefreshSession()
-		_, err = fa.RestClient.R().
+		fa.RestClient.R().
 			SetResult(&result).
 			Get(uri)
-		if err != nil {
-			fa.Error = err
-		}
+
 	}
 
 	return result
diff --git a/internal/rest-client/drives.go b/internal/rest-client/drives.go
@@ -25,15 +25,12 @@ func (fa *FAClient) GetDrives() *DriveList {
 	if err != nil {
 		fa.Error = err
 	}
-
 	if res.StatusCode() == 401 {
 		fa.RefreshSession()
-		_, err = fa.RestClient.R().
+		fa.RestClient.R().
 			SetResult(&result).
 			Get(uri)
-		if err != nil {
-			fa.Error = err
-		}
+
 	}
 
 	return result
diff --git a/internal/rest-client/hardware.go b/internal/rest-client/hardware.go
@@ -31,15 +31,12 @@ func (fa *FAClient) GetHardware() *HardwareList {
 	if err != nil {
 		fa.Error = err
 	}
-
 	if res.StatusCode() == 401 {
 		fa.RefreshSession()
-		_, err = fa.RestClient.R().
+		fa.RestClient.R().
 			SetResult(&result).
 			Get(uri)
-		if err != nil {
-			fa.Error = err
-		}
+
 	}
 
 	return result
diff --git a/internal/rest-client/hosts.go b/internal/rest-client/hosts.go
@@ -43,15 +43,12 @@ func (fa *FAClient) GetHosts() *HostsList {
 	if err != nil {
 		fa.Error = err
 	}
-
 	if res.StatusCode() == 401 {
 		fa.RefreshSession()
-		_, err = fa.RestClient.R().
+		fa.RestClient.R().
 			SetResult(&result).
 			Get(uri)
-		if err != nil {
-			fa.Error = err
-		}
+
 	}
 	return result
 }
diff --git a/internal/rest-client/hosts_balance.go b/internal/rest-client/hosts_balance.go
@@ -41,15 +41,12 @@ func (fa *FAClient) GetHostsBalance() *HostsBalanceList {
 	if err != nil {
 		fa.Error = err
 	}
-
 	if res.StatusCode() == 401 {
 		fa.RefreshSession()
-		_, err = fa.RestClient.R().
+		fa.RestClient.R().
 			SetResult(&result).
 			Get(uri)
-		if err != nil {
-			fa.Error = err
-		}
+
 	}
 
 	return result
diff --git a/internal/rest-client/hosts_performance.go b/internal/rest-client/hosts_performance.go
@@ -48,15 +48,12 @@ func (fa *FAClient) GetHostsPerformance() *HostsPerformanceList {
 	if err != nil {
 		fa.Error = err
 	}
-
 	if res.StatusCode() == 401 {
 		fa.RefreshSession()
-		_, err = fa.RestClient.R().
+		fa.RestClient.R().
 			SetResult(&result).
 			Get(uri)
-		if err != nil {
-			fa.Error = err
-		}
+
 	}
 
 	return result
diff --git a/internal/rest-client/network_interface.go b/internal/rest-client/network_interface.go
@@ -50,15 +50,12 @@ func (fa *FAClient) GetNetworkInterfaces() *NetworkInterfacesList {
 	if err != nil {
 		fa.Error = err
 	}
-
 	if res.StatusCode() == 401 {
 		fa.RefreshSession()
-		_, err = fa.RestClient.R().
+		fa.RestClient.R().
 			SetResult(&result).
 			Get(uri)
-		if err != nil {
-			fa.Error = err
-		}
+
 	}
 
 	return result
diff --git a/internal/rest-client/network_performance.go b/internal/rest-client/network_performance.go
@@ -50,15 +50,12 @@ func (fa *FAClient) GetNetworkInterfacesPerformance() *NetworkInterfacesPerforma
 	if err != nil {
 		fa.Error = err
 	}
-
 	if res.StatusCode() == 401 {
 		fa.RefreshSession()
-		_, err = fa.RestClient.R().
+		fa.RestClient.R().
 			SetResult(&result).
 			Get(uri)
-		if err != nil {
-			fa.Error = err
-		}
+
 	}
 
 	return result
diff --git a/internal/rest-client/pod_replica_links_lag.go b/internal/rest-client/pod_replica_links_lag.go
@@ -33,15 +33,12 @@ func (fa *FAClient) GetPodReplicaLinksLag() *PodReplicaLinksLagList {
 	if err != nil {
 		fa.Error = err
 	}
-
 	if res.StatusCode() == 401 {
 		fa.RefreshSession()
-		_, err = fa.RestClient.R().
+		fa.RestClient.R().
 			SetResult(&result).
 			Get(uri)
-		if err != nil {
-			fa.Error = err
-		}
+
 	}
 
 	return result
diff --git a/internal/rest-client/pod_replica_links_performance.go b/internal/rest-client/pod_replica_links_performance.go
@@ -29,15 +29,12 @@ func (fa *FAClient) GetPodReplicaLinksPerformance() *PodReplicaLinksPerformanceL
 	if err != nil {
 		fa.Error = err
 	}
-
 	if res.StatusCode() == 401 {
 		fa.RefreshSession()
-		_, err = fa.RestClient.R().
+		fa.RestClient.R().
 			SetResult(&result).
 			Get(uri)
-		if err != nil {
-			fa.Error = err
-		}
+
 	}
 
 	return result
diff --git a/internal/rest-client/pods.go b/internal/rest-client/pods.go
@@ -42,15 +42,12 @@ func (fa *FAClient) GetPods() *PodsList {
 	if err != nil {
 		fa.Error = err
 	}
-
 	if res.StatusCode() == 401 {
 		fa.RefreshSession()
-		_, err = fa.RestClient.R().
+		fa.RestClient.R().
 			SetResult(&result).
 			Get(uri)
-		if err != nil {
-			fa.Error = err
-		}
+
 	}
 
 	return result
diff --git a/internal/rest-client/pods_performance.go b/internal/rest-client/pods_performance.go
@@ -51,15 +51,12 @@ func (fa *FAClient) GetPodsPerformance() *PodsPerformanceList {
 	if err != nil {
 		fa.Error = err
 	}
-
 	if res.StatusCode() == 401 {
 		fa.RefreshSession()
-		_, err = fa.RestClient.R().
+		fa.RestClient.R().
 			SetResult(&result).
 			Get(uri)
-		if err != nil {
-			fa.Error = err
-		}
+
 	}
 
 	return result
diff --git a/internal/rest-client/pods_performance_replication.go b/internal/rest-client/pods_performance_replication.go
@@ -33,15 +33,12 @@ func (fa *FAClient) GetPodsPerformanceReplication() *PodsPerformanceReplicationL
 	if err != nil {
 		fa.Error = err
 	}
-
 	if res.StatusCode() == 401 {
 		fa.RefreshSession()
-		_, err = fa.RestClient.R().
+		fa.RestClient.R().
 			SetResult(&result).
 			Get(uri)
-		if err != nil {
-			fa.Error = err
-		}
+
 	}
 
 	return result
diff --git a/internal/rest-client/ports.go b/internal/rest-client/ports.go
@@ -25,15 +25,12 @@ func (fa *FAClient) GetPorts() *PortsList {
 	if err != nil {
 		fa.Error = err
 	}
-
 	if res.StatusCode() == 401 {
 		fa.RefreshSession()
-		_, err = fa.RestClient.R().
+		fa.RestClient.R().
 			SetResult(&result).
 			Get(uri)
-		if err != nil {
-			fa.Error = err
-		}
+
 	}
 
 	return result
diff --git a/internal/rest-client/subscriptions.go b/internal/rest-client/subscriptions.go
@@ -21,15 +21,12 @@ func (fa *FAClient) GetSubscriptions() *SubscriptionsList {
 	if err != nil {
 		fa.Error = err
 	}
-
 	if res.StatusCode() == 401 {
 		fa.RefreshSession()
-		_, err = fa.RestClient.R().
+		fa.RestClient.R().
 			SetResult(&result).
 			Get(uri)
-		if err != nil {
-			fa.Error = err
-		}
+
 	}
 
 	return result
diff --git a/internal/rest-client/volumes.go b/internal/rest-client/volumes.go
@@ -58,15 +58,12 @@ func (fa *FAClient) GetVolumes() *VolumesList {
 	if err != nil {
 		fa.Error = err
 	}
-
 	if res.StatusCode() == 401 {
 		fa.RefreshSession()
-		_, err = fa.RestClient.R().
+		fa.RestClient.R().
 			SetResult(&result).
 			Get(uri)
-		if err != nil {
-			fa.Error = err
-		}
+
 	}
 
 	return result
diff --git a/internal/rest-client/volumes_performance.go b/internal/rest-client/volumes_performance.go
@@ -49,15 +49,12 @@ func (fa *FAClient) GetVolumesPerformance() *VolumesPerformanceList {
 	if err != nil {
 		fa.Error = err
 	}
-
 	if res.StatusCode() == 401 {
 		fa.RefreshSession()
-		_, err = fa.RestClient.R().
+		fa.RestClient.R().
 			SetResult(&result).
 			Get(uri)
-		if err != nil {
-			fa.Error = err
-		}
+
 	}
 
 	return result

Original file line number	Diff line number	Diff line change
`@@ -43,15 +43,12 @@ func (fa FAClient) GetHosts() HostsList {`
`43`	`43`	`if err != nil {`
`44`	`44`	`fa.Error = err`
`45`	`45`	`}`
`46`		`-`
`47`	`46`	`if res.StatusCode() == 401 {`
`48`	`47`	`fa.RefreshSession()`
`49`		`- _, err = fa.RestClient.R().`
	`48`	`+ fa.RestClient.R().`
`50`	`49`	`SetResult(&result).`
`51`	`50`	`Get(uri)`
`52`		`- if err != nil {`
`53`		`- fa.Error = err`
`54`		`- }`
	`51`	`+`
`55`	`52`	`}`
`56`	`53`	`return result`
`57`	`54`	`}`