aws-sdk-core 2.1.0 → 2.1.1

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

@@ -3,9 +3,8 @@ module Aws
   class Pager
 
     def initialize(rules)
-      if rules['more_results']
-        @more_results = underscore(rules['more_results'])
-      end
+      @more_results = rules['more_results']
+      @more_results = underscore(@more_results) if @more_results
       if rules['limit_key']
         @limit_key = underscore(rules['limit_key']).to_sym
       end

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

@@ -64,6 +64,7 @@ module Aws
           context.http_request.http_method = 'GET'
           context.http_request.endpoint = new_endpoint(context)
           context.http_request.body = ''
+          context.http_request.headers.delete('Content-Type')
         end
 
         def new_endpoint(context)
@@ -74,7 +75,7 @@ module Aws
         end
 
         def presigned_url(http_request, config)
-          signer = Signers::V4.new('ec2', config.credentials, config.region)
+          signer = Signers::V4.new(config.credentials, 'ec2', config.region)
           signer.presigned_url(http_request, expires_in: 3600)
         end
 

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

@@ -22,6 +22,7 @@ module Aws
       class Handler < Seahorse::Client::Handler
 
         def call(context)
+          context[:original_params] = context.params
           resp = @handler.call(context)
           resp.extend(PageableResponse)
           resp.pager = context.operation[:pager]

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

@@ -53,7 +53,7 @@ module Aws
     # @note This method does not indicate if the file found at {#path}
     #   will be parsable, only if it can be read.
     def loadable?
-      !path.nil? && File.exists?(path) && File.readable?(path)
+      !path.nil? && File.exist?(path) && File.readable?(path)
     end
 
     private
@@ -92,7 +92,7 @@ module Aws
       map = {}
       file.lines.each do |line|
         line = line.split(/^|\s;/).first # remove comments
