azure-armrest 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: defac8d47729576388ef8ee13366182f5d2ba617
-  data.tar.gz: 226dd08875b1bcee85ce4ada88c0d31653a7c0d5
+  metadata.gz: 198f8903222b20b0bbea81928db29aab7436dbae
+  data.tar.gz: 25a4b584d105a275782a32635e69faa78e6d6250
 SHA512:
-  metadata.gz: a111aa4f81c3a43699a5f39f78cbbadbc84361d18a58d40e4e5f803ad1ab2b90daa22d261ce3f58241ad787cd5c01c2678b91ec70ef977c6078d93bc74359ad1
-  data.tar.gz: 90cc8169495c37470eee3bc75b93fb907b93aa15a4a8f2c67c6cae34af5543b353a576f337f207f8c5da040a2ca4c4bf16e37a5bf92bb6821030c3669ad6b6bd
+  metadata.gz: d6c3ab976bc6b91665dafccfcfc5e317023c9feddeb61ec580764fe07858d095be9cb8bb8d715c8c4cf53ec589ae76b8cb6657f759152a014f11c729a0f0d11e
+  data.tar.gz: 9023b4532602c882d34282208cf4941b7cf5bd130e641d7da11b3c8fdca5235a075df763454bded12bc389df91ebd21aa0b4185dfa45ca3a2ff2bc2c9b17beb4

data/CHANGES

@@ -1,3 +1,10 @@
+= 0.0.8 - 10-Nov-2015
+* Added the list_private_images method to the StorageAccountService class.
+* Added the list_all method to the ResourceGroupService class.
+* Removed the EventService class for now. It did not actually work, and will
+  eventually be re-implemented as part of a group of Insights classes.
+* Added a .to_h and .to_hash method for the BaseModel class.
+
 = 0.0.7 - 5-Nov-2015
 * Refactored our BaseModel class so that it no longer uses Delegate or OpenStruct.
 * Added more methods to the StorageAccount model, and modified methods so that

data/azure-armrest.gemspec

@@ -20,7 +20,7 @@ behind the scenes.
   EOF
 
   spec.add_dependency 'json'
-  spec.add_dependency 'rest-client', '=2.0.0.rc1'
+  spec.add_dependency 'rest-client', '~> 2.0.0.rc'
   spec.add_dependency 'cache_method', '~> 0.2.7'
   spec.add_dependency 'azure-signature', '~> 0.2.0'
   spec.add_dependency 'activesupport', '>= 1.2.0'

data/lib/azure/armrest.rb

@@ -29,7 +29,6 @@ require 'azure/armrest/availability_set_service'
 require 'azure/armrest/virtual_machine_service'
 require 'azure/armrest/virtual_machine_image_service'
 require 'azure/armrest/virtual_machine_extension_service'
-require 'azure/armrest/event_service'
 require 'azure/armrest/template_deployment_service'
 require 'azure/armrest/resource_service'
 require 'azure/armrest/resource_group_service'

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

@@ -54,14 +54,14 @@ module Azure
         end
 
         if json.is_a?(Hash)
-          hash = json
+          @hash = json
           @json = json.to_json
         else
-          hash = JSON.parse(json)
+          @hash = JSON.parse(json)
           @json = json
         end
 
-        __setobj__(hash)
+        __setobj__(@hash.dup)
       end
 
       def resource_group
@@ -72,6 +72,14 @@ module Azure
         @resource_group = rg
       end
 
+      def to_h
+        @hash
+      end
+
+      def to_hash
+        @hash
+      end
+
       def to_json
         @json
       end

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

@@ -10,6 +10,7 @@ module Azure
       class ContainerProperty < BaseModel; end
       class Blob < BaseModel; end
       class BlobProperty < BaseModel; end
+      class PrivateImage < BlobProperty; end
       class BlobServiceProperty < BaseModel; end
       class BlobServiceStat < BaseModel; end
       class BlobMetadata < BaseModel; end
@@ -95,9 +96,8 @@ module Azure
         doc = Nokogiri::XML(response.body)
 
         doc.xpath('//Blobs/Blob').map do |node|
-          blob = Blob.new(Hash.from_xml(node.to_s)['Blob'])
-          blob[:container] = container
-          blob
+          hash = Hash.from_xml(node.to_s)['Blob'].merge(:container => container)
+          Blob.new(hash)
         end
       end
 

