fog-azure-rm 0.0.4 → 0.0.5

data/lib/fog/azurerm/requests/resources/create_deployment.rb

@@ -4,39 +4,43 @@ module Fog
       # This class provides the actual implemention for service calls.
       class Real
         def create_deployment(resource_group, deployment_name, template_link, parameters_link)
+          Fog::Logger.debug "Creating Deployment: #{deployment_name} in Resource Group: #{resource_group}"
+          deployment = create_deployment_object(template_link, parameters_link)
           begin
-            Fog::Logger.debug "Creating Deployment: #{deployment_name} in Resource Group: #{resource_group}"
-            deployment = Azure::ARM::Resources::Models::Deployment.new
-            deployment_properties = Azure::ARM::Resources::Models::DeploymentProperties.new
+            @rmc.deployments.validate(resource_group, deployment_name, deployment)
+            deployment = @rmc.deployments.create_or_update(resource_group, deployment_name, deployment)
+            Fog::Logger.debug "Deployment: #{deployment_name} in Resource Group: #{resource_group} created successfully."
+            deployment
+          rescue  MsRestAzure::AzureOperationError => e
+            raise Fog::AzureRm::OperationError.new(e)
+          end
+        end
 
-            template_link_obj = Azure::ARM::Resources::Models::TemplateLink.new
-            template_link_obj.uri = template_link
+        private
 
-            parameters_link_obj = Azure::ARM::Resources::Models::ParametersLink.new
-            parameters_link_obj.uri = parameters_link
+        def create_deployment_object(template_link, parameters_link)
+          deployment = Azure::ARM::Resources::Models::Deployment.new
+          deployment_properties = Azure::ARM::Resources::Models::DeploymentProperties.new
 
-            deployment_properties.template_link = template_link_obj
-            deployment_properties.parameters_link = parameters_link_obj
-            deployment_properties.mode = 'Incremental'
+          template_link_obj = Azure::ARM::Resources::Models::TemplateLink.new
+          template_link_obj.uri = template_link
 
-            deployment.properties = deployment_properties
+          parameters_link_obj = Azure::ARM::Resources::Models::ParametersLink.new
+          parameters_link_obj.uri = parameters_link
 
-            @rmc.deployments.validate(resource_group, deployment_name, deployment)
-            promise = @rmc.deployments.create_or_update(resource_group, deployment_name, deployment)
-            result = promise.value!
-            Fog::Logger.debug "Deployment: #{deployment_name} in Resource Group: #{resource_group} created successfully."
-            Azure::ARM::Resources::Models::DeploymentExtended.serialize_object(result.body)
-          rescue  MsRestAzure::AzureOperationError => e
-            msg = "Exception creating Deployment: #{deployment_name} in Resource Group: #{resource_group}. #{e.body['error']['message']}"
-            raise msg
-          end
+          deployment_properties.template_link = template_link_obj
+          deployment_properties.parameters_link = parameters_link_obj
+          deployment_properties.mode = 'Incremental'
+
+          deployment.properties = deployment_properties
+          deployment
         end
       end
 
       # This class provides the mock implementation
       class Mock
         def create_deployment(resource_group, deployment_name, template_link, parameters_link)
-          {
+          deployment = {
             id: "/subscriptions/########-####-####-####-############/resourceGroups/#{resource_group}/providers/microsoft.resources/deployments/#{deployment_name}",
             name: deployment_name,
             properties: {
@@ -83,6 +87,8 @@ module Fog
               }]
             }
           }
+          result_mapper = Azure::ARM::Resources::Models::DeploymentExtended.mapper
+          @rmc.deserialize(result_mapper, deployment, 'result.body')
         end
       end
     end

data/lib/fog/azurerm/requests/resources/create_resource_group.rb

@@ -4,17 +4,15 @@ module Fog
       # This class provides the actual implemention for service calls.
       class Real
         def create_resource_group(name, location)
+          Fog::Logger.debug "Creating Resource Group: #{name}."
+          resource_group = Azure::ARM::Resources::Models::ResourceGroup.new
+          resource_group.location = location
           begin
