fog 0.4.1 → 0.5.0

data/lib/fog/compute/rackspace.rb

@@ -100,13 +100,10 @@ module Fog
           end
 
           require 'json'
-          credentials = Fog::Rackspace.authenticate(options)
-          @auth_token = credentials['X-Auth-Token']
-          uri = URI.parse(credentials['X-Server-Management-Url'])
-          @host   = uri.host
-          @path   = uri.path
-          @port   = uri.port
-          @scheme = uri.scheme
+          @rackspace_api_key = options[:rackspace_api_key]
+          @rackspace_username = options[:rackspace_username]
+          @rackspace_auth_url = options[:rackspace_auth_url]
+          authenticate
           @connection = Fog::Connection.new("#{@scheme}://#{@host}:#{@port}", options[:persistent])
         end
 
@@ -124,6 +121,13 @@ module Fog
               :host     => @host,
               :path     => "#{@path}/#{params[:path]}"
             }))
+          rescue Excon::Errors::Unauthorized => error
+            if JSON.parse(response.body)['unauthorized']['message'] == 'Invalid authentication token.  Please renew.'
+              authenticate
+              retry
+            else
+              raise error
+            end
           rescue Excon::Errors::HTTPStatusError => error
             raise case error
             when Excon::Errors::NotFound
@@ -138,6 +142,23 @@ module Fog
           response
         end
 
+        private
+
+        def authenticate
+          options = {
+            :rackspace_api_key  => @rackspace_api_key,
+            :rackspace_username => @rackspace_username,
+            :rackspace_auth_url => @rackspace_auth_url
+          }
+          credentials = Fog::Rackspace.authenticate(options)
+          @auth_token = credentials['X-Auth-Token']
+          uri = URI.parse(credentials['X-Server-Management-Url'])
+          @host   = uri.host
+          @path   = uri.path
+          @port   = uri.port
+          @scheme = uri.scheme
+        end
+
       end
     end
   end

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

@@ -56,7 +56,54 @@ module Fog
       class Mock
 
         def describe_images(filters = {})
-          Fog::Mock.not_implemented
+          unless filters.is_a?(Hash)
+            Formatador.display_line("[yellow][WARN] describe_images with #{filters.class} param is deprecated, use describe_snapshots('snapshot-id' => []) instead[/] [light_black](#{caller.first})[/]")
+            filters = {'snapshot-id' => [*filters]}
+          end
+          
+          if filters.keys.any? {|key| key =~ /^block-device/}
+            Formatador.display_line("[yellow][WARN] describe_images block-device-mapping filters are not yet mocked[/] [light_black](#{caller.first})[/]")
+            Fog::Mock.not_implemented
+          end
+          
+          if filters.keys.any? {|key| key =~ /^tag/}
+            Formatador.display_line("[yellow][WARN] describe_images tag filters are not yet mocked[/] [light_black](#{caller.first})[/]")
+            Fog::Mock.not_implemented
+          end
+          
+          response = Excon::Response.new
+          
+          aliases = {
+            'architecture'        => 'architecture',
+            'description'         => 'description',
+            'hypervisor'          => 'hypervisor',
+            'image-id'            => 'imageId',
+            'image-type'          => 'imageType',
+            'is-public'           => 'isPublic',
+            'kernel-id'           => 'kernelId',
+            'manifest-location'   => 'manifestLocation',
+            'name'                => 'name',            
+            'owner-id'            => 'imageOwnerId',
+            'ramdisk-id'          => 'ramdiskId',
+            'root-device-name'    => 'rootDeviceName',
+            'root-device-type'    => 'rootDeviceType',
+            'state'               => 'imageState',
+            'virtualization-type' => 'virtualizationType'
+          }
+          
+          image_set = @data[:images].values
+          
+          for filter_key, filter_value in filters
+            aliased_key = aliases[filter_key]
+            image_set = image_set.reject{|image| ![*filter_value].include?(image[aliased_key])}
+          end
+
+          response.status = 200
+          response.body = {
+            'requestId' => Fog::AWS::Mock.request_id,
+            'imagesSet' => image_set
+          }
+          response
         end
 
       end

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

