fog-azure-rm 0.0.4 → 0.0.5

data/test/requests/resources/test_list_resource_groups.rb

@@ -4,28 +4,21 @@ require File.expand_path '../../test_helper', __dir__
 class TestListResourceGroups < Minitest::Test
   def setup
     @service = Fog::Resources::AzureRM.new(credentials)
-    client = @service.instance_variable_get(:@rmc)
-    @resource_groups = client.resource_groups
-    @promise = Concurrent::Promise.execute do
-    end
+    @client = @service.instance_variable_get(:@rmc)
+    @resource_groups = @client.resource_groups
   end
 
   def test_list_resource_group_success
-    mokced_response = ApiStub::Requests::Resources::ResourceGroup.list_resource_group_response
-    expected_response = Azure::ARM::Resources::Models::ResourceGroupListResult.serialize_object(mokced_response.body)['value']
-    @promise.stub :value!, mokced_response do
-      @resource_groups.stub :list, @promise do
-        assert_equal @service.list_resource_groups, expected_response
-      end
+    mocked_response = ApiStub::Requests::Resources::ResourceGroup.list_resource_group_response(@client)
+    @resource_groups.stub :list_as_lazy, mocked_response do
+      assert_equal @service.list_resource_groups, mocked_response.value
     end
   end
 
   def test_list_resource_group_failure
-    response = -> { fail MsRestAzure::AzureOperationError.new(nil, nil, 'error' => { 'message' => 'mocked exception' }) }
-    @promise.stub :value!, response do
-      @resource_groups.stub :list, @promise do
-        assert_raises(RuntimeError) { @service.list_resource_groups }
-      end
+    response = proc { raise MsRestAzure::AzureOperationError.new(nil, nil, 'error' => { 'message' => 'mocked exception' }) }
+    @resource_groups.stub :list_as_lazy, response do
+      assert_raises(Fog::AzureRm::OperationError) { @service.list_resource_groups }
     end
   end
 end

data/test/requests/resources/test_list_tagged_resources.rb

@@ -4,28 +4,21 @@ require File.expand_path '../../test_helper', __dir__
 class TestListTags < Minitest::Test
   def setup
     @service = Fog::Resources::AzureRM.new(credentials)
-    client = @service.instance_variable_get(:@rmc)
-    @resources = client.resources
-    @promise = Concurrent::Promise.execute do
-    end
+    @client = @service.instance_variable_get(:@rmc)
+    @resources = @client.resources
   end
 
   def test_list_tagged_resources_success
-    mokced_response = ApiStub::Requests::Resources::AzureResource.list_tagged_resources_response
-    expected_response = Azure::ARM::Resources::Models::ResourceListResult.serialize_object(mokced_response.body)['value']
-    @promise.stub :value!, mokced_response do
-      @resources.stub :list, @promise do
-        assert_equal @service.list_tagged_resources('test_key'), expected_response
-      end
+    mocked_response = ApiStub::Requests::Resources::AzureResource.list_tagged_resources_response(@client)
+    @resources.stub :list_as_lazy, mocked_response do
+      assert_equal @service.list_tagged_resources('test_key'), mocked_response.value
     end
   end
 
   def test_list_tagged_resources_failure
-    response = -> { raise MsRestAzure::AzureOperationError.new(nil, nil, 'error' => { 'message' => 'mocked exception' }) }
-    @promise.stub :value!, response do
-      @resources.stub :list, @promise do
-        assert_raises(RuntimeError) { @service.list_tagged_resources('test_key') }
-      end
+    response = proc { raise MsRestAzure::AzureOperationError.new(nil, nil, 'error' => { 'message' => 'mocked exception' }) }
+    @resources.stub :list_as_lazy, response do
+      assert_raises(Fog::AzureRm::OperationError) { @service.list_tagged_resources('test_key') }
     end
   end
 end

data/test/requests/resources/test_tag_resource.rb

@@ -4,42 +4,26 @@ require File.expand_path '../../test_helper', __dir__
 class TestTagResource < Minitest::Test
   def setup
     @service = Fog::Resources::AzureRM.new(credentials)
-    client = @service.instance_variable_get(:@rmc)
-    @resources = client.resources
+    @client = @service.instance_variable_get(:@rmc)
+    @resources = @client.resources
+    @resource_response = ApiStub::Requests::Resources::AzureResource.azure_resource_response(@client)
   end
 
   def test_tag_resource_success
