gapinc-fog 1.12.1.1 → 1.12.1.2

data/lib/fog/aws/rds.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, :version
 
       request_path 'fog/aws/requests/rds'
       request :describe_events
@@ -155,6 +155,7 @@ module Fog
           @port       = options[:port]        || 443
           @scheme     = options[:scheme]      || 'https'
           @connection = Fog::Connection.new("#{@scheme}://#{@host}:#{@port}#{@path}", @persistent, @connection_options)
+          @version    = options[:version] || '2012-09-17' #'2011-04-01'
         end
 
         def owner_id
@@ -191,12 +192,12 @@ module Fog
               :host               => @host,
               :path               => @path,
               :port               => @port,
-              :version            => '2012-09-17' #'2011-04-01'
+              :version            => @version
             }
           )
 
           begin
-            response = @connection.request({
+            @connection.request({
               :body       => body,
               :expects    => 200,
               :headers    => { 'Content-Type' => 'application/x-www-form-urlencoded' },
@@ -206,23 +207,27 @@ module Fog
               :parser     => parser
             })
           rescue Excon::Errors::HTTPStatusError => error
-            if match = error.response.body.match(/(?:.*<Code>(.*)<\/Code>)(?:.*<Message>(.*)<\/Message>)/m)
-              case match[1].split('.').last
-              when 'DBInstanceNotFound', 'DBParameterGroupNotFound', 'DBSnapshotNotFound', 'DBSecurityGroupNotFound'
-                raise Fog::AWS::RDS::NotFound.slurp(error, match[2])
-              when 'DBParameterGroupAlreadyExists'
-                raise Fog::AWS::RDS::IdentifierTaken.slurp(error, match[2])
-              when 'AuthorizationAlreadyExists'
-                raise Fog::AWS::RDS::AuthorizationAlreadyExists.slurp(error, match[2])
+            match = Fog::AWS::Errors.match_error(error)
+            if match.empty?
+              case error.message
+              when 'Not Found'
+                raise Fog::AWS::RDS::NotFound.slurp(error, 'RDS Instance not found')
               else
                 raise
               end
             else
-              raise
+              raise case match[:code]
+                    when 'DBInstanceNotFound', 'DBParameterGroupNotFound', 'DBSnapshotNotFound', 'DBSecurityGroupNotFound'
+                      Fog::AWS::RDS::NotFound.slurp(error, match[:message])
+                    when 'DBParameterGroupAlreadyExists'
+                      Fog::AWS::RDS::IdentifierTaken.slurp(error, match[:message])
+                    when 'AuthorizationAlreadyExists'
+                      Fog::AWS::RDS::AuthorizationAlreadyExists.slurp(error, match[:message])
+                    else
+                      Fog::AWS::RDS::Error.slurp(error, "#{match[:code]} => #{match[:message]}")
+                    end
             end
           end
-
-          response
         end
 
       end

data/lib/fog/aws/requests/compute/create_volume.rb

@@ -13,7 +13,7 @@ module Fog
         # * options<~Hash>
         #   * 'SnapshotId'<~String> - Optional, snapshot to create volume from
         #   * 'VolumeType'<~String> - Optional, volume type. standard or io1, default is standard.
-        #   * 'Iops'<~Integer> - Number of IOPS the volume supports. Required if VolumeType is io1, must be between 1 and 1000.
+        #   * 'Iops'<~Integer> - Number of IOPS the volume supports. Required if VolumeType is io1, must be between 1 and 4000.
         #
         # ==== Returns
         # * response<~Excon::Response>:
@@ -83,8 +83,8 @@ module Fog
                 raise Fog::Compute::AWS::Error.new("VolumeIOPSLimit => Volume iops of #{iops} is too low; minimum is 100.")
               end
 
-              if iops > 2000
-                raise Fog::Compute::AWS::Error.new("VolumeIOPSLimit => Volume iops of #{iops} is too high; maximum is 2000.")
+              if iops > 4000
+                raise Fog::Compute::AWS::Error.new("VolumeIOPSLimit => Volume iops of #{iops} is too high; maximum is 4000.")
               end
             end
 

data/lib/fog/aws/requests/rds/create_db_instance.rb

@@ -25,6 +25,7 @@ module Fog
         # @param PreferredBackupWindow [String] The daily time range during which automated backups are created if automated backups are enabled
         # @param PreferredMaintenanceWindow [String] The weekly time range (in UTC) during which system maintenance can occur, which may result in an outage
         # @param DBSubnetGroupName [String] The name, if any, of the VPC subnet for this RDS instance
+        # @param PubliclyAcccesible [Boolean] Whether an RDS instance inside of the VPC subnet should have a public-facing endpoint
         # 
         # @return [Excon::Response]:
         #   * body [Hash]:
@@ -103,7 +104,8 @@ module Fog
 #                 "ReadReplicaSourceDBInstanceIdentifier" => nil,
 #                 "LatestRestorableTime" => nil,
                  "AvailabilityZone" => options["AvailabilityZone"],
-                 "DBSubnetGroupName" => options["DBSubnetGroupName"]
+                 "DBSubnetGroupName" => options["DBSubnetGroupName"],
+                 "PubliclyAccessible" => options["PubliclyAccessible"]
              }
 
 

data/lib/fog/aws/requests/ses/verify_domain_identity.rb

@@ -0,0 +1,30 @@
+module Fog
+  module AWS
+    class SES
+      class Real
+
+        require 'fog/aws/parsers/ses/verify_domain_identity'
+
+        # Verifies a domain. This action returns a verification authorization
+        # token which must be added as a DNS TXT record to the domain.
+        #
+        # ==== Parameters
+        # * domain<~String> - The domain to be verified
+        # ==== Returns
+        # * response<~Excon::Response>:
+        #   * body<~Hash>:
+        #     * 'ResponseMetadata'<~Hash>:
+        #       * 'VerificationToken'<~String> - Verification token
+        #       * 'RequestId'<~String> - Id of request
+        def verify_domain(domain)
+          request({
+            'Action'           => 'VerifyDomainIdentity',
+            'Domain'           => domain,
+            :parser            => Fog::Parsers::AWS::SES::VerifyDomainIdentity.new
+          })
+        end
+
+      end
+    end
+  end
+end

data/lib/fog/aws/ses.rb

@@ -11,6 +11,7 @@ module Fog
       request_path 'fog/aws/requests/ses'
       request :delete_verified_email_address
       request :verify_email_address
+      request :verify_domain_identity
       request :get_send_quota
       request :get_send_statistics
       request :list_verified_email_addresses

data/lib/fog/aws/storage.rb

@@ -491,13 +491,14 @@ DATA
           refresh_credentials_if_expired
 
           expires = Fog::Time.now.to_date_header
+
+          params[:headers]['x-amz-security-token'] = @aws_session_token if @aws_session_token
           signature = signature(params, expires)
 
           params = request_params(params)
           params.delete(:port) unless params[:port]
 
           params[:headers]['Date'] = expires
-          params[:headers]['x-amz-security-token'] = @aws_session_token if @aws_session_token
           params[:headers]['Authorization'] = "AWS #{@aws_access_key_id}:#{signature}"
           # FIXME: ToHashParser should make this not needed
           original_params = params.dup

data/lib/fog/aws/sts.rb

@@ -102,7 +102,7 @@ module Fog
           )
 
           begin