@@ -0,0 +1,45 @@
+module Fog
+  module AWS
+    class Compute
+      class Real
+
+        require 'fog/compute/parsers/aws/describe_reserved_instances_offerings'
+
+        # Describe all or specified reserved instances offerings
+        #
+        # ==== Parameters
+        # * filters<~Hash> - List of filters to limit results with
+        #
+        # ==== Returns
+        # * response<~Excon::Response>:
+        #   * body<~Hash>:
+        #     * 'requestId'<~String> - Id of request
+        #     * 'reservedInstancesOfferingsSet'<~Array>:
+        #       * 'availabilityZone'<~String> - availability zone of offering
+        #       * 'duration'<~Integer> - duration, in seconds, of offering
+        #       * 'fixedPrice'<~Float> - purchase price of offering
+        #       * 'instanceType'<~String> - instance type of offering
+        #       * 'productDescription'<~String> - description of offering
+        #       * 'reservedInstancesOfferingId'<~String> - id of offering
+        #       * 'usagePrice'<~Float> - usage price of offering, per hour
+        def describe_reserved_instances_offerings(filters = {})
+          params = AWS.indexed_filters(filters)
+          request({
+            'Action'    => 'DescribeReservedInstancesOfferings',
+            :idempotent => true,
+            :parser     => Fog::Parsers::AWS::Compute::DescribeReservedInstancesOfferings.new
+          }.merge!(params))
+        end
+
+      end
+
+      class Mock
+
+        def describe_reserved_instances_offerings(filters = {})
+          Fog::Mock.not_implemented
+        end
+
+      end
+    end
+  end
+end

data/lib/fog/compute/requests/go_grid/grid_server_add.rb

@@ -6,11 +6,11 @@ module Fog
         # Create a new server
         #
         # ==== Parameters
+        # * 'name'<~String>   - name of the server, 20 or fewer characters
         # * 'image'<~String>  - image to use, in grid_image_list
         # * 'ip'<~String> - initial public ip for this server
-        # * 'name'<~String>   - name of the server, 20 or fewer characters
-        # * 'server_ram'<~String> - flavor to use, in common_lookup_list('server.ram')
         # * 'options'<~Hash>:
+        #   * 'server.ram'<~String> - flavor to use, in common_lookup_list('server.ram')
         #   * 'description'<~String>  - description of this server
         #   * 'isSandbox'<~String>    - treat this server as image sandbox? in ['true', 'false']
         #

data/lib/fog/core/ssh.rb

@@ -2,9 +2,6 @@ module Fog
   module SSH
 
     def self.new(address, username, options = {})
-      unless options[:key_data] || options[:keys] || options[:password]
-        raise ArgumentError.new(':key_data, :keys or :password are required to initialize SSH')
-      end
       if Fog.mocking?
         Fog::SSH::Mock.new(address, username, options)
       else
@@ -40,6 +37,13 @@ module Fog
 
       def initialize(address, username, options)
         require 'net/ssh'
+
+        key_manager = Net::SSH::Authentication::KeyManager.new(nil, options)
+
+        unless options[:key_data] || options[:keys] || options[:password] || key_manager.agent
+          raise ArgumentError.new(':key_data, :keys, :password or a loaded ssh-agent is required to initialize SSH')
+        end
+
         @address  = address
         @username = username
         @options  = { :paranoid => false }.merge(options)

data/lib/fog/dns.rb

@@ -17,7 +17,7 @@ module Fog
         require 'fog/dns/zerigo'
         Fog::Zerigo::DNS.new(attributes)
       else
-        raise ArgumentError.new("#{provider} is not a recognized storage provider")
+        raise ArgumentError.new("#{provider} is not a recognized dns provider")
       end
     end
 

data/lib/fog/dns/requests/aws/create_hosted_zone.rb

@@ -10,18 +10,18 @@ module Fog
         # ==== Parameters
         # * name<~String> - The name of the domain. Must be a fully-specified domain that ends with a period
         # * options<~Hash>
-        #   * caller_ref<~String> - unique string that identifies the request & allows failed 
+        #   * caller_ref<~String> - unique string that identifies the request & allows failed
         #                           calls to be retried without the risk of executing the operation twice
