fog-azure-rm 0.1.0 → 0.1.1

data/lib/fog/azurerm/requests/sql/delete_firewall_rule.rb

@@ -7,7 +7,7 @@ module Fog
           msg = "Deleting SQL Firewall Rule: #{rule_name}."
           Fog::Logger.debug msg
 
-          resource_url = "#{AZURE_RESOURCE}/subscriptions/#{@subscription_id}/resourceGroups/#{resource_group}/providers/Microsoft.Sql/servers/#{server_name}/firewallRules/#{rule_name}?api-version=2014-04-01-preview"
+          resource_url = "#{resource_manager_endpoint_url}/subscriptions/#{@subscription_id}/resourceGroups/#{resource_group}/providers/Microsoft.Sql/servers/#{server_name}/firewallRules/#{rule_name}?api-version=2014-04-01-preview"
           begin
             token = Fog::Credentials::AzureRM.get_token(@tenant_id, @client_id, @client_secret)
             RestClient.delete(
@@ -16,11 +16,11 @@ module Fog
               content_type: :json,
               authorization: token
             )
-            Fog::Logger.debug "SQL Firewall Rule: #{rule_name} deleted successfully."
-            true
           rescue RestClient::Exception => e
-            raise JSON.parse(e.response)['message']
+            raise_azure_exception(e, msg)
           end
+          Fog::Logger.debug "SQL Firewall Rule: #{rule_name} deleted successfully."
+          true
         end
       end
 

data/lib/fog/azurerm/requests/sql/delete_sql_server.rb

@@ -6,7 +6,7 @@ module Fog
         def delete_sql_server(resource_group, name)
           msg = "Deleting SQL Server: #{name}."
           Fog::Logger.debug msg
-          resource_url = "#{AZURE_RESOURCE}/subscriptions/#{@subscription_id}/resourceGroups/#{resource_group}/providers/Microsoft.Sql/servers/#{name}?api-version=2014-04-01-preview"
+          resource_url = "#{resource_manager_endpoint_url}/subscriptions/#{@subscription_id}/resourceGroups/#{resource_group}/providers/Microsoft.Sql/servers/#{name}?api-version=2014-04-01-preview"
           begin
             token = Fog::Credentials::AzureRM.get_token(@tenant_id, @client_id, @client_secret)
             RestClient.delete(
@@ -15,11 +15,11 @@ module Fog
               content_type: :json,
               authorization: token
             )
-            Fog::Logger.debug "SQL Server: #{name} deleted successfully."
-            true
           rescue RestClient::Exception => e
-            raise JSON.parse(e.response)['message']
+            raise_azure_exception(e, msg)
           end
+          Fog::Logger.debug "SQL Server: #{name} deleted successfully."
+          true
         end
       end
 

data/lib/fog/azurerm/requests/sql/get_database.rb

@@ -6,7 +6,7 @@ module Fog
         def get_database(resource_group, server_name, name)
           msg = "Getting Sql Database: #{name} in Resource Group: #{resource_group}."
           Fog::Logger.debug msg
-          resource_url = "#{AZURE_RESOURCE}/subscriptions/#{@subscription_id}/resourceGroups/#{resource_group}/providers/Microsoft.Sql/servers/#{server_name}/databases/#{name}?api-version=2014-04-01-preview"
+          resource_url = "#{resource_manager_endpoint_url}/subscriptions/#{@subscription_id}/resourceGroups/#{resource_group}/providers/Microsoft.Sql/servers/#{server_name}/databases/#{name}?api-version=2014-04-01-preview"
           begin
             token = Fog::Credentials::AzureRM.get_token(@tenant_id, @client_id, @client_secret)
             response = RestClient.get(
@@ -16,10 +16,10 @@ module Fog
               authorization: token
             )
           rescue RestClient::Exception => e
-            raise JSON.parse(e.response)['message']
+            raise_azure_exception(e, msg)
           end
           Fog::Logger.debug "Sql Database fetched successfully in Resource Group: #{resource_group}"
-          JSON.parse(response)
+          Fog::JSON.decode(response)
         end
       end
 

data/lib/fog/azurerm/requests/sql/get_firewall_rule.rb

@@ -6,7 +6,7 @@ module Fog
         def get_firewall_rule(resource_group, server_name, rule_name)
           msg = "Getting Sql Server Firewall Rule: #{rule_name} from SQL Server: #{server_name} in Resource Group: #{resource_group}..."
           Fog::Logger.debug msg
