azure-storage 0.14.0.preview → 0.15.0.preview

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9d928e46742461de06b7ea74aba3adfd35076eb6
-  data.tar.gz: 7c60c44b62b9a09f9bf9ff2f113a16182619e335
+  metadata.gz: e5c12c44729bf416e20e2a983f88fce629e58982
+  data.tar.gz: d589d29762029eccf660cd0fca41bb2e18b49082
 SHA512:
-  metadata.gz: 5cf469aea716d07951b603167cce71a3bf51dfd5142d5431998c68e047bd1b651a7bb6c5b22c5de6ac57b1e0a7c41cafbf2fa823a1043685a02222e30c3b8bf7
-  data.tar.gz: 7d529320af4adc9026c9714f8a4f7276524b77c98909046d75753c986ce8054b24e91b0ff8892a01ebe669321728d684e0bbc4e285bd6cd0cd8520d83b61f3bf
+  metadata.gz: 109b153f84da28f24892241fe953ab93f7c4e6d1664fd4c5ed723000902ac6af508ea5523bb688a5783d6f52a5ceac5dedd00637ea480388fc552f896a59be95
+  data.tar.gz: b0186d8eec0537b52ec24647a994813e867dfa6b23b34e9ad69224fe46e4719d46a978130cf24e67480689002f6b743d84a9b35b901a75f80b7957b7cb0681bb

data/lib/azure/storage/blob/append.rb

@@ -63,6 +63,8 @@ module Azure::Storage
     # * +:if_none_match+             - String. An ETag value. Specify an ETag value for this conditional header to create a new blob
     #                                  only if the blob's ETag value does not match the value specified. If the values are identical,
     #                                  the Blob service returns status code 412 (Precondition Failed).
+    # * +:lease_id+                  - String. Required if the blob has an active lease. To perform this operation on a blob with an active lease,
+    #                                  specify the valid lease ID for this header.
     #
     # See http://msdn.microsoft.com/en-us/library/azure/dd179451.aspx
     #
@@ -92,6 +94,7 @@ module Azure::Storage
 
       StorageService.add_metadata_to_headers options[:metadata], headers
       add_blob_conditional_headers options, headers
+      headers["x-ms-lease-id"] = options[:lease_id] if options[:lease_id]
 
       # call PutBlob with empty body
       response = call(:put, uri, nil, headers, options)
@@ -135,6 +138,8 @@ module Azure::Storage
     # * +:if_none_match+             - String. An ETag value. Specify an ETag value for this conditional header to append a block only if
     #                                  the blob's ETag value does not match the value specified. If the values are identical,
     #                                  the Blob service returns status code 412 (Precondition Failed).
+    # * +:lease_id+                  - String. Required if the blob has an active lease. To perform this operation on a blob with an
+    #                                  active lease, specify the valid lease ID for this header.
     #
     # See http://msdn.microsoft.com/en-us/library/azure/mt427365.aspx
     #
@@ -150,6 +155,7 @@ module Azure::Storage
       StorageService.with_header headers, "x-ms-lease-id", options[:lease_id]
 
       add_blob_conditional_headers options, headers
+      headers["x-ms-lease-id"] = options[:lease_id] if options[:lease_id]
 
       response = call(:put, uri, content, headers, options)
       result = Serialization.blob_from_headers(response.headers)

data/lib/azure/storage/blob/blob.rb

@@ -61,6 +61,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.
     # * +:if_modified_since+         - String. A DateTime value. Specify this conditional header to get the blob
     #                                  only if the blob has been modified since the specified date/time. If the blob has not been modified,
     #                                  the Blob service returns status code 412 (Precondition Failed).
@@ -73,6 +75,12 @@ module Azure::Storage
     # * +:if_none_match+             - String. An ETag value. Specify an ETag value for this conditional header to get the blob
     #                                  only if the blob's ETag value does not match the value specified. If the values are identical,
     #                                  the Blob service returns status code 412 (Precondition Failed).
+    # * +:lease_id+                  - String. If this header is specified, the operation will be performed only if both of the
+    #                                  following conditions are met:
+    #                                   - The blob's lease is currently active.
+    #                                   - The lease ID specified in the request matches that of the blob.
+    #                                  If this header is specified and both of these conditions are not met, the request will fail
+    #                                  and the Get Blob operation will fail with status code 412 (Precondition Failed).
     #
     # See http://msdn.microsoft.com/en-us/library/azure/dd179440.aspx
     #
