Add latest changes from gitlab-org/gitlab@master

17 files changed, 131 insertions, 31 deletions

diff --git a/spec/requests/api/commit_statuses_spec.rb b/spec/requests/api/commit_statuses_spec.rb
index 39be28d7427..dc5d9620dc4 100644
--- a/spec/requests/api/commit_statuses_spec.rb
+++ b/spec/requests/api/commit_statuses_spec.rb
@@ -478,6 +478,26 @@ RSpec.describe API::CommitStatuses do
               .to include 'has already been taken'
         end
       end
+
+      context 'with partitions' do
+        let(:current_partition_id) { 123 }
+
+        before do
+          allow(Ci::Pipeline)
+            .to receive(:current_partition_value) { current_partition_id }
+        end
+
+        it 'creates records in the current partition' do
+          expect { post api(post_url, developer), params: { state: 'running' } }
+            .to change(CommitStatus, :count).by(1)
+            .and change(Ci::Pipeline, :count).by(1)
+
+          status = CommitStatus.find(json_response['id'])
+
+          expect(status.partition_id).to eq(current_partition_id)
+          expect(status.pipeline.partition_id).to eq(current_partition_id)
+        end
+      end
     end
 
     context 'reporter user' do
diff --git a/spec/requests/api/conan_instance_packages_spec.rb b/spec/requests/api/conan_instance_packages_spec.rb
index e4747e0eb99..b343e0cfc97 100644
--- a/spec/requests/api/conan_instance_packages_spec.rb
+++ b/spec/requests/api/conan_instance_packages_spec.rb
@@ -103,8 +103,7 @@ RSpec.describe API::ConanInstancePackages do
   context 'file download endpoints' do
     include_context 'conan file download endpoints'
 
-    describe 'GET /api/v4/packages/conan/v1/files/:package_name/package_version/:package_username/:package_channel/
-:recipe_revision/export/:file_name' do
+    describe 'GET /api/v4/packages/conan/v1/files/:package_name/package_version/:package_username/:package_channel/:recipe_revision/export/:file_name' do
       subject do
         get api("/packages/conan/v1/files/#{recipe_path}/#{metadata.recipe_revision}/export/#{recipe_file.file_name}"),
             headers: headers
@@ -114,8 +113,7 @@ RSpec.describe API::ConanInstancePackages do
       it_behaves_like 'project not found by recipe'
     end
 
-    describe 'GET /api/v4/packages/conan/v1/files/:package_name/package_version/:package_username/:package_channel/
-:recipe_revision/package/:conan_package_reference/:package_revision/:file_name' do
+    describe 'GET /api/v4/packages/conan/v1/files/:package_name/package_version/:package_username/:package_channel/:recipe_revision/package/:conan_package_reference/:package_revision/:file_name' do
       subject do
         get api("/packages/conan/v1/files/#{recipe_path}/#{metadata.recipe_revision}/package/#{metadata.conan_package_reference}/#{metadata.package_revision}/#{package_file.file_name}"),
             headers: headers
diff --git a/spec/requests/api/conan_project_packages_spec.rb b/spec/requests/api/conan_project_packages_spec.rb
index 48e36b55a68..4e6af9942ef 100644
--- a/spec/requests/api/conan_project_packages_spec.rb
+++ b/spec/requests/api/conan_project_packages_spec.rb
@@ -102,8 +102,7 @@ RSpec.describe API::ConanProjectPackages do
   context 'file download endpoints', quarantine: 'https://gitlab.com/gitlab-org/gitlab/-/issues/326194' do
     include_context 'conan file download endpoints'
 
-    describe 'GET /api/v4/projects/:id/packages/conan/v1/files/:package_name/package_version/:package_username/:package_channel/
-:recipe_revision/export/:file_name' do
+    describe 'GET /api/v4/projects/:id/packages/conan/v1/files/:package_name/package_version/:package_username/:package_channel/:recipe_revision/export/:file_name' do
       subject do
         get api("/projects/#{project_id}/packages/conan/v1/files/#{recipe_path}/#{metadata.recipe_revision}/export/#{recipe_file.file_name}"),
             headers: headers
