opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-09-01 15:07:17 +08:00
Code Issues Packages Projects Releases Wiki Activity

validators: remove unused defaultVal member

Browse Source
This commit is contained in:
Yousong Zhou
2020-01-10 13:56:32 +08:00
parent f90b4cd9e1
commit 60eb3bcbb2
1 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/cloudcommon/validators/validators.go
+8 -9
View File
@@ -160,9 +160,8 @@ func (v *ValidatorIPv4Prefix) Validate(data *jsonutils.JSONDict) error {
type ValidatorStringChoices struct {
Validator
Choices choices.Choices
defaultVal string
Value string
Choices choices.Choices
Value string
}
func NewStringChoicesValidator(key string, choices choices.Choices) *ValidatorStringChoices {
@@ -176,7 +175,8 @@ func NewStringChoicesValidator(key string, choices choices.Choices) *ValidatorSt
func (v *ValidatorStringChoices) Default(s string) IValidator {
if v.Choices.Has(s) {
return v.Validator.Default(s)
v.Validator.Default(s)
return v
}
panic("invalid default for " + v.Key)
}
@@ -204,11 +204,10 @@ func (v *ValidatorStringChoices) Validate(data *jsonutils.JSONDict) error {
type ValidatorStringMultiChoices struct {
Validator
Choices choices.Choices
defaultVal string
Value string
sep string
keepDup bool
Choices choices.Choices
Value string
sep string
keepDup bool
}
func NewStringMultiChoicesValidator(key string, choices choices.Choices) *ValidatorStringMultiChoices {