@@ -81,7 +89,9 @@ module Azure::Storage
       query = {}
       StorageService.with_query query, "snapshot", options[:snapshot]
       StorageService.with_query query, "timeout", options[:timeout].to_s if options[:timeout]
-      uri = blob_uri(container, blob, query)
+      
+      options[:request_location_mode] = RequestLocationMode::PRIMARY_OR_SECONDARY
+      uri = blob_uri(container, blob, query, options)
 
       headers = StorageService.common_headers
       options[:start_range] = 0 if options[:end_range] && (not options[:start_range])
@@ -90,6 +100,7 @@ module Azure::Storage
         StorageService.with_header headers, "x-ms-range-get-content-md5", "true" if options[:get_content_md5]
       end
       add_blob_conditional_headers options, headers
+      headers["x-ms-lease-id"] = options[:lease_id] if options[:lease_id]
 
       response = call(:get, uri, nil, headers, options)
       result = Serialization.blob_from_headers(response.headers)
@@ -114,6 +125,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.
     # * +:if_modified_since+         - String. A DateTime value. Specify this conditional header to get the blob properties
     #                                  only if the blob has been modified since the specified date/time. If the blob has not been modified,
     #                                  the Blob service returns status code 412 (Precondition Failed).
@@ -126,6 +139,14 @@ module Azure::Storage
     # * +:if_none_match+             - String. An ETag value. Specify an ETag value for this conditional header to get the blob properties
     #                                  only if the blob's ETag value does not match the value specified. If the values are identical,
     #                                  the Blob service returns status code 412 (Precondition Failed).
+    # * +:lease_id+                  - String. If this header is specified, the operation will be performed only if both of the
+    #                                  following conditions are met:
+    #
+    #                                   - The blob's lease is currently active.
+    #                                   - The lease ID specified in the request matches that of the blob.
+    #
+    #                                  If this header is specified and both of these conditions are not met, the request will fail
+    #                                  and the Get Blob Properties operation will fail with status code 412 (Precondition Failed).
     #
     # See http://msdn.microsoft.com/en-us/library/azure/dd179394.aspx
     #
@@ -139,8 +160,10 @@ module Azure::Storage
       unless options.empty?
         add_blob_conditional_headers options, headers
       end
+      headers["x-ms-lease-id"] = options[:lease_id] if options[:lease_id]
 
-      uri = blob_uri(container, blob, query)
+      options[:request_location_mode] = RequestLocationMode::PRIMARY_OR_SECONDARY
+      uri = blob_uri(container, blob, query, options)
 
       response = call(:head, uri, nil, headers, options)
 
@@ -217,6 +240,8 @@ module Azure::Storage
     # * +:if_none_match+             - String. An ETag value. Specify an ETag value for this conditional header to set the blob properties
     #                                  only if the blob's ETag value does not match the value specified. If the values are identical,
     #                                  the Blob service returns status code 412 (Precondition Failed).
+    # * +:lease_id+                  - String. Required if the blob has an active lease. To perform this operation on a blob with an active
+    #                                  lease, specify the valid lease ID for this header.
     #
     # Remarks:
     #
@@ -271,6 +296,7 @@ module Azure::Storage
         end
 
         add_blob_conditional_headers options, headers
+        headers["x-ms-lease-id"] = options[:lease_id] if options[:lease_id]
       end
 
       call(:put, uri, nil, headers, options)
@@ -293,6 +319,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.
     # * +:if_modified_since+         - String. A DateTime value. Specify this conditional header to get the blob metadata
     #                                  only if the blob has been modified since the specified date/time. If the blob has not been modified,
     #                                  the Blob service returns status code 412 (Precondition Failed).
@@ -305,6 +333,14 @@ module Azure::Storage
     # * +:if_none_match+             - String. An ETag value. Specify an ETag value for this conditional header to get the blob metadata
     #                                  only if the blob's ETag value does not match the value specified. If the values are identical,
     #                                  the Blob service returns status code 412 (Precondition Failed).
