fog 1.23.0 → 1.24.0

data/fog.gemspec

@@ -6,8 +6,8 @@ Gem::Specification.new do |s|
   ## If your rubyforge_project name is different, then edit it and comment out
   ## the sub! line in the Rakefile
   s.name              = 'fog'
-  s.version           = '1.23.0'
-  s.date              = '2014-07-17'
+  s.version           = '1.24.0'
+  s.date              = '2014-10-09'
   s.rubyforge_project = 'fog'
 
   ## Make sure your summary is short. The description may be as long
@@ -50,6 +50,8 @@ Gem::Specification.new do |s|
   # Modular providers
   s.add_dependency("fog-brightbox")
   s.add_dependency("fog-softlayer")
+  s.add_dependency("fog-sakuracloud", ">= 0.0.4")
+  s.add_dependency("fog-radosgw", ">=0.0.2")
 
   ## List your development dependencies here. Development dependencies are
   ## those that are only needed during development
@@ -64,6 +66,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency('pry')
   s.add_development_dependency('opennebula', '>=4.4.0')
   s.add_development_dependency('google-api-client', '~> 0.6', '>= 0.6.2')
+  s.add_development_dependency('docker-api', '>= 1.8.0')
   s.add_development_dependency('rubocop') if RUBY_VERSION > "1.9"
 
   if ENV["FOG_USE_LIBVIRT"]

data/lib/fog/atmos/models/storage/files.rb

@@ -35,7 +35,7 @@ module Fog
 
         def get(key, &block)
           requires :directory