-          resource_url = "#{AZURE_RESOURCE}/subscriptions/#{@subscription_id}/resourceGroups/#{resource_group}/providers/Microsoft.Sql/servers/#{server_name}/firewallRules/#{rule_name}?api-version=2014-04-01-preview"
+          resource_url = "#{resource_manager_endpoint_url}/subscriptions/#{@subscription_id}/resourceGroups/#{resource_group}/providers/Microsoft.Sql/servers/#{server_name}/firewallRules/#{rule_name}?api-version=2014-04-01-preview"
           begin
             token = Fog::Credentials::AzureRM.get_token(@tenant_id, @client_id, @client_secret)
             response = RestClient.get(
@@ -16,10 +16,10 @@ module Fog
               authorization: token
             )
           rescue RestClient::Exception => e
-            raise JSON.parse(e.response)['message']
+            raise_azure_exception(e, msg)
           end
           Fog::Logger.debug "Sql Server Firewall Rule fetched successfully from Server: #{server_name}, Resource Group: #{resource_group}"
-          JSON.parse(response)
+          Fog::JSON.decode(response)
         end
       end
 

data/lib/fog/azurerm/requests/sql/get_sql_server.rb

@@ -6,7 +6,7 @@ module Fog
         def get_sql_server(resource_group, server_name)
           msg = "Getting Sql Server: #{server_name} in Resource Group: #{resource_group}..."
           Fog::Logger.debug msg
-          resource_url = "#{AZURE_RESOURCE}/subscriptions/#{@subscription_id}/resourceGroups/#{resource_group}/providers/Microsoft.Sql/servers/#{server_name}?api-version=2014-04-01-preview"
+          resource_url = "#{resource_manager_endpoint_url}/subscriptions/#{@subscription_id}/resourceGroups/#{resource_group}/providers/Microsoft.Sql/servers/#{server_name}?api-version=2014-04-01-preview"
           begin
             token = Fog::Credentials::AzureRM.get_token(@tenant_id, @client_id, @client_secret)
             response = RestClient.get(
@@ -16,10 +16,10 @@ module Fog
               authorization: token
             )
           rescue RestClient::Exception => e
-            raise JSON.parse(e.response)['message']
+            raise_azure_exception(e, msg)
           end
           Fog::Logger.debug "Sql Server fetched successfully in Resource Group: #{resource_group}"
-          JSON.parse(response)
+          Fog::JSON.decode(response)
         end
       end
 

data/lib/fog/azurerm/requests/sql/list_databases.rb

@@ -6,7 +6,7 @@ module Fog
         def list_databases(resource_group, server_name)
           msg = "Listing Sql Databases in Resource Group: #{resource_group}."
           Fog::Logger.debug msg
-          resource_url = "#{AZURE_RESOURCE}/subscriptions/#{@subscription_id}/resourceGroups/#{resource_group}/providers/Microsoft.Sql/servers/#{server_name}/databases?api-version=2014-04-01-preview"
+          resource_url = "#{resource_manager_endpoint_url}/subscriptions/#{@subscription_id}/resourceGroups/#{resource_group}/providers/Microsoft.Sql/servers/#{server_name}/databases?api-version=2014-04-01-preview"
           begin
             token = Fog::Credentials::AzureRM.get_token(@tenant_id, @client_id, @client_secret)
             response = RestClient.get(
@@ -16,10 +16,10 @@ module Fog
               authorization: token
             )
           rescue RestClient::Exception => e
-            raise JSON.parse(e.response)['message']
+            raise_azure_exception(e, msg)
           end
           Fog::Logger.debug "Sql Databases listed successfully in Resource Group: #{resource_group}"
-          JSON.parse(response)['value']
+          Fog::JSON.decode(response)['value']
         end
       end
 

data/lib/fog/azurerm/requests/sql/list_firewall_rules.rb

@@ -6,7 +6,7 @@ module Fog
         def list_firewall_rules(resource_group, server_name)
           msg = "Listing Sql Server Firewall rules on server: #{server_name} in Resource Group: #{resource_group}."
           Fog::Logger.debug msg
-          resource_url = "#{AZURE_RESOURCE}/subscriptions/#{@subscription_id}/resourceGroups/#{resource_group}/providers/Microsoft.Sql/servers/#{server_name}/firewallRules/?api-version=2014-04-01-preview"
+          resource_url = "#{resource_manager_endpoint_url}/subscriptions/#{@subscription_id}/resourceGroups/#{resource_group}/providers/Microsoft.Sql/servers/#{server_name}/firewallRules/?api-version=2014-04-01-preview"
           begin
             token = Fog::Credentials::AzureRM.get_token(@tenant_id, @client_id, @client_secret)
             response = RestClient.get(
@@ -16,10 +16,10 @@ module Fog
               authorization: token
             )
           rescue RestClient::Exception => e