-    mocked_response = ApiStub::Requests::Resources::AzureResource.azure_resource_response
-    promise_get = Concurrent::Promise.execute do
-    end
-    promise_create = Concurrent::Promise.execute do
-    end
-    promise_get.stub :value!, mocked_response do
-      @resources.stub :get, promise_get do
-        promise_create.stub :value!, mocked_response do
-          @resources.stub :create_or_update, promise_create do
-            resource_id = '/subscriptions/########-####-####-####-############/resourceGroups/{RESOURCE-GROUP}/providers/Microsoft.Network/{PROVIDER-NAME}/{RESOURCE-NAME}'
-            assert_equal @service.tag_resource(resource_id, 'tag_name', 'tag_value'), true
-          end
-        end
+    @resources.stub :get, @resource_response do
+      @resources.stub :create_or_update, @resource_response do
+        resource_id = '/subscriptions/########-####-####-####-############/resourceGroups/{RESOURCE-GROUP}/providers/Microsoft.Network/{PROVIDER-NAME}/{RESOURCE-NAME}'
+        assert_equal @service.tag_resource(resource_id, 'tag_name', 'tag_value'), true
       end
     end
   end
 
   def test_tag_resource_failure
-    response = -> { raise MsRestAzure::AzureOperationError.new(nil, nil, 'error' => { 'message' => 'mocked exception' }) }
-    promise_get = Concurrent::Promise.execute do
-    end
-    promise_create = Concurrent::Promise.execute do
-    end
-    promise_get.stub :value!, response do
-      @resources.stub :get, promise_get do
-        promise_create.stub :value!, response do
-          @resources.stub :create_or_update, promise_create do
-            resource_id = '/subscriptions/########-####-####-####-############/resourceGroups/{RESOURCE-GROUP}/providers/Microsoft.Network/{PROVIDER-NAME}/{RESOURCE-NAME}'
-            assert_raises(RuntimeError) { @service.tag_resource(resource_id, 'tag_name', 'tag_value') }
-          end
-        end
+    response = proc { raise MsRestAzure::AzureOperationError.new(nil, nil, 'error' => { 'message' => 'mocked exception' }) }
+    @resources.stub :get, @resource_response do
+      @resources.stub :create_or_update, response do
+        resource_id = '/subscriptions/########-####-####-####-############/resourceGroups/{RESOURCE-GROUP}/providers/Microsoft.Network/{PROVIDER-NAME}/{RESOURCE-NAME}'
+        assert_raises(Fog::AzureRm::OperationError) { @service.tag_resource(resource_id, 'tag_name', 'tag_value') }
       end
     end
   end

data/test/requests/storage/test_check_storage_account_name_availability.rb

@@ -1,26 +1,21 @@
 require File.expand_path '../../test_helper', __dir__
 
-# Storage Account Class
+# Test Class for Check Storage Account Request
 class TestCheckStorageAccountNameAvailability < Minitest::Test
   # This class posesses the test cases for the requests of storage account service.
   def setup
     @azure_credentials = Fog::Storage::AzureRM.new(credentials)
-    client = @azure_credentials.instance_variable_get(:@storage_mgmt_client)
-    @storage_accounts = client.storage_accounts
+    @storage_mgmt_client = @azure_credentials.instance_variable_get(:@storage_mgmt_client)
+    @storage_accounts = @storage_mgmt_client.storage_accounts
   end
 
   def test_check_storage_account_name_availability_success
     params = Azure::ARM::Storage::Models::StorageAccountCheckNameAvailabilityParameters.new
     params.name = 'teststorageaccount'
     params.type = 'Microsoft.Storage/storageAccounts'
-    mock_promise = Concurrent::Promise.execute do
-    end
-    true_case_response = ApiStub::Requests::Storage::StorageAccount.true_case_for_check_name_availability
-    result = ApiStub::Requests::Storage::StorageAccount.azure_operation_response(true_case_response)
-    mock_promise.stub :value!, result do
-      @storage_accounts.stub :check_name_availability, mock_promise do
-        assert_equal @azure_credentials.check_storage_account_name_availability(params), true
-      end
+    true_case_response = ApiStub::Requests::Storage::StorageAccount.true_case_for_check_name_availability(@storage_mgmt_client)
+    @storage_accounts.stub :check_name_availability, true_case_response do
+      assert_equal @azure_credentials.check_storage_account_name_availability(params), true
     end
   end
 
