From 49cd761bf62851a62f4f61b2e610b7f66cef0059 Mon Sep 17 00:00:00 2001
From: Kristoffer Dalby <kradalby@kradalby.no>
Date: Tue, 1 Mar 2022 16:34:35 +0000
Subject: [PATCH] Use new machine types in tests
---
acls_test.go | 132 ++++++++++++++++++++++++++++++------------------
cli_test.go | 3 --
machine_test.go | 16 +-----
routes_test.go | 11 +---
4 files changed, 87 insertions(+), 75 deletions(-)
diff --git a/acls_test.go b/acls_test.go
index 9f0432a..b06255a 100644
--- a/acls_test.go
+++ b/acls_test.go
@@ -6,7 +6,6 @@ import (
"testing"
"gopkg.in/check.v1"
- "gorm.io/datatypes"
"inet.af/netaddr"
"tailscale.com/tailcfg"
)
@@ -108,9 +107,12 @@ func (s *Suite) TestValidExpandTagOwnersInUsers(c *check.C) {
_, err = app.GetMachine("user1", "testmachine")
c.Assert(err, check.NotNil)
- hostInfo := []byte(
- "{\"OS\":\"centos\",\"Hostname\":\"testmachine\",\"RequestTags\":[\"tag:test\"]}",
- )
+ hostInfo := tailcfg.Hostinfo{
+ OS: "centos",
+ Hostname: "testmachine",
+ RequestTags: []string{"tag:test"},
+ }
+
machine := Machine{
ID: 0,
MachineKey: "foo",
@@ -122,7 +124,7 @@ func (s *Suite) TestValidExpandTagOwnersInUsers(c *check.C) {
Registered: true,
RegisterMethod: RegisterMethodAuthKey,
AuthKeyID: uint(pak.ID),
- HostInfo: datatypes.JSON(hostInfo),
+ HostInfo: HostInfo(hostInfo),
}
app.db.Save(&machine)
@@ -152,9 +154,12 @@ func (s *Suite) TestValidExpandTagOwnersInPorts(c *check.C) {
_, err = app.GetMachine("user1", "testmachine")
c.Assert(err, check.NotNil)
- hostInfo := []byte(
- "{\"OS\":\"centos\",\"Hostname\":\"testmachine\",\"RequestTags\":[\"tag:test\"]}",
- )
+ hostInfo := tailcfg.Hostinfo{
+ OS: "centos",
+ Hostname: "testmachine",
+ RequestTags: []string{"tag:test"},
+ }
+
machine := Machine{
ID: 1,
MachineKey: "12345",
@@ -166,7 +171,7 @@ func (s *Suite) TestValidExpandTagOwnersInPorts(c *check.C) {
Registered: true,
RegisterMethod: RegisterMethodAuthKey,
AuthKeyID: uint(pak.ID),
- HostInfo: datatypes.JSON(hostInfo),
+ HostInfo: HostInfo(hostInfo),
}
app.db.Save(&machine)
@@ -196,9 +201,12 @@ func (s *Suite) TestInvalidTagValidNamespace(c *check.C) {
_, err = app.GetMachine("user1", "testmachine")
c.Assert(err, check.NotNil)
- hostInfo := []byte(
- "{\"OS\":\"centos\",\"Hostname\":\"testmachine\",\"RequestTags\":[\"tag:foo\"]}",
- )
+ hostInfo := tailcfg.Hostinfo{
+ OS: "centos",
+ Hostname: "testmachine",
+ RequestTags: []string{"tag:foo"},
+ }
+
machine := Machine{
ID: 1,
MachineKey: "12345",
@@ -210,7 +218,7 @@ func (s *Suite) TestInvalidTagValidNamespace(c *check.C) {
Registered: true,
RegisterMethod: RegisterMethodAuthKey,
AuthKeyID: uint(pak.ID),
- HostInfo: datatypes.JSON(hostInfo),
+ HostInfo: HostInfo(hostInfo),
}
app.db.Save(&machine)
@@ -239,9 +247,12 @@ func (s *Suite) TestValidTagInvalidNamespace(c *check.C) {
_, err = app.GetMachine("user1", "webserver")
c.Assert(err, check.NotNil)
- hostInfo := []byte(
- "{\"OS\":\"centos\",\"Hostname\":\"webserver\",\"RequestTags\":[\"tag:webapp\"]}",
- )
+ hostInfo := tailcfg.Hostinfo{
+ OS: "centos",
+ Hostname: "webserver",
+ RequestTags: []string{"tag:webapp"},
+ }
+
machine := Machine{
ID: 1,
MachineKey: "12345",
@@ -253,11 +264,14 @@ func (s *Suite) TestValidTagInvalidNamespace(c *check.C) {
Registered: true,
RegisterMethod: RegisterMethodAuthKey,
AuthKeyID: uint(pak.ID),
- HostInfo: datatypes.JSON(hostInfo),
+ HostInfo: HostInfo(hostInfo),
}
app.db.Save(&machine)
_, err = app.GetMachine("user1", "user")
- hostInfo = []byte("{\"OS\":\"debian\",\"Hostname\":\"user\"}")
+ hostInfo2 := tailcfg.Hostinfo{
+ OS: "debian",
+ Hostname: "Hostname",
+ }
c.Assert(err, check.NotNil)
machine = Machine{
ID: 2,
@@ -270,7 +284,7 @@ func (s *Suite) TestValidTagInvalidNamespace(c *check.C) {
Registered: true,
RegisterMethod: RegisterMethodAuthKey,
AuthKeyID: uint(pak.ID),
- HostInfo: datatypes.JSON(hostInfo),
+ HostInfo: HostInfo(hostInfo2),
}
app.db.Save(&machine)
@@ -872,18 +886,22 @@ func Test_expandAlias(t *testing.T) {
netaddr.MustParseIP("100.64.0.1"),
},
Namespace: Namespace{Name: "joe"},
- HostInfo: []byte(
- "{\"OS\":\"centos\",\"Hostname\":\"foo\",\"RequestTags\":[\"tag:hr-webserver\"]}",
- ),
+ HostInfo: HostInfo{
+ OS: "centos",
+ Hostname: "foo",
+ RequestTags: []string{"tag:hr-webserver"},
+ },
},
{
IPAddresses: MachineAddresses{
netaddr.MustParseIP("100.64.0.2"),
},
Namespace: Namespace{Name: "joe"},
- HostInfo: []byte(
- "{\"OS\":\"centos\",\"Hostname\":\"foo\",\"RequestTags\":[\"tag:hr-webserver\"]}",
- ),
+ HostInfo: HostInfo{
+ OS: "centos",
+ Hostname: "foo",
+ RequestTags: []string{"tag:hr-webserver"},
+ },
},
{
IPAddresses: MachineAddresses{
@@ -955,18 +973,22 @@ func Test_expandAlias(t *testing.T) {
netaddr.MustParseIP("100.64.0.1"),
},
Namespace: Namespace{Name: "joe"},
- HostInfo: []byte(
- "{\"OS\":\"centos\",\"Hostname\":\"foo\",\"RequestTags\":[\"tag:accountant-webserver\"]}",
- ),
+ HostInfo: HostInfo{
+ OS: "centos",
+ Hostname: "foo",
+ RequestTags: []string{"tag:accountant-webserver"},
+ },
},
{
IPAddresses: MachineAddresses{
netaddr.MustParseIP("100.64.0.2"),
},
Namespace: Namespace{Name: "joe"},
- HostInfo: []byte(
- "{\"OS\":\"centos\",\"Hostname\":\"foo\",\"RequestTags\":[\"tag:accountant-webserver\"]}",
- ),
+ HostInfo: HostInfo{
+ OS: "centos",
+ Hostname: "foo",
+ RequestTags: []string{"tag:accountant-webserver"},
+ },
},
{
IPAddresses: MachineAddresses{
@@ -1032,18 +1054,22 @@ func Test_excludeCorrectlyTaggedNodes(t *testing.T) {
netaddr.MustParseIP("100.64.0.1"),
},
Namespace: Namespace{Name: "joe"},
- HostInfo: []byte(
- "{\"OS\":\"centos\",\"Hostname\":\"foo\",\"RequestTags\":[\"tag:accountant-webserver\"]}",
- ),
+ HostInfo: HostInfo{
+ OS: "centos",
+ Hostname: "foo",
+ RequestTags: []string{"tag:accountant-webserver"},
+ },
},
{
IPAddresses: MachineAddresses{
netaddr.MustParseIP("100.64.0.2"),
},
Namespace: Namespace{Name: "joe"},
- HostInfo: []byte(
- "{\"OS\":\"centos\",\"Hostname\":\"foo\",\"RequestTags\":[\"tag:accountant-webserver\"]}",
- ),
+ HostInfo: HostInfo{
+ OS: "centos",
+ Hostname: "foo",
+ RequestTags: []string{"tag:accountant-webserver"},
+ },
},
{
IPAddresses: MachineAddresses{
@@ -1074,18 +1100,22 @@ func Test_excludeCorrectlyTaggedNodes(t *testing.T) {
netaddr.MustParseIP("100.64.0.1"),
},
Namespace: Namespace{Name: "joe"},
- HostInfo: []byte(
- "{\"OS\":\"centos\",\"Hostname\":\"hr-web1\",\"RequestTags\":[\"tag:hr-webserver\"]}",
- ),
+ HostInfo: HostInfo{
+ OS: "centos",
+ Hostname: "hr-web1",
+ RequestTags: []string{"tag:hr-webserver"},
+ },
},
{
IPAddresses: MachineAddresses{
netaddr.MustParseIP("100.64.0.2"),
},
Namespace: Namespace{Name: "joe"},
- HostInfo: []byte(
- "{\"OS\":\"centos\",\"Hostname\":\"hr-web2\",\"RequestTags\":[\"tag:hr-webserver\"]}",
- ),
+ HostInfo: HostInfo{
+ OS: "centos",
+ Hostname: "hr-web2",
+ RequestTags: []string{"tag:hr-webserver"},
+ },
},
{
IPAddresses: MachineAddresses{
@@ -1102,18 +1132,22 @@ func Test_excludeCorrectlyTaggedNodes(t *testing.T) {
netaddr.MustParseIP("100.64.0.1"),
},
Namespace: Namespace{Name: "joe"},
- HostInfo: []byte(
- "{\"OS\":\"centos\",\"Hostname\":\"hr-web1\",\"RequestTags\":[\"tag:hr-webserver\"]}",
- ),
+ HostInfo: HostInfo{
+ OS: "centos",
+ Hostname: "hr-web1",
+ RequestTags: []string{"tag:hr-webserver"},
+ },
},
{
IPAddresses: MachineAddresses{
netaddr.MustParseIP("100.64.0.2"),
},
Namespace: Namespace{Name: "joe"},
- HostInfo: []byte(
- "{\"OS\":\"centos\",\"Hostname\":\"hr-web2\",\"RequestTags\":[\"tag:hr-webserver\"]}",
- ),
+ HostInfo: HostInfo{
+ OS: "centos",
+ Hostname: "hr-web2",
+ RequestTags: []string{"tag:hr-webserver"},
+ },
},
{
IPAddresses: MachineAddresses{
diff --git a/cli_test.go b/cli_test.go
index 71f2bea..ab98167 100644
--- a/cli_test.go
+++ b/cli_test.go
@@ -35,7 +35,4 @@ func (s *Suite) TestRegisterMachine(c *check.C) {
)
c.Assert(err, check.IsNil)
c.Assert(machineAfterRegistering.Registered, check.Equals, true)
-
- _, err = machineAfterRegistering.GetHostInfo()
- c.Assert(err, check.IsNil)
}
diff --git a/machine_test.go b/machine_test.go
index e9c91f8..e20308f 100644
--- a/machine_test.go
+++ b/machine_test.go
@@ -35,10 +35,7 @@ func (s *Suite) TestGetMachine(c *check.C) {
}
app.db.Save(machine)
- machineFromDB, err := app.GetMachine("test", "testmachine")
- c.Assert(err, check.IsNil)
-
- _, err = machineFromDB.GetHostInfo()
+ _, err = app.GetMachine("test", "testmachine")
c.Assert(err, check.IsNil)
}
@@ -65,10 +62,7 @@ func (s *Suite) TestGetMachineByID(c *check.C) {
}
app.db.Save(&machine)
- machineByID, err := app.GetMachineByID(0)
- c.Assert(err, check.IsNil)
-
- _, err = machineByID.GetHostInfo()
+ _, err = app.GetMachineByID(0)
c.Assert(err, check.IsNil)
}
@@ -146,9 +140,6 @@ func (s *Suite) TestListPeers(c *check.C) {
machine0ByID, err := app.GetMachineByID(0)
c.Assert(err, check.IsNil)
- _, err = machine0ByID.GetHostInfo()
- c.Assert(err, check.IsNil)
-
peersOfMachine0, err := app.ListPeers(machine0ByID)
c.Assert(err, check.IsNil)
@@ -219,9 +210,6 @@ func (s *Suite) TestGetACLFilteredPeers(c *check.C) {
c.Logf("Machine(%v), namespace: %v", testMachine.Name, testMachine.Namespace)
c.Assert(err, check.IsNil)
- _, err = testMachine.GetHostInfo()
- c.Assert(err, check.IsNil)
-
machines, err := app.ListMachines()
c.Assert(err, check.IsNil)
diff --git a/routes_test.go b/routes_test.go
index 94bda45..87fc079 100644
--- a/routes_test.go
+++ b/routes_test.go
@@ -1,10 +1,7 @@
package headscale
import (
- "encoding/json"
-
"gopkg.in/check.v1"
- "gorm.io/datatypes"
"inet.af/netaddr"
"tailscale.com/tailcfg"
)
@@ -25,8 +22,6 @@ func (s *Suite) TestGetRoutes(c *check.C) {
hostInfo := tailcfg.Hostinfo{
RoutableIPs: []netaddr.IPPrefix{route},
}
- hostinfo, err := json.Marshal(hostInfo)
- c.Assert(err, check.IsNil)
machine := Machine{
ID: 0,
@@ -38,7 +33,7 @@ func (s *Suite) TestGetRoutes(c *check.C) {
Registered: true,
RegisterMethod: RegisterMethodAuthKey,
AuthKeyID: uint(pak.ID),
- HostInfo: datatypes.JSON(hostinfo),
+ HostInfo: HostInfo(hostInfo),
}
app.db.Save(&machine)
@@ -79,8 +74,6 @@ func (s *Suite) TestGetEnableRoutes(c *check.C) {
hostInfo := tailcfg.Hostinfo{
RoutableIPs: []netaddr.IPPrefix{route, route2},
}
- hostinfo, err := json.Marshal(hostInfo)
- c.Assert(err, check.IsNil)
machine := Machine{
ID: 0,
@@ -92,7 +85,7 @@ func (s *Suite) TestGetEnableRoutes(c *check.C) {
Registered: true,
RegisterMethod: RegisterMethodAuthKey,
AuthKeyID: uint(pak.ID),
- HostInfo: datatypes.JSON(hostinfo),
+ HostInfo: HostInfo(hostInfo),
}
app.db.Save(&machine)