azure-armrest 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 62a4984d7d387a029f6e37b0b3fb34e3ef2cb66b
-  data.tar.gz: 7f7d881116fe76082ed7ca21352117796bc01516
+  metadata.gz: 90de5f291ba5efea0f715c848e05dcaecf52110d
+  data.tar.gz: c30be8f74ef00dfe99f069eac51bbed61644ff00
 SHA512:
-  metadata.gz: 9e208bb91e488aa4d1718c926c269ad1535845bacf50e7207fc9503ef6d704e314de34cf75077cab0c90a34f1eacc5fca10b5efac3fdc9f8952c6e1e1bd8161e
-  data.tar.gz: df333ea565a2e3a0d06cfe98cfd6f2948fc412bcbd3607201cedaaed838422e8c998e1a825e7a959c9cacbb33f6b4cf367e846d11bdb266db345c2abd762f7d9
+  metadata.gz: b1e1f5f15e417fe74e275bad5ca0becd7b762022bcab8eb5ad526c9cb6776760ee7d32fdc72cd6c6dbee9c11ff1c8a6dfab28c57e719db9ed97c70fb3b245646
+  data.tar.gz: 9cabb2b1274e5ff5474675cd18cb7ee959cd0508719bf553dd7944b498f3fb9eddc36728cab8b9ce7e7fe7f6349d6f281d331f263b20e33a72638299ed1956b9

data/CHANGES

@@ -1,3 +1,22 @@
+= 0.0.4 - 19-Oct-2015
+* All get/list/list_all methods now return wrapper class instances, e.g.
+  a call to VirtualMachineService#get will return a VirtualMachine instance.
+  These provide a nice OpenStruct wrapper so you can use methods instead
+  of hash references if desired.
+* A custom StorageAccount class was added that implements methods for
+  gathering blob information.
+* Most service classes now inherit from ResourceGroupBasedService, which
+  provides a common set of methods typically used for various services.
+* Now re-raises RestClient exceptions as exceptions that we have defined.
+* The VirtualMachineImage class was overhauled and is now working properly.
+* The azure-signature, nokogiri and activesupport dependencies were added.
+
+= 0.0.3 - 13-Oct-2015
+* Bug fixes for VirtualMachineImageService class.
+* Reorganized and updated SubnetService class.
+* Some updates to the BaseModel in prep for JSON wrapper classes.
+* Added NetworkSecurityGroupService and IpAddressService classes.
+
 = 0.0.2 - 23-Sep-2015
 * Revamped class names. Now use "Service" instead of "Manager".
 * Several new service classes added, updated, and refactored.

data/azure-armrest.gemspec

@@ -20,12 +20,15 @@ behind the scenes.
   EOF
 
   spec.add_dependency 'json'
-  spec.add_dependency 'rest-client'
-  spec.add_dependency 'cache_method', "~> 0.2.7"
+  spec.add_dependency 'rest-client', '=2.0.0.rc1'
+  spec.add_dependency 'cache_method', '~> 0.2.7'
+  spec.add_dependency 'azure-signature', '~> 0.2.0'
+  spec.add_dependency 'activesupport', '>= 1.2.0'
+  spec.add_dependency 'nokogiri', '~> 1.6.0'
 
-  spec.add_development_dependency "bundler"
-  spec.add_development_dependency "rake"
-  spec.add_development_dependency "rspec", "~> 3.0"
-  spec.add_development_dependency "codeclimate-test-reporter"
-  spec.add_development_dependency "timecop", "~> 0.7"
+  spec.add_development_dependency 'bundler'
+  spec.add_development_dependency 'rake'
+  spec.add_development_dependency 'rspec', '~> 3.0'
+  spec.add_development_dependency 'codeclimate-test-reporter'
+  spec.add_development_dependency 'timecop', '~> 0.7'
 end

data/lib/azure/armrest.rb

@@ -18,11 +18,12 @@ module Azure
     # A common URI for all subclasses
     COMMON_URI = RESOURCE + "subscriptions/"
   end
-
 end
 
 require 'azure/armrest/version'
