diff --git a/cmd/tunnel/main.go b/cmd/tunnel/main.go index 4346bae..86f9fc9 100644 --- a/cmd/tunnel/main.go +++ b/cmd/tunnel/main.go @@ -14,8 +14,8 @@ import ( "github.com/urfave/cli/v2" "golang.org/x/xerrors" - "cdr.dev/slog" - "cdr.dev/slog/sloggers/sloghuman" + "cdr.dev/slog/v3" + "cdr.dev/slog/v3/sloggers/sloghuman" "github.com/coder/wgtunnel/buildinfo" "github.com/coder/wgtunnel/tunnelsdk" ) diff --git a/cmd/tunneld/main.go b/cmd/tunneld/main.go index 6fd294e..f179069 100644 --- a/cmd/tunneld/main.go +++ b/cmd/tunneld/main.go @@ -21,8 +21,8 @@ import ( "golang.org/x/sync/errgroup" "golang.org/x/xerrors" - "cdr.dev/slog" - "cdr.dev/slog/sloggers/sloghuman" + "cdr.dev/slog/v3" + "cdr.dev/slog/v3/sloggers/sloghuman" "github.com/coder/wgtunnel/buildinfo" "github.com/coder/wgtunnel/tunneld" "github.com/coder/wgtunnel/tunnelsdk" diff --git a/go.mod b/go.mod index 4030273..71bf343 100644 --- a/go.mod +++ b/go.mod @@ -5,7 +5,7 @@ go 1.20 replace github.com/tailscale/wireguard-go => github.com/coder/wireguard-go v0.0.0-20240502122727-a4cb23ac736d require ( - cdr.dev/slog v1.6.2-0.20230901043036-3e17d6de9749 + cdr.dev/slog/v3 v3.0.0-rc1 github.com/go-chi/chi/v5 v5.0.10 github.com/go-chi/hostrouter v0.2.0 github.com/go-chi/httprate v0.7.4 diff --git a/go.sum b/go.sum index 6d384e6..16e8afc 100644 --- a/go.sum +++ b/go.sum @@ -1,5 +1,5 @@ -cdr.dev/slog v1.6.2-0.20230901043036-3e17d6de9749 h1:KGTttdvivQTsOJMbkjAHD8QhERoje0egSZn7hLvHdio= -cdr.dev/slog v1.6.2-0.20230901043036-3e17d6de9749/go.mod h1:NaoTA7KwopCrnaSb0JXTC0PTp/O/Y83Lndnq0OEV3ZQ= +cdr.dev/slog/v3 v3.0.0-rc1 h1:EN7Zim6GvTpAeHQjI0ERDEfqKbTyXRvgH4UhlzLpvWM= +cdr.dev/slog/v3 v3.0.0-rc1/go.mod h1:iO/OALX1VxlI03mkodCGdVP7pXzd2bRMvu3ePvlJ9ak= cloud.google.com/go/compute v1.23.0 h1:tP41Zoavr8ptEqaW6j+LQOnyBBhO7OkOMAGrgLopTwY= cloud.google.com/go/compute/metadata v0.2.3 h1:mg4jlk7mCAj6xXp9UJ4fjI9VUI5rubuGBW5aJ7UnBMY= cloud.google.com/go/logging v1.8.1 h1:26skQWPeYhvIasWKm48+Eq7oUqdcdbwsCVwz5Ys0FvU= diff --git a/tunneld/httpmw/ratelimit.go b/tunneld/httpmw/ratelimit.go index dccce65..3e0579c 100644 --- a/tunneld/httpmw/ratelimit.go +++ b/tunneld/httpmw/ratelimit.go @@ -10,7 +10,7 @@ import ( "github.com/go-chi/httprate" - "cdr.dev/slog" + "cdr.dev/slog/v3" "github.com/coder/wgtunnel/tunneld/httpapi" "github.com/coder/wgtunnel/tunnelsdk" ) diff --git a/tunneld/options.go b/tunneld/options.go index 4d1a2a2..e67ac20 100644 --- a/tunneld/options.go +++ b/tunneld/options.go @@ -14,7 +14,7 @@ import ( "github.com/tailscale/wireguard-go/device" "golang.org/x/xerrors" - "cdr.dev/slog" + "cdr.dev/slog/v3" "github.com/coder/wgtunnel/tunnelsdk" ) diff --git a/tunneld/tunneld_test.go b/tunneld/tunneld_test.go index dd66bd6..7f7da16 100644 --- a/tunneld/tunneld_test.go +++ b/tunneld/tunneld_test.go @@ -19,7 +19,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "cdr.dev/slog/sloggers/slogtest" + "cdr.dev/slog/v3/sloggers/slogtest" "github.com/coder/wgtunnel/tunneld" "github.com/coder/wgtunnel/tunnelsdk" ) diff --git a/tunnelsdk/tunnel.go b/tunnelsdk/tunnel.go index c0ce3e5..ffa3024 100644 --- a/tunnelsdk/tunnel.go +++ b/tunnelsdk/tunnel.go @@ -19,7 +19,7 @@ import ( "golang.org/x/xerrors" "golang.zx2c4.com/wireguard/wgctrl/wgtypes" - "cdr.dev/slog" + "cdr.dev/slog/v3" ) // TunnelPort is the port in the virtual wireguard network stack that the