Resolve #711: CLI panics on domain update when domain doesn't exist (#…

…838)
cadence-workflow · Jun 12, 2018 · 85dbdf5 · 85dbdf5
1 parent 1a167d7
commit 85dbdf5
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 0 deletions.
diff --git a/tools/cli/app_test.go b/tools/cli/app_test.go
@@ -156,6 +156,12 @@ func (s *cliAppSuite) TestDomainUpdate_DomainNotExist() {
 	s.Nil(err)
 }
 
+func (s *cliAppSuite) TestDomainUpdate_ActiveClusterFlagNotSet_DomainNotExist() {
+	s.service.EXPECT().DescribeDomain(gomock.Any(), gomock.Any(), callOptions...).Return(nil, &shared.EntityNotExistsError{})
+	err := s.app.Run([]string{"", "--do", domainName, "domain", "update"})
+	s.Nil(err)
+}
+
 func (s *cliAppSuite) TestDomainUpdate_Failed() {
 	resp := describeDomainResponse
 	s.service.EXPECT().DescribeDomain(gomock.Any(), gomock.Any(), callOptions...).Return(resp, nil)

diff --git a/tools/cli/commands.go b/tools/cli/commands.go
@@ -259,6 +259,7 @@ func UpdateDomain(c *cli.Context) {
 			} else {
 				fmt.Printf("Domain %s does not exist.\n", domain)
 			}
+			return
 		}
 
 		description := resp.DomainInfo.GetDescription()