azure-armrest 0.9.1 → 0.9.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: '08bd3d2e3e8ede9dafb7b9851aae5db77bb0e770'
-  data.tar.gz: 94e69ee9f9b4a9c843addd3e9965981ad97f8da7
+  metadata.gz: 2b445a2a57cca396bfb03a3f62393f4c0669f708
+  data.tar.gz: 9a4984a64e5db8057e7c018b8f9730134735dd6a
 SHA512:
-  metadata.gz: 6af19fd0c290e2e21f690b4fc15b6d7549234a250ffed764daef8dafb41b6c35e8ab0444574b1a9ffebcef6500ada264dfad4d9cb402b40f038044c1d275cff8
-  data.tar.gz: 1b86a6de9fd1845c36a32efae9424c709f7f05c1a69eaac728bd6950bdde68eedb35a2678883b792728a09bd77077f2c42a2ce1e5e09e8eb64b65c1ce71f0187
+  metadata.gz: aefd6f6a4936e5f93e6144f4dec4d841f6335dc65542c0ad00fdb881a3153ca9e2abd163b527633cc4a1eba09495b93917d97f6ecbbf23bd2f01a0c0a6373c0a
+  data.tar.gz: e7338c46f28895160763f8bc1df1b9c0118fa16830435c1fdd90f5d62bdb3bce01595a78e0aa292ea55f8a5887de8a0dfab7dd395ed3e2ba38d63b0f29372167

data/CHANGES

@@ -1,3 +1,14 @@
+= 0.9.2 - 31-Oct-2017
+* Fixed a bug in the StorageAccountService#list_private_images method. It
+  now accepts an option to skip accessor definitions.
+* Fixed a caller bug that caused tests to fail on Windows.
+* Fixed a bug where an argument to a sleep call could be a string by mistake.
+* Fixed issues with continuation results for list methods in the
+  StorageAccount model class.
+* The json dependency restriction was loosened to 1.anything.
+* The nokogiri dependency was removed. We now rely on Hash#from_xml courtesy
+  of activesupport, which we were already using.
+
 = 0.9.1 - 9-Oct-2017
 * Fixed an issue where hash properties that contain a '$' sign would fail
   when we attempted to convert them to model objects. They are now converted

data/azure-armrest.gemspec

@@ -17,12 +17,11 @@ different than the current azure gem, which uses the older (XML) interface
 behind the scenes.
   EOF
 
-  spec.add_dependency 'json', '~> 2.0.1'
+  spec.add_dependency 'json', '~> 2'
   spec.add_dependency 'rest-client', '~> 2.0.0'
   spec.add_dependency 'memoist', '~> 0.15.0'
   spec.add_dependency 'azure-signature', '~> 0.2.3'
   spec.add_dependency 'activesupport', '>= 4.2.2'
-  spec.add_dependency 'nokogiri', '>= 1.8.1', '~> 1.8'
   spec.add_dependency 'addressable', '~> 2.4.0'
   spec.add_dependency 'parallel', '~> 1.12.0'
 

data/lib/azure/armrest/armrest_service.rb

@@ -216,7 +216,9 @@ module Azure
             if tries <= max_retries
               msg = "A rate limit or server side issue has occurred [#{err.http_code}]. Retry number #{tries}."
               Azure::Armrest::Configuration.log.try(:log, Logger::WARN, msg)
-              sleep_time = err.response.headers[:retry_after] || 30
+              sleep_time = (err.response.headers[:retry_after] || 30).to_i
+              sleep_time = 5 if sleep_time < 5     # 5 second minimum
+              sleep_time = 120 if sleep_time > 120 # 2 minute maximum
               sleep(sleep_time)
               retry
             end

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

@@ -56,7 +56,9 @@ module Azure
       #   #=> "123.123.123.123"
       #
       def self.attr_from_hash(attrs = {})
-        file, line, _ = caller.first.split(":")
+        location   = caller_locations(1, 1).first
+        file, line = location.path, location.lineno
+
         attrs.each do |attr_name, keys|
           keys      = Array(keys)
           first_key = keys.shift

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

@@ -1,6 +1,5 @@
 require 'azure-signature'
 require 'active_support/core_ext/hash/conversions'
-require 'nokogiri'
 
 module Azure
   module Armrest
