azure-armrest 0.3.3 → 0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a89bf6828ff100bbcff625f099a48ac04c9937b8
-  data.tar.gz: 1cc4335de5c38155990f7c7d170752a092c5bd96
+  metadata.gz: 25599bb89027a9662c3f4b47a582db0bb112c9ef
+  data.tar.gz: 80c069a284b706e81c139f2c1ae64f276084aba5
 SHA512:
-  metadata.gz: 4ddc35af1397dc283a18a44b0abbcfff389e135caa77b9d1540524708e1c760e7d97b15107c5779d6c7c13d0dd44142ee55940a08b584fbc68eb063305c790a0
-  data.tar.gz: 31d18ab596d27b4da75555721e86d1ebf4fc798c543a775c0e380ff06ed64d5f100fbfe8f40d290f4ac157aa151a91de5785de7a68dbf3dc3d2498e4e41905d1
+  metadata.gz: a91dfecc724c56d950fd4b33a90a3efed24c1a58b22fa63b1ea003bf02c0594792978d8643ee97cc7897f04139f0e9ef1905de2c81774bc7f4d45ffb05ecba94
+  data.tar.gz: 9473b0a19e8275664d39afb7f264a37fbd47fdcccd7a93a7ef3fc2df36b446a5a8407efb7407eaab757d41297c5713c6d4016c09ab5f2cdb5b6d590938e03705

data/CHANGES

@@ -1,3 +1,13 @@
+= 0.3.4 - 9-Aug-2016
+* Modified the StorageAccount#blobs and StorageAccount#containers method. Both
+  now accept a hash of options that you can use to modify the results. Also,
+  both now automatically handle continuation tokens to collect all results.
+* The ResourceGroupBasedService#delete method now returns a ResponseHeaders
+  object instead of nil. Furthermore, it will raise an error on a 204 response
+  which indicates that the resource wasn't actually found.
+* Added the Network::LoadBalancerService and Network::InboundNatService classes.
+* Added the Network::RouteService and Network::RouteTableService classes.
+
 = 0.3.3 - 1-Aug-2016
 * Added the :max_threads configuration option. This is used internally wherever
   the Parallel gem is used.
@@ -39,6 +49,10 @@
 * StorageAccountService no longer does account type validation.
 * Added the StorageAccountService#list_all_private_images method.
 
+= 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.encoded.
 

data/lib/azure/armrest.rb

@@ -40,10 +40,14 @@ require 'azure/armrest/resource_provider_service'
 require 'azure/armrest/insights/alert_service'
 require 'azure/armrest/insights/event_service'
 require 'azure/armrest/insights/metrics_service'
+require 'azure/armrest/network/load_balancer_service'
+require 'azure/armrest/network/inbound_nat_service'
 require 'azure/armrest/network/ip_address_service'
 require 'azure/armrest/network/network_interface_service'
 require 'azure/armrest/network/network_security_group_service'
 require 'azure/armrest/network/network_security_rule_service'
+require 'azure/armrest/network/route_table_service'
+require 'azure/armrest/network/route_service'
 require 'azure/armrest/network/virtual_network_service'
 require 'azure/armrest/network/subnet_service'
 require 'azure/armrest/role/assignment_service'

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

@@ -194,6 +194,8 @@ module Azure
     class Sku < BaseModel; end
     class Usage < BaseModel; end
 
+    class ResponseHeaders < BaseModel; end
+
     class StorageAccount < BaseModel; end
     class StorageAccountKey < StorageAccount
       def key1; key_name == 'key1' ? value : nil; end
@@ -222,10 +224,14 @@ module Azure
     end
 
     module Network
+      class LoadBalancer < BaseModel; end
+      class InboundNat < LoadBalancer; end
       class IpAddress < BaseModel; end
       class NetworkInterface < BaseModel; end
       class NetworkSecurityGroup < BaseModel; end
       class NetworkSecurityRule < NetworkSecurityGroup; end
