Add latest changes from gitlab-org/gitlab@13-2-stable-ee

1 files changed, 20 insertions, 6 deletions

diff --git a/spec/support/helpers/stub_object_storage.rb b/spec/support/helpers/stub_object_storage.rb
index b473cdaefc1..6056359d026 100644
--- a/spec/support/helpers/stub_object_storage.rb
+++ b/spec/support/helpers/stub_object_storage.rb
@@ -1,6 +1,25 @@
 # frozen_string_literal: true
 
 module StubObjectStorage
+  def stub_packages_object_storage(**params)
+    stub_object_storage_uploader(config: ::Gitlab.config.packages.object_store,
+                                  uploader: ::Packages::PackageFileUploader,
+                                  remote_directory: 'packages',
+                                  **params)
+  end
+
+  def stub_dependency_proxy_object_storage(**params)
+    stub_object_storage_uploader(config: ::Gitlab.config.dependency_proxy.object_store,
+                                  uploader: ::DependencyProxy::FileUploader,
+                                  remote_directory: 'dependency_proxy',
+                                  **params)
+  end
+
+  def stub_object_storage_pseudonymizer
+    stub_object_storage(connection_params: Pseudonymizer::Uploader.object_store_credentials,
+                        remote_directory: Pseudonymizer::Uploader.remote_directory)
+  end
+
   def stub_object_storage_uploader(
         config:,
         uploader:,
@@ -73,7 +92,7 @@ module StubObjectStorage
   def stub_terraform_state_object_storage(uploader = described_class, **params)
     stub_object_storage_uploader(config: Gitlab.config.terraform_state.object_store,
                                  uploader: uploader,
-                                 remote_directory: 'terraform_state',
+                                 remote_directory: 'terraform',
                                  **params)
   end
 
@@ -89,8 +108,3 @@ module StubObjectStorage
       EOS
   end
 end
-
-require_relative '../../../ee/spec/support/helpers/ee/stub_object_storage' if
-  Dir.exist?("#{__dir__}/../../../ee")
-
-StubObjectStorage.prepend_if_ee('EE::StubObjectStorage')