azure-storage 0.10.0.preview → 0.10.1.preview

data/lib/azure/storage/core/{auth/shared_key_lite.rb → filter/linear_retry_filter.rb}

@@ -21,35 +21,33 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 #--------------------------------------------------------------------------
-require "azure/storage/core/auth/shared_key"
+require 'azure/core'
+require 'azure/core/http/retry_policy'
 
-module Azure::Storage
-  module Auth
-    class SharedKeyLite < SharedKey
-      # The name of the strategy.
-      #
-      # @return [String]
-      def name
-        'SharedKeyLite'
-      end
-
-      # Generate the string to sign.
-      #
-      # @param method     [Symbol] The HTTP request method.
-      # @param uri        [URI] The URI of the request we're signing.
-      # @param headers    [Hash] A Hash of HTTP request headers.
-      #
-      # Returns a plain text string.
-      def signable_string(method, uri, headers)
-        [
-          method.to_s.upcase,
-          headers.fetch('Content-MD5', ''),
-          headers.fetch('Content-Type', ''),
-          headers.fetch('Date') { raise IndexError, 'Headers must include Date' },
-          canonicalized_headers(headers),
-          canonicalized_resource(uri)
-        ].join("\n")
-      end
+module Azure::Storage::Core::Filter
+  class LinearRetryPolicyFilter < RetryPolicyFilter
+    def initialize(retry_count=nil, retry_interval=nil)
+      @retry_count = retry_count || LinearRetryPolicyFilter::DEFAULT_RETRY_COUNT
+      @retry_interval = retry_interval || LinearRetryPolicyFilter::DEFAULT_RETRY_INTERVAL
+      
+      super @retry_count, @retry_interval
+    end
+    
+    DEFAULT_RETRY_COUNT = 3
+    DEFAULT_RETRY_INTERVAL = 30
+    
+    # Overrides the base class implementation of call to determine 
+    # how the HTTP request should continue retrying
+    #
+    # retry_data - Hash. Stores stateful retry data
+    #
+    # The retry_data is a Hash which can be used to store
+    # stateful data about the request execution context (such as an
+    # incrementing counter, timestamp, etc). The retry_data object
+    # will be the same instance throughout the lifetime of the request
+    def apply_retry_policy(retry_data)
+      retry_data[:count] = retry_data[:count] == nil ? 1 : retry_data[:count] + 1
+      retry_data[:interval] = @retry_interval
     end
   end
-end
+end

data/lib/azure/storage/core/filter/retry_filter.rb

