Add latest changes from gitlab-org/gitlab@master

3 files changed, 79 insertions, 1 deletions

diff --git a/app/services/bulk_imports/file_download_service.rb b/app/services/bulk_imports/file_download_service.rb
index 48adb90fb4c..b7e84508e98 100644
--- a/app/services/bulk_imports/file_download_service.rb
+++ b/app/services/bulk_imports/file_download_service.rb
@@ -83,6 +83,8 @@ module BulkImports
     end
 
     def raise_error(message)
+      logger.warn(message: message, response_headers: response_headers, importer: 'gitlab_migration')
+
       raise ServiceError, message
     end
 
@@ -109,6 +111,10 @@ module BulkImports
       @filename.presence || remote_filename
     end
 
+    def logger
+      @logger ||= Gitlab::Import::Logger.build
+    end
+
     def validate_url
       ::Gitlab::UrlBlocker.validate!(
         http_client.resource_url(relative_url),
diff --git a/app/services/packages/nuget/odata_package_entry_service.rb b/app/services/packages/nuget/odata_package_entry_service.rb
new file mode 100644
index 00000000000..0cdcc38de16
--- /dev/null
+++ b/app/services/packages/nuget/odata_package_entry_service.rb
@@ -0,0 +1,70 @@
+# frozen_string_literal: true
+
+module Packages
+  module Nuget
+    class OdataPackageEntryService
+      include API::Helpers::RelatedResourcesHelpers
+
+      SEMVER_LATEST_VERSION_PLACEHOLDER = '0.0.0-latest-version'
+      LATEST_VERSION_FOR_V2_DOWNLOAD_ENDPOINT = 'latest'
+
+      def initialize(project, params)
+        @project = project
+        @params = params
+      end
+
+      def execute
+        ServiceResponse.success(payload: package_entry)
+      end
+
+      private
+
+      attr_reader :project, :params
+
+      def package_entry
+        <<-XML.squish
+          <entry xmlns='http://www.w3.org/2005/Atom' xmlns:d='http://schemas.microsoft.com/ado/2007/08/dataservices' xmlns:georss='http://www.georss.org/georss' xmlns:gml='http://www.opengis.net/gml' xmlns:m='http://schemas.microsoft.com/ado/2007/08/dataservices/metadata' xml:base="#{xml_base}">
+            <id>#{id_url}</id>
+            <category term='V2FeedPackage' scheme='http://schemas.microsoft.com/ado/2007/08/dataservices/scheme'/>
+            <title type='text'>#{params[:package_name]}</title>
+            <content type='application/zip' src="#{download_url}"/>
+            <m:properties>
+              <d:Version>#{package_version}</d:Version>
+            </m:properties>
+          </entry>
+        XML
+      end
+
+      def package_version
+        params[:package_version] || SEMVER_LATEST_VERSION_PLACEHOLDER
+      end
+
+      def id_url
+        expose_url "#{api_v4_projects_packages_nuget_v2_path(id: project.id)}" \
+                   "/Packages(Id='#{params[:package_name]}',Version='#{package_version}')"
+      end
+
+      # TODO: use path helper when download endpoint is merged
+      def download_url
+        expose_url "#{api_v4_projects_packages_nuget_v2_path(id: project.id)}" \
+                   "/download/#{params[:package_name]}/#{download_url_package_version}"
+      end
+
+      def download_url_package_version
+        if latest_version?
+          LATEST_VERSION_FOR_V2_DOWNLOAD_ENDPOINT
+        else
+          params[:package_version]
+        end
+      end
+
+      def latest_version?
+        params[:package_version].nil? || params[:package_version] == SEMVER_LATEST_VERSION_PLACEHOLDER
+      end
+
+      def xml_base
+        expose_url api_v4_projects_packages_nuget_v2_path(id: project.id)
+      end
+    end
+  end
+end
diff --git a/app/services/projects/container_repository/cleanup_tags_base_service.rb b/app/services/projects/container_repository/cleanup_tags_base_service.rb
index 45557d03502..185895698af 100644
--- a/app/services/projects/container_repository/cleanup_tags_base_service.rb
+++ b/app/services/projects/container_repository/cleanup_tags_base_service.rb
@@ -100,7 +100,9 @@ module Projects
 
       def older_than_in_seconds
         strong_memoize(:older_than_in_seconds) do
-          ChronicDuration.parse(older_than).seconds
+          ChronicDuration.parse(
+            older_than, use_complete_matcher: Feature.enabled?(:update_chronic_duration)
+          ).seconds
         end
       end
     end