Merge f0bfc92295 into eae72b0a79

Bumps [actions/checkout](https://github.com/actions/checkout) from 3 to 4.
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](https://github.com/actions/checkout/compare/v3...v4)

---
updated-dependencies:
- dependency-name: actions/checkout
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

.github/workflows/go.yml

@@ -17,12 +17,12 @@ jobs:
       with:
         go-version: '1.20.2'
     - name: Check out code
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
     - 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

Makefile

@@ -9,10 +9,25 @@ GOOS := $(shell go env GOOS)
 GOARCH := $(shell go env GOARCH)
 
 
-build-all: clean
+build-all:
 	GOOS=linux GOARCH=amd64 make build
 	GOOS=linux GOARCH=arm make build
-	GOOS=linux GOARCH=arm64 make build
+
+build-prod:
+	GOOS=linux GOARCH=arm RELEASE=prod make build
+
+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}"
@@ -42,7 +57,11 @@ install:
 	@echo "Edgeboxctl installed successfully"
 	@echo "To start edgeboxctl run: systemctl start edgeboxctl"
 
-build-install: build install
+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

codecov.yml

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

internal/diagnostics/diagnostics.go

@@ -1,5 +1,18 @@
 package diagnostics
 
+type ReleaseVersion string
+
 var Version string
 var Commit string
 var BuildDate string
+
+const (
+	DEV_VERSION   ReleaseVersion = "dev"
+	PROD_VERSION  ReleaseVersion = "prod"
+	CLOUD_VERSION ReleaseVersion = "cloud"
+	OTHER_VERSION ReleaseVersion = "other"
+)
+
+func GetReleaseVersion() ReleaseVersion {
+	return ReleaseVersion(Version)
+}

internal/storage/storage.go

@@ -6,6 +6,7 @@ import (
 	"path/filepath"
 	"strings"
 
+	"github.com/edgebox-iot/edgeboxctl/internal/diagnostics"
 	"github.com/edgebox-iot/edgeboxctl/internal/utils"
 	"github.com/shirou/gopsutil/disk"
 )
@@ -74,9 +75,20 @@ const (
 	DISK_TYPE_VDA   DeviceIdentifier = "vda"
 )
 
