ms_rest_azure 0.1.2 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 358a159d41187ee8dbebdf93b8dd886576f8a0cb
-  data.tar.gz: fc7302b082c0bf3bfe38afcf1ce9edb8d39e1ecb
+  metadata.gz: 6b02ce265675df7683f3fb48e1f1fd1ec1d0e60b
+  data.tar.gz: 027a5fe53ebc63894274461aa81786a4f735c6b6
 SHA512:
-  metadata.gz: 55e84dd3e4435da36b1adbc19394b3c8d358bb0d643f6833f108c1b52e137c6b2928fd6ef75c39f81971cc234dafad0443e9f246904684d5a58396c1bdaf0c17
-  data.tar.gz: c096ce9729717f63d526b430aad10ff7ba93d8e5d69f2ab4231eff1e7d759b7d57de88476f8366cd8b002c32f5d5950ba99767acf7d2a67e999063718cdd8f69
+  metadata.gz: aff4289214fe7169448cd59f4d4570f609e6a8beee79282edabb39e1cf71b8b730421697214453fce6c124c20dec491e4b78a8981217072476dfeac59ab8f50d
+  data.tar.gz: fe7b6aa721bafe96825a5763e2bd2f5d396f2bd213a2b712af88748d48d656fbc6d218e7403f929b213663ee4a4c30623e142d2900b8f3edcdfac7aed3005948

data/lib/ms_rest_azure/azure_service_client.rb

@@ -17,11 +17,10 @@ module MsRestAzure
     #
     # Retrieves the result of 'PUT' operation. Perfroms polling of required.
     # @param azure_response [MsRestAzure::AzureOperationResponse] response from Azure service.
-    # @param custom_headers [Hash] custom HTTP headers to apply to HTTP requests.
     # @param custom_deserialization_block [Proc] custom logic for response deserialization.
     #
     # @return [MsRest::HttpOperationResponse] the response.
-    def get_put_operation_result(azure_response, custom_headers, custom_deserialization_block)
+    def get_put_operation_result(azure_response, custom_deserialization_block)
       fail MsRest::ValidationError, 'Azure response cannot be nil' if azure_response.nil?
 
       status_code = azure_response.response.status
@@ -31,17 +30,18 @@ module MsRestAzure
       end
 
       polling_state = PollingState.new(azure_response, @long_running_operation_retry_timeout)
-      operation_url = azure_response.request.url_prefix.to_s
+      request = azure_response.request
 
       if (!AsyncOperationStatus.is_terminal_status(polling_state.status))
         task = Concurrent::TimerTask.new do
           begin
             if !polling_state.azure_async_operation_header_link.nil?
-              update_state_from_azure_async_operation_header(polling_state, custom_headers)
+              update_state_from_azure_async_operation_header(polling_state.get_request(headers: request.headers, base_uri: request.base_uri), polling_state)
             elsif !polling_state.location_header_link.nil?
-              update_state_from_location_header_on_put(polling_state, custom_headers, custom_deserialization_block)
+              update_state_from_location_header_on_put(polling_state.get_request(headers: request.headers, base_uri: request.base_uri), polling_state, custom_deserialization_block)
             else
-              update_state_from_get_resource_operation(operation_url, polling_state, custom_headers, custom_deserialization_block)
+              get_request = MsRest::HttpOperationRequest.new(request.base_uri, request.build_path.to_s, 'get', query_params: request.query_params)
+              update_state_from_get_resource_operation(get_request, polling_state, custom_deserialization_block)
             end
 
             if (AsyncOperationStatus.is_terminal_status(polling_state.status))
@@ -65,7 +65,8 @@ module MsRestAzure
       end
 
       if (AsyncOperationStatus.is_successful_status(polling_state.status) && polling_state.resource.nil?)
-        update_state_from_get_resource_operation(operation_url, polling_state, custom_headers, custom_deserialization_block)
+        get_request = MsRest::HttpOperationRequest.new(request.base_uri, request.build_path.to_s, 'get', query_params: request.query_params)
+        update_state_from_get_resource_operation(get_request, polling_state, custom_deserialization_block)
       end
 
       if (AsyncOperationStatus.is_failed_status(polling_state.status))
