fog 1.1.1 → 1.2.0

data/lib/fog/aws/simpledb.rb

@@ -5,7 +5,7 @@ module Fog
     class SimpleDB < Fog::Service
 
       requires :aws_access_key_id, :aws_secret_access_key
-      recognizes :host, :nil_string, :path, :port, :scheme, :persistent, :region
+      recognizes :host, :nil_string, :path, :port, :scheme, :persistent, :region, :aws_session_token
 
       request_path 'fog/aws/requests/simpledb'
       request :batch_put_attributes
@@ -70,27 +70,13 @@ module Fog
 
           @aws_access_key_id      = options[:aws_access_key_id]
           @aws_secret_access_key  = options[:aws_secret_access_key]
+          @aws_session_token      = options[:aws_session_token]
           @connection_options     = options[:connection_options] || {}
           @hmac       = Fog::HMAC.new('sha256', @aws_secret_access_key)
           @nil_string = options[:nil_string]|| 'nil'
 
           options[:region] ||= 'us-east-1'
-          @host = options[:host] || case options[:region]
-          when 'ap-northeast-1'
-            'sdb.ap-northeast-1.amazonaws.com'
-          when 'ap-southeast-1'
-            'sdb.ap-southeast-1.amazonaws.com'
-          when 'eu-west-1'
-            'sdb.eu-west-1.amazonaws.com'
-          when 'us-east-1'
-            'sdb.amazonaws.com'
-          when 'us-west-1'
-            'sdb.us-west-1.amazonaws.com'
-          when 'us-west-2'
-            'sdb.us-west-2.amazonaws.com'
-          else
-            raise ArgumentError, "Unknown region: #{options[:region].inspect}"
-          end
+          @host = options[:host] || "sdb.#{options[:region]}.amazonaws.com"
           @path       = options[:path]        || '/'
           @persistent = options[:persistent]  || false
           @port       = options[:port]        || 443
