Fix wrong error message on memory validation

pull/11015/head
Anders F Björklund 2021-04-07 20:02:46 +02:00
parent 22099c8a14
commit f672afe1d4
2 changed files with 10 additions and 1 deletions

View File

@ -93,7 +93,7 @@ var settings = []Setting{
{
name: "memory",
set: SetString,
validations: []setFn{IsValidDiskSize},
validations: []setFn{IsValidMemory},
callbacks: []setFn{RequiresRestartMsg},
},
{

View File

@ -53,6 +53,15 @@ func IsValidDiskSize(name string, disksize string) error {
return nil
}
// IsValidMemory checks if a string is a valid memory size
func IsValidMemory(name string, memsize string) error {
_, err := units.FromHumanSize(memsize)
if err != nil {
return fmt.Errorf("invalid memory size: %v", err)
}
return nil
}
// IsValidURL checks if a location is a valid URL
func IsValidURL(name string, location string) error {
_, err := url.Parse(location)