Merge pull request #407 from civo/show-region

Show Region in case of no resources
civo · Apr 28, 2024 · cf3bedc · cf3bedc
2 parents ae2bfa4 + 2ea7f53
commit cf3bedc
Show file tree

Hide file tree

Showing 17 changed files with 35 additions and 133 deletions.
diff --git a/cmd/apikey/apikey_list.go b/cmd/apikey/apikey_list.go
@@ -3,7 +3,6 @@ package apikey
 import (
 	"sort"
 
-	"github.com/civo/cli/common"
 	"github.com/civo/cli/config"
 	"github.com/civo/cli/utility"
 	"github.com/spf13/cobra"
@@ -42,13 +41,6 @@ Example: civo apikey ls -o custom -f "Name: Key"`,
 
 		}
 
-		switch common.OutputFormat {
-		case "json":
-			ow.WriteMultipleObjectsJSON(common.PrettySet)
-		case "custom":
-			ow.WriteCustomOutput(common.OutputFields)
-		default:
-			ow.WriteTable()
-		}
+		ow.FinishAndPrintOutput()
 	},
 }
diff --git a/cmd/database/database_list.go b/cmd/database/database_list.go
@@ -61,14 +61,6 @@ var dbListCmd = &cobra.Command{
 			}
 		}
 
-		switch common.OutputFormat {
-		case "json":
-			ow.WriteMultipleObjectsJSON(common.PrettySet)
-		case "custom":
-			ow.WriteCustomOutput(common.OutputFields)
-		default:
-			ow.WriteTable()
-			fmt.Println("To get the credentials for a database, use `civo db credential <name/ID>`")
-		}
+		ow.FinishAndPrintOutput()
 	},
 }
diff --git a/cmd/domain/domain_list.go b/cmd/domain/domain_list.go
@@ -1,7 +1,6 @@
 package domain
 
 import (
-	"github.com/civo/cli/common"
 	"github.com/civo/cli/config"
 	"github.com/civo/cli/utility"
 
@@ -42,13 +41,6 @@ Example: civo domain ls -o custom -f "ID: Name"`,
 			ow.AppendDataWithLabel("name", domain.Name, "Name")
 		}
 
-		switch common.OutputFormat {
-		case "json":
-			ow.WriteMultipleObjectsJSON(common.PrettySet)
-		case "custom":
-			ow.WriteCustomOutput(common.OutputFields)
-		default:
-			ow.WriteTable()
-		}
+		ow.FinishAndPrintOutput()
 	},
 }
diff --git a/cmd/domain/domain_record_list.go b/cmd/domain/domain_record_list.go
@@ -4,7 +4,6 @@ import (
 	"os"
 	"strconv"
 
-	"github.com/civo/cli/common"
 	"github.com/civo/cli/config"
 	"github.com/civo/cli/utility"
 	"github.com/spf13/cobra"
@@ -63,14 +62,7 @@ If you wish to use a custom format, the available fields are:
 
 		}
 
-		switch common.OutputFormat {
-		case "json":
-			ow.WriteMultipleObjectsJSON(common.PrettySet)
-		case "custom":
-			ow.WriteCustomOutput(common.OutputFields)
-		default:
-			ow.WriteTable()
-		}
+		ow.FinishAndPrintOutput()
 	},
 }
 

