aws-sdk-core 2.1.15 → 2.1.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: eb7035e34d902375798faef2e19fe201d4fc2443
-  data.tar.gz: 74053d54cbf587272a5a363ca550234f4a4f17b4
+  metadata.gz: bc2f401308dd78a076bbe8c47554c31dc6781399
+  data.tar.gz: 5d6e0d172a31dd25f69f4df5aa8f62fbd8fcfcb8
 SHA512:
-  metadata.gz: cbbd080fc669fd280a25bb8aa7cec8f28019e055d7f520e4acf20ef61de3779e7c97900fee9d741bc4d095133df07c2b83baf54a924d497a91808916d72daf7b
-  data.tar.gz: 0b5f4f61a1e591bf8cf59e8a0452a2af002208c6b8a1385be592f16763e684e508f2a0987b567e4a0b77f3df5a60a3a4c91d479b4b80e033353ac4dcc7ad8d21
+  metadata.gz: 81f4a66d57dcf5f94f0132f3dbdbff7f1f0022632f7d6e6a422e20242ddba740141e404d3bb102e2cbf40abca48a6cae2e9a30c80ee67c3c934c53648e992903
+  data.tar.gz: ce220fa2d46bcb6554f8bca278976f4e4f89b26cb2edce85d7a3bc2dd5d366aef0a3dbc97661a7618f24747fd62fea2ce0b220004f7e857b8d17aad73aef1512

data/apis/codepipeline/2015-07-09/api-2.json

@@ -845,7 +845,8 @@
       ],
       "members":{
         "type":{"shape":"ArtifactStoreType"},
-        "location":{"shape":"ArtifactStoreLocation"}
+        "location":{"shape":"ArtifactStoreLocation"},
+        "encryptionKey":{"shape":"EncryptionKey"}
       }
     },
     "ArtifactStoreLocation":{
@@ -996,6 +997,26 @@
       }
     },
     "Enabled":{"type":"boolean"},
+    "EncryptionKey":{
+      "type":"structure",
+      "required":[
+        "id",
+        "type"
+      ],
+      "members":{
+        "id":{"shape":"EncryptionKeyId"},
+        "type":{"shape":"EncryptionKeyType"}
+      }
+    },
+    "EncryptionKeyId":{
+      "type":"string",
+      "min":1,
+      "max":100
+    },
+    "EncryptionKeyType":{
+      "type":"string",
+      "enum":["KMS"]
+    },
     "ErrorDetails":{
       "type":"structure",
       "members":{
@@ -1015,7 +1036,10 @@
     "ExecutionSummary":{"type":"string"},
     "FailureDetails":{
       "type":"structure",
-      "required":["type"],
+      "required":[
+        "type",
+        "message"
+      ],
       "members":{
         "type":{"shape":"FailureType"},
         "message":{"shape":"Message"},
@@ -1177,7 +1201,8 @@
         "inputArtifacts":{"shape":"ArtifactList"},
         "outputArtifacts":{"shape":"ArtifactList"},
         "artifactCredentials":{"shape":"AWSSessionCredentials"},
-        "continuationToken":{"shape":"ContinuationToken"}
+        "continuationToken":{"shape":"ContinuationToken"},
+        "encryptionKey":{"shape":"EncryptionKey"}
       }
     },
     "JobDetails":{
@@ -1571,7 +1596,8 @@
         "inputArtifacts":{"shape":"ArtifactList"},
         "outputArtifacts":{"shape":"ArtifactList"},
         "artifactCredentials":{"shape":"AWSSessionCredentials"},
-        "continuationToken":{"shape":"ContinuationToken"}
+        "continuationToken":{"shape":"ContinuationToken"},
+        "encryptionKey":{"shape":"EncryptionKey"}
       }
     },
     "ThirdPartyJobDetails":{

data/apis/opsworks/2013-02-18/waiters-2.json

@@ -18,6 +18,26 @@
         }
       ]
     },
