fog 1.3.1 → 1.4.0

data/docs/storage/index.markdown

@@ -35,8 +35,8 @@ First, create a connection with your new account:
     # create a connection
     connection = Fog::Storage.new({
       :provider                 => 'AWS',
-      :aws_access_key_id        => YOUR_SECRET_ACCESS_KEY_ID,
-      :aws_secret_access_key    => YOUR_SECRET_ACCESS_KEY
+      :aws_access_key_id        => YOUR_AWS_ACCESS_KEY_ID,
+      :aws_secret_access_key    => YOUR_AWS_SECRET_ACCESS_KEY
     })
 
     # First, a place to contain the glorious details

data/fog.gemspec

@@ -6,10 +6,11 @@ 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.3.1'
-  s.date              = '2012-03-27'
+  s.version           = '1.4.0'
+  s.date              = '2012-06-24'
   s.rubyforge_project = 'fog'
 
+
   ## Make sure your summary is short. The description may be as long
   ## as you like.
   s.summary     = "brings clouds to you"
@@ -26,6 +27,10 @@ Gem::Specification.new do |s|
   # s.require_paths << 'ext'
   # s.extensions = %w[ext/extconf.rb]
 
+  ## This gets added to the $LOAD_PATH so that 'lib/NAME.rb' can be required as
+  ## require 'NAME.rb' or'/lib/NAME/file.rb' can be as require 'NAME/file.rb'
+  s.require_paths = %w[lib]
+
   ## If your gem includes any executables, list them here.
   s.executables = ["fog"]
 
@@ -37,7 +42,7 @@ Gem::Specification.new do |s|
   ## List your runtime dependencies here. Runtime dependencies are those
   ## that are needed for an end user to actually USE your code.
   s.add_dependency('builder')
-  s.add_dependency('excon', '~>0.13.0')
+  s.add_dependency('excon', '~>0.14.0')
   s.add_dependency('formatador', '~>0.2.0')
   s.add_dependency('multi_json', '~>1.0')
   s.add_dependency('mime-types')
@@ -54,10 +59,11 @@ Gem::Specification.new do |s|
   s.add_development_dependency('rdoc')
   s.add_development_dependency('thor')
   s.add_development_dependency('rspec', '~>1.3.1')
-  s.add_development_dependency('rbovirt', '>=0.0.9')
+  s.add_development_dependency('rbovirt', '>=0.0.11')
   s.add_development_dependency('shindo', '~>0.3.4')
   s.add_development_dependency('virtualbox', '~>0.9.1')
   s.add_development_dependency('fission')
+  s.add_development_dependency('pry')
 #  s.add_development_dependency('ruby-libvirt','~>0.4.0')
 
   s.files = `git ls-files`.split("\n")

data/lib/fog.rb

@@ -3,7 +3,7 @@ require File.join(File.dirname(__FILE__), 'fog', 'core')
 module Fog
 
   unless const_defined?(:VERSION)
-    VERSION = '1.3.1'
+    VERSION = '1.4.0'
   end
 
 end
@@ -13,6 +13,9 @@ require 'fog/providers'
 require 'fog/terremark'
 
 require 'fog/compute'
+require 'fog/identity'
+require 'fog/image'
+require 'fog/volume'
 require 'fog/cdn'
 require 'fog/dns'
 require 'fog/storage'

data/lib/fog/aws.rb

@@ -1,5 +1,5 @@
-require(File.expand_path(File.join(File.dirname(__FILE__), 'core')))
-
+require 'fog/core'
+require 'fog/aws/credential_fetcher'
 module Fog
   module AWS
 
@@ -60,6 +60,14 @@ module Fog
       end
     end
 
+    def self.indexed_request_param(name, values)
+      idx = -1
+      Array(values).inject({}) do |params, value|
+        params["#{name}.#{idx += 1}"] = value
+        params
+      end
+    end
+
     def self.indexed_filters(filters)
       params = {}
       filters.keys.each_with_index do |key, key_index|
@@ -226,6 +234,36 @@ module Fog
         "sg-#{Fog::Mock.random_hex(8)}"
       end
 
