diff options
Diffstat (limited to 'spec/support/helpers/stub_object_storage.rb')
| -rw-r--r-- | spec/support/helpers/stub_object_storage.rb | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/spec/support/helpers/stub_object_storage.rb b/spec/support/helpers/stub_object_storage.rb index dba3d2b137e..dc54a21d0fa 100644 --- a/spec/support/helpers/stub_object_storage.rb +++ b/spec/support/helpers/stub_object_storage.rb @@ -22,6 +22,16 @@ module StubObjectStorage background_upload: false, direct_upload: false ) + new_config = config.to_h.deep_symbolize_keys.merge({ + enabled: enabled, + proxy_download: proxy_download, + background_upload: background_upload, + direct_upload: direct_upload + }) + + # Needed for ObjectStorage::Config compatibility + allow(config).to receive(:to_hash).and_return(new_config) + allow(config).to receive(:to_h).and_return(new_config) allow(config).to receive(:enabled) { enabled } allow(config).to receive(:proxy_download) { proxy_download } allow(config).to receive(:background_upload) { background_upload } @@ -84,13 +94,6 @@ module StubObjectStorage def stub_terraform_state_object_storage(**params) stub_object_storage_uploader(config: Gitlab.config.terraform_state.object_store, - uploader: Terraform::VersionedStateUploader, - remote_directory: 'terraform', - **params) - end - - def stub_terraform_state_version_object_storage(**params) - stub_object_storage_uploader(config: Gitlab.config.terraform_state.object_store, uploader: Terraform::StateUploader, remote_directory: 'terraform', **params) |