Cleanup, improved error handling and slight refactor

Author: Pancaakeman

builder/checks/netCheck.go

@@ -1,19 +1,19 @@
 package checks
 
 import (
+	"fmt"
 	"net"
 )
 
-// NetCheck Attempts to make a http request with a 10 second timeout limit, if it fails return a DNS error (default behaviour)
-// might change it to return something else if needed, but this should suffice
+// NetCheck Attempts to make a http request to the go.dev site to check for network connectivity
 //
 // PENDING CONCURRENCY IMPLEMENTATION
-func NetCheck() (passed bool) {
-	conn, err := net.DialTimeout("tcp", "go.dev:http", 10)
+func NetCheck() (passed bool, err error) {
+	conn, err := net.Dial("tcp", "go.dev:http")
 	if err != nil {
-		return false
+		return false, fmt.Errorf("connectivity error %v", err)
 	}
 
 	defer conn.Close()
-	return true
+	return true, nil
 }

builder/checks/osCheck.go

@@ -2,12 +2,13 @@ package checks
 
 import (
 	"bytes"
+	"fmt"
 	"log"
 	"os/exec"
 )
 
 // OsCheck PENDING CONCURRENCY IMPLEMENTATION
-func OsCheck() (passed bool) {
+func OsCheck() (passed bool, err error) {
 
 	// cmd sends this command to the OS shell
 	cmd := exec.Command("cat", "/etc/os-release")
@@ -39,18 +40,18 @@ func OsCheck() (passed bool) {
 		but I am unsure if that value can be changed when changing hostname (pending test), will re-implement based on results
 		until then, we Will use the Distro code name to ensure a reliable answer
 
-		This version is more reliable and preferred so I'll keep it until any problems arise
+		This version is more reliable and preferred, so I'll keep it until any problems arise
 	*/
 
 	switch {
 	case bytes.Contains(out, []byte("Noble Numbat")): // Ubuntu 24.04 LTS
-		return true
+		return true, nil
 	case bytes.Contains(out, []byte("Trixie")): // Debian 13
-		return true
+		return true, nil
 	case bytes.Contains(out, []byte("Bookworm")): // Debian 12
-		return true
+		return true, nil
 	default:
-		return false // Neither of the Above
+		return false, fmt.Errorf("builder cannot run on this operating system") // Neither of the Above
 
 	}
 }

builder/checks/permCheck.go

@@ -5,13 +5,13 @@ import (
 	"syscall"
 )
 
-// PrivelageCheck checks the UID if the user running isn't root it returns a fatal error!
+// PrivilegeCheck checks the UID if the user running isn't root it returns a fatal error!
 // should be checked before everything for efficiency
 //
 // PENDING CONCURRENCY IMPLEMENTATION
-func PrivelageCheck() (passed bool) {
-	if syscall.Getuid() != 0{ // 0 is the root User ID
-		log.Fatal("Command must be run as Root")
+func PrivilegeCheck() (passed bool) {
+	if syscall.Getuid() != 0 { // 0 is the root User ID
+		log.Fatal("command must be run as Root")
 		return false
 	}
 	return true

builder/checks/root.go

@@ -0,0 +1,33 @@
+package checks
+
+import (
+	"log"
+)
+
+// AllChecks Handles all checks and their errors,
+// terminating the program if any errors occur and prints the error to stdout
+func AllChecks() (passed bool) {
+
+	privCheck := PrivilegeCheck()
+
+	osPassed, osErr := OsCheck()
+	if osErr != nil {
+		log.Fatal(osErr)
+	}
+
+	netPassed, netErr := NetCheck()
+	if netErr != nil {
+		log.Fatal(netErr)
+	}
+
+	storagePassed, storageErr := StorageCheck()
+	if storageErr != nil {
+		log.Fatal(storageErr)
+	}
+
+	if privCheck && osPassed && netPassed && storagePassed == true {
+		return true
+	}
+	return false
+
+}

builder/checks/storageCheck.go

@@ -1,16 +1,19 @@
 package checks
 
 import (
+	"fmt"
 	"log"
 	"math"
 
 	"golang.org/x/sys/unix"
 )
 
+const neededSpace = 30 // 30 Gigabytes
+
 // StorageCheck PENDING CONCURRENCY IMPLEMENTATION
-func StorageCheck() (passed bool) {
+func StorageCheck() (passed bool, err error) {
 	var stat unix.Statfs_t
-	err := unix.Statfs("/", &stat)
+	err = unix.Statfs("/", &stat)
 
 	if err != nil {
 		log.Fatal(err)
@@ -19,10 +22,9 @@ func StorageCheck() (passed bool) {
 	availableSpace := stat.Bavail * uint64(stat.Bsize) * uint64(math.Pow(10, 9))
 
 	switch {
-	case availableSpace >= uint64(math.Pow(30, 9)):
-		return true
+	case availableSpace >= neededSpace:
+		return true, nil
 	default:
-		return false
+		return false, fmt.Errorf("not enough storage space (needed: %v GB) (have: %v GB)", neededSpace, availableSpace)
 	}
-
 }