From cc951e3c52344f2022674fe7b793fe3a782c7718 Mon Sep 17 00:00:00 2001 From: Ayman Bagabas Date: Fri, 12 May 2023 16:15:54 -0400 Subject: [PATCH] feat: switch to env/v8 --- go.mod | 2 +- go.sum | 4 ++-- server/config/config.go | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/go.mod b/go.mod index bdd5d6109e36bd4ba33daa721386777ab263197f..cb14103f0e9a1be2615ddaa782a3996679aee5a6 100644 --- a/go.mod +++ b/go.mod @@ -18,7 +18,7 @@ require ( ) require ( - github.com/caarlos0/env/v7 v7.1.0 + github.com/caarlos0/env/v8 v8.0.0 github.com/charmbracelet/keygen v0.4.2 github.com/charmbracelet/log v0.2.1 github.com/charmbracelet/ssh v0.0.0-20221117183211-483d43d97103 diff --git a/go.sum b/go.sum index 29e1ad2153c2c2fa4eae1b0f68884ee53435af72..8928e0cb9f894b9fa890b465dc026b9f2d8def78 100644 --- a/go.sum +++ b/go.sum @@ -16,8 +16,8 @@ github.com/aymerick/douceur v0.2.0/go.mod h1:wlT5vV2O3h55X9m7iVYN0TBM0NH/MmbLnd3 github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM= github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw= github.com/bwesterb/go-ristretto v1.2.0/go.mod h1:fUIoIZaG73pV5biE2Blr2xEzDoMj7NFEuV9ekS419A0= -github.com/caarlos0/env/v7 v7.1.0 h1:9lzTF5amyQeWHZzuZeKlCb5FWSUxpG1js43mhbY8ozg= -github.com/caarlos0/env/v7 v7.1.0/go.mod h1:LPPWniDUq4JaO6Q41vtlyikhMknqymCLBw0eX4dcH1E= +github.com/caarlos0/env/v8 v8.0.0 h1:POhxHhSpuxrLMIdvTGARuZqR4Jjm8AYmoi/JKlcScs0= +github.com/caarlos0/env/v8 v8.0.0/go.mod h1:7K4wMY9bH0esiXSSHlfHLX5xKGQMnkH5Fk4TDSSSzfo= github.com/caarlos0/sshmarshal v0.1.0 h1:zTCZrDORFfWh526Tsb7vCm3+Yg/SfW/Ub8aQDeosk0I= github.com/caarlos0/sshmarshal v0.1.0/go.mod h1:7Pd/0mmq9x/JCzKauogNjSQEhivBclCQHfr9dlpDIyA= github.com/cespare/xxhash/v2 v2.2.0 h1:DC2CZ1Ep5Y4k3ZQ899DldepgrayRUGE6BBZ/cd9Cj44= diff --git a/server/config/config.go b/server/config/config.go index a96e69c75f5bc2e3944160aa86831236a177b71c..2dca4fada1dfb5ce10e2c2cba76693113ebf76a2 100644 --- a/server/config/config.go +++ b/server/config/config.go @@ -9,7 +9,7 @@ import ( "strings" "time" - "github.com/caarlos0/env/v7" + "github.com/caarlos0/env/v8" "github.com/charmbracelet/log" "github.com/charmbracelet/soft-serve/server/backend" "golang.org/x/crypto/ssh" @@ -158,7 +158,7 @@ func parseConfig(path string) (*Config, error) { initialAdminKeys := append([]string{}, cfg.InitialAdminKeys...) // Override with environment variables - if err := env.Parse(cfg, env.Options{ + if err := env.ParseWithOptions(cfg, env.Options{ Prefix: "SOFT_SERVE_", }); err != nil { return cfg, fmt.Errorf("parse environment variables: %w", err)