1 files changed, 33 insertions, 77 deletions

diff --git a/app/services/projects/container_repository/cleanup_tags_service.rb b/app/services/projects/container_repository/cleanup_tags_service.rb
index 285c3e252ef..cf2eb81e5f3 100644
--- a/app/services/projects/container_repository/cleanup_tags_service.rb
+++ b/app/services/projects/container_repository/cleanup_tags_service.rb
@@ -2,101 +2,57 @@
 
 module Projects
   module ContainerRepository
-    class CleanupTagsService < CleanupTagsBaseService
-      def initialize(container_repository:, current_user: nil, params: {})
-        super
-
-        @params = params.dup
-        @counts = { cached_tags_count: 0 }
-      end
-
+    class CleanupTagsService < BaseContainerRepositoryService
       def execute
         return error('access denied') unless can_destroy?
         return error('invalid regex') unless valid_regex?
 
-        tags = container_repository.tags
-        @counts[:original_size] = tags.size
-
-        filter_out_latest!(tags)
-        filter_by_name!(tags)
-
-        tags = truncate(tags)
-        populate_from_cache(tags)
-
-        tags = filter_keep_n(tags)
-        tags = filter_by_older_than(tags)
-
-        @counts[:before_delete_size] = tags.size
-
-        delete_tags(tags).merge(@counts).tap do |result|
-          result[:deleted_size] = result[:deleted]&.size
-
-          result[:status] = :error if @counts[:before_truncate_size] != @counts[:after_truncate_size]
-        end
+        cleanup_tags_service_class.new(container_repository: container_repository, current_user: current_user, params: params)
+                                  .execute
       end
 
       private
 
-      def filter_keep_n(tags)
-        tags, tags_to_keep = partition_by_keep_n(tags)
-
-        cache_tags(tags_to_keep)
-
-        tags
-      end
-
-      def filter_by_older_than(tags)
-        tags, tags_to_keep = partition_by_older_than(tags)
-
-        cache_tags(tags_to_keep)
-
-        tags
+      def cleanup_tags_service_class
+        log_data = {
+          container_repository_id: container_repository.id,
+          container_repository_path: container_repository.path,
+          project_id: project.id
+        }
+
+        if use_gitlab_service?
+          log_info(log_data.merge(gitlab_cleanup_tags_service: true))
+          ::Projects::ContainerRepository::Gitlab::CleanupTagsService
+        else
+          log_info(log_data.merge(third_party_cleanup_tags_service: true))
+          ::Projects::ContainerRepository::ThirdParty::CleanupTagsService
+        end
       end
 
-      def pushed_at(tag)
-        tag.created_at
+      def use_gitlab_service?
+        container_repository.migrated? &&
+          container_repository.gitlab_api_client.supports_gitlab_api?
       end
 
-      def truncate(tags)
-        @counts[:before_truncate_size] = tags.size
-        @counts[:after_truncate_size] = tags.size
-
-        return tags if max_list_size == 0
-
-        # truncate the list to make sure that after the #filter_keep_n
-        # execution, the resulting list will be max_list_size
-        truncated_size = max_list_size + keep_n_as_integer
-
-        return tags if tags.size <= truncated_size
+      def can_destroy?
+        return true if container_expiration_policy
 
-        tags = tags.sample(truncated_size)
-        @counts[:after_truncate_size] = tags.size
-        tags
+        can?(current_user, :destroy_container_image, project)
       end
 
-      def populate_from_cache(tags)
-        @counts[:cached_tags_count] = cache.populate(tags) if caching_enabled?
-      end
-
-      def cache_tags(tags)
-        cache.insert(tags, older_than_in_seconds) if caching_enabled?
-      end
-
-      def cache
-        strong_memoize(:cache) do
-          ::Gitlab::ContainerRepository::Tags::Cache.new(container_repository)
+      def valid_regex?
+        %w[name_regex_delete name_regex name_regex_keep].each do |param_name|
+          regex = params[param_name]
+          ::Gitlab::UntrustedRegexp.new(regex) unless regex.blank?
         end
+        true
+      rescue RegexpError => e
+        ::Gitlab::ErrorTracking.log_exception(e, project_id: project.id)
+        false
       end
 
-      def caching_enabled?
-        result = ::Gitlab::CurrentSettings.current_application_settings.container_registry_expiration_policies_caching &&
-                 container_expiration_policy &&
-                 older_than.present?
-        !!result
-      end
-
-      def max_list_size
-        ::Gitlab::CurrentSettings.current_application_settings.container_registry_cleanup_tags_service_max_list_size.to_i
+      def container_expiration_policy
+        params['container_expiration_policy']
       end
     end
   end