From 7ad8a16cd6c33816e732c48f104bac3eb2fea49e Mon Sep 17 00:00:00 2001 From: Jeronimo Date: Fri, 18 Oct 2019 10:41:05 +0100 Subject: [PATCH 1/2] Updating plugin.go to allow versions This change is it allow all possible versions in all plugins within update.jenkins.io, this is linked to issue:https://github.com/jenkinsci/kubernetes-operator/issues/144 --- pkg/controller/jenkins/plugins/plugin.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/controller/jenkins/plugins/plugin.go b/pkg/controller/jenkins/plugins/plugin.go index ef4dde30..c1ee8fc7 100644 --- a/pkg/controller/jenkins/plugins/plugin.go +++ b/pkg/controller/jenkins/plugins/plugin.go @@ -21,7 +21,7 @@ func (p Plugin) String() string { var ( 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" From d9b5d1b9cde8ff5bae3e65c238be80db351a5ab7 Mon Sep 17 00:00:00 2001 From: jgarcia Date: Fri, 18 Oct 2019 12:01:13 +0100 Subject: [PATCH 2/2] Changing tests to pass the new regexp --- pkg/controller/jenkins/configuration/base/validate_test.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/controller/jenkins/configuration/base/validate_test.go b/pkg/controller/jenkins/configuration/base/validate_test.go index 51c1206f..2ede8948 100644 --- a/pkg/controller/jenkins/configuration/base/validate_test.go +++ b/pkg/controller/jenkins/configuration/base/validate_test.go @@ -57,7 +57,7 @@ func TestValidatePlugins(t *testing.T) { 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) { var requiredBasePlugins []plugins.Plugin @@ -84,7 +84,7 @@ func TestValidatePlugins(t *testing.T) { 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) { var requiredBasePlugins []plugins.Plugin