Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

test: upgrade ut of package config to make it more self-contained and… #896

Merged
merged 1 commit into from
Mar 8, 2024
Merged

test: upgrade ut of package config to make it more self-contained and… #896

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 3 additions & 5 deletions pkg/config/operator.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ var (
ErrEmptyConfigItem = errors.New("empty config item")
ErrConflictConfigItemType = errors.New("type of the config item conflicts between saved and registered")
ErrEmptyConfigItemKey = errors.New("empty config item key")
ErrEmptyConfigItemValue = errors.New("empty config item value")
ErrUnsupportedConfigItem = errors.New("unsupported config item")
ErrEmptyBackendName = errors.New("backend name should not be empty")
ErrInvalidBackendName = errors.New("backend name should not be current")
Expand Down Expand Up @@ -246,9 +247,6 @@ func getConfigItemWithLaxType(config *v1.Config, key string) (any, error) {
// the updated config.
// ATTENTION! Cause the input config could be nil, change it or its value may both could result in assignment failure.
func setItemInConfig(config *v1.Config, info *itemInfo, key string, value any) (*v1.Config, error) {
if err := validateConfig(config); err != nil {
return nil, err
}
if err := validateConfigItem(config, info, key, value); err != nil {
return nil, err
}
Expand Down Expand Up @@ -299,7 +297,7 @@ func tidyConfig(configAddr **v1.Config) {
// validateConfigItem checks the config item value is valid or not.
func validateConfigItem(config *v1.Config, info *itemInfo, key string, value any) error {
if reflect.ValueOf(value).IsZero() {
return ErrEmptyConfigItem
return ErrEmptyConfigItemValue
}
if info.validateFunc != nil {
return info.validateFunc(config, key, value)
Expand All @@ -311,7 +309,7 @@ func validateConfigItem(config *v1.Config, info *itemInfo, key string, value any
// its validation.
func parseStructuredConfigItem(info *itemInfo, strValue string) (any, error) {
if len(strValue) == 0 {
return nil, ErrEmptyConfigItem
return nil, ErrEmptyConfigItemValue
}

value := info.zeroValue
Expand Down