cc951e3c52344f2022674fe7b793fe3a782c7718

Author
Ayman Bagabas <ayman.bagabas@gmail.com>
Committer
Ayman Bagabas <ayman.bagabas@gmail.com>
Date

Message

feat: switch to env/v8

Diff

 1diff --git a/go.mod b/go.mod
 2index bdd5d6109e36bd4ba33daa721386777ab263197f..cb14103f0e9a1be2615ddaa782a3996679aee5a6 100644
 3--- a/go.mod
 4+++ b/go.mod
 5@@ -18,7 +18,7 @@ require (
 6 )
 7 
 8 require (
 9-	github.com/caarlos0/env/v7 v7.1.0
10+	github.com/caarlos0/env/v8 v8.0.0
11 	github.com/charmbracelet/keygen v0.4.2
12 	github.com/charmbracelet/log v0.2.1
13 	github.com/charmbracelet/ssh v0.0.0-20221117183211-483d43d97103
14diff --git a/go.sum b/go.sum
15index 29e1ad2153c2c2fa4eae1b0f68884ee53435af72..8928e0cb9f894b9fa890b465dc026b9f2d8def78 100644
16--- a/go.sum
17+++ b/go.sum
18@@ -16,8 +16,8 @@ github.com/aymerick/douceur v0.2.0/go.mod h1:wlT5vV2O3h55X9m7iVYN0TBM0NH/MmbLnd3
19 github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM=
20 github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw=
21 github.com/bwesterb/go-ristretto v1.2.0/go.mod h1:fUIoIZaG73pV5biE2Blr2xEzDoMj7NFEuV9ekS419A0=
22-github.com/caarlos0/env/v7 v7.1.0 h1:9lzTF5amyQeWHZzuZeKlCb5FWSUxpG1js43mhbY8ozg=
23-github.com/caarlos0/env/v7 v7.1.0/go.mod h1:LPPWniDUq4JaO6Q41vtlyikhMknqymCLBw0eX4dcH1E=
24+github.com/caarlos0/env/v8 v8.0.0 h1:POhxHhSpuxrLMIdvTGARuZqR4Jjm8AYmoi/JKlcScs0=
25+github.com/caarlos0/env/v8 v8.0.0/go.mod h1:7K4wMY9bH0esiXSSHlfHLX5xKGQMnkH5Fk4TDSSSzfo=
26 github.com/caarlos0/sshmarshal v0.1.0 h1:zTCZrDORFfWh526Tsb7vCm3+Yg/SfW/Ub8aQDeosk0I=
27 github.com/caarlos0/sshmarshal v0.1.0/go.mod h1:7Pd/0mmq9x/JCzKauogNjSQEhivBclCQHfr9dlpDIyA=
28 github.com/cespare/xxhash/v2 v2.2.0 h1:DC2CZ1Ep5Y4k3ZQ899DldepgrayRUGE6BBZ/cd9Cj44=
29diff --git a/server/config/config.go b/server/config/config.go
30index a96e69c75f5bc2e3944160aa86831236a177b71c..2dca4fada1dfb5ce10e2c2cba76693113ebf76a2 100644
31--- a/server/config/config.go
32+++ b/server/config/config.go
33@@ -9,7 +9,7 @@ import (
34 	"strings"
35 	"time"
36 
37-	"github.com/caarlos0/env/v7"
38+	"github.com/caarlos0/env/v8"
39 	"github.com/charmbracelet/log"
40 	"github.com/charmbracelet/soft-serve/server/backend"
41 	"golang.org/x/crypto/ssh"
42@@ -158,7 +158,7 @@ func parseConfig(path string) (*Config, error) {
43 	initialAdminKeys := append([]string{}, cfg.InitialAdminKeys...)
44 
45 	// Override with environment variables
46-	if err := env.Parse(cfg, env.Options{
47+	if err := env.ParseWithOptions(cfg, env.Options{
48 		Prefix: "SOFT_SERVE_",
49 	}); err != nil {
50 		return cfg, fmt.Errorf("parse environment variables: %w", err)