+      class RouteTable < BaseModel; end
+      class Route < RouteTable; end
       class VirtualNetwork < BaseModel; end
       class Subnet < VirtualNetwork; end
     end

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

@@ -119,14 +119,51 @@ module Azure
       # If no key is provided, it is assumed that the StorageAccount object
       # includes the key1 property.
       #
-      def containers(key = nil)
+      # # The following options are supported:
+      #
+      # * prefix
+      # * delimiter
+      # * maxresults
+      # * include
+      # * timeout
+      #
+      # By default Azure uses a value of 5000 for :maxresults.
+      #
+      # If the :include option is specified, it should contain an array of
+      # one element: metadata. More options may be added by Microsoft
+      # at a later date.
+      #
+      # Example:
+      #
+      #   sas  = Azure::Armrest::StorageAccountService.new(conf)
+      #   key  = sas.list_account_keys['key1']
+      #   acct = sas.get('your_storage_account', 'your_resource_group')
+      #
+      #   p acct.containers(key)
+      #   p acct.containers(key, :include => ['metadata'])
+      #   p acct.containers(key, :maxresults => 1)
+      #
+      # In cases where a NextMarker element is found in the original response,
+      # another call will automatically be made with the marker value included
+      # in the URL so that you don't have to perform such a step manually.
+      #
+      def containers(key = nil, options = {})
         key ||= properties.key1
 
-        response = blob_response(key, "comp=list")
+        query = "comp=list"
+        options.each { |okey, ovalue| query += "&#{okey}=#{[ovalue].flatten.join(',')}" }
+
+        response = blob_response(key, query)
 
-        Nokogiri::XML(response.body).xpath('//Containers/Container').map do |element|
+        doc = Nokogiri::XML(response.body)
+
+        results = doc.xpath('//Containers/Container').collect do |element|
           Container.new(Hash.from_xml(element.to_s)['Container'])
         end
+
+        results << next_marker_results(doc, :containers, key, options)
+
+        results.flatten
       end
 
       # Returns the properties for the given container +name+ using account +key+.
@@ -184,30 +221,52 @@ module Azure
       # Return a list of blobs for the given +container+ using the given +key+
       # or the key1 property of the StorageAccount object.
       #
-      def blobs(container, key = nil, include_snapshot = false)
+      # The following options are supported:
+      #
+      # * prefix
+      # * delimiter
+      # * maxresults
+      # * include
+      # * timeout
+      #
+      # By default Azure uses a value of 5000 for :maxresults.
+      #
+      # If the :include option is specified, it should contain an array of
+      # one or more of the following values: snapshots, metadata, copy or
+      # uncommittedblobs.
+      #
+      # Example:
+      #
+      #   sas  = Azure::Armrest::StorageAccountService.new(conf)
+      #   key  = sas.list_account_keys['key1']
+      #   acct = sas.get('your_storage_account', 'your_resource_group')
+      #
+      #   p acct.blobs('vhds', key)
+      #   p acct.blobs('vhds', key, :timeout => 30)
+      #   p acct.blobs('vhds', key, :include => ['snapshots', 'metadata'])
+      #
+      # In cases where a NextMarker element is found in the original response,
+      # another call will automatically be made with the marker value included
+      # in the URL so that you don't have to perform such a step manually.
+      #
+      def blobs(container, key = nil, options = {})
         key ||= properties.key1
 
-        url = File.join(properties.primary_endpoints.blob, container)
-        url += "?restype=container&comp=list"
-        url += "&include=snapshots" if include_snapshot
+        query = "restype=container&comp=list"
+        options.each { |okey, ovalue| query += "&#{okey}=#{[ovalue].flatten.join(',')}" }
 
-        headers = build_headers(url, key)
-
-        response = ArmrestService.send(
-          :rest_get,
-          :url         => url,
-          :headers     => headers,
-          :proxy       => proxy,
-          :ssl_version => ssl_version,
-          :ssl_verify  => ssl_verify
-        )
+        response = blob_response(key, query, container)
 
         doc = Nokogiri::XML(response.body)
 