-        #   * comment<~Integer> - 
+        #   * comment<~Integer> -
         #
         # ==== Returns
         # * response<~Excon::Response>:
         #   * body<~Hash>:
         #     * 'HostedZone'<~Hash>:
-        #       * 'Id'<~String> - 
-        #       * 'Name'<~String> - 
+        #       * 'Id'<~String> -
+        #       * 'Name'<~String> -
         #       * 'CallerReference'<~String>
-        #       * 'Comment'<~String> - 
+        #       * 'Comment'<~String> -
         #     * 'ChangeInfo'<~Hash> -
         #       * 'Id'<~String>
         #       * 'Status'<~String>
@@ -33,16 +33,16 @@ module Fog
 
           optional_tags = ''
           if options[:caller_ref]
-              optional_tags+= "<CallerReference>#{options[:call_ref]}</CallerReference>"
+              optional_tags+= "<CallerReference>#{options[:caller_ref]}</CallerReference>"
           else
             #make sure we have a unique call reference
             caller_ref = "ref-#{rand(1000000).to_s}"
-            optional_tags+= "<CallerReference>#{caller_ref}</CallerReference>"            
+            optional_tags+= "<CallerReference>#{caller_ref}</CallerReference>"
           end
           if options[:comment]
               optional_tags+= "<HostedZoneConfig><Comment>#{options[:comment]}</Comment></HostedZoneConfig>"
           end