-            response = @connection.request({
+            @connection.request({
               :body       => body,
               :expects    => 200,
               :idempotent => idempotent,
@@ -111,23 +111,17 @@ module Fog
               :method     => 'POST',
               :parser     => parser
             })
-
-            response
           rescue Excon::Errors::HTTPStatusError => error
-            if match = error.message.match(/(?:.*<Code>(.*)<\/Code>)(?:.*<Message>(.*)<\/Message>)/m)
-              case match[1]
-              when 'EntityAlreadyExists', 'KeyPairMismatch', 'LimitExceeded', 'MalformedCertificate', 'ValidationError'
-                raise Fog::AWS::STS.const_get(match[1]).slurp(error, match[2])
-              else
-                raise Fog::AWS::STS::Error.slurp(error, "#{match[1]} => #{match[2]}") if match[1]
-                raise
-              end
-            else
-              raise
-            end
+            match = Fog::AWS::Errors.match_error(error)
+            raise if match.empty?
+            raise case match[:code]
+                  when 'EntityAlreadyExists', 'KeyPairMismatch', 'LimitExceeded', 'MalformedCertificate', 'ValidationError'
+                    Fog::AWS::STS.const_get(match[:code]).slurp(error, match[:message])
+                  else
+                    Fog::AWS::STS::Error.slurp(error, "#{match[:code]} => #{match[:message]}")
+                  end
           end
 
-
         end
 
       end

data/lib/fog/core.rb

@@ -19,11 +19,9 @@ require 'fog/core/current_machine'
 require 'fog/core/deprecation'
 require 'fog/core/errors'
 require 'fog/core/hmac'
-require 'fog/core/json'
 require 'fog/core/logger'
 require 'fog/core/model'
 require 'fog/core/mock'
-require 'fog/core/parser' # FIXME: would be better to only load when nokogiri is required
 require 'fog/core/provider'
 require 'fog/core/service'
 require 'fog/core/ssh'
@@ -33,6 +31,13 @@ require 'fog/core/timeout'
 require 'fog/core/wait_for'
 require 'fog/core/class_from_string'
 
+# data exchange specific (to be extracted and used on a per provider basis)
+require 'fog/xml'
+require 'fog/json'
+
+# deprecation wrappers
+require 'fog/core/deprecated/connection'
+
 # service wrappers
 require 'fog/compute'
 require 'fog/identity'

data/lib/fog/core/connection.rb

@@ -1,40 +1,73 @@
 module Fog
-  class Connection
+  module Core
 
-    def initialize(url, persistent=false, params={})
-      unless params.has_key?(:debug_response)
-        params[:debug_response] = true
-      end
-      params[:headers] ||= {}
-      params[:headers]['User-Agent'] ||= "fog/#{Fog::VERSION}"
-      @excon = Excon.new(url, params)
-      @persistent = persistent
-    end
-
-    def request(params, &block)
-      unless @persistent
-        reset
-      end
-      unless block_given?
-        if (parser = params.delete(:parser))
-          body = Nokogiri::XML::SAX::PushParser.new(parser)
-          params[:response_block] = lambda { |chunk, remaining, total| body << chunk }
+    # Fog::Core::Connection is a generic class to contain a HTTP link to an API.
+    #
+    # It is intended to be subclassed by providers who can then add their own
+    # modifications such as authentication or response object.
+    #
+    class Connection
+      # Prepares the connection and sets defaults for any future requests.
+      #
+      # @param [String] url The destination URL
+      # @param persistent [Boolean]
+      # @param [Hash] params
+      # @option params [String] :body Default text to be sent over a socket. Only used if :body absent in Connection#request params
+      # @option params [Hash<Symbol, String>] :headers The default headers to supply in a request. Only used if params[:headers] is not supplied to Connection#request
+      # @option params [String] :host The destination host's reachable DNS name or IP, in the form of a String
+      # @option params [String] :path Default path; appears after 'scheme://host:port/'. Only used if params[:path] is not supplied to Connection#request
+      # @option params [Fixnum] :port The port on which to connect, to the destination host
+      # @option params [Hash]   :query Default query; appended to the 'scheme://host:port/path/' in the form of '?key=value'. Will only be used if params[:query] is not supplied to Connection#request
+      # @option params [String] :scheme The protocol; 'https' causes OpenSSL to be used
+      # @option params [String] :proxy Proxy server; e.g. 'http://myproxy.com:8888'
+      # @option params [Fixnum] :retry_limit Set how many times we'll retry a failed request.  (Default 4)
+      # @option params [Class] :instrumentor Responds to #instrument as in ActiveSupport::Notifications
+      # @option params [String] :instrumentor_name Name prefix for #instrument events.  Defaults to 'excon'
+      #
+      def initialize(url, persistent=false, params={})
+        unless params.has_key?(:debug_response)
+          params[:debug_response] = true
         end
+        params[:headers] ||= {}
+        params[:headers]['User-Agent'] ||= "fog/#{Fog::VERSION}"
+        @excon = Excon.new(url, params)
+        @persistent = persistent
       end
 
-      response = @excon.request(params, &block)
-
-      if parser
-        body.finish
-        response.body = parser.response
+      # Makes a request using the connection using Excon
+      #
+      # @param [Hash] params
+      # @option params [String] :body text to be sent over a socket
+      # @option params [Hash<Symbol, String>] :headers The default headers to supply in a request
+      # @option params [String] :host The destination host's reachable DNS name or IP, in the form of a String
+      # @option params [String] :path appears after 'scheme://host:port/'
+      # @option params [Fixnum] :port The port on which to connect, to the destination host
+      # @option params [Hash]   :query appended to the 'scheme://host:port/path/' in the form of '?key=value'
+      # @option params [String] :scheme The protocol; 'https' causes OpenSSL to be used
+      # @option params [Proc] :response_block
+      #
+      # @return [Excon::Response]
+      #
+      # @raise [Excon::Errors::StubNotFound]
+      # @raise [Excon::Errors::Timeout]
+      # @raise [Excon::Errors::SocketError]
+      #
+      def request(params, &block)
+        reset unless @persistent
+        @excon.request(params, &block)
       end
 
-      response
-    end
+      # Make {#request} available even when it has been overidden by a subclass
+      # to allow backwards compatibility.
+      #
+      alias_method :original_request, :request
+      protected :original_request
 
-    def reset
-      @excon.reset
+      # Closes the connection
+      #
+      def reset
+        @excon.reset
+      end
     end
-
   end
 end

data/lib/fog/core/deprecated/connection.rb

@@ -0,0 +1,24 @@
+require "fog/xml"
+
+module Fog
+
+  # @deprecated Use {Fog::Core::Connection} or {XML::SAXParserConnection} if you
+  #   require the response body to be parsed.
+  #
+  # The Connection class is a wrapper around an instance of Excon::Connection
+  # supporting {#request} and {#reset} only.
+  #
+  # {#request} includes an option to perform SAX parsing for XML APIs.
+  #
+  # @see https://github.com/geemus/excon/blob/master/lib/excon/connection.rb
+  #
+  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

data/lib/fog/core/parser.rb

@@ -1,4 +1,4 @@
-require 'nokogiri'
+require "nokogiri"
 
 module Fog
   module Parsers

data/lib/fog/google/compute.rb

@@ -41,6 +41,8 @@ module Fog
       request :insert_network
       request :insert_server
 
+      request :set_metadata
+
       model_path 'fog/google/models/compute'
       model :server
       collection :servers
@@ -51,6 +53,9 @@ module Fog
       model :flavor
       collection :flavors
 
+      model :disk
+      collection :disks
+
       class Mock
         include Collections
 
@@ -66,16 +71,15 @@ module Fog
         attr_reader :project
 
         def initialize(options)
-
-
           base_url = 'https://www.googleapis.com/compute/'
-          api_version = 'v1beta14'
+          api_version = 'v1beta15'
           api_scope_url = 'https://www.googleapis.com/auth/compute'
 
           @project = options[:google_project]
           google_client_email = options[:google_client_email]
           @api_url = base_url + api_version + '/projects/'
-          #NOTE: loaded here to avoid requiring this as a core Fog dependency
+
+          # NOTE: loaded here to avoid requiring this as a core Fog dependency
           begin
             require 'google/api_client'
           rescue LoadError
@@ -87,6 +91,7 @@ module Fog
             :application_name => "fog",
             :application_version => Fog::VERSION,
           })
