rsp2k/headscale
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

all: apply golangci-lint 2.9.0 fixes

Browse source 
Fix issues found by the upgraded golangci-lint:
- wsl_v5: add required whitespace in CLI files
- staticcheck SA4006: replace new(var.Field) with &localVar
  pattern since staticcheck does not recognize Go 1.26
  new(value) as a use of the variable
- staticcheck SA5011: use t.Fatal instead of t.Error for
  nil guard checks so execution stops
- unused: remove dead ptrTo helper function
This commit is contained in:
Kristoffer Dalby 2026-02-16 19:40:02 +00:00
parent 73613d7f53
commit 43afeedde2
15 changed files with 58 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

3
hscontrol/db/node.go
View file

@ -682,6 +682,7 @@ func (hsdb *HSDatabase) CreateNodeForTest(user *types.User, hostname ...string)
panic(fmt.Sprintf("failed to create preauth key for test node: %v", err))
}
pakID := pak.ID
nodeKey := key.NewNode()
machineKey := key.NewMachine()
discoKey := key.NewDisco()
@ -693,7 +694,7 @@ func (hsdb *HSDatabase) CreateNodeForTest(user *types.User, hostname ...string)
Hostname: nodeName,
UserID: &user.ID,
RegisterMethod: util.RegisterMethodAuthKey,
AuthKeyID: new(pak.ID),
AuthKeyID: &pakID,
}
err = hsdb.DB.Save(node).Error

15
hscontrol/db/node_test.go
View file

@ -101,6 +101,8 @@ func TestExpireNode(t *testing.T) {
pak, err := db.CreatePreAuthKey(user.TypedID(), false, false, nil, nil)
require.NoError(t, err)
pakID := pak.ID
_, err = db.getNode(types.UserID(user.ID), "testnode")
require.Error(t, err)
@ -114,7 +116,7 @@ func TestExpireNode(t *testing.T) {
Hostname: "testnode",
UserID: &user.ID,
RegisterMethod: util.RegisterMethodAuthKey,
AuthKeyID: new(pak.ID),
AuthKeyID: &pakID,
Expiry: &time.Time{},
}
db.DB.Save(node)
@ -145,6 +147,8 @@ func TestSetTags(t *testing.T) {
pak, err := db.CreatePreAuthKey(user.TypedID(), false, false, nil, nil)
require.NoError(t, err)
pakID := pak.ID
_, err = db.getNode(types.UserID(user.ID), "testnode")
require.Error(t, err)
@ -158,7 +162,7 @@ func TestSetTags(t *testing.T) {
Hostname: "testnode",
UserID: &user.ID,
RegisterMethod: util.RegisterMethodAuthKey,
AuthKeyID: new(pak.ID),
AuthKeyID: &pakID,
}
trx := db.DB.Save(node)
@ -652,6 +656,9 @@ func TestListEphemeralNodes(t *testing.T) {
pakEph, err := db.CreatePreAuthKey(user.TypedID(), false, true, nil, nil)
require.NoError(t, err)
pakID := pak.ID
pakEphID := pakEph.ID
node := types.Node{
ID: 0,
MachineKey: key.NewMachine().Public(),
@ -659,7 +666,7 @@ func TestListEphemeralNodes(t *testing.T) {
Hostname: "test",
UserID: &user.ID,
RegisterMethod: util.RegisterMethodAuthKey,
AuthKeyID: new(pak.ID),
AuthKeyID: &pakID,
}
nodeEph := types.Node{
@ -669,7 +676,7 @@ func TestListEphemeralNodes(t *testing.T) {
Hostname: "ephemeral",
UserID: &user.ID,
RegisterMethod: util.RegisterMethodAuthKey,
AuthKeyID: new(pakEph.ID),
AuthKeyID: &pakEphID,
}
err = db.DB.Save(&node).Error

4
hscontrol/db/users_test.go
View file

@ -73,12 +73,14 @@ func TestDestroyUserErrors(t *testing.T) {
pak, err := db.CreatePreAuthKey(user.TypedID(), false, false, nil, nil)
require.NoError(t, err)
pakID := pak.ID
node := types.Node{
ID: 0,
Hostname: "testnode",
UserID: &user.ID,
RegisterMethod: util.RegisterMethodAuthKey,
AuthKeyID: new(pak.ID),
AuthKeyID: &pakID,
}
trx := db.DB.Save(&node)
require.NoError(t, trx.Error)