azure-storage 0.11.5.preview → 0.12.0.preview

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 99c064d9e707d08b6efa5c7c83f96e6cb8a5ddc6
-  data.tar.gz: 5cc39f4003ae67bbb655fe8d30a5701d2404b736
+  metadata.gz: c54fd3d9800024a29cf5d43c6f867cb79f3ed46b
+  data.tar.gz: b8bab282f10b6c63768c992b3a6fa92b5e33f43b
 SHA512:
-  metadata.gz: 0359aaaeca2ae969a7ec5ffd68a281fb679fe952bf12fcbdda6e1a9086b2221a8e6c33853e8c0f8df170b6906fc748b21f86011a20c4ed4280baea3b07dd5393
-  data.tar.gz: a19f2f613d09b8da5305c0fc9d46395929be89d8640978af4123f1934147cae34fb6e5cbd230e20109e9eff7de041246c21699a28fcf944c4b289ba8b2c4f0a5
+  metadata.gz: 67212a5088a580dbb94f238ae3c3874fc56d49d7a664235f84eb96668a6061954175c2b8e0587a981cf3152fe02494f0c62bb6c74816faa5f8474ff2b628e83e
+  data.tar.gz: fa00cd1a38a04932c63ea34ef7c6599f1c100c1f726eb4bcfbba944aac19c4d3a89c09d81bdea7b265d6eb07a079c627e28bd4159098894d8b53da7334e0e3b1

data/lib/azure/storage/autoload.rb

@@ -65,5 +65,13 @@ module Azure
       autoload :Query,                    'azure/storage/table/query'
     end
 
+    module File
+      autoload :FileService,              'azure/storage/file/file_service'
+      autoload :Share,                    'azure/storage/file/share'
+      autoload :Directory,                'azure/storage/file/directory'
+      autoload :File,                     'azure/storage/file/file'
+      autoload :Serialization,            'azure/storage/file/serialization'
+    end
+
   end
 end

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

@@ -96,6 +96,7 @@ module Azure::Storage
 
       result = Serialization.blob_from_headers(response.headers)
       result.name = blob
+      result.metadata = options[:metadata] if options[:metadata]
 
       result
     end

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

@@ -125,7 +125,7 @@ module Azure::Storage
     #
     # See http://msdn.microsoft.com/en-us/library/azure/dd179394.aspx
     #
-    # Returns the blob properties
+    # Returns the blob properties with a Blob instance
     def get_blob_properties(container, blob, options={})
       query = { }
       StorageService.with_query query, 'snapshot', options[:snapshot]
@@ -620,13 +620,13 @@ module Azure::Storage
       response.headers['x-ms-snapshot']
     end
     
-    # Public: Copies a source blob to a destination blob.
+    # Public: Copies a source blob or file to a destination blob.
     #
     # ==== Attributes
     #
-    # * +source_container+           - String. The destination container name to copy to.
-    # * +source_blob+                - String. The destination blob name to copy to.
-    # * +source_blob_uri+            - String. The source blob URI to copy from.
+    # * +destination_container+      - String. The destination container name to copy to.
+    # * +destination_blob+           - String. The destination blob name to copy to.
+    # * +source_uri+                 - String. The source blob or file URI to copy from.
     # * +options+                    - Hash. Optional parameters.
     #
     # ==== Options
@@ -675,13 +675,13 @@ module Azure::Storage
     #                                    "success" - The copy completed successfully.
     #                                    "pending" - The copy is in progress.
     #
-    def copy_blob_from_uri(destination_container, destination_blob, source_blob_uri, options={})
+    def copy_blob_from_uri(destination_container, destination_blob, source_uri, options={})
       query = { }
       StorageService.with_query query, 'timeout', options[:timeout].to_s if options[:timeout]
 
       uri = blob_uri(destination_container, destination_blob, query)
       headers = StorageService.common_headers
-      StorageService.with_header headers, 'x-ms-copy-source', source_blob_uri
+      StorageService.with_header headers, 'x-ms-copy-source', source_uri
 
       unless options.empty?
         add_blob_conditional_headers options, headers