-            Fog::Logger.debug "Creating Resource Group: #{name}."
-            rg_properties = ::Azure::ARM::Resources::Models::ResourceGroup.new
-            rg_properties.location = location
-            promise = @rmc.resource_groups.create_or_update(name, rg_properties)
-            result = promise.value!
+            resource_group = @rmc.resource_groups.create_or_update(name, resource_group)
             Fog::Logger.debug "Resource Group #{name} created successfully."
-            Azure::ARM::Resources::Models::ResourceGroup.serialize_object(result.body)
+            resource_group
           rescue  MsRestAzure::AzureOperationError => e
-            msg = "Exception creating Resource Group #{name}. #{e.body['error']['message']}"
-            raise msg
+            raise Fog::AzureRm::OperationError.new(e)
           end
         end
       end
@@ -22,7 +20,7 @@ module Fog
       # This class provides the mock implementation for unit tests.
       class Mock
         def create_resource_group(name, location)
-          {
+          resource_group = {
             'location' => location,
             'id' => "/subscriptions/########-####-####-####-############/resourceGroups/#{name}",
             'name' => name,
@@ -31,6 +29,8 @@ module Fog
               'provisioningState' => 'Succeeded'
             }
           }
+          result_mapper = Azure::ARM::Resources::Models::ResourceGroup.mapper
+          @rmc.deserialize(result_mapper, resource_group, 'result.body')
         end
       end
     end

data/lib/fog/azurerm/requests/resources/delete_deployment.rb

@@ -4,14 +4,13 @@ module Fog
       # This class provides the actual implemention for service calls.
       class Real
         def delete_deployment(resource_group, deployment_name)
+          Fog::Logger.debug "Deleting Deployment: #{deployment_name} in Resource Group: #{resource_group}"
           begin
-            Fog::Logger.debug "Deleting Deployment: #{deployment_name} in Resource Group: #{resource_group}"
-            @rmc.deployments.delete(resource_group, deployment_name).value!
+            @rmc.deployments.delete(resource_group, deployment_name)
             Fog::Logger.debug "Deployment: #{deployment_name} in Resource Group: #{resource_group} deleted successfully."
             true
           rescue  MsRestAzure::AzureOperationError => e
-            msg = "Exception deleting Deployment: #{deployment_name} in Resource Group: #{resource_group}. #{e.body['error']['message']}"
-            raise msg
+            raise Fog::AzureRm::OperationError.new(e)
           end
         end
       end

data/lib/fog/azurerm/requests/resources/delete_resource_group.rb

@@ -4,15 +4,13 @@ module Fog
       # This class provides the actual implemention for service calls.
       class Real
         def delete_resource_group(name)
+          Fog::Logger.debug "Deleting Resource Group: #{name}."
           begin
-            Fog::Logger.debug "Deleting Resource Group: #{name}."
-            promise = @rmc.resource_groups.delete(name)
-            promise.value!
+            @rmc.resource_groups.delete(name)
             Fog::Logger.debug "Resource Group #{name} deleted successfully."
             true
           rescue  MsRestAzure::AzureOperationError => e
-            msg = "Exception deleting Resource Group #{name}. #{e.body['error']['message']}"
-            raise msg
+            raise Fog::AzureRm::OperationError.new(e)
           end
         end
       end

data/lib/fog/azurerm/requests/resources/delete_resource_tag.rb

@@ -1,37 +1,31 @@
 module Fog
   module Resources
     class AzureRM
-      # This class provides the actual implemention for service calls.
+      # This class provides the actual implementation for service calls.
       class Real
         def delete_resource_tag(resource_id, tag_name, tag_value)
-          begin
+          split_resource = resource_id.split('/') unless resource_id.nil?
+          if split_resource.count != 9
+            raise 'Invalid Resource Id'
+          end
 
-            split_resource = resource_id.split('/') unless resource_id.nil?
-            if split_resource.count != 9
-              msg = 'Invalid Resource Id.'
-              raise msg
-            end
-            resource_group_name = split_resource[4]
-            resource_provider_namespace = split_resource[6]
-            resource_type = split_resource[7]
-            resource_name = split_resource[8]
-            api_version = '2016-06-01'
+          resource_group_name = get_resource_from_resource_id(resource_id, RESOURCE_GROUP_NAME)
+          resource_provider_namespace = get_resource_from_resource_id(resource_id, RESOURCE_PROVIDER_NAMESPACE)
+          resource_type = get_resource_from_resource_id(resource_id, RESOURCE_TYPE)
+          resource_name = get_resource_from_resource_id(resource_id, RESOURCE_NAME)
 
