azure-storage 0.14.0.preview → 0.15.0.preview

data/lib/azure/storage/file/file_service.rb

@@ -39,7 +39,8 @@ module Azure::Storage
         client_config = options[:client] || Azure::Storage
         signer = options[:signer] || client_config.signer || Core::Auth::SharedKey.new(client_config.storage_account_name, client_config.storage_access_key)
         super(signer, client_config.storage_account_name, options, &block)
-        @host = client.storage_file_host
+        @storage_service_host[:primary] = client.storage_file_host
+        @storage_service_host[:secondary] = client.storage_file_host true
       end
 
       def call(method, uri, body = nil, headers = {}, options = {})
@@ -98,6 +99,9 @@ module Azure::Storage
       # * +:request_id+              - String. Provides a client-generated, opaque value with a 1 KB character limit that is recorded
       #                                in the analytics logs when storage analytics logging is enabled.
       #
+      # * +:location_mode+           - LocationMode. Specifies the location mode used to decide 
+      #                                which location the request should be sent to.
+      #
       # See: https://docs.microsoft.com/en-us/rest/api/storageservices/fileservices/list-shares
       #
       # Returns an Azure::Service::EnumerationResults
@@ -112,7 +116,8 @@ module Azure::Storage
           StorageService.with_query query, "timeout", options[:timeout].to_s if options[:timeout]
         end
 
-        uri = shares_uri(query)
+        options[:request_location_mode] = RequestLocationMode::PRIMARY_OR_SECONDARY
+        uri = shares_uri(query, options)
         response = call(:get, uri, nil, {}, options)
 
         Serialization.share_enumeration_results_from_xml(response.body)
@@ -127,9 +132,9 @@ module Azure::Storage
       # Returns a URI.
       #
       protected
-        def shares_uri(query = {})
+        def shares_uri(query = {}, options = {})
           query = { "comp" => "list" }.merge(query)
-          generate_uri("", query)
+          generate_uri("", query, options)
         end
 
       # Protected: Generate the URI for a specific share.
@@ -142,10 +147,10 @@ module Azure::Storage
       # Returns a URI.
       #
       protected
-        def share_uri(name, query = {})
+        def share_uri(name, query = {}, options = {})
           return name if name.kind_of? ::URI
-          query = { "restype" => "share" }.merge(query)
-          generate_uri(name, query)
+          query = { restype: "share" }.merge(query)
+          generate_uri(name, query, options)
         end
 
       # Protected: Generate the URI for a specific directory.
@@ -160,10 +165,11 @@ module Azure::Storage
       # Returns a URI.
       #
       protected
-        def directory_uri(share, directory_path, query = {})
+        def directory_uri(share, directory_path, query = {}, options = {})
           path = directory_path.nil? ? share : ::File.join(share, directory_path)
-          query = { "restype" => "directory" }.merge(query)
-          generate_uri(path, query, true)
+          query = { restype: "directory" }.merge(query)
+          options = { encode: true }.merge(options)
+          generate_uri(path, query, options)
         end
 
       # Protected: Generate the URI for a specific file.
@@ -178,13 +184,14 @@ module Azure::Storage
       # Returns a URI.
       #
       protected
-        def file_uri(share, directory_path, file, query = {})
+        def file_uri(share, directory_path, file, query = {}, options = {})
           if directory_path.nil?
             path = ::File.join(share, file)
           else
             path = ::File.join(share, directory_path, file)
           end
-          generate_uri(path, query, true)
+          options = { encode: true }.merge(options)
+          generate_uri(path, query, options)
         end
     end
   end

data/lib/azure/storage/file/share.rb

@@ -100,6 +100,8 @@ module Azure::Storage::File
     # * +:timeout+                  - Integer. A timeout in seconds.
     # * +:request_id+               - String. Provides a client-generated, opaque value with a 1 KB character limit that is recorded
     #                                 in the analytics logs when storage analytics logging is enabled.
+    # * +:location_mode+            - LocationMode. Specifies the location mode used to decide 
+    #                                 which location the request should be sent to.
     #
     # See https://docs.microsoft.com/en-us/rest/api/storageservices/fileservices/get-share-properties
     #
@@ -110,7 +112,8 @@ module Azure::Storage::File
       query["timeout"] = options[:timeout].to_s if options[:timeout]
 
       # Call