@@ -0,0 +1,172 @@
+#-------------------------------------------------------------------------
+# # Copyright (c) Microsoft and contributors. All rights reserved.
+#
+# The MIT License(MIT)
+
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files(the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and / or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions :
+
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+#--------------------------------------------------------------------------
+require 'azure/core'
+require 'azure/core/http/retry_policy'
+
+module Azure::Storage::Core::Filter
+  class RetryPolicyFilter < Azure::Core::Http::RetryPolicy
+    def initialize(retry_count=nil, retry_interval=nil)
+      @retry_count = retry_count
+      @retry_interval = retry_interval
+      
+      super &:should_retry?
+    end
+    
+    attr_reader :retry_count,
+                :retry_interval
+                
+    # Overrides the base class implementation of call to determine 
+    # whether to retry the operation
+    #
+    # response - HttpResponse. The response from the active request
+    # retry_data - Hash. Stores stateful retry data
+    def should_retry?(response, retry_data)
+      apply_retry_policy retry_data
+      retry_data[:retryable] = retry_data[:count] <= @retry_count
+      return false unless retry_data[:retryable]
+      
+      should_retry_on_local_error? retry_data
+      should_retry_on_error? response, retry_data
+      return false unless retry_data[:retryable]
+      
+      adjust_retry_parameter retry_data
+    end
+    
+    # Apply the retry policy to determine how the HTTP request should continue retrying
+    #
+    # retry_data - Hash. Stores stateful retry data
+    #
+    # The retry_data is a Hash which can be used to store
+    # stateful data about the request execution context (such as an
+    # incrementing counter, timestamp, etc). The retry_data object
+    # will be the same instance throughout the lifetime of the request
+    #
+    # Alternatively, a subclass could override this method.
+    def apply_retry_policy(retry_data)
+    end
+    
+    # Determines if the HTTP request should continue retrying
+    #
+    # retry_data - Hash. Stores stateful retry data
+    #
+    # The retry_data is a Hash which can be used to store
+    # stateful data about the request execution context (such as an
+    # incrementing counter, timestamp, etc). The retry_data object
+    # will be the same instance throughout the lifetime of the request.
+    def should_retry_on_local_error?(retry_data)
+      unless retry_data[:error]
+        retry_data[:retryable] = true;
+        return true
+      end
+      
+      if retry_data[:error].inspect.include?('SocketError: Hostname not known')
+        # Retry on local DNS resolving
+        # When uses resolv-replace.rb to replace the libc resolver 
+        # Reference: 
+        #  https://makandracards.com/ninjaconcept/30815-fixing-socketerror-getaddrinfo-name-or-service-not-known-with-ruby-s-resolv-replace-rb 
+        #  http://www.subelsky.com/2014/05/fixing-socketerror-getaddrinfo-name-or.html 
+        retry_data[:retryable] = true;
+      elsif retry_data[:error].inspect.include?('getaddrinfo: Name or service not known')
+        # When uses the default resolver 
+        retry_data[:retryable] = true;
+      elsif retry_data[:error].inspect.include?('Errno::EACCES')
+        retry_data[:retryable] = false;
+      elsif retry_data[:error].inspect.include?('NOSUPPORT')
+        retry_data[:retryable] = false;
+      end
+      
+      retry_data[:retryable]
+    end
+    
+    # Determines if the HTTP request should continue retrying
+    #
+    # response - Azure::Core::Http::HttpResponse. The response from the active request
+    # retry_data - Hash. Stores stateful retry data
+    #
+    # The retry_data is a Hash which can be used to store
+    # stateful data about the request execution context (such as an
+    # incrementing counter, timestamp, etc). The retry_data object
+    # will be the same instance throughout the lifetime of the request.
+    def should_retry_on_error?(response, retry_data)
+      unless response
+        retry_data[:retryable] = false unless retry_data[:error]
+        return retry_data[:retryable]
+      end
+      
+      # If a request sent to the secondary location fails with 404 (Not Found), it is possible
+      # that the resource replication is not finished yet. So, in case of 404 only in the secondary
+      # location, the failure should still be retryable.
+      secondary_not_found = (retry_data[:current_location] === Azure::Storage::RequestLocationMode::SECONDARY_ONLY) && response.status_code === 404;
+
+      if secondary_not_found
+        retry_data[:status_code] = 500
+      else
+        if (response.status_code)
+          retry_data[:status_code] = response.status_code
+        else
+          retry_data[:status_code] = nil
+        end
+      end 
+      
+      # Non-timeout Cases
+      if (retry_data[:status_code] >= 300 && retry_data[:status_code] != 408)
+        # Always no retry on "not implemented" and "version not supported"
+        if (retry_data[:status_code] == 501 || retry_data[:status_code] == 505)
+          retry_data[:retryable] = false;
+          return false;
+        end
+      end
+    
+      # When absorb_conditional_errors_on_retry is set (for append blob)
+      if (retry_data[:request_options] && retry_data[:request_options][:absorb_conditional_errors_on_retry])
+        if (retry_data[:status_code] == 412)
+          # When appending block with precondition failure and their was a server error before, we ignore the error.
+          if (retry_data[:last_server_error])
+            retry_data[:error] = nil;
+            retry_data[:retryable] = true;
+          else
+            retry_data[:retryable] = false;
+          end
+        elsif (retry_data[:retryable] && retry_data[:status_code] >= 500 && retry_data[:status_code] < 600)
+          # Retry on the server error
+          retry_data[:retryable] = true;
+          retry_data[:last_server_error] = true;
+        end
+      elsif (retry_data[:status_code] < 500)
+        # No retry on the client error
+        retry_data[:retryable] = false;
+      end
+    end
+    
+    # Adjust the retry parameter
+    #
+    # retry_data - Hash. Stores stateful retry data
+    def adjust_retry_parameter(retry_data)
+      # TODO: Adjust the retry parameter according to the location and last attempt time 
+      sleep retry_data[:interval] if retry_data[:retryable]
+      retry_data[:retryable]
+    end
+    
+  end
+end

data/lib/azure/storage/core/http_client.rb

@@ -22,7 +22,7 @@
 # THE SOFTWARE.
 #--------------------------------------------------------------------------
 
-module Azure::Core
+module Azure::Storage::Core
   module HttpClient
     # Returns the http agent based on uri
     # @param uri  [URI|String] the base uri (scheme, host, port) of the http endpoint

data/lib/azure/storage/core/utility.rb

@@ -34,7 +34,7 @@ if RUBY_VERSION.to_f < 2.0
   end
 end
 
-module Azure
+module Azure::Storage
   module Error
     # Azure Error
     class Error <  Azure::Core::Error
@@ -204,12 +204,6 @@ end
 
 # Code validate private/public IP acceptable ranges.
 class IPAddr
-  PRIVATE_RANGES = [
-    IPAddr.new('10.0.0.0/8'),
-    IPAddr.new('172.16.0.0/12'),
-    IPAddr.new('192.168.0.0/16')
-  ]
-
   def private?
     return false unless self.ipv4?
     PRIVATE_RANGES.each do |ipr|
@@ -249,6 +243,4 @@ class IPAddr
       (IPAddr.new(ip) rescue nil).nil?
     end
   end
-end
-
-Azure::Loggerx = Azure::Core::Logger
+end

data/lib/azure/storage/service/storage_service.rb

@@ -22,7 +22,7 @@
 # THE SOFTWARE.
 #--------------------------------------------------------------------------
 
-require 'azure/storage/core/signed_service'
+require 'azure/core/signed_service'
 require 'azure/storage/core'
 require 'azure/storage/service/storage_service_properties'
 
@@ -36,7 +36,12 @@ module Azure::Storage
       # (optional, Default=Azure::Storage::Auth::SharedKey.new)
       # @param account_name   [String] The account name (optional, Default=Azure.config.storage_account_name)
       # @param options        [Azure::Storage::Configurable] the client configuration context
-      def initialize(signer=Auth::SharedKey.new, account_name=nil, options = {})
+      def initialize(signer=nil, account_name=nil, options = {})
+        options[:client] = Azure::Storage if options[:client] == nil
+        client_config = options[:client]
+        signer = signer || Azure::Storage::Core::Auth::SharedKey.new(
+          client_config.storage_account_name,
+          client_config.storage_access_key)
         super(signer, account_name, options)
       end
 

data/lib/azure/storage/table/auth/shared_key.rb

@@ -22,12 +22,12 @@
 # THE SOFTWARE.
 #--------------------------------------------------------------------------
 require 'cgi'
-require 'azure/storage/core/auth/signer'
+require 'azure/storage/core/auth/shared_key'
 
 module Azure::Storage
   module Table
     module Auth
-      class SharedKey < Azure::Storage::Auth::SharedKey
+      class SharedKey < Core::Auth::SharedKey
         # The account name
         attr :account_name
 

data/lib/azure/storage/table/batch.rb

@@ -23,10 +23,10 @@
 #--------------------------------------------------------------------------
 require 'uuid'
 
+require 'azure/core/http/http_error'
 require 'azure/storage/table/serialization'
 require 'azure/storage/table/table_service'
 require 'azure/storage/table/batch_response'
-require 'azure/storage/core/http/http_error'
 
 module Azure::Storage
   module Table

data/lib/azure/storage/table/table_service.rb

@@ -29,7 +29,7 @@ require 'azure/storage/table/entity'
 
 module Azure::Storage
   module Table
-    class TableService < Azure::Storage::Service::StorageService
+    class TableService < Service::StorageService
 
       def initialize(options = {})
         client_config = options[:client] || Azure::Storage
@@ -58,7 +58,7 @@ module Azure::Storage
         query = { }
         query['timeout'] = options[:timeout].to_s if options[:timeout]
 
-        body = Azure::Storage::Table::Serialization.hash_to_entry_xml({"TableName" => table_name}).to_xml
+        body = Table::Serialization.hash_to_entry_xml({"TableName" => table_name}).to_xml
         call(:post, collection_uri(query), body)
         nil
       end
@@ -104,7 +104,7 @@ module Azure::Storage
         query["timeout"] = options[:timeout].to_s if options[:timeout]
 
         response = call(:get, table_uri(table_name, query))
-        results = Azure::Storage::Table::Serialization.hash_from_entry_xml(response.body)
+        results = Table::Serialization.hash_from_entry_xml(response.body)
         results[:updated]
       end
 
@@ -131,7 +131,7 @@ module Azure::Storage
         uri = collection_uri(query)
 
         response = call(:get, uri)
-        entries = Azure::Storage::Table::Serialization.entries_from_feed_xml(response.body) || []
+        entries = Table::Serialization.entries_from_feed_xml(response.body) || []
 
         values = Azure::Service::EnumerationResults.new(entries)
         values.continuation_token = response.headers["x-ms-continuation-NextTableName"]
@@ -160,7 +160,7 @@ module Azure::Storage
         response = call(:get, generate_uri(table_name, query), nil, {'x-ms-version' => '2012-02-12'})
 
         signed_identifiers = []
-        signed_identifiers = Azure::Storage::Table::Serialization.signed_identifiers_from_xml response.body unless response.body == nil or response.body.length < 1
+        signed_identifiers = Table::Serialization.signed_identifiers_from_xml response.body unless response.body == nil or response.body.length < 1
         signed_identifiers
       end
 
@@ -186,7 +186,7 @@ module Azure::Storage
 
         uri = generate_uri(table_name, query)
         body = nil
-        body = Azure::Storage::Table::Serialization.signed_identifiers_to_xml options[:signed_identifiers] if options[:signed_identifiers] && options[:signed_identifiers].length > 0
+        body = Table::Serialization.signed_identifiers_to_xml options[:signed_identifiers] if options[:signed_identifiers] && options[:signed_identifiers].length > 0
 
         call(:put, uri, body, {'x-ms-version' => '2012-02-12'})
         nil
@@ -210,14 +210,14 @@ module Azure::Storage
       #
       # Returns a Azure::Storage::Entity::Table::Entity
       def insert_entity(table_name, entity_values, options={})
-        body = Azure::Storage::Table::Serialization.hash_to_entry_xml(entity_values).to_xml
+        body = Table::Serialization.hash_to_entry_xml(entity_values).to_xml
 
         query = { }
         query['timeout'] = options[:timeout].to_s if options[:timeout]
 
         response = call(:post, entities_uri(table_name, nil, nil, query), body)
         
-        result = Azure::Storage::Table::Serialization.hash_from_entry_xml(response.body)
+        result = Table::Serialization.hash_from_entry_xml(response.body)
 
         Entity.new do |entity|
           entity.table = table_name
@@ -262,7 +262,7 @@ module Azure::Storage
 
         entities = Azure::Service::EnumerationResults.new
 
-        results = (options[:partition_key] and options[:row_key]) ? [Azure::Storage::Table::Serialization.hash_from_entry_xml(response.body)] : Azure::Storage::Table::Serialization.entries_from_feed_xml(response.body)
+        results = (options[:partition_key] and options[:row_key]) ? [Table::Serialization.hash_from_entry_xml(response.body)] : Table::Serialization.entries_from_feed_xml(response.body)
         
         results.each do |result|
           entity = Entity.new do |e|
@@ -315,7 +315,7 @@ module Azure::Storage
         headers = {}
         headers["If-Match"] = if_match || "*" unless options[:create_if_not_exists]
 
-        body = Azure::Storage::Table::Serialization.hash_to_entry_xml(entity_values).to_xml
+        body = Table::Serialization.hash_to_entry_xml(entity_values).to_xml
 
         response = call(:put, uri, body, headers)
         response.headers["etag"]
@@ -353,7 +353,7 @@ module Azure::Storage
         headers = { "X-HTTP-Method"=> "MERGE" }
         headers["If-Match"] = if_match || "*" unless options[:create_if_not_exists]
 
-        body = Azure::Storage::Table::Serialization.hash_to_entry_xml(entity_values).to_xml
+        body = Table::Serialization.hash_to_entry_xml(entity_values).to_xml
 
         response = call(:post, uri, body, headers)
         response.headers["etag"]

data/lib/azure/storage/version.rb

@@ -28,7 +28,7 @@ module Azure
       # Fields represent the parts defined in http://semver.org/
       MAJOR = 0 unless defined? MAJOR
       MINOR = 10 unless defined? MINOR
-      UPDATE = 0 unless defined? UPDATE
+      UPDATE = 1 unless defined? UPDATE
       PRE = 'preview' unless defined? PRE
 
       class << self

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: azure-storage
 version: !ruby/object:Gem::Version
-  version: 0.10.0.preview
+  version: 0.10.1.preview
 platform: ruby
 authors:
 - Microsoft Corporation
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-30 00:00:00.000000000 Z
+date: 2016-05-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -24,6 +24,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.3'
+- !ruby/object:Gem::Dependency
+  name: azure-core
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
 - !ruby/object:Gem::Dependency
   name: faraday
   requirement: !ruby/object:Gem::Requirement
@@ -235,7 +249,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0.8'
 description: Microsoft Azure Storage Client Library for Ruby
-email: dmsh@microsoft.com
+email: ascl@microsoft.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -250,32 +264,23 @@ files:
 - lib/azure/storage/blob/page.rb
 - lib/azure/storage/blob/serialization.rb
 - lib/azure/storage/client.rb
+- lib/azure/storage/client_options.rb
+- lib/azure/storage/client_options_error.rb
 - lib/azure/storage/configurable.rb
 - lib/azure/storage/core.rb
 - lib/azure/storage/core/auth/shared_access_signature.rb
 - lib/azure/storage/core/auth/shared_access_signature_generator.rb
 - lib/azure/storage/core/auth/shared_access_signature_signer.rb
 - lib/azure/storage/core/auth/shared_key.rb
-- lib/azure/storage/core/auth/shared_key_lite.rb
-- lib/azure/storage/core/auth/signer.rb
 - lib/azure/storage/core/autoload.rb
-- lib/azure/storage/core/client_options.rb
-- lib/azure/storage/core/client_options_error.rb
-- lib/azure/storage/core/constants.rb
 - lib/azure/storage/core/error.rb
-- lib/azure/storage/core/filtered_service.rb
-- lib/azure/storage/core/http/debug_filter.rb
-- lib/azure/storage/core/http/http_error.rb
-- lib/azure/storage/core/http/http_filter.rb
-- lib/azure/storage/core/http/http_request.rb
-- lib/azure/storage/core/http/http_response.rb
-- lib/azure/storage/core/http/retry_policy.rb
-- lib/azure/storage/core/http/signer_filter.rb
+- lib/azure/storage/core/filter/exponential_retry_filter.rb
+- lib/azure/storage/core/filter/linear_retry_filter.rb
+- lib/azure/storage/core/filter/retry_filter.rb
 - lib/azure/storage/core/http_client.rb
-- lib/azure/storage/core/service.rb
-- lib/azure/storage/core/signed_service.rb
 - lib/azure/storage/core/sr.rb
 - lib/azure/storage/core/utility.rb
+- lib/azure/storage/default.rb
 - lib/azure/storage/queue/message.rb
 - lib/azure/storage/queue/queue.rb
 - lib/azure/storage/queue/queue_service.rb
@@ -327,3 +332,4 @@ signing_key:
 specification_version: 4
 summary: Official Ruby client library to consume Azure Storage services
 test_files: []
+has_rdoc: