aws-sdk 1.3.5 → 1.3.6

data/lib/aws/ec2/vpn_gateway.rb

@@ -0,0 +1,123 @@
+# 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.
+
+require 'aws/ec2/vpn_gateway/attachment'
+
+module AWS
+  class EC2
+
+    class VPNGateway < Resource
+
+      include TaggedItem
+
+      def initialize vpn_gateway_id, options = {}
+        @vpn_gateway_id = vpn_gateway_id
+        super
+      end
+
+      # @return [String]
+      attr_reader :vpn_gateway_id
+
+      alias_method :id, :vpn_gateway_id
+    
+      attribute :state, :to_sym => true
+
+      attribute :vpn_type, :static => true
+
+      attribute :attachment_set, :as => :attachments
+
+      protected :attachment_set
+
+      populates_from(:create_vpn_gateway) do |resp|
+        resp.vpn_gateway if resp.vpn_gateway.vpn_gateway_id == id
+      end
+
+      populates_from(:describe_vpn_gateways) do |resp|
+        resp.vpn_gateway_set.find do |gateway| 
+          gateway.vpn_gateway_id == vpn_gateway_id
+        end
+      end
+
+      # @return [Array<VPNGateway::Attachment>]
+      def attachments
+        attachment_set.map {|details| Attachment.new(self, details) }
+      end
+
+      # @return [VPC,nil] Returns the currently attached VPC, or nil
+      #   if this gateway has not been attached.
+      def vpc
+        if attachment = attachments.first  
+          attachment.vpc
+        end
+      end
+
+      # Attaches this vpn gateway to the given VPC.
+      # @param [VPC,String] vpc A {VPC} object or a vpc id string.
+      # @return [Attachment]
+      def attach vpc
+
+        client_opts = {}
+        client_opts[:vpn_gateway_id] = vpn_gateway_id
+        client_opts[:vpc_id] = vpc_id(vpc)
+
+        resp = client.attach_vpn_gateway(client_opts)
+
+        Attachment.new(self, resp.attachment)
+
+      end
+
+      # Detaches this vpn gateway from the given VPC.
+      # @param [VPC,String] vpc A {VPC} object or a vpc id string.
+      # @return [nil]
+      def detach vpc
+        client_opts = {}
+        client_opts[:vpn_gateway_id] = vpn_gateway_id
+        client_opts[:vpc_id] = vpc_id(vpc)
+        client.detach_vpn_gateway(client_opts)
+        nil
+      end
+
+      # @return [VPNConnectionCollection] Returns a collection
+      #   of VPC connections for this gateway.
+      def vpn_connections
+        connections = VPNConnectionCollection.new(:config => config)
+        connections.filter('vpn-gateway-id', id)
+      end
+
+      # Deletes this vpn gateway.
+      # @return [nil]
+      def delete
+        client_opts = {}
+        client_opts[:vpn_gateway_id] = vpn_gateway_id
+        client.delete_vpn_gateway(client_opts)
+        nil
+      end
+
+      # @return [Boolean] Returns true if the gateway exists.
+      def exists?
+        begin
+          client.describe_vpn_gateways(:vpn_gateway_ids => [id])
+          true
+        rescue Errors::InvalidVPNGatewayID::NotFound
+          false
+        end
+      end
+
+      protected
+      def vpc_id vpc
+        vpc.is_a?(VPC) ? vpc.vpc_id : vpc
+      end
+
+    end
+  end
+end

data/lib/aws/ec2/vpn_gateway/attachment.rb

@@ -0,0 +1,45 @@
+# 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
+    class VPNGateway < Resource
+      class Attachment
+
+        # @private
+        def initialize vpn_gateway, details
+          @vpn_gateway = vpn_gateway
+          @vpc = VPC.new(details.vpc_id, :config => vpn_gateway.config)
+          @state = details.state.to_sym
+        end
+
+        # @return [VPNGateway]
+        attr_reader :vpn_gateway
+
+        # @return [VPC]
+        attr_reader :vpc
+
+        # @return [Symbol]
+        attr_reader :state
+
+        # Deletes this attachment.
+        # @return (see VPNGateway#detach)
+        def delete
+          vpn_gateway.detach(vpc)
+        end
+        alias_method :detach, :delete
+
+      end
+    end
+  end
+end

data/lib/aws/ec2/vpn_gateway_collection.rb