+      def self.network_interface_id
+        "eni-#{Fog::Mock.random_hex(8)}"
+      end
+      def self.internet_gateway_id
+        "igw-#{Fog::Mock.random_hex(8)}"
+      end
+      def self.dhcp_options_id
+        "dopt-#{Fog::Mock.random_hex(8)}"
+      end
+      def self.vpc_id
+        "vpc-#{Fog::Mock.random_hex(8)}"
+      end
+      def self.subnet_id
+        "subnet-#{Fog::Mock.random_hex(8)}"
+      end
+      def self.zone_id
+        "zone-#{Fog::Mock.random_hex(8)}"
+      end
+      def self.change_id
+        "change-#{Fog::Mock.random_hex(8)}"
+      end
+      def self.nameservers
+        [
+          'ns-2048.awsdns-64.com',
+          'ns-2049.awsdns-65.net',
+          'ns-2050.awsdns-66.org',
+          'ns-2051.awsdns-67.co.uk'
+        ]
+      end
+
       def self.key_id(length=21)
         #Probably close enough
         Fog::Mock.random_selection('ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789',length)
@@ -237,6 +275,7 @@ module Fog
     end
 
     def self.parse_security_group_options(group_name, options)
+      options ||= Hash.new
       if group_name.is_a?(Hash)
         options = group_name
       elsif group_name
@@ -246,11 +285,13 @@ module Fog
         options = options.clone
         options['GroupName'] = group_name
       end
-      if !options.key?('GroupName') && !options.key?('GroupId')
+      name_specified = options.key?('GroupName') && !options['GroupName'].nil?
+      group_id_specified = options.key?('GroupId') && !options['GroupId'].nil?
+      unless name_specified || group_id_specified
         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'
+      if name_specified && group_id_specified
+        options.delete('GroupName')
       end
       options
     end

data/lib/fog/aws/auto_scaling.rb

@@ -1,15 +1,16 @@
-require File.expand_path(File.join(File.dirname(__FILE__), '..', 'aws'))
+require 'fog/aws'
 
 module Fog
   module AWS
     class AutoScaling < Fog::Service
+      extend Fog::AWS::CredentialFetcher::ServiceMethods
 
       class IdentifierTaken < Fog::Errors::Error; end
       class ResourceInUse < Fog::Errors::Error; end
       class ValidationError < Fog::Errors::Error; end
 
       requires :aws_access_key_id, :aws_secret_access_key
-      recognizes :host, :path, :port, :scheme, :persistent, :region
+      recognizes :host, :path, :port, :scheme, :persistent, :region, :use_iam_profile, :aws_session_token, :aws_credentials_expire_at
 
       request_path 'fog/aws/requests/auto_scaling'
       request :create_auto_scaling_group
@@ -32,6 +33,7 @@ module Fog
       request :execute_policy
       request :put_scaling_policy
       request :put_scheduled_update_group_action
+      request :put_notification_configuration
       request :resume_processes
       request :set_desired_capacity
       request :set_instance_health
@@ -50,7 +52,7 @@ module Fog
       collection :instances
 
       class Real
-
+        include Fog::AWS::CredentialFetcher::ConnectionMethods
         # Initialize connection to AutoScaling
         #
         # ==== Notes
@@ -71,9 +73,8 @@ module Fog
         def initialize(options={})
           require 'fog/core/parser'
 
-          @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)
+          @use_iam_profile = options[:use_iam_profile]
+          setup_credentials(options)
 
           @connection_options = options[:connection_options] || {}
           options[:region] ||= 'us-east-1'
@@ -92,6 +93,8 @@ module Fog
         private
 
         def request(params)
+          refresh_credentials_if_expired
+
           idempotent  = params.delete(:idempotent)
           parser      = params.delete(:parser)
 
@@ -99,11 +102,12 @@ module Fog
             params,
             {
               :aws_access_key_id  => @aws_access_key_id,
+              :aws_session_token  => @aws_session_token,
               :hmac               => @hmac,
               :host               => @host,
               :path               => @path,
               :port               => @port,
-              :version            => '2010-08-01'
+              :version            => '2011-01-01'
             }
           )
 
@@ -138,13 +142,21 @@ module Fog
           response
         end
 
+        def setup_credentials(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]
+          @aws_credentials_expire_at = options[:aws_credentials_expire_at]
+
+          @hmac       = Fog::HMAC.new('sha256', @aws_secret_access_key)
+        end
       end
 
