azure-armrest 0.2.7 → 0.2.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: edf2ba291d6e30b9bbc4b1358d33fa0b0ab44203
-  data.tar.gz: c4a444504dfe8e490a04166806d889d2b1a4426f
+  metadata.gz: 83cc9a600096d0ba6960803745720f3db623e035
+  data.tar.gz: 6dfc6c507bd13b8563c345c2c22a5076a0c4ab1e
 SHA512:
-  metadata.gz: 8f3aefdf3b5d17a8e2226a8edbb4fa855f81c697038c5ea9b6d8f9e3df14a72fd93b99f9f6ef417e95455b2cab31572647d4443ae222a480ff41d28cac6a8211
-  data.tar.gz: 977091814361c70170aca2bab6e8a889d0e8287ffd202285aa94cfb573cc2f92ab09d4ad8085d2eb4560073e37e009b8d787186c8235ff982db0464592a82e15
+  metadata.gz: 622474a14751ccc15e669c3a0502e124fd3e2500d3e7889ef5f759b547852d78f0a14cd8bb6cc6977fd2936e40a2c72c4db82d438a32ddd7052df7fc55d692a3
+  data.tar.gz: 17440d8c5629a94c1f4e04a98046939537ffa8996a843dc7d2998796a6f76a3089434e79489b899d260589dc102c507188595bb937d233e80a3d010643f346be

data/.travis.yml

@@ -1,8 +1,7 @@
 language: ruby
 rvm:
-- "2.0"
-- "2.1"
-- "2.2"
+- "2.2.5"
+- "2.3.1"
 - ruby-head
 - jruby-head
 matrix:

data/CHANGES

@@ -1,3 +1,7 @@
+= 0.2.8 - 22-Jul-2016
+* Backported PR #188 (add list_all_private_images method).
+* Backported PR #194 (updated .travis.yml).
+
 = 0.2.7 - 20-Jun-2016
 * All internal calls to rest-client are now explicitly URI.encode'd.
 

data/lib/azure/armrest/storage_account_service.rb

@@ -186,51 +186,35 @@ module Azure
 
       alias regenerate_storage_account_key_objects regenerate_account_key_objects
 
-      # Returns a list of images that are available for provisioning for all
-      # storage accounts in the provided resource group. The custom keys
-      # :uri and :operating_system have been added for convenience.
+      # Returns a list of PrivateImage objects that are available for
+      # provisioning for all storage accounts in the current subscription.
       #
-      def list_private_images(group = configuration.resource_group)
-        results = []
-        threads = []
-        mutex = Mutex.new
-
-        list(group).each do |lstorage_account|
-          threads << Thread.new(lstorage_account) do |storage_account|
-            if recent_api_version?
-              key = list_account_key_objects(storage_account.name, group).first.key
-            else
-              key = list_account_keys(storage_account.name, group).fetch('key1')
-            end
-
-            storage_account.all_blobs(key).each do |blob|
-              next unless File.extname(blob.name).downcase == '.vhd'
-              next unless blob.properties.lease_state.downcase == 'available'
-
-              blob_properties = storage_account.blob_properties(blob.container, blob.name, key)
-              next unless blob_properties.respond_to?(:x_ms_meta_microsoftazurecompute_osstate)
-              next unless blob_properties.x_ms_meta_microsoftazurecompute_osstate.downcase == 'generalized'
-
-              mutex.synchronize do
-                hash = blob.to_h.merge(
-                  :storage_account  => storage_account.to_h,
-                  :blob_properties  => blob_properties.to_h,
-                  :operating_system => blob_properties.try(:x_ms_meta_microsoftazurecompute_ostype),
-                  :uri => File.join(
-                    storage_account.properties.primary_endpoints.blob,
-                    blob.container,
-                    blob.name
-                  )
-                )
-                results << StorageAccount::PrivateImage.new(hash)
-              end
-            end
-          end
-        end
-
-        threads.each(&:join)
+      # You may optionally reduce the set of storage accounts that will
+      # be scanned by providing a filter, where the keys are StorageAccount
+      # properties.
+      #
+      # Example:
+      #
+      #   sas.list_all_private_images(:location => 'eastus', resource_group => 'some_group')
+      #
+      def list_all_private_images(filter = {})
+        storage_accounts = list_all.select { |acct| filter.all? { |k, v| acct.public_send(k) == v } }
+        get_private_images(storage_accounts)
+      end
 
