azure 0.7.1 → 0.7.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5bda06759b70c920d48fe1272ce87ca645aaebd5
-  data.tar.gz: fafc97c79406bd2ff47b696e90fc025c8e0b9945
+  metadata.gz: 5ba36bbb5faaf4c52e3fc3b2f41b741b7c36722a
+  data.tar.gz: 0458b5f67633e4908c5b76a2cd314d31c99f4424
 SHA512:
-  metadata.gz: af50fd89146d0af1b830bcb88a54cfa44e6f95349cbd39447ea9438604108425f379cff689b7609075221aca35bdb0a6df1d3f0418aa630080fdecd2d4202f92
-  data.tar.gz: 96a63eb8ee3b996079d62bcf7c030e8563ade20200a144705a9a1266a3710d2d40daf9316c67e215892c06f05dcd30322c7b52fc77807ddc55acde8fea463b17
+  metadata.gz: bd1dc4d1b7c57f4dcf2b81d3830f9fe086b97dd35f23766ace5f6df20349e287dd1097b0e7a3a108d3ee7cdf15959130c3c1054531faff2f12e77a9e35945a51
+  data.tar.gz: 0b8723c181c732524b3dd2cb91e9163e76cc879ea847f19dec3a0e3619d25e41a4e3170433271cf3e2980ff0387c36c4188ccb0225a8f462f78a9aec384a5ed6

data/Rakefile

@@ -88,6 +88,7 @@ namespace :test do
 
     component_task :affinity_group
     component_task :blob
+    component_task :cloud_service
     component_task :database
     component_task :location
     component_task :queue
@@ -99,6 +100,36 @@ namespace :test do
     component_task :vnet
   end
 
+  Rake::TestTask.new :recorded do |t|
+    t.test_files = Dir['test/integration/**/*_test.rb'].reject do |path|
+      # Reject the test paths those are not yet VCR recorded
+      # Following three are Azure-Storage gem features and need to be removed when we take dependency on azure-storage gem
+      path.include?('blob') || path.include?('queue') || path.include?('table')
+    end
+    t.verbose = true
+    t.libs = %w(lib test)
+  end
+
+  namespace :recorded do
+    def component_task(component)
+      Rake::TestTask.new component do |t|
+        t.pattern = "test/integration/#{component}/**/*_test.rb"
+        t.verbose = true
+        t.libs = %w(lib test)
+      end
+    end
+
+    component_task :affinity_group
+    component_task :cloud_service
+    component_task :database
+    component_task :location
+    component_task :service_bus
+    component_task :storage_management
+    component_task :vm
+    component_task :vm_image
+    component_task :vnet
+  end
+
   task :cleanup => :require_environment do
     $:.unshift 'lib'
     require 'azure'

data/azure.gemspec

@@ -25,7 +25,7 @@ Gem::Specification.new do |s|
   s.summary     = 'Official ruby client library to consume Microsoft Azure services.'
   s.homepage    = 'http://github.com/azure/azure-sdk-for-ruby'
   s.license     = 'Apache License, Version 2.0'
-  s.files       = `git ls-files`.split("\n").reject { |f|  f.start_with?("lib/azure/arm") }
+  s.files       = `git ls-files`.split("\n").reject { |f|  f.start_with?("test") }
   s.bindir      = 'bin'
   s.executables = s.files.grep(%r{^bin/}) { |f| File.basename(f) }
 
@@ -48,4 +48,5 @@ Gem::Specification.new do |s|
   s.add_development_dependency('rake',                '~> 10.0')
   s.add_development_dependency('timecop',             '~> 0.7')
   s.add_development_dependency('yard',                '~> 0.8')
+  s.add_development_dependency('vcr',                 '~> 3.0')
 end

data/lib/azure.rb

@@ -30,6 +30,7 @@ module Azure
   autoload :Default,                          'azure/default'
   autoload :HttpClient,                       'azure/http_client'
   autoload :Version,                          'azure/version'
+  autoload :HttpResponseHelper,               'azure/http_response_helper'
 
   # helpers because the naming is far too verbose
   autoload :BaseManagementService,                    'azure/base_management/base_management_service'

data/lib/azure/base_management/management_http_request.rb

@@ -48,10 +48,7 @@ module Azure
       # Returns a Nokogiri::XML instance of HttpResponse body
       def call
         conn = http_setup
-        res = conn.run_request(method.to_sym, uri, nil, nil) do  |req|
-          req.body = body if body
-          req.headers = headers if headers
-        end
+        res = set_up_response(method.to_sym, uri, conn, headers ,body)
         response = wait_for_completion(Azure::Core::Http::HttpResponse.new(res))
         Nokogiri::XML response.body unless response.nil?
       end
@@ -116,10 +113,7 @@ module Azure
         done = false
         until done
           Azure::Loggerx.info('# ')