@@ -28,17 +23,11 @@ class TestCheckStorageAccountNameAvailability < Minitest::Test
     params = Azure::ARM::Storage::Models::StorageAccountCheckNameAvailabilityParameters.new
     params.name = 'teststorageaccount'
     params.type = 'Microsoft.Storage/storageAccounts'
-    mock_promise = Concurrent::Promise.execute do
-    end
-    false_case_response = ApiStub::Requests::Storage::StorageAccount.false_case_for_check_name_availability
-    result = ApiStub::Requests::Storage::StorageAccount
-             .azure_operation_response(false_case_response)
-    mock_promise.stub :value!, result do
-      @storage_accounts.stub :check_name_availability, mock_promise do
-        assert_equal @azure_credentials.check_storage_account_name_availability(params), false
-        assert_raises ArgumentError do
-          @azure_credentials.check_storage_account_name_availability(params, 'wrong arg')
-        end
+    false_case_response = ApiStub::Requests::Storage::StorageAccount.false_case_for_check_name_availability(@storage_mgmt_client)
+    @storage_accounts.stub :check_name_availability, false_case_response do
+      assert_equal @azure_credentials.check_storage_account_name_availability(params), false
+      assert_raises ArgumentError do
+        @azure_credentials.check_storage_account_name_availability(params, 'wrong arg')
       end
     end
   end
@@ -47,13 +36,9 @@ class TestCheckStorageAccountNameAvailability < Minitest::Test
     params = Azure::ARM::Storage::Models::StorageAccountCheckNameAvailabilityParameters.new
     params.name = 'teststorageaccount'
     params.type = 'Microsoft.Storage/storageAccounts'
-    raise_exception = -> { raise MsRestAzure::AzureOperationError.new(nil, nil, 'error' => { 'message' => 'mocked exception', 'code' => 'ResourceGroupNotFound' }) }
-    mock_promise = Concurrent::Promise.execute do
-    end
-    mock_promise.stub :value!, raise_exception do
-      @storage_accounts.stub :check_name_availability, mock_promise do
-        assert_raises(RuntimeError) { @azure_credentials.check_storage_account_name_availability(params) }
-      end
+    raise_exception = proc { raise MsRestAzure::AzureOperationError.new(nil, nil, 'error' => { 'message' => 'mocked exception', 'code' => 'ResourceGroupNotFound' }) }
+    @storage_accounts.stub :check_name_availability, raise_exception do
+      assert_raises(RuntimeError) { @azure_credentials.check_storage_account_name_availability(params) }
     end
   end
 end

data/test/requests/storage/test_create_storage_account.rb

@@ -1,56 +1,34 @@
 require File.expand_path '../../test_helper', __dir__
 
-# Create Storage Account Class
+# Test Class for Create Storage Account Request
 class TestCreateStorageAccount < Minitest::Test
   # This class posesses the test cases for the requests of storage account service.
   def setup
     @azure_credentials = Fog::Storage::AzureRM.new(credentials)
-    client = @azure_credentials.instance_variable_get(:@storage_mgmt_client)
-    @storage_accounts = client.storage_accounts
+    @storage_mgmt_client = @azure_credentials.instance_variable_get(:@storage_mgmt_client)
+    @storage_accounts = @storage_mgmt_client.storage_accounts
+    @storage_account_arguments = ApiStub::Requests::Storage::StorageAccount.storage_account_arguments
+    @storage_acc_obj = ApiStub::Requests::Storage::StorageAccount.storage_account_request(@storage_mgmt_client)
   end
 
   def test_create_storage_account_success