@@ -113,8 +112,7 @@ RSpec.describe API::ConanProjectPackages do
       it_behaves_like 'project not found by project id'
     end
 
-    describe 'GET /api/v4/projects/:id/packages/conan/v1/files/:package_name/package_version/:package_username/:package_channel/
-:recipe_revision/package/:conan_package_reference/:package_revision/:file_name' do
+    describe 'GET /api/v4/projects/:id/packages/conan/v1/files/:package_name/package_version/:package_username/:package_channel/:recipe_revision/package/:conan_package_reference/:package_revision/:file_name' do
       subject do
         get api("/projects/#{project_id}/packages/conan/v1/files/#{recipe_path}/#{metadata.recipe_revision}/package/#{metadata.conan_package_reference}/#{metadata.package_revision}/#{package_file.file_name}"),
             headers: headers
diff --git a/spec/requests/api/debian_group_packages_spec.rb b/spec/requests/api/debian_group_packages_spec.rb
index 956de61bf07..542ae05f996 100644
--- a/spec/requests/api/debian_group_packages_spec.rb
+++ b/spec/requests/api/debian_group_packages_spec.rb
@@ -49,11 +49,11 @@ RSpec.describe API::DebianGroupPackages do
     end
 
     describe 'GET groups/:id/-/packages/debian/pool/:codename/:project_id/:letter/:package_name/:package_version/:file_name' do
+      using RSpec::Parameterized::TableSyntax
+
       let(:url) { "/groups/#{container.id}/-/packages/debian/pool/#{package.debian_distribution.codename}/#{project.id}/#{letter}/#{package.name}/#{package.version}/#{file_name}" }
       let(:file_name) { params[:file_name] }
 
-      using RSpec::Parameterized::TableSyntax
-
       where(:file_name, :success_body) do
         'sample_1.2.3~alpha2.tar.xz'          | /^.7zXZ/
         'sample_1.2.3~alpha2.dsc'             | /^Format: 3.0 \(native\)/
@@ -65,6 +65,12 @@ RSpec.describe API::DebianGroupPackages do
 
       with_them do
         it_behaves_like 'Debian packages read endpoint', 'GET', :success, params[:success_body]
+
+        context 'for bumping last downloaded at' do
+          include_context 'Debian repository access', :public, :developer, :basic do
+            it_behaves_like 'bumping the package last downloaded at field'
+          end
+        end
       end
     end
   end
diff --git a/spec/requests/api/debian_project_packages_spec.rb b/spec/requests/api/debian_project_packages_spec.rb
index 122a3df5e67..f0cd0b6d5ed 100644
--- a/spec/requests/api/debian_project_packages_spec.rb
+++ b/spec/requests/api/debian_project_packages_spec.rb
@@ -49,11 +49,11 @@ RSpec.describe API::DebianProjectPackages do
     end
 
     describe 'GET projects/:id/packages/debian/pool/:codename/:letter/:package_name/:package_version/:file_name' do
+      using RSpec::Parameterized::TableSyntax
+
       let(:url) { "/projects/#{container.id}/packages/debian/pool/#{package.debian_distribution.codename}/#{letter}/#{package.name}/#{package.version}/#{file_name}" }
       let(:file_name) { params[:file_name] }
 
-      using RSpec::Parameterized::TableSyntax
-
       where(:file_name, :success_body) do
         'sample_1.2.3~alpha2.tar.xz'          | /^.7zXZ/
         'sample_1.2.3~alpha2.dsc'             | /^Format: 3.0 \(native\)/
@@ -65,6 +65,12 @@ RSpec.describe API::DebianProjectPackages do
 
       with_them do
         it_behaves_like 'Debian packages read endpoint', 'GET', :success, params[:success_body]
+
+        context 'for bumping last downloaded at' do
+          include_context 'Debian repository access', :public, :developer, :basic do
+            it_behaves_like 'bumping the package last downloaded at field'
+          end
+        end
       end
     end
 