-            raise JSON.parse(e.response)['message']
+            raise_azure_exception(e, msg)
           end
           Fog::Logger.debug "Sql Server Firewall Rules listed successfully on server: #{server_name} in Resource Group: #{resource_group}"
-          JSON.parse(response)['value']
+          Fog::JSON.decode(response)['value']
         end
       end
 

data/lib/fog/azurerm/requests/sql/list_sql_servers.rb

@@ -6,7 +6,7 @@ module Fog
         def list_sql_servers(resource_group)
           msg = "Listing Sql Servers in Resource Group: #{resource_group}."
           Fog::Logger.debug msg
-          resource_url = "#{AZURE_RESOURCE}/subscriptions/#{@subscription_id}/resourceGroups/#{resource_group}/providers/Microsoft.Sql/servers?api-version=2014-04-01-preview"
+          resource_url = "#{resource_manager_endpoint_url}/subscriptions/#{@subscription_id}/resourceGroups/#{resource_group}/providers/Microsoft.Sql/servers?api-version=2014-04-01-preview"
           begin
             token = Fog::Credentials::AzureRM.get_token(@tenant_id, @client_id, @client_secret)
             response = RestClient.get(
@@ -16,10 +16,10 @@ module Fog
               authorization: token
             )
           rescue RestClient::Exception => e
-            raise JSON.parse(e.response)['message']
+            raise_azure_exception(e, msg)
           end
           Fog::Logger.debug "Sql Servers listed successfully in Resource Group: #{resource_group}"
-          JSON.parse(response)['value']
+          Fog::JSON.decode(response)['value']
         end
       end
 

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

@@ -3,14 +3,17 @@ module Fog
     class AzureRM
       # This class provides the actual implementation for service calls.
       class Real
-        def acquire_blob_lease(container_name, name, options={})
-          msg = "Leasing blob: #{name} of container #{container_name}"
+        def acquire_blob_lease(container_name, name, options = {})
+          options[:request_id] = SecureRandom.uuid
+          msg = "Leasing blob: #{name} of container #{container_name} options: #{options}"
           Fog::Logger.debug msg
+
           begin
             lease_id = @blob_client.acquire_blob_lease(container_name, name, options)
           rescue Azure::Core::Http::HTTPError => ex
             raise_azure_exception(ex, msg)
           end
+
           Fog::Logger.debug "Blob #{name} leased successfully."
           lease_id
         end

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

@@ -3,14 +3,17 @@ module Fog
     class AzureRM
       # This class provides the actual implementation for service calls.
       class Real
-        def acquire_container_lease(name, options={})
-          msg = "Leasing container: #{name}"
+        def acquire_container_lease(name, options = {})
+          options[:request_id] = SecureRandom.uuid
+          msg = "Leasing container: #{name} options: #{options}"
           Fog::Logger.debug msg
+
           begin
             lease_id = @blob_client.acquire_container_lease(name, options)
           rescue Azure::Core::Http::HTTPError => ex
             raise_azure_exception(ex, msg)
           end
+
           Fog::Logger.debug "Container #{name} leased successfully."
           lease_id
         end

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

