fix: rename healthcheckfailed error to errnotserving

Signed-off-by: Rodney Osodo <28790446+rodneyosodo@users.noreply.github.com>

pkg/auth/client.go

@@ -13,7 +13,7 @@ import (
 	grpchealth "google.golang.org/grpc/health/grpc_health_v1"
 )
 
-var errHealthCheckFailed = errors.New("health check failed")
+var errSvcNotServing = errors.New("service is not serving")
 
 // Setup loads Auth gRPC configuration and creates new Auth gRPC client.
 //
@@ -30,11 +30,8 @@ func Setup(ctx context.Context, cfg Config) (magistrala.AuthServiceClient, Handl
 	resp, err := health.Check(ctx, &grpchealth.HealthCheckRequest{
 		Service: "auth",
 	})
-	if err != nil {
-		return nil, nil, errors.Wrap(errHealthCheckFailed, err)
-	}
-	if resp.GetStatus() != grpchealth.HealthCheckResponse_SERVING {
-		return nil, nil, errors.Wrap(errHealthCheckFailed, errors.New("service is not serving"))
+	if err != nil || resp.GetStatus() != grpchealth.HealthCheckResponse_SERVING {
+		return nil, nil, errSvcNotServing
 	}
 
 	return authgrpc.NewClient(client.Connection(), cfg.Timeout), client, nil
@@ -55,11 +52,8 @@ func SetupAuthz(ctx context.Context, cfg Config) (magistrala.AuthzServiceClient,
 	resp, err := health.Check(ctx, &grpchealth.HealthCheckRequest{
 		Service: "things",
 	})
-	if err != nil {
-		return nil, nil, errors.Wrap(errHealthCheckFailed, err)
-	}
-	if resp.GetStatus() != grpchealth.HealthCheckResponse_SERVING {
-		return nil, nil, errors.Wrap(errHealthCheckFailed, errors.New("service is not serving"))
+	if err != nil || resp.GetStatus() != grpchealth.HealthCheckResponse_SERVING {
+		return nil, nil, errSvcNotServing
 	}
 
 	return thingsauth.NewClient(client.Connection(), cfg.Timeout), client, nil

pkg/auth/client_test.go

@@ -58,7 +58,7 @@ func TestSetupAuth(t *testing.T) {
 				URL:     "",
 				Timeout: time.Second,
 			},
-			err: errors.New("health check failed"),
+			err: errors.New("service is not serving"),
 		},
 	}
 
@@ -109,7 +109,7 @@ func TestSetupAuthz(t *testing.T) {
 				URL:     "",
 				Timeout: time.Second,
 			},
-			err: errors.New("health check failed"),
+			err: errors.New("service is not serving"),
 		},
 	}