diff --git a/app/common/meta_debug.go b/app/common/meta_debug.go
index cfb3c2a..e31203b 100644
--- a/app/common/meta_debug.go
+++ b/app/common/meta_debug.go
@@ -36,10 +36,6 @@ var MimeTypes = map[string]MimeType{
Type: "image/svg+xml",
Minifier: nil,
},
- "png": {
- Type: "image/png",
- Minifier: nil,
- },
"js": {
Type: "application/javascript",
Minifier: nil,
diff --git a/app/common/meta_release.go b/app/common/meta_release.go
index baa4124..fd736bd 100644
--- a/app/common/meta_release.go
+++ b/app/common/meta_release.go
@@ -40,10 +40,6 @@ var MimeTypes = map[string]MimeType{
Type: "image/svg+xml",
Minifier: svg.Minify,
},
- "png": {
- Type: "image/png",
- Minifier: nil,
- },
"js": {
Type: "application/javascript",
Minifier: js.Minify,
diff --git a/app/routes/account.go b/app/routes/account.go
index cca4511..159f560 100644
--- a/app/routes/account.go
+++ b/app/routes/account.go
@@ -11,71 +11,11 @@ import (
"github.com/go-viper/mapstructure/v2"
)
-type Account struct {
- User paas.User
- Pools map[string]Pool
-}
-
type Pool struct {
paas.Pool `mapstructure:",squash"`
ResourceCharts map[string]map[string]any
}
-// numerical constraint
-type Constraint struct {
- Max int64
- Used int64
- Avail int64
-}
-
-// match constraint
-type Match struct {
- Name string
- Match string
- Max int64
- Used int64
- Avail int64
-}
-
-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
-}
-
-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
-}
-
-type ListResource struct {
- Type string
- Whitelist bool
- Display bool
- Global []Match
- Nodes map[string][]Match
- Total []Match
- Category string
-}
-
type ResourceChart struct {
Type string
Display bool
@@ -103,28 +43,23 @@ var Green = color.RGB{
func HandleGETAccount(c *gin.Context) {
auth, err := common.GetAuthFromRequest(c)
if err == nil {
- account := Account{}
-
user, err := GetUserBasic(auth)
if err != nil {
common.HandleNonFatalError(c, err)
return
}
- account.User = user
pools, err := GetUserPools(auth)
if err != nil {
common.HandleNonFatalError(c, err)
return
}
- account.Pools = pools
-
- account.FormatPoolResourceCharts()
c.HTML(http.StatusOK, "html/account.html", gin.H{
- "global": common.Global,
- "page": "account",
- "account": account,
+ "global": common.Global,
+ "page": "account",
+ "user": user,
+ "pools": pools,
})
} else {
c.Redirect(http.StatusFound, "/login") // if user is not authed, redirect user to login page
@@ -195,7 +130,7 @@ func GetUserPools(auth paas.Auth) (map[string]Pool, error) {
// depending on type, decode the apool data into the corresponding resource type
switch t {
case "numeric":
- n := NumericResource{}
+ n := paas.NumericResource{}
n.Type = t
err_m := mapstructure.Decode(m, &n)
err_r := mapstructure.Decode(r, &n)
@@ -204,7 +139,7 @@ func GetUserPools(auth paas.Auth) (map[string]Pool, error) {
}
pool.ResourceCharts[category][k] = n
case "storage":
- n := StorageResource{}
+ n := paas.StorageResource{}
n.Type = t
err_m := mapstructure.Decode(m, &n)
err_r := mapstructure.Decode(r, &n)
@@ -213,7 +148,7 @@ func GetUserPools(auth paas.Auth) (map[string]Pool, error) {
}
pool.ResourceCharts[category][k] = n
case "list":
- n := ListResource{}
+ n := paas.ListResource{}
n.Type = t
err_m := mapstructure.Decode(m, &n)
err_r := mapstructure.Decode(r, &n)
@@ -229,21 +164,25 @@ func GetUserPools(auth paas.Auth) (map[string]Pool, error) {
pools[poolname] = pool
}
+ err = FormatPoolResourceCharts(&pools)
+ if err != nil {
+ return pools, err
+ }
+
return pools, nil
}
-func (account *Account) FormatPoolResourceCharts() error {
- pools := account.Pools
- for poolname, pool := range pools {
+func FormatPoolResourceCharts(pools *map[string]Pool) error {
+ for poolname, pool := range *pools {
// for each resource category
for categoryname, category := range pool.ResourceCharts {
// for each resource in each category
for resourcename, resource := range category {
// create a resource chart for resource depending on resource type
switch t := resource.(type) {
- case NumericResource:
+ case paas.NumericResource:
avail, prefix := paas.FormatNumber(paas.SafeUint64(t.Total.Avail*t.Multiplier), t.Base)
- pools[poolname].ResourceCharts[categoryname][resourcename] = ResourceChart{
+ (*pools)[poolname].ResourceCharts[categoryname][resourcename] = ResourceChart{
Type: t.Type,
Display: t.Display,
Name: t.Name,
@@ -254,9 +193,9 @@ func (account *Account) FormatPoolResourceCharts() error {
Unit: t.Unit,
ColorHex: InterpolateColorHSV(Green, Red, float64(t.Total.Used)/float64(t.Total.Max)).ToHTML(),
}
- case StorageResource:
+ case paas.StorageResource:
avail, prefix := paas.FormatNumber(paas.SafeUint64(t.Total.Avail*t.Multiplier), t.Base)
- pools[poolname].ResourceCharts[categoryname][resourcename] = ResourceChart{
+ (*pools)[poolname].ResourceCharts[categoryname][resourcename] = ResourceChart{
Type: t.Type,
Display: t.Display,
Name: t.Name,
@@ -267,7 +206,7 @@ func (account *Account) FormatPoolResourceCharts() error {
Unit: t.Unit,
ColorHex: InterpolateColorHSV(Green, Red, float64(t.Total.Used)/float64(t.Total.Max)).ToHTML(),
}
- case ListResource:
+ case paas.ListResource:
l := struct {
Type string
Display bool
@@ -291,7 +230,7 @@ func (account *Account) FormatPoolResourceCharts() error {
ColorHex: InterpolateColorHSV(Green, Red, float64(r.Used)/float64(r.Max)).ToHTML(),
})
}
- pools[poolname].ResourceCharts[categoryname][resourcename] = l
+ (*pools)[poolname].ResourceCharts[categoryname][resourcename] = l
}
}
}
diff --git a/app/routes/config.go b/app/routes/config.go
index e53ce71..4645e28 100644
--- a/app/routes/config.go
+++ b/app/routes/config.go
@@ -12,8 +12,6 @@ import (
"github.com/go-viper/mapstructure/v2"
)
-// imported types from fabric
-
type InstanceConfig struct {
paas.Instance `mapstructure:",squash"`
// overrides
@@ -28,8 +26,8 @@ type GlobalConfig struct {
type PoolConfig struct {
CPU struct {
- Global []paas.MatchLimit
- Nodes map[string][]paas.MatchLimit
+ Global []paas.Match
+ Nodes map[string][]paas.Match
}
}
@@ -243,7 +241,7 @@ func GetCPUTypes(vm paas.InstancePath, pool string, auth paas.Auth) (common.Sele
}
// use node specific rules if present, otherwise use global rules
- var userCPU []paas.MatchLimit
+ var userCPU []paas.Match
if _, ok := poolCPUConfig.CPU.Nodes[vm.NodeName]; ok {
userCPU = poolCPUConfig.CPU.Nodes[vm.NodeName]
} else {
@@ -269,7 +267,7 @@ func GetCPUTypes(vm paas.InstancePath, pool string, auth paas.Auth) (common.Sele
return cputypes, fmt.Errorf("request to %s resulted in %+v", path, res)
}
supported := struct {
- data []paas.MatchLimit
+ data []paas.Match
}{}
err = mapstructure.Decode(body, supported)
if err != nil {
@@ -278,7 +276,7 @@ func GetCPUTypes(vm paas.InstancePath, pool string, auth paas.Auth) (common.Sele
// for each node supported cpu type, if it is NOT in the user's config (aka is not blacklisted) then add it to the options
for _, cpu := range supported.data {
- contains := slices.ContainsFunc(userCPU, func(c paas.MatchLimit) bool {
+ contains := slices.ContainsFunc(userCPU, func(c paas.Match) bool {
return c.Name == cpu.Name
})
if !contains {
diff --git a/app/routes/login.go b/app/routes/login.go
index 4501720..8157f21 100644
--- a/app/routes/login.go
+++ b/app/routes/login.go
@@ -9,11 +9,6 @@ import (
"github.com/go-viper/mapstructure/v2"
)
-// used when requesting GET /access/domains
-type GetRealmsBody struct {
- Data []Realm `json:"data"`
-}
-
// stores each realm's data
type Realm struct {
Default int `json:"default"`
diff --git a/proxmoxaas-common-lib b/proxmoxaas-common-lib
index 0551969..f4deeb1 160000
--- a/proxmoxaas-common-lib
+++ b/proxmoxaas-common-lib
@@ -1 +1 @@
-Subproject commit 05519694e1a19c9555114dffdf8f5610f46b54cd
+Subproject commit f4deeb1ab65bfbaf07c0286b5d3b7915fa129f21
diff --git a/web/html/account.html b/web/html/account.html
index 92fa460..d0bc556 100644
--- a/web/html/account.html
+++ b/web/html/account.html
@@ -39,11 +39,11 @@
Account
Account Details
- Username: {{.account.User.Username.UserID}}@{{.account.User.Username.Realm}}
- Email: {{.account.User.Mail}}
+ Username: {{.user.Username.UserID}}@{{.user.Username.Realm}}
+ Email: {{.user.Mail}}
Password:
- {{range $poolname, $pool := .account.Pools}}
+ {{range $poolname, $pool := .pools}}
{{template "pool-resources" $pool}}
{{end}}