-            Fog::Logger.debug "Deleting Tag #{tag_name} from Resource #{resource_name}"
-            promise = @rmc.resources.get(resource_group_name, resource_provider_namespace, '', resource_type, resource_name, api_version)
-            result = promise.value!
-            resource = result.body
+          Fog::Logger.debug "Deleting Tag #{tag_name} from Resource #{resource_name}"
+          begin
+            resource = @rmc.resources.get(resource_group_name, resource_provider_namespace, '', resource_type, resource_name, API_VERSION)
 
             if resource.tags.key?(tag_name)
               resource.tags.delete_if { |key, value| key == tag_name && value == tag_value }
             end
-            promise = @rmc.resources.create_or_update(resource_group_name, resource_provider_namespace, '', resource_type, resource_name, api_version, resource)
-            promise.value!
+            @rmc.resources.create_or_update(resource_group_name, resource_provider_namespace, '', resource_type, resource_name, API_VERSION, resource)
             Fog::Logger.debug "Tag #{tag_name} deleted successfully from Resource #{resource_name}"
             true
           rescue  MsRestAzure::AzureOperationError => e
-            msg = "Exception deleting Tag #{tag_name}. #{e.body['error']['message']}"
-            raise msg
+            raise Fog::AzureRm::OperationError.new(e)
           end
         end
       end

data/lib/fog/azurerm/requests/resources/list_deployments.rb

@@ -4,14 +4,13 @@ module Fog
       # This class provides the actual implemention for service calls.
       class Real
         def list_deployments(resource_group)
+          Fog::Logger.debug "Listing Deployments in Resource Group: #{resource_group}"
           begin
-            Fog::Logger.debug "Listing Deployments in Resource Group: #{resource_group}"
-            promise = @rmc.deployments.list(resource_group)
-            result = promise.value!
-            Azure::ARM::Resources::Models::DeploymentListResult.serialize_object(result.body)['value']
+            deployments = @rmc.deployments.list_as_lazy(resource_group)
+            Fog::Logger.debug "Deployments listed successfully in Resource Group: #{resource_group}"
+            deployments.value
           rescue  MsRestAzure::AzureOperationError => e
-            msg = "Exception listing Deployments in Resource Group: #{resource_group}. #{e.body['error']['message']}"
-            raise msg
+            raise Fog::AzureRm::OperationError.new(e)
           end
         end
       end
@@ -19,7 +18,7 @@ module Fog
       # This class provides the mock implementation
       class Mock
         def list_deployments(resource_group)
-          {
+          deployments = {
             value: [{
               id: "/subscriptions/########-####-####-####-############/resourceGroups/#{resource_group}/providers/microsoft.resources/deployments/testdeployment",
               name: 'testdeployment',
@@ -68,6 +67,8 @@ module Fog
               }
             }]
           }
+          result_mapper = Azure::ARM::Resources::Models::DeploymentListResult.mapper
+          @rmc.deserialize(result_mapper, deployments, 'result.body').value
         end
       end
     end

data/lib/fog/azurerm/requests/resources/list_resource_groups.rb

@@ -4,14 +4,14 @@ module Fog
       # This class provides the actual implemention for service calls.
       class Real
         def list_resource_groups
+          Fog::Logger.debug 'Listing Resource Groups'
           begin
-            promise = @rmc.resource_groups.list
-            result = promise.value!
-            result.body.next_link = ''
-            Azure::ARM::Resources::Models::ResourceGroupListResult.serialize_object(result.body)['value']
+            resource_groups = @rmc.resource_groups.list_as_lazy
+            resource_groups.next_link = '' if resource_groups.next_link.nil?
+            Fog::Logger.debug 'Resource Groups listed successfully'
+            resource_groups.value
           rescue  MsRestAzure::AzureOperationError => e
-            msg = "Exception listing Resource Groups. #{e.body['error']['message']}"
-            raise msg
+            raise Fog::AzureRm::OperationError.new(e)
           end
         end
       end
