fog 0.4.1 → 0.5.0

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

@@ -0,0 +1,50 @@
+module Fog
+  module AWS
+    class SES
+      class Real
+
+        require 'fog/aws/parsers/ses/send_raw_email'
+
+        # Delete an existing verified email address
+        #
+        # ==== Parameters
+        # * RawMessage <~String> - The message to be sent.
+        # * Options <~Hash>
+        #   * Source <~String> - The sender's email address
+        #   * Destinations <~Array> - The destination for this email, composed of To:, From:, and CC: fields.
+        #
+        # ==== Returns
+        # * response<~Excon::Response>:
+        #   * body<~Hash>:
+        #     * 'MessageId'<~String> - Id of message
+        #     * 'ResponseMetadata'<~Hash>:
+        #       * 'RequestId'<~String> - Id of request
+        def send_raw_email(raw_message, options = {})
+          params = {}
+          if options.has_key?('Destinations')
+            params['Destinations'] = AWS.indexed_param('Destinations.member', [*options['Destinations']])
+          end
+          if options.has_key?('Source')
+            params['Source'] = options['Source']
+          end
+
+          request({
+            'Action'          => 'SendRawEmail',
+            'RawMessage.Data' => Base64.encode64(raw_message).chomp!,
+            :parser           => Fog::Parsers::AWS::SES::SendRawEmail.new
+          }.merge(params))
+        end
+
+      end
+
+      class Mock
+
+        def send_raw_email(source, destinations, raw_message)
+          Fog::Mock.not_implemented
+        end
+
+      end
+
+    end
+  end
+end

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

@@ -0,0 +1,37 @@
+module Fog
+  module AWS
+    class SES
+      class Real
+
+        require 'fog/aws/parsers/ses/verify_email_address'
+
+        # Verifies an email address. This action causes a confirmation email message to be sent to the specified address.
+        #
+        # ==== Parameters
+        # * email_address<~String> - The email address to be verified
+        # ==== Returns
+        # * response<~Excon::Response>:
+        #   * body<~Hash>:
+        #     * 'ResponseMetadata'<~Hash>:
+        #       * 'RequestId'<~String> - Id of request
+        def verify_email_address(email_address)
+          request({
+            'Action'           => 'VerifyEmailAddress',
+            'EmailAddress'     => email_address,
+            :parser            => Fog::Parsers::AWS::SES::VerifyEmailAddress.new
+          })
+        end
+
+      end
+
+      class Mock
+
+        def verify_email_address(email_address)
+          Fog::Mock.not_implemented
+        end
+
+      end
+
+    end
+  end
+end

data/lib/fog/aws/ses.rb

@@ -0,0 +1,106 @@
+module Fog
+  module AWS
+    class SES < Fog::Service
+
+      requires :aws_access_key_id, :aws_secret_access_key
+      recognizes :region, :host, :path, :port, :scheme, :persistent
+
+      request_path 'fog/aws/requests/ses'
+      request :delete_verified_email_address
+      request :verify_email_address
+      request :get_send_quota
+      request :get_send_statistics
+      request :list_verified_email_addresses
+      request :send_email
+      request :send_raw_email
+
+      class Mock
+
+        def initialize(options={})
+        end
+
+      end
+
+      class Real
+
+        # Initialize connection to SES
+        #
+        # ==== Notes
+        # options parameter must include values for :aws_access_key_id and
+        # :aws_secret_access_key in order to create a connection
+        #
+        # ==== Examples
+        #   ses = SES.new(
+        #    :aws_access_key_id => your_aws_access_key_id,
+        #    :aws_secret_access_key => your_aws_secret_access_key
+        #   )
+        #
+        # ==== Parameters
+        # * options<~Hash> - config arguments for connection.  Defaults to {}.
+        #   * region<~String> - optional region to use, in ['eu-west-1', 'us-east-1', 'us-west-1'i, 'ap-southeast-1']
+        #
+        # ==== Returns
+        # * SES object with connection to AWS.
+        def initialize(options={})
+          @aws_access_key_id      = options[:aws_access_key_id]
+          @aws_secret_access_key  = options[:aws_secret_access_key]
+          @hmac = Fog::HMAC.new('sha256', @aws_secret_access_key)
+          options[:region] ||= 'us-east-1'
+          @host = options[:host] || case options[:region]
+          when 'us-east-1'
+            'email.us-east-1.amazonaws.com'
+          else
+            raise ArgumentError, "Unknown region: #{options[:region].inspect}"
+          end
+          @path       = options[:path]      || '/'
+          @port       = options[:port]      || 443
+          @scheme     = options[:scheme]    || 'https'
+          @connection = Fog::Connection.new("#{@scheme}://#{@host}:#{@port}#{@path}", options[:persistent])
+        end
+
+        def reload
+          @connection.reset
+        end
+
+        private
+
+        def request(params)
+          idempotent  = params.delete(:idempotent)
+          parser      = params.delete(:parser)
+
+          headers = {
+            'Content-Type'  => 'application/x-www-form-urlencoded',
+            'Date'          => Time.now.utc.strftime("%a, %d %b %Y %H:%M:%S +0000")
+          }
+
+          #AWS3-HTTPS AWSAccessKeyId=<Your AWS Access Key ID>, Algorithm=HmacSHA256, Signature=<Signature>
+          headers['X-Amzn-Authorization'] = 'AWS3-HTTPS '
+          headers['X-Amzn-Authorization'] << 'AWSAccessKeyId=' << @aws_access_key_id
+          headers['X-Amzn-Authorization'] << ', Algorithm=HmacSHA256'
+          headers['X-Amzn-Authorization'] << ', Signature=' << Base64.encode64(@hmac.sign(headers['Date'])).chomp!
+
+          body = ''
+          for key in params.keys.sort
+            unless (value = params[key]).nil?
+              body << "#{key}=#{CGI.escape(value.to_s).gsub(/\+/, '%20')}&"
+            end
+          end
+          body.chop! # remove trailing '&'
+
+          response = @connection.request({
+            :body       => body,
+            :expects    => 200,
+            :headers    => headers,
+            :idempotent => idempotent,
+            :host       => @host,
+            :method     => 'POST',
+            :parser     => parser
+          })
+
+          response
+        end
+
+      end
+    end
+  end
+end

