Skip to content

Commit

Permalink
Rename CreateClient, fix doc
Browse files Browse the repository at this point in the history
  • Loading branch information
aaron-congo committed Mar 21, 2024
1 parent 7aad421 commit 8126d7b
Show file tree
Hide file tree
Showing 5 changed files with 21 additions and 22 deletions.
4 changes: 2 additions & 2 deletions go/api/cluster_client.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ type RedisClusterClient struct {
*baseClient
}

// CreateClusterClient creates a Redis client in cluster mode using the given [RedisClusterClientConfiguration].
func CreateClusterClient(config *RedisClusterClientConfiguration) (*RedisClusterClient, error) {
// NewRedisClusterClient creates a Redis client in cluster mode using the given [RedisClusterClientConfiguration].
func NewRedisClusterClient(config *RedisClusterClientConfiguration) (*RedisClusterClient, error) {
client, err := createClient(config)
if err != nil {
return nil, err
Expand Down
3 changes: 1 addition & 2 deletions go/api/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -140,8 +140,7 @@ func (strategy *BackoffStrategy) toProtobuf() *protobuf.ConnectionRetryStrategy
}
}

// RedisClientConfiguration represents the configuration settings for a Standalone Redis client. baseClientConfiguration is an
// embedded struct that contains shared settings for standalone and cluster clients.
// RedisClientConfiguration represents the configuration settings for a Standalone Redis client.
type RedisClientConfiguration struct {
baseClientConfiguration
reconnectStrategy *BackoffStrategy
Expand Down
4 changes: 2 additions & 2 deletions go/api/standalone_client.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ type RedisClient struct {
*baseClient
}

// CreateClient creates a Redis client in standalone mode using the given [RedisClientConfiguration].
func CreateClient(config *RedisClientConfiguration) (*RedisClient, error) {
// NewRedisClient creates a Redis client in standalone mode using the given [RedisClientConfiguration].
func NewRedisClient(config *RedisClientConfiguration) (*RedisClient, error) {
client, err := createClient(config)
if err != nil {
return nil, err
Expand Down
24 changes: 12 additions & 12 deletions go/examples/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,24 +3,24 @@
package main

import (
"log"
"log"

"github.com/aws/glide-for-redis/go/glide/api"
"github.com/aws/glide-for-redis/go/glide/api"
)

func main() {
host := "localhost"
port := 6379
host := "localhost"
port := 6379

config := api.NewRedisClientConfiguration().
WithAddress(&api.NodeAddress{Host: host, Port: port})
config := api.NewRedisClientConfiguration().
WithAddress(&api.NodeAddress{Host: host, Port: port})

client, err := api.CreateClient(config)
if err != nil {
log.Fatal("error connecting to database: ", err)
}
client, err := api.NewRedisClient(config)
if err != nil {
log.Fatal("error connecting to database: ", err)
}

// TODO: Add example commands as they are implemented
// TODO: Add example commands as they are implemented

client.Close()
client.Close()
}
8 changes: 4 additions & 4 deletions go/integTest/connection_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (
func (suite *GlideTestSuite) TestStandaloneConnect() {
config := api.NewRedisClientConfiguration().
WithAddress(&api.NodeAddress{Port: suite.standalonePorts[0]})
client, err := api.CreateClient(config)
client, err := api.NewRedisClient(config)

assert.Nil(suite.T(), err)
assert.NotNil(suite.T(), client)
Expand All @@ -24,7 +24,7 @@ func (suite *GlideTestSuite) TestClusterConnect() {
config.WithAddress(&api.NodeAddress{Port: port})
}

client, err := api.CreateClusterClient(config)
client, err := api.NewRedisClusterClient(config)

assert.Nil(suite.T(), err)
assert.NotNil(suite.T(), client)
Expand All @@ -36,7 +36,7 @@ func (suite *GlideTestSuite) TestClusterConnect_singlePort() {
config := api.NewRedisClusterClientConfiguration().
WithAddress(&api.NodeAddress{Port: suite.clusterPorts[0]})

client, err := api.CreateClusterClient(config)
client, err := api.NewRedisClusterClient(config)

assert.Nil(suite.T(), err)
assert.NotNil(suite.T(), client)
Expand All @@ -47,7 +47,7 @@ func (suite *GlideTestSuite) TestClusterConnect_singlePort() {
func (suite *GlideTestSuite) TestConnectWithInvalidAddress() {
config := api.NewRedisClientConfiguration().
WithAddress(&api.NodeAddress{Host: "invalid-host"})
client, err := api.CreateClient(config)
client, err := api.NewRedisClient(config)

assert.Nil(suite.T(), client)
assert.NotNil(suite.T(), err)
Expand Down

0 comments on commit 8126d7b

Please sign in to comment.