Improve output readability

ernestio · Mar 16, 2017 · 2f6cc99 · 2f6cc99
1 parent fcfa0ec
commit 2f6cc99
Show file tree

Hide file tree

Showing 11 changed files with 66 additions and 22 deletions.
diff --git a/c_ebs_volume.go b/c_ebs_volume.go
@@ -31,15 +31,19 @@ func (n *EBSVolume) getSingleDetail(c component, prefix string) (lines []Message
 		name = prefix + " " + name
 	}
 	status, _ := c["_state"].(string)
-	lines = append(lines, Message{Body: " - " + name, Level: ""})
+	level := "INFO"
+	if status == "errored" {
+		level = "ERROR"
+	}
+	lines = append(lines, Message{Body: " " + name, Level: level})
 	id, _ := c["volume_aws_id"].(string)
 	if id != "" {
 		lines = append(lines, Message{Body: "   AWS ID : " + id, Level: ""})
 	}
 	lines = append(lines, Message{Body: "   Status : " + status, Level: ""})
 	if status == "errored" {
 		err, _ := c["error"].(string)
-		lines = append(lines, Message{Body: "   Error     : " + err, Level: "ERROR"})
+		lines = append(lines, Message{Body: "   Error     : " + err, Level: ""})
 	}
 	return lines
 }
diff --git a/c_elb.go b/c_elb.go
@@ -34,7 +34,11 @@ func (n *ELB) getSingleDetail(c component, prefix string) (lines []Message) {
 		name = prefix + " " + name
 	}
 	status, _ := c["_state"].(string)
-	lines = append(lines, Message{Body: " - " + name, Level: ""})
+	level := "INFO"
+	if status == "errored" {
+		level = "ERROR"
+	}
+	lines = append(lines, Message{Body: " " + name, Level: level})
 	lines = append(lines, Message{Body: "   Status    : " + status, Level: ""})
 	if c["dns_name"] != nil {
 		dnsName, _ := c["dns_name"].(string)
@@ -45,7 +49,7 @@ func (n *ELB) getSingleDetail(c component, prefix string) (lines []Message) {
 	lines = append(lines)
 	if status == "errored" {
 		err, _ := c["error"].(string)
-		lines = append(lines, Message{Body: "   Error     : " + err, Level: "ERROR"})
+		lines = append(lines, Message{Body: "   Error     : " + err, Level: ""})
 	}
 
 	return lines

diff --git a/c_firewall.go b/c_firewall.go
@@ -33,11 +33,15 @@ func (n *Firewall) getSingleDetail(c component, prefix string) (lines []Message)
 		name = prefix + " " + name
 	}
 	status, _ := c["_state"].(string)
-	lines = append(lines, Message{Body: " - " + name, Level: ""})
+	level := "INFO"
+	if status == "errored" {
+		level = "ERROR"
+	}
+	lines = append(lines, Message{Body: " " + name, Level: level})
 	lines = append(lines, Message{Body: "   Status    : " + status, Level: ""})
 	if status == "errored" {
 		err, _ := c["error"].(string)
-		lines = append(lines, Message{Body: "   Error     : " + err, Level: "ERROR"})
+		lines = append(lines, Message{Body: "   Error     : " + err, Level: ""})
 	}
 	return lines
 }
diff --git a/c_instance.go b/c_instance.go
@@ -34,7 +34,11 @@ func (n *Instance) getSingleDetail(c component, prefix string) (lines []Message)
 		name = prefix + " " + name
 	}
 	status, _ := c["_state"].(string)
-	lines = append(lines, Message{Body: " - " + name, Level: ""})
+	level := "INFO"
+	if status == "errored" {
+		level = "ERROR"
+	}
+	lines = append(lines, Message{Body: " " + name, Level: level})
 	lines = append(lines, Message{Body: "   IP        : " + ip, Level: ""})
 	publicIP, _ := c["public_ip"].(string)
 	if publicIP != "" {
@@ -47,7 +51,7 @@ func (n *Instance) getSingleDetail(c component, prefix string) (lines []Message)
 	lines = append(lines, Message{Body: "   Status    : " + status, Level: ""})
 	if status == "errored" {
 		err, _ := c["error"].(string)
-		lines = append(lines, Message{Body: "   Error     : " + err, Level: "ERROR"})
+		lines = append(lines, Message{Body: "   Error     : " + err, Level: ""})
 	}
 	return lines
 }
diff --git a/c_nat.go b/c_nat.go
@@ -33,11 +33,15 @@ func (n *Nat) getSingleDetail(c component, prefix string) (lines []Message) {
 		name = prefix + " " + name
 	}
 	status, _ := c["_state"].(string)
-	lines = append(lines, Message{Body: " - " + name, Level: ""})
+	level := "INFO"
+	if status == "errored" {
+		level = "ERROR"
+	}
+	lines = append(lines, Message{Body: " " + name, Level: level})
 	lines = append(lines, Message{Body: "   Status    : " + status, Level: ""})
 	if status == "errored" {
 		err, _ := c["error"].(string)
-		lines = append(lines, Message{Body: "   Error     : " + err, Level: "ERROR"})
+		lines = append(lines, Message{Body: "   Error     : " + err, Level: ""})
 	}
 	return lines
 }
diff --git a/c_network.go b/c_network.go
@@ -32,7 +32,11 @@ func (n *Network) getSingleDetail(c component, prefix string) (lines []Message)
 		name = prefix + " " + name
 	}
 	status, _ := c["_state"].(string)
