aws-sdk 1.5.4 → 1.5.5

data/lib/aws/core/http/httparty_handler.rb

@@ -92,12 +92,13 @@ module AWS
   
           begin
             http_response = self.class.send(method, url, opts)
+            unless http_response.nil?
+              response.body = http_response.body
+              response.status = http_response.code.to_i
+              response.headers = http_response.to_hash
+            end
           rescue Timeout::Error, Errno::ETIMEDOUT => e
             response.timeout = true
-          else
-            response.body = http_response.body
-            response.status = http_response.code.to_i
-            response.headers = http_response.to_hash
           end
         end
       end

data/lib/aws/core/http/net_http_handler.rb

@@ -17,17 +17,28 @@ module AWS
   module Core
     module Http
   
-      # The default http request handler for the aws-sdk gem.  It is based
-      # on Net::Http.
+      # = NetHttpHandler
+      #
+      # This is the default HTTP handler for the aws-sdk gem.  It uses
+      # Ruby's Net::HTTP to make requests.  It uses persistent connections
+      # and a connection pool.
+      #
       class NetHttpHandler
 
-        @@pool = Net::HTTP::ConnectionPool.new
-
-        # @private
-        def self.pool
-          @@pool
+        # (see Net::HTTP::ConnectionPool.new)
+        def initialize options = {}
+          @pool = Net::HTTP::ConnectionPool.new(options)
         end
+
+        # @return [Net::HTTP::ConnectionPool]
+        attr_reader :pool
   
+        # Given a populated request object and an empty response object,
+        # this method will make the request and them populate the 
+        # response.
+        # @param [Request] request
+        # @param [Response] response
+        # @return [nil]
         def handle request, response
 
           options = {}
@@ -38,23 +49,28 @@ module AWS
           options[:ssl_ca_file] = request.ssl_ca_file if request.ssl_ca_file
           options[:ssl_ca_path] = request.ssl_ca_path if request.ssl_ca_path
 
-          connection = self.class.pool.connection_for(request.host, options)
+          connection = pool.connection_for(request.host, options)
           connection.read_timeout = request.read_timeout
 
           begin
-            http_response = connection.request(build_request(request))
+            http_response = connection.request(build_net_http_request(request))
             response.body = http_response.body
             response.status = http_response.code.to_i
             response.headers = http_response.to_hash
           rescue Timeout::Error, Errno::ETIMEDOUT => e
             response.timeout = true
           end
+          nil
 
         end
 
-        # @private
         protected
-        def build_request request
+
+        # Given an AWS::Core::HttpRequest, this method translates
+        # it into a Net::HTTPRequest (Get, Put, Post, Head or Delete).
+        # @param [Request]
+        # @return [Net::HTTPRequest]
+        def build_net_http_request request
 
           # Net::HTTP adds a content-type header automatically unless its set
           # and this messes with request signature signing.  Also, it expects
@@ -64,16 +80,16 @@ module AWS
             headers[key] = value.to_s
           end
 
-          req_class = case request.http_method
+          request_class = case request.http_method
             when 'GET'    then Net::HTTP::Get
             when 'PUT'    then Net::HTTP::Put
             when 'POST'   then Net::HTTP::Post
             when 'HEAD'   then Net::HTTP::Head
             when 'DELETE' then Net::HTTP::Delete
             else raise "unsupported http method: #{request.http_method}"
-          end
+            end
 
-          net_http_req = req_class.new(request.uri, headers)
+          net_http_req = request_class.new(request.uri, headers)
           net_http_req.body = request.body
           net_http_req
 

data/lib/aws/core/http/request.rb

@@ -30,13 +30,13 @@ module AWS
           @params = []
           @use_ssl = true
           @port = nil
-          @read_timeout = 60 
+          @default_read_timeout = 60 
         end
 
         # @return [Integer] The number of seconds the service has to respond
         #   before a timeout error is raised on the request.  Defaults to 
         #   60 seconds.
