This commit is contained in:
@@ -7,14 +7,9 @@ import (
|
||||
)
|
||||
|
||||
type PVEConfig struct {
|
||||
URL string `json:"url"`
|
||||
Token struct {
|
||||
User string `json:"user"`
|
||||
Realm string `json:"realm"`
|
||||
ID string `json:"id"`
|
||||
UUID string `json:"uuid"`
|
||||
} `json:"token"`
|
||||
PAASClientRole string `json:"paas-client-role"`
|
||||
URL string `json:"url"`
|
||||
Token PVEAPIToken `json:"token"`
|
||||
PAASClientRole string `json:"paas-client-role"`
|
||||
}
|
||||
|
||||
type LDAPConfig struct {
|
||||
|
||||
+5
-6
@@ -32,10 +32,9 @@ type Group = paas.Group
|
||||
type Username = paas.Username
|
||||
type User = paas.User
|
||||
|
||||
func ParseGroupname(groupname string) (Groupname, error) {
|
||||
return paas.ParseGroupname(groupname)
|
||||
}
|
||||
|
||||
func ParseUsername(username string) (Username, error) {
|
||||
return paas.ParseUsername(username)
|
||||
type PVEAPIToken struct {
|
||||
User string `json:"user"`
|
||||
Realm string `json:"realm"`
|
||||
ID string `json:"id"`
|
||||
UUID string `json:"uuid"`
|
||||
}
|
||||
|
||||
@@ -1,9 +1,20 @@
|
||||
package app
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"reflect"
|
||||
|
||||
paas "proxmoxaas-common-lib"
|
||||
)
|
||||
|
||||
func ParseGroupname(groupname string) (Groupname, error) {
|
||||
return paas.ParseGroupname(groupname)
|
||||
}
|
||||
|
||||
func ParseUsername(username string) (Username, error) {
|
||||
return paas.ParseUsername(username)
|
||||
}
|
||||
|
||||
// RequireAll ensures that EVERY non-excluded exported field in the struct is non-zero.
|
||||
func RequireAll(v any, excludes ...string) bool {
|
||||
val := reflect.ValueOf(v)
|
||||
@@ -53,3 +64,7 @@ func AtLeastOne(v any, excludes ...string) bool {
|
||||
}
|
||||
return false
|
||||
}
|
||||
|
||||
func (token PVEAPIToken) ToString() string {
|
||||
return fmt.Sprintf(`%s@%s!%s`, token.User, token.Realm, token.ID)
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user