aws-sdk 1.3.9 → 1.4.0

data/lib/aws/cloud_formation/stack_resource_summary_collection.rb

@@ -0,0 +1,72 @@
+# 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 CloudFormation
+
+    # = Stack Resource Summaries
+    #
+    # Stack summaries contain information about CloudFormation
+    # stack resources.  You can enumerate these from a stack.
+    #
+    #   stack = cfm.stacks['stack-name']
+    #   stack.resource_summaries.each do |summary|
+    #     puts "#{summary[:physical_resource_id]}: #{summary[:resource_status]}"
+    #   end
+    #
+    # Each summary yielded is a hash with the following keys:
+    #
+    # * +:logical_resource_id+
+    # * +:physical_resource_id+
+    # * +:resource_type+
+    # * +:resource_status+
+    # * +:resource_status_reason+
+    # * +:last_updated_timestamp+
+    # 
+    class StackResourceSummaryCollection
+
+      include Core::Collection::Simple
+
+      # @param [Stack] stack
+      # @param [Hash[ options
+      def initialize stack, options = {}
+        @stack = stack
+        super
+      end
+
+      # @return [Stack]
+      attr_reader :stack
+
+      protected
+
+      def _each_item options = {}
+        next_token = nil
+        begin
+
+          options = {}
+          options[:next_token] = next_token if next_token
+          options[:stack_name] = stack.name
+          resp = client.list_stack_resources(options)
+
+          resp.stack_resource_summaries.each do |summary|
+            yield(summary.to_hash)
+          end
+
+          next_token = resp.next_token if resp.respond_to?(:next_token)
+
+        end while next_token
+      end
+
+    end
+  end
+end

data/lib/aws/cloud_formation/stack_summary.rb

@@ -0,0 +1,71 @@
+# 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 CloudFormation
+
+    # A stack summary contains some information about a stack.  You 
+    # can get summary information on any stack (including stacks
+    # deleted within the last 90 days).
+    #
+    # To get summary information, enumerate the summaries on an
+    # AWS::CloudFormation object:
+    #
+    #   cf = AWS::CloudFormation.new
+    #   cf.stack_summaries.each do |summary|
+    #      puts "#{summary.stack_name} : #{summary.stack_status}"
+    #   end
+    #
+    # You can get the full {Stack} object from a summary by calling
+    # {#stack}.
+    #
+    class StackSummary
+
+      # @private
+      def initialize stack, details
+        @stack = stack
+        details.each_pair do |attr_name,attr_value|
+          instance_variable_set("@#{attr_name}", attr_value)
+        end
+      end
+
+      # @return [Stack]
+      attr_reader :stack
+
+      # @return [Time]
+      attr_reader :creation_time
+
+      # @return [Time,nil]
+      attr_reader :last_updated_time
+
+      # @return [String]
+      attr_reader :stack_name
+
+      # @return [String]
+      attr_reader :stack_id
+
+      # @return [String]
+      attr_reader :stack_status
+
+      # @return [String]
+      attr_reader :stack_status_reason
+
+      # @return [Time,nil]
+      attr_reader :deletion_time
+
+      # @return [Strin]
+      attr_reader :template_description
+
+    end
+  end
+end

data/lib/aws/cloud_formation/stack_summary_collection.rb

