From ee664acb356f8123f4f6b00b73c1e1cf0866c7fb Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Thu, 20 Oct 2022 09:40:42 +0000 Subject: Add latest changes from gitlab-org/gitlab@15-5-stable-ee --- spec/config/object_store_settings_spec.rb | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) (limited to 'spec/config') diff --git a/spec/config/object_store_settings_spec.rb b/spec/config/object_store_settings_spec.rb index 8ddb5652dae..9275c809550 100644 --- a/spec/config/object_store_settings_spec.rb +++ b/spec/config/object_store_settings_spec.rb @@ -113,6 +113,27 @@ RSpec.describe ObjectStoreSettings do expect(settings.lfs['object_store']['bucket_prefix']).to eq('lfs') end + context 'with Google CDN enabled' do + let(:cdn_config) do + { + 'provider' => 'Google', + 'url' => 'https://cdn.example.org', + 'key_name' => 'stanhu-key', + 'key' => Base64.urlsafe_encode64(SecureRandom.hex) + } + end + + before do + config['object_store']['objects']['artifacts']['cdn'] = cdn_config + end + + it 'populates artifacts CDN config' do + subject + + expect(settings.artifacts['object_store']['cdn']).to eq(cdn_config) + end + end + it 'raises an error when a bucket is missing' do config['object_store']['objects']['lfs'].delete('bucket') -- cgit v1.2.3