From 1994f50fe8c3bfc7a5904735c54d57604a728488 Mon Sep 17 00:00:00 2001 From: Kristoffer Dalby Date: Tue, 25 Aug 2026 09:43:56 +0000 Subject: [PATCH] policy/v2: drop elided struct types in test users Promoted field keys let the literals skip the embedded gorm.Model. --- hscontrol/policy/v2/types_test.go | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/hscontrol/policy/v2/types_test.go b/hscontrol/policy/v2/types_test.go index 5a9530d8f..c457c94aa 100644 --- a/hscontrol/policy/v2/types_test.go +++ b/hscontrol/policy/v2/types_test.go @@ -16,7 +16,6 @@ import ( "github.com/stretchr/testify/require" "go4.org/netipx" xmaps "golang.org/x/exp/maps" - "gorm.io/gorm" "tailscale.com/net/tsaddr" "tailscale.com/tailcfg" ) @@ -2359,12 +2358,12 @@ func p(pref string) Prefix { return Prefix(mp(pref)) } func TestResolvePolicy(t *testing.T) { users := map[string]types.User{ - "testuser": {Model: gorm.Model{ID: 1}, Name: "testuser"}, - "groupuser": {Model: gorm.Model{ID: 2}, Name: "groupuser"}, - "groupuser1": {Model: gorm.Model{ID: 3}, Name: "groupuser1"}, - "groupuser2": {Model: gorm.Model{ID: 4}, Name: "groupuser2"}, - "notme": {Model: gorm.Model{ID: 5}, Name: "notme"}, - "testuser2": {Model: gorm.Model{ID: 6}, Name: "testuser2"}, + "testuser": {ID: 1, Name: "testuser"}, + "groupuser": {ID: 2, Name: "groupuser"}, + "groupuser1": {ID: 3, Name: "groupuser1"}, + "groupuser2": {ID: 4, Name: "groupuser2"}, + "notme": {ID: 5, Name: "notme"}, + "testuser2": {ID: 6, Name: "testuser2"}, } tests := []struct {