Add latest changes from gitlab-org/gitlab@14-7-stable-ee

35 files changed, 476 insertions, 25 deletions

diff --git a/app/models/packages/package.rb b/app/models/packages/package.rb
index 1b2c3e25283..4a97ae97ea0 100644
--- a/app/models/packages/package.rb
+++ b/app/models/packages/package.rb
@@ -63,12 +63,17 @@ class Packages::Package < ApplicationRecord
   validates :name, format: { with: Gitlab::Regex.package_name_regex }, unless: -> { conan? || generic? || debian? }
 
   validates :name,
-    uniqueness: { scope: %i[project_id version package_type] }, unless: -> { conan? || debian_package? }
-  validate :unique_debian_package_name, if: :debian_package?
+            uniqueness: {
+              scope: %i[project_id version package_type],
+              conditions: -> { not_pending_destruction}
+            },
+            unless: -> { pending_destruction? || conan? || debian_package? }
 
+  validate :unique_debian_package_name, if: :debian_package?
   validate :valid_conan_package_recipe, if: :conan?
   validate :valid_composer_global_name, if: :composer?
   validate :npm_package_already_taken, if: :npm?
+
   validates :name, format: { with: Gitlab::Regex.conan_recipe_component_regex }, if: :conan?
   validates :name, format: { with: Gitlab::Regex.generic_package_name_regex }, if: :generic?
   validates :name, format: { with: Gitlab::Regex.helm_package_regex }, if: :helm?
@@ -320,6 +325,7 @@ class Packages::Package < ApplicationRecord
     recipe_exists = project.packages
                            .conan
                            .includes(:conan_metadatum)
+                           .not_pending_destruction
                            .with_name(name)
                            .with_version(version)
                            .with_conan_channel(conan_metadatum.package_channel)
@@ -334,9 +340,14 @@ class Packages::Package < ApplicationRecord
     # .default_scoped is required here due to a bug in rails that leaks
     # the scope and adds `self` to the query incorrectly
     # See https://github.com/rails/rails/pull/35186
-    if Packages::Package.default_scoped.composer.with_name(name).where.not(project_id: project_id).exists?
-      errors.add(:name, 'is already taken by another project')
-    end
+    package_exists = Packages::Package.default_scoped
+                                      .composer
+                                      .not_pending_destruction
+                                      .with_name(name)
+                                      .where.not(project_id: project_id)
+                                      .exists?
+
+    errors.add(:name, 'is already taken by another project') if package_exists
   end
 
   def npm_package_already_taken
@@ -361,6 +372,7 @@ class Packages::Package < ApplicationRecord
     package_exists = debian_publication.distribution.packages
                             .with_name(name)
                             .with_version(version)
+                            .not_pending_destruction
                             .id_not_in(id)
                             .exists?
 
diff --git a/app/models/project.rb b/app/models/project.rb
index f2b3db684ae..7f823b5ed6b 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -2614,6 +2614,7 @@ class Project < ApplicationRecord
     Packages::Package.with_name(package_name)
       .with_version(package_version)
       .with_package_type(package_type)