data/lib/fog/bin/aws.rb

@@ -15,6 +15,8 @@ class AWS < Fog::Bin
         Fog::AWS::IAM
       when :sdb
         Fog::AWS::SimpleDB
+      when :ses
+        Fog::AWS::SES
       when :eu_storage, :s3, :storage
         Fog::AWS::Storage
       else
@@ -48,6 +50,8 @@ class AWS < Fog::Bin
           Fog::Storage.new(:provider => 'AWS', :region => 'eu-west-1')
         when :sdb
           Fog::AWS::SimpleDB.new
+        when :ses
+          Fog::AWS::SES.new
         when :s3
           location = caller.first
           warning = "[yellow][WARN] AWS[:s3] is deprecated, use AWS[:storage] instead[/]"
@@ -64,7 +68,7 @@ class AWS < Fog::Bin
     end
 
     def services
-      [:cdn, :compute, :dns, :elb, :iam, :sdb, :storage]
+      [:cdn, :compute, :dns, :elb, :iam, :sdb, :ses, :storage]
     end
 
   end

data/lib/fog/cdn.rb

@@ -11,7 +11,7 @@ module Fog
         require 'fog/cdn/rackspace'
         Fog::Rackspace::CDN.new(attributes)
       else
-        raise ArgumentError.new("#{provider} is not a recognized storage provider")
+        raise ArgumentError.new("#{provider} is not a recognized cdn provider")
       end
     end
 

data/lib/fog/compute/aws.rb

@@ -68,6 +68,7 @@ module Fog
       request :describe_reserved_instances
       request :describe_key_pairs
       request :describe_regions
+      request :describe_reserved_instances_offerings
       request :describe_security_groups
       request :describe_snapshots
       request :describe_tags

data/lib/fog/compute/models/aws/server.rb

@@ -177,8 +177,11 @@ module Fog
         end
 
         def ssh(commands)
-          requires :identity, :ip_address, :private_key, :username
-          Fog::SSH.new(ip_address, username, :key_data => [private_key]).run(commands)
+          requires :identity, :ip_address, :username
+
+          options = {}
+          options[:key_data] = [private_key] if private_key
+          Fog::SSH.new(ip_address, username, options).run(commands)
         end
 
         def start

data/lib/fog/compute/models/bluebox/server.rb

@@ -108,8 +108,11 @@ module Fog
         end
 
         def ssh(commands)
-          requires :identity, :ips, :private_key, :username
-          Fog::SSH.new(ips.first['address'], username, :key_data => [private_key]).run(commands)
+          requires :identity, :ips, :username
+
+          options = {}
+          options[:key_data] = [private_key] if private_key
+          Fog::SSH.new(ips.first['address'], username, options).run(commands)
         end
 
         def username

data/lib/fog/compute/models/go_grid/images.rb

@@ -1,5 +1,5 @@
 require 'fog/core/collection'
-require 'fog/go_grid/models/compute/image'
+require 'fog/compute/models/go_grid/image'
 
 module Fog
   module GoGrid

data/lib/fog/compute/models/go_grid/server.rb

@@ -11,7 +11,7 @@ module Fog
         identity :id
 
         attribute :name
-        attribute :image_id        # id or name
+        attribute :image_id     # id or name
         attribute :ip
         attribute :memory       # server.ram
         attribute :state
@@ -24,30 +24,77 @@ module Fog
 
         def destroy
           requires :id