+    # * +:lease_id+                  - String. If this header is specified, the operation will be performed only if both of the
+    #                                  following conditions are met:
+    #
+    #                                   - The blob's lease is currently active.
+    #                                   - The lease ID specified in the request matches that of the blob.
+    #
+    #                                  If this header is specified and both of these conditions are not met, the request will fail
+    #                                  and the Get Blob Metadata operation will fail with status code 412 (Precondition Failed).
     #
     # See http://msdn.microsoft.com/en-us/library/azure/dd179350.aspx
     #
@@ -317,9 +353,11 @@ module Azure::Storage
       headers = StorageService.common_headers
       unless options.empty?
         add_blob_conditional_headers options, headers
+        headers["x-ms-lease-id"] = options[:lease_id] if options[:lease_id]
       end
 
-      uri = blob_uri(container, blob, query)
+      options[:request_location_mode] = RequestLocationMode::PRIMARY_OR_SECONDARY
+      uri = blob_uri(container, blob, query, options)
       response = call(:get, uri, nil, headers, options)
       result = Serialization.blob_from_headers(response.headers)
 
@@ -356,6 +394,8 @@ module Azure::Storage
     # * +:if_none_match+             - String. An ETag value. Specify an ETag value for this conditional header to set the blob metadata
     #                                  only if the blob's ETag value does not match the value specified. If the values are identical,
     #                                  the Blob service returns status code 412 (Precondition Failed).
+    # * +:lease_id+                  - String. Required if the blob has an active lease. To perform this operation on a blob with an active
+    #                                  lease, specify the valid lease ID for this header.
     #
     # See http://msdn.microsoft.com/en-us/library/azure/dd179414.aspx
     #
@@ -370,6 +410,7 @@ module Azure::Storage
       StorageService.add_metadata_to_headers metadata, headers
       unless options.empty?
         add_blob_conditional_headers options, headers
+        headers["x-ms-lease-id"] = options[:lease_id] if options[:lease_id]
       end
 
       call(:put, uri, nil, headers, options)
@@ -407,6 +448,8 @@ module Azure::Storage
     # * +:if_none_match+             - String. An ETag value. Specify an ETag value for this conditional header to acquire the lease
     #                                  only if the blob's ETag value does not match the value specified. If the values are identical,
     #                                  the Blob service returns status code 412 (Precondition Failed).
+    # * +:origin+                    - String. Optional. Specifies the origin from which the request is issued. The presence of this header results
+    #                                  in cross-origin resource sharing headers on the response.
     #
     # See http://msdn.microsoft.com/en-us/library/azure/ee691972.aspx
     #
@@ -447,6 +490,8 @@ module Azure::Storage
     # * +:if_none_match+             - String. An ETag value. Specify an ETag value for this conditional header to renew the lease
     #                                  only if the blob's ETag value does not match the value specified. If the values are identical,
     #                                  the Blob service returns status code 412 (Precondition Failed).
+    # * +:origin+                    - String. Optional. Specifies the origin from which the request is issued. The presence of this header results
+    #                                  in cross-origin resource sharing headers on the response.
     # See http://msdn.microsoft.com/en-us/library/azure/ee691972.aspx
     #
     # Returns the renewed lease id
@@ -483,6 +528,8 @@ module Azure::Storage
     # * +:if_none_match+             - String. An ETag value. Specify an ETag value for this conditional header to change the lease
     #                                  only if the blob's ETag value does not match the value specified. If the values are identical,
     #                                  the Blob service returns status code 412 (Precondition Failed).
+    # * +:origin+                    - String. Optional. Specifies the origin from which the request is issued. The presence of this header results
+    #                                  in cross-origin resource sharing headers on the response.
     # See http://msdn.microsoft.com/en-us/library/azure/ee691972.aspx
     #
     # Returns the changed lease id
@@ -519,6 +566,8 @@ module Azure::Storage
     # * +:if_none_match+             - String. An ETag value. Specify an ETag value for this conditional header to release the lease
     #                                  only if the blob's ETag value does not match the value specified. If the values are identical,
     #                                  the Blob service returns status code 412 (Precondition Failed).
