Merge branch...

Merge branch '508115-validate-one-org-group-project-is-present-in-bulk-import-entity' into 'master' 

Remove redundant validate in BulkImport::Entity

See merge request https://gitlab.com/gitlab-org/gitlab/-/merge_requests/182760



Merged-by: Rodrigo Tomonari <rtomonari@gitlab.com>
Approved-by: George Koltsov <gkoltsov@gitlab.com>
Approved-by: Rodrigo Tomonari <rtomonari@gitlab.com>
Reviewed-by: Jannik Lehmann <jlehmann@gitlab.com>
Co-authored-by: long nguyen huy <n.h.long.9697@gmail.com>

app/models/bulk_imports/entity.rb

@@ -41,16 +41,13 @@ class BulkImports::Entity < ApplicationRecord
     inverse_of: :entity,
     foreign_key: :bulk_import_entity_id
 
-  validates :project, absence: true, if: :group
-  validates :group, absence: true, if: :project
   validates :source_type, presence: true
   validates :source_full_path, presence: true
   validates :destination_name, presence: true, if: -> { group || project }
   validates :destination_namespace, exclusion: [nil], if: :group
   validates :destination_namespace, presence: true, if: :project?
 
-  # TODO: Remove `on: :create` once the post migration SetOrganizationIdForBulkImportEntities has run
-  validate :validate_only_one_sharding_key_present, on: :create
+  validate :validate_only_one_sharding_key_present
   validate :validate_parent_is_a_group, if: :parent
   validate :validate_imported_entity_type
   validate :validate_destination_namespace_ascendency, if: :group_entity?

spec/models/bulk_imports/entity_spec.rb

@@ -43,7 +43,9 @@
         entity = build(:bulk_import_entity, group: build(:group), project: build(:project))
 
         expect(entity).not_to be_valid
-        expect(entity.errors).to include(:base, :project, :group)
+
+        expect(entity.errors[:base])
+          .to include('Import failed: Must have exactly one of organization, group or project.')
       end
     end