Modify getEnv for getMeilisearchHost

meilisearch · Jul 28, 2022 · 3204cfc · 3204cfc
1 parent 02321b8
commit 3204cfc
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 15 deletions.
diff --git a/client_test.go b/client_test.go
@@ -1090,7 +1090,7 @@ func TestClient_GenerateTenantToken(t *testing.T) {
 			args: args{
 				IndexUID: "TestGenerateTenantTokenWithoutApiKey",
 				client: NewClient(ClientConfig{
-					Host:   meilisearchHost,
+					Host:   getMeilisearchHost(),
 					APIKey: "",
 				}),
 				APIKeyUID: GetPrivateUIDKey(),
@@ -1173,7 +1173,7 @@ func TestClient_GenerateTenantToken(t *testing.T) {
 				}
 
 				client := NewClient(ClientConfig{
-					Host:   meilisearchHost,
+					Host:   getMeilisearchHost(),
 					APIKey: token,
 				})
 

diff --git a/main_test.go b/main_test.go
@@ -11,8 +11,6 @@ import (
 	"github.com/valyala/fasthttp"
 )
 
-var meilisearchHost = getenv("MEILISEARCH_HOST", "http://localhost:7700")
-
 type docTest struct {
 	ID   string `json:"id"`
 	Name string `json:"name"`
@@ -25,10 +23,10 @@ type docTestBooks struct {
 	Year   int    `json:"year"`
 }
 
-func getenv(key, fallback string) string {
-	value := os.Getenv(key)
+func getMeilisearchHost() string {
+	value := os.Getenv("MEILISEARCH_HOST")
 	if len(value) == 0 {
-		return fallback
+		return "http://localhost:7700"
 	}
 	return value
 }
@@ -115,7 +113,7 @@ func GetPrivateUIDKey() (key string) {
 
 func SetUpEmptyIndex(index *IndexConfig) (resp *Index, err error) {
 	client := NewClient(ClientConfig{
-		Host:   meilisearchHost,
+		Host:   getMeilisearchHost(),
 		APIKey: masterKey,
 	})
 	task, err := client.CreateIndex(index)
@@ -132,7 +130,7 @@ func SetUpEmptyIndex(index *IndexConfig) (resp *Index, err error) {
 
 func SetUpBasicIndex(indexUID string) {
 	client := NewClient(ClientConfig{
-		Host:   meilisearchHost,
+		Host:   getMeilisearchHost(),
 		APIKey: masterKey,
 	})
 	index := client.Index(indexUID)
@@ -158,7 +156,7 @@ func SetUpBasicIndex(indexUID string) {
 
 func SetUpIndexWithNestedFields(indexUID string) {
 	client := NewClient(ClientConfig{
-		Host:   meilisearchHost,
+		Host:   getMeilisearchHost(),
 		APIKey: masterKey,
 	})
 	index := client.Index(indexUID)
@@ -185,7 +183,7 @@ func SetUpIndexWithNestedFields(indexUID string) {
 
 func SetUpIndexForFaceting() {
 	client := NewClient(ClientConfig{
-		Host:   meilisearchHost,
+		Host:   getMeilisearchHost(),
 		APIKey: masterKey,
 	})
 	index := client.Index("indexUID")
@@ -226,7 +224,7 @@ func SetUpIndexForFaceting() {
 var (
 	masterKey     = "masterKey"
 	defaultClient = NewClient(ClientConfig{
-		Host:   meilisearchHost,
+		Host:   getMeilisearchHost(),
 		APIKey: masterKey,
 	})
 	defaultRankingRules = []string{
@@ -250,7 +248,7 @@ var (
 )
 
 var customClient = NewFastHTTPCustomClient(ClientConfig{
-	Host:   meilisearchHost,
+	Host:   getMeilisearchHost(),
 	APIKey: masterKey,
 },
 	&fasthttp.Client{
@@ -259,13 +257,13 @@ var customClient = NewFastHTTPCustomClient(ClientConfig{
 	})
 
 var timeoutClient = NewClient(ClientConfig{
-	Host:    meilisearchHost,
+	Host:    getMeilisearchHost(),
 	APIKey:  masterKey,
 	Timeout: 1,
 })
 
 var privateClient = NewClient(ClientConfig{
-	Host:   meilisearchHost,
+	Host:   getMeilisearchHost(),
 	APIKey: GetPrivateKey(),
 })