From 43a25d93ebdabea52f99b05e15b06250cd8f07d7 Mon Sep 17 00:00:00 2001
From: GitLab Bot <gitlab-bot@gitlab.com>
Date: Wed, 17 May 2023 16:05:49 +0000
Subject: Add latest changes from gitlab-org/gitlab@16-0-stable-ee

---
 .../import_export/group/relation_tree_restorer.rb  | 56 +++++++++++++++-------
 1 file changed, 40 insertions(+), 16 deletions(-)

(limited to 'lib/gitlab/import_export/group')

diff --git a/lib/gitlab/import_export/group/relation_tree_restorer.rb b/lib/gitlab/import_export/group/relation_tree_restorer.rb
index 5a78f2fb531..5453792e904 100644
--- a/lib/gitlab/import_export/group/relation_tree_restorer.rb
+++ b/lib/gitlab/import_export/group/relation_tree_restorer.rb
@@ -34,7 +34,6 @@ module Gitlab
               update_params!
 
               BulkInsertableAssociations.with_bulk_insert(enabled: bulk_insert_enabled) do
-                fix_ci_pipelines_not_sorted_on_legacy_project_json!
                 create_relations!
               end
             end
@@ -90,13 +89,23 @@ module Gitlab
 
         def save_relation_object(relation_object, relation_key, relation_definition, relation_index)
           if relation_object.new_record?
-            Gitlab::ImportExport::Base::RelationObjectSaver.new(
+            saver = Gitlab::ImportExport::Base::RelationObjectSaver.new(
               relation_object: relation_object,
               relation_key: relation_key,
               relation_definition: relation_definition,
               importable: @importable
-            ).execute
+            )
+
+            saver.execute
+
+            log_invalid_subrelations(saver.invalid_subrelations, relation_key)
           else
+            if relation_object.invalid?
+              Gitlab::Import::Errors.merge_nested_errors(relation_object)
+
+              raise(ActiveRecord::RecordInvalid, relation_object)
+            end
+
             import_failure_service.with_retry(action: 'relation_object.save!', relation_key: relation_key, relation_index: relation_index) do
               relation_object.save!
             end
@@ -113,7 +122,7 @@ module Gitlab
           @relations ||=
             @reader
               .attributes_finder
-              .find_relations_tree(importable_class_sym)
+              .find_relations_tree(importable_class_sym, include_import_only_tree: true)
               .deep_stringify_keys
         end
 
@@ -126,9 +135,7 @@ module Gitlab
 
           modify_attributes
 
-          Gitlab::Timeless.timeless(@importable) do
-            @importable.save!
-          end
+          @importable.save!(touch: false)
         end
 
         def filter_attributes(params)
@@ -265,15 +272,6 @@ module Gitlab
           }
         end
 
-        # Temporary fix for https://gitlab.com/gitlab-org/gitlab/-/issues/27883 when import from legacy project.json
-        # This should be removed once legacy JSON format is deprecated.
-        # Ndjson export file will fix the order during project export.
-        def fix_ci_pipelines_not_sorted_on_legacy_project_json!
-          return unless @relation_reader.legacy?
-
-          @relation_reader.sort_ci_pipelines_by_id
-        end
-
         # Enable logging of each top-level relation creation when Importing into a Group
         def log_relation_creation(importable, relation_key, relation_object)
           root_ancestor_group = importable.try(:root_ancestor)
@@ -290,6 +288,32 @@ module Gitlab
             message: '[Project/Group Import] Created new object relation'
           )
         end
+
+        def log_invalid_subrelations(invalid_subrelations, relation_key)
+          invalid_subrelations.flatten.each do |record|
+            Gitlab::Import::Errors.merge_nested_errors(record)
+
+            @shared.logger.info(
+              message: '[Project/Group Import] Invalid subrelation',
+              importable_column_name => @importable.id,
+              relation_key: relation_key,
+              error_messages: record.errors.full_messages.to_sentence
+            )
+
+            ::ImportFailure.create(
+              source: 'RelationTreeRestorer#save_relation_object',
+              relation_key: relation_key,
+              exception_class: 'ActiveRecord::RecordInvalid',
+              exception_message: record.errors.full_messages.to_sentence,
+              correlation_id_value: Labkit::Correlation::CorrelationId.current_or_new_id,
+              importable_column_name => @importable.id
+            )
+          end
+        end
+
+        def importable_column_name
+          @column_name ||= @importable.class.reflect_on_association(:import_failures).foreign_key.to_sym
+        end
       end
     end
   end
-- 
cgit v1.2.3