-          data = service.get_namespace(directory.key + key, :parse => false)#, &block)
+          data = service.get_namespace(directory.key + key, :parse => false, &block)
           file_data = data.headers.merge({
             :body => data.body,
             :key  => key

data/lib/fog/atmos/requests/storage/get_namespace.rb

@@ -2,8 +2,13 @@ module Fog
   module Storage
     class Atmos
       class Real
-        def get_namespace(namespace = '', options = {})
+        def get_namespace(namespace = '', options = {}, &block)
           options = options.reject {|key, value| value.nil?}
+
+          if block_given?
+            options[:response_block] = Proc.new
+          end
+
           request({
                     :expects  => 200,
                     :method   => 'GET',

data/lib/fog/aws/beanstalk.rb

@@ -8,7 +8,7 @@ module Fog
       class InvalidParameterError < Fog::Errors::Error; end
 
       requires :aws_access_key_id, :aws_secret_access_key
-      recognizes :region, :host, :path, :port, :scheme, :persistent, :use_iam_profile, :aws_session_token, :aws_credentials_expire_at
+      recognizes :region, :host, :path, :port, :scheme, :persistent, :use_iam_profile, :aws_session_token, :aws_credentials_expire_at, :instrumentor, :instrumentor_name
 
       request_path 'fog/aws/requests/beanstalk'
 
@@ -77,6 +77,8 @@ module Fog
           @port       = options[:port]        || 443
           @scheme     = options[:scheme]      || 'https'
           @connection = Fog::XML::Connection.new("#{@scheme}://#{@host}:#{@port}#{@path}", @persistent, @connection_options)
+          @instrumentor       = options[:instrumentor]
+          @instrumentor_name  = options[:instrumentor_name] || 'fog.aws.beanstalk'
         end
 
         def reload
@@ -118,26 +120,34 @@ module Fog
               }
           )
 
-          begin
-            @connection.request({
-                :body       => body,
-                :expects    => 200,
-                :headers    => { 'Content-Type' => 'application/x-www-form-urlencoded' },
-                :idempotent => idempotent,
-                :method     => 'POST',
-                :parser     => parser
-            })
-          rescue Excon::Errors::HTTPStatusError => error
-            match = Fog::AWS::Errors.match_error(error)
-            raise if match.empty?
-            raise case match[:code]
-                  when 'InvalidParameterValue'
-                    Fog::AWS::ElasticBeanstalk::InvalidParameterError.slurp(error, match[:message])
-                  else
-                    Fog::AWS::ElasticBeanstalk::Error.slurp(error, "#{match[:code]} => #{match[:message]}")
-                  end
+          if @instrumentor
+            @instrumentor.instrument("#{@instrumentor_name}.request", params) do
+              _request(body, idempotent, parser)
+            end
+          else
+            _request(body, idempotent, parser)
           end
         end
+
+        def _request(body, idempotent, parser)
+          @connection.request({
+              :body       => body,
+              :expects    => 200,
+              :headers    => { 'Content-Type' => 'application/x-www-form-urlencoded' },
+              :idempotent => idempotent,
+              :method     => 'POST',
+              :parser     => parser
+          })
+        rescue Excon::Errors::HTTPStatusError => error
+          match = Fog::AWS::Errors.match_error(error)
+          raise if match.empty?
+          raise case match[:code]
+                when 'InvalidParameterValue'
+                  Fog::AWS::ElasticBeanstalk::InvalidParameterError.slurp(error, match[:message])
+                else
+                  Fog::AWS::ElasticBeanstalk::Error.slurp(error, "#{match[:code]} => #{match[:message]}")
+                end
+        end
       end
     end
   end

data/lib/fog/aws/cdn.rb

@@ -6,7 +6,7 @@ module Fog
       extend Fog::AWS::CredentialFetcher::ServiceMethods
 
       requires :aws_access_key_id, :aws_secret_access_key
-      recognizes :host, :path, :port, :scheme, :version, :persistent, :use_iam_profile, :aws_session_token, :aws_credentials_expire_at
+      recognizes :host, :path, :port, :scheme, :version, :persistent, :use_iam_profile, :aws_session_token, :aws_credentials_expire_at, :instrumentor, :instrumentor_name
 
       model_path 'fog/aws/models/cdn'
       model       :distribution
@@ -146,6 +146,8 @@ EOF
 
           @use_iam_profile = options[:use_iam_profile]
           setup_credentials(options)
+          @instrumentor      = options[:instrumentor]
+          @instrumentor_name = options[:instrumentor_name] || 'fog.aws.cdn'
           @connection_options = options[:connection_options] || {}
           @host       = options[:host]      || 'cloudfront.amazonaws.com'
           @path       = options[:path]      || '/'
@@ -179,6 +181,17 @@ EOF
           params[:headers]['x-amz-security-token'] = @aws_session_token if @aws_session_token
           params[:headers]['Authorization'] = "AWS #{@aws_access_key_id}:#{signature(params)}"
           params[:path] = "/#{@version}/#{params[:path]}"
+
+          if @instrumentor
+            @instrumentor.instrument("#{@instrumentor_name}.request", params) do
+              _request(params, &block)
+            end
+          else
+            _request(params, &block)
+          end
+        end
+
+        def _request(params, &block)
           @connection.request(params, &block)
         end
 

data/lib/fog/aws/cloud_formation.rb

@@ -6,7 +6,7 @@ module Fog
       extend Fog::AWS::CredentialFetcher::ServiceMethods
 
       requires :aws_access_key_id, :aws_secret_access_key
-      recognizes :host, :path, :port, :scheme, :persistent, :region, :use_iam_profile, :aws_session_token, :aws_credentials_expire_at
+      recognizes :host, :path, :port, :scheme, :persistent, :region, :use_iam_profile, :aws_session_token, :aws_credentials_expire_at, :instrumentor, :instrumentor_name
 
       request_path 'fog/aws/requests/cloud_formation'
       request :create_stack
@@ -51,6 +51,8 @@ module Fog
           @use_iam_profile = options[:use_iam_profile]
           setup_credentials(options)
 
+          @instrumentor       = options[:instrumentor]
+          @instrumentor_name  = options[:instrumentor_name] || 'fog.aws.cloud_formation'
           @connection_options = options[:connection_options] || {}
           options[:region] ||= 'us-east-1'
           @host = options[:host] || "cloudformation.#{options[:region]}.amazonaws.com"
@@ -95,26 +97,34 @@ module Fog
             }
           )
 