@@ -696,8 +696,8 @@ module Azure::Storage
     #
     # ==== Attributes
     #
-    # * +source_container+           - String. The destination container name to copy to.
-    # * +source_blob+                - String. The destination blob name to copy to.
+    # * +destination_container+      - String. The destination container name to copy to.
+    # * +destination_blob+           - String. The destination blob name to copy to.
     # * +source_container+           - String. The source container name to copy from.
     # * +source_blob+                - String. The source blob name to copy from.
     # * +options+                    - Hash. Optional parameters.

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

@@ -40,7 +40,7 @@ module Azure::Storage
       
       def initialize(options = {}, &block)
         client_config = options[:client] || Azure::Storage
-        signer = options[:signer] || Azure::Storage::Core::Auth::SharedKey.new(client_config.storage_account_name, client_config.storage_access_key)
+        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
       end
@@ -469,19 +469,9 @@ module Azure::Storage
         if container_name.nil? || container_name.empty?
           path = blob_name
         else
-          path = File.join(container_name, blob_name)
+          path = ::File.join(container_name, blob_name)
         end
-
-        path = CGI.escape(path.encode('UTF-8'))
-
-        # Unencode the forward slashes to match what the server expects.
-        path = path.gsub(/%2F/, '/')
-        # Unencode the backward slashes to match what the server expects.
-        path = path.gsub(/%5C/, '/')
-        # Re-encode the spaces (encoded as space) to the % encoding.
-        path = path.gsub(/\+/, '%20')
-
-        generate_uri(path, query)
+        generate_uri(path, query, true)
       end
       
       # Adds conditional header with required condition

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

@@ -115,6 +115,7 @@ module Azure::Storage
 
       result = Serialization.blob_from_headers(response.headers)
       result.name = blob
+      result.metadata = options[:metadata] if options[:metadata]
 
       result
     end

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

@@ -106,7 +106,8 @@ module Azure::Storage
 
       result = Serialization.blob_from_headers(response.headers)
       result.name = blob
-
+      result.metadata = options[:metadata] if options[:metadata]
+      
       result
     end
     
@@ -118,12 +119,14 @@ module Azure::Storage
     # * +blob+                       - String. Name of blob
     # * +start_range+                - Integer. Position of first byte of first page
     # * +end_range+                  - Integer. Position of last byte of of last page
-    # * +content+                    - IO or String. Content to write. Length in bytes should equal end_range - start_range
+    # * +content+                    - IO or String. Content to write. Length in bytes should equal end_range - start_range + 1
     # * +options+                    - Hash. A collection of options.
     #
     # ==== Options
     #
     # Accepted key/value pairs in options parameter are:
+    # * +:transactional_md5+         - String. An MD5 hash of the page content. This hash is used to verify the integrity of the page during transport.
+    #                                  When this header is specified, the storage service checks the hash that has arrived with the one that was sent.
     # * +:if_sequence_number_le+     - Integer. If the blob's sequence number is less than or equal to the specified value, the request proceeds; 
     #                                  otherwise it fails with the SequenceNumberConditionNotMet error (HTTP status code 412 - Precondition Failed).
     # * +:if_sequence_number_lt+     - Integer. If the blob's sequence number is less than the specified value, the request proceeds; 
@@ -155,6 +158,7 @@ module Azure::Storage
 
       uri = blob_uri(container, blob, query)
       headers = StorageService.common_headers
+      StorageService.with_header headers, 'Content-MD5', options[:transactional_md5]
       StorageService.with_header headers, 'x-ms-range', "bytes=#{start_range}-#{end_range}"
       StorageService.with_header headers, 'x-ms-page-write', 'update'
 

data/lib/azure/storage/client.rb

@@ -31,6 +31,7 @@ require 'azure/storage/service/storage_service'
 require 'azure/storage/blob/blob_service'
 require 'azure/storage/table/table_service'
 require 'azure/storage/queue/queue_service'
+require 'azure/storage/file/file_service'
 
 module Azure::Storage
   class Client
@@ -50,6 +51,7 @@ module Azure::Storage
     #
     # * +:use_development_storage+        - True. Whether to use storage emulator.
     # * +:development_storage_proxy_uri+  - String. Used with +:use_development_storage+ if emulator is hosted other than localhost.
