extern/netbird
1
0
Fork 0
mirror of https://github.com/netbirdio/netbird.git synced 2025-02-02 19:39:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

remove daemon status from output

Browse Source
This commit is contained in:
Pascal Fischer 2023-02-27 17:12:34 +01:00
parent 23610db727
commit 82059df324
2 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
client/cmd/status.go
View File

@ -57,7 +57,6 @@ type statusOutputOverview struct {
Peers peersStateOutput `json:"peers" yaml:"peers"` Peers peersStateOutput `json:"peers" yaml:"peers"`
CliVersion string `json:"cliVersion" yaml:"cliVersion"` CliVersion string `json:"cliVersion" yaml:"cliVersion"`
DaemonVersion string `json:"daemonVersion" yaml:"daemonVersion"` DaemonVersion string `json:"daemonVersion" yaml:"daemonVersion"`
DaemonStatus string `json:"daemonStatus" yaml:"daemonStatus"`
ManagementState managementStateOutput `json:"management" yaml:"management"` ManagementState managementStateOutput `json:"management" yaml:"management"`
SignalState signalStateOutput `json:"signal" yaml:"signal"` SignalState signalStateOutput `json:"signal" yaml:"signal"`
IP string `json:"netbirdIp" yaml:"netbirdIp"` IP string `json:"netbirdIp" yaml:"netbirdIp"`
@ -212,7 +211,6 @@ func convertToStatusOutputOverview(resp *proto.StatusResponse) statusOutputOverv
Peers: peersOverview, Peers: peersOverview,
CliVersion: system.NetbirdVersion(), CliVersion: system.NetbirdVersion(),
DaemonVersion: resp.GetDaemonVersion(), DaemonVersion: resp.GetDaemonVersion(),
DaemonStatus: resp.GetStatus(),
ManagementState: managementOverview, ManagementState: managementOverview,
SignalState: signalOverview, SignalState: signalOverview,
IP: pbFullStatus.GetLocalPeerState().GetIP(), IP: pbFullStatus.GetLocalPeerState().GetIP(),
@ -340,7 +338,6 @@ func parseGeneralSummary(overview statusOutputOverview, showURL bool) string {
summary := fmt.Sprintf( summary := fmt.Sprintf(
"Daemon version: %s\n"+ "Daemon version: %s\n"+
"CLI version: %s\n"+ "CLI version: %s\n"+
"%s"+ // daemon status
"Management: %s\n"+ "Management: %s\n"+
"Signal: %s\n"+ "Signal: %s\n"+
"FQDN: %s\n"+ "FQDN: %s\n"+
@ -349,7 +346,6 @@ func parseGeneralSummary(overview statusOutputOverview, showURL bool) string {
"Peers count: %s\n", "Peers count: %s\n",
overview.DaemonVersion, overview.DaemonVersion,
system.NetbirdVersion(), system.NetbirdVersion(),
overview.DaemonStatus,
managementConnString, managementConnString,
signalConnString, signalConnString,
overview.FQDN, overview.FQDN,

7
client/cmd/status_test.go
View File

@ -91,7 +91,6 @@ var overview = statusOutputOverview{
}, },
CliVersion: system.NetbirdVersion(), CliVersion: system.NetbirdVersion(),
DaemonVersion: "0.14.1", DaemonVersion: "0.14.1",
DaemonStatus: "Connected",
ManagementState: managementStateOutput{ ManagementState: managementStateOutput{
URL: "my-awesome-management.com:443", URL: "my-awesome-management.com:443",
Connected: true, Connected: true,
@ -191,7 +190,6 @@ func TestParsingToJSON(t *testing.T) {
"}," + "}," +
"\"cliVersion\":\"development\"," + "\"cliVersion\":\"development\"," +
"\"daemonVersion\":\"0.14.1\"," + "\"daemonVersion\":\"0.14.1\"," +
"\"daemonStatus\":\"Connected\"," +
"\"management\":" + "\"management\":" +
"{" + "{" +
"\"url\":\"my-awesome-management.com:443\"," + "\"url\":\"my-awesome-management.com:443\"," +
@ -241,7 +239,6 @@ func TestParsingToYAML(t *testing.T) {
" remote: prflx\n" + " remote: prflx\n" +
"cliVersion: development\n" + "cliVersion: development\n" +
"daemonVersion: 0.14.1\n" + "daemonVersion: 0.14.1\n" +
"daemonStatus: Connected\n" +
"management:\n" + "management:\n" +
" url: my-awesome-management.com:443\n" + " url: my-awesome-management.com:443\n" +
" connected: true\n" + " connected: true\n" +
@ -282,7 +279,7 @@ func TestParsingToDetail(t *testing.T) {
"\n" + "\n" +
"Daemon version: 0.14.1\n" + "Daemon version: 0.14.1\n" +
"CLI version: development\n" + "CLI version: development\n" +
"ConnectedManagement: Connected to my-awesome-management.com:443\n" + "Management: Connected to my-awesome-management.com:443\n" +
"Signal: Connected to my-awesome-signal.com:443\n" + "Signal: Connected to my-awesome-signal.com:443\n" +
"FQDN: some-localhost.awesome-domain.com\n" + "FQDN: some-localhost.awesome-domain.com\n" +
"NetBird IP: 192.168.178.100/16\n" + "NetBird IP: 192.168.178.100/16\n" +
@ -297,7 +294,7 @@ func TestParsingToShortVersion(t *testing.T) {
expectedString := "Daemon version: 0.14.1\n" + expectedString := "Daemon version: 0.14.1\n" +
"CLI version: development\n" + "CLI version: development\n" +
"ConnectedManagement: Connected\n" + "Management: Connected\n" +
"Signal: Connected\n" + "Signal: Connected\n" +
"FQDN: some-localhost.awesome-domain.com\n" + "FQDN: some-localhost.awesome-domain.com\n" +
"NetBird IP: 192.168.178.100/16\n" + "NetBird IP: 192.168.178.100/16\n" +