take out rest error handling

chrroberts-pure · chrroberts-pure · commit f1cd002bee41 · 2024-03-18T19:27:09.000-05:00
diff --git a/internal/rest-client/alerts.go b/internal/rest-client/alerts.go
@@ -36,11 +36,7 @@ func (fa *FAClient) GetAlerts(filter string) *AlertsList {
 	if filter != "" {
 		req = req.SetQueryParam("filter", filter)
 	}
-	res, err := req.Get(uri)
-	if err != nil {
-		fa.Error = err
-	}
-
+	res, _ := req.Get(uri)
 	if res.StatusCode() == 401 {
 		fa.RefreshSession()
 		req.Get(uri)
diff --git a/internal/rest-client/arrays.go b/internal/rest-client/arrays.go
@@ -57,18 +57,14 @@ type ArraysList struct {
 func (fa *FAClient) GetArrays() *ArraysList {
 	uri := "/arrays"
 	result := new(ArraysList)
-	res, err := fa.RestClient.R().
+	res, _ := fa.RestClient.R().
 		SetResult(&result).
 		Get(uri)
-	if err != nil {
-		fa.Error = err
-	}
 	if res.StatusCode() == 401 {
 		fa.RefreshSession()
 		fa.RestClient.R().
 			SetResult(&result).
 			Get(uri)
 	}
-
 	return result
 }
diff --git a/internal/rest-client/arrays_performance.go b/internal/rest-client/arrays_performance.go
@@ -46,18 +46,14 @@ type ArraysPerformanceList struct {
 func (fa *FAClient) GetArraysPerformance() *ArraysPerformanceList {
 	uri := "/arrays/performance"
 	result := new(ArraysPerformanceList)
-	res, err := fa.RestClient.R().
+	res, _ := fa.RestClient.R().
 		SetResult(&result).
 		Get(uri)
-	if err != nil {
-		fa.Error = err
-	}
 	if res.StatusCode() == 401 {
 		fa.RefreshSession()
 		fa.RestClient.R().
 			SetResult(&result).
 			Get(uri)
 	}
-
 	return result
 }
diff --git a/internal/rest-client/connections.go b/internal/rest-client/connections.go
@@ -36,18 +36,14 @@ type ConnectionsList struct {
 func (fa *FAClient) GetConnections() *ConnectionsList {
 	uri := "/connections"
 	result := new(ConnectionsList)
-	res, err := fa.RestClient.R().
+	res, _ := fa.RestClient.R().
 		SetResult(&result).
 		Get(uri)
-	if err != nil {
-		fa.Error = err
-	}
 	if res.StatusCode() == 401 {
 		fa.RefreshSession()
 		fa.RestClient.R().
 			SetResult(&result).
 			Get(uri)
 	}
-
 	return result
 }
diff --git a/internal/rest-client/directories.go b/internal/rest-client/directories.go
@@ -46,13 +46,9 @@ type DirectoriesList struct {
 func (fa *FAClient) GetDirectories() *DirectoriesList {
 	uri := "/directories"
 	result := new(DirectoriesList)
-	res, err := fa.RestClient.R().
+	res, _ := fa.RestClient.R().
 		SetResult(&result).
 		Get(uri)
-
-	if err != nil {
-		fa.Error = err
-	}
 	if res.StatusCode() == 401 {
 		fa.RefreshSession()
 		fa.RestClient.R().
diff --git a/internal/rest-client/directories_performance.go b/internal/rest-client/directories_performance.go
@@ -28,18 +28,14 @@ type DirectoriesPerformanceList struct {
 func (fa *FAClient) GetDirectoriesPerformance() *DirectoriesPerformanceList {
 	uri := "/directories/performance"
 	result := new(DirectoriesPerformanceList)
-	res, err := fa.RestClient.R().
+	res, _ := fa.RestClient.R().
 		SetResult(&result).
 		Get(uri)
-	if err != nil {
-		fa.Error = err
-	}
 	if res.StatusCode() == 401 {
 		fa.RefreshSession()
 		fa.RestClient.R().
 			SetResult(&result).
 			Get(uri)
 	}
-
 	return result
 }
diff --git a/internal/rest-client/drives.go b/internal/rest-client/drives.go
@@ -19,18 +19,14 @@ type DriveList struct {
 func (fa *FAClient) GetDrives() *DriveList {
 	uri := "/drives"
 	result := new(DriveList)
-	res, err := fa.RestClient.R().
+	res, _ := fa.RestClient.R().
 		SetResult(&result).
 		Get(uri)
-	if err != nil {
-		fa.Error = err
-	}
 	if res.StatusCode() == 401 {
 		fa.RefreshSession()
 		fa.RestClient.R().
 			SetResult(&result).
 			Get(uri)
 	}
-
 	return result
 }
diff --git a/internal/rest-client/flasharray_client.go b/internal/rest-client/flasharray_client.go
@@ -90,9 +90,13 @@ func NewRestClient(endpoint string, apitoken string, apiversion string, uagent s
 		fa.Error = err
 		return fa
 	}
+	if res.StatusCode() != 200 {
+		fa.Error = errors.New("failed to login to FlashArray, check API Token")
+		return fa
+	}
 	fa.XAuthToken = res.Header().Get("x-auth-token")
 	fa.RestClient.SetHeader("x-auth-token", fa.XAuthToken)
-	fa.RestClient.SetHeader("User-Agent", FARestUserAgent + " (" + uagent + ")")
+	fa.RestClient.SetHeader("User-Agent", FARestUserAgent+" ("+uagent+")")
 	return fa
 }
 
diff --git a/internal/rest-client/hardware.go b/internal/rest-client/hardware.go
@@ -25,18 +25,14 @@ type HardwareList struct {
 func (fa *FAClient) GetHardware() *HardwareList {
 	uri := "/hardware"
 	result := new(HardwareList)
-	res, err := fa.RestClient.R().
+	res, _ := fa.RestClient.R().
 		SetResult(&result).
 		Get(uri)
-	if err != nil {
-		fa.Error = err
-	}
 	if res.StatusCode() == 401 {
 		fa.RefreshSession()
 		fa.RestClient.R().
 			SetResult(&result).
 			Get(uri)
 	}
-
 	return result
 }
diff --git a/internal/rest-client/hosts.go b/internal/rest-client/hosts.go
@@ -37,17 +37,15 @@ type HostsList struct {
 func (fa *FAClient) GetHosts() *HostsList {
 	uri := "/hosts"
 	result := new(HostsList)
-	res, err := fa.RestClient.R().
+	res, _ := fa.RestClient.R().
 		SetResult(&result).
 		Get(uri)
-	if err != nil {
-		fa.Error = err
-	}
 	if res.StatusCode() == 401 {
 		fa.RefreshSession()
 		fa.RestClient.R().
 			SetResult(&result).
 			Get(uri)
 	}
+
 	return result
 }
diff --git a/internal/rest-client/hosts_balance.go b/internal/rest-client/hosts_balance.go
@@ -35,18 +35,14 @@ type HostsBalanceList struct {
 func (fa *FAClient) GetHostsBalance() *HostsBalanceList {
 	uri := "/hosts/performance/balance"
 	result := new(HostsBalanceList)
-	res, err := fa.RestClient.R().
+	res, _ := fa.RestClient.R().
 		SetResult(&result).
 		Get(uri)
-	if err != nil {
-		fa.Error = err
-	}
 	if res.StatusCode() == 401 {
 		fa.RefreshSession()
 		fa.RestClient.R().
 			SetResult(&result).
 			Get(uri)
 	}
-
 	return result
 }
diff --git a/internal/rest-client/hosts_performance.go b/internal/rest-client/hosts_performance.go
@@ -42,18 +42,14 @@ type HostsPerformanceList struct {
 func (fa *FAClient) GetHostsPerformance() *HostsPerformanceList {
 	uri := "/hosts/performance"
 	result := new(HostsPerformanceList)
-	res, err := fa.RestClient.R().
+	res, _ := fa.RestClient.R().
 		SetResult(&result).
 		Get(uri)
-	if err != nil {
-		fa.Error = err
-	}
 	if res.StatusCode() == 401 {
 		fa.RefreshSession()
 		fa.RestClient.R().
 			SetResult(&result).
 			Get(uri)
 	}
-
 	return result
 }
diff --git a/internal/rest-client/network_interface.go b/internal/rest-client/network_interface.go
@@ -44,18 +44,14 @@ type NetworkInterfacesList struct {
 func (fa *FAClient) GetNetworkInterfaces() *NetworkInterfacesList {
 	uri := "/network-interfaces"
 	result := new(NetworkInterfacesList)
-	res, err := fa.RestClient.R().
+	res, _ := fa.RestClient.R().
 		SetResult(&result).
 		Get(uri)
-	if err != nil {
-		fa.Error = err
-	}
 	if res.StatusCode() == 401 {
 		fa.RefreshSession()
 		fa.RestClient.R().
 			SetResult(&result).
 			Get(uri)
 	}
-
 	return result
 }
diff --git a/internal/rest-client/network_performance.go b/internal/rest-client/network_performance.go
@@ -44,18 +44,14 @@ type NetworkInterfacesPerformanceList struct {
 func (fa *FAClient) GetNetworkInterfacesPerformance() *NetworkInterfacesPerformanceList {
 	uri := "/network-interfaces/performance"
 	result := new(NetworkInterfacesPerformanceList)
-	res, err := fa.RestClient.R().
+	res, _ := fa.RestClient.R().
 		SetResult(&result).
 		Get(uri)
-	if err != nil {
-		fa.Error = err
-	}
 	if res.StatusCode() == 401 {
 		fa.RefreshSession()
 		fa.RestClient.R().
 			SetResult(&result).
 			Get(uri)
 	}
-
 	return result
 }
diff --git a/internal/rest-client/pod_replica_links_lag.go b/internal/rest-client/pod_replica_links_lag.go
@@ -27,18 +27,14 @@ type PodReplicaLinksLagList struct {
 func (fa *FAClient) GetPodReplicaLinksLag() *PodReplicaLinksLagList {
 	uri := "/pod-replica-links/lag"
 	result := new(PodReplicaLinksLagList)
-	res, err := fa.RestClient.R().
+	res, _ := fa.RestClient.R().
 		SetResult(&result).
 		Get(uri)
-	if err != nil {
-		fa.Error = err
-	}
 	if res.StatusCode() == 401 {
 		fa.RefreshSession()
 		fa.RestClient.R().
 			SetResult(&result).
 			Get(uri)
 	}
-
 	return result
 }
diff --git a/internal/rest-client/pod_replica_links_performance.go b/internal/rest-client/pod_replica_links_performance.go
@@ -23,18 +23,14 @@ type PodReplicaLinksPerformanceList struct {
 func (fa *FAClient) GetPodReplicaLinksPerformance() *PodReplicaLinksPerformanceList {
 	uri := "/pod-replica-links/performance/replication"
 	result := new(PodReplicaLinksPerformanceList)
-	res, err := fa.RestClient.R().
+	res, _ := fa.RestClient.R().
 		SetResult(&result).
 		Get(uri)
-	if err != nil {
-		fa.Error = err
-	}
 	if res.StatusCode() == 401 {
 		fa.RefreshSession()
 		fa.RestClient.R().
 			SetResult(&result).
 			Get(uri)
 	}
-
 	return result
 }
diff --git a/internal/rest-client/pods.go b/internal/rest-client/pods.go
@@ -36,18 +36,14 @@ type PodShort struct {
 func (fa *FAClient) GetPods() *PodsList {
 	uri := "/pods"
 	result := new(PodsList)
-	res, err := fa.RestClient.R().
+	res, _ := fa.RestClient.R().
 		SetResult(&result).
 		Get(uri)
-	if err != nil {
-		fa.Error = err
-	}
 	if res.StatusCode() == 401 {
 		fa.RefreshSession()
 		fa.RestClient.R().
 			SetResult(&result).
 			Get(uri)
 	}
-
 	return result
 }
diff --git a/internal/rest-client/pods_performance.go b/internal/rest-client/pods_performance.go
@@ -45,18 +45,14 @@ type PodsPerformanceList struct {
 func (fa *FAClient) GetPodsPerformance() *PodsPerformanceList {
 	uri := "/pods/performance"
 	result := new(PodsPerformanceList)
-	res, err := fa.RestClient.R().
+	res, _ := fa.RestClient.R().
 		SetResult(&result).
 		Get(uri)
-	if err != nil {
-		fa.Error = err
-	}
 	if res.StatusCode() == 401 {
 		fa.RefreshSession()
 		fa.RestClient.R().
 			SetResult(&result).
 			Get(uri)
 	}
-
 	return result
 }
diff --git a/internal/rest-client/pods_performance_replication.go b/internal/rest-client/pods_performance_replication.go
@@ -27,18 +27,14 @@ type PodsPerformanceReplicationList struct {
 func (fa *FAClient) GetPodsPerformanceReplication() *PodsPerformanceReplicationList {
 	uri := "/pods/performance/replication"
 	result := new(PodsPerformanceReplicationList)
-	res, err := fa.RestClient.R().
+	res, _ := fa.RestClient.R().
 		SetResult(&result).
 		Get(uri)
-	if err != nil {
-		fa.Error = err
-	}
 	if res.StatusCode() == 401 {
 		fa.RefreshSession()
 		fa.RestClient.R().
 			SetResult(&result).
 			Get(uri)
 	}
-
 	return result
 }
diff --git a/internal/rest-client/ports.go b/internal/rest-client/ports.go
@@ -19,18 +19,14 @@ type PortsList struct {
 func (fa *FAClient) GetPorts() *PortsList {
 	uri := "/ports"
 	result := new(PortsList)
-	res, err := fa.RestClient.R().
+	res, _ := fa.RestClient.R().
 		SetResult(&result).
 		Get(uri)
-	if err != nil {
-		fa.Error = err
-	}
 	if res.StatusCode() == 401 {
 		fa.RefreshSession()
 		fa.RestClient.R().
 			SetResult(&result).
 			Get(uri)
 	}
-
 	return result
 }
diff --git a/internal/rest-client/subscriptions.go b/internal/rest-client/subscriptions.go
diff --git a/internal/rest-client/volumes.go b/internal/rest-client/volumes.go
diff --git a/internal/rest-client/volumes_performance.go b/internal/rest-client/volumes_performance.go

Original file line number	Diff line number	Diff line change
`@@ -90,9 +90,13 @@ func NewRestClient(endpoint string, apitoken string, apiversion string, uagent s`
`90`	`90`	`fa.Error = err`
`91`	`91`	`return fa`
`92`	`92`	`}`
	`93`	`+ if res.StatusCode() != 200 {`
	`94`	`+ fa.Error = errors.New("failed to login to FlashArray, check API Token")`
	`95`	`+ return fa`
	`96`	`+ }`
`93`	`97`	`fa.XAuthToken = res.Header().Get("x-auth-token")`
`94`	`98`	`fa.RestClient.SetHeader("x-auth-token", fa.XAuthToken)`
`95`		`- fa.RestClient.SetHeader("User-Agent", FARestUserAgent + " (" + uagent + ")")`
	`99`	`+ fa.RestClient.SetHeader("User-Agent", FARestUserAgent+" ("+uagent+")")`
`96`	`100`	`return fa`
`97`	`101`	`}`
`98`	`102`