From 7bb4923edae9a1117c8e05d4a9a6e02dca02adf6 Mon Sep 17 00:00:00 2001 From: Darby Frey Date: Wed, 7 Jun 2023 08:33:14 -0500 Subject: [PATCH] Revert adding ci_secure_files to consolidated object storage Adding ci_secure_files to consolidated object storage would be a breaking change, so this change will be delayed until the 17.0 release. Changelog: changed MR: --- config/object_store_settings.rb | 2 +- spec/config/object_store_settings_spec.rb | 9 --------- 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/config/object_store_settings.rb b/config/object_store_settings.rb index 9cc037d04a8067..22194d8c2de406 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 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 diff --git a/spec/config/object_store_settings_spec.rb b/spec/config/object_store_settings_spec.rb index 0689dc130d9524..14995e2934eb0a 100644 --- a/spec/config/object_store_settings_spec.rb +++ b/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, @@ -101,14 +100,6 @@ 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