+
       class Mock
 
         def self.data
           @data ||= Hash.new do |hash, region|
-            owner_id = Fog::AWS::Mock.owner_id
             hash[region] = Hash.new do |region_hash, key|
               region_hash[key] = {
                 :adjustment_types => [
@@ -186,9 +198,8 @@ module Fog
         end
 
         def initialize(options={})
-
-          @aws_access_key_id = options[:aws_access_key_id]
-
+          @use_iam_profile = options[:use_iam_profile]
+          setup_credentials(options)
           @region = options[:region] || 'us-east-1'
 
           unless ['ap-northeast-1', 'ap-southeast-1', 'eu-west-1', 'sa-east-1', 'us-east-1', 'us-west-1', 'us-west-2'].include?(@region)
@@ -197,6 +208,10 @@ module Fog
 
         end
 
+        def setup_credentials(options)
+          @aws_access_key_id      = options[:aws_access_key_id]
+        end
+
         def data
           self.class.data[@region][@aws_access_key_id]
         end

data/lib/fog/aws/beanstalk.rb

@@ -1,12 +1,14 @@
-require File.expand_path(File.join(File.dirname(__FILE__), '..', 'aws'))
+require 'fog/aws'
 
 module Fog
   module AWS
     class ElasticBeanstalk < Fog::Service
-
+      extend Fog::AWS::CredentialFetcher::ServiceMethods
+      
       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
 
       request_path 'fog/aws/requests/beanstalk'
 
@@ -62,14 +64,12 @@ module Fog
       end
 
       class Real
-
+        include Fog::AWS::CredentialFetcher::ConnectionMethods
         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]
-          @hmac                   = Fog::HMAC.new('sha256', @aws_secret_access_key)
+          @use_iam_profile = options[:use_iam_profile]
+          setup_credentials(options)
 
           @connection_options = options[:connection_options] || {}
           options[:region] ||= 'us-east-1'
@@ -92,7 +92,18 @@ module Fog
 
         private
 
+        def setup_credentials(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]
+          @aws_credentials_expire_at = options[:aws_credentials_expire_at]
+
+          @hmac                   = Fog::HMAC.new('sha256', @aws_secret_access_key)
+        end
+
         def request(params)
+          refresh_credentials_if_expired
+
           idempotent  = params.delete(:idempotent)
           parser      = params.delete(:parser)
 
@@ -100,6 +111,7 @@ module Fog
               params,
               {
                   :aws_access_key_id  => @aws_access_key_id,
+                  :aws_session_token  => @aws_session_token,
                   :hmac               => @hmac,
                   :host               => @host,
                   :path               => @path,
@@ -109,15 +121,15 @@ module Fog
           )
 
           begin
-            response = @connection.request({
-                                               :body       => body,
-                                               :expects    => 200,
-                                               :headers    => { 'Content-Type' => 'application/x-www-form-urlencoded' },
-                                               :idempotent => idempotent,
-                                               :host       => @host,
-                                               :method     => 'POST',
-                                               :parser     => parser
-                                           })
+            @connection.request({
+                :body       => body,
+                :expects    => 200,
+                :headers    => { 'Content-Type' => 'application/x-www-form-urlencoded' },
+                :idempotent => idempotent,
+                :host       => @host,
+                :method     => 'POST',
+                :parser     => parser
+            })
           rescue Excon::Errors::HTTPStatusError => error
             if match = error.response.body.match(/<Code>(.*)<\/Code>[ \t\n]*<Message>(.*)<\/Message>/)
               raise case match[1].split('.').last

data/lib/fog/aws/cdn.rb

@@ -1,12 +1,13 @@
-require File.expand_path(File.join(File.dirname(__FILE__), '..', 'aws'))
+require 'fog/aws'
 require 'fog/cdn'
 
 module Fog
   module CDN
     class AWS < Fog::Service
+      extend Fog::AWS::CredentialFetcher::ServiceMethods
 
       requires :aws_access_key_id, :aws_secret_access_key
-      recognizes :host, :path, :port, :scheme, :version, :persistent
+      recognizes :host, :path, :port, :scheme, :version, :persistent, :use_iam_profile, :aws_session_token, :aws_credentials_expire_at
 
       model_path 'fog/aws/cdn/models'
 
@@ -42,7 +43,8 @@ module Fog
 
         def initialize(options={})
           require 'mime/types'
-          @aws_access_key_id  = options[:aws_access_key_id]
+          @use_iam_profile = options[:use_iam_profile]
+          setup_credentials(options)
           @region             = options[:region]
         end
 
@@ -58,10 +60,13 @@ module Fog
           "foo"
         end
 
+        def setup_credentials(options={})
+          @aws_access_key_id  = options[:aws_access_key_id]
+        end
       end
 
       class Real
-
+        include Fog::AWS::CredentialFetcher::ConnectionMethods
         # Initialize connection to Cloudfront
         #
         # ==== Notes
@@ -82,13 +87,12 @@ module Fog
         def initialize(options={})
           require 'fog/core/parser'
 
-          @aws_access_key_id = options[:aws_access_key_id]
-          @aws_secret_access_key = options[:aws_secret_access_key]
+          @use_iam_profile = options[:use_iam_profile]
+          setup_credentials(options)
           @connection_options = options[:connection_options] || {}
-          @hmac       = Fog::HMAC.new('sha1', @aws_secret_access_key)
           @host       = options[:host]      || 'cloudfront.amazonaws.com'
           @path       = options[:path]      || '/'
-          @persistent = options[:persistent] || true
+          @persistent = options.fetch(:persistent, true)
           @port       = options[:port]      || 443
           @scheme     = options[:scheme]    || 'https'
           @version    = options[:version]  || '2010-11-01'
@@ -101,9 +105,21 @@ module Fog
 
         private
 
+        def setup_credentials(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]
+          @aws_credentials_expire_at = options[:aws_credentials_expire_at]
+
+          @hmac       = Fog::HMAC.new('sha1', @aws_secret_access_key)
+        end
+
         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]['Authorization'] = "AWS #{@aws_access_key_id}:#{signature(params)}"
           params[:path] = "/#{@version}/#{params[:path]}" 
           @connection.request(params, &block)
