Remove utils.go from gateway package and update the code and the tests

Signed-off-by: Doğukan Teber <[email protected]>

Author: dogukanteber

gateway/gateway_test.go

@@ -5,7 +5,6 @@ import (
 	"errors"
 	"net/http"
 	"net/http/httptest"
-	"os"
 	"strings"
 	"testing"
 	"time"
@@ -48,8 +47,6 @@ func TestNewGateway(t *testing.T) {
 }
 
 func TestStartGateway(t *testing.T) {
-	InitLogger(os.Stdout)
-
 	distributorServer := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {}))
 	frontendServer := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {}))
 	alertmanagerServer := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {}))

gateway/middleware.go

@@ -4,7 +4,7 @@ import (
 	"net/http"
 
 	"github.com/cortexproject/auth-gateway/middleware"
-	"github.com/go-kit/log/level"
+	"github.com/sirupsen/logrus"
 )
 
 type Authentication struct {
@@ -36,7 +36,7 @@ func (a Authentication) Wrap(next http.Handler) http.Handler {
 		if ok {
 			next.ServeHTTP(sr, r)
 		} else {
-			level.Debug(logger).Log("msg", "No valid tenant credentials are found")
+			logrus.Infof("No valid tenant credentials are found")
 			sr.Header().Set("WWW-Authenticate", `Basic realm="Restricted"`)
 			http.Error(sr, "Unauthorized", http.StatusUnauthorized)
 		}

gateway/middleware_test.go

@@ -4,12 +4,10 @@ import (
 	"encoding/base64"
 	"net/http"
 	"net/http/httptest"
-	"os"
 	"testing"
 )
 
 func TestAuthenticate(t *testing.T) {
-	InitLogger(os.Stdout)
 	testCases := []struct {
 		name           string
 		config         *Config

gateway/utils.go

@@ -7,6 +7,7 @@ import (
 	"github.com/cortexproject/auth-gateway/gateway"
 	"github.com/cortexproject/auth-gateway/middleware"
 	"github.com/cortexproject/auth-gateway/server"
+	"github.com/cortexproject/auth-gateway/utils"
 )
 
 func main() {
@@ -15,11 +16,9 @@ func main() {
 		os.Exit(1)
 	}
 
-	gateway.InitLogger(os.Stdout)
-
 	filePath := os.Args[1]
 	conf, err := gateway.Init(filePath)
-	gateway.CheckErr("reading the configuration file", err)
+	utils.CheckErr("reading the configuration file", err)
 
 	serverConf := server.Config{
 		HTTPListenAddr: conf.Server.Address,
@@ -37,12 +36,12 @@ func main() {
 		UnAuthorizedHTTPServerIdleTimeout:  conf.Admin.IdleTimeout,
 	}
 	server, err := server.New(serverConf)
-	gateway.CheckErr("initializing the server", err)
+	utils.CheckErr("initializing the server", err)
 
 	defer server.Shutdown()
 
 	gtw, err := gateway.New(&conf, server)
-	gateway.CheckErr("initializing the gateway", err)
+	utils.CheckErr("initializing the gateway", err)
 
 	gtw.Start(&conf)
 

gateway/utils_test.go

@@ -1,10 +1,25 @@
 package utils
 
-import "github.com/sirupsen/logrus"
+import (
+	"os"
+
+	"github.com/sirupsen/logrus"
+)
 
 type LogrusErrorWriter struct{}
 
 func (w LogrusErrorWriter) Write(p []byte) (n int, err error) {
 	logrus.Errorf("%s", string(p))
 	return len(p), nil
 }
+
+func CheckErr(msg string, err error) {
+	CheckErrWithExit(msg, err, os.Exit)
+}
+
+func CheckErrWithExit(msg string, err error, exitFunc func(int)) {
+	if err != nil {
+		logrus.Errorf("err: %v", err)
+		exitFunc(1)
+	}
+}