+    # * +:origin+                    - String. Optional. Specifies the origin from which the request is issued. The presence of this header results
+    #                                  in cross-origin resource sharing headers on the response.
     # See http://msdn.microsoft.com/en-us/library/azure/ee691972.aspx
     #
     # Returns nil on success
@@ -567,6 +616,8 @@ module Azure::Storage
     # * +:if_none_match+             - String. An ETag value. Specify an ETag value for this conditional header to break the lease
     #                                  only if the blob's ETag value does not match the value specified. If the values are identical,
     #                                  the Blob service returns status code 412 (Precondition Failed).
+    # * +:origin+                    - String. Optional. Specifies the origin from which the request is issued. The presence of this header results
+    #                                  in cross-origin resource sharing headers on the response.
     # See http://msdn.microsoft.com/en-us/library/azure/ee691972.aspx
     #
     # Returns an Integer of the remaining lease time. This value is the approximate time remaining in the lease
@@ -603,6 +654,12 @@ module Azure::Storage
     # * +:if_none_match+             - String. An ETag value. Specify an ETag value for this conditional header to create the blob snapshot
     #                                  only if the blob's ETag value does not match the value specified. If the values are identical,
     #                                  the Blob service returns status code 412 (Precondition Failed).
+    # * +:lease_id+                  - String. If this header is specified, the operation will be performed only if both of the
+    #                                  following conditions are met:
+    #                                   - The blob's lease is currently active.
+    #                                   - The lease ID specified in the request matches that of the blob.
+    #                                  If this header is specified and both of these conditions are not met, the request will fail
+    #                                  and the Snapshot Blob operation will fail with status code 412 (Precondition Failed).
     #
     # See http://msdn.microsoft.com/en-us/library/azure/ee691971.aspx
     #
@@ -617,6 +674,7 @@ module Azure::Storage
       unless options.empty?
         StorageService.add_metadata_to_headers(options[:metadata], headers)
         add_blob_conditional_headers(options, headers)
+        headers["x-ms-lease-id"] = options[:lease_id] if options[:lease_id]
       end
 
       response = call(:put, uri, nil, headers, options)
@@ -668,6 +726,13 @@ 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.
+    # * +:lease_id+                   - String. Required if the destination blob has an active lease. The lease ID specified for
+    #                                   this header must match the lease ID of the destination blob. If the request does not include
+    #                                   the lease ID or it is not valid, the operation fails with status code 412 (Precondition Failed).
+    #                                   If this header is specified and the destination blob does not currently have an active lease,
+    #                                   the operation will also fail with status code 412 (Precondition Failed).
+    #                                   In version 2012-02-12 and newer, this value must specify an active, infinite lease for a
+    #                                   leased blob. A finite-duration lease ID fails with 412 (Precondition Failed).
     #
     # See http://msdn.microsoft.com/en-us/library/azure/dd894037.aspx
     #
@@ -690,6 +755,7 @@ module Azure::Storage
       unless options.empty?
         add_blob_conditional_headers options, headers
         StorageService.add_metadata_to_headers options[:metadata], headers
+        headers["x-ms-lease-id"] = options[:lease_id] if options[:lease_id]
       end
 
       response = call(:put, uri, nil, headers, options)
@@ -741,6 +807,13 @@ 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.
+    # * +:lease_id+                   - String. Required if the destination blob has an active lease. The lease ID specified for
+    #                                   this header must match the lease ID of the destination blob. If the request does not include
+    #                                   the lease ID or it is not valid, the operation fails with status code 412 (Precondition Failed).
+    #                                   If this header is specified and the destination blob does not currently have an active lease,
+    #                                   the operation will also fail with status code 412 (Precondition Failed).
+    #                                   In version 2012-02-12 and newer, this value must specify an active, infinite lease for a
+    #                                   leased blob. A finite-duration lease ID fails with 412 (Precondition Failed).
     #
     # See http://msdn.microsoft.com/en-us/library/azure/dd894037.aspx
     #
@@ -830,6 +903,9 @@ module Azure::Storage
     # * +:if_none_match+             - String. An ETag value. Specify an ETag value for this conditional header to create the blob snapshot
     #                                  only if the blob's ETag value does not match the value specified. If the values are identical,
     #                                  the Blob service returns status code 412 (Precondition Failed).