-    mock_promise = Concurrent::Promise.execute do
-    end
-    storage_acc_obj = ApiStub::Requests::Storage::StorageAccount.storage_account_request
-    properties = Azure::ARM::Storage::Models::StorageAccountPropertiesCreateParameters.new
-    properties.account_type = 'Standard_LRS' # This might change in the near future!
-    params = Azure::ARM::Storage::Models::StorageAccountCreateParameters.new
-    params.properties = properties
-    params.location = location
-    mock_promise.stub :value!, storage_acc_obj do
-      @storage_accounts.stub :create, mock_promise do
-        assert_equal @azure_credentials.create_storage_account('gateway-RG', 'fog_test_storage_account', params), Azure::ARM::Storage::Models::StorageAccount.serialize_object(storage_acc_obj.body)
-      end
+    @storage_accounts.stub :create, @storage_acc_obj do
+      assert_equal @azure_credentials.create_storage_account(@storage_account_arguments), @storage_acc_obj
     end
   end
 
   def test_create_storage_account_failure
-    mock_promise = Concurrent::Promise.execute do
-    end
-    storage_acc_obj = ApiStub::Requests::Storage::StorageAccount.create_storage_account
-    mock_promise.stub :value!, storage_acc_obj do
-      @storage_accounts.stub :create, mock_promise do
-        assert_raises ArgumentError do
-          @azure_credentials.create_storage_account('gateway-RG', 'fog_test_storage_account')
-        end
+    @storage_accounts.stub :create, @storage_acc_obj do
+      assert_raises ArgumentError do
+        @azure_credentials.create_storage_account
       end
     end
   end
 
   def test_create_storage_account_exception
-    properties = Azure::ARM::Storage::Models::StorageAccountPropertiesCreateParameters.new
-    properties.account_type = 'Standard_LRS' # This might change in the near future!
-    params = Azure::ARM::Storage::Models::StorageAccountCreateParameters.new
-    params.properties = properties
-    params.location = location
-    mock_promise = Concurrent::Promise.execute do
-    end
-    raise_exception = -> { fail MsRestAzure::AzureOperationError.new(nil, nil, 'error' => { 'message' => 'mocked exception' }) }
-    mock_promise.stub :value!, raise_exception do
-      @storage_accounts.stub :create, mock_promise do
-        assert_raises(RuntimeError) { @azure_credentials.create_storage_account('gateway-RG', 'fog_test_storage_account', params) }
-      end
+    raise_exception = proc { fail MsRestAzure::AzureOperationError.new(nil, nil, 'error' => { 'message' => 'mocked exception' }) }
+    @storage_accounts.stub :create, raise_exception do
+      assert_raises(RuntimeError) { @azure_credentials.create_storage_account(@storage_account_arguments) }
     end
   end
 end

data/test/requests/storage/test_delete_storage_account.rb

@@ -1,21 +1,17 @@
 require File.expand_path '../../test_helper', __dir__
 
-# Storage Account Class
+# Test Class for Delete Storage Account Request
 class TestDeleteStorageAccount < Minitest::Test
   # This class posesses the test cases for the requests of storage account service.
   def setup
     @azure_credentials = Fog::Storage::AzureRM.new(credentials)
-    client = @azure_credentials.instance_variable_get(:@storage_mgmt_client)
-    @storage_accounts = client.storage_accounts
-    @promise = Concurrent::Promise.execute do
-    end
+    storage_mgmt_client = @azure_credentials.instance_variable_get(:@storage_mgmt_client)
+    @storage_accounts = storage_mgmt_client.storage_accounts
   end
 
   def test_delete_storage_account_success
-    @promise.stub :value!, true do
-      @storage_accounts.stub :delete, @promise do
-        assert @azure_credentials.delete_storage_account('gateway-RG', 'fog_test_storage_account')
-      end
+    @storage_accounts.stub :delete, nil do
+      assert @azure_credentials.delete_storage_account('gateway-RG', 'fog_test_storage_account')
     end
   end
 
@@ -24,11 +20,9 @@ class TestDeleteStorageAccount < Minitest::Test
   end
 
   def test_delete_storage_account_exception
-    raise_exception = -> { fail MsRestAzure::AzureOperationError.new(nil, nil, 'error' => { 'message' => 'mocked exception' }) }
-    @promise.stub :value!, raise_exception do
-      @storage_accounts.stub :delete, @promise do
-        assert_raises(RuntimeError) { @azure_credentials.delete_storage_account('gateway-RG', 'fog_test_storage_account') }
-      end
+    raise_exception = proc { fail MsRestAzure::AzureOperationError.new(nil, nil, 'error' => { 'message' => 'mocked exception' }) }
+    @storage_accounts.stub :delete, raise_exception do
+      assert_raises(RuntimeError) { @azure_credentials.delete_storage_account('gateway-RG', 'fog_test_storage_account') }
     end
   end
 end