@@ -78,11 +79,10 @@ module MsRestAzure
     #
     # Retrieves the result of 'POST' or 'DELETE' operations. Perfroms polling of required.
     # @param azure_response [MsRestAzure::AzureOperationResponse] response from Azure service.
-    # @param custom_headers [Proc] custom method for polling.
     # @param custom_deserialization_block [Proc] custom logic for response deserialization.
     #
     # @return [MsRest::HttpOperationResponse] the response.
-    def get_post_or_delete_operation_result(azure_response, custom_headers, custom_deserialization_block)
+    def get_post_or_delete_operation_result(azure_response, custom_deserialization_block)
       fail MsRest::ValidationError, 'Azure response cannot be nil' if azure_response.nil?
       fail MsRest::ValidationError, 'Azure response cannot have empty response object' if azure_response.response.nil?
 
@@ -93,14 +93,15 @@ module MsRestAzure
       end
 
       polling_state = PollingState.new(azure_response, @long_running_operation_retry_timeout)
-
+      request = azure_response.request
+      
       if (!AsyncOperationStatus.is_terminal_status(polling_state.status))
         task = Concurrent::TimerTask.new do
           begin
             if !polling_state.azure_async_operation_header_link.nil?
-              update_state_from_azure_async_operation_header(polling_state, custom_headers)
+              update_state_from_azure_async_operation_header(polling_state.get_request(headers: request.headers, base_uri: request.base_uri), polling_state)
             elsif !polling_state.location_header_link.nil?
-              update_state_from_location_header_on_post_or_delete(polling_state, custom_headers, custom_deserialization_block)
+              update_state_from_location_header_on_post_or_delete(polling_state.get_request(headers: request.headers, base_uri: request.base_uri), polling_state, custom_deserialization_block)
             else
               task.shutdown
               fail AzureOperationError, 'Location header is missing from long running operation'
@@ -135,13 +136,12 @@ module MsRestAzure
 
     #
     # Updates polling state based on location header for PUT HTTP requests.
-    # @param operation_url [String] The url retrieve data from.
+    # @param request [MsRest::HttpOperationRequest] The url retrieve data from.
     # @param polling_state [MsRestAzure::PollingState] polling state to update.
-    # @param custom_headers [Hash] custom headers to apply to HTTP request.
     # @param custom_deserialization_block [Proc] custom deserialization method for parsing response.
     #
-    def update_state_from_get_resource_operation(operation_url, polling_state, custom_headers, custom_deserialization_block)
-      result = get_async_with_custom_deserialization(operation_url, custom_headers, custom_deserialization_block)
+    def update_state_from_get_resource_operation(request, polling_state, custom_deserialization_block)
+      result = get_async_with_custom_deserialization(request, custom_deserialization_block)
 
       fail AzureOperationError, 'The response from long running operation does not contain a body' if result.response.body.nil? || result.response.body.empty?
 
@@ -163,11 +163,11 @@ module MsRestAzure
 
     #
     # Updates polling state based on location header for PUT HTTP requests.
+    # @param request [MsRest::HttpOperationRequest] The url retrieve data from.
     # @param polling_state [MsRestAzure::PollingState] polling state to update.
-    # @param custom_headers [Hash] custom headers to apply to HTTP request.
     # @param custom_deserialization_block [Proc] custom deserialization method for parsing response.
-    def update_state_from_location_header_on_put(polling_state, custom_headers, custom_deserialization_block)
-      result = get_async_with_custom_deserialization(polling_state.location_header_link, custom_headers, custom_deserialization_block)
+    def update_state_from_location_header_on_put(request, polling_state, custom_deserialization_block)
+      result = get_async_with_custom_deserialization(request, custom_deserialization_block)
 
       polling_state.update_response(result.response)
       polling_state.request = result.response
@@ -199,9 +199,8 @@ module MsRestAzure
     #
     # Updates polling state from Azure async operation header.
     # @param polling_state [MsRestAzure::PollingState] polling state.