+    # * +:lease_id+                  - String. Required if the blob has an active lease. To perform this operation on a blob with an
+    #                                  active lease, specify the valid lease ID for this header. If a valid lease ID is not specified
+    #                                  on the request, the operation will fail with status code 403 (Forbidden).
     #
     # See http://msdn.microsoft.com/en-us/library/azure/dd179440.aspx
     #
@@ -846,6 +922,7 @@ module Azure::Storage
       headers = StorageService.common_headers
       StorageService.with_header headers, "x-ms-delete-snapshots", options[:delete_snapshots].to_s if options[:delete_snapshots] && options[:snapshot] == nil
       add_blob_conditional_headers options, headers
+      headers["x-ms-lease-id"] = options[:lease_id] if options[:lease_id]
 
       call(:delete, uri, nil, headers, options)
       nil

data/lib/azure/storage/blob/blob_service.rb

@@ -44,7 +44,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_blob_host
+        @storage_service_host[:primary] = client.storage_blob_host
+        @storage_service_host[:secondary] = client.storage_blob_host true
       end
 
       def call(method, uri, body = nil, headers = {}, options = {})
@@ -103,6 +104,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://msdn.microsoft.com/en-us/library/azure/dd179352.aspx
       #
       # NOTE: Metadata requested with the :metadata parameter must have been stored in
@@ -126,7 +130,8 @@ module Azure::Storage
           StorageService.with_query query, "timeout", options[:timeout].to_s if options[:timeout]
         end
 
-        uri = containers_uri(query)
+        options[:request_location_mode] = RequestLocationMode::PRIMARY_OR_SECONDARY
+        uri = containers_uri(query, options)
         response = call(:get, uri, nil, {}, options)
 
         Serialization.container_enumeration_results_from_xml(response.body)
@@ -163,6 +168,8 @@ module Azure::Storage
       # * +:if_none_match+           - String. An ETag value. Specify an ETag value for this conditional header to acquire the lease
       #                                only if the blob's ETag value does not match the value specified. If the values are identical,
       #                                the Blob service returns status code 412 (Precondition Failed).
+      # * +:origin+                  - String. Optional. Specifies the origin from which the request is issued. The presence of this header results
+      #                                in cross-origin resource sharing headers on the response.
       #
       # See http://msdn.microsoft.com/en-us/library/azure/ee691972.aspx
       #
@@ -187,6 +194,7 @@ module Azure::Storage
           Service::StorageService.with_header headers, "x-ms-lease-action", "acquire"
           Service::StorageService.with_header headers, "x-ms-lease-duration", duration.to_s if duration
           Service::StorageService.with_header headers, "x-ms-proposed-lease-id", options[:proposed_lease_id]
+          Service::StorageService.with_header headers, "Origin", options[:origin].to_s if options[:origin]
           add_blob_conditional_headers options, headers
 
           response = call(:put, uri, nil, headers, options)
@@ -223,6 +231,8 @@ module Azure::Storage
       # * +:if_none_match+           - String. An ETag value. Specify an ETag value for this conditional header to renew the lease
       #                                only if the blob's ETag value does not match the value specified. If the values are identical,
       #                                the Blob service returns status code 412 (Precondition Failed).
+      # * +:origin+                  - String. Optional. Specifies the origin from which the request is issued. The presence of this header results
+      #                                in cross-origin resource sharing headers on the response.
       #
       # See http://msdn.microsoft.com/en-us/library/azure/ee691972.aspx
       #
@@ -242,6 +252,7 @@ module Azure::Storage
           headers = Service::StorageService.common_headers
           Service::StorageService.with_header headers, "x-ms-lease-action", "renew"
           Service::StorageService.with_header headers, "x-ms-lease-id", lease
+          Service::StorageService.with_header headers, "Origin", options[:origin].to_s if options[:origin]
           add_blob_conditional_headers options, headers
 
           response = call(:put, uri, nil, headers, options)
@@ -277,6 +288,8 @@ module Azure::Storage
       # * +:if_none_match+           - String. An ETag value. Specify an ETag value for this conditional header to change the lease
       #                                only if the blob's ETag value does not match the value specified. If the values are identical,
       #                                the Blob service returns status code 412 (Precondition Failed).
