From 837da6260792c0ce027643a35b0690ac64ccbed4 Mon Sep 17 00:00:00 2001
From: Chris F Ravenscroft <chris@voilaweb.com>
Date: Sun, 17 Dec 2023 16:39:35 -0800
Subject: [PATCH] Chore/bump minimum go version to 1.21 (#375)

* chore: fix go fmt in makefile

* chore: bump minimum go version to 1.21
---
 .github/workflows/ci.yml      |  2 +-
 v2/Makefile                   |  2 +-
 v2/go.mod                     |  2 +-
 v2/internal/tracing/tracer.go |  2 +-
 v2/pkg/server/options.go      | 12 ++++++------
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index e75a2dd..0f50332 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -10,7 +10,7 @@ jobs:
     runs-on: ubuntu-20.04
     strategy:
       matrix:
-        go-version: [1.19.x, 1.20.x, 1.21.x]
+        go-version: [1.21.x]
     steps:
       - name: Install Go
         uses: actions/setup-go@v4
diff --git a/v2/Makefile b/v2/Makefile
index f093627..9a3f5f0 100644
--- a/v2/Makefile
+++ b/v2/Makefile
@@ -87,7 +87,7 @@ updatetest:
 	./scripts/ci/integration-test.sh
 
 format:
-	go fmt
+	go fmt ./...
 
 devrun:
 	go run ${BUILD_FILES} -c sample-simple.cfg
diff --git a/v2/go.mod b/v2/go.mod
index 1954329..efea452 100644
--- a/v2/go.mod
+++ b/v2/go.mod
@@ -1,6 +1,6 @@
 module github.com/glauth/glauth/v2
 
-go 1.19
+go 1.21
 
 require (
 	github.com/BurntSushi/toml v1.3.2
diff --git a/v2/internal/tracing/tracer.go b/v2/internal/tracing/tracer.go
index 2f61e76..72686bd 100644
--- a/v2/internal/tracing/tracer.go
+++ b/v2/internal/tracing/tracer.go
@@ -22,7 +22,7 @@ import (
 )
 
 type Tracer struct {
-    embedded.Tracer
+	embedded.Tracer
 
 	tracer trace.Tracer
 
diff --git a/v2/pkg/server/options.go b/v2/pkg/server/options.go
index 22bc26a..2143c22 100644
--- a/v2/pkg/server/options.go
+++ b/v2/pkg/server/options.go
@@ -16,12 +16,12 @@ type Option func(o *Options)
 
 // Options defines the available options for this package.
 type Options struct {
-	Logger  zerolog.Logger
-	Config  *config.Config
-	TLSConfig *tls.Config  
-	Monitor monitoring.MonitorInterface
-	Tracer  trace.Tracer
-	Context context.Context
+	Logger    zerolog.Logger
+	Config    *config.Config
+	TLSConfig *tls.Config
+	Monitor   monitoring.MonitorInterface
+	Tracer    trace.Tracer
+	Context   context.Context
 }
 
 // newOptions initializes the available default options.