azure 0.7.0.pre → 0.7.0.pre2

data/lib/azure/core/http/http_response.rb

@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #--------------------------------------------------------------------------
-require "azure/core/http/http_error"
+require 'azure/core/http/http_error'
 
 module Azure
   module Core
@@ -23,7 +23,7 @@ module Azure
         # Public: Initialize a new response.
         #
         # http_response - A Net::HTTPResponse.
-        def initialize(http_response, uri="")
+        def initialize(http_response, uri='')
           @http_response = http_response
           @uri = uri
         end
@@ -37,18 +37,11 @@ module Azure
           @http_response.body
         end
 
-        # Public: Get the response status message.
-        #
-        # Returns a String.
-        def message
-          @http_response.message
-        end
-
         # Public: Get the response status code.
         #
         # Returns a Fixnum.
         def status_code
-          @http_response.code.to_i
+          @http_response.status
         end
 
         # Public: Check if this response was successful. A request is considered
@@ -56,14 +49,14 @@ module Azure
         #
         # Returns nil|false.
         def success?
-          (200..399).include? status_code
+          @http_response.success?
         end
 
         # Public: Get all the response headers as a Hash.
         #
         # Returns a Hash.
         def headers
-          @headers ||= HeaderHash.new(@http_response.to_hash)
+          @http_response.headers
         end
 
         # Public: Get an error that wraps this HTTP response, as long as this
@@ -77,56 +70,19 @@ module Azure
         
         alias_method :error, :exception
 
-        # Since HTTP Headers are case insensitive, this class will 
-        # normalize them to lowercase. This also wraps Net::HTTPResponse 
-        # headers by returning their values as strings, not arrays, by selecting
-        # the first value from the array.
-        class HeaderHash < Hash
-          # Public: Initialize the header hash.
-          #
-          # headers - A Hash of headers as returned from Net::HTTPResponse#to_hash.
-          def initialize(headers)
-            super
-            headers = Hash[headers.map { |k,v| [k.downcase.freeze, v.first.freeze] }]
-            replace(headers)
-          end
-
-          # Public: Get a header's value or nil if it's not present.
-          #
-          # header - A string with the header's name.
-          #
-          # Returns a String or nil.
-          def [](header)
-            super(header.downcase)
-          end
-
-          # Public: Get a header's value or a specified default.
-          #
-          # header  - A string with the header's name.
-          # default - A default value.
-          #
-          # Yields a block where you can specify the default value.
-          #
-          # Returns a String, or the specified default.
-          def fetch(header, *default, &block)
-            if (args = default.size) > 1
-              raise ArgumentError, "wrong number of arguments(#{args + 1} for 2)"
-            end
-
-            super(header.downcase, *default, &block)
-          end
-        end
-        
+        # TODO: This needs to be deleted and HttpError needs to be refactored to not rely on HttpResponse.
+        # The dependency on knowing the internal structure of HttpResponse breaks good design principles.
+        # The only reason this class exists is because the HttpError parses the HttpResponse to produce an error msg.
         class MockResponse
           def initialize(code, body, headers)
-            @code = code.to_s 
+            @status = code
             @body = body
             @headers = headers
             @headers.each { |k,v|
-              @headers[k] = [v] unless v.respond_to? first 
-            } 
+              @headers[k] = [v] unless v.respond_to? first
+            }
           end
-          attr_accessor :code
+          attr_accessor :status
           attr_accessor :body
           attr_accessor :headers
 

data/lib/azure/core/http/signer_filter.rb

@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #--------------------------------------------------------------------------
-require "azure/core/http/http_filter"
+require 'azure/core/http/http_filter'
 
 module Azure
   module Core
@@ -24,11 +24,10 @@ module Azure
         end
 
         def call(req, _next)
-          signature = @signer.sign(req.method, req.uri, req.headers)
-          req.headers["Authorization"] = "#{@signer.name} #{signature}"
+          @signer.sign_request(req)
           _next.call
         end
       end
     end
   end
-end
+end

data/lib/azure/core/service.rb

@@ -21,36 +21,19 @@ module Azure
 
       # Create a new instance of the Service
       # 
-      # host            - String. The hostname. (optional, Default empty)
-      def initialize(host='')
+      # @param host     [String] The hostname. (optional, Default empty)
+      # @param options  [Hash] options including {:client} (optional, Default {})
+      def initialize(host='', options = {})
         @host = host
+        @client = options[:client] || Azure
       end
 
-      attr_accessor :host
-
-      def call(method, uri, body=nil, headers=nil)
-        if headers && !body.nil?
-          if headers['Content-Encoding'].nil?
-            headers['Content-Encoding'] = body.encoding.to_s
-          else 
-            body.force_encoding(headers['Content-Encoding']) 
-          end
-        end
-
-        request = Core::Http::HttpRequest.new(method, uri, body)
-        request.headers.merge!(headers) if headers
-
-        request.headers['connection'] = 'keep-alive' if request.respond_to? :headers
+      attr_accessor :host, :client
 