data/test/requests/storage/test_get_storage_access_keys.rb

@@ -4,28 +4,21 @@ require File.expand_path '../../test_helper', __dir__
 class TestGetStorageAccessKeys < Minitest::Test
   def setup
     @service = Fog::Storage::AzureRM.new(credentials)
-    client = @service.instance_variable_get(:@storage_mgmt_client)
-    @storage_accounts = client.storage_accounts
-    @promise = Concurrent::Promise.execute do
-    end
+    @storage_mgmt_client = @service.instance_variable_get(:@storage_mgmt_client)
+    @storage_accounts = @storage_mgmt_client.storage_accounts
   end
 
   def test_get_storage_access_keys_success
     mocked_response = ApiStub::Requests::Storage::StorageAccount.list_keys_response
-    expected_response = Azure::ARM::Storage::Models::StorageAccountKeys.serialize_object(mocked_response.body)
-    @promise.stub :value!, mocked_response do
-      @storage_accounts.stub :list_keys, @promise do
-        assert_equal @service.get_storage_access_keys('fog-test-rg', 'fogstorageaccount'), expected_response
-      end
+    @storage_accounts.stub :list_keys, mocked_response do
+      assert_equal @service.get_storage_access_keys('fog-test-rg', 'fogstorageaccount'), mocked_response.keys
     end
   end
 
   def test_get_storage_access_keys_failure
-    response = -> { raise MsRestAzure::AzureOperationError.new(nil, nil, 'error' => { 'message' => 'mocked exception' }) }
-    @promise.stub :value!, response do
-      @storage_accounts.stub :list_keys, @promise do
-        assert_raises(RuntimeError) { @service.get_storage_access_keys('fog-test-rg', 'fogstorageaccount') }
-      end
+    response = proc { raise MsRestAzure::AzureOperationError.new(nil, nil, 'error' => { 'message' => 'mocked exception' }) }
+    @storage_accounts.stub :list_keys, response do
+      assert_raises(RuntimeError) { @service.get_storage_access_keys('fog-test-rg', 'fogstorageaccount') }
     end
   end
 end

data/test/requests/storage/test_list_storage_accounts.rb

@@ -1,39 +1,29 @@
 require File.expand_path '../../test_helper', __dir__
 
-# Storage Account Class
+# Test Class for List Storage Accounts Request
 class TestListStorageAccounts < Minitest::Test
   # This class posesses the test cases for the requests of storage account service.
   def setup
     @azure_credentials = Fog::Storage::AzureRM.new(credentials)
-    client = @azure_credentials.instance_variable_get(:@storage_mgmt_client)
-    @storage_accounts = client.storage_accounts
+    @storage_mgmt_client = @azure_credentials.instance_variable_get(:@storage_mgmt_client)
+    @storage_accounts = @storage_mgmt_client.storage_accounts
   end
 
   def test_list_storage_accounts_success
-    mock_promise = Concurrent::Promise.execute do
-    end
-    response_body = ApiStub::Requests::Storage::StorageAccount.list_storage_accounts
-    result = ApiStub::Requests::Storage::StorageAccount.response_storage_account_list(response_body)
-    mock_promise.stub :value!, result do
-      @storage_accounts.stub :list, mock_promise do
-        assert @azure_credentials.list_storage_accounts.size >= 1
-        @azure_credentials.list_storage_accounts.each do |s|
-          assert_equal s['name'], response_body['value'][0]['name']
-        end
+    response_body = ApiStub::Requests::Storage::StorageAccount.list_storage_accounts(@storage_mgmt_client)
+    @storage_accounts.stub :list, response_body do
+      assert @azure_credentials.list_storage_accounts.size >= 1
+      @azure_credentials.list_storage_accounts.each do |s|
+        assert_equal s.name, response_body.value[0].name
       end
     end
   end
 
   def test_list_storage_accounts_failure
