From c906aaf9278fd5f9df8551600dfaa57ff557733d Mon Sep 17 00:00:00 2001 From: Juan Font Date: Wed, 17 Apr 2024 22:08:32 +0000 Subject: [PATCH] Allow to remove forced tags of a node Set as empty StringList --- hscontrol/db/node.go | 5 +++++ hscontrol/db/node_test.go | 7 +++++++ 2 files changed, 12 insertions(+) diff --git a/hscontrol/db/node.go b/hscontrol/db/node.go index b397721424..109fd610a9 100644 --- a/hscontrol/db/node.go +++ b/hscontrol/db/node.go @@ -206,6 +206,11 @@ func SetTags( tags []string, ) error { if len(tags) == 0 { + // if no tags are provided, we remove all forced tags + if err := tx.Model(&types.Node{}).Where("id = ?", nodeID).Update("forced_tags", types.StringList{}).Error; err != nil { + return fmt.Errorf("failed to remove tags for node in the database: %w", err) + } + return nil } diff --git a/hscontrol/db/node_test.go b/hscontrol/db/node_test.go index 84116f25b6..9ff022871a 100644 --- a/hscontrol/db/node_test.go +++ b/hscontrol/db/node_test.go @@ -386,6 +386,13 @@ func (s *Suite) TestSetTags(c *check.C) { check.DeepEquals, types.StringList([]string{"tag:bar", "tag:test", "tag:unknown"}), ) + + // test removing tags + err = db.SetTags(node.ID, []string{}) + c.Assert(err, check.IsNil) + node, err = db.getNode("test", "testnode") + c.Assert(err, check.IsNil) + c.Assert(node.ForcedTags, check.DeepEquals, types.StringList([]string{})) } func TestHeadscale_generateGivenName(t *testing.T) {