From 63e442ac7a3f7bd11eb853c040908c9aa8111645 Mon Sep 17 00:00:00 2001 From: Max Xandeco Date: Thu, 19 Sep 2019 11:27:57 +0100 Subject: [PATCH] change plugin name regex to case-insensitive. --- pkg/controller/jenkins/plugins/plugin.go | 2 +- pkg/controller/jenkins/plugins/plugin_test.go | 12 ++++++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/pkg/controller/jenkins/plugins/plugin.go b/pkg/controller/jenkins/plugins/plugin.go index 75ed6138..ef96fa8a 100644 --- a/pkg/controller/jenkins/plugins/plugin.go +++ b/pkg/controller/jenkins/plugins/plugin.go @@ -22,7 +22,7 @@ func (p Plugin) String() string { } var ( - namePattern = regexp.MustCompile(`^[0-9a-z-_]+$`) + namePattern = regexp.MustCompile(`(?i)^[0-9a-z-_]+$`) versionPattern = regexp.MustCompile(`^[0-9\\.]+$`) ) diff --git a/pkg/controller/jenkins/plugins/plugin_test.go b/pkg/controller/jenkins/plugins/plugin_test.go index 4074a03e..de137dc7 100644 --- a/pkg/controller/jenkins/plugins/plugin_test.go +++ b/pkg/controller/jenkins/plugins/plugin_test.go @@ -44,6 +44,18 @@ func TestVerifyDependencies(t *testing.T) { got := VerifyDependencies(basePlugins) assert.Equal(t, true, got) }) + t.Run("happy, two plugin names with uppercase names", 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) { basePlugins := map[Plugin][]Plugin{ Must(New("first-root-plugin:1.0.0")): {