+    # * +:storage_connection_string+      - String. The storage connection string.
     # * +:storage_account_name+           - String. The name of the storage account.
     # * +:storage_access_key+             - Base64 String. The access key of the storage account.
     # * +:storage_sas_token+              - String. The signed access signiture for the storage account or one of its service.
@@ -79,14 +81,9 @@ module Azure::Storage
     #
     # @return [Azure::Storage::Client]
     def initialize(options = {}, &block)
-      if options.is_a?(Hash)
-        options = setup_options if options.length == 0
-        options = parse_connection_string(options[:storage_connection_string]) if options[:storage_connection_string]
-
-        if options.has_key?(:user_agent_prefix)
-          Azure::Storage::Service::StorageService.user_agent_prefix = options[:user_agent_prefix]
-          options.delete :user_agent_prefix
-        end
+      if options.is_a?(Hash) and options.has_key?(:user_agent_prefix)
+        Azure::Storage::Service::StorageService.user_agent_prefix = options[:user_agent_prefix]
+        options.delete :user_agent_prefix
       end
       Azure::Storage::Service::StorageService.register_request_callback &block if block_given?
       reset!(options)
@@ -110,6 +107,12 @@ module Azure::Storage
       @table_client ||= Azure::Storage::Table::TableService.new(default_client(options))
     end
 
+    # Azure File service client configured from this Azure Storage client instance
+    # @return [Azure::Storage::File::FileService]
+    def file_client(options = {})
+      @file_client ||= Azure::Storage::File::FileService.new(default_client(options))
+    end
+
     class << self
       # Public: Creates an instance of [Azure::Storage::Client]
       #

data/lib/azure/storage/client_options.rb

@@ -34,7 +34,7 @@ module Azure::Storage
     #
     # ==== Attributes
     #
-    # * +options+    - Hash. Optional parameters.
+    # * +options+                         - Hash | String. Optional parameters or storage connection string.
     #
     # ==== Options
     #
@@ -42,6 +42,7 @@ module Azure::Storage
     #
     # * +:use_development_storage+        - TrueClass. Whether to use storage emulator.
     # * +:development_storage_proxy_uri+  - String. Used with +:use_development_storage+ if emulator is hosted other than localhost.
+    # * +:storage_connection_string+      - String. The storage connection string.
     # * +:storage_account_name+           - String. The name of the storage account.
     # * +:storage_access_key+             - Base64 String. The access key of the storage account.
     # * +:storage_sas_token+              - String. The signed access signiture for the storage account or one of its service.
@@ -71,9 +72,16 @@ module Azure::Storage
     def reset!(options = {})
       if options.is_a? String
         options = parse_connection_string(options)
+      elsif options.is_a? Hash
+        # When the options are provided via singlton setup: Azure::Storage.setup()
+        options = setup_options if options.length == 0
+        
+        options = parse_connection_string(options[:storage_connection_string]) if options[:storage_connection_string]
       end
-      
+
+      # Load from environment when no valid input
       options = load_env if options.length == 0
+
       @ca_file = options.delete(:ca_file)
       @options = filter(options)
       self.send(:reset_config!, @options) if self.respond_to?(:reset_config!)

data/lib/azure/storage/configurable.rb

@@ -58,7 +58,10 @@ module Azure::Storage
 
     attr_writer :storage_table_host,
                 :storage_blob_host,
-                :storage_queue_host
+                :storage_queue_host,
+                :storage_file_host
+
+    attr_reader :signer
 
     class << self
       # List of configurable keys for {Azure::Client}
@@ -71,7 +74,8 @@ module Azure::Storage
           :storage_sas_token,
           :storage_table_host,
           :storage_blob_host,
-          :storage_queue_host
+          :storage_queue_host,
+          :storage_file_host
         ]
       end
     end
@@ -81,6 +85,10 @@ module Azure::Storage
       yield self
     end
 
+    def config
+      self
+    end
+
     # Reset configuration options to default values
     def reset_config!(options = {})
       Azure::Storage::Configurable.keys.each do |key|
