From 7f37977d2e330d9dacdc629c951a54f0e563a0a9 Mon Sep 17 00:00:00 2001 From: Paul Thornthwaite Date: Wed, 26 Feb 2014 09:56:40 +0000 Subject: [PATCH 1/3] [core] Deprecate Fog::Connection This reapplies the deprecation warnings that were originally part of 7ee3535 when using Fog::Connection request. Unfortunately the Mock world does not exercise any of the code affected by this change so I missed that I had adjusted the signature of the method. If you pass a parser argument into Fog::Connection you should switch to using Fog::XML::SAXParserConnection and pass the parser as the first argument to `#request` If you don't it is better to use Fog::Core::Connection to get rid of the backwards compatibility code and XML dependency. This will make fog VERY NOISY since you'll get output for every request on out of date services. --- lib/fog/core/deprecated/connection.rb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lib/fog/core/deprecated/connection.rb b/lib/fog/core/deprecated/connection.rb index 193d4bd02..e27931fc0 100644 --- a/lib/fog/core/deprecated/connection.rb +++ b/lib/fog/core/deprecated/connection.rb @@ -15,8 +15,10 @@ module Fog class Connection < Fog::XML::SAXParserConnection def request(params, &block) if (parser = params.delete(:parser)) + Fog::Logger.deprecation("Fog::Connection is deprecated use Fog::XML::SAXParserConnection instead [light_black](#{caller.first})[/]") super(parser, params) else + Fog::Logger.deprecation("Fog::Connection is deprecated use Fog::Core::Connection instead [light_black](#{caller.first})[/]") original_request(params) end end From 1768f2a37ec7772d48518202cb4503db4a7c5ece Mon Sep 17 00:00:00 2001 From: Paul Thornthwaite Date: Wed, 26 Feb 2014 22:07:06 +0000 Subject: [PATCH 2/3] [GH-2711] Add Fog::XML::Connection Attempting to move to using Fog::XML::SAXParserConnection directly failed because the arguments changed. This adds another compatibility level with two key differences: 1) It's namespaced within XML so stands out as not being part of core 2) It is NOT creating deprecation warnings so can be used as the final step if rewriting to use SAXParserConnection is undesired So when merged Fog::Connection usage will create noise. Fog::XML::Connection works the same way and will be extracted to "fog/xml" when we get to it. Fog::Core::Connection just wraps Excon.request and leaves the response body parsing to the provider. --- lib/fog/core/deprecated/connection.rb | 9 ++++---- lib/fog/xml.rb | 12 +++++++++-- lib/fog/xml/connection.rb | 13 ++++++++++++ test/fog/xml/connection_test.rb | 30 +++++++++++++++++++++++++++ test/hello_world_test.rb | 8 ------- 5 files changed, 57 insertions(+), 15 deletions(-) create mode 100644 lib/fog/xml/connection.rb create mode 100644 test/fog/xml/connection_test.rb delete mode 100644 test/hello_world_test.rb diff --git a/lib/fog/core/deprecated/connection.rb b/lib/fog/core/deprecated/connection.rb index e27931fc0..a9f9069a4 100644 --- a/lib/fog/core/deprecated/connection.rb +++ b/lib/fog/core/deprecated/connection.rb @@ -12,15 +12,14 @@ module Fog # # @see https://github.com/geemus/excon/blob/master/lib/excon/connection.rb # - class Connection < Fog::XML::SAXParserConnection + class Connection < Fog::XML::Connection def request(params, &block) - if (parser = params.delete(:parser)) - Fog::Logger.deprecation("Fog::Connection is deprecated use Fog::XML::SAXParserConnection instead [light_black](#{caller.first})[/]") - super(parser, params) + if params.key?(:parser) + Fog::Logger.deprecation("Fog::Connection is deprecated use Fog::XML::Connection instead [light_black](#{caller.first})[/]") else Fog::Logger.deprecation("Fog::Connection is deprecated use Fog::Core::Connection instead [light_black](#{caller.first})[/]") - original_request(params) end + super(params) end end end diff --git a/lib/fog/xml.rb b/lib/fog/xml.rb index 0e4b61573..13d3c88c3 100644 --- a/lib/fog/xml.rb +++ b/lib/fog/xml.rb @@ -1,5 +1,6 @@ require "nokogiri" require "fog/core/parser" +require "fog/xml/sax_parser_connection" module Fog @@ -15,7 +16,14 @@ module Fog # its services # module XML + class Connection < Fog::XML::SAXParserConnection + def request(params, &block) + if (parser = params.delete(:parser)) + super(parser, params) + else + original_request(params) + end + end + end end end - -require "fog/xml/sax_parser_connection" diff --git a/lib/fog/xml/connection.rb b/lib/fog/xml/connection.rb new file mode 100644 index 000000000..fedcc4b62 --- /dev/null +++ b/lib/fog/xml/connection.rb @@ -0,0 +1,13 @@ +module Fog + module XML + class Connection < SAXParserConnection + def request(params, &block) + if (parser = params.delete(:parser)) + super(parser, params) + else + original_request(params) + end + end + end + end +end diff --git a/test/fog/xml/connection_test.rb b/test/fog/xml/connection_test.rb new file mode 100644 index 000000000..9f36bdd7b --- /dev/null +++ b/test/fog/xml/connection_test.rb @@ -0,0 +1,30 @@ +require "minitest/autorun" +require "fog" + +# Note this is going to be part of fog-xml eventually +class TestFogXMLConnection < MiniTest::Unit::TestCase + def setup + @connection = Fog::XML::Connection.new("http://localhost") + end + + def teardown + Excon.stubs.clear + end + + def test_respond_to_request + assert_respond_to @connection, :request + end + + def test_request_with_parser + @parser = Fog::ToHashDocument.new + Excon.stub({}, { :status => 200, :body => "" }) + response = @connection.request(:parser => @parser, :mock => true) + assert_equal({ :xml => "" }, response.body) + end + + def test_request_without_parser + Excon.stub({}, { :status => 200, :body => "" }) + response = @connection.request(:mock => true) + assert_equal("", response.body) + end +end diff --git a/test/hello_world_test.rb b/test/hello_world_test.rb deleted file mode 100644 index 1a8b8fe9d..000000000 --- a/test/hello_world_test.rb +++ /dev/null @@ -1,8 +0,0 @@ -require "minitest/autorun" - -class HelloWorldTest < Minitest::Test - # This is a placeholder to ensure minitest is being picked up by rake - def test_truth - assert true - end -end From 0e1daf3dddddb1fc85f2157ab0415dc9b0e8ee2b Mon Sep 17 00:00:00 2001 From: Paul Thornthwaite Date: Thu, 27 Feb 2014 00:50:35 +0000 Subject: [PATCH 3/3] [GH-2711] Replace Fog::Connection with XML shim Unlike last attempt this replaces Fog::Connection with Fog::XML::Connection which should be directly compatible. Fog::Connection is there for old PRs but should be removed real soon. Providers using JSON should be able to replace "XML" with "Core" within their code to cut down on the dependency. If I get the time I may attempt to clean up some but testing with Mock will mean that is mostly educated guesswork. --- lib/fog/atmos/storage.rb | 2 +- lib/fog/aws/auto_scaling.rb | 2 +- lib/fog/aws/beanstalk.rb | 2 +- lib/fog/aws/cdn.rb | 2 +- lib/fog/aws/cloud_formation.rb | 2 +- lib/fog/aws/cloud_watch.rb | 2 +- lib/fog/aws/compute.rb | 2 +- lib/fog/aws/data_pipeline.rb | 2 +- lib/fog/aws/dns.rb | 2 +- lib/fog/aws/dynamodb.rb | 2 +- lib/fog/aws/elasticache.rb | 2 +- lib/fog/aws/elb.rb | 2 +- lib/fog/aws/emr.rb | 2 +- lib/fog/aws/glacier.rb | 2 +- lib/fog/aws/iam.rb | 2 +- lib/fog/aws/rds.rb | 2 +- lib/fog/aws/redshift.rb | 2 +- lib/fog/aws/ses.rb | 2 +- lib/fog/aws/simpledb.rb | 2 +- lib/fog/aws/sns.rb | 2 +- lib/fog/aws/sqs.rb | 2 +- lib/fog/aws/storage.rb | 4 ++-- lib/fog/aws/sts.rb | 2 +- lib/fog/bare_metal_cloud/compute.rb | 2 +- lib/fog/bluebox/blb.rb | 2 +- lib/fog/bluebox/compute.rb | 2 +- lib/fog/bluebox/dns.rb | 2 +- lib/fog/clodo/compute.rb | 2 +- lib/fog/clodo/core.rb | 2 +- lib/fog/cloudsigma/connection.rb | 2 +- lib/fog/cloudstack/compute.rb | 2 +- lib/fog/core/deprecated/connection.rb | 4 ++-- lib/fog/digitalocean/compute.rb | 2 +- lib/fog/dnsimple/dns.rb | 2 +- lib/fog/dnsmadeeasy/dns.rb | 2 +- lib/fog/dreamhost/dns.rb | 2 +- lib/fog/dynect/dns.rb | 2 +- lib/fog/ecloud/compute.rb | 2 +- lib/fog/glesys/compute.rb | 2 +- lib/fog/go_grid/compute.rb | 2 +- lib/fog/google/storage.rb | 2 +- lib/fog/hp/block_storage.rb | 2 +- lib/fog/hp/block_storage_v2.rb | 2 +- lib/fog/hp/cdn.rb | 2 +- lib/fog/hp/compute.rb | 2 +- lib/fog/hp/compute_v2.rb | 2 +- lib/fog/hp/core.rb | 4 ++-- lib/fog/hp/dns.rb | 2 +- lib/fog/hp/lb.rb | 2 +- lib/fog/hp/network.rb | 2 +- lib/fog/hp/storage.rb | 2 +- lib/fog/ibm/core.rb | 2 +- lib/fog/internet_archive/storage.rb | 4 ++-- lib/fog/joyent/analytics.rb | 2 +- lib/fog/joyent/compute.rb | 2 +- lib/fog/linode/compute.rb | 2 +- lib/fog/linode/dns.rb | 2 +- lib/fog/ninefold/compute.rb | 2 +- lib/fog/openstack/compute.rb | 4 ++-- lib/fog/openstack/core.rb | 8 ++++---- lib/fog/openstack/identity.rb | 2 +- lib/fog/openstack/image.rb | 2 +- lib/fog/openstack/metering.rb | 2 +- lib/fog/openstack/network.rb | 2 +- lib/fog/openstack/orchestration.rb | 4 ++-- lib/fog/openstack/storage.rb | 2 +- lib/fog/openstack/volume.rb | 2 +- lib/fog/rackspace/auto_scale.rb | 2 +- lib/fog/rackspace/block_storage.rb | 2 +- lib/fog/rackspace/cdn.rb | 2 +- lib/fog/rackspace/compute.rb | 2 +- lib/fog/rackspace/compute_v2.rb | 2 +- lib/fog/rackspace/core.rb | 2 +- lib/fog/rackspace/databases.rb | 2 +- lib/fog/rackspace/dns.rb | 2 +- lib/fog/rackspace/identity.rb | 2 +- lib/fog/rackspace/load_balancers.rb | 2 +- lib/fog/rackspace/monitoring.rb | 2 +- lib/fog/rackspace/queues.rb | 2 +- lib/fog/rackspace/storage.rb | 2 +- lib/fog/rage4/dns.rb | 2 +- lib/fog/riakcs/provisioning.rb | 2 +- lib/fog/serverlove/compute.rb | 2 +- lib/fog/storm_on_demand/shared.rb | 2 +- lib/fog/terremark/vcloud.rb | 2 +- lib/fog/vcloud/compute.rb | 2 +- lib/fog/vcloud_director/compute.rb | 4 ++-- lib/fog/voxel/compute.rb | 2 +- lib/fog/xenserver/compute.rb | 2 +- lib/fog/zerigo/dns.rb | 2 +- 90 files changed, 100 insertions(+), 100 deletions(-) diff --git a/lib/fog/atmos/storage.rb b/lib/fog/atmos/storage.rb index acf83b777..3ef915023 100644 --- a/lib/fog/atmos/storage.rb +++ b/lib/fog/atmos/storage.rb @@ -83,7 +83,7 @@ module Fog @hmac = Fog::HMAC.new('sha1', @storage_secret_decoded) @persistent = options.fetch(:persistent, false) - @connection = Fog::Connection.new("#{@prefix}://#{@storage_host}:#{@storage_port}", + @connection = Fog::XML::Connection.new("#{@prefix}://#{@storage_host}:#{@storage_port}", @persistent, @connection_options) end diff --git a/lib/fog/aws/auto_scaling.rb b/lib/fog/aws/auto_scaling.rb index f74dd4309..2ec273c64 100644 --- a/lib/fog/aws/auto_scaling.rb +++ b/lib/fog/aws/auto_scaling.rb @@ -104,7 +104,7 @@ module Fog @port = options[:port] || 443 @persistent = options[:persistent] || false @scheme = options[:scheme] || 'https' - @connection = Fog::Connection.new("#{@scheme}://#{@host}:#{@port}#{@path}", @persistent, @connection_options) + @connection = Fog::XML::Connection.new("#{@scheme}://#{@host}:#{@port}#{@path}", @persistent, @connection_options) end def reload diff --git a/lib/fog/aws/beanstalk.rb b/lib/fog/aws/beanstalk.rb index 37fa12604..eb7ca48ad 100644 --- a/lib/fog/aws/beanstalk.rb +++ b/lib/fog/aws/beanstalk.rb @@ -78,7 +78,7 @@ module Fog @persistent = options[:persistent] || false @port = options[:port] || 443 @scheme = options[:scheme] || 'https' - @connection = Fog::Connection.new("#{@scheme}://#{@host}:#{@port}#{@path}", @persistent, @connection_options) + @connection = Fog::XML::Connection.new("#{@scheme}://#{@host}:#{@port}#{@path}", @persistent, @connection_options) end def reload diff --git a/lib/fog/aws/cdn.rb b/lib/fog/aws/cdn.rb index caa11fdf5..911f3cbc9 100644 --- a/lib/fog/aws/cdn.rb +++ b/lib/fog/aws/cdn.rb @@ -154,7 +154,7 @@ EOF @port = options[:port] || 443 @scheme = options[:scheme] || 'https' @version = options[:version] || '2010-11-01' - @connection = Fog::Connection.new("#{@scheme}://#{@host}:#{@port}#{@path}", @persistent, @connection_options) + @connection = Fog::XML::Connection.new("#{@scheme}://#{@host}:#{@port}#{@path}", @persistent, @connection_options) end def reload diff --git a/lib/fog/aws/cloud_formation.rb b/lib/fog/aws/cloud_formation.rb index 93c63661e..35c6fad96 100644 --- a/lib/fog/aws/cloud_formation.rb +++ b/lib/fog/aws/cloud_formation.rb @@ -60,7 +60,7 @@ module Fog @persistent = options[:persistent] || false @port = options[:port] || 443 @scheme = options[:scheme] || 'https' - @connection = Fog::Connection.new("#{@scheme}://#{@host}:#{@port}#{@path}", @persistent, @connection_options) + @connection = Fog::XML::Connection.new("#{@scheme}://#{@host}:#{@port}#{@path}", @persistent, @connection_options) end def reload diff --git a/lib/fog/aws/cloud_watch.rb b/lib/fog/aws/cloud_watch.rb index 9dacfa6c5..17c4c7d66 100644 --- a/lib/fog/aws/cloud_watch.rb +++ b/lib/fog/aws/cloud_watch.rb @@ -104,7 +104,7 @@ module Fog @persistent = options[:persistent] || false @port = options[:port] || 443 @scheme = options[:scheme] || 'https' - @connection = Fog::Connection.new("#{@scheme}://#{@host}:#{@port}#{@path}", @persistent, @connection_options) + @connection = Fog::XML::Connection.new("#{@scheme}://#{@host}:#{@port}#{@path}", @persistent, @connection_options) end def reload diff --git a/lib/fog/aws/compute.rb b/lib/fog/aws/compute.rb index 5d183de25..900d99873 100644 --- a/lib/fog/aws/compute.rb +++ b/lib/fog/aws/compute.rb @@ -399,7 +399,7 @@ module Fog @port = options[:port] || 443 @scheme = options[:scheme] || 'https' end - @connection = Fog::Connection.new("#{@scheme}://#{@host}:#{@port}#{@path}", @persistent, @connection_options) + @connection = Fog::XML::Connection.new("#{@scheme}://#{@host}:#{@port}#{@path}", @persistent, @connection_options) end def reload diff --git a/lib/fog/aws/data_pipeline.rb b/lib/fog/aws/data_pipeline.rb index 4dfba7cce..c1ddab0b8 100644 --- a/lib/fog/aws/data_pipeline.rb +++ b/lib/fog/aws/data_pipeline.rb @@ -62,7 +62,7 @@ module Fog @persistent = options[:persistent] || false @port = options[:port] || 443 @scheme = options[:scheme] || 'https' - @connection = Fog::Connection.new("#{@scheme}://#{@host}:#{@port}#{@path}", @persistent, @connection_options) + @connection = Fog::XML::Connection.new("#{@scheme}://#{@host}:#{@port}#{@path}", @persistent, @connection_options) setup_credentials(options) end diff --git a/lib/fog/aws/dns.rb b/lib/fog/aws/dns.rb index 0e380e6fa..5af807fe6 100644 --- a/lib/fog/aws/dns.rb +++ b/lib/fog/aws/dns.rb @@ -99,7 +99,7 @@ module Fog @scheme = options[:scheme] || 'https' @version = options[:version] || '2012-02-29' - @connection = Fog::Connection.new("#{@scheme}://#{@host}:#{@port}#{@path}", @persistent, @connection_options) + @connection = Fog::XML::Connection.new("#{@scheme}://#{@host}:#{@port}#{@path}", @persistent, @connection_options) end def reload diff --git a/lib/fog/aws/dynamodb.rb b/lib/fog/aws/dynamodb.rb index 48e3aa69a..6752a123b 100644 --- a/lib/fog/aws/dynamodb.rb +++ b/lib/fog/aws/dynamodb.rb @@ -88,7 +88,7 @@ module Fog @port = options[:port] || '443' @scheme = options[:scheme] || 'https' - @connection = Fog::Connection.new("#{@scheme}://#{@host}:#{@port}#{@path}", @persistent, @connection_options) + @connection = Fog::XML::Connection.new("#{@scheme}://#{@host}:#{@port}#{@path}", @persistent, @connection_options) end private diff --git a/lib/fog/aws/elasticache.rb b/lib/fog/aws/elasticache.rb index b05a438ab..45dd5988a 100644 --- a/lib/fog/aws/elasticache.rb +++ b/lib/fog/aws/elasticache.rb @@ -62,7 +62,7 @@ module Fog @path = options[:path] || '/' @port = options[:port] || 443 @scheme = options[:scheme] || 'https' - @connection = Fog::Connection.new( + @connection = Fog::XML::Connection.new( "#{@scheme}://#{@host}:#{@port}#{@path}", options[:persistent] ) end diff --git a/lib/fog/aws/elb.rb b/lib/fog/aws/elb.rb index 4fcac56a6..3004d7b05 100644 --- a/lib/fog/aws/elb.rb +++ b/lib/fog/aws/elb.rb @@ -139,7 +139,7 @@ module Fog @persistent = options[:persistent] || false @port = options[:port] || 443 @scheme = options[:scheme] || 'https' - @connection = Fog::Connection.new("#{@scheme}://#{@host}:#{@port}#{@path}", @persistent, @connection_options) + @connection = Fog::XML::Connection.new("#{@scheme}://#{@host}:#{@port}#{@path}", @persistent, @connection_options) end def reload diff --git a/lib/fog/aws/emr.rb b/lib/fog/aws/emr.rb index 6826772b0..ea06bf5e9 100644 --- a/lib/fog/aws/emr.rb +++ b/lib/fog/aws/emr.rb @@ -73,7 +73,7 @@ module Fog @persistent = options[:persistent] || false @port = options[:port] || 443 @scheme = options[:scheme] || 'https' - @connection = Fog::Connection.new("#{@scheme}://#{@host}:#{@port}#{@path}", @persistent, @connection_options) + @connection = Fog::XML::Connection.new("#{@scheme}://#{@host}:#{@port}#{@path}", @persistent, @connection_options) @region = options[:region] end diff --git a/lib/fog/aws/glacier.rb b/lib/fog/aws/glacier.rb index 29573b3e2..93b2d2d76 100644 --- a/lib/fog/aws/glacier.rb +++ b/lib/fog/aws/glacier.rb @@ -134,7 +134,7 @@ module Fog @port = options[:port] || 443 @scheme = options[:scheme] || 'https' - @connection = Fog::Connection.new("#{@scheme}://#{@host}:#{@port}#{@path}", @persistent, @connection_options) + @connection = Fog::XML::Connection.new("#{@scheme}://#{@host}:#{@port}#{@path}", @persistent, @connection_options) end diff --git a/lib/fog/aws/iam.rb b/lib/fog/aws/iam.rb index d9693f061..784ef165d 100644 --- a/lib/fog/aws/iam.rb +++ b/lib/fog/aws/iam.rb @@ -170,7 +170,7 @@ module Fog @persistent = options[:persistent] || false @port = options[:port] || 443 @scheme = options[:scheme] || 'https' - @connection = Fog::Connection.new("#{@scheme}://#{@host}:#{@port}#{@path}", @persistent, @connection_options) + @connection = Fog::XML::Connection.new("#{@scheme}://#{@host}:#{@port}#{@path}", @persistent, @connection_options) end def reload diff --git a/lib/fog/aws/rds.rb b/lib/fog/aws/rds.rb index 768427ff9..233dc6f69 100644 --- a/lib/fog/aws/rds.rb +++ b/lib/fog/aws/rds.rb @@ -168,7 +168,7 @@ module Fog @persistent = options[:persistent] || false @port = options[:port] || 443 @scheme = options[:scheme] || 'https' - @connection = Fog::Connection.new("#{@scheme}://#{@host}:#{@port}#{@path}", @persistent, @connection_options) + @connection = Fog::XML::Connection.new("#{@scheme}://#{@host}:#{@port}#{@path}", @persistent, @connection_options) @version = options[:version] || '2013-05-15' end diff --git a/lib/fog/aws/redshift.rb b/lib/fog/aws/redshift.rb index 09e74b16e..66e0a53ec 100644 --- a/lib/fog/aws/redshift.rb +++ b/lib/fog/aws/redshift.rb @@ -90,7 +90,7 @@ module Fog @port = options[:port] || 443 @scheme = options[:scheme] || 'https' - @connection = Fog::Connection.new("#{@scheme}://#{@host}:#{@port}#{@path}", @persistent, @connection_options) + @connection = Fog::XML::Connection.new("#{@scheme}://#{@host}:#{@port}#{@path}", @persistent, @connection_options) end diff --git a/lib/fog/aws/ses.rb b/lib/fog/aws/ses.rb index 56aed6edc..265377584 100644 --- a/lib/fog/aws/ses.rb +++ b/lib/fog/aws/ses.rb @@ -62,7 +62,7 @@ module Fog @persistent = options[:persistent] || false @port = options[:port] || 443 @scheme = options[:scheme] || 'https' - @connection = Fog::Connection.new("#{@scheme}://#{@host}:#{@port}#{@path}", @persistent, @connection_options) + @connection = Fog::XML::Connection.new("#{@scheme}://#{@host}:#{@port}#{@path}", @persistent, @connection_options) end def reload diff --git a/lib/fog/aws/simpledb.rb b/lib/fog/aws/simpledb.rb index 646c6fc94..12d0755b8 100644 --- a/lib/fog/aws/simpledb.rb +++ b/lib/fog/aws/simpledb.rb @@ -89,7 +89,7 @@ module Fog @persistent = options[:persistent] || false @port = options[:port] || 443 @scheme = options[:scheme] || 'https' - @connection = Fog::Connection.new("#{@scheme}://#{@host}:#{@port}#{@path}", @persistent, @connection_options) + @connection = Fog::XML::Connection.new("#{@scheme}://#{@host}:#{@port}#{@path}", @persistent, @connection_options) end private diff --git a/lib/fog/aws/sns.rb b/lib/fog/aws/sns.rb index 148df1c06..1a1a69d6d 100644 --- a/lib/fog/aws/sns.rb +++ b/lib/fog/aws/sns.rb @@ -61,7 +61,7 @@ module Fog @persistent = options[:persistent] || false @port = options[:port] || 443 @scheme = options[:scheme] || 'https' - @connection = Fog::Connection.new("#{@scheme}://#{@host}:#{@port}#{@path}", @persistent, @connection_options) + @connection = Fog::XML::Connection.new("#{@scheme}://#{@host}:#{@port}#{@path}", @persistent, @connection_options) end def reload diff --git a/lib/fog/aws/sqs.rb b/lib/fog/aws/sqs.rb index 327ded0c0..be74ef0a1 100644 --- a/lib/fog/aws/sqs.rb +++ b/lib/fog/aws/sqs.rb @@ -89,7 +89,7 @@ module Fog @persistent = options[:persistent] || false @port = options[:port] || 443 @scheme = options[:scheme] || 'https' - @connection = Fog::Connection.new("#{@scheme}://#{@host}:#{@port}#{@path}", @persistent, @connection_options) + @connection = Fog::XML::Connection.new("#{@scheme}://#{@host}:#{@port}#{@path}", @persistent, @connection_options) end def reload diff --git a/lib/fog/aws/storage.rb b/lib/fog/aws/storage.rb index 053ad3861..d5c8be90b 100644 --- a/lib/fog/aws/storage.rb +++ b/lib/fog/aws/storage.rb @@ -523,7 +523,7 @@ DATA else @connection = nil end - @connection ||= Fog::Connection.new(uri, @persistent, @connection_options) + @connection ||= Fog::XML::Connection.new(uri, @persistent, @connection_options) end def request(params, &block) @@ -550,7 +550,7 @@ DATA headers = (error.response.is_a?(Hash) ? error.response[:headers] : error.response.headers) uri = URI.parse(headers['Location']) Fog::Logger.warning("fog: followed redirect to #{uri.host}, connecting to the matching region will be more performant") - response = Fog::Connection.new("#{uri.scheme}://#{uri.host}:#{uri.port}", false, @connection_options).request(original_params, &block) + response = Fog::XML::Connection.new("#{uri.scheme}://#{uri.host}:#{uri.port}", false, @connection_options).request(original_params, &block) end response diff --git a/lib/fog/aws/sts.rb b/lib/fog/aws/sts.rb index 3cb69bf3d..4a899333e 100644 --- a/lib/fog/aws/sts.rb +++ b/lib/fog/aws/sts.rb @@ -83,7 +83,7 @@ module Fog @persistent = options[:persistent] || false @port = options[:port] || 443 @scheme = options[:scheme] || 'https' - @connection = Fog::Connection.new("#{@scheme}://#{@host}:#{@port}#{@path}", @persistent, @connection_options) + @connection = Fog::XML::Connection.new("#{@scheme}://#{@host}:#{@port}#{@path}", @persistent, @connection_options) end def reload diff --git a/lib/fog/bare_metal_cloud/compute.rb b/lib/fog/bare_metal_cloud/compute.rb index 0fc2f7525..8f12437b9 100644 --- a/lib/fog/bare_metal_cloud/compute.rb +++ b/lib/fog/bare_metal_cloud/compute.rb @@ -58,7 +58,7 @@ module Fog @persistent = options[:persistent] || false @port = options[:port] || 443 @scheme = options[:scheme] || 'https' - @connection = Fog::Connection.new("#{@scheme}://#{@host}:#{@port}", @persistent, @connection_options) + @connection = Fog::XML::Connection.new("#{@scheme}://#{@host}:#{@port}", @persistent, @connection_options) end def reload diff --git a/lib/fog/bluebox/blb.rb b/lib/fog/bluebox/blb.rb index fb7426976..250f63cec 100644 --- a/lib/fog/bluebox/blb.rb +++ b/lib/fog/bluebox/blb.rb @@ -50,7 +50,7 @@ module Fog @persistent = options[:persistent] || false @port = options[:bluebox_port] || 443 @scheme = options[:bluebox_scheme] || 'https' - @connection = Fog::Connection.new("#{@scheme}://#{@host}:#{@port}", @persistent, @connection_options) + @connection = Fog::XML::Connection.new("#{@scheme}://#{@host}:#{@port}", @persistent, @connection_options) end def reload diff --git a/lib/fog/bluebox/compute.rb b/lib/fog/bluebox/compute.rb index e9b2a93f8..335484727 100644 --- a/lib/fog/bluebox/compute.rb +++ b/lib/fog/bluebox/compute.rb @@ -68,7 +68,7 @@ module Fog @persistent = options[:persistent] || false @port = options[:bluebox_port] || 443 @scheme = options[:bluebox_scheme] || 'https' - @connection = Fog::Connection.new("#{@scheme}://#{@host}:#{@port}", @persistent, @connection_options) + @connection = Fog::XML::Connection.new("#{@scheme}://#{@host}:#{@port}", @persistent, @connection_options) end def reload diff --git a/lib/fog/bluebox/dns.rb b/lib/fog/bluebox/dns.rb index 395e1e621..118a83f67 100644 --- a/lib/fog/bluebox/dns.rb +++ b/lib/fog/bluebox/dns.rb @@ -59,7 +59,7 @@ module Fog @persistent = options[:persistent] || false @port = options[:bluebox_port] || 443 @scheme = options[:bluebox_scheme] || 'https' - @connection = Fog::Connection.new("#{@scheme}://#{@host}:#{@port}", @persistent, @connection_options) + @connection = Fog::XML::Connection.new("#{@scheme}://#{@host}:#{@port}", @persistent, @connection_options) end def reload diff --git a/lib/fog/clodo/compute.rb b/lib/fog/clodo/compute.rb index 4ae77abfe..e415502b0 100644 --- a/lib/fog/clodo/compute.rb +++ b/lib/fog/clodo/compute.rb @@ -84,7 +84,7 @@ module Fog @clodo_must_reauthenticate = false authenticate Excon.ssl_verify_peer = false if options[:clodo_servicenet] == true - @connection = Fog::Connection.new("#{@scheme}://#{@host}:#{@port}", options[:persistent]) + @connection = Fog::XML::Connection.new("#{@scheme}://#{@host}:#{@port}", options[:persistent]) end def reload diff --git a/lib/fog/clodo/core.rb b/lib/fog/clodo/core.rb index 27e63463e..099ded5b6 100644 --- a/lib/fog/clodo/core.rb +++ b/lib/fog/clodo/core.rb @@ -13,7 +13,7 @@ module Fog url = clodo_auth_url.match(/^https?:/) ? \ clodo_auth_url : 'https://' + clodo_auth_url uri = URI.parse(url) - connection = Fog::Connection.new(url) + connection = Fog::XML::Connection.new(url) @clodo_api_key = options[:clodo_api_key] @clodo_username = options[:clodo_username] response = connection.request({ diff --git a/lib/fog/cloudsigma/connection.rb b/lib/fog/cloudsigma/connection.rb index ab055955d..c9211d49a 100644 --- a/lib/fog/cloudsigma/connection.rb +++ b/lib/fog/cloudsigma/connection.rb @@ -37,7 +37,7 @@ module Fog @api_version = options[:cloudsigma_api_version] || '2.0' @path_prefix = "#{@api_path_prefix}/#{@api_version}/" - @connection = Fog::Connection.new("#{@scheme}://#{@host}:#{@port}", @persistent, @connection_options) + @connection = Fog::XML::Connection.new("#{@scheme}://#{@host}:#{@port}", @persistent, @connection_options) end def request(params) diff --git a/lib/fog/cloudstack/compute.rb b/lib/fog/cloudstack/compute.rb index ddbf57627..23054a8da 100644 --- a/lib/fog/cloudstack/compute.rb +++ b/lib/fog/cloudstack/compute.rb @@ -149,7 +149,7 @@ module Fog @path = options[:cloudstack_path] || '/client/api' @port = options[:cloudstack_port] || 443 @scheme = options[:cloudstack_scheme] || 'https' - @connection = Fog::Connection.new("#{@scheme}://#{@host}:#{@port}#{@path}", options[:cloudstack_persistent], {:ssl_verify_peer => false}) + @connection = Fog::XML::Connection.new("#{@scheme}://#{@host}:#{@port}#{@path}", options[:cloudstack_persistent], {:ssl_verify_peer => false}) end def reload diff --git a/lib/fog/core/deprecated/connection.rb b/lib/fog/core/deprecated/connection.rb index a9f9069a4..00246e2a8 100644 --- a/lib/fog/core/deprecated/connection.rb +++ b/lib/fog/core/deprecated/connection.rb @@ -15,9 +15,9 @@ module Fog class Connection < Fog::XML::Connection def request(params, &block) if params.key?(:parser) - Fog::Logger.deprecation("Fog::Connection is deprecated use Fog::XML::Connection instead [light_black](#{caller.first})[/]") + Fog::Logger.deprecation("Fog::XML::Connection is deprecated use Fog::XML::Connection instead [light_black](#{caller.first})[/]") else - Fog::Logger.deprecation("Fog::Connection is deprecated use Fog::Core::Connection instead [light_black](#{caller.first})[/]") + Fog::Logger.deprecation("Fog::XML::Connection is deprecated use Fog::Core::Connection instead [light_black](#{caller.first})[/]") end super(params) end diff --git a/lib/fog/digitalocean/compute.rb b/lib/fog/digitalocean/compute.rb index feea465ff..a74ee69bf 100644 --- a/lib/fog/digitalocean/compute.rb +++ b/lib/fog/digitalocean/compute.rb @@ -77,7 +77,7 @@ module Fog @digitalocean_client_id = options[:digitalocean_client_id] @digitalocean_api_url = options[:digitalocean_api_url] || \ "https://api.digitalocean.com" - @connection = Fog::Connection.new(@digitalocean_api_url) + @connection = Fog::XML::Connection.new(@digitalocean_api_url) end def reload diff --git a/lib/fog/dnsimple/dns.rb b/lib/fog/dnsimple/dns.rb index 420c162da..a20cc8fff 100644 --- a/lib/fog/dnsimple/dns.rb +++ b/lib/fog/dnsimple/dns.rb @@ -70,7 +70,7 @@ module Fog @persistent = options[:persistent] || false @port = options[:port] || 443 @scheme = options[:scheme] || 'https' - @connection = Fog::Connection.new("#{@scheme}://#{@host}:#{@port}", @persistent, @connection_options) + @connection = Fog::XML::Connection.new("#{@scheme}://#{@host}:#{@port}", @persistent, @connection_options) end def reload diff --git a/lib/fog/dnsmadeeasy/dns.rb b/lib/fog/dnsmadeeasy/dns.rb index 1c3d229d3..9c5dc8c78 100644 --- a/lib/fog/dnsmadeeasy/dns.rb +++ b/lib/fog/dnsmadeeasy/dns.rb @@ -87,7 +87,7 @@ module Fog @persistent = options.fetch(:persistent, true) @port = options[:port] || 80 #443 Not yet @scheme = options[:scheme] || 'http' #'https Not yet - @connection = Fog::Connection.new("#{@scheme}://#{@host}:#{@port}", @persistent, @connection_options) + @connection = Fog::XML::Connection.new("#{@scheme}://#{@host}:#{@port}", @persistent, @connection_options) end def reload diff --git a/lib/fog/dreamhost/dns.rb b/lib/fog/dreamhost/dns.rb index e6c456fbb..3f6e5ec38 100644 --- a/lib/fog/dreamhost/dns.rb +++ b/lib/fog/dreamhost/dns.rb @@ -57,7 +57,7 @@ module Fog @persistent = options[:persistent] || false @port = options[:port] || 443 @scheme = options[:scheme] || 'https' - @connection = Fog::Connection.new("#{@scheme}://#{@host}:#{@port}", @persistent) + @connection = Fog::XML::Connection.new("#{@scheme}://#{@host}:#{@port}", @persistent) end def reload diff --git a/lib/fog/dynect/dns.rb b/lib/fog/dynect/dns.rb index 189d754c2..9772c1ed3 100644 --- a/lib/fog/dynect/dns.rb +++ b/lib/fog/dynect/dns.rb @@ -72,7 +72,7 @@ module Fog @persistent = options[:persistent] || false @scheme = options[:scheme] || 'https' @version = options[:version] || '3.5.2' - @connection = Fog::Connection.new("#{@scheme}://#{@host}:#{@port}", @persistent, @connection_options) + @connection = Fog::XML::Connection.new("#{@scheme}://#{@host}:#{@port}", @persistent, @connection_options) end def auth_token diff --git a/lib/fog/ecloud/compute.rb b/lib/fog/ecloud/compute.rb index 57deb15e1..9bd7aa08b 100644 --- a/lib/fog/ecloud/compute.rb +++ b/lib/fog/ecloud/compute.rb @@ -317,7 +317,7 @@ module Fog # Hash connections on the host_url ... There's nothing to say we won't get URI's that go to # different hosts. - @connections[host_url] ||= Fog::Connection.new(host_url, @persistent, @connection_options) + @connections[host_url] ||= Fog::XML::Connection.new(host_url, @persistent, @connection_options) # Set headers to an empty hash if none are set. headers = set_extra_headers_for(params) || set_extra_headers_for({}) diff --git a/lib/fog/glesys/compute.rb b/lib/fog/glesys/compute.rb index bbdaa4cf4..7d801842d 100644 --- a/lib/fog/glesys/compute.rb +++ b/lib/fog/glesys/compute.rb @@ -79,7 +79,7 @@ module Fog @glesys_api_key = options[:glesys_api_key] || Fog.credentials[:glesys_api_key] @connection_options = options[:connection_options] || {} @persistent = options[:persistent] || false - @connection = Fog::Connection.new(@api_url, @persistent, @connection_options) + @connection = Fog::XML::Connection.new(@api_url, @persistent, @connection_options) end def request(method_name, options = {}) diff --git a/lib/fog/go_grid/compute.rb b/lib/fog/go_grid/compute.rb index aedfdc877..01fbbbe0e 100644 --- a/lib/fog/go_grid/compute.rb +++ b/lib/fog/go_grid/compute.rb @@ -68,7 +68,7 @@ module Fog @persistent = options[:persistent] || false @port = options[:port] || 443 @scheme = options[:scheme] || 'https' - @connection = Fog::Connection.new("#{@scheme}://#{@host}:#{@port}", @persistent, @connection_options) + @connection = Fog::XML::Connection.new("#{@scheme}://#{@host}:#{@port}", @persistent, @connection_options) end def reload diff --git a/lib/fog/google/storage.rb b/lib/fog/google/storage.rb index 8be329de4..3b330fdb3 100644 --- a/lib/fog/google/storage.rb +++ b/lib/fog/google/storage.rb @@ -283,7 +283,7 @@ DATA else @connection = nil end - @connection ||= Fog::Connection.new(uri, @persistent, @connection_options) + @connection ||= Fog::XML::Connection.new(uri, @persistent, @connection_options) end private diff --git a/lib/fog/hp/block_storage.rb b/lib/fog/hp/block_storage.rb index 5042fec33..9789066be 100644 --- a/lib/fog/hp/block_storage.rb +++ b/lib/fog/hp/block_storage.rb @@ -138,7 +138,7 @@ module Fog @port = uri.port @scheme = uri.scheme - @connection = Fog::Connection.new("#{@scheme}://#{@host}:#{@port}", @persistent, @connection_options) + @connection = Fog::XML::Connection.new("#{@scheme}://#{@host}:#{@port}", @persistent, @connection_options) end def reload diff --git a/lib/fog/hp/block_storage_v2.rb b/lib/fog/hp/block_storage_v2.rb index 6a6aea6a1..904be49da 100644 --- a/lib/fog/hp/block_storage_v2.rb +++ b/lib/fog/hp/block_storage_v2.rb @@ -127,7 +127,7 @@ module Fog @port = uri.port @scheme = uri.scheme - @connection = Fog::Connection.new("#{@scheme}://#{@host}:#{@port}", @persistent, @connection_options) + @connection = Fog::XML::Connection.new("#{@scheme}://#{@host}:#{@port}", @persistent, @connection_options) end def reload diff --git a/lib/fog/hp/cdn.rb b/lib/fog/hp/cdn.rb index 64c24f035..1f8da9b05 100644 --- a/lib/fog/hp/cdn.rb +++ b/lib/fog/hp/cdn.rb @@ -115,7 +115,7 @@ module Fog @path = uri.path.chomp("/") @port = uri.port @scheme = uri.scheme - @connection = Fog::Connection.new("#{@scheme}://#{@host}:#{@port}", @persistent, @connection_options) + @connection = Fog::XML::Connection.new("#{@scheme}://#{@host}:#{@port}", @persistent, @connection_options) @enabled = true end end diff --git a/lib/fog/hp/compute.rb b/lib/fog/hp/compute.rb index 9249668ee..50286bc3f 100644 --- a/lib/fog/hp/compute.rb +++ b/lib/fog/hp/compute.rb @@ -220,7 +220,7 @@ module Fog @port = uri.port @scheme = uri.scheme - @connection = Fog::Connection.new("#{@scheme}://#{@host}:#{@port}", @persistent, @connection_options) + @connection = Fog::XML::Connection.new("#{@scheme}://#{@host}:#{@port}", @persistent, @connection_options) end def reload diff --git a/lib/fog/hp/compute_v2.rb b/lib/fog/hp/compute_v2.rb index e6e8974e4..a7abc7f54 100644 --- a/lib/fog/hp/compute_v2.rb +++ b/lib/fog/hp/compute_v2.rb @@ -274,7 +274,7 @@ module Fog @port = uri.port @scheme = uri.scheme - @connection = Fog::Connection.new("#{@scheme}://#{@host}:#{@port}", @persistent, @connection_options) + @connection = Fog::XML::Connection.new("#{@scheme}://#{@host}:#{@port}", @persistent, @connection_options) end def reload diff --git a/lib/fog/hp/core.rb b/lib/fog/hp/core.rb index 38a384dc9..497165632 100644 --- a/lib/fog/hp/core.rb +++ b/lib/fog/hp/core.rb @@ -82,7 +82,7 @@ module Fog # Set the User-Agent @user_agent = options[:user_agent] set_user_agent_header(connection_options, "fog/#{Fog::VERSION}", @user_agent) - connection = Fog::Connection.new(service_url, false, connection_options) + connection = Fog::XML::Connection.new(service_url, false, connection_options) @hp_access_key = options[:hp_access_key] @hp_secret_key = options[:hp_secret_key] response = connection.request({ @@ -158,7 +158,7 @@ module Fog # Set the User-Agent. If the caller sets a user_agent, use it. @user_agent = options[:user_agent] set_user_agent_header(connection_options, "fog/#{Fog::VERSION}", @user_agent) - connection = Fog::Connection.new(service_url, false, connection_options) + connection = Fog::XML::Connection.new(service_url, false, connection_options) ### Implement HP Control Services Authentication services ### # Get the style of auth credentials passed, defaults to access/secret key style diff --git a/lib/fog/hp/dns.rb b/lib/fog/hp/dns.rb index 640536bfb..639771170 100644 --- a/lib/fog/hp/dns.rb +++ b/lib/fog/hp/dns.rb @@ -97,7 +97,7 @@ module Fog @port = uri.port @scheme = uri.scheme - @connection = Fog::Connection.new("#{@scheme}://#{@host}:#{@port}", @persistent, @connection_options) + @connection = Fog::XML::Connection.new("#{@scheme}://#{@host}:#{@port}", @persistent, @connection_options) end def reload diff --git a/lib/fog/hp/lb.rb b/lib/fog/hp/lb.rb index a94215c6c..e066d208a 100644 --- a/lib/fog/hp/lb.rb +++ b/lib/fog/hp/lb.rb @@ -132,7 +132,7 @@ module Fog @port = uri.port @scheme = uri.scheme - @connection = Fog::Connection.new("#{@scheme}://#{@host}:#{@port}", @persistent, @connection_options) + @connection = Fog::XML::Connection.new("#{@scheme}://#{@host}:#{@port}", @persistent, @connection_options) end def reload diff --git a/lib/fog/hp/network.rb b/lib/fog/hp/network.rb index fd7390f7d..994e23322 100644 --- a/lib/fog/hp/network.rb +++ b/lib/fog/hp/network.rb @@ -155,7 +155,7 @@ module Fog @port = uri.port @scheme = uri.scheme - @connection = Fog::Connection.new("#{@scheme}://#{@host}:#{@port}", @persistent, @connection_options) + @connection = Fog::XML::Connection.new("#{@scheme}://#{@host}:#{@port}", @persistent, @connection_options) end def reload diff --git a/lib/fog/hp/storage.rb b/lib/fog/hp/storage.rb index bcc0d94df..24784b3d7 100644 --- a/lib/fog/hp/storage.rb +++ b/lib/fog/hp/storage.rb @@ -351,7 +351,7 @@ module Fog @port = uri.port @scheme = uri.scheme - @connection = Fog::Connection.new("#{@scheme}://#{@host}:#{@port}", @persistent, @connection_options) + @connection = Fog::XML::Connection.new("#{@scheme}://#{@host}:#{@port}", @persistent, @connection_options) end def reload diff --git a/lib/fog/ibm/core.rb b/lib/fog/ibm/core.rb index 5f982e5ec..7f2b14d78 100644 --- a/lib/fog/ibm/core.rb +++ b/lib/fog/ibm/core.rb @@ -16,7 +16,7 @@ module Fog 1800 end - class Connection < Fog::Connection + class Connection < Fog::XML::Connection def initialize(user, password) @user = user diff --git a/lib/fog/internet_archive/storage.rb b/lib/fog/internet_archive/storage.rb index 9b1480233..f0b8ffa78 100644 --- a/lib/fog/internet_archive/storage.rb +++ b/lib/fog/internet_archive/storage.rb @@ -269,7 +269,7 @@ module Fog @port = options[:port] || 80 @scheme = options[:scheme] || 'http' end - @connection = Fog::Connection.new("#{@scheme}://#{@host}:#{@port}#{@path}", @persistent, @connection_options) + @connection = Fog::XML::Connection.new("#{@scheme}://#{@host}:#{@port}#{@path}", @persistent, @connection_options) end def reload @@ -376,7 +376,7 @@ DATA rescue Excon::Errors::TemporaryRedirect => error uri = URI.parse(error.response.headers['location']) Fog::Logger.warning("fog: followed redirect to #{uri.host}, connecting to the matching region will be more performant") - response = Fog::Connection.new("#{@scheme}://#{uri.host}:#{@port}", false, @connection_options).request(original_params, &block) + response = Fog::XML::Connection.new("#{@scheme}://#{uri.host}:#{@port}", false, @connection_options).request(original_params, &block) end response diff --git a/lib/fog/joyent/analytics.rb b/lib/fog/joyent/analytics.rb index fbd52f9ea..be90501e5 100644 --- a/lib/fog/joyent/analytics.rb +++ b/lib/fog/joyent/analytics.rb @@ -188,7 +188,7 @@ module Fog raise ArgumentError, "Must provide either a joyent_password or joyent_keyname and joyent_keyfile pair" end - @connection = Fog::Connection.new( + @connection = Fog::XML::Connection.new( @joyent_url, @persistent, @connection_options diff --git a/lib/fog/joyent/compute.rb b/lib/fog/joyent/compute.rb index c57a344a0..352001bfb 100644 --- a/lib/fog/joyent/compute.rb +++ b/lib/fog/joyent/compute.rb @@ -158,7 +158,7 @@ module Fog raise ArgumentError, "Must provide either a joyent_password or joyent_keyname and joyent_keyfile pair" end - @connection = Fog::Connection.new( + @connection = Fog::XML::Connection.new( @joyent_url, @persistent, @connection_options diff --git a/lib/fog/linode/compute.rb b/lib/fog/linode/compute.rb index eda77b8f0..5b823acd2 100644 --- a/lib/fog/linode/compute.rb +++ b/lib/fog/linode/compute.rb @@ -83,7 +83,7 @@ module Fog @host = options[:host] || "api.linode.com" @port = options[:port] || 443 @scheme = options[:scheme] || 'https' - @connection = Fog::Connection.new("#{@scheme}://#{@host}:#{@port}", options[:persistent]) + @connection = Fog::XML::Connection.new("#{@scheme}://#{@host}:#{@port}", options[:persistent]) end def reload diff --git a/lib/fog/linode/dns.rb b/lib/fog/linode/dns.rb index 341df8b2a..144ec7fc2 100644 --- a/lib/fog/linode/dns.rb +++ b/lib/fog/linode/dns.rb @@ -58,7 +58,7 @@ module Fog @persistent = options[:persistent] || false @port = options[:port] || 443 @scheme = options[:scheme] || 'https' - @connection = Fog::Connection.new("#{@scheme}://#{@host}:#{@port}", @persistent, @connection_options) + @connection = Fog::XML::Connection.new("#{@scheme}://#{@host}:#{@port}", @persistent, @connection_options) end def reload diff --git a/lib/fog/ninefold/compute.rb b/lib/fog/ninefold/compute.rb index 501c043f7..363914e80 100644 --- a/lib/fog/ninefold/compute.rb +++ b/lib/fog/ninefold/compute.rb @@ -89,7 +89,7 @@ module Fog @ninefold_compute_secret = options[:ninefold_compute_secret] || Fog.credentials[:ninefold_compute_secret] @connection_options = options[:connection_options] || {} @persistent = options[:persistent] || false - @connection = Fog::Connection.new(@api_url, @persistent, @connection_options) + @connection = Fog::XML::Connection.new(@api_url, @persistent, @connection_options) end def request(command, params, options) diff --git a/lib/fog/openstack/compute.rb b/lib/fog/openstack/compute.rb index 270db0eb8..2bc0c0261 100644 --- a/lib/fog/openstack/compute.rb +++ b/lib/fog/openstack/compute.rb @@ -320,7 +320,7 @@ module Fog authenticate @persistent = options[:persistent] || false - @connection = Fog::Connection.new("#{@scheme}://#{@host}:#{@port}", @persistent, @connection_options) + @connection = Fog::XML::Connection.new("#{@scheme}://#{@host}:#{@port}", @persistent, @connection_options) end def credentials @@ -422,7 +422,7 @@ module Fog # Not all implementations have identity service in the catalog if @openstack_identity_public_endpoint || @openstack_management_url - @identity_connection = Fog::Connection.new( + @identity_connection = Fog::XML::Connection.new( @openstack_identity_public_endpoint || @openstack_management_url, false, @connection_options) end diff --git a/lib/fog/openstack/core.rb b/lib/fog/openstack/core.rb index 5d708a41a..8a55affa3 100644 --- a/lib/fog/openstack/core.rb +++ b/lib/fog/openstack/core.rb @@ -63,7 +63,7 @@ module Fog # legacy v1.0 style auth def self.authenticate_v1(options, connection_options = {}) uri = options[:openstack_auth_uri] - connection = Fog::Connection.new(uri.to_s, false, connection_options) + connection = Fog::XML::Connection.new(uri.to_s, false, connection_options) @openstack_api_key = options[:openstack_api_key] @openstack_username = options[:openstack_username] @@ -102,7 +102,7 @@ module Fog unless service unless tenant_name - response = Fog::Connection.new( + response = Fog::XML::Connection.new( "#{uri.scheme}://#{uri.host}:#{uri.port}/v2.0/tenants", false, connection_options).request({ :expects => [200, 204], :headers => {'Content-Type' => 'application/json', @@ -186,7 +186,7 @@ module Fog auth_token = options[:openstack_auth_token] || options[:unscoped_token] uri = options[:openstack_auth_uri] - connection = Fog::Connection.new(uri.to_s, false, connection_options) + connection = Fog::XML::Connection.new(uri.to_s, false, connection_options) request_body = {:auth => Hash.new} if auth_token @@ -213,7 +213,7 @@ module Fog end def self.get_supported_version(supported_versions, uri, auth_token, connection_options = {}) - connection = Fog::Connection.new("#{uri.scheme}://#{uri.host}:#{uri.port}", false, connection_options) + connection = Fog::XML::Connection.new("#{uri.scheme}://#{uri.host}:#{uri.port}", false, connection_options) response = connection.request({ :expects => [200, 204, 300], :headers => {'Content-Type' => 'application/json', diff --git a/lib/fog/openstack/identity.rb b/lib/fog/openstack/identity.rb index 9dc024930..1b340695e 100644 --- a/lib/fog/openstack/identity.rb +++ b/lib/fog/openstack/identity.rb @@ -200,7 +200,7 @@ module Fog authenticate @persistent = options[:persistent] || false - @connection = Fog::Connection.new("#{@scheme}://#{@host}:#{@port}", @persistent, @connection_options) + @connection = Fog::XML::Connection.new("#{@scheme}://#{@host}:#{@port}", @persistent, @connection_options) end def credentials diff --git a/lib/fog/openstack/image.rb b/lib/fog/openstack/image.rb index 1712ec592..c342d416e 100644 --- a/lib/fog/openstack/image.rb +++ b/lib/fog/openstack/image.rb @@ -122,7 +122,7 @@ module Fog authenticate @persistent = options[:persistent] || false - @connection = Fog::Connection.new("#{@scheme}://#{@host}:#{@port}", @persistent, @connection_options) + @connection = Fog::XML::Connection.new("#{@scheme}://#{@host}:#{@port}", @persistent, @connection_options) end def credentials diff --git a/lib/fog/openstack/metering.rb b/lib/fog/openstack/metering.rb index 72f0f86b3..38c0a3706 100644 --- a/lib/fog/openstack/metering.rb +++ b/lib/fog/openstack/metering.rb @@ -116,7 +116,7 @@ module Fog authenticate @persistent = options[:persistent] || false - @connection = Fog::Connection.new("#{@scheme}://#{@host}:#{@port}", @persistent, @connection_options) + @connection = Fog::XML::Connection.new("#{@scheme}://#{@host}:#{@port}", @persistent, @connection_options) end def credentials diff --git a/lib/fog/openstack/network.rb b/lib/fog/openstack/network.rb index 3b992fad2..ee715e2a0 100644 --- a/lib/fog/openstack/network.rb +++ b/lib/fog/openstack/network.rb @@ -256,7 +256,7 @@ module Fog authenticate @persistent = options[:persistent] || false - @connection = Fog::Connection.new("#{@scheme}://#{@host}:#{@port}", @persistent, @connection_options) + @connection = Fog::XML::Connection.new("#{@scheme}://#{@host}:#{@port}", @persistent, @connection_options) end def credentials diff --git a/lib/fog/openstack/orchestration.rb b/lib/fog/openstack/orchestration.rb index ca2682533..ef9e2272c 100644 --- a/lib/fog/openstack/orchestration.rb +++ b/lib/fog/openstack/orchestration.rb @@ -114,7 +114,7 @@ module Fog authenticate @persistent = options[:persistent] || false - @connection = Fog::Connection.new("#{@scheme}://#{@host}:#{@port}", @persistent, @connection_options) + @connection = Fog::XML::Connection.new("#{@scheme}://#{@host}:#{@port}", @persistent, @connection_options) end def credentials @@ -214,7 +214,7 @@ module Fog # Not all implementations have identity service in the catalog if @openstack_identity_public_endpoint || @openstack_management_url - @identity_connection = Fog::Connection.new( + @identity_connection = Fog::XML::Connection.new( @openstack_identity_public_endpoint || @openstack_management_url, false, @connection_options) end diff --git a/lib/fog/openstack/storage.rb b/lib/fog/openstack/storage.rb index 542fd5a82..238f6e62c 100644 --- a/lib/fog/openstack/storage.rb +++ b/lib/fog/openstack/storage.rb @@ -92,7 +92,7 @@ module Fog @openstack_temp_url_key = options[:openstack_temp_url_key] authenticate @persistent = options[:persistent] || false - @connection = Fog::Connection.new("#{@scheme}://#{@host}:#{@port}", @persistent, @connection_options) + @connection = Fog::XML::Connection.new("#{@scheme}://#{@host}:#{@port}", @persistent, @connection_options) end def reload diff --git a/lib/fog/openstack/volume.rb b/lib/fog/openstack/volume.rb index 87f6c410f..531b84dd6 100644 --- a/lib/fog/openstack/volume.rb +++ b/lib/fog/openstack/volume.rb @@ -136,7 +136,7 @@ module Fog authenticate @persistent = options[:persistent] || false - @connection = Fog::Connection.new("#{@scheme}://#{@host}:#{@port}", @persistent, @connection_options) + @connection = Fog::XML::Connection.new("#{@scheme}://#{@host}:#{@port}", @persistent, @connection_options) end def credentials diff --git a/lib/fog/rackspace/auto_scale.rb b/lib/fog/rackspace/auto_scale.rb index e630c20e7..dea4d82ad 100644 --- a/lib/fog/rackspace/auto_scale.rb +++ b/lib/fog/rackspace/auto_scale.rb @@ -96,7 +96,7 @@ module Fog authenticate - @connection = Fog::Connection.new(endpoint_uri.to_s, @options[:persistent], @options[:connection_options]) + @connection = Fog::XML::Connection.new(endpoint_uri.to_s, @options[:persistent], @options[:connection_options]) end def request(params, parse_json = true, &block) diff --git a/lib/fog/rackspace/block_storage.rb b/lib/fog/rackspace/block_storage.rb index b241c0d66..e1c881fa1 100644 --- a/lib/fog/rackspace/block_storage.rb +++ b/lib/fog/rackspace/block_storage.rb @@ -82,7 +82,7 @@ module Fog deprecation_warnings(options) @persistent = options[:persistent] || false - @connection = Fog::Connection.new(endpoint_uri.to_s, @persistent, @connection_options) + @connection = Fog::XML::Connection.new(endpoint_uri.to_s, @persistent, @connection_options) end def request(params, parse_json = true) diff --git a/lib/fog/rackspace/cdn.rb b/lib/fog/rackspace/cdn.rb index 9a445ff2f..57db9bcab 100644 --- a/lib/fog/rackspace/cdn.rb +++ b/lib/fog/rackspace/cdn.rb @@ -143,7 +143,7 @@ module Fog @persistent = options[:persistent] || false if endpoint_uri - @connection = Fog::Connection.new(endpoint_uri.to_s, @persistent, @connection_options) + @connection = Fog::XML::Connection.new(endpoint_uri.to_s, @persistent, @connection_options) @enabled = true end end diff --git a/lib/fog/rackspace/compute.rb b/lib/fog/rackspace/compute.rb index 1752a9942..30541f33a 100644 --- a/lib/fog/rackspace/compute.rb +++ b/lib/fog/rackspace/compute.rb @@ -197,7 +197,7 @@ module Fog authenticate Excon.defaults[:ssl_verify_peer] = false if service_net? @persistent = options[:persistent] || false - @connection = Fog::Connection.new(endpoint_uri.to_s, @persistent, @connection_options) + @connection = Fog::XML::Connection.new(endpoint_uri.to_s, @persistent, @connection_options) end def reload diff --git a/lib/fog/rackspace/compute_v2.rb b/lib/fog/rackspace/compute_v2.rb index 55a9757a1..a005a2274 100644 --- a/lib/fog/rackspace/compute_v2.rb +++ b/lib/fog/rackspace/compute_v2.rb @@ -145,7 +145,7 @@ module Fog deprecation_warnings(options) @persistent = options[:persistent] || false - @connection = Fog::Connection.new(endpoint_uri.to_s, @persistent, @connection_options) + @connection = Fog::XML::Connection.new(endpoint_uri.to_s, @persistent, @connection_options) end def request(params, parse_json = true) diff --git a/lib/fog/rackspace/core.rb b/lib/fog/rackspace/core.rb index 86b00a3a5..0f6ed950d 100644 --- a/lib/fog/rackspace/core.rb +++ b/lib/fog/rackspace/core.rb @@ -104,7 +104,7 @@ module Fog url = rackspace_auth_url.match(/^https?:/) ? \ rackspace_auth_url : 'https://' + rackspace_auth_url uri = URI.parse(url) - connection = Fog::Connection.new(url, false, connection_options) + connection = Fog::XML::Connection.new(url, false, connection_options) @rackspace_api_key = options[:rackspace_api_key] @rackspace_username = options[:rackspace_username] response = connection.request({ diff --git a/lib/fog/rackspace/databases.rb b/lib/fog/rackspace/databases.rb index c69e78ac0..b0f4f9fa0 100644 --- a/lib/fog/rackspace/databases.rb +++ b/lib/fog/rackspace/databases.rb @@ -82,7 +82,7 @@ module Fog deprecation_warnings(options) @persistent = options[:persistent] || false - @connection = Fog::Connection.new(endpoint_uri.to_s, @persistent, @connection_options) + @connection = Fog::XML::Connection.new(endpoint_uri.to_s, @persistent, @connection_options) end def request(params, parse_json = true) diff --git a/lib/fog/rackspace/dns.rb b/lib/fog/rackspace/dns.rb index 09eed1b14..79ed6eb29 100644 --- a/lib/fog/rackspace/dns.rb +++ b/lib/fog/rackspace/dns.rb @@ -101,7 +101,7 @@ module Fog deprecation_warnings(options) @persistent = options[:persistent] || false - @connection = Fog::Connection.new(endpoint_uri.to_s, @persistent, @connection_options) + @connection = Fog::XML::Connection.new(endpoint_uri.to_s, @persistent, @connection_options) end def endpoint_uri(service_endpoint_url=nil) diff --git a/lib/fog/rackspace/identity.rb b/lib/fog/rackspace/identity.rb index 798d18ff6..6fa478048 100644 --- a/lib/fog/rackspace/identity.rb +++ b/lib/fog/rackspace/identity.rb @@ -74,7 +74,7 @@ module Fog def initialize(options={}) apply_options(options) - @connection = Fog::Connection.new(@uri.to_s, @persistent, @connection_options) + @connection = Fog::XML::Connection.new(@uri.to_s, @persistent, @connection_options) authenticate end diff --git a/lib/fog/rackspace/load_balancers.rb b/lib/fog/rackspace/load_balancers.rb index 16090dfbf..6294f82ce 100644 --- a/lib/fog/rackspace/load_balancers.rb +++ b/lib/fog/rackspace/load_balancers.rb @@ -119,7 +119,7 @@ module Fog deprecation_warnings(options) @persistent = options[:persistent] || false - @connection = Fog::Connection.new(endpoint_uri.to_s, @persistent, @connection_options) + @connection = Fog::XML::Connection.new(endpoint_uri.to_s, @persistent, @connection_options) end def request(params, parse_json = true) diff --git a/lib/fog/rackspace/monitoring.rb b/lib/fog/rackspace/monitoring.rb index 3cce61fd7..508c37021 100644 --- a/lib/fog/rackspace/monitoring.rb +++ b/lib/fog/rackspace/monitoring.rb @@ -140,7 +140,7 @@ module Fog authenticate @persistent = options[:persistent] || false - @connection = Fog::Connection.new(endpoint_uri.to_s, @persistent, @connection_options) + @connection = Fog::XML::Connection.new(endpoint_uri.to_s, @persistent, @connection_options) end def reload diff --git a/lib/fog/rackspace/queues.rb b/lib/fog/rackspace/queues.rb index 64f6a750e..cb8272608 100644 --- a/lib/fog/rackspace/queues.rb +++ b/lib/fog/rackspace/queues.rb @@ -378,7 +378,7 @@ module Fog authenticate @persistent = options[:persistent] || false - @connection = Fog::Connection.new(endpoint_uri.to_s, @persistent, @connection_options) + @connection = Fog::XML::Connection.new(endpoint_uri.to_s, @persistent, @connection_options) end def request(params, parse_json = true, &block) diff --git a/lib/fog/rackspace/storage.rb b/lib/fog/rackspace/storage.rb index d1693e13e..8b5855339 100644 --- a/lib/fog/rackspace/storage.rb +++ b/lib/fog/rackspace/storage.rb @@ -419,7 +419,7 @@ module Fog authenticate @persistent = options[:persistent] || false Excon.defaults[:ssl_verify_peer] = false if service_net? - @connection = Fog::Connection.new(endpoint_uri.to_s, @persistent, @connection_options) + @connection = Fog::XML::Connection.new(endpoint_uri.to_s, @persistent, @connection_options) end # Using SSL? diff --git a/lib/fog/rage4/dns.rb b/lib/fog/rage4/dns.rb index c673adafd..7f0e8fcff 100644 --- a/lib/fog/rage4/dns.rb +++ b/lib/fog/rage4/dns.rb @@ -48,7 +48,7 @@ module Fog @persistent = options[:persistent] || false @port = options[:port] || 443 @scheme = options[:scheme] || 'https' - @connection = Fog::Connection.new("#{@scheme}://#{@host}:#{@port}", @persistent, @connection_options) + @connection = Fog::XML::Connection.new("#{@scheme}://#{@host}:#{@port}", @persistent, @connection_options) end def reload diff --git a/lib/fog/riakcs/provisioning.rb b/lib/fog/riakcs/provisioning.rb index ae767037f..064a95151 100644 --- a/lib/fog/riakcs/provisioning.rb +++ b/lib/fog/riakcs/provisioning.rb @@ -53,7 +53,7 @@ module Fog @connection_options = options[:connection_options] || {} @persistent = options[:persistent] || false - @raw_connection = Fog::Connection.new(riakcs_uri, @persistent, @connection_options) + @raw_connection = Fog::XML::Connection.new(riakcs_uri, @persistent, @connection_options) @s3_connection = Fog::Storage.new( :provider => 'AWS', diff --git a/lib/fog/serverlove/compute.rb b/lib/fog/serverlove/compute.rb index ccd0394cb..48bf99a04 100644 --- a/lib/fog/serverlove/compute.rb +++ b/lib/fog/serverlove/compute.rb @@ -59,7 +59,7 @@ module Fog @api_key = options[:serverlove_api_key] || Fog.credentials[:serverlove_api_key] @api_host = options[:serverlove_api_url] || Fog.credentials[:serverlove_api_url] || API_HOST - @connection = Fog::Connection.new("https://#{@api_uuid}:#{@api_key}@#{@api_host}") + @connection = Fog::XML::Connection.new("https://#{@api_uuid}:#{@api_key}@#{@api_host}") end def request(params) diff --git a/lib/fog/storm_on_demand/shared.rb b/lib/fog/storm_on_demand/shared.rb index 64df77265..c7ce0c8cc 100644 --- a/lib/fog/storm_on_demand/shared.rb +++ b/lib/fog/storm_on_demand/shared.rb @@ -15,7 +15,7 @@ module Fog @scheme = uri.scheme @storm_on_demand_username = options[:storm_on_demand_username] @storm_on_demand_password = options[:storm_on_demand_password] - @connection = Fog::Connection.new("#{@scheme}://#{@host}:#{@port}", @persistent, @connection_options) + @connection = Fog::XML::Connection.new("#{@scheme}://#{@host}:#{@port}", @persistent, @connection_options) end def reload diff --git a/lib/fog/terremark/vcloud.rb b/lib/fog/terremark/vcloud.rb index 3aa136769..24863673f 100644 --- a/lib/fog/terremark/vcloud.rb +++ b/lib/fog/terremark/vcloud.rb @@ -46,7 +46,7 @@ module Fog @persistent = options[:persistent] || false @port = options[:port] || Fog::Terremark::Vcloud::Defaults::PORT @scheme = options[:scheme] || Fog::Terremark::Vcloud::Defaults::SCHEME - @connection = Fog::Connection.new("#{@scheme}://#{@host}:#{@port}", @persistent, @connection_options) + @connection = Fog::XML::Connection.new("#{@scheme}://#{@host}:#{@port}", @persistent, @connection_options) end def default_vdc_id diff --git a/lib/fog/vcloud/compute.rb b/lib/fog/vcloud/compute.rb index 09a6c8e3e..1ce57af88 100644 --- a/lib/fog/vcloud/compute.rb +++ b/lib/fog/vcloud/compute.rb @@ -319,7 +319,7 @@ module Fog # Hash connections on the host_url ... There's nothing to say we won't get URI's that go to # different hosts. - @connections[host_url] ||= Fog::Connection.new(host_url, @persistent, @connection_options) + @connections[host_url] ||= Fog::XML::Connection.new(host_url, @persistent, @connection_options) # Set headers to an empty hash if none are set. headers = params[:headers] || {} diff --git a/lib/fog/vcloud_director/compute.rb b/lib/fog/vcloud_director/compute.rb index 23f2c4d69..627910299 100644 --- a/lib/fog/vcloud_director/compute.rb +++ b/lib/fog/vcloud_director/compute.rb @@ -335,7 +335,7 @@ module Fog @persistent = options[:persistent] || false @port = options[:port] || Fog::Compute::VcloudDirector::Defaults::PORT @scheme = options[:scheme] || Fog::Compute::VcloudDirector::Defaults::SCHEME - @connection = Fog::Connection.new("#{@scheme}://#{@host}:#{@port}", @persistent, @connection_options) + @connection = Fog::XML::Connection.new("#{@scheme}://#{@host}:#{@port}", @persistent, @connection_options) @end_point = "#{@scheme}://#{@host}#{@path}/" @api_version = options[:vcloud_director_api_version] || Fog::Compute::VcloudDirector::Defaults::API_VERSION @show_progress = options[:vcloud_director_show_progress] @@ -670,7 +670,7 @@ module Fog @persistent = options[:persistent] || false @port = options[:port] || Fog::Compute::VcloudDirector::Defaults::PORT @scheme = options[:scheme] || Fog::Compute::VcloudDirector::Defaults::SCHEME - #@connection = Fog::Connection.new("#{@scheme}://#{@host}:#{@port}", @persistent, @connection_options) + #@connection = Fog::XML::Connection.new("#{@scheme}://#{@host}:#{@port}", @persistent, @connection_options) @end_point = "#{@scheme}://#{@host}#{@path}/" @api_version = options[:vcloud_director_api_version] || Fog::Compute::VcloudDirector::Defaults::API_VERSION end diff --git a/lib/fog/voxel/compute.rb b/lib/fog/voxel/compute.rb index 4d522cc0a..d68f959f3 100644 --- a/lib/fog/voxel/compute.rb +++ b/lib/fog/voxel/compute.rb @@ -86,7 +86,7 @@ module Fog @connection_options[:ssl_verify_peer] = false - @connection = Fog::Connection.new("#{@scheme}://#{@host}:#{@port}", @persistent, @connection_options) + @connection = Fog::XML::Connection.new("#{@scheme}://#{@host}:#{@port}", @persistent, @connection_options) end def request(method_name, options = {}) diff --git a/lib/fog/xenserver/compute.rb b/lib/fog/xenserver/compute.rb index d1f5e78a9..0f5c5f290 100644 --- a/lib/fog/xenserver/compute.rb +++ b/lib/fog/xenserver/compute.rb @@ -164,7 +164,7 @@ module Fog @host = options[:xenserver_pool_master] @username = options[:xenserver_username] @password = options[:xenserver_password] - @connection = Fog::Connection.new(@host) + @connection = Fog::XML::Connection.new(@host) @connection.authenticate(@username, @password) end diff --git a/lib/fog/zerigo/dns.rb b/lib/fog/zerigo/dns.rb index c8afdc53a..ca80c59cd 100644 --- a/lib/fog/zerigo/dns.rb +++ b/lib/fog/zerigo/dns.rb @@ -79,7 +79,7 @@ module Fog @persistent = options[:persistent] || false @port = options[:port] || 80 @scheme = options[:scheme] || 'http' - @connection = Fog::Connection.new("#{@scheme}://#{@host}:#{@port}", @persistent, @connection_options) + @connection = Fog::XML::Connection.new("#{@scheme}://#{@host}:#{@port}", @persistent, @connection_options) end def reload