aws-sdk 1.4.1 → 1.5.0

data/lib/aws/auto_scaling/errors.rb

@@ -13,13 +13,9 @@
 
 module AWS
   class AutoScaling
-
-    # @private
     module Errors
 
-      BASE_ERROR_GRAMMAR = Client::XML::BaseError
-
-      include Core::LazyErrorClasses
+      extend Core::LazyErrorClasses
 
     end
   end

data/lib/aws/auto_scaling/group.rb

@@ -203,7 +203,7 @@ module AWS
       # terminated. This applies to any Auto Scaling decisions that might 
       # result in terminating instances.
       #
-      # @param [Integer] Capacity The new capacity setting for this Auto 
+      # @param [Integer] capacity The new capacity setting for this Auto 
       #   Scaling group.
       #
       # @param [Hash] options

data/lib/aws/auto_scaling/group_collection.rb

@@ -87,7 +87,7 @@ module AWS
           
         end
 
-        resp.next_token if resp.respond_to?(:next_token)
+        resp.data[:next_token]
 
       end
 

data/lib/aws/auto_scaling/instance_collection.rb

@@ -55,7 +55,7 @@ module AWS
           yield(instance)
           
         end
-        resp.next_token if resp.respond_to?(:next_token)
+        resp.data[:next_token]
       end
 
     end

data/lib/aws/auto_scaling/launch_configuration.rb

@@ -56,7 +56,7 @@ module AWS
       attribute :detailed_instance_monitoring,
         :as => :instance_monitoring,
         :static => true do
-        translates_output {|value| value.enabled? }
+        translates_output {|value| value[:enabled] }
       end
 
       alias_method :detailed_instance_monitoring?, :detailed_instance_monitoring

data/lib/aws/auto_scaling/launch_configuration_collection.rb

@@ -111,7 +111,7 @@ module AWS
           yield(launch_configuration)
           
         end
-        resp.next_token if resp.respond_to?(:next_token)
+        resp.data[:next_token]
       end
 
       def image_id_opt image

data/lib/aws/auto_scaling/notification_configuration_collection.rb

@@ -163,7 +163,7 @@ module AWS
             groups[group_name][c.topic_arn] << c.notification_type
           end
 
-          next_token = resp.respond_to?(:next_token) ? resp.next_token : nil
+          next_token = resp.data[:next_token]
 
         end while next_token
 

data/lib/aws/auto_scaling/request.rb

@@ -16,8 +16,7 @@ module AWS
 
     # @private
     class Request < Core::Http::Request
-      include Core::AuthorizeV2
-      include Core::AuthorizeWithSessionToken
+      include Core::Signature::Version2
     end
 
   end

data/lib/aws/auto_scaling/scaling_policy_collection.rb

@@ -64,7 +64,7 @@ module AWS
           yield(scaling_policy)
           
         end
-        resp.next_token if resp.respond_to?(:next_token)
+        resp.data[:next_token]
       end
 
     end

data/lib/aws/auto_scaling/scheduled_action_collection.rb

@@ -122,11 +122,11 @@ module AWS
       #   collection that will filter the actions returned by the
       #   given criteria.
       #
-      def filter options = {}
+      def filter filters = {}
         init_opts = {}
         init_opts[:config] = config
         init_opts[:filters] = @filters
-        init_opts[:filters].merge!(filter_opts(options))
+        init_opts[:filters].merge!(filter_opts(filters))
         ScheduledActionCollection.new(init_opts)
       end
 
@@ -186,7 +186,7 @@ module AWS
           
         end
 
-        resp.next_token if resp.respond_to?(:next_token)
+        resp.data[:next_token]
 
       end
 

data/lib/aws/auto_scaling/tag_collection.rb

@@ -103,7 +103,7 @@ module AWS
           yield(Tag.new(tag.to_hash.merge(:config => config)))
         end
 
-        resp.next_token if resp.respond_to?(:next_token)
+        resp.data[:next_token]
 
       end
 