@@ -92,6 +100,7 @@ module Azure::Storage
         instance_variable_set(:"@#{key}", options.fetch(key, value))
       end
       self.send(:reset_agents!) if self.respond_to?(:reset_agents!)
+      setup_signer_for_service
       self
     end
 
@@ -121,10 +130,6 @@ module Azure::Storage
       @storage_file_host || default_host(:file)
     end
 
-    def config
-      self
-    end
-
     private
 
     def default_host(service)
@@ -139,5 +144,36 @@ module Azure::Storage
       opts
     end
 
+    def account_name_from_endpoint endpoint
+      return nil if endpoint.nil?
+      uri = URI::parse endpoint
+      fields = uri.host.split '.'
+      fields[0]
+    end
+
+    def determine_account_name
+      if instance_variable_get(:@storage_account_name).nil?
+        hosts = [@storage_blob_host, @storage_table_host, @storage_queue_host, @storage_file_host]
+        account_name = nil;
+        hosts.each do |host|
+          parsed = account_name_from_endpoint host
+          if account_name.nil?
+            account_name = parsed
+          elsif !account_name.nil? and !parsed.nil? and (account_name <=> parsed) != 0
+            raise InvalidOptionsError, "Ambiguous account name in service hosts."
+          end
+        end
+        raise InvalidOptionsError, "Cannot identify account name." if account_name.nil?
+        @storage_account_name = account_name
+      end
+    end
+
+    def setup_signer_for_service
+      if @storage_sas_token
+        determine_account_name
+        @signer = Azure::Storage::Core::Auth::SharedAccessSignatureSigner.new @storage_account_name, @storage_sas_token
+      end
+    end
+
   end
 end

data/lib/azure/storage/core/auth/shared_access_signature_generator.rb

@@ -83,6 +83,15 @@ module Azure::Storage::Core
         endrk:                :erk
       }
 
+      FILE_KEY_MAPPINGS = {
+        resource:             :sr,
+        cache_control:        :rscc,
+        content_disposition:  :rscd,
+        content_encoding:     :rsce,
+        content_language:     :rscl,
+        content_type:         :rsct
+      }
+
       SERVICE_OPTIONAL_QUERY_PARAMS = [:sp, :si, :sip, :spr, :rscc, :rscd, :rsce, :rscl, :rsct, :spk, :srk, :epk, :erk]
 
       ACCOUNT_OPTIONAL_QUERY_PARAMS = [:st, :sip, :spr]
@@ -151,6 +160,13 @@ module Azure::Storage::Core
         elsif service_type == Azure::Storage::ServiceType::TABLE
           options.merge!(table_name: path)
           valid_mappings.merge!(TABLE_KEY_MAPPINGS)
+        elsif service_type == Azure::Storage::ServiceType::FILE
+          if options[:resource]
+            options.merge!(resource: options[:resource])
+          else
+            options.merge!(resource: 'f')
+          end
+          valid_mappings.merge!(FILE_KEY_MAPPINGS)
         end
 
         invalid_options = options.reject { |k, _| valid_mappings.key?(k) }
@@ -188,7 +204,7 @@ module Azure::Storage::Core
           options[:content_encoding],
           options[:content_language],
           options[:content_type]
