Skip to content

Commit b108e2e

Browse files
committed
take AzureRM for consistency
1 parent 2596e92 commit b108e2e

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

lib/cloud_controller/blobstore/storage_cli/azure_storage_cli_client.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ def cli_path
55
ENV['AZURE_STORAGE_CLI_PATH'] || '/var/vcap/packages/azure-storage-cli/bin/azure-storage-cli'
66
end
77

8-
CloudController::Blobstore::StorageCliClient.register('azure', AzureStorageCliClient)
8+
CloudController::Blobstore::StorageCliClient.register('AzureRM', AzureStorageCliClient)
99
end
1010
end
1111
end

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ module Blobstore
1010
RSpec.describe AzureStorageCliClient do
1111
let!(:tmp_cfg) do
1212
f = Tempfile.new(['storage_cli_config', '.json'])
13-
f.write({ provider: 'azure',
13+
f.write({ provider: 'AzureRM',
1414
account_name: 'some-account-name',
1515
account_key: 'some-access-key',
1616
container_name: directory_key,
@@ -82,8 +82,8 @@ module Blobstore
8282
end
8383

8484
it 'can be overridden by an environment variable' do
85-
allow(ENV).to receive(:[]).with('AZURE_STORAGE_CLI_PATH').and_return('/custom/path/to/azure-storage-cli')
86-
expect(client.cli_path).to eq('/custom/path/to/azure-storage-cli')
85+
allow(ENV).to receive(:[]).with('AZURE_STORAGE_CLI_PATH').and_return('/custom/path/to/AzureRM-storage-cli')
86+
expect(client.cli_path).to eq('/custom/path/to/AzureRM-storage-cli')
8787
end
8888
end
8989

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -156,8 +156,8 @@ def build_client(resource_type)
156156

157157
it 'raises when provider is missing from config file' do
158158
File.write(packages_cfg.path, {
159-
azure_storage_access_key: 'bommelkey',
160-
azure_storage_account_name: 'bommel',
159+
AzureRM_storage_access_key: 'bommelkey',
160+
AzureRM_storage_account_name: 'bommel',
161161
container_name: 'bommelcontainer',
162162
environment: 'BommelCloud'
163163
}.to_json)

0 commit comments

Comments
 (0)