Move config to separate package, update tests and add TGX-CLIENT header, update package version.

Author: Illicitus

config.go renamed to config/config.go

@@ -1,4 +1,4 @@
-package go_sdk
+package config
 
 import (
 	"github.com/joho/godotenv"
@@ -7,7 +7,7 @@ import (
 )
 
 const (
-	Version = "v0.1.2"
+	Version = "0.2.0"
 )
 
 type TestConfig struct {
@@ -17,12 +17,16 @@ type TestConfig struct {
 
 var TestCfg *TestConfig
 
-func GetTestConfig() *TestConfig {
+func GetTestConfig(envPath ...string) *TestConfig {
 	if TestCfg != nil {
 		return TestCfg
 	}
 
-	InitEnv()
+	if len(envPath) > 0 {
+		InitEnv(envPath[0])
+	} else {
+		InitEnv()
+	}
 
 	TestCfg = &TestConfig{
 		SandboxURL:   getEnvString("TEST_SANDBOX_URL", ""),
@@ -32,9 +36,15 @@ func GetTestConfig() *TestConfig {
 	return TestCfg
 }
 
-func InitEnv() {
-	if err := godotenv.Load("../.env"); err != nil {
-		log.Print(".env file not found")
+func InitEnv(envPath ...string) {
+	if len(envPath) > 0 {
+		if err := godotenv.Load(envPath[0]); err != nil {
+			log.Print(".env file not found")
+		}
+	} else {
+		if err := godotenv.Load(); err != nil {
+			log.Print(".env file not found")
+		}
 	}
 }
 

net/http/http.go

@@ -4,6 +4,7 @@ import (
 	"errors"
 	"fmt"
 	"github.com/tradologics/go-sdk/backtest"
+	"github.com/tradologics/go-sdk/config"
 	"io"
 	"log"
 	_http "net/http"
@@ -95,13 +96,17 @@ func (c *Client) processRequest(method, url, contentType string, body io.Reader,
 		return nil, err
 	}
 
+	// Set auth header
 	if _, ok := req.Header["Authorization"]; !ok {
 		if Token == "" && !IsBacktest {
 			return nil, errors.New("please use `SetToken(...)` first")
 		}
 		req.Header.Set("Authorization", fmt.Sprintf("Bearer %s", Token))
 	}
 
+	// Set client version header
+	req.Header.Set("TGX-CLIENT", fmt.Sprintf("go-sdk/%s", config.Version))
+
 	if strings.HasSuffix(req.URL.Path, "/") {
 		req.URL.Path = req.URL.Path[:len(req.URL.Path)-1]
 	}

net/http/http_test.go

@@ -6,6 +6,7 @@ import (
 	"fmt"
 	"github.com/stretchr/testify/assert"
 	"github.com/tradologics/go-sdk/backtest"
+	"github.com/tradologics/go-sdk/config"
 	"io"
 	"log"
 	"reflect"
@@ -15,7 +16,10 @@ import (
 
 const invalidErrorMsg = "invalid response"
 
-const token = ""
+func authInit() {
+	cfg := config.GetTestConfig("../../.env")
+	SetToken(cfg.SandboxToken)
+}
 
 func turnOnBacktestModel() {
 	err := SetBacktestMode("2021-01-01 21:00:00.000000", "2021-01-08 21:00:00.000000")
@@ -39,7 +43,7 @@ func removeBacktestMode() {
 }
 
 func removeToken() {
-	Token = ""
+	SetToken("")
 }
 
 func cls(b io.ReadCloser) {
@@ -130,7 +134,7 @@ func TestTradologicsGetWithEmptyToken(t *testing.T) {
 }
 
 func TestTradologicsGetWithToken(t *testing.T) {
-	SetToken(token)
+	authInit()
 	defer removeToken()
 
 	res, err := Get("/me")
@@ -192,7 +196,7 @@ func TestTradologicsPostWithEmptyToken(t *testing.T) {
 }
 
 func TestTradologicsPostWithToken(t *testing.T) {
-	SetToken(token)
+	authInit()
 	defer removeToken()
 
 	payload, err := json.Marshal(map[string]interface{}{
@@ -277,7 +281,7 @@ func TestTradologicsNewRequestWithEmptyToken(t *testing.T) {
 }
 
 func TestTradologicsNewRequestWithToken(t *testing.T) {
-	SetToken(token)
+	authInit()
 	defer removeToken()
 
 	payload, err := json.Marshal(map[string]interface{}{

sandbox/sandbox.go

@@ -2,7 +2,7 @@ package sandbox
 
 import (
 	"fmt"
-	go_sdk "github.com/tradologics/go-sdk"
+	"github.com/tradologics/go-sdk/config"
 	"io/ioutil"
 	"log"
 	"net/http"
@@ -36,7 +36,7 @@ func Tradehook(kind string, strategy func(string, []byte), args map[string]inter
 
 	// Add user auth token and client version
 	req.Header.Set("Authorization", fmt.Sprintf("Bearer %s", Token))
-	req.Header.Set("TGX-CLIENT", fmt.Sprintf("go-sdk/%s", go_sdk.Version))
+	req.Header.Set("TGX-CLIENT", fmt.Sprintf("go-sdk/%s", config.Version))
 
 	if len(args) > 0 {
 		values := req.URL.Query()

sandbox/sandbox_test.go

@@ -3,7 +3,7 @@ package sandbox
 import (
 	"encoding/json"
 	"github.com/stretchr/testify/assert"
-	go_sdk "github.com/tradologics/go-sdk"
+	"github.com/tradologics/go-sdk/config"
 	"testing"
 	"time"
 )
@@ -63,7 +63,7 @@ type orderPayload struct {
 }
 
 func authInit() {
-	cfg := go_sdk.GetTestConfig()
+	cfg := config.GetTestConfig("../.env")
 	setSandboxURL(cfg.SandboxURL)
 	SetToken(cfg.SandboxToken)
 }
@@ -106,7 +106,7 @@ func TestTradehookValidToken(t *testing.T) {
 }
 
 func TestTradehookInvalidToken(t *testing.T) {
-	cfg := go_sdk.GetTestConfig()
+	cfg := config.GetTestConfig()
 	setSandboxURL(cfg.SandboxURL)
 	SetToken("")