jpt/edgeboxctl
1
0
Fork 0
mirror of https://github.com/edgebox-iot/edgeboxctl.git synced 2026-09-24 05:41:43 +02:00
Code Issues Packages Projects Releases Wiki Activity

GetPath improvements (#20)

Browse Source 
* Use named variables for getting path
Fixed bug with env var

* Fix test

* Use utils to get paths
This commit is contained in:
Malachi Soord
2022-10-08 18:41:37 +02:00
committed by GitHub
parent 83d2fdcae1
commit 0680b7ffb9
7 changed files with 56 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files
internal/utils/utils.go
+13 -7
View File
@@ -81,7 +81,7 @@ func DeleteEmptySlices(s []string) []string {
func GetSQLiteDbConnectionDetails() string {
var apiEnv map[string]string
apiEnv, err := godotenv.Read(GetPath("apiEnvFileLocation"))
apiEnv, err := godotenv.Read(GetPath(ApiEnvFileLocation))
if err != nil {
log.Fatal("Error loading .env file")
@@ -100,6 +100,12 @@ func GetSQLiteFormattedDateTime(t time.Time) string {
return formatedDatetime
}
const CloudEnvFileLocation string = "cloudEnvFileLocation"
const ApiEnvFileLocation string = "apiEnvFileLocation"
const ApiPath string = "apiPath"
const EdgeAppsPath string = "edgeAppsPath"
const WsPath string = "wsPath"
// GetPath : Returns either the hardcoded path, or a overwritten value via .env file at project root. Register paths here for seamless working code between dev and prod environments ;)
func GetPath(pathKey string) string {
@@ -113,7 +119,7 @@ func GetPath(pathKey string) string {
}
switch pathKey {
case "cloudEnvFileLocation":
case CloudEnvFileLocation:
if env["CLOUD_ENV_FILE_LOCATION"] != "" {
targetPath = env["CLOUD_ENV_FILE_LOCATION"]
@@ -121,7 +127,7 @@ func GetPath(pathKey string) string {
targetPath = "/home/system/components/edgeboxctl/cloud.env"
}
case "apiEnvFileLocation":
case ApiEnvFileLocation:
if env["API_ENV_FILE_LOCATION"] != "" {
targetPath = env["API_ENV_FILE_LOCATION"]
@@ -129,15 +135,15 @@ func GetPath(pathKey string) string {
targetPath = "/home/system/components/api/edgebox.env"
}
case "apiPath":
case ApiPath:
if env["API_PATH"] != "" {
targetPath = env["APT_PATH"]
targetPath = env["API_PATH"]
} else {
targetPath = "/home/system/components/api/"
}
case "edgeAppsPath":
case EdgeAppsPath:
if env["EDGEAPPS_PATH"] != "" {
targetPath = env["EDGEAPPS_PATH"]
@@ -145,7 +151,7 @@ func GetPath(pathKey string) string {
targetPath = "/home/system/components/apps/"
}
case "wsPath":
case WsPath:
if env["WS_PATH"] != "" {
targetPath = env["WS_PATH"]
internal/utils/utils_test.go
+1 -2
View File
@@ -89,8 +89,7 @@ func TestGetPath(t *testing.T) {
t.Fail()
}
validPathKey := "wsPath"
result = GetPath(validPathKey)
result = GetPath(WsPath)
if result != "/home/system/components/ws/" {
t.Log("Expected /home/system/components/ws/ but got", result)
t.Fail()