@@ -0,0 +1,30 @@
+module Fog
+  module Storage
+    class AzureRM
+      # This class provides the actual implementation for service calls.
+      class Real
+        def commit_blob_blocks(container_name, blob_name, blocks, options = {})
+          options[:request_id] = SecureRandom.uuid
+          msg = "commit_blob_blocks: Complete uploading #{blob_name} to the container #{container_name}. options: #{options}"
+          Fog::Logger.debug msg
+
+          begin
+            @blob_client.commit_blob_blocks(container_name, blob_name, blocks, options)
+          rescue Azure::Core::Http::HTTPError => ex
+            raise_azure_exception(ex, msg)
+          end
+
+          Fog::Logger.debug "Block blob #{blob_name} is uploaded successfully."
+          true
+        end
+      end
+
+      # This class provides the mock implementation for unit tests.
+      class Mock
+        def commit_blob_blocks(*)
+          true
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,148 @@
+module Fog
+  module Storage
+    class AzureRM
+      # This class provides the actual implementation for service calls.
+      class Real
+        def compare_container_blobs(container1, container2)
+          msg = "Comparing blobs from container #{container1} to container #{container2}"
+          Fog::Logger.debug msg
+          begin
+            identical_blobs = get_identical_blobs_from_containers(container1, container2)
+          rescue Azure::Core::Http::HTTPError => ex
+            raise_azure_exception(ex, msg)
+          end
+          identical_blobs
+        end
+
+        private
+
+        def get_identical_blobs_from_containers(container1, container2)
+          container1_blobs = list_blobs(container1)
+          container2_blobs = list_blobs(container2)
+
+          identical_blobs = []
+          container1_blobs[:blobs].each do |container1_blob|
+            container2_blobs[:blobs].each do |container2_blob|
+              if container1_blob.name == container2_blob.name && container1_blob.properties[:content_md5] == container2_blob.properties[:content_md5]
+                identical_blobs.push(container1_blob)
+              end
+            end
+          end
+          identical_blobs
+        end
+      end
+
+      # This class provides the mock implementation for unit tests.
+      class Mock
+        def compare_container_blobs(*)
+          [
+            {
+              'name' => 'test_blob1',
+              'metadata' => {},
+              'properties' => {
+                'last_modified' => 'Mon, 04 Jul 2016 02:50:20 GMT',
+                'etag' => '0x8D3A3B5F017F52D',
+                'lease_status' => 'unlocked',
+                'lease_state' => 'available',
+                'content_length' => 4_194_304,
+                'content_type' => 'application/octet-stream',
+                'content_encoding' => nil,
+                'content_language' => nil,
+                'content_disposition' => nil,
+                'content_md5' => 'tXAohIyxuu/t94Lp/ujeRw==',
+                'cache_control' => nil,
+                'sequence_number' => 0,
+                'blob_type' => 'PageBlob',
+                'copy_id' => '095adc3b-e277-4c3d-97e0-0abca881f60c',
+                'copy_status' => 'success',
+                'copy_source' => 'https://testaccount.blob.core.windows.net/test_container/test_blob?snapshot=2016-02-04T08%3A35%3A50.3256874Z',
+                'copy_progress' => '4194304/4194304',
+                'copy_completion_time' => 'Thu, 04 Feb 2016 08:35:52 GMT',
+                'copy_status_description' => nil,
+                'accept_ranges' => 0
+              }
+            },
+            {
+              'name' => 'test_blob2',
+              'metadata' => {},
+              'properties' => {
+                'last_modified' => 'Tue, 04 Aug 2015 06:02:08 GMT',
+                'etag' => '0x8D29C92173526C8',
+                'lease_status' => 'unlocked',
+                'lease_state' => 'available',
+                'content_length' => 4_194_304,
+                'content_type' => 'application/octet-stream',
+                'content_encoding' => nil,
+                'content_language' => nil,
+                'content_disposition' => nil,
+                'content_md5' => 'tXAohIyxuu/t94Lp/ujeRw==',
+                'cache_control' => nil,
+                'sequence_number' => 0,
+                'blob_type' => 'PageBlob',
+                'copy_id' => '0abcdc3b-4c3d-e277-97e0-0abca881f60c',
+                'copy_status' => 'success',
+                'copy_source' => 'https://testaccount.blob.core.windows.net/test_container/test_blob?snapshot=2016-02-04T08%3A35%3A55.3157696Z',
+                'copy_progress' => '4194304/4194304',
+                'copy_completion_time' => 'Thu, 04 Feb 2016 08:40:52 GMT',
+                'copy_status_description' => nil,
+                'accept_ranges' => 0
+              }
+            },
+            {
+              'name' => 'test_blob3',
+              'metadata' => {},
+              'properties' => {
+                'last_modified' => 'Tue, 04 Aug 2015 06:02:08 GMT',
+                'etag' => '0x8D29C92173526C8',
+                'lease_status' => 'unlocked',
+                'lease_state' => 'available',
+                'content_length' => 4_194_304,
+                'content_type' => 'application/octet-stream',
+                'content_encoding' => nil,
+                'content_language' => nil,
+                'content_disposition' => nil,
+                'content_md5' => 'tXAohIyxuu/t94Lp/ujeRw==',
+                'cache_control' => nil,
+                'sequence_number' => 0,
+                'blob_type' => 'PageBlob',
+                'copy_id' => '0abcdc3b-4c3d-e277-97e0-0abca881f60c',
+                'copy_status' => 'success',
+                'copy_source' => 'https://testaccount.blob.core.windows.net/test_container/test_blob?snapshot=2016-02-04T08%3A35%3A55.3157696Z',
+                'copy_progress' => '4194304/4194304',
+                'copy_completion_time' => 'Thu, 04 Feb 2016 08:40:52 GMT',
+                'copy_status_description' => nil,
+                'accept_ranges' => 0
+              }
+            },
+            {
+              'name' => 'test_blob4',
+              'metadata' => {},
+              'properties' => {
+                'last_modified' => 'Tue, 04 Aug 2015 06:02:08 GMT',
+                'etag' => '0x8D29C92173526C8',
+                'lease_status' => 'unlocked',
+                'lease_state' => 'available',
+                'content_length' => 4_194_304,
+                'content_type' => 'application/octet-stream',
+                'content_encoding' => nil,
+                'content_language' => nil,
+                'content_disposition' => nil,
+                'content_md5' => 'tXAohIyxuu/t94Lp/ujeRw==',
+                'cache_control' => nil,
+                'sequence_number' => 0,
+                'blob_type' => 'PageBlob',
+                'copy_id' => '0abcdc3b-4c3d-e277-97e0-0abca881f60c',
+                'copy_status' => 'success',
+                'copy_source' => 'https://testaccount.blob.core.windows.net/test_container/test_blob?snapshot=2016-02-04T08%3A35%3A55.3157696Z',
+                'copy_progress' => '4194304/4194304',
+                'copy_completion_time' => 'Thu, 04 Feb 2016 08:40:52 GMT',
+                'copy_status_description' => nil,
+                'accept_ranges' => 0
+              }
+            }
+          ]
+        end
+      end
+    end
+  end
+end

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