-          begin
-            @connection.request({
-              :body       => body,
-              :expects    => 200,
-              :idempotent => idempotent,
-              :headers    => { 'Content-Type' => 'application/x-www-form-urlencoded' },
-              :method     => 'POST',
-              :parser     => parser
-            })
-          rescue Excon::Errors::HTTPStatusError => error
-            match = Fog::AWS::Errors.match_error(error)
-            raise if match.empty?
-            raise case match[:code]
-                  when 'NotFound', 'ValidationError'
-                    Fog::AWS::CloudFormation::NotFound.slurp(error, match[:message])
-                  else
-                    Fog::AWS::CloudFormation::Error.slurp(error, "#{match[:code]} => #{match[:message]}")
-                  end
+          if @instrumentor
+            @instrumentor.instrument("#{@instrumentor_name}.request", params) do
+              _request(body, idempotent, parser)
+            end
+          else
+            _request(body, idempotent, parser)
           end
         end
+
+        def _request(body, idempotent, parser)
+          @connection.request({
+            :body       => body,
+            :expects    => 200,
+            :idempotent => idempotent,
+            :headers    => { 'Content-Type' => 'application/x-www-form-urlencoded' },
+            :method     => 'POST',
+            :parser     => parser
+          })
+        rescue Excon::Errors::HTTPStatusError => error
+          match = Fog::AWS::Errors.match_error(error)
+          raise if match.empty?
+          raise case match[:code]
+                when 'NotFound', 'ValidationError'
+                  Fog::AWS::CloudFormation::NotFound.slurp(error, match[:message])
+                else
+                  Fog::AWS::CloudFormation::Error.slurp(error, "#{match[:code]} => #{match[:message]}")
+                end
+        end
       end
     end
   end

data/lib/fog/aws/compute.rb

@@ -153,6 +153,8 @@ module Fog
       request :monitor_instances
       request :unmonitor_instances
 
+      class InvalidURIError < Exception; end
+
       # deprecation
       class Real
         def modify_image_attributes(*params)
@@ -294,7 +296,21 @@ module Fog
           @aws_credentials_expire_at = Time::now + 20
           setup_credentials(options)
           @region = options[:region] || 'us-east-1'
-          validate_aws_region @region
+
+          if @endpoint = options[:endpoint]
+            endpoint = URI.parse(@endpoint)
+            @host = endpoint.host or raise InvalidURIError.new("could not parse endpoint: #{@endpoint}")
+            @path = endpoint.path
+            @port = endpoint.port
+            @scheme = endpoint.scheme
+          else
+            @host = options[:host] || "ec2.#{options[:region]}.amazonaws.com"
+            @path       = options[:path]        || '/'
+            @persistent = options[:persistent]  || false
+            @port       = options[:port]        || 443
+            @scheme     = options[:scheme]      || 'https'
+          end
+          validate_aws_region(@host, @region)
         end
 
         def region_data
@@ -443,11 +459,9 @@ module Fog
           @instrumentor_name      = options[:instrumentor_name] || 'fog.aws.compute'
           @version                = options[:version]     ||  '2014-06-15'
 
-          validate_aws_region @region
-
           if @endpoint = options[:endpoint]
             endpoint = URI.parse(@endpoint)
-            @host = endpoint.host
+            @host = endpoint.host or raise InvalidURIError.new("could not parse endpoint: #{@endpoint}")
             @path = endpoint.path
             @port = endpoint.port
             @scheme = endpoint.scheme
@@ -458,6 +472,8 @@ module Fog
             @port       = options[:port]        || 443
             @scheme     = options[:scheme]      || 'https'
           end
+
+          validate_aws_region(@host, @region)
           @connection = Fog::XML::Connection.new("#{@scheme}://#{@host}:#{@port}#{@path}", @persistent, @connection_options)
         end
 

data/lib/fog/aws/data_pipeline.rb

@@ -6,7 +6,7 @@ module Fog
       extend Fog::AWS::CredentialFetcher::ServiceMethods
 
       requires :aws_access_key_id, :aws_secret_access_key
-      recognizes :region, :host, :path, :port, :scheme, :persistent, :use_iam_profile, :aws_session_token, :aws_credentials_expire_at
+      recognizes :region, :host, :path, :port, :scheme, :persistent, :use_iam_profile, :aws_session_token, :aws_credentials_expire_at, :instrumentor, :instrumentor_name
 
       request_path 'fog/aws/requests/data_pipeline'
       request :activate_pipeline
@@ -53,8 +53,9 @@ module Fog
         # * DataPipeline object with connection to AWS.
         def initialize(options={})
           @use_iam_profile = options[:use_iam_profile]
