Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@ gem 'actionview', '~> 8.1.3'
gem 'activemodel', '~> 8.1.2'
gem 'railties', '~> 8.1.1'

gem 'fog-aliyun'
gem 'fog-aws'
gem 'fog-core', '~> 2.6.0'
gem 'fog-google', '~> 1.29.4'
Expand Down
21 changes: 0 additions & 21 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,6 @@ GEM
uri (>= 0.13.1)
addressable (2.9.0)
public_suffix (>= 2.0.2, < 8.0)
aliyun-sdk (0.8.0)
nokogiri (~> 1.6)
rest-client (~> 2.0)
ast (2.4.3)
backport (1.2.0)
base64 (0.3.0)
Expand Down Expand Up @@ -93,13 +90,6 @@ GEM
fluent-logger (0.10.0)
logger (~> 1.6)
msgpack (>= 1.0.0, < 2)
fog-aliyun (0.4.1)
addressable (>= 2.8, < 2.10)
aliyun-sdk (~> 0.8.0)
fog-core
fog-json
ipaddress (~> 0.8)
xml-simple (~> 1.1)
fog-aws (3.33.2)
base64 (>= 0.2, < 0.4)
fog-core (~> 2.6)
Expand Down Expand Up @@ -191,15 +181,13 @@ GEM
google-protobuf (>= 3.25, < 5.0)
googleapis-common-protos-types (~> 1.0)
hashdiff (1.2.1)
http-accept (1.7.0)
http-cookie (1.1.6)
domain_name (~> 0.5)
httpclient (2.9.0)
mutex_m
i18n (1.14.8)
concurrent-ruby (~> 1.0)
io-console (0.8.2)
ipaddress (0.8.3)
irb (1.18.0)
pp (>= 0.6.0)
prism (>= 1.3.0)
Expand Down Expand Up @@ -250,7 +238,6 @@ GEM
mysql2 (0.5.7)
bigdecimal
netaddr (2.0.6)
netrc (0.11.0)
newrelic_rpm (10.5.0)
logger
nio4r (2.7.5)
Expand Down Expand Up @@ -350,11 +337,6 @@ GEM
declarative (< 0.1.0)
trailblazer-option (>= 0.1.1, < 0.2.0)
uber (< 0.2.0)
rest-client (2.1.0)
http-accept (>= 1.7.0, < 2.0)
http-cookie (>= 1.0.2, < 2.0)
mime-types (>= 1.16, < 4.0)
netrc (~> 0.8)
retriable (3.8.0)
reverse_markdown (3.0.2)
nokogiri
Expand Down Expand Up @@ -521,8 +503,6 @@ GEM
crack (>= 0.3.2)
hashdiff (>= 0.4.0, < 2.0.0)
webrick (1.9.2)
xml-simple (1.1.9)
rexml
yard (0.9.44)
yard-activesupport-concern (0.0.1)
yard (>= 0.8)
Expand Down Expand Up @@ -550,7 +530,6 @@ DEPENDENCIES
debug (~> 1.11)
digest-xxhash
fluent-logger
fog-aliyun
fog-aws
fog-core (~> 2.6.0)
fog-google (~> 1.29.4)
Expand Down
1 change: 0 additions & 1 deletion lib/cloud_controller/blobstore/fog/providers.rb
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
original = Fog::Logger[:deprecation]
Fog::Logger[:deprecation] = nil

require 'fog/aliyun'
require 'fog/aws'
require 'fog/local'
require 'fog/google'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ class StorageCliClient < BaseClient

# DEPRECATED: Legacy fog provider names (remove after migration window)
LEGACY_PROVIDER_TO_STORAGE_CLI_TYPE = {
'aliyun' => 'alioss',
'AzureRM' => 'azurebs',
'AWS' => 's3',
'Google' => 'gcs'
# 'webdav' => 'dav', # intentionally not enabled yet
Expand All @@ -34,6 +34,7 @@ def initialize(directory_key:, resource_type:, root_dir:, min_size: nil, max_siz
config_file_path = config_path_for(resource_type)
cfg = fetch_config(resource_type)

# Get provider field (can contain either fog name or storage-cli type)
provider = cfg['provider']&.to_s
raise BlobstoreError.new("No provider specified in config file: #{File.basename(config_file_path)}") if provider.nil? || provider.empty?

Expand Down
Loading