🎄 xmas present

redis/config.go

@@ -1,111 +1,52 @@
 package redis
 
-import (
-	"context"
-	"crypto/tls"
-	"net"
-	"time"
-
-	"github.com/go-redis/redis/v8"
-)
-
-// Config defines the config for redis storage.
+// Config defines the config for storage.
 type Config struct {
-	// Custom options
+	// Host name where the DB is hosted
+	//
+	// Optional. Default is "127.0.0.1"
+	Host string
 
-	// https://pkg.go.dev/github.com/go-redis/redis/v8#Options
+	// Port where the DB is listening on
+	//
+	// Optional. Default is 3306
+	Port int
 
-	// The network type, either tcp or unix.
-	// Default is tcp.
-	Network string
-
-	// host:port address.
-	Addr string
-
-	// Dialer creates new network connection and has priority over
-	// Network and Addr options.
-	Dialer func(ctx context.Context, network, addr string) (net.Conn, error)
-
-	// Hook that is called when new connection is established.
-	OnConnect func(ctx context.Context, cn *redis.Conn) error
-
-	// Use the specified Username to authenticate the current connection
-	// with one of the connections defined in the ACL list when connecting
-	// to a Redis 6.0 instance, or greater, that is using the Redis ACL system.
+	// Server username
+	//
+	// Optional. Default is ""
 	Username string
-	// Optional password. Must match the password specified in the
-	// requirepass server configuration option (if connecting to a Redis 5.0 instance, or lower),
-	// or the User Password when connecting to a Redis 6.0 instance, or greater,
-	// that is using the Redis ACL system.
+
+	// Server password
+	//
+	// Optional. Default is ""
 	Password string
 
 	// Database to be selected after connecting to the server.
-	DB int
+	//
+	// Optional. Default is 0
+	Database int
 
-	// Maximum number of retries before giving up.
-	// Default is 3 retries.
-	MaxRetries int
+	// Clear any existing keys in existing Collection
+	//
+	// Optional. Default is false
+	Clear bool
 
-	// Minimum backoff between each retry.
-	// Default is 8 milliseconds; -1 disables backoff.
-	MinRetryBackoff time.Duration
+	////////////////////////////////////
+	// Adaptor related config options //
+	////////////////////////////////////
 
-	// Maximum backoff between each retry.
-	// Default is 512 milliseconds; -1 disables backoff.
-	MaxRetryBackoff time.Duration
-
-	// Dial timeout for establishing new connections.
-	// Default is 5 seconds.
-	DialTimeout time.Duration
-
-	// Timeout for socket reads. If reached, commands will fail
-	// with a timeout instead of blocking. Use value -1 for no timeout and 0 for default.
-	// Default is 3 seconds.
-	ReadTimeout time.Duration
-
-	// Timeout for socket writes. If reached, commands will fail
-	// with a timeout instead of blocking.
-	// Default is ReadTimeout.
-	WriteTimeout time.Duration
-
-	// Maximum number of socket connections.
-	// Default is 10 connections per every CPU as reported by runtime.NumCPU.
-	PoolSize int
-
-	// Minimum number of idle connections which is useful when establishing
-	// new connection is slow.
-	MinIdleConns int
-
-	// Connection age at which client retires (closes) the connection.
-	// Default is to not close aged connections.
-	MaxConnAge time.Duration
-
-	// Amount of time client waits for connection if all connections
-	// are busy before returning an error.
-	// Default is ReadTimeout + 1 second.
-	PoolTimeout time.Duration
-
-	// Amount of time after which client closes idle connections.
-	// Should be less than server's timeout.
-	// Default is 5 minutes. -1 disables idle timeout check.
-	IdleTimeout time.Duration
-
-	// Frequency of idle checks made by idle connections reaper.
-	// Default is 1 minute. -1 disables idle connections reaper,
-	// but idle connections are still discarded by the client
-	// if IdleTimeout is set.
-	IdleCheckFrequency time.Duration
-
-	// TLS Config to use. When set TLS will be negotiated.
-	TLSConfig *tls.Config
-
-	// Limiter interface used to implemented circuit breaker or rate limiter.
-	Limiter redis.Limiter
+	// https://pkg.go.dev/github.com/go-redis/redis/v8#Options
 }
 
 // ConfigDefault is the default config
 var ConfigDefault = Config{
-	Addr: "127.0.0.1:6379",
+	Host:     "127.0.0.1",
+	Port:     6379,
+	Username: "",
+	Password: "",
+	Database: 0,
+	Clear:    false,
 }
 
 // Helper function to set default values
@@ -119,8 +60,11 @@ func configDefault(config ...Config) Config {
 	cfg := config[0]
 
 	// Set default values
-	if cfg.Addr == "" {
-		cfg.Addr = ConfigDefault.Addr
+	if cfg.Host == "" {
+		cfg.Host = ConfigDefault.Host
+	}
+	if cfg.Port <= 0 {
+		cfg.Port = ConfigDefault.Port
 	}
 	return cfg
 }