From 9539b2e0afc9bae95d2907dd0d922ae98d10b1fd Mon Sep 17 00:00:00 2001
From: Darby Frey <dfrey@gitlab.com>
Date: Wed, 31 May 2023 15:43:23 -0500
Subject: [PATCH] Adding secure files settings to consolidated object storage

The consolidated object storage configuration now supports Secure Files.

Changelog: changed
MR: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/122250
---
 config/object_store_settings.rb           |  2 +-
 spec/config/object_store_settings_spec.rb | 12 ++++++++++++
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/config/object_store_settings.rb b/config/object_store_settings.rb
index 615b13d59caafe..9cc037d04a8067 100644
--- a/config/object_store_settings.rb
+++ b/config/object_store_settings.rb
@@ -2,7 +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 secure_files).freeze
+  SUPPORTED_TYPES = %w(artifacts external_diffs lfs uploads packages dependency_proxy terraform_state pages ci_secure_files).freeze
   ALLOWED_OBJECT_STORE_OVERRIDES = %w(bucket enabled proxy_download cdn).freeze
 
   # To ensure the one Workhorse credential matches the Rails config, we
diff --git a/spec/config/object_store_settings_spec.rb b/spec/config/object_store_settings_spec.rb
index b8e46affc2a543..0689dc130d9524 100644
--- a/spec/config/object_store_settings_spec.rb
+++ b/spec/config/object_store_settings_spec.rb
@@ -25,6 +25,7 @@
           'artifacts' => { 'enabled' => true },
           'external_diffs' => { 'enabled' => false },
           'pages' => { 'enabled' => true },
+          'ci_secure_files' => { 'enabled' => true },
           'object_store' => {
             'enabled' => true,
             'connection' => connection,
@@ -43,6 +44,9 @@
               },
               'pages' => {
                 'bucket' => 'pages'
+              },
+              'ci_secure_files' => {
+                'bucket' => 'ci_secure_files'
               }
             }
           }
@@ -97,6 +101,14 @@
         expect(settings.external_diffs['enabled']).to be false
         expect(settings.external_diffs['object_store']).to be_nil
         expect(settings.external_diffs).to eq(settings['external_diffs'])
+
+        expect(settings.ci_secure_files['enabled']).to be true
+        expect(settings.ci_secure_files['object_store']['enabled']).to be true
+        expect(settings.ci_secure_files['object_store']['connection'].to_hash).to eq(connection)
+        expect(settings.ci_secure_files['object_store']['remote_directory']).to eq('ci_secure_files')
+        expect(settings.ci_secure_files['object_store']['bucket_prefix']).to eq(nil)
+        expect(settings.ci_secure_files['object_store']['consolidated_settings']).to be true
+        expect(settings.ci_secure_files).to eq(settings['ci_secure_files'])
       end
 
       it 'supports bucket prefixes' do
-- 
GitLab