refactor loki client mock

Author: jpinsonneau

pkg/handler/loki.go

@@ -11,6 +11,7 @@ import (
 
 	"github.com/sirupsen/logrus"
 
+	"github.com/netobserv/network-observability-console-plugin/pkg/handler/lokiclientmock"
 	"github.com/netobserv/network-observability-console-plugin/pkg/httpclient"
 	"github.com/netobserv/network-observability-console-plugin/pkg/loki"
 	"github.com/netobserv/network-observability-console-plugin/pkg/metrics"
@@ -30,8 +31,14 @@ func newLokiClient(cfg *loki.Config) httpclient.Caller {
 			lokiOrgIDHeader: {cfg.TenantID},
 		}
 	}
+
+	if cfg.UseMocks {
+		hlog.Debug("Mocking Loki Client")
+		return new(lokiclientmock.LokiClientMock)
+	}
+
 	// TODO: loki with auth
-	return httpclient.NewHTTPClient(cfg.Timeout, headers, cfg.SkipTLS, cfg.UseMocks)
+	return httpclient.NewHTTPClient(cfg.Timeout, headers, cfg.SkipTLS)
 }
 
 /* loki query will fail if spaces or quotes are not encoded

pkg/httpclient/httpclienttest/http_client_json_mock.go renamed to pkg/handler/lokiclientmock/loki_client_mock.go

@@ -1,14 +1,14 @@
-package httpclienttest
+package lokiclientmock
 
 import (
 	"io/ioutil"
 	"strings"
 )
 
-type HTTPClientJSONMock struct {
+type LokiClientMock struct {
 }
 
-func (o *HTTPClientJSONMock) Get(url string) ([]byte, int, error) {
+func (o *LokiClientMock) Get(url string) ([]byte, int, error) {
 	var path string
 
 	isLabel := strings.Contains(url, "/label/")

pkg/httpclient/http_client.go

@@ -7,7 +7,6 @@ import (
 	"net/http"
 	"time"
 
-	"github.com/netobserv/network-observability-console-plugin/pkg/httpclient/httpclienttest"
 	"github.com/sirupsen/logrus"
 )
 
@@ -23,7 +22,7 @@ type httpClient struct {
 
 var slog = logrus.WithField("module", "server")
 
-func NewHTTPClient(timeout time.Duration, overrideHeaders map[string][]string, skipTLS bool, useMocks bool) Caller {
+func NewHTTPClient(timeout time.Duration, overrideHeaders map[string][]string, skipTLS bool) Caller {
 	transport := &http.Transport{
 		DialContext:     (&net.Dialer{Timeout: timeout}).DialContext,
 		IdleConnTimeout: timeout,
@@ -35,11 +34,6 @@ func NewHTTPClient(timeout time.Duration, overrideHeaders map[string][]string, s
 		slog.Warn("skipping TLS checks. SSL certificate verification is now disabled !")
 	}
 
-	if useMocks {
-		slog.Debug("Mocking HTTP Client")
-		return new(httpclienttest.HTTPClientJSONMock)
-	}
-
 	return &httpClient{
 		client:  http.Client{Transport: transport, Timeout: timeout},
 		headers: overrideHeaders,