@@ -194,27 +193,43 @@ module Azure
       # * marker
       # * maxresults
       # * timeout
+      # * all
+      #
+      # If the :all option is set to true, then this method will collect all
+      # records. Otherwise, it is capped at 5000 records by Azure, or whatever
+      # you set :maxresults to. If you set both the :all option and the :maxresults
+      # option, then all records will be collected in :maxresults batches.
       #
       def files(share, key = access_key, options = {})
         raise ArgumentError, "No access key specified" unless key
 
-        query = {:restype => 'directory', :comp => 'list'}.merge(options).to_query
+        query = "comp=list&restype=directory"
+
+        skip_defs = options[:skip_accessors_definition]
+
+        options.each do |okey, ovalue|
+          unless okey == :skip_accessors_definition
+            query += "&#{okey}=#{[ovalue].flatten.join(',')}"
+          end
+        end
 
         response = file_response(key, query, 'get', nil, share)
 
-        doc = Nokogiri::XML(response.body)
+        hash = Hash.from_xml(response.body)['EnumerationResults']['Entries']
         results = []
 
-        doc.xpath('//EnumerationResults/Entries').each do |element|
-          element.xpath('//Directory').each do |dir|
-            results << ShareDirectory.new(Hash.from_xml(dir.to_s)['Directory'])
-          end
-          element.xpath('//File').each do |file|
-            results << ShareFile.new(Hash.from_xml(file.to_s)['File'])
-          end
+        if hash && hash['Directory']
+          Array.wrap(hash['Directory']).each { |dir| results << ShareDirectory.new(dir, skip_defs) }
+        end
+
+        if hash && hash['File']
+          Array.wrap(hash['File']).each { |file| results << ShareFile.new(file, skip_defs) }
         end
 
-        results.concat(next_marker_results(doc, :files, key, options))
+        if options[:all] && hash['NextMarker']
+          options[:marker] = hash['NextMarker']
+          results.concat(files(share, key, options))
+        end
 
         results
       end
@@ -407,6 +422,7 @@ module Azure
       # * maxresults
       # * include
       # * timeout
+      # * all
       #
       # By default Azure uses a value of 5000 for :maxresults.
       #
@@ -414,6 +430,11 @@ module Azure
       # one element: metadata. More options may be added by Microsoft
       # at a later date.
       #
+      # If the :all option is set to true, then this method will collect all
+      # records. Otherwise, it is capped at 5000 records by Azure, or whatever
+      # you set :maxresults to. If you set both the :all option and the :maxresults
+      # option, then all records will be collected in :maxresults batches.
+      #
       # Example:
       #
       #   sas  = Azure::Armrest::StorageAccountService.new(conf)
@@ -424,10 +445,6 @@ module Azure
       #   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 = access_key, options = {})
         raise ArgumentError, "No access key specified" unless key
 
@@ -442,13 +459,19 @@ module Azure
 
         response = blob_response(key, query)
 
-        doc = Nokogiri::XML(response.body)
+        hash = Hash.from_xml(response.body)['EnumerationResults']['Containers']
+        results = []
+
+        if hash && hash['Container']
+          Array.wrap(hash['Container']).each { |c| results << Container.new(c, skip_defs) }
+        end
 
-        results = doc.xpath('//Containers/Container').collect do |element|
-          Container.new(Hash.from_xml(element.to_s)['Container'], skip_defs)
+        if options[:all] && hash['NextMarker']
+          options[:marker] = hash['NextMarker']
+          results.concat(containers(key, options))
         end
 
-        results.concat(next_marker_results(doc, :containers, key, options))
+        results
       end
 
       # Returns the properties for the given container +name+ using account +key+.
@@ -555,6 +578,11 @@ module Azure
       # one or more of the following values: snapshots, metadata, copy or
       # uncommittedblobs.
       #
+      # If the :all option is set to true, then this method will collect all
+      # records. Otherwise, it is capped at 5000 records by Azure, or whatever
+      # you set :maxresults to. If you set both the :all option and the :maxresults
+      # option, then all records will be collected in :maxresults batches.
+      #
       # Example:
       #
       #   sas  = Azure::Armrest::StorageAccountService.new(conf)
@@ -565,10 +593,6 @@ module Azure
       #   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 = access_key, options = {})
         raise ArgumentError, "No access key specified" unless key
 