@@ -19,26 +19,30 @@ module Fog
       # This class provides the mock implementation for unit tests.
       class Mock
         def list_resource_groups
-          [
-            {
-              'location' => 'westus',
-              'id' => '/subscriptions/########-####-####-####-############/resourceGroups/Fog_test_rg',
-              'name' => 'Fog_test_rg',
-              'properties' =>
+          resource_groups = {
+            'value' => [
               {
-                'provisioningState' => 'Succeeded'
-              }
-            },
-            {
-              'location' => 'westus',
-              'id' => '/subscriptions/########-####-####-####-############/resourceGroups/Fog_test_rg1',
-              'name' => 'Fog_test_rg1',
-              'properties' =>
+                'location' => 'westus',
+                'id' => '/subscriptions/########-####-####-####-############/resourceGroups/Fog_test_rg',
+                'name' => 'Fog_test_rg',
+                'properties' =>
+                {
+                  'provisioningState' => 'Succeeded'
+                }
+              },
               {
-                'provisioningState' => 'Succeeded'
+                'location' => 'westus',
+                'id' => '/subscriptions/########-####-####-####-############/resourceGroups/Fog_test_rg1',
+                'name' => 'Fog_test_rg1',
+                'properties' =>
+                {
+                  'provisioningState' => 'Succeeded'
+                }
               }
-            }
-          ]
+            ]
+          }
+          result_mapper = Azure::ARM::Resources::Models::ResourceGroupListResult.mapper
+          @rmc.deserialize(result_mapper, resource_groups, 'result.body').value
         end
       end
     end

data/lib/fog/azurerm/requests/resources/list_tagged_resources.rb

@@ -4,18 +4,17 @@ module Fog
       # This class provides the actual implemention for service calls.
       class Real
         def list_tagged_resources(tag_name, tag_value = nil)
-          begin
-            unless tag_name.nil?
-              query_filter = "tagname eq '#{tag_name}' "
-              query_filter += tag_value.nil? ? '' : "and tagvalue eq '#{tag_value}'"
-              promise = @rmc.resources.list(query_filter)
-              result = promise.value!
-              result.body.next_link = ''
-              Azure::ARM::Resources::Models::ResourceListResult.serialize_object(result.body)['value']
+          Fog::Logger.debug "Listing Resources with tagname: #{tag_name}"
+          unless tag_name.nil?
+            query_filter = "tagname eq '#{tag_name}' "
+            query_filter += tag_value.nil? ? '' : "and tagvalue eq '#{tag_value}'"
+            begin
+              resources = @rmc.resources.list_as_lazy(query_filter)
+              resources.next_link = '' if resources.next_link.nil?
+              resources.value
+            rescue MsRestAzure::AzureOperationError => e
+              raise Fog::AzureRm::OperationError.new(e)
             end
-          rescue MsRestAzure::AzureOperationError => e
-            msg = "Exception listing Resources . #{e.body['error']['message']}"
-            raise msg
           end
         end
       end
@@ -23,22 +22,26 @@ module Fog
       # This class provides the mock implementation for unit tests.
       class Mock
         def list_tagged_resources(tag_name, tag_value)
-          [
-            {
-              'id' => _resource_id,
-              'name' => 'your-resource-name',
-              'type' => 'providernamespace/resourcetype',
-              'location' => 'westus',
-              'tags' =>
-                {
-                  tag_name => tag_value
-                },
-              'plan' =>
-                {
-                  'name' => 'free'
-                }
-            }
-          ]
+          resources = {
+            'value' => [
+              {
+                'id' => '/subscriptions/########-####-####-####-############/fog-rg',
+                'name' => 'your-resource-name',
+                'type' => 'providernamespace/resourcetype',
+                'location' => 'westus',
+                'tags' =>
+                  {
+                    tag_name => tag_value
+                  },
+                'plan' =>
+                  {
+                    'name' => 'free'
+                  }
+              }
+            ]
+          }
+          result_mapper = Azure::ARM::Resources::Models::ResourceListResult.mapper
+          @rmc.deserialize(result_mapper, resources, 'result.body').value
         end
       end
     end

data/lib/fog/azurerm/requests/resources/tag_resource.rb

