chore(routes): change field order

Author: duanhongyi

cmd/routes.go

@@ -49,7 +49,7 @@ func (d *DryccCmd) RoutesList(appID string, results int) error {
 	if count == 0 {
 		d.Println(fmt.Sprintf("No routes found in %s app.", appID))
 	} else {
-		table := d.getDefaultFormatTable([]string{"NAME", "OWNER", "KIND", "SERVICE", "GATEWAY"})
+		table := d.getDefaultFormatTable([]string{"NAME", "OWNER", "KIND", "GATEWAY", "SERVICE"})
 		for _, route := range routes {
 			var services []string
 			for _, rule := range route.Rules {
@@ -69,8 +69,8 @@ func (d *DryccCmd) RoutesList(appID string, results int) error {
 				route.Name,
 				route.Owner,
 				route.Kind,
-				strings.Join(services, "\n"),
-				strings.Join(gateways, "\n"),
+				safeGetString(strings.Join(gateways, "\n")),
+				safeGetString(strings.Join(services, "\n")),
 			})
 		}
 		table.Render()

cmd/routes_test.go

@@ -103,9 +103,9 @@ func TestRoutesList(t *testing.T) {
 	err = cmdr.RoutesList("foo", -1)
 	assert.NoError(t, err)
 
-	assert.Equal(t, b.String(), `NAME          OWNER    KIND         SERVICE                GATEWAY         
-example-go    test     HTTPRoute    yygl-nextcloud:80      example-go:80      
-                                    yygl-nextcloud:8080    example-go:8080    
+	assert.Equal(t, b.String(), `NAME          OWNER    KIND         GATEWAY            SERVICE             
+example-go    test     HTTPRoute    example-go:80      yygl-nextcloud:80      
+                                    example-go:8080    yygl-nextcloud:8080    
 `, "output")
 }