Skip to content

chore: update to slog v3 #31

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
spikecurtis merged 1 commit into from
Jan 5, 2026
Merged

chore: update to slog v3 #31

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions cmd/tunnel/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down
4 changes: 2 additions & 2 deletions cmd/tunneld/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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=
Expand Down
2 changes: 1 addition & 1 deletion tunneld/httpmw/ratelimit.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down
2 changes: 1 addition & 1 deletion tunneld/options.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
2 changes: 1 addition & 1 deletion tunneld/tunneld_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down
2 changes: 1 addition & 1 deletion tunnelsdk/tunnel.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading