Merge branch 'revert-e5b56c6e' into 'master'

Revert "Merge branch 'allow-secure-files-bucket-optional' into 'master'"

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



Merged-by: Reuben Pereira <2967854-rpereira2@users.noreply.gitlab.com>
Approved-by: Reuben Pereira <2967854-rpereira2@users.noreply.gitlab.com>
Co-authored-by: Stan Hu <stanhu@gmail.com>

config/object_store_settings.rb

@@ -2,8 +2,7 @@
 
 # Set default values for object_store settings
 class ObjectStoreSettings
-  SUPPORTED_TYPES = %w[artifacts external_diffs lfs uploads packages dependency_proxy terraform_state pages
-    ci_secure_files].freeze
+  SUPPORTED_TYPES = %w[artifacts external_diffs lfs uploads packages dependency_proxy terraform_state pages].freeze
   ALLOWED_OBJECT_STORE_OVERRIDES = %w[bucket enabled proxy_download cdn].freeze
 
   # To ensure the one Workhorse credential matches the Rails config, we
@@ -13,9 +12,9 @@ class ObjectStoreSettings
   # the future.
   WORKHORSE_ACCELERATED_TYPES = SUPPORTED_TYPES - %w[pages]
 
-  # pages and ci_secure_files may be enabled but use legacy disk storage
+  # pages may be enabled but use legacy disk storage
   # we don't need to raise an error in that case
-  ALLOWED_INCOMPLETE_TYPES = %w[pages ci_secure_files].freeze
+  ALLOWED_INCOMPLETE_TYPES = %w[pages].freeze
 
   attr_accessor :settings
 

spec/config/object_store_settings_spec.rb

@@ -25,7 +25,6 @@
           'artifacts' => { 'enabled' => true },
           'external_diffs' => { 'enabled' => false },
           'pages' => { 'enabled' => true },
-          'ci_secure_files' => { 'enabled' => true },
           'object_store' => {
             'enabled' => true,
             'connection' => connection,
@@ -149,13 +148,6 @@
         expect(settings.pages['object_store']).to eq(nil)
       end
 
-      it 'does not raise error if ci_secure_files config is missing' do
-        config['object_store']['objects'].delete('ci_secure_files')
-
-        expect { subject }.not_to raise_error
-        expect(settings.ci_secure_files['object_store']).to eq(nil)
-      end
-
       context 'GitLab Pages' do
         let(:pages_connection) { { 'provider' => 'Google', 'google_application_default' => true } }
 
@@ -203,28 +195,6 @@
         end
       end
 
-      context 'when object storage is disabled for ci_secure_files with no bucket' do
-        before do
-          config['ci_secure_files'] = {
-            'enabled' => true,
-            'object_store' => {}
-          }
-          config['object_store']['objects']['ci_secure_files'] = {
-            'enabled' => false
-          }
-        end
-
-        it 'does not enable consolidated settings for ci_secure_files' do
-          subject
-
-          expect(settings.ci_secure_files['enabled']).to be true
-          expect(settings.ci_secure_files['object_store']['remote_directory']).to be_nil
-          expect(settings.ci_secure_files['object_store']['bucket_prefix']).to be_nil
-          expect(settings.ci_secure_files['object_store']['enabled']).to be_falsey
-          expect(settings.ci_secure_files['object_store']['consolidated_settings']).to be_falsey
-        end
-      end
-
       context 'with legacy config' do
         let(:legacy_settings) do
           {