@@ -0,0 +1,127 @@
+# 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 CloudFormation
+
+    # = Stack Summaries
+    #
+    # Stack summaries contain information about CloudFormation
+    # stacks.  You can filter the stacks you want summary information
+    # for by one or more statuses.  You can even get information
+    # about deleted stacks for up to 90 days.
+    #
+    # == Enumerating Stack Summaries
+    #
+    # You can enumerate all available summaries using enumerable
+    # methods.  Yielded summaries are simple hashes.
+    #
+    #   cfm = AWS::CloudFormation.new
+    #   cfm.stack_summaries.each do |summary|
+    #     puts summary.to_yaml
+    #   end
+    #
+    # == Filtering Stack Summaries
+    #
+    # You can optionally provide one or more stack stasus values
+    # to filter the results by.  Only stacks with the given status(es)
+    # will be enumerated.
+    #
+    #   cfm.stack_summaries.with_status(:create_failed).each do |summary|
+    #     # ...
+    #   end
+    #
+    #   # enumerate stacks with various delete statuses
+    #   statuses = %w(delete_in_progress delete_failed delete_complete)
+    #   cf.stack_summaries.with_status(statuses).each do |summary|
+    #     # ...
+    #   end
+    #
+    class StackSummaryCollection
+
+      include Core::Collection::Simple
+
+      # @private
+      def initialize options = {}
+        @filters = options[:filters]
+        super
+      end
+
+      # Limits the stacks summaries that are enumerated.
+      #
+      #   cfm.stack_summaries.with_status(:create_complete).each do |summary|
+      #     puts summary[:stack_name]
+      #   end
+      #
+      # You can provide multiple statuses:
+      #
+      #   statuses = [:create_failed, :rollback_failed]
+      #   cfm.stack_summaries.with_status(statuses).each do |summary|
+      #     puts summary[:stack_name]
+      #   end
+      #
+      # Status names may be symbolized (snake-cased) or upper-cased strings
+      # (e.g. :create_in_progress, 'CREATE_IN_PROGRESS').
+      # 
+      # @param [Symbol,String] status_filters One or more statuses to filter
+      #   stacks with. Valid values include:
+      #   * +:create_in_progress+
+      #   * +:create_failed+
+      #   * +:create_complete+
+      #   * +:rollback_in_progress+
+      #   * +:rollback_failed+
+      #   * +:rollback_complete+
+      #   * +:delete_in_progress+
+      #   * +:delete_failed+
+      #   * +:delete_complete+
+      #   * +:update_in_progress+
+      #   * +:update_complete_cleanup_in_progress+
+      #   * +:update_complete+
+      #   * +:update_rollback_in_progress+
+      #   * +:update_rollback_failed+
+      #   * +:update_rollback_complete_cleanup_in_progress+
+      #   * +:update_rollback_complete+
+      #
+      # @return [StackSummaryCollection] Returns a new stack summary
+      #   collection that restricts what stack summariess will be 
+      #   enumerated.
+      #
+      def with_status *status_filters
+        StackSummaryCollection.new(
+          :filters => status_filters.flatten.map(&:to_s).map(&:upcase),
+          :config => config)
+      end
+
+      protected
+
+      def _each_item options = {}
+        next_token = nil
+        begin
+          
+          client_opts = {}
+          client_opts[:next_token] = next_token if next_token
+          client_opts[:stack_status_filter] = @filters if @filters
+          resp = client.list_stacks(client_opts)
+
+          resp.stack_summaries.each do |summary|
+            yield(summary.to_hash)
+          end
+
+          next_token = resp.next_token if resp.respond_to?(:next_token)
+
+        end while next_token
+      end
+
+    end
+  end
+end

data/lib/aws/core.rb

@@ -21,6 +21,7 @@ require 'aws/core/autoloader'
 # The currently supported services are:
 #
 # * {AWS::AutoScaling}
+# * {AWS::CloudFormation}
 # * {AWS::DynamoDB}
 # * {AWS::EC2}
 # * {AWS::ELB}
@@ -60,7 +61,7 @@ require 'aws/core/autoloader'
 module AWS
 
   # Current version of the AWS SDK for Ruby
-  VERSION = "1.3.9"
+  VERSION = "1.4.0"
 
   register_autoloads(self) do
     autoload :Errors, 'errors'
@@ -171,6 +172,9 @@ module AWS
     # @option options [String] :auto_scaling_endpoint ('autoscaling.us-east-1.amazonaws.com')
     #   The service endpoint for Auto Scaling.
     #
+    # @option options [String] :cloud_formation_endpoint ('cloudformation.us-east-1.amazonaws.com') 
+    #   The service endpoint for AWS CloudFormation.
+    #
     # @option options [String] :dynamo_db_endpoint ('dynamodb.amazonaws.com') 
     #   The service endpoint for Amazon DynamoDB.
     #

data/lib/aws/core/configuration.rb

@@ -66,6 +66,9 @@ module AWS
     # @attr_reader [String] auto_scaling_endpoint ('autoscaling.us-east-1.amazonaws.com')
     #   The service endpoint for Auto Scaling.
     #
+    # @attr_reader [String] cloud_formation_endpoint ('cloudformation.us-east-1.amazonaws.com')
+    #   The service endpoint for AWS CloudFormation.
+    #
     # @attr_reader [String] dynamo_db_endpoint ('dynamodb.us-east-1.amazonaws.com')
     #   The service endpoint for Amazon DynamoDB.  
     #