-	lines = append(lines, Message{Body: " - " + name, Level: ""})
+	level := "INFO"
+	if status == "errored" {
+		level = "ERROR"
+	}
+	lines = append(lines, Message{Body: " " + name, Level: level})
 	lines = append(lines, Message{Body: "   IP     : " + ip, Level: ""})
 	id, _ := c["network_aws_id"].(string)
 	if id != "" {
@@ -41,7 +45,7 @@ func (n *Network) getSingleDetail(c component, prefix string) (lines []Message)
 	lines = append(lines, Message{Body: "   Status : " + status, Level: ""})
 	if status == "errored" {
 		err, _ := c["error"].(string)
-		lines = append(lines, Message{Body: "   Error     : " + err, Level: "ERROR"})
+		lines = append(lines, Message{Body: "   Error     : " + err, Level: ""})
 	}
 	return lines
 }
diff --git a/c_rds_cluster.go b/c_rds_cluster.go
@@ -35,12 +35,16 @@ func (n *RDSCluster) getSingleDetail(c component, prefix string) (lines []Messag
 	engine, _ := c["engine"].(string)
 	endpoint, _ := c["endpoint"].(string)
 	status, _ := c["_state"].(string)
-	lines = append(lines, Message{Body: " - " + name, Level: ""})
+	level := "INFO"
+	if status == "errored" {
+		level = "ERROR"
+	}
+	lines = append(lines, Message{Body: " " + name, Level: level})
 	lines = append(lines, Message{Body: "   Engine    : " + engine, Level: ""})
 	lines = append(lines, Message{Body: "   Endpoint  : " + endpoint, Level: ""})
 	if status == "errored" {
 		err, _ := c["error"].(string)
-		lines = append(lines, Message{Body: "   Error     : " + err, Level: "ERROR"})
+		lines = append(lines, Message{Body: "   Error     : " + err, Level: ""})
 	}
 	return lines
 }
diff --git a/c_rds_instance.go b/c_rds_instance.go
@@ -36,13 +36,17 @@ func (n *RDSInstance) getSingleDetail(c component, prefix string) (lines []Messa
 	cluster, _ := c["cluster"].(string)
 	endpoint, _ := c["endpoint"].(string)
 	status, _ := c["_state"].(string)
-	lines = append(lines, Message{Body: " - " + name, Level: ""})
+	level := "INFO"
+	if status == "errored" {
+		level = "ERROR"
+	}
+	lines = append(lines, Message{Body: " " + name, Level: level})
 	lines = append(lines, Message{Body: "   Engine    : " + engine, Level: ""})
 	lines = append(lines, Message{Body: "   Cluster   : " + cluster, Level: ""})
 	lines = append(lines, Message{Body: "   Endpoint  : " + endpoint, Level: ""})
 	if status == "errored" {
 		err, _ := c["error"].(string)
-		lines = append(lines, Message{Body: "   Error     : " + err, Level: "ERROR"})
+		lines = append(lines, Message{Body: "   Error     : " + err, Level: ""})
 	}
 
 	return lines

diff --git a/c_router.go b/c_router.go
@@ -30,13 +30,17 @@ func (n *Router) getSingleDetail(c component, prefix string) (lines []Message) {
 		name = prefix + " " + name
 	}
 	status, _ := c["_state"].(string)
+	level := "INFO"
+	if status == "errored" {
+		level = "ERROR"
+	}
 	ip, _ := c["ip"].(string)
-	lines = append(lines, Message{Body: " - " + name, Level: ""})
+	lines = append(lines, Message{Body: " " + name, Level: level})
 	lines = append(lines, Message{Body: "   IP        : " + ip, Level: ""})
 	lines = append(lines, Message{Body: "   Status    : " + status, Level: ""})
 	if status == "errored" {
 		err, _ := c["error"].(string)
-		lines = append(lines, Message{Body: "   Error     : " + err, Level: "ERROR"})
+		lines = append(lines, Message{Body: "   Error     : " + err, Level: ""})
 	}
 
 	return lines

diff --git a/c_s3.go b/c_s3.go
@@ -37,12 +37,16 @@ func (n *S3Bucket) getSingleDetail(c component, prefix string) (lines []Message)
 		acl = "by grantees"
 	}
 	status, _ := c["_state"].(string)
-	lines = append(lines, Message{Body: " - " + name, Level: ""})
+	level := "INFO"
+	if status == "errored" {
+		level = "ERROR"
+	}
+	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 == "errored" {
 		err, _ := c["error"].(string)
-		lines = append(lines, Message{Body: "   Error     : " + err, Level: "ERROR"})
+		lines = append(lines, Message{Body: "   Error     : " + err, Level: ""})
 	}
 	return lines
 }
diff --git a/c_vpc.go b/c_vpc.go
@@ -34,12 +34,16 @@ func (n *Vpc) getSingleDetail(c component, prefix string) (lines []Message) {
 	}
 	subnet, _ := c["subnet"].(string)
 	status, _ := c["_state"].(string)
-	lines = append(lines, Message{Body: " - " + id, Level: ""})
+	level := "INFO"
+	if status == "errored" {
+		level = "ERROR"
+	}
+	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 == "errored" {
 		err, _ := c["error"].(string)
-		lines = append(lines, Message{Body: "   Error     : " + err, Level: "ERROR"})
+		lines = append(lines, Message{Body: "   Error     : " + err, Level: ""})
 	}
 	return lines
 }