-      response = call(:get, share_uri(name, query), nil, {}, options)
+      options[:request_location_mode] = Azure::Storage::RequestLocationMode::PRIMARY_OR_SECONDARY
+      response = call(:get, share_uri(name, query, options), nil, {}, options)
 
       # result
       share = Serialization.share_from_headers(response.headers)
@@ -166,6 +169,8 @@ module Azure::Storage::File
     # * +:timeout+                  - Integer. A timeout in seconds.
     # * +:request_id+               - String. Provides a client-generated, opaque value with a 1 KB character limit that is recorded
     #                                 in the analytics logs when storage analytics logging is enabled.
+    # * +:location_mode+            - LocationMode. Specifies the location mode used to decide 
+    #                                 which location the request should be sent to.
     #
     # See https://docs.microsoft.com/en-us/rest/api/storageservices/fileservices/get-share-metadata
     #
@@ -176,7 +181,8 @@ module Azure::Storage::File
       query["timeout"] = options[:timeout].to_s if options[:timeout]
 
       # Call
-      response = call(:get, share_uri(name, query), nil, {}, options)
+      options[:request_location_mode] = Azure::Storage::RequestLocationMode::PRIMARY_OR_SECONDARY
+      response = call(:get, share_uri(name, query, options), nil, {}, options)
 
       # result
       share = Serialization.share_from_headers(response.headers)
@@ -260,6 +266,8 @@ module Azure::Storage::File
     # * +:timeout+                  - Integer. A timeout in seconds.
     # * +:request_id+               - String. Provides a client-generated, opaque value with a 1 KB character limit that is recorded
     #                                 in the analytics logs when storage analytics logging is enabled.
+    # * +:location_mode+            - LocationMode. Specifies the location mode used to decide 
+    #                                 which location the request should be sent to.
     #
     # See https://docs.microsoft.com/en-us/rest/api/storageservices/fileservices/get-share-acl
     #
@@ -273,7 +281,8 @@ module Azure::Storage::File
       query["timeout"] = options[:timeout].to_s if options[:timeout]
 
       # Call
-      response = call(:get, share_uri(name, query), nil, {}, options)
+      options[:request_location_mode] = Azure::Storage::RequestLocationMode::PRIMARY_OR_SECONDARY
+      response = call(:get, share_uri(name, query, options), nil, {}, options)
 
       # Result
       share = Serialization.share_from_headers(response.headers)
@@ -343,6 +352,8 @@ module Azure::Storage::File
     # * +:timeout+                  - Integer. A timeout in seconds.
     # * +:request_id+               - String. Provides a client-generated, opaque value with a 1 KB character limit that is recorded
     #                                 in the analytics logs when storage analytics logging is enabled.
+    # * +:location_mode+            - LocationMode. Specifies the location mode used to decide 
+    #                                 which location the request should be sent to.
     #
     # See https://docs.microsoft.com/en-us/rest/api/storageservices/fileservices/get-share-stats
     #
@@ -353,7 +364,8 @@ module Azure::Storage::File
       query["timeout"] = options[:timeout].to_s if options[:timeout]
 
       # Call
-      response = call(:get, share_uri(name, query), nil, {}, options)
+      options[:request_location_mode] = Azure::Storage::RequestLocationMode::PRIMARY_OR_SECONDARY
+      response = call(:get, share_uri(name, query, options), nil, {}, options)
 
       # result
       share = Serialization.share_from_headers(response.headers)

data/lib/azure/storage/queue/queue_service.rb

@@ -35,7 +35,8 @@ module Azure::Storage
         client_config = options[:client] || Azure::Storage
         signer = options[:signer] || client_config.signer || Azure::Storage::Core::Auth::SharedKey.new(client_config.storage_account_name, client_config.storage_access_key)
         super(signer, client_config.storage_account_name, options, &block)
-        @host = @client.storage_queue_host
+        @storage_service_host[:primary] = client.storage_queue_host
+        @storage_service_host[:secondary] = client.storage_queue_host true
       end
 
       # Public: Get a list of Queues from the server
@@ -65,6 +66,8 @@ module Azure::Storage
       # * +:timeout+                   - Integer. A timeout in seconds.
       # * +:request_id+                - String. Provides a client-generated, opaque value with a 1 KB character limit that is recorded
       #                                  in the analytics logs when storage analytics logging is enabled.
