add vmid to instance

resource-types.go

@@ -21,6 +21,7 @@ const VM InstanceType = "VM"
 const CT InstanceType = "CT"
 
 type Instance struct {
+	VMID     InstanceID           `json:"vmid" mapstructure:"vmid"`
 	Type     InstanceType         `json:"type" mapstructure:"type"`
 	Name     string               `json:"name" mapstructure:"name"`
 	Proctype string               `json:"cpu" mapstructure:"cpu"`

units.go

@@ -2,49 +2,56 @@ package proxmoxaas_common_lib
 
 import (
 	"fmt"
+	"log"
 	"math"
 	"strings"
 )
 
-const Base1000 int64 = 1000
+const Base1000 uint64 = 1000
-const Base1024 int64 = 1024
+const Base1024 uint64 = 1024
 
 var prefixesBase1000 []string = []string{"", "K", "M", "G", "T"}
 var prefixesBase1024 []string = []string{"", "Ki", "Mi", "Gi", "Ti"}
 
-const KB int64 = Base1000
+const KB uint64 = Base1000
-const MB int64 = KB * Base1000
+const MB uint64 = KB * Base1000
-const GB int64 = MB * Base1000
+const GB uint64 = MB * Base1000
-const TB int64 = GB * Base1000
+const TB uint64 = GB * Base1000
 
-const KiB int64 = Base1024
+const KiB uint64 = Base1024
-const MiB int64 = KiB * Base1024
+const MiB uint64 = KiB * Base1024
-const GiB int64 = MiB * Base1024
+const GiB uint64 = MiB * Base1024
-const TiB int64 = GiB * Base1024
+const TiB uint64 = GiB * Base1024
+
+func FormatNumber(val uint64, base uint64) (string, string) {
+	prefixes := []string{""}
+	switch base {
+	case Base1000:
+		prefixes = prefixesBase1000
+	case Base1024:
+		prefixes = prefixesBase1024
+	default:
+	}
 
-func FormatNumber(val int64, base int64) (string, string) {
 	valf := float64(val)
 	basef := float64(base)
 	steps := 0
-	for math.Abs(valf) > basef && steps < 4 {
+	for math.Abs(valf) > basef && steps < len(prefixes)-1 {
 		valf /= basef
 		steps++
 	}
 
-	switch base {
+	s := fmt.Sprintf("%.4f", valf)
-	case Base1000:
+	s = strings.TrimRight(s, "0")
-		s := fmt.Sprintf("%.4f", valf)
+	s = strings.TrimRight(s, ".")
-		s = strings.TrimRight(s, "0")
+	return s, prefixes[steps]
-		s = strings.TrimRight(s, ".")
+}
-		prefixes := prefixesBase1000
+
-		return s, prefixes[steps]
+// Converts int, int32, and int64 to uint64. Less than 0 check.
-	case Base1024:
+func SafeUint64[I int | int32 | int64 | uint | uint32](i I) uint64 {
-		s := fmt.Sprintf("%.4f", valf)
+	if i < 0 {
-		s = strings.TrimRight(s, "0")
+		log.Printf("Tried to cast %d to uint64", i)
-		s = strings.TrimRight(s, ".")
+		return 0
-		prefixes := prefixesBase1024
+	}
-		return s, prefixes[steps]
+	return uint64(i)
-	default:
-		return "0", ""
-	}
 }