Enable codecov

.github/dependabot.yml

@@ -1,10 +0,0 @@
-version: 2
-updates:
-  - package-ecosystem: "gomod" 
-    directory: "/"
-    schedule:
-      interval: "weekly"
-  - package-ecosystem: "github-actions"
-    directory: "/"
-    schedule:
-      interval: "weekly"

.github/workflows/go.yml

@@ -13,16 +13,16 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: Set up Go
-      uses: actions/setup-go@v4
+      uses: actions/setup-go@v2
       with:
-        go-version: '1.20.2'
+        go-version: ^1.15
     - name: Check out code
-      uses: actions/checkout@v4
+      uses: actions/checkout@v2
     - name: Build
       run: make build
     - name: Test
       run: make test-with-coverage
-    # - uses: codecov/codecov-action@v1
+    - uses: codecov/codecov-action@v1
-    #   with:
+      with:
-    #     token: ${{ secrets.CODECOV_TOKEN }}
+        token: ${{ secrets.CODECOV_TOKEN }}
-    #     files: coverage.out
+        files: coverage.out

.gitignore

@@ -21,6 +21,3 @@ main
 # Build
 
 /bin
-
-# Logs from executed scripts
-/scripts/output.log

Dockerfile

@@ -1,9 +1,11 @@
-FROM golang:1.20.2
+FROM golang:latest
 
 WORKDIR /app
 
 COPY ./ /app
 
-RUN go install github.com/githubnemo/CompileDaemon@latest
+RUN go mod download
 
-ENTRYPOINT CompileDaemon --build="make build" --command=./bin/edgeboxctl-$(go env GOOS)-$(go env GOARCH)
+RUN go get github.com/githubnemo/CompileDaemon
+
+ENTRYPOINT CompileDaemon --build="make build" --command=./bin/edgeboxctl

Makefile

@@ -1,13 +1,9 @@
-.DEFAULT_GOAL := build
+PROJECT?=github.com/edgebox-iot/edgeboxctl
 
-PROJECT ?= github.com/edgebox-iot/edgeboxctl
 RELEASE ?= dev
 COMMIT := $(shell git rev-parse --short HEAD)
 BUILD_DATE := $(shell date -u '+%Y-%m-%d_%H:%M:%S')
 BUILD_DIR = bin
-GOOS := $(shell go env GOOS)
-GOARCH := $(shell go env GOARCH)
-
 
 build-all:
 	GOOS=linux GOARCH=amd64 make build
@@ -19,16 +15,6 @@ build-prod:
 build-cloud:
 	GOOS=linux GOARCH=amd64 RELEASE=cloud make build
 
-build-arm64:
-	GOOS=linux GOARCH=arm64 RELEASE=prod make build
-
-build-armhf:
-	GOOS=linux GOARCH=arm RELEASE=prod make build
-
-build-amd64:
-	GOOS=linux GOARCH=amd64 RELEASE=prod make build
-
-
 build:
 	@echo "Building ${GOOS}-${GOARCH}"
 	GOOS=${GOOS} GOARCH=${GOARCH} go build \
@@ -36,6 +22,7 @@ build:
 		-X ${PROJECT}/internal/diagnostics.Commit=${COMMIT} \
 		-X ${PROJECT}/internal/diagnostics.BuildDate=${BUILD_DATE}" \
 		-o bin/edgeboxctl-${GOOS}-${GOARCH} ${PROJECT}/cmd/edgeboxctl
+	cp ./bin/edgeboxctl-${GOOS}-${GOARCH} ./bin/edgeboxctl
 
 clean:
 	rm -rf ${BUILD_DIR}
@@ -46,28 +33,3 @@ test:
 
 test-with-coverage:
 	go test -tags=unit -timeout=600s -v ./... -coverprofile=coverage.out
-
-install:
-	sudo systemctl stop edgeboxctl || true
-	sudo rm -rf /usr/local/bin/edgeboxctl /usr/local/sbin/edgeboctl /lib/systemd/system/edgeboxctl.service
-	sudo cp ./bin/edgeboxctl-${GOOS}-${GOARCH} /usr/local/bin/edgeboxctl
-	sudo cp ./bin/edgeboxctl-${GOOS}-${GOARCH} /usr/local/sbin/edgeboxctl
-	sudo cp ./edgeboxctl.service /lib/systemd/system/edgeboxctl.service
-	sudo systemctl daemon-reload
-	@echo "Edgeboxctl installed successfully"
-	@echo "To start edgeboxctl run: systemctl start edgeboxctl"
-
-install-prod: build-prod install
-install-cloud: build-cloud install
-install-arm64: build-arm64 install
-install-armhf: build-armhf install
-install-amd64: build-amd64 install
-
-start:
-	systemctl start edgeboxctl
-
-stop:
-	systemctl stop edgeboxctl
-
-log: start
-	journalctl -fu edgeboxctl

README.md

@@ -1,3 +1,21 @@
+
+<!-- PROJECT SHIELDS -->
+<!--
+*** Using markdown "reference style" links for readability.
+*** Reference links are enclosed in brackets [ ] instead of parentheses ( ).
+*** See the bottom of this document for the declaration of the reference variables
+*** for contributors-url, forks-url, etc. This is an optional, concise syntax you may use.
+*** https://www.markdownguide.org/basic-syntax/#reference-style-links
+-->
+[![Contributors][contributors-shield]][contributors-url]
+[![Forks][forks-shield]][forks-url]
+[![Stargazers][stars-shield]][stars-url]
+[![Issues][issues-shield]][issues-url]
+[![MIT License][license-shield]][license-url]
+[![LinkedIn][linkedin-shield]][linkedin-url]
+
+
+
 <!-- PROJECT LOGO -->
 <br />
 <p align="center">
@@ -8,7 +26,9 @@
   <h3 align="center">Edgebox Control Module</h3>
 
   <p align="center">
