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

Merge pull request #156 from bechampion/patch-2 

Updating plugin.go to allow versions
This commit is contained in:
Tomasz Sęk 2019-10-18 15:24:22 +02:00 committed by GitHub
parent 159e0cfee7 d9b5d1b9cd
commit 8775a20573
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/controller/jenkins/configuration/base/validate_test.go
View File

@ -57,7 +57,7 @@ func TestValidatePlugins(t *testing.T) {
got := baseReconcileLoop.validatePlugins(requiredBasePlugins, basePlugins, userPlugins) got := baseReconcileLoop.validatePlugins(requiredBasePlugins, basePlugins, userPlugins)
assert.Equal(t, got, []string{"invalid plugin version 'simple-plugin:invalid', must follow pattern '^[0-9\\\\.-]+$'"}) assert.Equal(t, got, []string{"invalid plugin version 'simple-plugin:invalid', must follow pattern '^[0-9\\\\.-]+(\\..+)?$'"})
}) })
t.Run("valid base plugin", func(t *testing.T) { t.Run("valid base plugin", func(t *testing.T) {
var requiredBasePlugins []plugins.Plugin var requiredBasePlugins []plugins.Plugin
@ -84,7 +84,7 @@ func TestValidatePlugins(t *testing.T) {
got := baseReconcileLoop.validatePlugins(requiredBasePlugins, basePlugins, userPlugins) got := baseReconcileLoop.validatePlugins(requiredBasePlugins, basePlugins, userPlugins)
assert.Equal(t, got, []string{"invalid plugin version 'simple-plugin:invalid', must follow pattern '^[0-9\\\\.-]+$'"}) assert.Equal(t, got, []string{"invalid plugin version 'simple-plugin:invalid', must follow pattern '^[0-9\\\\.-]+(\\..+)?$'"})
}) })
t.Run("valid user and base plugin version", func(t *testing.T) { t.Run("valid user and base plugin version", func(t *testing.T) {
var requiredBasePlugins []plugins.Plugin var requiredBasePlugins []plugins.Plugin

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

@ -21,7 +21,7 @@ func (p Plugin) String() string {
var ( var (
namePattern = regexp.MustCompile(`(?i)^[0-9a-z-_]+$`) namePattern = regexp.MustCompile(`(?i)^[0-9a-z-_]+$`)
versionPattern = regexp.MustCompile(`^[0-9\\.-]+$`) versionPattern = regexp.MustCompile(`^[0-9\\.-]+(\..+)?$`)
) )
// New creates plugin from string, for example "name-of-plugin:0.0.1" // New creates plugin from string, for example "name-of-plugin:0.0.1"