remove go mod

access-types.go

@@ -49,48 +49,3 @@ type VMID struct {
 	Min int `json:"min" mapstructure:"min"`
 	Max int `json:"max" mapstructure:"max"`
 }
-
-type Backups struct {
-	MaxPerInstance int `json:"max-per-instance" mapstructure:"max-per-instance"`
-	MaxTotal       int `json:"max-total" mapstructure:"max-total"`
-}
-
-type Templates struct {
-	Instances struct {
-		LXC  map[string]ResourceTemplate `json:"lxc" mapstructure:"lxc"`
-		QEMU map[string]ResourceTemplate `json:"qemu" mapstructure:"qemu"`
-	} `json:"instances"`
-}
-
-type SimpleResource struct {
-	Limits struct {
-		Global SimpleLimit            `json:"global" mapstructure:"global"`
-		Nodes  map[string]SimpleLimit `json:"nodes" mapstructure:"nodes"`
-	} `json:"limits"`
-}
-
-type SimpleLimit struct {
-	Max int `json:"max" mapstructure:"max"`
-}
-
-type MatchResource struct {
-	Limits struct {
-		Global []MatchLimit            `json:"global" mapstructure:""`
-		Nodes  map[string][]MatchLimit `json:"nodes" mapstructure:""`
-	} `json:"limits"`
-}
-
-type MatchLimit struct {
-	Match string `json:"match" mapstructure:""`
-	Name  string `json:"name" mapstructure:""`
-	Max   int    `json:"max" mapstructure:""`
-}
-
-type ResourceTemplate struct {
-	Value    string `json:"value" mapstructure:"value"`
-	Resource struct {
-		Enabled bool   `json:"enabled" mapstructure:"enabled"`
-		Name    string `json:"name" mapstructure:"name"`
-		Amount  int    `json:"amount" mapstructure:"amount"`
-	} `json:"resource" mapstructure:"resource"`
-}

access-utils.go

@@ -14,7 +14,7 @@ func (g Groupname) ToString() string {
 // Converts input username object to string representation.
 // Uses the format uid@realm.
 func (u Username) ToString() string {
-	return fmt.Sprintf("%s-%s", u.UserID, u.Realm)
+	return fmt.Sprintf("%s@%s", u.UserID, u.Realm)
 }
 
 // Parses input groupname string to gid and realm.

go.mod

@@ -1,3 +0,0 @@
-module proxmoxaas-common-lib
-
-go 1.26.0

http-utils.go

@@ -0,0 +1,57 @@
+package proxmoxaas_common_lib
+
+import (
+	"bytes"
+	"encoding/json"
+	"html/template"
+	"log"
+	"net/http"
+	"time"
+)
+
+func HTTPExecuteHTMLTemplate(w http.ResponseWriter, t *template.Template, name string, d any) {
+	w.Header().Set("Content-Type", "text/html")
+	body := bytes.Buffer{}
+	err := t.ExecuteTemplate(&body, name, d)
+	if err != nil {
+		w.WriteHeader(http.StatusInternalServerError)
+		return
+	} else {
+		w.Write(body.Bytes())
+		return
+	}
+}
+
+func HTTPExecuteHTMLFragmentTemplate(w http.ResponseWriter, t *template.Template, name string, d any) {
+	w.Header().Set("Content-Type", "text/plain")
+	body := bytes.Buffer{}
+	err := t.ExecuteTemplate(&body, name, d)
+	if err != nil {
+		w.WriteHeader(http.StatusInternalServerError)
+		return
+	} else {
+		w.Write(body.Bytes())
+		return
+	}
+}
+
+func HTTPWriteJson(w http.ResponseWriter, code int, obj any) {
+	w.Header().Set("Content-Type", "application/json")
+	json, err := json.Marshal(obj)
+	if err != nil {
+		w.WriteHeader(http.StatusInternalServerError)
+		return
+	} else {
+		w.WriteHeader(code)
+		w.Write(json)
+		return
+	}
+}
+
+func LoggingMiddleware(next http.Handler) http.Handler {
+	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		start := time.Now()
+		next.ServeHTTP(w, r)
+		log.Printf("%s %s %s", r.Method, r.URL.Path, time.Since(start))
+	})
+}

quota-types.go

@@ -0,0 +1,78 @@
+package proxmoxaas_common_lib
+
+// numerical constraint
+type Constraint struct {
+	Max   int64 `json:"max" mapstructure:"max"`
+	Used  int64 `json:"used" mapstructure:"used"`
+	Avail int64 `json:"avail" mapstructure:"avail"`
+}
+
+// match constraint
+type Match struct {
+	Constraint `mapstructure:",squash"`
+	Name       string `json:"name" mapstructure:"name"`
+	Match      string `json:"match" mapstructure:"match"`
+}
+
+// numerical resource
+type NumericResource struct {
+	Type       string
+	Name       string
+	Multiplier int64
+	Base       uint64
+	Compact    bool
+	Unit       string
+	Display    bool
+	Global     Constraint
+	Nodes      map[string]Constraint
+	Total      Constraint
+	Category   string
+}
+
+// storage resource
+type StorageResource struct {
+	Type       string
+	Name       string
+	Multiplier int64
+	Base       uint64
+	Compact    bool
+	Unit       string
+	Display    bool
+	Disks      []string
+	Global     Constraint
+	Nodes      map[string]Constraint
+	Total      Constraint
+	Category   string
+}
+
+// list resource
+type ListResource struct {
+	Type      string
+	Whitelist bool
+	Display   bool
+	Global    []Match
+	Nodes     map[string][]Match
+	Total     []Match
+	Category  string
+}
+
+type Templates struct {
+	Instances struct {
+		LXC  map[string]ResourceTemplate `json:"lxc" mapstructure:"lxc"`
+		QEMU map[string]ResourceTemplate `json:"qemu" mapstructure:"qemu"`
+	} `json:"instances"`
+}
+
+type ResourceTemplate struct {
+	Value    string `json:"value" mapstructure:"value"`
+	Resource struct {
+		Enabled bool   `json:"enabled" mapstructure:"enabled"`
+		Name    string `json:"name" mapstructure:"name"`
+		Amount  int    `json:"amount" mapstructure:"amount"`
+	} `json:"resource" mapstructure:"resource"`
+}
+
+type Backups struct {
+	MaxPerInstance int `json:"max-per-instance" mapstructure:"max-per-instance"`
+	MaxTotal       int `json:"max-total" mapstructure:"max-total"`
+}

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

@@ -48,7 +48,7 @@ func FormatNumber(val uint64, base uint64) (string, string) {
 }
 
 // Converts int, int32, and int64 to uint64. Less than 0 check.
-func SafeUint64[I int | int32 | int64](i I) uint64 {
+func SafeUint64[I int | int32 | int64 | uint | uint32](i I) uint64 {
 	if i < 0 {
 		log.Printf("Tried to cast %d to uint64", i)
 		return 0