Merge branch '357799_hide_internal_migration_vars' into 'master'

Show import container registry vars only on gitlab.com

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



Merged-by: David Fernandez <dfernandez@gitlab.com>
Approved-by: Adie (she/her) <avpfestin@gitlab.com>
Approved-by: David Fernandez <dfernandez@gitlab.com>
Reviewed-by: David Fernandez <dfernandez@gitlab.com>
Co-authored-by: Kevin-Damian Gosa <mail@kevingosa.de>

app/helpers/application_settings_helper.rb

@@ -470,15 +470,6 @@ def visible_attributes
       :package_registry_cleanup_policies_worker_capacity,
       :container_registry_expiration_policies_worker_capacity,
       :container_registry_cleanup_tags_service_max_list_size,
-      :container_registry_import_max_tags_count,
-      :container_registry_import_max_retries,
-      :container_registry_import_start_max_retries,
-      :container_registry_import_max_step_duration,
-      :container_registry_pre_import_tags_rate,
-      :container_registry_pre_import_timeout,
-      :container_registry_import_timeout,
-      :container_registry_import_target_plan,
-      :container_registry_import_created_before,
       :keep_latest_artifact,
       :whats_new_variant,
       :user_deactivation_emails_enabled,
@@ -523,10 +514,20 @@ def visible_attributes
       :downstream_pipeline_trigger_limit_per_project_user_sha,
       :asciidoc_max_includes
     ].tap do |settings|
-      next if Gitlab.com?
-
-      settings << :deactivate_dormant_users
-      settings << :deactivate_dormant_users_period
+      if Gitlab.com?
+        settings << :container_registry_import_max_tags_count
+        settings << :container_registry_import_max_retries
+        settings << :container_registry_import_start_max_retries
+        settings << :container_registry_import_max_step_duration
+        settings << :container_registry_pre_import_tags_rate
+        settings << :container_registry_pre_import_timeout
+        settings << :container_registry_import_timeout
+        settings << :container_registry_import_target_plan
+        settings << :container_registry_import_created_before
+      else
+        settings << :deactivate_dormant_users
+        settings << :deactivate_dormant_users_period
+      end
     end
   end
 

spec/helpers/application_settings_helper_spec.rb

@@ -79,6 +79,18 @@
       expect(helper.visible_attributes).to include(:namespace_aggregation_schedule_lease_duration_in_seconds)
     end
 
+    it 'does not contain :container_registry_import_* and :container_registry_pre_import_*', :aggregate_failures do
+      expect(helper.visible_attributes).not_to include(:container_registry_import_max_tags_count)
+      expect(helper.visible_attributes).not_to include(:container_registry_import_max_retries)
+      expect(helper.visible_attributes).not_to include(:container_registry_import_start_max_retries)
+      expect(helper.visible_attributes).not_to include(:container_registry_import_max_step_duration)
+      expect(helper.visible_attributes).not_to include(:container_registry_pre_import_tags_rate)
+      expect(helper.visible_attributes).not_to include(:container_registry_pre_import_timeout)
+      expect(helper.visible_attributes).not_to include(:container_registry_import_timeout)
+      expect(helper.visible_attributes).not_to include(:container_registry_import_target_plan)
+      expect(helper.visible_attributes).not_to include(:container_registry_import_created_before)
+    end
+
     it 'contains service ping settings' do
       expect(helper.visible_attributes).to include(
         *%i[
@@ -94,6 +106,18 @@
       it 'does not contain :deactivate_dormant_users_period' do
         expect(helper.visible_attributes).not_to include(:deactivate_dormant_users_period)
       end
+
+      it 'does contain :container_registry_import_* and :container_registry_pre_import_*', :aggregate_failures do
+        expect(helper.visible_attributes).to include(:container_registry_import_max_tags_count)
+        expect(helper.visible_attributes).to include(:container_registry_import_max_retries)
+        expect(helper.visible_attributes).to include(:container_registry_import_start_max_retries)
+        expect(helper.visible_attributes).to include(:container_registry_import_max_step_duration)
+        expect(helper.visible_attributes).to include(:container_registry_pre_import_tags_rate)
+        expect(helper.visible_attributes).to include(:container_registry_pre_import_timeout)
+        expect(helper.visible_attributes).to include(:container_registry_import_timeout)
+        expect(helper.visible_attributes).to include(:container_registry_import_target_plan)
+        expect(helper.visible_attributes).to include(:container_registry_import_created_before)
+      end
     end
   end