Mirrors/juanfont.headscale
1
0
Fork 0
mirror of https://github.com/juanfont/headscale.git synced 2024-10-17 20:05:55 +02:00
Code Issues Projects Releases Wiki Activity

correctly update machine namespace

Browse Source
This commit is contained in:
Igor Perepilitsyn 2022-05-02 13:47:21 +04:00
parent 1b3a7bbf03
commit 6ba68d150c
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
namespaces.go
View File

@ -177,8 +177,10 @@ func (h *Headscale) SetMachineNamespace(machine *Machine, namespaceName string)
if err != nil { if err != nil {
return err return err
} }
machine.NamespaceID = namespace.ID machine.Namespace = *namespace
h.db.Save(&machine) if result := h.db.Save(&machine); result.Error != nil {
return result.Error
}
return nil return nil
} }

2
namespaces_test.go
View File

@ -399,6 +399,7 @@ func (s *Suite) TestSetMachineNamespace(c *check.C) {
err = app.SetMachineNamespace(&machine, newNamespace.Name) err = app.SetMachineNamespace(&machine, newNamespace.Name)
c.Assert(err, check.IsNil) c.Assert(err, check.IsNil)
c.Assert(machine.NamespaceID, check.Equals, newNamespace.ID) c.Assert(machine.NamespaceID, check.Equals, newNamespace.ID)
c.Assert(machine.Namespace.Name, check.Equals, newNamespace.Name)
err = app.SetMachineNamespace(&machine, "non-existing-namespace") err = app.SetMachineNamespace(&machine, "non-existing-namespace")
c.Assert(err, check.Equals, errNamespaceNotFound) c.Assert(err, check.Equals, errNamespaceNotFound)
@ -406,4 +407,5 @@ func (s *Suite) TestSetMachineNamespace(c *check.C) {
err = app.SetMachineNamespace(&machine, newNamespace.Name) err = app.SetMachineNamespace(&machine, newNamespace.Name)
c.Assert(err, check.IsNil) c.Assert(err, check.IsNil)
c.Assert(machine.NamespaceID, check.Equals, newNamespace.ID) c.Assert(machine.NamespaceID, check.Equals, newNamespace.ID)
c.Assert(machine.Namespace.Name, check.Equals, newNamespace.Name)
} }