-        doc.xpath('//Blobs/Blob').map do |node|
+        results = doc.xpath('//Blobs/Blob').collect do |node|
           hash = Hash.from_xml(node.to_s)['Blob'].merge(:container => container)
           hash.key?('Snapshot') ? BlobSnapshot.new(hash) : Blob.new(hash)
         end
+
+        results << next_marker_results(doc, :blobs, container, key, options)
+
+        results.flatten
       end
 
       # Returns an array of all blobs for all containers.
@@ -545,6 +604,21 @@ module Azure
 
         headers
       end
+
+      # Generic method to handle NextMarker token. The +doc+ should be an
+      # XML object that responds to .xpath, followed by a method name,
+      # followed by any arguments to pass to that method.
+      #
+      def next_marker_results(doc, method_name, *args)
+        xmarker = doc.xpath('//NextMarker').first # There is only one
+        if xmarker.children.empty?
+          return []
+        else
+          args = args.dup # Avoid modifying original argument
+          args.last[:marker] = xmarker.children.first.to_s
+          return send(method_name, *args)
+        end
+      end
     end
   end
 end

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

@@ -0,0 +1,12 @@
+module Azure
+  module Armrest
+    module Network
+      # Base class for managing subnets
+      class InboundNatService < ResourceGroupBasedSubservice
+        def initialize(armrest_configuration, options = {})
+          super(armrest_configuration, 'loadBalancers', 'inboundNatRules', 'Microsoft.Network', options)
+        end
+      end
+    end # Network
+  end # Armrest
+end # Azure

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

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

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

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

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

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

data/lib/azure/armrest/resource_group_based_service.rb

@@ -50,14 +50,28 @@ module Azure
         model_class.new(response)
       end
 
+      # Delete the resource with the given +name+ for the provided +resource_group+,
+      # or the resource group specified in your original configuration object. If
+      # successful, returns a ResponseHeaders object.
+      #
+      # If the delete operation returns a 204 (no body), which is what the Azure
+      # REST API typically returns if the resource is not found, it is treated
+      # as an error and a ResourceNotFoundException is raised.
+      #
       def delete(name, rgroup = configuration.resource_group)
         validate_resource_group(rgroup)
         validate_resource(name)
 
         url = build_url(rgroup, name)
         url = yield(url) || url if block_given?
-        rest_delete(url)
-        nil
+        response = rest_delete(url)
+
+        if response.code == 204
+          msg = "#{self.class} resource #{rgroup}/#{name} not found"
+          raise Azure::Armrest::ResourceNotFoundException.new(response.code, msg, response)
+        end
+
+        Azure::Armrest::ResponseHeaders.new(response.headers)
       end
 
       private

data/lib/azure/armrest/version.rb

@@ -1,5 +1,5 @@
 module Azure
   module Armrest
-    VERSION = '0.3.3'.freeze
+    VERSION = '0.3.4'.freeze
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: azure-armrest
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.3.4
 platform: ruby
 authors:
 - Daniel J. Berger
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-01 00:00:00.000000000 Z
+date: 2016-08-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -230,10 +230,14 @@ files:
 - lib/azure/armrest/insights/metrics_service.rb
 - lib/azure/armrest/model/base_model.rb
 - lib/azure/armrest/model/storage_account.rb
+- lib/azure/armrest/network/inbound_nat_service.rb
 - lib/azure/armrest/network/ip_address_service.rb
+- lib/azure/armrest/network/load_balancer_service.rb
 - lib/azure/armrest/network/network_interface_service.rb
 - lib/azure/armrest/network/network_security_group_service.rb
 - lib/azure/armrest/network/network_security_rule_service.rb
+- lib/azure/armrest/network/route_service.rb
+- lib/azure/armrest/network/route_table_service.rb
 - lib/azure/armrest/network/subnet_service.rb
 - lib/azure/armrest/network/virtual_network_service.rb
 - lib/azure/armrest/resource_group_based_service.rb