+      .not_pending_destruction
       .for_projects(
         root_ancestor.all_projects
           .id_not_in(id)
diff --git a/app/services/packages/create_package_service.rb b/app/services/packages/create_package_service.rb
index 7e1b6ecbe51..7565b017a64 100644
--- a/app/services/packages/create_package_service.rb
+++ b/app/services/packages/create_package_service.rb
@@ -11,6 +11,7 @@ module Packages
       project
         .packages
         .with_package_type(package_type)
+        .not_pending_destruction
         .find_or_create_by!(name: name, version: version) do |package|
           package.status = params[:status] if params[:status]
           package.creator = package_creator
diff --git a/app/services/packages/debian/find_or_create_package_service.rb b/app/services/packages/debian/find_or_create_package_service.rb
index 46e06c9f584..3b2be7b6874 100644
--- a/app/services/packages/debian/find_or_create_package_service.rb
+++ b/app/services/packages/debian/find_or_create_package_service.rb
@@ -11,6 +11,7 @@ module Packages
                          .with_name(params[:name])
                          .with_version(params[:version])
                          .with_debian_codename(params[:distribution_name])
+                         .not_pending_destruction
                          .first
 
         package ||= create_package!(
diff --git a/app/services/packages/helm/process_file_service.rb b/app/services/packages/helm/process_file_service.rb
index 31b357c1616..f53c63d2b01 100644
--- a/app/services/packages/helm/process_file_service.rb
+++ b/app/services/packages/helm/process_file_service.rb
@@ -68,6 +68,7 @@ module Packages
           package = project_packages.with_package_type(:helm)
                                     .with_name(metadata['name'])
                                     .with_version(metadata['version'])
+                                    .not_pending_destruction
                                     .last
           package || temp_package
         end
diff --git a/app/services/packages/npm/create_package_service.rb b/app/services/packages/npm/create_package_service.rb
index 76a7f3bdc72..b0a5f37cfa3 100644
--- a/app/services/packages/npm/create_package_service.rb
+++ b/app/services/packages/npm/create_package_service.rb
@@ -33,6 +33,7 @@ module Packages
                .npm
                .with_name(name)
                .with_version(version)
+               .not_pending_destruction
                .exists?
       end
 
diff --git a/app/services/packages/nuget/update_package_from_metadata_service.rb b/app/services/packages/nuget/update_package_from_metadata_service.rb
index d1e47ad00a1..5456ad4cad7 100644
--- a/app/services/packages/nuget/update_package_from_metadata_service.rb
+++ b/app/services/packages/nuget/update_package_from_metadata_service.rb
@@ -98,6 +98,7 @@ module Packages
                                .nuget
                                .with_name(package_name)
                                .with_version(package_version)
+                               .not_pending_destruction
                                .first
         end
       end
diff --git a/app/services/packages/rubygems/process_gem_service.rb b/app/services/packages/rubygems/process_gem_service.rb
index 109c87a0444..c771af28f73 100644
--- a/app/services/packages/rubygems/process_gem_service.rb
+++ b/app/services/packages/rubygems/process_gem_service.rb
@@ -91,6 +91,7 @@ module Packages
                                 .rubygems
                                 .with_name(gemspec.name)
                                 .with_version(gemspec.version.to_s)
+                                .not_pending_destruction
                                 .last
           package || temp_package
         end
diff --git a/app/services/packages/terraform_module/create_package_service.rb b/app/services/packages/terraform_module/create_package_service.rb
index d1bc79089a3..3afecc6c1ca 100644
--- a/app/services/packages/terraform_module/create_package_service.rb
+++ b/app/services/packages/terraform_module/create_package_service.rb
@@ -29,6 +29,7 @@ module Packages
           .for_projects(project.root_namespace.all_projects.id_not_in(project.id))
           .with_package_type(:terraform_module)
           .with_name(name)
+          .not_pending_destruction
           .exists?
       end
 
@@ -37,6 +38,7 @@ module Packages
           .with_package_type(:terraform_module)
           .with_name(name)
           .with_version(params[:module_version])
+          .not_pending_destruction
           .exists?
       end
 
diff --git a/db/migrate/20220203091304_fix_unique_packages_index_excluding_pending_destruction_status.rb b/db/migrate/20220203091304_fix_unique_packages_index_excluding_pending_destruction_status.rb
new file mode 100644
index 00000000000..c30d8de23db
--- /dev/null
+++ b/db/migrate/20220203091304_fix_unique_packages_index_excluding_pending_destruction_status.rb
@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+class FixUniquePackagesIndexExcludingPendingDestructionStatus < Gitlab::Database::Migration[1.0]
+  disable_ddl_transaction!
+
+  GO_UNIQUE_INDEX_NAME = 'index_packages_on_project_id_name_version_unique_when_golang'
+  GENERIC_UNIQUE_INDEX_NAME = 'index_packages_on_project_id_name_version_unique_when_generic'
+  HELM_UNIQUE_INDEX_NAME = 'index_packages_on_project_id_name_version_unique_when_helm'
+
+  NEW_GO_UNIQUE_INDEX_NAME = 'idx_packages_on_project_id_name_version_unique_when_golang'
+  NEW_GENERIC_UNIQUE_INDEX_NAME = 'idx_packages_on_project_id_name_version_unique_when_generic'
+  NEW_HELM_UNIQUE_INDEX_NAME = 'idx_packages_on_project_id_name_version_unique_when_helm'
+
+  def up
+    add_concurrent_index :packages_packages, [:project_id, :name, :version], unique: true, name: NEW_GO_UNIQUE_INDEX_NAME, where: 'package_type = 8 AND status != 4'
+    add_concurrent_index :packages_packages, [:project_id, :name, :version], unique: true, name: NEW_GENERIC_UNIQUE_INDEX_NAME, where: 'package_type = 7 AND status != 4'
+    add_concurrent_index :packages_packages, [:project_id, :name, :version], unique: true, name: NEW_HELM_UNIQUE_INDEX_NAME, where: 'package_type = 11 AND status != 4'
+
+    remove_concurrent_index_by_name :packages_packages, GO_UNIQUE_INDEX_NAME
+    remove_concurrent_index_by_name :packages_packages, GENERIC_UNIQUE_INDEX_NAME
+    remove_concurrent_index_by_name :packages_packages, HELM_UNIQUE_INDEX_NAME
+  end
+
+  def down
+    # no-op
+    # We can't guarantee that the old index can be recreated since it targets a set larger that the new index.
+  end
+end
diff --git a/db/schema_migrations/20220203091304 b/db/schema_migrations/20220203091304
new file mode 100644
index 00000000000..847620db3d2
--- /dev/null
+++ b/db/schema_migrations/20220203091304
@@ -0,0 +1 @@
+dac90da1a8c5af69610dd103c8db9cd70a395ad5f9addafb554a853d6acd2a6e
\ No newline at end of file
diff --git a/db/structure.sql b/db/structure.sql
index 47e111bf48f..8d0c7b3d693 100644
--- a/db/structure.sql
+++ b/db/structure.sql
@@ -25161,6 +25161,12 @@ CREATE INDEX idx_packages_debian_group_component_files_on_architecture_id ON pac
 
 CREATE INDEX idx_packages_debian_project_component_files_on_architecture_id ON packages_debian_project_component_files USING btree (architecture_id);
 
+CREATE UNIQUE INDEX idx_packages_on_project_id_name_version_unique_when_generic ON packages_packages USING btree (project_id, name, version) WHERE ((package_type = 7) AND (status <> 4));
+
+CREATE UNIQUE INDEX idx_packages_on_project_id_name_version_unique_when_golang ON packages_packages USING btree (project_id, name, version) WHERE ((package_type = 8) AND (status <> 4));
+
+CREATE UNIQUE INDEX idx_packages_on_project_id_name_version_unique_when_helm ON packages_packages USING btree (project_id, name, version) WHERE ((package_type = 11) AND (status <> 4));
+
 CREATE INDEX idx_packages_packages_on_project_id_name_version_package_type ON packages_packages USING btree (project_id, name, version, package_type);
 
 CREATE INDEX idx_pkgs_debian_group_distribution_keys_on_distribution_id ON packages_debian_group_distribution_keys USING btree (distribution_id);
@@ -27031,12 +27037,6 @@ CREATE INDEX index_packages_maven_metadata_on_path ON packages_maven_metadata US
 
 CREATE INDEX index_packages_nuget_dl_metadata_on_dependency_link_id ON packages_nuget_dependency_link_metadata USING btree (dependency_link_id);
 
-CREATE UNIQUE INDEX index_packages_on_project_id_name_version_unique_when_generic ON packages_packages USING btree (project_id, name, version) WHERE (package_type = 7);
-
-CREATE UNIQUE INDEX index_packages_on_project_id_name_version_unique_when_golang ON packages_packages USING btree (project_id, name, version) WHERE (package_type = 8);
-
-CREATE UNIQUE INDEX index_packages_on_project_id_name_version_unique_when_helm ON packages_packages USING btree (project_id, name, version) WHERE (package_type = 11);
-
 CREATE INDEX index_packages_package_file_build_infos_on_package_file_id ON packages_package_file_build_infos USING btree (package_file_id);
 
 CREATE INDEX index_packages_package_file_build_infos_on_pipeline_id ON packages_package_file_build_infos USING btree (pipeline_id);
diff --git a/lib/api/helpers/packages/conan/api_helpers.rb b/lib/api/helpers/packages/conan/api_helpers.rb
index 031c29e7472..e92547890e8 100644
--- a/lib/api/helpers/packages/conan/api_helpers.rb
+++ b/lib/api/helpers/packages/conan/api_helpers.rb
@@ -145,6 +145,7 @@ module API
                 .with_conan_username(params[:package_username])
                 .with_conan_channel(params[:package_channel])
                 .order_created
+                .not_pending_destruction
                 .last
             end
           end
diff --git a/lib/gitlab/github_import/importer/pull_requests_importer.rb b/lib/gitlab/github_import/importer/pull_requests_importer.rb
index 2812fbd3dfe..d7eaa5a470b 100644
--- a/lib/gitlab/github_import/importer/pull_requests_importer.rb
+++ b/lib/gitlab/github_import/importer/pull_requests_importer.rb
@@ -40,7 +40,7 @@ module Gitlab
           # updating the timestamp.
           project.update_column(:last_repository_updated_at, Time.zone.now)
 
-          project.repository.fetch_remote(project.import_url, refmap: Gitlab::GithubImport.refmap, forced: false)
+          project.repository.fetch_remote(project.import_url, refmap: Gitlab::GithubImport.refmap, forced: true)
 
           pname = project.path_with_namespace
 
diff --git a/lib/gitlab/import_export/project/object_builder.rb b/lib/gitlab/import_export/project/object_builder.rb
index f7598ba1337..64496d23402 100644
--- a/lib/gitlab/import_export/project/object_builder.rb
+++ b/lib/gitlab/import_export/project/object_builder.rb
@@ -61,7 +61,7 @@ module Gitlab
         def where_clause_for_klass
           return attrs_to_arel(attributes.slice('filename')).and(table[:issue_id].eq(nil)) if design?
 
-          attrs_to_arel(attributes.slice('iid')) if merge_request?
+          attrs_to_arel(attributes.slice('iid', 'target_project_id')) if merge_request?
         end
 
         def prepare_attributes
diff --git a/spec/lib/gitlab/github_import/importer/pull_requests_importer_spec.rb b/spec/lib/gitlab/github_import/importer/pull_requests_importer_spec.rb
index 067b8b09516..a70ff0bd82d 100644
--- a/spec/lib/gitlab/github_import/importer/pull_requests_importer_spec.rb
+++ b/spec/lib/gitlab/github_import/importer/pull_requests_importer_spec.rb
@@ -164,7 +164,7 @@ RSpec.describe Gitlab::GithubImport::Importer::PullRequestsImporter do
 
       expect(project.repository)
         .to receive(:fetch_remote)
-        .with(url, forced: false, refmap: Gitlab::GithubImport.refmap)
+        .with(url, forced: true, refmap: Gitlab::GithubImport.refmap)
 
       freeze_time do
         importer.update_repository
diff --git a/spec/models/packages/package_spec.rb b/spec/models/packages/package_spec.rb
index 0cb92f81da2..52ed52de193 100644
--- a/spec/models/packages/package_spec.rb
+++ b/spec/models/packages/package_spec.rb
@@ -475,6 +475,15 @@ RSpec.describe Packages::Package, type: :model do
           end
         end
 
+        shared_examples 'validating both if the first package is pending destruction' do
+          before do
+            package.status = :pending_destruction
+          end
+
+          it_behaves_like 'validating the first package'
+          it_behaves_like 'validating the second package'
+        end
+
         context 'following the naming convention' do
           let(:name) { "@#{group.path}/test" }
 
@@ -503,6 +512,7 @@ RSpec.describe Packages::Package, type: :model do
 
               it_behaves_like 'validating the first package'
               it_behaves_like 'not validating the second package', field_with_error: :name
+              it_behaves_like 'validating both if the first package is pending destruction'
             end
           end
 
@@ -531,6 +541,7 @@ RSpec.describe Packages::Package, type: :model do
 
               it_behaves_like 'validating the first package'
               it_behaves_like 'not validating the second package', field_with_error: :base
+              it_behaves_like 'validating both if the first package is pending destruction'
             end
           end
         end
@@ -563,6 +574,7 @@ RSpec.describe Packages::Package, type: :model do
 
               it_behaves_like 'validating the first package'
               it_behaves_like 'not validating the second package', field_with_error: :name
+              it_behaves_like 'validating both if the first package is pending destruction'
             end
           end
 
@@ -591,6 +603,7 @@ RSpec.describe Packages::Package, type: :model do
 
               it_behaves_like 'validating the first package'
               it_behaves_like 'validating the second package'
+              it_behaves_like 'validating both if the first package is pending destruction'
             end
           end
         end
@@ -598,19 +611,53 @@ RSpec.describe Packages::Package, type: :model do
     end
 
     context "recipe uniqueness for conan packages" do
-      let!(:package) { create('conan_package') }
+      let_it_be(:package) { create(:conan_package) }
 
       it "will allow a conan package with same project, name, version and package_type" do
-        new_package = build('conan_package', project: package.project, name: package.name, version: package.version)
+        new_package = build(:conan_package, project: package.project, name: package.name, version: package.version)
         new_package.conan_metadatum.package_channel = 'beta'
         expect(new_package).to be_valid
       end
 
       it "will not allow a conan package with same recipe (name, version, metadatum.package_channel, metadatum.package_username, and package_type)" do
-        new_package = build('conan_package', project: package.project, name: package.name, version: package.version)
+        new_package = build(:conan_package, project: package.project, name: package.name, version: package.version)
         expect(new_package).not_to be_valid
         expect(new_package.errors.to_a).to include("Package recipe already exists")
       end
+
+      context 'with pending destruction package' do
+        let_it_be(:package) { create(:conan_package, :pending_destruction) }
+
+        it 'will allow a conan package with same recipe (name, version, metadatum.package_channel, metadatum.package_username, and package_type)' do
+          new_package = build(:conan_package, project: package.project, name: package.name, version: package.version)
+          expect(new_package).to be_valid
+        end
+      end
+    end
+
+    describe '#valid_composer_global_name' do
+      let_it_be(:package) { create(:composer_package) }
+
+      context 'with different name and different project' do
+        let(:new_package) { build(:composer_package, name: 'different_name') }
+
+        it { expect(new_package).to be_valid }
+      end
+
+      context 'with same name and different project' do
+        let(:new_package) { build(:composer_package, name: package.name) }
+
+        it 'will not validate second package' do
+          expect(new_package).not_to be_valid
+          expect(new_package.errors.to_a).to include('Name is already taken by another project')
+        end
+
+        context 'with pending destruction package' do
+          let_it_be(:package) { create(:composer_package, :pending_destruction) }
+
+          it { expect(new_package).to be_valid }
+        end
+      end
     end
 
     describe "#unique_debian_package_name" do
@@ -632,6 +679,16 @@ RSpec.describe Packages::Package, type: :model do
         new_package = build(:debian_package, project: package.project, name: package.name, version: package.version, published_in: nil)
         expect(new_package).to be_valid
       end
+
+      context 'with pending_destruction package' do
+        let!(:package) { create(:debian_package, :pending_destruction) }
+
+        it "will allow a Debian package with same project, name, version and distribution" do
+          new_package = build(:debian_package, project: package.project, name: package.name, version: package.version)
+          new_package.debian_publication.distribution = package.debian_publication.distribution
+          expect(new_package).to be_valid
+        end
+      end
     end
 
     Packages::Package.package_types.keys.without('conan', 'debian').each do |pt|
@@ -1267,4 +1324,16 @@ RSpec.describe Packages::Package, type: :model do
       end
     end
   end
+
+  context 'with identical pending destruction package' do
+    described_class.package_types.keys.each do |package_format|
+      context "for package format #{package_format}" do
+        let_it_be(:package_pending_destruction) { create("#{package_format}_package", :pending_destruction) }
+
+        let(:new_package) { build("#{package_format}_package", name: package_pending_destruction.name, version: package_pending_destruction.version, project: package_pending_destruction.project) }
+
+        it { expect(new_package).to be_valid }
+      end
+    end
+  end
 end
diff --git a/spec/models/project_spec.rb b/spec/models/project_spec.rb
index 2fe50f8c48a..30114d36a06 100644
--- a/spec/models/project_spec.rb
+++ b/spec/models/project_spec.rb
@@ -7119,7 +7119,7 @@ RSpec.describe Project, factory_default: :keep do
   describe '#package_already_taken?' do
     let_it_be(:namespace) { create(:namespace, path: 'test') }
     let_it_be(:project) { create(:project, :public, namespace: namespace) }
-    let_it_be(:package) { create(:npm_package, project: project, name: "@#{namespace.path}/foo", version: '1.2.3') }
+    let_it_be_with_reload(:package) { create(:npm_package, project: project, name: "@#{namespace.path}/foo", version: '1.2.3') }
 
     subject { project.package_already_taken?(package_name, package_version, package_type: :npm) }
 
@@ -7158,6 +7158,23 @@ RSpec.describe Project, factory_default: :keep do
           expect(result).to be false
         end
       end
+
+      context 'with a pending_destruction package' do
+        before do
+          package.pending_destruction!
+        end
+
+        where(:package_name, :package_version, :expected_result) do
+          '@test/bar' | '1.2.3' | false
+          '@test/bar' | '5.5.5' | false
+          '@test/foo' | '1.2.3' | false
+          '@test/foo' | '5.5.5' | false
+        end
+
+        with_them do
+          it { is_expected.to eq expected_result}
+        end
+      end
     end
   end
 
diff --git a/spec/requests/api/composer_packages_spec.rb b/spec/requests/api/composer_packages_spec.rb
index 21b4634ce25..bc30fc3b230 100644
--- a/spec/requests/api/composer_packages_spec.rb
+++ b/spec/requests/api/composer_packages_spec.rb
@@ -327,6 +327,35 @@ RSpec.describe API::ComposerPackages do
       it_behaves_like 'rejects Composer access with unknown project id'
     end
 
+    context 'with existing package' do
+      include_context 'Composer api project access', 'PRIVATE', :developer, true, true
+
+      let_it_be_with_reload(:existing_package) { create(:composer_package, name: package_name, version: '1.2.99', project: project) }
+
+      let(:params) { { tag: 'v1.2.99' } }
+
+      before do
+        project.add_maintainer(user)
+      end
+
+      it 'does not create a new package' do
+        expect { subject }
+          .to change { project.packages.composer.count }.by(0)
+
+        expect(response).to have_gitlab_http_status(:created)
+      end
+
+      context 'marked as pending_destruction' do
+        it 'does create a new package' do
+          existing_package.pending_destruction!
+          expect { subject }
+            .to change { project.packages.composer.count }.by(1)
+
+          expect(response).to have_gitlab_http_status(:created)
+        end
+      end
+    end
+
     context 'with no tag or branch params' do
       let(:headers) { basic_auth_header(user.username, personal_access_token.token) }
 
diff --git a/spec/requests/api/generic_packages_spec.rb b/spec/requests/api/generic_packages_spec.rb
index 1836233594d..e1d8a9f0229 100644
--- a/spec/requests/api/generic_packages_spec.rb
+++ b/spec/requests/api/generic_packages_spec.rb
@@ -426,6 +426,33 @@ RSpec.describe API::GenericPackages do
         it_behaves_like 'a package tracking event', described_class.name, 'push_package'
       end
 
+      context 'with existing package' do
+        let_it_be(:package_name) { 'mypackage' }
+        let_it_be(:package_version) { '1.2.3' }
+        let_it_be_with_reload(:existing_package) { create(:generic_package, name: package_name, version: package_version, project: project) }
+
+        let(:headers) { workhorse_headers.merge(personal_access_token_header) }
+
+        it 'does not create a new package' do
+          expect { upload_file(params, headers, package_name: package_name, package_version: package_version) }
+            .to change { project.packages.generic.count }.by(0)
+            .and change { Packages::PackageFile.count }.by(1)
+
+          expect(response).to have_gitlab_http_status(:created)
+        end
+
+        context 'marked as pending_destruction' do
+          it 'does create a new package' do
+            existing_package.pending_destruction!
+            expect { upload_file(params, headers, package_name: package_name, package_version: package_version) }
+              .to change { project.packages.generic.count }.by(1)
+              .and change { Packages::PackageFile.count }.by(1)
+
+            expect(response).to have_gitlab_http_status(:created)
+          end
+        end
+      end
+
       it 'rejects request without a file from workhorse' do
         headers = workhorse_headers.merge(personal_access_token_header)
         upload_file({}, headers)
diff --git a/spec/requests/api/pypi_packages_spec.rb b/spec/requests/api/pypi_packages_spec.rb
index c17d0600aca..fcd2d56e655 100644
--- a/spec/requests/api/pypi_packages_spec.rb
+++ b/spec/requests/api/pypi_packages_spec.rb
@@ -230,6 +230,35 @@ RSpec.describe API::PypiPackages do
 
       it_behaves_like 'returning response status', :bad_request
     end
+
+    context 'with existing package' do
+      let_it_be_with_reload(:existing_package) { create(:pypi_package, name: 'sample-project', version: '1.0.0', project: project) }
+
+      let(:headers) { basic_auth_header(user.username, personal_access_token.token).merge(workhorse_headers) }
+
+      before do
+        project.add_maintainer(user)
+      end
+
+      it 'does not create a new package', :aggregate_failures do
+        expect { subject }
+          .to change { project.packages.pypi.count }.by(0)
+          .and change { Packages::PackageFile.count }.by(1)
+          .and change { Packages::Pypi::Metadatum.count }.by(0)
+        expect(response).to have_gitlab_http_status(:created)
+      end
+
+      context 'marked as pending_destruction' do
+        it 'does create a new package', :aggregate_failures do
+          existing_package.pending_destruction!
+          expect { subject }
+            .to change { project.packages.pypi.count }.by(1)
+            .and change { Packages::PackageFile.count }.by(1)
+            .and change { Packages::Pypi::Metadatum.count }.by(1)
+          expect(response).to have_gitlab_http_status(:created)
+        end
+      end
+    end
   end
 
   context 'file download endpoint' do
diff --git a/spec/requests/api/terraform/modules/v1/packages_spec.rb b/spec/requests/api/terraform/modules/v1/packages_spec.rb
index c0f04ba09be..8160113bbde 100644
--- a/spec/requests/api/terraform/modules/v1/packages_spec.rb
+++ b/spec/requests/api/terraform/modules/v1/packages_spec.rb
@@ -415,6 +415,28 @@ RSpec.describe API::Terraform::Modules::V1::Packages do
               .and change { Packages::PackageFile.count }.by(0)
           expect(response).to have_gitlab_http_status(:error)
         end
+
+        context 'with an existing package' do
+          let_it_be_with_reload(:existing_package) { create(:terraform_module_package, name: 'mymodule/mysystem', version: '1.0.0', project: project) }
+
+          it 'does not create a new package' do
+            expect { subject }
+              .to change { project.packages.count }.by(0)
+              .and change { Packages::PackageFile.count }.by(0)
+            expect(response).to have_gitlab_http_status(:forbidden)
+          end
+
+          context 'marked as pending_destruction' do
+            it 'does create a new package' do
+              existing_package.pending_destruction!
+
+              expect { subject }
+                .to change { project.packages.count }.by(1)
+                .and change { Packages::PackageFile.count }.by(1)
+              expect(response).to have_gitlab_http_status(:created)
+            end
+          end
+        end
       end
     end
   end
diff --git a/spec/services/packages/composer/create_package_service_spec.rb b/spec/services/packages/composer/create_package_service_spec.rb
index 593777faa55..b04a6c8382f 100644
--- a/spec/services/packages/composer/create_package_service_spec.rb
+++ b/spec/services/packages/composer/create_package_service_spec.rb
@@ -88,13 +88,23 @@ RSpec.describe Packages::Composer::CreatePackageService do
       end
 
       context 'belonging to another project' do
-        let(:other_project) { create(:project) }
+        let(:other_project) { create(:project)}
         let!(:other_package) { create(:composer_package, name: package_name, version: 'dev-master', project: other_project) }
 
         it 'fails with an error' do
           expect { subject }
             .to raise_error(/is already taken/)
         end
+
+        context 'with pending_destruction package' do
+          let!(:other_package) { create(:composer_package, :pending_destruction, name: package_name, version: 'dev-master', project: other_project) }
+
+          it 'creates the package' do
+            expect { subject }
+              .to change { Packages::Package.composer.count }.by(1)
+              .and change { Packages::Composer::Metadatum.count }.by(1)
+          end
+        end
       end
 
       context 'same name but of different type' do
diff --git a/spec/services/packages/debian/find_or_create_package_service_spec.rb b/spec/services/packages/debian/find_or_create_package_service_spec.rb
index f06f86b0146..84a0e1465e8 100644
--- a/spec/services/packages/debian/find_or_create_package_service_spec.rb
+++ b/spec/services/packages/debian/find_or_create_package_service_spec.rb
@@ -32,8 +32,6 @@ RSpec.describe Packages::Debian::FindOrCreatePackageService do
     end
 
     context 'run twice' do
-      let(:subject2) { service.execute }
-
       let(:package2) { service.execute.payload[:package] }
 
       it 'returns the same object' do
@@ -42,6 +40,16 @@ RSpec.describe Packages::Debian::FindOrCreatePackageService do
 
         expect(package2.id).to eq(package.id)
       end
+
+      context 'with package marked as pending_destruction' do
+        it 'creates a new package' do
+          expect { subject }.to change { ::Packages::Package.count }.by(1)
+          package.pending_destruction!
+          expect { package2 }.to change { ::Packages::Package.count }.by(1)
+
+          expect(package2.id).not_to eq(package.id)
+        end
+      end
     end
 
     context 'with non-existing distribution' do
diff --git a/spec/services/packages/debian/process_changes_service_spec.rb b/spec/services/packages/debian/process_changes_service_spec.rb
index 8e5e36cdbcb..52bcddb6f5e 100644
--- a/spec/services/packages/debian/process_changes_service_spec.rb
+++ b/spec/services/packages/debian/process_changes_service_spec.rb
@@ -25,6 +25,30 @@ RSpec.describe Packages::Debian::ProcessChangesService do
         expect(created_package.version).to eq '1.2.3~alpha2'
         expect(created_package.creator).to eq user
       end
+
+      context 'with existing package' do
+        let_it_be_with_reload(:existing_package) { create(:debian_package, name: 'sample', version: '1.2.3~alpha2', project: distribution.project) }
+
+        before do
+          existing_package.update!(debian_distribution: distribution)
+        end
+
+        it 'does not create a package' do
+          expect { subject.execute }
+            .to not_change { Packages::Package.count }
+            .and not_change { Packages::PackageFile.count }
+        end
+
+        context 'marked as pending_destruction' do
+          it 'creates a package' do
+            existing_package.pending_destruction!
+
+            expect { subject.execute }
+              .to change { Packages::Package.count }.by(1)
+              .and not_change { Packages::PackageFile.count }
+          end
+        end
+      end
     end
 
     context 'with invalid package file' do
diff --git a/spec/services/packages/generic/find_or_create_package_service_spec.rb b/spec/services/packages/generic/find_or_create_package_service_spec.rb
index a045cb36418..10ec917bc99 100644
--- a/spec/services/packages/generic/find_or_create_package_service_spec.rb
+++ b/spec/services/packages/generic/find_or_create_package_service_spec.rb
@@ -83,6 +83,23 @@ RSpec.describe Packages::Generic::FindOrCreatePackageService do
           expect(package.reload.original_build_info.pipeline).to eq(pipeline)
         end
       end
+
+      context 'when a pending_destruction package exists', :aggregate_failures do
+        let!(:package) { project.packages.generic.create!(params.merge(status: :pending_destruction)) }
+
+        it 'creates a new package' do
+          service = described_class.new(project, user, params)
+
+          expect { service.execute }.to change { project.packages.generic.count }.by(1)
+
+          package = project.packages.generic.last
+
+          expect(package.creator).to eq(user)
+          expect(package.name).to eq('mypackage')
+          expect(package.version).to eq('0.0.1')
+          expect(package.original_build_info).to be_nil
+        end
+      end
     end
   end
 end
diff --git a/spec/services/packages/helm/process_file_service_spec.rb b/spec/services/packages/helm/process_file_service_spec.rb
index 2e98590a4f4..d22c1de2335 100644
--- a/spec/services/packages/helm/process_file_service_spec.rb
+++ b/spec/services/packages/helm/process_file_service_spec.rb
@@ -53,6 +53,19 @@ RSpec.describe Packages::Helm::ProcessFileService do
         expect(package_file.helm_file_metadatum.channel).to eq(channel)
         expect(package_file.helm_file_metadatum.metadata).to eq(expected)
       end
+
+      context 'marked as pending_destruction' do
+        before do
+          existing_package.pending_destruction!
+        end
+
+        it 'reuses the processing package' do
+          expect { execute }
+            .to not_change { Packages::Package.count }
+            .and not_change { Packages::PackageFile.count }
+            .and change { Packages::Helm::FileMetadatum.count }.by(1)
+        end
+      end
     end
 
     context 'with a valid file' do
diff --git a/spec/services/packages/maven/find_or_create_package_service_spec.rb b/spec/services/packages/maven/find_or_create_package_service_spec.rb
index 59f5677f526..cca074e2fa6 100644
--- a/spec/services/packages/maven/find_or_create_package_service_spec.rb
+++ b/spec/services/packages/maven/find_or_create_package_service_spec.rb
@@ -81,6 +81,14 @@ RSpec.describe Packages::Maven::FindOrCreatePackageService do
           let!(:existing_package) { create(:maven_package, name: path, version: version, project: project) }
 
           it_behaves_like 'reuse existing package'
+
+          context 'marked as pending_destruction' do
+            before do
+              existing_package.pending_destruction!
+            end
+
+            it_behaves_like 'create package'
+          end
         end
 
         context 'without existing package' do
diff --git a/spec/services/packages/npm/create_package_service_spec.rb b/spec/services/packages/npm/create_package_service_spec.rb
index a5b36527565..5b41055397b 100644
--- a/spec/services/packages/npm/create_package_service_spec.rb
+++ b/spec/services/packages/npm/create_package_service_spec.rb
@@ -112,6 +112,20 @@ RSpec.describe Packages::Npm::CreatePackageService do
 
       it { expect(subject[:http_status]).to eq 403 }
       it { expect(subject[:message]).to be 'Package already exists.' }
+
+      context 'marked as pending_destruction' do
+        before do
+          existing_package.pending_destruction!
+        end
+
+        it 'creates a new package' do
+          expect { subject }
+            .to change { Packages::Package.count }.by(1)
+            .and change { Packages::Package.npm.count }.by(1)
+            .and change { Packages::Tag.count }.by(1)
+            .and change { Packages::Npm::Metadatum.count }.by(1)
+        end
+      end
     end
 
     describe 'max file size validation' do
diff --git a/spec/services/packages/nuget/update_package_from_metadata_service_spec.rb b/spec/services/packages/nuget/update_package_from_metadata_service_spec.rb
index d682ee12ed5..6a4dbeb10dc 100644
--- a/spec/services/packages/nuget/update_package_from_metadata_service_spec.rb
+++ b/spec/services/packages/nuget/update_package_from_metadata_service_spec.rb
@@ -106,6 +106,20 @@ RSpec.describe Packages::Nuget::UpdatePackageFromMetadataService, :clean_gitlab_
       it_behaves_like 'taking the lease'
 
       it_behaves_like 'not updating the package if the lease is taken'
+
+      context 'marked as pending_destruction' do
+        before do
+          existing_package.pending_destruction!
+        end
+
+        it 'reuses the processing package', :aggregate_failures do
+          expect { subject }
+            .to not_change { ::Packages::Package.count }
+            .and change { Packages::Dependency.count }.by(1)
+            .and change { Packages::DependencyLink.count }.by(1)
+            .and change { ::Packages::Nuget::Metadatum.count }.by(0)
+        end
+      end
     end
 
     context 'with a nuspec file with metadata' do
diff --git a/spec/services/packages/pypi/create_package_service_spec.rb b/spec/services/packages/pypi/create_package_service_spec.rb
index a932cf73eb7..3d0c10724d4 100644
--- a/spec/services/packages/pypi/create_package_service_spec.rb
+++ b/spec/services/packages/pypi/create_package_service_spec.rb
@@ -72,6 +72,27 @@ RSpec.describe Packages::Pypi::CreatePackageService do
             .and change { Packages::PackageFile.count }.by(0)
             .and raise_error(/File name has already been taken/)
         end
+
+        context 'with a pending_destruction package', :aggregate_failures do
+          before do
+            Packages::Package.pypi.last.pending_destruction!
+          end
+
+          it 'creates a new package' do
+            expect { subject }
+              .to change { Packages::Package.pypi.count }.by(1)
+              .and change { Packages::PackageFile.count }.by(1)
+
+            expect(created_package.name).to eq 'foo'
+            expect(created_package.version).to eq '1.0'
+
+            expect(created_package.pypi_metadatum.required_python).to eq '>=2.7'
+            expect(created_package.package_files.size).to eq 1
+            expect(created_package.package_files.first.file_name).to eq 'foo.tgz'
+            expect(created_package.package_files.first.file_sha256).to eq 'abc'
+            expect(created_package.package_files.first.file_md5).to eq 'def'
+          end
+        end
       end
 
       context 'without an existing file' do
diff --git a/spec/services/packages/rubygems/process_gem_service_spec.rb b/spec/services/packages/rubygems/process_gem_service_spec.rb
index 64deb39c6d8..caff338ef53 100644
--- a/spec/services/packages/rubygems/process_gem_service_spec.rb
+++ b/spec/services/packages/rubygems/process_gem_service_spec.rb
@@ -85,6 +85,28 @@ RSpec.describe Packages::Rubygems::ProcessGemService do
       end
     end
 
+    context 'when the package already exists marked as pending_destruction' do
+      let_it_be_with_reload(:existing_package) { create(:rubygems_package, name: 'package', version: '0.0.1', project: package.project) }
+
+      let(:sub_service) { double }
+
+      before do
+        expect(Packages::Rubygems::MetadataExtractionService).to receive(:new).with(package, gemspec).and_return(sub_service)
+        expect(Packages::Rubygems::CreateGemspecService).to receive(:new).with(package, gemspec).and_return(sub_service)
+        expect(Packages::Rubygems::CreateDependenciesService).to receive(:new).with(package, gemspec).and_return(sub_service)
+
+        expect(sub_service).to receive(:execute).exactly(3).times.and_return(true)
+
+        existing_package.pending_destruction!
+      end
+
+      it 'reuses the processing package' do
+        expect { subject }
+          .to not_change { package.project.packages.count }
+          .and not_change { existing_package.package_files.count }
+      end
+    end
+
     context 'sub-service failure' do
       before do
         expect(Packages::Rubygems::MetadataExtractionService).to receive(:new).with(package, gemspec).and_raise(::Packages::Rubygems::ProcessGemService::ExtractionError.new('failure'))
diff --git a/spec/services/packages/terraform_module/create_package_service_spec.rb b/spec/services/packages/terraform_module/create_package_service_spec.rb
index e172aa726fd..f73b5682835 100644
--- a/spec/services/packages/terraform_module/create_package_service_spec.rb
+++ b/spec/services/packages/terraform_module/create_package_service_spec.rb
@@ -6,8 +6,6 @@ RSpec.describe Packages::TerraformModule::CreatePackageService do
   let_it_be(:project) { create(:project, namespace: namespace) }
   let_it_be(:user) { create(:user) }
   let_it_be(:sha256) { '440e5e148a25331bbd7991575f7d54933c0ebf6cc735a18ee5066ac1381bb590' }
-  let_it_be(:temp_file) { Tempfile.new('test') }
-  let_it_be(:file) { UploadedFile.new(temp_file.path, sha256: sha256) }
 
   let(:overrides) { {} }
 
@@ -16,7 +14,7 @@ RSpec.describe Packages::TerraformModule::CreatePackageService do
       module_name: 'foo',
       module_system: 'bar',
       module_version: '1.0.1',
-      file: file,
+      file: UploadedFile.new(Tempfile.new('test').path, sha256: sha256),
       file_name: 'foo-bar-1.0.1.tgz'
     }.merge(overrides)
   end
@@ -24,7 +22,7 @@ RSpec.describe Packages::TerraformModule::CreatePackageService do
   subject { described_class.new(project, user, params).execute }
 
   describe '#execute' do
-    context 'valid package' do
+    shared_examples 'creating a package' do
       it 'creates a package' do
         expect { subject }
           .to change { ::Packages::Package.count }.by(1)
@@ -32,12 +30,24 @@ RSpec.describe Packages::TerraformModule::CreatePackageService do
       end
     end
 
+    context 'valid package' do
+      it_behaves_like 'creating a package'
+    end
+
     context 'package already exists elsewhere' do
       let(:project2) { create(:project, namespace: namespace) }
       let!(:existing_package) { create(:terraform_module_package, project: project2, name: 'foo/bar', version: '1.0.0') }
 
       it { expect(subject[:http_status]).to eq 403 }
       it { expect(subject[:message]).to be 'Access Denied' }
+
+      context 'marked as pending_destruction' do
+        before do
+          existing_package.pending_destruction!
+        end
+
+        it_behaves_like 'creating a package'
+      end
     end
 
     context 'version already exists' do
@@ -45,6 +55,14 @@ RSpec.describe Packages::TerraformModule::CreatePackageService do
 
       it { expect(subject[:http_status]).to eq 403 }
       it { expect(subject[:message]).to be 'Package version already exists.' }
+
+      context 'marked as pending_destruction' do
+        before do
+          existing_version.pending_destruction!
+        end
+
+        it_behaves_like 'creating a package'
+      end
     end
 
     context 'with empty version' do
diff --git a/spec/support/shared_examples/requests/api/conan_packages_shared_examples.rb b/spec/support/shared_examples/requests/api/conan_packages_shared_examples.rb
index 71f3a0235be..b30c4186f0d 100644
--- a/spec/support/shared_examples/requests/api/conan_packages_shared_examples.rb
+++ b/spec/support/shared_examples/requests/api/conan_packages_shared_examples.rb
@@ -777,6 +777,32 @@ RSpec.shared_examples 'uploads a package file' do
 
         subject
       end
+
+      context 'with existing package' do
+        let!(:existing_package) { create(:conan_package, name: 'foo', version: 'bar', project: project) }
+
+        before do
+          existing_package.conan_metadatum.update!(package_username: project.full_path.tr('/', '+'), package_channel: 'baz')
+        end
+
+        it 'does not create a new package' do
+          expect { subject }
+            .to not_change { project.packages.count }
+            .and not_change { Packages::Conan::Metadatum.count }
+            .and change { Packages::PackageFile.count }.by(1)
+        end
+
+        context 'marked as pending_destruction' do
+          it 'does not create a new package' do
+            existing_package.pending_destruction!
+
+            expect { subject }
+              .to change { project.packages.count }.by(1)
+              .and change { Packages::Conan::Metadatum.count }.by(1)
+              .and change { Packages::PackageFile.count }.by(1)
+          end
+        end
+      end
     end
   end
 
diff --git a/spec/workers/packages/go/sync_packages_worker_spec.rb b/spec/workers/packages/go/sync_packages_worker_spec.rb
index ad1a85b26e4..5eeef1f7c08 100644
--- a/spec/workers/packages/go/sync_packages_worker_spec.rb
+++ b/spec/workers/packages/go/sync_packages_worker_spec.rb
@@ -57,6 +57,18 @@ RSpec.describe Packages::Go::SyncPackagesWorker, type: :worker do
       it_behaves_like 'it creates a package', '', 'v1.0.3'
       it_behaves_like 'it creates a package', 'mod', 'v1.0.3'
       it_behaves_like 'it creates a package', 'v2', 'v2.0.0'
+
+      context 'marked as pending_destruction' do
+        before do
+          project.packages.each(&:pending_destruction!)
+        end
+
+        it_behaves_like 'it creates a package', '', 'v1.0.1'
+        it_behaves_like 'it creates a package', '', 'v1.0.2'
+        it_behaves_like 'it creates a package', '', 'v1.0.3'
+        it_behaves_like 'it creates a package', 'mod', 'v1.0.3'
+        it_behaves_like 'it creates a package', 'v2', 'v2.0.0'
+      end
     end
 
     context 'with a package that exceeds project limits' do