@@ -4,25 +4,25 @@ module Fog
       # This class provides the actual implementation for service calls.
       class Real
         def copy_blob(destination_container, destination_blob, source_container, source_blob, options = {})
-          msg = "Copying blob: #{source_blob} from container #{source_container} to container #{destination_container}"
+          options[:request_id] = SecureRandom.uuid
+          msg = "Copying blob: #{source_blob} from container #{source_container} to container #{destination_container} options: #{options}"
           Fog::Logger.debug msg
+
           begin
-            copy_status = @blob_client.copy_blob(destination_container, destination_blob, source_container, source_blob, options)
+            copy_id, copy_status = @blob_client.copy_blob(destination_container, destination_blob, source_container, source_blob, options)
           rescue Azure::Core::Http::HTTPError => ex
             raise_azure_exception(ex, msg)
           end
-          Fog::Logger.debug "Blob #{destination_blob} copied successfully."
-          copy_status
+
+          Fog::Logger.debug "Copying blob: x-ms-copy-id: #{copy_id}, x-ms-copy-status: #{copy_status}"
+          [copy_id, copy_status]
         end
       end
 
       # This class provides the mock implementation for unit tests.
       class Mock
         def copy_blob(*)
-          {
-            'copyId' => 'abc123',
-            'copyStatus' => 'pending'
-          }
+          %w(abc123 pending)
         end
       end
     end

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

@@ -4,25 +4,25 @@ module Fog
       # This class provides the actual implementation for service calls.
       class Real
         def copy_blob_from_uri(destination_container, destination_blob, source_blob_uri, options = {})
-          msg = "Copying blob: #{source_blob_uri} to container #{destination_container}"
+          options[:request_id] = SecureRandom.uuid
+          msg = "Copying blob: #{source_blob_uri} to container #{destination_container} options: #{options}"
           Fog::Logger.debug msg
+
           begin
-            copy_status = @blob_client.copy_blob_from_uri(destination_container, destination_blob, source_blob_uri, options)
+            copy_id, copy_status = @blob_client.copy_blob_from_uri(destination_container, destination_blob, source_blob_uri, options)
           rescue Azure::Core::Http::HTTPError => ex
             raise_azure_exception(ex, msg)
           end
-          Fog::Logger.debug "Blob #{destination_blob} copied successfully."
-          copy_status
+
+          Fog::Logger.debug "Copying blob: x-ms-copy-id: #{copy_id}, x-ms-copy-status: #{copy_status}"
+          [copy_id, copy_status]
         end
       end
 
       # This class provides the mock implementation for unit tests.
       class Mock
         def copy_blob_from_uri(*)
-          {
-            'copyId' => 'abc123',
-            'copyStatus' => 'pending'
-          }
+          %w(abc123 pending)
         end
       end
     end