+      # * +:location_mode+             - LocationMode. Specifies the location mode used to decide 
+      #                                  which location the request should be sent to.
       #
       # NOTE: Metadata requested with the :metadata parameter must have been stored in
       # accordance with the naming restrictions imposed by the 2009-09-19 version of the queue
@@ -86,7 +89,8 @@ module Azure::Storage
         query["include"] = "metadata" if options[:metadata] == true
         query["timeout"] = options[:timeout].to_s if options[:timeout]
 
-        uri = collection_uri(query)
+        options[:request_location_mode] = RequestLocationMode::PRIMARY_OR_SECONDARY
+        uri = collection_uri(query, options)
         response = call(:get, uri, nil, {}, options)
 
         Serialization.queue_enumeration_results_from_xml(response.body)
@@ -195,6 +199,8 @@ module Azure::Storage
       # * +:timeout+                   - Integer. A timeout in seconds.
       # * +:request_id+                - String. Provides a client-generated, opaque value with a 1 KB character limit that is recorded
       #                                  in the analytics logs when storage analytics logging is enabled.
+      # * +:location_mode+             - LocationMode. Specifies the location mode used to decide 
+      #                                  which location the request should be sent to.
       #
       # See http://msdn.microsoft.com/en-us/library/azure/dd179384
       #
@@ -207,7 +213,8 @@ module Azure::Storage
         query = { "comp" => "metadata" }
         query["timeout"] = options[:timeout].to_s if options[:timeout]
 
-        uri = queue_uri(queue_name, query)
+        options[:request_location_mode] = RequestLocationMode::PRIMARY_OR_SECONDARY
+        uri = queue_uri(queue_name, query, options)
 
         response = call(:get, uri, nil, {}, options)
 
@@ -262,6 +269,8 @@ module Azure::Storage
       # * +:timeout+                   - Integer. A timeout in seconds.
       # * +:request_id+                - String. Provides a client-generated, opaque value with a 1 KB character limit that is recorded
       #                                  in the analytics logs when storage analytics logging is enabled.
+      # * +:location_mode+             - LocationMode. Specifies the location mode used to decide 
+      #                                  which location the request should be sent to.
       #
       # See http://msdn.microsoft.com/en-us/library/azure/jj159101
       #
@@ -270,7 +279,8 @@ module Azure::Storage
         query = { "comp" => "acl" }
         query["timeout"] = options[:timeout].to_s if options[:timeout]
 
-        response = call(:get, queue_uri(queue_name, query), nil, {}, options)
+        options[:request_location_mode] = RequestLocationMode::PRIMARY_OR_SECONDARY
+        response = call(:get, queue_uri(queue_name, query, options), nil, {}, options)
 
         signed_identifiers = []
         signed_identifiers = Serialization.signed_identifiers_from_xml(response.body) unless response.body == (nil) || response.body.length < (1)
@@ -432,6 +442,8 @@ module Azure::Storage
       # * +:timeout+                   - Integer. A timeout in seconds.
       # * +:request_id+                - String. Provides a client-generated, opaque value with a 1 KB character limit that is recorded
       #                                  in the analytics logs when storage analytics logging is enabled.
+      # * +:location_mode+             - LocationMode. Specifies the location mode used to decide 
+      #                                  which location the request should be sent to.
       #
       # See http://msdn.microsoft.com/en-us/library/azure/dd179472
       #
@@ -443,7 +455,8 @@ module Azure::Storage
         query = { "peekonly" => "true", "numofmessages" => number_of_messages.to_s }
         query["timeout"] = options[:timeout].to_s if options[:timeout]
 
-        uri = messages_uri(queue_name, query)
+        options[:request_location_mode] = RequestLocationMode::PRIMARY_OR_SECONDARY
+        uri = messages_uri(queue_name, query, options)
         response = call(:get, uri, nil, {}, options)
 
         messages = Serialization.queue_messages_from_xml(response.body, options[:decode])
@@ -558,9 +571,9 @@ module Azure::Storage
       #
       # Returns a URI.
       protected
-        def collection_uri(query = {})
+        def collection_uri(query = {}, options = {})
           query.update(comp: "list", include: "metadata")
-          generate_uri("", query)
+          generate_uri("", query, options)
         end
 
       # Protected: Generate the URI for a given queue.
@@ -572,9 +585,9 @@ module Azure::Storage
       #
       # Returns a URI.
       protected