diff --git a/cmd/firewall/firewall_list.go b/cmd/firewall/firewall_list.go
@@ -69,13 +69,6 @@ Example: civo firewall ls -o custom -f "ID: Name"`,
 			ow.AppendDataWithLabel("loadbalancer_count", strconv.Itoa(firewall.LoadBalancerCount), "Total LoadBalancer")
 		}
 
-		switch common.OutputFormat {
-		case "json":
-			ow.WriteMultipleObjectsJSON(common.PrettySet)
-		case "custom":
-			ow.WriteCustomOutput(common.OutputFields)
-		default:
-			ow.WriteTable()
-		}
+		ow.FinishAndPrintOutput()
 	},
 }
diff --git a/cmd/firewall/firewall_rule_list.go b/cmd/firewall/firewall_rule_list.go
@@ -71,13 +71,6 @@ If you wish to use a custom format, the available fields are:
 			ow.AppendDataWithLabel("label", firewallRule.Label, "Label")
 		}
 
-		switch common.OutputFormat {
-		case "json":
-			ow.WriteMultipleObjectsJSON(common.PrettySet)
-		case "custom":
-			ow.WriteCustomOutput(common.OutputFields)
-		default:
-			ow.WriteTable()
-		}
+		ow.FinishAndPrintOutput()
 	},
 }
diff --git a/cmd/instance/instance_list.go b/cmd/instance/instance_list.go
@@ -92,13 +92,6 @@ If you wish to use a custom format, the available fields are:
 			}
 		}
 
-		switch common.OutputFormat {
-		case "json":
-			ow.WriteMultipleObjectsJSON(common.PrettySet)
-		case "custom":
-			ow.WriteCustomOutput(common.OutputFields)
-		default:
-			ow.WriteTable()
-		}
+		ow.FinishAndPrintOutput()
 	},
 }
diff --git a/cmd/ip/ip_list.go b/cmd/ip/ip_list.go
@@ -48,13 +48,6 @@ var ipListCmd = &cobra.Command{
 			}
 		}
 
-		switch common.OutputFormat {
-		case "json":
-			ow.WriteMultipleObjectsJSON(common.PrettySet)
-		case "custom":
-			ow.WriteCustomOutput(common.OutputFields)
-		default:
-			ow.WriteTable()
-		}
+		ow.FinishAndPrintOutput()
 	},
 }
diff --git a/cmd/kfcluster/kfcluster_list.go b/cmd/kfcluster/kfcluster_list.go
@@ -43,13 +43,6 @@ var kfcListCmd = &cobra.Command{
 			ow.AppendDataWithLabel("dashboard_url", kfc.DashboardURL, "Dashboard URL")
 		}
 
-		switch common.OutputFormat {
-		case "json":
-			ow.WriteMultipleObjectsJSON(common.PrettySet)
-		case "custom":
-			ow.WriteCustomOutput(common.OutputFields)
-		default:
-			ow.WriteTable()
-		}
+		ow.FinishAndPrintOutput()
 	},
 }
diff --git a/cmd/kubernetes/kubernetes_list.go b/cmd/kubernetes/kubernetes_list.go
@@ -76,13 +76,6 @@ If you wish to use a custom format, the available fields are:
 			}
 		}
 
-		switch common.OutputFormat {
-		case "json":
-			ow.WriteMultipleObjectsJSON(common.PrettySet)
-		case "custom":
-			ow.WriteCustomOutput(common.OutputFields)
-		default:
-			ow.WriteTable()
-		}
+		ow.FinishAndPrintOutput()
 	},
 }
diff --git a/cmd/loadbalancer/loadbalancer_list.go b/cmd/loadbalancer/loadbalancer_list.go
@@ -74,13 +74,6 @@ If you wish to use a custom format, the available fields are:
 			ow.AppendData("Backends", strings.Join(backendList, ", "))
 		}
 
-		switch common.OutputFormat {
-		case "json":
-			ow.WriteMultipleObjectsJSON(common.PrettySet)
-		case "custom":
-			ow.WriteCustomOutput(common.OutputFields)
-		default:
-			ow.WriteTable()
-		}
+		ow.FinishAndPrintOutput()
 	},
 }
diff --git a/cmd/network/network_list.go b/cmd/network/network_list.go
@@ -56,13 +56,6 @@ If you wish to use a custom format, the available fields are:
 			}
 		}
 
-		switch common.OutputFormat {
-		case "json":
-			ow.WriteMultipleObjectsJSON(common.PrettySet)
-		case "custom":
-			ow.WriteCustomOutput(common.OutputFields)
-		default:
-			ow.WriteTable()
-		}
+		ow.FinishAndPrintOutput()
 	},
 }
diff --git a/cmd/objectstore/objectstore_credential_list.go b/cmd/objectstore/objectstore_credential_list.go
@@ -41,13 +41,6 @@ var objectStoreCredentialListCmd = &cobra.Command{
 			ow.AppendDataWithLabel("status", credential.Status, "Status")
 		}
 
-		switch common.OutputFormat {
-		case "json":
-			ow.WriteMultipleObjectsJSON(common.PrettySet)
-		case "custom":
-			ow.WriteCustomOutput(common.OutputFields)
-		default:
-			ow.WriteTable()
-		}
+		ow.FinishAndPrintOutput()
 	},
 }
diff --git a/cmd/objectstore/objectstore_list.go b/cmd/objectstore/objectstore_list.go
@@ -46,13 +46,6 @@ var objectStoreListCmd = &cobra.Command{
 			ow.AppendDataWithLabel("status", objectStore.Status, "Status")
 		}
 
-		switch common.OutputFormat {
-		case "json":
-			ow.WriteMultipleObjectsJSON(common.PrettySet)
-		case "custom":
-			ow.WriteCustomOutput(common.OutputFields)
-		default:
-			ow.WriteTable()
-		}
+		ow.FinishAndPrintOutput()
 	},
 }
diff --git a/cmd/sshkey/ssh_key_list.go b/cmd/sshkey/ssh_key_list.go
@@ -3,7 +3,6 @@ package sshkey
 import (
 	"os"
 
-	"github.com/civo/cli/common"
 	"github.com/civo/cli/config"
 	"github.com/civo/cli/utility"
 	"github.com/spf13/cobra"
@@ -44,13 +43,6 @@ Example: civo ssh ls -o custom -f "id: name"`,
 			ow.AppendDataWithLabel("fingerprint", sshkey.Fingerprint, "Finger Print")
 		}
 
