new

Author: jianxiaoguo

cmd/gateways.go

@@ -1,7 +1,6 @@
 package cmd
 
 import (
-	"encoding/json"
 	"fmt"
 
 	"github.com/drycc/controller-sdk-go/gateways"
@@ -28,11 +27,10 @@ func (d *DryccCmd) GatewaysList(appID string, results int) error {
 		d.Println("Could not find any gateway")
 	} else {
 		table := tablewriter.NewWriter(d.WOut)
-		table.SetHeader([]string{"Name", "Lisenter", "Port", "Protocol", "allowedRoutes"})
+		table.SetHeader([]string{"Name", "Lisenter", "Port", "Protocol"})
 		for _, gateway := range gateways {
 			for _, listener := range gateway.Listeners {
-				allowedRoutes, _ := json.Marshal(listener.AllowedRoutes)
-				table.Append([]string{gateway.Name, listener.Name, fmt.Sprint(listener.Port), listener.Protocol, string(allowedRoutes)})
+				table.Append([]string{gateway.Name, listener.Name, fmt.Sprint(listener.Port), listener.Protocol})
 			}
 		}
 		table.SetAutoMergeCellsByColumnIndex([]int{0})

cmd/gateways_test.go

@@ -57,13 +57,13 @@ func TestGatewaysList(t *testing.T) {
 	assert.NoError(t, err)
 
 	assert.Equal(t, b.String(), `=== foo Gateways
-+------+---------------+------+----------+-------------------------------+
-| NAME |   LISENTER    | PORT | PROTOCOL |         ALLOWEDROUTES         |
-+------+---------------+------+----------+-------------------------------+
-| foo  | foo-80-http   |   80 | HTTP     | {"namespaces":{"from":"All"}} |
-+      +---------------+------+----------+-------------------------------+
-|      | foo-443-https |  443 | HTTPS    | {"namespaces":{"from":"All"}} |
-+------+---------------+------+----------+-------------------------------+
++------+---------------+------+----------+
+| NAME |   LISENTER    | PORT | PROTOCOL |
++------+---------------+------+----------+
+| foo  | foo-80-http   |   80 | HTTP     |
++      +---------------+------+----------+
+|      | foo-443-https |  443 | HTTPS    |
++------+---------------+------+----------+
 `, "output")
 }
 

cmd/routes.go

@@ -51,16 +51,15 @@ func (d *DryccCmd) RoutesList(appID string, results int) error {
 		d.Println("Could not find any route")
 	} else {
 		table := tablewriter.NewWriter(d.WOut)
-		table.SetHeader([]string{"Name", "Type", "Kind", "Gateway", "Section"})
+		table.SetHeader([]string{"Name", "Type", "Kind", "Gateway"})
 		for _, route := range routes {
 			if len(route.ParentRefs) > 0 {
 				for _, gateway := range route.ParentRefs {
-					table.Append([]string{route.Name, route.Type, route.Kind, gateway.Name, gateway.Section})
+					table.Append([]string{route.Name, route.Type, route.Kind, gateway.Name})
 				}
 			} else {
-				table.Append([]string{route.Name, route.Type, route.Kind, "", ""})
+				table.Append([]string{route.Name, route.Type, route.Kind, ""})
 			}
-
 		}
 		table.SetAutoMergeCellsByColumnIndex([]int{0})
 		table.SetRowLine(true)

cmd/routes_test.go

@@ -75,11 +75,11 @@ func TestRoutesList(t *testing.T) {
 	assert.NoError(t, err)
 
 	assert.Equal(t, b.String(), `=== foo Routes
-+------------+------+-----------+------------+--------------------+
-|    NAME    | TYPE |   KIND    |  GATEWAY   |      SECTION       |
-+------------+------+-----------+------------+--------------------+
-| example-go | web  | HTTPRoute | example-go | example-go-80-http |
-+------------+------+-----------+------------+--------------------+
++------------+------+-----------+------------+
+|    NAME    | TYPE |   KIND    |  GATEWAY   |
++------------+------+-----------+------------+
+| example-go | web  | HTTPRoute | example-go |
++------------+------+-----------+------------+
 `, "output")
 }
 

cmd/services.go

@@ -32,7 +32,7 @@ func (d *DryccCmd) ServicesList(appID string) error {
 				table.Append([]string{service.ProcfileType, port.Name, fmt.Sprint(port.Port), port.Protocol, fmt.Sprint(port.TargetPort)})
 			}
 		}
-		table.SetAutoMergeCellsByColumnIndex([]int{0, 1})
+		table.SetAutoMergeCellsByColumnIndex([]int{0})
 		table.SetRowLine(true)
 		table.Render()
 	}