@@ -4,32 +4,27 @@ module Fog
       # This class provides the actual implemention for service calls.
       class Real
         def tag_resource(resource_id, tag_name, tag_value)
-          begin
-            split_resource = resource_id.split('/') unless resource_id.nil?
-            if split_resource.count != 9
-              msg = 'Invalid Resource Id.'
-              raise msg
-            end
-            resource_group_name = split_resource[4]
-            resource_provider_namespace = split_resource[6]
-            parent_resource_id = ''
-            resource_type = split_resource[7]
-            resource_name = split_resource[8]
-            api_version = '2016-06-01'
+          split_resource = resource_id.split('/') unless resource_id.nil?
+          if split_resource.count != 9
+            raise 'Invalid Resource Id'
+          end
 
-            Fog::Logger.debug "Creating Tag #{tag_name} for Resource #{resource_name}"
-            promise = @rmc.resources.get(resource_group_name, resource_provider_namespace, parent_resource_id, resource_type, resource_name, api_version)
-            result = promise.value!
-            resource = result.body
+          resource_group_name = get_resource_from_resource_id(resource_id, RESOURCE_GROUP_NAME)
+          resource_provider_namespace = get_resource_from_resource_id(resource_id, RESOURCE_PROVIDER_NAMESPACE)
+          resource_type = get_resource_from_resource_id(resource_id, RESOURCE_TYPE)
+          resource_name = get_resource_from_resource_id(resource_id, RESOURCE_NAME)
+          parent_resource_id = ''
+
+          Fog::Logger.debug "Creating Tag #{tag_name} for Resource #{resource_name}"
+          begin
+            resource = @rmc.resources.get(resource_group_name, resource_provider_namespace, parent_resource_id, resource_type, resource_name, API_VERSION)
             resource.tags = {} if resource.tags.nil?
             resource.tags[tag_name] = tag_value
-            promise = @rmc.resources.create_or_update(resource_group_name, resource_provider_namespace, parent_resource_id, resource_type, resource_name, api_version, resource)
-            promise.value!
+            @rmc.resources.create_or_update(resource_group_name, resource_provider_namespace, parent_resource_id, resource_type, resource_name, API_VERSION, resource)
             Fog::Logger.debug "Tag #{tag_name} created successfully for Resource #{resource_name}"
             true
           rescue MsRestAzure::AzureOperationError => e
-            msg = "Exception creating Tag #{tag_name}. #{e.body['error']['message']}"
-            raise msg
+            raise Fog::AzureRm::OperationError.new(e)
           end
         end
       end

data/lib/fog/azurerm/requests/storage/check_storage_account_name_availability.rb

@@ -1,25 +1,23 @@
 module Fog
   module Storage
     class AzureRM
-      # This class provides the actual implemention for service calls.
+      # This class provides the actual implementation for service calls.
       class Real
         def check_storage_account_name_availability(params)
-          Fog::Logger.debug "Checking Name availability: #{params.name}."
+          msg = "Checking Name availability: #{params.name}."
+          Fog::Logger.debug msg
           begin
-            promise = @storage_mgmt_client.storage_accounts.check_name_availability(params)
-            result = promise.value!
-            name_available_obj = Azure::ARM::Storage::Models::CheckNameAvailabilityResult.serialize_object(result.body)
-            if name_available_obj['nameAvailable'] == true
-              Fog::Logger.debug "Name: #{params.name} is available."
-              true
-            else
-              Fog::Logger.debug "Name: #{params.name} is not available."
-              Fog::Logger.debug "Reason: #{name_available_obj['reason']}."
-              false
-            end
+            name_available_obj = @storage_mgmt_client.storage_accounts.check_name_availability(params)
           rescue MsRestAzure::AzureOperationError => e
-            msg = "Exception checking name availability: #{e.body['error']['message']}"
-            raise msg if e.body['error']['code'] == 'ResourceGroupNotFound'
+            raise_azure_exception(e, msg)
+          end
+          if name_available_obj.name_available
+            Fog::Logger.debug "Name: #{params.name} is available."
+            true
+          else
+            Fog::Logger.debug "Name: #{params.name} is not available."
+            Fog::Logger.debug "Reason: #{name_available_obj.reason}."
+            false
           end
         end
       end