+
           @client.authorization = Signet::OAuth2::Client.new({
             :audience => 'https://accounts.google.com/o/oauth2/token',
             :auth_provider_x509_cert_url => "https://www.googleapis.com/oauth2/v1/certs",
@@ -96,15 +101,14 @@ module Fog
             :signing_key => key,
             :token_credential_uri => 'https://accounts.google.com/o/oauth2/token',
           })
-          @client.authorization.fetch_access_token!
 
+          @client.authorization.fetch_access_token!
           @compute = @client.discovered_api('compute', api_version)
           @default_network = 'default'
         end
 
         def build_result(api_method, parameters, body_object=nil)
           if body_object
-            #p api_method, parameters
             result = @client.execute(
               :api_method => api_method,
               :parameters => parameters,
@@ -123,15 +127,35 @@ module Fog
           response.body = Fog::JSON.decode(result.body)
           if response.body["error"]
             response.status = response.body["error"]["code"]
+
+            response.body["error"]["errors"].each do |error|
+              raise Fog::Errors::Error.new(error["message"])
+            end
           else
             response.status = 200
           end
           response
         end
 
+        def backoff_if_unfound(&block)
+          retries_remaining = 10
+          begin
+            result = block.call
+          rescue Exception => msg
+            if msg.to_s.include? 'was not found' and retries_remaining > 0
+              retries_remaining -= 1
+              sleep 0.1
+              retry
+            else
+              raise msg
+            end
+          end
+          result
+        end
+
       end
 
-      RUNNING_STATE = 'RUNNING'
+      RUNNING = 'RUNNING'
 
     end
   end