-        attr_accessor :read_timeout
+        attr_accessor :default_read_timeout
 
         # @return [String] The snake-cased ruby name for the service
         #   (e.g. 's3', 'iam', 'dynamo_db', etc).
@@ -69,6 +69,14 @@ module AWS
         # @return [String]
         # @private
         attr_accessor :access_key_id
+
+        # Some subclasses override this method to obseve requirements
+        # set by the services (e.q. SimpleWorlfow and SQS have special
+        # long-pulling requirements and require special read timeouts).
+        # @private
+        def read_timeout
+          default_read_timeout
+        end
   
         # @param [Boolean] state If the request should be sent over ssl or not.
         def use_ssl= state

data/lib/aws/core/inflection.rb

@@ -17,21 +17,24 @@ module AWS
     # @private
     module Inflection
 
-      def ruby_name(aws_name)
+      def ruby_name aws_name
 
-        #aws_name.sub(/^.*:/, '').
-        #  gsub(/[A-Z]+[a-z]+/){|str| "_#{str.downcase}_" }.
-        #  gsub(/(^_|_$)/, '').
-        #  gsub(/__/, '_').
-        #  downcase
+        inflector = Hash.new do |hash,key|
 
-        return 'etag' if aws_name == 'ETag'
+          key.
+            sub(/^.*:/, '').                          # strip namespace
+            gsub(/([A-Z0-9]+)([A-Z][a-z])/, '\1_\2'). # split acronyms from words
+            scan(/[a-z]+|\d+|[A-Z0-9]+[a-z]*/).       # split remaining words
+            join('_').downcase                        # join parts _ and downcase
 
-        aws_name.
-          sub(/^.*:/, '').                          # strip namespace
-          gsub(/([A-Z0-9]+)([A-Z][a-z])/, '\1_\2'). # split acronyms from words
-          scan(/[a-z]+|\d+|[A-Z0-9]+[a-z]*/).       # split remaining words
-          join('_').downcase                        # join parts _ and downcase
+        end
+
+        # add a few irregular inflections
+        inflector['ETag'] = 'etag'
+        inflector['s3Bucket'] = 's3_bucket'
+        inflector['s3Key'] = 's3_key'
+
+        inflector[aws_name]
 
       end
       module_function :ruby_name

data/lib/aws/core/log_formatter.rb

@@ -171,6 +171,12 @@ module AWS
         pattern.gsub(/:(\w+)/) {|sym| send("_#{sym[1..-1]}", response) }
       end
 
+      # @private
+      def eql? other
+        other.is_a?(self.class) and other.pattern == self.pattern
+      end
+      alias_method :==, :eql?
+
       protected
 
       def method_missing method_name, *args

data/lib/aws/core/resource.rb

@@ -390,9 +390,13 @@ module AWS
 
             attr = @klass.attributes[attr_name]
 
-            method = options[:get_as] || attr.get_as
-  
-            v = resp_obj.key?(method) ? resp_obj[method] : resp_obj[method.to_s]
+            methods = [options[:get_as] || attr.get_as].flatten
+
+            v = resp_obj
+            methods.each do |method|
+              v = v.key?(method) ? v[method] : v[method.to_s]
+              break if v.nil?
+            end
             v = v[:value] if v and options[:value_wrapped]
             v = attr.translate_output_value(v)
 

data/lib/aws/core/service_interface.rb

@@ -45,10 +45,10 @@ module AWS
       #   to AWS.config when not provided.
       #
       def initialize options = {}
-        @config = options[:config]
-        @config ||= AWS.config
+        options = options.dup
+        @config = (options.delete(:config) || AWS.config)
         @config = @config.with(options)
-        @client = config.send(Inflection.ruby_name(self.class.to_s) + '_client')
+        @client = @config.send(Inflection.ruby_name(self.class.to_s) + '_client')
       end
 
       # @return [String]

data/lib/aws/ec2.rb

@@ -247,6 +247,8 @@ module AWS
       autoload :ElasticIp, 'elastic_ip'
       autoload :ElasticIpCollection, 'elastic_ip_collection'
       autoload :Errors, 'errors'
