Merge branch 'georgekoltsov/filter-group-attributes' into 'master'

Add more group attrs to list of excluded attributes for Group Import

See merge request gitlab-org/gitlab!25031

changelogs/unreleased/georgekoltsov-filter-group-attributes.yml

+---
+title: Extend the list of excluded_attributes for group on Group Import
+merge_request: 25031
+author:
+type: fixed

lib/gitlab/import_export/group_import_export.yml

@@ -28,8 +28,15 @@ included_attributes:
 excluded_attributes:
   group:
     - :id
+    - :name
+    - :path
+    - :owner_id
+    - :parent_id
+    - :created_at
+    - :updated_at
     - :runners_token
     - :runners_token_encrypted
+    - :saml_discovery_token
 
 methods:
   labels:

spec/fixtures/lib/gitlab/import_export/group_exports/complex/group.json

 {
   "name": "ymg09t5704clnxnqfgaj2h098gz4r7gyx4wc3fzmlqj1en24zf",
   "path": "ymg09t5704clnxnqfgaj2h098gz4r7gyx4wc3fzmlqj1en24zf",
-  "owner_id": null,
+  "owner_id": 123,
   "created_at": "2019-11-20 17:01:53 UTC",
   "updated_at": "2019-11-20 17:05:44 UTC",
   "description": "Group Description",
@@ -18,7 +18,7 @@
   "ldap_sync_last_successful_update_at": null,
   "ldap_sync_last_sync_at": null,
   "lfs_enabled": null,
-  "parent_id": null,
+  "parent_id": 7,
   "shared_runners_minutes_limit": null,
   "repository_size_limit": null,
   "require_two_factor_authentication": false,
@@ -33,6 +33,8 @@
   "extra_shared_runners_minutes_limit": null,
   "last_ci_minutes_notification_at": null,
   "last_ci_minutes_usage_notification_level": null,
+  "runners_token": "token",
+  "runners_token_encrypted": "encrypted",
   "subgroup_creation_level": 1,
   "emails_disabled": null,
   "max_pages_size": null,

spec/lib/gitlab/import_export/group_tree_restorer_spec.rb

@@ -71,6 +71,44 @@ describe Gitlab::ImportExport::GroupTreeRestorer do
     end
   end
 
+  context 'excluded attributes' do
+    let!(:source_user) { create(:user, id: 123) }
+    let!(:importer_user) { create(:user) }
+    let(:group) { create(:group) }
+    let(:shared) { Gitlab::ImportExport::Shared.new(group) }
+    let(:group_tree_restorer) { described_class.new(user: importer_user, shared: shared, group: group, group_hash: nil) }
+    let(:group_json) { ActiveSupport::JSON.decode(IO.read(File.join(shared.export_path, 'group.json'))) }
+
+    shared_examples 'excluded attributes' do
+      excluded_attributes = %w[
+        id
+        name
+        path
+        owner_id
+        parent_id
+        created_at
+        updated_at
+        runners_token
+        runners_token_encrypted
+        saml_discovery_token
+      ]
+
+      before do
+        group.add_owner(importer_user)
+
+        setup_import_export_config('group_exports/complex')
+      end
+
+      excluded_attributes.each do |excluded_attribute|
+        it 'does not allow override of excluded attributes' do
+          expect(group_json[excluded_attribute]).not_to eq(group.public_send(excluded_attribute))
+        end
+      end
+    end
+
+    include_examples 'excluded attributes'
+  end
+
   context 'group.json file access check' do
     let(:user) { create(:user) }
     let!(:group) { create(:group, name: 'group2', path: 'group2') }

spec/lib/gitlab/import_export/group_tree_saver_spec.rb

@@ -157,10 +157,29 @@ describe Gitlab::ImportExport::GroupTreeSaver do
       end
 
       context 'group attributes' do
-        it 'does not contain the runners token' do
-          expect(saved_group_json).not_to include("runners_token" => 'token')
+        shared_examples 'excluded attributes' do
+          excluded_attributes = %w[
+            id
+            name
+            path
+            owner_id
+            parent_id
+            created_at
+            updated_at
+            runners_token
+            runners_token_encrypted
+            saml_discovery_token
+          ]
+
+          excluded_attributes.each do |excluded_attribute|
+            it 'does not contain excluded attribute' do
+              expect(saved_group_json).not_to include(excluded_attribute => group.public_send(excluded_attribute))
+            end
           end
         end
+
+        include_examples 'excluded attributes'
+      end
     end
   end