-            
+
           request({
             :body       => %Q{<?xml version="1.0" encoding="UTF-8"?><CreateHostedZoneRequest xmlns="https://route53.amazonaws.com/doc/2010-10-01/"><Name>#{name}</Name>#{optional_tags}</CreateHostedZoneRequest>},
             :parser     => Fog::Parsers::AWS::DNS::CreateHostedZone.new,

data/lib/fog/providers/aws.rb

@@ -15,6 +15,7 @@ module Fog
     service(:elb,       'aws/elb')
     service(:iam,       'aws/iam')
     service(:s3,        'storage/aws')
+    service(:ses,       'aws/ses')
     service(:simpledb,  'aws/simpledb')
     service(:storage,   'storage/aws')
 

data/lib/fog/storage/aws.rb

@@ -21,7 +21,7 @@ module Fog
       requires :aws_access_key_id, :aws_secret_access_key
       recognizes :endpoint, :region, :host, :path, :port, :scheme, :persistent
       recognizes :provider # remove post deprecation
-      
+
       model_path 'fog/storage/models/aws'
       collection  :directories
       model       :directory
@@ -79,14 +79,14 @@ module Fog
 
           if data.is_a?(String)
             metadata[:body] = data
-            metadata[:headers]['Content-Length'] = metadata[:body].size.to_s
+            metadata[:headers]['Content-Length'] = metadata[:body].size
           else
             filename = ::File.basename(data.path)
             unless (mime_types = MIME::Types.of(filename)).empty?
               metadata[:headers]['Content-Type'] = mime_types.first.content_type
             end
             metadata[:body] = data
-            metadata[:headers]['Content-Length'] = ::File.size(data.path).to_s
+            metadata[:headers]['Content-Length'] = ::File.size(data.path)
           end
           # metadata[:headers]['Content-MD5'] = Base64.encode64(Digest::MD5.digest(metadata[:body])).strip
           metadata
@@ -94,13 +94,13 @@ module Fog
 
         def url(params, expires)
           params[:headers]['Date'] = expires.to_i
+          params[:path] = CGI.escape(params[:path]).gsub('%2F', '/')
           query = [params[:query]].compact
           query << "AWSAccessKeyId=#{@aws_access_key_id}"
           query << "Signature=#{CGI.escape(signature(params))}"
           query << "Expires=#{params[:headers]['Date']}"
           bucket = params[:host].split('.').first
-          path = CGI.escape(params[:path]).gsub('%2F', '/')
-          "https://#{@host}/#{path}?#{query.join('&')}"
+          "https://#{@host}/#{params[:path]}?#{query.join('&')}"
         end
 
       end
@@ -111,7 +111,7 @@ module Fog
         def self.acls(type)
           case type
           when 'private'
-            @private ||= {
+            {
               "AccessControlList" => [
                 {
                   "Permission" => "FULL_CONTROL",
@@ -121,32 +121,51 @@ module Fog
               "Owner" => {"DisplayName" => "me", "ID" => "2744ccd10c7533bd736ad890f9dd5cab2adb27b07d500b9493f29cdc420cb2e0"}
             }
           when 'public-read'
-            @public_read ||= begin
-              public_read = self.acls('private').dup
-              public_read['AccessControlList'] << {
-                "Permission" => "READ",
-                "Grantee" => {"URI" => "http://acs.amazonaws.com/groups/global/AllUsers"}
-              }
-              public_read
-            end
+            {
+              "AccessControlList" => [
+                {
+                  "Permission" => "FULL_CONTROL",
+                  "Grantee" => {"DisplayName" => "me", "ID" => "2744ccd10c7533bd736ad890f9dd5cab2adb27b07d500b9493f29cdc420cb2e0"}
+                },
+                {
+                  "Permission" => "READ",
+                  "Grantee" => {"URI" => "http://acs.amazonaws.com/groups/global/AllUsers"}
+                }
+              ],
+              "Owner" => {"DisplayName" => "me", "ID" => "2744ccd10c7533bd736ad890f9dd5cab2adb27b07d500b9493f29cdc420cb2e0"}
+            }
           when 'public-read-write'
-            @public_read_write ||= begin
-              public_read_write = self.acls('public-read').dup
-              public_read_write['AccessControlList'] << {
-                "Permission" => "WRITE",
-                "Grantee" => {"URI" => "http://acs.amazonaws.com/groups/global/AllUsers"}
-              }
-              public_read_write
-            end
+            {
+              "AccessControlList" => [
+                {
+                  "Permission" => "FULL_CONTROL",
+                  "Grantee" => {"DisplayName" => "me", "ID" => "2744ccd10c7533bd736ad890f9dd5cab2adb27b07d500b9493f29cdc420cb2e0"}
+                },
+                {
+                  "Permission" => "READ",
+                  "Grantee" => {"URI" => "http://acs.amazonaws.com/groups/global/AllUsers"}
+                },
+                {
+                  "Permission" => "WRITE",
+                  "Grantee" => {"URI" => "http://acs.amazonaws.com/groups/global/AllUsers"}
+                }
+              ],
+              "Owner" => {"DisplayName" => "me", "ID" => "2744ccd10c7533bd736ad890f9dd5cab2adb27b07d500b9493f29cdc420cb2e0"}
+            }
           when 'authenticated-read'
-            @authenticated_read ||= begin
-              authenticated_read = self.acls('private').dup
-              authenticated_read['AccessControlList'] << {
-                "Permission" => "READ",
-                "Grantee" => {"URI" => "http://acs.amazonaws.com/groups/global/AuthenticatedUsers"}
-              }
-              authenticated_read
-            end
+            {
+              "AccessControlList" => [
+                {
+                  "Permission" => "FULL_CONTROL",
+                  "Grantee" => {"DisplayName" => "me", "ID" => "2744ccd10c7533bd736ad890f9dd5cab2adb27b07d500b9493f29cdc420cb2e0"}
+                },
+                {
+                  "Permission" => "READ",
+                  "Grantee" => {"URI" => "http://acs.amazonaws.com/groups/global/AuthenticatedUsers"}
+                }
+              ],
+              "Owner" => {"DisplayName" => "me", "ID" => "2744ccd10c7533bd736ad890f9dd5cab2adb27b07d500b9493f29cdc420cb2e0"}
+            }
           end
         end
 

data/lib/fog/storage/google.rb

@@ -39,14 +39,14 @@ module Fog
 
           if data.is_a?(String)
             metadata[:body] = data
-            metadata[:headers]['Content-Length'] = metadata[:body].size.to_s
+            metadata[:headers]['Content-Length'] = metadata[:body].size
           else
             filename = ::File.basename(data.path)
             unless (mime_types = MIME::Types.of(filename)).empty?
               metadata[:headers]['Content-Type'] = mime_types.first.content_type
             end
             metadata[:body] = data
-            metadata[:headers]['Content-Length'] = ::File.size(data.path).to_s
+            metadata[:headers]['Content-Length'] = ::File.size(data.path)
           end
           # metadata[:headers]['Content-MD5'] = Base64.encode64(Digest::MD5.digest(metadata[:body])).strip
           metadata
@@ -54,12 +54,12 @@ module Fog
 
         def url(params, expires)
           params[:headers]['Date'] = expires.to_i
+          params[:path] = CGI.escape(params[:path]).gsub('%2F', '/')
           query = [params[:query]].compact
           query << "GoogleAccessKeyId=#{@google_storage_access_key_id}"
           query << "Signature=#{CGI.escape(signature(params))}"
           query << "Expires=#{params[:headers]['Date']}"
-          path = CGI.escape(params[:path]).gsub('%2F', '/')
-          "http://#{params[:host]}/#{path}?#{query.join('&')}"
+          "http://#{params[:host]}/#{params[:path]}?#{query.join('&')}"
         end
 
       end
@@ -70,7 +70,7 @@ module Fog
         def self.acls(type)
           case type
           when 'private'
-            @private ||= {
+            {
               "AccessControlList"=> [
                 {
                   "Permission" => "FULL_CONTROL",
@@ -80,32 +80,51 @@ module Fog
               "Owner" => {"ID" => "2744ccd10c7533bd736ad890f9dd5cab2adb27b07d500b9493f29cdc420cb2e0"}
             }
           when 'public-read'
-            @public_read ||= begin
-              public_read = self.acls('private').dup
-              public_read['AccessControlList'] << {
-                "Permission" => "READ",
-                "Scope" => {"type" => "AllUsers"}
-              }
-              public_read
-            end
+            {
+              "AccessControlList"=> [
+                {
+                  "Permission" => "FULL_CONTROL",
+                  "Scope" => {"ID" => "2744ccd10c7533bd736ad890f9dd5cab2adb27b07d500b9493f29cdc420cb2e0", "type" => "UserById"}
+                },
+                {
+                  "Permission" => "READ",
+                  "Scope" => {"type" => "AllUsers"}
+                }
+              ],
+              "Owner" => {"ID" => "2744ccd10c7533bd736ad890f9dd5cab2adb27b07d500b9493f29cdc420cb2e0"}
+            }
           when 'public-read-write'
-            @public_read_write ||= begin
-              public_read_write = self.acls('private').dup
-              public_read_write['AccessControlList'] << {
-                "Permission" => "WRITE",
-                "Scope" => {"type" => "AllUsers"}
-              }
-              public_read_write
-            end
+            {
+              "AccessControlList"=> [
+                {
+                  "Permission" => "FULL_CONTROL",
+                  "Scope" => {"ID" => "2744ccd10c7533bd736ad890f9dd5cab2adb27b07d500b9493f29cdc420cb2e0", "type" => "UserById"}
+                },
+                {
+                  "Permission" => "READ",
+                  "Scope" => {"type" => "AllUsers"}
+                },
+                {
+                  "Permission" => "WRITE",
+                  "Scope" => {"type" => "AllUsers"}
+                }
+              ],
+              "Owner" => {"ID" => "2744ccd10c7533bd736ad890f9dd5cab2adb27b07d500b9493f29cdc420cb2e0"}
+            }
           when 'authenticated-read'
-            @authenticated_read ||= begin
-              authenticated_read = self.acls('private').dup
-              authenticated_read['AccessControlList'] << {
-                "Permission" => "READ",
-                "Scope" => {"type" => "AllAuthenticatedUsers"}
-              }
-              authenticated_read
-            end
+            {
+              "AccessControlList"=> [
+                {
+                  "Permission" => "FULL_CONTROL",
+                  "Scope" => {"ID" => "2744ccd10c7533bd736ad890f9dd5cab2adb27b07d500b9493f29cdc420cb2e0", "type" => "UserById"}
+                },
+                {
+                  "Permission" => "READ",
+                  "Scope" => {"type" => "AllAuthenticatedUsers"}
+                }
+              ],
+              "Owner" => {"ID" => "2744ccd10c7533bd736ad890f9dd5cab2adb27b07d500b9493f29cdc420cb2e0"}
+            }
           end
         end