aws-sdk-core 2.1.30 → 2.1.31

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c7d8cb4090e4540174e0cebe44bb119b18a53062
-  data.tar.gz: 967f9f5b25cec1c66cc561280ae8fedfea27da7e
+  metadata.gz: 9ef47ff238a5188d387a6365c5116429cef767e4
+  data.tar.gz: c252c77777dd2ca628d74eda4e959535724885f0
 SHA512:
-  metadata.gz: 13e3639beacc6dad6c11dac0133159bdc0d069dd226afec0ad9b855468c6e4be578e9b4f59bc485d2c75207bcdf40207eb23e06d4415df4bb35d0175c025cd76
-  data.tar.gz: 5868d5e1fc4b048425d95c8b90fd1236188f751c42f1fcf646a34099d84af7269db80d2f54d3ad3a1c40fc233664611e60cb9f63e0f8c3162feb9f6894cae143
+  metadata.gz: cc84bc97edae72edc900511b0f1d89908760e6c892f2085cd49fcef27b1b5bc7d0c2d8c4683e5bbae475b2a0e378591a96d9a587124b9e691626d1e44e7f8ac8
+  data.tar.gz: 712486e2dd3a271b869664b0f5a39dfde7963050c5666b2d6fe945771324b60fa13e0371d27a0985c81321292fd4d52c887ed557764cb9b1d22bd1eef5c611fb

data/apis/autoscaling/2011-01-01/api-2.json

@@ -1487,6 +1487,7 @@
       "min":1
     },
     "BlockDeviceEbsDeleteOnTermination":{"type":"boolean"},
+    "BlockDeviceEbsEncrypted":{"type":"boolean"},
     "BlockDeviceEbsIops":{
       "type":"integer",
       "min":100,
@@ -1830,7 +1831,8 @@
         "VolumeSize":{"shape":"BlockDeviceEbsVolumeSize"},
         "VolumeType":{"shape":"BlockDeviceEbsVolumeType"},
         "DeleteOnTermination":{"shape":"BlockDeviceEbsDeleteOnTermination"},
-        "Iops":{"shape":"BlockDeviceEbsIops"}
+        "Iops":{"shape":"BlockDeviceEbsIops"},
+        "Encrypted":{"shape":"BlockDeviceEbsEncrypted"}
       }
     },
     "EbsOptimized":{"type":"boolean"},

data/apis/iam/2010-05-08/api-2.json

@@ -5052,6 +5052,16 @@
         "AWSManagedPolicy"
       ]
     },
+    "EvalDecisionDetailsType":{
+      "type":"map",
+      "key":{"shape":"EvalDecisionSourceType"},
+      "value":{"shape":"PolicyEvaluationDecisionType"}
+    },
+    "EvalDecisionSourceType":{
+      "type":"string",
+      "min":3,
+      "max":256
+    },
     "EvaluationResult":{
       "type":"structure",
       "required":[
@@ -5064,7 +5074,8 @@
         "EvalResourceName":{"shape":"ResourceNameType"},
         "EvalDecision":{"shape":"PolicyEvaluationDecisionType"},
         "MatchedStatements":{"shape":"StatementListType"},
-        "MissingContextValues":{"shape":"ContextKeyNamesResultListType"}
+        "MissingContextValues":{"shape":"ContextKeyNamesResultListType"},
+        "EvalDecisionDetails":{"shape":"EvalDecisionDetailsType"}
       }
     },
     "EvaluationResultsListType":{
@@ -6129,6 +6140,7 @@
         "role",
         "aws-managed",
         "user-managed",
+        "resource",
         "none"
       ]
     },
@@ -6437,6 +6449,9 @@
         "PolicyInputList":{"shape":"SimulationPolicyListType"},
         "ActionNames":{"shape":"ActionNameListType"},
         "ResourceArns":{"shape":"ResourceNameListType"},