@@ -0,0 +1,77 @@
+# 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
+
+    class VPNGatewayCollection < Collection
+
+      include TaggedCollection
+      include Core::Collection::Simple
+
+      # Creates a new virtual private gateway. A virtual private gateway is 
+      # the VPC-side endpoint for your VPN connection. You can create a 
+      # virtual private gateway before creating the VPC itself.
+      #
+      # @param [Hash] options
+      #
+      # @option options [String] :vpn_type ('ipsec.1') The type of VPN 
+      #   connection this virtual private gateway supports.
+      #
+      # @option options [AvailabilityZone,String] :availability_zone
+      #   The Availability Zone where you want the virtual private gateway.
+      #   AWS can select a default zone for you.  This can be an
+      #   {AvailablityZone} object or availability zone name string.
+      #   
+      # @return [VPNGateway]
+      #
+      def create options = {}
+
+        client_opts = {}
+        client_opts[:type] = options[:vpn_type] || 'ipsec.1'
+
+        if az = options[:availability_zone]
+          az = az.name if az.is_a?(AvailabilityZone)
+          client_opts[:availability_zone] = az
+        end
+
+        resp = client.create_vpn_gateway(client_opts)
+
+        VPNGateway.new_from(:create_vpn_gateway, resp.vpn_gateway,
+          resp.vpn_gateway.vpn_gateway_id, :config => config)
+
+      end
+
+      # @param [String] vpn_gateway_id
+      # @return [VPNGateway]
+      def [] vpn_gateway_id
+        VPNGateway.new(vpn_gateway_id, :config => config)
+      end
+
+      protected
+
+      def _each_item options = {}, &block
+        response = filtered_request(:describe_vpn_gateways, options, &block)
+        response.vpn_gateway_set.each do |g|
+
+          gateway = VPNGateway.new_from(:describe_vpn_gateways, g, 
+            g.vpn_gateway_id, :config => config)
+
+          yield(gateway)
+
+        end
+      end
+
+    end
+  end
+end

data/lib/aws/iam/login_profile.rb

@@ -27,6 +27,7 @@ module AWS
     #
     # @example Deleting the login profile for a user
     #   user.login_profile.delete
+    #
     class LoginProfile < Resource
 
       # @private
@@ -67,8 +68,11 @@ module AWS
       #   about making keys inactive or deleting them, see
       #   {User#access_keys}.
       #
+      # @return [nil]
+      #
       def delete
         client.delete_login_profile(resource_options)
+        nil
       end
 
       # @return [Boolean] True if a login profile exists for the user.

data/lib/aws/iam/user.rb

@@ -111,6 +111,12 @@ module AWS
         nil
       end
 
+      # Deletes the current user, after:
+      # * deleting its login profile
+      # * removing it from all groups
+      # * deleting all of its access keys
+      # * deleting its mfa devices
+      # * deleting its signing certificates
       def delete!
         groups.clear
         access_keys.clear

data/lib/aws/record/hash_model.rb

@@ -57,8 +57,7 @@ module AWS
         # @param [Integer] write_capacity_units
         #   See {DynamoDB::TableCollection#create} for more information.
         #
-        # @param [Hash] options Hash of options passed to 
-        #   {DynamoDB::TableCollection#create}.  
+        # @param [Hash] options
         #
         # @option options [String] :shard_name Defaults to the class name.  The
         #   shard name will be prefixed with {AWS::Record.table_prefix},
@@ -70,7 +69,8 @@ module AWS
 
           table_name = dynamo_db_table_name(options[:shard_name])
 