+      autoload :ExportTask, 'export_task'
+      autoload :ExportTaskCollection, 'export_task_collection'
       autoload :FilteredCollection, 'filtered_collection'
       autoload :HasPermissions, 'has_permissions'
       autoload :Image, 'image'
@@ -427,5 +429,10 @@ module AWS
       VPNConnectionCollection.new(:config => config)
     end
 
+    # @return [ExportTaskCollection]
+    def export_tasks
+      ExportTaskCollection.new(:config => config)
+    end
+
   end
 end

data/lib/aws/ec2/client.rb

@@ -428,6 +428,21 @@ module AWS
       #
       define_client_method :cancel_conversion_task, 'CancelConversionTask'
 
+      # Calls the CancelExportTask API operation.
+      # @method cancel_export_task(options = {})
+      #
+      # === Options:
+      #
+      # * +:export_task_id+ - *required* - (String)
+      #
+      # === Response Structure:
+      #
+      # This method returns no response data.
+      #
+      # @return [Core::Response]
+      #
+      define_client_method :cancel_export_task, 'CancelExportTask'
+
       # Calls the CancelSpotInstanceRequests API operation.
       # @method cancel_spot_instance_requests(options = {})
       #
@@ -544,6 +559,41 @@ module AWS
       #
       define_client_method :create_image, 'CreateImage'
 
+      # Calls the CreateInstanceExportTask API operation.
+      # @method create_instance_export_task(options = {})
+      #
+      # === Options:
+      #
+      # * +:description+ - (String)
+      # * +:instance_id+ - *required* - (String)
+      # * +:target_environment+ - *required* - (String)
+      # * +:export_to_s3+ - (Hash)
+      #   * +:disk_image_format+ - (String)
+      #   * +:container_format+ - (String)
+      #   * +:s3_bucket+ - *required* - (String)
+      #   * +:s3_prefix+ - (String)
+      #
+      # === Response Structure:
+      #
+      # * +:request_id+ - (String)
+      # * +:export_task+ - (Hash)
+      #   * +:export_task_id+ - (String)
+      #   * +:description+ - (String)
+      #   * +:state+ - (String)
+      #   * +:status_message+ - (String)
+      #   * +:instance_export+ - (Hash)
+      #     * +:instance_id+ - (String)
+      #     * +:target_environment+ - (String)
+      #   * +:export_to_s3+ - (Hash)
+      #     * +:disk_image_format+ - (String)
+      #     * +:container_format+ - (String)
+      #     * +:s3_bucket+ - (String)
+      #     * +:s3_key+ - (String)
+      #
+      # @return [Core::Response]
+      #
+      define_client_method :create_instance_export_task, 'CreateInstanceExportTask'
+
       # Calls the CreateInternetGateway API operation.
       # @method create_internet_gateway(options = {})
       #
@@ -1588,6 +1638,34 @@ module AWS
       #
       define_client_method :describe_dhcp_options, 'DescribeDhcpOptions'
 
+      # Calls the DescribeExportTasks API operation.
+      # @method describe_export_tasks(options = {})
+      #
+      # === Options:
+      #
+      # * +:export_task_ids+ - (Array<String>)
+      #
+      # === Response Structure:
+      #
+      # * +:request_id+ - (String)
+      # * +:export_task_set+ - (Array<Hash>)
+      #   * +:export_task_id+ - (String)
+      #   * +:description+ - (String)
+      #   * +:state+ - (String)
+      #   * +:status_message+ - (String)
+      #   * +:instance_export+ - (Hash)
+      #     * +:instance_id+ - (String)
+      #     * +:target_environment+ - (String)
+      #   * +:export_to_s3+ - (Hash)
+      #     * +:disk_image_format+ - (String)
+      #     * +:container_format+ - (String)
+      #     * +:s3_bucket+ - (String)
+      #     * +:s3_key+ - (String)
+      #
+      # @return [Core::Response]
+      #
+      define_client_method :describe_export_tasks, 'DescribeExportTasks'
+
       # Calls the DescribeImageAttribute API operation.
       # @method describe_image_attribute(options = {})
       #