-        ] if service_type == Azure::Storage::ServiceType::BLOB
+        ] if service_type == Azure::Storage::ServiceType::BLOB || service_type == Azure::Storage::ServiceType::FILE
 
         signable_fields.concat [
           options[:startpk],

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

@@ -42,13 +42,21 @@ module Azure::Storage::Core::Filter
     # response - HttpResponse. The response from the active request
     # retry_data - Hash. Stores stateful retry data
     def should_retry?(response, retry_data)
+      # Applies the logic when there is subclass overrides it
       apply_retry_policy retry_data
-      retry_data[:retryable] = retry_data[:count] <= @retry_count
+
+      # Checks the result and count limit
+      if retry_data[:retryable].nil?
+        retry_data[:retryable] = true
+      else
+        retry_data[:retryable] &&= retry_data[:count] <= @retry_count
+      end
       return false unless retry_data[:retryable]
-      
+
+      # Checks whether there is a local error
+      # Cannot retry immediately when it returns true, as it need check other errors
       should_retry_on_local_error? retry_data
-      should_retry_on_error? response, retry_data
-      return false unless retry_data[:retryable]
+      return false unless should_retry_on_error? response, retry_data
       
       adjust_retry_parameter retry_data
     end
@@ -167,6 +175,7 @@ module Azure::Storage::Core::Filter
           retry_data[:retryable] = false;
         end
       end
+      retry_data[:retryable]
     end
     
     # Adjust the retry parameter

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

@@ -0,0 +1,268 @@
+#-------------------------------------------------------------------------
+# # 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/storage/file/serialization'
+
+module Azure::Storage::File
+  module Directory
+    include Azure::Storage::Service
+    
+    class Directory
+      def initialize
+        @properties = {}
+        @metadata = {}
+        yield self if block_given?
+      end
+
+      attr_accessor :name
+      attr_accessor :properties
+      attr_accessor :metadata
+    end
+  end
+
+  # Public: Get a list of files or directories under the specified share or directory.
+  #         It lists the contents only for a single level of the directory hierarchy.
+  #
+  # ==== Attributes
+  #
+  # * +share+                     - String. The name of the file share.
+  # * +directory_path+            - String. The path to the directory.
+  # * +options+                   - Hash. Optional parameters.
+  #
+  # ==== Options
+  #
+  # Accepted key/value pairs in options parameter are:
+  #
+  # * +:marker+                  - String. An identifier the specifies the portion of the
+  #                                list to be returned. This value comes from the property
+  #                                Azure::Service::EnumerationResults.continuation_token when there
+  #                                are more shares available than were returned. The
+  #                                marker value may then be used here to request the next set
+  #                                of list items. (optional)
+  #
+  # * +:max_results+             - Integer. Specifies the maximum number of shares to return.
+  #                                If max_results is not specified, or is a value greater than
+  #                                5,000, the server will return up to 5,000 items. If it is set
+  #                                to a value less than or equal to zero, the server will return
+  #                                status code 400 (Bad Request). (optional)
+  #
+  # * +: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.
+  #
+  # See: https://docs.microsoft.com/en-us/rest/api/storageservices/fileservices/list-directories-and-files
+  #
+  # Returns an Azure::Service::EnumerationResults
+  #
+  def list_directories_and_files(share, directory_path, options={})
+    query = {'comp' => 'list'}
+    unless options.nil?
+      StorageService.with_query query, 'marker', options[:marker]
+      StorageService.with_query query, 'maxresults', options[:max_results].to_s if options[:max_results]
+      StorageService.with_query query, 'timeout', options[:timeout].to_s if options[:timeout]
+    end
+
+    uri = directory_uri(share, directory_path, query)
+    response = call(:get, uri, nil, {}, options)
+
+    # Result
+    if response.success?
+      Serialization.directories_and_files_enumeration_results_from_xml(response.body)
+    else
+      response.exception
+    end
+  end
+
+  # Public: Create a new directory
+  #
+  # ==== Attributes
+  #
+  # * +share+                     - String. The name of the file share.
+  # * +directory_path+            - String. The path to the directory.
+  # * +options+                   - Hash. Optional parameters.
+  #
+  # ==== Options
+  #
+  # Accepted key/value pairs in options parameter are:
+  # * +:metadata+                 - Hash. User defined metadata for the share (optional).
+  # * +: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.
+  #
+  # See https://docs.microsoft.com/en-us/rest/api/storageservices/fileservices/create-directory
+  #
+  # Returns a Directory
+  def create_directory(share, directory_path, options={})
+    # Query
+    query = { }
+    query['timeout'] = options[:timeout].to_s if options[:timeout]
+
+    # Scheme + path
+    uri = directory_uri(share, directory_path, query)
+
+    # Headers
+    headers = StorageService.common_headers
+    StorageService.add_metadata_to_headers(options[:metadata], headers) if options[:metadata]
+
+    # Call
+    response = call(:put, uri, nil, headers, options)
+
+    # result
+    directory = Serialization.directory_from_headers(response.headers)
+    directory.name = directory_path
+    directory.metadata = options[:metadata] if options[:metadata]
+    directory
+  end
+
+  # Public: Returns all system properties for the specified directory,
+  #         and can also be used to check the existence of a directory.
+  #         The data returned does not include the files in the directory or any subdirectories.
+  #
+  # ==== Attributes
+  #
+  # * +share+                     - String. The name of the file share.
+  # * +directory_path+            - String. The path to the directory.
+  # * +options+                   - Hash. Optional parameters.
+  #
+  # ==== Options
+  #
+  # Accepted key/value pairs in options parameter are:
+  # * +: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.
+  #
+  # See https://docs.microsoft.com/en-us/rest/api/storageservices/fileservices/get-directory-properties
+  #
+  # Returns a Directory
+  def get_directory_properties(share, directory_path, options={})
+    # Query
+    query = { }
+    query['timeout'] = options[:timeout].to_s if options[:timeout]
+
+    # Call
+    response = call(:get, directory_uri(share, directory_path, query), nil, {}, options)
+
+    # result
+    directory = Serialization.directory_from_headers(response.headers)
+    directory.name = directory_path
+    directory
+  end
+
+  # Public: Deletes a directory.
+  #
+  # ==== Attributes
+  #
+  # * +share+                     - String. The name of the file share.
+  # * +directory_path+            - String. The path to the directory.
+  # * +options+                   - Hash. Optional parameters.
+  #
+  # ==== Options
+  #
+  # Accepted key/value pairs in options parameter are:
+  # * +: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.
+  #
+  # See https://docs.microsoft.com/en-us/rest/api/storageservices/fileservices/delete-directory
+  #
+  # Returns nil on success
+  def delete_directory(share, directory_path, options={})
+    # Query
+    query = { }
+    query['timeout'] = options[:timeout].to_s if options[:timeout]
+
+    # Call
+    call(:delete, directory_uri(share, directory_path, query), nil, {}, options)
+    
+    # result
+    nil
+  end
+
+  # Public: Returns only user-defined metadata for the specified directory.
+  #
+  # ==== Attributes
+  #
+  # * +share+                     - String. The name of the file share.
+  # * +directory_path+            - String. The path to the directory.
+  # * +options+                   - Hash. Optional parameters.
+  #
+  # ==== Options
+  #
+  # Accepted key/value pairs in options parameter are:
+  # * +: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.
+  #
+  # See https://docs.microsoft.com/en-us/rest/api/storageservices/fileservices/get-directory-metadata
+  #
+  # Returns a Directory
+  def get_directory_metadata(share, directory_path, options={})
+    # Query
+    query = { 'comp' => 'metadata' }
+    query['timeout'] = options[:timeout].to_s if options[:timeout]
+
+    # Call
+    response = call(:get, directory_uri(share, directory_path, query), nil, {}, options)
+
+    # result
+    directory = Serialization.directory_from_headers(response.headers)
+    directory.name = directory_path
+    directory
+  end
+
+  # Public: Sets custom metadata for the directory.
+  #
+  # ==== Attributes
+  #
+  # * +share+                     - String. The name of the file share.
+  # * +directory_path+            - String. The path to the directory.
+  # * +metadata+                  - Hash. A Hash of the metadata values.
+  # * +options+                   - Hash. Optional parameters.
+  #
+  # ==== Options
+  #
+  # Accepted key/value pairs in options parameter are:
+  # * +: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.
+  #
+  # See https://docs.microsoft.com/en-us/rest/api/storageservices/fileservices/set-directory-metadata
+  #
+  # Returns nil on success
+  def set_directory_metadata(share, directory_path, metadata, options={})
+    # Query
+    query = { 'comp' => 'metadata' }
+    query['timeout'] = options[:timeout].to_s if options[:timeout]
+
+    # Headers
+    headers = StorageService.common_headers
+    StorageService.add_metadata_to_headers(metadata, headers) if metadata
+
+    # Call
+    call(:put, directory_uri(share, directory_path, query), nil, headers, options)
+    
+    # Result
+    nil
+  end
+end