azure-armrest 0.2.10 → 0.3.0

data/lib/azure/armrest/resource_group_based_service.rb

@@ -83,7 +83,7 @@ module Azure
         mutex = Mutex.new
 
         resource_groups.each do |rg|
-          threads << Thread.new(rg['name']) do |group|
+          threads << Thread.new(rg.name) do |group|
             response = rest_get(build_url(group))
             results = JSON.parse(response)['value'].map { |hash| model_class.new(hash) }
             mutex.synchronize { array << results } unless results.blank?

data/lib/azure/armrest/resource_group_service.rb

@@ -18,16 +18,16 @@ module Azure
       #
       #   rgs = ResourceGroupService.new
       #   rgs.list(:top => 2)
-      #   rgs.list(:filter => "sometag=value")
+      #   rgs.list(:filter => "sometag eq 'value'")
       #
       def list(options = {})
         url = build_url
         url << "&$top=#{options[:top]}" if options[:top]
         url << "&$filter=#{options[:filter]}" if options[:filter]
 
-        response = rest_get(URI.escape(url))
+        response = rest_get(url)
 
-        JSON.parse(response)["value"].map{ |hash| Azure::Armrest::ResourceGroup.new(hash) }
+        JSON.parse(response)['value'].map { |hash| Azure::Armrest::ResourceGroup.new(hash) }
       end
 
       # Creates a new +group+ in +location+ for the current subscription.

data/lib/azure/armrest/resource_service.rb

@@ -10,37 +10,29 @@ module Azure
         super(configuration, 'subscriptions', 'Microsoft.Resources', options)
       end
 
-      # List all the resources for the current subscription. You can optionally
-      # pass :top or :filter options as well to restrict returned results.
-      #
-      # If you pass a :resource_group option, then only resources for that
-      # resource group are returned.
+      # List all the resources for the current subscription in the specified
+      # resource group. You can optionally pass :top or :filter options as well
+      # to restrict returned results.
       #
       # Examples:
       #
-      #   rs = ResourceService.new
-      #   rs.list(:top => 2)
-      #   rs.list(:filter => "location eq 'centralus'")
+      #   rs = Azure::Armrest::ResourceService.new
+      #   rs.list(your_group, :top => 2)
+      #   rs.list(your_group, :filter => "location eq 'centralus'")
       #
-      def list(options = {})
-        subscription_id = configuration.subscription_id
-
-        if options[:resource_group]
-          url = File.join(
-            Azure::Armrest::COMMON_URI, subscription_id, 'resourcegroups',
-            options[:resource_group], 'resources'
-          )
-        else
-          url = File.join(Azure::Armrest::COMMON_URI, subscription_id, 'resources')
-        end
-
-        url << "?api-version=#{@api_version}"
-        url << "&$top=#{options[:top]}" if options[:top]
-        url << "&$filter=#{options[:filter]}" if options[:filter]
-
-        response = rest_get(URI.escape(url))
+      def list(resource_group, options = {})
+        url = build_url(resource_group, options)
+        response = rest_get(url)
+        JSON.parse(response)['value'].map { |hash| Azure::Armrest::Resource.new(hash) }
+      end
 
-        JSON.parse(response)["value"].map{ |hash| Azure::Armrest::Resource.new(hash) }
+      # Same as Azure::Armrest::ResourceService#list but returns all resources
+      # for all resource groups.
+      #
+      def list_all(options = {})
+        url = build_url(nil, options)
+        response = rest_get(url)
+        JSON.parse(response)['value'].map { |hash| Azure::Armrest::Resource.new(hash) }
       end
 
       # Move the resources from +source_group+ under +source_subscription+,
@@ -79,6 +71,23 @@ module Azure
         check_resource(resource_name, resource_type)['status'] == 'Allowed'
       end
 
+      private
+
+      def build_url(resource_group = nil, options = {})
+        url = File.join(Azure::Armrest::COMMON_URI, configuration.subscription_id)
+
+        if resource_group
+          url = File.join(url, 'resourceGroups', resource_group, 'resources')
+        else
+          url = File.join(url, 'resources')
+        end
+
+        url << "?api-version=#{@api_version}"
+        url << "&$top=#{options[:top]}" if options[:top]
+        url << "&$filter=#{options[:filter]}" if options[:filter]
+
+        url
+      end
     end # ResourceService
   end # Armrest
 end # Azure