@@ -354,7 +357,7 @@ module AWS
             value || begin
               endpoint = config.send("#{ruby_name}_endpoint")
               if endpoint =~ /us-gov/
-                if matches = enpoint.match(/(us-gov-west-\d+)/)
+                if matches = endpoint.match(/(us-gov-west-\d+)/)
                   matches[1]
                 else
                   'us-gov-west-1' # e.g. iam.us-gov.amazonaws.com

data/lib/aws/core/resource.rb

@@ -153,6 +153,22 @@ module AWS
       end
   
       class << self
+
+        # @private
+        def define_attribute_type type_name
+          class_eval <<-METHODS
+
+            def self.#{type_name}_attributes
+              @#{type_name}_attributes ||= {}  
+            end
+
+            def self.#{type_name}_attribute name, options = {}, &block
+              attr = attribute(name, options, &block)
+              #{type_name}_attributes[attr.name] = attr
+            end
+
+          METHODS
+        end
   
         # @private
         def new_from request_type, resp_obj, *args

data/lib/aws/core/response.rb

@@ -73,11 +73,13 @@ module AWS
       # @return [Boolean] Returns true if the http request was throttled
       #   by AWS.
       def throttled?
-        !successful? and
-          http_response.body and
-          parsed_body = XmlGrammar.parse(http_response.body) and
-          parsed_body.respond_to?(:code) and
-          parsed_body.code == "Throttling"
+        if !successful? and http_response.body
+          error = XmlGrammar.parse(http_response.body)
+          error = error.error if error.respond_to?(:error)
+          error.respond_to?(:code) and error.code == "Throttling"
+        else
+          false
+        end
       end
   
       # @return [Boolean] Returns true if the http request timed out.

data/lib/aws/ec2/elastic_ip.rb

@@ -14,10 +14,24 @@
 module AWS
   class EC2
 
-    #
     # @attr_reader [String,nil] instance_id Returns the instance id if 
     #   assigned to an EC2 instance, nil otherwise.
     #
+    # @attr_reader [String,nil] allocation_id
+    #   The ID representing the allocation of the address for use with Amazon 
+    #   VPC.
+    #
+    # @attr_reader [String] Indicates whether this elastic ip address is for 
+    #   EC2 instances ('standard') or VPC instances ('vpc').
+    #
+    # @attr_reader [String,nil] The ID of the association between this elastic
+    #   ip address and an EC2 VPC instance (VPC only).
+    #
+    # @attr_reader [String,nil] The ID of the network interface (VPC only).
+    #
+    # @attr_reader [String,nil] network_interface_owner_id 
+    #   The ID of the AWS account that owns the network interface (VPC only).
+    #
     class ElasticIp < Resource
 
       def initialize public_ip, options = {}
@@ -32,10 +46,27 @@ module AWS
 
       attribute :instance_id
 
+      ## vpc related attributes
+
+      attribute :allocation_id, :static => true
+
+      attribute :domain, :static => true
+
+      attribute :association_id
+
+      attribute :network_interface_id
+
+      attribute :network_interface_owner_id
+
       populates_from(:describe_addresses) do |resp|
         resp.address_index[public_ip]
       end
 
+      # @return [Boolean] Returns true if this is an EC2 VPC Elastic IP.
+      def vpc?
+        domain == 'vpc'
+      end
+
       # @return [Boolean] Returns true if this IP address is attached to
       #   an EC2 instance.
       def associated?
@@ -59,10 +90,13 @@ module AWS
       #
       # @return [nil]
       def delete
-        client.release_address(resource_options)
+        if vpc?
+          client.release_address(:allocation_id => allocation_id)
+        else
+          client.release_address(:public_ip => public_ip)
+        end
         nil
       end
-
       alias_method :release, :delete
 
       # Disassociates this elastic IP address from an EC2 instance.
@@ -70,10 +104,25 @@ module AWS
       # associated with an instance.
       # @return [nil]
       def disassociate
-        client.disassociate_address(resource_options)
+        if vpc?
+          client.disassociate_address(:association_id => association_id)
+        else
+          client.disassociate_address(:public_ip => public_ip)
+        end
         nil
       end
 
+      # @return [Boolean] Returns true the elastic ip address exists in
+      #   your account.
+      def exists?
+        begin
+          get_resource
+          true
+        rescue Errors::InvalidAddress::NotFound
+          false
+        end
+      end
+
       # @return [String] Returns the public IP address
       def to_s
         public_ip.to_s