@@ -165,6 +151,7 @@ module Fog
             params,
             {
               :aws_access_key_id  => @aws_access_key_id,
+              :aws_session_token  => @aws_session_token,
               :hmac               => @hmac,
               :host               => @host,
               :path               => @path,

data/lib/fog/aws/sns.rb

@@ -56,20 +56,7 @@ module Fog
           @hmac       = Fog::HMAC.new('sha256', @aws_secret_access_key)
 
           options[:region] ||= 'us-east-1'
-          @host = options[:host] || case options[:region]
-          when 'ap-southeast-1'
-            'sns.ap-southeast-1.amazonaws.com'
-          when 'eu-west-1'
-            'sns.eu-west-1.amazonaws.com'
-          when 'us-east-1'
-            'sns.us-east-1.amazonaws.com'
-          when 'us-west-1'
-            'sns.us-west-1.amazonaws.com'
-          when 'us-west-2'
-            'sns.us-west-2.amazonaws.com'
-          else
-            raise ArgumentError, "Unknown region: #{options[:region].inspect}"
-          end
+          @host = options[:host] || "sns.#{options[:region]}.amazonaws.com"
 
           @path       = options[:path]        || '/'
           @persistent = options[:persistent]  || false

data/lib/fog/aws/sqs.rb

@@ -5,7 +5,7 @@ module Fog
     class SQS < Fog::Service
 
       requires :aws_access_key_id, :aws_secret_access_key
-      recognizes :region, :host, :path, :port, :scheme, :persistent
+      recognizes :region, :host, :path, :port, :scheme, :persistent, :aws_session_token
 
       request_path 'fog/aws/requests/sqs'
       request :change_message_visibility
@@ -71,29 +71,22 @@ module Fog
         #
         # ==== 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', 'us-west-2', 'ap-southeast-1']
+        #   * region<~String> - optional region to use. For instance, 'eu-west-1', 'us-east-1' and etc.
         #
         # ==== Returns
         # * SQS 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]
+          @aws_session_token      = options[:aws_session_token]
           @connection_options     = options[:connection_options] || {}
           @hmac = Fog::HMAC.new('sha256', @aws_secret_access_key)
           options[:region] ||= 'us-east-1'
           @host = options[:host] || case options[:region]
-          when 'ap-southeast-1'
-            'ap-southeast-1.queue.amazonaws.com'
-          when 'eu-west-1'
-            'eu-west-1.queue.amazonaws.com'
           when 'us-east-1'
             'queue.amazonaws.com'
-          when 'us-west-1'
-            'us-west-1.queue.amazonaws.com'
-          when 'us-west-2'
-            'us-west-2.queue.amazonaws.com'
           else
-            raise ArgumentError, "Unknown region: #{options[:region].inspect}"
+            "#{options[:region]}.queue.amazonaws.com"
           end
           @path       = options[:path]        || '/'
           @persistent = options[:persistent]  || false
@@ -121,6 +114,7 @@ module Fog
             params,
             {
               :aws_access_key_id  => @aws_access_key_id,
+              :aws_session_token  => @aws_session_token,
               :hmac               => @hmac,
               :host               => @host,
               :path               => path || @path,

data/lib/fog/aws/storage.rb

@@ -19,11 +19,13 @@ module Fog
       request :complete_multipart_upload
       request :copy_object
       request :delete_bucket
+      request :delete_bucket_lifecycle
       request :delete_bucket_policy
       request :delete_bucket_website
       request :delete_object
       request :get_bucket
       request :get_bucket_acl
+      request :get_bucket_lifecycle
       request :get_bucket_location
       request :get_bucket_logging
       request :get_bucket_object_versions
@@ -45,6 +47,7 @@ module Fog
       request :post_object_hidden_fields
       request :put_bucket
       request :put_bucket_acl
+      request :put_bucket_lifecycle
       request :put_bucket_logging
       request :put_bucket_policy
       request :put_bucket_versioning
@@ -95,7 +98,7 @@ module Fog
           query << "AWSAccessKeyId=#{@aws_access_key_id}"
           query << "Signature=#{Fog::AWS.escape(signature(params))}"
           query << "Expires=#{params[:headers]['Date']}"
-          "#{@host}/#{params[:path]}?#{query.join('&')}"
+          "#{params[:host]}/#{params[:path]}?#{query.join('&')}"
         end
 
       end
@@ -189,20 +192,10 @@ module Fog
           @aws_secret_access_key = options[:aws_secret_access_key]
           options[:region] ||= 'us-east-1'
           @host = options[:host] || case options[:region]
-          when 'ap-northeast-1'
-            's3-ap-northeast-1.amazonaws.com'
-          when 'ap-southeast-1'
-            's3-ap-southeast-1.amazonaws.com'
-          when 'eu-west-1'
-            's3-eu-west-1.amazonaws.com'
           when 'us-east-1'
             's3.amazonaws.com'
-          when 'us-west-1'
-            's3-us-west-1.amazonaws.com'
-          when 'us-west-2'
-            's3-us-west-2.amazonaws.com'
           else
-            raise ArgumentError, "Unknown region: #{options[:region].inspect}"
+            "s3-#{options[:region]}.amazonaws.com"
           end
           @region = options[:region]
         end
@@ -263,20 +256,10 @@ module Fog
           else
             options[:region] ||= 'us-east-1'
             @host = options[:host] || case options[:region]
-            when 'ap-northeast-1'
-              's3-ap-northeast-1.amazonaws.com'
-            when 'ap-southeast-1'
-              's3-ap-southeast-1.amazonaws.com'
-            when 'eu-west-1'
-              's3-eu-west-1.amazonaws.com'
             when 'us-east-1'
               's3.amazonaws.com'
-            when 'us-west-1'
-              's3-us-west-1.amazonaws.com'
-            when 'us-west-2'
-              's3-us-west-2.amazonaws.com'
             else
-              raise ArgumentError, "Unknown region: #{options[:region].inspect}"
+              "s3-#{options[:region]}.amazonaws.com"
             end
             @path       = options[:path]        || '/'
             @persistent = options[:persistent]  || true
@@ -332,6 +315,7 @@ DATA
           for key in (params[:query] || {}).keys.sort
             if %w{
               acl
+              lifecycle
               location
               logging
               notification

data/lib/fog/aws/sts.rb

@@ -0,0 +1,137 @@
+require File.expand_path(File.join(File.dirname(__FILE__), '..', 'aws'))
+
+module Fog
+  module AWS
+    class STS < Fog::Service
+
+      class EntityAlreadyExists < Fog::AWS::STS::Error; end
+      class ValidationError < Fog::AWS::STS::Error; end
+
+      requires :aws_access_key_id, :aws_secret_access_key
+      recognizes :host, :path, :port, :scheme, :persistent
+
+      request_path 'fog/aws/requests/sts'
+      request :get_federation_token
+      request :get_session_token
+
+      class Mock
+        def self.data
+          @data ||= Hash.new do |hash, key|
+            hash[key] = {
+              :owner_id => Fog::AWS::Mock.owner_id,
+              :server_certificates => {}
+            }
+          end
+        end
+
+        def self.reset
+          @data = nil
+        end
+
+        def self.server_certificate_id
+          Fog::Mock.random_hex(16)
+        end
+
+        def initialize(options={})
+          @aws_access_key_id = options[:aws_access_key_id]
+        end
+
+        def data
+          self.class.data[@aws_access_key_id]
+        end
+
+        def reset_data
+          self.class.data.delete(@aws_access_key_id)
+        end
+      end
+
+      class Real
+
+        # Initialize connection to STS
+        #
+        # ==== Notes
+        # options parameter must include values for :aws_access_key_id and
+        # :aws_secret_access_key in order to create a connection
+        #
+        # ==== Examples
+        #   iam = STS.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 {}.
+        #
+        # ==== Returns
+        # * STS object with connection to AWS.
+        def initialize(options={})
+          require 'fog/core/parser'
+          require 'multi_json'
+
+          @aws_access_key_id      = options[:aws_access_key_id]
+          @aws_secret_access_key  = options[:aws_secret_access_key]
+          @connection_options     = options[:connection_options] || {}
+          @hmac       = Fog::HMAC.new('sha256', @aws_secret_access_key)
+          @host       = options[:host]        || 'sts.amazonaws.com'
+          @path       = options[:path]        || '/'
+          @persistent = options[:persistent]  || false
+          @port       = options[:port]        || 443
+          @scheme     = options[:scheme]      || 'https'
+          @connection = Fog::Connection.new("#{@scheme}://#{@host}:#{@port}#{@path}", @persistent, @connection_options)
+        end
+
+        def reload
+          @connection.reset
+        end
+
+        private
+
+        def request(params)
+          idempotent  = params.delete(:idempotent)
+          parser      = params.delete(:parser)
+
+          body = Fog::AWS.signed_params(
+            params,
+            {
+              :aws_access_key_id  => @aws_access_key_id,
+              :hmac               => @hmac,
+              :host               => @host,
+              :path               => @path,
+              :port               => @port,
+              :version            => '2011-06-15'
+            }
+          )
+
+          begin
+            response = @connection.request({
+              :body       => body,
+              :expects    => 200,
+              :idempotent => idempotent,
+              :headers    => { 'Content-Type' => 'application/x-www-form-urlencoded' },
+              :host       => @host,
+              :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
+          end
+
+
+        end
+
+      end
+    end
+  end
+end

data/lib/fog/aws.rb

@@ -6,10 +6,12 @@ module Fog
     extend Fog::Provider
 
     service(:auto_scaling,    'aws/auto_scaling',     'AutoScaling')
+    service(:beanstalk,       'aws/beanstalk',        'ElasticBeanstalk')
     service(:cdn,             'aws/cdn',              'CDN')
     service(:compute,         'aws/compute',          'Compute')
     service(:cloud_formation, 'aws/cloud_formation',  'CloudFormation')
     service(:cloud_watch,     'aws/cloud_watch',      'CloudWatch')
+    service(:dynamodb,        'aws/dynamodb',         'DynamoDB')
     service(:dns,             'aws/dns',              'DNS')
     service(:elasticache,     'aws/elasticache',      'Elasticache')
     service(:elb,             'aws/elb',              'ELB')
@@ -20,6 +22,7 @@ module Fog
     service(:simpledb,        'aws/simpledb',         'SimpleDB')
     service(:sns,             'aws/sns',              'SNS')
     service(:sqs,             'aws/sqs',              'SQS')
+    service(:sts,             'aws/sts',              'STS')
     service(:storage,         'aws/storage',          'Storage')
 
     def self.indexed_param(key, values)
@@ -39,7 +42,7 @@ module Fog
       end
       params
     end
-    
+
     def self.serialize_keys(key, value, options = {})
       case value
       when Hash
@@ -85,6 +88,10 @@ module Fog
         'Version'           => options[:version]
       })
 
+      params.merge!({
+        'SecurityToken'     => options[:aws_session_token]
+      }) if options[:aws_session_token]
+
       body = ''
       for key in params.keys.sort
         unless (value = params[key]).nil?
@@ -125,10 +132,6 @@ module Fog
         "ip-#{ip_address.gsub('.','-')}.ec2.internal"
       end
 
-      def self.etag
-        Fog::Mock.random_hex(32)
-      end
-
       def self.image
         path = []
         (rand(3) + 2).times do
@@ -218,6 +221,38 @@ module Fog
       def self.volume_id
         "vol-#{Fog::Mock.random_hex(8)}"
       end
+
+      def self.security_group_id
+        "sg-#{Fog::Mock.random_hex(8)}"
+      end
+
+      def self.key_id(length=21)
+        #Probably close enough
+        Fog::Mock.random_selection('ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789',length)
+      end
+
+      def self.rds_address(db_name,region)
+        "#{db_name}.#{Fog::Mock.random_letters(rand(12) + 4)}.#{region}.rds.amazonaws.com"
+      end
+    end
+
+    def self.parse_security_group_options(group_name, options)
+      if group_name.is_a?(Hash)
+        options = group_name
+      elsif group_name
+        if options.key?('GroupName')
+          raise Fog::Compute::AWS::Error, 'Arguments specified both group_name and GroupName in options'
+        end
+        options = options.clone
+        options['GroupName'] = group_name
+      end
+      if !options.key?('GroupName') && !options.key?('GroupId')
+        raise Fog::Compute::AWS::Error, 'Neither GroupName nor GroupId specified'
+      end
+      if options.key?('GroupName') && options.key?('GroupId')
+        raise Fog::Compute::AWS::Error, 'Both GroupName and GroupId specified'
+      end
+      options
     end
   end
 end

data/lib/fog/{new_servers → bare_metal_cloud}/compute.rb

@@ -1,16 +1,16 @@
-require File.expand_path(File.join(File.dirname(__FILE__), '..', 'new_servers'))
+require File.expand_path(File.join(File.dirname(__FILE__), '..', 'bare_metal_cloud'))
 require 'fog/compute'
 
 module Fog
   module Compute
-    class NewServers < Fog::Service
+    class BareMetalCloud < Fog::Service
 
-      requires :new_servers_password, :new_servers_username
+      requires :bare_metal_cloud_password, :bare_metal_cloud_username
       recognizes :host, :port, :scheme, :persistent
 
-      model_path 'fog/new_servers/models/compute'
+      model_path 'fog/bare_metal_cloud/models/compute'
 
-      request_path 'fog/new_servers/requests/compute'
+      request_path 'fog/bare_metal_cloud/requests/compute'
       request :add_server
       request :cancel_server
       request :get_server
@@ -32,15 +32,15 @@ module Fog
         end
 
         def initialize(options={})
-          @new_server_username = options[:new_servers_username]
+          @bare_metal_cloud_username = options[:bare_metal_cloud_username]
         end
 
         def data
-          self.class.data[@new_server_username]
+          self.class.data[@bare_metal_cloud_username]
         end
 
         def reset_data
-          self.class.data.delete(@new_server_username)
+          self.class.data.delete(@bare_metal_cloud_username)
         end
 
       end
@@ -50,10 +50,10 @@ module Fog
         def initialize(options={})
           require 'fog/core/parser'
 
-          @new_servers_password = options[:new_servers_password]
-          @new_servers_username = options[:new_servers_username]
+          @bare_metal_cloud_password = options[:bare_metal_cloud_password]
+          @bare_metal_cloud_username = options[:bare_metal_cloud_username]
           @connection_options = options[:connection_options] || {}
-          @host       = options[:host]        || "noc.newservers.com"
+          @host       = options[:host]        || "noc.baremetalcloud.com"
           @persistent = options[:persistent]  || false
           @port       = options[:port]        || 443
           @scheme     = options[:scheme]      || 'https'
@@ -67,8 +67,8 @@ module Fog
         def request(params)
           params[:query] ||= {}
           params[:query].merge!({
-            :password => @new_servers_password,
-            :username => @new_servers_username
+            :password => @bare_metal_cloud_password,
+            :username => @bare_metal_cloud_username
           })
           params[:headers] ||= {}
           case params[:method]
@@ -83,7 +83,7 @@ module Fog
           rescue Excon::Errors::HTTPStatusError => error
             raise case error
             when Excon::Errors::NotFound
-              Fog::Compute::NewServers::NotFound.slurp(error)
+              Fog::Compute::BareMetalCloud::NotFound.slurp(error)
             else
               error
             end

data/lib/fog/{new_servers → bare_metal_cloud}/requests/compute/add_server.rb

@@ -1,6 +1,6 @@
 module Fog
   module Compute
-    class NewServers
+    class BareMetalCloud
       class Real
 
         # Boot a new server

data/lib/fog/{new_servers → bare_metal_cloud}/requests/compute/cancel_server.rb

@@ -1,6 +1,6 @@
 module Fog
   module Compute
-    class NewServers
+    class BareMetalCloud
       class Real
 
         # Shutdown a running server

data/lib/fog/{new_servers → bare_metal_cloud}/requests/compute/get_server.rb

@@ -1,6 +1,6 @@
 module Fog
   module Compute
-    class NewServers
+    class BareMetalCloud
       class Real
 
         # List servers

data/lib/fog/{new_servers → bare_metal_cloud}/requests/compute/list_images.rb

@@ -1,6 +1,6 @@
 module Fog
   module Compute
-    class NewServers
+    class BareMetalCloud
       class Real
 
         # List images

data/lib/fog/{new_servers → bare_metal_cloud}/requests/compute/list_plans.rb

@@ -1,6 +1,6 @@
 module Fog
   module Compute
-    class NewServers
+    class BareMetalCloud
       class Real
 
         # List available plans

data/lib/fog/{new_servers → bare_metal_cloud}/requests/compute/list_servers.rb

@@ -1,6 +1,6 @@
 module Fog
   module Compute
-    class NewServers
+    class BareMetalCloud
       class Real
 
         # List servers

data/lib/fog/{new_servers → bare_metal_cloud}/requests/compute/reboot_server.rb

@@ -1,6 +1,6 @@
 module Fog
   module Compute
-    class NewServers
+    class BareMetalCloud
       class Real
 
         # Reboot a running server

data/lib/fog/{new_servers.rb → bare_metal_cloud.rb}

@@ -1,11 +1,11 @@
 require(File.expand_path(File.join(File.dirname(__FILE__), 'core')))
 
 module Fog
-  module NewServers
+  module BareMetalCloud
 
     extend Fog::Provider
 
-    service(:compute, 'new_servers/compute', 'Compute')
+    service(:compute, 'bare_metal_cloud/compute', 'Compute')
 
   end
 end

data/lib/fog/bin/aws.rb

@@ -5,6 +5,8 @@ class AWS < Fog::Bin
       case key
       when :auto_scaling
         Fog::AWS::AutoScaling
+      when :beanstalk
+        Fog::AWS::ElasticBeanstalk
       when :cdn
         Fog::CDN::AWS
       when :cloud_formation
@@ -13,6 +15,8 @@ class AWS < Fog::Bin
         Fog::AWS::CloudWatch
       when :compute
         Fog::Compute::AWS
+      when :ddb, :dynamodb
+        Fog::AWS::DynamoDB
       when :dns
         Fog::DNS::AWS
       when :elasticache
@@ -35,6 +39,8 @@ class AWS < Fog::Bin
         Fog::AWS::RDS
       when :sns
         Fog::AWS::SNS
+      when :sts
+        Fog::AWS::STS
       else
         # @todo Replace most instances of ArgumentError with NotImplementedError
         # @todo For a list of widely supported Exceptions, see:
@@ -56,8 +62,10 @@ class AWS < Fog::Bin
         when :cloud_watch
           Fog::AWS::CloudWatch.new
         when :compute
-          Fog::Logger.warning("AWS[:compute] is not recommended, use Comptue[:aws] for portability")
+          Fog::Logger.warning("AWS[:compute] is not recommended, use Compute[:aws] for portability")
           Fog::Compute.new(:provider => 'AWS')
+        when :ddb, :dynamodb
+          Fog::AWS::DynamoDB.new
         when :dns
           Fog::Logger.warning("AWS[:dns] is not recommended, use DNS[:aws] for portability")
           Fog::DNS.new(:provider => 'AWS')
@@ -84,6 +92,8 @@ class AWS < Fog::Bin
           Fog::Storage.new(:provider => 'AWS')
         when :sns
           Fog::AWS::SNS.new
+        when :sts
+          Fog::AWS::STS.new
         else
           raise ArgumentError, "Unrecognized service: #{key.inspect}"
         end

data/lib/fog/bin/{new_servers.rb → bare_metal_cloud.rb}

@@ -1,10 +1,10 @@
-class NewServers < Fog::Bin
+class BareMetalCloud < Fog::Bin
   class << self
 
     def class_for(key)
       case key
       when :compute
-        Fog::Compute::NewServers
+        Fog::Compute::BareMetalCloud
       else 
         raise ArgumentError, "Unsupported #{self} service: #{key}"
       end
@@ -14,8 +14,8 @@ class NewServers < Fog::Bin
       @@connections ||= Hash.new do |hash, key|
         hash[key] = case key
         when :compute
-          Fog::Logger.warning("NewServers[:compute] is not recommended, use Compute[:newservers] for portability")
-          Fog::Compute.new(:provider => 'NewServers')
+          Fog::Logger.warning("BareMetalCloud[:compute] is not recommended, use Compute[:baremetalcloud] for portability")
+          Fog::Compute.new(:provider => 'BareMetalCloud')
         else
           raise ArgumentError, "Unrecognized service: #{key.inspect}"
         end
@@ -24,7 +24,7 @@ class NewServers < Fog::Bin
     end
 
     def services
-      Fog::NewServers.services
+      Fog::BareMetalCloud.services
     end
 
   end