aws-sdk 1.3.8 → 1.3.9

data/lib/aws/auto_scaling/tag.rb

@@ -0,0 +1,59 @@
+# 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 AutoScaling
+
+    # Auto Scaling tags are hashes with two helper methods:
+    #
+    # * {#resource}
+    # * {#delete}
+    #
+    class Tag < Hash
+
+      # @private
+      def initialize options = {}
+
+        super()
+
+        @resource = 
+          case options[:resource_type]
+          when 'auto-scaling-group' 
+            group_name = options[:resource_id]
+            config = options.delete(:config)
+            Group.new(group_name, :config => config)
+          else 
+            msg = "unhandled resource type: #{options[:resource_type]}"
+            raise ArgumentError, msg
+          end
+
+        merge!(options)
+
+      end
+
+      # @return [Group] Returns the tagged resource.  Currently this is
+      #   always an Auto Scaling group.
+      def resource
+        @resource
+      end
+
+      # Deletes the tag from the resource.
+      # @return [nil]
+      def delete
+        resource.delete_tags([self])
+        nil
+      end
+
+    end
+  end
+end

data/lib/aws/auto_scaling/tag_collection.rb

@@ -0,0 +1,112 @@
+# 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 AutoScaling
+
+    # Provides an interface for enumerating tags defined in Auto Scaling.
+    #
+    #   auto_scaling = AWS::AutoScaling.new
+    #   auto_scaling.tags.each do |tag|
+    #      puts "#{tag.key}:#{tag.value}"
+    #   end
+    #
+    # == Filters
+    #
+    # You can filter the tags returned using {#filter}:
+    #
+    #   # returns tags with the key "role"
+    #   auto_scaling.filter(:key, 'role').to_a
+    #
+    #   # returns tags with the key "role" and value "webserver"
+    #   auto_scaling.filter(:key, 'role').filter(:value, 'webserver')to_a
+    #
+    #   # returns tags with the Auto Scaling group name "group1"
+    #   auto_scaling.filter(:auto_scaling_group, 'group1').to_a
+    #
+    #   # returns all tags that propagate at launch
+    #   auto_scaling.filter(:propagate_at_launch, true).to_a
+    #
+    # == Creating Tags
+    #
+    # You can create Auto Scaling tags when you:
+    #
+    # * [create]{GroupCollection#create} an Auto Scaling group
+    # * [update]{Group#update} an Auto Scaling group
+    #
+    # Both of these methods accept a +:tags+ option.
+    #
+    #   tags = [
+    #     { :key => 'auto-scaling-instance' },       # tag name only
+    #     { :key => 'role', :value => 'webserver' }, # tag name and value
+    #   ]
+    #
+    #   # creating a group with tags
+    #   group = auto_scaling.groups.create('group-name', :tags => tags, ...)
+    #
+    #   # updating a group's tags
+    #   group.update(:tags => tags)
+    # 
+    class TagCollection
+
+      include Core::Collection::Limitable
+
+      # @private
+      def initialize options = {}
+        @filters = options.delete(:filters) || []
+        super
+      end
+      
+      # Filters the tags by the given filter name and value(s).
+      #
+      #   # return tags with the key "role" and the value "webserver"
+      #   auto_scaling.tags.filter(:key, 'role').filer(:value, 'webserver')
+      # 
+      # @param [Symbol] name Valid filter names include:
+      #
+      #   * :key
+      #   * :value
+      #   * :propagate_at_launch
+      #   * :auto_scaling_group
+      #
+      # @param [Array<String>] values
+      #
+      # @return [TagCollection]
+      #
+      def filter name, *values
+        name = name.to_s.gsub(/_/, '-')
+        values = values.flatten.map(&:to_s)
+        filter = { :name => name, :values => values }
+        TagCollection.new(:filters => @filters + [filter], :config => config)
+      end
+
+      protected
+
+      def _each_item next_token, limit, options = {}, &block
+
+        options[:next_token] = next_token if next_token
+        options[:max_records] = limit if limit
+        options[:filters] = @filters unless @filters.empty?
+
+        resp = client.describe_tags(options)
+        resp.tags.each do |tag|
+          yield(Tag.new(tag.to_hash.merge(:config => config)))
+        end
+
+        resp.next_token if resp.respond_to?(:next_token)
+
+      end
+
+    end
+  end
+end

data/lib/aws/core.rb

@@ -20,6 +20,7 @@ require 'aws/core/autoloader'
 #
 # The currently supported services are:
 #
+# * {AWS::AutoScaling}
 # * {AWS::DynamoDB}
 # * {AWS::EC2}
 # * {AWS::ELB}
@@ -59,7 +60,7 @@ require 'aws/core/autoloader'
 module AWS
 
   # Current version of the AWS SDK for Ruby
-  VERSION = "1.3.8"
+  VERSION = "1.3.9"
 
   register_autoloads(self) do
     autoload :Errors, 'errors'
