From 4614a0f070441deaadba74903ed590bddda662f6 Mon Sep 17 00:00:00 2001 From: Paulo Truta Date: Sun, 20 Jun 2021 22:04:12 +0000 Subject: [PATCH] Added utils.WriteOption and refactor, added enablePublicDashb0oard --- internal/edgeapps/edgeapps.go | 2 + internal/tasks/tasks.go | 106 ++++------------------------------ internal/utils/utils.go | 24 ++++++++ 3 files changed, 36 insertions(+), 96 deletions(-) diff --git a/internal/edgeapps/edgeapps.go b/internal/edgeapps/edgeapps.go index f4624ab..b34c5b8 100644 --- a/internal/edgeapps/edgeapps.go +++ b/internal/edgeapps/edgeapps.go @@ -341,6 +341,8 @@ func EnablePublicDashboard(InternetURL string) bool { env, _ := godotenv.Unmarshal("INTERNET_URL=" + InternetURL) _ = godotenv.Write(env, envFilePath) + buildFrameworkContainers() + return true } diff --git a/internal/tasks/tasks.go b/internal/tasks/tasks.go index 378415f..ccdf58c 100644 --- a/internal/tasks/tasks.go +++ b/internal/tasks/tasks.go @@ -415,6 +415,9 @@ func taskEnablePublicDashboard(args taskEnablePublicDashboardArgs) string { fmt.Println("Enabling taskEnablePublicDashboard") result := edgeapps.EnablePublicDashboard(args.InternetURL) if result { + + utils.WriteOption("PUBLIC_DASHBOARD", "true") + return "{result: true}" } @@ -424,10 +427,11 @@ func taskEnablePublicDashboard(args taskEnablePublicDashboardArgs) string { } func taskDisablePublicDashboard() string { - + fmt.Println("Executing taskDisablePublicDashboard") result := edgeapps.DisablePublicDashboard() if result { + utils.WriteOption("PUBLIC_DASBOARD", "false") return "{result: true}" } return "{result: false}" @@ -438,25 +442,7 @@ func taskSetReleaseVersion() string { fmt.Println("Executing taskSetReleaseVersion") - db, err := sql.Open("sqlite3", utils.GetSQLiteDbConnectionDetails()) - - if err != nil { - log.Fatal(err.Error()) - } - - statement, err := db.Prepare("REPLACE into option (name, value, created, updated) VALUES (?, ?, ?, ?);") // Prepare SQL Statement - if err != nil { - log.Fatal(err.Error()) - } - - formatedDatetime := utils.GetSQLiteFormattedDateTime(time.Now()) - - _, err = statement.Exec("RELEASE_VERSION", diagnostics.Version, formatedDatetime, formatedDatetime) // Execute SQL Statement - if err != nil { - log.Fatal(err.Error()) - } - - db.Close() + utils.WriteOption("RELEASE_VERSION", diagnostics.Version) return diagnostics.Version } @@ -468,25 +454,7 @@ func taskGetEdgeApps() string { edgeApps := edgeapps.GetEdgeApps() edgeAppsJSON, _ := json.Marshal(edgeApps) - db, err := sql.Open("sqlite3", utils.GetSQLiteDbConnectionDetails()) - - if err != nil { - log.Fatal(err.Error()) - } - - statement, err := db.Prepare("REPLACE into option (name, value, created, updated) VALUES (?, ?, ?, ?);") // Prepare SQL Statement - if err != nil { - log.Fatal(err.Error()) - } - - formatedDatetime := utils.GetSQLiteFormattedDateTime(time.Now()) - - _, err = statement.Exec("EDGEAPPS_LIST", string(edgeAppsJSON), formatedDatetime, formatedDatetime) // Execute SQL Statement - if err != nil { - log.Fatal(err.Error()) - } - - db.Close() + utils.WriteOption("EDGEAPPS_LIST", string(edgeAppsJSON)) return string(edgeAppsJSON) @@ -497,25 +465,7 @@ func taskGetSystemUptime() string { uptime := system.GetUptimeInSeconds() - db, err := sql.Open("sqlite3", utils.GetSQLiteDbConnectionDetails()) - - if err != nil { - log.Fatal(err.Error()) - } - - statement, err := db.Prepare("REPLACE into option (name, value, created, updated) VALUES (?, ?, ?, ?);") // Prepare SQL Statement - if err != nil { - log.Fatal(err.Error()) - } - - formatedDatetime := utils.GetSQLiteFormattedDateTime(time.Now()) - - _, err = statement.Exec("SYSTEM_UPTIME", uptime, formatedDatetime, formatedDatetime) // Execute SQL Statement - if err != nil { - log.Fatal(err.Error()) - } - - db.Close() + utils.WriteOption("SYSTEM_UPTIME", uptime) return uptime @@ -527,25 +477,7 @@ func taskGetStorageDevices() string { devices := storage.GetDevices(diagnostics.Version) devicesJSON, _ := json.Marshal(devices) - db, err := sql.Open("sqlite3", utils.GetSQLiteDbConnectionDetails()) - - if err != nil { - log.Fatal(err.Error()) - } - - statement, err := db.Prepare("REPLACE into option (name, value, created, updated) VALUES (?, ?, ?, ?);") // Prepare SQL Statement - if err != nil { - log.Fatal(err.Error()) - } - - formatedDatetime := utils.GetSQLiteFormattedDateTime(time.Now()) - - _, err = statement.Exec("STORAGE_DEVICES_LIST", devicesJSON, formatedDatetime, formatedDatetime) // Execute SQL Statement - if err != nil { - log.Fatal(err.Error()) - } - - db.Close() + utils.WriteOption("STORAGE_DEVICES_LIST", string(devicesJSON)) return string(devicesJSON) @@ -556,25 +488,7 @@ func taskGetSystemIP() string { ip := system.GetIP() - db, err := sql.Open("sqlite3", utils.GetSQLiteDbConnectionDetails()) - - if err != nil { - log.Fatal(err.Error()) - } - - statement, err := db.Prepare("REPLACE into option (name, value, created, updated) VALUES (?, ?, ?, ?);") // Prepare SQL Statement - if err != nil { - log.Fatal(err.Error()) - } - - formatedDatetime := utils.GetSQLiteFormattedDateTime(time.Now()) - - _, err = statement.Exec("IP_ADDRESS", ip, formatedDatetime, formatedDatetime) // Execute SQL Statement - if err != nil { - log.Fatal(err.Error()) - } - - db.Close() + utils.WriteOption("IP_ADDRESS", ip) return ip } diff --git a/internal/utils/utils.go b/internal/utils/utils.go index 996c0ea..195e1d4 100644 --- a/internal/utils/utils.go +++ b/internal/utils/utils.go @@ -3,6 +3,7 @@ package utils import ( "bufio" "bytes" + "database/sql" "fmt" "io" "log" @@ -145,3 +146,26 @@ func GetPath(pathKey string) string { return targetPath } + +func WriteOption(optionKey string, optionValue string) { + + db, err := sql.Open("sqlite3", GetSQLiteDbConnectionDetails()) + + if err != nil { + log.Fatal(err.Error()) + } + + statement, err := db.Prepare("REPLACE into option (name, value, created, updated) VALUES (?, ?, ?, ?);") // Prepare SQL Statement + if err != nil { + log.Fatal(err.Error()) + } + + formatedDatetime := GetSQLiteFormattedDateTime(time.Now()) + + _, err = statement.Exec(optionKey, optionValue, formatedDatetime, formatedDatetime) // Execute SQL Statement + if err != nil { + log.Fatal(err.Error()) + } + + db.Close() +}