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

Fix domain list output (#1288)

This commit is contained in:
David Simansky 2021-04-14 20:55:01 +02:00 committed by GitHub
parent cdc1d4e41a
commit 405691dd8c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/kn/commands/domain/list.go
View File

@ -55,7 +55,7 @@ func NewDomainMappingListCommand(p *commands.KnParams) *cobra.Command {
return err return err
} }
if len(domainMappingList.Items) == 0 { if !listFlags.GenericPrintFlags.OutputFlagSpecified() && len(domainMappingList.Items) == 0 {
fmt.Fprintf(cmd.OutOrStdout(), "No domain mapping found.\n") fmt.Fprintf(cmd.OutOrStdout(), "No domain mapping found.\n")
return nil return nil
} }

16
pkg/kn/commands/domain/list_test.go
View File

@ -23,6 +23,7 @@ import (
"knative.dev/client/pkg/serving/v1alpha1" "knative.dev/client/pkg/serving/v1alpha1"
"knative.dev/client/pkg/util" "knative.dev/client/pkg/util"
servingv1alpha1 "knative.dev/serving/pkg/apis/serving/v1alpha1" servingv1alpha1 "knative.dev/serving/pkg/apis/serving/v1alpha1"
"knative.dev/serving/pkg/client/clientset/versioned/scheme"
) )
func TestDomainMappingList(t *testing.T) { func TestDomainMappingList(t *testing.T) {
@ -56,3 +57,18 @@ func TestDomainMappingListEmpty(t *testing.T) {
servingRecorder.Validate() servingRecorder.Validate()
} }
func TestChannelListEmptyWithOutputSet(t *testing.T) {
client := v1alpha1.NewMockKnServiceClient(t)
servingRecorder := client.Recorder()
domainMappingList := &servingv1alpha1.DomainMappingList{}
err := util.UpdateGroupVersionKindWithScheme(domainMappingList, servingv1alpha1.SchemeGroupVersion, scheme.Scheme)
assert.NilError(t, err)
servingRecorder.ListDomainMappings(domainMappingList, nil)
out, err := executeDomainCommand(client, nil, "list", "-o", "json")
assert.NilError(t, err)
assert.Check(t, util.ContainsAll(out, "\"apiVersion\": \""+servingv1alpha1.SchemeGroupVersion.String()+"\"", "\"kind\": \"DomainMappingList\"", "\"items\": []"))
servingRecorder.Validate()
}