+      # * +:origin+                  - String. Optional. Specifies the origin from which the request is issued. The presence of this header results
+      #                                in cross-origin resource sharing headers on the response.
       #
       # See http://msdn.microsoft.com/en-us/library/azure/ee691972.aspx
       #
@@ -298,6 +311,7 @@ module Azure::Storage
           Service::StorageService.with_header headers, "x-ms-lease-action", "change"
           Service::StorageService.with_header headers, "x-ms-lease-id", lease
           Service::StorageService.with_header headers, "x-ms-proposed-lease-id", proposed_lease
+          Service::StorageService.with_header headers, "Origin", options[:origin].to_s if options[:origin]
           add_blob_conditional_headers options, headers
 
           response = call(:put, uri, nil, headers, options)
@@ -333,6 +347,8 @@ module Azure::Storage
       # * +:if_none_match+           - String. An ETag value. Specify an ETag value for this conditional header to release the lease
       #                                only if the blob's ETag value does not match the value specified. If the values are identical,
       #                                the Blob service returns status code 412 (Precondition Failed).
+      # * +:origin+                  - String. Optional. Specifies the origin from which the request is issued. The presence of this header results
+      #                                in cross-origin resource sharing headers on the response.
       #
       # See http://msdn.microsoft.com/en-us/library/azure/ee691972.aspx
       #
@@ -352,6 +368,7 @@ module Azure::Storage
           headers = Service::StorageService.common_headers
           Service::StorageService.with_header headers, "x-ms-lease-action", "release"
           Service::StorageService.with_header headers, "x-ms-lease-id", lease
+          Service::StorageService.with_header headers, "Origin", options[:origin].to_s if options[:origin]
           add_blob_conditional_headers options, headers
 
           call(:put, uri, nil, headers, options)
@@ -399,6 +416,8 @@ module Azure::Storage
       # * +:if_none_match+           - String. An ETag value. Specify an ETag value for this conditional header to acquire the lease
       #                                only if the blob's ETag value does not match the value specified. If the values are identical,
       #                                the Blob service returns status code 412 (Precondition Failed).
+      # * +:origin+                  - String. Optional. Specifies the origin from which the request is issued. The presence of this header results
+      #                                in cross-origin resource sharing headers on the response.
       #
       # See http://msdn.microsoft.com/en-us/library/azure/ee691972.aspx
       #
@@ -420,6 +439,7 @@ module Azure::Storage
           headers = Service::StorageService.common_headers
           Service::StorageService.with_header headers, "x-ms-lease-action", "break"
           Service::StorageService.with_header headers, "x-ms-lease-break-period", options[:break_period].to_s if options[:break_period]
+          Service::StorageService.with_header headers, "Origin", options[:origin].to_s if options[:origin]
           add_blob_conditional_headers options, headers
 
           response = call(:put, uri, nil, headers, options)
@@ -435,9 +455,9 @@ module Azure::Storage
       # Returns a URI.
       #
       protected
-        def containers_uri(query = {})
+        def containers_uri(query = {}, options = {})
           query = { "comp" => "list" }.merge(query)
-          generate_uri("", query)
+          generate_uri("", query, options)
         end
 
       # Protected: Generate the URI for a specific container.
@@ -450,10 +470,10 @@ module Azure::Storage
       # Returns a URI.
       #
       protected
-        def container_uri(name, query = {})
+        def container_uri(name, query = {}, options = {})
           return name if name.kind_of? ::URI
           query = { "restype" => "container" }.merge(query)
-          generate_uri(name, query)
+          generate_uri(name, query, options)
         end
 
       # Protected: Generate the URI for a specific Blob.
@@ -467,13 +487,14 @@ module Azure::Storage
       # Returns a URI.
       #
       protected
-        def blob_uri(container_name, blob_name, query = {})
+        def blob_uri(container_name, blob_name, query = {}, options = {})
           if container_name.nil? || container_name.empty?
             path = blob_name
           else
             path = ::File.join(container_name, blob_name)
           end
-          generate_uri(path, query, true)
+          options = { encode: true }.merge(options)
+          generate_uri(path, query, options)
         end
 
       # Adds conditional header with required condition