@@ -2986,7 +3064,8 @@ module AWS
       #         Amazon EBS volume is deleted on instance termination.
       #     * +:no_device+ - (String) Specifies the device name to suppress
       #       during instance launch.
-      #   * +:monitoring+ - (Boolean)
+      #   * +:monitoring+ - (Hash)
+      #     * +:enabled+ - (Boolean)
       #   * +:subnet_id+ - (String)
       #   * +:disable_api_termination+ - (Boolean)
       #   * +:instance_initiated_shutdown_behavior+ - (String)

data/lib/aws/ec2/export_task.rb

@@ -0,0 +1,120 @@
+# Copyright 2011-2012 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License"). You
+# may not use this file except in compliance with the License. A copy of
+# the License is located at
+#
+#     http://aws.amazon.com/apache2.0/
+#
+# or in the "license" file accompanying this file. This file is
+# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF
+# ANY KIND, either express or implied. See the License for the specific
+# language governing permissions and limitations under the License.
+
+module AWS
+  class EC2
+
+    # @attr_reader [String] description
+    #   Description of the resource being exported.
+    #
+    # @attr_reader [Symbol] state State of the conversion task.
+    #   Valid values :active, :cancelling, :cancelled and :completed.
+    #
+    # @attr_reader [String] status_message Status message related to the 
+    #   export task.
+    #
+    # @attr_reader [String] instance_id ID of instance being exported.
+    #
+    # @attr_reader [String] target_environment The target virtualization 
+    #   environment.
+    #
+    # @attr_reader [String] disk_image_format The format for the exported 
+    #   image.
+    #
+    # @attr_reader [String] container_format The container format used to
+    #   combine disk images with metadata (such as OVF).
+    #
+    # @attr_reader [String] s3_bucket The name of the Amazon S3 bucket
+    #   the image will be exported to.
+    #
+    # @attr_reader [String] s3_key The key of the Amazon S3 object
+    #   the image will be exported to.
+    #
+    class ExportTask < Resource
+      
+      # @private
+      def initialize export_task_id, options = {}
+        @export_task_id = export_task_id
+        super
+      end
+
+      # @return [String]
+      attr_reader :export_task_id
+
+      alias_method :id, :export_task_id
+
+      attribute :description, :static => true
+
+      attribute :state, :to_sym => true
+
+      attribute :status_message
+
+      attribute :instance_id, 
+        :as => [:instance_export, :instance_id],
+        :static => true
+
+      attribute :target_environment,
+        :as => [:instance_export, :target_environment],
+        :static => true
+
+      attribute :disk_image_format,
+        :as => [:export_to_s3, :disk_image_format],
+        :static => true
+
+      attribute :container_format,
+        :as => [:export_to_s3, :container_format],
+        :static => true
+
+      attribute :s3_bucket_name,
+        :as => [:export_to_s3, :s3_bucket],
+        :static => true
+
+      attribute :s3_key,
+        :as => [:export_to_s3, :s3_key],
+        :static => true
+
+      populates_from(:create_instance_export_task) do |resp|
+        resp[:export_task] if resp[:export_task][:export_task_id] == id
+      end
+
+      populates_from(:describe_export_tasks) do |resp|
+        resp[:export_task_set].find do |task|
+          task[:export_task_id] == id
+        end
+      end
+
+      # @return [Instance]
+      def instance
+        Instance.new(instance_id, :config => config)
+      end
+
+      # @return [S3::Bucket]
+      def s3_bucket
+        S3::Bucket.new(s3_bucket_name, :config => config)
+      end
+
+      # @return [S3::S3Object]
+      def s3_object
+        s3_bucket.objects[s3_key]
+      end
+
+      # Cancels the export task.
+      # @return [nil]
+      def cancel
+        client.cancel_export_task(:export_task_id => export_task_id)
+        nil
+      end
+
+    end
+  end
+end