@@ -76,7 +77,6 @@ module AWS
       autoload :AuthorizeWithSessionToken, 'authorize_with_session_token'
       autoload :Cacheable,                 'cacheable'
       autoload :Client,                    'client'
-      autoload :ClientLogging,             'client_logging'
       autoload :Collection,                'collection'
       autoload :Configuration,             'configuration'
       autoload :ConfiguredClientMethods,   'configured_client_methods'
@@ -90,6 +90,7 @@ module AWS
       autoload :Inflection,                'inflection'
       autoload :JsonClient,                'json_client'
       autoload :LazyErrorClasses,          'lazy_error_classes'
+      autoload :LogFormatter,              'log_formatter'
       autoload :MetaUtils,                 'meta_utils'
       autoload :Model,                     'model'
       autoload :Naming,                    'naming'
@@ -167,8 +168,11 @@ module AWS
     # @option options [String,nil] :session_token (nil) AWS secret token 
     #   credential.
     #
-    # @option options [String] :dynamo_db_endpoint ('dynamodb.amazonaws.com') The 
-    #   service endpoint for Amazon DynamoDB.
+    # @option options [String] :auto_scaling_endpoint ('autoscaling.us-east-1.amazonaws.com')
+    #   The service endpoint for Auto Scaling.
+    #
+    # @option options [String] :dynamo_db_endpoint ('dynamodb.amazonaws.com') 
+    #   The service endpoint for Amazon DynamoDB.
     #
     # @option options [String] :dynamo_db_retry_throughput_errors (true) When
     #   true, AWS::DynamoDB::Errors::ProvisionedThroughputExceededException
@@ -186,10 +190,38 @@ module AWS
     # @option options [String] :iam_endpoint ('iam.amazonaws.com') The 
     #   service endpoint for AWS Idenity Access Management (IAM).
     #
-    # @option options [Object,nil] :logger (nil) A logger instance that 
-    #   should receive log messages generated by service requets.  
-    #   A logger needs to respond to #log and must accept a 
-    #   severity (e.g. :info, :error, etc) and a string message.
+    # @option options [Logger,nil] :logger (nil) A logger to send 
+    #   log messages to.  Here is an example that logs to standard out.
+    #
+    #     require 'logger'
+    #     AWS.config(:logger => Logger.new($stdout))
+    #
+    # @option options [Symbol] :log_level (:info) The level log messages are
+    #   sent to the logger with (e.g. +:notice+, +:info+, +:warn+, 
+    #   +:debug+, etc).
+    #
+    # @option options [Object] :log_formatter The log formatter is responsible
+    #   for building log messages from responses. You can quickly change 
+    #   log formats by providing a canned log formatter.
+    #
+    #     AWS.config(:log_formatter => AWS::Core::LogFormatter.colored)
+    # 
+    #   Here is the complete list of canned log formatters:
+    #
+    #   * +AWS::Core::LogFormatter.default+
+    #   * +AWS::Core::LogFormatter.short+
+    #   * +AWS::Core::LogFormatter.debug+
+    #   * +AWS::Core::LogFormatter.colored+
+    #
+    #   You can also create an instance of AWS::Core::LogFormatter
+    #   with a custom log message pattern. See {Core::LogFormatter} for 
+    #   a complete list of pattern substituions.
+    #
+    #     pattern = "[AWS :operation :duration] :error_message"
+    #     AWS.config(:log_formatter => AWS::Core::LogFormatter.new(pattern))
+    #
+    #   Lastly you can pass any object that responds to +#format+ accepting
+    #   and instance of {Core::Response} and returns a string.
     #
     # @option options [Integer] :max_retries (3) The maximum number of times
     #   service errors (500) should be retried.  There is an exponential 

data/lib/aws/core/client.rb

@@ -22,8 +22,6 @@ module AWS
   
       extend Naming
   
-      include ClientLogging
-  
       CACHEABLE_REQUESTS = Set.new
   
       # Creates a new low-level client.
@@ -221,6 +219,8 @@ module AWS
   
           @http_handler.handle(response.http_request, http_response)
   
+          populate_error(response)
+
           populate_error(response)
           response.signal_success unless response.error
           response
@@ -278,6 +278,31 @@ module AWS
         end
         response
       end
+
+      private
+      def log_client_request options
+
+        # time the request, retries and all
+        start = Time.now
+        response = yield
+        response.duration = Time.now - start
+
+        if config.logger
+          if options[:async] 
+            response.on_complete { log_response(response) } 
+          else
+            log_response(response)
+          end
+        end
+  
+        response
+
+      end
+
+      def log_response response
+        message = config.log_formatter.format(response)
+        config.logger.send(config.log_level, message)
+      end
   
       protected
       def populate_error response
@@ -335,7 +360,7 @@ module AWS
       private
       def client_request name, options, &block
         return_or_raise(options) do