diff --git a/spec/requests/api/generic_packages_spec.rb b/spec/requests/api/generic_packages_spec.rb
index 3a5c6103781..823eafab734 100644
--- a/spec/requests/api/generic_packages_spec.rb
+++ b/spec/requests/api/generic_packages_spec.rb
@@ -572,6 +572,12 @@ RSpec.describe API::GenericPackages do
 
           expect(response).to have_gitlab_http_status(expected_status)
         end
+
+        if params[:expected_status] == :success
+          it_behaves_like 'bumping the package last downloaded at field' do
+            subject { download_file(auth_header) }
+          end
+        end
       end
 
       where(:authenticate_with, :expected_status) do
@@ -587,6 +593,12 @@ RSpec.describe API::GenericPackages do
 
           expect(response).to have_gitlab_http_status(expected_status)
         end
+
+        if params[:expected_status] == :success
+          it_behaves_like 'bumping the package last downloaded at field' do
+            subject { download_file(deploy_token_auth_header) }
+          end
+        end
       end
     end
 
@@ -608,6 +620,12 @@ RSpec.describe API::GenericPackages do
 
           expect(response).to have_gitlab_http_status(expected_status)
         end
+
+        if params[:expected_status] == :success
+          it_behaves_like 'bumping the package last downloaded at field' do
+            subject { download_file(personal_access_token_header) }
+          end
+        end
       end
     end
 
diff --git a/spec/requests/api/graphql/packages/composer_spec.rb b/spec/requests/api/graphql/packages/composer_spec.rb
index 9830623ede8..89c01d44771 100644
--- a/spec/requests/api/graphql/packages/composer_spec.rb
+++ b/spec/requests/api/graphql/packages/composer_spec.rb
@@ -5,7 +5,7 @@ RSpec.describe 'package details' do
   include GraphqlHelpers
   include_context 'package details setup'
 
-  let_it_be(:package) { create(:composer_package, project: project) }
+  let_it_be(:package) { create(:composer_package, :last_downloaded_at, project: project) }
   let_it_be(:composer_json) { { name: 'name', type: 'type', license: 'license', version: 1 } }
   let_it_be(:composer_metadatum) do
     # we are forced to manually create the metadatum, without using the factory to force the sha to be a string
diff --git a/spec/requests/api/graphql/packages/conan_spec.rb b/spec/requests/api/graphql/packages/conan_spec.rb
index 5bd5a71bbeb..7ad85edecef 100644
--- a/spec/requests/api/graphql/packages/conan_spec.rb
+++ b/spec/requests/api/graphql/packages/conan_spec.rb
@@ -5,7 +5,7 @@ RSpec.describe 'conan package details' do
   include GraphqlHelpers
   include_context 'package details setup'
 
-  let_it_be(:package) { create(:conan_package, project: project) }
+  let_it_be(:package) { create(:conan_package, :last_downloaded_at, project: project) }
 
   let(:metadata) { query_graphql_fragment('ConanMetadata') }
   let(:package_files_metadata) { query_graphql_fragment('ConanFileMetadata') }
diff --git a/spec/requests/api/graphql/packages/helm_spec.rb b/spec/requests/api/graphql/packages/helm_spec.rb
index 1675b8faa23..79a589e2dc2 100644
--- a/spec/requests/api/graphql/packages/helm_spec.rb
+++ b/spec/requests/api/graphql/packages/helm_spec.rb
@@ -5,7 +5,7 @@ RSpec.describe 'helm package details' do
   include GraphqlHelpers
   include_context 'package details setup'
 
-  let_it_be(:package) { create(:helm_package, project: project) }
+  let_it_be(:package) { create(:helm_package, :last_downloaded_at, project: project) }
 
   let(:package_files_metadata) { query_graphql_fragment('HelmFileMetadata') }
 
diff --git a/spec/requests/api/graphql/packages/maven_spec.rb b/spec/requests/api/graphql/packages/maven_spec.rb
index 9d59a922660..b7f39efcf73 100644
--- a/spec/requests/api/graphql/packages/maven_spec.rb
+++ b/spec/requests/api/graphql/packages/maven_spec.rb
@@ -5,7 +5,7 @@ RSpec.describe 'maven package details' do
   include GraphqlHelpers
   include_context 'package details setup'
 
