Mirrors/juanfont.headscale
1
0
Fork 0
mirror of https://github.com/juanfont/headscale.git synced 2024-12-20 19:09:07 +01:00
Code Issues Projects Releases Wiki Activity

feat: update functions to use set command

Browse Source
This commit is contained in:
Adrien Raffin-Caboisse 2022-04-25 21:16:14 +02:00
parent cc9eeda889
commit ea9aaa6022
2 changed files with 18 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
grpcv1.go
View File

@ -3,8 +3,6 @@ package headscale
import (
"context"
"fmt"
"strconv"
"time"
v1 "github.com/juanfont/headscale/gen/go/headscale/v1"
@ -184,35 +182,23 @@ func (api headscaleV1APIServer) GetMachine(
return &v1.GetMachineResponse{Machine: machine.toProto()}, nil
}
func (api headscaleV1APIServer) UpdateMachine(
func (api headscaleV1APIServer) SetTags(
ctx context.Context,
request *v1.UpdateMachineRequest,
) (*v1.UpdateMachineResponse, error) {
rMachine := request.GetMachine()
machine, err := api.h.GetMachineByID(rMachine.Id)
request *v1.SetTagsRequest,
) (*v1.SetTagsResponse, error) {
machine, err := api.h.GetMachineByID(request.GetMachineId())
if err != nil {
return nil, err
}
machine.ForcedTags = rMachine.ForcedTags
machine.Name = rMachine.Name
id, err := strconv.Atoi(rMachine.Namespace.Id)
if err != nil {
return nil, fmt.Errorf("failed to convert namespace id to integer: %w", err)
}
machine.NamespaceID = uint(id)
api.h.SetTags(machine, request.GetTags())
err = api.h.UpdateDBMachine(*machine)
if err != nil {
return nil, err
}
log.Trace().
Str("machine", machine.Name).
Strs("tags", request.GetTags()).
Msg("Changing tags of machine")
machine, err = api.h.GetMachineByID(rMachine.Id)
if err != nil {
return nil, err
}
return &v1.UpdateMachineResponse{Machine: machine.toProto()}, nil
return &v1.SetTagsResponse{Machine: machine.toProto()}, nil
}
func (api headscaleV1APIServer) DeleteMachine(

19
machine.go
View File

@ -360,18 +360,15 @@ func (h *Headscale) UpdateMachine(machine *Machine) error {
return nil
}
// UpdateDBMachine takes a Machine struct pointer (typically already loaded from database
// search for the same machine in the database and update the latter.
func (h *Headscale) UpdateDBMachine(machine Machine) error {
destMachine := Machine{}
if result := h.db.Where("id = ?", machine.ID).Find(&destMachine); result.Error != nil {
return result.Error
// SetTags takes a Machine struct pointer and update the forced tags.
func (h *Headscale) SetTags(machine *Machine, tags []string) error {
machine.ForcedTags = tags
err := h.UpdateACLRules()
if err != nil {
return err
}
destMachine.Name = machine.Name
destMachine.NamespaceID = machine.NamespaceID
destMachine.ForcedTags = machine.ForcedTags
h.db.Save(destMachine)
h.setLastStateChangeToNow(machine.Namespace.Name)
h.db.Save(machine)
return nil
}