Address review comments

Author: Vighneswar Rao Bojja

client/nginx.go

@@ -934,11 +934,8 @@ func (client *NginxClient) getStreamZoneSync() (*StreamZoneSync, error) {
 func (client *NginxClient) getLocationZones() (*LocationZones, error) {
 	var locationZones LocationZones
 	err := client.get("http/location_zones", &locationZones)
-
 	if err != nil {
-		if err, ok := err.(*internalError); ok {
-			return nil, fmt.Errorf("failed to get location zones: %v", err)
-		}
+		return nil, fmt.Errorf("failed to get location zones: %v", err)
 	}
 
 	return &locationZones, err
@@ -947,11 +944,8 @@ func (client *NginxClient) getLocationZones() (*LocationZones, error) {
 func (client *NginxClient) getResolvers() (*Resolvers, error) {
 	var resolvers Resolvers
 	err := client.get("resolvers", &resolvers)
-
 	if err != nil {
-		if err, ok := err.(*internalError); ok {
-			return nil, fmt.Errorf("failed to get resolvers: %v", err)
-		}
+		return nil, fmt.Errorf("failed to get resolvers: %v", err)
 	}
 
 	return &resolvers, err

docker/nginx.conf

@@ -50,7 +50,7 @@ stream {
         health_check interval=10 fails=3 passes=1;
     }
 
-    resolver 127.0.0.11 valid=5s status_zone=test-zone;
+    resolver 127.0.0.11 valid=5s status_zone=resolver_test;
 
     server {
         listen 7777;

tests/client_test.go

@@ -14,6 +14,8 @@ const (
 	upstream       = "test"
 	streamUpstream = "stream_test"
 	streamZoneSync = "zone_test_sync"
+	locationZone   = "location_test"
+	resolverMetric = "resolver_test"
 )
 
 var defaultMaxFails = 1
@@ -484,20 +486,18 @@ func TestStats(t *testing.T) {
 		t.Errorf("Upstream 'test' not found")
 	}
 
-	// cleanup upstream servers
-	_, _, err = c.UpdateHTTPServers(upstream, []client.UpstreamServer{})
-	if err != nil {
-		t.Errorf("Couldn't remove servers: %v", err)
+	if locZone, ok := stats.LocationZones[locationZone]; !ok {
+		t.Errorf("LocationZone %v not found", locZone)
 	}
 
-	locationZones := stats.LocationZones
-	if len(locationZones) < 1 {
-		t.Errorf("location zones are not available")
+	if resolver, ok := stats.Resolvers[resolverMetric]; !ok {
+		t.Errorf("Resolver %v not found", resolver)
 	}
 
-	resolvers := stats.Resolvers
-	if len(resolvers) < 1 {
-		t.Errorf("resolvers are not available")
+	// cleanup upstream servers
+	_, _, err = c.UpdateHTTPServers(upstream, []client.UpstreamServer{})
+	if err != nil {
+		t.Errorf("Couldn't remove servers: %v", err)
 	}
 }