-  let_it_be(:package) { create(:maven_package, project: project) }
+  let_it_be(:package) { create(:maven_package, :last_downloaded_at, project: project) }
 
   let(:metadata) { query_graphql_fragment('MavenMetadata') }
 
@@ -31,7 +31,9 @@ RSpec.describe 'maven package details' do
 
   context 'a versionless maven package' do
     let_it_be(:maven_metadatum) { create(:maven_metadatum, app_version: nil) }
-    let_it_be(:package) { create(:maven_package, project: project, version: nil, maven_metadatum: maven_metadatum) }
+    let_it_be(:package) do
+      create(:maven_package, :last_downloaded_at, project: project, version: nil, maven_metadatum: maven_metadatum)
+    end
 
     subject { post_graphql(query, current_user: user) }
 
diff --git a/spec/requests/api/graphql/packages/nuget_spec.rb b/spec/requests/api/graphql/packages/nuget_spec.rb
index 87cffc67ce5..7de132d1574 100644
--- a/spec/requests/api/graphql/packages/nuget_spec.rb
+++ b/spec/requests/api/graphql/packages/nuget_spec.rb
@@ -5,7 +5,7 @@ RSpec.describe 'nuget package details' do
   include GraphqlHelpers
   include_context 'package details setup'
 
-  let_it_be(:package) { create(:nuget_package, :with_metadatum, project: project) }
+  let_it_be(:package) { create(:nuget_package, :last_downloaded_at, :with_metadatum, project: project) }
   let_it_be(:dependency_link) { create(:packages_dependency_link, :with_nuget_metadatum, package: package) }
 
   let(:metadata) { query_graphql_fragment('NugetMetadata') }
diff --git a/spec/requests/api/graphql/packages/package_spec.rb b/spec/requests/api/graphql/packages/package_spec.rb
index b9bb57c7df7..e9f82d66775 100644
--- a/spec/requests/api/graphql/packages/package_spec.rb
+++ b/spec/requests/api/graphql/packages/package_spec.rb
@@ -6,8 +6,8 @@ RSpec.describe 'package details' do
 
   let_it_be_with_reload(:group) { create(:group) }
   let_it_be_with_reload(:project) { create(:project, group: group) }
+  let_it_be_with_reload(:composer_package) { create(:composer_package, :last_downloaded_at, project: project) }
   let_it_be(:user) { create(:user) }
-  let_it_be(:composer_package) { create(:composer_package, project: project) }
   let_it_be(:composer_json) { { name: 'name', type: 'type', license: 'license', version: 1 } }
   let_it_be(:composer_metadatum) do
     # we are forced to manually create the metadatum, without using the factory to force the sha to be a string
@@ -65,6 +65,17 @@ RSpec.describe 'package details' do
       end
     end
 
+    context 'with package without last_downloaded_at' do
+      before do
+        composer_package.update!(last_downloaded_at: nil)
+        subject
+      end
+
+      it 'matches the JSON schema' do
+        expect(package_details).to match_schema('graphql/packages/package_details')
+      end
+    end
+
     context 'with package files pending destruction' do
       let_it_be(:package_file) { create(:package_file, package: composer_package) }
       let_it_be(:package_file_pending_destruction) { create(:package_file, :pending_destruction, package: composer_package) }
diff --git a/spec/requests/api/graphql/packages/pypi_spec.rb b/spec/requests/api/graphql/packages/pypi_spec.rb
index 0cc5bd2e3b2..c0e589f3597 100644
--- a/spec/requests/api/graphql/packages/pypi_spec.rb
+++ b/spec/requests/api/graphql/packages/pypi_spec.rb
@@ -5,7 +5,7 @@ RSpec.describe 'pypi package details' do
   include GraphqlHelpers
   include_context 'package details setup'
 
