azure-armrest 0.9.4 → 0.9.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0c2605f1a0d6193e9bcd8f41512d64d29c70f12acbf56df23972c6c7659ee41c
-  data.tar.gz: 747601d0bd5494f50b07473b86fddfdc20bc150b15906e7700f8438c638f30ce
+  metadata.gz: c36786918df641ad7cc61b96471a4fba6828c86af36751f3be841e2879111f1c
+  data.tar.gz: 28a4135e681858eeed8876c9e450faadc6f9d8b9a1eab97e16f1eee7d582fba6
 SHA512:
-  metadata.gz: 998117ceb8031506e8569ec83988f880f9c3d841bd3b5a3ef8bd251f070554194eef8b10baa299b38cbd9b969b44f1dee3338aac0a8078975821cb184f86bb49
-  data.tar.gz: 284cb6d3b7b30bce806784c424fe4fe7c89ed3d9fa1f9f63bbd69cc9b960835088b1a36451aabe0c0f25637b7d3d9b2482ed320a3b61756503355963340423f6
+  metadata.gz: 2fe855b4a36f5494538df99895e5022a0bca82ec42f3dbf06b906da516ba07bad27782aa986e6a545e151927c6f30933356c15e533e8b8954f31230b139a091b
+  data.tar.gz: a99277df03074b8169cf43c486b02f282c49888ec636a3ecb984dde9c21be6ed39a615b57d5ffc0ba1ff55dd189143d3e1340279e19f4a93982c61986c0f23b0

data/CHANGES

@@ -1,3 +1,10 @@
+= 0.9.5 - 22-Jan-2018
+* Fixed a bug in the exception handler for the StorageAccount#all_blobs
+  method and the StorageAccountService#get_private_images method.
+* Added the Azure::Armrest::Storage::ManagedStorageHelper::ManagedDisk
+  class. This should now be the preferred approach for getting raw
+  blob information, as it is much more efficient.
+
 = 0.9.4 - 29-Nov-2017
 * Fixed the VirtualMachineService#delete_associated_resources to handle VM's
   backed by managed storage, as well as VM's with a private IP.

data/lib/azure/armrest/model/storage_account.rb

@@ -643,7 +643,7 @@ module Azure
           begin
             mutex.synchronize { array.concat(blobs(container.name_from_hash, key, options)) }
           rescue Errno::ECONNREFUSED, Azure::Armrest::TimeoutException => err
-            msg = "Unable to gather blob information for #{container.name}: #{err}"
+            msg = "Unable to gather blob information for #{container.name_from_hash}: #{err}"
             Azure::Armrest::Configuration.log.try(:log, Logger::WARN, msg)
             next
           end

data/lib/azure/armrest/storage/managed_disk.rb

@@ -0,0 +1,43 @@
+# Azure namespace
+module Azure
+  # Armrest namespace
+  module Armrest
+    # Storage namespace
+    module Storage
+      # Base class for managing managed disks.
+      module ManagedStorageHelper
+        class ManagedDisk
+          def initialize(storage_service, disk_name, resource_group, options)
+            @storage_service = storage_service
+            @disk_name       = disk_name
+            @resource_group  = resource_group
+            @sas_url         = storage_service.access_token(disk_name, resource_group, options)
+          end
+
+          def read(options = {})
+            retries = 0
+            begin
+              @storage_service.read(@sas_url, options)
+            rescue Azure::Armrest::ForbiddenException => err
+              raise err if retries.positive?
+              log('warn', "ManagedDisk.read: #{err} - getting new SAS URL")
+              begin
+                close
+              rescue => err
+                log('debug', "ManagedDisk.read: #{err} received on close ignored.")
+              end
+              @sas_url = @storage_service.access_token(@disk_name, @resource_group, options)
+              retries += 1
+              retry
+            end
+          end
+
+          def close
+            @storage_service.close(@disk_name, @resource_group)
+            @sas_url = nil
+          end
+        end
+      end
+    end
+  end
+end

data/lib/azure/armrest/storage/managed_storage_helper.rb

@@ -1,4 +1,5 @@
 module Azure::Armrest::Storage::ManagedStorageHelper
+  require_relative 'managed_disk'
   # Get the raw blob information for a managed disk. This is similar to
   # the StorageAccount#get_blob_raw method, but applies only to a managed
   # disk or its snapshot, whereas that method applies only to an individual storage
@@ -49,37 +50,12 @@ module Azure::Armrest::Storage::ManagedStorageHelper
   #   p data.headers
   #   File.open('vm.vhd', 'a'){ |fh| fh.write(data.body) }
   #
-  def get_blob_raw(disk_name, resource_group = configuration.resource_group, options = {})
-    validate_resource_group(resource_group)
-
-    post_options = {
-      :access            => 'read',                    # Must be 'read'
-      :durationInSeconds => options[:duration] || 3600 # 1 hour default
-    }
-
-    # This call will give us an operations URL in the headers.
-    begin_get_access_url = build_url(resource_group, disk_name, 'BeginGetAccess')
-    begin_get_access_response = rest_post(begin_get_access_url, post_options.to_json)
-
-    headers = Azure::Armrest::ResponseHeaders.new(begin_get_access_response.headers)
-    status = wait(headers, 120, 5)
-
-    unless status.casecmp('succeeded').zero?
-      msg = "Unable to obtain an operations URL for #{disk_name}/#{resource_group}"
-      log('debug', "#{msg}: #{begin_get_access_response.headers}")
-      raise Azure::Armrest::NotFoundException.new(begin_get_access_response.code, msg, begin_get_access_response.body)
-    end
-
-    # Get the SAS URL from the BeginGetAccess call
-    op_url = headers.try(:azure_asyncoperation) || headers.location
-
-    # Dig the URL + SAS token URL out of the response
-    response = rest_get(op_url)
-
-    body = Azure::Armrest::ResponseBody.new(response.body)
-    sas_url = body.properties.output.access_sas
+  def open(disk_name, resource_group = configuration.resource_group, options = {})
+    ManagedDisk.new(self, disk_name, resource_group, options)
+  end
 
