build(deps): bump fog-core from 2.1.2 to 2.4.0 (#3744)

* build(deps): bump fog-core from 2.1.2 to 2.4.0

Bumps [fog-core](https://github.com/fog/fog-core) from 2.1.2 to 2.4.0.
- [Changelog](https://github.com/fog/fog-core/blob/master/changelog.md)
- [Commits](fog/fog-core@v2.1.2...v2.4.0)

---
updated-dependencies:
- dependency-name: fog-core
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>

* Remove fog aliyun hack

Seems to be no longer needed with fog-core >= 2.3.0

References:
- fog/fog-core#269
- fog/fog-aliyun#155

---------

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Johannes Haass <[email protected]>

Gemfile

@@ -56,7 +56,7 @@ gem 'azure-storage-blob', git: 'https://github.com/sethboyles/azure-storage-ruby
 gem 'fog-aliyun'
 gem 'fog-aws'
 gem 'fog-azure-rm', git: 'https://github.com/fog/fog-azure-rm.git', branch: 'fog-arm-cf'
-gem 'fog-core', '~> 2.1.2'
+gem 'fog-core', '~> 2.4.0'
 gem 'fog-google', '~> 1.24.1'
 gem 'fog-local'
 gem 'fog-openstack'

Gemfile.lock

@@ -181,10 +181,10 @@ GEM
       fog-core (~> 2.1)
       fog-json (~> 1.1)
       fog-xml (~> 0.1)
-    fog-core (2.1.2)
+    fog-core (2.4.0)
       builder
-      excon (~> 0.58)
-      formatador (~> 0.2)
+      excon (~> 0.71)
+      formatador (>= 0.2, < 2.0)
       mime-types
     fog-google (1.24.1)
       addressable (>= 2.7.0)
@@ -210,7 +210,7 @@ GEM
     fog-xml (0.1.4)
       fog-core
       nokogiri (>= 1.5.11, < 2.0.0)
-    formatador (0.3.0)
+    formatador (1.1.0)
     google-apis-compute_v1 (0.86.0)
       google-apis-core (>= 0.11.0, < 2.a)
     google-apis-core (0.11.3)
@@ -611,7 +611,7 @@ DEPENDENCIES
   fog-aliyun
   fog-aws
   fog-azure-rm!
-  fog-core (~> 2.1.2)
+  fog-core (~> 2.4.0)
   fog-google (~> 1.24.1)
   fog-local
   fog-openstack

lib/cloud_controller/blobstore/fog/providers.rb

@@ -7,9 +7,6 @@
 Fog::Logger[:deprecation] = nil
 
 require 'fog/aliyun'
-# Hack until https://github.com/fog/fog-aliyun/pull/155 is merged and released
-Fog::Aliyun::Compute = Fog::Compute::Aliyun
-
 require 'fog/aws'
 require 'fog/local'
 require 'fog/google'