azure-armrest 0.9.7 → 0.9.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: c06e7097d8652955d4ba02fd9a45af7b4877dc10
-  data.tar.gz: 66613b67f52124b592b474ba5539d4323442f059
+SHA256:
+  metadata.gz: 308fa0471db6fcfcf327950d653656c9b8f920664f328784720d6d79fb8d92c7
+  data.tar.gz: 2df3fed1b871bb4d037acd2e66d9dac4720a96b29399d1875ca454cef5b0b0ee
 SHA512:
-  metadata.gz: a5b83e1622e46b89b2f37f2cb5e7db17b8ba9a052ea95660c6c01e66031fe1dea2adebe310cddef974213b7d2f0fc444cff34ba12a2b411d69f33c6e7bd4abc2
-  data.tar.gz: 1edb37efd68be1ac101298cf7059b06ca16f008d6b7d9b21d166a5710ea5be42db14dc60855c7bf3bfaaa1b403a2a561dd820b9bd17efba99890a43a924b2460
+  metadata.gz: d0e1fe0a64713a2ad3decb326ba5e182eb72e53e2960de6d1ddf1daab03ec1579046c4ed38fafa17434c8f1b9afb6519486a138f8f9a77e8e80444a9f0b0b18e
+  data.tar.gz: df7b6ef4e32b62a81b6d394b6e44a303bd8631ac17fc8bc260e3f852e6058c3dc38e799529c3f36e0a0091ae6245ac9bda43fa6fbe9a9bfd0222199e297f4463

data/CHANGES

@@ -1,3 +1,12 @@
+= 0.9.8 - 14-mar-2018
+* Performance of the VirtualMachineImageService#list_all method has been
+  dramatically improved.
+* Added the StorageAccountService#get_by_url method.
+* Fixed an error message in the StorageAccountService#list_private_images method.
+* Added an error check for invalid ID strings in the
+  ResourceGroupBasedService#get_by_id method.
+* Minor doc updates.
+
 = 0.9.7 - 5-Mar-2018
 * Added get_by_id support for templates and template operations.
 

data/lib/azure/armrest/network/route_service.rb

@@ -1,7 +1,7 @@
 module Azure
   module Armrest
     module Network
-      # Base class for managing subnets
+      # Base class for managing routes in a route table
       class RouteService < ResourceGroupBasedSubservice
         def initialize(armrest_configuration, options = {})
           super(armrest_configuration, 'routeTables', 'routes', 'Microsoft.Network', options)

data/lib/azure/armrest/network/route_table_service.rb

@@ -1,9 +1,9 @@
 module Azure
   module Armrest
     module Network
-      # Class for managing load balancers
+      # Class for managing route tables
       class RouteTableService < ResourceGroupBasedService
-        # Creates and returns a new LoadBalancerService instance.
+        # Creates and returns a new RouteTableService instance.
         #
         def initialize(armrest_configuration, options = {})
           super(armrest_configuration, 'routeTables', 'Microsoft.Network', options)

data/lib/azure/armrest/resource_group_based_service.rb

@@ -212,6 +212,7 @@ module Azure
         }xi
 
         match = regex.match(id_string)
+        raise ArgumentError, "Invalid ID string: #{id_string}" unless match
         Hash[match.names.zip(match.captures)]
       end
 

data/lib/azure/armrest/storage_account_service.rb

@@ -28,6 +28,33 @@ module Azure
         super(filter).each { |model| model.configuration = configuration }
       end
 
