Add ability to show proxy/domain labels

Author: theRealWardo

cmd/domain.go

@@ -19,15 +19,24 @@ import (
 
 func fmtDomain(r *v1alpha.Domain) {
 	t := pretty.Table{
-		Header: buildDomainHeader(),
+		Header: buildDomainHeader(false),
 		Rows: pretty.Rows{
-			buildDomainRow(r),
+			buildDomainRow(r, false),
 		},
 	}
 	t.Print()
 }
 
-func buildDomainHeader() pretty.Header {
+func buildDomainHeader(labels bool) pretty.Header {
+	if labels {
+		return pretty.Header{
+			"NAME",
+			"HOSTNAMES",
+			"STATUS",
+			"AGE",
+			"LABELS",
+		}
+	}
 	return pretty.Header{
 		"NAME",
 		"HOSTNAMES",
@@ -36,21 +45,26 @@ func buildDomainHeader() pretty.Header {
 	}
 }
 
-func buildDomainRow(r *v1alpha.Domain) []interface{} {
+func buildDomainRow(r *v1alpha.Domain, labels bool) (res []interface{}) {
 	if r.Spec.Style == v1alpha.DomainStyleMagic {
-		return []interface{}{
+		res = []interface{}{
 			r.Name,
 			fmt.Sprintf("%s.apoxy.io", r.Spec.MagicKey),
 			r.Status.Phase,
 			pretty.SinceString(r.CreationTimestamp.Time),
 		}
+	} else {
+		res = []interface{}{
+			r.Name,
+			strings.Join(r.Spec.Hostnames, ", "),
+			r.Status.Phase,
+			pretty.SinceString(r.CreationTimestamp.Time),
+		}
 	}
-	return []interface{}{
-		r.Name,
-		strings.Join(r.Spec.Hostnames, ", "),
-		r.Status.Phase,
-		pretty.SinceString(r.CreationTimestamp.Time),
+	if labels {
+		res = append(res, labelsToString(r.Labels))
 	}
+	return
 }
 
 func getOrCreateMagicProxy(c *rest.APIClient, name string) error {
@@ -96,6 +110,8 @@ func GetDomain(name string) error {
 	return nil
 }
 
+var showDomainLabels bool
+
 func ListDomains() error {
 	c, err := defaultAPIClient()
 	if err != nil {
@@ -106,10 +122,10 @@ func ListDomains() error {
 		return err
 	}
 	t := pretty.Table{
-		Header: buildDomainHeader(),
+		Header: buildDomainHeader(showDomainLabels),
 	}
 	for _, p := range r.Items {
-		t.Rows = append(t.Rows, buildDomainRow(&p))
+		t.Rows = append(t.Rows, buildDomainRow(&p, showDomainLabels))
 	}
 	t.Print()
 	return nil
@@ -307,6 +323,8 @@ func init() {
 		BoolVar(&domainRandomName, "random", false, "Generate a random name of the domain.")
 	getDomainCmd.PersistentFlags().
 		BoolVarP(&listProxies, "proxies", "p", false, "List the proxies this domain points to.")
+	listDomainCmd.PersistentFlags().
+		BoolVar(&showDomainLabels, "show-labels", false, "Print the domain's labels.")
 	// TODO: add flags for domain config as raw envoy config
 
 	domainCmd.AddCommand(getDomainCmd, listDomainCmd, createDomainCmd, deleteDomainCmd)

cmd/proxy.go

@@ -15,15 +15,25 @@ import (
 
 func fmtProxy(r *v1alpha.Proxy) {
 	t := pretty.Table{
-		Header: buildProxyHeader(),
+		Header: buildProxyHeader(false),
 		Rows: pretty.Rows{
-			buildProxyRow(r),
+			buildProxyRow(r, false),
 		},
 	}
 	t.Print()
 }
 
-func buildProxyHeader() pretty.Header {
+func buildProxyHeader(labels bool) pretty.Header {
+	if labels {
+		return pretty.Header{
+			"NAME",
+			"PROVIDER",
+			"STATUS",
+			"ADDRESS",
+			"AGE",
+			"LABELS",
+		}
+	}
 	return pretty.Header{
 		"NAME",
 		"PROVIDER",
@@ -33,7 +43,17 @@ func buildProxyHeader() pretty.Header {
 	}
 }
 
-func buildProxyRow(r *v1alpha.Proxy) []interface{} {
+func buildProxyRow(r *v1alpha.Proxy, labels bool) []interface{} {
+	if labels {
+		return []interface{}{
+			r.Name,
+			r.Spec.Provider,
+			r.Status.Phase,
+			r.Status.Address,
+			pretty.SinceString(r.CreationTimestamp.Time),
+			labelsToString(r.Labels),
+		}
+	}
 	return []interface{}{
 		r.Name,
 		r.Spec.Provider,
@@ -56,6 +76,8 @@ func GetProxy(name string) error {
 	return nil
 }
 
+var showProxyLabels bool
+
 func ListProxies(opts ...metav1.ListOptions) error {
 	c, err := defaultAPIClient()
 	if err != nil {
@@ -71,10 +93,10 @@ func ListProxies(opts ...metav1.ListOptions) error {
 		return err
 	}
 	t := pretty.Table{
-		Header: buildProxyHeader(),
+		Header: buildProxyHeader(showProxyLabels),
 	}
 	for _, p := range r.Items {
-		t.Rows = append(t.Rows, buildProxyRow(&p))
+		t.Rows = append(t.Rows, buildProxyRow(&p, showProxyLabels))
 	}
 	t.Print()
 	return nil
@@ -191,6 +213,8 @@ var deleteProxyCmd = &cobra.Command{
 func init() {
 	createProxyCmd.PersistentFlags().
 		StringVarP(&proxyFile, "filename", "f", "", "The file that contains the configuration to create.")
+	listProxyCmd.PersistentFlags().
+		BoolVar(&showProxyLabels, "show-labels", false, "Print the proxy's labels.")
 	// TODO: add flags for proxy config as raw envoy config
 
 	proxyCmd.AddCommand(getProxyCmd, listProxyCmd, createProxyCmd, deleteProxyCmd)

cmd/root.go

@@ -93,6 +93,15 @@ func yamlStringToJSONString(yamlString string) (string, error) {
 	return string(jsonBytes), nil
 }
 
+// labelsToString converts a map of labels to a string.
+func labelsToString(labels map[string]string) string {
+	var l []string
+	for k, v := range labels {
+		l = append(l, fmt.Sprintf("%s=%s", k, v))
+	}
+	return strings.Join(l, ",")
+}
+
 // GenerateDocs generates the docs in the docs folder.
 func GenerateDocs() {
 	anchorLinks := func(s string) string {