@@ -583,14 +607,23 @@ module Azure
 
         response = blob_response(key, query, container)
 
-        doc = Nokogiri::XML(response.body)
+        hash = Hash.from_xml(response.body)['EnumerationResults']['Blobs']
+        results = []
+
+        if hash && hash['Blob']
+          Array.wrap(hash['Blob']).each do |h|
+            h[:container] = container
+            object = h.key?('Snapshot') ? BlobSnapshot.new(h, skip_defs) : Blob.new(h, skip_defs)
+            results << object
+          end
+        end
 
-        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, skip_defs) : Blob.new(hash, skip_defs)
+        if options[:all] && hash['NextMarker']
+          options[:marker] = hash['NextMarker']
+          results.concat(blobs(container, key, options))
         end
 
-        results.concat(next_marker_results(doc, :blobs, container, key, options))
+        results
       end
 
       # Returns an array of all blobs for all containers. The +options+ hash
@@ -625,10 +658,9 @@ module Azure
         raise ArgumentError, "No access key specified" unless key
 
         response = blob_response(key, "restype=service&comp=properties")
-        toplevel = 'StorageServiceProperties'
+        hash = Hash.from_xml(response.body)['StorageServiceProperties']
 
-        doc = Nokogiri::XML(response.body).xpath("//#{toplevel}")
-        BlobServiceProperty.new(Hash.from_xml(doc.to_s)[toplevel])
+        BlobServiceProperty.new(hash)
       end
 
       # Return metadata for the given +blob+ within +container+. You may
@@ -653,10 +685,9 @@ module Azure
         raise ArgumentError, "No access key specified" unless key
 
         response = blob_response(key, "restype=service&comp=stats")
-        toplevel = 'StorageServiceStats'
 
-        doc = Nokogiri::XML(response.body).xpath("//#{toplevel}")
-        BlobServiceStat.new(Hash.from_xml(doc.to_s)[toplevel])
+        hash = Hash.from_xml(response.body)['StorageServiceStats']
+        BlobServiceStat.new(hash)
       end
 
       # Copy the blob from the source container/blob to the destination container/blob.
@@ -1045,21 +1076,6 @@ 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/resource_group_based_service.rb

@@ -72,14 +72,14 @@ module Azure
       # Returns an ArmrestCollection, with the response headers set
       # for the operation as a whole.
       #
-      def list(rgroup = configuration.resource_group)
+      def list(rgroup = configuration.resource_group, skip_accessors_definition = false)
         validate_resource_group(rgroup)
 
         url = build_url(rgroup)
         url = yield(url) || url if block_given?
         response = rest_get(url)
 
-        get_all_results(response)
+        get_all_results(response, skip_accessors_definition)
       end
 
       # Use a single call to get all resources for the service. You may

data/lib/azure/armrest/storage_account_service.rb

@@ -18,7 +18,7 @@ module Azure
 
       # Same as other resource based list methods, but also sets the proxy on each model object.
       #
-      def list(resource_group = configuration.resource_group)
+      def list(resource_group = configuration.resource_group, skip_accessors_definition = false)
         super.each { |model| model.configuration = configuration }
       end
 

data/lib/azure/armrest/version.rb

@@ -1,6 +1,6 @@
 module Azure
   module Armrest
     # The version of the azure-armrest library.
-    VERSION = '0.9.1'.freeze
+    VERSION = '0.9.2'.freeze
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: azure-armrest
 version: !ruby/object:Gem::Version
-  version: 0.9.1
+  version: 0.9.2
 platform: ruby
 authors:
 - Daniel J. Berger
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-09 00:00:00.000000000 Z
+date: 2017-10-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -19,14 +19,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.1
+        version: '2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.1
+        version: '2'
 - !ruby/object:Gem::Dependency
   name: rest-client
   requirement: !ruby/object:Gem::Requirement
@@ -83,26 +83,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 4.2.2
-- !ruby/object:Gem::Dependency
-  name: nokogiri
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.8.1
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.8'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.8.1
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.8'
 - !ruby/object:Gem::Dependency
   name: addressable
   requirement: !ruby/object:Gem::Requirement
@@ -308,7 +288,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.12
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: An interface for ARM/JSON Azure REST API