From 8eae64c90e20c1ef92d0a28b06134aad1a81425e Mon Sep 17 00:00:00 2001
From: Stan Hu <stanhu@gmail.com>
Date: Thu, 3 Dec 2020 19:18:04 -0800
Subject: [PATCH] Update fog-google to v1.12
This resolves an issue with the XML API, which uses the legacy, S3-style
tokens, not working: https://github.com/fog/fog-google/pull/508
This came up with a user attempting to use the cloud-native job logs:
https://gitlab.com/gitlab-org/gitlab/-/issues/273405.
Full list of changes:
https://github.com/fog/fog-google/compare/v1.11.0..v1.12.0
---
Gemfile | 2 +-
Gemfile.lock | 17 +++++++++--------
changelogs/unreleased/sh-update-fog-google.yml | 5 +++++
3 files changed, 15 insertions(+), 9 deletions(-)
create mode 100644 changelogs/unreleased/sh-update-fog-google.yml
diff --git a/Gemfile b/Gemfile
index 4439036135087..edff54dd220ad 100644
--- a/Gemfile
+++ b/Gemfile
@@ -119,7 +119,7 @@ gem 'fog-aws', '~> 3.7'
# 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'
-gem 'fog-google', '~> 1.11'
+gem 'fog-google', '~> 1.12'
gem 'fog-local', '~> 0.6'
gem 'fog-openstack', '~> 1.0'
gem 'fog-rackspace', '~> 0.1.1'
diff --git a/Gemfile.lock b/Gemfile.lock
index 8967edd1cf5f6..a6db8650a0d2a 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -222,7 +222,7 @@ GEM
debugger-ruby_core_source (1.3.8)
deckar01-task_list (2.3.1)
html-pipeline
- declarative (0.0.10)
+ declarative (0.0.20)
declarative-option (0.1.0)
default_value_for (3.3.0)
activerecord (>= 3.2.0, < 6.1)
@@ -373,11 +373,11 @@ GEM
excon (~> 0.58)
formatador (~> 0.2)
mime-types
- fog-google (1.11.0)
+ fog-google (1.12.0)
fog-core (<= 2.1.0)
fog-json (~> 1.2)
fog-xml (~> 0.1.0)
- google-api-client (>= 0.32, < 0.34)
+ google-api-client (>= 0.44.2, < 0.51)
google-cloud-env (~> 1.2)
fog-json (1.2.0)
fog-core
@@ -473,20 +473,21 @@ GEM
actionpack (>= 3.0)
multi_json
request_store (>= 1.0)
- google-api-client (0.33.2)
+ google-api-client (0.50.0)
addressable (~> 2.5, >= 2.5.1)
googleauth (~> 0.9)
httpclient (>= 2.8.1, < 3.0)
mini_mime (~> 1.0)
representable (~> 3.0)
retriable (>= 2.0, < 4.0)
+ rexml
signet (~> 0.12)
google-cloud-env (1.4.0)
faraday (>= 0.17.3, < 2.0)
google-protobuf (3.12.4)
googleapis-common-protos-types (1.0.5)
google-protobuf (~> 3.11)
- googleauth (0.12.0)
+ googleauth (0.14.0)
faraday (>= 0.17.3, < 2.0)
jwt (>= 1.4, < 3.0)
memoist (~> 0.16)
@@ -696,7 +697,7 @@ GEM
marginalia (1.9.0)
actionpack (>= 2.3)
activerecord (>= 2.3)
- memoist (0.16.0)
+ memoist (0.16.2)
memoizable (0.4.2)
thread_safe (~> 0.3, >= 0.3.1)
memory_profiler (0.9.14)
@@ -837,7 +838,7 @@ GEM
org-ruby (0.9.12)
rubypants (~> 0.2)
orm_adapter (0.5.0)
- os (1.0.0)
+ os (1.1.1)
parallel (1.19.2)
parser (2.7.2.0)
ast (~> 2.4.1)
@@ -1338,7 +1339,7 @@ DEPENDENCIES
fog-aliyun (~> 0.3)
fog-aws (~> 3.7)
fog-core (= 2.1.0)
- fog-google (~> 1.11)
+ fog-google (~> 1.12)
fog-local (~> 0.6)
fog-openstack (~> 1.0)
fog-rackspace (~> 0.1.1)
diff --git a/changelogs/unreleased/sh-update-fog-google.yml b/changelogs/unreleased/sh-update-fog-google.yml
new file mode 100644
index 0000000000000..e18d512d964a9
--- /dev/null
+++ b/changelogs/unreleased/sh-update-fog-google.yml
@@ -0,0 +1,5 @@
+---
+title: Update fog-google to v1.12
+merge_request: 49196
+author:
+type: fixed
--
GitLab