Add namespace to search attributes operations requests (#346)

cli/config.go

@@ -68,7 +68,7 @@ func EnvProperty(c *cli.Context) error {
 
 	env, key := envKey(fullKey)
 
-	val := tctlConfig.EnvProperty(env, key)
+	val, _ := tctlConfig.EnvProperty(env, key)
 	fmt.Println(val)
 
 	return nil
@@ -148,7 +148,7 @@ func populateFlagsFunc(command *cli.Command, globalFlags []cli.Flag) func(ctx *c
 
 			for _, c := range ctx.Lineage() {
 				if !c.IsSet(name) {
-					value := tctlConfig.EnvProperty(tctlConfig.CurrentEnv, name)
+					value, _ := tctlConfig.EnvProperty(tctlConfig.CurrentEnv, name)
 					if value != "" {
 						c.Set(name, value)
 					}

cli/search_attribute_commands.go

@@ -43,11 +43,15 @@ const (
 
 // ListSearchAttributes lists search attributes
 func ListSearchAttributes(c *cli.Context) error {
+	namespace := c.String(FlagNamespace)
 	client := cFactory.OperatorClient(c)
 	ctx, cancel := newContext(c)
 	defer cancel()
 
-	resp, err := client.ListSearchAttributes(ctx, &operatorservice.ListSearchAttributesRequest{})
+	resp, err := client.ListSearchAttributes(
+		ctx,
+		&operatorservice.ListSearchAttributesRequest{Namespace: namespace},
+	)
 	if err != nil {
 		return fmt.Errorf("unable to list search attributes: %w", err)
 	}
@@ -75,6 +79,7 @@ func ListSearchAttributes(c *cli.Context) error {
 
 // AddSearchAttributes to add search attributes
 func AddSearchAttributes(c *cli.Context) error {
+	namespace := c.String(FlagNamespace)
 	names := c.StringSlice(FlagName)
 	typeStrs := c.StringSlice(FlagType)
 
@@ -125,6 +130,7 @@ func AddSearchAttributes(c *cli.Context) error {
 
 	request := &operatorservice.AddSearchAttributesRequest{
 		SearchAttributes: searchAttributes,
+		Namespace:        namespace,
 	}
 
 	ctx, cancel = newContextWithTimeout(c, addSearchAttributesTimeout)
@@ -139,6 +145,7 @@ func AddSearchAttributes(c *cli.Context) error {
 
 // RemoveSearchAttributes to add search attributes
 func RemoveSearchAttributes(c *cli.Context) error {
+	namespace := c.String(FlagNamespace)
 	names := c.StringSlice(FlagName)
 
 	promptMsg := fmt.Sprintf(
@@ -154,6 +161,7 @@ func RemoveSearchAttributes(c *cli.Context) error {
 	defer cancel()
 	request := &operatorservice.RemoveSearchAttributesRequest{
 		SearchAttributes: names,
+		Namespace:        namespace,
 	}
 
 	_, err := client.RemoveSearchAttributes(ctx, request)

cli_curr/adminCommands.go

@@ -589,7 +589,7 @@ func AdminListGossipMembers(c *cli.Context) {
 	}
 
 	members := response.MembershipInfo.Rings
-	if roleFlag != primitives.AllServices {
+	if roleFlag != string(primitives.AllServices) {
 		all := members
 
 		members = members[:0]

cli_curr/admin_cluster_search_attributes_commands.go

@@ -46,6 +46,7 @@ const (
 
 // AdminAddSearchAttributes to add search attributes
 func AdminAddSearchAttributes(c *cli.Context) {
+	namespace := getRequiredGlobalOption(c, FlagNamespace)
 	names := getRequiredStringSliceOption(c, FlagName)
 	typeStrs := getRequiredStringSliceOption(c, FlagType)
 
@@ -54,7 +55,7 @@ func AdminAddSearchAttributes(c *cli.Context) {
 	}
 
 	adminClient := cFactory.AdminClient(c)
-	existingSearchAttributes, err := getSearchAttributes(c, adminClient)
+	existingSearchAttributes, err := getSearchAttributes(c, adminClient, namespace)
 	if err != nil {
 		ErrorAndExit("Unable to get existing search attributes.", err)
 	}
@@ -105,6 +106,7 @@ func AdminAddSearchAttributes(c *cli.Context) {
 		SearchAttributes: searchAttributes,
 		IndexName:        c.String(FlagElasticsearchIndex),
 		SkipSchemaUpdate: c.Bool(FlagSkipSchemaUpdate),
+		Namespace:        namespace,
 	}
 
 	ctx, cancel := newContextWithTimeout(c, addSearchAttributesTimeout)
@@ -114,16 +116,12 @@ func AdminAddSearchAttributes(c *cli.Context) {
 		ErrorAndExit("Unable to add search attributes.", err)
 	}
 
-	resp, err := getSearchAttributes(c, adminClient)
-	if err != nil {
-		ErrorAndExit("Search attributes have been added successfully but there was an error while reading them back.", err)
-	}
-	printSearchAttributesResponse(resp, c.String(FlagElasticsearchIndex))
 	color.HiGreen("Search attributes have been added successfully.")
 }
 
 // AdminRemoveSearchAttributes to add search attributes
 func AdminRemoveSearchAttributes(c *cli.Context) {
+	namespace := getRequiredGlobalOption(c, FlagNamespace)
 	names := getRequiredStringSliceOption(c, FlagName)
 
 	// ask user for confirmation
@@ -139,25 +137,22 @@ func AdminRemoveSearchAttributes(c *cli.Context) {
 	request := &adminservice.RemoveSearchAttributesRequest{
 		SearchAttributes: names,
 		IndexName:        c.String(FlagElasticsearchIndex),
+		Namespace:        namespace,
 	}
 
 	_, err := adminClient.RemoveSearchAttributes(ctx, request)
 	if err != nil {
 		ErrorAndExit("Unable to remove search attributes.", err)
 	}
 
-	resp, err := getSearchAttributes(c, adminClient)
-	if err != nil {
-		ErrorAndExit("Search attributes have been removed successfully but there was an error while reading them back.", err)
-	}
-	printSearchAttributesResponse(resp, c.String(FlagElasticsearchIndex))
 	color.HiGreen("Search attributes have been removed successfully.")
 }
 
 // AdminGetSearchAttributes to print search attributes
 func AdminGetSearchAttributes(c *cli.Context) {
+	namespace := getRequiredGlobalOption(c, FlagNamespace)
 	adminClient := cFactory.AdminClient(c)
-	resp, err := getSearchAttributes(c, adminClient)
+	resp, err := getSearchAttributes(c, adminClient, namespace)
 	if err != nil {
 		ErrorAndExit("Unable to get search attributes.", err)
 	}
@@ -168,11 +163,16 @@ func AdminGetSearchAttributes(c *cli.Context) {
 	printSearchAttributesResponse(resp, c.String(FlagElasticsearchIndex))
 }
 
-func getSearchAttributes(c *cli.Context, adminClient adminservice.AdminServiceClient) (*adminservice.GetSearchAttributesResponse, error) {
+func getSearchAttributes(
+	c *cli.Context,
+	adminClient adminservice.AdminServiceClient,
+	namespace string,
+) (*adminservice.GetSearchAttributesResponse, error) {
 	ctx, cancel := newContext(c)
 	defer cancel()
 	request := &adminservice.GetSearchAttributesRequest{
 		IndexName: c.String(FlagElasticsearchIndex),
+		Namespace: namespace,
 	}
 	return adminClient.GetSearchAttributes(ctx, request)
 }

cli_curr/app_test.go

@@ -575,12 +575,15 @@ func (s *cliAppSuite) TestAdminAddSearchAttributes() {
 		SearchAttributes: map[string]enumspb.IndexedValueType{
 			"testKey": enumspb.INDEXED_VALUE_TYPE_KEYWORD,
 		},
+		Namespace: cliTestNamespace,
 	}
 	s.serverAdminClient.EXPECT().AddSearchAttributes(gomock.Any(), request)
 
-	getRequest := &adminservice.GetSearchAttributesRequest{}
+	getRequest := &adminservice.GetSearchAttributesRequest{
+		Namespace: cliTestNamespace,
+	}
 	getResponse := &adminservice.GetSearchAttributesResponse{}
-	s.serverAdminClient.EXPECT().GetSearchAttributes(gomock.Any(), getRequest).Return(getResponse, nil).Times(2)
+	s.serverAdminClient.EXPECT().GetSearchAttributes(gomock.Any(), getRequest).Return(getResponse, nil)
 
 	err := s.app.Run([]string{"", "--auto_confirm", "--ns", cliTestNamespace, "admin", "cl", "asa", "--name", "testKey", "--type", "keyword"})
 	s.Nil(err)
@@ -589,18 +592,18 @@ func (s *cliAppSuite) TestAdminAddSearchAttributes() {
 func (s *cliAppSuite) TestAdminRemoveSearchAttributes() {
 	request := &adminservice.RemoveSearchAttributesRequest{
 		SearchAttributes: []string{"testKey"},
+		Namespace:        cliTestNamespace,
 	}
 	s.serverAdminClient.EXPECT().RemoveSearchAttributes(gomock.Any(), request)
 
-	getRequest := &adminservice.GetSearchAttributesRequest{}
-	s.serverAdminClient.EXPECT().GetSearchAttributes(gomock.Any(), getRequest)
-
 	err := s.app.Run([]string{"", "--auto_confirm", "--ns", cliTestNamespace, "admin", "cl", "rsa", "--name", "testKey"})
 	s.Nil(err)
 }
 
 func (s *cliAppSuite) TestAdminGetSearchAttributes() {
-	getRequest := &adminservice.GetSearchAttributesRequest{}
+	getRequest := &adminservice.GetSearchAttributesRequest{
+		Namespace: cliTestNamespace,
+	}
 	s.serverAdminClient.EXPECT().GetSearchAttributes(gomock.Any(), getRequest)
 
 	err := s.app.Run([]string{"", "--ns", cliTestNamespace, "admin", "cl", "gsa"})

cli_curr/namespaceCommands.go

@@ -39,17 +39,13 @@ import (
 	"go.temporal.io/api/serviceerror"
 	"go.temporal.io/api/workflowservice/v1"
 
-	"go.temporal.io/server/common/namespace"
 	"go.temporal.io/server/common/primitives/timestamp"
 )
 
 type (
 	namespaceCLIImpl struct {
 		// used when making RPC call to frontend service``
 		frontendClient workflowservice.WorkflowServiceClient
-
-		// act as admin to modify namespace in DB directly
-		namespaceHandler namespace.Handler
 	}
 )
 
@@ -58,21 +54,8 @@ func newNamespaceCLI(
 	c *cli.Context,
 	isAdminMode bool,
 ) *namespaceCLIImpl {
-
-	var frontendClient workflowservice.WorkflowServiceClient
-	var namespaceHandler namespace.Handler
-	if !isAdminMode {
-		frontendClient = initializeFrontendClient(c)
-	} else {
-		var err error
-		namespaceHandler, err = initializeAdminNamespaceHandler(c)
-		if err != nil {
-			ErrorAndExit("Unable to initialize admin namespace handler", err)
-		}
-	}
 	return &namespaceCLIImpl{
-		frontendClient:   frontendClient,
-		namespaceHandler: namespaceHandler,
+		frontendClient: initializeFrontendClient(c),
 	}
 }
 
@@ -433,7 +416,7 @@ func (d *namespaceCLIImpl) listNamespaces(
 		return d.frontendClient.ListNamespaces(ctx, request)
 	}
 
-	return d.namespaceHandler.ListNamespaces(ctx, request)
+	return d.frontendClient.ListNamespaces(ctx, request)
 }
 
 func (d *namespaceCLIImpl) registerNamespace(
@@ -445,7 +428,7 @@ func (d *namespaceCLIImpl) registerNamespace(
 		return err
 	}
 
-	_, err := d.namespaceHandler.RegisterNamespace(ctx, request)
+	_, err := d.frontendClient.RegisterNamespace(ctx, request)
 	return err
 }
 
@@ -458,7 +441,7 @@ func (d *namespaceCLIImpl) updateNamespace(
 		return err
 	}
 
-	_, err := d.namespaceHandler.UpdateNamespace(ctx, request)
+	_, err := d.frontendClient.UpdateNamespace(ctx, request)
 	return err
 }
 
@@ -471,7 +454,7 @@ func (d *namespaceCLIImpl) describeNamespace(
 		return d.frontendClient.DescribeNamespace(ctx, request)
 	}
 
-	resp, err := d.namespaceHandler.DescribeNamespace(ctx, request)
+	resp, err := d.frontendClient.DescribeNamespace(ctx, request)
 	return resp, err
 }