Skip to content

Commit 9ea4504

Browse files
committed
new try
1 parent 71315d4 commit 9ea4504

File tree

2 files changed

+8
-12
lines changed

2 files changed

+8
-12
lines changed

lib/cloud_controller/blobstore/storage_cli/storage_cli_client.rb

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,18 +13,20 @@ class StorageCliClient < BaseClient
1313
@registry = {}
1414

1515
class << self
16+
attr_reader :registry
17+
1618
def register(provider, klass)
17-
@registry[provider] = klass
19+
registry[provider] = klass
1820
end
1921

2022
def build(connection_config:, directory_key:, root_dir:, min_size: nil, max_size: nil)
2123
provider = connection_config[:provider]
2224
raise 'Missing connection_config[:provider]' if provider.nil?
2325

24-
impl_class = @registry[provider]
26+
impl_class = registry[provider]
2527
raise "No storage CLI client registered for provider #{provider}" unless impl_class
2628

27-
impl_class.new(connection_config:, directory_key:, root_dir:, min_size:, max_size:, fork:)
29+
impl_class.new(connection_config:, directory_key:, root_dir:, min_size:, max_size:)
2830
end
2931
end
3032

spec/unit/lib/cloud_controller/blobstore/storage_cli/storage_cli_client_spec.rb

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,13 @@
11
require 'spec_helper'
2-
require_relative '../client_shared'
2+
require 'cloud_controller/blobstore/storage_cli/azure_storage_cli_client'
33

44
module CloudController
55
module Blobstore
66
RSpec.describe StorageCliClient do
77
describe 'registry build and lookup' do
8-
class DummyClient < StorageCliClient
9-
def initialize(*); end
10-
end
11-
12-
before { StorageCliClient.register('DummyProvider', DummyClient) }
13-
148
it 'builds the correct client' do
15-
client_from_registry = StorageCliClient.build(connection_config: { provider: 'DummyProvider' }, directory_key: 'dummy-key', root_dir: 'dummy-root')
16-
expect(client_from_registry).to be_a(DummyClient)
9+
client_from_registry = StorageCliClient.build(connection_config: { provider: 'AzureRM' }, directory_key: 'dummy-key', root_dir: 'dummy-root')
10+
expect(client_from_registry).to be_a(AzureStorageCliClient)
1711
end
1812

1913
it 'raises an error for an unregistered provider' do

0 commit comments

Comments
 (0)