-  let_it_be(:package) { create(:pypi_package, project: project) }
+  let_it_be(:package) { create(:pypi_package, :last_downloaded_at, project: project) }
 
   let(:metadata) { query_graphql_fragment('PypiMetadata') }
 
diff --git a/spec/requests/api/maven_packages_spec.rb b/spec/requests/api/maven_packages_spec.rb
index 1b378788b6a..33a722793e3 100644
--- a/spec/requests/api/maven_packages_spec.rb
+++ b/spec/requests/api/maven_packages_spec.rb
@@ -244,6 +244,7 @@ RSpec.describe API::MavenPackages do
 
       shared_examples 'getting a file' do
         it_behaves_like 'tracking the file download event'
+        it_behaves_like 'bumping the package last downloaded at field'
         it_behaves_like 'successfully returning the file'
         it_behaves_like 'file download in FIPS mode'
 
@@ -275,7 +276,7 @@ RSpec.describe API::MavenPackages do
 
       shared_examples 'getting a file' do
         it_behaves_like 'tracking the file download event'
-
+        it_behaves_like 'bumping the package last downloaded at field'
         it_behaves_like 'successfully returning the file'
 
         it 'denies download when no private token' do
@@ -285,7 +286,6 @@ RSpec.describe API::MavenPackages do
         end
 
         it_behaves_like 'downloads with a job token'
-
         it_behaves_like 'downloads with a deploy token'
 
         context 'with a non existing maven path' do
@@ -307,7 +307,7 @@ RSpec.describe API::MavenPackages do
 
       shared_examples 'getting a file' do
         it_behaves_like 'tracking the file download event'
-
+        it_behaves_like 'bumping the package last downloaded at field'
         it_behaves_like 'successfully returning the file'
 
         it 'denies download when not enough permissions' do
@@ -327,7 +327,6 @@ RSpec.describe API::MavenPackages do
         end
 
         it_behaves_like 'downloads with a job token'
-
         it_behaves_like 'downloads with a deploy token'
 
         it 'does not allow download by a unauthorized deploy token with same id as a user with access' do
@@ -414,6 +413,7 @@ RSpec.describe API::MavenPackages do
 
       shared_examples 'getting a file for a group' do
         it_behaves_like 'tracking the file download event'
+        it_behaves_like 'bumping the package last downloaded at field'
         it_behaves_like 'successfully returning the file'
         it_behaves_like 'file download in FIPS mode'
 
@@ -445,7 +445,7 @@ RSpec.describe API::MavenPackages do
 
       shared_examples 'getting a file for a group' do
         it_behaves_like 'tracking the file download event'
-
+        it_behaves_like 'bumping the package last downloaded at field'
         it_behaves_like 'successfully returning the file'
 
         it 'denies download when no private token' do
@@ -455,7 +455,6 @@ RSpec.describe API::MavenPackages do
         end
 
         it_behaves_like 'downloads with a job token'
-
         it_behaves_like 'downloads with a deploy token'
 
         context 'with a non existing maven path' do
@@ -477,7 +476,7 @@ RSpec.describe API::MavenPackages do
 
       shared_examples 'getting a file for a group' do
         it_behaves_like 'tracking the file download event'
-
+        it_behaves_like 'bumping the package last downloaded at field'
         it_behaves_like 'successfully returning the file'
 
         it 'denies download when not enough permissions' do
@@ -495,7 +494,6 @@ RSpec.describe API::MavenPackages do
         end
 
         it_behaves_like 'downloads with a job token'
-
         it_behaves_like 'downloads with a deploy token'
 
         context 'with a non existing maven path' do
@@ -676,7 +674,7 @@ RSpec.describe API::MavenPackages do
       subject { download_file_with_token(file_name: package_file.file_name) }
 
       it_behaves_like 'tracking the file download event'
-
+      it_behaves_like 'bumping the package last downloaded at field'
       it_behaves_like 'successfully returning the file'
 
       it 'denies download when not enough permissions' do
@@ -694,7 +692,6 @@ RSpec.describe API::MavenPackages do
       end
 
       it_behaves_like 'downloads with a job token'