+          @instrumentor       = options[:instrumentor]
+          @instrumentor_name  = options[:instrumentor_name] || 'fog.aws.data_pipeline'
           @connection_options     = options[:connection_options] || {}
-
           @version    = '2012-10-29'
           @region     = options[:region]      || 'us-east-1'
           @host       = options[:host]        || "datapipeline.#{@region}.amazonaws.com"
@@ -107,8 +108,17 @@ module Fog
           params[:headers]['x-amz-security-token'] = @aws_session_token if @aws_session_token
           params[:headers]['Authorization'] = @signer.sign(params, date)
 
-          response = @connection.request(params)
-          response
+          if @instrumentor
+            @instrumentor.instrument("#{@instrumentor_name}.request", params) do
+              _request(params)
+            end
+          else
+            _request(params)
+          end
+        end
+
+        def _request(params)
+          @connection.request(params)
         end
       end
     end

data/lib/fog/aws/dns.rb

@@ -6,7 +6,7 @@ module Fog
       extend Fog::AWS::CredentialFetcher::ServiceMethods
 
       requires :aws_access_key_id, :aws_secret_access_key
-      recognizes :host, :path, :port, :scheme, :version, :persistent, :use_iam_profile, :aws_session_token, :aws_credentials_expire_at
+      recognizes :host, :path, :port, :scheme, :version, :persistent, :use_iam_profile, :aws_session_token, :aws_credentials_expire_at, :instrumentor, :instrumentor_name
 
       model_path 'fog/aws/models/dns'
       model       :record
@@ -15,9 +15,13 @@ module Fog
       collection  :zones
 
       request_path 'fog/aws/requests/dns'
+      request :create_health_check
       request :create_hosted_zone
+      request :delete_health_check
+      request :get_health_check
       request :get_hosted_zone
       request :delete_hosted_zone
+      request :list_health_checks
       request :list_hosted_zones
       request :change_resource_record_sets
       request :list_resource_record_sets
@@ -90,6 +94,8 @@ module Fog
 
           @use_iam_profile = options[:use_iam_profile]
           setup_credentials(options)
+          @instrumentor       = options[:instrumentor]
+          @instrumentor_name  = options[:instrumentor_name] || 'fog.aws.dns'
           @connection_options     = options[:connection_options] || {}
           @host       = options[:host]        || 'route53.amazonaws.com'
           @path       = options[:path]        || '/'
@@ -118,11 +124,23 @@ module Fog
 
         def request(params, &block)
           refresh_credentials_if_expired
+
           params[:headers] ||= {}
           params[:headers]['Date'] = Fog::Time.now.to_date_header
           params[:headers]['x-amz-security-token'] = @aws_session_token if @aws_session_token
           params[:headers]['X-Amzn-Authorization'] = "AWS3-HTTPS AWSAccessKeyId=#{@aws_access_key_id},Algorithm=HmacSHA1,Signature=#{signature(params)}"
           params[:path] = "/#{@version}/#{params[:path]}"
+
+          if @instrumentor
+            @instrumentor.instrument("#{@instrumentor_name}.request", params) do
+              _request(params, &block)
+            end
+          else
+            _request(params, &block)
+          end
+        end
+
+        def _request(params, &block)
           @connection.request(params, &block)
         end
 

data/lib/fog/aws/dynamodb.rb

@@ -6,7 +6,7 @@ module Fog
       extend Fog::AWS::CredentialFetcher::ServiceMethods
 
       requires :aws_access_key_id, :aws_secret_access_key
-      recognizes :aws_session_token, :host, :path, :port, :scheme, :persistent, :region, :use_iam_profile, :aws_credentials_expire_at
+      recognizes :aws_session_token, :host, :path, :port, :scheme, :persistent, :region, :use_iam_profile, :aws_credentials_expire_at, :instrumentor, :instrumentor_name
 
       request_path 'fog/aws/requests/dynamodb'
       request :batch_get_item
@@ -80,6 +80,8 @@ module Fog
           setup_credentials(options)
 
           @connection_options     = options[:connection_options] || {}
+          @instrumentor           = options[:instrumentor]
+          @instrumentor_name      = options[:instrumentor_name] || 'fog.aws.dynamodb'
 
           @host       = options[:host]        || "dynamodb.#{@region}.amazonaws.com"
           @path       = options[:path]        || '/'
