Don't send a name and an ID to DescribeNamespace (#1446)

* Don't send a name and an ID to DescribeNamespace.
temporalio · Apr 10, 2021 · b75a7cf · b75a7cf
1 parent ca6febf
commit b75a7cf
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 2 deletions.
diff --git a/tools/cli/app_test.go b/tools/cli/app_test.go
@@ -218,11 +218,18 @@ func (s *cliAppSuite) TestNamespaceUpdate_Failed() {
 
 func (s *cliAppSuite) TestNamespaceDescribe() {
 	resp := describeNamespaceResponseServer
-	s.frontendClient.EXPECT().DescribeNamespace(gomock.Any(), gomock.Any()).Return(resp, nil)
+	s.frontendClient.EXPECT().DescribeNamespace(gomock.Any(), &workflowservice.DescribeNamespaceRequest{Namespace: cliTestNamespace, Id: ""}).Return(resp, nil)
 	err := s.app.Run([]string{"", "--ns", cliTestNamespace, "namespace", "describe"})
 	s.Nil(err)
 }
 
+func (s *cliAppSuite) TestNamespaceDescribe_ById() {
+	resp := describeNamespaceResponseServer
+	s.frontendClient.EXPECT().DescribeNamespace(gomock.Any(), &workflowservice.DescribeNamespaceRequest{Namespace: "", Id: "nid"}).Return(resp, nil)
+	err := s.app.Run([]string{"", "namespace", "describe", "--namespace_id", "nid"})
+	s.Nil(err)
+}
+
 func (s *cliAppSuite) TestNamespaceDescribe_NamespaceNotExist() {
 	resp := describeNamespaceResponseServer
 	s.frontendClient.EXPECT().DescribeNamespace(gomock.Any(), gomock.Any()).Return(resp, serviceerror.NewNotFound(""))

diff --git a/tools/cli/namespaceCommands.go b/tools/cli/namespaceCommands.go
@@ -291,8 +291,15 @@ func (d *namespaceCLIImpl) DescribeNamespace(c *cli.Context) {
 	namespaceID := c.String(FlagNamespaceID)
 
 	if namespaceID == "" && namespace == "" {
-		ErrorAndExit("At least namespaceId or namespace must be provided.", nil)
+		ErrorAndExit("At least namespace_id or namespace must be provided.", nil)
 	}
+	if c.GlobalIsSet(FlagNamespace) && namespaceID != "" {
+		ErrorAndExit("Only one of namespace_id or namespace must be provided.", nil)
+	}
+	if namespaceID != "" {
+		namespace = ""
+	}
+
 	ctx, cancel := newContext(c)
 	defer cancel()
 	resp, err := d.describeNamespace(ctx, &workflowservice.DescribeNamespaceRequest{