From 1c6809089f302a5023e0bbc4170f995f9d28813e Mon Sep 17 00:00:00 2001 From: Kristoffer Dalby Date: Tue, 25 Aug 2026 09:43:36 +0000 Subject: [PATCH] hscontrol: use the stdlib uuid package Go 1.27 ships RFC 9562 UUIDs and NewV4 cannot fail, dropping gofrs/uuid and two error paths. --- flakehashes.json | 4 ++-- go.mod | 1 - go.sum | 2 -- hscontrol/platform_config.go | 15 +++------------ 4 files changed, 5 insertions(+), 17 deletions(-) diff --git a/flakehashes.json b/flakehashes.json index f1fc9c570..6ea845440 100644 --- a/flakehashes.json +++ b/flakehashes.json @@ -1,6 +1,6 @@ { "vendor": { - "goModSum": "sha256-c5zqlgQKbVs9Y9FXHkdZh17FqyXPLh/j+XYQj/IPW8k=", - "sri": "sha256-zWcaRben+px9w6NcUPkYfR6DbBJhwdYsXcZ5cm95hmo=" + "goModSum": "sha256-FqwMYiHc0uc873IaVIs6tJ5Dsk7BTWamm7s8FzFzC4U=", + "sri": "sha256-uZ2BZ2xBOb2JMOV/ao74vRlY/7m0Tj1Pu84tc3s0+rE=" } } diff --git a/go.mod b/go.mod index c86f606fc..71ecbbb12 100644 --- a/go.mod +++ b/go.mod @@ -19,7 +19,6 @@ require ( github.com/go-chi/metrics v0.1.1 github.com/go-gormigrate/gormigrate/v2 v2.1.6 github.com/go-json-experiment/json v0.0.0-20260601182631-00ed12fed2a6 - github.com/gofrs/uuid/v5 v5.4.0 github.com/google/go-cmp v0.7.0 github.com/hashicorp/golang-lru/v2 v2.0.7 github.com/jagottsicher/termcolor v1.0.2 diff --git a/go.sum b/go.sum index 12a7fcb89..04eec22a5 100644 --- a/go.sum +++ b/go.sum @@ -223,8 +223,6 @@ github.com/gobwas/pool v0.2.1/go.mod h1:q8bcK0KcYlCgd9e7WYLm9LpyS+YeLd8JVDW6Wezm github.com/gobwas/ws v1.2.1/go.mod h1:hRKAFb8wOxFROYNsT1bqfWnhX+b5MFeJM9r2ZSwg/KY= github.com/godbus/dbus/v5 v5.2.2 h1:TUR3TgtSVDmjiXOgAAyaZbYmIeP3DPkld3jgKGV8mXQ= github.com/godbus/dbus/v5 v5.2.2/go.mod h1:3AAv2+hPq5rdnr5txxxRwiGjPXamgoIHgz9FPBfOp3c= -github.com/gofrs/uuid/v5 v5.4.0 h1:EfbpCTjqMuGyq5ZJwxqzn3Cbr2d0rUZU7v5ycAk/e/0= -github.com/gofrs/uuid/v5 v5.4.0/go.mod h1:CDOjlDMVAtN56jqyRUZh58JT31Tiw7/oQyEXZV+9bD8= github.com/golang-jwt/jwt/v5 v5.3.1 h1:kYf81DTWFe7t+1VvL7eS+jKFVWaUnK9cB1qbwn63YCY= github.com/golang-jwt/jwt/v5 v5.3.1/go.mod h1:fxCRLWMO43lRc8nhHWY6LGqRcf+1gQWArsqaEUEa5bE= github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0 h1:DACJavvAHhabrF08vX0COfcOBJRhZ8lUbR+ZWIs0Y5g= diff --git a/hscontrol/platform_config.go b/hscontrol/platform_config.go index 28a918bce..eac355382 100644 --- a/hscontrol/platform_config.go +++ b/hscontrol/platform_config.go @@ -5,9 +5,9 @@ import ( _ "embed" "net/http" textTemplate "text/template" + "uuid" "github.com/go-chi/chi/v5" - "github.com/gofrs/uuid/v5" "github.com/juanfont/headscale/hscontrol/templates" ) @@ -41,17 +41,8 @@ func (h *Headscale) ApplePlatformConfig( return } - id, err := uuid.NewV4() - if err != nil { - httpError(writer, err) - return - } - - contentID, err := uuid.NewV4() - if err != nil { - httpError(writer, err) - return - } + id := uuid.NewV4() + contentID := uuid.NewV4() platformConfig := AppleMobilePlatformConfig{ UUID: contentID,