@@ -125,6 +127,16 @@ module Fog
           params[:headers]['x-amz-security-token'] = @aws_session_token if @aws_session_token
           params[:headers]['Authorization'] = @signer.sign(params, date)
 
+          if @instrumentor
+            @instrumentor.instrument("#{@instrumentor_name}.request", params) do
+              _request(params)
+            end
+          else
+            _request(params)
+          end
+        end
+
+        def _request(params)
           response = @connection.request(params)
 
           unless response.body.empty?
@@ -133,6 +145,7 @@ module Fog
 
           response
         end
+
       end
     end
   end

data/lib/fog/aws/elasticache.rb

@@ -10,7 +10,7 @@ module Fog
       class AuthorizationAlreadyExists < Fog::Errors::Error; end
 
       requires :aws_access_key_id, :aws_secret_access_key
-      recognizes :region, :host, :path, :port, :scheme, :persistent, :use_iam_profile, :aws_session_token, :aws_credentials_expire_at
+      recognizes :region, :host, :path, :port, :scheme, :persistent, :use_iam_profile, :aws_session_token, :aws_credentials_expire_at, :instrumentor, :instrumentor_name
 
       request_path 'fog/aws/requests/elasticache'
 
@@ -57,6 +57,8 @@ module Fog
           @use_iam_profile = options[:use_iam_profile]
           setup_credentials(options)
 
+          @instrumentor       = options[:instrumentor]
+          @instrumentor_name  = options[:instrumentor_name] || 'fog.aws.elasticache'
           options[:region] ||= 'us-east-1'
           @host = options[:host] || "elasticache.#{options[:region]}.amazonaws.com"
           @path       = options[:path]      || '/'
@@ -101,30 +103,38 @@ module Fog
           }
           )
 
-          begin
-            @connection.request({
-              :body       => body,
-              :expects    => 200,
-              :headers    => { 'Content-Type' => 'application/x-www-form-urlencoded' },
-              :idempotent => idempotent,
-              :method     => 'POST',
-              :parser     => parser
-            })
-          rescue Excon::Errors::HTTPStatusError => error
-            match = Fog::AWS::Errors.match_error(error)
-            raise if match.empty?
-            raise case match[:code]
-                  when 'CacheSecurityGroupNotFound', 'CacheParameterGroupNotFound', 'CacheClusterNotFound'
-                    Fog::AWS::Elasticache::NotFound.slurp(error, match[:message])
-                  when 'CacheSecurityGroupAlreadyExists'
-                    Fog::AWS::Elasticache::IdentifierTaken.slurp(error, match[:message])
-                  when 'InvalidParameterValue'
-                    Fog::AWS::Elasticache::InvalidInstance.slurp(error, match[:message])
-                  else
-                    Fog::AWS::Elasticache::Error.slurp(error, "#{match[:code]} => #{match[:message]}")
-                  end
+          if @instrumentor
+            @instrumentor.instrument("#{@instrumentor_name}.request", params) do
+              _request(body, idempotent, parser)
+            end
+          else
+            _request(body, idempotent, parser)
           end
         end
+
+        def _request(body, idempotent, parser)
+          @connection.request({
+            :body       => body,
+            :expects    => 200,
+            :headers    => { 'Content-Type' => 'application/x-www-form-urlencoded' },
+            :idempotent => idempotent,
+            :method     => 'POST',
+            :parser     => parser
+          })
+        rescue Excon::Errors::HTTPStatusError => error
+          match = Fog::AWS::Errors.match_error(error)
+          raise if match.empty?
+          raise case match[:code]
+                when 'CacheSecurityGroupNotFound', 'CacheParameterGroupNotFound', 'CacheClusterNotFound'
+                  Fog::AWS::Elasticache::NotFound.slurp(error, match[:message])
+                when 'CacheSecurityGroupAlreadyExists'
+                  Fog::AWS::Elasticache::IdentifierTaken.slurp(error, match[:message])
+                when 'InvalidParameterValue'
+                  Fog::AWS::Elasticache::InvalidInstance.slurp(error, match[:message])
+                else
+                  Fog::AWS::Elasticache::Error.slurp(error, "#{match[:code]} => #{match[:message]}")
+                end
+        end
       end
 
       class Mock