-          res = conn.run_request(method.to_sym, URI(request_path), nil, nil) do  |req|
-            req.body = body if body
-            req.headers = headers if headers
-          end
+          res = set_up_response(method.to_sym, URI(request_path), conn, headers ,body)
           response = Azure::Core::Http::HttpResponse.new(res)
           ret_val = Nokogiri::XML response.body
           status = xml_content(ret_val, 'Operation Status')
@@ -150,10 +144,7 @@ module Azure
       def rebuild_request(response)
         host_uri = URI.parse(response.headers['location'])
         conn = http_setup
-        res = conn.run_request(method.to_sym, host_uri, nil, nil) do  |req|
-          req.body = body if body
-          req.headers = headers if headers
-        end
+        res = set_up_response(method.to_sym, host_uri, conn, headers ,body)
         wait_for_completion(HttpResponse.new(res))
       end
 

data/lib/azure/blob/auth/shared_access_signature.rb

@@ -62,6 +62,8 @@ module Azure
         def signable_string(path, options)
           # Order is significant
           # The newlines from empty strings here are required
+          options[:start] = Time.parse(options[:start]).utc.iso8601 if options[:start]
+          options[:expiry] = Time.parse(options[:expiry]).utc.iso8601 if options[:expiry]
           [
               options[:permissions],
               options[:start],
@@ -106,6 +108,8 @@ module Azure
         def signed_uri(uri, options)
           parsed_query = CGI::parse(uri.query || '').inject({}){|memo,(k,v)| memo[k.to_sym] = v; memo}
 
+          options[:start] = Time.parse(options[:start]).utc.iso8601 if options[:start]
+          options[:expiry] = Time.parse(options[:expiry]).utc.iso8601 if options[:expiry]
           options[:expiry] ||= (Time.now + 60*30).utc.iso8601
 
           if parsed_query.has_key?(:restype)

data/lib/azure/blob/blob_service.rb

@@ -1378,8 +1378,8 @@ module Azure
           end
 
           # Azure Storage Service expects content-encoding to be lowercase.
-          # Authentication will fail otherwise.  
-          headers['Content-Encoding'].downcase!
+          # Authentication will fail otherwise.
+          headers['Content-Encoding'] = headers['Content-Encoding'].downcase
         end
 
         response = super

data/lib/azure/client_services.rb

@@ -20,79 +20,79 @@ module Azure
     # Azure Blob service configured for this Azure client instance
     # @return [Azure::Blob::BlobService]
     def blobs(options = {})
-      @blobs ||= Azure::Blob::BlobService.new(default_client(options))
+      Azure::Blob::BlobService.new(default_client(options))
     end
 
     # Azure Queue service configured for this Azure client instance
     # @return [Azure::Queue::QueueService]
     def queues(options = {})
-      @queues ||= Azure::Queue::QueueService.new(default_client(options))
+      Azure::Queue::QueueService.new(default_client(options))
     end
 
     # Azure Table service configured for this Azure client instance
     # @return [Azure::Table::TableService]
     def tables(options = {})
-      @tables ||= Azure::Table::TableService.new(default_client(options))
+      Azure::Table::TableService.new(default_client(options))
     end
 
     # Azure Service Bus service configured for this Azure client instance
     # @return [Azure::ServiceBus::ServiceBusService]
     def service_bus(options = {})
-      @sb ||= Azure::ServiceBus::ServiceBusService.new(service_bus_host, default_client(options))
+      Azure::ServiceBus::ServiceBusService.new(service_bus_host, default_client(options))
     end
 
     # Azure Virtual Image management service configured for this Azure client instance
     # @return [Azure::VirtualMachineImageManagement::VirtualMachineImageManagementService]
     def vm_image_management(options = {})
-      @vm_image_mgmt ||= Azure::VirtualMachineImageManagement::VirtualMachineImageManagementService.new(default_client(options))
+      Azure::VirtualMachineImageManagement::VirtualMachineImageManagementService.new(default_client(options))
     end
 
     # Azure Virtual Machine disk management service configured for this Azure client instance
     # @return [Azure::VirtualMachineImageManagement::VirtualMachineDiskManagementService]
     def vm_disk_management(options = {})
-      @vm_disk_mgmt ||= Azure::VirtualMachineImageManagement::VirtualMachineDiskManagementService.new(default_client(options))
+      Azure::VirtualMachineImageManagement::VirtualMachineDiskManagementService.new(default_client(options))
     end
 
     # Azure Virtual Machine management service configured for this Azure client instance
     # @return [Azure::VirtualMachineManagement::VirtualMachineManagementService]
     def vm_management(options = {})
-      @vm_mgmt ||= Azure::VirtualMachineManagement::VirtualMachineManagementService.new(default_client(options))
+      Azure::VirtualMachineManagement::VirtualMachineManagementService.new(default_client(options))
     end
 
     # Azure SQL Database management service configured for this Azure client instance
     # @return [Azure::SqlDatabaseManagement::SqlDatabaseManagementService]
     def sql_database_management(options = {})
-      @sql_mgmt ||= Azure::SqlDatabaseManagement::SqlDatabaseManagementService.new(default_client(options))
+      Azure::SqlDatabaseManagement::SqlDatabaseManagementService.new(default_client(options))
     end
 
     # Azure Network management service configured for this Azure client instance
     # @return [Azure::VirtualNetworkManagement::VirtualNetworkManagementService]
     def network_management(options = {})
-      @network_mgmt ||= Azure::VirtualNetworkManagement::VirtualNetworkManagementService.new(default_client(options))
+      Azure::VirtualNetworkManagement::VirtualNetworkManagementService.new(default_client(options))
     end
 
     # Azure Cloud Service management service configured for this Azure client instance
     # @return [Azure::CloudServiceManagement::CloudServiceManagementService]
     def cloud_service_management(options = {})
-      @cs_mgmt ||= Azure::CloudServiceManagement::CloudServiceManagementService.new(default_client(options))
+      Azure::CloudServiceManagement::CloudServiceManagementService.new(default_client(options))
     end
 
     # Azure Storage management service configured for this Azure client instance
     # @return [Azure::StorageManagement::StorageManagementService]
     def storage_management(options = {})
-      @store_mgmt ||= Azure::StorageManagement::StorageManagementService.new(default_client(options))
+      Azure::StorageManagement::StorageManagementService.new(default_client(options))
     end
 
     # Azure Generic management service configured for this Azure client instance
     # @return [Azure::BaseManagement::BaseManagementService]
     def base_management(options = {})
-      @base_mgmt ||= Azure::BaseManagement::BaseManagementService.new(default_client(options))
+      Azure::BaseManagement::BaseManagementService.new(default_client(options))
     end
 
     private
 
     def default_client(opts)
-      {client: self}.merge(opts || {})
+      {client: Azure.client(opts || {})}
     end
   end
 end

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

@@ -26,7 +26,7 @@ module Azure
       # Represents a HTTP request can perform synchronous queries to a
       # HTTP server, returning a HttpResponse
       class HttpRequest
-
+        include Azure::HttpResponseHelper
         alias_method :_method, :method
 
         # The HTTP method to use (:get, :post, :put, :delete, etc...)
@@ -120,14 +120,7 @@ module Azure
         end
 
         def http_setup
-          http = @client.agents(uri)
-
-          unless headers.nil?
-            keep_alive = headers['Keep-Alive'] || headers['keep-alive']
-            http.read_timeout = keep_alive.split('=').last.to_i unless keep_alive.nil?
-          end
-
-          http
+          @client.agents(uri)
         end
 
         def body=(body)
@@ -140,11 +133,7 @@ module Azure
         # @return [HttpResponse]
         def call
           conn = http_setup
-          res = conn.run_request(method.to_sym, uri, nil, nil) do |req|
-            req.body = body if body
-            req.headers = headers if headers
-          end
-
+          res = set_up_response(method.to_sym, uri, conn, headers ,body)
           response = HttpResponse.new(res)
           response.uri = uri
           raise response.error unless response.success?

data/lib/azure/core/service.rb

@@ -37,7 +37,8 @@ module Azure
       end
 
       def generate_uri(path='', query={})
-        uri = URI.parse(File.join(host, path))
+        enconded_file_uri_string = URI.encode(File.join(host, path))
+        uri = URI.parse(enconded_file_uri_string)
         uri.query = URI.encode_www_form(query) unless query == nil or query.empty?
         uri
       end

data/lib/azure/http_client.rb

@@ -49,24 +49,8 @@ module Azure
     # @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 = {}
+      uri = URI.parse(uri) if uri.is_a?(String)
       if uri.scheme.downcase == 'https'
         ssl_options[:ca_file] = self.ca_file if self.ca_file
         ssl_options[:verify] = true

data/lib/azure/http_response_helper.rb

@@ -0,0 +1,38 @@
+#-------------------------------------------------------------------------
+# # 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 HttpResponseHelper
+
+      # Sends request to HTTP server and returns a Faraday::Response
+      # @param method   [Symbol] The HTTP method to use (:get, :post, :put, :del, etc...)
+      # @param url      [URI] The URI of the HTTP endpoint to query
+      # @param conn     [Net::HTTP] http agent for a given uri
+      # @param headers  [String] The request headers
+      # @param body     [String] The request body
+      #returns Faraday::Response
+      def set_up_response(method, url, conn, headers ,body)
+        conn.run_request(method, url, nil, nil) do |req|
+          req.body = body if body
+          req.headers = headers if headers
+          unless headers.nil?
+            keep_alive = headers['Keep-Alive'] || headers['keep-alive']
+            req.options[:timeout] = keep_alive.split('=').last.to_i unless keep_alive.nil?
+          end
+          req.options[:open_timeout] ||= 60
+        end
+      end
+  end
+end

data/lib/azure/sql_database_management/serialization.rb

@@ -47,6 +47,10 @@ module Azure
       end
 
       def self.server_name_from_xml(response_xml, login, location, version)
+        if response_xml.css('Error').css('Message').to_s != ''
+          raise Azure::SqlDatabaseManagement::Error.new(response_xml.css('Error').css('Message').to_s)
+        end
+
         server_name = xml_content(response_xml, 'ServerName')
         SqlServer.new do |db|
           db.name = server_name

data/lib/azure/sql_database_management/sql_database_management_service.rb

@@ -14,6 +14,7 @@
 #--------------------------------------------------------------------------
 
 require 'socket'
+require 'net/http'
 require 'azure/sql_database_management/sql_server'
 require 'azure/sql_database_management/firewall_rule'
 require 'azure/sql_database_management/serialization'
@@ -26,7 +27,7 @@ module Azure
 
       # Gets a list of database servers available under the current subscription.
       #
-      # @see http://msdn.microsoft.com/en-us/library/azure/gg715269.aspx
+      # @see http://msdn.microsoft.com/en-us/library/azure/dn505702.aspx
       #
       # @return Array<Azure::SqlDatabaseManagement::SqlServer>
       def list_servers
@@ -41,7 +42,7 @@ module Azure
       # @param location   [String] The location where the database server will be created.
       # @param version    [String|Integer] The version of the SQL server (default 12.0)
       #
-      # @see https://msdn.microsoft.com/en-us/library/azure/dn505699.aspx
+      # @see http://msdn.microsoft.com/en-us/library/azure/dn505699.aspx
       #
       # @return [Azure::SqlDatabaseManagement::SqlServer]
       def create_server(login, password, location, version = 12.0)
@@ -74,7 +75,7 @@ module Azure
       #
       # @param name     [String] SqlServer name.
       #
-      # @see http://msdn.microsoft.com/en-us/library/azure/gg715285.aspx
+      # @see http://msdn.microsoft.com/en-us/library/azure/dn505695.aspx
       #
       # @return  [void]
       def delete_server(name)
@@ -89,13 +90,13 @@ module Azure
       # @param name       [String] SqlServer name.
       # @param password   [String] SqlServer new password.
       #
-      # @see http://msdn.microsoft.com/en-us/library/azure/gg715272.aspx
+      # @see http://msdn.microsoft.com/en-us/library/azure/dn505696.aspx
       #
       # @return [void]
       def reset_password(name, password)
         ensure_server_exists!(name)
         body = Serialization.reset_password_to_xml(password)
-        request_path = servers_path + "#{name}?op=ResetPassword"
+        request_path = servers_path "#{name}?op=ResetPassword"
         request = client.sql_management_request(:post, request_path, body)
         request.call
         Azure::Loggerx.info "Password for server #{name} changed successfully."
@@ -112,7 +113,7 @@ module Azure
       #                                addresses equal to or less than this can attempt to connect to the server. The
       #                                highest possible IP address is 255.255.255.255. (default: first local public ip)
       #
-      # @see http://msdn.microsoft.com/en-us/library/azure/gg715280.aspx
+      # @see http://msdn.microsoft.com/en-us/library/azure/dn505707.aspx
       #
       # @return  [void]
       def set_sql_server_firewall_rule(server_name, rule_name, start_ip = public_ipv4, end_ip = public_ipv4)
@@ -145,7 +146,7 @@ module Azure
       #
       # @param server_name   [String] Database server name.
       #
-      # @see http://msdn.microsoft.com/en-us/library/azure/gg715278.aspx
+      # @see http://msdn.microsoft.com/en-us/library/azure/dn505715.aspx
       #
       # @return [Array<Azure::SqlDatabaseManagement::FirewallRule>]
       def list_sql_server_firewall_rules(server_name)
@@ -160,7 +161,7 @@ module Azure
       # @param server_name  [String] SQL database server name.
       # @param rule_name    [String] SQL database server firewall rule name.
       #
-      # @see http://msdn.microsoft.com/en-us/library/azure/gg715277.aspx
+      # @see http://msdn.microsoft.com/en-us/library/azure/dn505706.aspx
       #
       # @return  [void]
       def delete_sql_server_firewall_rule(server_name, rule_name)
@@ -201,7 +202,7 @@ module Azure
       end
 
       def public_ipv4
-        @public_ip ||= `curl -s whatismyip.akamai.com`
+        @public_ip ||= Net::HTTP.get('whatismyip.akamai.com', '/')
       end
 
     end