-        def queue_uri(queue_name, query = {})
+        def queue_uri(queue_name, query = {}, options = {})
           return queue_name if queue_name.kind_of? ::URI
-          generate_uri(queue_name, query)
+          generate_uri(queue_name, query, options)
         end
 
       # Protected: Generate the messages URI for the given queue.
@@ -586,8 +599,8 @@ module Azure::Storage
       #
       # Returns a URI.
       protected
-        def messages_uri(queue_name, query = {})
-          generate_uri("#{queue_name}/messages", query)
+        def messages_uri(queue_name, query = {}, options = {})
+          generate_uri("#{queue_name}/messages", query, options)
         end
 
       # Protected: Generate the URI for a given message
@@ -600,8 +613,8 @@ module Azure::Storage
       #
       # Returns a URI.
       protected
-        def message_uri(queue_name, message_id, query = {})
-          generate_uri("#{queue_name}/messages/#{message_id}", query)
+        def message_uri(queue_name, message_id, query = {}, options = {})
+          generate_uri("#{queue_name}/messages/#{message_id}", query, options)
         end
     end
   end

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

@@ -0,0 +1,40 @@
+# frozen_string_literal: true
+
+#-------------------------------------------------------------------------
+# # 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.
+#--------------------------------------------------------------------------
+
+module Azure::Storage
+  module Service
+    class GeoReplication
+      def initialize
+        @status = nil
+        @last_sync_time = nil
+        yield self if block_given?
+      end
+
+      attr_accessor :status
+      attr_accessor :last_sync_time
+    end
+  end
+end

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

@@ -24,6 +24,7 @@
 # THE SOFTWARE.
 #--------------------------------------------------------------------------
 require "nokogiri"
+require "time"
 
 require "azure/storage/service/enumeration_results"
 require "azure/storage/service/signed_identifier"
@@ -34,6 +35,7 @@ require "azure/storage/service/metrics"
 require "azure/storage/service/retention_policy"
 require "azure/storage/service/cors"
 require "azure/storage/service/cors_rule"
+require "azure/storage/service/storage_service_stats"
 
 module Azure::Storage
   module Service
@@ -253,6 +255,21 @@ module Azure::Storage
           end
         end
 
+        def geo_replication_from_xml(xml)
+          xml = slopify(xml)
+          expect_node("GeoReplication", xml)
+
+          GeoReplication.new do |geo_replication|
+            geo_replication.status = xml.Status.text if (xml > "Status").any?
+            geo_replication.last_sync_time =
+              begin
+                Time.parse(xml.LastSyncTime.text) if (xml > "LastSyncTime").any?
+              rescue
+                nil
+              end
+          end
+        end
+
         def ary_from_node(node)
           node.text.split(",").map { |s| s.strip }
         end
@@ -283,6 +300,15 @@ module Azure::Storage
           end
         end
 
+        def service_stats_from_xml(xml)
+          xml = slopify(xml)
+          expect_node("StorageServiceStats", xml)
+          
+          StorageServiceStats.new do |stats|
+            stats.geo_replication = geo_replication_from_xml(xml.GeoReplication)
+          end
+        end
+
         def to_bool(s)
           (s || "").downcase == "true"
         end

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

@@ -27,11 +27,17 @@
 require "azure/core/signed_service"
 require "azure/storage/core"
 require "azure/storage/service/storage_service_properties"
+require "azure/storage/service/storage_service_stats"
 
 module Azure::Storage
   module Service
     # A base class for StorageService implementations
     class StorageService < Azure::Core::SignedService
+
+      # @!attribute storage_service_host
+      # @return [Hash] Get or set the storage service host
+      attr_accessor :storage_service_host
+
       # Create a new instance of the StorageService
       #
       # @param signer         [Azure::Core::Auth::Signer] An implementation of Signer used for signing requests.
@@ -39,7 +45,7 @@ module Azure::Storage
       # @param account_name   [String] The account name (optional, Default=Azure::Storage.storage_account_name)
       # @param options        [Azure::Storage::Configurable] the client configuration context
       def initialize(signer = nil, account_name = nil, options = {}, &block)
