Go: Fix ClientGetName and ClientSetName (valkey-io#4088)

Co-authored-by: Yury-Fridlyand <yury.fridlyand@improving.com>

Author: edlng

CHANGELOG.md

@@ -119,6 +119,7 @@
 * Add support for Intel MAC (x86_64/amd64) ([#3482](https://github.com/valkey-io/valkey-glide/pull/3482))
 * Go, Java: Fix response handling for `customCommand` API for cluster client ([#3593](https://github.com/valkey-io/valkey-glide/pull/3593))
 * Java: Bump `netty` version ([#3804](https://github.com/valkey-io/valkey-glide/pull/3804))
+* Go: `ClientGetName` returns a nullable string ([#4088](https://github.com/valkey-io/valkey-glide/pull/4088))
 
 #### Operational Enhancements
 

go/connection_management_cluster_commands_test.go

@@ -94,7 +94,7 @@ func ExampleClusterClient_ClientSetName() {
 	if err != nil {
 		fmt.Println("Glide example failed with an error: ", err)
 	}
-	fmt.Println(result.SingleValue())
+	fmt.Println(result)
 
 	// Output: OK
 }
@@ -107,7 +107,7 @@ func ExampleClusterClient_ClientGetName() {
 	if err != nil {
 		fmt.Println("Glide example failed with an error: ", err)
 	}
-	fmt.Println(result.SingleValue() == connectionName)
+	fmt.Println(result.Value() == connectionName)
 
 	// Output: true
 }
@@ -120,7 +120,7 @@ func ExampleClusterClient_ClientSetNameWithOptions() {
 	if err != nil {
 		fmt.Println("Glide example failed with an error: ", err)
 	}
-	fmt.Println(result.SingleValue())
+	fmt.Println(result)
 
 	// Output: OK
 }
@@ -134,7 +134,7 @@ func ExampleClusterClient_ClientGetNameWithOptions() {
 	if err != nil {
 		fmt.Println("Glide example failed with an error: ", err)
 	}
-	fmt.Println(result.SingleValue() == connectionName)
+	fmt.Println(result.SingleValue().Value() == connectionName)
 
 	// Output: true
 }

go/connection_management_commands_test.go

@@ -76,7 +76,7 @@ func ExampleClient_ClientGetName() {
 	if err != nil {
 		fmt.Println("Glide example failed with an error: ", err)
 	}
-	fmt.Println(result == connectionName)
+	fmt.Println(result.Value() == connectionName)
 
 	// Output: true
 }

go/glide_client.go

@@ -566,15 +566,16 @@ func (client *Client) ConfigResetStat(ctx context.Context) (string, error) {
 //
 // Return value:
 //
-//	The name of the client connection as a string if a name is set, or nil if  no name is assigned.
+//	If a name is set, returns the name of the client connection as a models.Result[string].
+//	Otherwise, returns [models.CreateNilStringResult()] if no name is assigned.
 //
 // [valkey.io]: https://valkey.io/commands/client-getname/
-func (client *Client) ClientGetName(ctx context.Context) (string, error) {
+func (client *Client) ClientGetName(ctx context.Context) (models.Result[string], error) {
 	result, err := client.executeCommand(ctx, C.ClientGetName, []string{})
 	if err != nil {
-		return models.DefaultStringResponse, err
+		return models.CreateNilStringResult(), err
 	}
-	return handleStringResponse(result)
+	return handleStringOrNilResponse(result)
 }
 
 // Set the name of the current connection.

go/glide_cluster_client.go

@@ -1154,16 +1154,16 @@ func (client *ClusterClient) ConfigGetWithOptions(ctx context.Context,
 //	OK - when connection name is set
 //
 // [valkey.io]: https://valkey.io/commands/client-setname/
-func (client *ClusterClient) ClientSetName(ctx context.Context, connectionName string) (models.ClusterValue[string], error) {
+func (client *ClusterClient) ClientSetName(ctx context.Context, connectionName string) (string, error) {
 	response, err := client.executeCommand(ctx, C.ClientSetName, []string{connectionName})
 	if err != nil {
-		return models.CreateEmptyClusterValue[string](), err
+		return models.DefaultStringResponse, err
 	}
 	data, err := handleOkResponse(response)
 	if err != nil {
-		return models.CreateEmptyClusterValue[string](), err
+		return models.DefaultStringResponse, err
 	}
-	return models.CreateClusterSingleValue[string](data), nil
+	return data, nil
 }
 
 // Set the name of the current connection.
@@ -1183,27 +1183,20 @@ func (client *ClusterClient) ClientSetName(ctx context.Context, connectionName s
 func (client *ClusterClient) ClientSetNameWithOptions(ctx context.Context,
 	connectionName string,
 	opts options.RouteOption,
-) (models.ClusterValue[string], error) {
+) (string, error) {
 	response, err := client.executeCommandWithRoute(ctx, C.ClientSetName, []string{connectionName}, opts.Route)
 	if err != nil {
-		return models.CreateEmptyClusterValue[string](), err
-	}
-	if opts.Route != nil &&
-		(opts.Route).IsMultiNode() {
-		data, err := handleStringToStringMapResponse(response)
-		if err != nil {
-			return models.CreateEmptyClusterValue[string](), err
-		}
-		return models.CreateClusterMultiValue[string](data), nil
+		return models.DefaultStringResponse, err
 	}
 	data, err := handleOkResponse(response)
 	if err != nil {
-		return models.CreateEmptyClusterValue[string](), err
+		return models.DefaultStringResponse, err
 	}
-	return models.CreateClusterSingleValue[string](data), nil
+	return data, nil
 }
 
 // Gets the name of the current connection.
+// The command will be routed to a random node.
 //
 // See [valkey.io] for details.
 //
@@ -1213,19 +1206,20 @@ func (client *ClusterClient) ClientSetNameWithOptions(ctx context.Context,
 //
 // Return value:
 //
-//	The name of the client connection as a string if a name is set, or nil if  no name is assigned.
+//	If a name is set, returns the name of the client connection as a models.Result[string].
+//	Otherwise, returns [models.CreateNilStringResult()] if no name is assigned.
 //
 // [valkey.io]: https://valkey.io/commands/client-getname/
-func (client *ClusterClient) ClientGetName(ctx context.Context) (models.ClusterValue[string], error) {
+func (client *ClusterClient) ClientGetName(ctx context.Context) (models.Result[string], error) {
 	response, err := client.executeCommand(ctx, C.ClientGetName, []string{})
 	if err != nil {
-		return models.CreateEmptyClusterValue[string](), err
+		return models.CreateNilStringResult(), err
 	}
-	data, err := handleStringResponse(response)
+	data, err := handleStringOrNilResponse(response)
 	if err != nil {
-		return models.CreateEmptyClusterValue[string](), err
+		return models.CreateNilStringResult(), err
 	}
-	return models.CreateClusterSingleValue[string](data), nil
+	return data, nil
 }
 
 // Gets the name of the current connection.
@@ -1240,30 +1234,31 @@ func (client *ClusterClient) ClientGetName(ctx context.Context) (models.ClusterV
 //
 // Return value:
 //
-//	The name of the client connection as a string if a name is set, or nil if  no name is assigned.
+//	If a name is set, returns the name of the client connection as a ClusterValue wrapped models.Result[string].
+//	Otherwise, returns [models.CreateEmptyClusterValue[models.Result[string]]()] if no name is assigned.
 //
 // [valkey.io]: https://valkey.io/commands/client-getname/
 func (client *ClusterClient) ClientGetNameWithOptions(
 	ctx context.Context,
 	opts options.RouteOption,
-) (models.ClusterValue[string], error) {
+) (models.ClusterValue[models.Result[string]], error) {
 	response, err := client.executeCommandWithRoute(ctx, C.ClientGetName, []string{}, opts.Route)
 	if err != nil {
-		return models.CreateEmptyClusterValue[string](), err
+		return models.CreateEmptyClusterValue[models.Result[string]](), err
 	}
 	if opts.Route != nil &&
 		(opts.Route).IsMultiNode() {
-		data, err := handleStringToStringMapResponse(response)
+		data, err := handleStringToStringOrNilMapResponse(response)
 		if err != nil {
-			return models.CreateEmptyClusterValue[string](), err
+			return models.CreateEmptyClusterValue[models.Result[string]](), err
 		}
-		return models.CreateClusterMultiValue[string](data), nil
+		return models.CreateClusterMultiValue[models.Result[string]](data), nil
 	}
-	data, err := handleStringResponse(response)
+	data, err := handleStringOrNilResponse(response)
 	if err != nil {
-		return models.CreateEmptyClusterValue[string](), err
+		return models.CreateEmptyClusterValue[models.Result[string]](), err
 	}
-	return models.CreateClusterSingleValue[string](data), nil
+	return models.CreateClusterSingleValue[models.Result[string]](data), nil
 }
 
 // Rewrites the configuration file with the current configuration.

go/integTest/cluster_commands_test.go

@@ -1312,14 +1312,51 @@ func (suite *GlideTestSuite) TestConfigSetGetWithOptions() {
 	}
 }
 
+func (suite *GlideTestSuite) TestClusterClientGetName() {
+	client := suite.defaultClusterClient()
+	t := suite.T()
+
+	response, err := client.ClientGetName(context.Background())
+	assert.NoError(t, err)
+	assert.True(t, response.IsNil())
+}
+
+func (suite *GlideTestSuite) TestClusterClientGetNameWithRoute() {
+	client := suite.defaultClusterClient()
+	t := suite.T()
+
+	route := config.Route(config.RandomRoute)
+	opts := options.RouteOption{Route: route}
+
+	response, err := client.ClientGetNameWithOptions(context.Background(), opts)
+	assert.NoError(t, err)
+	assert.True(t, response.IsSingleValue())
+	assert.True(t, response.SingleValue().IsNil())
+}
+
+func (suite *GlideTestSuite) TestClusterClientGetNameWithMultiNodeRoutes() {
+	client := suite.defaultClusterClient()
+	t := suite.T()
+
+	route := config.Route(config.AllPrimaries)
+	opts := options.RouteOption{Route: route}
+
+	response, err := client.ClientGetNameWithOptions(context.Background(), opts)
+	assert.NoError(t, err)
+	assert.True(t, response.IsMultiValue())
+	for _, value := range response.MultiValue() {
+		assert.True(t, value.IsNil())
+	}
+}
+
 func (suite *GlideTestSuite) TestClientSetGetName() {
 	client := suite.defaultClusterClient()
 	t := suite.T()
 	connectionName := "ConnectionName-" + uuid.NewString()
 	client.ClientSetName(context.Background(), connectionName)
 	response, err := client.ClientGetName(context.Background())
 	assert.NoError(t, err)
-	assert.True(t, response.IsSingleValue())
+	assert.Equal(t, connectionName, response.Value())
 }
 
 func (suite *GlideTestSuite) TestClientSetGetNameWithRoute() {
@@ -1330,22 +1367,32 @@ func (suite *GlideTestSuite) TestClientSetGetNameWithRoute() {
 	opts := options.RouteOption{Route: nil}
 	connectionName := "ConnectionName-" + uuid.NewString()
 	response, err := client.ClientSetNameWithOptions(context.Background(), connectionName, opts)
+	suite.verifyOK(response, err)
+	response2, err := client.ClientGetNameWithOptions(context.Background(), opts)
 	assert.NoError(t, err)
-	assert.True(t, response.IsSingleValue())
-	response, err = client.ClientGetNameWithOptions(context.Background(), opts)
-	assert.NoError(t, err)
-	assert.True(t, response.IsSingleValue())
+	assert.True(t, response2.IsSingleValue())
 
 	// same sections with random route
 	connectionName = "ConnectionName-" + uuid.NewString()
 	route := config.Route(config.RandomRoute)
 	opts = options.RouteOption{Route: route}
 	response, err = client.ClientSetNameWithOptions(context.Background(), connectionName, opts)
+	suite.verifyOK(response, err)
+	response2, err = client.ClientGetNameWithOptions(context.Background(), opts)
 	assert.NoError(t, err)
-	assert.True(t, response.IsSingleValue())
-	response, err = client.ClientGetNameWithOptions(context.Background(), opts)
+	assert.True(t, response2.IsSingleValue())
+
+	// same sections with multinode routes
+	connectionName = "ConnectionName-" + uuid.NewString()
+	route = config.Route(config.AllPrimaries)
+	opts = options.RouteOption{Route: route}
+	response, err = client.ClientSetNameWithOptions(context.Background(), connectionName, opts)
+	suite.verifyOK(response, err)
+	response2, err = client.ClientGetNameWithOptions(context.Background(), opts)
 	assert.NoError(t, err)
-	assert.True(t, response.IsSingleValue())
+	for _, data := range response2.MultiValue() {
+		assert.Equal(t, connectionName, data.Value())
+	}
 }
 
 func (suite *GlideTestSuite) TestConfigRewriteCluster() {

go/integTest/standalone_commands_test.go

@@ -836,14 +836,23 @@ func (suite *GlideTestSuite) TestConfigResetStat() {
 	suite.verifyOK(client.ConfigResetStat(context.Background()))
 }
 
+func (suite *GlideTestSuite) TestClientGetName() {
+	client := suite.defaultClient()
+	t := suite.T()
+
+	result, err := client.ClientGetName(context.Background())
+	assert.Nil(t, err)
+	assert.True(t, result.IsNil())
+}
+
 func (suite *GlideTestSuite) TestClientGetSetName() {
 	client := suite.defaultClient()
 	t := suite.T()
 
 	suite.verifyOK(client.ClientSetName(context.Background(), "ConnectionName"))
 	result, err := client.ClientGetName(context.Background())
 	assert.Nil(t, err)
-	assert.Equal(t, result, "ConnectionName")
+	assert.Equal(t, result.Value(), "ConnectionName")
 }
 
 func (suite *GlideTestSuite) TestMove() {

go/internal/interfaces/connection_management_cluster_commands.go

@@ -27,15 +27,18 @@ type ConnectionManagementClusterCommands interface {
 
 	ClientIdWithOptions(ctx context.Context, routeOptions options.RouteOption) (models.ClusterValue[int64], error)
 
-	ClientSetName(ctx context.Context, connectionName string) (models.ClusterValue[string], error)
+	ClientSetName(ctx context.Context, connectionName string) (string, error)
 
 	ClientSetNameWithOptions(
 		ctx context.Context,
 		connectionName string,
 		routeOptions options.RouteOption,
-	) (models.ClusterValue[string], error)
+	) (string, error)
 
-	ClientGetName(ctx context.Context) (models.ClusterValue[string], error)
+	ClientGetName(ctx context.Context) (models.Result[string], error)
 
-	ClientGetNameWithOptions(ctx context.Context, routeOptions options.RouteOption) (models.ClusterValue[string], error)
+	ClientGetNameWithOptions(
+		ctx context.Context,
+		routeOptions options.RouteOption,
+	) (models.ClusterValue[models.Result[string]], error)
 }

go/internal/interfaces/connection_management_commands.go

@@ -23,7 +23,7 @@ type ConnectionManagementCommands interface {
 
 	ClientId(ctx context.Context) (int64, error)
 
-	ClientGetName(ctx context.Context) (string, error)
+	ClientGetName(ctx context.Context) (models.Result[string], error)
 
 	ClientSetName(ctx context.Context, connectionName string) (string, error)
 }

go/response_handlers.go

@@ -742,6 +742,33 @@ func handleStringToStringMapResponse(response *C.struct_CommandResponse) (map[st
 	return result, nil
 }
 
+func handleStringToStringOrNilMapResponse(response *C.struct_CommandResponse) (map[string]models.Result[string], error) {
+	defer C.free_command_response(response)
+
+	typeErr := checkResponseType(response, C.Map, false)
+	if typeErr != nil {
+		return nil, typeErr
+	}
+
+	data, err := parseMap(response)
+	if err != nil {
+		return nil, err
+	}
+	aMap := data.(map[string]any)
+	result := map[string]models.Result[string]{}
+
+	// Transform into Result[string]
+	for nodeAddr, nodeData := range aMap {
+		if nodeData == nil {
+			result[nodeAddr] = models.CreateNilStringResult()
+			continue
+		}
+		result[nodeAddr] = models.CreateStringResult(nodeData.(string))
+	}
+
+	return result, nil
+}
+
 func handleStringToStringArrayMapOrNilResponse(
 	response *C.struct_CommandResponse,
 ) (map[string][]string, error) {