+      # Retrieve information about the storage account using a URI. You may optionally
+      # specify a resource group name, which will slightly faster. By default it will
+      # use the resource group specified in the service configuration, if any.
+      #
+      # Example:
+      #
+      #   sas = Azure::Armrest::StorageAccountService.new(<config>)
+      #   url = https://foo.blob.core.windows.net/vhds/dberger1201691213010.vhd"
+      #
+      #   sas.get_from_url(url)
+      #   sas.get_from_url(url, some_resource_group)
+      #
+      def get_from_url(url, resource_group = configuration.resource_group)
+        uri  = Addressable::URI.parse(url)
+        name = uri.host.split('.').first
+
+        unless resource_group
+          rservice = Azure::Armrest::ResourceService.new(configuration)
+          filter   = "resourceType eq 'Microsoft.Storage/storageAccounts' and name eq '#{name}'"
+          resource = rservice.list_all(:filter => filter, :all => true).first
+          raise ArgumentError, "unable to find resource group for #{url}" unless resource
+          resource_group = resource.id[/resourceGroups\/(.*?)\//i, 1]
+        end
+
+        get(name, resource_group)
+      end
+
       # Creates a new storage account, or updates an existing account with the
       # specified parameters.
       #
@@ -191,26 +218,11 @@ module Azure
         get_private_images(storage_accounts)
       end
 
-      # Return the storage account for the virtual machine model +vm+.
+      # Return the storage account for the virtual machine model +vm+. Note that
+      # this method returns the storage account for the OS disk.
       #
       def get_from_vm(vm)
-        uri = Addressable::URI.parse(vm.properties.storage_profile.os_disk.vhd.uri)
-
-        # The uri looks like https://foo123.blob.core.windows.net/vhds/something123.vhd
-        name = uri.host.split('.').first # storage name, e.g. 'foo123'
-
-        # Look for the storage account in the VM's resource group first. If
-        # it's not found, look through all the storage accounts.
-        begin
-          acct = get(name, vm.resource_group)
-        rescue Azure::Armrest::NotFoundException => err
-          acct = list_all(:name => name).first
-          raise err unless acct
-        end
-
-        acct.configuration = configuration
-
-        acct
+        get_from_url(vm.properties.storage_profile.os_disk.vhd.uri)
       end
 
       # Get information for the underlying VHD file based on the properties
@@ -296,7 +308,7 @@ module Azure
                   :skip_accessors_definition => true
                 )
               rescue Errno::ECONNREFUSED, Azure::Armrest::TimeoutException => err
-                msg = "Unable to collect blob properties for #{blob.name_from_hash}/#{blob.container_from_hash}: #{err}"
+                msg = "Unable to collect blob properties for #{blob.name_from_hash}/#{blob[:container]}: #{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.7'.freeze
+    VERSION = '0.9.8'.freeze
   end
 end

data/lib/azure/armrest/virtual_machine_image_service.rb

@@ -31,23 +31,28 @@ module Azure
       def list_all(location = @location)
         raise ArgumentError, "No location specified" unless location
 
+        mutex  = Mutex.new
         images = []
-        publishers(location).each do |publisher|
-          offers(location, publisher.name).each do |offer|
-            skus(offer.name, location, publisher.name).each do |sku|
-              versions(sku.name, offer.name, location, publisher.name).each do |version|
-                images << Azure::Armrest::VirtualMachineImage.new(
+
+        Parallel.each(publishers(location), :in_threads => configuration.max_threads) do |publisher|
+          Parallel.each(offers(location, publisher.name), :in_threads => configuration.max_threads) do |offer|
+            Parallel.each(skus(offer.name, location, publisher.name), :in_threads => configuration.max_threads) do |sku|
+              Parallel.each(versions(sku.name, offer.name, location, publisher.name), :in_threads => configuration.max_threads) do |version|
+                mutex.synchronize do
+                  images << Azure::Armrest::VirtualMachineImage.new(
                     :location  => version.location,
                     :publisher => publisher.name,
                     :offer     => offer.name,
                     :sku       => sku.name,
                     :version   => version.name,
                     :id        => "#{publisher.name}:#{offer.name}:#{sku.name}:#{version.name}"
-                )
+                  )
+                end
               end
             end
           end
         end
+
         images
       end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: azure-armrest
 version: !ruby/object:Gem::Version
-  version: 0.9.7
+  version: 0.9.8
 platform: ruby
 authors:
 - Daniel J. Berger
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-05 00:00:00.000000000 Z
+date: 2018-03-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -291,7 +291,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: An interface for ARM/JSON Azure REST API