-
       it_behaves_like 'downloads with a deploy token'
 
       context 'with a non existing maven path' do
diff --git a/spec/requests/api/npm_project_packages_spec.rb b/spec/requests/api/npm_project_packages_spec.rb
index 3bcffac2760..bdcd6e7278d 100644
--- a/spec/requests/api/npm_project_packages_spec.rb
+++ b/spec/requests/api/npm_project_packages_spec.rb
@@ -63,6 +63,7 @@ RSpec.describe API::NpmProjectPackages do
 
         it_behaves_like 'successfully downloads the file'
         it_behaves_like 'a package tracking event', 'API::NpmPackages', 'pull_package'
+        it_behaves_like 'bumping the package last downloaded at field'
       end
 
       context 'with job token' do
@@ -70,12 +71,14 @@ RSpec.describe API::NpmProjectPackages do
 
         it_behaves_like 'successfully downloads the file'
         it_behaves_like 'a package tracking event', 'API::NpmPackages', 'pull_package'
+        it_behaves_like 'bumping the package last downloaded at field'
       end
     end
 
     context 'a public project' do
       it_behaves_like 'successfully downloads the file'
       it_behaves_like 'a package tracking event', 'API::NpmPackages', 'pull_package'
+      it_behaves_like 'bumping the package last downloaded at field'
 
       context 'with a job token for a different user' do
         let_it_be(:other_user) { create(:user) }
diff --git a/spec/requests/api/project_packages_spec.rb b/spec/requests/api/project_packages_spec.rb
index 7a05da8e13f..00d295b3490 100644
--- a/spec/requests/api/project_packages_spec.rb
+++ b/spec/requests/api/project_packages_spec.rb
@@ -6,7 +6,7 @@ RSpec.describe API::ProjectPackages do
   let_it_be(:project) { create(:project, :public) }
 
   let(:user) { create(:user) }
-  let!(:package1) { create(:npm_package, project: project, version: '3.1.0', name: "@#{project.root_namespace.path}/foo1") }
+  let!(:package1) { create(:npm_package, :last_downloaded_at, project: project, version: '3.1.0', name: "@#{project.root_namespace.path}/foo1") }
   let(:package_url) { "/projects/#{project.id}/packages/#{package1.id}" }
   let!(:package2) { create(:nuget_package, project: project, version: '2.0.4') }
   let!(:another_package) { create(:npm_package) }
@@ -272,6 +272,17 @@ RSpec.describe API::ProjectPackages do
           it_behaves_like 'returns package', :project, :no_type
           it_behaves_like 'returns package', :project, :guest
         end
+
+        context 'with a package without last_downloaded_at' do
+          let(:package_url) { "/projects/#{project.id}/packages/#{package2.id}" }
+
+          it 'returns 200 and the package information' do
+            subject
+
+            expect(response).to have_gitlab_http_status(:ok)
+            expect(response).to match_response_schema(single_package_schema)
+          end
+        end
       end
 
       context 'project is private' do
diff --git a/spec/requests/projects/packages/package_files_controller_spec.rb b/spec/requests/projects/packages/package_files_controller_spec.rb
new file mode 100644
index 00000000000..a6daf57f0fa
--- /dev/null
+++ b/spec/requests/projects/packages/package_files_controller_spec.rb
@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe Projects::Packages::PackageFilesController do
+  let_it_be(:project) { create(:project, :public) }
+  let_it_be(:package) { create(:package, project: project) }
+  let_it_be(:package_file) { create(:package_file, package: package) }
+
+  let(:filename) { package_file.file_name }
+
+  describe 'GET download' do
+    subject do
+      get download_namespace_project_package_file_url(
+        id: package_file.id,
+        namespace_id: project.namespace,
+        project_id: project
+      )
+    end
+
+    it 'sends the package file' do
+      subject
+
+      expect(response.headers['Content-Disposition'])
+        .to eq(%Q(attachment; filename="#{filename}"; filename*=UTF-8''#{filename}))
+    end
+
+    it_behaves_like 'bumping the package last downloaded at field'
+  end
+end