-    mock_promise = Concurrent::Promise.execute do
-    end
-    response_body = ApiStub::Requests::Storage::StorageAccount.list_storage_accounts
-    result = ApiStub::Requests::Storage::StorageAccount.response_storage_account_list(response_body)
-    mock_promise.stub :value!, result do
-      @storage_accounts.stub :list, mock_promise do
-        assert_raises ArgumentError do
-          assert @azure_credentials.list_storage_accounts('wrong arg', 'second wrong arg')
-        end
+    response_body = ApiStub::Requests::Storage::StorageAccount.list_storage_accounts(@storage_mgmt_client)
+    @storage_accounts.stub :list, response_body do
+      assert_raises ArgumentError do
+        assert @azure_credentials.list_storage_accounts('wrong arg', 'second wrong arg')
       end
     end
   end

data/test/requests/storage/test_list_storage_accounts_for_rg.rb

@@ -1,51 +1,37 @@
 require File.expand_path '../../test_helper', __dir__
 
-# Storage Account Class
+# Test Class for List Storage Accounts For Resource Group Request
 class TestListStorageAccountsForRG < Minitest::Test
   # This class posesses the test cases for the requests of storage account service.
   def setup
     @azure_credentials = Fog::Storage::AzureRM.new(credentials)
-    client = @azure_credentials.instance_variable_get(:@storage_mgmt_client)
-    @storage_accounts = client.storage_accounts
+    @storage_mgmt_client = @azure_credentials.instance_variable_get(:@storage_mgmt_client)
+    @storage_accounts = @storage_mgmt_client.storage_accounts
   end
 
   def test_list_storage_accounts_for_rg_success
-    mock_promise = Concurrent::Promise.execute do
-    end
-    response_body = ApiStub::Requests::Storage::StorageAccount.list_storage_accounts_for_rg
-    result = ApiStub::Requests::Storage::StorageAccount.response_storage_account_list(response_body)
-    mock_promise.stub :value!, result do
-      @storage_accounts.stub :list_by_resource_group, mock_promise do
-        assert @azure_credentials.list_storage_account_for_rg('gateway-RG').size >= 1
-        @azure_credentials.list_storage_account_for_rg('gateway-RG').each do |s|
-          assert_equal s['name'], response_body['value'][0]['name']
-        end
+    response_body = ApiStub::Requests::Storage::StorageAccount.list_storage_accounts_for_rg(@storage_mgmt_client)
+    @storage_accounts.stub :list_by_resource_group, response_body do
+      assert @azure_credentials.list_storage_account_for_rg('gateway-RG').size >= 1
+      @azure_credentials.list_storage_account_for_rg('gateway-RG').each do |s|
+        assert_equal s.name, response_body.value[0].name
       end
     end
   end
 
   def test_list_storage_accounts_for_rg_failure
-    mock_promise = Concurrent::Promise.execute do
-    end
-    response_body = ApiStub::Requests::Storage::StorageAccount.list_storage_accounts_for_rg
-    result = ApiStub::Requests::Storage::StorageAccount.response_storage_account_list(response_body)
-    mock_promise.stub :value!, result do
-      @storage_accounts.stub :list_by_resource_group, mock_promise do
-        assert_raises ArgumentError do
-          @azure_credentials.list_storage_account_for_rg('gateway-RG', 'wrong argument')
-        end
+    response_body = ApiStub::Requests::Storage::StorageAccount.list_storage_accounts_for_rg(@storage_mgmt_client)
+    @storage_accounts.stub :list_by_resource_group, response_body do
+      assert_raises ArgumentError do
+        @azure_credentials.list_storage_account_for_rg('gateway-RG', 'wrong argument')
       end
     end
   end
 
   def test_list_storage_accounts_for_rg_exception
-    raise_exception = -> { fail MsRestAzure::AzureOperationError.new(nil, nil, 'error' => { 'message' => 'mocked exception' }) }
-    mock_promise = Concurrent::Promise.execute do
-    end
-    mock_promise.stub :value!, raise_exception do
-      @storage_accounts.stub :list_by_resource_group, mock_promise do
-        assert_raises(RuntimeError) { @azure_credentials.list_storage_account_for_rg('gateway-RG') }
-      end
+    raise_exception = proc { fail MsRestAzure::AzureOperationError.new(nil, nil, 'error' => { 'message' => 'mocked exception' }) }
+    @storage_accounts.stub :list_by_resource_group, raise_exception do
+      assert_raises(RuntimeError) { @azure_credentials.list_storage_account_for_rg('gateway-RG') }
     end
   end
 end