Skip to content

Commit d976299

Browse files
build(deps): bump fog-aws, fog-core and fog-google (#4375)
* build(deps): bump fog-aws, fog-core and fog-google Bumps [fog-aws](https://github.com/fog/fog-aws), [fog-core](https://github.com/fog/fog-core) and [fog-google](https://github.com/fog/fog-google). These dependencies needed to be updated together. Updates `fog-aws` from 3.28.0 to 3.32.0 - [Changelog](https://github.com/fog/fog-aws/blob/master/CHANGELOG.md) - [Commits](fog/fog-aws@v3.28.0...v3.32.0) Updates `fog-core` from 2.4.0 to 2.6.0 - [Changelog](https://github.com/fog/fog-core/blob/master/changelog.md) - [Commits](fog/fog-core@v2.4.0...v2.6.0) Updates `fog-google` from 1.24.1 to 1.25.0 - [Release notes](https://github.com/fog/fog-google/releases) - [Changelog](https://github.com/fog/fog-google/blob/master/CHANGELOG.md) - [Commits](fog/fog-google@v1.24.1...v1.25.0) --- updated-dependencies: - dependency-name: fog-aws dependency-version: 3.32.0 dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: fog-core dependency-version: 2.6.0 dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: fog-google dependency-version: 1.25.0 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> * Rename Fog::Storage::* to Fog::Google::* --------- Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Jochen Ehret <[email protected]>
1 parent 6e688bd commit d976299

File tree

3 files changed

+18
-17
lines changed

3 files changed

+18
-17
lines changed

Gemfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,8 @@ gem 'azure-storage-blob', git: 'https://github.com/sethboyles/azure-storage-ruby
5555
gem 'fog-aliyun'
5656
gem 'fog-aws'
5757
gem 'fog-azure-rm', git: 'https://github.com/fog/fog-azure-rm.git', branch: 'fog-arm-cf'
58-
gem 'fog-core', '~> 2.4.0'
59-
gem 'fog-google', '~> 1.24.1'
58+
gem 'fog-core', '~> 2.6.0'
59+
gem 'fog-google', '~> 1.25.0'
6060
gem 'fog-local'
6161
gem 'fog-openstack'
6262

Gemfile.lock

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,8 @@ GEM
145145
erb (5.0.1)
146146
erubi (1.13.1)
147147
eventmachine (1.2.7)
148-
excon (0.112.0)
148+
excon (1.2.7)
149+
logger
149150
faraday (0.17.6)
150151
multipart-post (>= 1.2, < 3)
151152
faraday-cookie_jar (0.0.7)
@@ -166,19 +167,19 @@ GEM
166167
fog-json
167168
ipaddress (~> 0.8)
168169
xml-simple (~> 1.1)
169-
fog-aws (3.28.0)
170+
fog-aws (3.32.0)
170171
base64 (~> 0.2.0)
171-
fog-core (~> 2.1)
172+
fog-core (~> 2.6)
172173
fog-json (~> 1.1)
173174
fog-xml (~> 0.1)
174-
fog-core (2.4.0)
175+
fog-core (2.6.0)
175176
builder
176-
excon (~> 0.71)
177+
excon (~> 1.0)
177178
formatador (>= 0.2, < 2.0)
178179
mime-types
179-
fog-google (1.24.1)
180+
fog-google (1.25.0)
180181
addressable (>= 2.7.0)
181-
fog-core (< 2.5)
182+
fog-core (~> 2.5)
182183
fog-json (~> 1.2)
183184
fog-xml (~> 0.1.0)
184185
google-apis-compute_v1 (~> 0.53)
@@ -197,7 +198,7 @@ GEM
197198
fog-openstack (1.1.5)
198199
fog-core (~> 2.1)
199200
fog-json (>= 1.0)
200-
fog-xml (0.1.4)
201+
fog-xml (0.1.5)
201202
fog-core
202203
nokogiri (>= 1.5.11, < 2.0.0)
203204
formatador (1.1.0)
@@ -285,7 +286,7 @@ GEM
285286
addressable (~> 2.8)
286287
bigdecimal (~> 3.1)
287288
json_pure (2.8.1)
288-
jwt (2.8.1)
289+
jwt (2.10.1)
289290
base64
290291
kramdown (2.5.1)
291292
rexml (>= 3.3.9)
@@ -315,7 +316,7 @@ GEM
315316
mime-types (3.7.0)
316317
logger
317318
mime-types-data (~> 3.2025, >= 3.2025.0507)
318-
mime-types-data (3.2025.0507)
319+
mime-types-data (3.2025.0527)
319320
mini_mime (1.1.5)
320321
mini_portile2 (2.8.9)
321322
minitest (5.25.5)
@@ -333,7 +334,7 @@ GEM
333334
msgpack (1.7.2)
334335
multi_json (1.15.0)
335336
multipart-parser (0.1.1)
336-
multipart-post (2.4.0)
337+
multipart-post (2.4.1)
337338
mustache (1.1.1)
338339
mustermann (3.0.0)
339340
ruby2_keywords (~> 0.0.1)
@@ -525,7 +526,7 @@ GEM
525526
pg (>= 0.18.0, != 1.2.0)
526527
sequel (>= 4.38.0)
527528
sexp_processor (4.7.0)
528-
signet (0.19.0)
529+
signet (0.20.0)
529530
addressable (~> 2.8)
530531
faraday (>= 0.17.5, < 3.a)
531532
jwt (>= 1.5, < 3.0)
@@ -638,8 +639,8 @@ DEPENDENCIES
638639
fog-aliyun
639640
fog-aws
640641
fog-azure-rm!
641-
fog-core (~> 2.4.0)
642-
fog-google (~> 1.24.1)
642+
fog-core (~> 2.6.0)
643+
fog-google (~> 1.25.0)
643644
fog-local
644645
fog-openstack
645646
googleapis-common-protos (>= 1.8.0)

lib/cloud_controller/blobstore/fog/fog_client.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ def formatted_storage_options
146146
opts['x-amz-server-side-encryption'] = encrypt_opt
147147
opts
148148

149-
elsif [Fog::Storage::GoogleJSON, Fog::Storage::GoogleXML].include?(connection.service)
149+
elsif [Fog::Google::StorageJSON, Fog::Google::StorageXML].include?(connection.service)
150150
return {} unless @gcp_storage_options
151151

152152
@gcp_storage_options

0 commit comments

Comments
 (0)