From d31ea4b23c8786250cc27fbd103709974e9f509a Mon Sep 17 00:00:00 2001
From: Hector <hector@hjs.dev>
Date: Tue, 20 Jun 2023 21:41:15 +0100
Subject: [PATCH] move middleware to new package

---
 exporter.go                         | 17 +++++++++--------
 {auth => server}/middleware.go      |  2 +-
 {auth => server}/middleware_test.go |  2 +-
 3 files changed, 11 insertions(+), 10 deletions(-)
 rename {auth => server}/middleware.go (98%)
 rename {auth => server}/middleware_test.go (99%)

diff --git a/exporter.go b/exporter.go
index 449f5ac..65857ba 100644
--- a/exporter.go
+++ b/exporter.go
@@ -2,17 +2,18 @@ package main
 
 import (
 	"fmt"
-	"github.com/prometheus/client_golang/prometheus"
-	"github.com/prometheus/client_golang/prometheus/promhttp"
-	"gitlab.com/hectorjsmith/fail2ban-prometheus-exporter/auth"
-	"gitlab.com/hectorjsmith/fail2ban-prometheus-exporter/cfg"
-	"gitlab.com/hectorjsmith/fail2ban-prometheus-exporter/collector/f2b"
-	"gitlab.com/hectorjsmith/fail2ban-prometheus-exporter/collector/textfile"
 	"log"
 	"net/http"
 	"os"
 	"os/signal"
 	"syscall"
+
+	"github.com/prometheus/client_golang/prometheus"
+	"github.com/prometheus/client_golang/prometheus/promhttp"
+	"gitlab.com/hectorjsmith/fail2ban-prometheus-exporter/cfg"
+	"gitlab.com/hectorjsmith/fail2ban-prometheus-exporter/collector/f2b"
+	"gitlab.com/hectorjsmith/fail2ban-prometheus-exporter/collector/textfile"
+	"gitlab.com/hectorjsmith/fail2ban-prometheus-exporter/server"
 )
 
 const (
@@ -66,8 +67,8 @@ func main() {
 		textFileCollector := textfile.NewCollector(appSettings)
 		prometheus.MustRegister(textFileCollector)
 
-		http.HandleFunc("/", auth.BasicAuthMiddleware(rootHtmlHandler, appSettings.BasicAuthProvider))
-		http.HandleFunc(metricsPath, auth.BasicAuthMiddleware(
+		http.HandleFunc("/", server.BasicAuthMiddleware(rootHtmlHandler, appSettings.BasicAuthProvider))
+		http.HandleFunc(metricsPath, server.BasicAuthMiddleware(
 			func(w http.ResponseWriter, r *http.Request) {
 				metricHandler(w, r, textFileCollector)
 			},
diff --git a/auth/middleware.go b/server/middleware.go
similarity index 98%
rename from auth/middleware.go
rename to server/middleware.go
index dd16fe3..92dec38 100644
--- a/auth/middleware.go
+++ b/server/middleware.go
@@ -1,4 +1,4 @@
-package auth
+package server
 
 import (
 	"net/http"
diff --git a/auth/middleware_test.go b/server/middleware_test.go
similarity index 99%
rename from auth/middleware_test.go
rename to server/middleware_test.go
index 27c8ab6..7c7e428 100644
--- a/auth/middleware_test.go
+++ b/server/middleware_test.go
@@ -1,4 +1,4 @@
-package auth
+package server
 
 import (
 	"net/http"