Extracted Cache dependencies

cmd/go-mtg-vk/main.go

@@ -28,7 +28,7 @@ func main() {
 		GroupId:            groupId,
 		ConfirmationString: os.Getenv("VK_CONFIRMATION_STRING"),
 		DictPath:           "./assets/additional_cards.json",
-		Cache:              caching.GetClient(),
+		Cache:              caching.NewClient("redis:6379", "", time.Hour*24, 0),
 		InfoFetcher:        &cardsinfo.Fetcher{},
 	}
 

internal/caching/cache_test.go

@@ -11,11 +11,11 @@ import (
 )
 
 func TestGetClient(t *testing.T) {
-	c := GetClient()
+	c := NewClient("addr", "123", time.Hour, 1)
-	assert.Equal(t, CacheExpiration, c.Expiration)
+	assert.Equal(t, time.Hour, c.Expiration)
-	assert.Equal(t, 0, c.Storage.Options().DB)
+	assert.Equal(t, 1, c.Storage.Options().DB)
-	assert.Equal(t, HostName, c.Storage.Options().Addr)
+	assert.Equal(t, "addr", c.Storage.Options().Addr)
-	assert.Equal(t, Password, c.Storage.Options().Password)
+	assert.Equal(t, "123", c.Storage.Options().Password)
 }
 
 func TestGetSet(t *testing.T) {

internal/caching/client.go

@@ -10,19 +10,15 @@ type CacheClient struct {
 	Expiration time.Duration
 }
 
-func GetClient() *CacheClient {
+func NewClient(addr string, passwd string, expiration time.Duration, db int) *CacheClient {
-	client := new(CacheClient)
+	return &CacheClient{
-	client.Init()
+		Storage: redis.NewClient(&redis.Options{
-	return client
+			Addr:     addr,
+			Password: passwd,
+			DB:       db,
+		}),
+		Expiration: expiration,
 	}
-
-func (client *CacheClient) Init() {
-	client.Storage = redis.NewClient(&redis.Options{
-		Addr:     HostName,
-		Password: Password,
-		DB:       0,
-	})
-	client.Expiration = CacheExpiration
 }
 
 func (client *CacheClient) Set(key string, value string) {

internal/caching/secrets.go

@@ -1,9 +0,0 @@
-package caching
-
-import (
-	"time"
-)
-
-const HostName = "redis:6379"
-const Password = ""
-const CacheExpiration = time.Hour * 24