@@ -112,7 +128,7 @@ module Fog
         def signature(params)
           string_to_sign = params[:headers]['Date']
           signed_string = @hmac.sign(string_to_sign)
-          signature = Base64.encode64(signed_string).chomp!
+          Base64.encode64(signed_string).chomp!
         end
       end
     end

data/lib/fog/aws/cloud_formation.rb

@@ -1,11 +1,12 @@
-require File.expand_path(File.join(File.dirname(__FILE__), '..', 'aws'))
+require 'fog/aws'
 
 module Fog
   module AWS
     class CloudFormation < Fog::Service
+      extend Fog::AWS::CredentialFetcher::ServiceMethods
 
       requires :aws_access_key_id, :aws_secret_access_key
-      recognizes :host, :path, :port, :scheme, :persistent, :region
+      recognizes :host, :path, :port, :scheme, :persistent, :region, :use_iam_profile, :aws_session_token, :aws_credentials_expire_at
 
       request_path 'fog/aws/requests/cloud_formation'
       request :create_stack
@@ -26,7 +27,7 @@ module Fog
       end
 
       class Real
-
+        include Fog::AWS::CredentialFetcher::ConnectionMethods
         # Initialize connection to CloudFormation
         #
         # ==== Notes
@@ -46,11 +47,9 @@ module Fog
         # * CloudFormation 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]
-          @hmac       = Fog::HMAC.new('sha256', @aws_secret_access_key)
+          @use_iam_profile = options[:use_iam_profile]
+          setup_credentials(options)
 
           @connection_options = options[:connection_options] || {}
           options[:region] ||= 'us-east-1'
@@ -68,7 +67,18 @@ module Fog
 
         private
 
+        def setup_credentials(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]
+          @aws_credentials_expire_at = options[:aws_credentials_expire_at]
+
+          @hmac       = Fog::HMAC.new('sha256', @aws_secret_access_key)
+        end
+
         def request(params)
+          refresh_credentials_if_expired
+
           idempotent  = params.delete(:idempotent)
           parser      = params.delete(:parser)
 
@@ -76,6 +86,7 @@ module Fog
             params,
             {
               :aws_access_key_id  => @aws_access_key_id,
+              :aws_session_token  => @aws_session_token,
               :hmac               => @hmac,
               :host               => @host,
               :path               => @path,