-        StorageService.register_request_callback &block if block_given?
+        StorageService.register_request_callback(&block) if block_given?
         options[:client] = Azure::Storage if options[:client] == nil
         client_config = options[:client]
         signer = signer || Azure::Storage::Core::Auth::SharedKey.new(
@@ -48,11 +54,12 @@ module Azure::Storage
         signer = signer || Azure::Storage::Core::Auth::SharedAccessSignatureSigner.new(
           client_config.storage_account_name,
           client_config.storage_sas_token)
+        @storage_service_host = { primary: "", secondary: "" };
         super(signer, account_name, options)
       end
 
       def call(method, uri, body = nil, headers = {}, options = {})
-        super(method, uri, body, StorageService.common_headers(options).merge(headers))
+        super(method, uri, body, StorageService.common_headers(options).merge(headers), options)
       end
 
       # Public: Get Storage Service properties
@@ -98,9 +105,35 @@ module Azure::Storage
         nil
       end
 
+      # Public: Retrieves statistics related to replication for the service. 
+      # It is only available on the secondary location endpoint when read-access geo-redundant 
+      # replication is enabled for the storage account. 
+      #
+      # See https://docs.microsoft.com/en-us/rest/api/storageservices/get-blob-service-stats
+      # See https://docs.microsoft.com/en-us/rest/api/storageservices/get-queue-service-stats
+      # See https://docs.microsoft.com/en-us/rest/api/storageservices/get-table-service-stats
+      #
+      # ==== Options
+      #
+      # * +:timeout+                   - Integer. A timeout in seconds.
+      # * +:request_id+                - String. Provides a client-generated, opaque value with a 1 KB character limit that is recorded
+      #                                  in the analytics logs when storage analytics logging is enabled.
+      #
+      # Returns a Hash with the service statistics or nil if the operation failed
+      def get_service_stats(options = {})
+        query = {}
+        StorageService.with_query query, "timeout", options[:timeout].to_s if options[:timeout]
+
+        options.update(
+          location_mode: LocationMode::SECONDARY_ONLY,
+          request_location_mode: RequestLocationMode::SECONDARY_ONLY)
+        response = call(:get, service_stats_uri(query, options), nil, {}, options)
+        Serialization.service_stats_from_xml response.body
+      end
+
       # Public: Generate the URI for the service properties
       #
-      # query - see Azure::Storage::Services::GetServiceProperties#call documentation.
+      # * +:query+ - see Azure::Storage::Services::GetServiceProperties#call documentation.
       #
       # Returns a URI.
       def service_properties_uri(query = {})
@@ -108,21 +141,56 @@ module Azure::Storage
         generate_uri("", query)
       end
 
+      # Public: Generate the URI for the service statistics
+      #
+      # * +:query+ - see Azure::Storage::Services::GetServiceStats#call documentation.
+      #
+      # Returns a URI.
+      def service_stats_uri(query = {}, options = {})
+        query.update(restype: "service", comp: "stats")
+        generate_uri("", query, options)
+      end
+
       # Overrides the base class implementation to determine the request uri
       #
       # path    - String. the request path
       # query   - Hash. the query parameters
       #
+      # ==== Options
+      #
+      # * +:encode+                    - bool. Specifies whether to encode the path.
+      # * +:location_mode+             - LocationMode. Specifies the location mode used to decide 
+      #                                  which location the request should be sent to. 
+      # * +:request_location_mode+     - RequestLocationMode. Specifies the location used to indicate 
+      #                                  which location the operation (REST API) can be performed against.
+      #                                  This is determined by the API and cannot be specified by the users. 
+      #
       # Returns the uri hash
-      def generate_uri(path = "", query = {}, encode = false)
-        if self.client.is_a?(Azure::Storage::Client) && self.client.options[:use_path_style_uri]
-          if path.length > 0
-            path = self.client.options[:storage_account_name] + "/" + path
+      def generate_uri(path = "", query = {}, options = {})
+        location_mode =
+          if options[:location_mode].nil?
+            LocationMode::PRIMARY_ONLY
+          else
+            options[:location_mode]
+          end
+
+        request_location_mode = 
+          if options[:request_location_mode].nil?
+            RequestLocationMode::PRIMARY_ONLY
           else
-            path = self.client.options[:storage_account_name]
+            request_location_mode = options[:request_location_mode]
           end
+
+        location = StorageService.get_location location_mode, request_location_mode
+
+        if self.client.is_a?(Azure::Storage::Client) && self.client.options[:use_path_style_uri]
+          account_path = get_account_path location
+          path = path.length > 0 ? account_path + "/" + path : account_path
         end
 
+        @host = location == StorageLocation::PRIMARY ? @storage_service_host[:primary] : @storage_service_host[:secondary]
+
+        encode = options[:encode].nil? ? false : options[:encode]
         if encode
           path = CGI.escape(path.encode("UTF-8"))
 
@@ -134,7 +202,32 @@ module Azure::Storage
           path = path.gsub(/\+/, "%20")
         end
 
-        super path, query
+        @host = storage_service_host[:primary]
+        options[:primary_uri] = super path, query
+
+        @host = storage_service_host[:secondary]
+        options[:secondary_uri] = super path, query
+
+        if location == StorageLocation::PRIMARY
+          @host = @storage_service_host[:primary]
+          return options[:primary_uri]
+        else
+          @host = @storage_service_host[:secondary]
+          return options[:secondary_uri]
+        end
+      end
+
+      # Get account path according to the location settings.
+      #
+      # * +:location+                      - StorageLocation. Specifies the request location.
+      #
+      # Returns the account path
+      def get_account_path(location)
+        if location == StorageLocation::PRIMARY
+          self.client.options[:storage_account_name]
+        else
+          self.client.options[:storage_account_name] + "-secondary"
+        end
       end
 
       class << self
@@ -152,10 +245,41 @@ module Azure::Storage
           @request_callback = Proc.new
         end
 
+        # Get the request location.
+        #
+        # * +:location_mode+             - LocationMode. Specifies the location mode used to decide 
+        #                                  which location the request should be sent to.
+        # * +:request_location_mode+     - RequestLocationMode. Specifies the location used to indicate 
+        #                                  which location the operation (REST API) can be performed against.
+        #                                  This is determined by the API and cannot be specified by the users. 
+        #
+        # Returns the reqeust location
+        def get_location(location_mode, request_location_mode)
+          if request_location_mode == RequestLocationMode::PRIMARY_ONLY && location_mode == LocationMode::SECONDARY_ONLY
+            raise InvalidOptionsError, "This operation can only be executed against the primary storage location."
+          end
+
+          if request_location_mode == RequestLocationMode::SECONDARY_ONLY && location_mode == LocationMode::PRIMARY_ONLY
+            raise InvalidOptionsError, "This operation can only be executed against the secondary storage location."
+          end
+
+          if request_location_mode == RequestLocationMode::PRIMARY_ONLY
+            return StorageLocation::PRIMARY
+          elsif request_location_mode == RequestLocationMode::SECONDARY_ONLY
+            return StorageLocation::SECONDARY
+          end
+
+          if location_mode == LocationMode::PRIMARY_ONLY || location_mode == LocationMode::PRIMARY_THEN_SECONDARY
+            StorageLocation::PRIMARY
+          elsif location_mode == LocationMode::SECONDARY_ONLY || location_mode == LocationMode::SECONDARY_THEN_PRIMARY
+            StorageLocation::SECONDARY
+          end
+        end
+
         # Adds metadata properties to header hash with required prefix
         #
-        # metadata  - A Hash of metadata name/value pairs
-        # headers   - A Hash of HTTP headers
+        # * +:metadata+  - A Hash of metadata name/value pairs
+        # * +:headers+   - A Hash of HTTP headers
         def add_metadata_to_headers(metadata, headers)
           if metadata
             metadata.each do |key, value|
@@ -166,25 +290,25 @@ module Azure::Storage
 
         # Adds a value to the Hash object
         #
-        # object     - A Hash object
-        # key        - The key name
-        # value      - The value
+        # * +:object+     - A Hash object
+        # * +:key+        - The key name
+        # * +:value+      - The value
         def with_value(object, key, value)
           object[key] = value if value
         end
 
         # Adds a header with the value
         #
-        # headers    - A Hash of HTTP headers
-        # name       - The header name
-        # value      - The value
+        # * +:headers+    - A Hash of HTTP headers
+        # * +:name+       - The header name
+        # * +:value+      - The value
         alias with_header with_value
 
         # Adds a query parameter
         #
-        # query      - A Hash of HTTP query
-        # name       - The parameter name
-        # value      - The value
+        # * +:query+      - A Hash of HTTP query
+        # * +:name+       - The parameter name
+        # * +:value+      - The value
         alias with_query with_value
 
         # Declares a default hash object for request headers