Skip to content

G
gitlab-ce
Commit 0318ca46 authored by George Koltsov's avatar George Koltsov
Browse files
Options

Clean up exported group attributes 

- Remove certain group attributes from
  Group Export `trial_ends_on`,
  `shared_runners_minutes_limit` &
  `extra_shared_runners_minutes_limit` as
  they are not meant to be exported/imported
parent 34b027d5
Expand all Show whitespace changes
Inline Side-by-side
Showing with 9 additions and 49 deletions
changelogs/unreleased/georgekoltsov-remove_trial_ends_on_from_group_export.yml 0 → 100644
View file @ 0318ca46
---
title: Exclude 'trial_ends_on', 'shared_runners_minutes_limit' & 'extra_shared_runners_minutes_limit' from list of exported Group attributes
merge_request: 29259
author:
type: fixed
ee/spec/fixtures/lib/gitlab/import_export/group_exports/light/group.json
View file @ 0318ca46
...@@ -25,7 +25,6 @@ ...@@ -25,7 +25,6 @@
"two_factor_grace_period": 48, "two_factor_grace_period": 48,
"plan_id": null, "plan_id": null,
"project_creation_level": 2, "project_creation_level": 2,
"trial_ends_on": null,
"file_template_project_id": null, "file_template_project_id": null,
"saml_discovery_token": "rBKx3ioz", "saml_discovery_token": "rBKx3ioz",
"custom_project_templates_group_id": null, "custom_project_templates_group_id": null,
......
lib/gitlab/import_export/group/import_export.yml
View file @ 0318ca46
...@@ -36,6 +36,9 @@ excluded_attributes: ...@@ -36,6 +36,9 @@ excluded_attributes:
- :runners_token_encrypted - :runners_token_encrypted
- :saml_discovery_token - :saml_discovery_token
- :visibility_level - :visibility_level
- :trial_ends_on
- :shared_runners_minute_limit
- :extra_shared_runners_minutes_limit
epics: epics:
- :state_id - :state_id
......
spec/fixtures/group.json 0 → 100644
View file @ 0318ca46
This diff is collapsed.
spec/fixtures/lib/gitlab/import_export/group_exports/complex/group.json
View file @ 0318ca46
...@@ -19,18 +19,15 @@ ...@@ -19,18 +19,15 @@
"ldap_sync_last_sync_at": null, "ldap_sync_last_sync_at": null,
"lfs_enabled": null, "lfs_enabled": null,
"parent_id": 7, "parent_id": 7,
"shared_runners_minutes_limit": null,
"repository_size_limit": null, "repository_size_limit": null,
"require_two_factor_authentication": false, "require_two_factor_authentication": false,
"two_factor_grace_period": 48, "two_factor_grace_period": 48,
"plan_id": null, "plan_id": null,
"project_creation_level": 2, "project_creation_level": 2,
"trial_ends_on": null,
"file_template_project_id": null, "file_template_project_id": null,
"saml_discovery_token": "rBKx3ioz", "saml_discovery_token": "rBKx3ioz",
"custom_project_templates_group_id": null, "custom_project_templates_group_id": null,
"auto_devops_enabled": null, "auto_devops_enabled": null,
"extra_shared_runners_minutes_limit": null,
"last_ci_minutes_notification_at": null, "last_ci_minutes_notification_at": null,
"last_ci_minutes_usage_notification_level": null, "last_ci_minutes_usage_notification_level": null,
"runners_token": "token", "runners_token": "token",
...@@ -1075,18 +1072,15 @@ ...@@ -1075,18 +1072,15 @@
"ldap_sync_last_sync_at": null, "ldap_sync_last_sync_at": null,
"lfs_enabled": null, "lfs_enabled": null,
"parent_id": 4351, "parent_id": 4351,
"shared_runners_minutes_limit": null,
"repository_size_limit": null, "repository_size_limit": null,
"require_two_factor_authentication": false, "require_two_factor_authentication": false,
"two_factor_grace_period": 48, "two_factor_grace_period": 48,
"plan_id": null, "plan_id": null,
"project_creation_level": 2, "project_creation_level": 2,
"trial_ends_on": null,
"file_template_project_id": null, "file_template_project_id": null,
"saml_discovery_token": "ki3Xnjw3", "saml_discovery_token": "ki3Xnjw3",
"custom_project_templates_group_id": null, "custom_project_templates_group_id": null,
"auto_devops_enabled": null, "auto_devops_enabled": null,
"extra_shared_runners_minutes_limit": null,
"last_ci_minutes_notification_at": null, "last_ci_minutes_notification_at": null,
"last_ci_minutes_usage_notification_level": null, "last_ci_minutes_usage_notification_level": null,
"subgroup_creation_level": 1, "subgroup_creation_level": 1,
...@@ -1649,18 +1643,15 @@ ...@@ -1649,18 +1643,15 @@
"ldap_sync_last_sync_at": null, "ldap_sync_last_sync_at": null,
"lfs_enabled": null, "lfs_enabled": null,
"parent_id": 4351, "parent_id": 4351,
"shared_runners_minutes_limit": null,
"repository_size_limit": null, "repository_size_limit": null,
"require_two_factor_authentication": false, "require_two_factor_authentication": false,
"two_factor_grace_period": 48, "two_factor_grace_period": 48,
"plan_id": null, "plan_id": null,
"project_creation_level": 2, "project_creation_level": 2,
"trial_ends_on": null,
"file_template_project_id": null, "file_template_project_id": null,
"saml_discovery_token": "m7cx4AZi", "saml_discovery_token": "m7cx4AZi",
"custom_project_templates_group_id": null, "custom_project_templates_group_id": null,
"auto_devops_enabled": null, "auto_devops_enabled": null,
"extra_shared_runners_minutes_limit": null,
"last_ci_minutes_notification_at": null, "last_ci_minutes_notification_at": null,
"last_ci_minutes_usage_notification_level": null, "last_ci_minutes_usage_notification_level": null,
"subgroup_creation_level": 1, "subgroup_creation_level": 1,
......
spec/fixtures/lib/gitlab/import_export/group_exports/no_children/group.json
View file @ 0318ca46
...@@ -19,18 +19,15 @@ ...@@ -19,18 +19,15 @@
"ldap_sync_last_sync_at": null, "ldap_sync_last_sync_at": null,
"lfs_enabled": null, "lfs_enabled": null,
"parent_id": null, "parent_id": null,
"shared_runners_minutes_limit": null,
"repository_size_limit": null, "repository_size_limit": null,
"require_two_factor_authentication": false, "require_two_factor_authentication": false,
"two_factor_grace_period": 48, "two_factor_grace_period": 48,
"plan_id": null, "plan_id": null,
"project_creation_level": 2, "project_creation_level": 2,
"trial_ends_on": null,
"file_template_project_id": null, "file_template_project_id": null,
"saml_discovery_token": "rBKx3ioz", "saml_discovery_token": "rBKx3ioz",
"custom_project_templates_group_id": null, "custom_project_templates_group_id": null,
"auto_devops_enabled": null, "auto_devops_enabled": null,
"extra_shared_runners_minutes_limit": null,
"last_ci_minutes_notification_at": null, "last_ci_minutes_notification_at": null,
"last_ci_minutes_usage_notification_level": null, "last_ci_minutes_usage_notification_level": null,
"subgroup_creation_level": 1, "subgroup_creation_level": 1,
......
spec/fixtures/lib/gitlab/import_export/group_exports/visibility_levels/internal/group.json
View file @ 0318ca46
...@@ -20,17 +20,14 @@ ...@@ -20,17 +20,14 @@
"ldap_sync_last_sync_at": null, "ldap_sync_last_sync_at": null,
"lfs_enabled": null, "lfs_enabled": null,
"parent_id": null, "parent_id": null,
"shared_runners_minutes_limit": null,
"repository_size_limit": null, "repository_size_limit": null,
"require_two_factor_authentication": false, "require_two_factor_authentication": false,
"two_factor_grace_period": 48, "two_factor_grace_period": 48,
"plan_id": null, "plan_id": null,
"project_creation_level": 2, "project_creation_level": 2,
"trial_ends_on": null,
"file_template_project_id": null, "file_template_project_id": null,
"custom_project_templates_group_id": null, "custom_project_templates_group_id": null,
"auto_devops_enabled": null, "auto_devops_enabled": null,
"extra_shared_runners_minutes_limit": null,
"last_ci_minutes_notification_at": null, "last_ci_minutes_notification_at": null,
"last_ci_minutes_usage_notification_level": null, "last_ci_minutes_usage_notification_level": null,
"subgroup_creation_level": 1, "subgroup_creation_level": 1,
...@@ -61,17 +58,14 @@ ...@@ -61,17 +58,14 @@
"ldap_sync_last_sync_at": null, "ldap_sync_last_sync_at": null,
"lfs_enabled": null, "lfs_enabled": null,
"parent_id": 283, "parent_id": 283,
"shared_runners_minutes_limit": null,
"repository_size_limit": null, "repository_size_limit": null,
"require_two_factor_authentication": false, "require_two_factor_authentication": false,
"two_factor_grace_period": 48, "two_factor_grace_period": 48,
"plan_id": null, "plan_id": null,
"project_creation_level": 2, "project_creation_level": 2,
"trial_ends_on": null,
"file_template_project_id": null, "file_template_project_id": null,
"custom_project_templates_group_id": null, "custom_project_templates_group_id": null,
"auto_devops_enabled": null, "auto_devops_enabled": null,
"extra_shared_runners_minutes_limit": null,
"last_ci_minutes_notification_at": null, "last_ci_minutes_notification_at": null,
"last_ci_minutes_usage_notification_level": null, "last_ci_minutes_usage_notification_level": null,
"subgroup_creation_level": 1, "subgroup_creation_level": 1,
...@@ -102,17 +96,14 @@ ...@@ -102,17 +96,14 @@
"ldap_sync_last_sync_at": null, "ldap_sync_last_sync_at": null,
"lfs_enabled": null, "lfs_enabled": null,
"parent_id": 283, "parent_id": 283,
"shared_runners_minutes_limit": null,
"repository_size_limit": null, "repository_size_limit": null,
"require_two_factor_authentication": false, "require_two_factor_authentication": false,
"two_factor_grace_period": 48, "two_factor_grace_period": 48,
"plan_id": null, "plan_id": null,
"project_creation_level": 2, "project_creation_level": 2,
"trial_ends_on": null,
"file_template_project_id": null, "file_template_project_id": null,
"custom_project_templates_group_id": null, "custom_project_templates_group_id": null,
"auto_devops_enabled": null, "auto_devops_enabled": null,
"extra_shared_runners_minutes_limit": null,
"last_ci_minutes_notification_at": null, "last_ci_minutes_notification_at": null,
"last_ci_minutes_usage_notification_level": null, "last_ci_minutes_usage_notification_level": null,
"subgroup_creation_level": 1, "subgroup_creation_level": 1,
...@@ -143,17 +134,14 @@ ...@@ -143,17 +134,14 @@
"ldap_sync_last_sync_at": null, "ldap_sync_last_sync_at": null,
"lfs_enabled": null, "lfs_enabled": null,
"parent_id": 283, "parent_id": 283,
"shared_runners_minutes_limit": null,
"repository_size_limit": null, "repository_size_limit": null,
"require_two_factor_authentication": false, "require_two_factor_authentication": false,
"two_factor_grace_period": 48, "two_factor_grace_period": 48,
"plan_id": null, "plan_id": null,
"project_creation_level": 2, "project_creation_level": 2,
"trial_ends_on": null,
"file_template_project_id": null, "file_template_project_id": null,
"custom_project_templates_group_id": null, "custom_project_templates_group_id": null,
"auto_devops_enabled": null, "auto_devops_enabled": null,
"extra_shared_runners_minutes_limit": null,
"last_ci_minutes_notification_at": null, "last_ci_minutes_notification_at": null,
"last_ci_minutes_usage_notification_level": null, "last_ci_minutes_usage_notification_level": null,
"subgroup_creation_level": 1, "subgroup_creation_level": 1,
......
spec/fixtures/lib/gitlab/import_export/group_exports/visibility_levels/private/group.json
View file @ 0318ca46
...@@ -20,17 +20,14 @@ ...@@ -20,17 +20,14 @@
"ldap_sync_last_sync_at": null, "ldap_sync_last_sync_at": null,
"lfs_enabled": null, "lfs_enabled": null,
"parent_id": null, "parent_id": null,
"shared_runners_minutes_limit": null,
"repository_size_limit": null, "repository_size_limit": null,
"require_two_factor_authentication": false, "require_two_factor_authentication": false,
"two_factor_grace_period": 48, "two_factor_grace_period": 48,
"plan_id": null, "plan_id": null,
"project_creation_level": 2, "project_creation_level": 2,
"trial_ends_on": null,
"file_template_project_id": null, "file_template_project_id": null,
"custom_project_templates_group_id": null, "custom_project_templates_group_id": null,
"auto_devops_enabled": null, "auto_devops_enabled": null,
"extra_shared_runners_minutes_limit": null,
"last_ci_minutes_notification_at": null, "last_ci_minutes_notification_at": null,
"last_ci_minutes_usage_notification_level": null, "last_ci_minutes_usage_notification_level": null,
"subgroup_creation_level": 1, "subgroup_creation_level": 1,
...@@ -61,17 +58,14 @@ ...@@ -61,17 +58,14 @@
"ldap_sync_last_sync_at": null, "ldap_sync_last_sync_at": null,
"lfs_enabled": null, "lfs_enabled": null,
"parent_id": 283, "parent_id": 283,
"shared_runners_minutes_limit": null,
"repository_size_limit": null, "repository_size_limit": null,
"require_two_factor_authentication": false, "require_two_factor_authentication": false,
"two_factor_grace_period": 48, "two_factor_grace_period": 48,
"plan_id": null, "plan_id": null,
"project_creation_level": 2, "project_creation_level": 2,
"trial_ends_on": null,
"file_template_project_id": null, "file_template_project_id": null,
"custom_project_templates_group_id": null, "custom_project_templates_group_id": null,
"auto_devops_enabled": null, "auto_devops_enabled": null,
"extra_shared_runners_minutes_limit": null,
"last_ci_minutes_notification_at": null, "last_ci_minutes_notification_at": null,
"last_ci_minutes_usage_notification_level": null, "last_ci_minutes_usage_notification_level": null,
"subgroup_creation_level": 1, "subgroup_creation_level": 1,
...@@ -102,17 +96,14 @@ ...@@ -102,17 +96,14 @@
"ldap_sync_last_sync_at": null, "ldap_sync_last_sync_at": null,
"lfs_enabled": null, "lfs_enabled": null,
"parent_id": 283, "parent_id": 283,
"shared_runners_minutes_limit": null,
"repository_size_limit": null, "repository_size_limit": null,
"require_two_factor_authentication": false, "require_two_factor_authentication": false,
"two_factor_grace_period": 48, "two_factor_grace_period": 48,
"plan_id": null, "plan_id": null,
"project_creation_level": 2, "project_creation_level": 2,
"trial_ends_on": null,
"file_template_project_id": null, "file_template_project_id": null,
"custom_project_templates_group_id": null, "custom_project_templates_group_id": null,
"auto_devops_enabled": null, "auto_devops_enabled": null,
"extra_shared_runners_minutes_limit": null,
"last_ci_minutes_notification_at": null, "last_ci_minutes_notification_at": null,
"last_ci_minutes_usage_notification_level": null, "last_ci_minutes_usage_notification_level": null,
"subgroup_creation_level": 1, "subgroup_creation_level": 1,
...@@ -143,17 +134,14 @@ ...@@ -143,17 +134,14 @@
"ldap_sync_last_sync_at": null, "ldap_sync_last_sync_at": null,
"lfs_enabled": null, "lfs_enabled": null,
"parent_id": 283, "parent_id": 283,
"shared_runners_minutes_limit": null,
"repository_size_limit": null, "repository_size_limit": null,
"require_two_factor_authentication": false, "require_two_factor_authentication": false,
"two_factor_grace_period": 48, "two_factor_grace_period": 48,
"plan_id": null, "plan_id": null,
"project_creation_level": 2, "project_creation_level": 2,
"trial_ends_on": null,
"file_template_project_id": null, "file_template_project_id": null,
"custom_project_templates_group_id": null, "custom_project_templates_group_id": null,
"auto_devops_enabled": null, "auto_devops_enabled": null,
"extra_shared_runners_minutes_limit": null,
"last_ci_minutes_notification_at": null, "last_ci_minutes_notification_at": null,
"last_ci_minutes_usage_notification_level": null, "last_ci_minutes_usage_notification_level": null,
"subgroup_creation_level": 1, "subgroup_creation_level": 1,
......
spec/fixtures/lib/gitlab/import_export/group_exports/visibility_levels/public/group.json
View file @ 0318ca46
...@@ -20,17 +20,14 @@ ...@@ -20,17 +20,14 @@
"ldap_sync_last_sync_at": null, "ldap_sync_last_sync_at": null,
"lfs_enabled": null, "lfs_enabled": null,
"parent_id": null, "parent_id": null,
"shared_runners_minutes_limit": null,
"repository_size_limit": null, "repository_size_limit": null,
"require_two_factor_authentication": false, "require_two_factor_authentication": false,
"two_factor_grace_period": 48, "two_factor_grace_period": 48,
"plan_id": null, "plan_id": null,
"project_creation_level": 2, "project_creation_level": 2,
"trial_ends_on": null,
"file_template_project_id": null, "file_template_project_id": null,
"custom_project_templates_group_id": null, "custom_project_templates_group_id": null,
"auto_devops_enabled": null, "auto_devops_enabled": null,
"extra_shared_runners_minutes_limit": null,
"last_ci_minutes_notification_at": null, "last_ci_minutes_notification_at": null,
"last_ci_minutes_usage_notification_level": null, "last_ci_minutes_usage_notification_level": null,
"subgroup_creation_level": 1, "subgroup_creation_level": 1,
...@@ -61,17 +58,14 @@ ...@@ -61,17 +58,14 @@
"ldap_sync_last_sync_at": null, "ldap_sync_last_sync_at": null,
"lfs_enabled": null, "lfs_enabled": null,
"parent_id": 283, "parent_id": 283,
"shared_runners_minutes_limit": null,
"repository_size_limit": null, "repository_size_limit": null,
"require_two_factor_authentication": false, "require_two_factor_authentication": false,
"two_factor_grace_period": 48, "two_factor_grace_period": 48,
"plan_id": null, "plan_id": null,
"project_creation_level": 2, "project_creation_level": 2,
"trial_ends_on": null,
"file_template_project_id": null, "file_template_project_id": null,
"custom_project_templates_group_id": null, "custom_project_templates_group_id": null,
"auto_devops_enabled": null, "auto_devops_enabled": null,
"extra_shared_runners_minutes_limit": null,
"last_ci_minutes_notification_at": null, "last_ci_minutes_notification_at": null,
"last_ci_minutes_usage_notification_level": null, "last_ci_minutes_usage_notification_level": null,
"subgroup_creation_level": 1, "subgroup_creation_level": 1,
...@@ -102,17 +96,14 @@ ...@@ -102,17 +96,14 @@
"ldap_sync_last_sync_at": null, "ldap_sync_last_sync_at": null,
"lfs_enabled": null, "lfs_enabled": null,
"parent_id": 283, "parent_id": 283,
"shared_runners_minutes_limit": null,
"repository_size_limit": null, "repository_size_limit": null,
"require_two_factor_authentication": false, "require_two_factor_authentication": false,
"two_factor_grace_period": 48, "two_factor_grace_period": 48,
"plan_id": null, "plan_id": null,
"project_creation_level": 2, "project_creation_level": 2,
"trial_ends_on": null,
"file_template_project_id": null, "file_template_project_id": null,
"custom_project_templates_group_id": null, "custom_project_templates_group_id": null,
"auto_devops_enabled": null, "auto_devops_enabled": null,
"extra_shared_runners_minutes_limit": null,
"last_ci_minutes_notification_at": null, "last_ci_minutes_notification_at": null,
"last_ci_minutes_usage_notification_level": null, "last_ci_minutes_usage_notification_level": null,
"subgroup_creation_level": 1, "subgroup_creation_level": 1,
...@@ -143,17 +134,14 @@ ...@@ -143,17 +134,14 @@
"ldap_sync_last_sync_at": null, "ldap_sync_last_sync_at": null,
"lfs_enabled": null, "lfs_enabled": null,
"parent_id": 283, "parent_id": 283,
"shared_runners_minutes_limit": null,
"repository_size_limit": null, "repository_size_limit": null,
"require_two_factor_authentication": false, "require_two_factor_authentication": false,
"two_factor_grace_period": 48, "two_factor_grace_period": 48,
"plan_id": null, "plan_id": null,
"project_creation_level": 2, "project_creation_level": 2,
"trial_ends_on": null,
"file_template_project_id": null, "file_template_project_id": null,
"custom_project_templates_group_id": null, "custom_project_templates_group_id": null,
"auto_devops_enabled": null, "auto_devops_enabled": null,
"extra_shared_runners_minutes_limit": null,
"last_ci_minutes_notification_at": null, "last_ci_minutes_notification_at": null,
"last_ci_minutes_usage_notification_level": null, "last_ci_minutes_usage_notification_level": null,
"subgroup_creation_level": 1, "subgroup_creation_level": 1,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7