@@ -392,7 +392,7 @@ func (h *Headscale) GetMachineByGivenName(namespace string, givenName string) (*
392
392
// GetMachineByID finds a Machine by ID and returns the Machine struct.
393
393
func (h * Headscale ) GetMachineByID (id uint64 ) (* Machine , error ) {
394
394
m := Machine {}
395
- if result := h .db .Preload ("Namespace" ).Find (& Machine {ID : id }).First (& m ); result .Error != nil {
395
+ if result := h .db .Preload ("AuthKey" ). Preload ( " Namespace" ).Find (& Machine {ID : id }).First (& m ); result .Error != nil {
396
396
return nil , result .Error
397
397
}
398
398
@@ -404,7 +404,7 @@ func (h *Headscale) GetMachineByMachineKey(
404
404
machineKey key.MachinePublic ,
405
405
) (* Machine , error ) {
406
406
m := Machine {}
407
- if result := h .db .Preload ("Namespace" ).First (& m , "machine_key = ?" , MachinePublicKeyStripPrefix (machineKey )); result .Error != nil {
407
+ if result := h .db .Preload ("AuthKey" ). Preload ( " Namespace" ).First (& m , "machine_key = ?" , MachinePublicKeyStripPrefix (machineKey )); result .Error != nil {
408
408
return nil , result .Error
409
409
}
410
410
@@ -416,7 +416,7 @@ func (h *Headscale) GetMachineByNodeKey(
416
416
nodeKey key.NodePublic ,
417
417
) (* Machine , error ) {
418
418
machine := Machine {}
419
- if result := h .db .Preload ("Namespace" ).First (& machine , "node_key = ?" ,
419
+ if result := h .db .Preload ("AuthKey" ). Preload ( " Namespace" ).First (& machine , "node_key = ?" ,
420
420
NodePublicKeyStripPrefix (nodeKey )); result .Error != nil {
421
421
return nil , result .Error
422
422
}
@@ -429,7 +429,7 @@ func (h *Headscale) GetMachineByAnyKey(
429
429
machineKey key.MachinePublic , nodeKey key.NodePublic , oldNodeKey key.NodePublic ,
430
430
) (* Machine , error ) {
431
431
machine := Machine {}
432
- if result := h .db .Preload ("Namespace" ).First (& machine , "machine_key = ? OR node_key = ? OR node_key = ?" ,
432
+ if result := h .db .Preload ("AuthKey" ). Preload ( " Namespace" ).First (& machine , "machine_key = ? OR node_key = ? OR node_key = ?" ,
433
433
MachinePublicKeyStripPrefix (machineKey ),
434
434
NodePublicKeyStripPrefix (nodeKey ),
435
435
NodePublicKeyStripPrefix (oldNodeKey )); result .Error != nil {
0 commit comments