data/lib/azure/armrest/resource_provider_service.rb

@@ -47,13 +47,32 @@ module Azure
         response = rest_get(build_url)
         JSON.parse(response)["value"]
       end
+
       private :_list
 
-      # Cannot directly cache list method, because Marshal used by chche_method
-      # cannot dump anonymous class, including the ones derived from Azure::Armrest::BaseModel
-      # Same applies to other cached methods in this class
+      # Cannot directly cache list method, because Marshal used by cache_method
+      # cannot dump anonymous classes, including the ones derived from
+      # Azure::Armrest::BaseModel.
+      #
+      # The same applies to other cached methods in this class.
       cache_method(:_list, cache_time)
 
+      # List all the providers for Azure. This may include results that are
+      # not available for the current subscription.
+      #
+      def list_all
+        _list_all.map{ |hash| Azure::Armrest::ResourceProvider.new(hash) }
+      end
+
+      def _list_all
+        url = File.join(Azure::Armrest::RESOURCE, 'providers')
+        url << "?api-version=#{@api_version}"
+        response = rest_get(url)
+        JSON.parse(response)['value']
+      end
+
+      cache_method(:_list_all, cache_time)
+
       # Return information about a specific +namespace+ provider. The results
       # of this method are cached.
       #
@@ -65,6 +84,7 @@ module Azure
         url = build_url(namespace)
         rest_get(url).body
       end
+
       private :_get
 
       cache_method(:_get, cache_time)

data/lib/azure/armrest/storage_account_service.rb

@@ -70,7 +70,6 @@ module Azure
         end
       end
 
-
       # Returns the primary and secondary access keys for the given
       # storage account as a hash.
       #
@@ -98,6 +97,49 @@ module Azure
         JSON.parse(response)
       end
 
+      # 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.
+      #
+      def list_private_images(group = armrest_configuration.resource_group)
+        results = []
+        threads = []
+        mutex = Mutex.new
+
+        list(group).each do |lstorage_account|
+          threads << Thread.new(lstorage_account) do |storage_account|
+            key = list_account_keys(storage_account.name, group).fetch('key1')
+
+            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)
+
+        results.flatten
+      end
+
       private
 
       def validate_account_type(account_type)

data/lib/azure/armrest/version.rb

@@ -1,5 +1,5 @@
 module Azure
   module Armrest
-    VERSION = "0.0.7"
+    VERSION = "0.0.8"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: azure-armrest
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - Daniel J. Berger
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-06 00:00:00.000000000 Z
+date: 2015-11-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -31,16 +31,16 @@ dependencies:
   name: rest-client
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.0.rc1
+        version: 2.0.0.rc
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.0.rc1
+        version: 2.0.0.rc
 - !ruby/object:Gem::Dependency
   name: cache_method
   requirement: !ruby/object:Gem::Requirement
@@ -193,7 +193,6 @@ files:
 - lib/azure/armrest.rb
 - lib/azure/armrest/armrest_service.rb
 - lib/azure/armrest/availability_set_service.rb
-- lib/azure/armrest/event_service.rb
 - lib/azure/armrest/exception.rb
 - lib/azure/armrest/model/base_model.rb
 - lib/azure/armrest/model/storage_account.rb

data/lib/azure/armrest/event_service.rb

@@ -1,32 +0,0 @@
-module Azure
-  module Armrest
-    class EventService < ArmrestService
-
-      def initialize(armrest_configuration, _options = {})
-        super
-
-        @base_url += "providers/microsoft.insights/eventtypes/management/values"
-        @base_url += "?api-version=#{armrest_configuration.api_version}"
-      end
-
-      # check what data type the event channel is
-
-      def get_rg_events(starttime, endtime, channels, rg_name )
-        @uri += build_filter += " and resourceGroupName eq '#{rg_name}'"
-      end
-
-      def get_resource_events(starttime, endtime, channels, resource_uri )
-        @uri += build_filter += " and resourceUri eq '#{resource_uri}'"
-      end
-
-      def build_filter(starttime, endtime, channels)
-        "$filter=eventTimestamp ge '#{starttime}' and eventTimestamp le '#{endtime}'
-         and eventChannels eq '#{channels}'"
-      end
-
-      def select_properties(property_names)
-        "&$select={property_names}"
-      end
-    end
-  end
-end