Skip to content

Add WebDAV support to storage-cli client and improve test quality #4974

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
kathap wants to merge 1 commit into
base: main
Choose a base branch
from
+230 −179
Open

Add WebDAV support to storage-cli client and improve test quality #4974

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 4 additions & 8 deletions lib/cloud_controller/blobstore/storage_cli/storage_cli_client.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,16 +17,16 @@ class StorageCliClient < BaseClient
'resource_pool' => :storage_cli_config_file_resource_pool
}.freeze

# Native storage-cli type names supported by CC (dav intentionally excluded for now)
STORAGE_CLI_TYPES = %w[azurebs alioss s3 gcs].freeze
# Native storage-cli type names supported by CC
STORAGE_CLI_TYPES = %w[azurebs alioss s3 gcs dav].freeze

# DEPRECATED: Legacy fog provider names (remove after migration window)
LEGACY_PROVIDER_TO_STORAGE_CLI_TYPE = {
'AzureRM' => 'azurebs',
'aliyun' => 'alioss',
'AWS' => 's3',
'Google' => 'gcs'
# 'webdav' => 'dav', # intentionally not enabled yet
'Google' => 'gcs',
'webdav' => 'dav'
}.freeze

def initialize(directory_key:, resource_type:, root_dir:, min_size: nil, max_size: nil)
Expand All @@ -39,10 +39,6 @@ def initialize(directory_key:, resource_type:, root_dir:, min_size: nil, max_siz
provider = cfg['provider']&.to_s
raise BlobstoreError.new("No provider specified in config file: #{File.basename(config_file_path)}") if provider.nil? || provider.empty?

# Explicitly block unfinished webdav storage-cli support to avoid confusion and wasted effort on debugging
# unsupported providers. Remove this check when webdav support is added.
raise "provider '#{provider}' is not supported yet" if %w[webdav dav].include?(provider)

@storage_type =
if STORAGE_CLI_TYPES.include?(provider)
provider
Expand Down
Loading
Loading