-        section = line.match(/^\s*\[([^\[\]]+)\]\s*$/) unless line.nil?
+        section = line.match(/^\s*\[([^\[\]]+)\]\s*(#.+)?$/) unless line.nil?
         if section
           current_section = section[1]
         elsif current_section

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

@@ -1,7 +1,7 @@
 require 'set'
 require 'time'
 require 'openssl'
-require 'uri'
+require 'webrick/httputils'
 
 module Aws
   module Signers
@@ -53,7 +53,7 @@ module Aws
       def signature(request)
         string_to_sign = string_to_sign(request)
         signature = digest(credentials.secret_access_key, string_to_sign)
-        URI.escape(signature)
+        uri_escape(signature)
       end
 
       def digest(secret, string_to_sign)
@@ -150,7 +150,35 @@ module Aws
       def signed_querystring_params(endpoint)
         endpoint.query.to_s.split('&').select do |p|
           SIGNED_QUERYSTRING_PARAMS.include?(p.split('=')[0])
-        end.map { |p| URI.decode(p) }
+        end.map { |p| CGI.unescape(p) }
+      end
+
+      def uri_escape(s)
+
+        #URI.escape(s)
+
+        # URI.escape is deprecated, replacing it with escape from webrick
+        # to squelch the massive number of warnings generated from Ruby.
+        # The following script was used to determine the differences
+        # between the various escape methods available. The webrick
+        # escape only had two differences and it is available in the
+        # standard lib.
+        #
+        #     (0..255).each {|c|
+        #       s = [c].pack("C")
+        #       e = [
+        #         CGI.escape(s),
+        #         ERB::Util.url_encode(s),
+        #         URI.encode_www_form_component(s),
+        #         WEBrick::HTTPUtils.escape_form(s),
+        #         WEBrick::HTTPUtils.escape(s),
+        #         URI.escape(s),
+        #       ]
+        #       next if e.uniq.length == 1
+        #       puts("%5s %5s %5s %5s %5s %5s %5s" % ([s.inspect] + e))
+        #     }
+        #
+        WEBrick::HTTPUtils.escape(s).gsub('%5B', '[').gsub('%5D', ']')
       end
 
     end

data/lib/aws-sdk-core/stubbing/protocols/ec2.rb

@@ -31,11 +31,9 @@ module Aws
 
         def build_body(api, operation, data)
           xml = []
-          if rules = operation.output
-            Xml::Builder.new(operation.output, target:xml).to_xml(data)
-            xml.shift
-            xml.pop
-          end
+          Xml::Builder.new(operation.output, target:xml).to_xml(data)
+          xml.shift
+          xml.pop
           xmlns = "http://ec2.amazonaws.com/doc/#{api.version}/".inspect
           xml.unshift("  <requestId>stubbed-request-id</requestId>")
           xml.unshift("<#{operation.name}Response xmlns=#{xmlns}>\n")

data/lib/aws-sdk-core/stubbing/protocols/rest_xml.rb

@@ -7,7 +7,6 @@ module Aws
 
         def body_for(api, operation, rules, data)
           xml = []
-          builder = Aws::Xml::DocBuilder.new(target: xml, indent: '  ')
           rules.location_name = operation.name + 'Result'
           rules['xmlNamespace'] = { 'uri' => api.metadata['xmlNamespace'] }
           Xml::Builder.new(rules, target:xml).to_xml(data)

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

@@ -1,3 +1,3 @@
 module Aws
-  VERSION = '2.1.0'
+  VERSION = '2.1.1'
 end

data/lib/aws-sdk-core/xml/parser.rb

@@ -10,6 +10,7 @@ module Aws
 
       autoload :LibxmlEngine, 'aws-sdk-core/xml/parser/engines/libxml'
       autoload :NokogiriEngine, 'aws-sdk-core/xml/parser/engines/nokogiri'
+      autoload :OgaEngine, 'aws-sdk-core/xml/parser/engines/oga'
       autoload :OxEngine, 'aws-sdk-core/xml/parser/engines/ox'
       autoload :RexmlEngine, 'aws-sdk-core/xml/parser/engines/rexml'
 
@@ -35,6 +36,7 @@ module Aws
         #   Must be one of the following values:
         #
         #   * :ox
+        #   * :oga
         #   * :libxml
         #   * :nokogiri
         #   * :rexml
@@ -47,6 +49,7 @@ module Aws
         #   One of:
         #
         #   * {OxEngine}
+        #   * {OgaEngine}
         #   * {LibxmlEngine}
         #   * {NokogiriEngine}
         #   * {RexmlEngine}
@@ -71,7 +74,7 @@ module Aws
 
       end
 
-      self.engine = [:ox, :libxml, :nokogiri, :rexml].find do |name|
+      self.engine = [:ox, :oga, :libxml, :nokogiri, :rexml].find do |name|
         try_load_engine(name)
       end
 

data/lib/aws-sdk-core/xml/parser/engines/oga.rb

@@ -0,0 +1,39 @@
+require 'oga'
+
+module Aws
+  module Xml
+    class Parser
+      class OgaEngine
+
+        def initialize(stack)
+          @stack = stack
+          @depth = 0
+        end
+
+        def parse(xml)
+          Oga.sax_parse_xml(self, xml, strict:true)
+        rescue LL::ParserError => error
+          raise ParsingError.new(error.message, nil, nil)
+        end
+
+        def on_element(namespace, name, attrs = {})
+          @depth += 1
+          @stack.start_element(name)
+          attrs.each do |attr|
+            @stack.attr(*attr)
+          end
+        end
+
+        def on_text(value)
+          @stack.text(value) if @depth > 0
+        end
+
+        def after_element(_, _)
+          @stack.end_element
+          @depth -= 1
+        end
+
+      end
+    end
+  end
+end

data/lib/seahorse/client/http/request.rb

@@ -11,7 +11,7 @@ module Seahorse
         # @option options [Headers] :headers (Headers.new)
         # @option options [Body] :body (StringIO.new)
         def initialize(options = {})
-          self.endpoint = options[:endpoint] if options[:endpoint]
+          self.endpoint = options[:endpoint]
           self.http_method = options[:http_method] || 'GET'
           self.headers = Headers.new(options[:headers] || {})
           self.body = options[:body]

data/lib/seahorse/client/http/response.rb

@@ -23,12 +23,14 @@ module Seahorse
         # @return [Headers]
         attr_accessor :headers
 
-        # @return [IO]
-        attr_accessor :body
-
         # @return [StandardError, nil]
         attr_reader :error
 
+        # @return [IO]
+        def body
+          @body
+        end
+
         # @param [#read, #size, #rewind] io
         def body=(io)
           @body = case io

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aws-sdk-core
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.1.1
 platform: ruby
 authors:
 - Amazon Web Services
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-12 00:00:00.000000000 Z
+date: 2015-06-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jmespath
@@ -52,8 +52,6 @@ files:
 - apis/codedeploy/2014-10-06/paginators-1.json
 - apis/cognito-identity/2014-06-30/api-2.json
 - apis/cognito-sync/2014-06-30/api-2.json
-- apis/config/2014-10-17/api-2.json
-- apis/config/2014-10-17/paginators-1.json
 - apis/config/2014-11-12/api-2.json
 - apis/config/2014-11-12/paginators-1.json
 - apis/datapipeline/2012-10-29/api-2.json
@@ -65,14 +63,6 @@ files:
 - apis/dynamodb/2012-08-10/paginators-1.json
 - apis/dynamodb/2012-08-10/resources-1.json
 - apis/dynamodb/2012-08-10/waiters-2.json
-- apis/ec2/2014-10-01/api-2.json
-- apis/ec2/2014-10-01/paginators-1.json
-- apis/ec2/2014-10-01/resources-1.json
-- apis/ec2/2014-10-01/waiters-2.json
-- apis/ec2/2015-03-01/api-2.json
-- apis/ec2/2015-03-01/paginators-1.json
-- apis/ec2/2015-03-01/resources-1.json
-- apis/ec2/2015-03-01/waiters-2.json
 - apis/ec2/2015-04-15/api-2.json
 - apis/ec2/2015-04-15/paginators-1.json
 - apis/ec2/2015-04-15/resources-1.json
@@ -105,6 +95,7 @@ files:
 - apis/iam/2010-05-08/api-2.json
 - apis/iam/2010-05-08/paginators-1.json
 - apis/iam/2010-05-08/resources-1.json
+- apis/iam/2010-05-08/waiters-2.json
 - apis/importexport/2010-06-01/api-2.json
 - apis/importexport/2010-06-01/paginators-1.json
 - apis/kinesis/2013-12-02/api-2.json
@@ -332,6 +323,7 @@ files:
 - lib/aws-sdk-core/xml/parser.rb
 - lib/aws-sdk-core/xml/parser/engines/libxml.rb
 - lib/aws-sdk-core/xml/parser/engines/nokogiri.rb
+- lib/aws-sdk-core/xml/parser/engines/oga.rb
 - lib/aws-sdk-core/xml/parser/engines/ox.rb
 - lib/aws-sdk-core/xml/parser/engines/rexml.rb
 - lib/aws-sdk-core/xml/parser/frame.rb
@@ -394,7 +386,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: AWS SDK for Ruby - Core

data/apis/config/2014-10-17/api-2.json

@@ -1,694 +0,0 @@
-{
-  "metadata":{
-    "apiVersion":"2014-10-17",
-    "endpointPrefix":"config",
-    "jsonVersion":"1.1",
-    "serviceAbbreviation":"Config Service",
-    "serviceFullName":"AWS Config",
-    "signatureVersion":"v4",
-    "targetPrefix":"StarlingDoveService",
-    "protocol":"json"
-  },
-  "operations":{
-    "DeleteDeliveryChannel":{
-      "name":"DeleteDeliveryChannel",
-      "http":{
-        "method":"POST",
-        "requestUri":"/"
-      },
-      "input":{"shape":"DeleteDeliveryChannelRequest"},
-      "errors":[
-        {
-          "shape":"NoSuchDeliveryChannelException",
-          "exception":true
-        },
-        {
-          "shape":"LastDeliveryChannelDeleteFailedException",
-          "exception":true
-        }
-      ]
-    },
-    "DeliverConfigSnapshot":{
-      "name":"DeliverConfigSnapshot",
-      "http":{
-        "method":"POST",
-        "requestUri":"/"
-      },
-      "input":{"shape":"DeliverConfigSnapshotRequest"},
-      "output":{"shape":"DeliverConfigSnapshotResponse"},
-      "errors":[
-        {
-          "shape":"NoSuchDeliveryChannelException",
-          "exception":true
-        },
-        {
-          "shape":"NoAvailableConfigurationRecorderException",
-          "exception":true
-        },
-        {
-          "shape":"NoRunningConfigurationRecorderException",
-          "exception":true
-        }
-      ]
-    },
-    "DescribeConfigurationRecorderStatus":{
-      "name":"DescribeConfigurationRecorderStatus",
-      "http":{
-        "method":"POST",
-        "requestUri":"/"
-      },
-      "input":{"shape":"DescribeConfigurationRecorderStatusRequest"},
-      "output":{"shape":"DescribeConfigurationRecorderStatusResponse"},
-      "errors":[
-        {
-          "shape":"NoSuchConfigurationRecorderException",
-          "exception":true
-        }
-      ]
-    },
-    "DescribeConfigurationRecorders":{
-      "name":"DescribeConfigurationRecorders",
-      "http":{
-        "method":"POST",
-        "requestUri":"/"
-      },
-      "input":{"shape":"DescribeConfigurationRecordersRequest"},
-      "output":{"shape":"DescribeConfigurationRecordersResponse"},
-      "errors":[
-        {
-          "shape":"NoSuchConfigurationRecorderException",
-          "exception":true
-        }
-      ]
-    },
-    "DescribeDeliveryChannelStatus":{
-      "name":"DescribeDeliveryChannelStatus",
-      "http":{
-        "method":"POST",
-        "requestUri":"/"
-      },
-      "input":{"shape":"DescribeDeliveryChannelStatusRequest"},
-      "output":{"shape":"DescribeDeliveryChannelStatusResponse"},
-      "errors":[
-        {
-          "shape":"NoSuchDeliveryChannelException",
-          "exception":true
-        }
-      ]
-    },
-    "DescribeDeliveryChannels":{
-      "name":"DescribeDeliveryChannels",
-      "http":{
-        "method":"POST",
-        "requestUri":"/"
-      },
-      "input":{"shape":"DescribeDeliveryChannelsRequest"},
-      "output":{"shape":"DescribeDeliveryChannelsResponse"},
-      "errors":[
-        {
-          "shape":"NoSuchDeliveryChannelException",
-          "exception":true
-        }
-      ]
-    },
-    "GetResourceConfigHistory":{
-      "name":"GetResourceConfigHistory",
-      "http":{
-        "method":"POST",
-        "requestUri":"/"
-      },
-      "input":{"shape":"GetResourceConfigHistoryRequest"},
-      "output":{"shape":"GetResourceConfigHistoryResponse"},
-      "errors":[
-        {
-          "shape":"ValidationException",
-          "exception":true
-        },
-        {
-          "shape":"InvalidTimeRangeException",
-          "exception":true
-        },
-        {
-          "shape":"InvalidLimitException",
-          "exception":true
-        },
-        {
-          "shape":"InvalidNextTokenException",
-          "exception":true
-        },
-        {
-          "shape":"NoAvailableConfigurationRecorderException",
-          "exception":true
-        },
-        {
-          "shape":"ResourceNotDiscoveredException",
-          "exception":true
-        }
-      ]
-    },
-    "PutConfigurationRecorder":{
-      "name":"PutConfigurationRecorder",
-      "http":{
-        "method":"POST",
-        "requestUri":"/"
-      },
-      "input":{"shape":"PutConfigurationRecorderRequest"},
-      "errors":[
-        {
-          "shape":"MaxNumberOfConfigurationRecordersExceededException",
-          "exception":true
-        },
-        {
-          "shape":"InvalidConfigurationRecorderNameException",
-          "exception":true
-        },
-        {
-          "shape":"InvalidRoleException",
-          "exception":true
-        }
-      ]
-    },
-    "PutDeliveryChannel":{
-      "name":"PutDeliveryChannel",
-      "http":{
-        "method":"POST",
-        "requestUri":"/"
-      },
-      "input":{"shape":"PutDeliveryChannelRequest"},
-      "errors":[
-        {
-          "shape":"MaxNumberOfDeliveryChannelsExceededException",
-          "exception":true
-        },
-        {
-          "shape":"NoAvailableConfigurationRecorderException",
-          "exception":true
-        },
-        {
-          "shape":"InvalidDeliveryChannelNameException",
-          "exception":true
-        },
-        {
-          "shape":"NoSuchBucketException",
-          "exception":true
-        },
-        {
-          "shape":"InvalidS3KeyPrefixException",
-          "exception":true
-        },
-        {
-          "shape":"InvalidSNSTopicARNException",
-          "exception":true
-        },
-        {
-          "shape":"InsufficientDeliveryPolicyException",
-          "exception":true
-        }
-      ]
-    },
-    "StartConfigurationRecorder":{
-      "name":"StartConfigurationRecorder",
-      "http":{
-        "method":"POST",
-        "requestUri":"/"
-      },
-      "input":{"shape":"StartConfigurationRecorderRequest"},
-      "errors":[
-        {
-          "shape":"NoSuchConfigurationRecorderException",
-          "exception":true
-        },
-        {
-          "shape":"NoAvailableDeliveryChannelException",
-          "exception":true
-        }
-      ]
-    },
-    "StopConfigurationRecorder":{
-      "name":"StopConfigurationRecorder",
-      "http":{
-        "method":"POST",
-        "requestUri":"/"
-      },
-      "input":{"shape":"StopConfigurationRecorderRequest"},
-      "errors":[
-        {
-          "shape":"NoSuchConfigurationRecorderException",
-          "exception":true
-        }
-      ]
-    }
-  },
-  "shapes":{
-    "ARN":{"type":"string"},
-    "AccountId":{"type":"string"},
-    "AvailabilityZone":{"type":"string"},
-    "Boolean":{"type":"boolean"},
-    "ChannelName":{
-      "type":"string",
-      "min":1,
-      "max":256
-    },
-    "ChronologicalOrder":{
-      "type":"string",
-      "enum":[
-        "Reverse",
-        "Forward"
-      ]
-    },
-    "ConfigExportDeliveryInfo":{
-      "type":"structure",
-      "members":{
-        "lastStatus":{"shape":"DeliveryStatus"},
-        "lastErrorCode":{"shape":"String"},
-        "lastErrorMessage":{"shape":"String"},
-        "lastAttemptTime":{"shape":"Date"},
-        "lastSuccessfulTime":{"shape":"Date"}
-      }
-    },
-    "ConfigStreamDeliveryInfo":{
-      "type":"structure",
-      "members":{
-        "lastStatus":{"shape":"DeliveryStatus"},
-        "lastErrorCode":{"shape":"String"},
-        "lastErrorMessage":{"shape":"String"},
-        "lastStatusChangeTime":{"shape":"Date"}
-      }
-    },
-    "Configuration":{"type":"string"},
-    "ConfigurationItem":{
-      "type":"structure",
-      "members":{
-        "version":{"shape":"Version"},
-        "accountId":{"shape":"AccountId"},
-        "configurationItemCaptureTime":{"shape":"ConfigurationItemCaptureTime"},
-        "configurationItemStatus":{"shape":"ConfigurationItemStatus"},
-        "configurationStateId":{"shape":"ConfigurationStateId"},
-        "configurationItemMD5Hash":{"shape":"ConfigurationItemMD5Hash"},
-        "arn":{"shape":"ARN"},
-        "resourceType":{"shape":"ResourceType"},
-        "resourceId":{"shape":"ResourceId"},
-        "availabilityZone":{"shape":"AvailabilityZone"},
-        "resourceCreationTime":{"shape":"ResourceCreationTime"},
-        "tags":{"shape":"Tags"},
-        "relatedEvents":{"shape":"RelatedEventList"},
-        "relationships":{"shape":"RelationshipList"},
-        "configuration":{"shape":"Configuration"}
-      }
-    },
-    "ConfigurationItemCaptureTime":{"type":"timestamp"},
-    "ConfigurationItemList":{
-      "type":"list",
-      "member":{"shape":"ConfigurationItem"}
-    },
-    "ConfigurationItemMD5Hash":{"type":"string"},
-    "ConfigurationItemStatus":{
-      "type":"string",
-      "enum":[
-        "Ok",
-        "Failed",
-        "Discovered",
-        "Deleted"
-      ]
-    },
-    "ConfigurationRecorder":{
-      "type":"structure",
-      "members":{
-        "name":{"shape":"RecorderName"},
-        "roleARN":{"shape":"String"}
-      }
-    },
-    "ConfigurationRecorderList":{
-      "type":"list",
-      "member":{"shape":"ConfigurationRecorder"}
-    },
-    "ConfigurationRecorderNameList":{
-      "type":"list",
-      "member":{"shape":"RecorderName"}
-    },
-    "ConfigurationRecorderStatus":{
-      "type":"structure",
-      "members":{
-        "name":{"shape":"String"},
-        "lastStartTime":{"shape":"Date"},
-        "lastStopTime":{"shape":"Date"},
-        "recording":{"shape":"Boolean"},
-        "lastStatus":{"shape":"RecorderStatus"},
-        "lastErrorCode":{"shape":"String"},
-        "lastErrorMessage":{"shape":"String"},
-        "lastStatusChangeTime":{"shape":"Date"}
-      }
-    },
-    "ConfigurationRecorderStatusList":{
-      "type":"list",
-      "member":{"shape":"ConfigurationRecorderStatus"}
-    },
-    "ConfigurationStateId":{"type":"string"},
-    "Date":{"type":"timestamp"},
-    "DeleteDeliveryChannelRequest":{
-      "type":"structure",
-      "required":["DeliveryChannelName"],
-      "members":{
-        "DeliveryChannelName":{"shape":"ChannelName"}
-      }
-    },
-    "DeliverConfigSnapshotRequest":{
-      "type":"structure",
-      "required":["deliveryChannelName"],
-      "members":{
-        "deliveryChannelName":{"shape":"ChannelName"}
-      }
-    },
-    "DeliverConfigSnapshotResponse":{
-      "type":"structure",
-      "members":{
-        "configSnapshotId":{"shape":"String"}
-      }
-    },
-    "DeliveryChannel":{
-      "type":"structure",
-      "members":{
-        "name":{"shape":"ChannelName"},
-        "s3BucketName":{"shape":"String"},
-        "s3KeyPrefix":{"shape":"String"},
-        "snsTopicARN":{"shape":"String"}
-      }
-    },
-    "DeliveryChannelList":{
-      "type":"list",
-      "member":{"shape":"DeliveryChannel"}
-    },
-    "DeliveryChannelNameList":{
-      "type":"list",
-      "member":{"shape":"ChannelName"}
-    },
-    "DeliveryChannelStatus":{
-      "type":"structure",
-      "members":{
-        "name":{"shape":"String"},
-        "configSnapshotDeliveryInfo":{"shape":"ConfigExportDeliveryInfo"},
-        "configHistoryDeliveryInfo":{"shape":"ConfigExportDeliveryInfo"},
-        "configStreamDeliveryInfo":{"shape":"ConfigStreamDeliveryInfo"}
-      }
-    },
-    "DeliveryChannelStatusList":{
-      "type":"list",
-      "member":{"shape":"DeliveryChannelStatus"}
-    },
-    "DeliveryStatus":{
-      "type":"string",
-      "enum":[
-        "Success",
-        "Failure"
-      ]
-    },
-    "DescribeConfigurationRecorderStatusRequest":{
-      "type":"structure",
-      "members":{
-        "ConfigurationRecorderNames":{"shape":"ConfigurationRecorderNameList"}
-      }
-    },
-    "DescribeConfigurationRecorderStatusResponse":{
-      "type":"structure",
-      "members":{
-        "ConfigurationRecordersStatus":{"shape":"ConfigurationRecorderStatusList"}
-      }
-    },
-    "DescribeConfigurationRecordersRequest":{
-      "type":"structure",
-      "members":{
-        "ConfigurationRecorderNames":{"shape":"ConfigurationRecorderNameList"}
-      }
-    },
-    "DescribeConfigurationRecordersResponse":{
-      "type":"structure",
-      "members":{
-        "ConfigurationRecorders":{"shape":"ConfigurationRecorderList"}
-      }
-    },
-    "DescribeDeliveryChannelStatusRequest":{
-      "type":"structure",
-      "members":{
-        "DeliveryChannelNames":{"shape":"DeliveryChannelNameList"}
-      }
-    },
-    "DescribeDeliveryChannelStatusResponse":{
-      "type":"structure",
-      "members":{
-        "DeliveryChannelsStatus":{"shape":"DeliveryChannelStatusList"}
-      }
-    },
-    "DescribeDeliveryChannelsRequest":{
-      "type":"structure",
-      "members":{
-        "DeliveryChannelNames":{"shape":"DeliveryChannelNameList"}
-      }
-    },
-    "DescribeDeliveryChannelsResponse":{
-      "type":"structure",
-      "members":{
-        "DeliveryChannels":{"shape":"DeliveryChannelList"}
-      }
-    },
-    "EarlierTime":{"type":"timestamp"},
-    "GetResourceConfigHistoryRequest":{
-      "type":"structure",
-      "required":[
-        "resourceType",
-        "resourceId"
-      ],
-      "members":{
-        "resourceType":{"shape":"ResourceType"},
-        "resourceId":{"shape":"ResourceId"},
-        "laterTime":{"shape":"LaterTime"},
-        "earlierTime":{"shape":"EarlierTime"},
-        "chronologicalOrder":{"shape":"ChronologicalOrder"},
-        "limit":{"shape":"Limit"},
-        "nextToken":{"shape":"NextToken"}
-      }
-    },
-    "GetResourceConfigHistoryResponse":{
-      "type":"structure",
-      "members":{
-        "configurationItems":{"shape":"ConfigurationItemList"},
-        "nextToken":{"shape":"NextToken"}
-      }
-    },
-    "InsufficientDeliveryPolicyException":{
-      "type":"structure",
-      "members":{
-      },
-      "exception":true
-    },
-    "InvalidConfigurationRecorderNameException":{
-      "type":"structure",
-      "members":{
-      },
-      "exception":true
-    },
-    "InvalidDeliveryChannelNameException":{
-      "type":"structure",
-      "members":{
-      },
-      "exception":true
-    },
-    "InvalidLimitException":{
-      "type":"structure",
-      "members":{
-      },
-      "exception":true
-    },
-    "InvalidNextTokenException":{
-      "type":"structure",
-      "members":{
-      },
-      "exception":true
-    },
-    "InvalidRoleException":{
-      "type":"structure",
-      "members":{
-      },
-      "exception":true
-    },
-    "InvalidS3KeyPrefixException":{
-      "type":"structure",
-      "members":{
-      },
-      "exception":true
-    },
-    "InvalidSNSTopicARNException":{
-      "type":"structure",
-      "members":{
-      },
-      "exception":true
-    },
-    "InvalidTimeRangeException":{
-      "type":"structure",
-      "members":{
-      },
-      "exception":true
-    },
-    "LastDeliveryChannelDeleteFailedException":{
-      "type":"structure",
-      "members":{
-      },
-      "exception":true
-    },
-    "LaterTime":{"type":"timestamp"},
-    "Limit":{
-      "type":"integer",
-      "min":0,
-      "max":100
-    },
-    "MaxNumberOfConfigurationRecordersExceededException":{
-      "type":"structure",
-      "members":{
-      },
-      "exception":true
-    },
-    "MaxNumberOfDeliveryChannelsExceededException":{
-      "type":"structure",
-      "members":{
-      },
-      "exception":true
-    },
-    "Name":{"type":"string"},
-    "NextToken":{"type":"string"},
-    "NoAvailableConfigurationRecorderException":{
-      "type":"structure",
-      "members":{
-      },
-      "exception":true
-    },
-    "NoAvailableDeliveryChannelException":{
-      "type":"structure",
-      "members":{
-      },
-      "exception":true
-    },
-    "NoRunningConfigurationRecorderException":{
-      "type":"structure",
-      "members":{
-      },
-      "exception":true
-    },
-    "NoSuchBucketException":{
-      "type":"structure",
-      "members":{
-      },
-      "exception":true
-    },
-    "NoSuchConfigurationRecorderException":{
-      "type":"structure",
-      "members":{
-      },
-      "exception":true
-    },
-    "NoSuchDeliveryChannelException":{
-      "type":"structure",
-      "members":{
-      },
-      "exception":true
-    },
-    "PutConfigurationRecorderRequest":{
-      "type":"structure",
-      "required":["ConfigurationRecorder"],
-      "members":{
-        "ConfigurationRecorder":{"shape":"ConfigurationRecorder"}
-      }
-    },
-    "PutDeliveryChannelRequest":{
-      "type":"structure",
-      "required":["DeliveryChannel"],
-      "members":{
-        "DeliveryChannel":{"shape":"DeliveryChannel"}
-      }
-    },
-    "RecorderName":{
-      "type":"string",
-      "min":1,
-      "max":256
-    },
-    "RecorderStatus":{
-      "type":"string",
-      "enum":[
-        "Pending",
-        "Success",
-        "Failure"
-      ]
-    },
-    "RelatedEvent":{"type":"string"},
-    "RelatedEventList":{
-      "type":"list",
-      "member":{"shape":"RelatedEvent"}
-    },
-    "Relationship":{
-      "type":"structure",
-      "members":{
-        "resourceType":{"shape":"ResourceType"},
-        "resourceId":{"shape":"ResourceId"},
-        "relationshipName":{"shape":"RelationshipName"}
-      }
-    },
-    "RelationshipList":{
-      "type":"list",
-      "member":{"shape":"Relationship"}
-    },
-    "RelationshipName":{"type":"string"},
-    "ResourceCreationTime":{"type":"timestamp"},
-    "ResourceId":{"type":"string"},
-    "ResourceNotDiscoveredException":{
-      "type":"structure",
-      "members":{
-      },
-      "exception":true
-    },
-    "ResourceType":{
-      "type":"string",
-      "enum":[
-        "AWS::EC2::CustomerGateway",
-        "AWS::EC2::EIP",
-        "AWS::EC2::Instance",
-        "AWS::EC2::InternetGateway",
-        "AWS::EC2::NetworkAcl",
-        "AWS::EC2::NetworkInterface",
-        "AWS::EC2::RouteTable",
-        "AWS::EC2::SecurityGroup",
-        "AWS::EC2::Subnet",
-        "AWS::CloudTrail::Trail",
-        "AWS::EC2::Volume",
-        "AWS::EC2::VPC",
-        "AWS::EC2::VPNConnection",
-        "AWS::EC2::VPNGateway"
-      ]
-    },
-    "StartConfigurationRecorderRequest":{
-      "type":"structure",
-      "required":["ConfigurationRecorderName"],
-      "members":{
-        "ConfigurationRecorderName":{"shape":"RecorderName"}
-      }
-    },
-    "StopConfigurationRecorderRequest":{
-      "type":"structure",
-      "required":["ConfigurationRecorderName"],
-      "members":{
-        "ConfigurationRecorderName":{"shape":"RecorderName"}
-      }
-    },
-    "String":{"type":"string"},
-    "Tags":{
-      "type":"map",
-      "key":{"shape":"Name"},
-      "value":{"shape":"Value"}
-    },
-    "ValidationException":{
-      "type":"structure",
-      "members":{
-      },
-      "exception":true
-    },
-    "Value":{"type":"string"},
-    "Version":{"type":"string"}
-  }
-}