+        "ResourcePolicy":{"shape":"policyDocumentType"},
+        "ResourceOwner":{"shape":"ResourceNameType"},
+        "CallerArn":{"shape":"ResourceNameType"},
         "ContextEntries":{"shape":"ContextEntryListType"},
         "MaxItems":{"shape":"maxItemsType"},
         "Marker":{"shape":"markerType"}
@@ -6461,6 +6476,9 @@
         "PolicyInputList":{"shape":"SimulationPolicyListType"},
         "ActionNames":{"shape":"ActionNameListType"},
         "ResourceArns":{"shape":"ResourceNameListType"},
+        "ResourcePolicy":{"shape":"policyDocumentType"},
+        "ResourceOwner":{"shape":"ResourceNameType"},
+        "CallerArn":{"shape":"ResourceNameType"},
         "ContextEntries":{"shape":"ContextEntryListType"},
         "MaxItems":{"shape":"maxItemsType"},
         "Marker":{"shape":"markerType"}

data/lib/aws-sdk-core.rb

@@ -146,6 +146,7 @@ module Aws
     autoload :DynamoDBSimpleAttributes, 'aws-sdk-core/plugins/dynamodb_simple_attributes'
     autoload :DynamoDBCRC32Validation, 'aws-sdk-core/plugins/dynamodb_crc32_validation'
     autoload :EC2CopyEncryptedSnapshot, 'aws-sdk-core/plugins/ec2_copy_encrypted_snapshot'
+    autoload :EC2RegionValidation, 'aws-sdk-core/plugins/ec2_region_validation'
     autoload :GlacierAccountId, 'aws-sdk-core/plugins/glacier_account_id'
     autoload :GlacierApiVersion, 'aws-sdk-core/plugins/glacier_api_version'
     autoload :GlacierChecksums, 'aws-sdk-core/plugins/glacier_checksums'

data/lib/aws-sdk-core/api/builder.rb

@@ -34,8 +34,8 @@ module Aws
       # @param [Hash] definition
       # @return [Seahorse::Model::Api]
       def build(definition, options = {})
-        docs = build_docstring_provider(options)
         api = build_api(definition)
+        docs = build_docstring_provider(api, options)
         shapes = build_shape_map(definition, api, docs)
         build_operations(definition, api, shapes, docs)
         build_struct_classes(shapes, options)
@@ -44,9 +44,11 @@ module Aws
 
       private
 
-      def build_docstring_provider(options)
+      def build_docstring_provider(api, options)
         if options[:docs] && ENV['DOCSTRINGS']
-          Docs::DocstringProvider.new(Json.load_file(options[:docs]))
+          docs = Json.load_file(options[:docs])
+          Customizations.apply_doc_customizations(api, docs)
+          Docs::DocstringProvider.new(docs)
         else
           Docs::NullDocstringProvider.new
         end

data/lib/aws-sdk-core/api/customizations.rb

@@ -3,6 +3,7 @@ module Aws
     module Customizations
 
       @apis = {}
+      @docs = {}
       @plugins = {}
 
       class << self
@@ -11,6 +12,10 @@ module Aws
           @apis[prefix] = block
         end
 
