diff --git a/CHANGELOG.adoc b/CHANGELOG.adoc index 9604c8370a..2157faf1a3 100644 --- a/CHANGELOG.adoc +++ b/CHANGELOG.adoc @@ -26,6 +26,10 @@ | Fix plugin lookup with file ext on Windows | https://github.com/knative/client/pull/774[#774] +| 🐛 +| Correct error message when updating service +| https://github.com/knative/client/pull/778[#778] + |=== ## v0.13.1 (2020-03-25) diff --git a/pkg/kn/commands/service/create_test.go b/pkg/kn/commands/service/create_test.go index 0ade9c327c..548018f188 100644 --- a/pkg/kn/commands/service/create_test.go +++ b/pkg/kn/commands/service/create_test.go @@ -143,6 +143,13 @@ func TestServiceCreateWithMultipleImages(t *testing.T) { assert.Assert(t, util.ContainsAll(err.Error(), "\"--image\"", "\"gcr.io/bar/foo:baz\"", "flag", "once")) } +func TestServiceCreateWithMultipleNames(t *testing.T) { + _, _, _, err := fakeServiceCreate([]string{ + "service", "create", "foo", "foo1", "--image", "gcr.io/foo/bar:baz", "--no-wait"}, false) + + assert.Assert(t, util.ContainsAll(err.Error(), "'service create' requires the service name given as single argument")) +} + func TestServiceCreateImageSync(t *testing.T) { action, created, output, err := fakeServiceCreate([]string{ "service", "create", "foo", "--image", "gcr.io/foo/bar:baz"}, false) diff --git a/pkg/kn/commands/service/delete.go b/pkg/kn/commands/service/delete.go index 81dc8f9612..413c7aea55 100644 --- a/pkg/kn/commands/service/delete.go +++ b/pkg/kn/commands/service/delete.go @@ -40,7 +40,7 @@ func NewServiceDeleteCommand(p *commands.KnParams) *cobra.Command { RunE: func(cmd *cobra.Command, args []string) error { if len(args) < 1 { - return errors.New("requires the service name") + return errors.New("'service delete' requires the service name(s)") } namespace, err := p.GetNamespace(cmd) diff --git a/pkg/kn/commands/service/describe.go b/pkg/kn/commands/service/describe.go index 866c0827cd..d304124842 100644 --- a/pkg/kn/commands/service/describe.go +++ b/pkg/kn/commands/service/describe.go @@ -81,7 +81,7 @@ func NewServiceDescribeCommand(p *commands.KnParams) *cobra.Command { Short: "Show details of a service", RunE: func(cmd *cobra.Command, args []string) error { if len(args) != 1 { - return errors.New("'kn service describe' requires name of the service as single argument") + return errors.New("'service describe' requires the service name given as single argument") } serviceName := args[0] diff --git a/pkg/kn/commands/service/describe_test.go b/pkg/kn/commands/service/describe_test.go index 1c45b2e0d7..0c2bceb84b 100644 --- a/pkg/kn/commands/service/describe_test.go +++ b/pkg/kn/commands/service/describe_test.go @@ -75,6 +75,16 @@ func TestServiceDescribeBasic(t *testing.T) { r.Validate() } +func TestServiceDescribeWithMultipleNames(t *testing.T) { + client := knclient.NewMockKnServiceClient(t) + r := client.Recorder() + createTestService("foo", []string{"rev1"}, goodConditions()) + _, err := executeServiceCommand(client, "describe", "foo", "foo1") + + assert.Assert(t, util.ContainsAll(err.Error(), "'service describe' requires the service name given as single argument")) + r.Validate() +} + func TestServiceDescribeSad(t *testing.T) { client := knclient.NewMockKnServiceClient(t) r := client.Recorder() diff --git a/pkg/kn/commands/service/update.go b/pkg/kn/commands/service/update.go index b0589e0a1d..fe82ce232d 100644 --- a/pkg/kn/commands/service/update.go +++ b/pkg/kn/commands/service/update.go @@ -60,7 +60,7 @@ func NewServiceUpdateCommand(p *commands.KnParams) *cobra.Command { Example: updateExample, RunE: func(cmd *cobra.Command, args []string) (err error) { if len(args) != 1 { - return errors.New("requires the service name") + return errors.New("'service update' requires the service name given as single argument") } namespace, err := p.GetNamespace(cmd) diff --git a/pkg/kn/commands/service/update_test.go b/pkg/kn/commands/service/update_test.go index bb48aad86f..e197684c77 100644 --- a/pkg/kn/commands/service/update_test.go +++ b/pkg/kn/commands/service/update_test.go @@ -195,11 +195,19 @@ func TestServiceUpdateImage(t *testing.T) { func TestServiceUpdateWithMultipleImages(t *testing.T) { orig := newEmptyService() _, _, _, err := fakeServiceUpdate(orig, []string{ - "service", "create", "foo", "--image", "gcr.io/foo/bar:baz", "--image", "gcr.io/bar/foo:baz", "--no-wait"}) + "service", "update", "foo", "--image", "gcr.io/foo/bar:baz", "--image", "gcr.io/bar/foo:baz", "--no-wait"}) assert.Assert(t, util.ContainsAll(err.Error(), "\"--image\"", "\"gcr.io/bar/foo:baz\"", "flag", "once")) } +func TestServiceUpdateWithMultipleNames(t *testing.T) { + orig := newEmptyService() + _, _, _, err := fakeServiceUpdate(orig, []string{ + "service", "update", "foo", "foo1", "--image", "gcr.io/foo/bar:baz", "--no-wait"}) + + assert.Assert(t, util.ContainsAll(err.Error(), "'service update' requires the service name given as single argument")) +} + func TestServiceUpdateCommand(t *testing.T) { orig := newEmptyService()