-          log_client_request(name, options) do
+          log_client_request(options) do
   
             if config.stub_requests?
   

data/lib/aws/core/configuration.rb

@@ -63,6 +63,9 @@ module AWS
     #
     # @attr_reader [String,nil] session_token (nil) AWS secret token credential.
     #
+    # @attr_reader [String] auto_scaling_endpoint ('autoscaling.us-east-1.amazonaws.com')
+    #   The service endpoint for Auto Scaling.
+    #
     # @attr_reader [String] dynamo_db_endpoint ('dynamodb.us-east-1.amazonaws.com')
     #   The service endpoint for Amazon DynamoDB.  
     #
@@ -82,10 +85,11 @@ module AWS
     # @attr_reader [String] iam_endpoint ('iam.amazonaws.com')
     #   The service endpoint for AWS Idenity Access Management (IAM).
     #
-    # @attr_reader [Object,nil] logger (nil) A logger instance that 
-    #   should receive log messages generated by service requets.  
-    #   A logger needs to respond to #log and must accept a 
-    #   severity (e.g. :info, :error, etc) and a string message.
+    # @attr_reader [Logger,nil] logger (nil) The logging interface.
+    #
+    # @attr_reader [Symbol] log_level (:info) The log level.
+    #
+    # @attr_reader [LogFormatter] log_formatter The log message formatter.
     #
     # @attr_reader [Integer] max_retries (3) The maximum number of times
     #   service errors (500) should be retried.  There is an exponential 
@@ -338,26 +342,6 @@ module AWS
 
         def add_service name, ruby_name, default_endpoint
 
-          create_block = lambda do |config| 
-            AWS.const_get(name)::Client.new(:config => config)
-          end
-
-          needs = [
-            :signer, 
-            :http_handler, 
-            :"#{ruby_name}_endpoint",
-            :"#{ruby_name}_port",
-            :max_retries,
-            :stub_requests?,
-            :proxy_uri,
-            :use_ssl?,
-            :ssl_verify_peer?,
-            :ssl_ca_file,
-            :user_agent_prefix,
-            :logger,
-            :logger_truncate_strings_at,
-          ]
-
           add_option :"#{ruby_name}_endpoint", default_endpoint
 
           add_option(:"#{ruby_name}_port") do |config,value|
@@ -383,6 +367,27 @@ module AWS
             end
           end
 
+          needs = [
+            :signer, 
+            :http_handler, 
+            :"#{ruby_name}_endpoint",
+            :"#{ruby_name}_port",
+            :max_retries,
+            :stub_requests?,
+            :proxy_uri,
+            :use_ssl?,
+            :ssl_verify_peer?,
+            :ssl_ca_file,
+            :user_agent_prefix,
+            :logger,
+            :log_formatter,
+            :log_level,
+          ]
+
+          create_block = lambda do |config| 
+            AWS.const_get(name)::Client.new(:config => config)
+          end
+
           add_option_with_needs :"#{ruby_name}_client", needs, &create_block
 
         end
@@ -391,22 +396,24 @@ module AWS
 
       add_option :access_key_id, 
         ENV['AWS_ACCESS_KEY_ID'] || ENV['AMAZON_ACCESS_KEY_ID']
+  
+      add_option :secret_access_key, 
+        ENV['AWS_SECRET_ACCESS_KEY'] || ENV['AMAZON_SECRET_ACCESS_KEY']
+  
+      add_option :session_token
 
-      add_option :http_handler, Core::Http::NetHttpHandler.new
+      add_option :http_handler, Http::NetHttpHandler.new
   
       add_option :logger
 
-      add_option :logger_truncate_strings_at, 1000 
+      add_option :log_level, :info
+
+      add_option :log_formatter, LogFormatter.default
   
       add_option :max_retries, 3
   
       add_option :proxy_uri do |config,uri| uri ? URI.parse(uri.to_s) : nil end
   
-      add_option :secret_access_key, 
-        ENV['AWS_SECRET_ACCESS_KEY'] || ENV['AMAZON_SECRET_ACCESS_KEY']
-  
-      add_option :session_token
-  
       add_option_with_needs :signer, 
         [:access_key_id, :secret_access_key, :session_token] do |config|
   

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

@@ -43,17 +43,17 @@ module AWS
         attr_accessor :host
   
         # @return [CaseInsensitiveHash] request headers
-        attr_reader :headers
+        attr_accessor :headers
   
         # @return [Array] An array of request params, each param responds to
         #   #name and #value.
-        attr_reader :params
+        attr_accessor :params
   
         # @return [String] GET, PUT POST, HEAD or DELETE, defaults to POST
         attr_accessor :http_method
   
         # @return [String] path of the request URI, defaults to /
-        attr_reader :path
+        attr_accessor :path
   
         # @return [String] the AWS access key ID used to authorize the
         #   request