-          create_opts = { :hash_key => { :id => :string } }
+          create_opts = {}
+          create_opts[:hash_key] = { :id => :string }
 
           dynamo_db.tables.create(
             table_name, 

data/lib/aws/simple_workflow.rb

@@ -98,16 +98,19 @@ module AWS
   # * request_cancel_external_workflow_execution workflow_execution, options = {}
   # * start_child_workflow_execution workflow_type, options = {}
   #
+  # This sample gets a decision task and responds based on the events
+  # by scheduling an activity task or completing the workflow execution.
+  #
   #   # poll for decision tasks from 'my-task-list'
-  #   domain.decision_tasks.poll('my-task-list') do |decision_task|
+  #   domain.decision_tasks.poll('my-task-list') do |task|
   #
   #     # invesitate new events and make decisions
-  #     decision_task.new_events.each do |event|
+  #     task.new_events.each do |event|
   #       case event.event_type
   #       when 'WorkflowExecutionStarted'
   #         task.schedule_activity_task 'do-something', :input => 'abc xyz'
   #       when 'ActivityTaskCompleted'
-  #         task.comlete_workflow_execution :results => event.attributes.result
+  #         task.complete_workflow_execution :result => event.attributes.result
   #       end
   #     end
   #

data/lib/aws/simple_workflow/activity_task_collection.rb

@@ -30,6 +30,10 @@ module AWS
 
       # Returns the number of tasks in the specified +task_list+.
       #
+      #   count = activity_tasks.count('task-list-name')
+      #   count.truncated? #=> false
+      #   count.to_i #=> 7
+      #
       # @note This operation is eventually consistent. The results are best 
       #   effort and may not exactly reflect recent updates and changes.
       #
@@ -54,7 +58,8 @@ module AWS
       # @option options [String] :identity (nil) Identity of the worker 
       #   making the request, which is recorded in the ActivityTaskStarted 
       #   event in the workflow history. This enables diagnostic tracing 
-      #   when problems arise. The form of this identity is user defined.
+      #   when problems arise. The :identity defaults to the hostname and 
+      #   pid (e.g. "hostname:pid").
       #
       # @yieldparam [ActivityTask] activity_task Yields if a task is
       #   available within 60 seconds.  
@@ -68,7 +73,7 @@ module AWS
         client_opts = {}
         client_opts[:domain] = domain.name
         client_opts[:task_list] = { :name => task_list }
-        client_opts[:identity] = options[:identity] if options[:identity]
+        client_opts[:identity] = identity_opt(options)
 
         response = client.poll_for_activity_task(client_opts)
 

data/lib/aws/simple_workflow/decision_task_collection.rb

@@ -24,7 +24,7 @@ module AWS
     # To get a count of decision tasks needing attention, call {#count}
     # with a task list name:
     #
-    #   domain.decision_tasks.count('my-task-list') #=> 7
+    #   domain.decision_tasks.count('my-task-list').to_i #=> 7
     #
     # == Getting a single decision task
     #
@@ -83,14 +83,19 @@ module AWS
 
       # Returns the number of decision tasks in the specified +task_list+. 
       #
+      #   count = decision_tasks.count('task-list-name')
+      #   count.truncated? #=> false
+      #   count.to_i #=> 7
+      #
       # @note This operation is eventually consistent. The results are best 
       #   effort and may not exactly reflect recent updates and changes.
       #
       # @param [String] task_list Name of the task list to count 
       #   decision tasks for.
       #
-      # @return [Integer] Returns the number of descision tasks for the 
-      #   given +task_list+.
+      # @return [Count] Returns a {Count} object that specifies the number
+      #   of decision tasks for the given task list.  This count will
+      #   also indiciate if the count was truncated.
       #
       def count task_list
         options = {}
@@ -133,7 +138,8 @@ module AWS
       # @option options [String] :identity The identity of the decider 
       #   requesting a decision task.  This will be recorded in the
       #   DecisionTaskStarted event in the workflow history. 
-      #   If +:identity+ is not passed, a random UUID will be generated.
+      #   If +:identity+ is not passed then the hostname and 
+      #   process id will be sent (e.g. "hostname:pid").
       #
       # @option options [Boolean] :reverse_event_order (false)  When true, 
       #   the history events on the decision task will enumerate in 
@@ -155,7 +161,7 @@ module AWS
 
         client_opts = {}
         client_opts[:domain] = domain.name
-        client_opts[:identity] = options[:identity] if options[:identity]
+        client_opts[:identity] = identity_opt(options)
         client_opts[:task_list] = { :name => task_list }
         client_opts[:maximum_page_size] = options[:event_batch_size] || 1000
         client_opts[:reverse_order] = options.key?(:reverse_event_order) ?

data/lib/aws/simple_workflow/option_formatters.rb

@@ -11,11 +11,18 @@
 # ANY KIND, either express or implied. See the License for the specific
 # language governing permissions and limitations under the License.
 
+require 'socket'
+
 module AWS
   class SimpleWorkflow
     
     # @private
     module OptionFormatters
+
+      protected
+      def identity_opt options
+        options[:identity] || "#{Socket.gethostname}:#{Process.pid}"
+      end
       
       protected
       def upcase_opts options, *opt_names

data/lib/net/http/connection_pool.rb

@@ -117,24 +117,37 @@ class Net::HTTP::ConnectionPool
   end
 
   def request connection, *request_args, &block
+
     session = nil
     response = nil
     retried = false
+
     begin
+
       session = session_for(connection)
       session.http_session.read_timeout = connection.read_timeout
       response = session.request(*request_args, &block)
-    rescue *SOCKET_ERRORS => error
-      # retry socket errors once
-      unless retried
+
+    rescue Exception => error
+
+      # close the http session to prevent the connection from being
+      # left open and risk the other side sending data
+      session.finish if session
+
+      # retry socket errors once on a new session
+      if SOCKET_ERRORS.include?(error.class) and !retried
         retried = true
         retry
       end
+
       raise error
+
     else
       @pool_mutex.synchronize { @pool << session }
     end
+
     response
+
   end
 
   # Returns the number of sessions currently in the pool, not counting those
@@ -143,12 +156,13 @@ class Net::HTTP::ConnectionPool
     @pool_mutex.synchronize { @pool.size }  
   end
 
-  # Removes http sessions from the pool that have passed the idle timeout
+  # Removes stale http sessions from the pool (that have exceeded 
+  # the idle timeout).
   def clean!
     @pool_mutex.synchronize { _clean }
   end
 
-  # Finishes and removes removes all sessions from the pool.  
+  # Closes and removes removes all sessions from the pool.  
   # If empty! is called while there are outstanding requests they may
   # get checked back into the pool, leaving the pool in a non-empty state.
   def empty!