-
Notifications
You must be signed in to change notification settings - Fork 23
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.
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
Remove go-ozzo/ozzo-validation package #56
Merged
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,84 @@ | ||
| package utils | ||
|
|
||
| import ( | ||
| "encoding/base64" | ||
| "errors" | ||
| "net/url" | ||
| "strconv" | ||
|
|
||
| "github.com/ca-gip/kubi/pkg/types" | ||
| ) | ||
|
|
||
| func validateBase64(s string) error { | ||
| if _, err := base64.StdEncoding.DecodeString(s); err != nil { | ||
| return errors.New("must be a valid base64 string") | ||
| } | ||
| return nil | ||
| } | ||
|
|
||
| func validateURL(s string) error { | ||
| if _, err := url.ParseRequestURI(s); err != nil { | ||
| return errors.New("must be a valid URL") | ||
| } | ||
| return nil | ||
| } | ||
| func validateLength(field string, min int, max int) error { | ||
| length := len(field) | ||
| if length < min || length > max { | ||
| return errors.New("length must be between " + strconv.Itoa(min) + " and " + strconv.Itoa(max) + " characters") | ||
| } | ||
| return nil | ||
| } | ||
|
|
||
| func validateLdapConfig(ldapConfig *types.LdapConfig) error { | ||
| if ldapConfig.UserBase == "" { | ||
| return errors.New("userBase is required") | ||
| } | ||
| if err := validateLength(ldapConfig.UserBase, 2, 200); err != nil { | ||
| return err | ||
| } | ||
| if ldapConfig.GroupBase == "" { | ||
| return errors.New("groupBase is required") | ||
| } | ||
| if err := validateLength(ldapConfig.GroupBase, 2, 200); err != nil { | ||
| return err | ||
| } | ||
| if ldapConfig.Host == "" { | ||
| return errors.New("host is required") | ||
| } | ||
| if err := validateURL(ldapConfig.Host); err != nil { | ||
| return err | ||
| } | ||
| if ldapConfig.BindDN == "" { | ||
| return errors.New("BindDN is required") | ||
| } | ||
| if err := validateLength(ldapConfig.BindDN, 2, 200); err != nil { | ||
| return err | ||
| } | ||
| if ldapConfig.BindPassword == "" { | ||
| return errors.New("BindPassword is required") | ||
| } | ||
| if err := validateLength(ldapConfig.BindPassword, 2, 200); err != nil { | ||
| return err | ||
| } | ||
| return nil | ||
| } | ||
|
|
||
| func validateConfig(config *types.Config) error { | ||
| if config.KubeToken == "" { | ||
| return errors.New("KubeToken is required") | ||
| } | ||
| if config.KubeCa == "" { | ||
| return errors.New("KubeCa is required") | ||
| } | ||
| if err := validateBase64(config.KubeCa); err != nil { | ||
| return err | ||
| } | ||
| if config.PublicApiServerURL == "" { | ||
| return errors.New("PublicApiServerURL is required") | ||
| } | ||
| if err := validateURL(config.PublicApiServerURL); err != nil { | ||
| return err | ||
| } | ||
| return nil | ||
| } |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
validate config inside MakeConfig is very confusing.
Can't we simply use the MakeConfig as a constructor based on the config provided in the main, and validate all we need directly?
I am fine with splitting the function to make it clearer, so I am fine with validateLdapConfig. However, I believe that validation can be done immediately in a single step.
Also, we don't need to create validation functions, unless they are used multiple times and make it easier to read.
In all cases, don't forget to add tests...