+      def call(method, uri, body=nil, headers={})
+        request = Core::Http::HttpRequest.new(method, uri, body: body, headers: headers, client: @client)
         yield request if block_given?
-
-        response = request.call
-
-        if !response.nil? && !response.body.nil? && response.headers['content-encoding']
-          response.body.force_encoding(response.headers['content-encoding']) 
-        end
-
-        response
+        request.call
       end
 
       def generate_uri(path='', query={})

data/lib/azure/core/signed_service.rb

@@ -23,11 +23,13 @@ module Azure
 
       # Create a new instance of the SignedService
       #
-      # signer        - Azure::Core::Auth::Signer. An implementation of Signer used for signing requests. (optional, Default=Azure::Core::Auth::SharedKey.new)
-      # account_name  - String. The account name (optional, Default=Azure.config.storage_account_name)  
-      def initialize(signer=Core::Auth::SharedKey.new, account_name=Azure.config.storage_account_name)
-        super()
-        @account_name = account_name
+      # @param signer         [Azure::Core::Auth::Signer]. An implementation of Signer used for signing requests. (optional, Default=Azure::Core::Auth::SharedKey.new)
+      # @param account_name   [String] The account name (optional, Default=Azure.config.storage_account_name)
+      # @param options        [Hash] options
+      def initialize(signer=nil, account_name=nil, options={})
+        super('', options)
+        signer ||= Core::Auth::SharedKey.new(client.storage_account_name, client.storage_access_key)
+        @account_name = account_name || client.storage_account_name
         @signer = signer
         filters.unshift Core::Http::SignerFilter.new(signer) if signer
       end

data/lib/azure/core/utility.rb

@@ -94,38 +94,75 @@ module Azure
         cert
       end
 
+      def initialize_external_logger(logger)
+        Loggerx.initialize_external_logger(logger)
+      end
     end
 
     # Logger
     module Logger
       class << self
+        attr_accessor :logger
+
         def info(msg)
-          puts msg.bold.white
+          if logger.nil?
+            puts msg.bold.white
+          else
+            logger.info(msg)
+          end
         end
 
         def error_with_exit(msg)
-          puts  msg.bold.red
+          if logger.nil?
+            puts msg.bold.red
+          else
+            logger.error(msg)
+          end
+
           raise msg.bold.red
         end
 
         def warn(msg)
-          puts msg.yellow
+          if logger.nil?
+            puts msg.yellow
+          else
+            logger.warn(msg)
+          end
+
           msg
         end
 
         def error(msg)
-          puts msg.bold.red
+          if logger.nil?
+            puts msg.bold.red
+          else
+            logger.error(msg)
+          end
+
           msg
         end
 
         def exception_message(msg)
-          print msg.bold.red
+          if logger.nil?
+            puts msg.bold.red
+          else
+            logger.warn(msg)
+          end
+
           raise msg.bold.red
         end
 
         def success(msg)
           msg_with_new_line = msg + "\n"
-          print msg_with_new_line.green
+          if logger.nil?
+            print msg_with_new_line.green
+          else
+            logger.info(msg)
+          end
+        end
+
+        def initialize_external_logger(logger)
+          @logger = logger
         end
       end
     end
@@ -203,3 +240,5 @@ class IPAddr
     end
   end
 end
+
+Azure::Loggerx = Azure::Core::Logger

data/lib/azure/default.rb