+require 'azure/armrest/exception'
 require 'azure/armrest/armrest_service'
+require 'azure/armrest/resource_group_based_service'
 require 'azure/armrest/storage_account_service'
 require 'azure/armrest/availability_set_service'
 require 'azure/armrest/virtual_machine_service'

data/lib/azure/armrest/armrest_service.rb

@@ -35,7 +35,7 @@ module Azure
         def fetch_token
           token_url = Azure::Armrest::AUTHORITY + tenant_id + "/oauth2/token"
 
-          response = JSON.parse(RestClient.post(
+          response = JSON.parse(ArmrestService.rest_post(
             token_url,
             :grant_type    => grant_type,
             :client_id     => client_id,
@@ -123,7 +123,7 @@ module Azure
 
         url = File.join(Azure::Armrest::RESOURCE, "subscriptions?api-version=#{config.api_version}")
 
-        response = RestClient.get(
+        response = rest_get(
           url,
           :content_type  => config.content_type,
           :authorization => config.token
@@ -157,7 +157,7 @@ module Azure
       def providers
         url = url_with_api_version(armrest_configuration.api_version, @base_url, 'providers')
         resp = rest_get(url)
-        JSON.parse(resp.body)["value"]
+        JSON.parse(resp.body)["value"].map{ |hash| Azure::Armrest::ResourceProvider.new(hash) }
       end
 
       # Returns information about the specific provider +namespace+.
@@ -165,7 +165,7 @@ module Azure
       def provider_info(provider)
         url = url_with_api_version(armrest_configuration.api_version, @base_url, 'providers', provider)
         response = rest_get(url)
-        JSON.parse(response.body)
+        Azure::Armrest::ResourceProvider.new(response)
       end
 
       alias geo_locations provider_info
@@ -190,8 +190,8 @@ module Azure
       #
       def subscriptions
         url = url_with_api_version(armrest_configuration.api_version, @base_url, 'subscriptions')
-        resp = rest_get(url)
-        JSON.parse(resp.body)["value"]
+        response = rest_get(url)
+        JSON.parse(response.body)["value"].map{ |hash| Azure::Armrest::Subscription.new(hash) }
       end
 
       # Return information for the specified subscription ID, or the
@@ -206,8 +206,8 @@ module Azure
           armrest_configuration.subscription_id
         )
 
-        resp = rest_get(url)
-        JSON.parse(resp.body)
+        response = rest_get(url)
+        Azure::Armrest::Subscription.new(response.body)
       end
 
       # Returns a list of resources for the current subscription. If a
@@ -222,7 +222,7 @@ module Azure
         url = url_with_api_version(armrest_configuration.api_version, url_comps)
         response = rest_get(url)
 
-        JSON.parse(response.body)["value"]
+        JSON.parse(response)["value"].map{ |hash| Azure::Armrest::Resource.new(hash) }
       end
 
       # Returns a list of resource groups for the current subscription.
@@ -236,14 +236,14 @@ module Azure
           'resourcegroups'
         )
         response = rest_get(url)
-        JSON.parse(response.body)["value"]
+        JSON.parse(response)["value"].map{ |hash| Azure::Armrest::ResourceGroup.new(hash) }
       end
 
       # Returns information on the specified +resource_group+ for the current
       # subscription, or the resource group specified in the constructor if
       # none is provided.
       #
-      def resource_group_info(resource_group)
+      def resource_group_info(resource_group = armrest_configuration.resource_group)
         url = url_with_api_version(
           armrest_configuration.api_version,
           @base_url,
@@ -253,8 +253,8 @@ module Azure
           resource_group
         )
 
-        resp = rest_get(url)
-        JSON.parse(resp.body)
+        response = rest_get(url)
+        Azure::Armrest::ResourceGroup.new(response.body)
       end
 
       # Returns a list of tags for the current subscription.
@@ -268,7 +268,7 @@ module Azure
           'tagNames'
         )
         resp = rest_get(url)
-        JSON.parse(resp.body)["value"]
+        JSON.parse(resp.body)["value"].map{ |hash| Azure::Armrest::Tag.new(hash) }
       end
 
       # Returns a list of tenants that can be accessed.
@@ -276,15 +276,74 @@ module Azure
       def tenants
         url = url_with_api_version(armrest_configuration.api_version, @base_url, 'tenants')
         resp = rest_get(url)
-        JSON.parse(resp.body)
+        JSON.parse(resp.body)['value'].map{ |hash| Azure::Armrest::Tenant.new(hash) }
+      end
+
+      def self.rest_get(url, headers = {})
+        RestClient.get(url, headers)
+      rescue RestClient::Exception => e
+        raise_api_exception(e)
+      end
+
+      def self.rest_post(url, body, headers = {})
+        RestClient.post(url, body, headers)
+      rescue RestClient::Exception => e
+        raise_api_exception(e)
+      end
+
+      def self.rest_patch(url, body, headers = {})
+        RestClient.patch(url, body, headers)
+      rescue RestClient::Exception => e
+        raise_api_exception(e)
+      end
+
+      def self.rest_delete(url, headers = {})
+        RestClient.delete(url, headers)
+      rescue RestClient::Exception => e
+        raise_api_exception(e)
+      end
+
+      def self.rest_put(url, body, headers = {})
+        RestClient.put(url, body, headers)
+      rescue RestClient::Exception => e
+        raise_api_exception(e)
+      end
+
+      def self.raise_api_exception(e)
+        begin
+          response = JSON.parse(e.http_body)
+          code = response.fetch_path('error', 'code')
+          message = response.fetch_path('error', 'message')
+        rescue
+          message = e.http_body
+        end
+        message = e.http_body unless message
+
+        exception_type = case e
+                        when RestClient::NotFound
+                          ResourceNotFoundException
+                        when RestClient::BadRequest
+                          BadRequestException
+                        when RestClient::GatewayTimeout
+                          GatewayTimeoutException
+                        when RestClient::BadGateway
+                          BadGatewayException
+                        when RestClient::Unauthorized
+                          UnauthorizedException
+                        else
+                          ApiException
+                        end
+
+        raise exception_type.new(code, message, e)
       end
+      private_class_method :raise_api_exception
 
       private
 
       # REST verb methods
 
       def rest_get(url)
-        RestClient.get(
+        self.class.rest_get(
           url,
           :accept        => armrest_configuration.accept,
           :content_type  => armrest_configuration.content_type,
@@ -293,7 +352,7 @@ module Azure
       end
 
       def rest_put(url, body = '')
-        RestClient.put(
+        self.class.rest_put(
           url,
           body,
           :accept        => armrest_configuration.accept,
@@ -303,7 +362,7 @@ module Azure
       end
 
       def rest_post(url, body = '')
-        RestClient.post(
+        self.class.rest_post(
           url,
           body,
           :accept        => armrest_configuration.accept,
@@ -313,7 +372,7 @@ module Azure
       end
 
       def rest_patch(url, body = '')
-        RestClient.patch(
+        self.class.rest_patch(
           url,
           body,
           :accept        => armrest_configuration.accept,
@@ -323,7 +382,7 @@ module Azure
       end
 
       def rest_delete(url)
-        RestClient.delete(
+        self.class.rest_delete(
           url,
           :accept        => armrest_configuration.accept,
           :content_type  => armrest_configuration.content_type,
@@ -350,13 +409,13 @@ module Azure
 
         providers.each do |info|
           provider_info = {}
-          info['resourceTypes'].each do |resource|
-            provider_info[resource['resourceType']] = {
-              'api_version' => resource['apiVersions'].first,
-              'locations'   => resource['locations'] - [''] # Ignore empty elements
+          info.resource_types.each do |resource|
+            provider_info[resource.resource_type] = {
+              'api_version' => resource.api_versions.first,
+              'locations'   => resource.locations - [''] # Ignore empty elements
             }
           end
-          @@providers_hash[info['namespace'].downcase] = provider_info
+          @@providers_hash[info.namespace.downcase] = provider_info
         end
       end
 

data/lib/azure/armrest/availability_set_service.rb

@@ -3,97 +3,21 @@ module Azure
   # Armrest namespace
   module Armrest
     # Base class for managing availability sets.
-    class AvailabilitySetService < ArmrestService
-      # The provider used in requests when gathering ASM information.
+    class AvailabilitySetService < ResourceGroupBasedService
+      # The provider used in requests when gathering AvailabilitySet information.
       attr_reader :provider
 
-      # Create and return a new AvailabilitySetService (ASM) instance.
+      # Create and return a new AvailabilitySetService instance.
       #
       def initialize(_armrest_configuration, options = {})
         super
-
         @provider = options[:provider] || 'Microsoft.Compute'
-
         set_service_api_version(options, 'availabilitySets')
+        @service_name = 'availabilitySets'
       end
 
-      # Creates a new availability set with the given name. The optional +tags+
-      # argument should be a hash, if provided.
-      #
-      def create(name, location, tags = nil, resource_group = armrest_configuration.resource_group)
-        raise ArgumentError, "No resource group specified" if resource_group.nil?
-
-        url = build_url(resource_group, name)
-        body = {:name => name, :location => location, :tags => tags}.to_json
-        response = rest_put(url, body)
-        response.return!
-      end
-
-      alias update create
-
-      # Deletes the +name+ availability set.
-      #
-      def delete(name, resource_group = armrest_configuration.resource_group)
-        raise ArgumentError, "No resource group specified" if resource_group.nil?
-        url = build_url(resource_group, name)
-        response = rest_delete(url)
-        response.return!
-      end
-
-      # Retrieves the options of an availability set +name+.
-      #
-      def get(name, resource_group = armrest_configuration.resource_group)
-        raise ArgumentError, "No resource group specified" if resource_group.nil?
-        url = build_url(resource_group, name)
-        response = rest_get(url)
-        JSON.parse(response.body)
-      end
-
-      # List availability sets.
-      #
-      def list(resource_group = armrest_configuration.resource_group)
-        array = []
-
-        if resource_group
-          url = build_url(resource_group)
-          response = rest_get(url)
-          array << JSON.parse(response.body)['value']
-        else
-          threads = []
-          mutex = Mutex.new
-
-          resource_groups.each do |group|
-            url = build_url(group['name'])
-
-            threads << Thread.new(url) do |thread_url|
-              response = rest_get(thread_url)
-              result = JSON.parse(response)['value']
-              mutex.synchronize{ array << result if result }
-            end
-          end
-
-          threads.each(&:join)
-        end
-
-        array.flatten
-      end
-
-      # Builds a URL based on subscription_id an resource_group and any other
-      # arguments provided, and appends it with the api_version.
-      #
-      def build_url(resource_group, *args)
-        url = File.join(
-          Azure::Armrest::COMMON_URI,
-          armrest_configuration.subscription_id,
-          'resourceGroups',
-          resource_group,
-          'providers',
-          @provider,
-          'availabilitySets',
-        )
-
-        url = File.join(url, *args) unless args.empty?
-        url << "?api-version=#{@api_version}"
+      def list_all
+        list_in_all_groups
       end
     end # AvailabilitySetService
   end # Armrest

data/lib/azure/armrest/exception.rb

@@ -0,0 +1,45 @@
+module Azure
+  module Armrest
+    class Exception < StandardError
+      attr_accessor :cause
+      attr_writer :message
+
+      def initialize(message = nil, cause_exception = nil)
+        @message = message
+        @cause = cause_exception
+      end
+
+      def to_s
+        message
+      end
+
+      def message
+        @message || self.class.name
+      end
+    end
+
+    class ApiException < Exception
+      attr_accessor :code
+
+      def initialize(code, message, cause_exception)
+        @code = code
+        super(message, cause_exception)
+      end
+
+      def to_s
+        "[#{code}] #{message}"
+      end
+    end
+
+    class ResourceNotFoundException < ApiException; end
+
+    class BadRequestException < ApiException; end
+
+    class UnauthorizedException < ApiException; end
+
+    class BadGatewayException < ApiException; end
+
+    class GatewayTimeoutException < ApiException; end
+
+  end
+end