public_git
/
kubernetes-operator
mirror of https://github.com/jenkinsci/kubernetes-operator.git
1
0
Fork 0
Code Issues Releases Wiki Activity

#72 Add support for plugin names with underscore

This commit is contained in:
Jakub Al-Khalili 2019-08-14 09:51:55 +02:00
parent aecfd500f1
commit 5c55db489f
2 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/controller/jenkins/plugins/plugin.go
View File

@ -22,7 +22,7 @@ func (p Plugin) String() string {
} }
var ( var (
namePattern = regexp.MustCompile(`^[0-9a-z-]+$`) namePattern = regexp.MustCompile(`^[0-9a-z-_]+$`)
versionPattern = regexp.MustCompile(`^[0-9\\.]+$`) versionPattern = regexp.MustCompile(`^[0-9\\.]+$`)
) )

12
pkg/controller/jenkins/plugins/plugin_test.go
View File

@ -32,6 +32,18 @@ func TestVerifyDependencies(t *testing.T) {
got := VerifyDependencies(basePlugins) got := VerifyDependencies(basePlugins)
assert.Equal(t, true, got) assert.Equal(t, true, got)
}) })
t.Run("happy, two plugin names with names with underscores", func(t *testing.T) {
basePlugins := map[Plugin][]Plugin{
Must(New("first_root_plugin:1.0.0")): {
Must(New("first_plugin:0.0.1")),
},
Must(New("second_root_plugin:1.0.0")): {
Must(New("first_plugin:0.0.1")),
},
}
got := VerifyDependencies(basePlugins)
assert.Equal(t, true, got)
})
t.Run("fail, two root plugins have different versions", func(t *testing.T) { t.Run("fail, two root plugins have different versions", func(t *testing.T) {
basePlugins := map[Plugin][]Plugin{ basePlugins := map[Plugin][]Plugin{
Must(New("first-root-plugin:1.0.0")): { Must(New("first-root-plugin:1.0.0")): {