Resolve conflicts

.github/workflows/build_and_test.yml

@@ -1,4 +1,4 @@
-on: [push]
+on: [push, pull_request]
 
 name: Build & Test
 
@@ -10,7 +10,7 @@ jobs:
       BROWSER_PATH: /usr/bin/google-chrome
       HEADLESS: y
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
     - uses: nanasess/setup-chromedriver@master
       with:
         # Optional: do not specify to match Chrome's version

Dockerfile

@@ -1,4 +1,4 @@
-FROM golang:1.20
+FROM golang:1.22
 
 # Using root user creates permission issues on the host, particularly with go.sum being regenerated within the container.
 RUN useradd -s /bin/bash -m -U dev

docker-compose.yml

@@ -1,7 +1,7 @@
 version: '3'
 services:
   haproxy:
-    image: haproxy:2.3
+    image: haproxy:2.9
     volumes:
       - ./resources/haproxy:/usr/local/etc/haproxy:ro
     ports:

go.mod

@@ -1,47 +1,49 @@
 module github.com/criteo/haproxy-spoe-auth
 
-go 1.20
+go 1.22
 
 require (
-	github.com/coreos/go-oidc/v3 v3.6.0
-	github.com/go-ldap/ldap/v3 v3.4.4
+	github.com/coreos/go-oidc/v3 v3.10.0
+	github.com/go-ldap/ldap/v3 v3.4.8
 	github.com/negasus/haproxy-spoe-go v1.0.5
-	github.com/sirupsen/logrus v1.9.0
-	github.com/spf13/viper v1.15.0
-	github.com/stretchr/testify v1.8.1
+	github.com/sirupsen/logrus v1.9.3
+	github.com/spf13/viper v1.19.0
+	github.com/stretchr/testify v1.9.0
 	github.com/tebeka/selenium v0.9.9
-	github.com/tidwall/gjson v1.17.0
-	github.com/vmihailenco/msgpack/v5 v5.3.5
-	golang.org/x/oauth2 v0.6.0
+	github.com/tidwall/gjson v1.17.1
+	github.com/vmihailenco/msgpack/v5 v5.4.1
+	golang.org/x/oauth2 v0.21.0
 )
 
 require (
-	github.com/Azure/go-ntlmssp v0.0.0-20220621081337-cb9428e4ac1e // indirect
+	github.com/Azure/go-ntlmssp v0.0.0-20221128193559-754e69321358 // indirect
 	github.com/blang/semver v3.5.1+incompatible // indirect
-	github.com/davecgh/go-spew v1.1.1 // indirect
-	github.com/fsnotify/fsnotify v1.6.0 // indirect
-	github.com/go-asn1-ber/asn1-ber v1.5.4 // indirect
-	github.com/go-jose/go-jose/v3 v3.0.0 // indirect
-	github.com/golang/protobuf v1.5.2 // indirect
+	github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
+	github.com/fsnotify/fsnotify v1.7.0 // indirect
+	github.com/go-asn1-ber/asn1-ber v1.5.5 // indirect
+	github.com/go-jose/go-jose/v4 v4.0.2 // indirect
+	github.com/google/uuid v1.6.0 // indirect
 	github.com/hashicorp/hcl v1.0.0 // indirect
 	github.com/magiconair/properties v1.8.7 // indirect
 	github.com/mitchellh/mapstructure v1.5.0 // indirect
-	github.com/pelletier/go-toml/v2 v2.0.6 // indirect
-	github.com/pmezard/go-difflib v1.0.0 // indirect
-	github.com/spf13/afero v1.9.3 // indirect
-	github.com/spf13/cast v1.5.0 // indirect
-	github.com/spf13/jwalterweatherman v1.1.0 // indirect
+	github.com/pelletier/go-toml/v2 v2.2.2 // indirect
+	github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
+	github.com/sagikazarmark/locafero v0.4.0 // indirect
+	github.com/sagikazarmark/slog-shim v0.1.0 // indirect
+	github.com/sourcegraph/conc v0.3.0 // indirect
+	github.com/spf13/afero v1.11.0 // indirect
+	github.com/spf13/cast v1.6.0 // indirect
 	github.com/spf13/pflag v1.0.5 // indirect
-	github.com/subosito/gotenv v1.4.2 // indirect
+	github.com/subosito/gotenv v1.6.0 // indirect
 	github.com/tidwall/match v1.1.1 // indirect
 	github.com/tidwall/pretty v1.2.0 // indirect
 	github.com/vmihailenco/tagparser/v2 v2.0.0 // indirect
-	golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d // indirect
-	golang.org/x/net v0.8.0 // indirect
-	golang.org/x/sys v0.6.0 // indirect
-	golang.org/x/text v0.8.0 // indirect
-	google.golang.org/appengine v1.6.7 // indirect
-	google.golang.org/protobuf v1.28.1 // indirect
+	go.uber.org/atomic v1.9.0 // indirect
+	go.uber.org/multierr v1.9.0 // indirect
+	golang.org/x/crypto v0.21.0 // indirect
+	golang.org/x/exp v0.0.0-20230905200255-921286631fa9 // indirect
+	golang.org/x/sys v0.18.0 // indirect
+	golang.org/x/text v0.14.0 // indirect
 	gopkg.in/ini.v1 v1.67.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )