public_git/kubernetes-operator
1
0
Fork 0
mirror of https://github.com/jenkinsci/kubernetes-operator.git synced 2026-10-21 12:39:33 +02:00
Code Issues Releases Wiki Activity

#144 Fix unit tests

Browse Source
This commit is contained in:
Tomasz Sęk
2019-11-29 12:06:40 +01:00
parent 14e8667674
commit b03b7d91f6
2 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/controller/jenkins/plugins/plugin.go
+8 -6
View File
@@ -20,8 +20,10 @@ func (p Plugin) String() string {
}
var (
namePattern = regexp.MustCompile(`^[0-9a-zA-Z-_]+$`)
versionPattern = regexp.MustCompile(`^[0-9a-zA-Z+\\.-]+$`)
// NamePattern is the plugin name regex pattern
NamePattern = regexp.MustCompile(`^[0-9a-zA-Z-_]+$`)
// VersionPattern is the plugin version regex pattern
VersionPattern = regexp.MustCompile(`^[0-9a-zA-Z+\\.-]+$`)
)
// New creates plugin from string, for example "name-of-plugin:0.0.1"
@@ -56,11 +58,11 @@ func NewPlugin(name, version string) (*Plugin, error) {
}
func validatePlugin(name, version string) error {
if ok := namePattern.MatchString(name); !ok {
return errors.Errorf("invalid plugin name '%s:%s', must follow pattern '%s'", name, version, namePattern.String())
if ok := NamePattern.MatchString(name); !ok {
return errors.Errorf("invalid plugin name '%s:%s', must follow pattern '%s'", name, version, NamePattern.String())
}
if ok := versionPattern.MatchString(version); !ok {
return errors.Errorf("invalid plugin version '%s:%s', must follow pattern '%s'", name, version, versionPattern.String())
if ok := VersionPattern.MatchString(version); !ok {
return errors.Errorf("invalid plugin version '%s:%s', must follow pattern '%s'", name, version, VersionPattern.String())
}
return nil
}