Merge branch 's3-directories-get' into 'master'

Use directories.new when getting S3 directory

Closes gitlab-com/gl-infra/infrastructure#5807

See merge request gitlab-org/gitlab-ce!23981

3 files changed, 8 insertions, 2 deletions

diff --git a/changelogs/unreleased/s3-directories-get.yml b/changelogs/unreleased/s3-directories-get.yml
new file mode 100644
index 00000000000..9f76af2bb09
--- /dev/null
+++ b/changelogs/unreleased/s3-directories-get.yml
@@ -0,0 +1,6 @@
+---
+title: Allow 'rake gitlab:cleanup:remote_upload_files' to read bucket files without
+  having permissions to see all buckets.
+merge_request: 23981
+author:
+type: fixed
diff --git a/lib/gitlab/cleanup/remote_uploads.rb b/lib/gitlab/cleanup/remote_uploads.rb
index eba1faacc3a..03298d960a4 100644
--- a/lib/gitlab/cleanup/remote_uploads.rb
+++ b/lib/gitlab/cleanup/remote_uploads.rb
@@ -67,7 +67,7 @@ module Gitlab
       end
 
       def remote_directory
-        connection.directories.get(configuration['remote_directory'])
+        connection.directories.new(key: configuration['remote_directory'])
       end
 
       def connection
diff --git a/spec/lib/gitlab/cleanup/remote_uploads_spec.rb b/spec/lib/gitlab/cleanup/remote_uploads_spec.rb
index 8d03baeb07b..35642cd6e50 100644
--- a/spec/lib/gitlab/cleanup/remote_uploads_spec.rb
+++ b/spec/lib/gitlab/cleanup/remote_uploads_spec.rb
@@ -25,7 +25,7 @@ describe Gitlab::Cleanup::RemoteUploads do
 
       expect(::Fog::Storage).to receive(:new).and_return(connection)
 
-      expect(connection).to receive(:directories).and_return(double(get: directory))
+      expect(connection).to receive(:directories).and_return(double(new: directory))
       expect(directory).to receive(:files).and_return(remote_files)
     end