aws-sdk 1.3.9 → 1.4.0

data/lib/aws/ec2/elastic_ip_collection.rb

@@ -15,9 +15,22 @@ module AWS
   class EC2
     class ElasticIpCollection < Collection
 
-      def create 
-        response = client.allocate_address
+      # @param [Hash] options
+      #
+      # @option [Boolean] :vpc (false) When true, the elastic ip address
+      #   will be allocated to your VPC.
+      #
+      # @return [ElasticIp]
+      #
+      def create options = {}
+
+        client_opts = {}
+        client_opts[:domain] = 'vpc' if options[:vpc]
+
+        response = client.allocate_address(client_opts)
+
         ElasticIp.new(response.public_ip, :config => config)
+
       end
 
       alias_method :allocate, :create
@@ -63,11 +76,11 @@ module AWS
         response = filtered_request(:describe_addresses)
         response.addresses_set.each do |address|
 
-          options = {}
-          options[:config] = config
-          options[:instance_id] = address.instance_id
-
-          elastic_ip = ElasticIp.new(address.public_ip, options)
+          elastic_ip = ElasticIp.new_from(
+            :describe_addresses,
+            address,
+            address.public_ip,
+            :config => config)
 
           yield(elastic_ip)
 

data/lib/aws/ec2/instance.rb

@@ -356,6 +356,11 @@ module AWS
         provider.provides :monitoring
       end
 
+      # @return [Boolean] Returns true if this is an EC2 VPC instance.
+      def vpc?
+        !!vpc_id
+      end
+
       # @return [VPC,nil] Returns the VPC this instance was launched in.
       #   If this instance was not launched inside a VPC, nil is returned.
       def vpc
@@ -526,16 +531,32 @@ module AWS
 
       # Associates the elastic IP address with this instance.
       #
-      # @param [ElasticIp,String] elastic_ip Either a public IP address
-      #   string or an {ElasticIp} object to associate to this 
-      #   instance.
+      # @overload associate_elastic_ip(elastic_ip)
+      #   @param [ElasticIp,String] elastic_ip An Elastic ip address
+      #     (VPC or non-VPC) or a public ip address string (non-VPC only).
+      #
+      # @overload associate_elastic_ip(allocation_id)
+      #   @param [String] allocation_id The allocation id of a
+      #     VPC elastic ip address.
+      #
       # @return [nil]
+      #
       def associate_elastic_ip elastic_ip
-        client.associate_address(
-          :public_ip => elastic_ip.to_s,
-          :instance_id => self.id
-        )
+
+        client_opts = {}
+        client_opts[:instance_id] = self.id
+
+        if vpc?
+          client_opts[:allocation_id] = elastic_ip.is_a?(ElasticIp) ?
+            elastic_ip.allocation_id :
+            elastic_ip.to_s
+        else
+          client_opts[:public_ip] = elastic_ip.to_s
+        end
+
+        client.associate_address(client_opts)
         nil
+
       end
 
       alias_method :ip_address=, :associate_elastic_ip

data/lib/aws/simple_email_service.rb

@@ -290,14 +290,12 @@ module AWS
       send_opts = {}
       send_opts[:raw_message] = {}
       send_opts[:raw_message][:data] = raw_message.to_s
-      
-      if raw_message.class.name == 'Mail::Message'
-        send_opts[:source] = raw_message.from.first
+      send_opts[:source] = options[:from] if options[:from]
+
+      if raw_message.respond_to?(:destinations)
         send_opts[:destinations] = raw_message.destinations
-      else
-        send_opts[:source] = options[:from] if options[:from]
-        send_opts[:destinations] = [options[:to]].flatten if options[:to]
       end
+      send_opts[:destinations] = [options[:to]].flatten if options[:to]
 
       client.send_raw_email(send_opts)
       nil

data/lib/aws/sts/request.rb

@@ -16,7 +16,13 @@ module AWS
 
     # @private
     class Request < Core::Http::Request
-      include Core::AuthorizeV2
+
+      include Core::AuthorizeV4
+
+      def service
+        'sts'
+      end
+
     end
 
   end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: aws-sdk
 version: !ruby/object:Gem::Version 
-  hash: 9
+  hash: 7
   prerelease: 
   segments: 
   - 1
-  - 3
-  - 9
-  version: 1.3.9
+  - 4
+  - 0
+  version: 1.4.0
 platform: ruby
 authors: 
 - Amazon Web Services
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-03-30 00:00:00 Z
+date: 2012-04-12 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   version_requirements: &id001 !ruby/object:Gem::Requirement 
@@ -113,6 +113,23 @@ files:
 - lib/aws/auto_scaling/tag.rb
 - lib/aws/auto_scaling/tag_collection.rb
 - lib/aws/auto_scaling.rb
+- lib/aws/cloud_formation/client/xml.rb
+- lib/aws/cloud_formation/client.rb
+- lib/aws/cloud_formation/config.rb
+- lib/aws/cloud_formation/errors.rb
+- lib/aws/cloud_formation/request.rb
+- lib/aws/cloud_formation/stack.rb
+- lib/aws/cloud_formation/stack_collection.rb
+- lib/aws/cloud_formation/stack_event.rb
+- lib/aws/cloud_formation/stack_event_collection.rb
+- lib/aws/cloud_formation/stack_options.rb
+- lib/aws/cloud_formation/stack_output.rb
+- lib/aws/cloud_formation/stack_resource.rb
+- lib/aws/cloud_formation/stack_resource_collection.rb
+- lib/aws/cloud_formation/stack_resource_summary_collection.rb
+- lib/aws/cloud_formation/stack_summary.rb
+- lib/aws/cloud_formation/stack_summary_collection.rb
+- lib/aws/cloud_formation.rb
 - lib/aws/core/api_config.rb
 - lib/aws/core/async_handle.rb
 - lib/aws/core/authorize_v2.rb
@@ -453,6 +470,7 @@ files:
 - lib/net/http/connection_pool/session.rb
 - lib/net/http/connection_pool.rb
 - lib/aws/api_config/AutoScaling-2011-01-01.yml
+- lib/aws/api_config/CloudFormation-2010-05-15.yml
 - lib/aws/api_config/DynamoDB-2011-12-05.yml
 - lib/aws/api_config/EC2-2011-12-15.yml
 - lib/aws/api_config/ELB-2011-08-15.yml