data/lib/aws/cloud_formation.rb

@@ -237,24 +237,7 @@ module AWS
         client_opts = {}
         client_opts[:template] = template
         apply_template(client_opts)  
-        resp = client.validate_template(client_opts)
-
-        results = {}
-        [
-          :capabilities,
-          :capabilities_reason,
-          :description,
-        ].each do |method|
-          if resp.respond_to?(method)
-            results[method] = resp.send(method)
-          end
-        end
-        
-        if resp.respond_to?(:parameters)
-          results[:parameters] = resp.parameters.collect(&:to_hash)
-        end
-
-        results
+        client.validate_template(client_opts).data
 
       rescue CloudFormation::Errors::ValidationError => e
 

data/lib/aws/cloud_formation/client.rb

@@ -13,20 +13,326 @@
 
 module AWS
   class CloudFormation
-    class Client < Core::Client
-
-      AWS.register_autoloads(self, 'aws/cloud_formation/client') do
-        autoload :XML, 'xml'
-      end
 
-      include Core::ConfiguredClientMethods
+    # Client class for AWS CloudFormation.
+    class Client < Core::Client
 
       API_VERSION = '2010-05-15'
 
+      extend Core::Client::QueryXML
+
       # @private
-      REQUEST_CLASS = CloudFormation::Request
+      CACHEABLE_REQUESTS = Set[
+        :describe_adjustment_types,
+        :describe_auto_scaling_groups,
+        :describe_auto_scaling_instances,
+        :describe_auto_scaling_notification_types,
+        :describe_launch_configurations,
+        :describe_metric_collection_types,
+        :describe_notification_configurations,
+        :describe_policies,
+        :describe_scaling_activities,
+        :describe_scaling_process_types,
+        :describe_scheduled_actions,
+        :describe_tags,
+      ]
+
+      ## client methods ##
+
+      # Calls the CreateStack API operation.
+      # @method create_stack(options = {})
+      #
+      # === Options:
+      #
+      # * +:stack_name+ - *required* - (String)
+      # * +:template_body+ - (String)
+      # * +:template_url+ - (String)
+      # * +:parameters+ - (Array<Hash>)
+      #   * +:parameter_key+ - (String)
+      #   * +:parameter_value+ - (String)
+      # * +:disable_rollback+ - (Boolean)
+      # * +:timeout_in_minutes+ - (Integer)
+      # * +:notification_ar_ns+ - (Array<String>)
+      # * +:capabilities+ - (Array<String>)
+      # * +:on_failure+ - (String)
+      #
+      # === Response Structure:
+      #
+      # * +:stack_id+ - (String)
+      #
+      # @return [Core::Response]
+      #
+      define_client_method :create_stack, 'CreateStack'
+
+      # Calls the CreateUploadBucket API operation.
+      # @method create_upload_bucket(options = {})
+      #
+      # === Options:
+      #
+      # This method accepts no options.
+      #
+      # === Response Structure:
+      #
+      # * +:bucket_name+ - (String)
+      #
+      # @return [Core::Response]
+      #
+      define_client_method :create_upload_bucket, 'CreateUploadBucket'
+
+      # Calls the DeleteStack API operation.
+      # @method delete_stack(options = {})
+      #
+      # === Options:
+      #
+      # * +:stack_name+ - *required* - (String)
+      #
+      # === Response Structure:
+      #
+      # This method returns no response data.
+      #
+      # @return [Core::Response]
+      #
+      define_client_method :delete_stack, 'DeleteStack'
+
+      # Calls the DescribeStackEvents API operation.
+      # @method describe_stack_events(options = {})
+      #
+      # === Options:
+      #
+      # * +:stack_name+ - (String)
+      # * +:next_token+ - (String)
+      #
+      # === Response Structure:
+      #
+      # * +:stack_events+ - (Array<Hash>)
+      #   * +:stack_id+ - (String)
+      #   * +:event_id+ - (String)
+      #   * +:stack_name+ - (String)
+      #   * +:logical_resource_id+ - (String)
+      #   * +:physical_resource_id+ - (String)
+      #   * +:resource_type+ - (String)
+      #   * +:timestamp+ - (Time)
+      #   * +:resource_status+ - (String)
+      #   * +:resource_status_reason+ - (String)
+      #   * +:resource_properties+ - (String)
+      # * +:next_token+ - (String)
+      #
+      # @return [Core::Response]
+      #
+      define_client_method :describe_stack_events, 'DescribeStackEvents'
+
+      # Calls the DescribeStackResource API operation.
+      # @method describe_stack_resource(options = {})
+      #
+      # === Options:
+      #
+      # * +:stack_name+ - *required* - (String)
+      # * +:logical_resource_id+ - *required* - (String)
+      #
+      # === Response Structure:
+      #
+      # * +:stack_resource_detail+ - (Hash)
+      #   * +:stack_name+ - (String)
+      #   * +:stack_id+ - (String)
+      #   * +:logical_resource_id+ - (String)
+      #   * +:physical_resource_id+ - (String)
+      #   * +:resource_type+ - (String)
+      #   * +:last_updated_timestamp+ - (Time)
+      #   * +:resource_status+ - (String)
+      #   * +:resource_status_reason+ - (String)
+      #   * +:description+ - (String)
+      #   * +:metadata+ - (String)
+      #
+      # @return [Core::Response]
+      #
+      define_client_method :describe_stack_resource, 'DescribeStackResource'
+
+      # Calls the DescribeStackResources API operation.
+      # @method describe_stack_resources(options = {})
+      #
+      # === Options:
+      #
+      # * +:stack_name+ - (String)
+      # * +:logical_resource_id+ - (String)
+      # * +:physical_resource_id+ - (String)
+      #
+      # === Response Structure:
+      #
+      # * +:stack_resources+ - (Array<Hash>)
+      #   * +:stack_name+ - (String)
+      #   * +:stack_id+ - (String)
+      #   * +:logical_resource_id+ - (String)
+      #   * +:physical_resource_id+ - (String)
+      #   * +:resource_type+ - (String)
+      #   * +:timestamp+ - (Time)
+      #   * +:resource_status+ - (String)
+      #   * +:resource_status_reason+ - (String)
+      #   * +:description+ - (String)
+      #
+      # @return [Core::Response]
+      #
+      define_client_method :describe_stack_resources, 'DescribeStackResources'
+
+      # Calls the DescribeStacks API operation.
+      # @method describe_stacks(options = {})
+      #
+      # === Options:
+      #
+      # * +:stack_name+ - (String)
+      #
+      # === Response Structure:
+      #
+      # * +:stacks+ - (Array<Hash>)
+      #   * +:stack_id+ - (String)
+      #   * +:stack_name+ - (String)
+      #   * +:description+ - (String)
+      #   * +:parameters+ - (Array<Hash>)
+      #     * +:parameter_key+ - (String)
+      #     * +:parameter_value+ - (String)
+      #   * +:creation_time+ - (Time)
+      #   * +:last_updated_time+ - (Time)
+      #   * +:stack_status+ - (String)
+      #   * +:stack_status_reason+ - (String)
+      #   * +:disable_rollback+ - (Boolean)
+      #   * +:notification_ar_ns+ - (Array<String>)
+      #   * +:timeout_in_minutes+ - (Integer)
+      #   * +:capabilities+ - (Array<String>)
+      #   * +:outputs+ - (Array<Hash>)
+      #     * +:output_key+ - (String)
+      #     * +:output_value+ - (String)
+      #     * +:description+ - (String)
+      #
+      # @return [Core::Response]
+      #
+      define_client_method :describe_stacks, 'DescribeStacks'
+
+      # Calls the EstimateTemplateCost API operation.
+      # @method estimate_template_cost(options = {})
+      #
+      # === Options:
+      #
+      # * +:template_body+ - (String)
+      # * +:template_url+ - (String)
+      # * +:parameters+ - (Array<Hash>)
+      #   * +:parameter_key+ - (String)
+      #   * +:parameter_value+ - (String)
+      #
+      # === Response Structure:
+      #
+      # * +:url+ - (String)
+      #
+      # @return [Core::Response]
+      #
+      define_client_method :estimate_template_cost, 'EstimateTemplateCost'
+
+      # Calls the GetTemplate API operation.
+      # @method get_template(options = {})
+      #
+      # === Options:
+      #
+      # * +:stack_name+ - *required* - (String)
+      #
+      # === Response Structure:
+      #
+      # * +:template_body+ - (String)
+      #
+      # @return [Core::Response]
+      #
+      define_client_method :get_template, 'GetTemplate'
+
+      # Calls the ListStackResources API operation.
+      # @method list_stack_resources(options = {})
+      #
+      # === Options:
+      #
+      # * +:stack_name+ - *required* - (String)
+      # * +:next_token+ - (String)
+      #
+      # === Response Structure:
+      #
+      # * +:stack_resource_summaries+ - (Array<Hash>)
+      #   * +:logical_resource_id+ - (String)
+      #   * +:physical_resource_id+ - (String)
+      #   * +:resource_type+ - (String)
+      #   * +:last_updated_timestamp+ - (Time)
+      #   * +:resource_status+ - (String)
+      #   * +:resource_status_reason+ - (String)
+      # * +:next_token+ - (String)
+      #
+      # @return [Core::Response]
+      #
+      define_client_method :list_stack_resources, 'ListStackResources'
+
+      # Calls the ListStacks API operation.
+      # @method list_stacks(options = {})
+      #
+      # === Options:
+      #
+      # * +:next_token+ - (String)
+      # * +:stack_status_filter+ - (Array<String>)
+      #
+      # === Response Structure:
+      #
+      # * +:stack_summaries+ - (Array<Hash>)
+      #   * +:stack_id+ - (String)
+      #   * +:stack_name+ - (String)
+      #   * +:template_description+ - (String)
+      #   * +:creation_time+ - (Time)
+      #   * +:last_updated_time+ - (Time)
+      #   * +:deletion_time+ - (Time)
+      #   * +:stack_status+ - (String)
+      #   * +:stack_status_reason+ - (String)
+      # * +:next_token+ - (String)
+      #
+      # @return [Core::Response]
+      #
+      define_client_method :list_stacks, 'ListStacks'
+
+      # Calls the UpdateStack API operation.
+      # @method update_stack(options = {})
+      #
+      # === Options:
+      #
+      # * +:stack_name+ - *required* - (String)
+      # * +:template_body+ - (String)
+      # * +:template_url+ - (String)
+      # * +:parameters+ - (Array<Hash>)
+      #   * +:parameter_key+ - (String)
+      #   * +:parameter_value+ - (String)
+      # * +:capabilities+ - (Array<String>)
+      #
+      # === Response Structure:
+      #
+      # * +:stack_id+ - (String)
+      #
+      # @return [Core::Response]
+      #
+      define_client_method :update_stack, 'UpdateStack'
+
+      # Calls the ValidateTemplate API operation.
+      # @method validate_template(options = {})
+      #
+      # === Options:
+      #
+      # * +:template_body+ - (String)
+      # * +:template_url+ - (String)
+      #
+      # === Response Structure:
+      #
+      # * +:parameters+ - (Array<Hash>)
+      #   * +:parameter_key+ - (String)
+      #   * +:default_value+ - (String)
+      #   * +:no_echo+ - (Boolean)
+      #   * +:description+ - (String)
+      # * +:description+ - (String)
+      # * +:capabilities+ - (Array<String>)
+      # * +:capabilities_reason+ - (String)
+      #
+      # @return [Core::Response]
+      #
+      define_client_method :validate_template, 'ValidateTemplate'
 
-      configure_client
+      ## end client methods ##
 
     end
   end