-    # @param custom_headers [Hash] custom headers to apply to HTTP request.
-    def update_state_from_azure_async_operation_header(polling_state, custom_headers)
-      result = get_async_with_async_operation_deserialization(polling_state.azure_async_operation_header_link, custom_headers)
+    def update_state_from_azure_async_operation_header(request, polling_state)
+      result = get_async_with_async_operation_deserialization(request)
 
       fail AzureOperationError, 'The response from long running operation does not contain a body' if result.body.nil? || result.body.status.nil?
 
@@ -214,11 +213,10 @@ module MsRestAzure
 
     #
     # Updates polling state based on location header for POST and DELETE HTTP requests.
-    # @param polling_state [MsRestAzure::PollingState] [description]
-    # @param custom_headers [Hash] custom headers to apply to HTTP requests.
+    # @param polling_state [MsRest::HttpOperationRequest] [description]
     # @param custom_deserialization_block [Proc] custom deserialization method for parsing response.
-    def update_state_from_location_header_on_post_or_delete(polling_state, custom_headers, custom_deserialization_block)
-      result = get_async_with_custom_deserialization(polling_state.location_header_link, custom_headers, custom_deserialization_block)
+    def update_state_from_location_header_on_post_or_delete(request, polling_state, custom_deserialization_block)
+      result = get_async_with_custom_deserialization(request, custom_deserialization_block)
 
       polling_state.update_response(result.response)
       polling_state.request = result.request
@@ -234,13 +232,12 @@ module MsRestAzure
 
     #
     # Retrives data by given URL.
-    # @param operation_url [String] the URL.
-    # @param custom_headers [String] headers to apply to the HTTP request.
+    # @param request [MsRest::HttpOperationRequest] the URL.
     # @param custom_deserialization_block [Proc] function to perform deserialization of the HTTP response.
     #
     # @return [MsRest::HttpOperationResponse] the response.
-    def get_async_with_custom_deserialization(operation_url, custom_headers, custom_deserialization_block)
-      result = get_async_common(operation_url, custom_headers)
+    def get_async_with_custom_deserialization(request, custom_deserialization_block)
+      result = get_async_common(request)
 
       if (!result.body.nil? && !custom_deserialization_block.nil?)
         begin
@@ -255,12 +252,11 @@ module MsRestAzure
 
     #
     # Retrives data by given URL.
-    # @param operation_url [String] the URL.
-    # @param custom_headers [String] headers to apply to the HTTP request.
+    # @param request [MsRest::HttpOperationRequest] the URL.
     #
     # @return [MsRest::HttpOperationResponse] the response.
-    def get_async_with_async_operation_deserialization(operation_url, custom_headers)
-      result = get_async_common(operation_url, custom_headers)
+    def get_async_with_async_operation_deserialization(request)
+      result = get_async_common(request)
 
       result.body = AsyncOperationStatus.deserialize_object(result.body)
       result
@@ -268,55 +264,35 @@ module MsRestAzure
 
     #
     # Retrives data by given URL.
-    # @param operation_url [String] the URL.
-    # @param custom_headers [String] headers to apply to the HTTP request.
+    # @param request [MsRest::HttpOperationRequest] the URL.
     #
     # @return [MsRest::HttpOperationResponse] the response.
-    def get_async_common(operation_url, custom_headers)
-      fail ValidationError, 'Operation url cannot be nil' if operation_url.nil?
-
-      url = URI(operation_url.gsub(' ', '%20'))
-
-      fail URI::Error unless url.to_s =~ /\A#{URI::regexp}\z/
-
-      # Create HTTP transport object
-      connection = Faraday.new(:url => url) do |faraday|
-        faraday.use MsRest::RetryPolicyMiddleware, times: 3, retry: 0.02
-        faraday.use :cookie_jar
-        faraday.adapter Faraday.default_adapter
-      end
-
-      request_headers = Hash.new
-      request_headers['x-ms-client-request-id'] = SecureRandom.uuid
-      request_headers['Content-Type'] = 'application/json'
-
-      unless custom_headers.nil?
-        custom_headers.each do |key, value|
-          request_headers[key] = value
-        end
-      end
+    def get_async_common(request)
+      fail ValidationError, 'Request cannot be nil' if request.nil?
+      
+      request.middlewares = [[MsRest::RetryPolicyMiddleware, times: 3, retry: 0.02], [:cookie_jar]]
+      request.headers.merge!({'x-ms-client-request-id' => SecureRandom.uuid, 'Content-Type' => 'application/json'})
 
       # Send Request