+        def doc(prefix, &block)
+          @docs[prefix] = block
+        end
+
         def plugins(prefix, options)
           @plugins[prefix] = {
             add: options[:add] || [],
@@ -24,6 +29,11 @@ module Aws
           @apis[prefix].call(api) if @apis[prefix]
         end
 
+        def apply_doc_customizations(api, docs)
+          prefix = api.metadata['endpointPrefix']
+          @docs[prefix].call(docs) if @docs[prefix]
+        end
+
         def apply_plugins(client_class)
           prefix = client_class.api.metadata['endpointPrefix']
           if @plugins[prefix]
@@ -70,6 +80,7 @@ module Aws
 
       plugins('ec2', add: %w(
         Aws::Plugins::EC2CopyEncryptedSnapshot
+        Aws::Plugins::EC2RegionValidation
       ))
 
       api('glacier') do |api|
@@ -111,6 +122,11 @@ module Aws
         api['shapes']['Timestamp']['type'] = 'timestamp'
       end
 
+      doc('lambda') do |docs|
+        docs['shapes']['Blob']['refs']['UpdateFunctionCodeRequest$ZipFile'] =
+          "<p>.zip file containing your packaged source code.</p>"
+      end
+
       plugins('machinelearning', add: %w(
         Aws::Plugins::MachineLearningPredictEndpoint
       ))

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

@@ -69,7 +69,7 @@ module Aws
       # Retry loading credentials up to 3 times is the instance metadata
       # service is responding but is returning invalid JSON documents
       # in response to the GET profile credentials call.
-      retry_errors([JSON::ParserError], max_retries: 3) do
+      retry_errors([JSON::ParserError, StandardError], max_retries: 3) do
         c = JSON.parse(get_credentials.to_s)
         @credentials = Credentials.new(
           c['AccessKeyId'],

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

@@ -97,6 +97,14 @@ module Aws
         @converters[shape_class][value_class] = converter || block
       end
 
+      def ensure_open(file)
+        if file.closed?
+          File.open(file.path, 'rb')
+        else
+          file
+        end
+      end
+
       # @api private
       def c(shape, value)
         if converter = converter_for(shape, value)
@@ -195,7 +203,8 @@ module Aws
     end
 
     add(BlobShape, IO)
-    add(BlobShape, Tempfile)
+    add(BlobShape, File) { |file| ensure_open(file) }
+    add(BlobShape, Tempfile) { |tmpfile| ensure_open(tmpfile) }
     add(BlobShape, StringIO)
     add(BlobShape, String)
 

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

@@ -0,0 +1,17 @@
+module Aws
+  module Plugins
+    # @api private
+    class EC2RegionValidation < Seahorse::Client::Plugin
+
+      def after_initialize(client)
+        if region = client.config.region
+          if matches = region.match(/^(\w+-\w+-\d+)[a-z]$/)
+            msg = ":region option must a region name, not an availability "
+            msg << "zone name; try `#{matches[1]}' instead of `#{matches[0]}'"
+            raise ArgumentError, msg
+          end
+        end
+      end
+    end
+  end
+end

data/lib/aws-sdk-core/signers/v4.rb

@@ -134,7 +134,7 @@ module Aws
         if @service_name == 's3'
           path
         else
-          path.gsub(/[^\/]+/) { |segment| Seahorse::Util.uri_escape(segment) }
+          Seahorse::Util.uri_path_escape(path)
         end
       end
 

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

@@ -1,3 +1,3 @@
 module Aws
-  VERSION = '2.1.30'
+  VERSION = '2.1.31'
 end

data/lib/seahorse/util.rb

@@ -24,6 +24,10 @@ module Seahorse
         CGI.escape(string.encode('UTF-8')).gsub('+', '%20').gsub('%7E', '~')
       end
 
+      def uri_path_escape(path)
+        path.gsub(/[^\/]+/) { |part| uri_escape(part) }
+      end
+
     end
 
     @irregular_inflections = {}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aws-sdk-core
 version: !ruby/object:Gem::Version
-  version: 2.1.30
+  version: 2.1.31
 platform: ruby
 authors:
 - Amazon Web Services
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-15 00:00:00.000000000 Z
+date: 2015-10-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jmespath
@@ -256,6 +256,7 @@ files:
 - lib/aws-sdk-core/plugins/dynamodb_extended_retries.rb
 - lib/aws-sdk-core/plugins/dynamodb_simple_attributes.rb
 - lib/aws-sdk-core/plugins/ec2_copy_encrypted_snapshot.rb
+- lib/aws-sdk-core/plugins/ec2_region_validation.rb
 - lib/aws-sdk-core/plugins/glacier_account_id.rb
 - lib/aws-sdk-core/plugins/glacier_api_version.rb
 - lib/aws-sdk-core/plugins/glacier_checksums.rb