+    "DeploymentSuccessful": {
+      "delay": 15,
+      "operation": "DescribeDeployments",
+      "maxAttempts": 40,
+      "description": "Wait until a deployment has completed successfully",
+      "acceptors": [
+        {
+          "expected": "successful",
+          "matcher": "pathAll",
+          "state": "success",
+          "argument": "Deployments[].Status"
+        },
+        {
+          "expected": "failed",
+          "matcher": "pathAny",
+          "state": "failure",
+          "argument": "Deployments[].Status"
+        }
+      ]
+    },
     "InstanceOnline": {
       "delay": 15,
       "operation": "DescribeInstances",

data/bin/aws.rb

@@ -132,7 +132,7 @@ if options[:log]
 end
 
 if options[:color]
-  cfg[:log_formatter] = Seahorse::Client::Logging::Formatter.colored
+  cfg[:log_formatter] = Aws::Log::Formatter.colored
 end
 
 if options[:debug]

data/lib/aws-sdk-core.rb

@@ -126,6 +126,12 @@ module Aws
     end
   end
 
+  module Log
+    autoload :Formatter, 'aws-sdk-core/log/formatter'
+    autoload :ParamFilter, 'aws-sdk-core/log/param_filter'
+    autoload :ParamFormatter, 'aws-sdk-core/log/param_formatter'
+  end
+
   module Plugins
     autoload :CSDConditionalSigning, 'aws-sdk-core/plugins/csd_conditional_signing'
     autoload :DynamoDBExtendedRetries, 'aws-sdk-core/plugins/dynamodb_extended_retries'
@@ -136,6 +142,7 @@ module Aws
     autoload :GlacierApiVersion, 'aws-sdk-core/plugins/glacier_api_version'
     autoload :GlacierChecksums, 'aws-sdk-core/plugins/glacier_checksums'
     autoload :GlobalConfiguration, 'aws-sdk-core/plugins/global_configuration'
+    autoload :Logging, 'aws-sdk-core/plugins/logging'
     autoload :MachineLearningPredictEndpoint, 'aws-sdk-core/plugins/machine_learning_predict_endpoint'
     autoload :ParamConverter, 'aws-sdk-core/plugins/param_converter'
     autoload :ParamValidator, 'aws-sdk-core/plugins/param_validator'

data/lib/aws-sdk-core/client.rb

@@ -4,8 +4,8 @@ module Aws
 
     # @api private
     DEFAULT_PLUGINS = [
-      'Seahorse::Client::Plugins::Logging',
       'Seahorse::Client::Plugins::ContentLength',
+      'Aws::Plugins::Logging',
       'Aws::Plugins::ParamConverter',
       'Aws::Plugins::ParamValidator',
       'Aws::Plugins::UserAgent',

data/lib/aws-sdk-core/log/formatter.rb

@@ -0,0 +1,249 @@
+require 'pathname'
+
+module Aws
+  module Log
+
+    # A log formatter generates a string for logging from a response. This
+    # accomplished with a log pattern string:
+    #
+    #     pattern = ':operation :http_response_status_code :time'
+    #     formatter = Aws::Log::Formatter.new(pattern)
+    #     formatter.format(response)
+    #     #=> 'get_bucket 200 0.0352'
+    #
+    # # Canned Formatters
+    #
+    # Instead of providing your own pattern, you can choose a canned log
+    # formatter.
+    #
+    # * {Formatter.default}
+    # * {Formatter.colored}
+    # * {Formatter.short}
+    #
+    # # Pattern Substitutions
+    #
+    # You can put any of these placeholders into you pattern.
+    #
+    #   * `:client_class` - The name of the client class.
+    #
+    #   * `:operation` - The name of the client request method.
+    #
+    #   * `:request_params` - The user provided request parameters. Long
+    #     strings are truncated/summarized if they exceed the
+    #     {#max_string_size}.  Other objects are inspected.
+    #
+    #   * `:time` - The total time in seconds spent on the
+    #     request.  This includes client side time spent building
+    #     the request and parsing the response.
+    #
+    #   * `:retries` - The number of times a client request was retried.
+    #
+    #   * `:http_request_method` - The http request verb, e.g., `POST`,
+    #     `PUT`, `GET`, etc.
+    #
+    #   * `:http_request_endpoint` - The request endpoint.  This includes
+    #      the scheme, host and port, but not the path.
+    #
+    #   * `:http_request_scheme` - This is replaced by `http` or `https`.
+    #
+    #   * `:http_request_host` - The host name of the http request
+    #     endpoint (e.g. 's3.amazon.com').
+    #
+    #   * `:http_request_port` - The port number (e.g. '443' or '80').
+    #
+    #   * `:http_request_headers` - The http request headers, inspected.
+    #
+    #   * `:http_request_body` - The http request payload.
+    #
+    #   * `:http_response_status_code` - The http response status
+    #     code, e.g., `200`, `404`, `500`, etc.
+    #
+    #   * `:http_response_headers` - The http response headers, inspected.
+    #
+    #   * `:http_response_body` - The http response body contents.
+    #
+    #   * `:error_class`
+    #
+    #   * `:error_message`
+    #
+    class Formatter
+
+      # @param [String] pattern The log format pattern should be a string
+      #   and may contain substitutions.
+      #
+      # @option options [Integer] :max_string_size (1000) When summarizing
+      #   request parameters, strings longer than this value will be
+      #   truncated.
+      #
+      # @option options [Array<Symbol>] :filter A list of parameter
+      #   names that should be filtered when logging `:request_params`.
+      #
+      #       Formatter.new(pattern, filter: [:password])
+      #
+      #   The default list of filtered parameters is documented on the
+      #   {ParamFilter} class.
+      #
+      def initialize(pattern, options = {})
+        @pattern = pattern
+        @param_formatter = ParamFormatter.new(options)
+        @param_filter = ParamFilter.new(options)
+      end
+
+      # @return [String]
+      attr_reader :pattern
+
+      # Given a resopnse, this will format a log message and return it as a
+      #   string according to {#pattern}.
+      # @param [Seahorse::Client::Response] response
+      # @return [String]
+      def format(response)
+        pattern.gsub(/:(\w+)/) {|sym| send("_#{sym[1..-1]}", response) }
+      end
+
+      # @api private
+      def method_missing(method_name, *args)
+        if method_name.to_s.chars.first == '_'
+          ":#{method_name.to_s[1..-1]}"
+        else
+          super
+        end
+      end
+
+      private
+
+      def _client_class(response)
+        response.context.client.class.name
+      end
+
+      def _operation(response)
+        response.context.operation_name
+      end
+
+      def _request_params(response)
+        params = response.context.params
+        @param_formatter.summarize(@param_filter.filter(params))
+      end
+
+      def _time(response)
+        duration = response.context[:logging_completed_at] -
+          response.context[:logging_started_at]
+        ("%.06f" % duration).sub(/0+$/, '')
+      end
+
+      def _retries(response)
+        response.context.retries
+      end
+
+      def _http_request_endpoint(response)
+        response.context.http_request.endpoint.to_s
+      end
+
+      def _http_request_scheme(response)
+        response.context.http_request.endpoint.scheme
+      end
+
+      def _http_request_host(response)
+        response.context.http_request.endpoint.host
+      end
+
+      def _http_request_port(response)
+        response.context.http_request.endpoint.port.to_s
+      end
+
+      def _http_request_method(response)
+        response.context.http_request.http_method
+      end
+
+      def _http_request_headers(response)
+        response.context.http_request.headers.inspect
+      end
+
+      def _http_request_body(response)
+        @param_formatter.summarize(response.context.http_request.body_contents)
+      end
+
+      def _http_response_status_code(response)
+        response.context.http_response.status_code.to_s
+      end
+
+      def _http_response_headers(response)
+        response.context.http_response.headers.inspect
+      end
+
+      def _http_response_body(response)
+        @param_formatter.summarize(response.context.http_response.body_contents)
+      end
+
+      def _error_class(response)
+        response.error ? response.error.class.name : ''
+      end
+
+      def _error_message(response)
+        response.error ? response.error.message : ''
+      end
+
+      class << self
+
+        # The default log format.
+        # @option (see #initialize)
+        # @example A sample of the default format.
+        #
+        #     [ClientClass 200 0.580066 0 retries] list_objects(:bucket_name => 'bucket')
+        #
+        # @return [Formatter]
+        def default(options = {})
+          pattern = []
+          pattern << "[:client_class"
+          pattern << ":http_response_status_code"
+          pattern << ":time"
+          pattern << ":retries retries]"
+          pattern << ":operation(:request_params)"
+          pattern << ":error_class"
+          pattern << ":error_message"
+          Formatter.new(pattern.join(' ') + "\n", options)
+        end
+
+        # The short log format.  Similar to default, but it does not
+        # inspect the request params or report on retries.
+        # @option (see #initialize)
+        # @example A sample of the short format
+        #
+        #     [ClientClass 200 0.494532] list_buckets
+        #
+        # @return [Formatter]
+        def short(options = {})
+          pattern = []
+          pattern << "[:client_class"
+          pattern << ":http_response_status_code"
+          pattern << ":time]"
+          pattern << ":operation"
+          pattern << ":error_class"
+          Formatter.new(pattern.join(' ') + "\n", options)
+        end
+
+        # The default log format with ANSI colors.
+        # @option (see #initialize)
+        # @example A sample of the colored format (sans the ansi colors).
+        #
+        #     [ClientClass 200 0.580066 0 retries] list_objects(:bucket_name => 'bucket')
+        #
+        # @return [Formatter]
+        def colored(options = {})
+          bold = "\x1b[1m"
+          color = "\x1b[34m"
+          reset = "\x1b[0m"
+          pattern = []
+          pattern << "#{bold}#{color}[:client_class"
+          pattern << ":http_response_status_code"
+          pattern << ":time"
+          pattern << ":retries retries]#{reset}#{bold}"
+          pattern << ":operation(:request_params)"
+          pattern << ":error_class"
+          pattern << ":error_message#{reset}"
+          Formatter.new(pattern.join(' ') + "\n", options)
+        end
+
+      end
+    end
+  end
+end

data/lib/aws-sdk-core/log/handler.rb

@@ -0,0 +1,35 @@
+module Seahorse
+  module Client
+    module Logging
+      class Handler < Client::Handler
+
+        # @param [RequestContext] context
+        # @return [Response]
+        def call(context)
+          context[:logging_started_at] = Time.now
+          @handler.call(context).tap do |response|
+            context[:logging_completed_at] = Time.now
+            log(context.config, response)
+          end
+        end
+
+        private
+
+        # @param [Configuration] config
+        # @param [Response] response
+        # @return [void]
+        def log(config, response)
+          config.logger.send(config.log_level, format(config, response))
+        end
+
+        # @param [Configuration] config
+        # @param [Response] response
+        # @return [String]
+        def format(config, response)
+          config.log_formatter.format(response)
+        end
+
+      end
+    end
+  end
+end

data/lib/aws-sdk-core/log/param_filter.rb

@@ -0,0 +1,43 @@
+require 'pathname'
+
+module Aws
+  module Log
+    class ParamFilter
+
+      # A managed list of sensitive parameters that should be filtered from
+      # logs. This is updated automatically as part of each release. See the
+      # `tasks/sensitive.rake` for more information.
+      #
+      # ** DO NOT EDIT THE FOLLOWING LINE OF CODE **
+      #
+      SENSITIVE = [:admin_contact, :artifact_credentials, :auth_code, :base_32_string_seed, :copy_source_sse_customer_key, :new_password, :old_password, :password, :plaintext, :private_key, :qr_code_png, :registrant_contact, :secret_access_key, :shared_secret, :sse_customer_key, :ssekms_key_id, :tech_contact]
+
+      def initialize(options = {})
+        @filters = Set.new(SENSITIVE + Array(options[:filter]))
+      end
+
+      def filter(value)
+        case value
+        when Struct, Hash then filter_hash(value)
+        when Array then filter_array(value)
+        else value
+        end
+      end
+
+      private
+
+      def filter_hash(values)
+        filtered = {}
+        values.each_pair do |key, value|
+          filtered[key] = @filters.include?(key) ? '[FILTERED]' : filter(value)
+        end
+        filtered
+      end
+
+      def filter_array(values)
+        values.map { |value| filter(value) }
+      end
+
+    end
+  end
+end

data/lib/aws-sdk-core/log/param_formatter.rb

@@ -0,0 +1,68 @@
+require 'pathname'
+
+module Aws
+  module Log
+    # @api private
+    class ParamFormatter
+
+      # String longer than the max string size are truncated
+      MAX_STRING_SIZE = 1000
+
+      def initialize(options = {})
+        @max_string_size = options[:max_string_size] || MAX_STRING_SIZE
+      end
+
+      def summarize(value)
+        Hash === value ? summarize_hash(value) : summarize_value(value)
+      end
+
+      private
+
+      def summarize_hash(hash)
+        hash.keys.first.is_a?(String) ?
+          summarize_string_hash(hash) :
+          summarize_symbol_hash(hash)
+      end
+
+      def summarize_symbol_hash(hash)
+        hash.map do |key,v|
+          "#{key}:#{summarize_value(v)}"
+        end.join(",")
+      end
+
+      def summarize_string_hash(hash)
+        hash.map do |key,v|
+          "#{key.inspect}=>#{summarize_value(v)}"
+        end.join(",")
+      end
+
+      def summarize_string(str)
+        if str.size > @max_string_size
+          "#<String #{str[0...@max_string_size].inspect} ... (#{str.size} bytes)>"
+        else
+          str.inspect
+        end
+      end
+
+      def summarize_value(value)
+        case value
+        when String   then summarize_string(value)
+        when Hash     then '{' + summarize_hash(value) + '}'
+        when Array    then summarize_array(value)
+        when File     then summarize_file(value.path)
+        when Pathname then summarize_file(value)
+        else value.inspect
+        end
+      end
+
+      def summarize_file(path)
+        "#<File:#{path} (#{File.size(path)} bytes)>"
+      end
+
+      def summarize_array(array)
+        "[" + array.map{|v| summarize_value(v) }.join(",") + "]"
+      end
+
+    end
+  end
+end

data/lib/aws-sdk-core/pageable_response.rb

@@ -134,7 +134,7 @@ module Aws
         if method_name == :count
           data.respond_to?(:count)
         else
-          false
+          super
         end
       end
 

data/lib/aws-sdk-core/plugins/logging.rb

@@ -0,0 +1,64 @@
+module Aws
+  module Plugins
+
+    # Enables logging for all requests.  This plugin allows you to configure
+    # your logging device, the log format and the level to log messages at.
+    #
+    # @see Log::Formatter
+    #
+    # @seahorse.client.option [Logger] :logger (nil) The Logger instance
+    #   to send log messages to.  If this option is not set, logging
+    #   will be disabled.
+    #
+    # @seahorse.client.option [Symbol] :log_level (:info) The log level
+    #   to send messages to the logger at.
+    #
+    # @seahorse.client.option [Logging::LogFormatter] :log_formatter The log
+    #   formatter.  Defaults to {Seahorse::Client::Logging::Formatter.default}.
+    #
+    class Logging < Seahorse::Client::Plugin
+
+      option(:logger)
+
+      option(:log_level, :info)
+
+      option(:log_formatter) do |config|
+        Log::Formatter.default if config.logger
+      end
+
+      def add_handlers(handlers, config)
+        handlers.add(Handler, step: :validate) if config.logger
+      end
+
+      class Handler < Seahorse::Client::Handler
+
+        # @param [RequestContext] context
+        # @return [Response]
+        def call(context)
+          context[:logging_started_at] = Time.now
+          @handler.call(context).tap do |response|
+            context[:logging_completed_at] = Time.now
+            log(context.config, response)
+          end
+        end
+
+        private
+
+        # @param [Configuration] config
+        # @param [Response] response
+        # @return [void]
+        def log(config, response)
+          config.logger.send(config.log_level, format(config, response))
+        end
+
+        # @param [Configuration] config
+        # @param [Response] response
+        # @return [String]
+        def format(config, response)
+          config.log_formatter.format(response)
+        end
+
+      end
+    end
+  end
+end

data/lib/aws-sdk-core/version.rb

@@ -1,3 +1,3 @@
 module Aws
-  VERSION = '2.1.15'
+  VERSION = '2.1.16'
 end

data/lib/seahorse.rb

@@ -25,6 +25,8 @@ module Seahorse
       autoload :Response, 'seahorse/client/http/response'
     end
 
+    # The following module has been deprecated.
+    # @api private
     module Logging
       autoload :Handler, 'seahorse/client/logging/handler'
       autoload :Formatter, 'seahorse/client/logging/formatter'

data/lib/seahorse/client/configuration.rb

@@ -33,7 +33,7 @@ module Seahorse
     #     cfg1.color #=> 'red'
     #
     #     # supplied color
-    #     cfg2 = configuration.build!(color: blue)
+    #     cfg2 = configuration.build!(color: 'blue')
     #     cfg2.color #=> 'blue'
     #
     # ## Accepted Options

data/lib/seahorse/client/response.rb

@@ -57,6 +57,12 @@ module Seahorse
         (200..299).include?(@context.http_response.status_code) && @error.nil?
       end
 
+      # @api private
+      def on_complete(&block)
+        @context.http_response.on_done(&block)
+        self
+      end
+
       # @api private
       def inspect
         @data.inspect

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aws-sdk-core
 version: !ruby/object:Gem::Version
-  version: 2.1.15
+  version: 2.1.16
 platform: ruby
 authors:
 - Amazon Web Services
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-20 00:00:00.000000000 Z
+date: 2015-08-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jmespath
@@ -228,6 +228,10 @@ files:
 - lib/aws-sdk-core/kms.rb
 - lib/aws-sdk-core/lambda.rb
 - lib/aws-sdk-core/lambdapreview.rb
+- lib/aws-sdk-core/log/formatter.rb
+- lib/aws-sdk-core/log/handler.rb
+- lib/aws-sdk-core/log/param_filter.rb
+- lib/aws-sdk-core/log/param_formatter.rb
 - lib/aws-sdk-core/machinelearning.rb
 - lib/aws-sdk-core/opsworks.rb
 - lib/aws-sdk-core/pageable_response.rb
@@ -243,6 +247,7 @@ files:
 - lib/aws-sdk-core/plugins/glacier_api_version.rb
 - lib/aws-sdk-core/plugins/glacier_checksums.rb
 - lib/aws-sdk-core/plugins/global_configuration.rb
+- lib/aws-sdk-core/plugins/logging.rb
 - lib/aws-sdk-core/plugins/machine_learning_predict_endpoint.rb
 - lib/aws-sdk-core/plugins/param_converter.rb
 - lib/aws-sdk-core/plugins/param_validator.rb
@@ -399,7 +404,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.0
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: AWS SDK for Ruby - Core