@@ -392,7 +392,7 @@ func (h *Headscale) GetMachineByGivenName(namespace string, givenName string) (*
392392// GetMachineByID finds a Machine by ID and returns the Machine struct.
393393func (h * Headscale ) GetMachineByID (id uint64 ) (* Machine , error ) {
394394 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 {
396396 return nil , result .Error
397397 }
398398
@@ -404,7 +404,7 @@ func (h *Headscale) GetMachineByMachineKey(
404404 machineKey key.MachinePublic ,
405405) (* Machine , error ) {
406406 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 {
408408 return nil , result .Error
409409 }
410410
@@ -416,7 +416,7 @@ func (h *Headscale) GetMachineByNodeKey(
416416 nodeKey key.NodePublic ,
417417) (* Machine , error ) {
418418 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 = ?" ,
420420 NodePublicKeyStripPrefix (nodeKey )); result .Error != nil {
421421 return nil , result .Error
422422 }
@@ -429,7 +429,7 @@ func (h *Headscale) GetMachineByAnyKey(
429429 machineKey key.MachinePublic , nodeKey key.NodePublic , oldNodeKey key.NodePublic ,
430430) (* Machine , error ) {
431431 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 = ?" ,
433433 MachinePublicKeyStripPrefix (machineKey ),
434434 NodePublicKeyStripPrefix (nodeKey ),
435435 NodePublicKeyStripPrefix (oldNodeKey )); result .Error != nil {
0 commit comments