removing status line from output if empty

ernestio · Mar 29, 2017 · 610bce8 · 610bce8
1 parent 18e5546
commit 610bce8
Show file tree

Hide file tree

Showing 9 changed files with 27 additions and 9 deletions.
diff --git a/c_ebs_volume.go b/c_ebs_volume.go
@@ -45,7 +45,9 @@ func (n *EBSVolume) getSingleDetail(c component, prefix string) (lines []Message
 	if id != "" {
 		lines = append(lines, Message{Body: "   AWS ID : " + id, Level: ""})
 	}
-	lines = append(lines, Message{Body: "   Status : " + status, Level: ""})
+	if status != "" {
+		lines = append(lines, Message{Body: "   Status : " + status, Level: ""})
+	}
 	if status == "errored" {
 		err, _ := c["error"].(string)
 		lines = append(lines, Message{Body: "   Error     : " + err, Level: ""})

diff --git a/c_elb.go b/c_elb.go
@@ -43,7 +43,9 @@ func (n *ELB) getSingleDetail(c component, prefix string) (lines []Message) {
 		return lines
 	}
 	lines = append(lines, Message{Body: " " + name, Level: level})
-	lines = append(lines, Message{Body: "   Status    : " + status, Level: ""})
+	if status != "" {
+		lines = append(lines, Message{Body: "   Status    : " + status, Level: ""})
+	}
 	if c["dns_name"] != nil {
 		dnsName, _ := c["dns_name"].(string)
 		if dnsName != "" {

diff --git a/c_firewall.go b/c_firewall.go
@@ -43,7 +43,9 @@ func (n *Firewall) getSingleDetail(c component, prefix string) (lines []Message)
 		return lines
 	}
 	lines = append(lines, Message{Body: " " + name, Level: level})
-	lines = append(lines, Message{Body: "   Status    : " + status, Level: ""})
+	if status != "" {
+		lines = append(lines, Message{Body: "   Status    : " + status, Level: ""})
+	}
 	if status == "errored" {
 		err, _ := c["error"].(string)
 		lines = append(lines, Message{Body: "   Error     : " + err, Level: ""})

diff --git a/c_instance.go b/c_instance.go
@@ -53,7 +53,9 @@ func (n *Instance) getSingleDetail(c component, prefix string) (lines []Message)
 	if id != "" {
 		lines = append(lines, Message{Body: "   AWS ID    : " + id, Level: ""})
 	}
-	lines = append(lines, Message{Body: "   Status    : " + status, Level: ""})
+	if status != "" {
+		lines = append(lines, Message{Body: "   Status    : " + status, Level: ""})
+	}
 	if status == "errored" {
 		err, _ := c["error"].(string)
 		lines = append(lines, Message{Body: "   Error     : " + err, Level: ""})

diff --git a/c_nat.go b/c_nat.go
@@ -43,7 +43,9 @@ func (n *Nat) getSingleDetail(c component, prefix string) (lines []Message) {
 		return lines
 	}
 	lines = append(lines, Message{Body: " " + name, Level: level})
-	lines = append(lines, Message{Body: "   Status    : " + status, Level: ""})
+	if status != "" {
+		lines = append(lines, Message{Body: "   Status    : " + status, Level: ""})
+	}
 	if status == "errored" {
 		err, _ := c["error"].(string)
 		lines = append(lines, Message{Body: "   Error     : " + err, Level: ""})

diff --git a/c_network.go b/c_network.go
@@ -47,7 +47,9 @@ func (n *Network) getSingleDetail(c component, prefix string) (lines []Message)
 	if id != "" {
 		lines = append(lines, Message{Body: "   AWS ID : " + id, Level: ""})
 	}
-	lines = append(lines, Message{Body: "   Status : " + status, Level: ""})
+	if status != "" {
+		lines = append(lines, Message{Body: "   Status : " + status, Level: ""})
+	}
 	if status == "errored" {
 		err, _ := c["error"].(string)
 		lines = append(lines, Message{Body: "   Error     : " + err, Level: ""})

diff --git a/c_router.go b/c_router.go
@@ -36,7 +36,9 @@ func (n *Router) getSingleDetail(c component, prefix string) (lines []Message) {
 		return lines
 	}
 	lines = append(lines, Message{Body: " " + name, Level: level})
-	lines = append(lines, Message{Body: "   Status    : " + status, Level: ""})
+	if status != "" {
+		lines = append(lines, Message{Body: "   Status    : " + status, Level: ""})
+	}
 	if status == "errored" {
 		err, _ := c["error"].(string)
 		lines = append(lines, Message{Body: "   Error     : " + err, Level: ""})

diff --git a/c_s3.go b/c_s3.go
@@ -48,7 +48,9 @@ func (n *S3Bucket) getSingleDetail(c component, prefix string) (lines []Message)
 	}
 	lines = append(lines, Message{Body: " " + name, Level: level})
 	lines = append(lines, Message{Body: "   ACL       : " + acl, Level: ""})
-	lines = append(lines, Message{Body: "   Status    : " + status, Level: ""})
+	if status != "" {
+		lines = append(lines, Message{Body: "   Status    : " + status, Level: ""})
+	}
 	if status == "errored" {
 		err, _ := c["error"].(string)
 		lines = append(lines, Message{Body: "   Error     : " + err, Level: ""})

diff --git a/c_vpc.go b/c_vpc.go
@@ -45,7 +45,9 @@ func (n *Vpc) getSingleDetail(c component, prefix string) (lines []Message) {
 	}
 	lines = append(lines, Message{Body: " " + id, Level: level})
 	lines = append(lines, Message{Body: "   Subnet    : " + subnet, Level: ""})
-	lines = append(lines, Message{Body: "   Status    : " + status, Level: ""})
+	if status != "" {
+		lines = append(lines, Message{Body: "   Status    : " + status, Level: ""})
+	}
 	if status == "errored" {
 		err, _ := c["error"].(string)
 		lines = append(lines, Message{Body: "   Error     : " + err, Level: ""})