-    A System Control module written in Go. Its responsibility is to configure dependencies and perform system tasks, automatically on a schedule, or on demand.
+    A System Control module written in Go. Its resonsability is to configure dependencies and perform system tasks, automatically in a schedule, or by command.
+    <br />
+    <a href="https://github.com/github_username/edgeboxctl"><strong>Explore the docs »</strong></a>
     <br />
     <br />
     <a href="https://github.com/github_username/edgeboxctl/issues">Report Bug</a>
@@ -38,7 +58,9 @@
 <!-- ABOUT THE PROJECT -->
 ## About The Project
 
-Edgebox is an easy to configure and use system. It brings powerful features that go alongside or can even completely replace various services that you already use in the day-to-day.
+[![Edgebox Screen Shot][product-screenshot]](https://edgebox.co)
+
+Edgebox is a small box that connects alongside your home internet router. It brings powerful features that go alongside or can even completely replace various services that you already use in the day-to-day.
 
 
 ### Built With
@@ -56,15 +78,18 @@ To get a local copy up and running follow these simple steps.
 
 ### Prerequisites
 
-If you're running for development purposes, a docker container suffices, so make sure you have:
+If you're installing this to run natively in the system, you better be doing it inside of the [Development Virtual Machine](https://github.com/edgebox-iot/devm). This software can do destructive action in the system is is running. You've been warned.
 
-* docker
+If you're running for development purposes, a Docker container suffices, so make sure you have:
-* docker compose
+* Docker
+* Docker Compose
+```sh
+sudo apt-get install docker docker-compose
+```
 
 Check the following links for more info on [Docker](https://www.docker.com/) and [Docker Compose](https://docs.docker.com/compose/).
 
-Aditionally, `edgeboxctl` needs the following bash commands available wherever it runs:
+Aditionally, edgeboxctl needs the following bash commands available wherever it runs:
-
 * `arm-linux-gnueabi-gcc` (`sudo apt-get install gcc-arm*`)
 * `sh`
 * `rm`
@@ -116,4 +141,20 @@ Contributions are what make the open source community such an amazing place to b
 <!-- LICENSE -->
 ## License
 
-Distributed under the Elastic License 2.0. See `LICENSE` for more information.
+Distributed under the MIT License. See `LICENSE` for more information.
+
+
+<!-- MARKDOWN LINKS & IMAGES -->
+<!-- https://www.markdownguide.org/basic-syntax/#reference-style-links -->
+[contributors-shield]: https://img.shields.io/github/contributors/edgebox-iot/edgeboxctl.svg?style=flat-square
+[contributors-url]: https://github.com/edgebox-iot/edgeboxctl/graphs/contributors
+[forks-shield]: https://img.shields.io/github/forks/edgebox-iot/edgeboxctl.svg?style=flat-square
+[forks-url]: https://github.com/edgebox-iot/edgeboxctl/network/members
+[stars-shield]: https://img.shields.io/github/stars/edgebox-iot/edgeboxctl.svg?style=flat-square
+[stars-url]: https://github.com/edgebox-iot/edgeboxctl/stargazers
+[issues-shield]: https://img.shields.io/github/issues/edgebox-iot/edgeboxctl.svg?style=flat-square
+[issues-url]: https://github.com/edgebox-iot/edgeboxctl/issues
+[license-shield]: https://img.shields.io/github/license/edgebox-iot/edgeboxctl.svg?style=flat-square
+[license-url]: https://github.com/edgebox-iot/edgeboxctl/blob/master/LICENSE.txt
+[linkedin-shield]: https://img.shields.io/badge/-LinkedIn-black.svg?style=flat-square&logo=linkedin&colorB=555
+[linkedin-url]: https://linkedin.com/in/edgebox-iot

codecov.yml

@@ -1,4 +1,3 @@
-codecov:
-  require_ci_to_pass: no
-
 comment: false
+github_checks:
+  annotations: false

edgeboxctl.service

@@ -1,29 +0,0 @@
-[Unit]
-Description=Edgebox Control Module Service
-ConditionPathExists=/home/system/
-After=network.target
- 
-[Service]
-Type=simple
-User=root
-Group=root
-LimitNOFILE=1024
-
-Restart=on-failure
-RestartSec=10
-startLimitIntervalSec=60
-
-WorkingDirectory=/home/system/components/edgeboxctl
-ExecStart=edgeboxctl --name=edgebox-cloud
-
-# make sure log directory exists and owned by syslog
-PermissionsStartOnly=true
-ExecStartPre=/bin/mkdir -p /var/log/edgeboxctl
-ExecStartPre=/bin/chown root:root /var/log/edgeboxctl
-ExecStartPre=/bin/chmod 755 /var/log/edgeboxctl
-StandardOutput=syslog
-StandardError=syslog
-SyslogIdentifier=edgeboxctl
- 
-[Install]
-WantedBy=multi-user.target

internal/backups/backups.go

@@ -1,28 +0,0 @@
-package backups
-
-// import (
-// 	"fmt"
-// 	"os"
-// 	"path/filepath"
-// 	"strings"
-
-// 	"github.com/edgebox-iot/edgeboxctl/internal/diagnostics"
-// 	"github.com/edgebox-iot/edgeboxctl/internal/utils"
-// 	"github.com/shirou/gopsutil/disk"
-// )
-
-// Repository : Struct representing the backup repository of a device in the system
-type Repository struct {
-	ID         string 			`json:"id"`
-	FileCount  int64            `json:"file_count"`
-	Size       string           `json:"size"`
-	Snapshots  []Snapshot      	`json:"snapshots"`
-	Status     string     		`json:"status"`
-	// UsageStat  UsageStat        `json:"usage_stat"`
-}
-
-// Snapshot : Struct representing a single snapshot in the backup repository
-type Snapshot struct {
-	ID         string 			`json:"id"`
-	time 	   string           `json:"time"`
-}

internal/edgeapps/edgeapps.go

@@ -9,7 +9,6 @@ import (
 
 	"github.com/joho/godotenv"
 
-	"github.com/edgebox-iot/edgeboxctl/internal/system"
 	"github.com/edgebox-iot/edgeboxctl/internal/utils"
 )
 
@@ -23,9 +22,6 @@ type EdgeApp struct {
 	InternetAccessible bool             `json:"internet_accessible"`
 	NetworkURL         string           `json:"network_url"`
 	InternetURL        string           `json:"internet_url"`
-	Options			   []EdgeAppOption  `json:"options"`
-	NeedsConfig		   bool             `json:"needs_config"`
-	Login              EdgeAppLogin	 	`json:"login"`
 }
 
 // MaybeEdgeApp : Boolean flag for validation of edgeapp existance
@@ -46,29 +42,9 @@ type EdgeAppService struct {
 	IsRunning bool   `json:"is_running"`
 }
 
-type EdgeAppOption struct {
-	Key             string `json:"key"`
-	Value           string `json:"value"`
-	DefaultValue    string `json:"default_value"`
-	Format          string `json:"format"`
-	Description     string `json:"description"`
-	IsSecret        bool   `json:"is_secret"`
-	IsInstallLocked bool   `json:"is_install_locked"`
-}
-
-type EdgeAppLogin struct {
-	Enabled  bool   `json:"enabled"`
-	Username string `json:"username"`
-	Password string `json:"password"`
-}
-
 const configFilename = "/edgebox-compose.yml"
 const envFilename = "/edgebox.env"
-const optionsTemplateFilename = "/edgeapp.template.env"
-const optionsEnvFilename = "/edgeapp.env"
-const authEnvFilename = "/auth.env"
 const runnableFilename = "/.run"
-const appdataFoldername = "/appdata"
 const myEdgeAppServiceEnvFilename = "/myedgeapp.env"
 const defaultContainerOperationSleepTime time.Duration = time.Second * 10
 
@@ -86,7 +62,6 @@ func GetEdgeApp(ID string) MaybeEdgeApp {
 
 		edgeAppName := ID
 		edgeAppDescription := ""
-		edgeAppOptions := []EdgeAppOption{}
 
 		edgeAppEnv, err := godotenv.Read(utils.GetPath(utils.EdgeAppsPath) + ID + envFilename)
 
@@ -101,103 +76,6 @@ func GetEdgeApp(ID string) MaybeEdgeApp {
 			}
 		}
 
-		needsConfig := false
-		hasFilledOptions := false
-		edgeAppOptionsTemplate, err := godotenv.Read(utils.GetPath(utils.EdgeAppsPath) + ID + optionsTemplateFilename)
-		if err != nil {
-			log.Println("Error loading options template file for edgeapp " + edgeAppName)
-		} else {
-			// Try to read the edgeAppOptionsEnv file
-			edgeAppOptionsEnv, err := godotenv.Read(utils.GetPath(utils.EdgeAppsPath) + ID + optionsEnvFilename)
-			if err != nil {
-				log.Println("Error loading options env file for edgeapp " + edgeAppName)
-			} else {
-				hasFilledOptions = true
-			}
-
-			for key, value := range edgeAppOptionsTemplate {
-				
-				optionFilledValue := ""
-				if hasFilledOptions {
-					// Check if key exists in edgeAppOptionsEnv
-					optionFilledValue = edgeAppOptionsEnv[key]
-				}
-
-				format := ""
-				defaultValue := ""
-				description := ""
-				installLocked := false
-
-				// Parse value to separate by | and get the format, installLocked, description and default value
-				// Format is the first element
-				// InstallLocked is the second element
-				// Description is the third element
-				// Default value is the fourth element
-
-				valueSlices := strings.Split(value, "|")
-				if len(valueSlices) > 0 {
-					format = valueSlices[0]
-				}
-				if len(valueSlices) > 1 {
-					installLocked = valueSlices[1] == "true"
-				}
-				if len(valueSlices) > 2 {
-					description = valueSlices[2]
-				}
-				if len(valueSlices) > 3 {
-					defaultValue = valueSlices[3]
-				}
-
-				// // If value contains ">|", then get everything that is to the right of it as the description
-				// // and get everything between "<>" as the format
-				// if strings.Contains(value, ">|") {
-				// 	description = strings.Split(value, ">|")[1]
-				// 	// Check if description has default value. That would be everything that is to the right of the last "|"
-				// 	if strings.Contains(description, "|") {
-				// 		defaultValue = strings.Split(description, "|")[1]
-				// 		description = strings.Split(description, "|")[0]
-				// 	}
-
-				// 	value = strings.Split(value, ">|")[0]
-				// 	// Remove the initial < from value
-				// 	value = strings.TrimPrefix(value, "<")
-				// } else {
-				// 	// Trim initial < and final > from value
-				// 	value = strings.TrimPrefix(value, "<")
-				// 	value = strings.TrimSuffix(value, ">")
-				// }
-
-				isSecret := false
-
-				// Check if the lowercased key string contains the letters "pass", "secret", "key"
-				lowercaseKey := strings.ToLower(key)
-				// check if lowercaseInput contains "pass", "key", or "secret", or "token"
-				if strings.Contains(lowercaseKey, "pass") ||
-					strings.Contains(lowercaseKey, "key") ||
-					strings.Contains(lowercaseKey, "secret") ||
-					strings.Contains(lowercaseKey, "token") {
-					isSecret = true
-				}
-
-				currentOption := EdgeAppOption{
-					Key:             key,
-					Value:           optionFilledValue,
-					DefaultValue:    defaultValue,
-					Description:     description,
-					Format:          format,
-					IsSecret:        isSecret,
-					IsInstallLocked: installLocked,
-				}
-				edgeAppOptions = append(edgeAppOptions, currentOption)
-
-				if optionFilledValue == "" {
-					needsConfig = true
-				}
-
-			}
-		}
-
-
 		edgeAppInternetAccessible := false
 		edgeAppInternetURL := ""
 
@@ -211,21 +89,6 @@ func GetEdgeApp(ID string) MaybeEdgeApp {
 			}
 		}
 
-		edgeAppBasicAuthEnabled := false
-		edgeAppBasicAuthUsername := ""
-		edgeAppBasicAuthPassword := ""
-
-		edgeAppAuthEnv, err := godotenv.Read(utils.GetPath(utils.EdgeAppsPath) + ID + authEnvFilename)
-		if err != nil {
-			log.Println("No auth.env file found. Login status is disabled.")
-		} else {
-			if edgeAppAuthEnv["USERNAME"] != "" && edgeAppAuthEnv["PASSWORD"] != "" {
-				edgeAppBasicAuthEnabled = true
-				edgeAppBasicAuthUsername = edgeAppAuthEnv["USERNAME"]
-				edgeAppBasicAuthPassword = edgeAppAuthEnv["PASSWORD"]
-			}
-		}
-
 		result = MaybeEdgeApp{
 			EdgeApp: EdgeApp{
 				ID:                 ID,
@@ -234,12 +97,8 @@ func GetEdgeApp(ID string) MaybeEdgeApp {
 				Status:             GetEdgeAppStatus(ID),
 				Services:           GetEdgeAppServices(ID),
 				InternetAccessible: edgeAppInternetAccessible,
-				NetworkURL:         ID + "." + system.GetHostname() + ".local",
+				NetworkURL:         ID + ".edgebox.local",
 				InternetURL:        edgeAppInternetURL,
-				Options: 		    edgeAppOptions,
-				NeedsConfig:        needsConfig,
-				Login:				EdgeAppLogin{edgeAppBasicAuthEnabled, edgeAppBasicAuthUsername, edgeAppBasicAuthPassword},
-				
 			},
 			Valid: true,
 		}
@@ -294,40 +153,11 @@ func SetEdgeAppInstalled(ID string) bool {
 
 func SetEdgeAppNotInstalled(ID string) bool {
 
-	// Stop the app first
-	StopEdgeApp(ID)
-
-	// Now remove any files
 	result := true
-	
 	err := os.Remove(utils.GetPath(utils.EdgeAppsPath) + ID + runnableFilename)
 	if err != nil {
 		result = false
-		log.Println(err)
+		log.Fatal(err)
-	}
-
-	err = os.Remove(utils.GetPath(utils.EdgeAppsPath) + ID + authEnvFilename)
-	if err != nil {
-		result = false
-		log.Println(err)
-	}
-
-	err = os.RemoveAll(utils.GetPath(utils.EdgeAppsPath) + ID + appdataFoldername)
-	if err != nil {
-		result = false
-		log.Println(err)
-	}
-
-	err = os.Remove(utils.GetPath(utils.EdgeAppsPath) + ID + myEdgeAppServiceEnvFilename)
-	if err != nil {
-		result = false
-		log.Println(err)
-	}
-
-	err = os.Remove(utils.GetPath(utils.EdgeAppsPath) + ID + optionsEnvFilename)
-	if err != nil {
-		result = false
-		log.Println(err)
 	}
 
 	buildFrameworkContainers()
@@ -416,24 +246,12 @@ func GetEdgeAppServices(ID string) []EdgeAppService {
 	var edgeAppServices []EdgeAppService
 
 	for _, serviceID := range serviceSlices {
-		shouldBeRunning := false
-		isRunning := false
-
-		// Is service "runnable" when .run lockfile in the app folder
-		_, err := os.Stat(utils.GetPath(utils.EdgeAppsPath) + ID + runnableFilename)
-		if !os.IsNotExist(err) {
-			shouldBeRunning = true
-		}
-
-		// Check if the service is actually running
-		if shouldBeRunning {
 		cmdArgs = []string{"-f", wsPath + "/docker-compose.yml", "exec", "-T", serviceID, "echo", "'Service Check'"}
 		cmdResult := utils.Exec(wsPath, "docker-compose", cmdArgs)
+		isRunning := false
 		if cmdResult != "" {
 			isRunning = true
 		}
-		}
-
 		edgeAppServices = append(edgeAppServices, EdgeAppService{ID: serviceID, IsRunning: isRunning})
 	}
 
@@ -478,36 +296,6 @@ func StopEdgeApp(ID string) EdgeAppStatus {
 
 }
 
-// StopAllEdgeApps: Stops all EdgeApps and returns a count of how many were stopped
-func StopAllEdgeApps() int {
-	edgeApps := GetEdgeApps()
-	appCount := 0
-	for _, edgeApp := range edgeApps {
-		StopEdgeApp(edgeApp.ID)
-		appCount++
-	}
-
-	return appCount
-
-}
-
-// StartAllEdgeApps: Starts all EdgeApps and returns a count of how many were started
-func StartAllEdgeApps() int {	
-	edgeApps := GetEdgeApps()
-	appCount := 0
-	for _, edgeApp := range edgeApps {
-		RunEdgeApp(edgeApp.ID)
-		appCount++
-	}
-
-	return appCount
-
-}
-
-func RestartEdgeAppsService() {
-	buildFrameworkContainers()
-}
-
 // EnableOnline : Write environment file and rebuild the necessary containers. Rebuilds containers in project (in case of change only)
 func EnableOnline(ID string, InternetURL string) MaybeEdgeApp {
 

internal/storage/storage.go

@@ -2,7 +2,6 @@ package storage
 
 import (
 	"fmt"
-	"strconv"
 	"os"
 	"path/filepath"
 	"strings"
@@ -74,13 +73,12 @@ const (
 	DISK_TYPE_SDA   DeviceIdentifier = "sda"
 	DISK_TYPE_MCBLK DeviceIdentifier = "mmcblk0"
 	DISK_TYPE_VDA   DeviceIdentifier = "vda"
-	MIN_DISK_SIZE   int              = 1048576 // 1GB in bytes
 )
 
 func GetDeviceIdentifier(release_version diagnostics.ReleaseVersion) DeviceIdentifier {
 	switch release_version {
 	case diagnostics.CLOUD_VERSION:
-		return DISK_TYPE_SDA
+		return DISK_TYPE_VDA
 	case diagnostics.PROD_VERSION:
 		return DISK_TYPE_MCBLK
 	}
@@ -136,13 +134,7 @@ func GetDevices(release_version diagnostics.ReleaseVersion) []Device {
 				currentDevice.InUse = currentDeviceInUseFlag
 				currentDeviceInUseFlag = false
 				currentPartitions = []Partition{}
-				size, err := strconv.Atoi(currentDevice.Size)
-				if err != nil {
-					size = 0
-				}
-				if size > MIN_DISK_SIZE {
 				devices = append(devices, currentDevice)
-				}
 			} else {
 				firstDevice = false
 			}
@@ -201,22 +193,8 @@ func GetDevices(release_version diagnostics.ReleaseVersion) []Device {
 		currentDevice.Status.Description = "Not configured"
 	}
 	currentDevice.InUse = currentDeviceInUseFlag
-
-	fmt.Println("Secondary Storage Devices Found: ", len(devices))
-	fmt.Println("Main Storage Device size: ", currentDevice.Size)
-
-	// only append device if size > 1GB
-	if currentDevice.Size != "" && currentDevice.Size != "0" {
-		// Convert size to int
-		// Convert string to int
-		size, err := strconv.Atoi(currentDevice.Size)
-		if err != nil {
-			size = 0
-		}
-		if size > MIN_DISK_SIZE {
 	devices = append([]Device{currentDevice}, devices...) // Prepending the first device...
-		}
+
-	}
 	devices = getDevicesSpaceUsage(devices)
 
 	return devices

internal/system/system.go

@@ -4,14 +4,6 @@ import (
 	"fmt"
 	"strconv"
 	"strings"
-	"log"
-	"os"
-	"io"
-	"os/exec"
-	"bufio"
-	"path/filepath"
-	"io/ioutil"
-	"encoding/json"
 
 	"github.com/edgebox-iot/edgeboxctl/internal/utils"
 
@@ -19,12 +11,6 @@ import (
 	"github.com/shirou/gopsutil/host"
 )
 
-type cloudflaredTunnelJson struct {
-	AccountTag string `json:"AccountTag"`
-	TunnelSecret string `json:"TunnelSecret"`
-	TunnelID string `json:"TunnelID"`
-}
-
 // GetUptimeInSeconds: Returns a value (as string) of the total system uptime
 func GetUptimeInSeconds() string {
 	uptime, _ := host.Uptime()
@@ -92,22 +78,6 @@ func SetupCloudOptions() {
 		utils.WriteOption("EMAIL", cloudEnv["EMAIL"])
 	}
 
-	if cloudEnv["USERNAME"] != "" {
-		utils.WriteOption("USERNAME", cloudEnv["USERNAME"])
-	}
-
-	if cloudEnv["CLUSTER"] != "" {
-		utils.WriteOption("CLUSTER", cloudEnv["CLUSTER"])
-	}
-
-	if cloudEnv["CLUSTER_IP"] != "" {
-		utils.WriteOption("CLUSTER_IP", cloudEnv["CLUSTER_IP"])
-	}
-
-	if cloudEnv["CLUSTER_SSH_PORT"] != "" {
-		utils.WriteOption("CLUSTER_SSH_PORT", cloudEnv["CLUSTER_SSH_PORT"])
-	}
-
 	if cloudEnv["EDGEBOXIO_API_TOKEN"] != "" {
 		utils.WriteOption("EDGEBOXIO_API_TOKEN", cloudEnv["EDGEBOXIO_API_TOKEN"])
 	}
@@ -115,404 +85,3 @@ func SetupCloudOptions() {
 	// In the end of this operation takes place, remove the env file as to not overwrite any options once they are set.
 	utils.Exec("/", "rm", []string{cloudEnvFileLocationPath})
 }
-
-func StartSystemLogger() {
-	fmt.Println("Starting system logger")
-	loggerPath := utils.GetPath(utils.LoggerPath)
-	utils.Exec(loggerPath, "make", []string{"start"})
-}
-
-// UpdateSystemLoggerServices: Updates the services.txt file with the services that are currently running
-func UpdateSystemLoggerServices(services []string) {
-	fmt.Println("Updating system logger services:")
-	fmt.Println(services)
-	loggerPath := utils.GetPath(utils.LoggerPath)
-
-	utils.Exec(loggerPath, "bash", []string{"-c", "rm services.txt && touch services.txt"})
-
-	for _, service := range services {
-		fmt.Println("Adding " + service + " to services.txt")
-		utils.Exec(loggerPath, "bash", []string{"-c", "echo " + service + " >> services.txt"})
-	}
-
-	// Add empty line at the end of file (best practice)
-	utils.Exec(loggerPath, "bash", []string{"-c", "echo '' >> services.txt"})
-}
-
-// StartWs: Starts the webserver service for Edgeapps
-func StartWs() {
-	wsPath := utils.GetPath(utils.WsPath)
-	fmt.Println("Starting WS")
-	cmdargs := []string{"-b"}
-	utils.Exec(wsPath, "./ws", cmdargs)
-}
-
-// StartService: Starts a service
-func StartService(serviceID string) {
-	wsPath := utils.GetPath(utils.WsPath)
-	fmt.Println("Starting" + serviceID + "service")
-	cmdargs := []string{"start", serviceID}
-	utils.Exec(wsPath, "systemctl", cmdargs)
-}
-
-// StopService: Stops a service
-func StopService(serviceID string) {
-	wsPath := utils.GetPath(utils.WsPath)
-	fmt.Println("Stopping" + serviceID + "service")
-	cmdargs := []string{"stop", "cloudflared"}
-	utils.Exec(wsPath, "systemctl", cmdargs)
-}
-
-// RestartService: Restarts a service
-func RestartService(serviceID string) {
-	wsPath := utils.GetPath(utils.WsPath)	
-	fmt.Println("Restarting" + serviceID + "service")
-	cmdargs := []string{"restart", serviceID}
-	utils.Exec(wsPath, "systemctl", cmdargs)
-}
-
-// GetServiceStatus: Returns the status output of a service
-func GetServiceStatus(serviceID string) string {
-	wsPath := utils.GetPath(utils.WsPath)	
-	cmdargs := []string{"status", serviceID}
-	return utils.Exec(wsPath, "systemctl", cmdargs)
-}
-
-func CreateBackupsPasswordFile(password string) {
-	// Create a password file for backups
-	backupPasswordFile := utils.GetPath(utils.BackupPasswordFileLocation)
-	backupPasswordFileDir := filepath.Dir(backupPasswordFile)
-
-	if _, err := os.Stat(backupPasswordFileDir); os.IsNotExist(err) {
-		os.MkdirAll(backupPasswordFileDir, 0755)
-	}
-
-	// Write the password to the file, overriting an existing file
-	err := ioutil.WriteFile(backupPasswordFile, []byte(password), 0644)
-	if err != nil {
-		panic(err)
-	}
-} 
-
-// CreateTunnel: Creates a tunnel via cloudflared, needs to be authenticated first
-func CreateTunnel(configDestination string) {
-	fmt.Println("Creating Tunnel for Edgebox.")
-	cmd := exec.Command("sh", "/home/system/components/edgeboxctl/scripts/cloudflared_tunnel_create.sh")
-	stdout, err := cmd.StdoutPipe()
-	if err != nil {
-		panic(err)
-	}
-	scanner := bufio.NewScanner(stdout)
-	err = cmd.Start()
-	if err != nil {
-		panic(err)
-	}
-	for scanner.Scan() {
-		fmt.Println(scanner.Text())
-		text := scanner.Text()
-		fmt.Println(text)
-	}
-	if scanner.Err() != nil {
-		cmd.Process.Kill()
-		cmd.Wait()
-		panic(scanner.Err())
-	}
-
-	// This also needs to be executed in root and non root variants
-	fmt.Println("Reading cloudflared folder to get the JSON file.")
-	isRoot := false
-	dir := "/home/system/.cloudflared/"
-	dir2 := "/root/.cloudflared/"
-	files, err := os.ReadDir(dir)
-	if err != nil {
-		panic(err)
-	}
-
-	var jsonFile os.DirEntry
-	for _, file := range files {
-		// check if file has json extension
-		if filepath.Ext(file.Name()) == ".json" {
-			fmt.Println("Non-Root JSON file found: " + file.Name())
-			jsonFile = file
-		}
-	}
-
-	// If the files are not in the home folder, try the root folder
-	if jsonFile == nil {
-		files, err = os.ReadDir(dir2)
-		if err != nil {
-			panic(err)
-		}
-		for _, file := range files {
-			// check if file has json extension
-			if filepath.Ext(file.Name()) == ".json" {
-				fmt.Println("Root JSON file found: " + file.Name())
-				jsonFile = file
-				isRoot = true
-			}
-		}
-	}
-
-	if jsonFile == nil {
-		panic("No JSON file found in directory")
-	}
-
-	fmt.Println("Reading JSON file.")
-	targetDir := "/home/system/.cloudflared/"
-	if isRoot {
-		targetDir = "/root/.cloudflared/"
-	}
-
-	jsonFilePath := filepath.Join(targetDir, jsonFile.Name())
-	jsonBytes, err := ioutil.ReadFile(jsonFilePath)
-	if err != nil {
-		panic(err)
-	}
-
-	fmt.Println("Parsing JSON file.")
-	var data cloudflaredTunnelJson
-	err = json.Unmarshal(jsonBytes, &data)
-	if err != nil {
-		log.Printf("Error reading tunnel JSON file: %s", err)
-	}
-
-	fmt.Println("Tunnel ID is:" + data.TunnelID)
-
-	// create the config.yml file with the following content in each line:
-	// "url": "http://localhost:80"
-	// "tunnel": "<TunnelID>"
-	// "credentials-file": "/root/.cloudflared/<tunnelID>.json"
-
-	file := configDestination
-	f, err := os.Create(file)
-	if err != nil {
-		panic(err)
-	}
-
-	defer f.Close()
-
-	_, err = f.WriteString("url: http://localhost:80\ntunnel: " + data.TunnelID + "\ncredentials-file: " + jsonFilePath)
-
-	if err != nil {
-		panic(err)
-	}
-}
-
-// DeleteTunnel: Deletes a tunnel via cloudflared, this does not remove the service
-func DeleteTunnel() {
-	fmt.Println("Deleting possible previous tunnel.")
-	
-	// Configure the service and start it
-	cmd := exec.Command("sh", "/home/system/components/edgeboxctl/scripts/cloudflared_tunnel_delete.sh")
-	stdout, err := cmd.StdoutPipe()
-	if err != nil {
-		panic(err)
-	}
-	scanner := bufio.NewScanner(stdout)
-	err = cmd.Start()
-	if err != nil {
-		panic(err)
-	}
-	for scanner.Scan() {
-		fmt.Println(scanner.Text())
-		text := scanner.Text()
-		fmt.Println(text)
-	}
-	if scanner.Err() != nil {
-		cmd.Process.Kill()
-		cmd.Wait()
-		panic(scanner.Err())
-	}
-}
-
-// InstallTunnelService: Installs the tunnel service
-func InstallTunnelService(config string) {
-	fmt.Println("Installing cloudflared service.")
-	cmd := exec.Command("cloudflared", "--config", config, "service", "install")
-	cmd.Start()
-	cmd.Wait()
-}
-
-// RemoveTunnelService: Removes the tunnel service
-func RemoveTunnelService() {
-	wsPath := utils.GetPath(utils.WsPath)	
-	fmt.Println("Removing possibly previous service install.")
-	cmd := exec.Command("cloudflared", "service", "uninstall")
-	cmd.Start()
-	cmd.Wait()
-
-	fmt.Println("Removing cloudflared files")
-	cmdargs := []string{"-rf", "/home/system/.cloudflared"}
-	utils.Exec(wsPath, "rm", cmdargs)
-	cmdargs = []string{"-rf", "/etc/cloudflared/config.yml"}
-	utils.Exec(wsPath, "rm", cmdargs)
-	cmdargs = []string{"-rf", "/root/.cloudflared/cert.pem"}
-	utils.Exec(wsPath, "rm", cmdargs)
-}
-
-func CopyDir(src string, dest string) error {
-    srcInfo, err := os.Stat(src)
-    if err != nil {
-        return err
-    }
-    if !srcInfo.IsDir() {
-        return fmt.Errorf("%s is not a directory", src)
-    }
-
-    err = os.MkdirAll(dest, srcInfo.Mode())
-    if err != nil {
-        return err
-    }
-
-    items, err := ioutil.ReadDir(src)
-    if err != nil {
-        return err
-    }
-
-    for _, item := range items {
-        srcPath := filepath.Join(src, item.Name())
-        destPath := filepath.Join(dest, item.Name())
-
-        if item.IsDir() {
-            err = CopyDir(srcPath, destPath)
-            if err != nil {
-                fmt.Printf("error copying directory %s to %s: %s\n", srcPath, destPath, err.Error())
-            }
-        } else {
-            err = CopyFile(srcPath, destPath)
-            if err != nil {
-                fmt.Printf("error copying file %s to %s: %s\n", srcPath, destPath, err.Error())
-            }
-        }
-    }
-
-    return nil
-}
-
-func CopyFile(src string, dest string) error {
-    srcFile, err := os.Open(src)
-    if err != nil {
-        return err
-    }
-    defer srcFile.Close()
-
-    destFile, err := os.Create(dest)
-    if err != nil {
-        return err
-    }
-    defer destFile.Close()
-
-    _, err = io.Copy(destFile, srcFile)
-    if err != nil {
-        return err
-    }
-
-    err = destFile.Sync()
-    if err != nil {
-        return err
-    }
-
-    srcInfo, err := os.Stat(src)
-    if err != nil {
-        return err
-    }
-
-    err = os.Chmod(dest, srcInfo.Mode())
-    if err != nil {
-        return err
-    }
-
-    return nil
-}
-
-func CheckUpdates() {
-	fmt.Println("Checking for Edgebox System Updates.")
-	
-	// Configure the service and start it
-	cmd := exec.Command("sh", "/home/system/components/updater/run.sh", "--check")
-	stdout, err := cmd.StdoutPipe()
-	if err != nil {
-		panic(err)
-	}
-	scanner := bufio.NewScanner(stdout)
-	err = cmd.Start()
-	if err != nil {
-		panic(err)
-	}
-	for scanner.Scan() {
-		// fmt.Println(scanner.Text())
-		text := scanner.Text()
-		fmt.Println(text)
-	}
-	if scanner.Err() != nil {
-		cmd.Process.Kill()
-		cmd.Wait()
-		fmt.Println("Error running updates check.")
-		utils.WriteOption("SYSTEM_UPDATES", "[]")
-		return
-	}
-
-	// Read targets.env file into JSON list structure
-	targets := []string{}
-	targetsFile, err := os.Open("/home/system/components/updater/targets.env")
-	if err != nil {
-		fmt.Println("No targets.env file found. Skipping.")
-		utils.WriteOption("SYSTEM_UPDATES", "[]")
-		return
-	}
-	defer targetsFile.Close()
-	scanner = bufio.NewScanner(targetsFile)
-	for scanner.Scan() {
-		text := scanner.Text()
-		// text line should look like: {"target": "<target>", "version": "<version>"}
-		target := strings.Split(text, "=")
-		newText := "{\"target\": \"" + strings.Replace(target[0], "_VERSION", "", -1) + "\", \"version\": \"" + target[1] + "\"}"
-		targets = append(targets, newText)
-	}
-	if scanner.Err() != nil {
-		fmt.Println("Error reading update targets file.")
-		utils.WriteOption("SYSTEM_UPDATES", "[]")
-		return
-	}
-
-	// convert targets to string
-	targetsString := strings.Join(targets, ",")
-	targetsString = "[" + targetsString + "]"
-
-	fmt.Println(targetsString)
-
-	// Write option with targets
-	utils.WriteOption("SYSTEM_UPDATES", targetsString)
-}
-
-func ApplyUpdates() {
-	fmt.Println("Applying Edgebox System Updates.")
-
-	utils.WriteOption("UPDATING_SYSTEM", "true")
-	
-	// Configure the service and start it
-	cmd := exec.Command("sh", "/home/system/components/updater/run.sh", "--update")
-	stdout, err := cmd.StdoutPipe()
-	if err != nil {
-		panic(err)
-	}
-	scanner := bufio.NewScanner(stdout)
-	err = cmd.Start()
-	if err != nil {
-		panic(err)
-	}
-	for scanner.Scan() {
-		fmt.Println(scanner.Text())
-		text := scanner.Text()
-		fmt.Println(text)
-	}
-	if scanner.Err() != nil {
-		cmd.Process.Kill()
-		cmd.Wait()
-		panic(scanner.Err())
-	}
-
-	// If the system did not yet restart, set updating system to false
-	utils.WriteOption("UPDATING_SYSTEM", "false")
-}
-

internal/utils/utils.go

@@ -16,7 +16,7 @@ import (
 )
 
 // ExecAndStream : Runs a terminal command, but streams progress instead of outputting. Ideal for long lived process that need to be logged.
-func ExecAndStream(path string, command string, args []string) string {
+func ExecAndStream(path string, command string, args []string) {
 
 	cmd := exec.Command(command, args...)
 
@@ -27,17 +27,13 @@ func ExecAndStream(path string, command string, args []string) string {
 
 	err := cmd.Run()
 
-	outStr, errStr := string(stdoutBuf.Bytes()), string(stderrBuf.Bytes())
-
-	returnVal := outStr
 	if err != nil {
 		fmt.Printf("cmd.Run() failed with %s\n", err)
-		returnVal = errStr
 	}
 
+	outStr, errStr := string(stdoutBuf.Bytes()), string(stderrBuf.Bytes())
 	fmt.Printf("\nout:\n%s\nerr:\n%s\n", outStr, errStr)
 
-	return returnVal
 }
 
 // Exec : Runs a terminal Command, catches and logs errors, returns the result.
@@ -104,15 +100,11 @@ func GetSQLiteFormattedDateTime(t time.Time) string {
 	return formatedDatetime
 }
 
-const BackupPasswordFileLocation string = "backupPasswordFileLocation"
 const CloudEnvFileLocation string = "cloudEnvFileLocation"
 const ApiEnvFileLocation string = "apiEnvFileLocation"
 const ApiPath string = "apiPath"
 const EdgeAppsPath string = "edgeAppsPath"
-const EdgeAppsBackupPath string = "edgeAppsBackupPath"
 const WsPath string = "wsPath"
-const LoggerPath string = "loggerPath"
-
 
 // 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 {
@@ -132,7 +124,7 @@ func GetPath(pathKey string) string {
 		if env["CLOUD_ENV_FILE_LOCATION"] != "" {
 			targetPath = env["CLOUD_ENV_FILE_LOCATION"]
 		} else {
-			targetPath = "/home/system/components/api/cloud.env"
+			targetPath = "/home/system/components/edgeboxctl/cloud.env"
 		}
 
 	case ApiEnvFileLocation:
@@ -159,13 +151,6 @@ func GetPath(pathKey string) string {
 			targetPath = "/home/system/components/apps/"
 		}
 
-	case EdgeAppsBackupPath:
-		if env["EDGEAPPS_BACKUP_PATH"] != "" {
-			targetPath = env["EDGEAPPS_BACKUP_PATH"]
-		} else {
-			targetPath = "/home/system/components/backups/"
-		}
-
 	case WsPath:
 
 		if env["WS_PATH"] != "" {
@@ -174,21 +159,6 @@ func GetPath(pathKey string) string {
 			targetPath = "/home/system/components/ws/"
 		}
 
-	case LoggerPath:
-		if env["LOGGER_PATH"] != "" {
-			targetPath = env["LOGGER_PATH"]
-		} else {
-			targetPath = "/home/system/components/logger/"
-		}
-
-	case BackupPasswordFileLocation:
-
-		if env["BACKUP_PASSWORD_FILE_LOCATION"] != "" {
-			targetPath = env["BACKUP_PASSWORD_FILE_LOCATION"]
-		} else {
-			targetPath = "/home/system/components/backups/pw.txt"
-		}
-
 	default:
 
 		log.Printf("path_key %s nonexistant in GetPath().\n", pathKey)
@@ -222,47 +192,3 @@ func WriteOption(optionKey string, optionValue string) {
 
 	db.Close()
 }
-
-// ReadOption : Reads a key value pair option from the api shared database
-func ReadOption(optionKey string) string {
-	
-	db, err := sql.Open("sqlite3", GetSQLiteDbConnectionDetails())
-
-	if err != nil {
-		log.Fatal(err.Error())
-	}
-
-	var optionValue string
-
-	err = db.QueryRow("SELECT value FROM option WHERE name = ?", optionKey).Scan(&optionValue)
-
-	if err != nil {
-		log.Println(err.Error())
-	}
-
-	db.Close()
-
-	return optionValue
-}
-
-// DeleteOption : Deletes a key value pair option from the api shared database
-func DeleteOption(optionKey string) {
-	
-	db, err := sql.Open("sqlite3", GetSQLiteDbConnectionDetails())
-
-	if err != nil {
-		log.Fatal(err.Error())
-	}
-
-	statement, err := db.Prepare("DELETE FROM option WHERE name = ?;") // Prepare SQL Statement
-	if err != nil {
-		log.Fatal(err.Error())
-	}
-
-	_, err = statement.Exec(optionKey) // Execute SQL Statement
-	if err != nil {
-		log.Fatal(err.Error())
-	}
-
-	db.Close()
-}

scripts/cloudflared_login.sh

@@ -1,6 +0,0 @@
-#!/usr/bin/env sh
-
-echo "Starting script login"
-cloudflared tunnel login 2>&1 | tee /home/system/components/edgeboxctl/scripts/output.log &
-echo "sleeping 5 seconds"
-sleep 5

scripts/cloudflared_tunnel_create.sh

@@ -1,7 +0,0 @@
-#!/usr/bin/env sh
-
-echo "Starting script create"
-# script -q -c "cloudflared tunnel login 2>&1 | tee /app/output.log" &
-cloudflared tunnel create edgebox 2>&1 | tee /home/system/components/edgeboxctl/scripts/output.log
-echo "sleeping 5 seconds"
-sleep 5

scripts/cloudflared_tunnel_delete.sh

@@ -1,7 +0,0 @@
-#!/usr/bin/env sh
-
-echo "Starting script delete"
-TUNNEL_ORIGIN_CERT=/home/system/.cloudflared/cert.pem
-cloudflared tunnel delete edgebox 2>&1 | tee /home/system/components/edgeboxctl/scripts/output.log &
-echo "sleeping 5 seconds"
-sleep 5