-        results.flatten
+      # Returns a list of PrivateImage objects that are available for
+      # provisioning for all storage accounts in the provided resource group.
+      #
+      # The custom keys :uri and :operating_system have been added to the
+      # resulting PrivateImage objects for convenience.
+      #
+      # Example:
+      #
+      #   sas.list_private_images(your_resource_group)
+      #
+      def list_private_images(group = configuration.resource_group)
+        storage_accounts = list(group)
+        get_private_images(storage_accounts)
       end
 
       def accounts_by_name
@@ -267,6 +251,67 @@ module Azure
 
       private
 
+      # Given a list of StorageAccount objects, returns all private images
+      # within those accounts.
+      #
+      def get_private_images(storage_accounts)
+        results = []
+        threads = []
+        mutex = Mutex.new
+
+        storage_accounts.each do |lstorage_account|
+          threads << Thread.new(lstorage_account) do |storage_account|
+            key = get_account_key(storage_account)
+
+            storage_account.all_blobs(key).each do |blob|
+              next unless File.extname(blob.name).casecmp('.vhd') == 0
+              next unless blob.properties.lease_state.casecmp('available') == 0
+
+              blob_properties = storage_account.blob_properties(blob.container, blob.name, key)
+              next unless blob_properties.respond_to?(:x_ms_meta_microsoftazurecompute_osstate)
+              next unless blob_properties.x_ms_meta_microsoftazurecompute_osstate.casecmp('generalized') == 0
+
+              mutex.synchronize do
+                results << blob_to_private_image_object(storage_account, blob, blob_properties)
+              end
+            end
+          end
+        end
+
+        threads.each(&:join)
+
+        results
+      end
+
+      # Converts a StorageAccount::Blob object into a StorageAccount::PrivateImage
+      # object, which is a mix of Blob and StorageAccount properties.
+      #
+      def blob_to_private_image_object(storage_account, blob, blob_properties)
+        hash = blob.to_h.merge(
+          :storage_account  => storage_account.to_h,
+          :blob_properties  => blob_properties.to_h,
+          :operating_system => blob_properties.try(:x_ms_meta_microsoftazurecompute_ostype),
+          :uri              => File.join(
+            storage_account.properties.primary_endpoints.blob,
+            blob.container,
+            blob.name
+          )
+        )
+
+        StorageAccount::PrivateImage.new(hash)
+      end
+
+      # Get the key for the given +storage_acct+ using the appropriate method
+      # depending on the api-version.
+      #
+      def get_account_key(storage_acct)
+        if recent_api_version?
+          list_account_key_objects(storage_acct.name, storage_acct.resource_group).first.key
+        else
+          list_account_keys(storage_acct.name, storage_acct.resource_group).fetch('key1')
+        end
+      end
+
       # Check to see if the api-version string is 2016-01-01 or later.
       def recent_api_version?
         Time.parse(api_version).utc >= Time.parse('2016-01-01').utc

data/lib/azure/armrest/version.rb

@@ -1,5 +1,5 @@
 module Azure
   module Armrest
-    VERSION = '0.2.7'.freeze
+    VERSION = '0.2.8'.freeze
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: azure-armrest
 version: !ruby/object:Gem::Version
-  version: 0.2.7
+  version: 0.2.8
 platform: ruby
 authors:
 - Daniel J. Berger
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-20 00:00:00.000000000 Z
+date: 2016-07-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json