From 82059df3247d2efff50cf99e92ccd1a46602227c Mon Sep 17 00:00:00 2001
From: Pascal Fischer <pascal@netbird.io>
Date: Mon, 27 Feb 2023 17:12:34 +0100
Subject: [PATCH] remove daemon status from output

---
 client/cmd/status.go      | 4 ----
 client/cmd/status_test.go | 7 ++-----
 2 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/client/cmd/status.go b/client/cmd/status.go
index 44ba24251..5a667e6ee 100644
--- a/client/cmd/status.go
+++ b/client/cmd/status.go
@@ -57,7 +57,6 @@ type statusOutputOverview struct {
 	Peers           peersStateOutput      `json:"peers" yaml:"peers"`
 	CliVersion      string                `json:"cliVersion" yaml:"cliVersion"`
 	DaemonVersion   string                `json:"daemonVersion" yaml:"daemonVersion"`
-	DaemonStatus    string                `json:"daemonStatus" yaml:"daemonStatus"`
 	ManagementState managementStateOutput `json:"management" yaml:"management"`
 	SignalState     signalStateOutput     `json:"signal" yaml:"signal"`
 	IP              string                `json:"netbirdIp" yaml:"netbirdIp"`
@@ -212,7 +211,6 @@ func convertToStatusOutputOverview(resp *proto.StatusResponse) statusOutputOverv
 		Peers:           peersOverview,
 		CliVersion:      system.NetbirdVersion(),
 		DaemonVersion:   resp.GetDaemonVersion(),
-		DaemonStatus:    resp.GetStatus(),
 		ManagementState: managementOverview,
 		SignalState:     signalOverview,
 		IP:              pbFullStatus.GetLocalPeerState().GetIP(),
@@ -340,7 +338,6 @@ func parseGeneralSummary(overview statusOutputOverview, showURL bool) string {
 	summary := fmt.Sprintf(
 		"Daemon version: %s\n"+
 			"CLI version: %s\n"+
-			"%s"+ // daemon status
 			"Management: %s\n"+
 			"Signal: %s\n"+
 			"FQDN: %s\n"+
@@ -349,7 +346,6 @@ func parseGeneralSummary(overview statusOutputOverview, showURL bool) string {
 			"Peers count: %s\n",
 		overview.DaemonVersion,
 		system.NetbirdVersion(),
-		overview.DaemonStatus,
 		managementConnString,
 		signalConnString,
 		overview.FQDN,
diff --git a/client/cmd/status_test.go b/client/cmd/status_test.go
index 348ba537a..d7a71bc3b 100644
--- a/client/cmd/status_test.go
+++ b/client/cmd/status_test.go
@@ -91,7 +91,6 @@ var overview = statusOutputOverview{
 	},
 	CliVersion:    system.NetbirdVersion(),
 	DaemonVersion: "0.14.1",
-	DaemonStatus:  "Connected",
 	ManagementState: managementStateOutput{
 		URL:       "my-awesome-management.com:443",
 		Connected: true,
@@ -191,7 +190,6 @@ func TestParsingToJSON(t *testing.T) {
 		"}," +
 		"\"cliVersion\":\"development\"," +
 		"\"daemonVersion\":\"0.14.1\"," +
-		"\"daemonStatus\":\"Connected\"," +
 		"\"management\":" +
 		"{" +
 		"\"url\":\"my-awesome-management.com:443\"," +
@@ -241,7 +239,6 @@ func TestParsingToYAML(t *testing.T) {
 		"            remote: prflx\n" +
 		"cliVersion: development\n" +
 		"daemonVersion: 0.14.1\n" +
-		"daemonStatus: Connected\n" +
 		"management:\n" +
 		"    url: my-awesome-management.com:443\n" +
 		"    connected: true\n" +
@@ -282,7 +279,7 @@ func TestParsingToDetail(t *testing.T) {
 		"\n" +
 		"Daemon version: 0.14.1\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" +
 		"FQDN: some-localhost.awesome-domain.com\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" +
 		"CLI version: development\n" +
-		"ConnectedManagement: Connected\n" +
+		"Management: Connected\n" +
 		"Signal: Connected\n" +
 		"FQDN: some-localhost.awesome-domain.com\n" +
 		"NetBird IP: 192.168.178.100/16\n" +