-      http_response = connection.get do |request|
-        request.headers = request_headers
-        @credentials.sign_request(request) unless @credentials.nil?
-      end
-
+      http_response = request.run_promise do |req|
+        @credentials.sign_request(req) unless @credentials.nil?
+      end.execute.value!
+      
       status_code = http_response.status
 
       if (status_code != 200 && status_code != 201 && status_code != 202 && status_code != 204)
         json_error_data = JSON.load(http_response.body)
         error_data = CloudErrorData.deserialize_object(json_error_data)
 
-        fail AzureOperationError.new connection, http_response, error_data, "Long running operation failed with status #{status_code}"
+        fail AzureOperationError.new request, http_response, error_data, "Long running operation failed with status #{status_code}"
       end
 
-      result = MsRest::HttpOperationResponse.new(connection, http_response, http_response.body)
+      result = MsRest::HttpOperationResponse.new(request, http_response, http_response.body)
 
       begin
         result.body = JSON.load(http_response.body) unless http_response.body.to_s.empty?
       rescue Exception => e
-        fail MsRest::DeserializationError.new("Error occured in deserializing the response", e.message, e.backtrace, http_response.body)
+        fail MsRest::DeserializationError.new("Error occured in deserializing the response", e.message, e.backtrace, result)
       end
 
       result

data/lib/ms_rest_azure/polling_state.rb

@@ -91,6 +91,11 @@ module MsRestAzure
     def get_operation_error
       AzureOperationError.new @request, @response, @error_data, "Long running operation failed with status #{@status}"
     end
+    
+    def get_request(options = {})
+      link = @azure_async_operation_header_link || @location_header_link
+      MsRest::HttpOperationRequest.new(nil, link, 'get', options)
+    end
 
     private
 

data/lib/ms_rest_azure/version.rb

@@ -3,5 +3,5 @@
 # Licensed under the MIT License. See License.txt in the project root for license information.
 
 module MsRestAzure
-  VERSION = '0.1.2'
+  VERSION = '0.2.0'
 end

data/ms_rest_azure.gemspec

@@ -26,11 +26,11 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency 'bundler', '~> 1.9'
   spec.add_development_dependency 'rake', '~> 10.0'
-  spec.add_development_dependency 'rspec', '~> 3.3.0'
+  spec.add_development_dependency 'rspec', '~> 3.3'
 
   spec.add_runtime_dependency 'json', '~> 1.7'
   spec.add_runtime_dependency 'concurrent-ruby', '~> 1.0'
-  spec.add_runtime_dependency 'faraday', '~> 0.9.1'
+  spec.add_runtime_dependency 'faraday', '~> 0.9'
   spec.add_runtime_dependency 'faraday-cookie_jar', '~> 0.0.6'
-  spec.add_runtime_dependency 'ms_rest', '~> 0.1.0'
+  spec.add_runtime_dependency 'ms_rest', '~> 0.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ms_rest_azure
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.0
 platform: ruby
 authors:
 - Microsoft Corporation
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-23 00:00:00.000000000 Z
+date: 2016-03-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.3.0
+        version: '3.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.3.0
+        version: '3.3'
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
@@ -86,14 +86,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.1
+        version: '0.9'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.1
+        version: '0.9'
 - !ruby/object:Gem::Dependency
   name: faraday-cookie_jar
   requirement: !ruby/object:Gem::Requirement
@@ -114,14 +114,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: '0.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: '0.2'
 description: Azure Client Library for Ruby.
 email: azsdkteam@microsoft.com
 executables: []