From 794396b661f5a3a72ea48a9bce2eb7eeeb7499a4 Mon Sep 17 00:00:00 2001
From: Stan Hu <stanhu@gmail.com>
Date: Tue, 2 Mar 2021 08:54:45 -0800
Subject: [PATCH] Update fog-aws to v3.9.0

CHANGELOG:
https://github.com/fog/fog-aws/blob/master/CHANGELOG.md

Diff: https://github.com/fog/fog-aws/compare/v3.8.0..v3.9.0

This fixes a case-sensitivity issue that caused issues with some S3
providers or ones in front of a load balancer:
https://gitlab.com/gitlab-org/gitlab/-/issues/261667

This also fixes an issue with IRSA session names not being generated
automatically:
https://gitlab.com/gitlab-org/charts/gitlab/-/issues/1832
---
 Gemfile                                         | 2 +-
 Gemfile.lock                                    | 4 ++--
 changelogs/unreleased/sh-update-fog-aws-3-9.yml | 5 +++++
 3 files changed, 8 insertions(+), 3 deletions(-)
 create mode 100644 changelogs/unreleased/sh-update-fog-aws-3-9.yml

diff --git a/Gemfile b/Gemfile
index 3eb4b3e09ba9c..dbeda69ef981f 100644
--- a/Gemfile
+++ b/Gemfile
@@ -113,7 +113,7 @@ gem 'carrierwave', '~> 1.3'
 gem 'mini_magick', '~> 4.10.1'
 
 # for backups
-gem 'fog-aws', '~> 3.8'
+gem 'fog-aws', '~> 3.9'
 # Locked until fog-google resolves https://github.com/fog/fog-google/issues/421.
 # Also see config/initializers/fog_core_patch.rb.
 gem 'fog-core', '= 2.1.0'
diff --git a/Gemfile.lock b/Gemfile.lock
index 3309a3176459c..5e06975ec8745 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -363,7 +363,7 @@ GEM
       fog-json
       ipaddress (~> 0.8)
       xml-simple (~> 1.1)
-    fog-aws (3.8.0)
+    fog-aws (3.9.0)
       fog-core (~> 2.1)
       fog-json (~> 1.1)
       fog-xml (~> 0.1)
@@ -1356,7 +1356,7 @@ DEPENDENCIES
   flipper-active_support_cache_store (~> 0.17.1)
   flowdock (~> 0.7)
   fog-aliyun (~> 0.3)
-  fog-aws (~> 3.8)
+  fog-aws (~> 3.9)
   fog-core (= 2.1.0)
   fog-google (~> 1.12)
   fog-local (~> 0.6)
diff --git a/changelogs/unreleased/sh-update-fog-aws-3-9.yml b/changelogs/unreleased/sh-update-fog-aws-3-9.yml
new file mode 100644
index 0000000000000..86d5a3ef14570
--- /dev/null
+++ b/changelogs/unreleased/sh-update-fog-aws-3-9.yml
@@ -0,0 +1,5 @@
+---
+title: Update fog-aws to v3.9.0
+merge_request: 55528
+author:
+type: fixed
-- 
GitLab