@@ -0,0 +1,126 @@
+#-------------------------------------------------------------------------
+# # Copyright (c) Microsoft and contributors. All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#--------------------------------------------------------------------------
+
+module Azure
+
+  # Default configuration options for {Client}
+  module Default
+    # Default API endpoint
+    SERVICE_MANAGEMENT_ENDPOINT = 'https://management.core.windows.net'.freeze
+
+    # Default User Agent header string
+    USER_AGENT   = "Azure-SDK-For-Ruby/#{Azure::Version}".freeze
+
+    class << self
+
+      # Configuration options
+      # @return [Hash]
+      def options
+        Hash[Azure::Configurable.keys.map{|key| [key, send(key)]}]
+      end
+
+      # Default storage access key
+      # @return [String]
+      def storage_access_key
+        ENV['AZURE_STORAGE_ACCESS_KEY']
+      end
+
+      # Default storage account name
+      # @return [String]
+      def storage_account_name
+        ENV['AZURE_STORAGE_ACCOUNT']
+      end
+
+      # Default storage table host
+      # @return [String]
+      def storage_table_host
+        ENV['AZURE_STORAGE_TABLE_HOST']
+      end
+
+      # Default storage blob host
+      # @return [String]
+      def storage_blob_host
+        ENV['AZURE_STORAGE_BLOB_HOST']
+      end
+
+      # Default storage queue host
+      # @return [String]
+      def storage_queue_host
+        ENV['AZURE_STORAGE_QUEUE_HOST']
+      end
+
+      # Default service bus namespace
+      # @return [String]
+      def sb_namespace
+        ENV['AZURE_SERVICEBUS_NAMESPACE']
+      end
+
+      # Default service bus access key
+      # @return [String]
+      def sb_access_key
+        ENV['AZURE_SERVICEBUS_ACCESS_KEY']
+      end
+
+      # Default service bus Shared Access Policy key
+      # @return [String]
+      def sb_sas_key
+        ENV['AZURE_SERVICEBUS_SAS_KEY']
+      end
+
+      # Default service bus Shared Access Policy key name
+      # @return [String]
+      def sb_sas_key_name
+        ENV['AZURE_SERVICEBUS_SAS_KEY_NAME']
+      end
+
+      # Default service bus issuer
+      # @return [String]
+      def sb_issuer
+        ENV['AZURE_SERVICEBUS_ISSUER'] || 'owner'
+      end
+
+      # Default management certificate to use for management activeities
+      # @return [String]
+      def management_certificate
+        ENV['AZURE_MANAGEMENT_CERTIFICATE']
+      end
+
+      # Default subscription to use for management activities
+      # @return [String]
+      def subscription_id
+        ENV['AZURE_SUBSCRIPTION_ID']
+      end
+
+      # Default Azure management endpoint
+      # @return [String]
+      def management_endpoint
+        ENV['AZURE_MANAGEMENT_ENDPOINT'] || (SERVICE_MANAGEMENT_ENDPOINT + '/')
+      end
+
+      # Default SQL database management endpoint
+      # @return [String]
+      def sql_database_management_endpoint
+        ENV['AZURE_SQL_DATABASE_MANAGEMENT_ENDPOINT'] || "#{SERVICE_MANAGEMENT_ENDPOINT}:8443/"
+      end
+
+      # Default Certificate Authority bundle to be used for https
+      # @return [String]
+      def ca_file
+        ENV['SSL_CERT_FILE']
+      end
+
+    end
+  end
+end

data/lib/azure/http_client.rb

@@ -0,0 +1,85 @@
+#-------------------------------------------------------------------------
+# # Copyright (c) Microsoft and contributors. All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#--------------------------------------------------------------------------
+
+module Azure
+  module HttpClient
+
+    # Creates a new management request for the current configuration
+    # @param method           [Symbol] the HTTP method
+    # @param path             [URI] the path to the management resource
+    # @param options_or_body  [Hash|Body] options which can include body
+    def management_request(method, path, options_or_body = {})
+      options_or_body ||= {}
+      options = if options_or_body.is_a?(Hash)
+                  options_or_body
+                else
+                  {body: options_or_body}
+                end
+      BaseManagement::ManagementHttpRequest.new(method, path, {client: self}.merge(options))
+    end
+
+    # Creates a new management request for the current configuration
+    # @param method           [Symbol] the HTTP method
+    # @param path             [URI] the path to the management resource
+    # @param options_or_body  [Hash|Body] options which can include body
+    def sql_management_request(method, path, options_or_body = {})
+      options_or_body ||= {}
+      options = if options_or_body.is_a?(Hash)
+                  options_or_body
+                else
+                  {body: options_or_body}
+                end
+      puts [method, path, options]
+      BaseManagement::SqlManagementHttpRequest.new(method, path, {client: self}.merge(options))
+    end
+
+    # Returns the http agent based on uri
+    # @param uri  [URI|String] the base uri (scheme, host, port) of the http endpoint
+    # @return [Net::HTTP] http agent for a given uri
+    def agents(uri)
+      uri = URI.parse(uri) if uri.is_a?(String)
+      key = uri.scheme.to_s + uri.host.to_s + uri.port.to_s
+      @agents ||= {}
+      unless @agents.key?(key)
+        @agents[key] = build_http(uri)
+      end
+      @agents[key]
+    end
+
+    # Empties all the http agents
+    def reset_agents!
+      @agents = nil
+    end
+
+    private
+
+    def build_http(uri)
+      ssl_options = {}
+      if uri.scheme.downcase == 'https'
+        ssl_options[:ca_file] = self.ca_file if self.ca_file
+        ssl_options[:verify] = true
+      end
+
+      proxy_options = if ENV['HTTP_PROXY'] || ENV['HTTPS_PROXY']
+                        ENV['HTTP_PROXY'] ? URI::parse(ENV['HTTP_PROXY']) : URI::parse(ENV['HTTPS_PROXY'])
+                      end || nil
+
+      Faraday.new(uri, ssl: ssl_options, proxy: proxy_options) do |conn|
+        conn.use FaradayMiddleware::FollowRedirects
+        conn.adapter Faraday.default_adapter
+      end
+    end
+  end
+end