+func GetDeviceIdentifier(release_version diagnostics.ReleaseVersion) DeviceIdentifier {
+	switch release_version {
+	case diagnostics.CLOUD_VERSION:
+		return DISK_TYPE_VDA
+	case diagnostics.PROD_VERSION:
+		return DISK_TYPE_MCBLK
+	}
+
+	return DISK_TYPE_SDA
+}
+
+// GetDevices : Returns a list of all available sotrage devices in structs filled with information
+func GetDevices(release_version diagnostics.ReleaseVersion) []Device {
 
-// GetDevices : Returns a list of all available storage devices in structs filled with information
-func GetDevices() []Device {
 	var devices []Device
 
 	cmdArgs := []string{"--raw", "--bytes", "--noheadings"}
@@ -88,6 +100,8 @@ func GetDevices() []Device {
 	firstDevice := true
 	currentDeviceInUseFlag := false
 
+	mainDiskID := GetDeviceIdentifier(release_version)
+
 	for scanner.Scan() {
 		// 1 Device is represented here. Extract words in order for filling a Device struct
 		// Example deviceRawInfo: "mmcblk0 179:0 0 29.7G 0 disk"
@@ -139,9 +153,14 @@ func GetDevices() []Device {
 				Status:     DeviceStatus{ID: 1, Description: "healthy"},
 			}
 
+			if device.ID == mainDiskID {
+				device.MainDevice = true
+			}
+
 			currentDevice = device
 
 		} else if isPartition {
+
 			mountpoint := ""
 			if len(deviceRawInfo) >= 7 {
 				mountpoint = deviceRawInfo[6]

internal/storage/storage_test.go

@@ -7,7 +7,14 @@ import (
 )
 
 func TestGetDevices(t *testing.T) {
-	assertGetDevices(GetDevices(), t)
+
+	t.Log("Testing with release version dev")
+	assertGetDevices(GetDevices("dev"), t)
+	t.Log("Testing with release version prod")
+	assertGetDevices(GetDevices("prod"), t)
+	t.Log("Testing with release version cloud")
+	assertGetDevices(GetDevices("cloud"), t)
+
 }
 
 func assertGetDevices(devices []Device, t *testing.T) {

internal/system/system.go

@@ -82,7 +82,6 @@ func SetupCloudOptions() {
 
 	if err != nil {
 		fmt.Println("Error loading .env file for cloud version setup")
-		return
 	}
 
 	if cloudEnv["NAME"] != "" {

internal/tasks/tasks.go

@@ -164,208 +164,213 @@ func ExecuteTask(task Task) Task {
 		log.Fatal(err.Error())
 	}
 
-	log.Println("Task: " + task.Task)
+	if diagnostics.GetReleaseVersion() == diagnostics.DEV_VERSION {
-	log.Println("Args: " + task.Args.String)
+		log.Printf("Dev environemnt. Not executing tasks.")
-	switch task.Task {
+	} else {
-	case "setup_backups":
+		log.Println("Task: " + task.Task)
+		log.Println("Args: " + task.Args.String)
+		switch task.Task {
+		case "setup_backups":
 
-		log.Println("Setting up Backups Destination...")
+			log.Println("Setting up Backups Destination...")
-		var args taskSetupBackupsArgs
+			var args taskSetupBackupsArgs
-		err := json.Unmarshal([]byte(task.Args.String), &args)
+			err := json.Unmarshal([]byte(task.Args.String), &args)
-		if err != nil {
+			if err != nil {
-			log.Println("Error reading arguments of setup_backups task.")
+				log.Println("Error reading arguments of setup_backups task.")
-		} else {
+			} else {
-			taskResult := taskSetupBackups(args)
+				taskResult := taskSetupBackups(args)
+				taskResultBool := true
+				// Check if returned taskResult string contains "error"
+				if strings.Contains(taskResult, "error") {
+					taskResultBool = false
+				}
+				task.Result = sql.NullString{String: taskResult, Valid: taskResultBool}
+			}
+
+		case "start_backup":
+
+			log.Println("Backing up Edgebox...")
+			taskResult := taskBackup()
 			taskResultBool := true
 			// Check if returned taskResult string contains "error"
 			if strings.Contains(taskResult, "error") {
 				taskResultBool = false
 			}
 			task.Result = sql.NullString{String: taskResult, Valid: taskResultBool}
-		}
 
-	case "start_backup":
+		case "restore_backup":
+			log.Println("Attempting to Restore Last Backup to Edgebox")
+			taskResult := taskRestoreBackup()
+			taskResultBool := true
+			// Check if returned taskResult string contains "error"
+			if strings.Contains(taskResult, "error") {
+				taskResultBool = false
+			}
+			task.Result = sql.NullString{String: taskResult, Valid: taskResultBool}
 
-		log.Println("Backing up Edgebox...")
+		case "setup_tunnel":
-		taskResult := taskBackup()
-		taskResultBool := true
-		// Check if returned taskResult string contains "error"
-		if strings.Contains(taskResult, "error") {
-			taskResultBool = false
-		}
-		task.Result = sql.NullString{String: taskResult, Valid: taskResultBool}
 
-	case "restore_backup":
+			log.Println("Setting up Cloudflare Tunnel...")
-		log.Println("Attempting to Restore Last Backup to Edgebox")
+			var args taskSetupTunnelArgs
-		taskResult := taskRestoreBackup()
+			err := json.Unmarshal([]byte(task.Args.String), &args)
-		taskResultBool := true
+			if err != nil {
-		// Check if returned taskResult string contains "error"
+				log.Printf("Error reading arguments of setup_tunnel task: %s", err)
-		if strings.Contains(taskResult, "error") {
+				status := "{\"status\": \"error\", \"message\": \"The Domain Name you are going to Authorize must be provided beforehand! Please insert a domain name and try again.\"}"
-			taskResultBool = false
+				utils.WriteOption("TUNNEL_STATUS", status)
-		}
+			} else {
-		task.Result = sql.NullString{String: taskResult, Valid: taskResultBool}
+				taskResult := taskSetupTunnel(args)
+				task.Result = sql.NullString{String: taskResult, Valid: true}
+			}
 
-	case "setup_tunnel":
+		case "start_tunnel":
 
-		log.Println("Setting up Cloudflare Tunnel...")
+			log.Println("Starting Cloudflare Tunnel...")
-		var args taskSetupTunnelArgs
+			taskResult := taskStartTunnel()
-		err := json.Unmarshal([]byte(task.Args.String), &args)
-		if err != nil {
-			log.Printf("Error reading arguments of setup_tunnel task: %s", err)
-			status := "{\"status\": \"error\", \"message\": \"The Domain Name you are going to Authorize must be provided beforehand! Please insert a domain name and try again.\"}"
-			utils.WriteOption("TUNNEL_STATUS", status)
-		} else {
-			taskResult := taskSetupTunnel(args)
 			task.Result = sql.NullString{String: taskResult, Valid: true}
-		}
 
-	case "start_tunnel":
+		case "stop_tunnel":
 
-		log.Println("Starting Cloudflare Tunnel...")
+			log.Println("Stopping Cloudflare Tunnel...")
-		taskResult := taskStartTunnel()
+			taskResult := taskStopTunnel()
-		task.Result = sql.NullString{String: taskResult, Valid: true}
-
-	case "stop_tunnel":
-
-		log.Println("Stopping Cloudflare Tunnel...")
-		taskResult := taskStopTunnel()
-		task.Result = sql.NullString{String: taskResult, Valid: true}
-	
-	case "disable_tunnel":
-
-		log.Println("Disabling Cloudflare Tunnel...")
-		taskResult := taskDisableTunnel()
-		task.Result = sql.NullString{String: taskResult, Valid: true}
-
-	case "install_edgeapp":
-
-		log.Println("Installing EdgeApp...")
-		var args taskInstallEdgeAppArgs
-		err := json.Unmarshal([]byte(task.Args.String), &args)
-		if err != nil {
-			log.Printf("Error reading arguments of install_edgeapp task: %s", err)
-		} else {
-			taskResult := taskInstallEdgeApp(args)
 			task.Result = sql.NullString{String: taskResult, Valid: true}
-		}
+		
+		case "disable_tunnel":
 
-	case "remove_edgeapp":
+			log.Println("Disabling Cloudflare Tunnel...")
-
+			taskResult := taskDisableTunnel()
-		log.Println("Removing EdgeApp...")
-		var args taskRemoveEdgeAppArgs
-		err := json.Unmarshal([]byte(task.Args.String), &args)
-		if err != nil {
-			log.Printf("Error reading arguments of remove_edgeapp task: %s", err)
-		} else {
-			taskResult := taskRemoveEdgeApp(args)
 			task.Result = sql.NullString{String: taskResult, Valid: true}
-		}
 
-	case "start_edgeapp":
+		case "install_edgeapp":
 
-		log.Println("Starting EdgeApp...")
+			log.Println("Installing EdgeApp...")
-		var args taskStartEdgeAppArgs
+			var args taskInstallEdgeAppArgs
-		err := json.Unmarshal([]byte(task.Args.String), &args)
+			err := json.Unmarshal([]byte(task.Args.String), &args)
-		if err != nil {
+			if err != nil {
-			log.Printf("Error reading arguments of start_edgeapp task: %s", err)
+				log.Printf("Error reading arguments of install_edgeapp task: %s", err)
-		} else {
+			} else {
-			taskResult := taskStartEdgeApp(args)
+				taskResult := taskInstallEdgeApp(args)
+				task.Result = sql.NullString{String: taskResult, Valid: true}
+			}
+
+		case "remove_edgeapp":
+
+			log.Println("Removing EdgeApp...")
+			var args taskRemoveEdgeAppArgs
+			err := json.Unmarshal([]byte(task.Args.String), &args)
+			if err != nil {
+				log.Printf("Error reading arguments of remove_edgeapp task: %s", err)
+			} else {
+				taskResult := taskRemoveEdgeApp(args)
+				task.Result = sql.NullString{String: taskResult, Valid: true}
+			}
+
+		case "start_edgeapp":
+
+			log.Println("Starting EdgeApp...")
+			var args taskStartEdgeAppArgs
+			err := json.Unmarshal([]byte(task.Args.String), &args)
+			if err != nil {
+				log.Printf("Error reading arguments of start_edgeapp task: %s", err)
+			} else {
+				taskResult := taskStartEdgeApp(args)
+				task.Result = sql.NullString{String: taskResult, Valid: true}
+			}
+
+		case "stop_edgeapp":
+
+			log.Println("Stopping EdgeApp...")
+			var args taskStopEdgeAppArgs
+			err := json.Unmarshal([]byte(task.Args.String), &args)
+			if err != nil {
+				log.Printf("Error reading arguments of stop_edgeapp task: %s", err)
+			} else {
+				taskResult := taskStopEdgeApp(args)
+				task.Result = sql.NullString{String: taskResult, Valid: true}
+			}
+
+		case "set_edgeapp_options":
+
+			log.Println("Setting EdgeApp Options...")
+			var args taskSetEdgeAppOptionsArgs
+			// {"id":"podgrab","options":{"PODGRAB_PASSWORD":"fumarmata"}}
+			err := json.Unmarshal([]byte(task.Args.String), &args)
+			if err != nil {
+				log.Printf("Error reading arguments of set_edgeapp_options task: %s", err)
+			} else {
+				taskResult := taskSetEdgeAppOptions(args)
+				task.Result = sql.NullString{String: taskResult, Valid: true}
+			}
+
+		case "set_edgeapp_basic_auth":
+
+			log.Println("Settig EdgeApp Basic Authentication...")
+			var args taskSetEdgeAppBasicAuthArgs
+			err := json.Unmarshal([]byte(task.Args.String), &args)
+			if err != nil {
+				log.Printf("Error reading arguments of set_edgeapp_basic_auth task: %s", err)
+			} else {
+				taskResult := taskSetEdgeAppBasicAuth(args)
+				task.Result = sql.NullString{String: taskResult, Valid: true}
+			}
+
+		case "remove_edgeapp_basic_auth":
+
+			log.Println("Removing EdgeApp Basic Authentication...")
+			var args taskRemoveEdgeAppBasicAuthArgs
+			err := json.Unmarshal([]byte(task.Args.String), &args)
+			if err != nil {
+				log.Printf("Error reading arguments of remove_edgeapp_basic_auth task: %s", err)
+			} else {
+				taskResult := taskRemoveEdgeAppBasicAuth(args)
+				task.Result = sql.NullString{String: taskResult, Valid: true}
+			}
+
+		case "enable_online":
+
+			log.Println("Enabling online access to EdgeApp...")
+			var args taskEnableOnlineArgs
+			err := json.Unmarshal([]byte(task.Args.String), &args)
+			if err != nil {
+				log.Printf("Error reading arguments of enable_online task: %s", err)
+			} else {
+				taskResult := taskEnableOnline(args)
+				task.Result = sql.NullString{String: taskResult, Valid: true}
+			}
+
+		case "disable_online":
+
+			log.Println("Disabling online access to EdgeApp...")
+			var args taskDisableOnlineArgs
+			err := json.Unmarshal([]byte(task.Args.String), &args)
+			if err != nil {
+				log.Printf("Error reading arguments of enable_online task: %s", err)
+			} else {
+				taskResult := taskDisableOnline(args)
+				task.Result = sql.NullString{String: taskResult, Valid: true}
+			}
+
+		case "enable_public_dashboard":
+
+			log.Println("Enabling online access to Dashboard...")
+			var args taskEnablePublicDashboardArgs
+			err := json.Unmarshal([]byte(task.Args.String), &args)
+			if err != nil {
+				log.Printf("Error reading arguments of enable_public_dashboard task: %s", err)
+			} else {
+				taskResult := taskEnablePublicDashboard(args)
+				task.Result = sql.NullString{String: taskResult, Valid: true}
+			}
+
+		case "disable_public_dashboard":
+
+			log.Println("Disabling online access to Dashboard...")
+			taskResult := taskDisablePublicDashboard()
 			task.Result = sql.NullString{String: taskResult, Valid: true}
+
 		}
 
-	case "stop_edgeapp":
-
-		log.Println("Stopping EdgeApp...")
-		var args taskStopEdgeAppArgs
-		err := json.Unmarshal([]byte(task.Args.String), &args)
-		if err != nil {
-			log.Printf("Error reading arguments of stop_edgeapp task: %s", err)
-		} else {
-			taskResult := taskStopEdgeApp(args)
-			task.Result = sql.NullString{String: taskResult, Valid: true}
-		}
-
-	case "set_edgeapp_options":
-
-		log.Println("Setting EdgeApp Options...")
-		var args taskSetEdgeAppOptionsArgs
-		// {"id":"podgrab","options":{"PODGRAB_PASSWORD":"fumarmata"}}
-		err := json.Unmarshal([]byte(task.Args.String), &args)
-		if err != nil {
-			log.Printf("Error reading arguments of set_edgeapp_options task: %s", err)
-		} else {
-			taskResult := taskSetEdgeAppOptions(args)
-			task.Result = sql.NullString{String: taskResult, Valid: true}
-		}
-
-	case "set_edgeapp_basic_auth":
-
-		log.Println("Settig EdgeApp Basic Authentication...")
-		var args taskSetEdgeAppBasicAuthArgs
-		err := json.Unmarshal([]byte(task.Args.String), &args)
-		if err != nil {
-			log.Printf("Error reading arguments of set_edgeapp_basic_auth task: %s", err)
-		} else {
-			taskResult := taskSetEdgeAppBasicAuth(args)
-			task.Result = sql.NullString{String: taskResult, Valid: true}
-		}
-
-	case "remove_edgeapp_basic_auth":
-
-		log.Println("Removing EdgeApp Basic Authentication...")
-		var args taskRemoveEdgeAppBasicAuthArgs
-		err := json.Unmarshal([]byte(task.Args.String), &args)
-		if err != nil {
-			log.Printf("Error reading arguments of remove_edgeapp_basic_auth task: %s", err)
-		} else {
-			taskResult := taskRemoveEdgeAppBasicAuth(args)
-			task.Result = sql.NullString{String: taskResult, Valid: true}
-		}
-
-	case "enable_online":
-
-		log.Println("Enabling online access to EdgeApp...")
-		var args taskEnableOnlineArgs
-		err := json.Unmarshal([]byte(task.Args.String), &args)
-		if err != nil {
-			log.Printf("Error reading arguments of enable_online task: %s", err)
-		} else {
-			taskResult := taskEnableOnline(args)
-			task.Result = sql.NullString{String: taskResult, Valid: true}
-		}
-
-	case "disable_online":
-
-		log.Println("Disabling online access to EdgeApp...")
-		var args taskDisableOnlineArgs
-		err := json.Unmarshal([]byte(task.Args.String), &args)
-		if err != nil {
-			log.Printf("Error reading arguments of enable_online task: %s", err)
-		} else {
-			taskResult := taskDisableOnline(args)
-			task.Result = sql.NullString{String: taskResult, Valid: true}
-		}
-
-	case "enable_public_dashboard":
-
-		log.Println("Enabling online access to Dashboard...")
-		var args taskEnablePublicDashboardArgs
-		err := json.Unmarshal([]byte(task.Args.String), &args)
-		if err != nil {
-			log.Printf("Error reading arguments of enable_public_dashboard task: %s", err)
-		} else {
-			taskResult := taskEnablePublicDashboard(args)
-			task.Result = sql.NullString{String: taskResult, Valid: true}
-		}
-
-	case "disable_public_dashboard":
-
-		log.Println("Disabling online access to Dashboard...")
-		taskResult := taskDisablePublicDashboard()
-		task.Result = sql.NullString{String: taskResult, Valid: true}
 	}
 
-
 	statement, err = db.Prepare("Update task SET status = ?, result = ?, updated = ? WHERE ID = ?;") // Prepare SQL Statement
 	if err != nil {
 		log.Fatal(err.Error())
@@ -422,9 +427,10 @@ func ExecuteSchedules(tick int) {
 		// 	})
 		// }
 
-
+		if diagnostics.GetReleaseVersion() == diagnostics.CLOUD_VERSION {
-		log.Println("Setting up cloud version options (name, email, api token)")
+			log.Println("Setting up cloud version options (name, email, api token)")
-		taskSetupCloudOptions()
+			taskSetupCloudOptions()
+		}
 
 		// Executing on startup (first tick). Schedules run before tasks in the SystemIterator
 		uptime := taskGetSystemUptime()
@@ -1190,7 +1196,7 @@ func taskGetSystemUptime() string {
 func taskGetStorageDevices() string {
 	fmt.Println("Executing taskGetStorageDevices")
 
-	devices := storage.GetDevices()
+	devices := storage.GetDevices(diagnostics.GetReleaseVersion())
 	devicesJSON, _ := json.Marshal(devices)
 
 	utils.WriteOption("STORAGE_DEVICES_LIST", string(devicesJSON))