knative
/
client
mirror of https://github.com/knative/client.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

list services sorted by alphabetical order (#330)

This commit is contained in:
Ying Chun Guo 2019-08-09 16:00:04 +08:00 committed by Knative Prow Robot
parent 3594b39659
commit 8c362f0363
3 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGELOG.adoc
View File

@ -34,6 +34,10 @@
| `kn service describe` | `kn service describe`
| https://github.com/knative/client/pull/252[#252] | https://github.com/knative/client/pull/252[#252]
| 🐛
| `kn service list` lists services sorted by alphabetical order
| https://github.com/knative/client/pull/330[#330]
|=== |===
## v0.2.0 (2019-07-10) ## v0.2.0 (2019-07-10)

6
pkg/kn/commands/service/service_list.go
View File

@ -16,6 +16,7 @@ package service
import ( import (
"fmt" "fmt"
"sort"
"github.com/knative/client/pkg/kn/commands" "github.com/knative/client/pkg/kn/commands"
v1alpha12 "github.com/knative/client/pkg/serving/v1alpha1" v1alpha12 "github.com/knative/client/pkg/serving/v1alpha1"
@ -61,6 +62,11 @@ func NewServiceListCommand(p *commands.KnParams) *cobra.Command {
return err return err
} }
// Sort serviceList by name
sort.SliceStable(serviceList.Items, func(i, j int) bool {
return serviceList.Items[i].ObjectMeta.Name < serviceList.Items[j].ObjectMeta.Name
})
err = printer.PrintObj(serviceList, cmd.OutOrStdout()) err = printer.PrintObj(serviceList, cmd.OutOrStdout())
if err != nil { if err != nil {
return err return err

13
pkg/kn/commands/service/service_list_test.go
View File

@ -76,9 +76,10 @@ func TestGetEmpty(t *testing.T) {
} }
func TestServiceListDefaultOutput(t *testing.T) { func TestServiceListDefaultOutput(t *testing.T) {
service1 := createMockServiceWithParams("foo", "http://foo.default.example.com", 1) service1 := createMockServiceWithParams("foo", "http://foo.default.example.com", 2)
service2 := createMockServiceWithParams("bar", "http://bar.default.example.com", 2) service3 := createMockServiceWithParams("sss", "http://sss.default.example.com", 3)
serviceList := &v1alpha1.ServiceList{Items: []v1alpha1.Service{*service1, *service2}} service2 := createMockServiceWithParams("bar", "http://bar.default.example.com", 1)
serviceList := &v1alpha1.ServiceList{Items: []v1alpha1.Service{*service1, *service2, *service3}}
action, output, err := fakeServiceList([]string{"service", "list"}, serviceList) action, output, err := fakeServiceList([]string{"service", "list"}, serviceList)
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
@ -88,9 +89,11 @@ func TestServiceListDefaultOutput(t *testing.T) {
} else if !action.Matches("list", "services") { } else if !action.Matches("list", "services") {
t.Errorf("Bad action %v", action) t.Errorf("Bad action %v", action)
} }
// Outputs in alphabetical order
assert.Check(t, util.ContainsAll(output[0], "NAME", "URL", "GENERATION", "AGE", "CONDITIONS", "READY", "REASON")) assert.Check(t, util.ContainsAll(output[0], "NAME", "URL", "GENERATION", "AGE", "CONDITIONS", "READY", "REASON"))
assert.Check(t, util.ContainsAll(output[1], "foo", "foo.default.example.com", "1")) assert.Check(t, util.ContainsAll(output[1], "bar", "bar.default.example.com", "1"))
assert.Check(t, util.ContainsAll(output[2], "bar", "bar.default.example.com", "2")) assert.Check(t, util.ContainsAll(output[2], "foo", "foo.default.example.com", "2"))
assert.Check(t, util.ContainsAll(output[3], "sss", "sss.default.example.com", "3"))
} }
func TestServiceGetOneOutput(t *testing.T) { func TestServiceGetOneOutput(t *testing.T) {