Merge branch 'helm_version_regexp' into 'master'

Fix Helm version regexp to match unprefixed semver too

See merge request gitlab-org/gitlab!63967

app/models/packages/package.rb

@@ -76,7 +76,7 @@ class Packages::Package < ApplicationRecord
   validates :version, format: { with: Gitlab::Regex.maven_version_regex }, if: -> { version? && maven? }
   validates :version, format: { with: Gitlab::Regex.pypi_version_regex }, if: :pypi?
   validates :version, format: { with: Gitlab::Regex.prefixed_semver_regex }, if: :golang?
-  validates :version, format: { with: Gitlab::Regex.prefixed_semver_regex }, if: :helm?
+  validates :version, format: { with: Gitlab::Regex.helm_version_regex }, if: :helm?
   validates :version, format: { with: Gitlab::Regex.semver_regex }, if: -> { composer_tag_version? || npm? || terraform_module? }
 
   validates :version,

lib/gitlab/regex.rb

@@ -138,7 +138,8 @@ module Gitlab
       end
 
       def helm_version_regex
-        @helm_version_regex ||= %r{#{prefixed_semver_regex}}.freeze
+        # identical to semver_regex, with optional preceding 'v'
+        @helm_version_regex ||= Regexp.new("\\Av?#{::Gitlab::Regex.unbounded_semver_regex.source}\\z", ::Gitlab::Regex.unbounded_semver_regex.options)
       end
 
       def unbounded_semver_regex

spec/lib/gitlab/regex_spec.rb

@@ -675,9 +675,20 @@ RSpec.describe Gitlab::Regex do
   describe '.helm_version_regex' do
     subject { described_class.helm_version_regex }
 
+    it { is_expected.to match('1.2.3') }
+    it { is_expected.to match('1.2.3-beta') }
+    it { is_expected.to match('1.2.3-alpha.3') }
+
     it { is_expected.to match('v1.2.3') }
     it { is_expected.to match('v1.2.3-beta') }
     it { is_expected.to match('v1.2.3-alpha.3') }
+
+    it { is_expected.not_to match('1') }
+    it { is_expected.not_to match('1.2') }
+    it { is_expected.not_to match('1./2.3') }
+    it { is_expected.not_to match('../../../../../1.2.3') }
+    it { is_expected.not_to match('%2e%2e%2f1.2.3') }
+
     it { is_expected.not_to match('v1') }
     it { is_expected.not_to match('v1.2') }
     it { is_expected.not_to match('v1./2.3') }

spec/models/packages/package_spec.rb

@@ -404,7 +404,8 @@ RSpec.describe Packages::Package, type: :model do
         it { is_expected.not_to allow_value(nil).for(:version) }
         it { is_expected.not_to allow_value('').for(:version) }
         it { is_expected.to allow_value('v1.2.3').for(:version) }
-        it { is_expected.not_to allow_value('1.2.3').for(:version) }
+        it { is_expected.to allow_value('1.2.3').for(:version) }
+        it { is_expected.not_to allow_value('v1.2').for(:version) }
       end
 
       it_behaves_like 'validating version to be SemVer compliant for', :npm_package