[misc, client, management] Replace Wiretrustee with Netbird (#3267)

This commit is contained in:
Viktor Liu
2025-02-05 16:49:41 +01:00
committed by GitHub
parent 0125cd97d8
commit 97d498c59c
36 changed files with 679 additions and 681 deletions
+1 -1
View File
@@ -50,7 +50,7 @@ type Info struct {
OSVersion string
Hostname string
CPUs int
WiretrusteeVersion string
NetbirdVersion string
UIVersion string
KernelVersion string
NetworkAddresses []NetworkAddress
+1 -1
View File
@@ -36,7 +36,7 @@ func GetInfo(ctx context.Context) *Info {
OSVersion: osVersion(),
Hostname: extractDeviceName(ctx, "android"),
CPUs: runtime.NumCPU(),
WiretrusteeVersion: version.NetbirdVersion(),
NetbirdVersion: version.NetbirdVersion(),
UIVersion: extractUIVersion(ctx),
KernelVersion: kernelVersion,
SystemSerialNumber: serial(),
+1 -1
View File
@@ -63,7 +63,7 @@ func GetInfo(ctx context.Context) *Info {
systemHostname, _ := os.Hostname()
gio.Hostname = extractDeviceName(ctx, systemHostname)
gio.WiretrusteeVersion = version.NetbirdVersion()
gio.NetbirdVersion = version.NetbirdVersion()
gio.UIVersion = extractUserAgent(ctx)
return gio
+11 -11
View File
@@ -39,17 +39,17 @@ func GetInfo(ctx context.Context) *Info {
systemHostname, _ := os.Hostname()
return &Info{
GoOS: runtime.GOOS,
Kernel: osInfo[0],
Platform: runtime.GOARCH,
OS: osName,
OSVersion: osVersion,
Hostname: extractDeviceName(ctx, systemHostname),
CPUs: runtime.NumCPU(),
WiretrusteeVersion: version.NetbirdVersion(),
UIVersion: extractUserAgent(ctx),
KernelVersion: osInfo[1],
Environment: env,
GoOS: runtime.GOOS,
Kernel: osInfo[0],
Platform: runtime.GOARCH,
OS: osName,
OSVersion: osVersion,
Hostname: extractDeviceName(ctx, systemHostname),
CPUs: runtime.NumCPU(),
NetbirdVersion: version.NetbirdVersion(),
UIVersion: extractUserAgent(ctx),
KernelVersion: osInfo[1],
Environment: env,
}
}
+1 -1
View File
@@ -19,7 +19,7 @@ func GetInfo(ctx context.Context) *Info {
gio := &Info{Kernel: sysName, OSVersion: swVersion, Platform: "unknown", OS: sysName, GoOS: runtime.GOOS, CPUs: runtime.NumCPU(), KernelVersion: swVersion}
gio.Hostname = extractDeviceName(ctx, "hostname")
gio.WiretrusteeVersion = version.NetbirdVersion()
gio.NetbirdVersion = version.NetbirdVersion()
gio.UIVersion = extractUserAgent(ctx)
return gio
+1 -1
View File
@@ -61,7 +61,7 @@ func GetInfo(ctx context.Context) *Info {
Hostname: extractDeviceName(ctx, systemHostname),
GoOS: runtime.GOOS,
CPUs: runtime.NumCPU(),
WiretrusteeVersion: version.NetbirdVersion(),
NetbirdVersion: version.NetbirdVersion(),
UIVersion: extractUserAgent(ctx),
KernelVersion: osInfo[1],
NetworkAddresses: addrs,
+1 -1
View File
@@ -11,7 +11,7 @@ import (
func Test_LocalWTVersion(t *testing.T) {
got := GetInfo(context.TODO())
want := "development"
assert.Equal(t, want, got.WiretrusteeVersion)
assert.Equal(t, want, got.NetbirdVersion)
}
func Test_UIVersion(t *testing.T) {
+1 -1
View File
@@ -64,7 +64,7 @@ func GetInfo(ctx context.Context) *Info {
systemHostname, _ := os.Hostname()
gio.Hostname = extractDeviceName(ctx, systemHostname)
gio.WiretrusteeVersion = version.NetbirdVersion()
gio.NetbirdVersion = version.NetbirdVersion()
gio.UIVersion = extractUserAgent(ctx)
return gio