-    # The same restrictions that apply to the StorageAccont method also apply here.
+  def read(sas_url, options = {})
+    # The same restrictions that apply to the StorageAccount method also apply here.
     range = options[:range] if options[:range]
     range ||= options[:start_byte]..options[:end_byte] if options[:start_byte] && options[:end_byte]
     range ||= options[:start_byte]..options[:start_byte] + options[:length] - 1 if options[:start_byte] && options[:length]
@@ -95,8 +71,8 @@ module Azure::Armrest::Storage::ManagedStorageHelper
 
     # Need to make a raw call since we need to explicitly pass headers,
     # but without encoding the URL or passing our configuration token.
-    max_retries = 5
-    retries     = 0
+    max_retries           = 5
+    retries               = 0
 
     begin
       RestClient::Request.execute(
@@ -107,17 +83,59 @@ module Azure::Armrest::Storage::ManagedStorageHelper
         :ssl_version => configuration.ssl_version,
         :ssl_verify  => configuration.ssl_verify
       )
+    rescue Azure::Armrest::ForbiddenException => err
+      log('warn', "ManagedStorageHelper.read: #{err}")
+      raise err
     rescue RestClient::Exception, Azure::Armrest::ForbiddenException => err
-      retries += 1
       raise err unless retries < max_retries
-      log('warn', "get_blob_raw: #{err} - retry number #{retries}")
+      log('warn', "ManagedStorageHelper.read: #{err} - retry number #{retries}")
+      retries += 1
       sleep 5
       retry
     end
-  ensure
-    if begin_get_access_response && status.casecmp('succeeded').zero?
-      end_url = build_url(resource_group, disk_name, 'EndGetAccess')
-      rest_post(end_url)
+  end
+
+  def close(disk_name, resource_group)
+    end_url = build_url(resource_group, disk_name, 'EndGetAccess')
+    rest_post(end_url)
+  end
+
+  def get_blob_raw(disk_name, resource_group = configuration.resource_group, options = {})
+    managed_disk = open(disk_name, resource_group, options)
+    begin
+      managed_disk.read(options)
+    ensure
+      managed_disk.close
+    end
+  end
+
+  def access_token(disk_name, resource_group = configuration.resource_group, options = {})
+    validate_resource_group(resource_group)
+
+    post_options = {
+      :access            => 'read',                    # Must be 'read'
+      :durationInSeconds => options[:duration] || 3600 # 1 hour default
+    }
+
+    # This call will give us an operations URL in the headers.
+    begin_get_access_url = build_url(resource_group, disk_name, 'BeginGetAccess')
+    begin_get_access_response = rest_post(begin_get_access_url, post_options.to_json)
+
+    headers = Azure::Armrest::ResponseHeaders.new(begin_get_access_response.headers)
+    status = wait(headers, 120, 1)
+
+    unless status.casecmp('succeeded').zero?
+      msg = "Unable to obtain an operations URL for #{disk_name}/#{resource_group}"
+      log('debug', "#{msg}: #{begin_get_access_response.headers}")
+      raise Azure::Armrest::NotFoundException.new(begin_get_access_response.code, msg, begin_get_access_response.body)
     end
+
+    # Get the SAS URL from the BeginGetAccess call
+    op_url = headers.try(:azure_asyncoperation) || headers.location
+
+    # Dig the URL + SAS token URL out of the response
+    response = rest_get(op_url)
+    body     = Azure::Armrest::ResponseBody.new(response.body)
+    body.properties.output.access_sas
   end
 end

data/lib/azure/armrest/storage_account_service.rb

@@ -296,7 +296,7 @@ module Azure
                   :skip_accessors_definition => true
                 )
               rescue Errno::ECONNREFUSED, Azure::Armrest::TimeoutException => err
-                msg = "Unable to collect blob properties for #{blob.name}/#{blob.container}: #{err}"
+                msg = "Unable to collect blob properties for #{blob.name_from_hash}/#{blob.container_from_hash}: #{err}"
                 log('warn', msg)
                 next
               end

data/lib/azure/armrest/version.rb

@@ -1,6 +1,6 @@
 module Azure
   module Armrest
     # The version of the azure-armrest library.
-    VERSION = '0.9.4'.freeze
+    VERSION = '0.9.5'.freeze
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: azure-armrest
 version: !ruby/object:Gem::Version
-  version: 0.9.4
+  version: 0.9.5
 platform: ruby
 authors:
 - Daniel J. Berger
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-29 00:00:00.000000000 Z
+date: 2018-01-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -261,6 +261,7 @@ files:
 - lib/azure/armrest/sql/sql_server_service.rb
 - lib/azure/armrest/storage/disk_service.rb
 - lib/azure/armrest/storage/image_service.rb
+- lib/azure/armrest/storage/managed_disk.rb
 - lib/azure/armrest/storage/managed_storage_helper.rb
 - lib/azure/armrest/storage/snapshot_service.rb
 - lib/azure/armrest/storage_account_service.rb