From ff5a5bbabd2cea77a3fe10ea2403b5413dcf102b Mon Sep 17 00:00:00 2001 From: Kyle Rames Date: Wed, 24 Jul 2013 13:07:56 -0500 Subject: [PATCH] [rackspace|monitoring] updating to re-authenticate token on expiration; adding monitoring authentication tests --- lib/fog/rackspace/monitoring.rb | 27 +++++------ tests/rackspace/monitoring_tests.rb | 72 +++++++++++++++++++++++++++++ 2 files changed, 84 insertions(+), 15 deletions(-) create mode 100644 tests/rackspace/monitoring_tests.rb diff --git a/lib/fog/rackspace/monitoring.rb b/lib/fog/rackspace/monitoring.rb index 42a1b7d4d..b8a7410dd 100644 --- a/lib/fog/rackspace/monitoring.rb +++ b/lib/fog/rackspace/monitoring.rb @@ -16,7 +16,7 @@ module Fog requires :rackspace_api_key, :rackspace_username recognizes :rackspace_auth_url recognizes :persistent - recognizes :rackspace_service_url + recognizes :rackspace_monitoring_url recognizes :rackspace_region model_path 'fog/rackspace/models/monitoring' @@ -90,14 +90,11 @@ module Fog @rackspace_username = options[:rackspace_username] @rackspace_auth_url = options[:rackspace_auth_url] @connection_options = options[:connection_options] || {} + @rackspace_endpoint = Fog::Rackspace.normalize_url(options[:rackspace_monitoring_url]) authenticate @persistent = options[:persistent] || false - - @connection_options[:headers] ||= {} - @connection_options[:headers].merge!({ 'Content-Type' => 'application/json', 'X-Auth-Token' => auth_token }) - @connection = Fog::Connection.new(endpoint_uri.to_s, @persistent, @connection_options) end @@ -105,13 +102,14 @@ module Fog @connection.reset end + def endpoint_uri(service_endpoint_url=nil) + @uri = super(@rackspace_endpoint || service_endpoint_url, :rackspace_monitoring_url) + end + private - def request(params) - begin - response = @connection.request(params.merge!({ - :path => "#{endpoint_uri.path}/#{params[:path]}" - })) + def request(params, parse_json = true, &block) + super(params, parse_json, &block) rescue Excon::Errors::BadRequest => error raise BadRequest.slurp error rescue Excon::Errors::Conflict => error @@ -120,11 +118,10 @@ module Fog raise NotFound.slurp(error, region) rescue Excon::Errors::ServiceUnavailable => error raise ServiceUnavailable.slurp error - end - unless response.body.empty? - response.body = Fog::JSON.decode(response.body) - end - response + rescue Excon::Errors::InternalServerError => error + raise InternalServerError.slurp error + rescue Excon::Errors::HTTPStatusError => error + raise ServiceError.slurp error end def authenticate diff --git a/tests/rackspace/monitoring_tests.rb b/tests/rackspace/monitoring_tests.rb new file mode 100644 index 000000000..5ab8dafb6 --- /dev/null +++ b/tests/rackspace/monitoring_tests.rb @@ -0,0 +1,72 @@ +Shindo.tests('Fog::Rackspace::Monitoring', ['rackspace','rackspace_monitoring']) do + + def assert_method(url, method) + @service.instance_variable_set "@rackspace_auth_url", url + returns(method) { @service.send :authentication_method } + end + + tests('#authentication_method') do + @service = Fog::Rackspace::Monitoring.new + + assert_method nil, :authenticate_v2 + + assert_method 'auth.api.rackspacecloud.com', :authenticate_v1 # chef's default auth endpoint + + assert_method 'https://identity.api.rackspacecloud.com', :authenticate_v1 + assert_method 'https://identity.api.rackspacecloud.com/v1', :authenticate_v1 + assert_method 'https://identity.api.rackspacecloud.com/v1.1', :authenticate_v1 + assert_method 'https://identity.api.rackspacecloud.com/v2.0', :authenticate_v2 + + assert_method 'https://lon.identity.api.rackspacecloud.com', :authenticate_v1 + assert_method 'https://lon.identity.api.rackspacecloud.com/v1', :authenticate_v1 + assert_method 'https://lon.identity.api.rackspacecloud.com/v1.1', :authenticate_v1 + assert_method 'https://lon.identity.api.rackspacecloud.com/v2.0', :authenticate_v2 + end + + + tests('current authentation') do + pending if Fog.mocking? + + tests('variables populated').succeeds do + @service = Fog::Rackspace::Monitoring.new :rackspace_auth_url => 'https://identity.api.rackspacecloud.com/v2.0', :connection_options => {:ssl_verify_peer => true} + returns(true, "auth token populated") { !@service.send(:auth_token).nil? } + returns(false, "path populated") { @service.instance_variable_get("@uri").host.nil? } + identity_service = @service.instance_variable_get("@identity_service") + returns(false, "identity service was used") { identity_service.nil? } + returns(true, "connection_options are passed") { identity_service.instance_variable_get("@connection_options").has_key?(:ssl_verify_peer) } + @service.list_entities + end + tests('custom endpoint') do + @service = Fog::Rackspace::Monitoring.new :rackspace_auth_url => 'https://identity.api.rackspacecloud.com/v2.0', + :rackspace_monitoring_url => 'https://my-custom-endpoint.com' + returns(true, "auth token populated") { !@service.send(:auth_token).nil? } + returns(true, "uses custom endpoint") { (@service.instance_variable_get("@uri").host =~ /my-custom-endpoint\.com/) != nil } + end + end + + tests('default auth') do + pending if Fog.mocking? + + tests('no params').succeeds do + @service = Fog::Rackspace::Monitoring.new + returns(true, "auth token populated") { !@service.send(:auth_token).nil? } + returns(true) { (@service.instance_variable_get("@uri").host =~ /monitoring.api.rackspacecloud.com/) != nil } + @service.list_entities + end + tests('custom endpoint') do + @service = Fog::Rackspace::Monitoring.new :rackspace_monitoring_url => 'https://my-custom-endpoint.com' + returns(true, "auth token populated") { !@service.send(:auth_token).nil? } + returns(true, "uses custom endpoint") { (@service.instance_variable_get("@uri").host =~ /my-custom-endpoint\.com/) != nil } + end + end + + tests('reauthentication') do + pending if Fog.mocking? + + @service = Fog::Rackspace::Monitoring.new + returns(true, "auth token populated") { !@service.send(:auth_token).nil? } + @service.instance_variable_set("@auth_token", "bad_token") + returns(true) { [200, 203].include? @service.list_entities.status } + end + +end \ No newline at end of file