Merge f0bfc92295 into eae72b0a79

internal/edgeapps/edgeapps.go

@@ -416,24 +416,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})
 	}
 

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/tasks/tasks.go

@@ -100,10 +100,6 @@ type taskSetupBackupsArgs struct {
 	RepositoryPassword string `json:"repository_password"`
 }
 
-type taskStartShellArgs struct {
-	Timeout int `json:"timeout"`
-}
-
 
 const STATUS_CREATED int = 0
 const STATUS_EXECUTING int = 1
@@ -244,22 +240,6 @@ func ExecuteTask(task Task) Task {
 			taskResult := taskDisableTunnel()
 			task.Result = sql.NullString{String: taskResult, Valid: true}
 
-		case "start_shell":
-			log.Println("Starting SSHX.io Shell")
-			var args taskStartShellArgs
-			err := json.Unmarshal([]byte(task.Args.String), &args)
-			if err != nil {
-				log.Printf("Error reading arguments or start_shell task: %s", err)
-			} else {
-				taskResult := taskStartShell(args)
-				task.Result = sql.NullString{String: taskResult, Valid: true}												
-			}
-
-		case "stop_shell":
-			log.Println("Stopping SSHX.io Shell...")
-			taskResult := taskStopShell()
-			task.Result = sql.NullString{String: taskResult, Valid: true}
-
 		case "install_edgeapp":
 
 			log.Println("Installing EdgeApp...")
@@ -951,78 +931,6 @@ func taskDisableTunnel() string {
 	return "{\"status\": \"ok\"}"
 }
 
-func taskStartShell(args taskStartShellArgs) string {
-	fmt.Println("Executing taskStartShell")
-	wsPath := utils.GetPath(utils.WsPath)
-
-	// kill the process if its running
-	utils.Exec(wsPath, "killall", []string{"sshx"})
-
-	cmd := exec.Command("/usr/local/bin/sshx", "--quiet", "--shell", "bash")
-	stdout, err := cmd.StdoutPipe()
-	if err != nil {
-		panic(err)
-	}
-	scanner := bufio.NewScanner(stdout)
-	err = cmd.Start()
-	if err != nil {
-		panic(err)
-	}
-	url := ""
-
-	timeout := args.Timeout
-
-	for scanner.Scan() {
-		fmt.Println(scanner.Text())
-		text := scanner.Text()
-		if strings.Contains(text, "https://") {
-			url = text
-			fmt.Println("Shell start is responding with URL: " + url)
-			utils.WriteOption("SHELL_URL", url)
-			utils.WriteOption("SHELL_STATUS", "running")
-			break
-		}
-	}
-	if scanner.Err() != nil {
-		cmd.Process.Kill()
-		cmd.Wait()
-		panic(scanner.Err())
-	}
-
-	go func() {
-		fmt.Println("Running shell async")
-		
-		// cmd.Wait()
-
-		// Keep retrying to calculate timeout to know when to kill the process
-		for {
-			timeout = timeout - 1
-			if timeout <= 0 {
-				fmt.Println("Timeout reached, killing process...")
-				utils.Exec(wsPath, "killall sshx", []string{})
-				utils.WriteOption("SHELL_STATUS", "not_running")
-				break
-			}
-			fmt.Println("Active Shell Timeout is " + fmt.Sprint(timeout) + " seconds")
-			time.Sleep(1 * time.Second)
-		}
-	}()
-
-	return "{\"status\": \"ok\"}"
-}
-
-func taskStopShell() string {
-	fmt.Println("Executing taskStopShell")
-	wsPath := utils.GetPath(utils.WsPath)
-
-	// kill the process if its running
-	utils.Exec(wsPath, "killall", []string{"sshx"})
-	utils.WriteOption("SHELL_STATUS", "not_running")
-
-	return "{\"status\": \"ok\"}"
-
-}
-
 func taskInstallEdgeApp(args taskInstallEdgeAppArgs) string {
 	fmt.Println("Executing taskInstallEdgeApp for " + args.ID)