-		switch common.OutputFormat {
-		case "json":
-			ow.WriteMultipleObjectsJSON(common.PrettySet)
-		case "custom":
-			ow.WriteCustomOutput(common.OutputFields)
-		default:
-			ow.WriteTable()
-		}
+		ow.FinishAndPrintOutput()
 	},
 }
diff --git a/cmd/volume/volume_list.go b/cmd/volume/volume_list.go
@@ -143,13 +143,6 @@ Example: civo volume ls -o custom -f "ID: Name (SizeGigabytes)`,
 			ow.AppendDataWithLabel("status", volume.Status, "Status")
 		}
 
-		switch common.OutputFormat {
-		case "json":
-			ow.WriteMultipleObjectsJSON(common.PrettySet)
-		case "custom":
-			ow.WriteCustomOutput(common.OutputFields)
-		default:
-			ow.WriteTable()
-		}
+		ow.FinishAndPrintOutput()
 	},
 }
diff --git a/utility/output_writer.go b/utility/output_writer.go
@@ -6,6 +6,8 @@ import (
 	"bytes"
 	"encoding/json"
 	"fmt"
+	"github.com/civo/cli/common"
+	"github.com/civo/cli/config"
 	"os"
 	"regexp"
 	"sort"
@@ -280,3 +282,20 @@ func prettyprint(b []byte) ([]byte, error) {
 	err := json.Indent(&out, b, "", "  ")
 	return out.Bytes(), err
 }
+
+func (ow *OutputWriter) FinishAndPrintOutput() {
+	ow.finishExistingLine()
+	if len(ow.Values) == 0 {
+		region := config.Current.Meta.DefaultRegion
+		fmt.Fprintf(os.Stderr, "No resources found in region %s. For a list of regions use the command 'civo region ls'\n", region)
+	} else {
+		switch common.OutputFormat {
+		case "json":
+			ow.WriteMultipleObjectsJSON(common.PrettySet)
+		case "custom":
+			ow.WriteCustomOutput(common.OutputFields)
+		default:
+			ow.WriteTable()
+		}
+	}
+}