Introduce general abstraction for storage clis

Author: johha

lib/cloud_controller/blobstore/cli/azure_blob.rb

@@ -1,10 +1,10 @@
 require 'cloud_controller/blobstore/client'
 require 'cloud_controller/blobstore/retryable_client'
 require 'cloud_controller/blobstore/fog/fog_client'
-require 'cloud_controller/blobstore/fog/error_handling_client'
+require 'cloud_controller/blobstore/error_handling_client'
 require 'cloud_controller/blobstore/webdav/dav_client'
 require 'cloud_controller/blobstore/safe_delete_client'
-require 'cloud_controller/blobstore/cli/azure_cli_client'
+require 'cloud_controller/blobstore/storage_cli/storage_cli_client'
 require 'google/apis/errors'
 
 module CloudController
@@ -13,8 +13,11 @@ class ClientProvider
       def self.provide(options:, directory_key:, root_dir: nil, resource_type: nil)
         if options[:blobstore_type].blank? || (options[:blobstore_type] == 'fog')
           provide_fog(options, directory_key, root_dir)
-        elsif options[:blobstore_type] == 'cli'
-          provide_azure_cli(options, directory_key, root_dir)
+        elsif options[:blobstore_type] == 'storage-cli'
+          provide_storage_cli(options, directory_key, root_dir)
+        elsif options[:blobstore_type] == 'storage-cli-fork'
+          # Just for testing not yet merged features in bosh-azure-cli
+          provide_storage_cli(options, directory_key, root_dir, fork: true)
         else
           provide_webdav(options, directory_key, root_dir)
         end
@@ -69,18 +72,17 @@ def provide_webdav(options, directory_key, root_dir)
           Client.new(SafeDeleteClient.new(retryable_client, root_dir))
         end
 
-        def provide_azure_cli(options, directory_key, root_dir)
+        def provide_storage_cli(options, directory_key, root_dir, fork: false)
+          client = StorageCliClient.build(fog_connection: options.fetch(:fog_connection),
+                                          directory_key: directory_key,
+                                          root_dir: root_dir,
+                                          min_size: options[:minimum_size],
+                                          max_size: options[:maximum_size],
+                                          fork: fork)
 
-          client = AzureCliClient.new(fog_connection: options.fetch(:fog_connection),
-                                      directory_key: directory_key,
-                                      root_dir: root_dir,
-                                      min_size: options[:minimum_size],
-                                      max_size: options[:maximum_size],
-                                      )
-
-          logger = Steno.logger('cc.blobstore.azure_cli')
+          logger = Steno.logger('cc.blobstore.storage_cli_client')
           errors = [StandardError]
-          retryable_client = RetryableClient.new(client: client, errors: errors, logger: logger)
+          retryable_client = RetryableClient.new(client:, errors:, logger:)
 
           Client.new(SafeDeleteClient.new(retryable_client, root_dir))
         end

lib/cloud_controller/blobstore/cli/azure_cli_client.rb

@@ -0,0 +1,20 @@
+module CloudController
+  module Blobstore
+    class AzureStorageCliClient < StorageCliClient
+      StorageCliClient.register('AzureRM', CloudController::Blobstore::AzureStorageCliClient)
+
+      def cli_path
+        ENV['AZURE_STORAGE_CLI_PATH'] || '/var/vcap/packages/azure-storage-cli/bin/azure-storage-cli'
+      end
+
+      def build_config(fog_connection)
+        {
+          account_name: fog_connection[:azure_storage_account_name],
+          account_key: fog_connection[:azure_storage_access_key],
+          container_name: @directory_key,
+          environment: fog_connection[:environment]
+        }.compact
+      end
+    end
+  end
+end

lib/cloud_controller/blobstore/client_provider.rb

@@ -0,0 +1,43 @@
+module CloudController
+  module Blobstore
+    class StorageCliBlob < Blob
+      attr_reader :key
+
+      def initialize(key, properties: nil, signed_url: nil)
+        @key = key
+        @signed_url = signed_url if signed_url
+        # Set properties to an empty hash if nil to avoid nil errors
+        @properties = properties || {}
+      end
+
+      def internal_download_url
+        signed_url
+      end
+
+      def public_download_url
+        signed_url
+      end
+
+      def attributes(*keys)
+        @attributes ||= {
+          etag: @properties.fetch('etag', nil),
+          last_modified: @properties.fetch('last_modified', nil),
+          content_length: @properties.fetch('content_length', nil),
+          created_at: @properties.fetch('created_at', nil)
+        }
+
+        return @attributes if keys.empty?
+
+        @attributes.select { |key, _| keys.include? key }
+      end
+
+      private
+
+      def signed_url
+        raise BlobstoreError.new('StorageCliBlob not configured with a signed URL') unless @signed_url
+
+        @signed_url
+      end
+    end
+  end
+end