data/lib/azure/armrest/storage_account_service.rb

@@ -4,15 +4,6 @@ module Azure
   module Armrest
     # Class for managing storage accounts.
     class StorageAccountService < ResourceGroupBasedService
-
-      # Valid account types for the create or update method.
-      VALID_ACCOUNT_TYPES = %w[
-        Standard_LRS
-        Standard_ZRS
-        Standard_GRS
-        Standard_RAGRS
-      ]
-
       # Creates and returns a new StorageAccountService (SAS) instance.
       #
       def initialize(configuration, options = {})
@@ -89,7 +80,6 @@ module Azure
       #
       def create(account_name, rgroup = configuration.resource_group, options)
         validating = options.delete(:validating)
-        validate_account_type(options[:properties][:accountType])
         validate_account_name(account_name)
 
         acct = super(account_name, rgroup, options) do |url|
@@ -222,7 +212,7 @@ module Azure
       end
 
       def parse_uri(uri)
-        uri = URI.parse(uri)
+        uri = Addressable::URI.parse(uri)
         host_components = uri.host.split('.')
 
         rh = {
@@ -261,13 +251,7 @@ module Azure
 
         storage_accounts.each do |lstorage_account|
           threads << Thread.new(lstorage_account) do |storage_account|
-            begin
-              key = get_account_key(storage_account)
-            rescue Azure::Armrest::ApiException => err
-              # Most likely because the storage account isn't completely provisioned
-              # yet or provisioning of the account was not successful
-              next
-            end
+            key = get_account_key(storage_account)
 
             storage_account.all_blobs(key).each do |blob|
               next unless File.extname(blob.name).casecmp('.vhd') == 0
@@ -336,12 +320,6 @@ module Azure
         hash
       end
 
-      def validate_account_type(account_type)
-        unless VALID_ACCOUNT_TYPES.include?(account_type)
-          raise ArgumentError, "invalid account type '#{account_type}'"
-        end
-      end
-
       def validate_account_name(name)
         if name.size < 3 || name.size > 24 || name[/\W+/]
           raise ArgumentError, "name must be 3-24 alpha-numeric characters only"

data/lib/azure/armrest/version.rb

@@ -1,5 +1,5 @@
 module Azure
   module Armrest
-    VERSION = '0.2.10'.freeze
+    VERSION = '0.3.0'.freeze
   end
 end

data/lib/azure/armrest/virtual_machine_service.rb

@@ -17,14 +17,15 @@ module Azure
       end
 
       # Return a list of available VM series (aka sizes, flavors, etc), such
-      # as "Basic_A1", though information is included as well.
+      # as "Basic_A1", though other information is included as well.
       #
       def series(location)
-        unless @@providers_hash[provider.downcase] && @@providers_hash[provider.downcase]['locations/vmsizes']
-          raise ArgumentError, "Invalid provider '#{provider}'"
-        end
+        namespace = 'microsoft.compute'
+        version = configuration.provider_default_api_version(namespace, 'locations/vmsizes')
 
-        version = @@providers_hash[provider.downcase]['locations/vmsizes']['api_version']
+        unless version
+          raise ArgumentError, "Unable to find resources for #{namespace}"
+        end
 
         url = url_with_api_version(
           version, @base_url, 'subscriptions', configuration.subscription_id,

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: azure-armrest
 version: !ruby/object:Gem::Version
-  version: 0.2.10
+  version: 0.3.0
 platform: ruby
 authors:
 - Daniel J. Berger
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-15 00:00:00.000000000 Z
+date: 2016-06-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -97,6 +97,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.6.0
+- !ruby/object:Gem::Dependency
+  name: addressable
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.4.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.4.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -194,6 +208,8 @@ files:
 - lib/azure/armrest/armrest_collection.rb
 - lib/azure/armrest/armrest_service.rb
 - lib/azure/armrest/availability_set_service.rb
+- lib/azure/armrest/billing/usage_service.rb
+- lib/azure/armrest/configuration.rb
 - lib/azure/armrest/exception.rb
 - lib/azure/armrest/insights/alert_service.rb
 - lib/azure/armrest/insights/event_service.rb