-          connection.grid_server_destroy(id)
+          connection.grid_server_delete(id)
           true
         end
 
         def image
           requires :image_id
-          connection.grid_image_get(image_id)
+          connection.grid_image_get(:image => image_id)
         end
 
         def ready?
-          @state == 'On'
+          @state && @state["name"] == 'On'
+        end
+
+        def reload
+          requires :name
+          begin
+            if data = collection.get(name)
+              new_attributes = data.attributes
+              merge_attributes(new_attributes)
+              self
+            end
+          rescue Excon::Errors::BadRequest
+            false
+          end
         end
 
         def save
           raise Fog::Errors::Error.new('Resaving an existing object may create a duplicate') if identity
           requires :name, :image_id, :ip, :memory
-          options['isSandbox'] = sandbox if sandbox
-          options['server.ram'] = memory
-          options['image'] = image_id
-          data = connection.grid_server_add(name, image, ip, options)
+          options = {
+            'isSandbox'   => sandbox,
+            'image'       => image_id
+          }
+          options = options.reject {|key, value| value.nil?}
+          data = connection.grid_server_add(image, ip, name, memory, options)
           merge_attributes(data.body)
           true
         end
 
+        def ssh(commands)
+          requires :ip, :identity, :username
+
+          options = {}
+          options[:key_data] = [private_key] if private_key
+          Fog::SSH.new(ip['ip'], username, options).run(commands)
+        end
+
+        def setup(credentials = {})
+          requires :ip, :identity, :public_key, :username
+          Fog::SSH.new(ip['ip'], username, credentials).run([
+            %{mkdir .ssh},
+            %{echo "#{public_key}" >> ~/.ssh/authorized_keys},
+            %{passwd -l root},
+            %{echo "#{attributes.to_json}" >> ~/attributes.json},
+            %{echo "#{metadata.to_json}" >> ~/metadata.json}
+          ])
+        rescue Errno::ECONNREFUSED
+          sleep(1)
+          retry
+        end
+
+        def username
+          @username ||= 'root'
+        end
+
+        private
+
+        def adminPass=(new_admin_pass)
+          @password = new_admin_pass
+        end
+
       end
 
     end

data/lib/fog/compute/models/go_grid/servers.rb

@@ -1,5 +1,5 @@
 require 'fog/core/collection'
-require 'fog/go_grid/models/compute/server'
+require 'fog/compute/models/go_grid/server'
 
 module Fog
   module GoGrid
@@ -21,7 +21,7 @@ module Fog
         end
 
         def get(server_id)
-          if server_id && server = connection.grid_server_get(server_id).body['list']
+          if server_id && server = connection.grid_server_get(server_id).body['list'].first
             new(server)
           end
         rescue Fog::GoGrid::Compute::NotFound

data/lib/fog/compute/models/rackspace/server.rb

@@ -104,8 +104,11 @@ module Fog
         end
 
         def ssh(commands)
-          requires :addresses, :identity, :private_key, :username
-          Fog::SSH.new(addresses['public'].first, username, :key_data => [private_key]).run(commands)
+          requires :addresses, :identity, :username
+
+          options = {}
+          options[:key_data] = [private_key] if private_key
+          Fog::SSH.new(addresses['public'].first, username, options).run(commands)
         end
 
         def username

data/lib/fog/compute/models/slicehost/server.rb

@@ -94,8 +94,11 @@ module Fog
         end
 
         def ssh(commands)
-          requires :addresses, :identity, :private_key, :username
-          Fog::SSH.new(addresses.first, username, :key_data => [private_key]).run(commands)
+          requires :addresses, :identity, :username
+
+          options = {}
+          options[:key_data] = [private_key] if private_key
+          Fog::SSH.new(addresses.first, username, options).run(commands)
         end
 
         def username

data/lib/fog/compute/parsers/aws/describe_reserved_instances_offerings.rb

@@ -0,0 +1,34 @@
+module Fog
+  module Parsers
+    module AWS
+      module Compute
+
+        class DescribeReservedInstancesOfferings < Fog::Parsers::Base
+
+          def reset
+            @reserved_instances_offering = {}
+            @response = { 'reservedInstancesOfferingsSet' => [] }
+          end
+
+          def end_element(name)
+            case name
+            when 'availabilityZone', 'instanceType', 'productDescription', 'reservedInstancesOfferingId'
+              @reserved_instances_offering[name] = @value
+            when 'duration'
+              @reserved_instances_offering[name] = @value.to_i
+            when 'fixedPrice', 'usagePrice'
+              @reserved_instances_offering[name] = @value.to_f
+            when 'item'
+              @response['reservedInstancesOfferingsSet'] << @reserved_instances_offering
+              @reserved_instances_offering = {}
+            when 'requestId'
+              @response[name] = @value
+            end
+          end
+
+        end
+
+      end
+    end
+  end
+end