Merge branch '213929-move-package-regex-to-core' into 'master'

Move package regex to core

Closes #213929

See merge request gitlab-org/gitlab!33809

ee/app/models/packages/conan/file_metadatum.rb

@@ -18,8 +18,8 @@ class Packages::Conan::FileMetadatum < ApplicationRecord
 
   enum conan_file_type: { recipe_file: 1, package_file: 2 }
 
-  RECIPE_FILES = %w[conanfile.py conanmanifest.txt].freeze
-  PACKAGE_FILES = %w[conaninfo.txt conanmanifest.txt conan_package.tgz].freeze
+  RECIPE_FILES = ::Gitlab::Regex::Packages::CONAN_RECIPE_FILES
+  PACKAGE_FILES = ::Gitlab::Regex::Packages::CONAN_PACKAGE_FILES
   PACKAGE_BINARY = 'conan_package.tgz'
 
   private

ee/lib/ee/gitlab/regex.rb

@@ -6,52 +6,6 @@ module EE
       extend ActiveSupport::Concern
 
       class_methods do
-        def conan_file_name_regex
-          @conan_file_name_regex ||=
-            %r{\A#{(::Packages::Conan::FileMetadatum::RECIPE_FILES + ::Packages::Conan::FileMetadatum::PACKAGE_FILES).join("|")}\z}.freeze
-        end
-
-        def conan_package_reference_regex
-          @conan_package_reference_regex ||= %r{\A[A-Za-z0-9]+\z}.freeze
-        end
-
-        def conan_revision_regex
-          @conan_revision_regex ||= %r{\A0\z}.freeze
-        end
-
-        def conan_recipe_component_regex
-          @conan_recipe_component_regex ||= %r{\A[a-zA-Z0-9_][a-zA-Z0-9_\+\.-]{1,49}\z}.freeze
-        end
-
-        def composer_package_version_regex
-          @composer_package_version_regex ||= %r{^v?(\d+(\.(\d+|x))*(-.+)?)}.freeze
-        end
-
-        def package_name_regex
-          @package_name_regex ||= %r{\A\@?(([\w\-\.\+]*)\/)*([\w\-\.]+)@?(([\w\-\.\+]*)\/)*([\w\-\.]*)\z}.freeze
-        end
-
-        def maven_file_name_regex
-          @maven_file_name_regex ||= %r{\A[A-Za-z0-9\.\_\-\+]+\z}.freeze
-        end
-
-        def maven_path_regex
-          @maven_path_regex ||= %r{\A\@?(([\w\-\.]*)/)*([\w\-\.\+]*)\z}.freeze
-        end
-
-        def maven_app_name_regex
-          @maven_app_name_regex ||= /\A[\w\-\.]+\z/.freeze
-        end
-
-        def maven_app_group_regex
-          maven_app_name_regex
-        end
-
-        def semver_regex
-          # see the official regex: https://semver.org/#is-there-a-suggested-regular-expression-regex-to-check-a-semver-string
-          @semver_regex ||= %r{\A(0|[1-9]\d*)\.(0|[1-9]\d*)\.(0|[1-9]\d*)(?:-((?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*)(?:\.(?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*))*))?(?:\+([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?\z}.freeze
-        end
-
         def feature_flag_regex
           /\A[a-z]([-_a-z0-9]*[a-z0-9])?\z/
         end

ee/spec/lib/gitlab/regex_spec.rb

@@ -3,52 +3,6 @@
 require 'spec_helper'
 
 RSpec.describe Gitlab::Regex do
-  describe '.conan_file_name_regex' do
-    subject { described_class.conan_file_name_regex }
-
-    it { is_expected.to match('conanfile.py') }
-    it { is_expected.to match('conan_package.tgz') }
-    it { is_expected.not_to match('foo.txt') }
-    it { is_expected.not_to match('!!()()') }
-  end
-
-  describe '.conan_package_reference_regex' do
-    subject { described_class.conan_package_reference_regex }
-
-    it { is_expected.to match('123456789') }
-    it { is_expected.to match('asdf1234') }
-    it { is_expected.not_to match('@foo') }
-    it { is_expected.not_to match('0/pack+age/1@1/0') }
-    it { is_expected.not_to match('!!()()') }
-  end
-
-  describe '.conan_revision_regex' do
-    subject { described_class.conan_revision_regex }
-
-    it { is_expected.to match('0') }
-    it { is_expected.not_to match('foo') }
-    it { is_expected.not_to match('!!()()') }
-  end
-
-  describe '.conan_recipe_component_regex' do
-    subject { described_class.conan_recipe_component_regex }
-
-    let(:fifty_one_characters) { 'f_a' * 17}
-
-    it { is_expected.to match('foobar') }
-    it { is_expected.to match('foo_bar') }
-    it { is_expected.to match('foo+bar') }
-    it { is_expected.to match('_foo+bar-baz+1.0') }
-    it { is_expected.to match('1.0.0') }
-    it { is_expected.not_to match('-foo_bar') }
-    it { is_expected.not_to match('+foo_bar') }
-    it { is_expected.not_to match('.foo_bar') }
-    it { is_expected.not_to match('foo@bar') }
-    it { is_expected.not_to match('foo/bar') }
-    it { is_expected.not_to match('!!()()') }
-    it { is_expected.not_to match(fifty_one_characters) }
-  end
-
   describe '.feature_flag_regex' do
     subject { described_class.feature_flag_regex }
 
@@ -58,69 +12,4 @@ RSpec.describe Gitlab::Regex do
     it { is_expected.not_to match('my feature flag') }
     it { is_expected.not_to match('!!()()') }
   end
-
-  describe '.package_name_regex' do
-    subject { described_class.package_name_regex }
-
-    it { is_expected.to match('123') }
-    it { is_expected.to match('foo') }
-    it { is_expected.to match('foo/bar') }
-    it { is_expected.to match('@foo/bar') }
-    it { is_expected.to match('com/mycompany/app/my-app') }
-    it { is_expected.to match('my-package/1.0.0@my+project+path/beta') }
-    it { is_expected.not_to match('my-package/1.0.0@@@@@my+project+path/beta') }
-    it { is_expected.not_to match('$foo/bar') }
-    it { is_expected.not_to match('@foo/@/bar') }
-    it { is_expected.not_to match('@@foo/bar') }
-    it { is_expected.not_to match('my package name') }
-    it { is_expected.not_to match('!!()()') }
-    it { is_expected.not_to match("..\n..\foo") }
-  end
-
-  describe '.maven_file_name_regex' do
-    subject { described_class.maven_file_name_regex }
-
-    it { is_expected.to match('123') }
-    it { is_expected.to match('foo') }
-    it { is_expected.to match('foo+bar-2_0.pom') }
-    it { is_expected.to match('foo.bar.baz-2.0-20190901.47283-1.jar') }
-    it { is_expected.to match('maven-metadata.xml') }
-    it { is_expected.to match('1.0-SNAPSHOT') }
-    it { is_expected.not_to match('../../foo') }
-    it { is_expected.not_to match('..\..\foo') }
-    it { is_expected.not_to match('%2f%2e%2e%2f%2essh%2fauthorized_keys') }
-    it { is_expected.not_to match('$foo/bar') }
-    it { is_expected.not_to match('my file name') }
-    it { is_expected.not_to match('!!()()') }
-  end
-
-  describe '.maven_path_regex' do
-    subject { described_class.maven_path_regex }
-
-    it { is_expected.to match('123') }
-    it { is_expected.to match('foo') }
-    it { is_expected.to match('foo/bar') }
-    it { is_expected.to match('@foo/bar') }
-    it { is_expected.to match('com/mycompany/app/my-app') }
-    it { is_expected.to match('com/mycompany/app/my-app/1.0-SNAPSHOT') }
-    it { is_expected.to match('com/mycompany/app/my-app/1.0-SNAPSHOT+debian64') }
-    it { is_expected.not_to match('com/mycompany/app/my+app/1.0-SNAPSHOT') }
-    it { is_expected.not_to match('$foo/bar') }
-    it { is_expected.not_to match('@foo/@/bar') }
-    it { is_expected.not_to match('my package name') }
-    it { is_expected.not_to match('!!()()') }
-  end
-
-  describe '.semver_regex' do
-    subject { described_class.semver_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.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') }
-  end
 end

lib/gitlab/regex.rb

@@ -2,7 +2,59 @@
 
 module Gitlab
   module Regex
+    module Packages
+      CONAN_RECIPE_FILES = %w[conanfile.py conanmanifest.txt].freeze
+      CONAN_PACKAGE_FILES = %w[conaninfo.txt conanmanifest.txt conan_package.tgz].freeze
+
+      def conan_file_name_regex
+        @conan_file_name_regex ||=
+          %r{\A#{(CONAN_RECIPE_FILES + CONAN_PACKAGE_FILES).join("|")}\z}.freeze
+      end
+
+      def conan_package_reference_regex
+        @conan_package_reference_regex ||= %r{\A[A-Za-z0-9]+\z}.freeze
+      end
+
+      def conan_revision_regex
+        @conan_revision_regex ||= %r{\A0\z}.freeze
+      end
+
+      def conan_recipe_component_regex
+        @conan_recipe_component_regex ||= %r{\A[a-zA-Z0-9_][a-zA-Z0-9_\+\.-]{1,49}\z}.freeze
+      end
+
+      def composer_package_version_regex
+        @composer_package_version_regex ||= %r{^v?(\d+(\.(\d+|x))*(-.+)?)}.freeze
+      end
+
+      def package_name_regex
+        @package_name_regex ||= %r{\A\@?(([\w\-\.\+]*)\/)*([\w\-\.]+)@?(([\w\-\.\+]*)\/)*([\w\-\.]*)\z}.freeze
+      end
+
+      def maven_file_name_regex
+        @maven_file_name_regex ||= %r{\A[A-Za-z0-9\.\_\-\+]+\z}.freeze
+      end
+
+      def maven_path_regex
+        @maven_path_regex ||= %r{\A\@?(([\w\-\.]*)/)*([\w\-\.\+]*)\z}.freeze
+      end
+
+      def maven_app_name_regex
+        @maven_app_name_regex ||= /\A[\w\-\.]+\z/.freeze
+      end
+
+      def maven_app_group_regex
+        maven_app_name_regex
+      end
+
+      def semver_regex
+        # see the official regex: https://semver.org/#is-there-a-suggested-regular-expression-regex-to-check-a-semver-string
+        @semver_regex ||= %r{\A(0|[1-9]\d*)\.(0|[1-9]\d*)\.(0|[1-9]\d*)(?:-((?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*)(?:\.(?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*))*))?(?:\+([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?\z}.freeze
+      end
+    end
+
     extend self
+    extend Packages
 
     def project_name_regex
       # The character range \p{Alnum} overlaps with \u{00A9}-\u{1f9ff}

spec/lib/gitlab/regex_spec.rb

@@ -163,4 +163,115 @@ describe Gitlab::Regex do
     it { is_expected.not_to match('-foo-') }
     it { is_expected.not_to match('foo/bar') }
   end
+
+  describe '.conan_file_name_regex' do
+    subject { described_class.conan_file_name_regex }
+
+    it { is_expected.to match('conanfile.py') }
+    it { is_expected.to match('conan_package.tgz') }
+    it { is_expected.not_to match('foo.txt') }
+    it { is_expected.not_to match('!!()()') }
+  end
+
+  describe '.conan_package_reference_regex' do
+    subject { described_class.conan_package_reference_regex }
+
+    it { is_expected.to match('123456789') }
+    it { is_expected.to match('asdf1234') }
+    it { is_expected.not_to match('@foo') }
+    it { is_expected.not_to match('0/pack+age/1@1/0') }
+    it { is_expected.not_to match('!!()()') }
+  end
+
+  describe '.conan_revision_regex' do
+    subject { described_class.conan_revision_regex }
+
+    it { is_expected.to match('0') }
+    it { is_expected.not_to match('foo') }
+    it { is_expected.not_to match('!!()()') }
+  end
+
+  describe '.conan_recipe_component_regex' do
+    subject { described_class.conan_recipe_component_regex }
+
+    let(:fifty_one_characters) { 'f_a' * 17}
+
+    it { is_expected.to match('foobar') }
+    it { is_expected.to match('foo_bar') }
+    it { is_expected.to match('foo+bar') }
+    it { is_expected.to match('_foo+bar-baz+1.0') }
+    it { is_expected.to match('1.0.0') }
+    it { is_expected.not_to match('-foo_bar') }
+    it { is_expected.not_to match('+foo_bar') }
+    it { is_expected.not_to match('.foo_bar') }
+    it { is_expected.not_to match('foo@bar') }
+    it { is_expected.not_to match('foo/bar') }
+    it { is_expected.not_to match('!!()()') }
+    it { is_expected.not_to match(fifty_one_characters) }
+  end
+
+  describe '.package_name_regex' do
+    subject { described_class.package_name_regex }
+
+    it { is_expected.to match('123') }
+    it { is_expected.to match('foo') }
+    it { is_expected.to match('foo/bar') }
+    it { is_expected.to match('@foo/bar') }
+    it { is_expected.to match('com/mycompany/app/my-app') }
+    it { is_expected.to match('my-package/1.0.0@my+project+path/beta') }
+    it { is_expected.not_to match('my-package/1.0.0@@@@@my+project+path/beta') }
+    it { is_expected.not_to match('$foo/bar') }
+    it { is_expected.not_to match('@foo/@/bar') }
+    it { is_expected.not_to match('@@foo/bar') }
+    it { is_expected.not_to match('my package name') }
+    it { is_expected.not_to match('!!()()') }
+    it { is_expected.not_to match("..\n..\foo") }
+  end
+
+  describe '.maven_file_name_regex' do
+    subject { described_class.maven_file_name_regex }
+
+    it { is_expected.to match('123') }
+    it { is_expected.to match('foo') }
+    it { is_expected.to match('foo+bar-2_0.pom') }
+    it { is_expected.to match('foo.bar.baz-2.0-20190901.47283-1.jar') }
+    it { is_expected.to match('maven-metadata.xml') }
+    it { is_expected.to match('1.0-SNAPSHOT') }
+    it { is_expected.not_to match('../../foo') }
+    it { is_expected.not_to match('..\..\foo') }
+    it { is_expected.not_to match('%2f%2e%2e%2f%2essh%2fauthorized_keys') }
+    it { is_expected.not_to match('$foo/bar') }
+    it { is_expected.not_to match('my file name') }
+    it { is_expected.not_to match('!!()()') }
+  end
+
+  describe '.maven_path_regex' do
+    subject { described_class.maven_path_regex }
+
+    it { is_expected.to match('123') }
+    it { is_expected.to match('foo') }
+    it { is_expected.to match('foo/bar') }
+    it { is_expected.to match('@foo/bar') }
+    it { is_expected.to match('com/mycompany/app/my-app') }
+    it { is_expected.to match('com/mycompany/app/my-app/1.0-SNAPSHOT') }
+    it { is_expected.to match('com/mycompany/app/my-app/1.0-SNAPSHOT+debian64') }
+    it { is_expected.not_to match('com/mycompany/app/my+app/1.0-SNAPSHOT') }
+    it { is_expected.not_to match('$foo/bar') }
+    it { is_expected.not_to match('@foo/@/bar') }
+    it { is_expected.not_to match('my package name') }
+    it { is_expected.not_to match('!!()()') }
+  end
+
+  describe '.semver_regex' do
+    subject { described_class.semver_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.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') }
+  end
 end