From f19e4d80fdda2e9bd9057d1cba30551e9f9ccb32 Mon Sep 17 00:00:00 2001 From: Trevor Rowe Date: Fri, 24 Apr 2015 13:04:47 -0700 Subject: [PATCH 001/101] Work-in-progress on Seahorse::Model refactor. Greatly simplified the Seahorse::Model classes, removing AWS logic from how they are defined. This has been moved into `Aws::Model::Builder` which is responsible from loading a JSON defenition and converting it into an api, operations and shapes. Also removed the need for the API to hold onto its JSON definition and the number of objects generated. --- aws-sdk-core/lib/aws-sdk-core.rb | 5 +- aws-sdk-core/lib/aws-sdk-core/api/builder.rb | 69 +++ .../lib/aws-sdk-core/api/customizations.rb | 153 ++++++ .../lib/aws-sdk-core/api/customizer.rb | 75 --- .../api/service_customizations.rb | 140 ------ .../lib/aws-sdk-core/api/shape_map.rb | 94 ++++ .../aws-sdk-core/assume_role_credentials.rb | 1 + aws-sdk-core/lib/aws-sdk-core/client.rb | 10 +- aws-sdk-core/lib/aws-sdk-core/dynamodb.rb | 6 + .../aws-sdk-core/plugins/regional_endpoint.rb | 2 +- .../aws-sdk-core/plugins/request_signer.rb | 10 +- aws-sdk-core/lib/aws-sdk-core/s3/presigner.rb | 1 + aws-sdk-core/lib/aws-sdk-core/xml/parser.rb | 8 +- .../lib/aws-sdk-core/xml/parser/frame.rb | 95 ++-- .../lib/aws-sdk-core/xml/parser/stack.rb | 8 +- aws-sdk-core/lib/seahorse.rb | 1 - aws-sdk-core/lib/seahorse/client/base.rb | 13 +- aws-sdk-core/lib/seahorse/model/api.rb | 73 +-- aws-sdk-core/lib/seahorse/model/operation.rb | 78 +-- aws-sdk-core/lib/seahorse/model/shape_map.rb | 47 -- aws-sdk-core/lib/seahorse/model/shapes.rb | 456 +++--------------- aws-sdk-core/lib/seahorse/util.rb | 2 +- aws-sdk-core/spec/aws/xml/parser_spec.rb | 31 +- .../lib/aws-sdk-resources/definition.rb | 2 +- 24 files changed, 534 insertions(+), 846 deletions(-) create mode 100644 aws-sdk-core/lib/aws-sdk-core/api/builder.rb create mode 100644 aws-sdk-core/lib/aws-sdk-core/api/customizations.rb delete mode 100644 aws-sdk-core/lib/aws-sdk-core/api/customizer.rb delete mode 100644 aws-sdk-core/lib/aws-sdk-core/api/service_customizations.rb create mode 100644 aws-sdk-core/lib/aws-sdk-core/api/shape_map.rb delete mode 100644 aws-sdk-core/lib/seahorse/model/shape_map.rb diff --git a/aws-sdk-core/lib/aws-sdk-core.rb b/aws-sdk-core/lib/aws-sdk-core.rb index d3f0794ec42..e71fc73024d 100644 --- a/aws-sdk-core/lib/aws-sdk-core.rb +++ b/aws-sdk-core/lib/aws-sdk-core.rb @@ -97,14 +97,15 @@ module Aws # @api private module Api - autoload :Customizer, 'aws-sdk-core/api/customizer' + autoload :Builder, 'aws-sdk-core/api/builder' + autoload :Customizations, 'aws-sdk-core/api/customizations' autoload :Documenter, 'aws-sdk-core/api/documenter' autoload :Docstrings, 'aws-sdk-core/api/docstrings' autoload :Manifest, 'aws-sdk-core/api/manifest' autoload :ManifestBuilder, 'aws-sdk-core/api/manifest_builder' autoload :OperationDocumenter, 'aws-sdk-core/api/operation_documenter' autoload :OperationExample, 'aws-sdk-core/api/operation_example' - autoload :ServiceCustomizations, 'aws-sdk-core/api/service_customizations' + autoload :ShapeMap, 'aws-sdk-core/api/shape_map' end # @api private diff --git a/aws-sdk-core/lib/aws-sdk-core/api/builder.rb b/aws-sdk-core/lib/aws-sdk-core/api/builder.rb new file mode 100644 index 00000000000..86a0df22f92 --- /dev/null +++ b/aws-sdk-core/lib/aws-sdk-core/api/builder.rb @@ -0,0 +1,69 @@ +require 'set' + +module Aws + module Api + class Builder + class << self + + def build(definition) + Builder.new.build(customize(load_definition(definition))) + end + + private + + def load_definition(definition) + case definition + when nil then {} + when Hash then definition + when String, Pathname then Seahorse::Util.load_json(definition) + else raise ArgumentError, "invalid api definition #{api}" + end + end + + def customize(definition) + Customizations.apply_api_customizations(definition) + definition + end + + end + + # @param [Hash] + # @return [Seahorse::Model::Api] + def build(definition) + shapes = ShapeMap.new(definition['shapes']) + api = Seahorse::Model::Api.new + metadata = definition['metadata'] || {} + api.version = metadata['apiVersion'] + api.metadata = metadata + definition['operations'].each do |name, definition| + operation = build_operation(name, definition, shapes) + api.add_operation(underscore(name), operation) + end + api + end + + private + + def build_operation(name, definition, shapes) + http = definition['http'] || {} + op = Seahorse::Model::Operation.new + op.name = name + op.http_method = http['method'] + op.http_request_uri = http['requestUri'] + op.documentation = definition['documentation'] + op.deprecated = !!definition['deprecated'] + op.input = shapes.shape_ref(definition['input']) + op.output = shapes.shape_ref(definition['output']) + (definition['errors'] || []).each do |error| + op.errors << shapes.shape_ref(error) + end + op + end + + def underscore(str) + Seahorse::Util.underscore(str).to_sym + end + + end + end +end diff --git a/aws-sdk-core/lib/aws-sdk-core/api/customizations.rb b/aws-sdk-core/lib/aws-sdk-core/api/customizations.rb new file mode 100644 index 00000000000..e33c282e969 --- /dev/null +++ b/aws-sdk-core/lib/aws-sdk-core/api/customizations.rb @@ -0,0 +1,153 @@ +module Aws + module Api + module Customizations + + @apis = {} + @plugins = {} + + class << self + + def api(prefix, &block) + @apis[prefix] = block + end + + def plugins(prefix, options) + @plugins[prefix] = { + add: options[:add] || [], + remove: options[:remove] || [], + } + end + + def apply_api_customizations(api) + metadata = api['metadata'] || {} + prefix = metadata['endpointPrefix'] + @apis[prefix].call(api) if @apis[prefix] + end + + def apply_plugins(client_class) + prefix = client_class.api.metadata['endpointPrefix'] + if @plugins[prefix] + @plugins[prefix][:add].each { |p| client_class.add_plugin(p) } + @plugins[prefix][:remove].each { |p| client_class.remove_plugin(p) } + end + + protocol = client_class.api.metadata['protocol'] + plugin = case protocol + when 'ec2' then Aws::Plugins::Protocols::EC2 + when 'query' then Aws::Plugins::Protocols::Query + when 'json' then Aws::Plugins::Protocols::JsonRpc + when 'rest-json' then Aws::Plugins::Protocols::RestJson + when 'rest-xml' then Aws::Plugins::Protocols::RestXml + end + client_class.add_plugin(plugin) if plugin + end + + end + + api('cloudfront') do |api| + + api['shapes'].each do |_, shape| + if shape['members'] && shape['members']['MaxItems'] + shape['members']['MaxItems']['shape'] = 'integer' + end + end + + api['operations'].keys.each do |name| + symbolized = name.sub(/\d{4}_\d{2}_\d{2}$/, '') + api['operations'][symbolized] = api['operations'].delete(name) + end + + end + + plugins('cloudsearchdomain', + add: %w(Aws::Plugins::CSDConditionalSigning), + remove: %w(Aws::Plugins::RegionalEndpoint), + ) + + plugins('dynamodb', add: %w( + Aws::Plugins::DynamoDBExtendedRetries + Aws::Plugins::DynamoDBSimpleAttributes + Aws::Plugins::DynamoDBCRC32Validation + )) + + plugins('ec2', add: %w( + Aws::Plugins::EC2CopyEncryptedSnapshot + )) + + api('glacier') do |api| + api['shapes']['Date'] = { 'type' => 'timestamp' } + api['shapes'].each do |_, shape| + if shape['members'] + shape['members'].each do |name, ref| + case name + when /date/i then ref['shape'] = 'Date' + when 'limit' then ref['shape'] = 'Size' + when 'partSize' then ref['shape'] = 'Size' + when 'archiveSize' then ref['shape'] = 'Size' + end + end + end + end + end + + plugins('glacier', add: %w( + Aws::Plugins::GlacierAccountId + Aws::Plugins::GlacierApiVersion + Aws::Plugins::GlacierChecksums + )) + + api('importexport') do |api| + api['operations'].each do |_, operation| + operation['http']['requestUri'] = '/' + end + end + + api('lambda') do |api| + api['shapes']['Timestamp']['type'] = 'timestamp' + end + + plugins('machinelearning', add: %w( + Aws::Plugins::MachineLearningPredictEndpoint + )) + + api('route53') do |api| + api['shapes']['PageMaxItems']['type'] = 'integer' + end + + plugins('route53', add: %w( + Aws::Plugins::Route53IdFix + )) + + api('s3') do |api| + api['metadata'].delete('signatureVersion') + api['operations']['GetBucketLocation'].delete('output') + end + + plugins('s3', add: %w( + Aws::Plugins::S3BucketDns + Aws::Plugins::S3Expect100Continue + Aws::Plugins::S3CompleteMultipartUploadFix + Aws::Plugins::S3GetBucketLocationFix + Aws::Plugins::S3LocationConstraint + Aws::Plugins::S3Md5s + Aws::Plugins::S3Redirects + Aws::Plugins::S3SseCpk + Aws::Plugins::S3UrlEncodedKeys + Aws::Plugins::S3RequestSigner + )) + + api('sqs') do |api| + api['metadata']['errorPrefix'] = 'AWS.SimpleQueueService.' + end + + plugins('sqs', add: %w( + Aws::Plugins::SQSQueueUrls + )) + + plugins('swf', add: %w( + Aws::Plugins::SWFReadTimeouts + )) + + end + end +end diff --git a/aws-sdk-core/lib/aws-sdk-core/api/customizer.rb b/aws-sdk-core/lib/aws-sdk-core/api/customizer.rb deleted file mode 100644 index c225a5796d4..00000000000 --- a/aws-sdk-core/lib/aws-sdk-core/api/customizer.rb +++ /dev/null @@ -1,75 +0,0 @@ -module Aws - module Api - class Customizer - - # @api private - def initialize(client_class) - @client_class = client_class - @api = client_class.api - end - - # @return [Class] - attr_reader :client_class - - # @return [Seahorse::Model::Api] - attr_reader :api - - # @api private - def apply(&customizations) - instance_eval(&customizations) - end - - # @param [String, Class] plugin - def add_plugin(plugin) - @client_class.add_plugin(plugin) - end - - # @param [String, Class] plugin - def remove_plugin(plugin) - @client_class.remove_plugin(plugin) - end - - def metadata(key, value) - @client_class.api.definition['metadata'][key] = value - end - - def add_shape(shape_name, definition) - @client_class.api.definition['shapes'][shape_name] = definition - end - - def reshape(shape_name, modifications) - shape = @client_class.api.definition['shapes'][shape_name] - shape = deep_merge(shape, modifications) - @client_class.api.definition['shapes'][shape_name] = shape - end - - def reshape_members(member_regex, modifications) - if member_regex.is_a?(String) - member_regex = /^#{member_regex}$/ - end - @client_class.api.definition['shapes'].each do |shape_name, shape| - if shape['members'] - shape['members'].each do |member_name, member_ref| - if member_name.match(member_regex) - shape['members'][member_name] = deep_merge(member_ref, modifications) - end - end - end - end - end - - def each_operation(&block) - @client_class.api.definition['operations'].each(&block) - end - - private - - def deep_merge(first_hash, other_hash) - first_hash.merge(other_hash) do |key, old, new| - Hash === old && Hash === new ? deep_merge(old, new) : new - end - end - - end - end -end diff --git a/aws-sdk-core/lib/aws-sdk-core/api/service_customizations.rb b/aws-sdk-core/lib/aws-sdk-core/api/service_customizations.rb deleted file mode 100644 index ad840d26fef..00000000000 --- a/aws-sdk-core/lib/aws-sdk-core/api/service_customizations.rb +++ /dev/null @@ -1,140 +0,0 @@ -module Aws - module Api - module ServiceCustomizations - - @customizations = Hash.new {|h,k| h[k] = [] } - - class << self - - # Registers a list of customizations to apply during API translation. - # - # ServiceCustomizations.customize('s3') do - # plugin 'MyCustomPlugin' - # end - # - # The block is evaluated by an instance of {Customizer}. - # @param [String] endpoint_prefix - # @return [void] - # @see {Customizer} - def customize(endpoint_prefix, &block) - @customizations[endpoint_prefix] << block - end - - # Applies customizations registered for the service client. - # Customizations are registered by the service endpoint prefix. - # @param [Class] client_class - # @return [void] - # @see {#customize} - # @see {Customizer} - def apply(client_class) - apply_protocol_plugin(client_class) - endpoint_prefix = client_class.api.metadata('endpointPrefix') - @customizations[endpoint_prefix].each do |customization| - Customizer.new(client_class).apply(&customization) - end - end - - private - - def apply_protocol_plugin(client_class) - protocol = client_class.api.metadata('protocol') - plugin = case protocol - when 'ec2' then Aws::Plugins::Protocols::EC2 - when 'query' then Aws::Plugins::Protocols::Query - when 'json' then Aws::Plugins::Protocols::JsonRpc - when 'rest-json' then Aws::Plugins::Protocols::RestJson - when 'rest-xml' then Aws::Plugins::Protocols::RestXml - end - client_class.add_plugin(plugin) if plugin - end - - end - - customize 'cloudfront' do - reshape_members 'MaxItems', 'shape' => 'integer' - api.operations.each do |method_name| - operation = api.operation(method_name) - name = operation.name.sub(/\d{4}_\d{2}_\d{2}$/, '') - operation.instance_variable_set("@name", name) - end - end - - customize 'cloudsearchdomain' do - remove_plugin 'Aws::Plugins::RegionalEndpoint' - add_plugin 'Aws::Plugins::CSDConditionalSigning' - end - - customize 'dynamodb' do - add_plugin 'Aws::Plugins::DynamoDBExtendedRetries' - add_plugin 'Aws::Plugins::DynamoDBSimpleAttributes' - add_plugin 'Aws::Plugins::DynamoDBCRC32Validation' - end - - customize 'ec2' do - if api.version >= '2014-05-01' - add_plugin 'Aws::Plugins::EC2CopyEncryptedSnapshot' - end - end - - customize 'glacier' do - add_plugin 'Aws::Plugins::GlacierAccountId' - add_plugin 'Aws::Plugins::GlacierApiVersion' - add_plugin 'Aws::Plugins::GlacierChecksums' - add_shape 'Date', 'type' => 'timestamp' - reshape_members /date/i, 'shape' => 'Date' - reshape_members 'limit', 'shape' => 'Size' - reshape_members 'partSize', 'shape' => 'Size' - reshape_members 'archiveSize', 'shape' => 'Size' - end - - customize 'importexport' do - each_operation do |name, operation| - operation['http']['requestUri'] = '/' - end - end - - customize 'lambda' do - reshape 'Timestamp', 'type' => 'timestamp' - end - - customize 'machinelearning' do - add_plugin 'Aws::Plugins::MachineLearningPredictEndpoint' - end - - customize 'route53' do - add_plugin 'Aws::Plugins::Route53IdFix' - reshape 'PageMaxItems', 'type' => 'integer' - end - - customize 's3' do - add_plugin 'Aws::Plugins::S3BucketDns' - add_plugin 'Aws::Plugins::S3Expect100Continue' - add_plugin 'Aws::Plugins::S3CompleteMultipartUploadFix' - add_plugin 'Aws::Plugins::S3GetBucketLocationFix' - add_plugin 'Aws::Plugins::S3LocationConstraint' - add_plugin 'Aws::Plugins::S3Md5s' - add_plugin 'Aws::Plugins::S3Redirects' - add_plugin 'Aws::Plugins::S3SseCpk' - add_plugin 'Aws::Plugins::S3UrlEncodedKeys' - add_plugin 'Aws::Plugins::S3RequestSigner' - - api.definition['metadata'].delete('signatureVersion') - - # required for the GetBucketLocation fix to work, disabled normal - # parsing of the output - client_class.api.operation(:get_bucket_location). - instance_variable_set("@output", nil) - end - - customize 'sqs' do - add_plugin 'Aws::Plugins::SQSQueueUrls' - metadata 'errorPrefix', 'AWS.SimpleQueueService.' - end - - customize 'swf' do - add_plugin 'Aws::Plugins::SWFReadTimeouts' - end - - end - end -end diff --git a/aws-sdk-core/lib/aws-sdk-core/api/shape_map.rb b/aws-sdk-core/lib/aws-sdk-core/api/shape_map.rb new file mode 100644 index 00000000000..03d01ed192b --- /dev/null +++ b/aws-sdk-core/lib/aws-sdk-core/api/shape_map.rb @@ -0,0 +1,94 @@ +module Aws + module Api + class ShapeMap + + include Seahorse::Model::Shapes + + SHAPE_CLASSES = { + 'blob' => BlobShape, + 'byte' => StringShape, + 'boolean' => BooleanShape, + 'character' => StringShape, + 'double' => FloatShape, + 'float' => FloatShape, + 'integer' => IntegerShape, + 'list' => ListShape, + 'long' => IntegerShape, + 'map' => MapShape, + 'string' => StringShape, + 'structure' => StructureShape, + 'timestamp' => TimestampShape, + } + + # @param [ShapeMap] shapes + def initialize(definitions) + @shapes = {} + build_shapes(definitions) + end + + def [](shape_name) + if shape = @shapes[shape_name] + shape + else + raise ArgumentError, "unknown shape #{shape_name.inspect}" + end + end + + def shape_ref(definition, options = {}) + if definition + ref = ShapeRef.new + ref.shape = self[definition['shape']] + ref.location = definition['location'] + ref.location_name = definition['locationName'] || options[:location_name] + ref + else + nil + end + end + + private + + def build_shapes(definitions) + definitions.each do |name, definition| + shape = SHAPE_CLASSES[definition['type']].new + shape.name = name + @shapes[name] = shape + end + definitions.each do |name, definition| + shape = @shapes[name] + apply_common_traits(shape, definition) + apply_shape_refs(shape, definition) + end + end + + def apply_common_traits(shape, definition) + shape.enum = Set.new(definition['enum']) if definition.key?('enum') + %w(min max flattened documentation).each do |trait| + shape.send("#{trait}=", definition[trait]) if definition.key?(trait) + end + end + + def apply_shape_refs(shape, definition) + case shape + when StructureShape + required = Set.new(definition['required'] || []) + definition['members'].each do |member_name, ref| + name = underscore(member_name) + ref = shape_ref(ref, location_name: member_name) + shape.add_member(name, ref, required: required.include?(member_name)) + end + when ListShape + shape.member = shape_ref(definition['member']) + when MapShape + shape.key = shape_ref(definition['key']) + shape.value = shape_ref(definition['value']) + end + end + + def underscore(str) + Seahorse::Util.underscore(str).to_sym + end + + end + end +end diff --git a/aws-sdk-core/lib/aws-sdk-core/assume_role_credentials.rb b/aws-sdk-core/lib/aws-sdk-core/assume_role_credentials.rb index 8e39f06da61..a3b0114c57b 100644 --- a/aws-sdk-core/lib/aws-sdk-core/assume_role_credentials.rb +++ b/aws-sdk-core/lib/aws-sdk-core/assume_role_credentials.rb @@ -40,6 +40,7 @@ def refresh @secret_access_key = creds.secret_access_key @session_token = creds.session_token @expiration = creds.expiration + creds end end diff --git a/aws-sdk-core/lib/aws-sdk-core/client.rb b/aws-sdk-core/lib/aws-sdk-core/client.rb index c23e359a0b1..e258ab15025 100644 --- a/aws-sdk-core/lib/aws-sdk-core/client.rb +++ b/aws-sdk-core/lib/aws-sdk-core/client.rb @@ -28,11 +28,13 @@ class << self def define(svc_name, options) client_class = Class.new(self) client_class.identifier = svc_name.downcase.to_sym - [:api, :paginators, :waiters].each do |definition| - client_class.send("set_#{definition}", options[definition]) + client_class.set_api(Api.build(options[:api])) + client_class.set_paginators(options[:paginators]) + client_class.set_waiters(options[:waiters]) + DEFAULT_PLUGINS.each do |plugin| + client_class.add_plugin(plugin) end - DEFAULT_PLUGINS.each { |plugin| client_class.add_plugin(plugin) } - Api::ServiceCustomizations.apply(client_class) + Api::Customizations.apply_plugins(client_class) client_class end diff --git a/aws-sdk-core/lib/aws-sdk-core/dynamodb.rb b/aws-sdk-core/lib/aws-sdk-core/dynamodb.rb index 6a966cd9582..8f261027afb 100644 --- a/aws-sdk-core/lib/aws-sdk-core/dynamodb.rb +++ b/aws-sdk-core/lib/aws-sdk-core/dynamodb.rb @@ -9,5 +9,11 @@ module Aws module DynamoDB autoload :AttributeValue, 'aws-sdk-core/dynamodb/attribute_value' + + class Client + add_plugin(Aws::Plugins::DynamoDBExtendedRetries) + add_plugin(Aws::Plugins::DynamoDBSimpleAttributes) + add_plugin(Aws::Plugins::DynamoDBCRC32Validation) + end end end diff --git a/aws-sdk-core/lib/aws-sdk-core/plugins/regional_endpoint.rb b/aws-sdk-core/lib/aws-sdk-core/plugins/regional_endpoint.rb index 58d7e1b854a..516bf1db375 100644 --- a/aws-sdk-core/lib/aws-sdk-core/plugins/regional_endpoint.rb +++ b/aws-sdk-core/lib/aws-sdk-core/plugins/regional_endpoint.rb @@ -20,7 +20,7 @@ class RegionalEndpoint < Seahorse::Client::Plugin } option(:endpoint) do |cfg| - EndpointProvider.resolve(cfg.region, cfg.api.metadata('endpointPrefix')) + EndpointProvider.resolve(cfg.region, cfg.api.metadata['endpointPrefix']) end def after_initialize(client) diff --git a/aws-sdk-core/lib/aws-sdk-core/plugins/request_signer.rb b/aws-sdk-core/lib/aws-sdk-core/plugins/request_signer.rb index a732a2bad5e..730576a9f69 100644 --- a/aws-sdk-core/lib/aws-sdk-core/plugins/request_signer.rb +++ b/aws-sdk-core/lib/aws-sdk-core/plugins/request_signer.rb @@ -40,15 +40,15 @@ class RequestSigner < Seahorse::Client::Plugin # Intentionally not documented - this should go away when all # services support signature version 4 in every region. option(:signature_version) do |cfg| - cfg.api.metadata('signatureVersion') + cfg.api.metadata['signatureVersion'] end option(:sigv4_name) do |cfg| - cfg.api.metadata('signingName') || cfg.api.metadata('endpointPrefix') + cfg.api.metadata['signingName'] || cfg.api.metadata['endpointPrefix'] end option(:sigv4_region) do |cfg| - prefix = cfg.api.metadata('endpointPrefix') + prefix = cfg.api.metadata['endpointPrefix'] endpoint = cfg.endpoint.to_s if matches = endpoint.match(/#{prefix}[.-](.+)\.amazonaws\.com/) matches[1] == 'us-gov' ? 'us-gov-west-1' : matches[1] @@ -101,9 +101,9 @@ def missing_credentials?(context) end def unsigned_request?(context) - if context.config.api.metadata('endpointPrefix') == 'sts' + if context.config.api.metadata['endpointPrefix'] == 'sts' STS_UNSIGNED_REQUESTS.include?(context.operation.name) - elsif context.config.api.metadata('endpointPrefix') == 'cloudsearchdomain' + elsif context.config.api.metadata['endpointPrefix'] == 'cloudsearchdomain' context.config.credentials.nil? || !context.config.credentials.set? else false diff --git a/aws-sdk-core/lib/aws-sdk-core/s3/presigner.rb b/aws-sdk-core/lib/aws-sdk-core/s3/presigner.rb index 2e8384e6e51..adfca581ab1 100644 --- a/aws-sdk-core/lib/aws-sdk-core/s3/presigner.rb +++ b/aws-sdk-core/lib/aws-sdk-core/s3/presigner.rb @@ -60,6 +60,7 @@ def validate_expires_in_header(expires_in) # @api private class PresignHandler < Seahorse::Client::Handler def call(context) +puts context.http_request.endpoint.inspect Seahorse::Client::Response.new( context: context, data: presigned_url(context) diff --git a/aws-sdk-core/lib/aws-sdk-core/xml/parser.rb b/aws-sdk-core/lib/aws-sdk-core/xml/parser.rb index 384506f4e06..9ab2e8eb335 100644 --- a/aws-sdk-core/lib/aws-sdk-core/xml/parser.rb +++ b/aws-sdk-core/lib/aws-sdk-core/xml/parser.rb @@ -13,9 +13,9 @@ class Parser autoload :OxEngine, 'aws-sdk-core/xml/parser/engines/ox' autoload :RexmlEngine, 'aws-sdk-core/xml/parser/engines/rexml' - # @param [Seahorse::Model::Shapes::Structure] shape - def initialize(shape, options = {}) - @shape = shape + # @param [Seahorse::Model::ShapeRef] rules + def initialize(rules, options = {}) + @rules = rules @engine = options[:engine] || self.class.engine end @@ -24,7 +24,7 @@ def initialize(shape, options = {}) # @return [Structure] def parse(xml, target = nil) xml = '' if xml.nil? or xml.empty? - stack = Stack.new(@shape, target) + stack = Stack.new(@rules, target) @engine.new(stack).parse(xml.to_s) stack.result end diff --git a/aws-sdk-core/lib/aws-sdk-core/xml/parser/frame.rb b/aws-sdk-core/lib/aws-sdk-core/xml/parser/frame.rb index 7baed1bcef1..f4530c1720a 100644 --- a/aws-sdk-core/lib/aws-sdk-core/xml/parser/frame.rb +++ b/aws-sdk-core/lib/aws-sdk-core/xml/parser/frame.rb @@ -6,15 +6,61 @@ module Xml class Parser class Frame - def initialize(parent, shape, result = nil) + include Seahorse::Model::Shapes + + FRAME_CLASSES = { + NilClass => NullFrame, + BlobShape => BlobFrame, + BooleanShape => BooleanFrame, + FloatShape => FloatFrame, + IntegerShape => IntegerFrame, + ListShape => ListFrame, + MapShape => MapFrame, + StringShape => StringFrame, + StructureShape => StructureFrame, + TimestampShape => TimestampFrame, + } + + class << self + + def new(parent, shape_ref, result = nil) + if self == Frame + frame = frame_class(shape_ref && shape_ref.shape).allocate + frame.send(:initialize, parent, shape_ref, result) + frame + else + super + end + end + + private + + def frame_class(shape) + klass = FRAME_CLASSES[shape.class] + if ListFrame == klass && shape.flattened + FlatListFrame + elsif MapFrame == klass && shape.flattened + MapEntryFrame + else + klass + end + end + + end + + + def initialize(parent, shape_ref, result = nil) @parent = parent - @shape = shape + @shape_ref = shape_ref + @shape = shape_ref.shape @result = result @text = [] end attr_reader :parent + attr_reader :shape_ref + attr_reader :shape attr_reader :result @@ -28,51 +74,6 @@ def child_frame(xml_name) end def consume_child_frame(child); end - - private - - class << self - - def new(parent, shape, result = nil) - if self == Frame - frame = frame_class(shape).allocate - frame.send(:initialize, parent, shape, result) - frame - else - super - end - end - - private - - def frame_class(shape) - @classes ||= { - 'blob' => BlobFrame, - 'boolean' => BooleanFrame, - 'byte' => BlobFrame, - 'character' => StringFrame, - 'double' => FloatFrame, - 'float' => FloatFrame, - 'integer' => IntegerFrame, - 'list' => ListFrame, - 'list:flat' => FlatListFrame, - 'long' => IntegerFrame, - 'map' => MapFrame, - 'map:flat' => MapEntryFrame, - 'string' => StringFrame, - 'structure' => StructureFrame, - 'timestamp' => TimestampFrame, - } - if shape - type = shape.type - type += ':flat' if shape.definition['flattened'] - @classes[type] - else - NullFrame - end - end - - end end class StructureFrame < Frame diff --git a/aws-sdk-core/lib/aws-sdk-core/xml/parser/stack.rb b/aws-sdk-core/lib/aws-sdk-core/xml/parser/stack.rb index 42658c0b070..d05bc973364 100644 --- a/aws-sdk-core/lib/aws-sdk-core/xml/parser/stack.rb +++ b/aws-sdk-core/lib/aws-sdk-core/xml/parser/stack.rb @@ -3,8 +3,8 @@ module Xml class Parser class Stack - def initialize(shape, result = nil) - @shape = shape + def initialize(shape_ref, result = nil) + @shape_ref = shape_ref @frame = self @result = result end @@ -19,7 +19,7 @@ def start_element(name) def attr(name, value) if name.to_s == 'encoding' && value.to_s == 'base64' - @frame = BlobFrame.new(@frame.parent, @frame.shape) + @frame = BlobFrame.new(@frame.parent, @frame.shape_ref) else start_element(name) text(value) @@ -45,7 +45,7 @@ def error(msg, line = nil, column = nil) end def child_frame(name) - Frame.new(self, @shape, @result) + Frame.new(self, @shape_ref, @result) end def consume_child_frame(frame) diff --git a/aws-sdk-core/lib/seahorse.rb b/aws-sdk-core/lib/seahorse.rb index 5c11f2a2739..b294915058c 100644 --- a/aws-sdk-core/lib/seahorse.rb +++ b/aws-sdk-core/lib/seahorse.rb @@ -62,7 +62,6 @@ module Xml module Model autoload :Api, 'seahorse/model/api' autoload :Operation, 'seahorse/model/operation' - autoload :ShapeMap, 'seahorse/model/shape_map' autoload :Shapes, 'seahorse/model/shapes' end diff --git a/aws-sdk-core/lib/seahorse/client/base.rb b/aws-sdk-core/lib/seahorse/client/base.rb index 7fc28d5bc15..23e10b44cac 100644 --- a/aws-sdk-core/lib/seahorse/client/base.rb +++ b/aws-sdk-core/lib/seahorse/client/base.rb @@ -177,19 +177,10 @@ def api @api ||= Model::Api.new end - # @param [Model::Api, Hash] api + # @param [Model::Api] api # @return [Model::Api] def set_api(api) - @api = - case api - when nil then Model::Api.new({}) - when Model::Api then api - when Hash then Model::Api.new(api) - when String, Pathname then Model::Api.new(Util.load_json(api)) - else raise ArgumentError, "invalid api definition #{api}" - end - define_operation_methods - @api + @api = api end # @option options [Model::Api, Hash] :api ({}) diff --git a/aws-sdk-core/lib/seahorse/model/api.rb b/aws-sdk-core/lib/seahorse/model/api.rb index 2d11cbfedba..5b986338f98 100644 --- a/aws-sdk-core/lib/seahorse/model/api.rb +++ b/aws-sdk-core/lib/seahorse/model/api.rb @@ -2,58 +2,39 @@ module Seahorse module Model class Api - # @param [Hash] definition - def initialize(definition = {}) - @metadata = definition['metadata'] || {} - @version = metadata('apiVersion') - @documentation = definition['documentation'] - @definition = definition - @shape_map = ShapeMap.new(definition['shapes'] || {}) - compute_operations + def initialize + @metadata = {} + @operations = {} end # @return [String, nil] - attr_reader :version - - # @return [Array] - attr_reader :operation_names - - # @return [String, nil] - attr_reader :documentation - - # @return [ShapeMap] - attr_reader :shape_map + attr_accessor :version # @return [Hash] - attr_reader :definition + attr_accessor :metadata - # @param [Symbol] name - # @return [Boolean] Returns `true` if this API provides an operation - # with the given name. - def operation?(name) - @operation_defs.key?(name.to_sym) + def operations(&block) + if block_given? + @operations.each(&block) + else + @operations.enum_for(:each) + end end - # @param [Symbol] name - # @return [Operation] def operation(name) - name = name.to_sym - if definition = @operation_defs[name] - @operations[name] ||= Operation.new(definition, shape_map: @shape_map) + if @operations.key?(name) + @operations[name] else - raise ArgumentError, "unknown operation :#{name}" + raise ArgumentError, "unknown operation #{name.inspect}" end end - # @return [Enumerable] - def operations - enum_for(:each_operation) { |*args| operation_names.size } + def operation_names + @operations.keys end - # @param [String] key - # @return [Object, nil] - def metadata(key) - @metadata[key] + def add_operation(name, operation) + @operations[name] = operation end # @api private @@ -62,24 +43,6 @@ def inspect "#<#{self.class.name} version=#{version.inspect}>" end - private - - def each_operation(&block) - operation_names.each do |name| - yield(name, operation(name)) - end - end - - def compute_operations - @operations = {} - @operation_defs = {} - (definition['operations'] || {}).each do |name,definition| - name = Util.underscore(name).to_sym - @operation_defs[name] = definition - end - @operation_names = @operation_defs.keys - end - end end end diff --git a/aws-sdk-core/lib/seahorse/model/operation.rb b/aws-sdk-core/lib/seahorse/model/operation.rb index e0e85066e8e..d0face14b08 100644 --- a/aws-sdk-core/lib/seahorse/model/operation.rb +++ b/aws-sdk-core/lib/seahorse/model/operation.rb @@ -2,74 +2,40 @@ module Seahorse module Model class Operation - # @param [Hash] definition - # @option options [ShapeMap] :shape_map - def initialize(definition = {}, options = {}) - @definition = definition - @shape_map = options[:shape_map] || ShapeMap.new - @name = definition['name'] - @input = shape_for(definition['input']) if definition['input'] - @output = shape_for(definition['output']) if definition['output'] - @deprecated = !!definition['deprecated'] - @documentation = definition['documentation'] - @paging = definition['paging'] || {} + def initialize + @http_method = 'POST' + @http_request_uri = '/' + @deprecated = false + @errors = [] end - # @return [String] - attr_reader :name + # @return [String, nil] + attr_accessor :name # @return [String] - attr_reader :http_method + attr_accessor :http_method # @return [String] - attr_reader :http_request_uri - - # @return [String, nil] - attr_reader :documentation - - # @return [Shape, nil] - attr_reader :input - - # @return [Shape, nil] - attr_reader :output - - # @return [Hash] - attr_reader :paging - - # @return [Hash] - attr_reader :definition + attr_accessor :http_request_uri - # @return [String] - def http_method - (@definition['http'] || {})['method'] || 'POST' - end + # @return [Boolean] + attr_accessor :deprecated - # @return [String] - def http_request_uri - (@definition['http'] || {})['requestUri'] || '/' - end + # @return [String, nil] + attr_accessor :documentation - # @return [Boolean] Returns `true` if this API operation is deprecated. - def deprecated? - !!@definition['deprecated'] - end + # @return [ShapeRef, nil] + attr_accessor :input - # @return [Enumerator] Returns an enumerator that yields error - # shapes. - def errors - errors = (definition['errors'] || []) - errors = errors.map { |error| shape_for(error) } - errors.enum_for(:each) - end + # @return [ShapeRef, nil] + attr_accessor :output - private + # @return [Array] + attr_accessor :errors - def shape_for(definition) - if definition.key?('shape') - @shape_map.shape(definition) - else - Shapes::Shape.new(definition, shape_map: @shape_map) - end + # @api private + def inspect + "#<#{self.class.name} name=#{name.inspect}>" end end diff --git a/aws-sdk-core/lib/seahorse/model/shape_map.rb b/aws-sdk-core/lib/seahorse/model/shape_map.rb deleted file mode 100644 index d23056ecf8f..00000000000 --- a/aws-sdk-core/lib/seahorse/model/shape_map.rb +++ /dev/null @@ -1,47 +0,0 @@ -module Seahorse - module Model - # @api private - class ShapeMap - - # @param [Hash] shape_defs ({}) A hash of shape definitions. - # Hash keys should be shape names. Hash values should be shape - # definitions. - def initialize(shape_defs = {}) - @definitions = shape_defs - @shapes = {} - end - - # @return [Hash] - attr_reader :definitions - - # @param [Hash] shape_ref - # @option shape_ref [required, String] 'shape' - # @return [Shapes::Shape] - # @raise [ArgumentError] Raised when the given shape ref can not be - # resolved. - def shape(shape_ref) - @shapes[shape_ref] ||= build_shape(shape_ref) - end - - # @return [Array] - def shape_names - @definitions.keys - end - - private - - def build_shape(shape_ref) - Shapes::Shape.new(resolve(shape_ref), shape_map: self) - end - - def resolve(shape_ref) - if definition = @definitions[shape_ref['shape']] - definition.merge(shape_ref) - else - raise ArgumentError, "shape not found for #{shape_ref.inspect}" - end - end - - end - end -end diff --git a/aws-sdk-core/lib/seahorse/model/shapes.rb b/aws-sdk-core/lib/seahorse/model/shapes.rb index 5cd348cb777..f67c77fab2d 100644 --- a/aws-sdk-core/lib/seahorse/model/shapes.rb +++ b/aws-sdk-core/lib/seahorse/model/shapes.rb @@ -4,447 +4,141 @@ module Seahorse module Model module Shapes - @types = {} - - class << self - - # Registers a shape by type. - # - # Shapes.register('structure', Shapes::StructureShape) - # - # Shapes.type('structure') - # #=> # - # - # @param [String] type - # @param [Class] shape_class - # @return [void] - # @raise [ArgumentError] Raises an error if the given type or - # shape class have already been registered. - def register(type, shape_class) - shape_class.type = type - @types[type] = shape_class - end + class ShapeRef - # Given a type, this method returned the registered shape class. - # @param [String] type - # @return [Class] - # @raise [ArgumentError] Raises an ArgumentError if there is no - # shape class registered with the given `type`. - def shape_class(type) - if @types.key?(type) - @types[type] - else - raise ArgumentError, "unregisterd type `#{type}'" - end - end + # @return [Shape] + attr_accessor :shape - # Returns an enumerator that yields registered type names and shape - # classes. - # - # Seahorse::Model::Shapes.types.each do |type, shape_class| - # puts "%s => %s" % [type, shape_class.name] - # end - # - # @return [Enumerator] Returns an enumerable object that yields - # registered type names and shape classes. - def types - Enumerator.new do |y| - @types.each do |name, shape_class| - y.yield(name, shape_class) - end - end - end + # @return [String, nil] + attr_accessor :location + + # @return [String, nil] + attr_accessor :location_name end class Shape - # @param [Hash] definition - # @option options [ShapeMap] :shape_map (nil) - def initialize(definition, options = {}) - definition['type'] ||= self.class.type - @name = definition['shape'] - @definition = definition - @type = definition['type'] - @location = definition['location'] || 'body' - @location_name = definition['locationName'] - @shape_map = options[:shape_map] || ShapeMap.new - end - # @return [String] - attr_reader :name - - # @return [Hash] - attr_reader :definition - - # @return [String] The type name for this shape. - attr_reader :type - - # @return [String] Returns one of 'body', 'uri', 'headers', 'status_code' - attr_reader :location - - # @return [String, nil] Typically only set for shapes that are - # structure members. Serialized names are typically set on the - # shape references, not on the shape definition. - attr_reader :location_name - - attr_reader :documentation - - # @return [ShapeMap] - attr_reader :shape_map + attr_accessor :name # @return [String, nil] - def documentation - @definition['documentation'] - end - - # @param [String] key - # @return [Object, nil] - def metadata(key) - @definition[key.to_s] - end - - # @api private - # @return [String] - def inspect - "#<#{self.class.name}>" - end - - # @api private - def with(options) - self.class.new(@definition.merge(options), shape_map: shape_map) - end - - private - - def underscore(string) - Util.underscore(string) - end - - def shape_at(key) - if @definition[key] - shape_for(@definition[key]) - else - raise ArgumentError, "expected shape definition at #{key.inspect}" - end - end - - def shape_for(reference) - if reference.key?('shape') - # shape ref given, e.g. { "shape" => "ShapeName" }, - # use the shape map to resolve this reference - @shape_map.shape(reference) - else - Shape.new(reference, shape_map: @shape_map) - end - end - - class << self - - # @return [String] - attr_accessor :type - - # Constructs and returns a new shape object. You must specify - # the shape type using the "type" option or you must construct - # the shape using the appropriate subclass of `Shape`. - # - # @example Constructing a new shape - # - # shape = Seahorse::Model::Shapes::Shape.new("type" => "structure") - # - # shape.class - # #=> Seahorse::Model::Shapes::Structure - # - # shape.definition - # #=> { "type" => "structure" } - # - # @example Constructing a new shape using the shape class - # - # shape = Seahorse::Model::Shapes::String.new - # shape.definition - # #=> { "type" => "string" } - # - # @param [Hash] definition - # @option options [ShapeMap] :shape_map - # @return [Shape] - def new(definition = {}, options = {}) - if self == Shape - from_type(definition, options) - else - super(apply_type(definition), options) - end - end - - private - - def apply_type(definition) - case definition['type'] - when type then definition - when nil then { 'type' => type }.merge(definition) - else raise ArgumentError, "expected 'type' to be `#{type}'" - end - end - - def from_type(definition, options) - if type = definition['type'] - Shapes.shape_class(type).new(definition, options) - else - raise ArgumentError, 'must specify "type" in the definition' - end - end - - end + attr_accessor :documentation end - class Structure < Shape - - def initialize(definition, options = {}) - super - @members = {} - @member_refs = {} - @member_names = {} - compute_member_names - compute_required_member_names - @member_names = @member_names.values - end - - # @return [Array] Returns a list of members names. - attr_reader :member_names - - # @return [Array] Returns a list of required members names. - attr_reader :required - - # @return [String, nil] Returns the name of the payload member if set. - attr_reader :payload - - # @return [Shape, nil] - def payload_member - if payload - @payload_member ||= member(payload) - else - nil - end - end - - # @param [Symbol] name - # @return [Shape] - def member(name) - if ref = @member_refs[name.to_sym] - @members[name] ||= shape_for(ref) - else - raise ArgumentError, "no such member :#{name}" - end - end - - # @param [Symbol] name - # @return [Boolean] Returns `true` if this structure has a member with - # the given name. - def member?(name) - @member_refs.key?(name.to_sym) - end + class BlobShape < Shape; end - # @return [Enumerable] Returns an enumerator that yields - # member names and shapes. - def members - Enumerator.new do |y| - member_names.map do |member_name| - y.yield(member_name, member(member_name)) - end - end - end + class BooleanShape < Shape; end - # Searches the structure members for a shape with the given - # serialized name. - # - # If found, the shape will be returned with its symbolized member - # name. - # - # If no shape is found with the given serialized name, then - # nil is returned. - # - # @example - # - # name, shape = structure.member_by_location_name('SerializedName') - # name #=> :member_name - # shape #=> instance of Seahorse::Model::Shapes::Shape - # - # @param [String] location_name - # @return [Array, nil] - def member_by_location_name(location_name) - @by_location_name ||= index_members_by_location_name - @by_location_name[location_name] - end - - private + class FloatShape < Shape; end - def index_members_by_location_name - members.each.with_object({}) do |(name, shape), hash| - hash[shape.location_name] = [name, shape] - end - end + class IntegerShape < Shape - def compute_member_names - (definition['members'] || {}).each do |orig_name,ref| - name = underscore(orig_name).to_sym - if ref['location'] == 'headers' - @member_refs[name] = ref - else - @member_refs[name] = { 'locationName' => orig_name }.merge(ref) - end - @member_names[orig_name] = name - end - @payload = @member_names[definition['payload']] if definition['payload'] - end + # @return [Integer, nil] + attr_accessor :min - def compute_required_member_names - @required = (definition['required'] || []).map do |orig_name| - @member_names[orig_name] - end - end + # @return [Integer, nil] + attr_accessor :max end - class List < Shape + class ListShape < Shape - def initialize(definition, options = {}) - super - @min = definition['min'] - @max = definition['max'] - @member = shape_at('member') - end - - # @return [Shape] - attr_reader :member + # @return [ShapeRef] + attr_accessor :member # @return [Integer, nil] - attr_reader :min + attr_accessor :min # @return [Integer, nil] - attr_reader :max + attr_accessor :max + + # @return [Boolean] + attr_accessor :flattened end - class Map < Shape + class MapShape < Shape - def initialize(definition, options = {}) - super - @min = definition['min'] - @max = definition['max'] - @key = shape_at('key') - @value = shape_at('value') - end + # @return [ShapeRef] + attr_accessor :key - # @return [Shape] - attr_reader :key - - # @return [Shape] - attr_reader :value + # @return [ShapeRef] + attr_accessor :value # @return [Integer, nil] - attr_reader :min + attr_accessor :min # @return [Integer, nil] - attr_reader :max + attr_accessor :max - end - - class String < Shape + # @return [Boolean] + attr_accessor :flattened - def initialize(definition, options = {}) - super - @enum = Set.new(definition['enum']) if definition['enum'] - @pattern = definition['pattern'] - @min = definition['min'] - @max = definition['max'] - end + end - # @return [Set, nil] - attr_reader :enum + class StringShape < Shape - # @return [String, nil] - attr_reader :pattern + # @return [Set, nil] + attr_accessor :enum # @return [Integer, nil] - attr_reader :min + attr_accessor :min # @return [Integer, nil] - attr_reader :max + attr_accessor :max end - class Character < String; end + class StructureShape < Shape - class Byte < String; end + def initialize(options = {}) + @members = {} + @members_by_location_name = {} + @required = Set.new + end - class Timestamp < Shape + # @return [Set] + attr_accessor :required - def initialize(definition, options = {}) - @format = definition['timestampFormat'] - super + # @param [Symbol] name + # @param [ShapeRef] shape_ref + # @option options [Boolean] :required (false) + def add_member(name, shape_ref, options = {}) + @required << name if options[:required] + @members_by_location_name[shape_ref.location_name] = [name, shape_ref] + @members[name] = shape_ref end - # @return [String] - attr_reader :format + # @return [Array] + def member_names + @members.keys + end - # @param [Time] time - # @param [String] default_format The format to default to - # when {#format} is not set on this timestamp shape. - # @return [String] - def format_time(time, default_format) - format = @format || default_format - case format - when 'iso8601' then time.utc.iso8601 - when 'rfc822' then time.utc.rfc822 - when 'httpdate' then time.httpdate - when 'unixTimestamp' then time.utc.to_i + # @return [Enumerator<[Symbol,ShapeRef]>] + def members + @members.to_enum + end + + # @param [Symbol] name + # @return [ShapeRef] + def member(name) + if @members.key?(name) + @members[name] else - msg = "invalid timestamp format #{format.inspect}" - raise ArgumentError, msg + raise ArgumentError, "no such member #{name.inspect}" end end - end - - class Integer < Shape - - def initialize(definition, options = {}) - @min = definition['min'] - @max = definition['max'] - super + # @api private + def member_by_location_name(location_name) + @members_by_location_name[location_name] end - # @return [Integer, nil] - attr_reader :min - - # @return [Integer, nil] - attr_reader :max - end - class Long < Integer; end - - class Float < Shape; end - - class Double < Float; end - - class Boolean < Shape; end - - class Blob < Shape; end - - register('blob', Shapes::Blob) - register('byte', Shapes::Byte) - register('boolean', Shapes::Boolean) - register('character', Shapes::Character) - register('double', Shapes::Double) - register('float', Shapes::Float) - register('integer', Shapes::Integer) - register('list', Shapes::List) - register('long', Shapes::Long) - register('map', Shapes::Map) - register('string', Shapes::String) - register('structure', Shapes::Structure) - register('timestamp', Shapes::Timestamp) + class TimestampShape < Shape; end end end diff --git a/aws-sdk-core/lib/seahorse/util.rb b/aws-sdk-core/lib/seahorse/util.rb index 53b666a6273..cf6659562a4 100644 --- a/aws-sdk-core/lib/seahorse/util.rb +++ b/aws-sdk-core/lib/seahorse/util.rb @@ -1,10 +1,10 @@ require 'cgi' module Seahorse + # @api private module Util class << self - # @api private def irregular_inflections(hash) @irregular_inflections.update(hash) @irregular_regex = Regexp.new(@irregular_inflections.keys.join('|')) diff --git a/aws-sdk-core/spec/aws/xml/parser_spec.rb b/aws-sdk-core/spec/aws/xml/parser_spec.rb index 7f78f28f6cd..6d07616c446 100644 --- a/aws-sdk-core/spec/aws/xml/parser_spec.rb +++ b/aws-sdk-core/spec/aws/xml/parser_spec.rb @@ -32,24 +32,33 @@ module Xml next end - let(:members) { {} } - - let(:definition) {{ 'type' => 'structure', 'members' => members }} - - let(:shape) { Seahorse::Model::Shapes::Structure.new(definition) } + let(:shapes) {{ + 'OutputShape' => { + 'type' => 'structure', + 'members' => {} + } + }} + + let(:api) { + Api::Builder.build({ + 'operations' => { + 'ExampleOperation' => { + 'output' => { 'shape' => 'OutputShape' } + } + }, + 'shapes' => shapes, + }) + } let(:parser) { engine_class = Parser.const_get(engine) - Parser.new(shape, engine: engine_class) + output = api.operation(:example_operation).output + Parser.new(output, engine: engine_class) } def parse(xml, to_h = true) data = parser.parse(xml) - if to_h - data.to_h - else - data - end + to_h ? data.to_h : data end it 'returns an empty hash when the XML is empty' do diff --git a/aws-sdk-resources/lib/aws-sdk-resources/definition.rb b/aws-sdk-resources/lib/aws-sdk-resources/definition.rb index bb81cd09b60..42b3779fa73 100644 --- a/aws-sdk-resources/lib/aws-sdk-resources/definition.rb +++ b/aws-sdk-resources/lib/aws-sdk-resources/definition.rb @@ -59,7 +59,7 @@ def define_batch_actions(namespace, resource, batch_actions) def define_data_attributes(namespace, resource, definition) return unless shape_name = definition['shape'] - shape = resource.client_class.api.shape_map.shape('shape' => shape_name) + shape = resource.client_class.api.metadata['shapes'][shape_name] shape.member_names.each do |member_name| if resource.instance_methods.include?(member_name) || From 3010234d3837d857583505c0b098ec8776898418 Mon Sep 17 00:00:00 2001 From: Trevor Rowe Date: Fri, 24 Apr 2015 13:07:06 -0700 Subject: [PATCH 002/101] Fixed the basic Aws::Json::Parser specs. --- aws-sdk-core/lib/aws-sdk-core/json/parser.rb | 68 ++-- aws-sdk-core/spec/aws/json/parser_spec.rb | 334 +++++++++---------- 2 files changed, 183 insertions(+), 219 deletions(-) diff --git a/aws-sdk-core/lib/aws-sdk-core/json/parser.rb b/aws-sdk-core/lib/aws-sdk-core/json/parser.rb index 582076e7f9a..362057638c8 100644 --- a/aws-sdk-core/lib/aws-sdk-core/json/parser.rb +++ b/aws-sdk-core/lib/aws-sdk-core/json/parser.rb @@ -5,67 +5,59 @@ module Aws module Json class Parser - # @param [Seahorse::Model::Shapes::Shape] shape + include Seahorse::Model::Shapes + + # @param [Seahorse::Model::ShapeRef] rules + def initialize(rules) + @rules = rules + end + # @param [String] json - # @param [Hash, Array, nil] target - # @return [Hash] - def parse(shape, json, target = nil) - parse_shape(shape, MultiJson.load(json, max_nesting: false), target) + def parse(json, target = nil) + parse_ref(@rules, MultiJson.load(json, max_nesting: false), target) end private - # @param [Seahorse::Model::Shapes::Structure] structure - # @param [Hash] values - # @param [Hash, nil] target - # @return [Struct] - def structure(structure, values, target = nil) - target = Structure.new(structure.member_names) if target.nil? - values.each do |serialized_name, value| - member_name, shape = structure.member_by_location_name(serialized_name) - if shape - target[member_name] = parse_shape(shape, value) + def structure(ref, values, target = nil) + shape = ref.shape + target = Structure.new(shape.member_names) if target.nil? + values.each do |key, value| + member_name, member_ref = shape.member_by_location_name(key) + if member_ref + target[member_name] = parse_ref(member_ref, value) end end target end - # @param [Seahorse::Model::Shapes::List] list - # @param [Array] values - # @param [Array, nil] target - # @return [Array] - def list(list, values, target = nil) + def list(ref, values, target = nil) target = [] if target.nil? - values.each { |value| target << parse_shape(list.member, value) } + values.each do |value| + target << parse_ref(ref.shape.member, value) + end target end - # @param [Seahorse::Model::Shapes::Map] map - # @param [Hash] values - # @return [Hash] - def map(map, values, target = nil) + def map(ref, values, target = nil) target = {} if target.nil? values.each do |key, value| - target[key] = parse_shape(map.value, value) + target[key] = parse_ref(ref.shape.value, value) end target end - # @param [Seahorse::Model::Shapes::Shape] shape - # @param [Object] value - # @param [Hash, Array, nil] target - # @return [Object] - def parse_shape(shape, value, target = nil) + def parse_ref(ref, value, target = nil) if value.nil? nil else - case shape - when Seahorse::Model::Shapes::Structure then structure(shape, value, target) - when Seahorse::Model::Shapes::List then list(shape, value, target) - when Seahorse::Model::Shapes::Map then map(shape, value, target) - when Seahorse::Model::Shapes::Timestamp then time(value) - when Seahorse::Model::Shapes::Blob then Base64.decode64(value) - when Seahorse::Model::Shapes::Boolean then value.to_s == 'true' + case ref.shape + when StructureShape then structure(ref, value, target) + when ListShape then list(ref, value, target) + when MapShape then map(ref, value, target) + when TimestampShape then time(value) + when BlobShape then Base64.decode64(value) + when BooleanShape then value.to_s == 'true' else value end end diff --git a/aws-sdk-core/spec/aws/json/parser_spec.rb b/aws-sdk-core/spec/aws/json/parser_spec.rb index 04222296824..4c9e644c386 100644 --- a/aws-sdk-core/spec/aws/json/parser_spec.rb +++ b/aws-sdk-core/spec/aws/json/parser_spec.rb @@ -1,214 +1,186 @@ require 'spec_helper' +require 'base64' +require 'time' module Aws module Json describe Parser do - let(:members) { {} } + let(:shapes) {{ + 'StructureShape' => { + 'type' => 'structure', + 'members' => { + # complex members + 'Nested' => { 'shape' => 'StructureShape' }, + 'NestedList' => { 'shape' => 'StructureList' }, + 'NestedMap' => { 'shape' => 'StructureMap' }, + 'NumberList' => { 'shape' => 'IntegerList' }, + 'StringMap' => { 'shape' => 'StringMap' }, + # scalar members + 'Blob' => { 'shape' => 'BlobShape' }, + 'Byte' => { 'shape' => 'ByteShape' }, + 'Boolean' => { 'shape' => 'BooleanShape' }, + 'Character' => { 'shape' => 'CharacterShape' }, + 'Double' => { 'shape' => 'DoubleShape' }, + 'Float' => { 'shape' => 'FloatShape' }, + 'Integer' => { 'shape' => 'IntegerShape' }, + 'Long' => { 'shape' => 'LongShape' }, + 'String' => { 'shape' => 'StringShape' }, + 'Timestamp' => { 'shape' => 'TimestampShape' }, + } + }, + 'StructureList' => { + 'type' => 'list', + 'member' => { 'shape' => 'StructureShape' } + }, + 'StructureMap' => { + 'type' => 'map', + 'key' => { 'shape' => 'StringShape' }, + 'value' => { 'shape' => 'StructureShape' } + }, + 'IntegerList' => { + 'type' => 'list', + 'member' => { 'shape' => 'IntegerShape' } + }, + 'StringMap' => { + 'type' => 'map', + 'key' => { 'shape' => 'StringShape' }, + 'value' => { 'shape' => 'StringShape' } + }, + 'BlobShape' => { 'type' => 'blob' }, + 'ByteShape' => { 'type' => 'byte' }, + 'BooleanShape' => { 'type' => 'boolean' }, + 'CharacterShape' => { 'type' => 'character' }, + 'DoubleShape' => { 'type' => 'double' }, + 'FloatShape' => { 'type' => 'float' }, + 'IntegerShape' => { 'type' => 'integer' }, + 'LongShape' => { 'type' => 'long' }, + 'StringShape' => { 'type' => 'string' }, + 'TimestampShape' => { 'type' => 'timestamp' }, + }} def parse(json) - shape = Seahorse::Model::Shapes::Structure.new('members' => members) - Parser.new.parse(shape, json).to_hash + shape_map = Api::ShapeMap.new(shapes) + rules = shape_map.shape_ref('shape' => 'StructureShape') + Parser.new(rules).parse(json).to_hash end it 'returns an empty hash when the JSON is {}' do expect(parse('{}')).to eq({}) end - describe 'structures' do - - it 'symbolizes structure members' do - members['Name'] = { 'type' => 'string' } - json = '{"Name":"John Doe"}' - expect(parse(json)).to eq(name: 'John Doe') - end - - it 'parses members using their serialized name' do - members['First'] = { - 'type' => 'string', - 'locationName' => 'FirstName' - } - members['Last'] = { - 'type' => 'string', - 'locationName' => 'LastName' - } - json = '{"FirstName":"John", "LastName":"Doe"}' - expect(parse(json)).to eq(first: 'John', last: 'Doe') - end - - it 'ignores non-described values' do - members['Foo'] = { 'type' => 'string' } - json = '{"Foo":"bar", "Abc":"xyz"}' - expect(parse(json)).to eq(foo: 'bar') - end - - it 'skips over null values' do - members['Base'] = { - 'type' => 'structure', - 'members' => { - 'Nested' => { - 'type' => 'structure', - 'members' => { - 'Leaf' => { 'type' => 'string' } - } - } - } - } - json = '{"Base":{"Nested":null}}' - expect(parse(json)).to eq(base: {}) - end - + it 'parses complex and nested documents' do + json = <<-JSON + { + "Nested": { + "Nested": { + "Nested": { + "Integer": 3 + }, + "Integer": 2 + }, + "Integer": 1 + }, + "NestedList": [ + { "String": "v1" }, + { "String": "v2" }, + { "Nested": { "String": "v3" }} + ], + "NestedMap": { + "First": { "String": "v1" }, + "Second": { "Nested": { "String": "v2" }} + }, + "NumberList": [1,2,3,4,5], + "StringMap": { + "Size": "large", + "Color": "red" + }, + "Blob": "#{Base64.strict_encode64('data')}", + "Byte": "a", + "Boolean": true, + "Character": "b", + "Double": 123.456, + "Float": 654.321, + "Intger": 123, + "Long": 321, + "String": "Hello", + "Timestamp": 123456789 + } + JSON + expect(parse(json)).to eq({ + nested: { + nested: { + nested: { integer: 3 }, + integer: 2 + }, + integer: 1 + }, + nested_list: [ + { string: "v1" }, + { string: "v2" }, + { nested: { string: "v3" }} + ], + nested_map: { + "First" => { string: "v1" }, + "Second" => { nested: { string: "v2" }}, + }, + number_list: [1,2,3,4,5], + string_map: { + "Size" => "large", + "Color" => "red", + }, + blob: "data", + byte: "a", + boolean: true, + character: "b", + double: 123.456, + float: 654.321, + long: 321, + string: "Hello", + timestamp: Time.at(123456789), + }) end - describe 'lists' do - - it 'returns nil for lists missing in the json' do - members['Values'] = { - 'type' => 'list', - 'member' => { 'type' => 'string' } - } - json = '{}' - expect(parse(json)[:values]).to be(nil) - end - - it 'parses lists' do - members['Values'] = { - 'type' => 'list', - 'member' => { 'type' => 'string' } - } - json = '{"Values":["abc", "mno", "xyz"]}' - expect(parse(json)).to eq(values: %w(abc mno xyz)) - end - - it 'parses lists of complex members' do - members['Values'] = { - 'type' => 'list', - 'member' => { - 'type' => 'structure', - 'members' => { - 'Name' => { 'type' => 'string' } - } - } - } - json = '{"Values":[{"Name":"abc"},{"Name":"xyz"}]}' - expect(parse(json)).to eq(values: [{name:'abc'}, {name:'xyz'}]) - end - + it 'observes structure member locationNames' do + shapes['StructureShape']['members']['Integer']['locationName'] = 'Nesting' + json = '{ "Nesting": 0}' + expect(parse(json)).to eq(integer: 0) end - describe 'maps' do - - it 'parses maps as hashes (without symbolizing keys' do - members['Attributes'] = { - 'type' => 'map', - 'key' => { 'type' => 'string' }, - 'value' => { 'type' => 'string' } - } - json = '{"Attributes":{"Size":"large","Color":"red"}}' - expect(parse(json)).to eq(attributes: { - 'Size' => 'large', - 'Color' => 'red' - }) - end - + it 'ignores unknown json object keys' do + json = '{ "Integer": 123, "Unknown": "data" }' + expect(parse(json)).to eq({integer: 123}) end - describe 'booleans' do - - it 'converts true/false booleans' do - members['Hot'] = { 'type' => 'boolean' } - members['Cold'] = { 'type' => 'boolean' } - json = '{"Hot":true,"Cold":false}' - expect(parse(json)).to eq(hot: true, cold: false) - end - + it 'supports unix timestamps' do + now = Time.now.to_i + json = "{ \"Timestamp\": #{now.inspect} }" + expect(parse(json)).to eq({timestamp: Time.at(now) }) end - describe 'timestamps' do - - before(:each) do - members['CreatedAt'] = { - 'type' => 'timestamp', - 'locationName' => 'Created', - } - end - - it 'can parse unix timestamps' do - timestamp = 1349908100 - time = Time.at(timestamp) - json = "{\"Created\":#{timestamp}}" - data = parse(json) - expect(data[:created_at]).to be_a(Time) - expect(data[:created_at]).to eq(time) - end - - it 'can parse unix timestamps expressed as floats' do - timestamp = 1349908100.123 - time = Time.at(timestamp) - json = "{\"Created\":#{timestamp}}" - data = parse(json) - expect(data[:created_at]).to be_a(Time) - expect(data[:created_at]).to eq(time) - end - - it 'can parse iso8601 strings' do - timestamp = '2012-09-10T15:47:10.001Z' - time = Time.parse(timestamp).to_time.utc - json = "{\"Created\":\"#{timestamp}\"}" - data = parse(json) - expect(data[:created_at]).to be_a(Time) - expect(data[:created_at]).to eq(time) - end - - it 'can parse rfc822 strings' do - timestamp = 'Wed, 10 Oct 2012 15:59:55 UTC' - time = Time.parse(timestamp).to_time.utc - json = "{\"Created\":\"#{timestamp}\"}" - data = parse(json) - expect(data[:created_at]).to be_a(Time) - expect(data[:created_at]).to eq(time) - end - + it 'supports iso8601 strings' do + now = Time.now.iso8601 + json = "{ \"Timestamp\": #{now.inspect} }" + expect(parse(json)).to eq({timestamp: Time.parse(now) }) end - describe 'integers' do - - it 'parses integers' do - members['count'] = { 'type' => 'integer' } - json = '{"count":123}' - expect(parse(json)).to eq(count: 123) - end - + it 'supports rfc822 strings' do + now = Time.now.rfc822 + json = "{ \"Timestamp\": #{now.inspect} }" + expect(parse(json)).to eq({timestamp: Time.parse(now) }) end - describe 'floats' do - - it 'parses floats' do - members['value'] = { 'type' => 'float' } - json = '{"value":12.34}' - expect(parse(json)).to eq(value: 12.34) - end - + it 'supports quoted and unquoted booleans' do + expect(parse('{ "Boolean": true }')).to eq(boolean: true) + expect(parse('{ "Boolean": false }')).to eq(boolean: false) + expect(parse('{ "Boolean": "true" }')).to eq(boolean: true) + expect(parse('{ "Boolean": "false" }')).to eq(boolean: false) end - describe 'blobs' do - - it 'base64 decodes blobs' do - members['data'] = { 'type' => 'blob' } - json = '{"data":"aGVsbG8="}' - expect(parse(json)).to eq(data: 'hello') - end - + it 'does not trap json parsing errors' do + expect { parse('{"abc') }.to raise_error end - describe 'parsing errors' do - - it 'does not trap xml parsing errors' do - json = '{"abc' - expect { parse(json) }.to raise_error - end - - end end end end From 054aca77c662b7f6a82cec330dc43df324df4acf Mon Sep 17 00:00:00 2001 From: Trevor Rowe Date: Fri, 24 Apr 2015 14:43:13 -0700 Subject: [PATCH 003/101] Fixed the XML parser specs to use the new shapes. --- aws-sdk-core/lib/aws-sdk-core.rb | 1 + .../lib/aws-sdk-core/xml/default_map.rb | 10 + .../lib/aws-sdk-core/xml/parser/frame.rb | 96 +- .../lib/aws-sdk-core/xml/parser/stack.rb | 8 +- aws-sdk-core/spec/aws/xml/parser_spec.rb | 975 ++++++------------ 5 files changed, 409 insertions(+), 681 deletions(-) create mode 100644 aws-sdk-core/lib/aws-sdk-core/xml/default_map.rb diff --git a/aws-sdk-core/lib/aws-sdk-core.rb b/aws-sdk-core/lib/aws-sdk-core.rb index e71fc73024d..136c2fca1e5 100644 --- a/aws-sdk-core/lib/aws-sdk-core.rb +++ b/aws-sdk-core/lib/aws-sdk-core.rb @@ -199,6 +199,7 @@ module Waiters module Xml autoload :Builder, 'aws-sdk-core/xml/builder' autoload :DefaultList, 'aws-sdk-core/xml/default_list' + autoload :DefaultMap, 'aws-sdk-core/xml/default_map' autoload :ErrorHandler, 'aws-sdk-core/xml/error_handler' autoload :Parser, 'aws-sdk-core/xml/parser' autoload :RestHandler, 'aws-sdk-core/xml/rest_handler' diff --git a/aws-sdk-core/lib/aws-sdk-core/xml/default_map.rb b/aws-sdk-core/lib/aws-sdk-core/xml/default_map.rb new file mode 100644 index 00000000000..5362eb9a092 --- /dev/null +++ b/aws-sdk-core/lib/aws-sdk-core/xml/default_map.rb @@ -0,0 +1,10 @@ +module Aws + module Xml + # @api private + class DefaultMap < Hash + + alias nil? empty? + + end + end +end diff --git a/aws-sdk-core/lib/aws-sdk-core/xml/parser/frame.rb b/aws-sdk-core/lib/aws-sdk-core/xml/parser/frame.rb index f4530c1720a..5dfd7b74fe1 100644 --- a/aws-sdk-core/lib/aws-sdk-core/xml/parser/frame.rb +++ b/aws-sdk-core/lib/aws-sdk-core/xml/parser/frame.rb @@ -8,25 +8,12 @@ class Frame include Seahorse::Model::Shapes - FRAME_CLASSES = { - NilClass => NullFrame, - BlobShape => BlobFrame, - BooleanShape => BooleanFrame, - FloatShape => FloatFrame, - IntegerShape => IntegerFrame, - ListShape => ListFrame, - MapShape => MapFrame, - StringShape => StringFrame, - StructureShape => StructureFrame, - TimestampShape => TimestampFrame, - } - class << self - def new(parent, shape_ref, result = nil) + def new(parent, ref, result = nil) if self == Frame - frame = frame_class(shape_ref && shape_ref.shape).allocate - frame.send(:initialize, parent, shape_ref, result) + frame = frame_class(ref && ref.shape).allocate + frame.send(:initialize, parent, ref, result) frame else super @@ -48,20 +35,16 @@ def frame_class(shape) end - - def initialize(parent, shape_ref, result = nil) + def initialize(parent, ref, result = nil) @parent = parent - @shape_ref = shape_ref - @shape = shape_ref.shape + @ref = ref @result = result @text = [] end attr_reader :parent - attr_reader :shape_ref - - attr_reader :shape + attr_reader :ref attr_reader :result @@ -74,26 +57,27 @@ def child_frame(xml_name) end def consume_child_frame(child); end + end class StructureFrame < Frame - def initialize(parent, shape, result = nil) + def initialize(parent, ref, result = nil) super - @result ||= Structure.new(shape.member_names) + @result ||= Structure.new(ref.shape.member_names) @members = {} - shape.members.each do |member_name, member_shape| - apply_default_value(member_name, member_shape) - @members[xml_name(member_shape)] = { + ref.shape.members.each do |member_name, member_ref| + apply_default_value(member_name, member_ref) + @members[xml_name(member_ref)] = { name: member_name, - shape: member_shape, + ref: member_ref, } end end def child_frame(xml_name) if @member = @members[xml_name] - Frame.new(self, @member[:shape]) + Frame.new(self, @member[:ref]) else NullFrame.new(self) end @@ -113,21 +97,25 @@ def consume_child_frame(child) private - def apply_default_value(name, shape) - case shape - when Seahorse::Model::Shapes::List then @result[name] = DefaultList.new - when Seahorse::Model::Shapes::Map then @result[name] = {} + def apply_default_value(name, ref) + case ref.shape + when ListShape then @result[name] = DefaultList.new + when MapShape then @result[name] = DefaultMap.new end end - def xml_name(member_shape) - if member_shape.type == 'list' && member_shape.definition['flattened'] - member_shape.member.location_name || member_shape.location_name + def xml_name(ref) + if flattened_list?(ref.shape) + ref.shape.member.location_name || ref.location_name else - member_shape.location_name + ref.location_name end end + def flattened_list?(shape) + ListShape === shape && shape.flattened + end + end class ListFrame < Frame @@ -135,12 +123,12 @@ class ListFrame < Frame def initialize(*args) super @result = [] - @member_xml_name = @shape.member.location_name || 'member' + @member_xml_name = @ref.shape.member.location_name || 'member' end def child_frame(xml_name) if xml_name == @member_xml_name - Frame.new(self, @shape.member) + Frame.new(self, @ref.shape.member) else raise NotImplementedError end @@ -156,7 +144,7 @@ class FlatListFrame < Frame def initialize(*args) super - @member = Frame.new(self, @shape.member) + @member = Frame.new(self, @ref.shape.member) end def result @@ -186,7 +174,7 @@ def initialize(*args) def child_frame(xml_name) if xml_name == 'entry' - MapEntryFrame.new(self, @shape) + MapEntryFrame.new(self, @ref) else raise NotImplementedError end @@ -202,10 +190,10 @@ class MapEntryFrame < Frame def initialize(*args) super - @key_name = @shape.key.location_name || 'key' - @key = Frame.new(self, @shape.key) - @value_name = @shape.value.location_name || 'value' - @value = Frame.new(self, @shape.value) + @key_name = @ref.shape.key.location_name || 'key' + @key = Frame.new(self, @ref.shape.key) + @value_name = @ref.shape.value.location_name || 'value' + @value = Frame.new(self, @ref.shape.value) end # @return [StringFrame] @@ -279,6 +267,22 @@ def parse(value) end end end + + include Seahorse::Model::Shapes + + FRAME_CLASSES = { + NilClass => NullFrame, + BlobShape => BlobFrame, + BooleanShape => BooleanFrame, + FloatShape => FloatFrame, + IntegerShape => IntegerFrame, + ListShape => ListFrame, + MapShape => MapFrame, + StringShape => StringFrame, + StructureShape => StructureFrame, + TimestampShape => TimestampFrame, + } + end end end diff --git a/aws-sdk-core/lib/aws-sdk-core/xml/parser/stack.rb b/aws-sdk-core/lib/aws-sdk-core/xml/parser/stack.rb index d05bc973364..905c80bf067 100644 --- a/aws-sdk-core/lib/aws-sdk-core/xml/parser/stack.rb +++ b/aws-sdk-core/lib/aws-sdk-core/xml/parser/stack.rb @@ -3,8 +3,8 @@ module Xml class Parser class Stack - def initialize(shape_ref, result = nil) - @shape_ref = shape_ref + def initialize(ref, result = nil) + @ref = ref @frame = self @result = result end @@ -19,7 +19,7 @@ def start_element(name) def attr(name, value) if name.to_s == 'encoding' && value.to_s == 'base64' - @frame = BlobFrame.new(@frame.parent, @frame.shape_ref) + @frame = BlobFrame.new(@frame.parent, @frame.ref) else start_element(name) text(value) @@ -45,7 +45,7 @@ def error(msg, line = nil, column = nil) end def child_frame(name) - Frame.new(self, @shape_ref, @result) + Frame.new(self, @ref, @result) end def consume_child_frame(frame) diff --git a/aws-sdk-core/spec/aws/xml/parser_spec.rb b/aws-sdk-core/spec/aws/xml/parser_spec.rb index 6d07616c446..87d67dc066a 100644 --- a/aws-sdk-core/spec/aws/xml/parser_spec.rb +++ b/aws-sdk-core/spec/aws/xml/parser_spec.rb @@ -33,27 +33,63 @@ module Xml end let(:shapes) {{ - 'OutputShape' => { + 'StructureShape' => { 'type' => 'structure', - 'members' => {} - } + 'members' => { + # complex members + 'Nested' => { 'shape' => 'StructureShape' }, + 'NestedList' => { 'shape' => 'StructureList' }, + 'NestedMap' => { 'shape' => 'StructureMap' }, + 'NumberList' => { 'shape' => 'IntegerList' }, + 'StringMap' => { 'shape' => 'StringMap' }, + # scalar members + 'Blob' => { 'shape' => 'BlobShape' }, + 'Byte' => { 'shape' => 'ByteShape' }, + 'Boolean' => { 'shape' => 'BooleanShape' }, + 'Character' => { 'shape' => 'CharacterShape' }, + 'Double' => { 'shape' => 'DoubleShape' }, + 'Float' => { 'shape' => 'FloatShape' }, + 'Integer' => { 'shape' => 'IntegerShape' }, + 'Long' => { 'shape' => 'LongShape' }, + 'String' => { 'shape' => 'StringShape' }, + 'Timestamp' => { 'shape' => 'TimestampShape' }, + } + }, + 'StructureList' => { + 'type' => 'list', + 'member' => { 'shape' => 'StructureShape' } + }, + 'StructureMap' => { + 'type' => 'map', + 'key' => { 'shape' => 'StringShape' }, + 'value' => { 'shape' => 'StructureShape' } + }, + 'IntegerList' => { + 'type' => 'list', + 'member' => { 'shape' => 'IntegerShape' } + }, + 'StringMap' => { + 'type' => 'map', + 'key' => { 'shape' => 'StringShape' }, + 'value' => { 'shape' => 'StringShape' } + }, + 'BlobShape' => { 'type' => 'blob' }, + 'ByteShape' => { 'type' => 'byte' }, + 'BooleanShape' => { 'type' => 'boolean' }, + 'CharacterShape' => { 'type' => 'character' }, + 'DoubleShape' => { 'type' => 'double' }, + 'FloatShape' => { 'type' => 'float' }, + 'IntegerShape' => { 'type' => 'integer' }, + 'LongShape' => { 'type' => 'long' }, + 'StringShape' => { 'type' => 'string' }, + 'TimestampShape' => { 'type' => 'timestamp' }, }} - let(:api) { - Api::Builder.build({ - 'operations' => { - 'ExampleOperation' => { - 'output' => { 'shape' => 'OutputShape' } - } - }, - 'shapes' => shapes, - }) - } - let(:parser) { engine_class = Parser.const_get(engine) - output = api.operation(:example_operation).output - Parser.new(output, engine: engine_class) + shape_map = Api::ShapeMap.new(shapes) + rules = shape_map.shape_ref('shape' => 'StructureShape') + Parser.new(rules, engine: engine_class) } def parse(xml, to_h = true) @@ -61,6 +97,11 @@ def parse(xml, to_h = true) to_h ? data.to_h : data end + it 'does not trap xml parsing errors' do + xml = '')).to eq({}) end @@ -69,511 +110,325 @@ def parse(xml, to_h = true) expect(parse('')).to eq({}) end - it 'ignores xml elements when the rules are empty' do - expect(parse('bar')).to eq({}) + it 'returns an instance of Struct' do + expect(parse('', false)).to be_kind_of(Struct) end - it 'returns an instance of Struct' do - expect(Parser.new(shape).parse('')).to be_kind_of(Aws::Structure) + it 'parses complex and nested documents' do + xml = <<-XML.strip + + + + + 3 + + 2 + + 1 + + + + v1 + + + v2 + + + + v3 + + + + + + First + v1 + + + Second + + + v2 + + + + + + 1 + 2 + 3 + 4 + 5 + + + + Size + large + + + Color + red + + + #{Base64.strict_encode64('data')}} + a + true + b + 123.456 + 654.321 + 123 + 321 + Hello + 123456789 + + XML + expect(parse(xml)).to eq({ + nested: { + nested: { + nested: { integer: 3 }, + integer: 2 + }, + integer: 1 + }, + nested_list: [ + { string: "v1" }, + { string: "v2" }, + { nested: { string: "v3" }} + ], + nested_map: { + "First" => { string: "v1" }, + "Second" => { nested: { string: "v2" }}, + }, + number_list: [1,2,3,4,5], + string_map: { + "Size" => "large", + "Color" => "red", + }, + blob: "data", + byte: "a", + boolean: true, + character: "b", + double: 123.456, + float: 654.321, + integer: 123, + long: 321, + string: "Hello", + timestamp: Time.at(123456789), + }) end describe 'structures' do - it 'ignores root elements' do - members['First'] = { 'type' => 'string' } - members['Last'] = { 'type' => 'string' } - xml = <<-XML.strip - - - abc - xyz - - XML - expect(parse(xml)).to eq(first: 'abc', last: 'xyz') + it 'observes locationName traits' do + ref = shapes['StructureShape']['members']['Integer'] + ref['locationName'] = 'IntegerElement' + xml = '123' + expect(parse(xml)).to eq(integer: 123) end - it 'parses structure members' do - members['First'] = { 'type' => 'string' } - members['Last'] = { 'type' => 'string' } - xml = <<-XML - - abc - xyz - - XML - expect(parse(xml)).to eq(first: 'abc', last: 'xyz') - end - - it 'parses members using their location name' do - definition['members'] = { - 'first' => { 'type' => 'string', 'locationName' => 'FirstName' }, - 'last' => { 'type' => 'string', 'locationName' => 'LastName' } - } - xml = <<-XML - - John - Doe - - XML - expect(parse(xml)).to eq(first: 'John', last: 'Doe') - end - - it 'parses structures of structures' do - definition['members'] = { - 'config' => { - 'type' => 'structure', - 'members' => { - 'state' => { 'type' => 'string' } - } - }, - 'name' => { 'type' => 'string' } - } - xml = <<-XML - - - on - - abc - - XML - expect(parse(xml)).to eq(config: { state: 'on' }, name: 'abc') + it 'ignores unknown elements' do + xml = 'abcvalue' + expect(parse(xml)).to eq(string: 'abc') end end - describe 'non-flattened lists' do + describe 'lists' do - it 'returns missing lists as []' do - definition['members'] = { - 'Values' => { - 'type' => 'list', - 'member' => { 'type' => 'string' } - } - } - xml = "" - expect(parse(xml, false)[:values]).to eq([]) - end - - it 'popluates list members with a default list when not present' do - definition['members'] = { - 'Values' => { - 'type' => 'list', - 'member' => { 'type' => 'string' } - } - } - xml = "" - result = Parser.new(shape).parse(xml) - expect(result[:values]).to be_kind_of(DefaultList) - expect(result[:values]).to be_empty - expect(result[:values]).to be_nil - end - - it 'returns empty list elements as []' do - definition['members'] = { - 'Values' => { - 'type' => 'list', - 'member' => { 'type' => 'string' } - } - } - xml = "" - expect(parse(xml)[:values]).to eq([]) - end - - it 'converts lists of strings into arrays of strings' do - definition['members'] = { - 'Values' => { - 'type' => 'list', - 'member' => { 'type' => 'string' } - } - } - xml = <<-XML - - - abc - mno - xyz - - + it 'observes locationName traits' do # list and list member + ref = shapes['StructureShape']['members']['NumberList'] + ref['locationName'] = 'Numbers' + shapes['IntegerList']['member']['locationName'] = 'Value' + xml = <<-XML.strip + + + 1 + 2 + 3 + + XML - expect(parse(xml)[:values]).to eq(%w(abc mno xyz)) + expect(parse(xml)).to eq(number_list:[1,2,3]) end - it 'accepts lists of single elements' do - definition['members'] = { - 'Values' => { - 'type' => 'list', - 'member' => { - 'type' => 'structure', - 'members' => { - 'Enabled' => { 'type' => 'boolean' } - } - } - } - } - xml = <<-XML - - - - true - - - - XML - expect(parse(xml)[:values]).to eq([{ enabled: true }]) + it 'returns missing lists as a DefaultList' do + xml = '' + expect(parse(xml, false)[:number_list]).to be_kind_of(DefaultList) + expect(parse(xml)).to eq({}) end - it 'observes the list member location name when present' do - definition['members'] = { - 'Values' => { - 'type' => 'list', - 'member' => { 'type' => 'string', 'locationName' => 'Value' } - } - } - xml = <<-XML - - - abc - mno - xyz - - - XML - expect(parse(xml)[:values]).to eq(%w(abc mno xyz)) + it 'returns empty lists as a []' do + xml = '' + expect(parse(xml)).to eq(number_list: []) end - it 'can parse lists of complex types' do - definition['members'] = { - 'Values' => { - 'type' => 'list', - 'member' => { - 'type' => 'structure', - 'locationName' => 'item', - 'members' => { 'Name' => { 'type' => 'string' } } - } - } - } - xml = <<-XML - - - abc - mno - xyz - - + it 'supports flattened lists' do + shapes['StructureList']['flattened'] = true + xml = <<-XML.strip + + + v1 + + + v2 + + + v3 + + XML - expect(parse(xml)[:values]).to eq([ - { name: 'abc' }, - { name: 'mno' }, - { name: 'xyz' } + expect(parse(xml)).to eq(nested_list: [ + { string: 'v1' }, + { string: 'v2' }, + { string: 'v3' }, ]) end - end - - describe 'flattened lists' do - - it 'returns missing lists as []' do - definition['members'] = { - 'Values' => { - 'type' => 'list', - 'member' => { 'type' => 'string' }, - 'flattened' => true - } - } - xml = "" - expect(parse(xml, false)[:values]).to eq([]) - end - - it 'supports lists of scalars' do - definition['members'] = { - 'Values' => { - 'type' => 'list', - 'member' => { 'type' => 'integer' }, - 'flattened' => true - } - } - xml = <<-XML - - 1 - 2 - 3 - - XML - expect(parse(xml)).to eq(values: [1,2,3]) - end - - it 'accepts lists of a single element' do - definition['members'] = { - 'Values' => { - 'type' => 'list', - 'member' => { 'type' => 'string' }, - 'flattened' => true - } - } - xml = <<-XML - - abc - - XML - expect(parse(xml)[:values]).to eq(['abc']) - end - - it 'observes the list serialization name when present' do - definition['members'] = { - 'Values' => { - 'type' => 'list', - 'member' => { 'type' => 'string', 'locationName' => 'Item' }, - 'flattened' => true - } - } - xml = <<-XML - - abc - mno - xyz - + it 'supports flattened lists with locationName trait' do + shapes['StructureList']['flattened'] = true + ref = shapes['StructureShape']['members']['NestedList'] + ref['locationName'] = 'List' + xml = <<-XML.strip + + + v1 + + + v2 + + + v3 + + XML - expect(parse(xml)[:values]).to eq(%w(abc mno xyz)) + expect(parse(xml)).to eq(nested_list: [ + { string: 'v1' }, + { string: 'v2' }, + { string: 'v3' }, + ]) end - it 'can parse lists of complex types' do - definition['members'] = { - 'People' => { - 'type' => 'list', - 'locationName' => 'Person', - 'member' => { - 'type' => 'structure', - 'members' => { - 'Handle' => { 'type' => 'string', 'locationName' => 'Name' } - } - }, - 'flattened' => true - } - } - xml = <<-XML - - abc - mno - xyz - + it 'supports flattened lists with member locationName trait' do + shapes['StructureList']['flattened'] = true + shapes['StructureList']['member']['locationName'] = 'ListMember' + xml = <<-XML.strip + + + v1 + + + v2 + + + v3 + + XML - expect(parse(xml)[:people]).to eq([ - { handle: 'abc' }, - { handle: 'mno' }, - { handle: 'xyz' }, + expect(parse(xml)).to eq(nested_list: [ + { string: 'v1' }, + { string: 'v2' }, + { string: 'v3' }, ]) end end - describe 'non-flattened maps' do + describe 'maps' do - it 'returns missing maps as {}' do - definition['members'] = { - 'Attributes' => { - 'type' => 'map', - 'key' => { 'type' => 'string' }, - 'value' => { 'type' => 'string' } - } - } - xml = "" - expect(parse(xml)[:attributes]).to eq({}) + it 'returns missing maps as a DefaultMap' do + xml = '' + expect(parse(xml, false)[:string_map]).to be_kind_of(DefaultMap) + expect(parse(xml)).to eq({}) end it 'returns empty maps as {}' do - definition['members'] = { - 'Attributes' => { - 'type' => 'map', - 'key' => { 'type' => 'string' }, - 'value' => { 'type' => 'string' } - } - } - xml = "" - expect(parse(xml)[:attributes]).to eq({}) + xml = '' + expect(parse(xml)).to eq(string_map: {}) end - it 'expects entry, key and value tags by default' do - definition['members'] = { - 'Attributes' => { - 'type' => 'map', - 'key' => { 'type' => 'string' }, - 'value' => { 'type' => 'string' } - } - } - xml = <<-XML - - - - Color - red - - - Size - large - - - + it 'supports maps with locationName traits' do # key and value + shapes['StringMap']['key']['locationName'] = 'AttrName' + shapes['StringMap']['value']['locationName'] = 'AttrValue' + xml = <<-XML.strip + + + + size + large + + + color + red + + + XML - expect(parse(xml)[:attributes]).to eq({ - 'Color' => 'red', - 'Size' => 'large' + expect(parse(xml)).to eq(string_map: { + 'size' => 'large', + 'color' => 'red', }) end - it 'accepts maps with a single entry' do - definition['members'] = { - 'Attributes' => { - 'type' => 'map', - 'key' => { 'type' => 'string' }, - 'value' => { 'type' => 'string' } - } - } - xml = <<-XML - - - - Color - red - - - - XML - expect(parse(xml)[:attributes]).to eq('Color' => 'red') - end - - it 'accepts alternate key and value names' do - definition['members'] = { - 'Attributes' => { - 'type' => 'map', - 'key' => { 'type' => 'string', 'locationName' => 'attr' }, - 'value' => { 'type' => 'string', 'locationName' => 'val' } - } - } - xml = <<-XML - - - - hue - red - - - size - med - - - - XML - expect(parse(xml)[:attributes]).to eq('hue' => 'red', 'size' => 'med') - end - - end - - describe 'flattened maps' do - - it 'returns missing maps as {}' do - definition['members'] = { - 'Attributes' => { - 'type' => 'map', - 'key' => { 'type' => 'string' }, - 'value' => { 'type' => 'string' }, - 'flattened' => true - } - } - xml = "" - expect(parse(xml)[:attributes]).to eq({}) - end - - it 'expects key and value tags by default' do - definition['members'] = { - 'Attributes' => { - 'type' => 'map', - 'key' => { 'type' => 'string' }, - 'value' => { 'type' => 'string' }, - 'flattened' => true - } - } - xml = <<-XML - - - Color - red - - - Size - large - - + it 'supports flattened maps' do + shapes['StringMap']['flattened'] = true + xml = <<-XML.strip + + + size + large + + + color + red + + XML - expect(parse(xml)[:attributes]).to eq({ - 'Color' => 'red', - 'Size' => 'large' + expect(parse(xml)).to eq(string_map: { + 'size' => 'large', + 'color' => 'red', }) end - it 'accepts maps with a single entry' do - definition['members'] = { - 'Attributes' => { - 'type' => 'map', - 'key' => { 'type' => 'string' }, - 'value' => { 'type' => 'string' }, - 'flattened' => true - } - } - xml = <<-XML - - - Color - red - - - XML - expect(parse(xml)[:attributes]).to eq('Color' => 'red') - end - - it 'accepts alternate key and value names' do - definition['members'] = { - 'Attributes' => { - 'type' => 'map', - 'key' => { 'type' => 'string', 'locationName' => 'attr' }, - 'value' => { 'type' => 'string', 'locationName' => 'val' }, - 'flattened' => true - } - } - xml = <<-XML - - - hue - red - - - size - med - - + it 'supports flattened maps with locationName traits' do + shapes['StringMap']['flattened'] = true + shapes['StringMap']['key']['locationName'] = 'AttrName' + shapes['StringMap']['value']['locationName'] = 'AttrValue' + ref = shapes['StructureShape']['members']['StringMap'] + ref['locationName'] = 'Attributes' + xml = <<-XML.strip + + + size + large + + + color + red + + XML - expect(parse(xml)[:attributes]).to eq('hue' => 'red', 'size' => 'med') + expect(parse(xml)).to eq(string_map: { + 'size' => 'large', + 'color' => 'red', + }) end end describe 'booleans' do - before(:each) do - definition['members'] = { 'enabled' => { 'type' => 'boolean' } } + it 'supports true values' do + xml = 'true' + expect(parse(xml)).to eq(boolean: true) end - it 'converts boolean true values' do - xml = "true" - expect(parse(xml)).to eq(enabled: true) + it 'supports false values' do + xml = 'false' + expect(parse(xml)).to eq(boolean: false) end - it 'converts boolean false values' do - xml = "false" - expect(parse(xml)).to eq(enabled: false) - end - - it 'does not apply a boolean true/false value when not present' do - xml = "" + it 'returns nil for an empty element' do + xml = '' expect(parse(xml)).to eq({}) end @@ -581,199 +436,57 @@ def parse(xml, to_h = true) describe 'timestamps' do - before(:each) do - definition['members'] = { - 'CreatedAt' => { - 'type' => 'timestamp', - 'locationName' => 'Created', - } - } - end - - it 'returns an empty element as nil' do - xml = "" - expect(parse(xml)[:created_at]).to be(nil) - end - - it 'can parse unix timestamps' do - timestamp = 1349908100 - time = Time.at(timestamp) - xml = "#{timestamp}" - data = parse(xml) - expect(data[:created_at]).to be_a(Time) - expect(data[:created_at]).to eq(time) - end - - it 'understands basic iso8601 strings' do - timestamp = '2012-09-10T15:47:10.001Z' - time = Time.parse(timestamp).to_time.utc - xml = "#{timestamp}" - data = parse(xml) - expect(data[:created_at]).to be_a(Time) - expect(data[:created_at]).to eq(time) - end - - it 'understands basic rfc822 strings' do - timestamp = 'Wed, 10 Oct 2012 15:59:55 UTC' - time = Time.parse(timestamp).to_time.utc - xml = "#{timestamp}" - data = parse(xml) - expect(data[:created_at]).to be_a(Time) - expect(data[:created_at]).to eq(time) - end - - it 'throws an error when unable to determine the format' do - timestamp = 'bad-date-format' - xml = "#{timestamp}" - expect { - parse(xml) - }.to raise_error("unhandled timestamp format `#{timestamp}'") - end - - end - - describe 'integers' do - - before(:each) do - definition['members'] = { 'count' => { 'type' => 'integer' } } - end - - it 'parses integer elements' do - xml = "123" - expect(parse(xml)[:count]).to eq(123) - end - - it 'returns empty elements as nil' do - xml = "" - expect(parse(xml)[:count]).to eq(nil) + it 'supports unix timestamps' do + now = Time.now.to_i + xml = "#{now}" + expect(parse(xml)).to eq({timestamp: Time.at(now) }) end - end - - describe 'floats' do - - before(:each) do - definition['members'] = { 'price' => { 'type' => 'float' } } - end - - it 'parses float elements' do - xml = "12.34" - expect(parse(xml)[:price]).to eq(12.34) + it 'supports iso8601 strings' do + now = Time.now.iso8601 + xml = "#{now}" + expect(parse(xml)).to eq({timestamp: Time.parse(now) }) end - it 'returns empty elements as nil' do - xml = "" - expect(parse(xml)[:price]).to eq(nil) + it 'supports rfc822 strings' do + now = Time.now.rfc822 + xml = "#{now}" + expect(parse(xml)).to eq({timestamp: Time.parse(now) }) end end describe 'strings' do - it 'returns the empty string for self closing string XML elements' do - definition['members'] = { - 'data' => { 'type' => 'string' } - } - xml = "" - expect(parse(xml)[:data]).to eq('') - end - - it 'base64 decodes strings when encoding attribute is present' do - definition['members'] = { - 'encoded' => { 'type' => 'string' }, - 'not_encoded' => { 'type' => 'string' }, - 'nested' => { - 'type' => 'structure', - 'members' => { - 'encoded' => { 'type' => 'string' } - } - } - } + it 'base64 decodes with encoding is set' do xml = <<-XML.strip - #{Base64.encode64('a')} - mno - - #{Base64.encode64('b')} - + #{Base64.encode64('a')} + + #{Base64.encode64('b')} + XML - parsed = parse(xml) - expect(parsed[:encoded]).to eq('a') - expect(parsed[:nested][:encoded]).to eq('b') - expect(parsed[:not_encoded]).to eq('mno') - end - - it 'xml decodes string values' do - definition['members'] = { - 'data' => { 'type' => 'string' } - } - xml = "a&b" - expect(parse(xml)[:data]).to eq('a&b') - end - - end - - describe 'blobs' do - - it 'returns nil for empty elements' do - definition['members'] = { - 'data' => { 'type' => 'blob' } - } - xml = "" - expect(parse(xml)[:data]).to be(nil) - end - - it 'base64 decodes blob elements' do - definition['members'] = { - 'data' => { 'type' => 'blob' } - } - xml = "aGVsbG8=" - expect(parse(xml)).to eq(data: 'hello') + expect(parse(xml)).to eq(string: 'a', nested: { string: 'b' }) end end describe 'xml attributes' do - it 'omits attributes that are not members' do - definition['members'] = { - 'config' => { - 'type' => 'structure', - 'members' => { - 'state' => { 'type' => 'string' } - } - } - } - xml = "on" - expect(parse(xml)).to eq(config: { state: 'on' }) + it 'supports paring structure members from xml attributes' do + ref = shapes['StructureShape']['members']['String'] + ref['locationName'] = 'stringAsAttribute' + xml = '' + expect(parse(xml)).to eq(nested: { string: 'value' }) end - it 'merges xml attributes that are members' do - definition['members'] = { - 'config' => { - 'type' => 'structure', - 'members' => { - 'state' => { 'type' => 'string' }, - 'foo' => { 'type' => 'string' } - } - } - } - xml = "on" - expect(parse(xml)).to eq(config: { state: 'on', foo: 'bar' }) + it 'ignores xml attributes that are not members' do + xml = '' + expect(parse(xml)).to eq(nested: {}) end end - - describe 'parsing errors' do - - it 'does not trap xml parsing errors' do - xml = ' Date: Fri, 24 Apr 2015 14:49:48 -0700 Subject: [PATCH 004/101] DRY'd up the XML and JSON parser specs. --- aws-sdk-core/spec/aws/json/parser_spec.rb | 53 +------------------- aws-sdk-core/spec/aws/xml/parser_spec.rb | 53 +------------------- aws-sdk-core/spec/spec_helper.rb | 59 +++++++++++++++++++++++ 3 files changed, 61 insertions(+), 104 deletions(-) diff --git a/aws-sdk-core/spec/aws/json/parser_spec.rb b/aws-sdk-core/spec/aws/json/parser_spec.rb index 4c9e644c386..73a6cbe6b3d 100644 --- a/aws-sdk-core/spec/aws/json/parser_spec.rb +++ b/aws-sdk-core/spec/aws/json/parser_spec.rb @@ -6,58 +6,7 @@ module Aws module Json describe Parser do - let(:shapes) {{ - 'StructureShape' => { - 'type' => 'structure', - 'members' => { - # complex members - 'Nested' => { 'shape' => 'StructureShape' }, - 'NestedList' => { 'shape' => 'StructureList' }, - 'NestedMap' => { 'shape' => 'StructureMap' }, - 'NumberList' => { 'shape' => 'IntegerList' }, - 'StringMap' => { 'shape' => 'StringMap' }, - # scalar members - 'Blob' => { 'shape' => 'BlobShape' }, - 'Byte' => { 'shape' => 'ByteShape' }, - 'Boolean' => { 'shape' => 'BooleanShape' }, - 'Character' => { 'shape' => 'CharacterShape' }, - 'Double' => { 'shape' => 'DoubleShape' }, - 'Float' => { 'shape' => 'FloatShape' }, - 'Integer' => { 'shape' => 'IntegerShape' }, - 'Long' => { 'shape' => 'LongShape' }, - 'String' => { 'shape' => 'StringShape' }, - 'Timestamp' => { 'shape' => 'TimestampShape' }, - } - }, - 'StructureList' => { - 'type' => 'list', - 'member' => { 'shape' => 'StructureShape' } - }, - 'StructureMap' => { - 'type' => 'map', - 'key' => { 'shape' => 'StringShape' }, - 'value' => { 'shape' => 'StructureShape' } - }, - 'IntegerList' => { - 'type' => 'list', - 'member' => { 'shape' => 'IntegerShape' } - }, - 'StringMap' => { - 'type' => 'map', - 'key' => { 'shape' => 'StringShape' }, - 'value' => { 'shape' => 'StringShape' } - }, - 'BlobShape' => { 'type' => 'blob' }, - 'ByteShape' => { 'type' => 'byte' }, - 'BooleanShape' => { 'type' => 'boolean' }, - 'CharacterShape' => { 'type' => 'character' }, - 'DoubleShape' => { 'type' => 'double' }, - 'FloatShape' => { 'type' => 'float' }, - 'IntegerShape' => { 'type' => 'integer' }, - 'LongShape' => { 'type' => 'long' }, - 'StringShape' => { 'type' => 'string' }, - 'TimestampShape' => { 'type' => 'timestamp' }, - }} + let(:shapes) { ApiHelper.sample_shapes } def parse(json) shape_map = Api::ShapeMap.new(shapes) diff --git a/aws-sdk-core/spec/aws/xml/parser_spec.rb b/aws-sdk-core/spec/aws/xml/parser_spec.rb index 87d67dc066a..0baf11a884d 100644 --- a/aws-sdk-core/spec/aws/xml/parser_spec.rb +++ b/aws-sdk-core/spec/aws/xml/parser_spec.rb @@ -32,58 +32,7 @@ module Xml next end - let(:shapes) {{ - 'StructureShape' => { - 'type' => 'structure', - 'members' => { - # complex members - 'Nested' => { 'shape' => 'StructureShape' }, - 'NestedList' => { 'shape' => 'StructureList' }, - 'NestedMap' => { 'shape' => 'StructureMap' }, - 'NumberList' => { 'shape' => 'IntegerList' }, - 'StringMap' => { 'shape' => 'StringMap' }, - # scalar members - 'Blob' => { 'shape' => 'BlobShape' }, - 'Byte' => { 'shape' => 'ByteShape' }, - 'Boolean' => { 'shape' => 'BooleanShape' }, - 'Character' => { 'shape' => 'CharacterShape' }, - 'Double' => { 'shape' => 'DoubleShape' }, - 'Float' => { 'shape' => 'FloatShape' }, - 'Integer' => { 'shape' => 'IntegerShape' }, - 'Long' => { 'shape' => 'LongShape' }, - 'String' => { 'shape' => 'StringShape' }, - 'Timestamp' => { 'shape' => 'TimestampShape' }, - } - }, - 'StructureList' => { - 'type' => 'list', - 'member' => { 'shape' => 'StructureShape' } - }, - 'StructureMap' => { - 'type' => 'map', - 'key' => { 'shape' => 'StringShape' }, - 'value' => { 'shape' => 'StructureShape' } - }, - 'IntegerList' => { - 'type' => 'list', - 'member' => { 'shape' => 'IntegerShape' } - }, - 'StringMap' => { - 'type' => 'map', - 'key' => { 'shape' => 'StringShape' }, - 'value' => { 'shape' => 'StringShape' } - }, - 'BlobShape' => { 'type' => 'blob' }, - 'ByteShape' => { 'type' => 'byte' }, - 'BooleanShape' => { 'type' => 'boolean' }, - 'CharacterShape' => { 'type' => 'character' }, - 'DoubleShape' => { 'type' => 'double' }, - 'FloatShape' => { 'type' => 'float' }, - 'IntegerShape' => { 'type' => 'integer' }, - 'LongShape' => { 'type' => 'long' }, - 'StringShape' => { 'type' => 'string' }, - 'TimestampShape' => { 'type' => 'timestamp' }, - }} + let(:shapes) { ApiHelper.sample_shapes } let(:parser) { engine_class = Parser.const_get(engine) diff --git a/aws-sdk-core/spec/spec_helper.rb b/aws-sdk-core/spec/spec_helper.rb index 69e3773488d..716d6c42bf9 100644 --- a/aws-sdk-core/spec/spec_helper.rb +++ b/aws-sdk-core/spec/spec_helper.rb @@ -109,3 +109,62 @@ def data_to_hash(obj) else obj end end + +module ApiHelper + class << self + def sample_shapes + { + 'StructureShape' => { + 'type' => 'structure', + 'members' => { + # complex members + 'Nested' => { 'shape' => 'StructureShape' }, + 'NestedList' => { 'shape' => 'StructureList' }, + 'NestedMap' => { 'shape' => 'StructureMap' }, + 'NumberList' => { 'shape' => 'IntegerList' }, + 'StringMap' => { 'shape' => 'StringMap' }, + # scalar members + 'Blob' => { 'shape' => 'BlobShape' }, + 'Byte' => { 'shape' => 'ByteShape' }, + 'Boolean' => { 'shape' => 'BooleanShape' }, + 'Character' => { 'shape' => 'CharacterShape' }, + 'Double' => { 'shape' => 'DoubleShape' }, + 'Float' => { 'shape' => 'FloatShape' }, + 'Integer' => { 'shape' => 'IntegerShape' }, + 'Long' => { 'shape' => 'LongShape' }, + 'String' => { 'shape' => 'StringShape' }, + 'Timestamp' => { 'shape' => 'TimestampShape' }, + } + }, + 'StructureList' => { + 'type' => 'list', + 'member' => { 'shape' => 'StructureShape' } + }, + 'StructureMap' => { + 'type' => 'map', + 'key' => { 'shape' => 'StringShape' }, + 'value' => { 'shape' => 'StructureShape' } + }, + 'IntegerList' => { + 'type' => 'list', + 'member' => { 'shape' => 'IntegerShape' } + }, + 'StringMap' => { + 'type' => 'map', + 'key' => { 'shape' => 'StringShape' }, + 'value' => { 'shape' => 'StringShape' } + }, + 'BlobShape' => { 'type' => 'blob' }, + 'ByteShape' => { 'type' => 'byte' }, + 'BooleanShape' => { 'type' => 'boolean' }, + 'CharacterShape' => { 'type' => 'character' }, + 'DoubleShape' => { 'type' => 'double' }, + 'FloatShape' => { 'type' => 'float' }, + 'IntegerShape' => { 'type' => 'integer' }, + 'LongShape' => { 'type' => 'long' }, + 'StringShape' => { 'type' => 'string' }, + 'TimestampShape' => { 'type' => 'timestamp' }, + } + end + end +end From 58e5f32338855486386df6d8d6e72eca072ffbd0 Mon Sep 17 00:00:00 2001 From: Trevor Rowe Date: Mon, 27 Apr 2015 09:02:30 -0700 Subject: [PATCH 005/101] Converted the JSON builder to the new API shapes. --- aws-sdk-core/lib/aws-sdk-core/json/builder.rb | 64 +++--- .../lib/aws-sdk-core/json/rest_handler.rb | 4 +- .../lib/aws-sdk-core/json/rpc_body_handler.rb | 6 +- aws-sdk-core/lib/seahorse/model/shapes.rb | 7 + aws-sdk-core/spec/aws/json/builder_spec.rb | 211 ++++-------------- 5 files changed, 87 insertions(+), 205 deletions(-) diff --git a/aws-sdk-core/lib/aws-sdk-core/json/builder.rb b/aws-sdk-core/lib/aws-sdk-core/json/builder.rb index 3afc7c69ae7..d11059672c4 100644 --- a/aws-sdk-core/lib/aws-sdk-core/json/builder.rb +++ b/aws-sdk-core/lib/aws-sdk-core/json/builder.rb @@ -4,58 +4,56 @@ module Aws module Json class Builder - # @param [Seahorse::Model::Shapes::Shape] shape - # @param [Hash] params - # @return [String] - def to_json(shape, params) - MultiJson.dump(format(shape, params)) + include Seahorse::Model::Shapes + + def initialize(rules) + @rules = rules + end + + def to_json(params) + MultiJson.dump(format(@rules, params)) end private - # @param [Seahorse::Model::Shapes::Structure] structure - # @param [Hash] values - # @return [Hash] - def structure(structure, values) + def structure(ref, values) + shape = ref.shape values.each.with_object({}) do |(key, value), data| - if structure.member?(key) && !value.nil? - member_shape = structure.member(key) - name = member_shape.location_name || key - data[name] = format(member_shape, value) + if shape.member?(key) && !value.nil? + member_ref = shape.member(key) + member_name = member_ref.location_name || key + data[member_name] = format(member_ref, value) end end end - # @param [Seahorse::Model::Shapes::List] list - # @param [Array] values - # @return [Array] - def list(list, values) - values.collect { |value| format(list.member, value) } + def list(ref, values) + member_ref = ref.shape.member + values.collect { |value| format(member_ref, value) } end - # @param [Seahorse::Model::Shapes::Map] map - # @param [Hash] values - # @return [Hash] - def map(map, values) + def map(ref, values) + value_ref = ref.shape.value values.each.with_object({}) do |(key, value), data| - data[key] = format(map.value, value) + data[key] = format(value_ref, value) end end - # @param [Seahorse::Model::Shapes::Shape] shape - # @param [Object] value - # @return [Object] - def format(shape, value) - case shape.type - when 'structure' then structure(shape, value) - when 'list' then list(shape, value) - when 'map' then map(shape, value) - when 'timestamp' then shape.format_time(value, 'unixTimestamp') - when 'blob' then Base64.strict_encode64(value.read) + def format(ref, value) + case ref.shape + when StructureShape then structure(ref, value) + when ListShape then list(ref, value) + when MapShape then map(ref, value) + when TimestampShape then value.to_i + when BlobShape then encode(value) else value end end + def encode(blob) + Base64.strict_encode64(String === blob ? blob : blob.read) + end + end end end diff --git a/aws-sdk-core/lib/aws-sdk-core/json/rest_handler.rb b/aws-sdk-core/lib/aws-sdk-core/json/rest_handler.rb index 1b27cb496da..7b8391b354e 100644 --- a/aws-sdk-core/lib/aws-sdk-core/json/rest_handler.rb +++ b/aws-sdk-core/lib/aws-sdk-core/json/rest_handler.rb @@ -5,14 +5,14 @@ class RestHandler < RestBodyHandler # @param [Seahorse::Model::Shapes::Structure] shape # @param [Hash] params def serialize_params(shape, params) - Builder.new.to_json(shape, params) + Builder.new(shape).to_json(params) end # @param [String] json # @param [Seahorse::Model::Shapes::Structure] shape # @param [Structure, nil] target def parse_body(json, shape, target) - Parser.new.parse(shape, json, target) + Parser.new(shape).parse(json, target) end end diff --git a/aws-sdk-core/lib/aws-sdk-core/json/rpc_body_handler.rb b/aws-sdk-core/lib/aws-sdk-core/json/rpc_body_handler.rb index 6319759afd5..48b952820d9 100644 --- a/aws-sdk-core/lib/aws-sdk-core/json/rpc_body_handler.rb +++ b/aws-sdk-core/lib/aws-sdk-core/json/rpc_body_handler.rb @@ -17,17 +17,17 @@ def call(context) def build_json(context) if shape = context.operation.input - context.http_request.body = Builder.new.to_json(shape, context.params) + context.http_request.body = Builder.new(shape).to_json(context.params) else context.http_request.body = '{}' end end def parse_json(context) - if output_shape = context.operation.output + if rules = context.operation.output json = context.http_response.body_contents json = '{}' if json == '' - Parser.new.parse(output_shape, json) + Parser.new(rules).parse(json) else EmptyStructure.new end diff --git a/aws-sdk-core/lib/seahorse/model/shapes.rb b/aws-sdk-core/lib/seahorse/model/shapes.rb index f67c77fab2d..003332b5396 100644 --- a/aws-sdk-core/lib/seahorse/model/shapes.rb +++ b/aws-sdk-core/lib/seahorse/model/shapes.rb @@ -116,6 +116,13 @@ def member_names @members.keys end + # @param [Symbol] member_name + # @return [Boolean] Returns `true` if there exists a member with + # the given name. + def member?(member_name) + @members.key?(member_name) + end + # @return [Enumerator<[Symbol,ShapeRef]>] def members @members.to_enum diff --git a/aws-sdk-core/spec/aws/json/builder_spec.rb b/aws-sdk-core/spec/aws/json/builder_spec.rb index 078bcff6c75..7de3b8d3052 100644 --- a/aws-sdk-core/spec/aws/json/builder_spec.rb +++ b/aws-sdk-core/spec/aws/json/builder_spec.rb @@ -4,183 +4,60 @@ module Aws module Json describe Builder do - let(:members) { {} } + let(:shapes) { ApiHelper.sample_shapes } def json(params) - shape = Seahorse::Model::Shapes::Structure.new('members' => members) - Builder.new.to_json(shape, params) + shape_map = Api::ShapeMap.new(shapes) + rules = shape_map.shape_ref('shape' => 'StructureShape') + Builder.new(rules).to_json(params) end - describe 'structures' do - - it 'returns an empty xml doc when there are no params' do - expect(json({})).to eq('{}') - end - - it 'omits params that are not in the rules' do - expect(json(abc: 'xyz')).to eq('{}') - end - - it 'observes serialized name properties' do - members['Name'] = { - 'type' => 'string', - 'locationName' => 'FullName' - } - expect(json(name: 'John Doe')).to eq('{"FullName":"John Doe"}') - end - - it 'serializes nested structures' do - members['Abc'] = { - 'type' => 'structure', - 'members' => { - 'Mno' => { 'type' => 'string', 'locationName' => 'MNO' } - } - } - expect(json(abc: { mno: 'xyz' })).to eq('{"Abc":{"MNO":"xyz"}}') - end - - it 'does not serialize nil members' do - members['Cfg'] = { - 'type' => 'structure', - 'members' => { - 'Data' => { 'type' => 'blob' }, - } - } - expect(json(cfg: { data: nil })).to eq('{"Cfg":{}}') - end - + it 'builds an empty JOSN document when there are no params' do + expect(json({})).to eq('{}') end - describe 'lists' do - - it 'serializes lists' do - members['Items'] = { - 'type' => 'list', - 'member' => { 'type' => 'string' } - } - expect(json(items: %w(abc xyz))).to eq('{"Items":["abc","xyz"]}') - end - - it 'lists of complex shapes' do - members['Abc'] = { - 'type' => 'list', - 'member' => { - 'type' => 'structure', - 'members' => { - 'Mno' => { 'type' => 'string', 'locationName' => 'MNO' } - } - } - } - expect(json(abc: [{mno:'xyz'}])).to eq('{"Abc":[{"MNO":"xyz"}]}') - end - - end - - describe 'maps' do - - it 'accepts an arbitrary hash of values' do - members['Attrs'] = { - 'type' => 'map', - 'key' => { 'type' => 'string' }, - 'value' => { 'type' => 'string' } - } - params = { attrs: { 'Size' => 'large', 'Color' => 'red' } } - expect(json(params)).to eq('{"Attrs":{"Size":"large","Color":"red"}}') - end - - it 'supports complex hash values' do - members['People'] = { - 'type' => 'map', - 'key' => { 'type' => 'string' }, - 'value' => { - 'type' => 'structure', - 'members' => { - 'Age' => { 'type' => 'integer', 'locationName' => 'AGE' } - } - } - } - params = { people: { 'John' => { age: 40 } } } - expect(json(params)).to eq('{"People":{"John":{"AGE":40}}}') - end - + it 'supports locationName traits on structure members' do + shapes['StructureShape']['members']['String']['locationName'] = 'str' + expect(json(string: 'abc')).to eq('{"str":"abc"}') end - describe 'scalars' do - - it 'serializes integers' do - members['Count'] = { 'type' => 'integer' } - expect(json(count: 123)).to eq('{"Count":123}') - end - - it 'serializes floats' do - members['Price'] = { 'type' => 'float' } - expect(json(price: 12.34)).to eq('{"Price":12.34}') - end - - it 'serializes booleans' do - members['Hot'] = { 'type' => 'boolean' } - members['Cold'] = { 'type' => 'boolean' } - expect(json(hot:true, cold:false)).to eq('{"Hot":true,"Cold":false}') - end - - it 'serializes timestamps' do - now = Time.now - members['When'] = { 'type' => 'timestamp' } - expect(json(when:now)).to eq("{\"When\":#{now.utc.to_i}}") - end - - it 'serializes iso8601 timestamps' do - now = Time.now - members['When'] = { - 'type' => 'timestamp', - 'timestampFormat' => 'iso8601' - } - expect(json(when:now)).to eq("{\"When\":\"#{now.utc.iso8601}\"}") - end - - it 'serializes rfc822 timestamps' do - now = Time.now - members['When'] = { - 'type' => 'timestamp', - 'timestampFormat' => 'rfc822' - } - expect(json(when:now)).to eq("{\"When\":\"#{now.utc.rfc822}\"}") - end - - it 'serializes unix timestamps' do - now = Time.now - members['When'] = { - 'type' => 'timestamp', - 'timestampFormat' => 'unixTimestamp' - } - expect(json(when:now)).to eq("{\"When\":#{now.utc.to_i}}") - end - - it 'raises an error for unknown timestamp formats' do - members['When'] = { - 'type' => 'timestamp', - 'timestampFormat' => 'bogus' - } - expect { - json(when:Time.now) - }.to raise_error(ArgumentError, 'invalid timestamp format "bogus"') - end - - it 'serializes blobs as base64 strings' do - members['data'] = { 'type' => 'blob' } - expect(json(data:StringIO.new('hello'))).to eq('{"data":"aGVsbG8="}') - end - + it 'supports nested and complex structures' do + expect(json({ + nested: { + nested: { + nested: { integer: 3 }, + integer: 2 + }, + integer: 1 + }, + nested_list: [ + { string: "v1" }, + { string: "v2" }, + { nested: { string: "v3" }} + ], + nested_map: { + "First" => { string: "v1" }, + "Second" => { nested: { string: "v2" }}, + }, + number_list: [1,2,3,4,5], + string_map: { + "Size" => "large", + "Color" => "red", + }, + blob: "data", + byte: "a", + boolean: true, + character: "b", + double: 123.456, + float: 654.321, + long: 321, + string: "Hello", + timestamp: Time.at(123456789), + })).to eq('{"Nested":{"Nested":{"Nested":{"Integer":3},"Integer":2},"Integer":1},"NestedList":[{"String":"v1"},{"String":"v2"},{"Nested":{"String":"v3"}}],"NestedMap":{"First":{"String":"v1"},"Second":{"Nested":{"String":"v2"}}},"NumberList":[1,2,3,4,5],"StringMap":{"Size":"large","Color":"red"},"Blob":"ZGF0YQ==","Byte":"a","Boolean":true,"Character":"b","Double":123.456,"Float":654.321,"Long":321,"String":"Hello","Timestamp":123456789}') end - # All of the previous tests in this spec file test given a root - # level structure. JSON allows for root level arrays. - it 'supports serializing an array as the root element' do - list_shape = Seahorse::Model::Shapes::List.new( - 'member' => { 'type' => 'string' } - ) - json = Builder.new.to_json(list_shape, %w(a b c)) - expect(json).to eq('["a","b","c"]') + it 'does not serialize nil values' do + expect(json(string: 'abc', integer: nil)).to eq('{"String":"abc"}') end end From c589afa876c5dbe67251b5a0544c330dc51cbc35 Mon Sep 17 00:00:00 2001 From: Trevor Rowe Date: Tue, 5 May 2015 11:32:32 -0700 Subject: [PATCH 006/101] Added metdata to shapes and shape references. --- aws-sdk-core/lib/seahorse/model/shapes.rb | 43 +++++++++++++++++++++++ 1 file changed, 43 insertions(+) diff --git a/aws-sdk-core/lib/seahorse/model/shapes.rb b/aws-sdk-core/lib/seahorse/model/shapes.rb index 003332b5396..059c7375641 100644 --- a/aws-sdk-core/lib/seahorse/model/shapes.rb +++ b/aws-sdk-core/lib/seahorse/model/shapes.rb @@ -6,6 +6,10 @@ module Shapes class ShapeRef + def initialize + @metadata = {} + end + # @return [Shape] attr_accessor :shape @@ -15,16 +19,44 @@ class ShapeRef # @return [String, nil] attr_accessor :location_name + # Gets metadata for the given `key`. + def [](key) + if @metadata.key?(key) + @metadata[key] + else + @shape[key] + end + end + + # Sets metadata for the given `key`. + def []=(key, value) + @metadata[key] = value + end + end class Shape + def initialize + @metadata = {} + end + # @return [String] attr_accessor :name # @return [String, nil] attr_accessor :documentation + # Gets metadata for the given `key`. + def [](key) + @metadata[key] + end + + # Sets metadata for the given `key`. + def []=(key, value) + @metadata[key] = value + end + end class BlobShape < Shape; end @@ -45,6 +77,11 @@ class IntegerShape < Shape class ListShape < Shape + def initialize + @flattened = false + super + end + # @return [ShapeRef] attr_accessor :member @@ -61,6 +98,11 @@ class ListShape < Shape class MapShape < Shape + def initialize + @flattened = false + super + end + # @return [ShapeRef] attr_accessor :key @@ -97,6 +139,7 @@ def initialize(options = {}) @members = {} @members_by_location_name = {} @required = Set.new + super() end # @return [Set] From fc61900eeb1b9d1e04544e0a565844b1df4ff760 Mon Sep 17 00:00:00 2001 From: Trevor Rowe Date: Tue, 5 May 2015 11:32:37 -0700 Subject: [PATCH 007/101] Updated the XML builder to use the new seahorse shapes. --- .../lib/aws-sdk-core/api/shape_map.rb | 32 +- aws-sdk-core/lib/aws-sdk-core/xml/builder.rb | 100 ++-- aws-sdk-core/spec/aws/xml/builder_spec.rb | 543 +++++++----------- 3 files changed, 280 insertions(+), 395 deletions(-) diff --git a/aws-sdk-core/lib/aws-sdk-core/api/shape_map.rb b/aws-sdk-core/lib/aws-sdk-core/api/shape_map.rb index 03d01ed192b..ed75268dd60 100644 --- a/aws-sdk-core/lib/aws-sdk-core/api/shape_map.rb +++ b/aws-sdk-core/lib/aws-sdk-core/api/shape_map.rb @@ -20,6 +20,10 @@ class ShapeMap 'timestamp' => TimestampShape, } + SHAPE_ATTRS = Set.new(%w(min max documentation flattened)) + + SHAPE_METADATA = Set.new(%w(xmlNamespace)) + # @param [ShapeMap] shapes def initialize(definitions) @shapes = {} @@ -37,9 +41,15 @@ def [](shape_name) def shape_ref(definition, options = {}) if definition ref = ShapeRef.new - ref.shape = self[definition['shape']] - ref.location = definition['location'] - ref.location_name = definition['locationName'] || options[:location_name] + ref.location_name = options[:location_name] + definition.each do |key, value| + case key + when 'shape' then ref.shape = self[value] + when 'location' then ref.location = value + when 'locationName' then ref.location_name = value + else ref[key] = value + end + end ref else nil @@ -55,16 +65,18 @@ def build_shapes(definitions) @shapes[name] = shape end definitions.each do |name, definition| - shape = @shapes[name] - apply_common_traits(shape, definition) - apply_shape_refs(shape, definition) + populate_shape(@shapes[name], definition) end end - def apply_common_traits(shape, definition) - shape.enum = Set.new(definition['enum']) if definition.key?('enum') - %w(min max flattened documentation).each do |trait| - shape.send("#{trait}=", definition[trait]) if definition.key?(trait) + def populate_shape(shape, definition) + apply_shape_refs(shape, definition) + definition.each do |key, value| + case + when SHAPE_ATTRS.include?(key) then shape.send("#{key}=", value) + when SHAPE_METADATA.include?(key) then shape[key] = value + when key == 'enum' then shape.enum = Set.new(value) + end end end diff --git a/aws-sdk-core/lib/aws-sdk-core/xml/builder.rb b/aws-sdk-core/lib/aws-sdk-core/xml/builder.rb index 3876d7a4299..8bef7487566 100644 --- a/aws-sdk-core/lib/aws-sdk-core/xml/builder.rb +++ b/aws-sdk-core/lib/aws-sdk-core/xml/builder.rb @@ -5,85 +5,93 @@ module Aws module Xml class Builder - # @param [Seahorse::Model::Shapes::Structure] shape - def initialize(shape) - @shape = shape + include Seahorse::Model::Shapes + + def initialize(rules) + @rules = rules @xml = [] @builder = ::Builder::XmlMarkup.new(target: @xml, indent: 2) end - # @param [Hash] params - # @return [String] Returns an XML doc string. def to_xml(params) - structure(@shape.location_name, @shape, params) + structure(@rules.location_name, @rules, params) @xml.join end private - def structure(name, shape, values) + def structure(name, ref, values) if values.empty? - node(name, shape) + node(name, ref) else - node(name, shape, structure_attrs(shape, values)) do - shape.members.each do |member_name, member_shape| - unless values[member_name].nil? - next if xml_attribute?(member_shape) - mname = member_shape.location_name || member_name.to_s - member(mname, member_shape, values[member_name]) - end + node(name, ref, structure_attrs(ref, values)) do + ref.shape.members.each do |member_name, member_ref| + next if values[member_name].nil? + next if xml_attribute?(member_ref) + member(member_ref.location_name, member_ref, values[member_name]) end end end end - def structure_attrs(shape, values) - shape.members.inject({}) do |attrs, (member_name, member_shape)| - if xml_attribute?(member_shape) && values.key?(member_name) - attrs[member_shape.location_name] = values[member_name] + def structure_attrs(ref, values) + ref.shape.members.inject({}) do |attrs, (member_name, member_ref)| + if xml_attribute?(member_ref) && values.key?(member_name) + attrs[member_ref.location_name] = values[member_name] end attrs end end - def list(name, shape, values) - if flat?(shape) + def list(name, ref, values) + if flat?(ref) values.each do |value| - member(name, shape.member, value) + member(ref.shape.member.location_name || name, ref.shape.member, value) end else - node(name, shape) do + node(name, ref) do values.each do |value| - mname = shape.member.location_name || 'member' - member(mname, shape.member, value) + mname = ref.shape.member.location_name || 'member' + member(mname, ref.shape.member, value) end end end end - def map(name, shape, hash) - node(name, shape) do + def map(name, ref, hash) + key_ref = ref.shape.key + value_ref = ref.shape.value + node(name, ref) do hash.each do |key, value| - node('entry', shape) do - member(shape.key.location_name || 'key', shape.key, key) - member(shape.value.location_name || 'value', shape.value, value) + node('entry', ref) do + member(key_ref.location_name || 'key', key_ref, key) + member(value_ref.location_name || 'value', value_ref, value) end end end end - def member(name, shape, value) - case shape.type - when 'structure' then structure(name, shape, value) - when 'list' then list(name, shape, value) - when 'timestamp' then node(name, shape, shape.format_time(value, 'iso8601')) - when 'blob' then node(name, shape, Base64.strict_encode64(value.read)) - when 'map' then map(name, shape, value) + def member(name, ref, value) + case ref.shape + when StructureShape then structure(name, ref, value) + when ListShape then list(name, ref, value) + when MapShape then map(name, ref, value) + when TimestampShape then node(name, ref, timestamp(value)) + when BlobShape then node(name, ref, blob(value)) else - node(name, shape, value.to_s) + node(name, ref, value.to_s) end end + def blob(value) + value = value.read unless String === value + Base64.strict_encode64(value) + end + + def timestamp(value) + value.utc.iso8601 + end + # The `args` list may contain: # # * [] - empty, no value or attributes @@ -94,15 +102,15 @@ def member(name, shape, value) # Pass a block if you want to nest XML nodes inside. When doing this, # you may *not* pass a value to the `args` list. # - def node(name, shape, *args, &block) + def node(name, ref, *args, &block) attrs = args.last.is_a?(Hash) ? args.pop : {} - attrs = shape_attrs(shape).merge(attrs) + attrs = shape_attrs(ref).merge(attrs) args << attrs @builder.__send__(name, *args, &block) end - def shape_attrs(shape) - if xmlns = shape.metadata('xmlNamespace') + def shape_attrs(ref) + if xmlns = ref['xmlNamespace'] if prefix = xmlns['prefix'] { 'xmlns:' + prefix => xmlns['uri'] } else @@ -113,12 +121,12 @@ def shape_attrs(shape) end end - def xml_attribute?(shape) - !!shape.metadata('xmlAttribute') + def xml_attribute?(ref) + !!ref['xmlAttribute'] end - def flat?(shape) - shape.metadata('flattened') + def flat?(ref) + ref.shape.flattened end end diff --git a/aws-sdk-core/spec/aws/xml/builder_spec.rb b/aws-sdk-core/spec/aws/xml/builder_spec.rb index 8ef42ba4ec6..8a8a6eb3f29 100644 --- a/aws-sdk-core/spec/aws/xml/builder_spec.rb +++ b/aws-sdk-core/spec/aws/xml/builder_spec.rb @@ -4,366 +4,249 @@ module Aws module Xml describe Builder do - let(:members) { {} } + let(:shapes) { ApiHelper.sample_shapes } - let(:rules) {{ 'locationName' => 'xml', 'members' => members }} + let(:ref) {{ 'shape' => 'StructureShape', 'locationName' => 'xml' }} def xml(params) - shape = Seahorse::Model::Shapes::Structure.new(rules) - Builder.new(shape).to_xml(params) + shape_map = Api::ShapeMap.new(shapes) + rules = shape_map.shape_ref(ref) + Builder.new(rules).to_xml(params) end - describe 'structures' do - - it 'includes members that are present in the params' do - rules['members'] = { - 'Abc' => { 'type' => 'string' }, - 'Mno' => { 'type' => 'string' }, - } - expect(xml(:mno => 'value')).to eq(<<-XML) - - value - - XML - end + it 'serializes empty values as empty elements' do + expect(xml({})).to eq("\n") + end - it 'orders members by rule order, not param order' do - rules['members'] = { - 'Mno' => { 'type' => 'string' }, - 'Abc' => { 'type' => 'string' }, - } - expect(xml(:abc => 'v2', :mno => 'v1')).to eq(<<-XML) + it 'orders xml elements by members order' do + params = { + string: 'a', + boolean: true, + integer: 1, + } + expect(xml(params)).to eq(<<-XML) - v1 - v2 + true + 1 + a - XML - end - - it 'serializes nested structures' do - rules['members'] = { - 'Name' => { 'type' => 'string' }, - 'Details' => { - 'type' => 'structure', - 'members' => { - 'Size' => { 'type' => 'string' }, - 'Color' => { 'type' => 'string' }, - } - }, - } - params = { - name: 'Name', - details: { - size: 'large', - color: 'red', - }, - } - expect(xml(params)).to eq(<<-XML) - - Name -
- large - red -
- - XML - end + XML + end - it 'serializes empty structures as empty nodes' do - rules['members'] = { - 'Name' => { 'type' => 'string' }, - 'Details' => { - 'type' => 'structure', - 'members' => { - 'Size' => { 'type' => 'string' } - } - }, - } - params = { name: 'Name', details: {} } - expect(xml(params)).to eq(<<-XML) + it 'supports locationName traits on structure members' do + shapes['StructureShape']['members']['NumberList']['locationName'] = 'Ints' + expect(xml(number_list:[1,2,3])).to eq(<<-XML) - Name -
+ + 1 + 2 + 3 + - XML - end - - it 'applies xml attribute members to the structure' do - rules['members'] = { - 'Config' => { - 'type' => 'structure', - 'members' => { - 'Encoding' => { - 'type' => 'string', - 'xmlAttribute' => true, - 'locationName' => 'encode', - }, - 'Description' => { 'type' => 'string' }, - } - } - } - params = { - config: { - encoding: 'base64', - description: 'optional' - } - } - expect(xml(params)).to eq(<<-XML) - - - optional - - - XML - end - + XML end - describe 'non-flattened lists' do - - it 'serializes lists members as "member" by default' do - rules['members'] = { - 'Values' => { - 'type' => 'list', - 'member' => { 'type' => 'string' } - } - } - expect(xml(values: %w(abc xyz))).to eq(<<-XML) + it 'supports locationName traits on list members' do + shapes['IntegerList']['member']['locationName'] = 'int' + expect(xml(number_list:[1,2,3])).to eq(<<-XML) - - abc - xyz - + + 1 + 2 + 3 + - XML - end + XML + end - it 'applies xmlnames to the list wrapper and member entries' do - rules['members'] = { - 'Values' => { - 'type' => 'list', - 'locationName' => 'ItemList', - 'member' => { 'type' => 'string', 'locationName' => 'Item' } - } + it 'supports locationName traits on map keys and values' do + shapes['StringMap']['key']['locationName'] = 'attrName' + shapes['StringMap']['value']['locationName'] = 'attrValue' + params = { + string_map: { + 'color' => 'red', + 'size' => 'large', } - expect(xml(values: %w(abc xyz))).to eq(<<-XML) + } + expect(xml(params)).to eq(<<-XML) - - abc - xyz - + + + color + red + + + size + large + + - XML - end + XML + end - it 'can serialize lists of complex types' do - rules['members'] = { - 'Values' => { - 'type' => 'list', - 'member' => { - 'type' => 'structure', - 'members' => { - 'Name' => { 'type' => 'string' } - } - } - } - } - expect(xml(values: [{ name: 'abc' }, { name: 'mno' }])).to eq(<<-XML) + it 'supports nested and complex structures' do + params = { + nested: { + nested: { + nested: { integer: 3 }, + integer: 2 + }, + integer: 1 + }, + nested_list: [ + { string: "v1" }, + { string: "v2" }, + { nested: { string: "v3" }} + ], + nested_map: { + "First" => { string: "v1" }, + "Second" => { nested: { string: "v2" }}, + }, + number_list: [1,2,3,4,5], + string_map: { + "Size" => "large", + "Color" => "red", + }, + blob: "data", + byte: "a", + boolean: true, + character: "b", + double: 123.456, + float: 654.321, + long: 321, + string: "Hello", + timestamp: Time.at(123456789), + } + expect(xml(params)).to eq(<<-XML) - + + + + 3 + + 2 + + 1 + + + + v1 + - abc + v2 - mno + + v3 + - + + + + First + + v1 + + + + Second + + + v2 + + + + + + 1 + 2 + 3 + 4 + 5 + + + + Size + large + + + Color + red + + + ZGF0YQ== + a + true + b + 123.456 + 654.321 + 321 + Hello + #{Time.at(123456789).utc.iso8601} - XML - end - + XML end - describe 'flattened lists' do - - it 'serializes lists without a wrapping element' do - rules['members'] = { - 'Values' => { - 'type' => 'list', - 'member' => { 'type' => 'string' }, - 'flattened' => true - } - } - expect(xml(values: %w(abc mno xyz))).to eq(<<-XML) + it 'supports flat lists' do + shapes['IntegerList']['flattened'] = true + expect(xml(string:'abc', number_list:[1,2,3])).to eq(<<-XML) - abc - mno - xyz + 1 + 2 + 3 + abc - XML - end - - it 'applies xmlnames to the list elements' do - rules['members'] = { - 'Values' => { - 'type' => 'list', - 'locationName' => 'item', - 'member' => { 'type' => 'string' }, - 'flattened' => true - } - } - expect(xml(values: %w(abc mno xyz))).to eq(<<-XML) - - abc - mno - xyz - - XML - end - - it 'can serialize a list of complex types' do - rules['members'] = { - 'Values' => { - 'type' => 'list', - 'locationName' => 'item', - 'member' => { - 'type' => 'structure', - 'members' => { - 'Name' => { 'type' => 'string' } - } - }, - 'flattened' => true - } - } - expect(xml(values: [{ name: 'abc' }, { name: 'mno' }])).to eq(<<-XML) - - - abc - - - mno - - - XML - end - + XML end - describe 'scalars' do - - it 'serializes integers to string' do - rules['members']['Count'] = { 'type' => 'integer' } - expect(xml(count: 123)).to eq(<<-XML) - - 123 - - XML - end - - it 'serializes floats to string' do - value = double('value', :to_s => '123.123') - rules['members']['Price'] = { 'type' => 'float' } - expect(xml(price: value)).to eq(<<-XML) - - #{value.to_s} - - XML - end - - it 'serializes booleans as `true` and `false`' do - rules['members'] = { - 'Abc' => { 'type' => 'boolean' }, - 'Xyz' => { 'type' => 'boolean' } - } - expect(xml(abc: true, xyz: false)).to eq(<<-XML) - - true - false - - XML - end - - it 'serialzies blobs as base64 encoded strings' do - rules['members'] = { - 'Data' => { 'type' => 'blob' } - } - expect(xml(data: StringIO.new('hello'))).to eq(<<-XML) + it 'supports flat list with locationName traits' do + shapes['IntegerList']['flattened'] = true + shapes['IntegerList']['member']['locationName'] = 'Number' + expect(xml(string:'abc', number_list:[1,2,3])).to eq(<<-XML) - aGVsbG8= + 1 + 2 + 3 + abc - XML - end - - it 'serializes is8601 timestamp' do - now = Time.now - rules['members'] = { - 'When' => { - 'type' => 'timestamp', - 'timestampFormat' => 'iso8601' - } - } - expect(xml(when: now)).to eq(<<-XML) - - #{now.utc.iso8601} - - XML - end + XML + end - it 'can serialize a timestamp as an rfc822 string' do - now = Time.now - rules['members'] = { - 'When' => { - 'type' => 'timestamp', - 'timestampFormat' => 'rfc822' - } - } - expect(xml(when: now)).to eq(<<-XML) + it 'does not serialize nil values' do + expect(xml(string:'abc', integer:nil)).to eq(<<-XML) - #{now.utc.rfc822} + abc - XML - end + XML + end - it 'raises an error when the timestamp format is unknown' do - now = Time.now - rules['members'] = { - 'When' => { - 'type' => 'timestamp', - 'timestampFormat' => 'abc' - } + it 'applies xml attribute members to the structure' do + shapes['StructureShape']['members']['String']['xmlAttribute'] = true + shapes['StructureShape']['members']['String']['locationName'] = 'encode' + params = { + nested: { + string: 'base64', + integer: 123 } - expect { xml(when:now) }.to raise_error(/invalid timestamp/) - end - - it 'can serialize a timestamp as an unixtimestamp string' do - now = Time.now - rules['members'] = { - 'When' => { - 'type' => 'timestamp', - 'timestampFormat' => 'unixTimestamp' - } - } - expect(xml(when: now)).to eq(<<-XML) + } + expect(xml(params)).to eq(<<-XML) - #{now.utc.to_i} + + 123 + - XML - end - + XML end describe 'namespaces' do it 'applies xml namespace to the root node' do - rules['locationName'] = 'FooRequest' - rules['xmlNamespace'] = { 'uri' => 'http://foo.com' } - rules['members'] = { - 'Item' => { 'type' => 'string' } - } - expect(xml(item:'value')).to eq(<<-XML) - - value - + ref['locationName'] = 'Xml' + ref['xmlNamespace'] = { 'uri' => 'http://foo.com' } + expect(xml(string:'abc')).to eq(<<-XML) + + abc + XML end @@ -372,39 +255,21 @@ def xml(params) 'prefix' => 'xsi', 'uri' => 'http://xmlns.com/uri' }} - rules['members'] = { - 'Scalar' => { - 'type' => 'string', - }.merge(ns), - 'Struct' => { - 'type' => 'structure', - 'members' => { - 'List' => { - 'type' => 'list', - 'member' => { 'type' => 'string', 'locationName' => 'Item' } - }.merge(ns), - } - }.merge(ns) - } + shapes['StringShape'].update(ns) + shapes['StructureShape']['members']['Nested'].update(ns) params = { - scalar: 'value', - struct: { - list: %w(a b), + nested: { + string: 'abc' } } expect(xml(params)).to eq(<<-XML) - value - - - a - b - - + + abc + XML end - end end end From e9e646f22433025b0029421e7f282043e4ed1aa7 Mon Sep 17 00:00:00 2001 From: Trevor Rowe Date: Tue, 5 May 2015 11:35:48 -0700 Subject: [PATCH 008/101] Removed flattened traits from seahorse shapes. No longer keeping protocol specific traits on shapes. These now live in the new metadata for shapes and shape refs. --- aws-sdk-core/lib/aws-sdk-core/api/shape_map.rb | 4 ++-- aws-sdk-core/lib/aws-sdk-core/xml/builder.rb | 6 +----- aws-sdk-core/lib/aws-sdk-core/xml/parser/frame.rb | 6 +++--- 3 files changed, 6 insertions(+), 10 deletions(-) diff --git a/aws-sdk-core/lib/aws-sdk-core/api/shape_map.rb b/aws-sdk-core/lib/aws-sdk-core/api/shape_map.rb index ed75268dd60..c0c5ba04502 100644 --- a/aws-sdk-core/lib/aws-sdk-core/api/shape_map.rb +++ b/aws-sdk-core/lib/aws-sdk-core/api/shape_map.rb @@ -20,9 +20,9 @@ class ShapeMap 'timestamp' => TimestampShape, } - SHAPE_ATTRS = Set.new(%w(min max documentation flattened)) + SHAPE_ATTRS = Set.new(%w(min max documentation)) - SHAPE_METADATA = Set.new(%w(xmlNamespace)) + SHAPE_METADATA = Set.new(%w(xmlNamespace flattened)) # @param [ShapeMap] shapes def initialize(definitions) diff --git a/aws-sdk-core/lib/aws-sdk-core/xml/builder.rb b/aws-sdk-core/lib/aws-sdk-core/xml/builder.rb index 8bef7487566..38baf83041c 100644 --- a/aws-sdk-core/lib/aws-sdk-core/xml/builder.rb +++ b/aws-sdk-core/lib/aws-sdk-core/xml/builder.rb @@ -44,7 +44,7 @@ def structure_attrs(ref, values) end def list(name, ref, values) - if flat?(ref) + if ref['flattened'] values.each do |value| member(ref.shape.member.location_name || name, ref.shape.member, value) end @@ -125,10 +125,6 @@ def xml_attribute?(ref) !!ref['xmlAttribute'] end - def flat?(ref) - ref.shape.flattened - end - end end end diff --git a/aws-sdk-core/lib/aws-sdk-core/xml/parser/frame.rb b/aws-sdk-core/lib/aws-sdk-core/xml/parser/frame.rb index 5dfd7b74fe1..84a34d08ab5 100644 --- a/aws-sdk-core/lib/aws-sdk-core/xml/parser/frame.rb +++ b/aws-sdk-core/lib/aws-sdk-core/xml/parser/frame.rb @@ -24,9 +24,9 @@ def new(parent, ref, result = nil) def frame_class(shape) klass = FRAME_CLASSES[shape.class] - if ListFrame == klass && shape.flattened + if ListFrame == klass && shape['flattened'] FlatListFrame - elsif MapFrame == klass && shape.flattened + elsif MapFrame == klass && shape['flattened'] MapEntryFrame else klass @@ -113,7 +113,7 @@ def xml_name(ref) end def flattened_list?(shape) - ListShape === shape && shape.flattened + ListShape === shape && shape['flattened'] end end From 2114d6faab25f762c3caf5a2d65aec14084856d2 Mon Sep 17 00:00:00 2001 From: Trevor Rowe Date: Tue, 5 May 2015 12:35:43 -0700 Subject: [PATCH 009/101] Updated query param builder to use new seahorse shapes. --- .../lib/aws-sdk-core/query/param_builder.rb | 96 ++-- .../spec/aws/query/param_builder_spec.rb | 509 ++++++------------ 2 files changed, 208 insertions(+), 397 deletions(-) diff --git a/aws-sdk-core/lib/aws-sdk-core/query/param_builder.rb b/aws-sdk-core/lib/aws-sdk-core/query/param_builder.rb index 88f4b1a4241..548cafb4738 100644 --- a/aws-sdk-core/lib/aws-sdk-core/query/param_builder.rb +++ b/aws-sdk-core/lib/aws-sdk-core/query/param_builder.rb @@ -4,100 +4,92 @@ module Aws module Query class ParamBuilder - # @param [ParamList] param_list + include Seahorse::Model::Shapes + def initialize(param_list) @params = param_list end - # @return [ParamList] attr_reader :params - # Serializes the `params` hash onto {#param_list} following the rules - # provided by `shape`. - # rules provided by `shape`. - # @param [Seahorse::Model::Shapes::Structure] shape - # @param [Hash] params - # @return [void] - def apply(shape, params) - structure(shape, params, '') + def apply(ref, params) + structure(ref, params, '') end private - # @param [Seahorse::Model::Shapes::Structure] structure - # @param [Hash] values - # @param [String, nil] prefix - def structure(structure, values, prefix) + def structure(ref, values, prefix) + shape = ref.shape values.each do |name, value| - unless value.nil? - member_shape = structure.member(name) - format(member_shape, value, prefix + query_name(member_shape)) - end + next if value.nil? + member_ref = shape.member(name) + format(member_ref, value, prefix + query_name(member_ref)) end end - # @param [Seahorse::Model::Shapes::List] list - # @param [Array] values - # @param [String] prefix - def list(list, values, prefix) + def list(ref, values, prefix) + member_ref = ref.shape.member if values.empty? set(prefix, '') return end - if flat?(list) - if name = query_name(list.member) + if flat?(ref) + if name = query_name(member_ref) parts = prefix.split('.') parts.pop parts.push(name) prefix = parts.join('.') end else - prefix += '.member' + prefix += '.' + (member_ref.location_name || 'member') end values.each.with_index do |value, n| - format(list.member, value, "#{prefix}.#{n+1}") + format(member_ref, value, "#{prefix}.#{n+1}") end end - # @param [Seahorse::Model::Shapes::Map] map - # @param [Hash] values - # @param [String] prefix - def map(map, values, prefix) - prefix += '.entry' unless flat?(map) - key_name = "%s.%d.#{query_name(map.key, 'key')}" - value_name = "%s.%d.#{query_name(map.value, 'value')}" + def map(ref, values, prefix) + key_ref = ref.shape.key + value_ref = ref.shape.value + prefix += '.entry' unless flat?(ref) + key_name = "%s.%d.#{query_name(key_ref, 'key')}" + value_name = "%s.%d.#{query_name(value_ref, 'value')}" values.each.with_index do |(key, value), n| - format(map.key, key, key_name % [prefix, n + 1]) - format(map.value, value, value_name % [prefix, n + 1]) + format(key_ref, key, key_name % [prefix, n + 1]) + format(value_ref, value, value_name % [prefix, n + 1]) end end - # @param [Seahorse::Model::Shapes::Shape] shape - # @param [Object] value - # @param [String] prefix - def format(shape, value, prefix) - case shape.type - when 'structure' then structure(shape, value, prefix + '.') - when 'list' then list(shape, value, prefix) - when 'map' then map(shape, value, prefix) - when 'blob' then set(prefix, Base64.strict_encode64(value.read)) - when 'timestamp' - set(prefix, shape.format_time(value, 'iso8601').to_s) - else - set(prefix, value.to_s) + def format(ref, value, prefix) + case ref.shape + when StructureShape then structure(ref, value, prefix + '.') + when ListShape then list(ref, value, prefix) + when MapShape then map(ref, value, prefix) + when BlobShape then set(prefix, blob(value)) + when TimestampShape then set(prefix, timestamp(value)) + else set(prefix, value.to_s) end end - def query_name(shape, default = nil) - shape.location_name || default + def query_name(ref, default = nil) + ref.location_name || default end def set(name, value) params.set(name, value) end - def flat?(shape) - !!shape.metadata('flattened') + def flat?(ref) + ref['flattened'] + end + + def timestamp(value) + value.utc.iso8601 + end + + def blob(value) + value = value.read unless String === value + Base64.strict_encode64(value) end end diff --git a/aws-sdk-core/spec/aws/query/param_builder_spec.rb b/aws-sdk-core/spec/aws/query/param_builder_spec.rb index 7744f2ebec8..391e1be8179 100644 --- a/aws-sdk-core/spec/aws/query/param_builder_spec.rb +++ b/aws-sdk-core/spec/aws/query/param_builder_spec.rb @@ -4,368 +4,187 @@ module Aws module Query describe ParamBuilder do - let(:members) { {} } + let(:shapes) { ApiHelper.sample_shapes } - def query_params(params = {}) - shape = Seahorse::Model::Shapes::Structure.new('members' => members) + def query(params = {}) + shape_map = Api::ShapeMap.new(shapes) + rules = shape_map.shape_ref('shape' => 'StructureShape') param_list = ParamList.new - ParamBuilder.new(param_list).apply(shape, params) + ParamBuilder.new(param_list).apply(rules, params) param_list.map { |param| [param.name, param.value ] }.sort end - describe '#apply' do - describe 'structures' do - - it 'returns an empty list when there are no members' do - expect(query_params({})).to be_empty - end - - it 'returns an empty list when there are no params' do - members['Name'] = { 'type' => 'string' } - expect(query_params({})).to be_empty - end - - it 'serializes params by name' do - members['Name'] = { 'type' => 'string' } - members['Age'] = { 'type' => 'integer' } - expect(query_params(name: 'John', age: 40)).to eq([ - ['Age', '40'], - ['Name', 'John'], - ]) - end - - it 'observes location name properties' do - members['Name'] = { 'type' => 'string', 'locationName' => 'NAME' } - members['Age'] = { 'type' => 'integer', 'locationName' => 'AGE' } - expect(query_params(name: 'John', age: 40)).to eq([ - ['AGE', '40'], - ['NAME', 'John'], - ]) - end - - it 'serializes nested params' do - members['Name'] = { 'type' => 'string' } - members['Config'] = { - 'type' => 'structure', - 'members' => { - 'Enabled' => { 'type' => 'boolean' } - } - } - params = { name: 'John', config: { enabled: true } } - expect(query_params(params)).to eq([ - ['Config.Enabled', 'true'], - ['Name', 'John'], - ]) - end - - it 'does not serialize nil values' do - members['Name'] = { 'type' => 'string' } - members['Nickname'] = { 'type' => 'string' } - params = { name: 'John', nickname: nil } - expect(query_params(params)).to eq([ - ['Name', 'John'], - ]) - end - - end - - describe 'flattened lists' do - - it 'numbers list members starting at 1' do - members['Values'] = { - 'type' => 'list', - 'member' => { 'type' => 'string' }, - 'flattened' => true - } - expect(query_params(values: %w(abc mno xyz))).to eq([ - ['Values.1', 'abc'], - ['Values.2', 'mno'], - ['Values.3', 'xyz'], - ]) - end - - it 'uses the list member serialized name as the param name' do - members['Config'] = { - 'type' => 'structure', - 'members' => { - 'Values' => { - 'type' => 'list', - 'member' => { - 'type' => 'string', - 'locationName' => 'Item' - }, - 'flattened' => true - } - } - } - params = { config: { values: %w(abc mno xyz) } } - expect(query_params(params)).to eq([ - ['Config.Item.1', 'abc'], - ['Config.Item.2', 'mno'], - ['Config.Item.3', 'xyz'], - ]) - end - - it 'supports lists of complex types' do - members['People'] = { - 'type' => 'list', - 'member' => { - 'type' => 'structure', - 'members' => { - 'Name' => { 'type' => 'string' } - } - }, - 'flattened' => true - } - params = { people: [ { name: 'John' }, { name: 'Jane' } ] } - expect(query_params(params)).to eq([ - ['People.1.Name', 'John'], - ['People.2.Name', 'Jane'], - ]) - end - - it 'serializes empty lists' do - members['Config'] = { - 'type' => 'structure', - 'members' => { - 'Items' => { - 'type' => 'list', - 'member' => { - 'type' => 'string' - }, - 'flattened' => true, - 'locationName' => 'items' - } - }, - 'locationName' => 'config' - } - params = { config: { items: [] }} - expect(query_params(params)).to eq([ - ['config.items', ''], - ]) - end - - end - - describe 'non-flattened lists' do - - it 'numbers list members starting at 1' do - members['Values'] = { - 'type' => 'list', - 'member' => { 'type' => 'string' } - } - expect(query_params(values: %w(abc mno xyz))).to eq([ - ['Values.member.1', 'abc'], - ['Values.member.2', 'mno'], - ['Values.member.3', 'xyz'], - ]) - end - - it 'ignores the list member name' do - members['Config'] = { - 'type' => 'structure', - 'members' => { - 'Values' => { - 'type' => 'list', - 'member' => { - 'type' => 'string', - 'locationName' => 'Item' # has no effect - } - } - } - } - params = { config: { values: %w(abc mno xyz) } } - expect(query_params(params)).to eq([ - ['Config.Values.member.1', 'abc'], - ['Config.Values.member.2', 'mno'], - ['Config.Values.member.3', 'xyz'], - ]) - end - - it 'supports lists of complex types' do - members['People'] = { - 'type' => 'list', - 'member' => { - 'type' => 'structure', - 'members' => { - 'Name' => { 'type' => 'string' } - } - } - } - params = { people: [ { name: 'John' }, { name: 'Jane' } ] } - expect(query_params(params)).to eq([ - ['People.member.1.Name', 'John'], - ['People.member.2.Name', 'Jane'], - ]) - end - - it 'serializes empty lists' do - members['Config'] = { - 'type' => 'structure', - 'members' => { - 'Items' => { - 'type' => 'list', - 'member' => { - 'type' => 'string' - } - } - } - } - params = { config: { items: [] }} - expect(query_params(params)).to eq([ - ['Config.Items', ''], - ]) - end - - end - - describe 'flattened maps' do - - it 'serializes hashes with keys and values' do - members['Attributes'] = { - 'type' => 'map', - 'key' => { 'type' => 'string' }, - 'value' => { 'type' => 'string' }, - 'flattened' => true - } - params = { attributes: { 'Size' => 'large', 'Color' => 'red' } } - expect(query_params(params)).to eq([ - ['Attributes.1.key', 'Size'], - ['Attributes.1.value', 'large'], - ['Attributes.2.key', 'Color'], - ['Attributes.2.value', 'red'], - ]) - end - - it 'observes location name traits' do - members['Attributes'] = { - 'type' => 'map', - 'key' => { 'type' => 'string', 'locationName' => 'K' }, - 'value' => { 'type' => 'string', 'locationName' => 'V' }, - 'flattened' => true - } - params = { attributes: { 'Size' => 'large', 'Color' => 'red' } } - expect(query_params(params)).to eq([ - ['Attributes.1.K', 'Size'], - ['Attributes.1.V', 'large'], - ['Attributes.2.K', 'Color'], - ['Attributes.2.V', 'red'], - ]) - end - - end - - describe 'non-flattened maps' do - - it 'serializes hashes with keys and values' do - members['Attributes'] = { - 'type' => 'map', - 'key' => { 'type' => 'string' }, - 'value' => { 'type' => 'string' } - } - params = { attributes: { 'Size' => 'large', 'Color' => 'red' } } - expect(query_params(params)).to eq([ - ['Attributes.entry.1.key', 'Size'], - ['Attributes.entry.1.value', 'large'], - ['Attributes.entry.2.key', 'Color'], - ['Attributes.entry.2.value', 'red'], - ]) - end - - it 'observes location name traits' do - members['Attributes'] = { - 'type' => 'map', - 'key' => { 'type' => 'string', 'locationName' => 'K' }, - 'value' => { 'type' => 'string', 'locationName' => 'V' } - } - params = { attributes: { 'Size' => 'large', 'Color' => 'red' } } - expect(query_params(params)).to eq([ - ['Attributes.entry.1.K', 'Size'], - ['Attributes.entry.1.V', 'large'], - ['Attributes.entry.2.K', 'Color'], - ['Attributes.entry.2.V', 'red'], - ]) - end - - end - - describe 'scalars' do - - it 'serializes integers' do - members['count'] = { 'type' => 'integer' } - expect(query_params(count: 123)).to eq([ - ['count', '123'], - ]) - end + it 'returns an empty list when there are no params' do + expect(query({})).to eq([]) + end - it 'serializes floats' do - members['price'] = { 'type' => 'float' } - expect(query_params(price: 12.34)).to eq([ - ['price', '12.34'], - ]) - end + it 'does not serialize nil values' do + params = { + string: 'abc', + integer: nil, + } + expect(query(params)).to eq([ + ['String', 'abc'], + ]) + end - it 'serializes booleans' do - members['hot'] = { 'type' => 'boolean' } - members['cold'] = { 'type' => 'boolean' } - expect(query_params(hot:true, cold:false)).to eq([ - ['cold', 'false'], - ['hot', 'true'], - ]) - end + it 'supports locationName on structure members' do + shapes['StructureShape']['members']['String']['locationName'] = 'Value' + expect(query(string: 'abc')).to eq([ + ['Value', 'abc'], + ]) + end - it 'serializes is8601 timestamps' do - now = Time.now - members['when'] = { - 'type' => 'timestamp', - 'timestampFormat' => 'iso8601' - } - expect(query_params(when:now)).to eq([ - ['when', now.utc.iso8601] - ]) - end + it 'supports locationName traits on list members' do + shapes['IntegerList']['member']['locationName'] = 'Int' + expect(query(number_list: [3,2,1])).to eq([ + ['NumberList.Int.1', '3'], + ['NumberList.Int.2', '2'], + ['NumberList.Int.3', '1'], + ]) + end - it 'can serializes timestamps as rfc8622 strings' do - now = Time.now - members['when'] = { - 'type' => 'timestamp', - 'timestampFormat' => 'rfc822' - } - expect(query_params(when:now)).to eq([ - ['when', now.utc.rfc822] - ]) - end + it 'supports locationName traits on map keys and values' do + shapes['StringMap']['key']['locationName'] = 'AttrName' + shapes['StringMap']['value']['locationName'] = 'AttrValue' + params = { + string_map: { + 'color' => 'red', + 'size' => 'large', + } + } + expect(query(params)).to eq([ + ['StringMap.entry.1.AttrName', 'color'], + ['StringMap.entry.1.AttrValue', 'red'], + ['StringMap.entry.2.AttrName', 'size'], + ['StringMap.entry.2.AttrValue', 'large'], + ]) + end - it 'can serializes timestamps as unix timestamps' do - now = Time.now - members['when'] = { - 'type' => 'timestamp', - 'timestampFormat' => 'unixTimestamp', - } - expect(query_params(when:now)).to eq([ - ['when', now.to_i.to_s] - ]) - end + it 'supports nested and complex structures' do + params = { + nested: { + nested: { + nested: { integer: 3 }, + integer: 2 + }, + integer: 1 + }, + nested_list: [ + { string: "v1" }, + { string: "v2" }, + { nested: { string: "v3" }} + ], + nested_map: { + "First" => { string: "v1" }, + "Second" => { nested: { string: "v2" }}, + }, + number_list: [1,2,3,4,5], + string_map: { + "Size" => "large", + "Color" => "red", + }, + blob: "data", + byte: "a", + boolean: true, + character: "b", + double: 123.456, + float: 654.321, + long: 321, + string: "Hello", + timestamp: Time.at(123456789), + } + expect(query(params)).to eq([ + ['Blob', 'ZGF0YQ=='], + ['Boolean', 'true'], + ['Byte', 'a'], + ['Character', 'b'], + ['Double', '123.456'], + ['Float', '654.321'], + ['Long', '321'], + ['Nested.Integer', '1'], + ['Nested.Nested.Integer', '2'], + ['Nested.Nested.Nested.Integer', '3'], + ['NestedList.member.1.String', 'v1'], + ['NestedList.member.2.String', 'v2'], + ['NestedList.member.3.Nested.String', 'v3'], + ['NestedMap.entry.1.key', 'First'], + ['NestedMap.entry.1.value.String', 'v1'], + ['NestedMap.entry.2.key', 'Second'], + ['NestedMap.entry.2.value.Nested.String', 'v2'], + ['NumberList.member.1', '1'], + ['NumberList.member.2', '2'], + ['NumberList.member.3', '3'], + ['NumberList.member.4', '4'], + ['NumberList.member.5', '5'], + ['String', 'Hello'], + ['StringMap.entry.1.key', 'Size'], + ['StringMap.entry.1.value', 'large'], + ['StringMap.entry.2.key', 'Color'], + ['StringMap.entry.2.value', 'red'], + ['Timestamp', '1973-11-29T21:33:09Z'] + ]) + end - it 'serializes blobs as base64 strings' do - members['data'] = { 'type' => 'blob' } - expect(query_params(data:StringIO.new('hello'))).to eq([ - ['data', 'aGVsbG8='] - ]) - end + it 'supports empty lists' do + expect(query(number_list:[])).to eq([ + ['NumberList', ''] + ]) + end - end + it 'supports flattened lists' do + shapes['IntegerList']['flattened'] = true + expect(query(number_list: [3,2,1])).to eq([ + ['NumberList.1', '3'], + ['NumberList.2', '2'], + ['NumberList.3', '1'], + ]) end - describe '#params' do + it 'supports flattened lists with locationName traits' do + shapes['IntegerList']['flattened'] = true + shapes['IntegerList']['member']['locationName'] = 'Number' + expect(query(number_list: [3,2,1])).to eq([ + ['Number.1', '3'], + ['Number.2', '2'], + ['Number.3', '1'], + ]) + end - it 'returns the param list given the constructor' do - param_list = double('param-list') - builder = ParamBuilder.new(param_list) - expect(builder.params).to be(param_list) - end + it 'supports flattened maps' do + shapes['StringMap']['flattened'] = true + params = { + string_map: { + 'color' => 'red', + 'size' => 'large', + } + } + expect(query(params)).to eq([ + ['StringMap.1.key', 'color'], + ['StringMap.1.value', 'red'], + ['StringMap.2.key', 'size'], + ['StringMap.2.value', 'large'], + ]) + end + it 'supports flattened maps with locationName traits' do + shapes['StringMap']['flattened'] = true + shapes['StringMap']['key']['locationName'] = 'AttrName' + shapes['StringMap']['value']['locationName'] = 'AttrValue' + params = { + string_map: { + 'color' => 'red', + 'size' => 'large', + } + } + expect(query(params)).to eq([ + ['StringMap.1.AttrName', 'color'], + ['StringMap.1.AttrValue', 'red'], + ['StringMap.2.AttrName', 'size'], + ['StringMap.2.AttrValue', 'large'], + ]) end + end end end From dad73d742aa8daa8c0a47896f0722e4f5f823e0c Mon Sep 17 00:00:00 2001 From: Trevor Rowe Date: Tue, 5 May 2015 23:24:43 -0700 Subject: [PATCH 010/101] Moved the ParamConverter and ParamValidator from Seahorse in Aws. --- aws-sdk-core/lib/aws-sdk-core.rb | 4 + aws-sdk-core/lib/aws-sdk-core/client.rb | 4 +- .../lib/aws-sdk-core/param_converter.rb | 207 +++++++++++ .../lib/aws-sdk-core/param_validator.rb | 140 ++++++++ .../aws-sdk-core/plugins/param_converter.rb | 27 ++ .../aws-sdk-core/plugins/param_validator.rb | 28 ++ aws-sdk-core/lib/seahorse.rb | 4 - aws-sdk-core/lib/seahorse/client/base.rb | 2 - .../lib/seahorse/client/param_converter.rb | 207 ----------- .../lib/seahorse/client/param_validator.rb | 139 -------- .../client/plugins/param_conversion.rb | 29 -- .../client/plugins/param_validation.rb | 30 -- aws-sdk-core/spec/aws/param_converter_spec.rb | 319 +++++++++++++++++ aws-sdk-core/spec/aws/param_validator_spec.rb | 273 +++++++++++++++ .../seahorse/client/param_converter_spec.rb | 321 ------------------ .../seahorse/client/param_validator_spec.rb | 275 --------------- 16 files changed, 1001 insertions(+), 1008 deletions(-) create mode 100644 aws-sdk-core/lib/aws-sdk-core/param_converter.rb create mode 100644 aws-sdk-core/lib/aws-sdk-core/param_validator.rb create mode 100644 aws-sdk-core/lib/aws-sdk-core/plugins/param_converter.rb create mode 100644 aws-sdk-core/lib/aws-sdk-core/plugins/param_validator.rb delete mode 100644 aws-sdk-core/lib/seahorse/client/param_converter.rb delete mode 100644 aws-sdk-core/lib/seahorse/client/param_validator.rb delete mode 100644 aws-sdk-core/lib/seahorse/client/plugins/param_conversion.rb delete mode 100644 aws-sdk-core/lib/seahorse/client/plugins/param_validation.rb create mode 100644 aws-sdk-core/spec/aws/param_converter_spec.rb create mode 100644 aws-sdk-core/spec/aws/param_validator_spec.rb delete mode 100644 aws-sdk-core/spec/seahorse/client/param_converter_spec.rb delete mode 100644 aws-sdk-core/spec/seahorse/client/param_validator_spec.rb diff --git a/aws-sdk-core/lib/aws-sdk-core.rb b/aws-sdk-core/lib/aws-sdk-core.rb index 136c2fca1e5..557458f0c28 100644 --- a/aws-sdk-core/lib/aws-sdk-core.rb +++ b/aws-sdk-core/lib/aws-sdk-core.rb @@ -87,6 +87,8 @@ module Aws autoload :Errors, 'aws-sdk-core/errors' autoload :InstanceProfileCredentials, 'aws-sdk-core/instance_profile_credentials' autoload :PageableResponse, 'aws-sdk-core/pageable_response' + autoload :ParamConverter, 'aws-sdk-core/param_converter' + autoload :ParamValidator, 'aws-sdk-core/param_validator' autoload :RestBodyHandler, 'aws-sdk-core/rest_body_handler' autoload :RefreshingCredentials, 'aws-sdk-core/refreshing_credentials' autoload :Service, 'aws-sdk-core/service' @@ -138,6 +140,8 @@ module Plugins autoload :GlacierChecksums, 'aws-sdk-core/plugins/glacier_checksums' autoload :GlobalConfiguration, 'aws-sdk-core/plugins/global_configuration' 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' autoload :RegionalEndpoint, 'aws-sdk-core/plugins/regional_endpoint' autoload :ResponsePaging, 'aws-sdk-core/plugins/response_paging' autoload :RequestSigner, 'aws-sdk-core/plugins/request_signer' diff --git a/aws-sdk-core/lib/aws-sdk-core/client.rb b/aws-sdk-core/lib/aws-sdk-core/client.rb index e258ab15025..1e149b68393 100644 --- a/aws-sdk-core/lib/aws-sdk-core/client.rb +++ b/aws-sdk-core/lib/aws-sdk-core/client.rb @@ -7,6 +7,8 @@ class Client < Seahorse::Client::Base 'Seahorse::Client::Plugins::Logging', 'Seahorse::Client::Plugins::RestfulBindings', 'Seahorse::Client::Plugins::ContentLength', + 'Aws::Plugins::ParamConverter', + 'Aws::Plugins::ParamValidator', 'Aws::Plugins::UserAgent', 'Aws::Plugins::RetryErrors', 'Aws::Plugins::GlobalConfiguration', @@ -28,7 +30,7 @@ class << self def define(svc_name, options) client_class = Class.new(self) client_class.identifier = svc_name.downcase.to_sym - client_class.set_api(Api.build(options[:api])) + client_class.set_api(Api::Builder.build(options[:api])) client_class.set_paginators(options[:paginators]) client_class.set_waiters(options[:waiters]) DEFAULT_PLUGINS.each do |plugin| diff --git a/aws-sdk-core/lib/aws-sdk-core/param_converter.rb b/aws-sdk-core/lib/aws-sdk-core/param_converter.rb new file mode 100644 index 00000000000..76ec0178fac --- /dev/null +++ b/aws-sdk-core/lib/aws-sdk-core/param_converter.rb @@ -0,0 +1,207 @@ +require 'stringio' +require 'date' +require 'time' +require 'tempfile' +require 'thread' + +module Aws + # @api private + class ParamConverter + + include Seahorse::Model::Shapes + + @mutex = Mutex.new + @converters = Hash.new { |h,k| h[k] = {} } + + def initialize(shape) + @shape = shape + end + + # @param [Hash] params + # @return [Hash] + def convert(params) + structure(@shape, params) + end + + private + + def structure(structure, values) + values = c(structure, values) + if values.is_a?(Hash) + values.each do |k, v| + unless v.nil? + if structure.member?(k) + values[k] = member(structure.member(k), v) + end + end + end + end + values + end + + def list(list, values) + values = c(list, values) + if values.is_a?(Array) + values.map { |v| member(list.member, v) } + else + values + end + end + + def map(map, values) + values = c(map, values) + if values.is_a?(Hash) + values.each.with_object({}) do |(key, value), hash| + hash[member(map.key, key)] = member(map.value, value) + end + else + values + end + end + + def member(shape, value) + case shape + when StructureShape then structure(shape, value) + when ListShape then list(shape, value) + when MapShape then map(shape, value) + else c(shape, value) + end + end + + def c(shape, value) + self.class.c(shape.class, value) + end + + class << self + + # @param [Model::Shapes::InputShape] shape + # @param [Hash] params + # @return [Hash] + def convert(shape, params) + new(shape).convert(params) + end + + # Registers a new value converter. Converters run in the context + # of a shape and value class. + # + # # add a converter that stringifies integers + # shape_class = Seahorse::Model::Shapes::StringShape + # ParamConverter.add(shape_class, Integer) { |i| i.to_s } + # + # @param [Class] shape_class + # @param [Class] value_class + # @param [#call] converter (nil) An object that responds to `#call` + # accepting a single argument. This function should perform + # the value conversion if possible, returning the result. + # If the conversion is not possible, the original value should + # be returned. + # @return [void] + def add(shape_class, value_class, converter = nil, &block) + @converters[shape_class][value_class] = converter || block + end + + # @api private + def c(shape, value) + if converter = converter_for(shape, value) + converter.call(value) + else + value + end + end + + private + + def converter_for(shape_class, value) + unless @converters[shape_class].key?(value.class) + @mutex.synchronize { + unless @converters[shape_class].key?(value.class) + @converters[shape_class][value.class] = find(shape_class, value) + end + } + end + @converters[shape_class][value.class] + end + + def find(shape_class, value) + converter = nil + each_base_class(shape_class) do |klass| + @converters[klass].each do |value_class, block| + if value_class === value + converter = block + break + end + end + break if converter + end + converter + end + + def each_base_class(shape_class, &block) + shape_class.ancestors.each do |ancestor| + yield(ancestor) if @converters.key?(ancestor) + end + end + + end + + add(StructureShape, Hash) { |h| h.dup } + add(StructureShape, Struct) do |s| + s.members.each.with_object({}) {|k,h| h[k] = s[k] } + end + + add(MapShape, Hash) { |h| h.dup } + add(MapShape, Struct) do |s| + s.members.each.with_object({}) {|k,h| h[k] = s[k] } + end + + add(ListShape, Array) { |a| a.dup } + add(ListShape, Enumerable) { |value| value.to_a } + + add(StringShape, String) + add(StringShape, Symbol) { |sym| sym.to_s } + + add(IntegerShape, Integer) + add(IntegerShape, Float) { |f| f.to_i } + add(IntegerShape, String) do |str| + begin + Integer(str) + rescue ArgumentError + str + end + end + + add(FloatShape, Float) + add(FloatShape, Integer) { |i| i.to_f } + add(FloatShape, String) do |str| + begin + Float(str) + rescue ArgumentError + str + end + end + + add(TimestampShape, Time) + add(TimestampShape, Date) { |d| d.to_time } + add(TimestampShape, DateTime) { |dt| dt.to_time } + add(TimestampShape, Integer) { |i| Time.at(i) } + add(TimestampShape, String) do |str| + begin + Time.parse(str) + rescue ArgumentError + str + end + end + + add(BooleanShape, TrueClass) + add(BooleanShape, FalseClass) + add(BooleanShape, String) do |str| + { 'true' => true, 'false' => false }[str] + end + + add(BlobShape, IO) + add(BlobShape, Tempfile) + add(BlobShape, StringIO) + add(BlobShape, String) { |str| StringIO.new(str) } + + end +end diff --git a/aws-sdk-core/lib/aws-sdk-core/param_validator.rb b/aws-sdk-core/lib/aws-sdk-core/param_validator.rb new file mode 100644 index 00000000000..1697195573d --- /dev/null +++ b/aws-sdk-core/lib/aws-sdk-core/param_validator.rb @@ -0,0 +1,140 @@ +module Aws + # @api private + class ParamValidator + + include Seahorse::Model::Shapes + + # @param [Model::Shapes::Shape] shape + # @param [Hash] params + # @return [void] + def self.validate!(shape, params) + new(shape).validate!(params) + end + + # @param [Model::Shapes::Shape] shape + # @option options [Boolean] :validate_required (true) + def initialize(shape, options = {}) + @shape = shape || StructureShape.new + @validate_required = options[:validate_required] != false + end + + # @param [Hash] params + # @return [void] + def validate!(params) + errors = [] + shape(@shape, params, errors, context = 'params') + raise ArgumentError, error_messages(errors) unless errors.empty? + end + + private + + def structure(structure, values, errors, context) + # ensure the value is hash like + return unless hash?(values, errors, context) + + # ensure required members are present + if @validate_required + structure.required.each do |member_name| + if values[member_name].nil? + param = "#{context}[#{member_name.inspect}]" + errors << "missing required parameter #{param}" + end + end + end + + # validate non-nil members + values.each do |name, value| + unless value.nil? + if structure.member?(name) + member_shape = structure.member(name) + shape(member_shape, value, errors, context + "[#{name.inspect}]") + else + errors << "unexpected value at #{context}[#{name.inspect}]" + end + end + end + end + + def list(list, values, errors, context) + # ensure the value is an array + unless values.is_a?(Array) + errors << "expected #{context} to be an array" + return + end + + # validate members + values.each.with_index do |value, index| + shape(list.member, value, errors, context + "[#{index}]") + end + end + + def map(map, values, errors, context) + return unless hash?(values, errors, context) + values.each do |key, value| + shape(map.key, key, errors, "#{context} #{key.inspect} key") + shape(map.value, value, errors, context + "[#{key.inspect}]") + end + end + + def shape(shape, value, errors, context) + case shape + when StructureShape + structure(shape, value, errors, context) + when ListShape + list(shape, value, errors, context) + when MapShape + map(shape, value, errors, context) + when StringShape + unless value.is_a?(String) + errors << "expected #{context} to be a string" + end + when IntegerShape + unless value.is_a?(Integer) + errors << "expected #{context} to be an integer" + end + when FloatShape + unless value.is_a?(Float) + errors << "expected #{context} to be a float" + end + when TimestampShape + unless value.is_a?(Time) + errors << "expected #{context} to be a Time object" + end + when BooleanShape + unless [true, false].include?(value) + errors << "expected #{context} to be true or false" + end + when BlobShape + unless io_like?(value) or value.is_a?(String) + errors << "expected #{context} to be a string or IO object" + end + end + end + + def hash?(value, errors, context) + if value.is_a?(Hash) + true + else + errors << "expected #{context} to be a hash" + false + end + end + + def io_like?(value) + value.respond_to?(:read) && + value.respond_to?(:rewind) && + value.respond_to?(:size) + end + + def error_messages(errors) + if errors.size == 1 + errors.first + else + prefix = "\n - " + "parameter validator found #{errors.size} errors:" + + prefix + errors.join(prefix) + end + end + + end +end diff --git a/aws-sdk-core/lib/aws-sdk-core/plugins/param_converter.rb b/aws-sdk-core/lib/aws-sdk-core/plugins/param_converter.rb new file mode 100644 index 00000000000..c139eb80516 --- /dev/null +++ b/aws-sdk-core/lib/aws-sdk-core/plugins/param_converter.rb @@ -0,0 +1,27 @@ +module Aws + module Plugins + + # @seahorse.client.option [Boolean] :convert_params (true) + # When `true`, an attempt is made to coerce request parameters + # into the required types. + class ParamConverter < Seahorse::Client::Plugin + + option(:convert_params, true) + + def add_handlers(handlers, config) + handlers.add(Handler, step: :initialize) if config.convert_params + end + + class Handler < Seahorse::Client::Handler + + def call(context) + if input = context.operation.input + context.params = Aws::ParamConverter.convert(input, context.params) + end + @handler.call(context) + end + + end + end + end +end diff --git a/aws-sdk-core/lib/aws-sdk-core/plugins/param_validator.rb b/aws-sdk-core/lib/aws-sdk-core/plugins/param_validator.rb new file mode 100644 index 00000000000..d9f86b31c1e --- /dev/null +++ b/aws-sdk-core/lib/aws-sdk-core/plugins/param_validator.rb @@ -0,0 +1,28 @@ +module Aws + module Plugins + + # @seahorse.client.option [Boolean] :validate_params (true) + # When `true`, request parameters are validated before + # sending the request. + class ParamValidator < Seahorse::Client::Plugin + + option(:validate_params, true) + + def add_handlers(handlers, config) + if config.validate_params + handlers.add(Handler, step: :validate, priority: 50) + end + end + + class Handler < Seahorse::Client::Handler + + def call(context) + Aws::ParamValidator.validate!(context.operation.input, context.params) + @handler.call(context) + end + + end + + end + end +end diff --git a/aws-sdk-core/lib/seahorse.rb b/aws-sdk-core/lib/seahorse.rb index b294915058c..651c220fa05 100644 --- a/aws-sdk-core/lib/seahorse.rb +++ b/aws-sdk-core/lib/seahorse.rb @@ -13,8 +13,6 @@ module Client autoload :HandlerListEntry, 'seahorse/client/handler_list_entry' autoload :ManagedFile, 'seahorse/client/managed_file' autoload :NetworkingError, 'seahorse/client/networking_error' - autoload :ParamConverter, 'seahorse/client/param_converter' - autoload :ParamValidator, 'seahorse/client/param_validator' autoload :Plugin, 'seahorse/client/plugin' autoload :PluginList, 'seahorse/client/plugin_list' autoload :Request, 'seahorse/client/request' @@ -45,8 +43,6 @@ module Plugins autoload :JsonSimple, 'seahorse/client/plugins/json_simple' autoload :Logging, 'seahorse/client/plugins/logging' autoload :NetHttp, 'seahorse/client/plugins/net_http' - autoload :ParamConversion, 'seahorse/client/plugins/param_conversion' - autoload :ParamValidation, 'seahorse/client/plugins/param_validation' autoload :RaiseResponseErrors, 'seahorse/client/plugins/raise_response_errors' autoload :ResponseTarget, 'seahorse/client/plugins/response_target' autoload :RestfulBindings, 'seahorse/client/plugins/restful_bindings' diff --git a/aws-sdk-core/lib/seahorse/client/base.rb b/aws-sdk-core/lib/seahorse/client/base.rb index 23e10b44cac..44ac9072bc6 100644 --- a/aws-sdk-core/lib/seahorse/client/base.rb +++ b/aws-sdk-core/lib/seahorse/client/base.rb @@ -10,8 +10,6 @@ class Base @plugins = PluginList.new([ Plugins::Endpoint, Plugins::NetHttp, - Plugins::ParamConversion, - Plugins::ParamValidation, Plugins::RaiseResponseErrors, Plugins::ResponseTarget, ]) diff --git a/aws-sdk-core/lib/seahorse/client/param_converter.rb b/aws-sdk-core/lib/seahorse/client/param_converter.rb deleted file mode 100644 index 2a97e1b1abb..00000000000 --- a/aws-sdk-core/lib/seahorse/client/param_converter.rb +++ /dev/null @@ -1,207 +0,0 @@ -require 'stringio' -require 'date' -require 'time' -require 'tempfile' -require 'thread' - -module Seahorse - module Client - class ParamConverter - - @mutex = Mutex.new - @converters = Hash.new { |h,k| h[k] = {} } - - # @param [Model::Shapes::Shape] shape - def initialize(shape) - @shape = shape - end - - # @param [Hash] params - # @return [Hash] - def convert(params) - structure(@shape, params) - end - - private - - def structure(structure, values) - values = c(structure, values) - if values.is_a?(Hash) - values.each do |k, v| - unless v.nil? - if structure.member?(k) - values[k] = member(structure.member(k), v) - end - end - end - end - values - end - - def list(list, values) - values = c(list, values) - if values.is_a?(Array) - values.map { |v| member(list.member, v) } - else - values - end - end - - def map(map, values) - values = c(map, values) - if values.is_a?(Hash) - values.each.with_object({}) do |(key, value), hash| - hash[member(map.key, key)] = member(map.value, value) - end - else - values - end - end - - def member(shape, value) - case shape - when Model::Shapes::Structure then structure(shape, value) - when Model::Shapes::List then list(shape, value) - when Model::Shapes::Map then map(shape, value) - else c(shape, value) - end - end - - def c(shape, value) - self.class.c(shape.class, value) - end - - class << self - - # @param [Model::Shapes::InputShape] shape - # @param [Hash] params - # @return [Hash] - def convert(shape, params) - new(shape).convert(params) - end - - # Registers a new value converter. Converters run in the context - # of a shape and value class. - # - # # add a converter that stringifies integers - # shape_class = Seahorse::Model::Shapes::StringShape - # ParamConverter.add(shape_class, Integer) { |i| i.to_s } - # - # @param [Class] shape_class - # @param [Class] value_class - # @param [#call] converter (nil) An object that responds to `#call` - # accepting a single argument. This function should perform - # the value conversion if possible, returning the result. - # If the conversion is not possible, the original value should - # be returned. - # @return [void] - def add(shape_class, value_class, converter = nil, &block) - @converters[shape_class][value_class] = converter || block - end - - # @api private - def c(shape, value) - if converter = converter_for(shape, value) - converter.call(value) - else - value - end - end - - private - - def converter_for(shape_class, value) - unless @converters[shape_class].key?(value.class) - @mutex.synchronize { - unless @converters[shape_class].key?(value.class) - @converters[shape_class][value.class] = find(shape_class, value) - end - } - end - @converters[shape_class][value.class] - end - - def find(shape_class, value) - converter = nil - each_base_class(shape_class) do |klass| - @converters[klass].each do |value_class, block| - if value_class === value - converter = block - break - end - end - break if converter - end - converter - end - - def each_base_class(shape_class, &block) - shape_class.ancestors.each do |ancestor| - yield(ancestor) if @converters.key?(ancestor) - end - end - - end - - add(Model::Shapes::Structure, Hash) { |h| h.dup } - add(Model::Shapes::Structure, Struct) do |s| - s.members.each.with_object({}) {|k,h| h[k] = s[k] } - end - - add(Model::Shapes::Map, Hash) { |h| h.dup } - add(Model::Shapes::Map, Struct) do |s| - s.members.each.with_object({}) {|k,h| h[k] = s[k] } - end - - add(Model::Shapes::List, Array) { |a| a.dup } - add(Model::Shapes::List, Enumerable) { |value| value.to_a } - - add(Model::Shapes::String, String) - add(Model::Shapes::String, Symbol) { |sym| sym.to_s } - - add(Model::Shapes::Integer, Integer) - add(Model::Shapes::Integer, Float) { |f| f.to_i } - add(Model::Shapes::Integer, String) do |str| - begin - Integer(str) - rescue ArgumentError - str - end - end - - add(Model::Shapes::Float, Float) - add(Model::Shapes::Float, Integer) { |i| i.to_f } - add(Model::Shapes::Float, String) do |str| - begin - Float(str) - rescue ArgumentError - str - end - end - - add(Model::Shapes::Timestamp, Time) - add(Model::Shapes::Timestamp, Date) { |d| d.to_time } - add(Model::Shapes::Timestamp, DateTime) { |dt| dt.to_time } - add(Model::Shapes::Timestamp, Integer) { |i| Time.at(i) } - add(Model::Shapes::Timestamp, String) do |str| - begin - Time.parse(str) - rescue ArgumentError - str - end - end - - add(Model::Shapes::Boolean, TrueClass) - add(Model::Shapes::Boolean, FalseClass) - add(Model::Shapes::Boolean, String) do |str| - { 'true' => true, 'false' => false }[str] - end - - add(Model::Shapes::Blob, IO) - add(Model::Shapes::Blob, Tempfile) - add(Model::Shapes::Blob, StringIO) - add(Model::Shapes::Blob, String) { |str| StringIO.new(str) } - - end - end -end diff --git a/aws-sdk-core/lib/seahorse/client/param_validator.rb b/aws-sdk-core/lib/seahorse/client/param_validator.rb deleted file mode 100644 index 00d8d21a92f..00000000000 --- a/aws-sdk-core/lib/seahorse/client/param_validator.rb +++ /dev/null @@ -1,139 +0,0 @@ -module Seahorse - module Client - class ParamValidator - - # @param [Model::Shapes::Shape] shape - # @param [Hash] params - # @return [void] - def self.validate!(shape, params) - new(shape).validate!(params) - end - - # @param [Model::Shapes::Shape] shape - # @option options [Boolean] :validate_required (true) - def initialize(shape, options = {}) - @shape = shape || Seahorse::Model::Shapes::Structure.new - @validate_required = options[:validate_required] != false - end - - # @param [Hash] params - # @return [void] - def validate!(params) - errors = [] - shape(@shape, params, errors, context = 'params') - raise ArgumentError, error_messages(errors) unless errors.empty? - end - - private - - def structure(structure, values, errors, context) - # ensure the value is hash like - return unless hash?(values, errors, context) - - # ensure required members are present - if @validate_required - structure.required.each do |member_name| - if values[member_name].nil? - param = "#{context}[#{member_name.inspect}]" - errors << "missing required parameter #{param}" - end - end - end - - # validate non-nil members - values.each do |name, value| - unless value.nil? - if structure.member?(name) - member_shape = structure.member(name) - shape(member_shape, value, errors, context + "[#{name.inspect}]") - else - errors << "unexpected value at #{context}[#{name.inspect}]" - end - end - end - end - - def list(list, values, errors, context) - # ensure the value is an array - unless values.is_a?(Array) - errors << "expected #{context} to be an array" - return - end - - # validate members - values.each.with_index do |value, index| - shape(list.member, value, errors, context + "[#{index}]") - end - end - - def map(map, values, errors, context) - return unless hash?(values, errors, context) - values.each do |key, value| - shape(map.key, key, errors, "#{context} #{key.inspect} key") - shape(map.value, value, errors, context + "[#{key.inspect}]") - end - end - - def shape(shape, value, errors, context) - case shape - when Model::Shapes::Structure - structure(shape, value, errors, context) - when Model::Shapes::List - list(shape, value, errors, context) - when Model::Shapes::Map - map(shape, value, errors, context) - when Model::Shapes::String - unless value.is_a?(String) - errors << "expected #{context} to be a string" - end - when Model::Shapes::Integer - unless value.is_a?(Integer) - errors << "expected #{context} to be an integer" - end - when Model::Shapes::Float - unless value.is_a?(Float) - errors << "expected #{context} to be a float" - end - when Model::Shapes::Timestamp - unless value.is_a?(Time) - errors << "expected #{context} to be a Time object" - end - when Model::Shapes::Boolean - unless [true, false].include?(value) - errors << "expected #{context} to be true or false" - end - when Model::Shapes::Blob - unless io_like?(value) or value.is_a?(String) - errors << "expected #{context} to be a string or IO object" - end - end - end - - def hash?(value, errors, context) - if value.is_a?(Hash) - true - else - errors << "expected #{context} to be a hash" - false - end - end - - def io_like?(value) - value.respond_to?(:read) && - value.respond_to?(:rewind) && - value.respond_to?(:size) - end - - def error_messages(errors) - if errors.size == 1 - errors.first - else - prefix = "\n - " - "parameter validator found #{errors.size} errors:" + - prefix + errors.join(prefix) - end - end - - end - end -end diff --git a/aws-sdk-core/lib/seahorse/client/plugins/param_conversion.rb b/aws-sdk-core/lib/seahorse/client/plugins/param_conversion.rb deleted file mode 100644 index 23a5e365636..00000000000 --- a/aws-sdk-core/lib/seahorse/client/plugins/param_conversion.rb +++ /dev/null @@ -1,29 +0,0 @@ -module Seahorse - module Client - module Plugins - - # @seahorse.client.option [Boolean] :convert_params (true) - # When `true`, an attempt is made to coerce request parameters - # into the required types. - class ParamConversion < Plugin - - option(:convert_params, true) - - def add_handlers(handlers, config) - handlers.add(Handler, step: :initialize) if config.convert_params - end - - class Handler < Client::Handler - - def call(context) - if input = context.operation.input - context.params = ParamConverter.convert(input, context.params) - end - @handler.call(context) - end - - end - end - end - end -end diff --git a/aws-sdk-core/lib/seahorse/client/plugins/param_validation.rb b/aws-sdk-core/lib/seahorse/client/plugins/param_validation.rb deleted file mode 100644 index 8a020e70991..00000000000 --- a/aws-sdk-core/lib/seahorse/client/plugins/param_validation.rb +++ /dev/null @@ -1,30 +0,0 @@ -module Seahorse - module Client - module Plugins - - # @seahorse.client.option [Boolean] :validate_params (true) - # When `true`, request parameters are validated before - # sending the request. - class ParamValidation < Plugin - - option(:validate_params, true) - - def add_handlers(handlers, config) - if config.validate_params - handlers.add(Handler, step: :validate, priority: 50) - end - end - - class Handler < Client::Handler - - def call(context) - ParamValidator.validate!(context.operation.input, context.params) - @handler.call(context) - end - - end - - end - end - end -end diff --git a/aws-sdk-core/spec/aws/param_converter_spec.rb b/aws-sdk-core/spec/aws/param_converter_spec.rb new file mode 100644 index 00000000000..a232615c2a0 --- /dev/null +++ b/aws-sdk-core/spec/aws/param_converter_spec.rb @@ -0,0 +1,319 @@ +require 'stringio' + +module Aws + describe ParamConverter do + + describe 'convert' do + + it 'performs a deeply nested conversion of values' do + rules = Model::Shapes::Shape.new({ + 'type' => 'structure', + 'members' => { + 'username' => { 'type' => 'string' }, + 'config' => { + 'type' => 'structure', + 'members' => { + 'enabled' => { 'type' => 'boolean' }, + 'settings' => { + 'type' => 'map', + 'key' => { 'type' => 'string' }, + 'value' => { 'type' => 'string' }, + }, + 'counts' => { + 'type' => 'list', + 'member' => { + 'type' => 'structure', + 'members' => { + 'value' => { 'type' => 'integer' } + } + }, + } + } + } + } + }) + + data = double('data') + + config = Struct.new(:enabled, :settings, :counts, :unknown) + config = config.new(true, { color: :red }, [ + { value: 1 }, + { value: 2.0 }, + { value: '3' }, + ], data) + + params = { + username: :johndoe, + config: config + } + + converted = ParamConverter.convert(rules, params) + expect(converted).to eq({ + username: 'johndoe', + config: { + enabled: true, + settings: { 'color' => 'red' }, + counts: [ + { value: 1 }, + { value: 2 }, + { value: 3 }, + ], + unknown: data + } + }) + end + + end + + describe 'default converstions' do + + describe 'undescribed' do + + it 'returns the value unmodified if the shape class is unknown' do + shape_class = Class.new + value = 'raw' + expect(ParamConverter.c(shape_class, value)).to be(value) + end + + it 'returns the value unmodified if the value class is unknown' do + shape_class = Model::Shapes::String + value = double('raw') + expect(ParamConverter.c(shape_class, value)).to be(value) + end + + end + + describe 'structures' do + + let(:shape_class) { Model::Shapes::Structure } + + it 'returns duplicate hashes' do + value = { a: 1 } + converted = ParamConverter.c(shape_class, value) + expect(converted).to eq(value) + expect(converted).not_to be(value) + end + + it 'creates a hash from a struct' do + value = Struct.new(:a).new(1) + converted = ParamConverter.c(shape_class, value) + expect(converted).to eq(a: 1) + end + + end + + describe 'maps' do + + let(:shape_class) { Model::Shapes::Map } + + it 'returns duplicate hashes' do + value = { a: 1 } + converted = ParamConverter.c(shape_class, value) + expect(converted).to eq(value) + expect(converted).not_to be(value) + end + + it 'creates a hash from a struct' do + value = Struct.new(:a).new(1) + converted = ParamConverter.c(shape_class, value) + expect(converted).to eq(a: 1) + end + + end + + describe 'lists' do + + let(:shape_class) { Model::Shapes::List } + + it 'duplicates arrays' do + value = [1,2,3] + converted = ParamConverter.c(shape_class, value) + expect(converted).to eq(value) + expect(converted).not_to be(value) + end + + it 'converts enumerables into arrays' do + value = [1,2,3].enum_for(:each) + converted = ParamConverter.c(shape_class, value) + expect(converted).to eq([1,2,3]) + end + + end + + describe 'strings' do + + let(:shape_class) { Model::Shapes::String } + + it 'returns strings unmodified' do + expect(ParamConverter.c(shape_class, 'abc')).to eq('abc') + end + + it 'converts symbols to strings' do + expect(ParamConverter.c(shape_class, :abc)).to eq('abc') + end + + end + + describe 'integers' do + + let(:shape_class) { Model::Shapes::Integer } + + it 'returns integers unmodified' do + expect(ParamConverter.c(shape_class, 123)).to eq(123) + end + + it 'converts floats to integers' do + expect(ParamConverter.c(shape_class, 12.34)).to eq(12) + end + + it 'casts strings to integers' do + expect(ParamConverter.c(shape_class, '123')).to eq(123) + end + + it 'returns strings unmodified if cast fails' do + expect(ParamConverter.c(shape_class, 'abc')).to eq('abc') + end + + end + + describe 'floats' do + + let(:shape_class) { Model::Shapes::Float } + + it 'returns floats unmodified' do + expect(ParamConverter.c(shape_class, 12.34)).to eq(12.34) + end + + it 'converts integers to floats' do + expect(ParamConverter.c(shape_class, 12)).to eq(12.0) + end + + it 'casts strings to floats' do + expect(ParamConverter.c(shape_class, '12.34')).to eq(12.34) + end + + it 'returns strings unmodified if cast fails' do + expect(ParamConverter.c(shape_class, 'abc')).to eq('abc') + end + + end + + describe 'timestamps' do + + let(:shape_class) { Model::Shapes::Timestamp } + + it 'returns Time objects unmodfied' do + time = Time.now + expect(ParamConverter.c(shape_class, time)).to be(time) + end + + it 'returns DateTime objects as a Time object' do + time = DateTime.now + expect(ParamConverter.c(shape_class, time)).to eq(time.to_time) + end + + it 'returns Date objects as a Time object' do + time = Date.new + expect(ParamConverter.c(shape_class, time)).to eq(time.to_time) + end + + it 'converts integers to Time objects' do + time = Time.now.to_i + expect(ParamConverter.c(shape_class, time)).to eq(Time.at(time)) + end + + it 'parses strings as time objets' do + t1 = Time.now.utc.iso8601 + t2 = Time.now.rfc822 + t3 = Time.now.to_s + t4 = '2013-01-02' + expect(ParamConverter.c(shape_class, t1)).to eq(Time.parse(t1)) + expect(ParamConverter.c(shape_class, t2)).to eq(Time.parse(t2)) + expect(ParamConverter.c(shape_class, t3)).to eq(Time.parse(t3)) + expect(ParamConverter.c(shape_class, t4)).to eq(Time.parse(t4)) + end + + it 'returns strings unmodified if they can not be parsed' do + expect(ParamConverter.c(shape_class, 'abc')).to eq('abc') + end + + end + + describe 'booleans' do + + let(:shape_class) { Model::Shapes::Boolean } + + it 'returns true and false' do + expect(ParamConverter.c(shape_class, true)).to be(true) + expect(ParamConverter.c(shape_class, false)).to be(false) + end + + it 'does not translate nil' do + expect(ParamConverter.c(shape_class, nil)).to be(nil) + end + + end + + describe 'blobs' do + + let(:shape_class) { Model::Shapes::Blob } + + it 'accepts io objects (like file)' do + file = File.open(__FILE__, 'r') + expect(ParamConverter.c(shape_class, file)).to be(file) + file.close + end + + it 'accepts io objects (like stringio)' do + io = StringIO.new('abc') + expect(ParamConverter.c(shape_class, io)).to be(io) + end + + it 'accepts io objects (like tempfiles)' do + file = Tempfile.new('abc') + expect(ParamConverter.c(shape_class, file)).to be(file) + file.close + file.delete + end + + it 'accepts strings and returns StringIO' do + expect(ParamConverter.c(shape_class, 'abc').read).to eq('abc') + end + + end + + end + + describe '.add' do + + it 'registers a new converter' do + shape_class = Class.new + ParamConverter.add(shape_class, String) { |s| s.to_sym } + expect(ParamConverter.c(shape_class, 'abc')).to eq(:abc) + end + + it 'can convert values based on parent value classes' do + shape_class = Class.new + special_string = Class.new(String) + str = special_string.new('raw') + ParamConverter.add(shape_class, special_string) { |s| 'converted' } + expect(ParamConverter.c(shape_class, str)).to eq('converted') + end + + it 'can convert values based on parent shape classes' do + base = Class.new + extended = Class.new(base) + ParamConverter.add(base, String) { |s| 'converted' } + expect(ParamConverter.c(extended, 'raw')).to eq('converted') + end + + it 'replaces an existing converter' do + shape_class = Class.new + ParamConverter.add(shape_class, String) { |s| 'first' } + ParamConverter.add(shape_class, String) { |s| 'second' } + expect(ParamConverter.c(shape_class, 'value')).to eq('second') + end + + end + end +end diff --git a/aws-sdk-core/spec/aws/param_validator_spec.rb b/aws-sdk-core/spec/aws/param_validator_spec.rb new file mode 100644 index 00000000000..636f13e4401 --- /dev/null +++ b/aws-sdk-core/spec/aws/param_validator_spec.rb @@ -0,0 +1,273 @@ +module Aws + describe ParamValidator do + + let(:rules) {{ 'type' => 'structure', 'members' => {} }} + + def validate(params, expected_errors = []) + shape = Model::Shapes::Shape.new(rules) + if expected_errors.empty? + ParamValidator.new(shape).validate!(params) + else + expect { + ParamValidator.new(shape).validate!(params) + }.to raise_error(ArgumentError) do |error| + match_errors(error, expected_errors) + end + end + end + + def match_errors(error, expected_errors) + expected_errors = [expected_errors] unless expected_errors.is_a?(Array) + expected_errors.each do |expected_error| + if String === expected_error + expect(error.message).to include(expected_error) + else + expect(error.message).to match(expected_error) + end + end + end + + describe 'empty rules' do + + it 'accepts an empty hash of params when rules are empty' do + expect(validate({})) + end + + end + + describe 'structures' do + + it 'validates nested structures' do + rules['members'] = { + 'config' => { + 'type' => 'structure', + 'members' => { + 'settings' => { + 'type' => 'structure', + 'members' => {} + } + } + } + } + validate('abc', 'expected params to be a hash') + validate({ config: 'abc' }, 'expected params[:config] to be a hash') + validate({ config: { settings: 'abc' }}, 'expected params[:config][:settings] to be a hash') + end + + it 'accepts hashes' do + validate({}) + end + + it 'raises an error when a required paramter is missing' do + rules['required'] = %w(name) + rules['members'] = { + 'name' => { 'type' => 'string' } + } + validate({}, 'missing required parameter params[:name]') + end + + it 'raises an error when a given parameter is unexpected' do + validate({foo: 'bar'}, 'unexpected value at params[:foo]') + end + + it 'accepts members that pass validation' do + rules['required'] = %w(name) + rules['members'] = { + 'name' => { 'type' => 'string' } + } + validate(name: 'john doe') + end + + it 'aggregates errors for members' do + rules['required'] = %w(name) + rules['members'] = { + 'name' => { 'type' => 'string' } + } + validate({foo: 'bar'}, [ + 'missing required parameter params[:name]', + 'unexpected value at params[:foo]' + ]) + end + + it 'provides a helpful context for nested params' do + rules['members'] = { + 'config' => { + 'type' => 'structure', + 'required' => %w(name), + 'members' => { + 'name' => { 'type' => 'string' } + } + } + } + validate({ config: {} }, + 'missing required parameter params[:config][:name]') + end + + end + + describe 'lists' do + + before(:each) do + rules['members'] = { + # list of strings + 'names' => { + 'type' => 'list', + 'member' => { 'type' => 'string' } + }, + # list of structures + 'filters' => { + 'type' => 'list', + 'member' => { + 'type' => 'structure', + 'members' => { + 'values' => { + 'type' => 'list', + 'member' => { 'type' => 'string' } + } + } + } + } + } + end + + it 'accepts arrays' do + validate(names: []) + validate(names: %w(abc mno xyz)) + end + + it 'expects the value to be an array' do + validate({ names: [] }) + validate({ names: 'abc' }, 'expected params[:names] to be an array') + end + + it 'validates each member of the list' do + validate({ filters: [{}] }) + validate({ filters: ['abc'] }, + 'expected params[:filters][0] to be a hash') + validate({ filters: [{}, 'abc'] }, + 'expected params[:filters][1] to be a hash') + validate({ filters: [{ values: 'abc' }] }, + 'expected params[:filters][0][:values] to be an array') + validate({ filters: [{ value: 'abc' }] }, + 'unexpected value at params[:filters][0][:value]') + end + + end + + describe 'maps' do + + before(:each) do + rules['members'] = { + 'attributes' => { + 'type' => 'map', + 'key' => { 'type' => 'string' }, + 'value' => { 'type' => 'integer' } + } + } + end + + it 'accepts hashes' do + validate({ attributes: {}}) + validate({ attributes: 'abc' }, + 'expected params[:attributes] to be a hash') + end + + it 'validates map keys' do + validate({ attributes: { 'foo' => 123 }}) + validate({ attributes: { 123 => 456 }}, + 'expected params[:attributes] 123 key to be a string') + end + + it 'validates map values' do + validate({ attributes: { 'foo' => 123 }}) + validate({ attributes: { 'foo' => 'bar' }}, + 'expected params[:attributes]["foo"] to be an integer') + end + + end + + describe 'integers' do + + it 'accepts integers' do + rules['members'] = { 'count' => { 'type' => 'integer' } } + validate(count: 123) + validate({ count: '123' }, 'expected params[:count] to be an integer') + end + + end + + describe 'floats' do + + it 'accepts integers' do + rules['members'] = { 'price' => { 'type' => 'float' } } + validate(price: 123.0) + validate({ price: 123 }, 'expected params[:price] to be a float') + end + + end + + describe 'timestamps' do + + it 'accepts time objects' do + rules['members'] = { + 'a' => { 'type' => 'timestamp' }, + 'b' => { 'type' => 'timestamp', 'metadata' => { 'timestamp_format' => 'iso8601' }}, + 'c' => { 'type' => 'timestamp', 'metadata' => { 'timestamp_format' => 'rfc822' }}, + 'd' => { 'type' => 'timestamp', 'metadata' => { 'timestamp_format' => 'unix_timestamp' }}, + } + validate(a: Time.now) + validate(b: Time.now) + validate(c: Time.now) + validate(d: Time.now) + validate({a: 12345}, 'expected params[:a] to be a Time object') + validate({b: '2013-01-01'}, 'expected params[:b] to be a Time object') + validate({c: DateTime.now}, 'expected params[:c] to be a Time object') + validate({d: Date.new}, 'expected params[:d] to be a Time object') + end + + end + + describe 'booleans' do + + it 'accepts TrueClass and FalseClass' do + rules['members'] = { 'enabled' => { 'type' => 'boolean' } } + validate(enabled: true) + validate(enabled: false) + validate({ enabled: 'true' }, + 'expected params[:enabled] to be true or false') + end + + end + + describe 'blobs' do + + it 'accepts strings and io objects for payload members' do + rules['payload'] = 'data' + rules['members'] = { + 'data' => { 'type' => 'blob' } + } + validate(data: StringIO.new('abc')) + validate(data: double('d', :read => 'abc', :size => 3, :rewind => 0)) + validate({ data: 'abc' }) + end + + it 'accepts string objects for non-payload members' do + rules['members'] = { 'data' => { 'type' => 'blob' } } + validate(data: 'YQ==') + validate({ data: 123 }, + 'expected params[:data] to be a string or IO object') + end + + end + + describe 'strings' do + + it 'accepts string objects' do + rules['members'] = { 'name' => { 'type' => 'string' } } + validate(name: 'john doe') + validate({ name: 123 }, 'expected params[:name] to be a string') + end + + end + end +end diff --git a/aws-sdk-core/spec/seahorse/client/param_converter_spec.rb b/aws-sdk-core/spec/seahorse/client/param_converter_spec.rb deleted file mode 100644 index 3937d8fe6c9..00000000000 --- a/aws-sdk-core/spec/seahorse/client/param_converter_spec.rb +++ /dev/null @@ -1,321 +0,0 @@ -require 'stringio' - -module Seahorse - module Client - describe ParamConverter do - - describe 'convert' do - - it 'performs a deeply nested conversion of values' do - rules = Model::Shapes::Shape.new({ - 'type' => 'structure', - 'members' => { - 'username' => { 'type' => 'string' }, - 'config' => { - 'type' => 'structure', - 'members' => { - 'enabled' => { 'type' => 'boolean' }, - 'settings' => { - 'type' => 'map', - 'key' => { 'type' => 'string' }, - 'value' => { 'type' => 'string' }, - }, - 'counts' => { - 'type' => 'list', - 'member' => { - 'type' => 'structure', - 'members' => { - 'value' => { 'type' => 'integer' } - } - }, - } - } - } - } - }) - - data = double('data') - - config = Struct.new(:enabled, :settings, :counts, :unknown) - config = config.new(true, { color: :red }, [ - { value: 1 }, - { value: 2.0 }, - { value: '3' }, - ], data) - - params = { - username: :johndoe, - config: config - } - - converted = ParamConverter.convert(rules, params) - expect(converted).to eq({ - username: 'johndoe', - config: { - enabled: true, - settings: { 'color' => 'red' }, - counts: [ - { value: 1 }, - { value: 2 }, - { value: 3 }, - ], - unknown: data - } - }) - end - - end - - describe 'default converstions' do - - describe 'undescribed' do - - it 'returns the value unmodified if the shape class is unknown' do - shape_class = Class.new - value = 'raw' - expect(ParamConverter.c(shape_class, value)).to be(value) - end - - it 'returns the value unmodified if the value class is unknown' do - shape_class = Model::Shapes::String - value = double('raw') - expect(ParamConverter.c(shape_class, value)).to be(value) - end - - end - - describe 'structures' do - - let(:shape_class) { Model::Shapes::Structure } - - it 'returns duplicate hashes' do - value = { a: 1 } - converted = ParamConverter.c(shape_class, value) - expect(converted).to eq(value) - expect(converted).not_to be(value) - end - - it 'creates a hash from a struct' do - value = Struct.new(:a).new(1) - converted = ParamConverter.c(shape_class, value) - expect(converted).to eq(a: 1) - end - - end - - describe 'maps' do - - let(:shape_class) { Model::Shapes::Map } - - it 'returns duplicate hashes' do - value = { a: 1 } - converted = ParamConverter.c(shape_class, value) - expect(converted).to eq(value) - expect(converted).not_to be(value) - end - - it 'creates a hash from a struct' do - value = Struct.new(:a).new(1) - converted = ParamConverter.c(shape_class, value) - expect(converted).to eq(a: 1) - end - - end - - describe 'lists' do - - let(:shape_class) { Model::Shapes::List } - - it 'duplicates arrays' do - value = [1,2,3] - converted = ParamConverter.c(shape_class, value) - expect(converted).to eq(value) - expect(converted).not_to be(value) - end - - it 'converts enumerables into arrays' do - value = [1,2,3].enum_for(:each) - converted = ParamConverter.c(shape_class, value) - expect(converted).to eq([1,2,3]) - end - - end - - describe 'strings' do - - let(:shape_class) { Model::Shapes::String } - - it 'returns strings unmodified' do - expect(ParamConverter.c(shape_class, 'abc')).to eq('abc') - end - - it 'converts symbols to strings' do - expect(ParamConverter.c(shape_class, :abc)).to eq('abc') - end - - end - - describe 'integers' do - - let(:shape_class) { Model::Shapes::Integer } - - it 'returns integers unmodified' do - expect(ParamConverter.c(shape_class, 123)).to eq(123) - end - - it 'converts floats to integers' do - expect(ParamConverter.c(shape_class, 12.34)).to eq(12) - end - - it 'casts strings to integers' do - expect(ParamConverter.c(shape_class, '123')).to eq(123) - end - - it 'returns strings unmodified if cast fails' do - expect(ParamConverter.c(shape_class, 'abc')).to eq('abc') - end - - end - - describe 'floats' do - - let(:shape_class) { Model::Shapes::Float } - - it 'returns floats unmodified' do - expect(ParamConverter.c(shape_class, 12.34)).to eq(12.34) - end - - it 'converts integers to floats' do - expect(ParamConverter.c(shape_class, 12)).to eq(12.0) - end - - it 'casts strings to floats' do - expect(ParamConverter.c(shape_class, '12.34')).to eq(12.34) - end - - it 'returns strings unmodified if cast fails' do - expect(ParamConverter.c(shape_class, 'abc')).to eq('abc') - end - - end - - describe 'timestamps' do - - let(:shape_class) { Model::Shapes::Timestamp } - - it 'returns Time objects unmodfied' do - time = Time.now - expect(ParamConverter.c(shape_class, time)).to be(time) - end - - it 'returns DateTime objects as a Time object' do - time = DateTime.now - expect(ParamConverter.c(shape_class, time)).to eq(time.to_time) - end - - it 'returns Date objects as a Time object' do - time = Date.new - expect(ParamConverter.c(shape_class, time)).to eq(time.to_time) - end - - it 'converts integers to Time objects' do - time = Time.now.to_i - expect(ParamConverter.c(shape_class, time)).to eq(Time.at(time)) - end - - it 'parses strings as time objets' do - t1 = Time.now.utc.iso8601 - t2 = Time.now.rfc822 - t3 = Time.now.to_s - t4 = '2013-01-02' - expect(ParamConverter.c(shape_class, t1)).to eq(Time.parse(t1)) - expect(ParamConverter.c(shape_class, t2)).to eq(Time.parse(t2)) - expect(ParamConverter.c(shape_class, t3)).to eq(Time.parse(t3)) - expect(ParamConverter.c(shape_class, t4)).to eq(Time.parse(t4)) - end - - it 'returns strings unmodified if they can not be parsed' do - expect(ParamConverter.c(shape_class, 'abc')).to eq('abc') - end - - end - - describe 'booleans' do - - let(:shape_class) { Model::Shapes::Boolean } - - it 'returns true and false' do - expect(ParamConverter.c(shape_class, true)).to be(true) - expect(ParamConverter.c(shape_class, false)).to be(false) - end - - it 'does not translate nil' do - expect(ParamConverter.c(shape_class, nil)).to be(nil) - end - - end - - describe 'blobs' do - - let(:shape_class) { Model::Shapes::Blob } - - it 'accepts io objects (like file)' do - file = File.open(__FILE__, 'r') - expect(ParamConverter.c(shape_class, file)).to be(file) - file.close - end - - it 'accepts io objects (like stringio)' do - io = StringIO.new('abc') - expect(ParamConverter.c(shape_class, io)).to be(io) - end - - it 'accepts io objects (like tempfiles)' do - file = Tempfile.new('abc') - expect(ParamConverter.c(shape_class, file)).to be(file) - file.close - file.delete - end - - it 'accepts strings and returns StringIO' do - expect(ParamConverter.c(shape_class, 'abc').read).to eq('abc') - end - - end - - end - - describe '.add' do - - it 'registers a new converter' do - shape_class = Class.new - ParamConverter.add(shape_class, String) { |s| s.to_sym } - expect(ParamConverter.c(shape_class, 'abc')).to eq(:abc) - end - - it 'can convert values based on parent value classes' do - shape_class = Class.new - special_string = Class.new(String) - str = special_string.new('raw') - ParamConverter.add(shape_class, special_string) { |s| 'converted' } - expect(ParamConverter.c(shape_class, str)).to eq('converted') - end - - it 'can convert values based on parent shape classes' do - base = Class.new - extended = Class.new(base) - ParamConverter.add(base, String) { |s| 'converted' } - expect(ParamConverter.c(extended, 'raw')).to eq('converted') - end - - it 'replaces an existing converter' do - shape_class = Class.new - ParamConverter.add(shape_class, String) { |s| 'first' } - ParamConverter.add(shape_class, String) { |s| 'second' } - expect(ParamConverter.c(shape_class, 'value')).to eq('second') - end - - end - end - end -end diff --git a/aws-sdk-core/spec/seahorse/client/param_validator_spec.rb b/aws-sdk-core/spec/seahorse/client/param_validator_spec.rb deleted file mode 100644 index edee6dc5486..00000000000 --- a/aws-sdk-core/spec/seahorse/client/param_validator_spec.rb +++ /dev/null @@ -1,275 +0,0 @@ -module Seahorse - module Client - describe ParamValidator do - - let(:rules) {{ 'type' => 'structure', 'members' => {} }} - - def validate(params, expected_errors = []) - shape = Model::Shapes::Shape.new(rules) - if expected_errors.empty? - ParamValidator.new(shape).validate!(params) - else - expect { - ParamValidator.new(shape).validate!(params) - }.to raise_error(ArgumentError) do |error| - match_errors(error, expected_errors) - end - end - end - - def match_errors(error, expected_errors) - expected_errors = [expected_errors] unless expected_errors.is_a?(Array) - expected_errors.each do |expected_error| - if String === expected_error - expect(error.message).to include(expected_error) - else - expect(error.message).to match(expected_error) - end - end - end - - describe 'empty rules' do - - it 'accepts an empty hash of params when rules are empty' do - expect(validate({})) - end - - end - - describe 'structures' do - - it 'validates nested structures' do - rules['members'] = { - 'config' => { - 'type' => 'structure', - 'members' => { - 'settings' => { - 'type' => 'structure', - 'members' => {} - } - } - } - } - validate('abc', 'expected params to be a hash') - validate({ config: 'abc' }, 'expected params[:config] to be a hash') - validate({ config: { settings: 'abc' }}, 'expected params[:config][:settings] to be a hash') - end - - it 'accepts hashes' do - validate({}) - end - - it 'raises an error when a required paramter is missing' do - rules['required'] = %w(name) - rules['members'] = { - 'name' => { 'type' => 'string' } - } - validate({}, 'missing required parameter params[:name]') - end - - it 'raises an error when a given parameter is unexpected' do - validate({foo: 'bar'}, 'unexpected value at params[:foo]') - end - - it 'accepts members that pass validation' do - rules['required'] = %w(name) - rules['members'] = { - 'name' => { 'type' => 'string' } - } - validate(name: 'john doe') - end - - it 'aggregates errors for members' do - rules['required'] = %w(name) - rules['members'] = { - 'name' => { 'type' => 'string' } - } - validate({foo: 'bar'}, [ - 'missing required parameter params[:name]', - 'unexpected value at params[:foo]' - ]) - end - - it 'provides a helpful context for nested params' do - rules['members'] = { - 'config' => { - 'type' => 'structure', - 'required' => %w(name), - 'members' => { - 'name' => { 'type' => 'string' } - } - } - } - validate({ config: {} }, - 'missing required parameter params[:config][:name]') - end - - end - - describe 'lists' do - - before(:each) do - rules['members'] = { - # list of strings - 'names' => { - 'type' => 'list', - 'member' => { 'type' => 'string' } - }, - # list of structures - 'filters' => { - 'type' => 'list', - 'member' => { - 'type' => 'structure', - 'members' => { - 'values' => { - 'type' => 'list', - 'member' => { 'type' => 'string' } - } - } - } - } - } - end - - it 'accepts arrays' do - validate(names: []) - validate(names: %w(abc mno xyz)) - end - - it 'expects the value to be an array' do - validate({ names: [] }) - validate({ names: 'abc' }, 'expected params[:names] to be an array') - end - - it 'validates each member of the list' do - validate({ filters: [{}] }) - validate({ filters: ['abc'] }, - 'expected params[:filters][0] to be a hash') - validate({ filters: [{}, 'abc'] }, - 'expected params[:filters][1] to be a hash') - validate({ filters: [{ values: 'abc' }] }, - 'expected params[:filters][0][:values] to be an array') - validate({ filters: [{ value: 'abc' }] }, - 'unexpected value at params[:filters][0][:value]') - end - - end - - describe 'maps' do - - before(:each) do - rules['members'] = { - 'attributes' => { - 'type' => 'map', - 'key' => { 'type' => 'string' }, - 'value' => { 'type' => 'integer' } - } - } - end - - it 'accepts hashes' do - validate({ attributes: {}}) - validate({ attributes: 'abc' }, - 'expected params[:attributes] to be a hash') - end - - it 'validates map keys' do - validate({ attributes: { 'foo' => 123 }}) - validate({ attributes: { 123 => 456 }}, - 'expected params[:attributes] 123 key to be a string') - end - - it 'validates map values' do - validate({ attributes: { 'foo' => 123 }}) - validate({ attributes: { 'foo' => 'bar' }}, - 'expected params[:attributes]["foo"] to be an integer') - end - - end - - describe 'integers' do - - it 'accepts integers' do - rules['members'] = { 'count' => { 'type' => 'integer' } } - validate(count: 123) - validate({ count: '123' }, 'expected params[:count] to be an integer') - end - - end - - describe 'floats' do - - it 'accepts integers' do - rules['members'] = { 'price' => { 'type' => 'float' } } - validate(price: 123.0) - validate({ price: 123 }, 'expected params[:price] to be a float') - end - - end - - describe 'timestamps' do - - it 'accepts time objects' do - rules['members'] = { - 'a' => { 'type' => 'timestamp' }, - 'b' => { 'type' => 'timestamp', 'metadata' => { 'timestamp_format' => 'iso8601' }}, - 'c' => { 'type' => 'timestamp', 'metadata' => { 'timestamp_format' => 'rfc822' }}, - 'd' => { 'type' => 'timestamp', 'metadata' => { 'timestamp_format' => 'unix_timestamp' }}, - } - validate(a: Time.now) - validate(b: Time.now) - validate(c: Time.now) - validate(d: Time.now) - validate({a: 12345}, 'expected params[:a] to be a Time object') - validate({b: '2013-01-01'}, 'expected params[:b] to be a Time object') - validate({c: DateTime.now}, 'expected params[:c] to be a Time object') - validate({d: Date.new}, 'expected params[:d] to be a Time object') - end - - end - - describe 'booleans' do - - it 'accepts TrueClass and FalseClass' do - rules['members'] = { 'enabled' => { 'type' => 'boolean' } } - validate(enabled: true) - validate(enabled: false) - validate({ enabled: 'true' }, - 'expected params[:enabled] to be true or false') - end - - end - - describe 'blobs' do - - it 'accepts strings and io objects for payload members' do - rules['payload'] = 'data' - rules['members'] = { - 'data' => { 'type' => 'blob' } - } - validate(data: StringIO.new('abc')) - validate(data: double('d', :read => 'abc', :size => 3, :rewind => 0)) - validate({ data: 'abc' }) - end - - it 'accepts string objects for non-payload members' do - rules['members'] = { 'data' => { 'type' => 'blob' } } - validate(data: 'YQ==') - validate({ data: 123 }, - 'expected params[:data] to be a string or IO object') - end - - end - - describe 'strings' do - - it 'accepts string objects' do - rules['members'] = { 'name' => { 'type' => 'string' } } - validate(name: 'john doe') - validate({ name: 123 }, 'expected params[:name] to be a string') - end - - end - end - end -end From e98f7e93901aa60022e44105b9c32e65df3aa384 Mon Sep 17 00:00:00 2001 From: Trevor Rowe Date: Wed, 6 May 2015 09:05:06 -0700 Subject: [PATCH 011/101] Updated the ParamValidator to use the new Seahorse shapes. --- .../lib/aws-sdk-core/param_validator.rb | 57 ++--- aws-sdk-core/spec/aws/param_validator_spec.rb | 201 +++++------------- 2 files changed, 88 insertions(+), 170 deletions(-) diff --git a/aws-sdk-core/lib/aws-sdk-core/param_validator.rb b/aws-sdk-core/lib/aws-sdk-core/param_validator.rb index 1697195573d..96c594effea 100644 --- a/aws-sdk-core/lib/aws-sdk-core/param_validator.rb +++ b/aws-sdk-core/lib/aws-sdk-core/param_validator.rb @@ -4,17 +4,17 @@ class ParamValidator include Seahorse::Model::Shapes - # @param [Model::Shapes::Shape] shape + # @param [Seahorse::Model::Shapes::ShapeRef] rules # @param [Hash] params # @return [void] - def self.validate!(shape, params) - new(shape).validate!(params) + def self.validate!(rules, params) + new(rules).validate!(params) end - # @param [Model::Shapes::Shape] shape + # @param [Seahorse::Model::Shapes::ShapeRef] rules # @option options [Boolean] :validate_required (true) - def initialize(shape, options = {}) - @shape = shape || StructureShape.new + def initialize(rules, options = {}) + @rules = rules @validate_required = options[:validate_required] != false end @@ -22,19 +22,21 @@ def initialize(shape, options = {}) # @return [void] def validate!(params) errors = [] - shape(@shape, params, errors, context = 'params') + structure(@rules, params, errors, context = 'params') raise ArgumentError, error_messages(errors) unless errors.empty? end private - def structure(structure, values, errors, context) + def structure(ref, values, errors, context) # ensure the value is hash like return unless hash?(values, errors, context) + shape = ref.shape + # ensure required members are present if @validate_required - structure.required.each do |member_name| + shape.required.each do |member_name| if values[member_name].nil? param = "#{context}[#{member_name.inspect}]" errors << "missing required parameter #{param}" @@ -45,9 +47,9 @@ def structure(structure, values, errors, context) # validate non-nil members values.each do |name, value| unless value.nil? - if structure.member?(name) - member_shape = structure.member(name) - shape(member_shape, value, errors, context + "[#{name.inspect}]") + if shape.member?(name) + member_ref = shape.member(name) + shape(member_ref, value, errors, context + "[#{name.inspect}]") else errors << "unexpected value at #{context}[#{name.inspect}]" end @@ -55,7 +57,7 @@ def structure(structure, values, errors, context) end end - def list(list, values, errors, context) + def list(ref, values, errors, context) # ensure the value is an array unless values.is_a?(Array) errors << "expected #{context} to be an array" @@ -63,27 +65,30 @@ def list(list, values, errors, context) end # validate members + member_ref = ref.shape.member values.each.with_index do |value, index| - shape(list.member, value, errors, context + "[#{index}]") + shape(member_ref, value, errors, context + "[#{index}]") end end - def map(map, values, errors, context) + def map(ref, values, errors, context) + return unless hash?(values, errors, context) + + key_ref = ref.shape.key + value_ref = ref.shape.value + values.each do |key, value| - shape(map.key, key, errors, "#{context} #{key.inspect} key") - shape(map.value, value, errors, context + "[#{key.inspect}]") + shape(key_ref, key, errors, "#{context} #{key.inspect} key") + shape(value_ref, value, errors, context + "[#{key.inspect}]") end end - def shape(shape, value, errors, context) - case shape - when StructureShape - structure(shape, value, errors, context) - when ListShape - list(shape, value, errors, context) - when MapShape - map(shape, value, errors, context) + def shape(ref, value, errors, context) + case ref.shape + when StructureShape then structure(ref, value, errors, context) + when ListShape then list(ref, value, errors, context) + when MapShape then map(ref, value, errors, context) when StringShape unless value.is_a?(String) errors << "expected #{context} to be a string" @@ -108,6 +113,8 @@ def shape(shape, value, errors, context) unless io_like?(value) or value.is_a?(String) errors << "expected #{context} to be a string or IO object" end + else + raise "unhandled shape type: #{ref.shape.class.name}" end end diff --git a/aws-sdk-core/spec/aws/param_validator_spec.rb b/aws-sdk-core/spec/aws/param_validator_spec.rb index 636f13e4401..538408a3c49 100644 --- a/aws-sdk-core/spec/aws/param_validator_spec.rb +++ b/aws-sdk-core/spec/aws/param_validator_spec.rb @@ -1,15 +1,18 @@ +require 'spec_helper' + module Aws describe ParamValidator do - let(:rules) {{ 'type' => 'structure', 'members' => {} }} + let(:shapes) { ApiHelper.sample_shapes } def validate(params, expected_errors = []) - shape = Model::Shapes::Shape.new(rules) + shape_map = Api::ShapeMap.new(shapes) + rules = shape_map.shape_ref('shape' => 'StructureShape') if expected_errors.empty? - ParamValidator.new(shape).validate!(params) + ParamValidator.new(rules).validate!(params) else expect { - ParamValidator.new(shape).validate!(params) + ParamValidator.new(rules).validate!(params) }.to raise_error(ArgumentError) do |error| match_errors(error, expected_errors) end @@ -38,20 +41,9 @@ def match_errors(error, expected_errors) describe 'structures' do it 'validates nested structures' do - rules['members'] = { - 'config' => { - 'type' => 'structure', - 'members' => { - 'settings' => { - 'type' => 'structure', - 'members' => {} - } - } - } - } validate('abc', 'expected params to be a hash') - validate({ config: 'abc' }, 'expected params[:config] to be a hash') - validate({ config: { settings: 'abc' }}, 'expected params[:config][:settings] to be a hash') + validate({ nested: 'abc' }, 'expected params[:nested] to be a hash') + validate({ nested: { nested: 'abc' }}, 'expected params[:nested][:nested] to be a hash') end it 'accepts hashes' do @@ -59,11 +51,8 @@ def match_errors(error, expected_errors) end it 'raises an error when a required paramter is missing' do - rules['required'] = %w(name) - rules['members'] = { - 'name' => { 'type' => 'string' } - } - validate({}, 'missing required parameter params[:name]') + shapes['StructureShape']['required'] = %w(String) + validate({}, 'missing required parameter params[:string]') end it 'raises an error when a given parameter is unexpected' do @@ -71,117 +60,65 @@ def match_errors(error, expected_errors) end it 'accepts members that pass validation' do - rules['required'] = %w(name) - rules['members'] = { - 'name' => { 'type' => 'string' } - } - validate(name: 'john doe') + shapes['StructureShape']['required'] = %w(String) + validate(string: 'abc') end it 'aggregates errors for members' do - rules['required'] = %w(name) - rules['members'] = { - 'name' => { 'type' => 'string' } - } - validate({foo: 'bar'}, [ - 'missing required parameter params[:name]', - 'unexpected value at params[:foo]' + shapes['StructureShape']['required'] = %w(String) + validate({nested: { foo: 'bar' }}, [ + 'missing required parameter params[:string]', + 'missing required parameter params[:nested][:string]', + 'unexpected value at params[:nested][:foo]' ]) end - it 'provides a helpful context for nested params' do - rules['members'] = { - 'config' => { - 'type' => 'structure', - 'required' => %w(name), - 'members' => { - 'name' => { 'type' => 'string' } - } - } - } - validate({ config: {} }, - 'missing required parameter params[:config][:name]') - end - end describe 'lists' do - before(:each) do - rules['members'] = { - # list of strings - 'names' => { - 'type' => 'list', - 'member' => { 'type' => 'string' } - }, - # list of structures - 'filters' => { - 'type' => 'list', - 'member' => { - 'type' => 'structure', - 'members' => { - 'values' => { - 'type' => 'list', - 'member' => { 'type' => 'string' } - } - } - } - } - } - end - it 'accepts arrays' do - validate(names: []) - validate(names: %w(abc mno xyz)) + validate(number_list: []) + validate(nested_list: [{}, {}]) end it 'expects the value to be an array' do - validate({ names: [] }) - validate({ names: 'abc' }, 'expected params[:names] to be an array') + validate({ nested_list: [] }) + validate({ nested_list: 'abc' }, 'expected params[:nested_list] to be an array') end it 'validates each member of the list' do - validate({ filters: [{}] }) - validate({ filters: ['abc'] }, - 'expected params[:filters][0] to be a hash') - validate({ filters: [{}, 'abc'] }, - 'expected params[:filters][1] to be a hash') - validate({ filters: [{ values: 'abc' }] }, - 'expected params[:filters][0][:values] to be an array') - validate({ filters: [{ value: 'abc' }] }, - 'unexpected value at params[:filters][0][:value]') + validate({ nested_list: [{}] }) + validate({ number_list: ['abc'] }, + 'expected params[:number_list][0] to be an integer') + validate({ nested_list: [{}, 'abc'] }, + 'expected params[:nested_list][1] to be a hash') + validate({ nested_list: [{ number_list: ['abc'] }] }, + 'expected params[:nested_list][0][:number_list][0] to be an integer') + validate({ nested_list: [{ foo: 'abc' }] }, + 'unexpected value at params[:nested_list][0][:foo]') end end describe 'maps' do - before(:each) do - rules['members'] = { - 'attributes' => { - 'type' => 'map', - 'key' => { 'type' => 'string' }, - 'value' => { 'type' => 'integer' } - } - } - end - it 'accepts hashes' do - validate({ attributes: {}}) - validate({ attributes: 'abc' }, - 'expected params[:attributes] to be a hash') + validate({ string_map: {}}) + validate({ string_map: 'abc' }, + 'expected params[:string_map] to be a hash') end it 'validates map keys' do - validate({ attributes: { 'foo' => 123 }}) - validate({ attributes: { 123 => 456 }}, - 'expected params[:attributes] 123 key to be a string') + validate({ string_map: { 'abc' => 'mno' }}) + validate({ string_map: { 123 => 'xyz' }}, + 'expected params[:string_map] 123 key to be a string') end it 'validates map values' do - validate({ attributes: { 'foo' => 123 }}) - validate({ attributes: { 'foo' => 'bar' }}, - 'expected params[:attributes]["foo"] to be an integer') + validate({ string_map: { 'foo' => 'bar' }}) + validate({ string_map: { 'foo' => 123 }}, + 'expected params[:string_map]["foo"] to be a string') end end @@ -189,9 +126,8 @@ def match_errors(error, expected_errors) describe 'integers' do it 'accepts integers' do - rules['members'] = { 'count' => { 'type' => 'integer' } } - validate(count: 123) - validate({ count: '123' }, 'expected params[:count] to be an integer') + validate(integer: 123) + validate({ integer: '123' }, 'expected params[:integer] to be an integer') end end @@ -199,9 +135,8 @@ def match_errors(error, expected_errors) describe 'floats' do it 'accepts integers' do - rules['members'] = { 'price' => { 'type' => 'float' } } - validate(price: 123.0) - validate({ price: 123 }, 'expected params[:price] to be a float') + validate(float: 123.0) + validate({ float: 123 }, 'expected params[:float] to be a float') end end @@ -209,20 +144,8 @@ def match_errors(error, expected_errors) describe 'timestamps' do it 'accepts time objects' do - rules['members'] = { - 'a' => { 'type' => 'timestamp' }, - 'b' => { 'type' => 'timestamp', 'metadata' => { 'timestamp_format' => 'iso8601' }}, - 'c' => { 'type' => 'timestamp', 'metadata' => { 'timestamp_format' => 'rfc822' }}, - 'd' => { 'type' => 'timestamp', 'metadata' => { 'timestamp_format' => 'unix_timestamp' }}, - } - validate(a: Time.now) - validate(b: Time.now) - validate(c: Time.now) - validate(d: Time.now) - validate({a: 12345}, 'expected params[:a] to be a Time object') - validate({b: '2013-01-01'}, 'expected params[:b] to be a Time object') - validate({c: DateTime.now}, 'expected params[:c] to be a Time object') - validate({d: Date.new}, 'expected params[:d] to be a Time object') + validate(timestamp: Time.now) + validate({timestamp: Date.new}, 'expected params[:timestamp] to be a Time object') end end @@ -230,11 +153,10 @@ def match_errors(error, expected_errors) describe 'booleans' do it 'accepts TrueClass and FalseClass' do - rules['members'] = { 'enabled' => { 'type' => 'boolean' } } - validate(enabled: true) - validate(enabled: false) - validate({ enabled: 'true' }, - 'expected params[:enabled] to be true or false') + validate(boolean: true) + validate(boolean: false) + validate({ boolean: 'true' }, + 'expected params[:boolean] to be true or false') end end @@ -242,20 +164,10 @@ def match_errors(error, expected_errors) describe 'blobs' do it 'accepts strings and io objects for payload members' do - rules['payload'] = 'data' - rules['members'] = { - 'data' => { 'type' => 'blob' } - } - validate(data: StringIO.new('abc')) - validate(data: double('d', :read => 'abc', :size => 3, :rewind => 0)) - validate({ data: 'abc' }) - end - - it 'accepts string objects for non-payload members' do - rules['members'] = { 'data' => { 'type' => 'blob' } } - validate(data: 'YQ==') - validate({ data: 123 }, - 'expected params[:data] to be a string or IO object') + validate(blob: StringIO.new('abc')) + validate(blob: double('d', :read => 'abc', :size => 3, :rewind => 0)) + validate({ blob: 'abc' }) + validate({ blob: 123 }, 'expected params[:blob] to be a string or IO object') end end @@ -263,9 +175,8 @@ def match_errors(error, expected_errors) describe 'strings' do it 'accepts string objects' do - rules['members'] = { 'name' => { 'type' => 'string' } } - validate(name: 'john doe') - validate({ name: 123 }, 'expected params[:name] to be a string') + validate(string: 'john doe') + validate({ string: 123 }, 'expected params[:string] to be a string') end end From 31d964ed1012a783c80b2912340f350eb9fccfb0 Mon Sep 17 00:00:00 2001 From: Trevor Rowe Date: Wed, 6 May 2015 10:12:38 -0700 Subject: [PATCH 012/101] Updated the ParamConverter to use the new Seahorse shapes. --- .../lib/aws-sdk-core/param_converter.rb | 45 +++++----- aws-sdk-core/spec/aws/param_converter_spec.rb | 87 +++++++------------ 2 files changed, 51 insertions(+), 81 deletions(-) diff --git a/aws-sdk-core/lib/aws-sdk-core/param_converter.rb b/aws-sdk-core/lib/aws-sdk-core/param_converter.rb index 76ec0178fac..8894f3d64e3 100644 --- a/aws-sdk-core/lib/aws-sdk-core/param_converter.rb +++ b/aws-sdk-core/lib/aws-sdk-core/param_converter.rb @@ -13,25 +13,25 @@ class ParamConverter @mutex = Mutex.new @converters = Hash.new { |h,k| h[k] = {} } - def initialize(shape) - @shape = shape + def initialize(rules) + @rules = rules end # @param [Hash] params # @return [Hash] def convert(params) - structure(@shape, params) + structure(@rules, params) end private - def structure(structure, values) - values = c(structure, values) + def structure(ref, values) + values = c(ref, values) if values.is_a?(Hash) values.each do |k, v| unless v.nil? - if structure.member?(k) - values[k] = member(structure.member(k), v) + if ref.shape.member?(k) + values[k] = member(ref.shape.member(k), v) end end end @@ -39,44 +39,41 @@ def structure(structure, values) values end - def list(list, values) - values = c(list, values) + def list(ref, values) + values = c(ref, values) if values.is_a?(Array) - values.map { |v| member(list.member, v) } + values.map { |v| member(ref.shape.member, v) } else values end end - def map(map, values) - values = c(map, values) + def map(ref, values) + values = c(ref, values) if values.is_a?(Hash) values.each.with_object({}) do |(key, value), hash| - hash[member(map.key, key)] = member(map.value, value) + hash[member(ref.shape.key, key)] = member(ref.shape.value, value) end else values end end - def member(shape, value) - case shape - when StructureShape then structure(shape, value) - when ListShape then list(shape, value) - when MapShape then map(shape, value) - else c(shape, value) + def member(ref, value) + case ref.shape + when StructureShape then structure(ref, value) + when ListShape then list(ref, value) + when MapShape then map(ref, value) + else c(ref, value) end end - def c(shape, value) - self.class.c(shape.class, value) + def c(ref, value) + self.class.c(ref.shape.class, value) end class << self - # @param [Model::Shapes::InputShape] shape - # @param [Hash] params - # @return [Hash] def convert(shape, params) new(shape).convert(params) end diff --git a/aws-sdk-core/spec/aws/param_converter_spec.rb b/aws-sdk-core/spec/aws/param_converter_spec.rb index a232615c2a0..1f6e93467f9 100644 --- a/aws-sdk-core/spec/aws/param_converter_spec.rb +++ b/aws-sdk-core/spec/aws/param_converter_spec.rb @@ -1,3 +1,4 @@ +require 'spec_helper' require 'stringio' module Aws @@ -5,61 +6,33 @@ module Aws describe 'convert' do + let(:shapes) { ApiHelper.sample_shapes } + + let(:rules) { + Api::ShapeMap.new(shapes).shape_ref('shape' => 'StructureShape') + } + it 'performs a deeply nested conversion of values' do - rules = Model::Shapes::Shape.new({ - 'type' => 'structure', - 'members' => { - 'username' => { 'type' => 'string' }, - 'config' => { - 'type' => 'structure', - 'members' => { - 'enabled' => { 'type' => 'boolean' }, - 'settings' => { - 'type' => 'map', - 'key' => { 'type' => 'string' }, - 'value' => { 'type' => 'string' }, - }, - 'counts' => { - 'type' => 'list', - 'member' => { - 'type' => 'structure', - 'members' => { - 'value' => { 'type' => 'integer' } - } - }, - } - } - } - } - }) data = double('data') - config = Struct.new(:enabled, :settings, :counts, :unknown) - config = config.new(true, { color: :red }, [ - { value: 1 }, - { value: 2.0 }, - { value: '3' }, + params = Struct.new(:boolean, :string_map, :nested_list, :unknown) + params = params.new(true, { color: :red }, [ + { integer: 1 }, + { integer: 2.0 }, + { integer: '3' }, ], data) - params = { - username: :johndoe, - config: config - } - converted = ParamConverter.convert(rules, params) expect(converted).to eq({ - username: 'johndoe', - config: { - enabled: true, - settings: { 'color' => 'red' }, - counts: [ - { value: 1 }, - { value: 2 }, - { value: 3 }, - ], - unknown: data - } + boolean: true, + string_map: { 'color' => 'red' }, + nested_list: [ + { integer: 1 }, + { integer: 2 }, + { integer: 3 }, + ], + unknown: data }) end @@ -76,7 +49,7 @@ module Aws end it 'returns the value unmodified if the value class is unknown' do - shape_class = Model::Shapes::String + shape_class = Seahorse::Model::Shapes::StringShape value = double('raw') expect(ParamConverter.c(shape_class, value)).to be(value) end @@ -85,7 +58,7 @@ module Aws describe 'structures' do - let(:shape_class) { Model::Shapes::Structure } + let(:shape_class) { Seahorse::Model::Shapes::StructureShape } it 'returns duplicate hashes' do value = { a: 1 } @@ -104,7 +77,7 @@ module Aws describe 'maps' do - let(:shape_class) { Model::Shapes::Map } + let(:shape_class) { Seahorse::Model::Shapes::MapShape } it 'returns duplicate hashes' do value = { a: 1 } @@ -123,7 +96,7 @@ module Aws describe 'lists' do - let(:shape_class) { Model::Shapes::List } + let(:shape_class) { Seahorse::Model::Shapes::ListShape } it 'duplicates arrays' do value = [1,2,3] @@ -142,7 +115,7 @@ module Aws describe 'strings' do - let(:shape_class) { Model::Shapes::String } + let(:shape_class) { Seahorse::Model::Shapes::StringShape } it 'returns strings unmodified' do expect(ParamConverter.c(shape_class, 'abc')).to eq('abc') @@ -156,7 +129,7 @@ module Aws describe 'integers' do - let(:shape_class) { Model::Shapes::Integer } + let(:shape_class) { Seahorse::Model::Shapes::IntegerShape } it 'returns integers unmodified' do expect(ParamConverter.c(shape_class, 123)).to eq(123) @@ -178,7 +151,7 @@ module Aws describe 'floats' do - let(:shape_class) { Model::Shapes::Float } + let(:shape_class) { Seahorse::Model::Shapes::FloatShape } it 'returns floats unmodified' do expect(ParamConverter.c(shape_class, 12.34)).to eq(12.34) @@ -200,7 +173,7 @@ module Aws describe 'timestamps' do - let(:shape_class) { Model::Shapes::Timestamp } + let(:shape_class) { Seahorse::Model::Shapes::TimestampShape } it 'returns Time objects unmodfied' do time = Time.now @@ -241,7 +214,7 @@ module Aws describe 'booleans' do - let(:shape_class) { Model::Shapes::Boolean } + let(:shape_class) { Seahorse::Model::Shapes::BooleanShape } it 'returns true and false' do expect(ParamConverter.c(shape_class, true)).to be(true) @@ -256,7 +229,7 @@ module Aws describe 'blobs' do - let(:shape_class) { Model::Shapes::Blob } + let(:shape_class) { Seahorse::Model::Shapes::BlobShape } it 'accepts io objects (like file)' do file = File.open(__FILE__, 'r') From d2cb37b40a9111f98c74e992812363522c09cf2d Mon Sep 17 00:00:00 2001 From: Trevor Rowe Date: Wed, 6 May 2015 11:37:19 -0700 Subject: [PATCH 013/101] Updated the Query handler and ec2 builder for the new shapes. Query protocol clients now work as expected. --- aws-sdk-core/lib/aws-sdk-core/api/builder.rb | 2 +- .../aws-sdk-core/query/ec2_param_builder.rb | 63 +++++++++---------- .../lib/aws-sdk-core/query/handler.rb | 43 +++++++------ aws-sdk-core/lib/seahorse/client/base.rb | 2 + .../lib/seahorse/client/plugins/endpoint.rb | 2 +- .../client/plugins/restful_bindings.rb | 4 +- aws-sdk-core/lib/seahorse/model/shapes.rb | 11 +++- 7 files changed, 70 insertions(+), 57 deletions(-) diff --git a/aws-sdk-core/lib/aws-sdk-core/api/builder.rb b/aws-sdk-core/lib/aws-sdk-core/api/builder.rb index 86a0df22f92..a4203fab9de 100644 --- a/aws-sdk-core/lib/aws-sdk-core/api/builder.rb +++ b/aws-sdk-core/lib/aws-sdk-core/api/builder.rb @@ -49,7 +49,7 @@ def build_operation(name, definition, shapes) op = Seahorse::Model::Operation.new op.name = name op.http_method = http['method'] - op.http_request_uri = http['requestUri'] + op.http_request_uri = http['requestUri'] || '/' op.documentation = definition['documentation'] op.deprecated = !!definition['deprecated'] op.input = shapes.shape_ref(definition['input']) diff --git a/aws-sdk-core/lib/aws-sdk-core/query/ec2_param_builder.rb b/aws-sdk-core/lib/aws-sdk-core/query/ec2_param_builder.rb index 4b8d163c916..ff350c9ecc4 100644 --- a/aws-sdk-core/lib/aws-sdk-core/query/ec2_param_builder.rb +++ b/aws-sdk-core/lib/aws-sdk-core/query/ec2_param_builder.rb @@ -4,69 +4,55 @@ module Aws module Query class EC2ParamBuilder - # @param [ParamList] param_list + include Seahorse::Model::Shapes + def initialize(param_list) @params = param_list end - # @return [ParamList] attr_reader :params - # Serializes the `params` hash onto {#param_list} following the rules - # provided by `shape`. - # rules provided by `shape`. - # @param [Seahorse::Model::Shapes::Structure] shape - # @param [Hash] params - # @return [void] - def apply(shape, params) - structure(shape, params, '') + def apply(ref, params) + structure(ref, params, '') end private - # @param [Seahorse::Model::Shapes::Structure] structure - # @param [Hash] values - # @param [String, nil] prefix - def structure(structure, values, prefix) + def structure(ref, values, prefix) + shape = ref.shape values.each do |name, value| unless value.nil? - member_shape = structure.member(name) - format(member_shape, value, prefix + query_name(member_shape)) + member_ref = shape.member(name) + format(member_ref, value, prefix + query_name(member_ref)) end end end - # @param [Seahorse::Model::Shapes::List] list - # @param [Array] values - # @param [String] prefix - def list(list, values, prefix) + def list(ref, values, prefix) if values.empty? set(prefix, '') else + member_ref = ref.shape.member values.each.with_index do |value, n| - format(list.member, value, "#{prefix}.#{n+1}") + format(member_ref, value, "#{prefix}.#{n+1}") end end end - # @param [Seahorse::Model::Shapes::Shape] shape - # @param [Object] value - # @param [String] prefix - def format(shape, value, prefix) - case shape.type - when 'structure' then structure(shape, value, prefix + '.') - when 'list' then list(shape, value, prefix) - when 'map' then raise NotImplementedError - when 'blob' then set(prefix, Base64.strict_encode64(value.read)) - when 'timestamp' - set(prefix, shape.format_time(value, 'iso8601').to_s) + def format(ref, value, prefix) + case ref.shape + when StructureShape then structure(ref, value, prefix + '.') + when ListShape then list(ref, value, prefix) + when MapShape then raise NotImplementedError + when BlobShape then set(prefix, blob(value)) + when TimestampShape then set(prefix, timestamp(value)) else set(prefix, value.to_s) end end - def query_name(shape) - shape.metadata('queryName') || ucfirst(shape.location_name) + def query_name(ref) + ref['queryName'] || ucfirst(ref.location_name) end def set(name, value) @@ -77,6 +63,15 @@ def ucfirst(str) str[0].upcase + str[1..-1] end + def blob(value) + value = value.read unless String === value + Base64.strict_encode64(value) + end + + def timestamp(value) + value.utc.iso8601 + end + end end end diff --git a/aws-sdk-core/lib/aws-sdk-core/query/handler.rb b/aws-sdk-core/lib/aws-sdk-core/query/handler.rb index 89c2e6077cc..8f467673d7b 100644 --- a/aws-sdk-core/lib/aws-sdk-core/query/handler.rb +++ b/aws-sdk-core/lib/aws-sdk-core/query/handler.rb @@ -2,8 +2,19 @@ module Aws module Query class Handler < Seahorse::Client::Handler + include Seahorse::Model::Shapes + CONTENT_TYPE = 'application/x-www-form-urlencoded; charset=utf-8' + METADATA_REF = begin + request_id = ShapeRef.new( + shape: StringShape.new, + location_name: 'RequestId') + response_metadata = StructureShape.new + response_metadata.add_member(:request_id, request_id) + ShapeRef.new(shape: response_metadata, location_name: 'ResponseMetadata') + end + # @param [Seahorse::Client::RequestContext] context # @return [Seahorse::Client::Response] def call(context) @@ -32,9 +43,9 @@ def apply_params(param_list, params, rules) end def parse_xml(context) - if rules = context.operation.output - data = Xml::Parser.new(apply_wrapper(rules)).parse(xml(context)) - remove_wrapper(data, context, rules) + if context.operation.output + data = Xml::Parser.new(rules(context)).parse(xml(context)) + remove_wrapper(data, context) else EmptyStructure.new end @@ -44,24 +55,20 @@ def xml(context) context.http_response.body_contents end - def apply_wrapper(shape) - Seahorse::Model::Shapes::Structure.new({ - 'members' => { - shape.metadata('resultWrapper') => shape.definition, - 'ResponseMetadata' => { - 'type' => 'structure', - 'members' => { - 'RequestId' => { 'type' => 'string' } - } - } - } - }, shape_map: shape.shape_map) + def rules(context) + shape = Seahorse::Model::Shapes::StructureShape.new + shape.add_member(:result, ShapeRef.new( + shape: context.operation.output.shape, + location_name: context.operation.name + 'Result' + )) + shape.add_member(:response_metadata, METADATA_REF) + ShapeRef.new(shape: shape) end - def remove_wrapper(data, context, rules) - if context.operation.output.metadata('resultWrapper') + def remove_wrapper(data, context) + if context.operation.output['resultWrapper'] context[:request_id] = data.response_metadata.request_id - data[data.members.first] || Structure.new(rules.member_names) + data.result || Structure.new(context.operation.output.shape.member_names) else data end diff --git a/aws-sdk-core/lib/seahorse/client/base.rb b/aws-sdk-core/lib/seahorse/client/base.rb index 44ac9072bc6..3322ff19cae 100644 --- a/aws-sdk-core/lib/seahorse/client/base.rb +++ b/aws-sdk-core/lib/seahorse/client/base.rb @@ -179,6 +179,8 @@ def api # @return [Model::Api] def set_api(api) @api = api + define_operation_methods + @api end # @option options [Model::Api, Hash] :api ({}) diff --git a/aws-sdk-core/lib/seahorse/client/plugins/endpoint.rb b/aws-sdk-core/lib/seahorse/client/plugins/endpoint.rb index 409a491bd95..b6145cb4773 100644 --- a/aws-sdk-core/lib/seahorse/client/plugins/endpoint.rb +++ b/aws-sdk-core/lib/seahorse/client/plugins/endpoint.rb @@ -67,7 +67,7 @@ def apply_querystring_params(uri, context) parts.compact! if input = context.operation.input params = context.params - input.members.each do |member_name, member| + input.shape.members.each do |member_name, member| if member.location == 'querystring' && !params[member_name].nil? param_name = member.location_name param_value = params[member_name] diff --git a/aws-sdk-core/lib/seahorse/client/plugins/restful_bindings.rb b/aws-sdk-core/lib/seahorse/client/plugins/restful_bindings.rb index 160eb949825..2a3a39ad085 100644 --- a/aws-sdk-core/lib/seahorse/client/plugins/restful_bindings.rb +++ b/aws-sdk-core/lib/seahorse/client/plugins/restful_bindings.rb @@ -104,8 +104,8 @@ def parse_header_value(shape, value) end end - def each_member(shape, &block) - shape.members.each(&block) if shape + def each_member(ref, &block) + ref.shape.members.each(&block) if ref end end diff --git a/aws-sdk-core/lib/seahorse/model/shapes.rb b/aws-sdk-core/lib/seahorse/model/shapes.rb index 059c7375641..429d3c34f20 100644 --- a/aws-sdk-core/lib/seahorse/model/shapes.rb +++ b/aws-sdk-core/lib/seahorse/model/shapes.rb @@ -6,8 +6,17 @@ module Shapes class ShapeRef - def initialize + def initialize(options = {}) @metadata = {} + options.each do |key, value| + if key == :metadata + value.each do |k,v| + self[k] = v + end + else + send("#{key}=", value) + end + end end # @return [Shape] From a8df86cb1a295be7bcb8c5e473eae78d38a2d79f Mon Sep 17 00:00:00 2001 From: Trevor Rowe Date: Wed, 6 May 2015 13:53:50 -0700 Subject: [PATCH 014/101] The api builder shape map now applied ALL traits. Previously, only white-listed traits were applied to the metadata for the shapes and shape refs. Now all traits in the source API will be applied. Non-modeled traits are treated as metadata. --- .../lib/aws-sdk-core/api/shape_map.rb | 67 ++++++++++--------- 1 file changed, 34 insertions(+), 33 deletions(-) diff --git a/aws-sdk-core/lib/aws-sdk-core/api/shape_map.rb b/aws-sdk-core/lib/aws-sdk-core/api/shape_map.rb index c0c5ba04502..fc02a6b8ef9 100644 --- a/aws-sdk-core/lib/aws-sdk-core/api/shape_map.rb +++ b/aws-sdk-core/lib/aws-sdk-core/api/shape_map.rb @@ -20,10 +20,6 @@ class ShapeMap 'timestamp' => TimestampShape, } - SHAPE_ATTRS = Set.new(%w(min max documentation)) - - SHAPE_METADATA = Set.new(%w(xmlNamespace flattened)) - # @param [ShapeMap] shapes def initialize(definitions) @shapes = {} @@ -40,17 +36,12 @@ def [](shape_name) def shape_ref(definition, options = {}) if definition - ref = ShapeRef.new - ref.location_name = options[:location_name] - definition.each do |key, value| - case key - when 'shape' then ref.shape = self[value] - when 'location' then ref.location = value - when 'locationName' then ref.location_name = value - else ref[key] = value - end - end - ref + meta = definition.dup + ShapeRef.new( + shape: self[meta.delete('shape')], + location: meta.delete('location'), + location_name: meta.delete('locationName') || options[:location_name], + metadata: meta) else nil end @@ -65,38 +56,48 @@ def build_shapes(definitions) @shapes[name] = shape end definitions.each do |name, definition| - populate_shape(@shapes[name], definition) - end - end - - def populate_shape(shape, definition) - apply_shape_refs(shape, definition) - definition.each do |key, value| - case - when SHAPE_ATTRS.include?(key) then shape.send("#{key}=", value) - when SHAPE_METADATA.include?(key) then shape[key] = value - when key == 'enum' then shape.enum = Set.new(value) - end + shape = @shapes[name] + traits = definition.dup + apply_shape_refs(shape, traits) + apply_shape_traits(shape, traits) end end - def apply_shape_refs(shape, definition) + def apply_shape_refs(shape, traits) case shape when StructureShape - required = Set.new(definition['required'] || []) - definition['members'].each do |member_name, ref| + required = Set.new(traits.delete('required') || []) + traits.delete('members').each do |member_name, ref| name = underscore(member_name) ref = shape_ref(ref, location_name: member_name) shape.add_member(name, ref, required: required.include?(member_name)) end when ListShape - shape.member = shape_ref(definition['member']) + shape.member = shape_ref(traits.delete('member')) when MapShape - shape.key = shape_ref(definition['key']) - shape.value = shape_ref(definition['value']) + shape.key = shape_ref(traits.delete('key')) + shape.value = shape_ref(traits.delete('value')) end end + def apply_shape_traits(shape, traits) + shape.enum = Set.new(traits.delete('enum')) if traits.key?('enum') + shape.min = traits.delete('min') if traits.key?('min') + shape.max = traits.delete('max') if traits.key?('max') + shape.documentation = traits.delete('documentation') + if payload = traits.delete('payload') + shape[:payload] = underscore(payload) + shape[:payload_member] = shape.member(shape[:payload]) + end + traits.each do |key, value| + shape[key] = value + end + end + + def apply_payload(ref, name) + ref['payload'] = underscore(name).to_sym + end + def underscore(str) Seahorse::Util.underscore(str).to_sym end From 820c0dc2031f1d5222b1d9dcb709207ae38ca29a Mon Sep 17 00:00:00 2001 From: Trevor Rowe Date: Wed, 6 May 2015 17:46:53 -0700 Subject: [PATCH 015/101] Updated usage of payload, payload member and response stubbing. --- .../lib/aws-sdk-core/api/operation_example.rb | 4 +- .../lib/aws-sdk-core/api/shape_map.rb | 2 +- aws-sdk-core/lib/aws-sdk-core/client_stubs.rb | 74 +++++++++--------- .../lib/aws-sdk-core/json/rest_handler.rb | 13 +--- .../lib/aws-sdk-core/json/rpc_body_handler.rb | 4 +- .../lib/aws-sdk-core/param_validator.rb | 2 +- .../aws-sdk-core/plugins/stub_responses.rb | 6 +- .../lib/aws-sdk-core/rest_body_handler.rb | 77 +++++++------------ .../lib/aws-sdk-core/xml/rest_handler.rb | 13 +--- .../lib/seahorse/client/plugins/endpoint.rb | 2 +- aws-sdk-core/lib/seahorse/model/shapes.rb | 6 -- 11 files changed, 81 insertions(+), 122 deletions(-) diff --git a/aws-sdk-core/lib/aws-sdk-core/api/operation_example.rb b/aws-sdk-core/lib/aws-sdk-core/api/operation_example.rb index c8c591e4850..5f2641518cb 100644 --- a/aws-sdk-core/lib/aws-sdk-core/api/operation_example.rb +++ b/aws-sdk-core/lib/aws-sdk-core/api/operation_example.rb @@ -10,8 +10,8 @@ def initialize(options) @operation = options[:operation] @streaming_output = !!( @operation.output && - @operation.output.payload_member && - @operation.output.payload_member.definition['streaming'] + @operation.output.shape[:payload] && + @operation.output.shape[:payload_member].shape['streaming'] ) end diff --git a/aws-sdk-core/lib/aws-sdk-core/api/shape_map.rb b/aws-sdk-core/lib/aws-sdk-core/api/shape_map.rb index fc02a6b8ef9..2708167c877 100644 --- a/aws-sdk-core/lib/aws-sdk-core/api/shape_map.rb +++ b/aws-sdk-core/lib/aws-sdk-core/api/shape_map.rb @@ -56,8 +56,8 @@ def build_shapes(definitions) @shapes[name] = shape end definitions.each do |name, definition| - shape = @shapes[name] traits = definition.dup + shape = @shapes[name] apply_shape_refs(shape, traits) apply_shape_traits(shape, traits) end diff --git a/aws-sdk-core/lib/aws-sdk-core/client_stubs.rb b/aws-sdk-core/lib/aws-sdk-core/client_stubs.rb index d01473fcec0..05b147c73c0 100644 --- a/aws-sdk-core/lib/aws-sdk-core/client_stubs.rb +++ b/aws-sdk-core/lib/aws-sdk-core/client_stubs.rb @@ -103,9 +103,6 @@ def next_stub(operation_name) private - # @param [Symbol] operation_name - # @param [Hash, nil] data - # @return [Structure] def new_stub(operation_name, data = nil) Stub.new(operation(operation_name).output).format(data || {}) end @@ -130,61 +127,62 @@ def service_error_class(name) class Stub - # @param [Seahorse::Models::Shapes::Structure] output_shape This should - # be the output shape for an operation. - def initialize(output_shape) - @shape = output_shape + include Seahorse::Model::Shapes + + # @param [Seahorse::Models::Shapes::ShapeRef] rules + def initialize(rules) + @rules = rules end # @param [Hash] data An optional hash of data to format into the stubbed # object. def format(data = {}) - if @shape.nil? + if @rules.nil? empty_stub(data) else validate_data(data) - stub(@shape, data) + stub(@rules, data) end end private - def stub(shape, value) - case shape - when Seahorse::Model::Shapes::Structure then stub_structure(shape, value) - when Seahorse::Model::Shapes::List then stub_list(shape, value || []) - when Seahorse::Model::Shapes::Map then stub_map(shape, value || {}) - else stub_scalar(shape, value) + def stub(ref, value) + case ref.shape + when StructureShape then stub_structure(ref, value) + when ListShape then stub_list(ref, value || []) + when MapShape then stub_map(ref, value || {}) + else stub_scalar(ref, value) end end - def stub_structure(shape, hash) + def stub_structure(ref, hash) if hash - structure_obj(shape, hash) + structure_obj(ref, hash) else nil end end - def structure_obj(shape, hash) - stubs = Structure.new(shape.member_names) - shape.members.each do |member_name, member_shape| + def structure_obj(ref, hash) + stubs = Structure.new(ref.shape.member_names) + ref.shape.members.each do |member_name, member_ref| if hash.key?(member_name) && hash[member_name].nil? stubs[member_name] = nil else - value = structure_value(shape, member_name, member_shape, hash) - stubs[member_name] = stub(member_shape, value) + value = structure_value(ref, member_name, member_ref, hash) + stubs[member_name] = stub(member_ref, value) end end stubs end - def structure_value(shape, member_name, member_shape, hash) + def structure_value(ref, member_name, member_ref, hash) if hash.key?(member_name) hash[member_name] elsif - Seahorse::Model::Shapes::Structure === member_shape && - shape.required.include?(member_name) + StructureShape === member_ref.shape && + ref.shape.required.include?(member_name) then {} else @@ -192,30 +190,30 @@ def structure_value(shape, member_name, member_shape, hash) end end - def stub_list(shape, array) + def stub_list(ref, array) stubs = [] array.each do |value| - stubs << stub(shape.member, value) + stubs << stub(ref.shape.member, value) end stubs end - def stub_map(shape, value) + def stub_map(ref, value) stubs = {} value.each do |key, value| - stubs[key] = stub(shape.value, value) + stubs[key] = stub(ref.shape.value, value) end stubs end - def stub_scalar(shape, value) + def stub_scalar(ref, value) if value.nil? - case shape - when Seahorse::Model::Shapes::String then shape.name - when Seahorse::Model::Shapes::Integer then 0 - when Seahorse::Model::Shapes::Float then 0.0 - when Seahorse::Model::Shapes::Boolean then false - when Seahorse::Model::Shapes::Timestamp then Time.now + case ref.shape + when StringShape then ref.shape.name + when IntegerShape then 0 + when FloatShape then 0.0 + when BooleanShape then false + when TimestampShape then Time.now else nil end else @@ -234,8 +232,8 @@ def empty_stub(data) end def validate_data(data) - args = [@shape, { validate_required:false }] - Seahorse::Client::ParamValidator.new(*args).validate!(data) + args = [@rules, { validate_required:false }] + ParamValidator.new(*args).validate!(data) end end diff --git a/aws-sdk-core/lib/aws-sdk-core/json/rest_handler.rb b/aws-sdk-core/lib/aws-sdk-core/json/rest_handler.rb index 7b8391b354e..867d55801e2 100644 --- a/aws-sdk-core/lib/aws-sdk-core/json/rest_handler.rb +++ b/aws-sdk-core/lib/aws-sdk-core/json/rest_handler.rb @@ -2,17 +2,12 @@ module Aws module Json class RestHandler < RestBodyHandler - # @param [Seahorse::Model::Shapes::Structure] shape - # @param [Hash] params - def serialize_params(shape, params) - Builder.new(shape).to_json(params) + def serialize_params(rules, params) + Builder.new(rules).to_json(params) end - # @param [String] json - # @param [Seahorse::Model::Shapes::Structure] shape - # @param [Structure, nil] target - def parse_body(json, shape, target) - Parser.new(shape).parse(json, target) + def parse_body(json, rules, target) + Parser.new(rules).parse(json, target) end end diff --git a/aws-sdk-core/lib/aws-sdk-core/json/rpc_body_handler.rb b/aws-sdk-core/lib/aws-sdk-core/json/rpc_body_handler.rb index 48b952820d9..f2b369a4016 100644 --- a/aws-sdk-core/lib/aws-sdk-core/json/rpc_body_handler.rb +++ b/aws-sdk-core/lib/aws-sdk-core/json/rpc_body_handler.rb @@ -16,8 +16,8 @@ def call(context) private def build_json(context) - if shape = context.operation.input - context.http_request.body = Builder.new(shape).to_json(context.params) + if rules = context.operation.input + context.http_request.body = Builder.new(rules).to_json(context.params) else context.http_request.body = '{}' end diff --git a/aws-sdk-core/lib/aws-sdk-core/param_validator.rb b/aws-sdk-core/lib/aws-sdk-core/param_validator.rb index 96c594effea..f7179911bee 100644 --- a/aws-sdk-core/lib/aws-sdk-core/param_validator.rb +++ b/aws-sdk-core/lib/aws-sdk-core/param_validator.rb @@ -22,7 +22,7 @@ def initialize(rules, options = {}) # @return [void] def validate!(params) errors = [] - structure(@rules, params, errors, context = 'params') + structure(@rules, params, errors, context = 'params') if @rules raise ArgumentError, error_messages(errors) unless errors.empty? end diff --git a/aws-sdk-core/lib/aws-sdk-core/plugins/stub_responses.rb b/aws-sdk-core/lib/aws-sdk-core/plugins/stub_responses.rb index 62a4e21265d..1cc5367bff4 100644 --- a/aws-sdk-core/lib/aws-sdk-core/plugins/stub_responses.rb +++ b/aws-sdk-core/lib/aws-sdk-core/plugins/stub_responses.rb @@ -60,15 +60,15 @@ def apply_stub(resp, stub) def streaming?(resp) if output = resp.context.operation.output - payload = output.payload_member - payload && payload.definition['streaming'] == true + payload = output.shape[:payload_member] + payload && payload[:streaming] else false end end def stub_http_body(resp) - payload = resp.context.operation.output.payload + payload = resp.context.operation.output.shape[:payload] resp.context.http_response.signal_headers(200, {}) resp.context.http_response.signal_data(resp.data[payload]) resp.context.http_response.signal_done diff --git a/aws-sdk-core/lib/aws-sdk-core/rest_body_handler.rb b/aws-sdk-core/lib/aws-sdk-core/rest_body_handler.rb index 92ed07c51cb..d18ad8a1e0c 100644 --- a/aws-sdk-core/lib/aws-sdk-core/rest_body_handler.rb +++ b/aws-sdk-core/lib/aws-sdk-core/rest_body_handler.rb @@ -21,31 +21,29 @@ def extract_request_id(context) end def build_body(context) - input = context.operation.input + ref = context.operation.input case - when input.nil? - nil - when streaming?(input) - context.params[input.payload] - when input.payload - if params = context.params[input.payload] - serialize_params(input.payload_member, params) + when ref.nil? then nil + when streaming?(ref) then context.params[ref.shape[:payload]] + when ref.shape[:payload] + if params = context.params[ref.shape[:payload]] + serialize_params(ref.shape[:payload_member], params) end else - params = body_params(input, context.params) - serialize_params(input, params) unless params.empty? + params = body_params(ref, context.params) + serialize_params(ref, params) unless params.empty? end end def extract_data(context) - if output = context.operation.output - data = Structure.new(output.member_names) - if streaming?(output) - data[output.payload] = context.http_response.body - elsif output.payload - data[output.payload] = parse(context, output.payload_member) + if ref = context.operation.output + data = Structure.new(ref.shape.member_names) + if streaming?(ref) + data[ref.shape[:payload]] = context.http_response.body + elsif ref.shape[:payload] + data[ref.shape[:payload]] = parse(context, ref.shape[:payload_member]) else - parse(context, output, data) + parse(context, ref, data) end data else @@ -53,57 +51,36 @@ def extract_data(context) end end - def body_members_shape(shape) - if shape.payload - shape.payload_member - else - members = shape.members.each.with_object({}) do |(name, member), hash| - if member.location == 'body' - hash[name.to_s] = member.definition - end - end - definition = shape.definition.merge('members' => members) - options = { shape_map: shape.shape_map } - Seahorse::Model::Shapes::Shape.new(definition, options) - end - end - - def body_params(shape, params) - shape.members.each.with_object({}) do |(member_name, member_shape), hash| - if member_shape.location == 'body' + def body_params(ref, params) + ref.shape.members.inject({}) do |hash, (member_name, member_ref)| + if member_ref.location == 'body' hash[member_name] = params[member_name] if params.key?(member_name) end + hash end end - def streaming?(shape) - shape.payload && ( - Seahorse::Model::Shapes::Blob === shape.payload_member || - Seahorse::Model::Shapes::String === shape.payload_member + def streaming?(ref) + ref.shape[:payload] && ( + Seahorse::Model::Shapes::BlobShape === ref.shape[:payload_member] || + Seahorse::Model::Shapes::StringShape === ref.shape[:payload_member] ) end - def serialize_params(shape, params) + def serialize_params(ref, params) raise NotImplementedError, 'must be defiend in sublcasses' end - def body_contents(context) - context.http_response.body_contents - end - - def parse(context, shape, target = nil) + def parse(context, ref, target = nil) body = context.http_response.body_contents if body.bytesize == 0 nil else - parse_body(body, shape, target) + parse_body(body, ref, target) end end - # @param [String] body - # @param [Seahorse::Model::Shapes::Structure] shape - # @param [Structure] target - def parse_body(body, shape, target) + def parse_body(body, ref, target) raise NotImplementedError, 'must be defiend in sublcasses' end diff --git a/aws-sdk-core/lib/aws-sdk-core/xml/rest_handler.rb b/aws-sdk-core/lib/aws-sdk-core/xml/rest_handler.rb index b67568ad159..cdd17350899 100644 --- a/aws-sdk-core/lib/aws-sdk-core/xml/rest_handler.rb +++ b/aws-sdk-core/lib/aws-sdk-core/xml/rest_handler.rb @@ -2,17 +2,12 @@ module Aws module Xml class RestHandler < RestBodyHandler - # @param [Seahorse::Model::Shapes::Structure] shape - # @param [Hash] params - def serialize_params(shape, params) - Builder.new(shape).to_xml(params) + def serialize_params(rules, params) + Builder.new(rules).to_xml(params) end - # @param [String] xml - # @param [Seahorse::Model::Shapes::Structure] shape - # @param [Structure, nil] target - def parse_body(xml, shape, target) - Parser.new(shape).parse(xml, target) + def parse_body(xml, rules, target) + Parser.new(rules).parse(xml, target) end end diff --git a/aws-sdk-core/lib/seahorse/client/plugins/endpoint.rb b/aws-sdk-core/lib/seahorse/client/plugins/endpoint.rb index b6145cb4773..b1f4118bcf8 100644 --- a/aws-sdk-core/lib/seahorse/client/plugins/endpoint.rb +++ b/aws-sdk-core/lib/seahorse/client/plugins/endpoint.rb @@ -51,7 +51,7 @@ def apply_path_params(uri, context) else placeholder = placeholder[1..-2] end - name, shape = input.member_by_location_name(placeholder) + name, shape = input.shape.member_by_location_name(placeholder) param = context.params[name] if greedy param = param.gsub(/[^\/]+/) { |v| escape(v) } diff --git a/aws-sdk-core/lib/seahorse/model/shapes.rb b/aws-sdk-core/lib/seahorse/model/shapes.rb index 429d3c34f20..efd5a0c4892 100644 --- a/aws-sdk-core/lib/seahorse/model/shapes.rb +++ b/aws-sdk-core/lib/seahorse/model/shapes.rb @@ -100,9 +100,6 @@ def initialize # @return [Integer, nil] attr_accessor :max - # @return [Boolean] - attr_accessor :flattened - end class MapShape < Shape @@ -124,9 +121,6 @@ def initialize # @return [Integer, nil] attr_accessor :max - # @return [Boolean] - attr_accessor :flattened - end class StringShape < Shape From 9ef3a63e51b10a1f5e439ba275e020c28be2dcf9 Mon Sep 17 00:00:00 2001 From: Trevor Rowe Date: Wed, 6 May 2015 17:55:31 -0700 Subject: [PATCH 016/101] Updated request signer plugin specs. --- aws-sdk-core/lib/aws-sdk-core/api/builder.rb | 4 ++-- aws-sdk-core/spec/aws/plugins/request_signer_spec.rb | 11 ++++------- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/aws-sdk-core/lib/aws-sdk-core/api/builder.rb b/aws-sdk-core/lib/aws-sdk-core/api/builder.rb index a4203fab9de..fc3942a8303 100644 --- a/aws-sdk-core/lib/aws-sdk-core/api/builder.rb +++ b/aws-sdk-core/lib/aws-sdk-core/api/builder.rb @@ -30,12 +30,12 @@ def customize(definition) # @param [Hash] # @return [Seahorse::Model::Api] def build(definition) - shapes = ShapeMap.new(definition['shapes']) + shapes = ShapeMap.new(definition['shapes'] || {}) api = Seahorse::Model::Api.new metadata = definition['metadata'] || {} api.version = metadata['apiVersion'] api.metadata = metadata - definition['operations'].each do |name, definition| + (definition['operations'] || {}).each do |name, definition| operation = build_operation(name, definition, shapes) api.add_operation(underscore(name), operation) end diff --git a/aws-sdk-core/spec/aws/plugins/request_signer_spec.rb b/aws-sdk-core/spec/aws/plugins/request_signer_spec.rb index c80a1b3d3d5..b7dc0173d90 100644 --- a/aws-sdk-core/spec/aws/plugins/request_signer_spec.rb +++ b/aws-sdk-core/spec/aws/plugins/request_signer_spec.rb @@ -6,13 +6,10 @@ module Plugins let(:plugin) { RequestSigner.new } - let(:api) { - Seahorse::Model::Api.new( + let(:config) { + api = Api::Builder.build( 'metadata' => { 'endpointPrefix' => 'svc-name' } ) - } - - let(:config) { cfg = Seahorse::Client::Configuration.new cfg.add_option(:endpoint, 'http://svc-name.us-west-2.amazonaws.com') cfg.add_option(:api, api) @@ -23,11 +20,11 @@ module Plugins it 'raises an error when attempting to sign a request w/out credentials' do klass = Class.new(Seahorse::Client::Base) - klass.set_api({ + klass.set_api(Api::Builder.build( 'operations' => { 'DoSomething' => {} } - }) + )) klass.add_plugin(RegionalEndpoint) klass.add_plugin(RequestSigner) client = klass.new( From 57b7cd4c1acbcba4f2a5ded26a04cef06fe53623 Mon Sep 17 00:00:00 2001 From: Trevor Rowe Date: Thu, 7 May 2015 09:04:24 -0700 Subject: [PATCH 017/101] WIP --- .../client/plugins/restful_bindings.rb | 26 ++++++------ aws-sdk-core/spec/protocols_spec.rb | 10 ++--- aws-sdk-resources/lib/aws-sdk-resources.rb | 42 +++++++++---------- 3 files changed, 40 insertions(+), 38 deletions(-) diff --git a/aws-sdk-core/lib/seahorse/client/plugins/restful_bindings.rb b/aws-sdk-core/lib/seahorse/client/plugins/restful_bindings.rb index 2a3a39ad085..5da0a5c6c89 100644 --- a/aws-sdk-core/lib/seahorse/client/plugins/restful_bindings.rb +++ b/aws-sdk-core/lib/seahorse/client/plugins/restful_bindings.rb @@ -8,6 +8,8 @@ class RestfulBindings < Plugin # @api private class Handler < Client::Handler + include Seahorse::Model::Shapes + def call(context) build_request(context) @handler.call(context).on(200..299) do |response| @@ -30,31 +32,31 @@ def populate_http_request_method(context) def populate_http_headers(context) params = context.params headers = context.http_request.headers - each_member(context.operation.input) do |member_name, member| + each_member(context.operation.input) do |member_name, member_ref| value = params[member_name] next if value.nil? - case member.location - when 'header' then serialize_header(headers, member, value) - when 'headers' then serialize_header_map(headers, member, value) + case member_ref.location + when 'header' then serialize_header(headers, member_ref, value) + when 'headers' then serialize_header_map(headers, member_ref, value) end end end - def serialize_header(headers, shape, value) - headers[shape.location_name] = serialize_header_value(shape, value) + def serialize_header(headers, ref, value) + headers[ref.location_name] = serialize_header_value(ref, value) end - def serialize_header_map(headers, shape, values) - prefix = shape.location_name || '' + def serialize_header_map(headers, ref, values) + prefix = ref.location_name || '' values.each_pair do |name, value| - value = serialize_header_value(shape.value, value) + value = serialize_header_value(ref.shape.value, value) headers["#{prefix}#{name}"] = value end end - def serialize_header_value(shape, value) - if shape.is_a?(Model::Shapes::Timestamp) - shape.format_time(value, 'httpdate') + def serialize_header_value(ref, value) + if TimestampShape === ref.shape + value.utc.httpdate else value.to_s end diff --git a/aws-sdk-core/spec/protocols_spec.rb b/aws-sdk-core/spec/protocols_spec.rb index ab749bc6ff1..95c2feb665d 100644 --- a/aws-sdk-core/spec/protocols_spec.rb +++ b/aws-sdk-core/spec/protocols_spec.rb @@ -31,7 +31,7 @@ def each_test_case(context, fixture_path) def client_for(suite, test_case) protocol = suite['metadata']['protocol'] - api = Seahorse::Model::Api.new({ + api = Aws::Api::Builder.build({ 'metadata' => suite['metadata'], 'operations' => { 'ExampleOperation' => test_case['given'] @@ -58,18 +58,18 @@ def underscore(str) def format_data(shape, src) case shape - when Seahorse::Model::Shapes::Structure + when Seahorse::Model::Shapes::StructureShape src.each.with_object({}) do |(key, value), params| member = shape.member(underscore(key)) params[underscore(key).to_sym] = format_data(member, value) end - when Seahorse::Model::Shapes::List + when Seahorse::Model::Shapes::ListShape src.map { |value| format_data(shape.member, value) } - when Seahorse::Model::Shapes::Map + when Seahorse::Model::Shapes::MapShape src.each.with_object({}) do |(key, value), params| params[key] = format_data(shape.value, value) end - when Seahorse::Model::Shapes::Timestamp + when Seahorse::Model::Shapes::TimestampShape Time.at(src) else src end diff --git a/aws-sdk-resources/lib/aws-sdk-resources.rb b/aws-sdk-resources/lib/aws-sdk-resources.rb index b2bcc57f6d5..aec56d45351 100644 --- a/aws-sdk-resources/lib/aws-sdk-resources.rb +++ b/aws-sdk-resources/lib/aws-sdk-resources.rb @@ -19,26 +19,26 @@ module Resources autoload :Source, 'aws-sdk-resources/source' end - service_added do |name, svc_module, options| - definition = options[:resources] - definition = case definition - when nil then Resources::Definition.new({}) - when Resources::Definition then definition - when Hash then Resources::Definition.new(definition) - when String - Resources::Definition.new(Aws.load_json(definition), source_path: definition) - else raise ArgumentError, "invalid resource definition #{definition}" - end - definition.apply(svc_module) - - # load customizations - svc = File.join( - File.dirname(__FILE__), - 'aws-sdk-resources', - 'services', - "#{name.downcase}.rb") - - require(svc) if File.exists?(svc) - end +# service_added do |name, svc_module, options| +# definition = options[:resources] +# definition = case definition +# when nil then Resources::Definition.new({}) +# when Resources::Definition then definition +# when Hash then Resources::Definition.new(definition) +# when String +# Resources::Definition.new(Aws.load_json(definition), source_path: definition) +# else raise ArgumentError, "invalid resource definition #{definition}" +# end +# definition.apply(svc_module) +# +# # load customizations +# svc = File.join( +# File.dirname(__FILE__), +# 'aws-sdk-resources', +# 'services', +# "#{name.downcase}.rb") +# +# require(svc) if File.exists?(svc) +# end end From d6828f81ad6b8b4444cc722580c3af4e59d5cc3a Mon Sep 17 00:00:00 2001 From: Trevor Rowe Date: Thu, 7 May 2015 13:43:45 -0700 Subject: [PATCH 018/101] Fixed the response stubbing. --- aws-sdk-core/lib/aws-sdk-core/client_stubs.rb | 2 +- aws-sdk-core/lib/aws-sdk-core/rest_body_handler.rb | 4 ++-- aws-sdk-core/lib/seahorse/model/shapes.rb | 12 ++++++------ aws-sdk-core/spec/aws/stubbing/stub_spec.rb | 10 +++++----- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/aws-sdk-core/lib/aws-sdk-core/client_stubs.rb b/aws-sdk-core/lib/aws-sdk-core/client_stubs.rb index 05b147c73c0..d026a4d7ec4 100644 --- a/aws-sdk-core/lib/aws-sdk-core/client_stubs.rb +++ b/aws-sdk-core/lib/aws-sdk-core/client_stubs.rb @@ -94,7 +94,7 @@ def next_stub(operation_name) @stub_mutex.synchronize do stubs = @stubs[operation_name.to_sym] || [] case stubs.length - when 0 then new_stub(operation_name) + when 0 then new_stub(operation_name.to_sym) when 1 then stubs.first else stubs.shift end diff --git a/aws-sdk-core/lib/aws-sdk-core/rest_body_handler.rb b/aws-sdk-core/lib/aws-sdk-core/rest_body_handler.rb index d18ad8a1e0c..16b8173ef62 100644 --- a/aws-sdk-core/lib/aws-sdk-core/rest_body_handler.rb +++ b/aws-sdk-core/lib/aws-sdk-core/rest_body_handler.rb @@ -62,8 +62,8 @@ def body_params(ref, params) def streaming?(ref) ref.shape[:payload] && ( - Seahorse::Model::Shapes::BlobShape === ref.shape[:payload_member] || - Seahorse::Model::Shapes::StringShape === ref.shape[:payload_member] + Seahorse::Model::Shapes::BlobShape === ref.shape[:payload_member].shape || + Seahorse::Model::Shapes::StringShape === ref.shape[:payload_member].shape ) end diff --git a/aws-sdk-core/lib/seahorse/model/shapes.rb b/aws-sdk-core/lib/seahorse/model/shapes.rb index efd5a0c4892..fffc6cbd1d1 100644 --- a/aws-sdk-core/lib/seahorse/model/shapes.rb +++ b/aws-sdk-core/lib/seahorse/model/shapes.rb @@ -30,16 +30,16 @@ def initialize(options = {}) # Gets metadata for the given `key`. def [](key) - if @metadata.key?(key) - @metadata[key] + if @metadata.key?(key.to_s) + @metadata[key.to_s] else - @shape[key] + @shape[key.to_s] end end # Sets metadata for the given `key`. def []=(key, value) - @metadata[key] = value + @metadata[key.to_s] = value end end @@ -58,12 +58,12 @@ def initialize # Gets metadata for the given `key`. def [](key) - @metadata[key] + @metadata[key.to_s] end # Sets metadata for the given `key`. def []=(key, value) - @metadata[key] = value + @metadata[key.to_s] = value end end diff --git a/aws-sdk-core/spec/aws/stubbing/stub_spec.rb b/aws-sdk-core/spec/aws/stubbing/stub_spec.rb index 122ec09375a..6f25490bd67 100644 --- a/aws-sdk-core/spec/aws/stubbing/stub_spec.rb +++ b/aws-sdk-core/spec/aws/stubbing/stub_spec.rb @@ -23,7 +23,7 @@ module ClientStubs describe 'with an output shape' do - let(:shape_map) { Seahorse::Model::ShapeMap.new({ + let(:shape_map) { Api::ShapeMap.new({ 'Person' => { 'type' => 'structure', 'required' => ['FullName'], @@ -68,14 +68,14 @@ module ClientStubs 'Timestamp' => { 'type' => 'timestamp' }, })} - let(:shape) { shape_map.shape('shape' => 'Person') } + let(:ref) { shape_map.shape_ref('shape' => 'Person') } - let(:stub) { Stub.new(shape) } + let(:stub) { Stub.new(ref) } it 'returns a stub with the appropriate members' do data = stub.format expect(data).to be_kind_of(Structure) - expect(data.members).to eq(shape.member_names) + expect(data.members).to eq(ref.shape.member_names) end it 'validates the given data matches the response shape' do @@ -191,7 +191,7 @@ module ClientStubs end - describe 'streaming resposnes' do + describe 'streaming responses' do it 'stubs the HTTP response target when with streaming APIs' do s3 = S3::Client.new(stub_responses: true) From 33f26f45e655f43faebf47e0c07053f5ce6a3644 Mon Sep 17 00:00:00 2001 From: Trevor Rowe Date: Thu, 7 May 2015 13:51:37 -0700 Subject: [PATCH 019/101] Updated DynamoDB simple attributes to use the new Seahorse shapes. --- aws-sdk-core/lib/aws-sdk-core/api/builder.rb | 8 +++- .../aws-sdk-core/json/rpc_headers_handler.rb | 4 +- .../plugins/dynamodb_simple_attributes.rb | 39 ++++++++++--------- 3 files changed, 29 insertions(+), 22 deletions(-) diff --git a/aws-sdk-core/lib/aws-sdk-core/api/builder.rb b/aws-sdk-core/lib/aws-sdk-core/api/builder.rb index fc3942a8303..9ca03aa02dd 100644 --- a/aws-sdk-core/lib/aws-sdk-core/api/builder.rb +++ b/aws-sdk-core/lib/aws-sdk-core/api/builder.rb @@ -6,7 +6,11 @@ class Builder class << self def build(definition) - Builder.new.build(customize(load_definition(definition))) + if Seahorse::Model::Api === definition + definition + else + Builder.new.build(customize(load_definition(definition))) + end end private @@ -16,7 +20,7 @@ def load_definition(definition) when nil then {} when Hash then definition when String, Pathname then Seahorse::Util.load_json(definition) - else raise ArgumentError, "invalid api definition #{api}" + else raise ArgumentError, "invalid api definition #{definition}" end end diff --git a/aws-sdk-core/lib/aws-sdk-core/json/rpc_headers_handler.rb b/aws-sdk-core/lib/aws-sdk-core/json/rpc_headers_handler.rb index 5cd314c6aba..3449bbde0af 100644 --- a/aws-sdk-core/lib/aws-sdk-core/json/rpc_headers_handler.rb +++ b/aws-sdk-core/lib/aws-sdk-core/json/rpc_headers_handler.rb @@ -21,11 +21,11 @@ def add_headers(context) end def content_type(context) - CONTENT_TYPE % [context.config.api.metadata('jsonVersion')] + CONTENT_TYPE % [context.config.api.metadata['jsonVersion']] end def target(context) - prefix = context.config.api.metadata('targetPrefix') + prefix = context.config.api.metadata['targetPrefix'] "#{prefix}.#{context.operation.name}" end diff --git a/aws-sdk-core/lib/aws-sdk-core/plugins/dynamodb_simple_attributes.rb b/aws-sdk-core/lib/aws-sdk-core/plugins/dynamodb_simple_attributes.rb index 8296cf7975a..1b4409c6c43 100644 --- a/aws-sdk-core/lib/aws-sdk-core/plugins/dynamodb_simple_attributes.rb +++ b/aws-sdk-core/lib/aws-sdk-core/plugins/dynamodb_simple_attributes.rb @@ -137,20 +137,21 @@ def translate_output(response) # @api private class ValueTranslator - # @param [Seahorse::Model::Shapes::Shape] shape - # @param [Symbol<:marshal,:unmarshal>] mode - def initialize(shape, mode) - @shape = shape + include Seahorse::Model::Shapes + + def initialize(rules, mode) + @rules = rules @mode = mode end def apply(values) - structure(@shape, values) if @shape + structure(@rules, values) if @rules end private - def structure(shape, values) + def structure(ref, values) + shape = ref.shape if values.is_a?(Struct) values.members.each do |key| values[key] = translate(shape.member(key), values[key]) @@ -165,33 +166,35 @@ def structure(shape, values) end end - def list(shape, values) + def list(ref, values) return values unless values.is_a?(Array) + member_ref = ref.shape.member values.inject([]) do |list, value| - list << translate(shape.member, value) + list << translate(member_ref, value) end end - def map(shape, values) + def map(ref, values) return values unless values.is_a?(Hash) + value_ref = ref.shape.value values.each.with_object({}) do |(key, value), hash| - hash[key] = translate(shape.value, value) + hash[key] = translate(value_ref, value) end end - def translate(shape, value) - if shape.name == 'AttributeValue' + def translate(ref, value) + if ref.shape.name == 'AttributeValue' DynamoDB::AttributeValue.new.send(@mode, value) else - translate_complex(shape, value) + translate_complex(ref, value) end end - def translate_complex(shape, value) - case shape - when Seahorse::Model::Shapes::Structure then structure(shape, value) - when Seahorse::Model::Shapes::List then list(shape, value) - when Seahorse::Model::Shapes::Map then map(shape, value) + def translate_complex(ref, value) + case ref.shape + when StructureShape then structure(ref, value) + when ListShape then list(ref, value) + when MapShape then map(ref, value) else value end end From be8f38accfa1ff86f7b334d8701a291594ceab4b Mon Sep 17 00:00:00 2001 From: Trevor Rowe Date: Thu, 7 May 2015 16:11:05 -0700 Subject: [PATCH 020/101] More test updates. Changes include: * Corrected some bugs in the protocol tests where payload traits were applied in the wrong place. * Shape and ShapeRef metadata now provides indifferent symbol and string access. * Api#operation_names are now always symbols. --- .../lib/aws-sdk-core/api/shape_map.rb | 4 --- .../aws-sdk-core/plugins/s3_request_signer.rb | 2 +- .../aws-sdk-core/plugins/stub_responses.rb | 4 +-- .../lib/aws-sdk-core/rest_body_handler.rb | 22 ++++++------- aws-sdk-core/lib/seahorse/client/base.rb | 2 +- .../lib/seahorse/client/request_context.rb | 4 +-- aws-sdk-core/lib/seahorse/model/api.rb | 6 ++-- aws-sdk-core/lib/seahorse/model/shapes.rb | 7 ++-- .../aws/plugins/global_configuration_spec.rb | 2 +- .../spec/aws/plugins/region_endpoint_spec.rb | 2 +- .../fixtures/protocols/input/rest-json.json | 12 +++---- .../fixtures/protocols/input/rest-xml.json | 33 +++++++++---------- aws-sdk-core/spec/protocols_spec.rb | 12 +++---- 13 files changed, 52 insertions(+), 60 deletions(-) diff --git a/aws-sdk-core/lib/aws-sdk-core/api/shape_map.rb b/aws-sdk-core/lib/aws-sdk-core/api/shape_map.rb index 2708167c877..44fba09fbab 100644 --- a/aws-sdk-core/lib/aws-sdk-core/api/shape_map.rb +++ b/aws-sdk-core/lib/aws-sdk-core/api/shape_map.rb @@ -94,10 +94,6 @@ def apply_shape_traits(shape, traits) end end - def apply_payload(ref, name) - ref['payload'] = underscore(name).to_sym - end - def underscore(str) Seahorse::Util.underscore(str).to_sym end diff --git a/aws-sdk-core/lib/aws-sdk-core/plugins/s3_request_signer.rb b/aws-sdk-core/lib/aws-sdk-core/plugins/s3_request_signer.rb index 251af206013..3a791e91546 100644 --- a/aws-sdk-core/lib/aws-sdk-core/plugins/s3_request_signer.rb +++ b/aws-sdk-core/lib/aws-sdk-core/plugins/s3_request_signer.rb @@ -91,7 +91,7 @@ def kms_encrypted?(context) end def uploading_file?(context) - %w(put_object upload_part).include?(context.operation_name) && + [:put_object, :upload_part].include?(context.operation_name) && context.http_request.body.size > 0 end diff --git a/aws-sdk-core/lib/aws-sdk-core/plugins/stub_responses.rb b/aws-sdk-core/lib/aws-sdk-core/plugins/stub_responses.rb index 1cc5367bff4..507e919b385 100644 --- a/aws-sdk-core/lib/aws-sdk-core/plugins/stub_responses.rb +++ b/aws-sdk-core/lib/aws-sdk-core/plugins/stub_responses.rb @@ -60,7 +60,7 @@ def apply_stub(resp, stub) def streaming?(resp) if output = resp.context.operation.output - payload = output.shape[:payload_member] + payload = output[:payload_member] payload && payload[:streaming] else false @@ -68,7 +68,7 @@ def streaming?(resp) end def stub_http_body(resp) - payload = resp.context.operation.output.shape[:payload] + payload = resp.context.operation.output[:payload] resp.context.http_response.signal_headers(200, {}) resp.context.http_response.signal_data(resp.data[payload]) resp.context.http_response.signal_done diff --git a/aws-sdk-core/lib/aws-sdk-core/rest_body_handler.rb b/aws-sdk-core/lib/aws-sdk-core/rest_body_handler.rb index 16b8173ef62..98bb642f580 100644 --- a/aws-sdk-core/lib/aws-sdk-core/rest_body_handler.rb +++ b/aws-sdk-core/lib/aws-sdk-core/rest_body_handler.rb @@ -24,10 +24,10 @@ def build_body(context) ref = context.operation.input case when ref.nil? then nil - when streaming?(ref) then context.params[ref.shape[:payload]] - when ref.shape[:payload] - if params = context.params[ref.shape[:payload]] - serialize_params(ref.shape[:payload_member], params) + when streaming?(ref) then context.params[ref[:payload]] + when ref[:payload] + if params = context.params[ref[:payload]] + serialize_params(ref[:payload_member], params) end else params = body_params(ref, context.params) @@ -39,9 +39,9 @@ def extract_data(context) if ref = context.operation.output data = Structure.new(ref.shape.member_names) if streaming?(ref) - data[ref.shape[:payload]] = context.http_response.body - elsif ref.shape[:payload] - data[ref.shape[:payload]] = parse(context, ref.shape[:payload_member]) + data[ref[:payload]] = context.http_response.body + elsif ref[:payload] + data[ref[:payload]] = parse(context, ref[:payload_member]) else parse(context, ref, data) end @@ -53,7 +53,7 @@ def extract_data(context) def body_params(ref, params) ref.shape.members.inject({}) do |hash, (member_name, member_ref)| - if member_ref.location == 'body' + if member_ref.location.nil? hash[member_name] = params[member_name] if params.key?(member_name) end hash @@ -61,9 +61,9 @@ def body_params(ref, params) end def streaming?(ref) - ref.shape[:payload] && ( - Seahorse::Model::Shapes::BlobShape === ref.shape[:payload_member].shape || - Seahorse::Model::Shapes::StringShape === ref.shape[:payload_member].shape + ref[:payload] && ( + Seahorse::Model::Shapes::BlobShape === ref[:payload_member].shape || + Seahorse::Model::Shapes::StringShape === ref[:payload_member].shape ) end diff --git a/aws-sdk-core/lib/seahorse/client/base.rb b/aws-sdk-core/lib/seahorse/client/base.rb index 3322ff19cae..3dc88e475d5 100644 --- a/aws-sdk-core/lib/seahorse/client/base.rb +++ b/aws-sdk-core/lib/seahorse/client/base.rb @@ -88,7 +88,7 @@ def after_initialize(plugins) # @return [RequestContext] def context_for(operation_name, params) RequestContext.new( - operation_name: operation_name.to_s, + operation_name: operation_name, operation: operation(operation_name), client: self, params: params, diff --git a/aws-sdk-core/lib/seahorse/client/request_context.rb b/aws-sdk-core/lib/seahorse/client/request_context.rb index c01b0e6c9c4..4298e3ff199 100644 --- a/aws-sdk-core/lib/seahorse/client/request_context.rb +++ b/aws-sdk-core/lib/seahorse/client/request_context.rb @@ -4,7 +4,7 @@ module Seahorse module Client class RequestContext - # @option options [required,String] :operation_name (nil) + # @option options [required,Symbol] :operation_name (nil) # @option options [required,Model::Operation] :operation (nil) # @option options [Hash] :params ({}) # @option options [Configuration] :config (nil) @@ -23,7 +23,7 @@ def initialize(options = {}) @metadata = {} end - # @return [String] Name of the API operation called. + # @return [Symbol] Name of the API operation called. attr_accessor :operation_name # @return [Model::Operation] diff --git a/aws-sdk-core/lib/seahorse/model/api.rb b/aws-sdk-core/lib/seahorse/model/api.rb index 5b986338f98..9b16c0f61f5 100644 --- a/aws-sdk-core/lib/seahorse/model/api.rb +++ b/aws-sdk-core/lib/seahorse/model/api.rb @@ -22,8 +22,8 @@ def operations(&block) end def operation(name) - if @operations.key?(name) - @operations[name] + if @operations.key?(name.to_sym) + @operations[name.to_sym] else raise ArgumentError, "unknown operation #{name.inspect}" end @@ -34,7 +34,7 @@ def operation_names end def add_operation(name, operation) - @operations[name] = operation + @operations[name.to_sym] = operation end # @api private diff --git a/aws-sdk-core/lib/seahorse/model/shapes.rb b/aws-sdk-core/lib/seahorse/model/shapes.rb index fffc6cbd1d1..ce312c2955b 100644 --- a/aws-sdk-core/lib/seahorse/model/shapes.rb +++ b/aws-sdk-core/lib/seahorse/model/shapes.rb @@ -152,6 +152,7 @@ def initialize(options = {}) # @param [ShapeRef] shape_ref # @option options [Boolean] :required (false) def add_member(name, shape_ref, options = {}) + name = name.to_sym @required << name if options[:required] @members_by_location_name[shape_ref.location_name] = [name, shape_ref] @members[name] = shape_ref @@ -166,7 +167,7 @@ def member_names # @return [Boolean] Returns `true` if there exists a member with # the given name. def member?(member_name) - @members.key?(member_name) + @members.key?(member_name.to_sym) end # @return [Enumerator<[Symbol,ShapeRef]>] @@ -177,8 +178,8 @@ def members # @param [Symbol] name # @return [ShapeRef] def member(name) - if @members.key?(name) - @members[name] + if member?(name) + @members[name.to_sym] else raise ArgumentError, "no such member #{name.inspect}" end diff --git a/aws-sdk-core/spec/aws/plugins/global_configuration_spec.rb b/aws-sdk-core/spec/aws/plugins/global_configuration_spec.rb index 83e50f97873..d2684c1d388 100644 --- a/aws-sdk-core/spec/aws/plugins/global_configuration_spec.rb +++ b/aws-sdk-core/spec/aws/plugins/global_configuration_spec.rb @@ -14,7 +14,7 @@ def plugin(&block) end before(:each) do - api = Seahorse::Model::Api.new('metadata' => { + api = Aws::Api::Builder.build('metadata' => { 'apiVersion' => '2013-01-01', }) svc = Aws.add_service(:Svc, api: api)::Client diff --git a/aws-sdk-core/spec/aws/plugins/region_endpoint_spec.rb b/aws-sdk-core/spec/aws/plugins/region_endpoint_spec.rb index f62abb3d9f5..fbad2f5e9d5 100644 --- a/aws-sdk-core/spec/aws/plugins/region_endpoint_spec.rb +++ b/aws-sdk-core/spec/aws/plugins/region_endpoint_spec.rb @@ -11,7 +11,7 @@ module Plugins let(:client_class) { Seahorse::Client::Base.define( plugins: [RegionalEndpoint], - api: { 'metadata' => metadata } + api: Aws::Api::Builder.build('metadata' => metadata), ) } diff --git a/aws-sdk-core/spec/fixtures/protocols/input/rest-json.json b/aws-sdk-core/spec/fixtures/protocols/input/rest-json.json index 0f6f9eb9517..32d403684c3 100644 --- a/aws-sdk-core/spec/fixtures/protocols/input/rest-json.json +++ b/aws-sdk-core/spec/fixtures/protocols/input/rest-json.json @@ -374,7 +374,8 @@ "foo": { "shape": "FooShape" } - } + }, + "payload": "foo" }, "FooShape": { "locationName": "foo", @@ -397,8 +398,7 @@ "requestUri": "/" }, "input": { - "shape": "InputShape", - "payload": "foo" + "shape": "InputShape" }, "name": "OperationName" }, @@ -420,8 +420,7 @@ "requestUri": "/" }, "input": { - "shape": "InputShape", - "payload": "foo" + "shape": "InputShape" }, "name": "OperationName" }, @@ -439,8 +438,7 @@ "requestUri": "/" }, "input": { - "shape": "InputShape", - "payload": "foo" + "shape": "InputShape" }, "name": "OperationName" }, diff --git a/aws-sdk-core/spec/fixtures/protocols/input/rest-xml.json b/aws-sdk-core/spec/fixtures/protocols/input/rest-xml.json index d537c63f8fc..2d000afaa40 100644 --- a/aws-sdk-core/spec/fixtures/protocols/input/rest-xml.json +++ b/aws-sdk-core/spec/fixtures/protocols/input/rest-xml.json @@ -692,7 +692,8 @@ "foo": { "shape": "FooShape" } - } + }, + "payload": "foo" }, "FooShape": { "type": "string" @@ -706,8 +707,7 @@ "requestUri": "/" }, "input": { - "shape": "InputShape", - "payload": "foo" + "shape": "InputShape" }, "name": "OperationName" }, @@ -735,7 +735,8 @@ "foo": { "shape": "FooShape" } - } + }, + "payload": "foo" }, "FooShape": { "type": "blob" @@ -749,8 +750,7 @@ "requestUri": "/" }, "input": { - "shape": "InputShape", - "payload": "foo" + "shape": "InputShape" }, "name": "OperationName" }, @@ -770,8 +770,7 @@ "requestUri": "/" }, "input": { - "shape": "InputShape", - "payload": "foo" + "shape": "InputShape" }, "name": "OperationName" }, @@ -798,7 +797,8 @@ "foo": { "shape": "FooShape" } - } + }, + "payload": "foo" }, "FooShape": { "locationName": "foo", @@ -821,8 +821,7 @@ "requestUri": "/" }, "input": { - "shape": "InputShape", - "payload": "foo" + "shape": "InputShape" }, "name": "OperationName" }, @@ -844,8 +843,7 @@ "requestUri": "/" }, "input": { - "shape": "InputShape", - "payload": "foo" + "shape": "InputShape" }, "name": "OperationName" }, @@ -863,8 +861,7 @@ "requestUri": "/" }, "input": { - "shape": "InputShape", - "payload": "foo" + "shape": "InputShape" }, "name": "OperationName" }, @@ -890,7 +887,8 @@ "Grant": { "shape": "Grant" } - } + }, + "payload": "Grant" }, "Grant": { "type": "structure", @@ -933,8 +931,7 @@ "requestUri": "/" }, "input": { - "shape": "InputShape", - "payload": "Grant" + "shape": "InputShape" }, "name": "OperationName" }, diff --git a/aws-sdk-core/spec/protocols_spec.rb b/aws-sdk-core/spec/protocols_spec.rb index 95c2feb665d..6d878057641 100644 --- a/aws-sdk-core/spec/protocols_spec.rb +++ b/aws-sdk-core/spec/protocols_spec.rb @@ -56,18 +56,18 @@ def underscore(str) Seahorse::Util.underscore(str) end -def format_data(shape, src) - case shape +def format_data(ref, src) + case ref.shape when Seahorse::Model::Shapes::StructureShape src.each.with_object({}) do |(key, value), params| - member = shape.member(underscore(key)) - params[underscore(key).to_sym] = format_data(member, value) + member_ref = ref.shape.member(underscore(key).to_sym) + params[underscore(key).to_sym] = format_data(member_ref, value) end when Seahorse::Model::Shapes::ListShape - src.map { |value| format_data(shape.member, value) } + src.map { |value| format_data(ref.shape.member, value) } when Seahorse::Model::Shapes::MapShape src.each.with_object({}) do |(key, value), params| - params[key] = format_data(shape.value, value) + params[key] = format_data(ref.shape.value, value) end when Seahorse::Model::Shapes::TimestampShape Time.at(src) From b06c0d3f496a4c2323125997b076eff56d9ec094 Mon Sep 17 00:00:00 2001 From: Trevor Rowe Date: Thu, 7 May 2015 16:12:53 -0700 Subject: [PATCH 021/101] Removed tests for a (re)moved class. --- .../spec/seahorse/model/shape_map_spec.rb | 84 ------------------- 1 file changed, 84 deletions(-) delete mode 100644 aws-sdk-core/spec/seahorse/model/shape_map_spec.rb diff --git a/aws-sdk-core/spec/seahorse/model/shape_map_spec.rb b/aws-sdk-core/spec/seahorse/model/shape_map_spec.rb deleted file mode 100644 index 3817e8601e9..00000000000 --- a/aws-sdk-core/spec/seahorse/model/shape_map_spec.rb +++ /dev/null @@ -1,84 +0,0 @@ -module Seahorse - module Model - describe ShapeMap do - - describe '#definitions' do - - it 'returns an empty hash by default' do - expect(ShapeMap.new.definitions).to eq({}) - end - - it 'returns the definitions given to the constructor' do - definitions = { 'String' => { 'type' => 'string' } } - shapes = ShapeMap.new(definitions) - expect(shapes.definitions).to be(definitions) - end - - end - - describe '#shape' do - - let(:definitions) {{ 'Name' => { 'type' => 'string' }}} - - let(:shapes) { ShapeMap.new(definitions) } - - it 'returns an instance of the referenced shape' do - expect(shapes.shape('shape' => 'Name')).to be_kind_of(Shapes::String) - end - - it 'returns the same shape given the same reference' do - shape1 = shapes.shape('shape' => 'Name') - shape2 = shapes.shape('shape' => 'Name') - expect(shape1).to be(shape2) - end - - it 'initializes a new shape if the reference contains extra info' do - shape1 = shapes.shape('shape' => 'Name') - shape2 = shapes.shape('shape' => 'Name', 'documentation' => 'with-docs') - expect(shape1).not_to be(shape2) - end - - it 'merges additional traits from the shape reference onto the shape' do - shape1 = shapes.shape('shape' => 'Name') - shape2 = shapes.shape('shape' => 'Name', 'documentation' => 'docs') - expect(shape1.documentation).to be(nil) - expect(shape2.documentation).to eq('docs') - end - - it 'overrides traits on the shape definition with reference traits' do - definitions['Name']['documentation'] = 'default-docs' - shape1 = shapes.shape('shape' => 'Name') - shape2 = shapes.shape('shape' => 'Name', 'documentation' => 'new-docs') - expect(shape1.documentation).to eq('default-docs') - expect(shape2.documentation).to eq('new-docs') - end - - it 'merges shape reference metadata on top of definition metadata' do - definitions['Name']['foo'] = 'bar' - shape1 = shapes.shape('shape' => 'Name') - shape2 = shapes.shape('shape' => 'Name', 'foo' => 'BAR') - expect(shape1.metadata('foo')).to eq('bar') - expect(shape2.metadata('foo')).to eq('BAR') - end - - end - - describe '#shape_names' do - - it 'returns all of the registered shape names' do - definitions = { - 'Name' => { 'type' => 'string' }, - 'Age' => { 'type' => 'integer' }, - } - expect(ShapeMap.new(definitions).shape_names).to eq(%w(Name Age)) - end - - end - - it 'can be constructed without any definitions' do - expect(ShapeMap.new.definitions).to eq({}) - end - - end - end -end From 6fb71dae307f0812314a519ab29da178deab8218 Mon Sep 17 00:00:00 2001 From: Trevor Rowe Date: Thu, 7 May 2015 17:26:57 -0700 Subject: [PATCH 022/101] Added deprecated shape ref traits. --- aws-sdk-core/lib/aws-sdk-core/api/shape_map.rb | 4 +++- aws-sdk-core/lib/seahorse/model/shapes.rb | 4 ++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/aws-sdk-core/lib/aws-sdk-core/api/shape_map.rb b/aws-sdk-core/lib/aws-sdk-core/api/shape_map.rb index 44fba09fbab..cd3e79a982b 100644 --- a/aws-sdk-core/lib/aws-sdk-core/api/shape_map.rb +++ b/aws-sdk-core/lib/aws-sdk-core/api/shape_map.rb @@ -37,10 +37,12 @@ def [](shape_name) def shape_ref(definition, options = {}) if definition meta = definition.dup + shape = self[meta.delete('shape')] ShapeRef.new( - shape: self[meta.delete('shape')], + shape: shape, location: meta.delete('location'), location_name: meta.delete('locationName') || options[:location_name], + deprecated: !!(meta.delete('deprecated') || shape[:deprecated]), metadata: meta) else nil diff --git a/aws-sdk-core/lib/seahorse/model/shapes.rb b/aws-sdk-core/lib/seahorse/model/shapes.rb index ce312c2955b..9ac380027d3 100644 --- a/aws-sdk-core/lib/seahorse/model/shapes.rb +++ b/aws-sdk-core/lib/seahorse/model/shapes.rb @@ -8,6 +8,7 @@ class ShapeRef def initialize(options = {}) @metadata = {} + @deprecated = false options.each do |key, value| if key == :metadata value.each do |k,v| @@ -28,6 +29,9 @@ def initialize(options = {}) # @return [String, nil] attr_accessor :location_name + # @return [Boolean] + attr_accessor :deprecated + # Gets metadata for the given `key`. def [](key) if @metadata.key?(key.to_s) From 623356911753d78336d7c275dcd0ce7d2cff31d6 Mon Sep 17 00:00:00 2001 From: Trevor Rowe Date: Thu, 7 May 2015 19:24:32 -0700 Subject: [PATCH 023/101] Updated seahorse model specs. --- aws-sdk-core/lib/seahorse/model/api.rb | 6 - aws-sdk-core/lib/seahorse/model/operation.rb | 5 - aws-sdk-core/lib/seahorse/model/shapes.rb | 10 +- aws-sdk-core/spec/seahorse/model/api_spec.rb | 157 +---- .../spec/seahorse/model/operation_spec.rb | 181 ++--- .../spec/seahorse/model/shapes_spec.rb | 627 ++++++------------ 6 files changed, 280 insertions(+), 706 deletions(-) diff --git a/aws-sdk-core/lib/seahorse/model/api.rb b/aws-sdk-core/lib/seahorse/model/api.rb index 9b16c0f61f5..4b92b0fe648 100644 --- a/aws-sdk-core/lib/seahorse/model/api.rb +++ b/aws-sdk-core/lib/seahorse/model/api.rb @@ -37,12 +37,6 @@ def add_operation(name, operation) @operations[name.to_sym] = operation end - # @api private - # @return [String] - def inspect - "#<#{self.class.name} version=#{version.inspect}>" - end - end end end diff --git a/aws-sdk-core/lib/seahorse/model/operation.rb b/aws-sdk-core/lib/seahorse/model/operation.rb index d0face14b08..049d9a768cf 100644 --- a/aws-sdk-core/lib/seahorse/model/operation.rb +++ b/aws-sdk-core/lib/seahorse/model/operation.rb @@ -33,11 +33,6 @@ def initialize # @return [Array] attr_accessor :errors - # @api private - def inspect - "#<#{self.class.name} name=#{name.inspect}>" - end - end end end diff --git a/aws-sdk-core/lib/seahorse/model/shapes.rb b/aws-sdk-core/lib/seahorse/model/shapes.rb index 9ac380027d3..223cf61b77e 100644 --- a/aws-sdk-core/lib/seahorse/model/shapes.rb +++ b/aws-sdk-core/lib/seahorse/model/shapes.rb @@ -72,7 +72,15 @@ def []=(key, value) end - class BlobShape < Shape; end + class BlobShape < Shape + + # @return [Integer, nil] + attr_accessor :min + + # @return [Integer, nil] + attr_accessor :max + + end class BooleanShape < Shape; end diff --git a/aws-sdk-core/spec/seahorse/model/api_spec.rb b/aws-sdk-core/spec/seahorse/model/api_spec.rb index 16234e866eb..eef587204b5 100644 --- a/aws-sdk-core/spec/seahorse/model/api_spec.rb +++ b/aws-sdk-core/spec/seahorse/model/api_spec.rb @@ -3,151 +3,64 @@ module Seahorse module Model describe Api do - - describe '#definition' do - - it 'returns an empty hash by default' do - expect(Api.new.definition).to eq({}) - end - - it 'returns the definitions given the constructor' do - definition = { 'operations' => {} } - api = Api.new(definition) - expect(api.definition).to be(definition) - end - - end - - describe '#shape_map' do - - it 'defaults to an empty shape map' do - expect(Api.new.shape_map.definitions).to eq({}) - end - - it 'initializes the shape map with the given shape definitions' do - shape_definitions = { 'Name' => { 'type' => 'string' }} - api = Api.new('shapes' => shape_definitions) - expect(api.shape_map.definitions).to be(shape_definitions) - end - - end - describe '#version' do it 'defaults to nil' do expect(Api.new.version).to be(nil) end - it 'returns the value given in the definition' do - api = Api.new('metadata' => { 'apiVersion' => '1'}) - expect(api.version).to eq('1') - end - - end - - describe '#documentation' do - - it 'defaults to nil' do - expect(Api.new.documentation).to be(nil) - end - - it 'returns the value given in the definition' do - api = Api.new('documentation' => 'docs') - expect(api.documentation).to eq('docs') + it 'can be set' do + api = Api.new + api.version = '2015-01-01' + expect(api.version).to eq('2015-01-01') end end describe '#metadata' do - it 'returns the value given in the definition' do - metadata = { 'format' => 'query' } - api = Api.new('metadata' => metadata) - expect(api.metadata('format')).to eq('query') - end - - end - - describe '#operation' do - - let(:definition) {{ - 'operations' => { - 'Operation1' => { 'documentation' => 'first' }, - 'Operation2' => { 'documentation' => 'second' }, - } - }} - - it 'returns an operation' do - api = Api.new(definition) - expect(api.operation('operation_1')).to be_kind_of(Operation) - end - - it 'returns an operation built from the definition' do - api = Api.new(definition) - expect(api.operation(:operation_1).documentation).to eq('first') - end - - it 'returns the same operation object when called multiple times' do - api = Api.new(definition) - o1 = api.operation('operation_1') - o2 = api.operation('operation_1') - expect(o1).to be(o2) + it 'defaults to {}' do + expect(Api.new.metadata).to eq({}) end - it 'accepts operation names as symbols' do - api = Api.new(definition) - o1 = api.operation(:operation_1) - o2 = api.operation('operation_1') - expect(o1).to be(o2) - end - - it 'raises an ArgumentError for an undefined operation' do - api = Api.new(definition) - expect { - api.operation('operation3') - }.to raise_error(ArgumentError, "unknown operation :operation3") + it 'can be populated' do + api = Api.new + api.metadata['key'] = 'value' + expect(api.metadata['key']).to eq('value') end end - describe '#operation_names' do - - it 'returns an array of symbolized operation names' do - api = Api.new('operations' => { - 'Operation1' => {}, - 'Operation2' => {}, - }) - expect(api.operation_names).to eq([:operation_1, :operation_2]) - end - + it 'provides an enumerator for operations' do + operation = double('operation') + api = Api.new + api.add_operation('name', operation) + expect(api.operations).to be_kind_of(Enumerator) + expect(api.operations.to_a).to eq([[:name, operation]]) end - describe '#operations' do - - it 'yields operation names and operation objects' do - api = Api.new('operations' => { - 'OperationName' => {}, - 'OperationName2' => {}, - }) - yielded = [] - api.operations.each do |operation_name, operation| - yielded << [operation_name, operation] - end - expect(yielded).to eq([ - [:operation_name, api.operation('operation_name')], - [:operation_name_2, api.operation('operation_name_2')], - ]) - end - + it 'provides operation names' do + api = Api.new + api.add_operation('op1', double('operation')) + api.add_operation('op2', double('operation')) + expect(api.operation_names).to eq([:op1, :op2]) end - describe '#inspect' do - - it 'returns a simplified inspect string' do - api = Api.new('metadata' => { 'apiVersion' => '1'}) - expect(api.inspect).to eq('#') - end + it 'provides an operation getter' do + operation = double('operation') + api = Api.new + api.add_operation(:name, operation) + expect(api.operation(:name)).to be(operation) + end + it 'provides indifferent string/symbol access to operations by name' do + operation1 = double('operation-1') + operation2 = double('operation-2') + api = Api.new + api.add_operation(:name, operation1) + expect(api.operation('name')).to be(operation1) + api.add_operation('name', operation2) + expect(api.operation(:name)).to be(operation2) end end end diff --git a/aws-sdk-core/spec/seahorse/model/operation_spec.rb b/aws-sdk-core/spec/seahorse/model/operation_spec.rb index 1f7bfcb8726..ff1b64a3538 100644 --- a/aws-sdk-core/spec/seahorse/model/operation_spec.rb +++ b/aws-sdk-core/spec/seahorse/model/operation_spec.rb @@ -4,159 +4,64 @@ module Seahorse module Model describe Operation do - describe '#name' do - - it 'defaults to nil' do - expect(Operation.new.name).to be(nil) - end - - it 'returns the name set in the definition' do - operation = Operation.new('name' => 'abc') - expect(operation.name).to eq('abc') - end - + it 'defaults #name to nil' do + operation = Operation.new + operation.name = 'OperationName' + expect(operation.name).to eq('OperationName') end - describe '#http_method' do - - it 'defaults to POST' do - expect(Operation.new.http_method).to eq('POST') - end - - it 'returns the verb set in the definition' do - operation = Operation.new('http' => { 'method' => 'GET'}) - expect(operation.http_method).to eq('GET') - end - + it 'defaults #http_method to "POST"' do + operation = Operation.new + expect(operation.http_method).to eq('POST') + operation.http_method = 'GET' + expect(operation.http_method).to eq('GET') end - describe '#http_request_uri' do - - it 'defaults to /' do - expect(Operation.new.http_request_uri).to eq('/') - end - - it 'returns the request uri template set in the definition' do - operation = Operation.new('http' => { 'requestUri' => '/{id}{?cache}'}) - expect(operation.http_request_uri).to eq('/{id}{?cache}') - end - + it 'defaults #http_request_uri to "/"' do + operation = Operation.new + expect(operation.http_request_uri).to eq('/') + operation.http_request_uri = '/path?query' + expect(operation.http_method).to eq('/path?query') end - describe '#documentation' do - - it 'defaults to nil' do - expect(Operation.new.documentation).to be(nil) - end - - it 'returns the value set in the definition' do - operation = Operation.new('documentation' => 'docs') - expect(operation.documentation).to eq('docs') - end - + it 'defaults #deprecated to false' do + operation = Operation.new + expect(operation.deprecated).to be(false) + operation.deprecated = true + expect(operation.deprecated).to be(true) end - describe '#input' do - - it 'defaults to nil' do - expect(Operation.new.input).to be(nil) - end - - it 'returns the shape set in the definition' do - definition = { 'input' => { 'type' => 'structure' }} - operation = Operation.new(definition) - expect(operation.input).to be_kind_of(Shapes::Structure) - end - - it 'loads a shape from the shape map when given as a reference' do - definition = { - 'input' => { 'shape' => 'InputShape', 'documentation' => 'input' } - } - shapes = ShapeMap.new( - 'InputShape' => { 'type' => 'structure' } - ) - operation = Operation.new(definition, shape_map: shapes) - expect(operation.input.documentation).to eq('input') - end - + it 'defaults #documentation to nil' do + operation = Operation.new + expect(operation.documentation).to be(nil) + operation.documentation = 'docstring' + expect(operation.documenation).to eq('docstring') end - describe '#output' do - - it 'defaults to nil' do - expect(Operation.new.output).to be(nil) - end - - it 'returns the shape set in the definition' do - definition = { - 'output' => { 'shape' => 'OutputShape', 'documentation' => 'output' } - } - shapes = ShapeMap.new( - 'OutputShape' => { 'type' => 'structure' } - ) - operation = Operation.new(definition, shape_map: shapes) - expect(operation.output.documentation).to eq('output') - end - - it 'loads a shape from the shape map when given as a reference' do - shapes = ShapeMap.new('OutputShape' => { 'type' => 'structure' }) - definition = { 'output' => { 'shape' => 'OutputShape' }} - operation = Operation.new(definition, shape_map: shapes) - expect(operation.output).to be(shapes.shape('shape' => 'OutputShape')) - end - + it 'defaults #input to nil' do + shape_ref = double('shape-ref') + operation = Operation.new + expect(operation.input).to be(nil) + operation.input = shape_ref + expect(operation.input).to be(shape_ref) end - describe '#errors' do - - it 'returns an enumerator' do - expect(Operation.new.errors).to be_kind_of(Enumerator) - end - - it 'defaults to an empty list' do - expect(Operation.new.errors.to_a).to eq([]) - end - - it 'returns the shapes set in the definition' do - definition = { - 'errors' => [ - { 'type' => 'structure', 'documentation' => 'error1' }, - { 'type' => 'structure', 'documentation' => 'error2' }, - ] - } - operation = Operation.new(definition) - expect(operation.errors.map(&:documentation)).to eq(%w(error1 error2)) - end - - it 'loads shapes from the shape map when given as a references' do - definition = { - 'errors' => [ - { 'shape' => 'Error1' }, - { 'shape' => 'Error2' }, - ] - } - shapes = ShapeMap.new( - 'Error1' => { 'type' => 'structure', 'documentation' => 'error1' }, - 'Error2' => { 'type' => 'structure', 'documentation' => 'error2' }, - ) - operation = Operation.new(definition, shape_map: shapes) - expect(operation.errors.map(&:documentation)).to eq(%w(error1 error2)) - end - + it 'defaults #output to nil' do + shape_ref = double('shape-ref') + operation = Operation.new + expect(operation.output).to be(nil) + operation.output = shape_ref + expect(operation.output).to be(shape_ref) end - describe '#deprecated?' do - - it 'defaults to false' do - expect(Operation.new.deprecated?).to be(false) - end - - it 'returns true if specified in the definition' do - operation = Operation.new('deprecated' => true) - expect(operation.deprecated?).to be(true) - end - + it 'defaults #errors to []' do + shape_ref = double('shape-ref') + operation = Operation.new + expect(operation.errors).to eq([]) + operation.errors << [shape_ref, shape_ref] + expect(operation.output).to eq([shape_ref, shape_ref]) end + end end end diff --git a/aws-sdk-core/spec/seahorse/model/shapes_spec.rb b/aws-sdk-core/spec/seahorse/model/shapes_spec.rb index 09d36c3a793..cbb141aea40 100644 --- a/aws-sdk-core/spec/seahorse/model/shapes_spec.rb +++ b/aws-sdk-core/spec/seahorse/model/shapes_spec.rb @@ -1,520 +1,279 @@ require 'spec_helper' +require 'set' module Seahorse module Model module Shapes - - shared_examples 'subclass of Shape' do |definition| - - it 'can be initialized without any arguments' do - described_class.new(definition) - end - - it 'can be constructed directly from Shape.new with "type"' do - shape = Shape.new(definition.merge('type' => described_class.type)) - expect(shape).to be_kind_of(described_class) + describe ShapeRef do + + it 'defaults #shape to nil' do + shape = double('shape') + ref = ShapeRef.new + expect(ref.shape).to be(nil) + ref.shape = shape + expect(ref.shape).to be(shape) + end + + it 'defaults #location to nil' do + ref = ShapeRef.new + expect(ref.location).to be(nil) + ref.location = 'value' + expect(ref.location).to eq('value') + end + + it 'defaults #location_name to nil' do + ref = ShapeRef.new + expect(ref.location_name).to be(nil) + ref.location_name = 'value' + expect(ref.location_name).to eq('value') + end + + it 'defaults #deprecated to false' do + ref = ShapeRef.new + expect(ref.deprecated).to be(false) + ref.deprecated = true + expect(ref.deprecated).to be(true) + end + + it 'provides metadata access via #[] and #[]=' do + ref = ShapeRef.new + ref[:key] = 'value' + expect(ref[:key]).to eq('value') + expect(ref['key']).to eq('value') + end + + it 'provides read access to the shape metadata' do + shape = Shape.new + shape['key'] = 'value' + ref = ShapeRef.new(shape: shape) + expect(ref[:key]).to eq('value') + expect(ref['key']).to eq('value') + end + + it 'can be populated via .new' do + shape = double('shape') + ref = ShapeRef.new( + shape: shape, + location: 'location', + location_name: 'location_name', + deprecated: true, + metadata: { + key: 'value' + } + ) + expect(ref.shape).to be(shape) + expect(ref.location).to eq('location') + expect(ref.location_name).to eq('location_name') + expect(ref.deprecated).to be(true) + expect(ref[:key]).to eq('value') end - it 'responds to #type with the shape class type' do - shape = described_class.new(definition) - expect(shape.type).to eq(described_class.type) - end - - it 'responds to #location_name with a default of nil' do - shape = described_class.new(definition) - expect(shape.location_name).to be(nil) - end + end - it 'responds to #location_name with the given value' do - definition['locationName'] = 'Name' - shape = described_class.new(definition) - expect(shape.location_name).to eq('Name') - end + describe StructureShape do - it 'responds to #documentation with a default of nil' do - shape = described_class.new(definition) - expect(shape.documentation).to be(nil) - end + let(:shape_ref) { + ShapeRef.new(shape: Shape.new, location_name: 'LocName') + } - it 'responds to #documentation with the given docs' do - definition['documentation'] = 'docs' - shape = described_class.new(definition) - expect(shape.documentation).to eq('docs') + it 'is a Shape' do + expect(StructureShape.new).to be_kind_of(Shape) end - it 'responds to #metadata, returning the definition at that key' do - shape = described_class.new(definition.merge('foo' => 'bar')) - expect(shape.metadata('foo')).to eq('bar') + it 'allows members to be added' do + shape = StructureShape.new + expect(shape.member_names).to eq([]) + shape.add_member(:member_name, shape_ref, required: true) + expect(shape.member?(:member_name)).to be(true) + expect(shape.member?('member_name')).to be(true) + expect(shape.member_names).to eq([:member_name]) + expect(shape.member(:member_name)).to be(shape_ref) + expect(shape.member('member_name')).to be(shape_ref) end - it 'responds to #shape_map with a default empty shape map' do - shape = described_class.new(definition) - expect(shape.shape_map).to be_kind_of(ShapeMap) + it 'provides a list of required members' do + shape = StructureShape.new + expect(shape.required).to be_kind_of(Set) + expect(shape.required).to be_empty + shape.add_member(:member_name, shape_ref, required: true) + expect(shape.required).to include(:member_name) end - it 'responds to #shape_map with the constructed object' do - shape_map = double('shape-map') - shape = described_class.new(definition, shape_map: shape_map) - expect(shape.shape_map).to be(shape_map) + it 'provides access to members by their location name' do + shape = StructureShape.new + shape.add_member(:member_name, shape_ref, required: true) + expect(shape.member_by_location_name(shape_ref.location_name)).to eq([:member_name, shape_ref]) end end - describe Shapes::Shape do - - describe 'new' do - - it 'constructs and returns a shape of the indicited type' do - shape = Shape.new('type' => 'structure') - expect(shape).to be_kind_of(Shapes::Structure) - end - - end - - describe 'types' do + describe ListShape do - it 'returns an enumerator of shape types to shape classes' do - expect(Shapes.types.to_a.sort).to eq([ - ['blob', Shapes::Blob], - ['boolean', Shapes::Boolean], - ['byte', Shapes::Byte], - ['character', Shapes::Character], - ['double', Shapes::Double], - ['float', Shapes::Float], - ['integer', Shapes::Integer], - ['list', Shapes::List], - ['long', Shapes::Long], - ['map', Shapes::Map], - ['string', Shapes::String], - ['structure', Shapes::Structure], - ['timestamp', Shapes::Timestamp], - ]) - end - - end - - end - - describe Shapes::Structure do - - let(:definition) {{ - 'type' => 'structure', - 'required' => ['name'], - 'members' => { - 'name' => { 'type' => 'string' }, - 'age' => { 'type' => 'integer' }, - } - }} - - let(:shape) { Shapes::Structure.new(definition) } - - it_should_behave_like 'subclass of Shape', {} - - describe '#member' do - - it 'returns the shape for the named member' do - name_shape = shape.member(:name) - expect(name_shape).to be_a(Shapes::String) - end - - it 'accepts string member names' do - name_shape = shape.member('name') - expect(name_shape).to be_a(Shapes::String) - end - - it 'raises an ArgumentError if an undefined member is requested' do - expect { - shape.member(:gender) - }.to raise_error(ArgumentError, "no such member :gender") - end + let(:shape_ref) { + ShapeRef.new(shape: Shape.new, location_name: 'LocName') + } + it 'is a Shape' do + expect(ListShape.new).to be_kind_of(Shape) end - describe '#member?' do - - it 'returns true if the member is defined' do - expect(shape.member?(:name)).to be(true) - expect(shape.member?('name')).to be(true) - end - - it 'returns false if the member is not defined' do - expect(shape.member?(:gender)).to be(false) - end - + it 'defaults #min to nil' do + shape = ListShape.new + expect(shape.min).to be(nil) + shape.min = 10 + expect(shape.min).to eq(10) end - describe '#members' do - - it 'returns an enumerable object' do - expect(shape.members).to be_kind_of(Enumerable) - end - - it 'enumerates member names and member shapes' do - yielded = [] - shape.members.each do |member_name, member_shape| - yielded << [member_name, member_shape] - end - expect(yielded).to eq([ - [:name, shape.member(:name)], - [:age, shape.member(:age)], - ]) - end - + it 'defaults #max to nil' do + shape = ListShape.new + expect(shape.max).to be(nil) + shape.max = 10 + expect(shape.max).to eq(10) end - describe '#member_names' do - - it 'returns an array of symbolized member names' do - expect(shape.member_names).to eq([:name, :age]) - end - + it 'has a #member reference' do + shape = ListShape.new + expect(shape.member).to be(nil) + shape.member = shape_ref + expect(shape.member).to be(shape_ref) end - describe '#required' do + end - it 'returns an array of symbolized required member names' do - expect(shape.required).to eq([:name]) - end + describe MapShape do - it 'defaults to an empty list' do - shape = Shapes::Structure.new - expect(shape.required).to eq([]) - end + let(:shape_ref) { + ShapeRef.new(shape: Shape.new, location_name: 'LocName') + } + it 'is a Shape' do + expect(MapShape.new).to be_kind_of(Shape) end - describe 'with a shape map (recursive shapes)' do - - let(:shape_map) { - ShapeMap.new({ - 'Person' => { - 'type' => 'structure', - 'members' => { - 'Father' => { 'shape' => 'Person' }, - 'Mother' => { 'shape' => 'Person', 'hasMaidenName' => true }, - } - } - }) - } - - let(:shape) { shape_map.shape('shape' => 'Person') } - - it 'constructs and returns recursive shapes' do - shape.member(:father).member(:father) - end - - it 'reuses shapes that share references' do - father = shape.member(:father) - grand_father = father.member(:father) - expect(father).to be(grand_father) - end - - it 'constructs new shape for references with additional traits' do - mother = shape.member(:mother) - expect(mother).not_to be(shape.member(:father)) - expect(mother).to be(shape.member(:mother).member(:mother)) - end - - it 'merges shape refs with shape definitions' do - mother = shape.member(:mother) - expect(mother.metadata('hasMaidenName')).to be(true) - end - + it 'defaults #min to nil' do + shape = MapShape.new + expect(shape.min).to be(nil) + shape.min = 10 + expect(shape.min).to eq(10) end - end - - describe Shapes::List do - - it_should_behave_like 'subclass of Shape', { 'member' => { 'type' => 'string' }} - - let(:definition) {{ 'member' => { 'type' => 'string' }}} - - let(:options) { {} } - - let(:shape) { Shapes::List.new(definition, options) } - - describe '#min' do - - it 'defaults to nil' do - expect(shape.min).to be(nil) - end - - it 'returns the value given in the definition' do - definition['min'] = 1 - expect(shape.min).to be(1) - end - + it 'defaults #max to nil' do + shape = MapShape.new + expect(shape.max).to be(nil) + shape.max = 10 + expect(shape.max).to eq(10) end - describe '#max' do - - it 'defaults to nil' do - expect(shape.max).to be(nil) - end - - it 'returns the value given in the definition' do - definition['max'] = 100 - expect(shape.max).to be(100) - end - + it 'has a #key reference' do + shape = MapShape.new + expect(shape.key).to be(nil) + shape.key = shape_ref + expect(shape.key).to be(shape_ref) end - describe '#member' do - - it 'returns the shape given in the definition' do - definition['member'] = { 'type' => 'integer' } - expect(shape.member).to be_kind_of(Shapes::Integer) - end - - it 'resolves shape refs in the given shape map' do - shape_map = ShapeMap.new({'Number' => { 'type' => 'integer' }}) - definition['member'] = { 'shape' => 'Number' } - options[:shape_map] = shape_map - shape = Shapes::List.new(definition, options) - expect(shape.member).to be_kind_of(Shapes::Integer) - expect(shape.member).to be(shape_map.shape('shape' => 'Number')) - end - + it 'has a #value reference' do + shape = MapShape.new + expect(shape.value).to be(nil) + shape.value = shape_ref + expect(shape.value).to be(shape_ref) end end - describe Shapes::Map do - - it_should_behave_like 'subclass of Shape', { - 'key' => { 'type' => 'string' }, - 'value' => { 'type' => 'string' }, - } - - let(:definition) {{ - 'key' => { 'type' => 'string' }, - 'value' => { 'type' => 'string' }, - }} - - let(:options) { {} } - - let(:shape) { Shapes::Map.new(definition, options) } - - describe '#min' do - - it 'defaults to nil' do - expect(shape.min).to be(nil) - end - - it 'returns the value given in the definition' do - definition['min'] = 1 - expect(shape.min).to be(1) - end + describe BlobShape do + it 'is a Shape' do + expect(BlobShape.new).to be_kind_of(Shape) end - describe '#max' do - - it 'defaults to nil' do - expect(shape.max).to be(nil) - end - - it 'returns the value given in the definition' do - definition['max'] = 100 - expect(shape.max).to be(100) - end - + it 'defaults #min to nil' do + shape = BlobShape.new + expect(shape.min).to be(nil) + shape.min = 10 + expect(shape.min).to eq(10) end - describe '#key' do - - it 'defaults to a string shape' do - expect(shape.key).to be_kind_of(Shapes::String) - end - - it 'returns the shape given in the definition' do - definition['key'] = { 'type' => 'integer' } - expect(shape.key).to be_kind_of(Shapes::Integer) - end - - it 'resolves shape refs in the given shape map' do - shape_map = ShapeMap.new({'String' => { 'type' => 'integer' }}) - definition['key'] = { 'shape' => 'String' } - options[:shape_map] = shape_map - shape = Shapes::Map.new(definition, options) - expect(shape.key).to be_kind_of(Shapes::Integer) - expect(shape.key).to be(shape_map.shape('shape' => 'String')) - end - + it 'defaults #max to nil' do + shape = BlobShape.new + expect(shape.max).to be(nil) + shape.max = 10 + expect(shape.max).to eq(10) end - describe '#value' do - - it 'defaults to a string shape' do - expect(shape.value).to be_kind_of(Shapes::String) - end - - it 'returns the shape given in the definition' do - definition['value'] = { 'type' => 'integer' } - expect(shape.value).to be_kind_of(Shapes::Integer) - end + end - it 'resolves shape refs in the given shape map' do - shape_map = ShapeMap.new({'String' => { 'type' => 'integer' }}) - definition['value'] = { 'shape' => 'String' } - options[:shape_map] = shape_map - shape = Shapes::Map.new(definition, options) - expect(shape.value).to be_kind_of(Shapes::Integer) - expect(shape.value).to be(shape_map.shape('shape' => 'String')) - end + describe BooleanShape do + it 'is a Shape' do + expect(BooleanShape.new).to be_kind_of(Shape) end end - describe Shapes::String do - - it_should_behave_like 'subclass of Shape', {} - - let(:definition) { {} } - - let(:shape) { Shapes::String.new(definition) } - - describe '#min' do - - it 'defaults to nil' do - expect(shape.min).to be(nil) - end - - it 'returns the value given in the definition' do - definition['min'] = 1 - expect(shape.min).to be(1) - end + describe FloatShape do + it 'is a Shape' do + expect(FloatShape.new).to be_kind_of(Shape) end - describe '#max' do - - it 'defaults to nil' do - expect(shape.max).to be(nil) - end + end - it 'returns the value given in the definition' do - definition['max'] = 100 - expect(shape.max).to be(100) - end + describe IntegerShape do + it 'is a Shape' do + expect(IntegerShape.new).to be_kind_of(Shape) end - describe '#enum' do - - it 'defaults to nil' do - expect(shape.enum).to be(nil) - end - - it 'returns the value given in the definition in a Set' do - definition['enum'] = %w(a b c) - expect(shape.enum).to eq(Set.new(%w(a b c))) - end - + it 'defaults #min to nil' do + shape = IntegerShape.new + expect(shape.min).to be(nil) + shape.min = 10 + expect(shape.min).to eq(10) end - describe '#pattern' do - - it 'defaults to nil' do - expect(shape.pattern).to be(nil) - end - - it 'returns the value given' do - definition['pattern'] = 'abc' - expect(shape.pattern).to eq('abc') - end - + it 'defaults #max to nil' do + shape = IntegerShape.new + expect(shape.max).to be(nil) + shape.max = 10 + expect(shape.max).to eq(10) end end - describe Shapes::Timestamp do - - it_should_behave_like 'subclass of Shape', {} - - let(:definition) { {} } - - let(:shape) { Shapes::Timestamp.new(definition) } - - describe '#format' do - - it 'returns the value given in definition' do - definition['timestampFormat'] = 'rfc822' - expect(shape.format).to eq('rfc822') - end + describe StringShape do + it 'is a Shape' do + expect(StringShape.new).to be_kind_of(Shape) end - describe '#format_time' do - - it 'defaults to the given timestamp format' do - now = Time.now - expect(shape.format_time(now, 'unixTimestamp')).to eq(now.to_i) - end - - it 'uses the given timestampFormat over the given default' do - now = Time.now - definition['timestampFormat'] = 'rfc822' - expect(shape.format_time(now, 'unixTimestamp')).to eq(now.utc.rfc822) - end - + it 'defaults #enum to nil' do + shape = StringShape.new + expect(shape.enum).to be(nil) + shape.enum = Set.new(%w(a b c)) + expect(shape.enum).to eq(Set.new(%w(a b c))) end - end - - describe Shapes::Integer do - - it_should_behave_like 'subclass of Shape', {} - - let(:definition) { {} } - - let(:shape) { Shapes::Integer.new(definition) } - - describe '#min' do - - it 'defaults to nil' do - expect(shape.min).to be(nil) - end - - it 'returns the value given in the definition' do - definition['min'] = 1 - expect(shape.min).to be(1) - end - + it 'defaults #min to nil' do + shape = StringShape.new + expect(shape.min).to be(nil) + shape.min = 10 + expect(shape.min).to eq(10) end - describe '#max' do - - it 'defaults to nil' do - expect(shape.max).to be(nil) - end - - it 'returns the value given in the definition' do - definition['max'] = 100 - expect(shape.max).to be(100) - end - + it 'defaults #max to nil' do + shape = StringShape.new + expect(shape.max).to be(nil) + shape.max = 10 + expect(shape.max).to eq(10) end end - describe Shapes::Float do + describe TimestampShape do - it_should_behave_like 'subclass of Shape', {} - - end - - describe Shapes::Boolean do - - it_should_behave_like 'subclass of Shape', {} - - end - - describe Shapes::Blob do - - it_should_behave_like 'subclass of Shape', {} + it 'is a Shape' do + expect(TimestampShape.new).to be_kind_of(Shape) + end end end From b2d597d685c21c992e5f28701e37217b5022845d Mon Sep 17 00:00:00 2001 From: Trevor Rowe Date: Thu, 7 May 2015 20:11:06 -0700 Subject: [PATCH 024/101] More test fixes. --- .../lib/aws-sdk-core/xml/error_handler.rb | 2 +- .../client/plugins/restful_bindings.rb | 36 ++++++++++--------- aws-sdk-core/spec/aws_spec.rb | 17 ++++----- .../spec/seahorse/client/base_spec.rb | 36 ++++++------------- .../seahorse/client/plugins/endpoint_spec.rb | 8 ++--- .../spec/seahorse/model/operation_spec.rb | 9 ++--- 6 files changed, 46 insertions(+), 62 deletions(-) diff --git a/aws-sdk-core/lib/aws-sdk-core/xml/error_handler.rb b/aws-sdk-core/lib/aws-sdk-core/xml/error_handler.rb index 6ad67bc02f4..374df32bfda 100644 --- a/aws-sdk-core/lib/aws-sdk-core/xml/error_handler.rb +++ b/aws-sdk-core/lib/aws-sdk-core/xml/error_handler.rb @@ -50,7 +50,7 @@ def http_status_error_code(context) end def remove_prefix(error_code, context) - if prefix = context.config.api.metadata('errorPrefix') + if prefix = context.config.api.metadata['errorPrefix'] error_code.sub(/^#{prefix}/, '') else error_code diff --git a/aws-sdk-core/lib/seahorse/client/plugins/restful_bindings.rb b/aws-sdk-core/lib/seahorse/client/plugins/restful_bindings.rb index 5da0a5c6c89..37e13d48e41 100644 --- a/aws-sdk-core/lib/seahorse/client/plugins/restful_bindings.rb +++ b/aws-sdk-core/lib/seahorse/client/plugins/restful_bindings.rb @@ -65,42 +65,46 @@ def serialize_header_value(ref, value) # Extracts HTTP response headers and status code. def parse_response(response) headers = response.context.http_response.headers - each_member(response.context.operation.output) do |key, shape| - case shape.location + each_member(response.context.operation.output) do |key, ref| + case ref.location when 'statusCode' status_code = response.context.http_response.status_code response.data[key] = status_code when 'header' - response.data[key] = extract_header(headers, shape) + response.data[key] = extract_header(headers, ref) when 'headers' - response.data[key] = extract_header_map(headers, shape) + response.data[key] = extract_header_map(headers, ref) end end end - def extract_header(headers, shape) - parse_header_value(shape, headers[shape.location_name]) + def extract_header(headers, ref) + parse_header_value(ref, headers[ref.location_name]) end - def extract_header_map(headers, shape) - prefix = shape.location_name || '' + def extract_header_map(headers, ref) + prefix = ref.location_name || '' hash = {} headers.each do |header, value| if match = header.match(/^#{prefix}(.+)/i) - hash[match[1]] = parse_header_value(shape.value, value) + hash[match[1]] = parse_header_value(ref.shape.value, value) end end hash end - def parse_header_value(shape, value) + def parse_header_value(ref, value) if value - case shape - when Model::Shapes::Integer then value.to_i - when Model::Shapes::Float then value.to_f - when Model::Shapes::Boolean then value == 'true' - when Model::Shapes::Timestamp - shape.format == 'unix_timestamp' ? value.to_i : Time.parse(value) + case ref.shape + when IntegerShape then value.to_i + when FloatShape then value.to_f + when BooleanShape then value == 'true' + when TimestampShape + if value =~ /\d+(\.\d*)/ + Time.at(value.to_f) + else + Time.parse(value) + end else value end end diff --git a/aws-sdk-core/spec/aws_spec.rb b/aws-sdk-core/spec/aws_spec.rb index dd15531e1dd..cafa88e5c6e 100644 --- a/aws-sdk-core/spec/aws_spec.rb +++ b/aws-sdk-core/spec/aws_spec.rb @@ -67,29 +67,26 @@ module Aws it 'accepts nil' do Aws.add_service('DummyService', api: nil) - expect(DummyService::Client.api.definition).to eq({}) + expect(DummyService::Client.api).to be_kind_of(Seahorse::Model::Api) end it 'accepts string file path values' do Aws.add_service('DummyService', api: api_path) - expect(DummyService::Client.api.definition).to eq(EC2::Client.api.definition) + expect(DummyService::Client.api).to be_kind_of(Seahorse::Model::Api) end it 'accpets Pathname values' do - path = Pathname.new(api_path) - Aws.add_service('DummyService', api: path) - expect(DummyService::Client.api.definition).to eq(EC2::Client.api.definition) + Aws.add_service('DummyService', api: Pathname.new(api_path)) + expect(DummyService::Client.api).to be_kind_of(Seahorse::Model::Api) end it 'accpets hash values' do - api = Aws.load_json(api_path) - Aws.add_service('DummyService', api: api) - expect(DummyService::Client.api.definition).to eq(api) + Aws.add_service('DummyService', api: Aws.load_json(api_path)) + expect(DummyService::Client.api).to be_kind_of(Seahorse::Model::Api) end it 'accpets Seahorse::Model::Api values' do - api = Aws.load_json(api_path) - api = Seahorse::Model::Api.new(api) + api = Aws::Api::Builder.build(Aws.load_json(api_path)) Aws.add_service('DummyService', api: api) expect(DummyService::Client.api).to be(api) end diff --git a/aws-sdk-core/spec/seahorse/client/base_spec.rb b/aws-sdk-core/spec/seahorse/client/base_spec.rb index 7e114b5edaa..f310322cbc5 100644 --- a/aws-sdk-core/spec/seahorse/client/base_spec.rb +++ b/aws-sdk-core/spec/seahorse/client/base_spec.rb @@ -5,11 +5,7 @@ module Seahorse module Client describe Base do - let(:api) {{ - 'operations' => { - 'operation_name' => {}, - } - }} + let(:api) { Seahorse::Model::Api.new } let(:client_class) { Base.define(api:api) } @@ -63,6 +59,10 @@ module Client let(:request) { client.build_request('operation_name') } + before(:each) do + api.add_operation(:operation_name, Model::Operation.new) + end + it 'returns a Request' do expect(request).to be_kind_of(Request) end @@ -85,7 +85,7 @@ module Client it 'stringifies the operation name' do request = client.build_request(:operation_name) - expect(request.context.operation_name).to eq('operation_name') + expect(request.context.operation_name).to eq(:operation_name) end it 'populates the request context params' do @@ -107,7 +107,7 @@ module Client it 'raises an error for unknown operations' do expect { client.build_request('foo') - }.to raise_error("unknown operation :foo") + }.to raise_error("unknown operation \"foo\"") end end @@ -117,6 +117,7 @@ module Client let(:request) { double('request') } before(:each) do + api.add_operation(:operation_name, Model::Operation.new) allow(client).to receive(:build_request).and_return(request) allow(request).to receive(:send_request) end @@ -156,19 +157,12 @@ module Client describe '.api' do it 'can be set' do - api = Model::Api.new({}) + api = Model::Api.new client_class = Class.new(Base) client_class.set_api(api) expect(client_class.api).to be(api) end - it 'can be set as a hash, returning a Model::Api' do - client_class = Class.new(Base) - api = client_class.set_api({}) - expect(api).to be_kind_of(Model::Api) - expect(api.definition).to eq(Model::Api.new({}).definition) - end - end describe '.define' do @@ -179,7 +173,7 @@ module Client end it 'sets the api on the client class' do - api = Model::Api.new({}) + api = Model::Api.new client_class = Base.define(api: api) expect(client_class.api).to be(api) end @@ -269,21 +263,11 @@ module Client expect(client_class.plugins.to_a).to eq([ Plugins::Endpoint, Plugins::NetHttp, - Plugins::ParamConversion, - Plugins::ParamValidation, Plugins::RaiseResponseErrors, Plugins::ResponseTarget, ]) end - it 'add plugins specified in the api to the default plugins' do - stub_const('Seahorse::Client::PluginA', plugin_a) - api = { 'plugins' => ['Seahorse::Client::PluginA'] } - client_class = Base.define(api: api) - expect(client_class.plugins).to include(Plugins::NetHttp) - expect(client_class.plugins).to include(Client::Plugins::NetHttp) - end - end describe '.new' do diff --git a/aws-sdk-core/spec/seahorse/client/plugins/endpoint_spec.rb b/aws-sdk-core/spec/seahorse/client/plugins/endpoint_spec.rb index a240bbf8aa9..b3ea6c0ef13 100644 --- a/aws-sdk-core/spec/seahorse/client/plugins/endpoint_spec.rb +++ b/aws-sdk-core/spec/seahorse/client/plugins/endpoint_spec.rb @@ -6,11 +6,9 @@ module Plugins describe Endpoint do let(:client_class) do - client_class = Client::Base.define api: { - 'operations' => { - 'OperationName' => { 'name' => 'OperationName' }, - } - } + api = Model::Api.new + api.add_operation(:operation_name, Model::Operation.new) + client_class = Client::Base.define(api: api) client_class.clear_plugins client_class.add_plugin(Endpoint) client_class.add_plugin(DummySendPlugin) diff --git a/aws-sdk-core/spec/seahorse/model/operation_spec.rb b/aws-sdk-core/spec/seahorse/model/operation_spec.rb index ff1b64a3538..22d296ae47e 100644 --- a/aws-sdk-core/spec/seahorse/model/operation_spec.rb +++ b/aws-sdk-core/spec/seahorse/model/operation_spec.rb @@ -21,7 +21,7 @@ module Model operation = Operation.new expect(operation.http_request_uri).to eq('/') operation.http_request_uri = '/path?query' - expect(operation.http_method).to eq('/path?query') + expect(operation.http_request_uri).to eq('/path?query') end it 'defaults #deprecated to false' do @@ -35,7 +35,7 @@ module Model operation = Operation.new expect(operation.documentation).to be(nil) operation.documentation = 'docstring' - expect(operation.documenation).to eq('docstring') + expect(operation.documentation).to eq('docstring') end it 'defaults #input to nil' do @@ -58,8 +58,9 @@ module Model shape_ref = double('shape-ref') operation = Operation.new expect(operation.errors).to eq([]) - operation.errors << [shape_ref, shape_ref] - expect(operation.output).to eq([shape_ref, shape_ref]) + operation.errors << shape_ref + operation.errors << shape_ref + expect(operation.errors).to eq([shape_ref, shape_ref]) end end From 74cf16e50b51e34c20e010fbc31d8bec951b50e0 Mon Sep 17 00:00:00 2001 From: Trevor Rowe Date: Thu, 7 May 2015 21:46:13 -0700 Subject: [PATCH 025/101] Significant corrections to the protocol specs. A number of traits were applied incorrectly. --- .../spec/fixtures/protocols/input/ec2.json | 4 +- .../fixtures/protocols/input/rest-json.json | 4 +- .../fixtures/protocols/input/rest-xml.json | 14 +++---- .../spec/fixtures/protocols/output/ec2.json | 18 ++++----- .../spec/fixtures/protocols/output/query.json | 26 +++--------- .../fixtures/protocols/output/rest-json.json | 7 ++-- .../fixtures/protocols/output/rest-xml.json | 40 +++++++++---------- 7 files changed, 48 insertions(+), 65 deletions(-) diff --git a/aws-sdk-core/spec/fixtures/protocols/input/ec2.json b/aws-sdk-core/spec/fixtures/protocols/input/ec2.json index 84655834fdd..3c7e2f212df 100644 --- a/aws-sdk-core/spec/fixtures/protocols/input/ec2.json +++ b/aws-sdk-core/spec/fixtures/protocols/input/ec2.json @@ -204,7 +204,7 @@ "type": "list", "member": { "shape": "StringType", - "LocationName": "item" + "locationName": "item" } }, "StringType": { @@ -254,7 +254,7 @@ "type": "list", "member": { "shape": "StringType", - "LocationName": "item" + "locationName": "item" } }, "StringType": { diff --git a/aws-sdk-core/spec/fixtures/protocols/input/rest-json.json b/aws-sdk-core/spec/fixtures/protocols/input/rest-json.json index 32d403684c3..f8e0ff11d3e 100644 --- a/aws-sdk-core/spec/fixtures/protocols/input/rest-json.json +++ b/aws-sdk-core/spec/fixtures/protocols/input/rest-json.json @@ -372,13 +372,13 @@ "type": "structure", "members": { "foo": { - "shape": "FooShape" + "shape": "FooShape", + "locationName": "foo" } }, "payload": "foo" }, "FooShape": { - "locationName": "foo", "type": "structure", "members": { "baz": { diff --git a/aws-sdk-core/spec/fixtures/protocols/input/rest-xml.json b/aws-sdk-core/spec/fixtures/protocols/input/rest-xml.json index 2d000afaa40..023d3459b13 100644 --- a/aws-sdk-core/spec/fixtures/protocols/input/rest-xml.json +++ b/aws-sdk-core/spec/fixtures/protocols/input/rest-xml.json @@ -628,14 +628,14 @@ "type": "structure", "members": { "foo": { - "shape": "FooShape" + "shape": "FooShape", + "location": "headers", + "locationName": "x-foo-" } } }, "FooShape": { "type": "map", - "location": "headers", - "locationName": "x-foo-", "key": { "shape": "FooKeyValue" }, @@ -795,13 +795,13 @@ "type": "structure", "members": { "foo": { - "shape": "FooShape" + "shape": "FooShape", + "locationName": "foo" } }, "payload": "foo" }, "FooShape": { - "locationName": "foo", "type": "structure", "members": { "baz": { @@ -885,14 +885,14 @@ "type": "structure", "members": { "Grant": { - "shape": "Grant" + "shape": "Grant", + "locationName": "Grant" } }, "payload": "Grant" }, "Grant": { "type": "structure", - "locationName": "Grant", "members": { "Grantee": { "shape": "Grantee" diff --git a/aws-sdk-core/spec/fixtures/protocols/output/ec2.json b/aws-sdk-core/spec/fixtures/protocols/output/ec2.json index a85607a65d1..9bbcd0787aa 100644 --- a/aws-sdk-core/spec/fixtures/protocols/output/ec2.json +++ b/aws-sdk-core/spec/fixtures/protocols/output/ec2.json @@ -217,8 +217,7 @@ "type": "structure", "members": { "ListMember": { - "shape": "ListType", - "flattened": true + "shape": "ListType" } } }, @@ -226,7 +225,8 @@ "type": "list", "member": { "shape": "StringType" - } + }, + "flattened": true }, "StringType": { "type": "string" @@ -322,8 +322,7 @@ "type": "structure", "members": { "Map": { - "shape": "MapType", - "flattened": true + "shape": "MapType" } } }, @@ -334,7 +333,8 @@ }, "value": { "shape": "StringType" - } + }, + "flattened": true }, "StringType": { "type": "string" @@ -372,8 +372,7 @@ "type": "structure", "members": { "Map": { - "shape": "MapType", - "flattened": true + "shape": "MapType" } } }, @@ -386,7 +385,8 @@ "value": { "shape": "StringType", "locationName": "bar" - } + }, + "flattened": true }, "StringType": { "type": "string" diff --git a/aws-sdk-core/spec/fixtures/protocols/output/query.json b/aws-sdk-core/spec/fixtures/protocols/output/query.json index 5ffd5ac263a..5e5c00947bb 100644 --- a/aws-sdk-core/spec/fixtures/protocols/output/query.json +++ b/aws-sdk-core/spec/fixtures/protocols/output/query.json @@ -7,7 +7,6 @@ "shapes": { "OutputShape": { "type": "structure", - "resultWrapper": "OperationNameResult", "members": { "Str": { "shape": "StringType" @@ -99,7 +98,6 @@ "shapes": { "OutputShape": { "type": "structure", - "resultWrapper": "OperationNameResult", "members": { "Str": { "shape": "StringType" @@ -143,7 +141,6 @@ "shapes": { "OutputShape": { "type": "structure", - "resultWrapper": "Wrapper", "members": { "Str": { "shape": "StringType" @@ -168,7 +165,7 @@ "response": { "status_code": 200, "headers": {}, - "body": "mynamerequest-id" + "body": "mynamerequest-id" } } ] @@ -180,7 +177,6 @@ }, "shapes": { "OutputShape": { - "resultWrapper": "OperationNameResult", "type": "structure", "members": { "Blob": { @@ -219,7 +215,6 @@ "shapes": { "OutputShape": { "type": "structure", - "resultWrapper": "OperationNameResult", "members": { "ListMember": { "shape": "ListShape" @@ -263,7 +258,6 @@ "shapes": { "OutputShape": { "type": "structure", - "resultWrapper": "OperationNameResult", "members": { "ListMember": { "shape": "ListShape" @@ -308,7 +302,6 @@ "shapes": { "OutputShape": { "type": "structure", - "resultWrapper": "OperationNameResult", "members": { "ListMember": { "shape": "ListType" @@ -353,7 +346,6 @@ "shapes": { "OutputShape": { "type": "structure", - "resultWrapper": "OperationNameResult", "members": { "ListMember": { "shape": "ListType" @@ -398,7 +390,6 @@ "shapes": { "OutputShape": { "type": "structure", - "resultWrapper": "OperationNameResult", "members": { "List": { "shape": "ListOfStructs" @@ -456,7 +447,6 @@ "shapes": { "OutputShape": { "type": "structure", - "resultWrapper": "OperationNameResult", "members": { "List": { "shape": "ListOfStructs" @@ -515,7 +505,6 @@ "shapes": { "OutputShape": { "type": "structure", - "resultWrapper": "OperationNameResult", "members": { "List": { "shape": "ListType" @@ -561,7 +550,6 @@ "shapes": { "OutputShape": { "type": "structure", - "resultWrapper": "OperationNameResult", "members": { "Map": { "shape": "StringMap" @@ -625,8 +613,7 @@ "type": "structure", "members": { "Map": { - "shape": "StringMap", - "flattened": true + "shape": "StringMap" } } }, @@ -637,7 +624,8 @@ }, "value": { "shape": "StringType" - } + }, + "flattened": true }, "StringType": { "type": "string" @@ -647,7 +635,6 @@ { "given": { "output": { - "resultWrapper": "OperationNameResult", "shape": "OutputShape" }, "name": "OperationName" @@ -691,8 +678,7 @@ "shape": "StringType", "locationName": "Value" }, - "flattened": true, - "locationName": "Attribute" + "flattened": true }, "StringType": { "type": "string" @@ -702,7 +688,6 @@ { "given": { "output": { - "resultWrapper": "OperationNameResult", "shape": "OutputShape" }, "name": "OperationName" @@ -728,7 +713,6 @@ "shapes": { "OutputShape": { "type": "structure", - "resultWrapper": "OperationNameResult", "members": { "Map": { "shape": "MapType" diff --git a/aws-sdk-core/spec/fixtures/protocols/output/rest-json.json b/aws-sdk-core/spec/fixtures/protocols/output/rest-json.json index 29d6bf6e92f..2d2a7d4f798 100644 --- a/aws-sdk-core/spec/fixtures/protocols/output/rest-json.json +++ b/aws-sdk-core/spec/fixtures/protocols/output/rest-json.json @@ -9,10 +9,12 @@ "type": "structure", "members": { "ImaHeader": { - "shape": "HeaderShape" + "shape": "HeaderShape", + "location": "header" }, "ImaHeaderLocation": { "shape": "HeaderShape", + "location": "header", "locationName": "X-Foo" }, "Status": { @@ -46,8 +48,7 @@ } }, "HeaderShape": { - "type": "string", - "location": "header" + "type": "string" }, "StatusShape": { "type": "integer" diff --git a/aws-sdk-core/spec/fixtures/protocols/output/rest-xml.json b/aws-sdk-core/spec/fixtures/protocols/output/rest-xml.json index ba1f09ffa82..0334e097319 100644 --- a/aws-sdk-core/spec/fixtures/protocols/output/rest-xml.json +++ b/aws-sdk-core/spec/fixtures/protocols/output/rest-xml.json @@ -9,10 +9,12 @@ "type": "structure", "members": { "ImaHeader": { - "shape": "HeaderShape" + "shape": "HeaderShape", + "location": "header" }, "ImaHeaderLocation": { "shape": "HeaderShape", + "location": "header", "locationName": "X-Foo" }, "Str": { @@ -67,12 +69,7 @@ "type": "character" }, "HeaderShape": { - "type": "string", - "location": "header" - }, - "StatusShape": { - "type": "integer", - "location": "statusCode" + "type": "string" }, "TimestampType": { "type": "timestamp" @@ -273,8 +270,7 @@ "type": "structure", "members": { "ListMember": { - "shape": "StringList", - "flattened": true + "shape": "StringList" } } }, @@ -282,7 +278,8 @@ "type": "list", "member": { "shape": "StringType" - } + }, + "flattened": true }, "StringType": { "type": "string" @@ -378,8 +375,7 @@ "type": "structure", "members": { "Map": { - "shape": "StringMap", - "flattened": true + "shape": "StringMap" } } }, @@ -390,7 +386,8 @@ }, "value": { "shape": "StringType" - } + }, + "flattened": true }, "StringType": { "type": "string" @@ -573,73 +570,74 @@ "type": "structure", "members": { "Str": { + "location": "header", "locationName": "x-str", "shape": "StringHeaderType" }, "Integer": { + "location": "header", "locationName": "x-int", "shape": "IntegerHeaderType" }, "TrueBool": { + "location": "header", "locationName": "x-true-bool", "shape": "BooleanHeaderType" }, "FalseBool": { + "location": "header", "locationName": "x-false-bool", "shape": "BooleanHeaderType" }, "Float": { + "location": "header", "locationName": "x-float", "shape": "FloatHeaderType" }, "Double": { + "location": "header", "locationName": "x-double", "shape": "DoubleHeaderType" }, "Long": { + "location": "header", "locationName": "x-long", "shape": "LongHeaderType" }, "Char": { + "location": "header", "locationName": "x-char", "shape": "CharHeaderType" }, "Timestamp": { + "location": "header", "locationName": "x-timestamp", "shape": "TimestampHeaderType" } } }, "StringHeaderType": { - "location": "header", "type": "string" }, "IntegerHeaderType": { - "location": "header", "type": "integer" }, "BooleanHeaderType": { - "location": "header", "type": "boolean" }, "FloatHeaderType": { - "location": "header", "type": "float" }, "DoubleHeaderType": { - "location": "header", "type": "double" }, "LongHeaderType": { - "location": "header", "type": "long" }, "CharHeaderType": { - "location": "header", "type": "character" }, "TimestampHeaderType": { - "location": "header", "type": "timestamp" } }, From 81c54de1a66d11d22ab45d8a30fd9ad3c0720e16 Mon Sep 17 00:00:00 2001 From: Trevor Rowe Date: Thu, 7 May 2015 21:47:31 -0700 Subject: [PATCH 026/101] Protocol specs are now passing. --- aws-sdk-core/lib/aws-sdk-core/api/shape_map.rb | 15 +++++++++++---- aws-sdk-core/lib/aws-sdk-core/query/handler.rb | 2 +- aws-sdk-core/lib/aws-sdk-core/xml/parser/frame.rb | 4 ++-- aws-sdk-core/lib/seahorse/model/shapes.rb | 10 ---------- aws-sdk-core/spec/protocols_spec.rb | 8 ++++---- 5 files changed, 18 insertions(+), 21 deletions(-) diff --git a/aws-sdk-core/lib/aws-sdk-core/api/shape_map.rb b/aws-sdk-core/lib/aws-sdk-core/api/shape_map.rb index cd3e79a982b..a54a0449195 100644 --- a/aws-sdk-core/lib/aws-sdk-core/api/shape_map.rb +++ b/aws-sdk-core/lib/aws-sdk-core/api/shape_map.rb @@ -36,14 +36,21 @@ def [](shape_name) def shape_ref(definition, options = {}) if definition + meta = definition.dup + shape = self[meta.delete('shape')] + location = meta.delete('location') + location_name = meta.delete('locationName') + location_name ||= options[:member_name] unless location == 'headers' + ShapeRef.new( shape: shape, - location: meta.delete('location'), - location_name: meta.delete('locationName') || options[:location_name], + location: location, + location_name: location_name, deprecated: !!(meta.delete('deprecated') || shape[:deprecated]), - metadata: meta) + metadata: meta + ) else nil end @@ -71,7 +78,7 @@ def apply_shape_refs(shape, traits) required = Set.new(traits.delete('required') || []) traits.delete('members').each do |member_name, ref| name = underscore(member_name) - ref = shape_ref(ref, location_name: member_name) + ref = shape_ref(ref, member_name: member_name) shape.add_member(name, ref, required: required.include?(member_name)) end when ListShape diff --git a/aws-sdk-core/lib/aws-sdk-core/query/handler.rb b/aws-sdk-core/lib/aws-sdk-core/query/handler.rb index 8f467673d7b..b257b0884e0 100644 --- a/aws-sdk-core/lib/aws-sdk-core/query/handler.rb +++ b/aws-sdk-core/lib/aws-sdk-core/query/handler.rb @@ -66,7 +66,7 @@ def rules(context) end def remove_wrapper(data, context) - if context.operation.output['resultWrapper'] + if context.operation.output context[:request_id] = data.response_metadata.request_id data.result || Structure.new(context.operation.output.shape.member_names) else diff --git a/aws-sdk-core/lib/aws-sdk-core/xml/parser/frame.rb b/aws-sdk-core/lib/aws-sdk-core/xml/parser/frame.rb index 84a34d08ab5..1a3e5cfef62 100644 --- a/aws-sdk-core/lib/aws-sdk-core/xml/parser/frame.rb +++ b/aws-sdk-core/lib/aws-sdk-core/xml/parser/frame.rb @@ -24,9 +24,9 @@ def new(parent, ref, result = nil) def frame_class(shape) klass = FRAME_CLASSES[shape.class] - if ListFrame == klass && shape['flattened'] + if ListFrame == klass && shape[:flattened] FlatListFrame - elsif MapFrame == klass && shape['flattened'] + elsif MapFrame == klass && shape[:flattened] MapEntryFrame else klass diff --git a/aws-sdk-core/lib/seahorse/model/shapes.rb b/aws-sdk-core/lib/seahorse/model/shapes.rb index 223cf61b77e..286287c0d42 100644 --- a/aws-sdk-core/lib/seahorse/model/shapes.rb +++ b/aws-sdk-core/lib/seahorse/model/shapes.rb @@ -98,11 +98,6 @@ class IntegerShape < Shape class ListShape < Shape - def initialize - @flattened = false - super - end - # @return [ShapeRef] attr_accessor :member @@ -116,11 +111,6 @@ def initialize class MapShape < Shape - def initialize - @flattened = false - super - end - # @return [ShapeRef] attr_accessor :key diff --git a/aws-sdk-core/spec/protocols_spec.rb b/aws-sdk-core/spec/protocols_spec.rb index 6d878057641..dd39f82dfc3 100644 --- a/aws-sdk-core/spec/protocols_spec.rb +++ b/aws-sdk-core/spec/protocols_spec.rb @@ -34,7 +34,7 @@ def client_for(suite, test_case) api = Aws::Api::Builder.build({ 'metadata' => suite['metadata'], 'operations' => { - 'ExampleOperation' => test_case['given'] + 'OperationName' => test_case['given'] }, 'shapes' => suite['shapes'], }) @@ -156,9 +156,9 @@ def normalize_xml(xml) Seahorse::Client::Response.new(context:context) end - input_shape = client.config.api.operation(:example_operation).input + input_shape = client.config.api.operation(:operation_name).input request_params = format_data(input_shape, test_case['params']) - client.example_operation(request_params) + client.operation_name(request_params) end end @@ -182,7 +182,7 @@ def normalize_xml(xml) end group.it "extract response data correctly" do - resp = client.example_operation + resp = client.operation_name data = data_to_hash(resp.data) expected_data = format_data(resp.context.operation.output, test_case['result']) expect(data).to eq(expected_data) From 6188c9c451879e7e801ce11f5b2a12c389ba45bf Mon Sep 17 00:00:00 2001 From: Trevor Rowe Date: Thu, 7 May 2015 22:00:46 -0700 Subject: [PATCH 027/101] Re-enabled resource interfaces and removed an errant puts statement. --- aws-sdk-core/lib/aws-sdk-core/api/builder.rb | 1 + aws-sdk-core/lib/aws-sdk-core/s3/presigner.rb | 1 - aws-sdk-resources/lib/aws-sdk-resources.rb | 42 +++++++++---------- 3 files changed, 22 insertions(+), 22 deletions(-) diff --git a/aws-sdk-core/lib/aws-sdk-core/api/builder.rb b/aws-sdk-core/lib/aws-sdk-core/api/builder.rb index 9ca03aa02dd..b12a19b5055 100644 --- a/aws-sdk-core/lib/aws-sdk-core/api/builder.rb +++ b/aws-sdk-core/lib/aws-sdk-core/api/builder.rb @@ -37,6 +37,7 @@ def build(definition) shapes = ShapeMap.new(definition['shapes'] || {}) api = Seahorse::Model::Api.new metadata = definition['metadata'] || {} + metadata['shapes'] = shapes api.version = metadata['apiVersion'] api.metadata = metadata (definition['operations'] || {}).each do |name, definition| diff --git a/aws-sdk-core/lib/aws-sdk-core/s3/presigner.rb b/aws-sdk-core/lib/aws-sdk-core/s3/presigner.rb index adfca581ab1..2e8384e6e51 100644 --- a/aws-sdk-core/lib/aws-sdk-core/s3/presigner.rb +++ b/aws-sdk-core/lib/aws-sdk-core/s3/presigner.rb @@ -60,7 +60,6 @@ def validate_expires_in_header(expires_in) # @api private class PresignHandler < Seahorse::Client::Handler def call(context) -puts context.http_request.endpoint.inspect Seahorse::Client::Response.new( context: context, data: presigned_url(context) diff --git a/aws-sdk-resources/lib/aws-sdk-resources.rb b/aws-sdk-resources/lib/aws-sdk-resources.rb index aec56d45351..b2bcc57f6d5 100644 --- a/aws-sdk-resources/lib/aws-sdk-resources.rb +++ b/aws-sdk-resources/lib/aws-sdk-resources.rb @@ -19,26 +19,26 @@ module Resources autoload :Source, 'aws-sdk-resources/source' end -# service_added do |name, svc_module, options| -# definition = options[:resources] -# definition = case definition -# when nil then Resources::Definition.new({}) -# when Resources::Definition then definition -# when Hash then Resources::Definition.new(definition) -# when String -# Resources::Definition.new(Aws.load_json(definition), source_path: definition) -# else raise ArgumentError, "invalid resource definition #{definition}" -# end -# definition.apply(svc_module) -# -# # load customizations -# svc = File.join( -# File.dirname(__FILE__), -# 'aws-sdk-resources', -# 'services', -# "#{name.downcase}.rb") -# -# require(svc) if File.exists?(svc) -# end + service_added do |name, svc_module, options| + definition = options[:resources] + definition = case definition + when nil then Resources::Definition.new({}) + when Resources::Definition then definition + when Hash then Resources::Definition.new(definition) + when String + Resources::Definition.new(Aws.load_json(definition), source_path: definition) + else raise ArgumentError, "invalid resource definition #{definition}" + end + definition.apply(svc_module) + + # load customizations + svc = File.join( + File.dirname(__FILE__), + 'aws-sdk-resources', + 'services', + "#{name.downcase}.rb") + + require(svc) if File.exists?(svc) + end end From af1241790bfaaff544241a4f302f4daf9a53d7f9 Mon Sep 17 00:00:00 2001 From: Trevor Rowe Date: Thu, 7 May 2015 22:12:06 -0700 Subject: [PATCH 028/101] Resource unit tests now pass. --- .../lib/aws-sdk-core/api/shape_map.rb | 2 +- .../lib/aws-sdk-resources/definition.rb | 21 ++++++++++--------- aws-sdk-resources/spec/definition_spec.rb | 9 +++----- 3 files changed, 15 insertions(+), 17 deletions(-) diff --git a/aws-sdk-core/lib/aws-sdk-core/api/shape_map.rb b/aws-sdk-core/lib/aws-sdk-core/api/shape_map.rb index a54a0449195..f821be2603b 100644 --- a/aws-sdk-core/lib/aws-sdk-core/api/shape_map.rb +++ b/aws-sdk-core/lib/aws-sdk-core/api/shape_map.rb @@ -76,7 +76,7 @@ def apply_shape_refs(shape, traits) case shape when StructureShape required = Set.new(traits.delete('required') || []) - traits.delete('members').each do |member_name, ref| + (traits.delete('members') || {}).each do |member_name, ref| name = underscore(member_name) ref = shape_ref(ref, member_name: member_name) shape.add_member(name, ref, required: required.include?(member_name)) diff --git a/aws-sdk-resources/lib/aws-sdk-resources/definition.rb b/aws-sdk-resources/lib/aws-sdk-resources/definition.rb index 42b3779fa73..03c766e65e1 100644 --- a/aws-sdk-resources/lib/aws-sdk-resources/definition.rb +++ b/aws-sdk-resources/lib/aws-sdk-resources/definition.rb @@ -58,16 +58,17 @@ def define_batch_actions(namespace, resource, batch_actions) end def define_data_attributes(namespace, resource, definition) - return unless shape_name = definition['shape'] - shape = resource.client_class.api.metadata['shapes'][shape_name] - shape.member_names.each do |member_name| - if - resource.instance_methods.include?(member_name) || - data_attribute_is_an_identifier?(member_name, resource, definition) - then - next # some data attributes are duplicates to identifiers - else - resource.add_data_attribute(member_name) + if shape_name = definition['shape'] + shape = resource.client_class.api.metadata['shapes'][shape_name] + shape.member_names.each do |member_name| + if + resource.instance_methods.include?(member_name) || + data_attribute_is_an_identifier?(member_name, resource, definition) + then + next # some data attributes are duplicates to identifiers + else + resource.add_data_attribute(member_name) + end end end end diff --git a/aws-sdk-resources/spec/definition_spec.rb b/aws-sdk-resources/spec/definition_spec.rb index bdc233ed9cb..998d819f2c8 100644 --- a/aws-sdk-resources/spec/definition_spec.rb +++ b/aws-sdk-resources/spec/definition_spec.rb @@ -19,23 +19,20 @@ module Resources let(:shapes) {{}} - let(:api) { Seahorse::Model::Api.new('shapes' => shapes) } + let(:api) { Aws::Api::Builder.build('shapes' => shapes) } let(:namespace) { Module.new } - before(:each) do + def apply_definition namespace.const_set(:Client, client_class) allow(client_class).to receive(:new).and_return(client) - end - - def apply_definition Definition.new(definition).apply(namespace) end describe 'service' do it 'constructs default clients' do - Definition.new(definition).apply(namespace) + apply_definition expect(namespace::Resource.new.client).to be(client) end From ae5b4cac1053be2451b4dd814e4cb49206336cfc Mon Sep 17 00:00:00 2001 From: Trevor Rowe Date: Thu, 7 May 2015 23:24:53 -0700 Subject: [PATCH 029/101] More minor test fixes. --- aws-sdk-core/features/glacier/client.feature | 4 ++-- aws-sdk-core/features/glacier/step_definitions.rb | 5 +---- aws-sdk-core/features/route53_domains/client.feature | 2 +- aws-sdk-core/lib/aws-sdk-core/api/customizations.rb | 11 +++++------ .../lib/aws-sdk-core/plugins/glacier_account_id.rb | 10 +++++++++- .../lib/aws-sdk-core/plugins/glacier_checksums.rb | 5 ++--- 6 files changed, 20 insertions(+), 17 deletions(-) diff --git a/aws-sdk-core/features/glacier/client.feature b/aws-sdk-core/features/glacier/client.feature index a9317ede68f..35230fe1519 100644 --- a/aws-sdk-core/features/glacier/client.feature +++ b/aws-sdk-core/features/glacier/client.feature @@ -10,8 +10,8 @@ Feature: Amazon Glacier Scenario: Error handling When I attempt to call the "ListVaults" API with: | AccountId | abcmnoxyz | - Then I expect the response error code to be "AccessDeniedException" + Then I expect the response error code to be "UnrecognizedClientException" And I expect the response error message to include: """ - Access denied + No account found for the given parameters """ diff --git a/aws-sdk-core/features/glacier/step_definitions.rb b/aws-sdk-core/features/glacier/step_definitions.rb index 3f8e61e7b7c..adfcad711f2 100644 --- a/aws-sdk-core/features/glacier/step_definitions.rb +++ b/aws-sdk-core/features/glacier/step_definitions.rb @@ -35,10 +35,7 @@ def bytes(megabytes) end When(/^I upload an archive with the contents "(.*?)"$/) do |contents| - begin - upload_glacier_archive(contents) - rescue => @error - end + upload_glacier_archive(contents) end When(/^I upload an archive from a ([0-9\.]+)MB large file$/) do |size_in_mb| diff --git a/aws-sdk-core/features/route53_domains/client.feature b/aws-sdk-core/features/route53_domains/client.feature index 5d37d73e2e7..3c3316e765b 100644 --- a/aws-sdk-core/features/route53_domains/client.feature +++ b/aws-sdk-core/features/route53_domains/client.feature @@ -12,5 +12,5 @@ Feature: Amazon Route53 Domains Then I expect the response error code to be "InvalidInput" And I expect the response error message to include: """ - Invalid request + Errors """ diff --git a/aws-sdk-core/lib/aws-sdk-core/api/customizations.rb b/aws-sdk-core/lib/aws-sdk-core/api/customizations.rb index e33c282e969..d4c2dbcf3bf 100644 --- a/aws-sdk-core/lib/aws-sdk-core/api/customizations.rb +++ b/aws-sdk-core/lib/aws-sdk-core/api/customizations.rb @@ -25,12 +25,6 @@ def apply_api_customizations(api) end def apply_plugins(client_class) - prefix = client_class.api.metadata['endpointPrefix'] - if @plugins[prefix] - @plugins[prefix][:add].each { |p| client_class.add_plugin(p) } - @plugins[prefix][:remove].each { |p| client_class.remove_plugin(p) } - end - protocol = client_class.api.metadata['protocol'] plugin = case protocol when 'ec2' then Aws::Plugins::Protocols::EC2 @@ -40,6 +34,11 @@ def apply_plugins(client_class) when 'rest-xml' then Aws::Plugins::Protocols::RestXml end client_class.add_plugin(plugin) if plugin + prefix = client_class.api.metadata['endpointPrefix'] + if @plugins[prefix] + @plugins[prefix][:add].each { |p| client_class.add_plugin(p) } + @plugins[prefix][:remove].each { |p| client_class.remove_plugin(p) } + end end end diff --git a/aws-sdk-core/lib/aws-sdk-core/plugins/glacier_account_id.rb b/aws-sdk-core/lib/aws-sdk-core/plugins/glacier_account_id.rb index 762b6430d7c..e2ead26d503 100644 --- a/aws-sdk-core/lib/aws-sdk-core/plugins/glacier_account_id.rb +++ b/aws-sdk-core/lib/aws-sdk-core/plugins/glacier_account_id.rb @@ -1,11 +1,19 @@ module Aws module Plugins + + # @seahorse.client.option [String] :account_id ('-') + # The default Glacier AWS account ID to use for all glacier + # operations. The default value of `-` uses the account + # your `:credentials` belong to. + # class GlacierAccountId < Seahorse::Client::Plugin + option :account_id, '-' - handle_request(step: :validate, priority: 99) do |context| + handle_request(step: :initialize) do |context| context.params[:account_id] ||= context.config.account_id end + end end end diff --git a/aws-sdk-core/lib/aws-sdk-core/plugins/glacier_checksums.rb b/aws-sdk-core/lib/aws-sdk-core/plugins/glacier_checksums.rb index 7c2c44edd09..146d9635655 100644 --- a/aws-sdk-core/lib/aws-sdk-core/plugins/glacier_checksums.rb +++ b/aws-sdk-core/lib/aws-sdk-core/plugins/glacier_checksums.rb @@ -30,6 +30,7 @@ class GlacierChecksums < Seahorse::Client::Plugin class Handler < Seahorse::Client::Handler HASH = 'X-Amz-Content-Sha256' + TREE_HASH = 'X-Amz-Sha256-Tree-Hash' def call(context) @@ -65,12 +66,10 @@ def compute_checksums(body, &block) digest.update('') end - until body.eof? - chunk = body.read(1024 * 1024) # read 1MB + while chunk = body.read(1024 * 1024) # read 1MB tree_hash.update(chunk) digest.update(chunk) end - body.rewind yield(digest.to_s, tree_hash) From bef55d975623ff60ebf3cb830f911b4848063cbc Mon Sep 17 00:00:00 2001 From: Trevor Rowe Date: Thu, 7 May 2015 23:30:51 -0700 Subject: [PATCH 030/101] Model updates. --- aws-sdk-core/apis/cloudhsm/2014-05-30/api-2.json | 9 +++------ aws-sdk-core/apis/s3/2006-03-01/api-2.json | 3 +-- aws-sdk-core/apis/sqs/2012-11-05/api-2.json | 11 +++++------ 3 files changed, 9 insertions(+), 14 deletions(-) diff --git a/aws-sdk-core/apis/cloudhsm/2014-05-30/api-2.json b/aws-sdk-core/apis/cloudhsm/2014-05-30/api-2.json index ea6926a2308..6349bfc8430 100644 --- a/aws-sdk-core/apis/cloudhsm/2014-05-30/api-2.json +++ b/aws-sdk-core/apis/cloudhsm/2014-05-30/api-2.json @@ -540,8 +540,7 @@ "shape":"IpAddress", "locationName":"SyslogIp" } - }, - "locationName":"CreateHsmRequest" + } }, "CreateHsmResponse":{ "type":"structure", @@ -585,8 +584,7 @@ "shape":"HsmArn", "locationName":"HsmArn" } - }, - "locationName":"DeleteHsmRequest" + } }, "DeleteHsmResponse":{ "type":"structure", @@ -854,8 +852,7 @@ "shape":"IpAddress", "locationName":"SyslogIp" } - }, - "locationName":"ModifyHsmRequest" + } }, "ModifyHsmResponse":{ "type":"structure", diff --git a/aws-sdk-core/apis/s3/2006-03-01/api-2.json b/aws-sdk-core/apis/s3/2006-03-01/api-2.json index e3436517e47..42ba1e436e1 100644 --- a/aws-sdk-core/apis/s3/2006-03-01/api-2.json +++ b/aws-sdk-core/apis/s3/2006-03-01/api-2.json @@ -1362,8 +1362,7 @@ }, "CreationDate":{"type":"timestamp"}, "Date":{ - "type":"timestamp", - "timestampFormat":"iso8601" + "type":"timestamp" }, "Days":{"type":"integer"}, "Delete":{ diff --git a/aws-sdk-core/apis/sqs/2012-11-05/api-2.json b/aws-sdk-core/apis/sqs/2012-11-05/api-2.json index e3caadb4020..787bd49a815 100644 --- a/aws-sdk-core/apis/sqs/2012-11-05/api-2.json +++ b/aws-sdk-core/apis/sqs/2012-11-05/api-2.json @@ -496,8 +496,7 @@ "shape":"String", "locationName":"Value" }, - "flattened":true, - "locationName":"Attribute" + "flattened":true }, "AttributeNameList":{ "type":"list", @@ -557,7 +556,8 @@ "member":{ "shape":"Binary", "locationName":"BinaryListValue" - } + }, + "flattened":true }, "Boolean":{"type":"boolean"}, "ChangeMessageVisibilityBatchRequest":{ @@ -866,12 +866,10 @@ "BinaryValue":{"shape":"Binary"}, "StringListValues":{ "shape":"StringList", - "flattened":true, "locationName":"StringListValue" }, "BinaryListValues":{ "shape":"BinaryList", - "flattened":true, "locationName":"BinaryListValue" }, "DataType":{"shape":"String"} @@ -1131,7 +1129,8 @@ "member":{ "shape":"String", "locationName":"StringListValue" - } + }, + "flattened":true }, "TooManyEntriesInBatchRequest":{ "type":"structure", From 25049114830e00d5a98451a6e3217c8421e683d3 Mon Sep 17 00:00:00 2001 From: Trevor Rowe Date: Thu, 7 May 2015 23:52:34 -0700 Subject: [PATCH 031/101] Removed an unused plugin. --- aws-sdk-core/lib/seahorse.rb | 1 - .../seahorse/client/plugins/json_simple.rb | 33 ------------------- 2 files changed, 34 deletions(-) delete mode 100644 aws-sdk-core/lib/seahorse/client/plugins/json_simple.rb diff --git a/aws-sdk-core/lib/seahorse.rb b/aws-sdk-core/lib/seahorse.rb index 651c220fa05..3f9ff667962 100644 --- a/aws-sdk-core/lib/seahorse.rb +++ b/aws-sdk-core/lib/seahorse.rb @@ -40,7 +40,6 @@ module NetHttp module Plugins autoload :ContentLength, 'seahorse/client/plugins/content_length' autoload :Endpoint, 'seahorse/client/plugins/endpoint' - autoload :JsonSimple, 'seahorse/client/plugins/json_simple' autoload :Logging, 'seahorse/client/plugins/logging' autoload :NetHttp, 'seahorse/client/plugins/net_http' autoload :RaiseResponseErrors, 'seahorse/client/plugins/raise_response_errors' diff --git a/aws-sdk-core/lib/seahorse/client/plugins/json_simple.rb b/aws-sdk-core/lib/seahorse/client/plugins/json_simple.rb deleted file mode 100644 index d0e5a7a6178..00000000000 --- a/aws-sdk-core/lib/seahorse/client/plugins/json_simple.rb +++ /dev/null @@ -1,33 +0,0 @@ -module Seahorse - module Client - module Plugins - - # This plugin performs two trivial translations: - # - # * The request parameters are serialized as JSON for the request body - # * The response body is deserialized as JSON for the response data - # - # No attempt is made to extract errors from the HTTP response body. - # Parsing the response only happens for a successful response. - # - class JsonSimple < Plugin - - # @api private - class Handler < Client::Handler - - def call(context) - context.http_request.body = MultiJson.dump(context.params) - @handler.call(context).on_success do |response| - response.error = nil - response.data = MultiJson.load(context.http_response.body_contents) - end - end - - end - - handler(Handler) - - end - end - end -end From 14555dae7d95f8b87d62332da747372256d664ab Mon Sep 17 00:00:00 2001 From: Trevor Rowe Date: Fri, 8 May 2015 00:16:11 -0700 Subject: [PATCH 032/101] Removed builder gem dependency. --- aws-sdk-core/aws-sdk-core.gemspec | 1 - aws-sdk-core/lib/aws-sdk-core.rb | 1 + aws-sdk-core/lib/aws-sdk-core/xml/builder.rb | 5 +- .../lib/aws-sdk-core/xml/doc_builder.rb | 86 +++++++++++ aws-sdk-core/lib/seahorse.rb | 5 - .../lib/seahorse/client/xml/builder.rb | 91 ----------- aws-sdk-core/spec/aws/xml/doc_builder_spec.rb | 141 +++++++++++++++++ .../client/xml/builder/xml_doc_spec.rb | 142 ------------------ 8 files changed, 230 insertions(+), 242 deletions(-) create mode 100644 aws-sdk-core/lib/aws-sdk-core/xml/doc_builder.rb delete mode 100644 aws-sdk-core/lib/seahorse/client/xml/builder.rb create mode 100644 aws-sdk-core/spec/aws/xml/doc_builder_spec.rb delete mode 100644 aws-sdk-core/spec/seahorse/client/xml/builder/xml_doc_spec.rb diff --git a/aws-sdk-core/aws-sdk-core.gemspec b/aws-sdk-core/aws-sdk-core.gemspec index f136546d3f7..10d73e85f5f 100644 --- a/aws-sdk-core/aws-sdk-core.gemspec +++ b/aws-sdk-core/aws-sdk-core.gemspec @@ -21,7 +21,6 @@ Gem::Specification.new do |spec| spec.executables << 'aws.rb' spec.add_dependency('multi_json', '~> 1.0') - spec.add_dependency('builder', '~> 3.0') spec.add_dependency('jmespath', '~> 1.0') end diff --git a/aws-sdk-core/lib/aws-sdk-core.rb b/aws-sdk-core/lib/aws-sdk-core.rb index 557458f0c28..fd6f1ca2967 100644 --- a/aws-sdk-core/lib/aws-sdk-core.rb +++ b/aws-sdk-core/lib/aws-sdk-core.rb @@ -204,6 +204,7 @@ module Xml autoload :Builder, 'aws-sdk-core/xml/builder' autoload :DefaultList, 'aws-sdk-core/xml/default_list' autoload :DefaultMap, 'aws-sdk-core/xml/default_map' + autoload :DocBuilder, 'aws-sdk-core/xml/doc_builder' autoload :ErrorHandler, 'aws-sdk-core/xml/error_handler' autoload :Parser, 'aws-sdk-core/xml/parser' autoload :RestHandler, 'aws-sdk-core/xml/rest_handler' diff --git a/aws-sdk-core/lib/aws-sdk-core/xml/builder.rb b/aws-sdk-core/lib/aws-sdk-core/xml/builder.rb index 38baf83041c..a88ad3793b2 100644 --- a/aws-sdk-core/lib/aws-sdk-core/xml/builder.rb +++ b/aws-sdk-core/lib/aws-sdk-core/xml/builder.rb @@ -1,4 +1,3 @@ -require 'builder' require 'base64' module Aws @@ -10,7 +9,7 @@ class Builder def initialize(rules) @rules = rules @xml = [] - @builder = ::Builder::XmlMarkup.new(target: @xml, indent: 2) + @builder = DocBuilder.new(target: @xml, indent: ' ') end def to_xml(params) @@ -106,7 +105,7 @@ def node(name, ref, *args, &block) attrs = args.last.is_a?(Hash) ? args.pop : {} attrs = shape_attrs(ref).merge(attrs) args << attrs - @builder.__send__(name, *args, &block) + @builder.node(name, *args, &block) end def shape_attrs(ref) diff --git a/aws-sdk-core/lib/aws-sdk-core/xml/doc_builder.rb b/aws-sdk-core/lib/aws-sdk-core/xml/doc_builder.rb new file mode 100644 index 00000000000..9680c55a37a --- /dev/null +++ b/aws-sdk-core/lib/aws-sdk-core/xml/doc_builder.rb @@ -0,0 +1,86 @@ +module Aws + module Xml + class DocBuilder + + # @option options [#<<] :target ('') + # @option options [String] :pad ('') + # @option options [String] :indent ('') + def initialize(options = {}) + @target = options[:target] || '' + @indent = options[:indent] || '' + @pad = options[:pad] || '' + @end_of_line = @indent == '' ? '' : "\n" + end + + attr_reader :target + + # @overload node(name, attributes = {}) + # Adds a self closing element without any content. + # + # @overload node(name, value, attributes = {}) + # Adds an element that opens and closes on the same line with + # simple text content. + # + # @overload node(name, attributes = {}, &block) + # Adds a wrapping element. Calling {#node} from inside + # the yielded block creates nested elements. + # + # @return [void] + # + def node(name, *args, &block) + attrs = args.last.is_a?(Hash) ? args.pop : {} + if block_given? + @target << open_el(name, attrs) + @target << @end_of_line + increase_pad { yield } + @target << @pad + @target << close_el(name) + elsif args.empty? + @target << empty_element(name, attrs) + else + @target << inline_element(name, args.first, attrs) + end + end + + private + + def empty_element(name, attrs) + "#{@pad}<#{name}#{attributes(attrs)}/>#{@end_of_line}" + end + + def inline_element(name, value, attrs) + "#{open_el(name, attrs)}#{escape(value, :text)}#{close_el(name)}" + end + + def open_el(name, attrs) + "#{@pad}<#{name}#{attributes(attrs)}>" + end + + def close_el(name) + "#{@end_of_line}" + end + + def escape(string, text_or_attr) + string.to_s.encode(:xml => text_or_attr) + end + + def attributes(attr) + if attr.empty? + '' + else + ' ' + attr.map do |key, value| + "#{key}=#{escape(value, :attr)}" + end.join(' ') + end + end + + def increase_pad(&block) + pre_increase = @pad + @pad = @pad + @indent + yield + @pad = pre_increase + end + + end + end +end diff --git a/aws-sdk-core/lib/seahorse.rb b/aws-sdk-core/lib/seahorse.rb index 3f9ff667962..b3e48eb303d 100644 --- a/aws-sdk-core/lib/seahorse.rb +++ b/aws-sdk-core/lib/seahorse.rb @@ -47,11 +47,6 @@ module Plugins autoload :RestfulBindings, 'seahorse/client/plugins/restful_bindings' end - # @api private - module Xml - autoload :Builder, 'seahorse/client/xml/builder' - end - end module Model diff --git a/aws-sdk-core/lib/seahorse/client/xml/builder.rb b/aws-sdk-core/lib/seahorse/client/xml/builder.rb deleted file mode 100644 index 1f1f102b196..00000000000 --- a/aws-sdk-core/lib/seahorse/client/xml/builder.rb +++ /dev/null @@ -1,91 +0,0 @@ -module Seahorse - module Client - module Xml - class Builder - - class XmlDoc - - # @option options [#<<] :target ('') - # @option options [String] :pad ('') - # @option options [String] :indent ('') - def initialize(options = {}) - @target = options[:target] || '' - @indent = options[:indent] || '' - @pad = options[:pad] || '' - @end_of_line = @indent == '' ? '' : "\n" - end - - attr_reader :target - - # @overload node(name, attributes = {}) - # Adds a self closing element without any content. - # - # @overload node(name, value, attributes = {}) - # Adds an element that opens and closes on the same line with - # simple text content. - # - # @overload node(name, attributes = {}, &block) - # Adds a wrapping element. Calling {#node} from inside - # the yielded block creates nested elements. - # - # @return [void] - # - def node(name, *args, &block) - attrs = args.last.is_a?(Hash) ? args.pop : {} - if block_given? - @target << open_el(name, attrs) - @target << @end_of_line - increase_pad { yield } - @target << @pad - @target << close_el(name) - elsif args.empty? - @target << empty_element(name, attrs) - else - @target << inline_element(name, args.first, attrs) - end - end - - private - - def empty_element(name, attrs) - "#{@pad}<#{name}#{attributes(attrs)}/>#{@end_of_line}" - end - - def inline_element(name, value, attrs) - "#{open_el(name, attrs)}#{escape(value)}#{close_el(name)}" - end - - def open_el(name, attrs) - "#{@pad}<#{name}#{attributes(attrs)}>" - end - - def close_el(name) - "#{@end_of_line}" - end - - def escape(string) - string.to_s - end - - def attributes(attr) - if attr.empty? - '' - else - ' ' + attr.map do |key, value| - "#{key}=\"#{escape(value).gsub('"', '"')}\"" - end.join(' ') - end - end - - def increase_pad(&block) - pre_increase = @pad - @pad = @pad + @indent - yield - @pad = pre_increase - end - - end - end - end - end -end diff --git a/aws-sdk-core/spec/aws/xml/doc_builder_spec.rb b/aws-sdk-core/spec/aws/xml/doc_builder_spec.rb new file mode 100644 index 00000000000..012933781f4 --- /dev/null +++ b/aws-sdk-core/spec/aws/xml/doc_builder_spec.rb @@ -0,0 +1,141 @@ +require 'spec_helper' +require 'ostruct' + +module Aws + module Xml + describe DocBuilder do + + let(:result) { '' } + + let(:options) { { target: result, indent: '' } } + + let(:xml) { DocBuilder.new(options) } + + it 'creates empty xml documents' do + xml.node('Xml') + expect(result).to eq('') + end + + it 'nests elements' do + xml.node('xml') do + xml.node('element') + end + expect(result).to eq('') + end + + it 'nests elements deeply' do + xml.node('xml') do + xml.node('a') do + xml.node('b') do + xml.node('c') + end + end + end + expect(result).to eq('') + end + + it 'supports flat elements with nested elements' do + xml.node('xml') do + xml.node('a') do + xml.node('b') + end + xml.node('c') + end + expect(result).to eq('') + end + + it 'accepts element values' do + xml.node('xml') do + xml.node('element', 'value') + end + expect(result).to eq('value') + end + + it 'accepts element attributes' do + xml.node('xml') do + xml.node('el', abc: 123, mno: 'xyz') + end + expect(result).to eq('') + end + + it 'accepts element values and attributes at the same time' do + xml.node('xml') do + xml.node('el', 'value', abc: 'xyz') + end + expect(result).to eq('value') + end + + it 'accepts attributes on outer elements' do + xml.node('xml', xmlns: 'abc') do + xml.node('out', a: 'b') do + xml.node('c') + end + end + expect(result).to eq('') + end + + it 'escapes attribute values and element text' do + xml.node('xml', xmlns: 'a"b') do + xml.node('this & that') + end + expect(result).to eq('') + end + + it 'accepts :indent and initial :pad options' do + options[:indent] = ' ' + options[:pad] = ' ' * 5 + xml.node('xml', xmlns: 'http://example.com') do + xml.node('empty') + xml.node('attributes', a: 'b', c: 'd') + xml.node('value', 'content') + xml.node('both', 'content', m: 'n') + xml.node('branch') do + xml.node('leaf') + xml.node('branch') do + xml.node('leaf', 'abc') + xml.node('leaf', 'mno') + end + xml.node('branch') do + xml.node('leaf', 'xyz') + end + xml.node('leaf') + end + end + expect(result).to eq(<<-XML) + + + + content + content + + + + abc + mno + + + xyz + + + + + XML + end + + it 'can build xml to any object that responds to #<<' do + options[:indent] = ' ' + options[:pad] = ' ' * 5 + options[:target] = [] + xml.node('xml') do + xml.node('el', 'value') + end + expect(xml.target.join).to eq(<<-XML) + + value + + XML + end + + end + end +end diff --git a/aws-sdk-core/spec/seahorse/client/xml/builder/xml_doc_spec.rb b/aws-sdk-core/spec/seahorse/client/xml/builder/xml_doc_spec.rb deleted file mode 100644 index 0bb965ce8c2..00000000000 --- a/aws-sdk-core/spec/seahorse/client/xml/builder/xml_doc_spec.rb +++ /dev/null @@ -1,142 +0,0 @@ -require 'spec_helper' -require 'ostruct' - -module Seahorse - module Client - module Xml - class Builder - describe XmlDoc do - - let(:result) { '' } - - let(:options) { { target: result, indent: '' } } - - let(:xml) { XmlDoc.new(options) } - - it 'creates empty xml documents' do - xml.node('Xml') - expect(result).to eq('') - end - - it 'nests elements' do - xml.node('xml') do - xml.node('element') - end - expect(result).to eq('') - end - - it 'nests elements deeply' do - xml.node('xml') do - xml.node('a') do - xml.node('b') do - xml.node('c') - end - end - end - expect(result).to eq('') - end - - it 'supports flat elements with nested elements' do - xml.node('xml') do - xml.node('a') do - xml.node('b') - end - xml.node('c') - end - expect(result).to eq('') - end - - it 'accepts element values' do - xml.node('xml') do - xml.node('element', 'value') - end - expect(result).to eq('value') - end - - it 'accepts element attributes' do - xml.node('xml') do - xml.node('el', abc: 123, mno: 'xyz') - end - expect(result).to eq('') - end - - it 'accepts element values and attributes at the same time' do - xml.node('xml') do - xml.node('el', 'value', abc: 'xyz') - end - expect(result).to eq('value') - end - - it 'accepts attributes on outer elements' do - xml.node('xml', xmlns: 'abc') do - xml.node('out', a: 'b') do - xml.node('c') - end - end - expect(result).to eq('') - end - - #it 'escapes node values' - - #it 'escapes attribute values' - - it 'accepts :indent and initial :pad options' do - options[:indent] = ' ' - options[:pad] = ' ' * 7 - xml.node('xml', xmlns: 'http://example.com') do - xml.node('empty') - xml.node('attributes', a: 'b', c: 'd') - xml.node('value', 'content') - xml.node('both', 'content', m: 'n') - xml.node('branch') do - xml.node('leaf') - xml.node('branch') do - xml.node('leaf', 'abc') - xml.node('leaf', 'mno') - end - xml.node('branch') do - xml.node('leaf', 'xyz') - end - xml.node('leaf') - end - end - expect(result).to eq(<<-XML) - - - - content - content - - - - abc - mno - - - xyz - - - - - XML - end - - it 'can build xml to any object that responds to #<<' do - options[:indent] = ' ' - options[:pad] = ' ' * 7 - options[:target] = [] - xml.node('xml') do - xml.node('el', 'value') - end - expect(xml.target.join).to eq(<<-XML) - - value - - XML - end - - end - end - end - end -end From d491987c262cbe1632931fe0216404723860528c Mon Sep 17 00:00:00 2001 From: Trevor Rowe Date: Fri, 8 May 2015 10:03:00 -0700 Subject: [PATCH 033/101] Updated documentation to use the new Seahorse shapes. --- aws-sdk-core/lib/aws-sdk-core/api/builder.rb | 2 +- .../lib/aws-sdk-core/api/docstrings.rb | 1 + .../lib/aws-sdk-core/api/documenter.rb | 6 +- .../aws-sdk-core/api/operation_documenter.rb | 124 +++++++++--------- .../lib/aws-sdk-core/api/operation_example.rb | 96 +++++++------- .../lib/aws-sdk-core/api/shape_map.rb | 6 +- aws-sdk-core/lib/seahorse/model/shapes.rb | 3 + .../lib/aws-sdk-resources/documenter.rb | 31 +++-- .../documenter/base_operation_documenter.rb | 67 +++++----- doc-src/plugins/resources.rb | 40 +++--- tasks/docs.rake | 2 +- 11 files changed, 195 insertions(+), 183 deletions(-) diff --git a/aws-sdk-core/lib/aws-sdk-core/api/builder.rb b/aws-sdk-core/lib/aws-sdk-core/api/builder.rb index b12a19b5055..fc6785850e2 100644 --- a/aws-sdk-core/lib/aws-sdk-core/api/builder.rb +++ b/aws-sdk-core/lib/aws-sdk-core/api/builder.rb @@ -31,7 +31,7 @@ def customize(definition) end - # @param [Hash] + # @param [Hash] definition # @return [Seahorse::Model::Api] def build(definition) shapes = ShapeMap.new(definition['shapes'] || {}) diff --git a/aws-sdk-core/lib/aws-sdk-core/api/docstrings.rb b/aws-sdk-core/lib/aws-sdk-core/api/docstrings.rb index cfb4a3533bb..512e0a5b7ca 100644 --- a/aws-sdk-core/lib/aws-sdk-core/api/docstrings.rb +++ b/aws-sdk-core/lib/aws-sdk-core/api/docstrings.rb @@ -5,6 +5,7 @@ module Api module Docstrings def self.apply(client_class, path) + return api = client_class.api.definition docs = File.open(path, 'r', encoding: 'UTF-8') { |f| f.read } docs = MultiJson.load(docs) diff --git a/aws-sdk-core/lib/aws-sdk-core/api/documenter.rb b/aws-sdk-core/lib/aws-sdk-core/api/documenter.rb index 387ba1cdd51..b77c67ee618 100644 --- a/aws-sdk-core/lib/aws-sdk-core/api/documenter.rb +++ b/aws-sdk-core/lib/aws-sdk-core/api/documenter.rb @@ -10,8 +10,8 @@ def initialize(svc_module, docs_path) @client_class = svc_module.const_get(:Client) Aws::Api::Docstrings.apply(@client_class, docs_path) @api = @client_class.api - @full_name = @api.metadata('serviceFullName') - @error_names = @api.operations.map {|_,o| o.errors.map(&:name) } + @full_name = @api.metadata['serviceFullName'] + @error_names = @api.operations.map {|_,o| o.errors.map(&:shape).map(&:name) } @error_names = @error_names.flatten.uniq.sort @namespace = YARD::Registry['Aws'] end @@ -154,7 +154,7 @@ def operation_docstring(method_name, operation) end end - errors = (operation.errors || []).map { |shape| shape.name } + errors = (operation.errors || []).map { |ref| ref.shape.name } errors = errors.map { |e| "@raise [Errors::#{e}]" }.join("\n") docstring = <<-DOCSTRING.strip diff --git a/aws-sdk-core/lib/aws-sdk-core/api/operation_documenter.rb b/aws-sdk-core/lib/aws-sdk-core/api/operation_documenter.rb index d12b27266ca..f79bb61f122 100644 --- a/aws-sdk-core/lib/aws-sdk-core/api/operation_documenter.rb +++ b/aws-sdk-core/lib/aws-sdk-core/api/operation_documenter.rb @@ -2,6 +2,8 @@ module Aws module Api class OperationDocumenter + include Seahorse::Model::Shapes + def initialize(options) @operation = options[:operation] @example = OperationExample.new(options) @@ -44,8 +46,12 @@ def clean(docs) docs end - def api_ref(shape) - docs = shape.nil? ? '' : shape.documentation + def api_ref(ref) + if ref + doc = ref.documentation + docs ||= ref.shape.documentation if ref.respond_to?(:shape) + end + docs ||= '' if docs && !docs.empty? "
#{clean(docs)}
" end @@ -53,68 +59,68 @@ def api_ref(shape) private - def params(shape, &block) - if shape && shape.name == 'AttributeValue' + def params(ref, &block) + if ref && ref.shape.name == 'AttributeValue' ['

An attribute value may be one of:

  • `Hash`
  • `Array`
  • `String`
  • `Numeric`
  • `true` | `false`
  • `nil`
  • `IO`
  • `Set`

'] else - ['
', api_ref(shape)] + yield + ['
'] + ['
', api_ref(ref)] + yield + ['
'] end end - def param(shape, key_name, value_type, required, visited, &block) + def param(ref, key_name, value_type, required, visited, &block) lines = [] lines << '
' - lines << entry(shape, key_name, value_type, required, visited) + lines << entry(ref, key_name, value_type, required, visited) - if visited.include?(shape) + if visited.include?(ref) lines << "AttributeValue, recursive" else - visited = visited + [shape] + visited = visited + [ref] yield(lines) if block_given? - lines += nested_params(shape, visited) + lines += nested_params(ref, visited) end lines << '
' lines end - def nested_params(shape, visited) - if leaf?(shape) - nested(shape, visited) + def nested_params(ref, visited) + if leaf?(ref) + nested(ref, visited) else - params(shape) { nested(shape, visited) } + params(ref) { nested(ref, visited) } end end - def nested(shape, visited) - case shape - when Seahorse::Model::Shapes::Structure then structure(shape, visited) - when Seahorse::Model::Shapes::Map then map(shape, visited) - when Seahorse::Model::Shapes::List then list(shape, visited) - else [api_ref(shape)] + def nested(ref, visited) + case ref.shape + when StructureShape then structure(ref, visited) + when MapShape then map(ref, visited) + when ListShape then list(ref, visited) + else [api_ref(ref)] end end - def structure(shape, visited) - shape.members.inject([]) do |lines, (member_name, member_shape)| - lines += param(member_shape, member_name, shape_type(member_shape), shape.required.include?(member_name), visited) + def structure(ref, visited) + ref.shape.members.inject([]) do |lines, (member_name, member_ref)| + lines += param(member_ref, member_name, shape_type(member_ref), ref.shape.required.include?(member_name), visited) end end - def map(shape, visited) - param(shape.value, key_name(shape), value_type(shape), false, visited) + def map(ref, visited) + param(ref.shape.value, key_name(ref), value_type(ref), false, visited) end - def list(shape, visited) - case shape.member - when Seahorse::Model::Shapes::Structure then structure(shape.member, visited) - when Seahorse::Model::Shapes::Map then map(shape.member, visited) - when Seahorse::Model::Shapes::List then raise NotImplementedError - else [api_ref(shape)] + def list(ref, visited) + case ref.shape.member + when StructureShape then structure(ref.shape.member, visited) + when MapShape then map(ref.shape.member, visited) + when ListShape then raise NotImplementedError + else [api_ref(ref)] end end - def entry(shape, key_name, value_type, required, visited) + def entry(ref, key_name, value_type, required, visited) classes = ['key'] classes << 'required' if required line = '
' @@ -124,46 +130,42 @@ def entry(shape, key_name, value_type, required, visited) line end - def shape_type(shape) - case shape - when Seahorse::Model::Shapes::Structure then 'Hash' - when Seahorse::Model::Shapes::Map then 'Hash' - when Seahorse::Model::Shapes::List then "Array<#{value_type(shape)}>" - when Seahorse::Model::Shapes::String then 'String' - when Seahorse::Model::Shapes::Timestamp then 'Time' - when Seahorse::Model::Shapes::Integer then 'Integer' - when Seahorse::Model::Shapes::Float then 'Number' - when Seahorse::Model::Shapes::Boolean then 'Boolean' - when Seahorse::Model::Shapes::Blob then 'String,IO' - else raise "unhandled type #{shape.type}" + def shape_type(ref) + case ref.shape + when StructureShape then 'Hash' + when MapShape then 'Hash' + when ListShape then "Array<#{value_type(ref)}>" + when StringShape then 'String' + when TimestampShape then 'Time' + when IntegerShape then 'Integer' + when FloatShape then 'Number' + when BooleanShape then 'Boolean' + when BlobShape then 'String,IO' + else raise "unhandled type #{ref.shape.type}" end end - def key_type(shape) - shape_type(shape.key) + def key_type(ref) + shape_type(ref.shape.key) end - def value_type(shape) - case shape - when Seahorse::Model::Shapes::List then shape_type(shape.member) - when Seahorse::Model::Shapes::Map then shape_type(shape.value) + def value_type(ref) + case ref.shape + when ListShape then shape_type(ref.shape.member) + when MapShape then shape_type(ref.shape.value) else raise 'stop' end end - def key_name(shape) - shape.key.metadata('shape') - end - - def value_name(shape) - shape.members.metadata('shape') + def key_name(ref) + ref.shape.key.shape.name end - def leaf?(shape) - case shape - when Seahorse::Model::Shapes::Structure then false - when Seahorse::Model::Shapes::Map then false - when Seahorse::Model::Shapes::List then leaf?(shape.member) + def leaf?(ref) + case ref.shape + when StructureShape then false + when MapShape then false + when ListShape then leaf?(ref.shape.member) else true end end diff --git a/aws-sdk-core/lib/aws-sdk-core/api/operation_example.rb b/aws-sdk-core/lib/aws-sdk-core/api/operation_example.rb index 5f2641518cb..1eec682c9f0 100644 --- a/aws-sdk-core/lib/aws-sdk-core/api/operation_example.rb +++ b/aws-sdk-core/lib/aws-sdk-core/api/operation_example.rb @@ -10,8 +10,8 @@ def initialize(options) @operation = options[:operation] @streaming_output = !!( @operation.output && - @operation.output.shape[:payload] && - @operation.output.shape[:payload_member].shape['streaming'] + @operation.output[:payload] && + @operation.output[:payload_member]['streaming'] ) end @@ -28,104 +28,104 @@ def params structure(@operation.input, '', []) end - def structure(shape, i, visited) + def structure(ref, i, visited) lines = ['{'] if @streaming_output lines << "#{i} response_target: '/path/to/file', # optional target file path" end - shape.members.each do |member_name, member_shape| + shape = ref.shape + shape.members.each do |member_name, member_ref| if shape.required.include?(member_name) lines << "#{i} # required" end - lines << "#{i} #{member_name}: #{member(member_shape, i + ' ', visited)}," + lines << "#{i} #{member_name}: #{member(member_ref, i + ' ', visited)}," end lines << "#{i}}" lines.join("\n") end - def map(shape, i, visited) - if multiline?(shape.value) - multiline_map(shape, i, visited) + def map(ref, i, visited) + if multiline?(ref.shape.value) + multiline_map(ref, i, visited) else - "{ #{key_name(shape)} => #{value(shape.value)} }" + "{ #{key_name(ref)} => #{value(ref.shape.value)} }" end end - def multiline_map(shape, i, visited) + def multiline_map(ref, i, visited) lines = ["{"] - lines << "#{i} #{key_name(shape)} => #{member(shape.value, i + ' ', visited)}," + lines << "#{i} #{key_name(ref)} => #{member(ref.shape.value, i + ' ', visited)}," lines << "#{i}}" lines.join("\n") end - def list(shape, i, visited) - if multiline?(shape.member) - multiline_list(shape, i, visited) + def list(ref, i, visited) + if multiline?(ref.shape.member) + multiline_list(ref, i, visited) else - "[#{value(shape.member)}, '...']" + "[#{value(ref.shape.member)}, '...']" end end - def multiline_list(shape, i, visited) + def multiline_list(ref, i, visited) lines = ["["] - lines << "#{i} #{member(shape.member, i + ' ', visited)}," + lines << "#{i} #{member(ref.shape.member, i + ' ', visited)}," lines << "#{i}]" lines.join("\n") end - def member(shape, i, visited) - if visited.include?(shape.name) + def member(ref, i, visited) + if visited.include?(ref.shape.name) recursive = ['{'] - recursive << "#{i} # recursive #{shape.name} ..." + recursive << "#{i} # recursive #{ref.shape.name} ..." recursive << "#{i}}" return recursive.join("\n") - elsif shape.name == 'AttributeValue' + elsif ref.shape.name == 'AttributeValue' msg='"value", #' return msg else - visited = visited + [shape.name] + visited = visited + [ref.shape.name] end - case shape - when Seahorse::Model::Shapes::Structure then structure(shape, i, visited) - when Seahorse::Model::Shapes::Map then map(shape, i, visited) - when Seahorse::Model::Shapes::List then list(shape, i, visited) - else value(shape) + case ref.shape + when StructureShape then structure(ref, i, visited) + when MapShape then map(ref, i, visited) + when ListShape then list(ref, i, visited) + else value(ref) end end - def value(shape) - case shape - when Seahorse::Model::Shapes::String then string_value(shape) - when Seahorse::Model::Shapes::Integer then 1 - when Seahorse::Model::Shapes::Float then 1.1 - when Seahorse::Model::Shapes::Boolean then true - when Seahorse::Model::Shapes::Timestamp then 'Time.now' - when Seahorse::Model::Shapes::Blob then "#{shape_name(shape, false)}".inspect - else raise "unhandled shape type `#{shape.type}'" + def value(ref) + case ref.shape + when StringShape then string_value(ref) + when IntegerShape then 1 + when FloatShape then 1.1 + when BooleanShape then true + when TimestampShape then 'Time.now' + when BlobShape then "#{shape_name(ref, false)}".inspect + else raise "unhandled shape type `#{ref.shape.class.name}'" end end - def string_value(shape) - if shape.enum - shape.enum.to_a.join('|').inspect + def string_value(ref) + if ref.shape.enum + ref.shape.enum.to_a.join('|').inspect else - shape_name(shape) + shape_name(ref) end end - def multiline?(shape) - Seahorse::Model::Shapes::Structure === shape || - Seahorse::Model::Shapes::List === shape || - Seahorse::Model::Shapes::Map === shape + def multiline?(ref) + shape = ref.shape + StructureShape === shape || ListShape === shape || MapShape === shape end - def shape_name(shape, inspect = true) - value = shape.name + def shape_name(ref, inspect = true) + value = ref.shape.name inspect ? value.inspect : value end - def key_name(shape, inspect = true) - shape_name(shape.key) + def key_name(ref, inspect = true) + shape_name(ref.shape.key) end end diff --git a/aws-sdk-core/lib/aws-sdk-core/api/shape_map.rb b/aws-sdk-core/lib/aws-sdk-core/api/shape_map.rb index f821be2603b..99c20abdcdc 100644 --- a/aws-sdk-core/lib/aws-sdk-core/api/shape_map.rb +++ b/aws-sdk-core/lib/aws-sdk-core/api/shape_map.rb @@ -20,10 +20,10 @@ class ShapeMap 'timestamp' => TimestampShape, } - # @param [ShapeMap] shapes - def initialize(definitions) + # @param [Hash] shape_definitions + def initialize(shape_definitions) @shapes = {} - build_shapes(definitions) + build_shapes(shape_definitions) end def [](shape_name) diff --git a/aws-sdk-core/lib/seahorse/model/shapes.rb b/aws-sdk-core/lib/seahorse/model/shapes.rb index 286287c0d42..bcc66f0cc14 100644 --- a/aws-sdk-core/lib/seahorse/model/shapes.rb +++ b/aws-sdk-core/lib/seahorse/model/shapes.rb @@ -29,6 +29,9 @@ def initialize(options = {}) # @return [String, nil] attr_accessor :location_name + # @return [String, nil] + attr_accessor :documentation + # @return [Boolean] attr_accessor :deprecated diff --git a/aws-sdk-resources/lib/aws-sdk-resources/documenter.rb b/aws-sdk-resources/lib/aws-sdk-resources/documenter.rb index a32d5010a2e..aa613fca959 100644 --- a/aws-sdk-resources/lib/aws-sdk-resources/documenter.rb +++ b/aws-sdk-resources/lib/aws-sdk-resources/documenter.rb @@ -13,6 +13,8 @@ class Documenter class << self + include Seahorse::Model::Shapes + def apply_customizations document_s3_object_upload_file_additional_options end @@ -21,23 +23,24 @@ def apply_customizations def document_s3_object_upload_file_additional_options input = Aws::S3::Client.api.operation(:create_multipart_upload).input - opts = input.member_names - [:bucket, :key] + opts = input.shape.member_names - [:bucket, :key] tags = opts.map do |opt| - shape = input.member(opt) - type = case shape - when Seahorse::Model::Shapes::Structure then 'Structure' - when Seahorse::Model::Shapes::List then 'Array' - when Seahorse::Model::Shapes::Map then 'Hash' - when Seahorse::Model::Shapes::String then 'String' - when Seahorse::Model::Shapes::Integer then 'Integer' - when Seahorse::Model::Shapes::Float then 'Float' - when Seahorse::Model::Shapes::Boolean then 'Boolean' - when Seahorse::Model::Shapes::Timestamp then 'Time' - when Seahorse::Model::Shapes::Blob then 'IO' + ref = input.shape.member(opt) + type = case ref.shape + when StructureShape then 'Structure' + when ListShape then 'Array' + when MapShape then 'Hash' + when StringShape then 'String' + when IntegerShape then 'Integer' + when FloatShape then 'Float' + when BooleanShape then 'Boolean' + when TimestampShape then 'Time' + when BlobShape then 'IO' else - raise "unhandled shape class `#{shape.class.name}'" + raise "unhandled shape class `#{ref.shape.class.name}'" end - "@option options [#{type}] :#{opt} #{shape.documentation}" + docs = ref.documentation || ref.shape.documentation + "@option options [#{type}] :#{opt} #{docs}" end tags = YARD::DocstringParser.new.parse(tags).to_docstring.tags m = YARD::Registry['Aws::S3::Object#upload_file'] diff --git a/aws-sdk-resources/lib/aws-sdk-resources/documenter/base_operation_documenter.rb b/aws-sdk-resources/lib/aws-sdk-resources/documenter/base_operation_documenter.rb index 0c3a43202ff..c5678785182 100644 --- a/aws-sdk-resources/lib/aws-sdk-resources/documenter/base_operation_documenter.rb +++ b/aws-sdk-resources/lib/aws-sdk-resources/documenter/base_operation_documenter.rb @@ -3,6 +3,8 @@ module Resources class Documenter class BaseOperationDocumenter + include Seahorse::Model::Shapes + def initialize(yard_class, resource_class, operation_name, operation) @yard_class = yard_class @resource_class = resource_class @@ -131,16 +133,16 @@ def example_tags def option_tags if api_request && api_request.input tags = [] - required = api_request.input.required - members = api_request.input.members + required = api_request.input.shape.required + members = api_request.input.shape.members members = members.sort_by { |name,_| required.include?(name) ? 0 : 1 } - members.each do |member_name, member_shape| + members.each do |member_name, member_ref| if api_request_params.any? { |p| p.target.match(/^#{member_name}\b/) } next end - docstring = member_shape.documentation + docstring = docs(member_ref) req = ' **`required`** — ' if required.include?(member_name) - tags << "@option options [#{param_type(member_shape)}] :#{member_name} #{req}#{docstring}" + tags << "@option options [#{param_type(member_ref)}] :#{member_name} #{req}#{docstring}" end tags = tags.join("\n") YARD::DocstringParser.new.parse(tags).to_docstring.tags @@ -211,15 +213,15 @@ def variable_name def path_type case path_shape - when Seahorse::Model::Shapes::Structure then 'Structure' - when Seahorse::Model::Shapes::List then 'Array' - when Seahorse::Model::Shapes::Map then 'Hash' - when Seahorse::Model::Shapes::String then 'String' - when Seahorse::Model::Shapes::Integer then 'Integer' - when Seahorse::Model::Shapes::Float then 'Float' - when Seahorse::Model::Shapes::Boolean then 'Boolean' - when Seahorse::Model::Shapes::Timestamp then 'Time' - when Seahorse::Model::Shapes::Blob then 'IO' + when StructureShape then 'Structure' + when ListShape then 'Array' + when MapShape then 'Hash' + when StringShape then 'String' + when IntegerShape then 'Integer' + when FloatShape then 'Float' + when BooleanShape then 'Boolean' + when TimestampShape then 'Time' + when BlobShape then 'IO' else raise "unhandled shape class `#{path_shape.class.name}'" end @@ -232,40 +234,41 @@ def path_shape # Returns the output shape for the called operation. def response_shape api = resource_class.client_class.api - api.operation(@operation.request.method_name).output + output = api.operation(@operation.request.method_name).output + output ? output.shape : nil end def resolve_shape(shape, path) if path != '@' shape = path.scan(/\w+|\[.*?\]/).inject(shape) do |shape, part| if part[0] == '[' - shape.member + shape.member.shape else - shape.member(part) + shape.member(part).shape end end end end - def param_type(shape) - case shape - when Seahorse::Model::Shapes::Blob then 'IO' - when Seahorse::Model::Shapes::Byte then 'String' - when Seahorse::Model::Shapes::Boolean then 'Boolean' - when Seahorse::Model::Shapes::Character then 'String' - when Seahorse::Model::Shapes::Double then 'Float' - when Seahorse::Model::Shapes::Float then 'Float' - when Seahorse::Model::Shapes::Integer then 'Integer' - when Seahorse::Model::Shapes::List then 'Array' - when Seahorse::Model::Shapes::Long then 'Integer' - when Seahorse::Model::Shapes::Map then 'Hash' - when Seahorse::Model::Shapes::String then 'String' - when Seahorse::Model::Shapes::Structure then 'Hash' - when Seahorse::Model::Shapes::Timestamp then 'Time' + def param_type(ref) + case ref.shape + when BlobShape then 'IO' + when BooleanShape then 'Boolean' + when FloatShape then 'Float' + when IntegerShape then 'Integer' + when ListShape then 'Array' + when MapShape then 'Hash' + when StringShape then 'String' + when StructureShape then 'Hash' + when TimestampShape then 'Time' else raise 'unhandled type' end end + def docs(ref) + ref.documentation || ref.shape.documentation + end + end end end diff --git a/doc-src/plugins/resources.rb b/doc-src/plugins/resources.rb index 0d31b55095e..b9321e2570a 100644 --- a/doc-src/plugins/resources.rb +++ b/doc-src/plugins/resources.rb @@ -38,6 +38,8 @@ class ResourceDocPlugin + include Seahorse::Model::Shapes + def apply Aws.service_added do |_, svc_module, files| if files[:resources] @@ -63,8 +65,8 @@ def apply def service_docstring(name, yard_class, svc_class) api = svc_class.client_class.api - product_name = api.metadata('serviceAbbreviation') - product_name ||= api.metadata('serviceFullName') + product_name = api.metadata['serviceAbbreviation'] + product_name ||= api.metadata['serviceFullName'] docstring = <<-DOCSTRING.strip This class provides a resource oriented interface for #{product_name}. @@ -177,38 +179,36 @@ def document_data_attribute_getters(yard_class, resource_class) return if resource_name == 'Resource' - endpoint = resource_class.client_class.api.metadata('endpointPrefix') + endpoint = resource_class.client_class.api.metadata['endpointPrefix'] version = resource_class.client_class.api.version definition = File.read("aws-sdk-core/apis/#{endpoint}/#{version}/resources-1.json") definition = MultiJson.load(definition) definition = definition['resources'][resource_name] if shape_name = definition['shape'] - shape = resource_class.client_class.api.shape_map.shape('shape' => shape_name) + shape = resource_class.client_class.api.metadata['shapes'].shape_ref('shape' => shape_name).shape resource_class.data_attributes.each do |member_name| - member_shape = shape.member(member_name) - return_type = case member_shape - when Seahorse::Model::Shapes::Blob then 'String' - when Seahorse::Model::Shapes::Byte then 'String' - when Seahorse::Model::Shapes::Boolean then 'Boolean' - when Seahorse::Model::Shapes::Character then 'String' - when Seahorse::Model::Shapes::Double then 'Float' - when Seahorse::Model::Shapes::Float then 'Float' - when Seahorse::Model::Shapes::Integer then 'Integer' - when Seahorse::Model::Shapes::List then 'Array' - when Seahorse::Model::Shapes::Long then 'Integer' - when Seahorse::Model::Shapes::Map then 'Hash' - when Seahorse::Model::Shapes::String then 'String' - when Seahorse::Model::Shapes::Structure then 'Structure' - when Seahorse::Model::Shapes::Timestamp then 'Time' + member_ref = shape.member(member_name) + return_type = case member_ref.shape + when BlobShape then 'String' + when BooleanShape then 'Boolean' + when FloatShape then 'Float' + when IntegerShape then 'Integer' + when ListShape then 'Array' + when MapShape then 'Hash' + when StringShape then 'String' + when StructureShape then 'Structure' + when TimestampShape then 'Time' else raise 'unhandled type' end + docstring = member_ref.documentation || member_ref.shape.documentation + m = YARD::CodeObjects::MethodObject.new(yard_class, member_name) m.scope = :instance - m.docstring = "#{member_shape.documentation}\n@return [#{return_type}] #{member_shape.documentation}" + m.docstring = "#{docstring}\n@return [#{return_type}] #{docstring}" yard_class.instance_attributes[member_name] = { :read => m } end end diff --git a/tasks/docs.rake b/tasks/docs.rake index f01a032b6aa..9877c230b36 100644 --- a/tasks/docs.rake +++ b/tasks/docs.rake @@ -46,7 +46,7 @@ def supported_services_table table = [] Aws::SERVICE_MODULE_NAMES.each do |svc_name| client_class = Aws.const_get(svc_name).const_get(:Client) - full_name = client_class.api.metadata('serviceFullName') + full_name = client_class.api.metadata['serviceFullName'] version = client_class.api.version table << [full_name, svc_name, version] end From 0b478fed361014262eece5bf8a66d075fd6a69a8 Mon Sep 17 00:00:00 2001 From: Trevor Rowe Date: Fri, 8 May 2015 12:27:29 -0700 Subject: [PATCH 034/101] Removed dependency on MultiJson. Closes #792 --- aws-sdk-core/aws-sdk-core.gemspec | 1 - aws-sdk-core/features/env.rb | 5 +- aws-sdk-core/lib/aws-sdk-core.rb | 18 +----- aws-sdk-core/lib/aws-sdk-core/api/builder.rb | 2 +- .../lib/aws-sdk-core/api/docstrings.rb | 2 +- .../lib/aws-sdk-core/client_paging.rb | 2 +- .../lib/aws-sdk-core/client_waiters.rb | 2 +- .../lib/aws-sdk-core/endpoint_provider.rb | 2 +- .../instance_profile_credentials.rb | 2 +- aws-sdk-core/lib/aws-sdk-core/json.rb | 59 +++++++++++++++++++ aws-sdk-core/lib/aws-sdk-core/json/builder.rb | 2 +- .../lib/aws-sdk-core/json/error_handler.rb | 4 +- .../lib/aws-sdk-core/json/json_engine.rb | 15 +++++ .../lib/aws-sdk-core/json/oj_engine.rb | 15 +++++ aws-sdk-core/lib/aws-sdk-core/json/parser.rb | 2 +- .../aws-sdk-core/json/simple_body_handler.rb | 4 +- .../lib/aws-sdk-core/xml/error_handler.rb | 7 ++- aws-sdk-core/lib/seahorse/util.rb | 4 -- aws-sdk-core/spec/aws_spec.rb | 4 +- aws-sdk-core/spec/protocols_spec.rb | 11 ++-- aws-sdk-resources/features/env.rb | 4 +- aws-sdk-resources/lib/aws-sdk-resources.rb | 2 +- .../services/s3/encryption/client.rb | 4 +- .../services/s3/encryption/decrypt_handler.rb | 4 +- .../services/s3/encryption/encrypt_handler.rb | 2 +- .../services/s3/encryption/materials.rb | 4 +- .../services/s3/presigned_post.rb | 3 +- .../services/sns/message_verifier.rb | 3 +- .../services/s3/encryption/client_spec.rb | 4 +- .../spec/services/s3/presigned_post_spec.rb | 3 +- .../services/sns/message_verifier_spec.rb | 21 ++++--- doc-src/plugins/resources.rb | 3 +- 32 files changed, 145 insertions(+), 75 deletions(-) create mode 100644 aws-sdk-core/lib/aws-sdk-core/json.rb create mode 100644 aws-sdk-core/lib/aws-sdk-core/json/json_engine.rb create mode 100644 aws-sdk-core/lib/aws-sdk-core/json/oj_engine.rb diff --git a/aws-sdk-core/aws-sdk-core.gemspec b/aws-sdk-core/aws-sdk-core.gemspec index 10d73e85f5f..80b243838d6 100644 --- a/aws-sdk-core/aws-sdk-core.gemspec +++ b/aws-sdk-core/aws-sdk-core.gemspec @@ -20,7 +20,6 @@ Gem::Specification.new do |spec| spec.bindir = 'bin' spec.executables << 'aws.rb' - spec.add_dependency('multi_json', '~> 1.0') spec.add_dependency('jmespath', '~> 1.0') end diff --git a/aws-sdk-core/features/env.rb b/aws-sdk-core/features/env.rb index 9c3c055bc35..a3c36385aa8 100644 --- a/aws-sdk-core/features/env.rb +++ b/aws-sdk-core/features/env.rb @@ -2,14 +2,15 @@ require 'simplecov' require 'aws-sdk-core' -require 'multi_json' SimpleCov.command_name('test:integration:aws-sdk-core') cfg = './integration-test-config.json' if File.exist?(cfg) - Aws.config = MultiJson.load(File.read(cfg), symbolize_keys: true) + Aws.config = Aws::Json.load_file(cfg).inject({}) do |h, (k, v)| + h[k.to_sym] = v; h + end elsif ENV['AWS_INTEGRATION'] # run integration tests, just don't read a configuration file from disk else diff --git a/aws-sdk-core/lib/aws-sdk-core.rb b/aws-sdk-core/lib/aws-sdk-core.rb index fd6f1ca2967..b8a0a53d906 100644 --- a/aws-sdk-core/lib/aws-sdk-core.rb +++ b/aws-sdk-core/lib/aws-sdk-core.rb @@ -1,5 +1,4 @@ require 'jmespath' -require 'multi_json' require 'seahorse' Seahorse::Util.irregular_inflections({ @@ -86,6 +85,7 @@ module Aws autoload :EndpointProvider, 'aws-sdk-core/endpoint_provider' autoload :Errors, 'aws-sdk-core/errors' autoload :InstanceProfileCredentials, 'aws-sdk-core/instance_profile_credentials' + autoload :Json, 'aws-sdk-core/json' autoload :PageableResponse, 'aws-sdk-core/pageable_response' autoload :ParamConverter, 'aws-sdk-core/param_converter' autoload :ParamValidator, 'aws-sdk-core/param_validator' @@ -110,17 +110,6 @@ module Api autoload :ShapeMap, 'aws-sdk-core/api/shape_map' end - # @api private - module Json - autoload :Builder, 'aws-sdk-core/json/builder' - autoload :ErrorHandler, 'aws-sdk-core/json/error_handler' - autoload :Parser, 'aws-sdk-core/json/parser' - autoload :RestHandler, 'aws-sdk-core/json/rest_handler' - autoload :RpcBodyHandler, 'aws-sdk-core/json/rpc_body_handler' - autoload :RpcHeadersHandler, 'aws-sdk-core/json/rpc_headers_handler' - autoload :SimpleBodyHandler, 'aws-sdk-core/json/simple_body_handler' - end - # @api private module Paging autoload :NullPager, 'aws-sdk-core/paging/null_pager' @@ -237,11 +226,6 @@ def service_added(&block) @service_added_callbacks << callback end - # @api private - def load_json(path) - Seahorse::Util.load_json(path) - end - # Registers a new service. # # Aws.add_service('SvcName', diff --git a/aws-sdk-core/lib/aws-sdk-core/api/builder.rb b/aws-sdk-core/lib/aws-sdk-core/api/builder.rb index fc6785850e2..ba1377eea38 100644 --- a/aws-sdk-core/lib/aws-sdk-core/api/builder.rb +++ b/aws-sdk-core/lib/aws-sdk-core/api/builder.rb @@ -19,7 +19,7 @@ def load_definition(definition) case definition when nil then {} when Hash then definition - when String, Pathname then Seahorse::Util.load_json(definition) + when String, Pathname then Json.load_file(definition) else raise ArgumentError, "invalid api definition #{definition}" end end diff --git a/aws-sdk-core/lib/aws-sdk-core/api/docstrings.rb b/aws-sdk-core/lib/aws-sdk-core/api/docstrings.rb index 512e0a5b7ca..e30547e4541 100644 --- a/aws-sdk-core/lib/aws-sdk-core/api/docstrings.rb +++ b/aws-sdk-core/lib/aws-sdk-core/api/docstrings.rb @@ -8,7 +8,7 @@ def self.apply(client_class, path) return api = client_class.api.definition docs = File.open(path, 'r', encoding: 'UTF-8') { |f| f.read } - docs = MultiJson.load(docs) + docs = Json.load(docs) api['documentation'] = docs['service'] diff --git a/aws-sdk-core/lib/aws-sdk-core/client_paging.rb b/aws-sdk-core/lib/aws-sdk-core/client_paging.rb index 67d45005042..5da9f4713d5 100644 --- a/aws-sdk-core/lib/aws-sdk-core/client_paging.rb +++ b/aws-sdk-core/lib/aws-sdk-core/client_paging.rb @@ -15,7 +15,7 @@ def set_paginators(paginators) @paginators = case paginators when Paging::Provider then paginators when Hash then Paging::Provider.new(paginators) - when String, Pathname then Paging::Provider.new(Aws.load_json(paginators)) + when String, Pathname then Paging::Provider.new(Json.load_file(paginators)) when nil then Paging::NullProvider.new else raise ArgumentError, 'invalid paginators' end diff --git a/aws-sdk-core/lib/aws-sdk-core/client_waiters.rb b/aws-sdk-core/lib/aws-sdk-core/client_waiters.rb index d14697cdfff..e3ef375a25f 100644 --- a/aws-sdk-core/lib/aws-sdk-core/client_waiters.rb +++ b/aws-sdk-core/lib/aws-sdk-core/client_waiters.rb @@ -10,7 +10,7 @@ def set_waiters(waiters) case waiters when Waiters::Provider then waiters when Hash then Waiters::Provider.new(waiters) - when String, Pathname then Waiters::Provider.new(Aws.load_json(waiters)) + when String, Pathname then Waiters::Provider.new(Json.load_file(waiters)) when nil then Waiters::NullProvider.new else raise ArgumentError, 'invalid waiters' end diff --git a/aws-sdk-core/lib/aws-sdk-core/endpoint_provider.rb b/aws-sdk-core/lib/aws-sdk-core/endpoint_provider.rb index ada8165cfc3..11d537f0836 100644 --- a/aws-sdk-core/lib/aws-sdk-core/endpoint_provider.rb +++ b/aws-sdk-core/lib/aws-sdk-core/endpoint_provider.rb @@ -6,7 +6,7 @@ class EndpointProvider PATH = File.join(File.dirname(__FILE__), '..', '..', 'endpoints.json') # @api private - RULES = MultiJson.load(File.read(PATH))['endpoints'] + RULES = Json.load_file(PATH)['endpoints'] class << self diff --git a/aws-sdk-core/lib/aws-sdk-core/instance_profile_credentials.rb b/aws-sdk-core/lib/aws-sdk-core/instance_profile_credentials.rb index 7aa84304c0d..9ec326ab51a 100644 --- a/aws-sdk-core/lib/aws-sdk-core/instance_profile_credentials.rb +++ b/aws-sdk-core/lib/aws-sdk-core/instance_profile_credentials.rb @@ -64,7 +64,7 @@ def backoff(backoff) end def refresh - credentials = MultiJson.load(get_credentials) + credentials = Json.load(get_credentials) @access_key_id = credentials['AccessKeyId'] @secret_access_key = credentials['SecretAccessKey'] @session_token = credentials['Token'] diff --git a/aws-sdk-core/lib/aws-sdk-core/json.rb b/aws-sdk-core/lib/aws-sdk-core/json.rb new file mode 100644 index 00000000000..500ce86f547 --- /dev/null +++ b/aws-sdk-core/lib/aws-sdk-core/json.rb @@ -0,0 +1,59 @@ +module Aws + # @api private + module Json + + autoload :Builder, 'aws-sdk-core/json/builder' + autoload :ErrorHandler, 'aws-sdk-core/json/error_handler' + autoload :Parser, 'aws-sdk-core/json/parser' + autoload :RestHandler, 'aws-sdk-core/json/rest_handler' + autoload :RpcBodyHandler, 'aws-sdk-core/json/rpc_body_handler' + autoload :RpcHeadersHandler, 'aws-sdk-core/json/rpc_headers_handler' + autoload :SimpleBodyHandler, 'aws-sdk-core/json/simple_body_handler' + + class ParseError < StandardError + + def initialize(error) + @error = error + super(error.message) + end + + attr_reader :error + + end + + class << self + + def load(json) + ENGINE.load(json) + rescue ENGINE_ERROR => e + raise ParseError.new(e) + end + + def load_file(path) + self.load(File.open(path, 'r', encoding: 'UTF-8') { |f| f.read }) + end + + def dump(value) + ENGINE.dump(value) + end + + private + + def oj_engine + require 'oj' + [Oj, Oj::ParseError] + rescue LoadError + false + end + + def json_engine + require 'json' + [JSON, JSON::ParserError] + end + + end + + ENGINE, ENGINE_ERROR = oj_engine || json_engine + + end +end diff --git a/aws-sdk-core/lib/aws-sdk-core/json/builder.rb b/aws-sdk-core/lib/aws-sdk-core/json/builder.rb index d11059672c4..f98f710c099 100644 --- a/aws-sdk-core/lib/aws-sdk-core/json/builder.rb +++ b/aws-sdk-core/lib/aws-sdk-core/json/builder.rb @@ -11,7 +11,7 @@ def initialize(rules) end def to_json(params) - MultiJson.dump(format(@rules, params)) + Json.dump(format(@rules, params)) end private diff --git a/aws-sdk-core/lib/aws-sdk-core/json/error_handler.rb b/aws-sdk-core/lib/aws-sdk-core/json/error_handler.rb index a3d524c98be..92ad0c8d93f 100644 --- a/aws-sdk-core/lib/aws-sdk-core/json/error_handler.rb +++ b/aws-sdk-core/lib/aws-sdk-core/json/error_handler.rb @@ -14,11 +14,11 @@ def call(context) private def extract_error(body, context) - json = MultiJson.load(body) + json = Json.load(body) code = error_code(json, context) message = error_message(code, json) [code, message] - rescue MultiJson::ParseError + rescue Json::ParseError [http_status_error_code(context), ''] end diff --git a/aws-sdk-core/lib/aws-sdk-core/json/json_engine.rb b/aws-sdk-core/lib/aws-sdk-core/json/json_engine.rb new file mode 100644 index 00000000000..a4b4cbee334 --- /dev/null +++ b/aws-sdk-core/lib/aws-sdk-core/json/json_engine.rb @@ -0,0 +1,15 @@ +module Aws + module Json + class OjEngine + + def self.load(json) + Oj.load(json) + end + + def self.dump(value) + Oj.dump(value) + end + + end + end +end diff --git a/aws-sdk-core/lib/aws-sdk-core/json/oj_engine.rb b/aws-sdk-core/lib/aws-sdk-core/json/oj_engine.rb new file mode 100644 index 00000000000..98de4102858 --- /dev/null +++ b/aws-sdk-core/lib/aws-sdk-core/json/oj_engine.rb @@ -0,0 +1,15 @@ +module Aws + module Json + class JSONEngine + + def self.load(json) + JSON.load(json) + end + + def self.dump(value) + JSON.dump(value) + end + + end + end +end diff --git a/aws-sdk-core/lib/aws-sdk-core/json/parser.rb b/aws-sdk-core/lib/aws-sdk-core/json/parser.rb index 362057638c8..fe7193514a1 100644 --- a/aws-sdk-core/lib/aws-sdk-core/json/parser.rb +++ b/aws-sdk-core/lib/aws-sdk-core/json/parser.rb @@ -14,7 +14,7 @@ def initialize(rules) # @param [String] json def parse(json, target = nil) - parse_ref(@rules, MultiJson.load(json, max_nesting: false), target) + parse_ref(@rules, Json.load(json), target) end private diff --git a/aws-sdk-core/lib/aws-sdk-core/json/simple_body_handler.rb b/aws-sdk-core/lib/aws-sdk-core/json/simple_body_handler.rb index 66c173381c8..bbf82afe046 100644 --- a/aws-sdk-core/lib/aws-sdk-core/json/simple_body_handler.rb +++ b/aws-sdk-core/lib/aws-sdk-core/json/simple_body_handler.rb @@ -22,11 +22,11 @@ def call(context) private def build_json(context) - context.http_request.body = MultiJson.dump(context.params) + context.http_request.body = Json.dump(context.params) end def parse_json(context) - MultiJson.load(context.http_response.body_contents) + Json.load(context.http_response.body_contents) end end diff --git a/aws-sdk-core/lib/aws-sdk-core/xml/error_handler.rb b/aws-sdk-core/lib/aws-sdk-core/xml/error_handler.rb index 374df32bfda..8c47f9d7d71 100644 --- a/aws-sdk-core/lib/aws-sdk-core/xml/error_handler.rb +++ b/aws-sdk-core/lib/aws-sdk-core/xml/error_handler.rb @@ -15,7 +15,12 @@ def call(context) def error(context) body = context.http_response.body_contents - code, message = extract_error(body, context) + if body.empty? + code = http_status_error_code(context) + message = '' + else + code, message = extract_error(body, context) + end svc = context.client.class.name.split('::')[1] errors_module = Aws.const_get(svc).const_get(:Errors) errors_module.error_class(code).new(context, message) diff --git a/aws-sdk-core/lib/seahorse/util.rb b/aws-sdk-core/lib/seahorse/util.rb index cf6659562a4..3b05c5efc3f 100644 --- a/aws-sdk-core/lib/seahorse/util.rb +++ b/aws-sdk-core/lib/seahorse/util.rb @@ -24,10 +24,6 @@ def uri_escape(string) CGI::escape(string.encode('UTF-8')).gsub('+', '%20').gsub('%7E', '~') end - def load_json(path) - MultiJson.load(File.open(path, 'r', encoding: 'UTF-8') { |f| f.read }) - end - end @irregular_inflections = {} diff --git a/aws-sdk-core/spec/aws_spec.rb b/aws-sdk-core/spec/aws_spec.rb index cafa88e5c6e..c807995d3e9 100644 --- a/aws-sdk-core/spec/aws_spec.rb +++ b/aws-sdk-core/spec/aws_spec.rb @@ -81,12 +81,12 @@ module Aws end it 'accpets hash values' do - Aws.add_service('DummyService', api: Aws.load_json(api_path)) + Aws.add_service('DummyService', api: Json.load_file(api_path)) expect(DummyService::Client.api).to be_kind_of(Seahorse::Model::Api) end it 'accpets Seahorse::Model::Api values' do - api = Aws::Api::Builder.build(Aws.load_json(api_path)) + api = Aws::Api::Builder.build(Json.load_file(api_path)) Aws.add_service('DummyService', api: api) expect(DummyService::Client.api).to be(api) end diff --git a/aws-sdk-core/spec/protocols_spec.rb b/aws-sdk-core/spec/protocols_spec.rb index dd39f82dfc3..2a7f7e8bead 100644 --- a/aws-sdk-core/spec/protocols_spec.rb +++ b/aws-sdk-core/spec/protocols_spec.rb @@ -1,5 +1,4 @@ require 'spec_helper' -require 'multi_json' require 'rexml/document' def fixtures @@ -18,7 +17,7 @@ def fixtures def each_test_case(context, fixture_path) return unless fixture_path - MultiJson.load(File.read(fixture_path)).each do |suite| + Aws::Json.load_file(fixture_path).each do |suite| describe(suite['description'].inspect) do suite['cases'].each.with_index do |test_case,n| describe("case: #{n}") do @@ -118,12 +117,12 @@ def match_req_body(group, suite, test_case, http_req) body = body.split('&').sort.join('&') expected_body = expected_body.split('&').sort.join('&') when 'json' - body = MultiJson.load(body) unless body == '' - expected_body = MultiJson.load(expected_body) + body = Aws::Json.load(body) unless body == '' + expected_body = Aws::Json.load(expected_body) when 'rest-json' if body[0] == '{' - body = MultiJson.load(body) - expected_body = MultiJson.load(expected_body) + body = Aws::Json.load(body) + expected_body = Aws::Json.load(expected_body) end when 'rest-xml' body = normalize_xml(body) diff --git a/aws-sdk-resources/features/env.rb b/aws-sdk-resources/features/env.rb index 676951e19fc..4762f1f5f40 100644 --- a/aws-sdk-resources/features/env.rb +++ b/aws-sdk-resources/features/env.rb @@ -8,7 +8,9 @@ cfg = './integration-test-config.json' if File.exist?(cfg) - Aws.config = MultiJson.load(File.read(cfg), symbolize_keys: true) + Aws.config = Aws::Json.load_file(cfg).inject({}) do |h, (k, v)| + h[k.to_sym] = v; h + end elsif ENV['AWS_INTEGRATION'] # run integration tests, just don't read a configuration file from disk else diff --git a/aws-sdk-resources/lib/aws-sdk-resources.rb b/aws-sdk-resources/lib/aws-sdk-resources.rb index b2bcc57f6d5..d365c7a9e49 100644 --- a/aws-sdk-resources/lib/aws-sdk-resources.rb +++ b/aws-sdk-resources/lib/aws-sdk-resources.rb @@ -26,7 +26,7 @@ module Resources when Resources::Definition then definition when Hash then Resources::Definition.new(definition) when String - Resources::Definition.new(Aws.load_json(definition), source_path: definition) + Resources::Definition.new(Json.load_file(definition), source_path: definition) else raise ArgumentError, "invalid resource definition #{definition}" end definition.apply(svc_module) diff --git a/aws-sdk-resources/lib/aws-sdk-resources/services/s3/encryption/client.rb b/aws-sdk-resources/lib/aws-sdk-resources/services/s3/encryption/client.rb index f17ff8e06ba..71dcd03e5d5 100644 --- a/aws-sdk-resources/lib/aws-sdk-resources/services/s3/encryption/client.rb +++ b/aws-sdk-resources/lib/aws-sdk-resources/services/s3/encryption/client.rb @@ -80,14 +80,14 @@ module S3 # @keys = keys # @encryption_materials = Aws::S3::Encryption::Materials.new( # key: @keys[default_key_name], - # description: MultiJson.dump(key: default_key_name), + # description: JSON.dump(key: default_key_name), # ) # end # # attr_reader :encryption_materials # # def key_for(matdesc) - # key_name = MultiJson.load(matdesc)['key'] + # key_name = JSON.load(matdesc)['key'] # if key = @keys[key_name] # key # else diff --git a/aws-sdk-resources/lib/aws-sdk-resources/services/s3/encryption/decrypt_handler.rb b/aws-sdk-resources/lib/aws-sdk-resources/services/s3/encryption/decrypt_handler.rb index 8f48572ad38..23b48f9d0d7 100644 --- a/aws-sdk-resources/lib/aws-sdk-resources/services/s3/encryption/decrypt_handler.rb +++ b/aws-sdk-resources/lib/aws-sdk-resources/services/s3/encryption/decrypt_handler.rb @@ -66,11 +66,11 @@ def envelope_from_metadata(context) def envelope_from_instr_file(context) suffix = context[:encryption][:instruction_file_suffix] - MultiJson.load(context.client.get_object( + Json.load(context.client.get_object( bucket: context.params[:bucket], key: context.params[:key] + suffix ).body.read) - rescue S3::Errors::ServiceError, MultiJson::ParseError + rescue S3::Errors::ServiceError, Json::ParseError nil end diff --git a/aws-sdk-resources/lib/aws-sdk-resources/services/s3/encryption/encrypt_handler.rb b/aws-sdk-resources/lib/aws-sdk-resources/services/s3/encryption/encrypt_handler.rb index e5506e75b34..82727717093 100644 --- a/aws-sdk-resources/lib/aws-sdk-resources/services/s3/encryption/encrypt_handler.rb +++ b/aws-sdk-resources/lib/aws-sdk-resources/services/s3/encryption/encrypt_handler.rb @@ -30,7 +30,7 @@ def apply_encryption_envelope(context, envelope) context.client.put_object( bucket: context.params[:bucket], key: context.params[:key] + suffix, - body: MultiJson.dump(envelope) + body: Json.dump(envelope) ) end end diff --git a/aws-sdk-resources/lib/aws-sdk-resources/services/s3/encryption/materials.rb b/aws-sdk-resources/lib/aws-sdk-resources/services/s3/encryption/materials.rb index a1cf28abb73..af2d6da233a 100644 --- a/aws-sdk-resources/lib/aws-sdk-resources/services/s3/encryption/materials.rb +++ b/aws-sdk-resources/lib/aws-sdk-resources/services/s3/encryption/materials.rb @@ -45,9 +45,9 @@ def validate_key(key) end def validate_desc(description) - MultiJson.load(description) + Json.load(description) description - rescue MultiJson::ParseError + rescue Json::ParseError msg = "expected description to be a valid JSON document string" raise ArgumentError, msg end diff --git a/aws-sdk-resources/lib/aws-sdk-resources/services/s3/presigned_post.rb b/aws-sdk-resources/lib/aws-sdk-resources/services/s3/presigned_post.rb index e0151131f98..72a13fe10c9 100644 --- a/aws-sdk-resources/lib/aws-sdk-resources/services/s3/presigned_post.rb +++ b/aws-sdk-resources/lib/aws-sdk-resources/services/s3/presigned_post.rb @@ -1,6 +1,5 @@ require 'openssl' require 'base64' -require 'multi_json' module Aws module S3 @@ -597,7 +596,7 @@ def policy(datetime) signature_fields(datetime).each do |name, value| policy['conditions'] << { name => value } end - base64(MultiJson.dump(policy)) + base64(Json.dump(policy)) end def signature_fields(datetime) diff --git a/aws-sdk-resources/lib/aws-sdk-resources/services/sns/message_verifier.rb b/aws-sdk-resources/lib/aws-sdk-resources/services/sns/message_verifier.rb index fb909e3721f..d4c90c392a6 100644 --- a/aws-sdk-resources/lib/aws-sdk-resources/services/sns/message_verifier.rb +++ b/aws-sdk-resources/lib/aws-sdk-resources/services/sns/message_verifier.rb @@ -1,7 +1,6 @@ require 'net/http' require 'openssl' require 'base64' -require 'multi_json' module Aws module SNS @@ -59,7 +58,7 @@ def authentic?(message_body) # @raise [VerificationError] Raised when the given message has failed # verification. def authenticate!(message_body) - msg = MultiJson.load(message_body) + msg = Json.load(message_body) if public_key(msg).verify(sha1, signature(msg), canonical_string(msg)) true else diff --git a/aws-sdk-resources/spec/services/s3/encryption/client_spec.rb b/aws-sdk-resources/spec/services/s3/encryption/client_spec.rb index ed6af525432..b0603742426 100644 --- a/aws-sdk-resources/spec/services/s3/encryption/client_spec.rb +++ b/aws-sdk-resources/spec/services/s3/encryption/client_spec.rb @@ -162,7 +162,7 @@ module Encryption # first request stores the encryption materials in the instruction file expect( a_request(:put, "https://bucket.s3-us-west-1.amazonaws.com/key.instruction").with( - :body => MultiJson.dump( + :body => Json.dump( 'x-amz-key'=>'gX+a4JQYj7FP0y5TAAvxTz4e2l0DvOItbXByml/NPtKQcUlsoGHoYR/T0TuYHcNj', 'x-amz-iv' => 'TO5mQgtOzWkTfoX4RE5tsA==', 'x-amz-matdesc' => '{}', @@ -243,7 +243,7 @@ def stub_encrypted_get_with_instruction_file(suffix = '.instruction') to_return(body: encrypted_body) stub_request(:get, "https://bucket.s3-us-west-1.amazonaws.com/key#{suffix}"). to_return( - :body => MultiJson.dump( + :body => Json.dump( 'x-amz-key'=>'gX+a4JQYj7FP0y5TAAvxTz4e2l0DvOItbXByml/NPtKQcUlsoGHoYR/T0TuYHcNj', 'x-amz-iv' => 'TO5mQgtOzWkTfoX4RE5tsA==', 'x-amz-matdesc' => '{}', diff --git a/aws-sdk-resources/spec/services/s3/presigned_post_spec.rb b/aws-sdk-resources/spec/services/s3/presigned_post_spec.rb index 248c69e2c78..052733ded96 100644 --- a/aws-sdk-resources/spec/services/s3/presigned_post_spec.rb +++ b/aws-sdk-resources/spec/services/s3/presigned_post_spec.rb @@ -1,6 +1,5 @@ require 'spec_helper' require 'base64' -require 'multi_json' module Aws module S3 @@ -17,7 +16,7 @@ module S3 let(:post) { PresignedPost.new(creds, region, bucket, options) } def decode(policy) - MultiJson.load(Base64.decode64(policy)) + Json.load(Base64.decode64(policy)) end def policy(post) diff --git a/aws-sdk-resources/spec/services/sns/message_verifier_spec.rb b/aws-sdk-resources/spec/services/sns/message_verifier_spec.rb index 7e715ee0290..4161191f196 100644 --- a/aws-sdk-resources/spec/services/sns/message_verifier_spec.rb +++ b/aws-sdk-resources/spec/services/sns/message_verifier_spec.rb @@ -1,5 +1,4 @@ require 'spec_helper' -require 'multi_json' module Aws module SNS @@ -69,36 +68,36 @@ module SNS end it 'raises when the SigningCertURL is not https' do - msg = MultiJson.load(message) + msg = Json.load(message) msg['SigningCertURL'] = msg['SigningCertURL'].sub(/https/, 'http') - msg = MultiJson.dump(msg) + msg = Json.dump(msg) expect { verifier.authenticate!(msg) }.to raise_error(MessageVerifier::VerificationError, /must be https/) end it 'raises when the SigningCertURL is not AWS hosted' do - msg = MultiJson.load(message) + msg = Json.load(message) msg['SigningCertURL'] = 'https://internetbadguys.com/cert.pem' - msg = MultiJson.dump(msg) + msg = Json.dump(msg) expect { verifier.authenticate!(msg) }.to raise_error(MessageVerifier::VerificationError, /hosted by AWS/) end it 'raises when the SigningCertURL is not a pem file' do - msg = MultiJson.load(message) + msg = Json.load(message) msg['SigningCertURL'] = msg['SigningCertURL'].sub(/pem$/, 'key') - msg = MultiJson.dump(msg) + msg = Json.dump(msg) expect { verifier.authenticate!(msg) }.to raise_error(MessageVerifier::VerificationError, /a \.pem file/) end it 'raises when the message signature fails validation' do - msg = MultiJson.load(message) + msg = Json.load(message) msg['Signature'] = 'bad' - msg = MultiJson.dump(msg) + msg = Json.dump(msg) expect { verifier.authenticate!(msg) }.to raise_error(MessageVerifier::VerificationError, /cannot be verified/) @@ -142,9 +141,9 @@ module SNS end it 'returns false if the message can not be authenticated' do - msg = MultiJson.load(message) + msg = Json.load(message) msg['Signature'] = 'bad' - msg = MultiJson.dump(msg) + msg = Json.dump(msg) expect(verifier.authentic?(msg)).to be(false) end diff --git a/doc-src/plugins/resources.rb b/doc-src/plugins/resources.rb index b9321e2570a..371831f9419 100644 --- a/doc-src/plugins/resources.rb +++ b/doc-src/plugins/resources.rb @@ -181,8 +181,7 @@ def document_data_attribute_getters(yard_class, resource_class) endpoint = resource_class.client_class.api.metadata['endpointPrefix'] version = resource_class.client_class.api.version - definition = File.read("aws-sdk-core/apis/#{endpoint}/#{version}/resources-1.json") - definition = MultiJson.load(definition) + definition = Json.load_file("aws-sdk-core/apis/#{endpoint}/#{version}/resources-1.json") definition = definition['resources'][resource_name] if shape_name = definition['shape'] From b8930d745b365c08199ae2553d0128c87c7b01d4 Mon Sep 17 00:00:00 2001 From: Trevor Rowe Date: Fri, 8 May 2015 12:52:35 -0700 Subject: [PATCH 035/101] Fixed last of the failing integration tests. --- aws-sdk-core/features/glacier/step_definitions.rb | 5 ++++- aws-sdk-resources/features/s3/step_definitions.rb | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/aws-sdk-core/features/glacier/step_definitions.rb b/aws-sdk-core/features/glacier/step_definitions.rb index adfcad711f2..3f8e61e7b7c 100644 --- a/aws-sdk-core/features/glacier/step_definitions.rb +++ b/aws-sdk-core/features/glacier/step_definitions.rb @@ -35,7 +35,10 @@ def bytes(megabytes) end When(/^I upload an archive with the contents "(.*?)"$/) do |contents| - upload_glacier_archive(contents) + begin + upload_glacier_archive(contents) + rescue => @error + end end When(/^I upload an archive from a ([0-9\.]+)MB large file$/) do |size_in_mb| diff --git a/aws-sdk-resources/features/s3/step_definitions.rb b/aws-sdk-resources/features/s3/step_definitions.rb index f3ffbb8f8df..239cdd4ff02 100644 --- a/aws-sdk-resources/features/s3/step_definitions.rb +++ b/aws-sdk-resources/features/s3/step_definitions.rb @@ -38,7 +38,7 @@ end Then(/^the file should have been uploaded as a multipart upload$/) do - expect(ApiCallTracker.called_operations).to include('create_multipart_upload') + expect(ApiCallTracker.called_operations).to include(:create_multipart_upload) end Given(/^I have an encryption client$/) do From 4fef5be10eb27061b90093d5da5b3ad795460146 Mon Sep 17 00:00:00 2001 From: Trevor Rowe Date: Fri, 8 May 2015 13:59:30 -0700 Subject: [PATCH 036/101] No longer using annonymous struct clases. Every client now generates and names all of its structure types. --- aws-sdk-core/lib/aws-sdk-core.rb | 3 + .../lib/aws-sdk-core/api/shape_map.rb | 7 + aws-sdk-core/lib/aws-sdk-core/client_stubs.rb | 4 +- .../lib/aws-sdk-core/empty_structure.rb | 73 +-------- aws-sdk-core/lib/aws-sdk-core/json/parser.rb | 2 +- .../plugins/s3_get_bucket_location_fix.rb | 2 +- .../lib/aws-sdk-core/query/handler.rb | 6 + .../lib/aws-sdk-core/rest_body_handler.rb | 2 +- aws-sdk-core/lib/aws-sdk-core/structure.rb | 150 +----------------- .../lib/aws-sdk-core/xml/parser/frame.rb | 2 +- aws-sdk-core/spec/aws/empty_structure_spec.rb | 10 +- aws-sdk-core/spec/aws/structure_spec.rb | 115 +------------- aws-sdk-core/spec/aws/waiters_spec.rb | 2 +- 13 files changed, 44 insertions(+), 334 deletions(-) diff --git a/aws-sdk-core/lib/aws-sdk-core.rb b/aws-sdk-core/lib/aws-sdk-core.rb index b8a0a53d906..514ed77a140 100644 --- a/aws-sdk-core/lib/aws-sdk-core.rb +++ b/aws-sdk-core/lib/aws-sdk-core.rb @@ -267,6 +267,9 @@ def load_all_services service_added do |name, svc_module, options| svc_module.const_set(:Client, Client.define(name, options)) svc_module.const_set(:Errors, Module.new { extend Errors::DynamicErrors }) + svc_module::Client.api.metadata['shapes'].each_structure do |shape| + svc_module::Client.const_set(shape.name, shape[:struct_class]) + end end end diff --git a/aws-sdk-core/lib/aws-sdk-core/api/shape_map.rb b/aws-sdk-core/lib/aws-sdk-core/api/shape_map.rb index 99c20abdcdc..8d9d23164fc 100644 --- a/aws-sdk-core/lib/aws-sdk-core/api/shape_map.rb +++ b/aws-sdk-core/lib/aws-sdk-core/api/shape_map.rb @@ -34,6 +34,12 @@ def [](shape_name) end end + def each_structure + @shapes.each do |_, shape| + yield(shape) if StructureShape === shape + end + end + def shape_ref(definition, options = {}) if definition @@ -81,6 +87,7 @@ def apply_shape_refs(shape, traits) ref = shape_ref(ref, member_name: member_name) shape.add_member(name, ref, required: required.include?(member_name)) end + shape[:struct_class] = Structure.new(*shape.member_names) when ListShape shape.member = shape_ref(traits.delete('member')) when MapShape diff --git a/aws-sdk-core/lib/aws-sdk-core/client_stubs.rb b/aws-sdk-core/lib/aws-sdk-core/client_stubs.rb index d026a4d7ec4..b40dbd52fd9 100644 --- a/aws-sdk-core/lib/aws-sdk-core/client_stubs.rb +++ b/aws-sdk-core/lib/aws-sdk-core/client_stubs.rb @@ -165,7 +165,7 @@ def stub_structure(ref, hash) end def structure_obj(ref, hash) - stubs = Structure.new(ref.shape.member_names) + stubs = ref[:struct_class].new ref.shape.members.each do |member_name, member_ref| if hash.key?(member_name) && hash[member_name].nil? stubs[member_name] = nil @@ -223,7 +223,7 @@ def stub_scalar(ref, value) def empty_stub(data) if data.empty? - Structure.new(data) + EmptyStructure.new else msg = 'unable to generate a stubbed response from the given data; ' msg << 'this operation does not return data' diff --git a/aws-sdk-core/lib/aws-sdk-core/empty_structure.rb b/aws-sdk-core/lib/aws-sdk-core/empty_structure.rb index fd6db9cb8a7..6cfc771337a 100644 --- a/aws-sdk-core/lib/aws-sdk-core/empty_structure.rb +++ b/aws-sdk-core/lib/aws-sdk-core/empty_structure.rb @@ -1,41 +1,9 @@ module Aws - class EmptyStructure < Structure - - def self.new - super([]) - end - - def ==(other) - other.is_a?(EmptyStructure) - end - - def [](member_name) - raise NameError, "no member '#{member_name}' in struct" - end - - def []=(member_name, value) - raise NameError, "no member '#{member_name}' in struct" - end - - def each(&block) - unless block_given? - [].to_enum - end - end - - def each_pair(&block) - unless block_given? - {}.to_enum - end - end - - def eql?(other) - other.is_a?(EmptyStructure) - end + class EmptyStructure < Struct.new('AwsEmptyStructure') # @api private def inspect - '#' + "#" end # @api private @@ -43,42 +11,5 @@ def pretty_print(q) q.text(inspect) end - def length - 0 - end - - def members - [] - end - - def select(&block) - [] - end - - def size - 0 - end - - def to_a - [] - end - - def to_h - {} - end - - def values - [] - end - - def values_at(*selector) - if selector.empty? - [] - else - offset = selector.first - raise IndexError, "offset #{offset} too large for struct(size:0)" - end - end - end end diff --git a/aws-sdk-core/lib/aws-sdk-core/json/parser.rb b/aws-sdk-core/lib/aws-sdk-core/json/parser.rb index fe7193514a1..a7fa257e51d 100644 --- a/aws-sdk-core/lib/aws-sdk-core/json/parser.rb +++ b/aws-sdk-core/lib/aws-sdk-core/json/parser.rb @@ -21,7 +21,7 @@ def parse(json, target = nil) def structure(ref, values, target = nil) shape = ref.shape - target = Structure.new(shape.member_names) if target.nil? + target = ref[:struct_class].new if target.nil? values.each do |key, value| member_name, member_ref = shape.member_by_location_name(key) if member_ref diff --git a/aws-sdk-core/lib/aws-sdk-core/plugins/s3_get_bucket_location_fix.rb b/aws-sdk-core/lib/aws-sdk-core/plugins/s3_get_bucket_location_fix.rb index 6a78e53b4a5..ee6f2c9b7e4 100644 --- a/aws-sdk-core/lib/aws-sdk-core/plugins/s3_get_bucket_location_fix.rb +++ b/aws-sdk-core/lib/aws-sdk-core/plugins/s3_get_bucket_location_fix.rb @@ -6,7 +6,7 @@ class Handler < Seahorse::Client::Handler def call(context) @handler.call(context).on(200) do |response| - response.data = Structure.new([:location_constraint]) + response.data = S3::Client::GetBucketLocationOutput.new xml = context.http_response.body_contents matches = xml.match(/>(.+?)<\/LocationConstraint>/) response.data[:location_constraint] = matches ? matches[1] : '' diff --git a/aws-sdk-core/lib/aws-sdk-core/query/handler.rb b/aws-sdk-core/lib/aws-sdk-core/query/handler.rb index b257b0884e0..e15dd184bff 100644 --- a/aws-sdk-core/lib/aws-sdk-core/query/handler.rb +++ b/aws-sdk-core/lib/aws-sdk-core/query/handler.rb @@ -6,11 +6,16 @@ class Handler < Seahorse::Client::Handler CONTENT_TYPE = 'application/x-www-form-urlencoded; charset=utf-8' + WRAPPER_STRUCT = Structure.new(:result, :response_metadata) + + METADATA_STRUCT = Structure.new(:request_id) + METADATA_REF = begin request_id = ShapeRef.new( shape: StringShape.new, location_name: 'RequestId') response_metadata = StructureShape.new + response_metadata[:struct_class] = METADATA_STRUCT response_metadata.add_member(:request_id, request_id) ShapeRef.new(shape: response_metadata, location_name: 'ResponseMetadata') end @@ -61,6 +66,7 @@ def rules(context) shape: context.operation.output.shape, location_name: context.operation.name + 'Result' )) + shape[:struct_class] = WRAPPER_STRUCT shape.add_member(:response_metadata, METADATA_REF) ShapeRef.new(shape: shape) end diff --git a/aws-sdk-core/lib/aws-sdk-core/rest_body_handler.rb b/aws-sdk-core/lib/aws-sdk-core/rest_body_handler.rb index 98bb642f580..1fb64887c43 100644 --- a/aws-sdk-core/lib/aws-sdk-core/rest_body_handler.rb +++ b/aws-sdk-core/lib/aws-sdk-core/rest_body_handler.rb @@ -37,7 +37,7 @@ def build_body(context) def extract_data(context) if ref = context.operation.output - data = Structure.new(ref.shape.member_names) + data = ref[:struct_class].new if streaming?(ref) data[ref[:payload]] = context.http_response.body elsif ref[:payload] diff --git a/aws-sdk-core/lib/aws-sdk-core/structure.rb b/aws-sdk-core/lib/aws-sdk-core/structure.rb index bf297e192bd..900e79c4ac3 100644 --- a/aws-sdk-core/lib/aws-sdk-core/structure.rb +++ b/aws-sdk-core/lib/aws-sdk-core/structure.rb @@ -1,52 +1,9 @@ require 'thread' module Aws - - # A utilty class that makes it easier to work with Struct objects. - # - # ## Construction - # - # You can construct a Structure with a simple hash. - # - # person = Structure.new(name: 'John Doe', age: 40) - # #=> # - # - # ## Empty Structures - # - # The stdlib Struct class does not work with empty member lists. - # Structure solves this by introducing the EmptyStructure class. - # - # struct = Structure.new({}) - # #=> # - # - # ## Structure Classes - # - # In addition to simpler object construction, struct classes are re-used - # automatically. - # - # person1 = Structure.new(name: 'John Doe', age: 40) - # person2 = Structure.new(name: 'Jane Doe', age: 40) - # - # person1.class == person2.class - # - # ## Hash Conversion - # - # Calling {#to_h} or {#to_hash} on a Structure object performs a deep - # conversion of Structure objects into hashes. - # - # person = Structure.new( - # name: "John", - # age: 40, - # friend: Structure.new(name: "Jane", age: 40, friend: nil) - # ) - # person.to_h - # #=> {:name=>"John", :age=>40, :friend=>{:name=>"Jane", :age=>40}} - # + # @api private class Structure < Struct - @@classes = {} - @@classes_mutex = Mutex.new - if Struct.instance_methods.include?(:to_h) alias orig_to_h to_h end @@ -79,107 +36,14 @@ def to_h(obj = self) class << self - # Defines a Struct class with the given member names. Returns an - # instance of that class with nil member values. - # - # struct = Structure.new([:name, :age]) - # struct.members - # #=> [:name, :age] - # - # struct[:name] #=> nil - # struct[:age] #=> nil - # - # You can provide an ordered list of values to initialize structure - # members with: - # - # struct = Structure.new([:name, :age], ['John Doe', 40]) - # struct.members - # #=> [:name, :age] - # - # struct[:name] #=> 'John Doe' - # struct[:age] #=> 40 - # - # Calling {new} multiple times with the same list of members will - # reuse Struct classes. - # - # struct1 = Structure.new([:name, :age]) - # struct2 = Structure.new([:name, :age]) - # - # struct1.class.equal?(struct2.class) - # #=> true - # - # Calling {new} without members, or with an empty list of members - # will return an {EmptyStructure}: - # - # struct = Structure.new - # struct.members - # #=> [] - # - # You can also create an empty Structure via {EmptyStructure}. - # - # @overload new(member_names) - # @param [Array] member_names An array of member names. - # @return [Struct] - # - # @overload new(*member_names) - # @param [Symbol] member_names A list of member names. - # @return [Struct] - # - # @overload new(members) - # @param [Hash] members A hash of member names - # and values. - # @return [Struct] - # - # @overload new() - # @return [EmptyStructure] - # + # @api private def new(*args) - members, values = parse_args(args) - if members.empty? && self == Structure - EmptyStructure.new + if args == ['AwsEmptyStructure'] + super + elsif args.empty? + EmptyStructure else - struct_class = @@classes[members] - if struct_class.nil? - @@classes_mutex.synchronize do - struct_class = members.empty? ? super(:_) : super(*members) - @@classes[members] = struct_class - end - end - struct_class.new(*values) - end - end - - # Deeply converts hashes to Structure objects. Hashes with string - # keys are not converted, but their values are. - # @api private - def from_hash(value) - case value - when Hash - data = value.each.with_object({}) do |(key, value), hash| - hash[key] = from_hash(value) - end - Symbol === data.keys.first ? new(data) : data - when Array - value.map { |v| from_hash(v) } - else value - end - end - - private - - def parse_args(args) - case args.count - when 0 then [[], []] - when 1 then parse_single_arg(args.first) - else [args, []] - end - end - - def parse_single_arg(arg) - case arg - when Array then [arg, []] - when Hash then [arg.keys, arg.values] - else [[arg], []] + super(*args) end end diff --git a/aws-sdk-core/lib/aws-sdk-core/xml/parser/frame.rb b/aws-sdk-core/lib/aws-sdk-core/xml/parser/frame.rb index 1a3e5cfef62..e1fd5d39cb4 100644 --- a/aws-sdk-core/lib/aws-sdk-core/xml/parser/frame.rb +++ b/aws-sdk-core/lib/aws-sdk-core/xml/parser/frame.rb @@ -64,7 +64,7 @@ class StructureFrame < Frame def initialize(parent, ref, result = nil) super - @result ||= Structure.new(ref.shape.member_names) + @result ||= ref[:struct_class].new @members = {} ref.shape.members.each do |member_name, member_ref| apply_default_value(member_name, member_ref) diff --git a/aws-sdk-core/spec/aws/empty_structure_spec.rb b/aws-sdk-core/spec/aws/empty_structure_spec.rb index 74662624a76..d8e9b86efd7 100644 --- a/aws-sdk-core/spec/aws/empty_structure_spec.rb +++ b/aws-sdk-core/spec/aws/empty_structure_spec.rb @@ -3,8 +3,8 @@ module Aws describe EmptyStructure do - it 'can be constructed via Structure.new' do - expect(Structure.new({})).to be_kind_of(EmptyStructure) + it 'can be constructed via .new' do + expect(EmptyStructure.new).to be_kind_of(EmptyStructure) end it 'it is a Struct' do @@ -67,12 +67,12 @@ module Aws it 'supports pretty print' do r = double('receiver') - expect(r).to receive(:text).with('#') + expect(r).to receive(:text).with('#') EmptyStructure.new.pretty_print(r) end it 'has a sensible inspect string' do - expect(EmptyStructure.new.inspect).to eq('#') + expect(EmptyStructure.new.inspect).to eq('#') end it 'has a zero length' do @@ -104,7 +104,7 @@ module Aws struct = EmptyStructure.new expect(struct.values_at(*[])).to eq([]) expect { - struct.values_at(:foo, :bar) + struct.values_at(0,1) }.to raise_error(IndexError) end diff --git a/aws-sdk-core/spec/aws/structure_spec.rb b/aws-sdk-core/spec/aws/structure_spec.rb index 554e0d8f0fb..2bb950524de 100644 --- a/aws-sdk-core/spec/aws/structure_spec.rb +++ b/aws-sdk-core/spec/aws/structure_spec.rb @@ -4,120 +4,41 @@ module Aws describe Structure do it 'it is a Struct' do - expect(Structure.new([:abc])).to be_kind_of(Struct) + expect(Structure.new(:abc).new).to be_kind_of(Struct) end it 'accpets positional members' do expect(Structure.new(:abc, :xyz).members).to eq([:abc, :xyz]) end - it 'accepts a list of members' do - expect(Structure.new([:abc, :xyz]).members).to eq([:abc, :xyz]) - end - - it 'can be initialized with a data hash' do - struct = Structure.new(:a => 1, :b => 2) - expect(struct.members).to eq([:a, :b]) - expect(struct.a).to eq(1) - expect(struct.b).to eq(2) - end - - describe '#from_hash' do - - it 'converts nested hashes to Structure objects' do - data = { - :name => 'John', - :parents => { - :father => 'Jack', - :mother => 'Jane', - } - } - struct = Structure.from_hash(data) - expect(struct.name).to eq('John') - expect(struct.parents.father).to eq('Jack') - expect(struct.parents.mother).to eq('Jane') - end - - it 'converts arrays of hashes' do - data = { - :data => [ - { :value => 1 }, - { :value => 2 }, - ] - } - struct = Structure.from_hash(data) - expect(struct.data[0].value).to eq(1) - expect(struct.data[1].value).to eq(2) - end - - it 'can be converted to structures and back to data' do - data = { - :name => 'John', - :parents => { - :father => 'Jack', - :mother => 'Jane', - }, - :data => [ - { :value => 1 }, - { :value => 2 }, - ], - :empty => {} - } - expect(Structure.from_hash(data).to_hash).to eq(data) - end - - it 'does not convert hashes of string keys to structures' do - data = { - :attributes => { - 'color' => 'red', - 'size' => 'large', - }, - :tags => { - 'color' => { :value => 'red' }, - 'size' => { :value => 'large' }, - } - } - struct = Structure.from_hash(data) - expect(struct.attributes).to eq('color' => 'red', 'size' => 'large') - expect(struct.tags).to be_kind_of(Hash) - expect(struct.tags['color']).to be_kind_of(Structure) - expect(struct.tags['color'].value).to eq('red') - expect(struct.tags['size']).to be_kind_of(Structure) - expect(struct.tags['size'].value).to eq('large') - expect(struct.to_hash).to eq(data) - end - - end - describe '#to_hash' do it 'returns a hash' do - expect(Structure.new([:abc]).to_hash).to eq({}) + expect(Structure.new(:abc).new.to_hash).to eq({}) end it 'only serializes non-nil members' do - s = Structure.new([:abc, :mno]) - s.abc = 'abc' + s = Structure.new(:abc, :mno).new('abc') expect(s.to_hash).to eq(abc: 'abc') end it 'performs a deep to_hash' do - birthday = Structure.new([:day, :month, :year]) + birthday = Structure.new(:day, :month, :year).new birthday.day = 1 birthday.month = 2 birthday.year = 2000 aliases = %w(Doe Jon) - mom = Structure.new([:first_name, :last_name]) + mom = Structure.new(:first_name, :last_name).new mom.first_name = 'Jane' mom.last_name = 'Smith' - dad = Structure.new([:first_name, :last_name]) + dad = Structure.new(:first_name, :last_name).new dad.first_name = 'Jon' dad.last_name = 'Doe' - person = Structure.new([:name, :birthday, :empty, :aliases, :parents]) + person = Structure.new(:name, :birthday, :empty, :aliases, :parents).new person.name = 'John Doe' person.birthday = birthday person.aliases = aliases @@ -140,27 +61,5 @@ module Aws end end - - describe 'new' do - - it 'returns an empty constructed Struct' do - struct = Structure.new([:abc, :mno]) - expect(struct.abc).to be(nil) - expect(struct.mno).to be(nil) - end - - it 'returns the same struct class given the same properties' do - s1 = Structure.new([:abc, :mno]) - s2 = Structure.new([:abc, :mno]) - expect(s1.class).to be(s2.class) - end - - it 'returns a new struct class given different properties' do - s1 = Structure.new([:abc, :mno]) - s2 = Structure.new([:mno, :xyz]) - expect(s1.class).not_to be(s2.class) - end - - end end end diff --git a/aws-sdk-core/spec/aws/waiters_spec.rb b/aws-sdk-core/spec/aws/waiters_spec.rb index b253381de00..711bea157b9 100644 --- a/aws-sdk-core/spec/aws/waiters_spec.rb +++ b/aws-sdk-core/spec/aws/waiters_spec.rb @@ -73,7 +73,7 @@ module Waiters end it 'defaults new clients with an empty list of waiters' do - Aws.add_service(:WaiterTestSvc, api: Seahorse::Model::Api.new) + Aws.add_service(:WaiterTestSvc, api: {}) expect(Aws::WaiterTestSvc::Client.waiters.waiter_names).to eq([]) end From 65a5718a9da92671a3cfb661145187b3469cb11e Mon Sep 17 00:00:00 2001 From: Trevor Rowe Date: Fri, 8 May 2015 14:06:49 -0700 Subject: [PATCH 037/101] Better default pretty-print/inspect for responses. --- aws-sdk-core/lib/seahorse/client/response.rb | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/aws-sdk-core/lib/seahorse/client/response.rb b/aws-sdk-core/lib/seahorse/client/response.rb index 3729306678c..07c409fcbd8 100644 --- a/aws-sdk-core/lib/seahorse/client/response.rb +++ b/aws-sdk-core/lib/seahorse/client/response.rb @@ -59,11 +59,12 @@ def successful? # @api private def inspect - if @data - @data.respond_to?(:pretty_inspect) ? @data.pretty_inspect : super - else - super - end + @data.inspect + end + + # @api private + def pretty_print(q) + @data.pretty_print(q) end # @api private From ff4a34b7e1ffe8c3dc02675d5992e9385728b025 Mon Sep 17 00:00:00 2001 From: Trevor Rowe Date: Fri, 8 May 2015 14:08:45 -0700 Subject: [PATCH 038/101] Added a git ignore rule. --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 8b5e6c4b17f..acf464e28c6 100644 --- a/.gitignore +++ b/.gitignore @@ -8,6 +8,7 @@ /Gemfile.lock /vendor /release-notes.html +/TODO /developer_guide/output /developer_guide/tmp From 515e412f8861089dca20943da1bb711ad5199d7e Mon Sep 17 00:00:00 2001 From: Trevor Rowe Date: Mon, 11 May 2015 15:26:40 -0700 Subject: [PATCH 039/101] Significant API reference documentation update. The Client class operations and their input/output types are now documented using Ruby structure classes. This eliminates the deeply nested input & output tabs of the docs. Work is still required to translate these to the resource operations and to deal with documenting input structures as accepting hashes. --- aws-sdk-core/lib/aws-sdk-core.rb | 5 +- aws-sdk-core/lib/aws-sdk-core/api/builder.rb | 49 +++-- .../api/client_type_documenter.rb | 32 +++ .../lib/aws-sdk-core/api/doc_utils.rb | 43 ++++ .../aws-sdk-core/api/docstring_provider.rb | 64 ++++++ .../lib/aws-sdk-core/api/docstrings.rb | 39 ---- .../lib/aws-sdk-core/api/documenter.rb | 70 +++--- .../aws-sdk-core/api/operation_documenter.rb | 202 +++++------------- .../lib/aws-sdk-core/api/operation_example.rb | 3 +- .../lib/aws-sdk-core/api/shape_map.rb | 31 ++- aws-sdk-core/lib/aws-sdk-core/client.rb | 2 +- .../lib/aws-sdk-core/param_converter.rb | 1 + aws-sdk-core/lib/seahorse/model/shapes.rb | 9 +- .../spec/seahorse/model/shapes_spec.rb | 9 +- .../services/s3/encryption/client.rb | 4 +- doc-src/plugins/apis.rb | 2 +- doc-src/plugins/resources.rb | 5 +- tasks/docs.rake | 2 +- 18 files changed, 309 insertions(+), 263 deletions(-) create mode 100644 aws-sdk-core/lib/aws-sdk-core/api/client_type_documenter.rb create mode 100644 aws-sdk-core/lib/aws-sdk-core/api/doc_utils.rb create mode 100644 aws-sdk-core/lib/aws-sdk-core/api/docstring_provider.rb delete mode 100644 aws-sdk-core/lib/aws-sdk-core/api/docstrings.rb diff --git a/aws-sdk-core/lib/aws-sdk-core.rb b/aws-sdk-core/lib/aws-sdk-core.rb index 514ed77a140..1b50acafd0c 100644 --- a/aws-sdk-core/lib/aws-sdk-core.rb +++ b/aws-sdk-core/lib/aws-sdk-core.rb @@ -102,9 +102,12 @@ module Api autoload :Builder, 'aws-sdk-core/api/builder' autoload :Customizations, 'aws-sdk-core/api/customizations' autoload :Documenter, 'aws-sdk-core/api/documenter' - autoload :Docstrings, 'aws-sdk-core/api/docstrings' + autoload :DocstringProvider, 'aws-sdk-core/api/docstring_provider' + autoload :DocUtils, 'aws-sdk-core/api/doc_utils' + autoload :ClientTypeDocumenter, 'aws-sdk-core/api/client_type_documenter' autoload :Manifest, 'aws-sdk-core/api/manifest' autoload :ManifestBuilder, 'aws-sdk-core/api/manifest_builder' + autoload :NullDocstringProvider, 'aws-sdk-core/api/docstring_provider' autoload :OperationDocumenter, 'aws-sdk-core/api/operation_documenter' autoload :OperationExample, 'aws-sdk-core/api/operation_example' autoload :ShapeMap, 'aws-sdk-core/api/shape_map' diff --git a/aws-sdk-core/lib/aws-sdk-core/api/builder.rb b/aws-sdk-core/lib/aws-sdk-core/api/builder.rb index ba1377eea38..4af97f391ea 100644 --- a/aws-sdk-core/lib/aws-sdk-core/api/builder.rb +++ b/aws-sdk-core/lib/aws-sdk-core/api/builder.rb @@ -5,11 +5,11 @@ module Api class Builder class << self - def build(definition) + def build(definition, options = {}) if Seahorse::Model::Api === definition definition else - Builder.new.build(customize(load_definition(definition))) + Builder.new.build(customize(load_definition(definition)), options) end end @@ -33,29 +33,50 @@ def customize(definition) # @param [Hash] definition # @return [Seahorse::Model::Api] - def build(definition) - shapes = ShapeMap.new(definition['shapes'] || {}) + def build(definition, options = {}) + docs = build_docstring_provider(options) + api = build_api(definition) + shapes = build_shape_map(definition, api, docs) + build_operations(definition, api, shapes, docs) + api + end + + private + + def build_docstring_provider(options) + if options[:docs] && ENV['DOCSTRINGS'] + DocstringProvider.new(Json.load_file(options[:docs])) + else + NullDocstringProvider.new + end + end + + def build_api(definition) api = Seahorse::Model::Api.new - metadata = definition['metadata'] || {} - metadata['shapes'] = shapes - api.version = metadata['apiVersion'] - api.metadata = metadata + api.metadata = definition['metadata'] || {} + api.version = api.metadata['apiVersion'] + api + end + + def build_shape_map(definition, api, docs) + shapes = definition['shapes'] || {} + api.metadata['shapes'] = ShapeMap.new(shapes, docs: docs) + end + + def build_operations(definition, api, shapes, docs) (definition['operations'] || {}).each do |name, definition| - operation = build_operation(name, definition, shapes) + operation = build_operation(name, definition, shapes, docs) api.add_operation(underscore(name), operation) end - api end - private - - def build_operation(name, definition, shapes) + def build_operation(name, definition, shapes, docs) http = definition['http'] || {} op = Seahorse::Model::Operation.new op.name = name op.http_method = http['method'] op.http_request_uri = http['requestUri'] || '/' - op.documentation = definition['documentation'] + op.documentation = docs.operation_docs(name) op.deprecated = !!definition['deprecated'] op.input = shapes.shape_ref(definition['input']) op.output = shapes.shape_ref(definition['output']) diff --git a/aws-sdk-core/lib/aws-sdk-core/api/client_type_documenter.rb b/aws-sdk-core/lib/aws-sdk-core/api/client_type_documenter.rb new file mode 100644 index 00000000000..183620eb064 --- /dev/null +++ b/aws-sdk-core/lib/aws-sdk-core/api/client_type_documenter.rb @@ -0,0 +1,32 @@ +module Aws + module Api + class ClientTypeDocumenter + + include DocUtils + + # @param [Yard::CodeObjects::Base] namespace + def initialize(namespace) + @namespace = namespace + end + + # @param [Seahorse::Model::Shapes::StructureShape] shape + def document(shape) + yard_class = YARD::CodeObjects::ClassObject.new(@namespace, shape.name) + yard_class.superclass = 'Struct' + yard_class.docstring = shape.documentation + shape.members.each do |member_name, ref| + document_struct_member(yard_class, member_name, ref) + end + end + + def document_struct_member(yard_class, member_name, ref) + m = YARD::CodeObjects::MethodObject.new(yard_class, member_name) + m.scope = :instance + m.docstring = ref.documentation + m.add_tag(tag("@return [#{output_type(ref)}] #{ref.documentation}")) + yard_class.instance_attributes[member_name] = { :read => m, :write => m } + end + + end + end +end diff --git a/aws-sdk-core/lib/aws-sdk-core/api/doc_utils.rb b/aws-sdk-core/lib/aws-sdk-core/api/doc_utils.rb new file mode 100644 index 00000000000..4d0dbede290 --- /dev/null +++ b/aws-sdk-core/lib/aws-sdk-core/api/doc_utils.rb @@ -0,0 +1,43 @@ +module Aws + module Api + module DocUtils + + include Seahorse::Model + + def tag(string) + YARD::DocstringParser.new.parse(string).to_docstring.tags.first + end + + def input_type(ref) + case ref.shape + when Shapes::StructureShape then 'Client::' + ref.shape.name + when Shapes::ListShape then "Array<#{input_type(ref.shape.member)}>" + when Shapes::MapShape then "Hash" + when Shapes::BlobShape then 'String,IO' + when Shapes::BooleanShape then 'Boolean' + when Shapes::FloatShape then 'Float,Numeric' + when Shapes::IntegerShape then 'Integer,Numeric' + when Shapes::StringShape then 'String' + when Shapes::TimestampShape then 'Time,Date,DateTime,Integer' + else raise "unsupported shape #{ref.shape.class.name}" + end + end + + def output_type(ref) + case ref.shape + when Shapes::StructureShape then 'Client::' + ref.shape.name + when Shapes::ListShape then "Array<#{output_type(ref.shape.member)}>" + when Shapes::MapShape then "Hash" + when Shapes::BlobShape then ref.location == 'body' ? 'StringIO' : 'String' + when Shapes::BooleanShape then 'Boolean' + when Shapes::FloatShape then 'Float' + when Shapes::IntegerShape then 'Integer' + when Shapes::StringShape then 'String' + when Shapes::TimestampShape then 'Time' + else raise "unsupported shape #{ref.shape.class.name}" + end + end + + end + end +end diff --git a/aws-sdk-core/lib/aws-sdk-core/api/docstring_provider.rb b/aws-sdk-core/lib/aws-sdk-core/api/docstring_provider.rb new file mode 100644 index 00000000000..b0e27c588ab --- /dev/null +++ b/aws-sdk-core/lib/aws-sdk-core/api/docstring_provider.rb @@ -0,0 +1,64 @@ +module Aws + module Api + class DocstringProvider + + def initialize(docstrings) + @docstrings = docstrings + end + + # @param [String] operation_name + # @return [String,nil] + def operation_docs(operation_name) + clean(@docstrings['operations'][operation_name]) + end + + # @param [String] shape_name + # @return [String,nil] + def shape_docs(shape_name) + clean(shape(shape_name)['base']) + end + + # @param [String] shape_name + # @param [String] target + # @return [String,nil] + def shape_ref_docs(shape_name, target) + if ref_docs = shape(shape_name)['refs'][target] + clean(ref_docs) + else + shape_docs(shape_name) + end + end + + private + + def shape(name) + @docstrings['shapes'][name] || { 'base' => nil, 'refs' => {} } + end + + def clean(value) + if value.nil? + '' + else + value.gsub(/\{(\S+)\}/, '`{\1}`').strip + end + end + + end + + class NullDocstringProvider + + def operation_docs(operation_name) + nil + end + + def shape_docs(shape_name) + nil + end + + def shape_ref_docs(shape_name, target) + nil + end + + end + end +end diff --git a/aws-sdk-core/lib/aws-sdk-core/api/docstrings.rb b/aws-sdk-core/lib/aws-sdk-core/api/docstrings.rb deleted file mode 100644 index e30547e4541..00000000000 --- a/aws-sdk-core/lib/aws-sdk-core/api/docstrings.rb +++ /dev/null @@ -1,39 +0,0 @@ -module Aws - module Api - # @api private - # This module loads the API documentation for the given API. - module Docstrings - - def self.apply(client_class, path) - return - api = client_class.api.definition - docs = File.open(path, 'r', encoding: 'UTF-8') { |f| f.read } - docs = Json.load(docs) - - api['documentation'] = docs['service'] - - docs['operations'].each do |operation, doc| - api['operations'][operation]['documentation'] = doc - end - - docs['shapes'].each do |shape_name, shape| - api['shapes'][shape_name]['documentation'] = shape['base'] - shape['refs'].each do |ref,doc| - if doc.nil? - doc = shape['base'] - end - target_shape_name, member = ref.split('$') - target_shape = api['shapes'][target_shape_name] - case target_shape['type'] - when 'structure' then target_shape['members'][member]['documentation'] = doc - when 'list' then target_shape[member]['documentation'] = doc - when 'map' then target_shape[member]['documentation'] = doc - else raise 'not handled' - end - end - end - client_class.set_api(Seahorse::Model::Api.new(api)) - end - end - end -end diff --git a/aws-sdk-core/lib/aws-sdk-core/api/documenter.rb b/aws-sdk-core/lib/aws-sdk-core/api/documenter.rb index b77c67ee618..2cbb9e05023 100644 --- a/aws-sdk-core/lib/aws-sdk-core/api/documenter.rb +++ b/aws-sdk-core/lib/aws-sdk-core/api/documenter.rb @@ -4,11 +4,10 @@ module Aws module Api class Documenter - def initialize(svc_module, docs_path) + def initialize(svc_module) @svc_module = svc_module @svc_name = svc_module.name.split('::').last @client_class = svc_module.const_get(:Client) - Aws::Api::Docstrings.apply(@client_class, docs_path) @api = @client_class.api @full_name = @api.metadata['serviceFullName'] @error_names = @api.operations.map {|_,o| o.errors.map(&:shape).map(&:name) } @@ -70,11 +69,19 @@ def document_client yard_class = YARD::CodeObjects::ClassObject.new(@namespace, 'Client') yard_class.superclass = YARD::Registry['Seahorse::Client::Base'] yard_class.docstring = client_docstring + document_client_types(yard_class) document_client_constructor(yard_class) document_client_operations(yard_class) document_client_waiters(yard_class) end + def document_client_types(namespace) + documenter = ClientTypeDocumenter.new(namespace) + @api.metadata['shapes'].each_structure do |shape| + documenter.document(shape) + end + end + def client_docstring path = "doc-src/services/#{@svc_name}/client.md" path = 'doc-src/services/default/client.md' unless File.exists?(path) @@ -128,43 +135,34 @@ def document_client_operations(namespace) end def document_client_operation(namespace, method_name, operation) - m = YARD::CodeObjects::MethodObject.new(namespace, method_name) - m.group = 'Service Operations' - m.scope = :instance - m.parameters << ['params', '{}'] - m.docstring = operation_docstring(method_name, operation) + documenter = OperationDocumenter.new(namespace) + documenter.document(method_name, operation) end def operation_docstring(method_name, operation) - - documentor = OperationDocumenter.new( - svc_var_name: @svc_name.downcase, - method_name: method_name, - operation: operation) - - tabs = Tabulator.new.tap do |t| - t.tab(method_name, 'Formatting Example') do - "
#{documentor.example}
" - end - t.tab(method_name, 'Request Parameters') do - documentor.input - end - t.tab(method_name, 'Response Structure') do - documentor.output - end - end - - errors = (operation.errors || []).map { |ref| ref.shape.name } - errors = errors.map { |e| "@raise [Errors::#{e}]" }.join("\n") - - docstring = <<-DOCSTRING.strip -

Calls the #{operation.name} operation.

-#{documentor.api_ref(operation)} -#{tabs} -@param [Hash] params ({}) -@return [PageableResponse] -#{errors} - DOCSTRING +# tabs = Tabulator.new.tap do |t| +# t.tab(method_name, 'Formatting Example') do +# "

#{documentor.example}
" +# end +# t.tab(method_name, 'Request Parameters') do +# documentor.input +# end +# t.tab(method_name, 'Response Structure') do +# documentor.output +# end +# end +# +# errors = (operation.errors || []).map { |ref| ref.shape.name } +# errors = errors.map { |e| "@raise [Errors::#{e}]" }.join("\n") +# +# docstring = <<-DOCSTRING.strip +#

Calls the #{operation.name} operation.

+##{documentor.api_ref(operation)} +##{tabs} +#@param [Hash] params ({}) +#@return [PageableResponse] +##{errors} +# DOCSTRING end def document_client_waiters(yard_class) diff --git a/aws-sdk-core/lib/aws-sdk-core/api/operation_documenter.rb b/aws-sdk-core/lib/aws-sdk-core/api/operation_documenter.rb index f79bb61f122..57325ecec7d 100644 --- a/aws-sdk-core/lib/aws-sdk-core/api/operation_documenter.rb +++ b/aws-sdk-core/lib/aws-sdk-core/api/operation_documenter.rb @@ -2,172 +2,80 @@ module Aws module Api class OperationDocumenter - include Seahorse::Model::Shapes - - def initialize(options) - @operation = options[:operation] - @example = OperationExample.new(options) - end - - def input - params(nil) do - if @operation.input - lines = [] - if @operation.output - lines << '

:response_target => String, Pathname, File
Optional path to a file or file object where the HTTP response body should be written.
' - end - lines + structure(@operation.input, []) - else - [] - end - end.join - end - - def output - params(nil) do - if @operation.output - structure(@operation.output, []) - else - [] - end - end.join - end - - def example - @example - end - - def clean(docs) - docs = docs.gsub(//m, '') - docs = docs.gsub(/.+?<\/examples?>/m, '') - docs = docs.gsub(/<\/?note>/m, '') - docs = docs.gsub(/\{(\S+)\}/, '`{\1}`') - docs = docs.gsub(/\s+/, ' ').strip - docs - end - - def api_ref(ref) - if ref - doc = ref.documentation - docs ||= ref.shape.documentation if ref.respond_to?(:shape) - end - docs ||= '' - if docs && !docs.empty? - "
#{clean(docs)}
" + include Seahorse::Model + include DocUtils + + # @param [YARD::CodeObject::Base] namespace + def initialize(namespace) + @namespace = namespace + @optname = 'params' + end + + # @param [Symbol] method_name + # @param [Seahorse::Model::Opeation] operation + def document(method_name, operation) + m = YARD::CodeObjects::MethodObject.new(@namespace, method_name) + m.group = 'API Calls' + m.scope = :instance + m.parameters << [@optname, '{}'] + m.docstring = operation.documentation + tags(method_name, operation).each do |tag| + m.add_tag(tag) end end private - def params(ref, &block) - if ref && ref.shape.name == 'AttributeValue' - ['

An attribute value may be one of:

  • `Hash`
  • `Array`
  • `String`
  • `Numeric`
  • `true` | `false`
  • `nil`
  • `IO`
  • `Set`

'] - else - ['
', api_ref(ref)] + yield + ['
'] - end + def tags(method_name, operation) + tags = [] + tags += param_tags(method_name, operation) + tags += option_tags(method_name, operation) + tags += return_tags(method_name, operation) + tags += example_tags(method_name, operation) + tags += see_also_tags(method_name, operation) end - def param(ref, key_name, value_type, required, visited, &block) - lines = [] - lines << '
' - lines << entry(ref, key_name, value_type, required, visited) - - if visited.include?(ref) - lines << "AttributeValue, recursive" - else - visited = visited + [ref] - yield(lines) if block_given? - lines += nested_params(ref, visited) - end - - lines << '
' - lines + def param_tags(method_name, operation) + [] end - def nested_params(ref, visited) - if leaf?(ref) - nested(ref, visited) + def option_tags(method_name, operation) + if operation.input + operation.input.shape.members.map do |name, ref| + req = ref.required ? 'required,' : '' + type = input_type(ref) + tag("@option #{@optname} [#{req}#{type}] :#{name} #{ref.documentation}") + end else - params(ref) { nested(ref, visited) } - end - end - - def nested(ref, visited) - case ref.shape - when StructureShape then structure(ref, visited) - when MapShape then map(ref, visited) - when ListShape then list(ref, visited) - else [api_ref(ref)] - end - end - - def structure(ref, visited) - ref.shape.members.inject([]) do |lines, (member_name, member_ref)| - lines += param(member_ref, member_name, shape_type(member_ref), ref.shape.required.include?(member_name), visited) + [] end end - def map(ref, visited) - param(ref.shape.value, key_name(ref), value_type(ref), false, visited) + def return_tags(method_name, operation) + ref = operation.output ? output_type(operation.output) : 'EmptyStructure' + resp_type = '{Seahorse::Client::Response response}' + desc = "Returns a #{resp_type} object where the data is a {#{ref}}." + [tag("@return [#{ref}] #{desc}")] end - def list(ref, visited) - case ref.shape.member - when StructureShape then structure(ref.shape.member, visited) - when MapShape then map(ref.shape.member, visited) - when ListShape then raise NotImplementedError - else [api_ref(ref)] - end + def example_tags(method_name, operation) + [formatting_example(method_name, operation)] end - def entry(ref, key_name, value_type, required, visited) - classes = ['key'] - classes << 'required' if required - line = '
' - line << "#{key_name.inspect}" - line << " => #{value_type}" - line << '
' - line + def see_also_tags(method_name, operation) + [] end - def shape_type(ref) - case ref.shape - when StructureShape then 'Hash' - when MapShape then 'Hash' - when ListShape then "Array<#{value_type(ref)}>" - when StringShape then 'String' - when TimestampShape then 'Time' - when IntegerShape then 'Integer' - when FloatShape then 'Number' - when BooleanShape then 'Boolean' - when BlobShape then 'String,IO' - else raise "unhandled type #{ref.shape.type}" - end - end - - def key_type(ref) - shape_type(ref.shape.key) - end - - def value_type(ref) - case ref.shape - when ListShape then shape_type(ref.shape.member) - when MapShape then shape_type(ref.shape.value) - else raise 'stop' - end - end - - def key_name(ref) - ref.shape.key.shape.name - end - - def leaf?(ref) - case ref.shape - when StructureShape then false - when MapShape then false - when ListShape then leaf?(ref.shape.member) - else true - end + def formatting_example(method_name, operation) + example = OperationExample.new( + method_name: method_name, + operation: operation, + ) + parts = [] + parts << "@example Formatting example with placeholder values, " + parts << "demonstrates params structure.\n\n" + parts += example.to_s.lines.map { |line| " " + line } + tag(parts.join) end end diff --git a/aws-sdk-core/lib/aws-sdk-core/api/operation_example.rb b/aws-sdk-core/lib/aws-sdk-core/api/operation_example.rb index 1eec682c9f0..052631c6c86 100644 --- a/aws-sdk-core/lib/aws-sdk-core/api/operation_example.rb +++ b/aws-sdk-core/lib/aws-sdk-core/api/operation_example.rb @@ -5,7 +5,6 @@ class OperationExample include Seahorse::Model::Shapes def initialize(options) - @obj_name = options[:svc_var_name] @method_name = options[:method_name] @operation = options[:operation] @streaming_output = !!( @@ -16,7 +15,7 @@ def initialize(options) end def to_str - "resp = #{@obj_name}.#{@method_name}(#{params[1...-1]})" + "resp = client.#{@method_name}(#{params[1...-1]})" end alias to_s to_str alias inspect to_str diff --git a/aws-sdk-core/lib/aws-sdk-core/api/shape_map.rb b/aws-sdk-core/lib/aws-sdk-core/api/shape_map.rb index 8d9d23164fc..170155da615 100644 --- a/aws-sdk-core/lib/aws-sdk-core/api/shape_map.rb +++ b/aws-sdk-core/lib/aws-sdk-core/api/shape_map.rb @@ -21,8 +21,10 @@ class ShapeMap } # @param [Hash] shape_definitions - def initialize(shape_definitions) + # @option options [DocstringProvider] :docs (NullDocstringProvider) + def initialize(shape_definitions, options = {}) @shapes = {} + @docs = options[:docs] || NullDocstringProvider.new build_shapes(shape_definitions) end @@ -49,14 +51,16 @@ def shape_ref(definition, options = {}) location = meta.delete('location') location_name = meta.delete('locationName') location_name ||= options[:member_name] unless location == 'headers' + documentation = @docs.shape_ref_docs(shape.name, options[:target]) ShapeRef.new( shape: shape, location: location, location_name: location_name, + required: !!options[:required], deprecated: !!(meta.delete('deprecated') || shape[:deprecated]), - metadata: meta - ) + documentation: documentation, + metadata: meta) else nil end @@ -84,15 +88,24 @@ def apply_shape_refs(shape, traits) required = Set.new(traits.delete('required') || []) (traits.delete('members') || {}).each do |member_name, ref| name = underscore(member_name) - ref = shape_ref(ref, member_name: member_name) - shape.add_member(name, ref, required: required.include?(member_name)) + shape.add_member(name, shape_ref(ref, + member_name: member_name, + required: required.include?(member_name), + target: "#{shape.name}$#{member_name}", + )) end shape[:struct_class] = Structure.new(*shape.member_names) when ListShape - shape.member = shape_ref(traits.delete('member')) + shape.member = shape_ref( + traits.delete('member'), + target: "#{shape.name}$member") when MapShape - shape.key = shape_ref(traits.delete('key')) - shape.value = shape_ref(traits.delete('value')) + shape.key = shape_ref( + traits.delete('key'), + target: "#{shape.name}$key") + shape.value = shape_ref( + traits.delete('value'), + target: "#{shape.name}$value") end end @@ -100,7 +113,7 @@ def apply_shape_traits(shape, traits) shape.enum = Set.new(traits.delete('enum')) if traits.key?('enum') shape.min = traits.delete('min') if traits.key?('min') shape.max = traits.delete('max') if traits.key?('max') - shape.documentation = traits.delete('documentation') + shape.documentation = @docs.shape_docs(shape.name) if payload = traits.delete('payload') shape[:payload] = underscore(payload) shape[:payload_member] = shape.member(shape[:payload]) diff --git a/aws-sdk-core/lib/aws-sdk-core/client.rb b/aws-sdk-core/lib/aws-sdk-core/client.rb index 1e149b68393..019a4a5e185 100644 --- a/aws-sdk-core/lib/aws-sdk-core/client.rb +++ b/aws-sdk-core/lib/aws-sdk-core/client.rb @@ -30,7 +30,7 @@ class << self def define(svc_name, options) client_class = Class.new(self) client_class.identifier = svc_name.downcase.to_sym - client_class.set_api(Api::Builder.build(options[:api])) + client_class.set_api(Api::Builder.build(options[:api], options)) client_class.set_paginators(options[:paginators]) client_class.set_waiters(options[:waiters]) DEFAULT_PLUGINS.each do |plugin| diff --git a/aws-sdk-core/lib/aws-sdk-core/param_converter.rb b/aws-sdk-core/lib/aws-sdk-core/param_converter.rb index 8894f3d64e3..30037302c6e 100644 --- a/aws-sdk-core/lib/aws-sdk-core/param_converter.rb +++ b/aws-sdk-core/lib/aws-sdk-core/param_converter.rb @@ -181,6 +181,7 @@ def each_base_class(shape_class, &block) add(TimestampShape, Date) { |d| d.to_time } add(TimestampShape, DateTime) { |dt| dt.to_time } add(TimestampShape, Integer) { |i| Time.at(i) } + add(TimestampShape, Float) { |f| Time.at(f) } add(TimestampShape, String) do |str| begin Time.parse(str) diff --git a/aws-sdk-core/lib/seahorse/model/shapes.rb b/aws-sdk-core/lib/seahorse/model/shapes.rb index bcc66f0cc14..9da8f3bbc0b 100644 --- a/aws-sdk-core/lib/seahorse/model/shapes.rb +++ b/aws-sdk-core/lib/seahorse/model/shapes.rb @@ -8,6 +8,7 @@ class ShapeRef def initialize(options = {}) @metadata = {} + @required = false @deprecated = false options.each do |key, value| if key == :metadata @@ -29,6 +30,9 @@ def initialize(options = {}) # @return [String, nil] attr_accessor :location_name + # @return [Boolean] + attr_accessor :required + # @return [String, nil] attr_accessor :documentation @@ -155,10 +159,9 @@ def initialize(options = {}) # @param [Symbol] name # @param [ShapeRef] shape_ref - # @option options [Boolean] :required (false) - def add_member(name, shape_ref, options = {}) + def add_member(name, shape_ref) name = name.to_sym - @required << name if options[:required] + @required << name if shape_ref.required @members_by_location_name[shape_ref.location_name] = [name, shape_ref] @members[name] = shape_ref end diff --git a/aws-sdk-core/spec/seahorse/model/shapes_spec.rb b/aws-sdk-core/spec/seahorse/model/shapes_spec.rb index cbb141aea40..a3616817a86 100644 --- a/aws-sdk-core/spec/seahorse/model/shapes_spec.rb +++ b/aws-sdk-core/spec/seahorse/model/shapes_spec.rb @@ -83,7 +83,8 @@ module Shapes it 'allows members to be added' do shape = StructureShape.new expect(shape.member_names).to eq([]) - shape.add_member(:member_name, shape_ref, required: true) + shape_ref.required = true + shape.add_member(:member_name, shape_ref) expect(shape.member?(:member_name)).to be(true) expect(shape.member?('member_name')).to be(true) expect(shape.member_names).to eq([:member_name]) @@ -92,16 +93,18 @@ module Shapes end it 'provides a list of required members' do + shape_ref.required = true shape = StructureShape.new expect(shape.required).to be_kind_of(Set) expect(shape.required).to be_empty - shape.add_member(:member_name, shape_ref, required: true) + shape.add_member(:member_name, shape_ref) expect(shape.required).to include(:member_name) end it 'provides access to members by their location name' do + shape_ref.required = true shape = StructureShape.new - shape.add_member(:member_name, shape_ref, required: true) + shape.add_member(:member_name, shape_ref) expect(shape.member_by_location_name(shape_ref.location_name)).to eq([:member_name, shape_ref]) end diff --git a/aws-sdk-resources/lib/aws-sdk-resources/services/s3/encryption/client.rb b/aws-sdk-resources/lib/aws-sdk-resources/services/s3/encryption/client.rb index 71dcd03e5d5..6e66cf2f11d 100644 --- a/aws-sdk-resources/lib/aws-sdk-resources/services/s3/encryption/client.rb +++ b/aws-sdk-resources/lib/aws-sdk-resources/services/s3/encryption/client.rb @@ -159,7 +159,7 @@ class Client # * `:key_provider` # * `:encryption_key` # - # You may also pass any other options accepted by {S3::Client.new}. + # You may also pass any other options accepted by {S3::Client#initialize}. # # @option options [S3::Client] :client A basic S3 client that is used # to make api calls. If a `:client` is not provided, a new {S3::Client} @@ -175,7 +175,7 @@ class Client # @option options [Symbol] :envelope_location (:metadata) Where to # store the envelope encryption keys. By default, the envelope is # stored with the encrypted object. If you pass `:instruction_file`, - # then the envelope is stored in a seperate object in Amazon S3. + # then the envelope is stored in a separate object in Amazon S3. # # @option options [String] :instruction_file_suffix ('.instruction') # When `:envelope_location` is `:instruction_file` then the diff --git a/doc-src/plugins/apis.rb b/doc-src/plugins/apis.rb index b30cdac55ab..18c50bf76b0 100644 --- a/doc-src/plugins/apis.rb +++ b/doc-src/plugins/apis.rb @@ -11,6 +11,6 @@ YARD::Parser::SourceParser.after_parse_list do Aws.load_all_services Aws.service_added do |_, svc_module, options| - Aws::Api::Documenter.new(svc_module, options[:docs]).apply + Aws::Api::Documenter.new(svc_module).apply end end diff --git a/doc-src/plugins/resources.rb b/doc-src/plugins/resources.rb index 371831f9419..f6bc22432c6 100644 --- a/doc-src/plugins/resources.rb +++ b/doc-src/plugins/resources.rb @@ -43,9 +43,6 @@ class ResourceDocPlugin def apply Aws.service_added do |_, svc_module, files| if files[:resources] - # merges the .docs.json API docs onto the .api.json model - Aws::Api::Docstrings.apply(svc_module::Client, files[:docs]) - namespace = YARD::Registry[svc_module.name] svc_module.constants.each do |const| klass = svc_module.const_get(const) @@ -181,7 +178,7 @@ def document_data_attribute_getters(yard_class, resource_class) endpoint = resource_class.client_class.api.metadata['endpointPrefix'] version = resource_class.client_class.api.version - definition = Json.load_file("aws-sdk-core/apis/#{endpoint}/#{version}/resources-1.json") + definition = Aws::Json.load_file("aws-sdk-core/apis/#{endpoint}/#{version}/resources-1.json") definition = definition['resources'][resource_name] if shape_name = definition['shape'] diff --git a/tasks/docs.rake b/tasks/docs.rake index 9877c230b36..fdbcf5fa9d6 100644 --- a/tasks/docs.rake +++ b/tasks/docs.rake @@ -34,7 +34,7 @@ end desc 'Generate the API documentation.' task 'docs' => ['docs:clobber', 'docs:update_readme'] do env = {} - env['SOURCE'] = '1' + env['DOCSTRINGS'] = '1' env['SITEMAP_BASEURL'] = 'http://docs.aws.amazon.com/sdkforruby/api/' sh(env, 'bundle exec yard') end From 0f98210ae8dd97e34c7ae38fcfdb26a9433c455c Mon Sep 17 00:00:00 2001 From: Trevor Rowe Date: Mon, 11 May 2015 16:30:51 -0700 Subject: [PATCH 040/101] Cleaned up formatting of the operation examples. Moved the `# required` comment from the line before to the trailing end of the line for required parameters. --- .../lib/aws-sdk-core/api/operation_example.rb | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/aws-sdk-core/lib/aws-sdk-core/api/operation_example.rb b/aws-sdk-core/lib/aws-sdk-core/api/operation_example.rb index 052631c6c86..742e39cb7ad 100644 --- a/aws-sdk-core/lib/aws-sdk-core/api/operation_example.rb +++ b/aws-sdk-core/lib/aws-sdk-core/api/operation_example.rb @@ -34,10 +34,16 @@ def structure(ref, i, visited) end shape = ref.shape shape.members.each do |member_name, member_ref| - if shape.required.include?(member_name) - lines << "#{i} # required" + nested = "#{i} #{member_name}: #{member(member_ref, i + ' ', visited)}," + if member_ref.required + # add a required comment to the first line + nested = nested.lines + nested[0] = nested[0].match(/\n$/) ? + "#{nested[0].rstrip} # required\n" : + "#{nested[0]} # required" + nested = nested.join end - lines << "#{i} #{member_name}: #{member(member_ref, i + ' ', visited)}," + lines << nested end lines << "#{i}}" lines.join("\n") From 87e321a89d3e676c664d0ecd6dd09b70a2bee784 Mon Sep 17 00:00:00 2001 From: Trevor Rowe Date: Mon, 11 May 2015 16:34:31 -0700 Subject: [PATCH 041/101] Fixed format for enumeration values in formatting example. Instead of giving a large pipe-delimited string, it now uses the first value with a comment showing the full list of accepted values. --- .../lib/aws-sdk-core/api/operation_example.rb | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/aws-sdk-core/lib/aws-sdk-core/api/operation_example.rb b/aws-sdk-core/lib/aws-sdk-core/api/operation_example.rb index 742e39cb7ad..4e7ac2bcd48 100644 --- a/aws-sdk-core/lib/aws-sdk-core/api/operation_example.rb +++ b/aws-sdk-core/lib/aws-sdk-core/api/operation_example.rb @@ -38,9 +38,13 @@ def structure(ref, i, visited) if member_ref.required # add a required comment to the first line nested = nested.lines - nested[0] = nested[0].match(/\n$/) ? - "#{nested[0].rstrip} # required\n" : - "#{nested[0]} # required" + if nested[0].match(/\n$/) + nested[0] = "#{nested[0].rstrip} # required\n" + elsif nested[0].match(/# one of/) + nested[0] = nested[0].sub('# one of', '# required, one of') + else + nested[0] = "#{nested[0]} # required" + end nested = nested.join end lines << nested @@ -112,8 +116,9 @@ def value(ref) end def string_value(ref) - if ref.shape.enum - ref.shape.enum.to_a.join('|').inspect + if enum = ref.shape.enum + #ref.shape.enum.to_a.join('|').inspect + "#{enum.first.inspect}, # one of #{enum.to_a.join(', ')}" else shape_name(ref) end From 69d98d3d8fc81f81a776fb4801bff4c46d11cefe Mon Sep 17 00:00:00 2001 From: Trevor Rowe Date: Mon, 11 May 2015 16:44:28 -0700 Subject: [PATCH 042/101] Shortened doc class name. --- aws-sdk-core/lib/aws-sdk-core/api/doc_utils.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/aws-sdk-core/lib/aws-sdk-core/api/doc_utils.rb b/aws-sdk-core/lib/aws-sdk-core/api/doc_utils.rb index 4d0dbede290..5b8f824421f 100644 --- a/aws-sdk-core/lib/aws-sdk-core/api/doc_utils.rb +++ b/aws-sdk-core/lib/aws-sdk-core/api/doc_utils.rb @@ -10,7 +10,7 @@ def tag(string) def input_type(ref) case ref.shape - when Shapes::StructureShape then 'Client::' + ref.shape.name + when Shapes::StructureShape then ref.shape.name when Shapes::ListShape then "Array<#{input_type(ref.shape.member)}>" when Shapes::MapShape then "Hash" when Shapes::BlobShape then 'String,IO' @@ -25,7 +25,7 @@ def input_type(ref) def output_type(ref) case ref.shape - when Shapes::StructureShape then 'Client::' + ref.shape.name + when Shapes::StructureShape then ref.shape.name when Shapes::ListShape then "Array<#{output_type(ref.shape.member)}>" when Shapes::MapShape then "Hash" when Shapes::BlobShape then ref.location == 'body' ? 'StringIO' : 'String' From ee23b9691a56ba40fa03a23802b2465fcfe7a5a9 Mon Sep 17 00:00:00 2001 From: Trevor Rowe Date: Tue, 12 May 2015 09:06:07 -0700 Subject: [PATCH 043/101] Removed an un-used class. --- .../lib/aws-sdk-core/signers/handler.rb | 18 ------------------ 1 file changed, 18 deletions(-) delete mode 100644 aws-sdk-core/lib/aws-sdk-core/signers/handler.rb diff --git a/aws-sdk-core/lib/aws-sdk-core/signers/handler.rb b/aws-sdk-core/lib/aws-sdk-core/signers/handler.rb deleted file mode 100644 index cddaf261d75..00000000000 --- a/aws-sdk-core/lib/aws-sdk-core/signers/handler.rb +++ /dev/null @@ -1,18 +0,0 @@ -module Aws - module Signers - class Handler - - def initialize(signer) - @signer = signer - end - - attr_accessor :handler - - def call(context) - @signer.sign(context) - @handler.call(context) - end - - end - end -end From 9302c46592629c5d129d553e1778f652f4a5d7a7 Mon Sep 17 00:00:00 2001 From: Trevor Rowe Date: Tue, 12 May 2015 12:45:43 -0700 Subject: [PATCH 044/101] Resolved a race-condition in the credential classes. Credential classes with refreshable credentials, such as `Aws::InstanceProfileCredentials` and `Aws::AssumeRoleCredentials` could return credential values such as `#access_key_id` and then refresh before the paired `#secret_access_key` was returned. This commit changes the primary interface for all credential providers to have a single `#credentials` method that returns the tuple of credentials in a single instance of `Aws::Credentials`. The request signers now use this new method. The following methods will be deprecated in 2.1.0 and eventually removed in 2.2.0. They are implementation details and not public methods. Until their removal, they will generate deprecation warnings. * `#access_key_id` * `#secret_access_key` * `#session_token` --- aws-sdk-core/lib/aws-sdk-core.rb | 2 + .../aws-sdk-core/assume_role_credentials.rb | 16 +++-- .../lib/aws-sdk-core/credential_provider.rb | 44 ++++++++++++ .../aws-sdk-core/credential_provider_chain.rb | 5 +- aws-sdk-core/lib/aws-sdk-core/credentials.rb | 5 ++ aws-sdk-core/lib/aws-sdk-core/deprecations.rb | 69 +++++++++++++++++++ .../instance_profile_credentials.rb | 19 +++-- .../aws-sdk-core/refreshing_credentials.rb | 18 +---- .../lib/aws-sdk-core/shared_credentials.rb | 17 +++-- aws-sdk-core/lib/aws-sdk-core/signers/base.rb | 2 +- aws-sdk-core/lib/aws-sdk-core/signers/s3.rb | 4 +- aws-sdk-core/lib/aws-sdk-core/signers/v4.rb | 2 +- .../spec/aws/assume_role_credentials_spec.rb | 37 +++++++--- .../aws/credential_provider_chain_spec.rb | 6 +- .../aws/instance_profile_credentials_spec.rb | 44 ++++++++---- .../spec/aws/shared_credentials_spec.rb | 20 +++++- 16 files changed, 235 insertions(+), 75 deletions(-) create mode 100644 aws-sdk-core/lib/aws-sdk-core/credential_provider.rb create mode 100644 aws-sdk-core/lib/aws-sdk-core/deprecations.rb diff --git a/aws-sdk-core/lib/aws-sdk-core.rb b/aws-sdk-core/lib/aws-sdk-core.rb index 1b50acafd0c..f2505d3ebba 100644 --- a/aws-sdk-core/lib/aws-sdk-core.rb +++ b/aws-sdk-core/lib/aws-sdk-core.rb @@ -79,8 +79,10 @@ module Aws autoload :ClientPaging, 'aws-sdk-core/client_paging' autoload :ClientStubs, 'aws-sdk-core/client_stubs' autoload :ClientWaiters, 'aws-sdk-core/client_waiters' + autoload :CredentialProvider, 'aws-sdk-core/credential_provider' autoload :CredentialProviderChain, 'aws-sdk-core/credential_provider_chain' autoload :Credentials, 'aws-sdk-core/credentials' + autoload :Deprecations, 'aws-sdk-core/deprecations' autoload :EmptyStructure, 'aws-sdk-core/empty_structure' autoload :EndpointProvider, 'aws-sdk-core/endpoint_provider' autoload :Errors, 'aws-sdk-core/errors' diff --git a/aws-sdk-core/lib/aws-sdk-core/assume_role_credentials.rb b/aws-sdk-core/lib/aws-sdk-core/assume_role_credentials.rb index a3b0114c57b..63be7719a43 100644 --- a/aws-sdk-core/lib/aws-sdk-core/assume_role_credentials.rb +++ b/aws-sdk-core/lib/aws-sdk-core/assume_role_credentials.rb @@ -13,8 +13,9 @@ module Aws # # If you omit `:client` option, a new {STS::Client} object will be # constructed. - class AssumeRoleCredentials < Credentials + class AssumeRoleCredentials + include CredentialProvider include RefreshingCredentials # @option options [required, String] :role_arn @@ -35,12 +36,13 @@ def initialize(options = {}) private def refresh - creds = @client.assume_role(@options).credentials - @access_key_id = creds.access_key_id - @secret_access_key = creds.secret_access_key - @session_token = creds.session_token - @expiration = creds.expiration - creds + c = @client.assume_role(@options).credentials + @credentials = Credentials.new( + c.access_key_id, + c.secret_access_key, + c.session_token + ) + @expiration = c.expiration end end diff --git a/aws-sdk-core/lib/aws-sdk-core/credential_provider.rb b/aws-sdk-core/lib/aws-sdk-core/credential_provider.rb new file mode 100644 index 00000000000..2edfc51b002 --- /dev/null +++ b/aws-sdk-core/lib/aws-sdk-core/credential_provider.rb @@ -0,0 +1,44 @@ +module Aws + module CredentialProvider + + extend Deprecations + + # @return [Credentials] + def credentials + @credentials + end + + # @return [Boolean] + def set? + !!@credentials && @credentials.set? + end + + # @deprecated Deprecated in 2.1.0. This method is subject to errors + # from a race condition when called against refreshable credential + # objects. Will be removed in 2.2.0. + # @see #credentials + def access_key_id + @credentials ? @credentials.access_key_id : nil + end + deprecated(:access_key_id, use: '#credentials') + + # @deprecated Deprecated in 2.1.0. This method is subject to errors + # from a race condition when called against refreshable credential + # objects. Will be removed in 2.2.0. + # @see #credentials + def secret_access_key + @credentials ? @credentials.secret_access_key : nil + end + deprecated(:secret_access_key, use: '#credentials') + + # @deprecated Deprecated in 2.1.0. This method is subject to errors + # from a race condition when called against refreshable credential + # objects. Will be removed in 2.2.0. + # @see #credentials + def session_token + @credentials ? @credentials.session_token : nil + end + deprecated(:session_token, use: '#credentials') + + end +end diff --git a/aws-sdk-core/lib/aws-sdk-core/credential_provider_chain.rb b/aws-sdk-core/lib/aws-sdk-core/credential_provider_chain.rb index c43adc67c69..a2bfb278449 100644 --- a/aws-sdk-core/lib/aws-sdk-core/credential_provider_chain.rb +++ b/aws-sdk-core/lib/aws-sdk-core/credential_provider_chain.rb @@ -6,10 +6,11 @@ def initialize(config) @config = config end + # @return [CredentialProvider, nil] def resolve providers.each do |method_name, options| - credentials = send(method_name, options.merge(config: @config)) - return credentials if credentials && credentials.set? + provider = send(method_name, options.merge(config: @config)) + return provider if provider && provider.set? end nil end diff --git a/aws-sdk-core/lib/aws-sdk-core/credentials.rb b/aws-sdk-core/lib/aws-sdk-core/credentials.rb index fb4493629fd..f6881ea3366 100644 --- a/aws-sdk-core/lib/aws-sdk-core/credentials.rb +++ b/aws-sdk-core/lib/aws-sdk-core/credentials.rb @@ -19,6 +19,11 @@ def initialize(access_key_id, secret_access_key, session_token = nil) # @return [String, nil] attr_reader :session_token + # @return [Credentials] + def credentials + self + end + # @return [Boolean] Returns `true` if the access key id and secret # access key are both set. def set? diff --git a/aws-sdk-core/lib/aws-sdk-core/deprecations.rb b/aws-sdk-core/lib/aws-sdk-core/deprecations.rb new file mode 100644 index 00000000000..06b8076d721 --- /dev/null +++ b/aws-sdk-core/lib/aws-sdk-core/deprecations.rb @@ -0,0 +1,69 @@ +module Aws + + # A utility module that provides a class method that wraps + # a method such that it generates a deprecation warning when called. + # Given the following class: + # + # class Example + # + # def do_something + # end + # + # end + # + # If you want to deprecate the `#do_something` method, you can extend + # this module and then call `deprecated` on the method (after it + # has been defined). + # + # class Example + # + # extend Aws::Deprecations + # + # def do_something + # end + # + # def do_something_else + # end + # + # deprecated :do_something + # + # end + # + # The `#do_something` method will continue to function, but will + # generate a deprecation warning when called. + # + # @api private + module Deprecations + + # @param [Symbol] method_name The name of the deprecated method. + # + # @option options [String] :message The warning message to issue + # when the deprecated method is called. + # + # @option options [Symbol] :use The name of an use + # method that should be used. + # + def deprecated(method_name, options = {}) + + deprecation_msg = options[:message] || begin + msg = "DEPRECATION WARNING: called deprecated method `#{method_name}' " + msg << "of an #{self}" + msg << ", use #{options[:use]} instead" if options[:use] + msg + end + + alias_method(:"deprecated_#{method_name}", method_name) + + warned = false # we only want to issue this warning once + + define_method(method_name) do |*args,&block| + unless warned + warned = true + warn(deprecation_msg + "\n" + caller.join("\n")) + end + send("deprecated_#{method_name}", *args, &block) + end + end + + end +end diff --git a/aws-sdk-core/lib/aws-sdk-core/instance_profile_credentials.rb b/aws-sdk-core/lib/aws-sdk-core/instance_profile_credentials.rb index 9ec326ab51a..d94dc54a23d 100644 --- a/aws-sdk-core/lib/aws-sdk-core/instance_profile_credentials.rb +++ b/aws-sdk-core/lib/aws-sdk-core/instance_profile_credentials.rb @@ -2,8 +2,9 @@ require 'net/http' module Aws - class InstanceProfileCredentials < Credentials + class InstanceProfileCredentials + include CredentialProvider include RefreshingCredentials # @api private @@ -64,15 +65,13 @@ def backoff(backoff) end def refresh - credentials = Json.load(get_credentials) - @access_key_id = credentials['AccessKeyId'] - @secret_access_key = credentials['SecretAccessKey'] - @session_token = credentials['Token'] - if expires = credentials['Expiration'] - @expiration = Time.parse(expires) - else - @expiration = nil - end + c = Json.load(get_credentials) + @credentials = Credentials.new( + c['AccessKeyId'], + c['SecretAccessKey'], + c['Token'] + ) + @expiration = c['Expiration'] ? Time.parse(c['Expiration']) : nil end def get_credentials diff --git a/aws-sdk-core/lib/aws-sdk-core/refreshing_credentials.rb b/aws-sdk-core/lib/aws-sdk-core/refreshing_credentials.rb index cf0b95f85e9..9f10b07f0d6 100644 --- a/aws-sdk-core/lib/aws-sdk-core/refreshing_credentials.rb +++ b/aws-sdk-core/lib/aws-sdk-core/refreshing_credentials.rb @@ -20,22 +20,10 @@ def initialize(options = {}) refresh end - # @return [String,nil] - def access_key_id + # @return [Credentials] + def credentials refresh_if_near_expiration - @access_key_id - end - - # @return [String,nil] - def secret_access_key - refresh_if_near_expiration - @secret_access_key - end - - # @return [String,nil] - def session_token - refresh_if_near_expiration - @session_token + @credentials end # @return [Time,nil] diff --git a/aws-sdk-core/lib/aws-sdk-core/shared_credentials.rb b/aws-sdk-core/lib/aws-sdk-core/shared_credentials.rb index 1f6288175d9..d8946853a7a 100644 --- a/aws-sdk-core/lib/aws-sdk-core/shared_credentials.rb +++ b/aws-sdk-core/lib/aws-sdk-core/shared_credentials.rb @@ -1,5 +1,7 @@ module Aws - class SharedCredentials < Credentials + class SharedCredentials + + include CredentialProvider # @api private KEY_MAP = { @@ -33,6 +35,9 @@ def initialize(options = {}) # @return [String] attr_reader :profile_name + # @return [Credentials] + attr_reader :credentials + # @api private def inspect parts = [ @@ -62,11 +67,11 @@ def default_path def load_from_path profile = load_profile - KEY_MAP.each do |source, target| - if profile.key?(source) - instance_variable_set("@#{target}", profile[source]) - end - end + @credentials = Credentials.new( + profile['aws_access_key_id'], + profile['aws_secret_access_key'], + profile['aws_session_token'] + ) end def load_profile diff --git a/aws-sdk-core/lib/aws-sdk-core/signers/base.rb b/aws-sdk-core/lib/aws-sdk-core/signers/base.rb index 2eeb751d0bf..da5a6279b91 100644 --- a/aws-sdk-core/lib/aws-sdk-core/signers/base.rb +++ b/aws-sdk-core/lib/aws-sdk-core/signers/base.rb @@ -6,7 +6,7 @@ class Base # @param [Credentials] credentials def initialize(credentials) - @credentials = credentials + @credentials = credentials.credentials end private diff --git a/aws-sdk-core/lib/aws-sdk-core/signers/s3.rb b/aws-sdk-core/lib/aws-sdk-core/signers/s3.rb index a11ebf7fdb9..62f073e7a5d 100644 --- a/aws-sdk-core/lib/aws-sdk-core/signers/s3.rb +++ b/aws-sdk-core/lib/aws-sdk-core/signers/s3.rb @@ -27,9 +27,9 @@ def self.sign(context) ).sign(context.http_request) end - # @param [Credentials] credentials + # @param [CredentialProvider] credentials def initialize(credentials, params, force_path_style) - @credentials = credentials + @credentials = credentials.credentials @params = Query::ParamList.new params.each_pair do |param_name, param_value| @params.set(param_name, param_value) diff --git a/aws-sdk-core/lib/aws-sdk-core/signers/v4.rb b/aws-sdk-core/lib/aws-sdk-core/signers/v4.rb index 0da88043438..6c7cb820ea8 100644 --- a/aws-sdk-core/lib/aws-sdk-core/signers/v4.rb +++ b/aws-sdk-core/lib/aws-sdk-core/signers/v4.rb @@ -21,7 +21,7 @@ def self.sign(context) # will be made to. def initialize(credentials, service_name, region) @service_name = service_name - @credentials = credentials + @credentials = credentials.credentials @region = region end diff --git a/aws-sdk-core/spec/aws/assume_role_credentials_spec.rb b/aws-sdk-core/spec/aws/assume_role_credentials_spec.rb index 40bfc440c7b..e13a22dcb42 100644 --- a/aws-sdk-core/spec/aws/assume_role_credentials_spec.rb +++ b/aws-sdk-core/spec/aws/assume_role_credentials_spec.rb @@ -66,25 +66,42 @@ module Aws end it 'extracts credentials from the assume role response' do - creds = AssumeRoleCredentials.new( + c = AssumeRoleCredentials.new( role_arn: 'arn', role_session_name: 'session') - expect(creds).to be_set - expect(creds.access_key_id).to eq('akid') - expect(creds.secret_access_key).to eq('secret') - expect(creds.session_token).to eq('session') - expect(creds.expiration).to eq(in_one_hour) + expect(c).to be_set + expect(c.credentials.access_key_id).to eq('akid') + expect(c.credentials.secret_access_key).to eq('secret') + expect(c.credentials.session_token).to eq('session') + expect(c.expiration).to eq(in_one_hour) end it 'refreshes credentials automatically when they are near expiration' do allow(credentials).to receive(:expiration).and_return(Time.now) expect(client).to receive(:assume_role).exactly(4).times - creds = AssumeRoleCredentials.new( + c = AssumeRoleCredentials.new( role_arn: 'arn', role_session_name: 'session') - creds.access_key_id - creds.access_key_id - creds.access_key_id + c.credentials + c.credentials + c.credentials + end + + it 'generates deprecation warnings for credential accessors' do + c = AssumeRoleCredentials.new( + role_arn: 'arn', + role_session_name: 'session') + + expect(c).to receive(:warn).exactly(3).times + + c.access_key_id + c.secret_access_key + c.session_token + + # warnings are not duplicated + c.access_key_id + c.secret_access_key + c.session_token end end diff --git a/aws-sdk-core/spec/aws/credential_provider_chain_spec.rb b/aws-sdk-core/spec/aws/credential_provider_chain_spec.rb index 3b8f58d29aa..6dc7f4585ba 100644 --- a/aws-sdk-core/spec/aws/credential_provider_chain_spec.rb +++ b/aws-sdk-core/spec/aws/credential_provider_chain_spec.rb @@ -85,9 +85,9 @@ module Aws expect(File).to receive(:read).with(path).and_return(File.read(mock_path)) expect(credentials).to be_kind_of(SharedCredentials) expect(credentials.set?).to be(true) - expect(credentials.access_key_id).to eq('ACCESS_KEY_0') - expect(credentials.secret_access_key).to eq('SECRET_KEY_0') - expect(credentials.session_token).to eq('TOKEN_0') + expect(credentials.credentials.access_key_id).to eq('ACCESS_KEY_0') + expect(credentials.credentials.secret_access_key).to eq('SECRET_KEY_0') + expect(credentials.credentials.session_token).to eq('TOKEN_0') end it 'hydrates credentials from the instance profile service' do diff --git a/aws-sdk-core/spec/aws/instance_profile_credentials_spec.rb b/aws-sdk-core/spec/aws/instance_profile_credentials_spec.rb index de81e217fc4..07dd3f81591 100644 --- a/aws-sdk-core/spec/aws/instance_profile_credentials_spec.rb +++ b/aws-sdk-core/spec/aws/instance_profile_credentials_spec.rb @@ -60,18 +60,18 @@ module Aws it 'populates credentials from the instance profile' do c = InstanceProfileCredentials.new(backoff:0) - expect(c.access_key_id).to eq('akid') - expect(c.secret_access_key).to eq('secret') - expect(c.session_token).to eq('session-token') + expect(c.credentials.access_key_id).to eq('akid') + expect(c.credentials.secret_access_key).to eq('secret') + expect(c.credentials.session_token).to eq('session-token') expect(c.expiration.to_s).to eq(expiration.to_s) end it 're-queries the metadata service when #refresh! is called' do c = InstanceProfileCredentials.new c.refresh! - expect(c.access_key_id).to eq('akid-2') - expect(c.secret_access_key).to eq('secret-2') - expect(c.session_token).to eq('session-token-2') + expect(c.credentials.access_key_id).to eq('akid-2') + expect(c.credentials.secret_access_key).to eq('secret-2') + expect(c.credentials.session_token).to eq('session-token-2') expect(c.expiration.to_s).to eq(expiration2.to_s) end @@ -82,12 +82,26 @@ module Aws stub_request(:get, "http://169.254.169.254#{path}profile-name"). to_return(:status => 200, :body => resp2) c = InstanceProfileCredentials.new(backoff:0) - expect(c.access_key_id).to eq('akid-2') - expect(c.secret_access_key).to eq('secret-2') - expect(c.session_token).to eq('session-token-2') + expect(c.credentials.access_key_id).to eq('akid-2') + expect(c.credentials.secret_access_key).to eq('secret-2') + expect(c.credentials.session_token).to eq('session-token-2') expect(c.expiration.to_s).to eq(expiration2.to_s) end + it 'generates deprecation warnings for credential accessors' do + c = InstanceProfileCredentials.new(backoff:0) + expect(c).to receive(:warn).exactly(3).times + + c.access_key_id + c.secret_access_key + c.session_token + + # warnings are not duplicated + c.access_key_id + c.secret_access_key + c.session_token + end + describe 'auto refreshing' do # expire in 4 minutes @@ -95,9 +109,9 @@ module Aws it 'auto-refreshes within 5 minutes from expiration' do c = InstanceProfileCredentials.new - expect(c.access_key_id).to eq('akid-2') - expect(c.secret_access_key).to eq('secret-2') - expect(c.session_token).to eq('session-token-2') + expect(c.credentials.access_key_id).to eq('akid-2') + expect(c.credentials.secret_access_key).to eq('secret-2') + expect(c.credentials.session_token).to eq('session-token-2') expect(c.expiration.to_s).to eq(expiration2.to_s) end @@ -114,9 +128,9 @@ module Aws to_return(:status => 200, :body => resp) c = InstanceProfileCredentials.new expect(c.set?).to be(false) - expect(c.access_key_id).to be(nil) - expect(c.secret_access_key).to be(nil) - expect(c.session_token).to be(nil) + expect(c.credentials.access_key_id).to be(nil) + expect(c.credentials.secret_access_key).to be(nil) + expect(c.credentials.session_token).to be(nil) expect(c.expiration).to be(nil) end diff --git a/aws-sdk-core/spec/aws/shared_credentials_spec.rb b/aws-sdk-core/spec/aws/shared_credentials_spec.rb index c20cced62d7..a985d3e1f0f 100644 --- a/aws-sdk-core/spec/aws/shared_credentials_spec.rb +++ b/aws-sdk-core/spec/aws/shared_credentials_spec.rb @@ -20,7 +20,7 @@ module Aws end it 'reads the correct default credentials from a credentials file' do - creds = SharedCredentials.new(path:mock_credential_file) + creds = SharedCredentials.new(path:mock_credential_file).credentials expect(creds.access_key_id).to eq('ACCESS_KEY_0') expect(creds.secret_access_key).to eq('SECRET_KEY_0') expect(creds.session_token).to eq('TOKEN_0') @@ -28,7 +28,7 @@ module Aws it 'supports fetching profiles from ENV' do stub_const('ENV', { 'AWS_PROFILE' => 'barprofile' }) - creds = SharedCredentials.new(path:mock_credential_file) + creds = SharedCredentials.new(path:mock_credential_file).credentials expect(creds.access_key_id).to eq('ACCESS_KEY_2') expect(creds.secret_access_key).to eq('SECRET_KEY_2') expect(creds.session_token).to eq('TOKEN_2') @@ -38,7 +38,7 @@ module Aws stub_const('ENV', { 'AWS_PROFILE' => 'barporfile' }) creds = SharedCredentials.new( path: mock_credential_file, - profile_name: 'fooprofile') + profile_name: 'fooprofile').credentials expect(creds.access_key_id).to eq('ACCESS_KEY_1') expect(creds.secret_access_key).to eq('SECRET_KEY_1') expect(creds.session_token).to eq('TOKEN_1') @@ -64,5 +64,19 @@ module Aws expect(creds.set?).to eq(false) end + it 'generates deprecation warnings for credential accessors' do + c = SharedCredentials.new(path:mock_credential_file) + expect(c).to receive(:warn).exactly(3).times + + c.access_key_id + c.secret_access_key + c.session_token + + # warnings are not duplicated + c.access_key_id + c.secret_access_key + c.session_token + end + end end From 6e3e2df95ece7d1e0391ab8e8fd69d57d9ae94b0 Mon Sep 17 00:00:00 2001 From: Trevor Rowe Date: Wed, 13 May 2015 12:37:22 -0700 Subject: [PATCH 045/101] Removed duplicate dynamodb plugins, also in customizations. --- aws-sdk-core/lib/aws-sdk-core/dynamodb.rb | 6 ------ 1 file changed, 6 deletions(-) diff --git a/aws-sdk-core/lib/aws-sdk-core/dynamodb.rb b/aws-sdk-core/lib/aws-sdk-core/dynamodb.rb index 8f261027afb..6a966cd9582 100644 --- a/aws-sdk-core/lib/aws-sdk-core/dynamodb.rb +++ b/aws-sdk-core/lib/aws-sdk-core/dynamodb.rb @@ -9,11 +9,5 @@ module Aws module DynamoDB autoload :AttributeValue, 'aws-sdk-core/dynamodb/attribute_value' - - class Client - add_plugin(Aws::Plugins::DynamoDBExtendedRetries) - add_plugin(Aws::Plugins::DynamoDBSimpleAttributes) - add_plugin(Aws::Plugins::DynamoDBCRC32Validation) - end end end From d19aebeb4b55f3dfc9da182a63d1b7958b8f8001 Mon Sep 17 00:00:00 2001 From: Trevor Rowe Date: Wed, 13 May 2015 15:41:10 -0700 Subject: [PATCH 046/101] Refactored and simplified response paging. Previously, every single response returned became an instance of `Aws::PageableResponse`. This caused confusion when the response was not actually pageable. Instead now, the SDK will only decorate responses with a pageable response mixin and will only do so when the response might actually be pageable. This also provides instant feedback when you attempt to enumerate a response that can never be paged. --- aws-sdk-core/lib/aws-sdk-core.rb | 24 ++++--- aws-sdk-core/lib/aws-sdk-core/client.rb | 3 +- .../lib/aws-sdk-core/client_paging.rb | 31 -------- .../lib/aws-sdk-core/pageable_response.rb | 21 +++--- .../lib/aws-sdk-core/paging/null_pager.rb | 20 ------ .../lib/aws-sdk-core/paging/null_provider.rb | 13 ---- aws-sdk-core/lib/aws-sdk-core/paging/pager.rb | 70 ------------------- .../lib/aws-sdk-core/paging/provider.rb | 22 ------ .../aws-sdk-core/plugins/response_paging.rb | 31 +++++--- aws-sdk-core/lib/seahorse/model/operation.rb | 9 +++ .../spec/aws/cloud_front/client_spec.rb | 4 +- .../spec/aws/pageable_response_spec.rb | 49 ++++--------- .../spec/aws/paging/null_provider_spec.rb | 16 ----- .../lib/aws-sdk-resources/definition.rb | 8 ++- 14 files changed, 74 insertions(+), 247 deletions(-) delete mode 100644 aws-sdk-core/lib/aws-sdk-core/client_paging.rb delete mode 100644 aws-sdk-core/lib/aws-sdk-core/paging/null_pager.rb delete mode 100644 aws-sdk-core/lib/aws-sdk-core/paging/null_provider.rb delete mode 100644 aws-sdk-core/lib/aws-sdk-core/paging/pager.rb delete mode 100644 aws-sdk-core/lib/aws-sdk-core/paging/provider.rb delete mode 100644 aws-sdk-core/spec/aws/paging/null_provider_spec.rb diff --git a/aws-sdk-core/lib/aws-sdk-core.rb b/aws-sdk-core/lib/aws-sdk-core.rb index f2505d3ebba..18f6e70629d 100644 --- a/aws-sdk-core/lib/aws-sdk-core.rb +++ b/aws-sdk-core/lib/aws-sdk-core.rb @@ -76,7 +76,6 @@ module Aws autoload :AssumeRoleCredentials, 'aws-sdk-core/assume_role_credentials' autoload :Client, 'aws-sdk-core/client' - autoload :ClientPaging, 'aws-sdk-core/client_paging' autoload :ClientStubs, 'aws-sdk-core/client_stubs' autoload :ClientWaiters, 'aws-sdk-core/client_waiters' autoload :CredentialProvider, 'aws-sdk-core/credential_provider' @@ -89,6 +88,7 @@ module Aws autoload :InstanceProfileCredentials, 'aws-sdk-core/instance_profile_credentials' autoload :Json, 'aws-sdk-core/json' autoload :PageableResponse, 'aws-sdk-core/pageable_response' + autoload :Pager, 'aws-sdk-core/pager' autoload :ParamConverter, 'aws-sdk-core/param_converter' autoload :ParamValidator, 'aws-sdk-core/param_validator' autoload :RestBodyHandler, 'aws-sdk-core/rest_body_handler' @@ -115,14 +115,6 @@ module Api autoload :ShapeMap, 'aws-sdk-core/api/shape_map' end - # @api private - module Paging - autoload :NullPager, 'aws-sdk-core/paging/null_pager' - autoload :NullProvider, 'aws-sdk-core/paging/null_provider' - autoload :Pager, 'aws-sdk-core/paging/pager' - autoload :Provider, 'aws-sdk-core/paging/provider' - end - module Plugins autoload :CSDConditionalSigning, 'aws-sdk-core/plugins/csd_conditional_signing' autoload :DynamoDBExtendedRetries, 'aws-sdk-core/plugins/dynamodb_extended_retries' @@ -245,7 +237,7 @@ def service_added(&block) # @param [String] svc_name The name of the service. This will also be # the namespace under {Aws}. This must be a valid constant name. # @option options[String,Pathname,Hash,Seahorse::Model::Api,nil] :api - # @option options[String,Pathname,Hash,Paging::Provider,nil] :paginators + # @option options[String,Pathname,Hash,nil] :paginators # @option options[String,Pathname,Hash,Waiters::Provider,nil] :waiters # @option options[String,Pathname,Hash,Resources::Definition,nil] :resources # @return [Module] Returns the new service module. @@ -277,4 +269,16 @@ def load_all_services end end + # enable response paging + service_added do |name, svc_module, options| + if paginators = options[:paginators] + paginators = Json.load_file(paginators) unless Hash === paginators + svc_module::Client.api.operations.each do |_, operation| + if rules = paginators['pagination'][operation.name] + operation[:pager] = Pager.new(rules) + end + end + end + end + end diff --git a/aws-sdk-core/lib/aws-sdk-core/client.rb b/aws-sdk-core/lib/aws-sdk-core/client.rb index 019a4a5e185..e677dd82b02 100644 --- a/aws-sdk-core/lib/aws-sdk-core/client.rb +++ b/aws-sdk-core/lib/aws-sdk-core/client.rb @@ -14,9 +14,9 @@ class Client < Seahorse::Client::Base 'Aws::Plugins::GlobalConfiguration', 'Aws::Plugins::RegionalEndpoint', 'Aws::Plugins::RequestSigner', + 'Aws::Plugins::ResponsePaging', ] - include ClientPaging include ClientStubs include ClientWaiters @@ -31,7 +31,6 @@ def define(svc_name, options) client_class = Class.new(self) client_class.identifier = svc_name.downcase.to_sym client_class.set_api(Api::Builder.build(options[:api], options)) - client_class.set_paginators(options[:paginators]) client_class.set_waiters(options[:waiters]) DEFAULT_PLUGINS.each do |plugin| client_class.add_plugin(plugin) diff --git a/aws-sdk-core/lib/aws-sdk-core/client_paging.rb b/aws-sdk-core/lib/aws-sdk-core/client_paging.rb deleted file mode 100644 index 5da9f4713d5..00000000000 --- a/aws-sdk-core/lib/aws-sdk-core/client_paging.rb +++ /dev/null @@ -1,31 +0,0 @@ -require 'pathname' - -module Aws - # @api private - module ClientPaging - - # @api private - def self.included(subclass) - - subclass.add_plugin('Aws::Plugins::ResponsePaging') - - class << subclass - - def set_paginators(paginators) - @paginators = case paginators - when Paging::Provider then paginators - when Hash then Paging::Provider.new(paginators) - when String, Pathname then Paging::Provider.new(Json.load_file(paginators)) - when nil then Paging::NullProvider.new - else raise ArgumentError, 'invalid paginators' - end - end - - def paginators - @paginators - end - - end - end - end -end diff --git a/aws-sdk-core/lib/aws-sdk-core/pageable_response.rb b/aws-sdk-core/lib/aws-sdk-core/pageable_response.rb index 41b5bf0d919..bb591a8d194 100644 --- a/aws-sdk-core/lib/aws-sdk-core/pageable_response.rb +++ b/aws-sdk-core/lib/aws-sdk-core/pageable_response.rb @@ -30,25 +30,22 @@ module Aws # directly. The {Plugins::ResponsePaging} plugin automatically # decorates all responses with a {PageableResponse}. # - class PageableResponse < Seahorse::Client::Response + module PageableResponse - include Enumerable - - # @param [Seahorse::Client::Response] response - # @param [Paging::Pager] pager - def initialize(response, pager) - @pager = pager - super(context:response.context, data:response.data, error:response.error) + def self.included(base) + base.send(:include, Enumerable) end # @return [Paging::Pager] - attr_reader :pager + attr_accessor :pager # Returns `true` if there are no more results. Calling {#next_page} # when this method returns `false` will raise an error. # @return [Boolean] def last_page? - @last_page = !@pager.truncated?(self) + if @last_page.nil? + @last_page = !@pager.truncated?(self) + end @last_page end @@ -64,7 +61,7 @@ def next_page(params = {}) if last_page? raise LastPageError.new(self) else - PageableResponse.new(next_response(params), pager) + next_response(params) end end @@ -117,7 +114,7 @@ def next_response(params) # @return [Hash] Returns the hash of request parameters for the # next page, merging any given params. def next_page_params(params) - context[:original_params].merge(@pager.next_tokens(self).merge(params)) + context.params.merge(@pager.next_tokens(self).merge(params)) end # Raised when calling {PageableResponse#next_page} on a pager that diff --git a/aws-sdk-core/lib/aws-sdk-core/paging/null_pager.rb b/aws-sdk-core/lib/aws-sdk-core/paging/null_pager.rb deleted file mode 100644 index 3535cb40add..00000000000 --- a/aws-sdk-core/lib/aws-sdk-core/paging/null_pager.rb +++ /dev/null @@ -1,20 +0,0 @@ -module Aws - module Paging - class NullPager < Pager - - def initialize - end - - # @return [{}] - def next_tokens - {} - end - - # @return [false] - def truncated?(response) - false - end - - end - end -end diff --git a/aws-sdk-core/lib/aws-sdk-core/paging/null_provider.rb b/aws-sdk-core/lib/aws-sdk-core/paging/null_provider.rb deleted file mode 100644 index f464407e3dd..00000000000 --- a/aws-sdk-core/lib/aws-sdk-core/paging/null_provider.rb +++ /dev/null @@ -1,13 +0,0 @@ -module Aws - module Paging - class NullProvider - - # @param [String] operation_name - # @return [NullPager] - def pager(operation_name) - NullPager.new - end - - end - end -end diff --git a/aws-sdk-core/lib/aws-sdk-core/paging/pager.rb b/aws-sdk-core/lib/aws-sdk-core/paging/pager.rb deleted file mode 100644 index ec0e82f42de..00000000000 --- a/aws-sdk-core/lib/aws-sdk-core/paging/pager.rb +++ /dev/null @@ -1,70 +0,0 @@ -module Aws - module Paging - class Pager - - def initialize(rules) - if rules['more_results'] - @more_results = underscore(rules['more_results']) - end - if rules['limit_key'] - @limit_key = underscore(rules['limit_key']).to_sym - end - map_tokens(rules) - end - - # @return [Symbol, nil] - attr_reader :limit_key - - # @param [Seahorse::Client::Response] response - # @return [Hash] - def next_tokens(response) - @tokens.each.with_object({}) do |(source, target), next_tokens| - value = JMESPath.search(source, response.data) - next_tokens[target.to_sym] = value unless empty_value?(value) - end - end - - # @api private - def prev_tokens(response) - @tokens.each.with_object({}) do |(_, target), tokens| - value = JMESPath.search(target, response.context.params) - tokens[target.to_sym] = value unless empty_value?(value) - end - end - - # @param [Seahorse::Client::Response] response - # @return [Boolean] - def truncated?(response) - if @more_results - JMESPath.search(@more_results, response.data) - else - next_tokens = self.next_tokens(response) - prev_tokens = self.prev_tokens(response) - !(next_tokens.empty? || next_tokens == prev_tokens) - end - end - - private - - def map_tokens(rules) - input = Array(rules['input_token']) - output = Array(rules['output_token']) - @tokens = {} - input.each.with_index do |key, n| - @tokens[underscore(output[n])] = underscore(key) - end - end - - def underscore(str) - str. - gsub(' or ', '||'). - gsub(/\w+/) { |part| Seahorse::Util.underscore(part) } - end - - def empty_value?(value) - value.nil? || value == '' || value == [] || value == {} - end - - end - end -end diff --git a/aws-sdk-core/lib/aws-sdk-core/paging/provider.rb b/aws-sdk-core/lib/aws-sdk-core/paging/provider.rb deleted file mode 100644 index 52cdf95d225..00000000000 --- a/aws-sdk-core/lib/aws-sdk-core/paging/provider.rb +++ /dev/null @@ -1,22 +0,0 @@ -module Aws - module Paging - class Provider - - # @param [Hash] rules - def initialize(rules) - @operations = rules['pagination'].select { |k,v| v.key?('input_token') } - end - - # @param [String] operation_name - # @return [Pager] - def pager(operation_name) - if rules = @operations[operation_name] - Pager.new(rules) - else - NullPager.new - end - end - - end - end -end diff --git a/aws-sdk-core/lib/aws-sdk-core/plugins/response_paging.rb b/aws-sdk-core/lib/aws-sdk-core/plugins/response_paging.rb index c5bc5a4fd7d..02061293a65 100644 --- a/aws-sdk-core/lib/aws-sdk-core/plugins/response_paging.rb +++ b/aws-sdk-core/lib/aws-sdk-core/plugins/response_paging.rb @@ -2,24 +2,33 @@ module Aws module Plugins class ResponsePaging < Seahorse::Client::Plugin - # @api private - class Handler < Seahorse::Client::Handler + def add_handlers(handlers, config) + handlers.add(Handler, + operations: pageable_operations(config), + step: :initialize, + priority: 90) + end - def call(context) - context[:original_params] = context.params - PageableResponse.new(@handler.call(context), pager(context)) + private + + def pageable_operations(config) + config.api.operations.inject([]) do |pageable, (name, operation)| + pageable << name if operation[:pager] + pageable end + end - private + # @api private + class Handler < Seahorse::Client::Handler - def pager(context) - context.client.class.paginators.pager(context.operation.name) + def call(context) + resp = @handler.call(context) + resp.extend(PageableResponse) + resp.pager = context.operation[:pager] + resp end end - - handler(Handler, step: :initialize, priority: 90) - end end end diff --git a/aws-sdk-core/lib/seahorse/model/operation.rb b/aws-sdk-core/lib/seahorse/model/operation.rb index 049d9a768cf..7f8dfc94790 100644 --- a/aws-sdk-core/lib/seahorse/model/operation.rb +++ b/aws-sdk-core/lib/seahorse/model/operation.rb @@ -7,6 +7,7 @@ def initialize @http_request_uri = '/' @deprecated = false @errors = [] + @metadata = {} end # @return [String, nil] @@ -33,6 +34,14 @@ def initialize # @return [Array] attr_accessor :errors + def [](key) + @metadata[key.to_s] + end + + def []=(key, value) + @metadata[key.to_s] = value + end + end end end diff --git a/aws-sdk-core/spec/aws/cloud_front/client_spec.rb b/aws-sdk-core/spec/aws/cloud_front/client_spec.rb index d8af8346ede..78b8cff9549 100644 --- a/aws-sdk-core/spec/aws/cloud_front/client_spec.rb +++ b/aws-sdk-core/spec/aws/cloud_front/client_spec.rb @@ -10,9 +10,7 @@ module CloudFront end it 'returns the paginator for the operation' do - operation = Client.api.operation(:list_distributions) - pager = Client.paginators.pager(operation.name) - expect(pager).not_to be_kind_of(Paging::NullPager) + expect(Client.api.operation(:list_distributions)[:pager]).not_to be(nil) end end diff --git a/aws-sdk-core/spec/aws/pageable_response_spec.rb b/aws-sdk-core/spec/aws/pageable_response_spec.rb index b73d12c69dd..bafc91b6592 100644 --- a/aws-sdk-core/spec/aws/pageable_response_spec.rb +++ b/aws-sdk-core/spec/aws/pageable_response_spec.rb @@ -3,38 +3,15 @@ module Aws describe PageableResponse do - let(:pager) { Paging::Pager.new(rules) } - - let(:resp) { - r = Seahorse::Client::Response.new - r.context[:original_params] = r.context.params - PageableResponse.new(r, pager) - } - - # If an operation has no paging metadata, then it is considered - # un-pageable and will always treat a response as the last page. - describe 'unpageable-operation' do - - let(:pager) { Paging::NullPager.new } - - it 'returns true from #last_page?' do - expect(resp.last_page?).to be(true) - expect(resp.next_page?).to be(false) - end - - it 'raises a LastPageError when calling next_page' do - expect { resp.next_page }.to raise_error(PageableResponse::LastPageError) - end + def pageable(resp, pager) + resp.extend(PageableResponse) + resp.pager = pager + resp + end - it 'popualtes the error with the response' do - begin - resp.next_page - rescue => error - expect(error.response).to be(resp) - end - end + let(:pager) { Pager.new(rules) } - end + let(:resp) { pageable(Seahorse::Client::Response.new, pager) } describe 'pagable operations' do @@ -174,7 +151,7 @@ module Aws resp.context.client = client resp.context.operation_name = 'operation-name' - resp2 = Seahorse::Client::Response.new + resp2 = pageable(Seahorse::Client::Response.new, resp.pager) resp2.data = {} allow(client).to receive(:build_request). @@ -192,10 +169,12 @@ module Aws describe '#count' do + let(:rules) {{}} + it 'raises not implemented error by default' do data = double('data') resp = double('resp', data:data, error:nil, context:nil) - page = PageableResponse.new(resp, Paging::NullPager.new) + page = pageable(resp, pager) expect { page.count }.to raise_error(NotImplementedError) @@ -204,21 +183,21 @@ module Aws it 'passes count from the raises not implemented error by default' do data = double('data', count: 10) resp = double('resp', data:data, error:nil, context:nil) - page = PageableResponse.new(resp, Paging::NullPager.new) + page = pageable(resp, pager) expect(page.count).to eq(10) end it 'returns false from respond_to when count not present' do data = double('data') resp = double('resp', data:data, error:nil, context:nil) - page = PageableResponse.new(resp, Paging::NullPager.new) + page = pageable(resp, pager) expect(page.respond_to?(:count)).to be(false) end it 'indicates it responds to count when data#count exists' do data = double('data', count: 10) resp = double('resp', data:data, error:nil, context:nil) - page = PageableResponse.new(resp, Paging::NullPager.new) + page = pageable(resp, pager) expect(page.respond_to?(:count)) end diff --git a/aws-sdk-core/spec/aws/paging/null_provider_spec.rb b/aws-sdk-core/spec/aws/paging/null_provider_spec.rb deleted file mode 100644 index 31f9c9c6d96..00000000000 --- a/aws-sdk-core/spec/aws/paging/null_provider_spec.rb +++ /dev/null @@ -1,16 +0,0 @@ -require 'spec_helper' - -module Aws - module Paging - describe NullProvider do - - let(:provider) { NullProvider.new } - - it 'returns null pagers' do - expect(provider.pager('NonPagedOperation').next_tokens).to eq({}) - expect(provider.pager('NonPagedOperation').truncated?('resp')).to be(false) - end - - end - end -end diff --git a/aws-sdk-resources/lib/aws-sdk-resources/definition.rb b/aws-sdk-resources/lib/aws-sdk-resources/definition.rb index 03c766e65e1..f6c976da6f7 100644 --- a/aws-sdk-resources/lib/aws-sdk-resources/definition.rb +++ b/aws-sdk-resources/lib/aws-sdk-resources/definition.rb @@ -156,8 +156,12 @@ def build_waiter_operation(namespace, resource, definition) def limit_key(resource, definition) operation_name = definition['request']['operation'] - paginators = resource.client_class.paginators - paginators.pager(operation_name).limit_key + operation = resource.client_class.api.operation(underscore(operation_name)) + if operation[:pager] + operation[:pager].limit_key + else + nil + end end def define_request(definition) From ad94760b69b16d7e874e380df3855e3fd353daf0 Mon Sep 17 00:00:00 2001 From: Trevor Rowe Date: Wed, 13 May 2015 15:42:53 -0700 Subject: [PATCH 047/101] Minor test cleanups. --- .../spec/aws/instance_profile_credentials_spec.rb | 14 -------------- aws-sdk-core/spec/aws/shared_credentials_spec.rb | 14 -------------- .../spec/seahorse/client/response_spec.rb | 15 --------------- 3 files changed, 43 deletions(-) diff --git a/aws-sdk-core/spec/aws/instance_profile_credentials_spec.rb b/aws-sdk-core/spec/aws/instance_profile_credentials_spec.rb index 07dd3f81591..5b351224dc7 100644 --- a/aws-sdk-core/spec/aws/instance_profile_credentials_spec.rb +++ b/aws-sdk-core/spec/aws/instance_profile_credentials_spec.rb @@ -88,20 +88,6 @@ module Aws expect(c.expiration.to_s).to eq(expiration2.to_s) end - it 'generates deprecation warnings for credential accessors' do - c = InstanceProfileCredentials.new(backoff:0) - expect(c).to receive(:warn).exactly(3).times - - c.access_key_id - c.secret_access_key - c.session_token - - # warnings are not duplicated - c.access_key_id - c.secret_access_key - c.session_token - end - describe 'auto refreshing' do # expire in 4 minutes diff --git a/aws-sdk-core/spec/aws/shared_credentials_spec.rb b/aws-sdk-core/spec/aws/shared_credentials_spec.rb index a985d3e1f0f..bf20c4caf1c 100644 --- a/aws-sdk-core/spec/aws/shared_credentials_spec.rb +++ b/aws-sdk-core/spec/aws/shared_credentials_spec.rb @@ -64,19 +64,5 @@ module Aws expect(creds.set?).to eq(false) end - it 'generates deprecation warnings for credential accessors' do - c = SharedCredentials.new(path:mock_credential_file) - expect(c).to receive(:warn).exactly(3).times - - c.access_key_id - c.secret_access_key - c.session_token - - # warnings are not duplicated - c.access_key_id - c.secret_access_key - c.session_token - end - end end diff --git a/aws-sdk-core/spec/seahorse/client/response_spec.rb b/aws-sdk-core/spec/seahorse/client/response_spec.rb index ae0d7a4738a..7d66ee9895e 100644 --- a/aws-sdk-core/spec/seahorse/client/response_spec.rb +++ b/aws-sdk-core/spec/seahorse/client/response_spec.rb @@ -4,21 +4,6 @@ module Seahorse module Client describe Response do - - describe '#inspect' do - - it 'returns the inspect string for the data' do - resp = Response.new - resp.data = double('data') - expect(resp.inspect).to eq(resp.data.pretty_inspect) - end - - it 'returns the default inspect if data is not set' do - expect(Response.new.inspect).to include('# Date: Wed, 13 May 2015 15:49:23 -0700 Subject: [PATCH 048/101] Minor test updates for paginators. --- aws-sdk-resources/spec/definition_spec.rb | 15 ++++++++++++++- .../spec/operations/has_many_operation_spec.rb | 2 +- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/aws-sdk-resources/spec/definition_spec.rb b/aws-sdk-resources/spec/definition_spec.rb index 998d819f2c8..6d614df48ad 100644 --- a/aws-sdk-resources/spec/definition_spec.rb +++ b/aws-sdk-resources/spec/definition_spec.rb @@ -19,7 +19,13 @@ module Resources let(:shapes) {{}} - let(:api) { Aws::Api::Builder.build('shapes' => shapes) } + let(:api_model) {{ + 'metadata' => {}, + 'operations' => {}, + 'shapes' => shapes, + }} + + let(:api) { Aws::Api::Builder.build(api_model) } let(:namespace) { Module.new } @@ -267,6 +273,11 @@ def apply_definition } }} + let(:api_model) {{ + 'operations' => { 'ListThings' => {} }, + 'shapes' => shapes + }} + it 'returns an resource enumerator' do expect(client).to receive(:list_things). with(batch_size:2). @@ -732,6 +743,8 @@ def apply_definition } } + api_model['operations']['ListDooDads'] = {} + apply_definition page1 = double('client-response', data: { diff --git a/aws-sdk-resources/spec/operations/has_many_operation_spec.rb b/aws-sdk-resources/spec/operations/has_many_operation_spec.rb index 70ed197bf3a..eeba33e04d4 100644 --- a/aws-sdk-resources/spec/operations/has_many_operation_spec.rb +++ b/aws-sdk-resources/spec/operations/has_many_operation_spec.rb @@ -71,7 +71,7 @@ module Operations responses = [resp1, resp2] client = double('client') - allow(client).to receive_message_chain(:config, :api, :metadata).and_return(Paging::NullProvider.new) + allow(client).to receive_message_chain(:config, :api, :metadata).and_return(Pager.new({})) allow(client).to receive_message_chain(:config, :api, :operation, :name).and_return('OperationName') expect(client).to receive(:list_resources). and_return(responses) From 3cb7152faaf4133cdaa8b1071ee647efa90b3238 Mon Sep 17 00:00:00 2001 From: Trevor Rowe Date: Wed, 13 May 2015 15:51:04 -0700 Subject: [PATCH 049/101] Added missing file. --- aws-sdk-core/lib/aws-sdk-core/pager.rb | 69 ++++++++++++++++++++++++++ 1 file changed, 69 insertions(+) create mode 100644 aws-sdk-core/lib/aws-sdk-core/pager.rb diff --git a/aws-sdk-core/lib/aws-sdk-core/pager.rb b/aws-sdk-core/lib/aws-sdk-core/pager.rb new file mode 100644 index 00000000000..6de8bb12f0f --- /dev/null +++ b/aws-sdk-core/lib/aws-sdk-core/pager.rb @@ -0,0 +1,69 @@ +module Aws + # @api private + class Pager + + def initialize(rules) + if rules['more_results'] + @more_results = underscore(rules['more_results']) + end + if rules['limit_key'] + @limit_key = underscore(rules['limit_key']).to_sym + end + map_tokens(rules) + end + + # @return [Symbol, nil] + attr_reader :limit_key + + # @param [Seahorse::Client::Response] response + # @return [Hash] + def next_tokens(response) + @tokens.each.with_object({}) do |(source, target), next_tokens| + value = JMESPath.search(source, response.data) + next_tokens[target.to_sym] = value unless empty_value?(value) + end + end + + # @api private + def prev_tokens(response) + @tokens.each.with_object({}) do |(_, target), tokens| + value = JMESPath.search(target, response.context.params) + tokens[target.to_sym] = value unless empty_value?(value) + end + end + + # @param [Seahorse::Client::Response] response + # @return [Boolean] + def truncated?(response) + if @more_results + JMESPath.search(@more_results, response.data) + else + next_tokens = self.next_tokens(response) + prev_tokens = self.prev_tokens(response) + !(next_tokens.empty? || next_tokens == prev_tokens) + end + end + + private + + def map_tokens(rules) + input = Array(rules['input_token']) + output = Array(rules['output_token']) + @tokens = {} + input.each.with_index do |key, n| + @tokens[underscore(output[n])] = underscore(key) + end + end + + def underscore(str) + str. + gsub(' or ', '||'). + gsub(/\w+/) { |part| Seahorse::Util.underscore(part) } + end + + def empty_value?(value) + value.nil? || value == '' || value == [] || value == {} + end + + end +end From 772fcbab4f1e00a6cb07231564345b62fb5cff27 Mon Sep 17 00:00:00 2001 From: Trevor Rowe Date: Wed, 13 May 2015 16:01:08 -0700 Subject: [PATCH 050/101] Removed the use of a deprecated method in an integration test. --- .../lib/aws-sdk-resources/services/s3/presigned_post.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/aws-sdk-resources/lib/aws-sdk-resources/services/s3/presigned_post.rb b/aws-sdk-resources/lib/aws-sdk-resources/services/s3/presigned_post.rb index 72a13fe10c9..76318d9f220 100644 --- a/aws-sdk-resources/lib/aws-sdk-resources/services/s3/presigned_post.rb +++ b/aws-sdk-resources/lib/aws-sdk-resources/services/s3/presigned_post.rb @@ -209,7 +209,7 @@ class PresignedPost # @option options [String] :server_side_encryption_customer_algorithm See {PresignedPost#server_side_encryption_customer_algorithm}. # @option options [String] :server_side_encryption_customer_key See {PresignedPost#server_side_encryption_customer_key}. def initialize(credentials, bucket_region, bucket_name, options = {}) - @credentials = credentials + @credentials = credentials.credentials @bucket_region = bucket_region @bucket_name = bucket_name @url = bucket_url From 11040b4a93b3d0d09943ae991de7b60d3481a62b Mon Sep 17 00:00:00 2001 From: Trevor Rowe Date: Thu, 14 May 2015 09:20:13 -0700 Subject: [PATCH 051/101] Improved the order of method documentation on client classes. The constructor will now appear at the top of the page, before the massive list of API operations for clients. --- .../lib/aws-sdk-core/api/operation_documenter.rb | 2 +- doc-src/templates/default/module/setup.rb | 16 ++++++++++++++++ 2 files changed, 17 insertions(+), 1 deletion(-) create mode 100644 doc-src/templates/default/module/setup.rb diff --git a/aws-sdk-core/lib/aws-sdk-core/api/operation_documenter.rb b/aws-sdk-core/lib/aws-sdk-core/api/operation_documenter.rb index 57325ecec7d..74a7d1df54b 100644 --- a/aws-sdk-core/lib/aws-sdk-core/api/operation_documenter.rb +++ b/aws-sdk-core/lib/aws-sdk-core/api/operation_documenter.rb @@ -15,7 +15,7 @@ def initialize(namespace) # @param [Seahorse::Model::Opeation] operation def document(method_name, operation) m = YARD::CodeObjects::MethodObject.new(@namespace, method_name) - m.group = 'API Calls' + m.group = 'API Operations' m.scope = :instance m.parameters << [@optname, '{}'] m.docstring = operation.documentation diff --git a/doc-src/templates/default/module/setup.rb b/doc-src/templates/default/module/setup.rb new file mode 100644 index 00000000000..b204847caa9 --- /dev/null +++ b/doc-src/templates/default/module/setup.rb @@ -0,0 +1,16 @@ +def groups(list, type = "Method") + if groups_data = object.groups + list.each {|m| groups_data |= [m.group] if m.group && owner != m.namespace } + others = list.select {|m| !m.group || !groups_data.include?(m.group) } + groups_data = groups_data.sort_by { |n| n == 'Constructor' ? '' : n } + groups_data.each do |name| + items = list.select {|m| m.group == name } + yield(items, name) unless items.empty? + end + else + raise 'not implemented' + # see implementation from base template + end + + scopes(others) {|items, scope| yield(items, "#{scope.to_s.capitalize} #{type} Summary") } +end From 9a565b00e2344663edd975e01173325b29055d28 Mon Sep 17 00:00:00 2001 From: Trevor Rowe Date: Thu, 14 May 2015 09:30:03 -0700 Subject: [PATCH 052/101] Improved client API reference documentation. Changes include: * Added a link to the constructor options from the top-level client example. * Cleared up some of the language for default region and credentials. * Added a link to information about the shared credentials file. --- doc-src/services/default/client.md | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/doc-src/services/default/client.md b/doc-src/services/default/client.md index 9419f9351b4..665a7248164 100644 --- a/doc-src/services/default/client.md +++ b/doc-src/services/default/client.md @@ -1,14 +1,13 @@ -An API client for <%= full_name %>. - -# Configuration - -To construct a client, you need to configure a `:region` and `:credentials`. +An API client for <%= full_name %>. To construct a client, you need to configure a `:region` and `:credentials`. <%= svc_name.downcase %> = Aws::<%= svc_name %>::Client.new( region: region_name, - credentials: credentials + credentials: credentials, + # ... ) +See {#initialize} for a full list of supported configuration options. + ## Region You can configure a default region in the following locations: @@ -20,12 +19,12 @@ You can configure a default region in the following locations: ## Credentials -Credentials are loaded automatically from the following locations: +Default credentials are loaded automatically from the following locations: * `ENV['AWS_ACCESS_KEY_ID']` and `ENV['AWS_SECRET_ACCESS_KEY']` * `Aws.config[:credentials]` -* Shared credentials file, `~/.aws/credentials` -* EC2 Instance profile +* The shared credentials ini file at `~/.aws/credentials` ([more information](http://blogs.aws.amazon.com/security/post/Tx3D6U6WSFGOK2H/A-New-and-Standardized-Way-to-Manage-Credentials-in-the-AWS-SDKs)) +* From an instance profile when running on EC2 You can also construct a credentials object from one of the following classes: From 61a2cb8988c04191ed7a9141cf50acec469ddc87 Mon Sep 17 00:00:00 2001 From: Trevor Rowe Date: Thu, 14 May 2015 10:52:27 -0700 Subject: [PATCH 053/101] Moved the client data type structures into their own namespace. --- aws-sdk-core/lib/aws-sdk-core.rb | 7 ++++++- aws-sdk-core/lib/aws-sdk-core/api/doc_utils.rb | 4 ++-- aws-sdk-core/lib/aws-sdk-core/api/documenter.rb | 1 + .../lib/aws-sdk-core/plugins/s3_get_bucket_location_fix.rb | 2 +- 4 files changed, 10 insertions(+), 4 deletions(-) diff --git a/aws-sdk-core/lib/aws-sdk-core.rb b/aws-sdk-core/lib/aws-sdk-core.rb index 18f6e70629d..bba327f5362 100644 --- a/aws-sdk-core/lib/aws-sdk-core.rb +++ b/aws-sdk-core/lib/aws-sdk-core.rb @@ -264,8 +264,13 @@ def load_all_services service_added do |name, svc_module, options| svc_module.const_set(:Client, Client.define(name, options)) svc_module.const_set(:Errors, Module.new { extend Errors::DynamicErrors }) + end + + # define a struct class for each client data type + service_added do |name, svc_module, options| + svc_module.const_set(:Types, Module.new) svc_module::Client.api.metadata['shapes'].each_structure do |shape| - svc_module::Client.const_set(shape.name, shape[:struct_class]) + svc_module::Types.const_set(shape.name, shape[:struct_class]) end end diff --git a/aws-sdk-core/lib/aws-sdk-core/api/doc_utils.rb b/aws-sdk-core/lib/aws-sdk-core/api/doc_utils.rb index 5b8f824421f..7a4bbc631c6 100644 --- a/aws-sdk-core/lib/aws-sdk-core/api/doc_utils.rb +++ b/aws-sdk-core/lib/aws-sdk-core/api/doc_utils.rb @@ -10,7 +10,7 @@ def tag(string) def input_type(ref) case ref.shape - when Shapes::StructureShape then ref.shape.name + when Shapes::StructureShape then "Types::" + ref.shape.name when Shapes::ListShape then "Array<#{input_type(ref.shape.member)}>" when Shapes::MapShape then "Hash" when Shapes::BlobShape then 'String,IO' @@ -25,7 +25,7 @@ def input_type(ref) def output_type(ref) case ref.shape - when Shapes::StructureShape then ref.shape.name + when Shapes::StructureShape then "Types::" + ref.shape.name when Shapes::ListShape then "Array<#{output_type(ref.shape.member)}>" when Shapes::MapShape then "Hash" when Shapes::BlobShape then ref.location == 'body' ? 'StringIO' : 'String' diff --git a/aws-sdk-core/lib/aws-sdk-core/api/documenter.rb b/aws-sdk-core/lib/aws-sdk-core/api/documenter.rb index 2cbb9e05023..1d46521f2f1 100644 --- a/aws-sdk-core/lib/aws-sdk-core/api/documenter.rb +++ b/aws-sdk-core/lib/aws-sdk-core/api/documenter.rb @@ -76,6 +76,7 @@ def document_client end def document_client_types(namespace) + namespace = YARD::CodeObjects::ModuleObject.new(namespace, 'Types') documenter = ClientTypeDocumenter.new(namespace) @api.metadata['shapes'].each_structure do |shape| documenter.document(shape) diff --git a/aws-sdk-core/lib/aws-sdk-core/plugins/s3_get_bucket_location_fix.rb b/aws-sdk-core/lib/aws-sdk-core/plugins/s3_get_bucket_location_fix.rb index ee6f2c9b7e4..e847563452f 100644 --- a/aws-sdk-core/lib/aws-sdk-core/plugins/s3_get_bucket_location_fix.rb +++ b/aws-sdk-core/lib/aws-sdk-core/plugins/s3_get_bucket_location_fix.rb @@ -6,7 +6,7 @@ class Handler < Seahorse::Client::Handler def call(context) @handler.call(context).on(200) do |response| - response.data = S3::Client::GetBucketLocationOutput.new + response.data = S3::Types::GetBucketLocationOutput.new xml = context.http_response.body_contents matches = xml.match(/>(.+?)<\/LocationConstraint>/) response.data[:location_constraint] = matches ? matches[1] : '' From 3a1a1abd03ccc5c76774d8a70543f98d60e0668d Mon Sep 17 00:00:00 2001 From: Trevor Rowe Date: Thu, 14 May 2015 10:52:42 -0700 Subject: [PATCH 054/101] Filtering docs from the gem. The gemspec was incorrectly including the doc files. --- aws-sdk-core/aws-sdk-core.gemspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/aws-sdk-core/aws-sdk-core.gemspec b/aws-sdk-core/aws-sdk-core.gemspec index 80b243838d6..e23e85876ca 100644 --- a/aws-sdk-core/aws-sdk-core.gemspec +++ b/aws-sdk-core/aws-sdk-core.gemspec @@ -15,7 +15,7 @@ Gem::Specification.new do |spec| spec.files = ['endpoints.json'] spec.files += Dir['lib/**/*.rb'] - spec.files += Dir['apis/**/**/*.json'].select { |p| !p.match(/\.docs\.json$/) } + spec.files += Dir['apis/**/**/*.json'].select { |p| !p.match(/\/docs/) } spec.bindir = 'bin' spec.executables << 'aws.rb' From 3894158c5ef22e011371b418c9d5f830648664a4 Mon Sep 17 00:00:00 2001 From: Trevor Rowe Date: Thu, 14 May 2015 17:26:46 -0700 Subject: [PATCH 055/101] Namespace correction in yard plugin. --- aws-sdk-core/lib/aws-sdk-core/api/documenter.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/aws-sdk-core/lib/aws-sdk-core/api/documenter.rb b/aws-sdk-core/lib/aws-sdk-core/api/documenter.rb index 1d46521f2f1..eb3acc878c2 100644 --- a/aws-sdk-core/lib/aws-sdk-core/api/documenter.rb +++ b/aws-sdk-core/lib/aws-sdk-core/api/documenter.rb @@ -69,14 +69,14 @@ def document_client yard_class = YARD::CodeObjects::ClassObject.new(@namespace, 'Client') yard_class.superclass = YARD::Registry['Seahorse::Client::Base'] yard_class.docstring = client_docstring - document_client_types(yard_class) + document_client_types document_client_constructor(yard_class) document_client_operations(yard_class) document_client_waiters(yard_class) end - def document_client_types(namespace) - namespace = YARD::CodeObjects::ModuleObject.new(namespace, 'Types') + def document_client_types + namespace = YARD::CodeObjects::ModuleObject.new(@namespace, 'Types') documenter = ClientTypeDocumenter.new(namespace) @api.metadata['shapes'].each_structure do |shape| documenter.document(shape) From 9519eb3c75c8c43c151e3c81719f0fe1de3731f7 Mon Sep 17 00:00:00 2001 From: Trevor Rowe Date: Fri, 15 May 2015 00:34:37 -0700 Subject: [PATCH 056/101] Removed old DynamoDB and EC2 API files. --- .../apis/dynamodb/2011-12-05/api-2.json | 949 -- .../apis/dynamodb/2011-12-05/docs-2.json | 606 - .../dynamodb/2011-12-05/paginators-1.json | 26 - .../apis/dynamodb/2011-12-05/waiters-2.json | 35 - aws-sdk-core/apis/ec2/2014-10-01/api-2.json | 10267 ---------------- aws-sdk-core/apis/ec2/2014-10-01/docs-2.json | 4678 ------- .../apis/ec2/2014-10-01/paginators-1.json | 125 - .../apis/ec2/2014-10-01/resources-1.json | 2289 ---- .../apis/ec2/2014-10-01/waiters-2.json | 453 - 9 files changed, 19428 deletions(-) delete mode 100644 aws-sdk-core/apis/dynamodb/2011-12-05/api-2.json delete mode 100644 aws-sdk-core/apis/dynamodb/2011-12-05/docs-2.json delete mode 100644 aws-sdk-core/apis/dynamodb/2011-12-05/paginators-1.json delete mode 100644 aws-sdk-core/apis/dynamodb/2011-12-05/waiters-2.json delete mode 100644 aws-sdk-core/apis/ec2/2014-10-01/api-2.json delete mode 100644 aws-sdk-core/apis/ec2/2014-10-01/docs-2.json delete mode 100644 aws-sdk-core/apis/ec2/2014-10-01/paginators-1.json delete mode 100644 aws-sdk-core/apis/ec2/2014-10-01/resources-1.json delete mode 100644 aws-sdk-core/apis/ec2/2014-10-01/waiters-2.json diff --git a/aws-sdk-core/apis/dynamodb/2011-12-05/api-2.json b/aws-sdk-core/apis/dynamodb/2011-12-05/api-2.json deleted file mode 100644 index 4bd6a22cdd9..00000000000 --- a/aws-sdk-core/apis/dynamodb/2011-12-05/api-2.json +++ /dev/null @@ -1,949 +0,0 @@ -{ - "version":"2.0", - "metadata":{ - "apiVersion":"2011-12-05", - "endpointPrefix":"dynamodb", - "jsonVersion":"1.0", - "serviceAbbreviation":"DynamoDB", - "serviceFullName":"Amazon DynamoDB", - "signatureVersion":"v4", - "targetPrefix":"DynamoDB_20111205", - "protocol":"json" - }, - "operations":{ - "BatchGetItem":{ - "name":"BatchGetItem", - "http":{ - "method":"POST", - "requestUri":"/" - }, - "input":{"shape":"BatchGetItemInput"}, - "output":{"shape":"BatchGetItemOutput"}, - "errors":[ - { - "shape":"ProvisionedThroughputExceededException", - "exception":true - }, - { - "shape":"ResourceNotFoundException", - "exception":true - }, - { - "shape":"InternalServerError", - "exception":true, - "fault":true - } - ] - }, - "BatchWriteItem":{ - "name":"BatchWriteItem", - "http":{ - "method":"POST", - "requestUri":"/" - }, - "input":{"shape":"BatchWriteItemInput"}, - "output":{"shape":"BatchWriteItemOutput"}, - "errors":[ - { - "shape":"ProvisionedThroughputExceededException", - "exception":true - }, - { - "shape":"ResourceNotFoundException", - "exception":true - }, - { - "shape":"LimitExceededException", - "exception":true - }, - { - "shape":"InternalServerError", - "exception":true, - "fault":true - } - ] - }, - "CreateTable":{ - "name":"CreateTable", - "http":{ - "method":"POST", - "requestUri":"/" - }, - "input":{"shape":"CreateTableInput"}, - "output":{"shape":"CreateTableOutput"}, - "errors":[ - { - "shape":"ResourceInUseException", - "exception":true - }, - { - "shape":"LimitExceededException", - "exception":true - }, - { - "shape":"InternalServerError", - "exception":true, - "fault":true - } - ] - }, - "DeleteItem":{ - "name":"DeleteItem", - "http":{ - "method":"POST", - "requestUri":"/" - }, - "input":{"shape":"DeleteItemInput"}, - "output":{"shape":"DeleteItemOutput"}, - "errors":[ - { - "shape":"ConditionalCheckFailedException", - "exception":true - }, - { - "shape":"ProvisionedThroughputExceededException", - "exception":true - }, - { - "shape":"ResourceNotFoundException", - "exception":true - }, - { - "shape":"LimitExceededException", - "exception":true - }, - { - "shape":"InternalServerError", - "exception":true, - "fault":true - } - ] - }, - "DeleteTable":{ - "name":"DeleteTable", - "http":{ - "method":"POST", - "requestUri":"/" - }, - "input":{"shape":"DeleteTableInput"}, - "output":{"shape":"DeleteTableOutput"}, - "errors":[ - { - "shape":"ResourceInUseException", - "exception":true - }, - { - "shape":"ResourceNotFoundException", - "exception":true - }, - { - "shape":"LimitExceededException", - "exception":true - }, - { - "shape":"InternalServerError", - "exception":true, - "fault":true - } - ] - }, - "DescribeTable":{ - "name":"DescribeTable", - "http":{ - "method":"POST", - "requestUri":"/" - }, - "input":{"shape":"DescribeTableInput"}, - "output":{"shape":"DescribeTableOutput"}, - "errors":[ - { - "shape":"ResourceNotFoundException", - "exception":true - }, - { - "shape":"InternalServerError", - "exception":true, - "fault":true - } - ] - }, - "GetItem":{ - "name":"GetItem", - "http":{ - "method":"POST", - "requestUri":"/" - }, - "input":{"shape":"GetItemInput"}, - "output":{"shape":"GetItemOutput"}, - "errors":[ - { - "shape":"ProvisionedThroughputExceededException", - "exception":true - }, - { - "shape":"ResourceNotFoundException", - "exception":true - }, - { - "shape":"InternalServerError", - "exception":true, - "fault":true - } - ] - }, - "ListTables":{ - "name":"ListTables", - "http":{ - "method":"POST", - "requestUri":"/" - }, - "input":{"shape":"ListTablesInput"}, - "output":{"shape":"ListTablesOutput"}, - "errors":[ - { - "shape":"InternalServerError", - "exception":true, - "fault":true - } - ] - }, - "PutItem":{ - "name":"PutItem", - "http":{ - "method":"POST", - "requestUri":"/" - }, - "input":{"shape":"PutItemInput"}, - "output":{"shape":"PutItemOutput"}, - "errors":[ - { - "shape":"ConditionalCheckFailedException", - "exception":true - }, - { - "shape":"ProvisionedThroughputExceededException", - "exception":true - }, - { - "shape":"ResourceNotFoundException", - "exception":true - }, - { - "shape":"LimitExceededException", - "exception":true - }, - { - "shape":"InternalServerError", - "exception":true, - "fault":true - } - ] - }, - "Query":{ - "name":"Query", - "http":{ - "method":"POST", - "requestUri":"/" - }, - "input":{"shape":"QueryInput"}, - "output":{"shape":"QueryOutput"}, - "errors":[ - { - "shape":"ProvisionedThroughputExceededException", - "exception":true - }, - { - "shape":"ResourceNotFoundException", - "exception":true - }, - { - "shape":"InternalServerError", - "exception":true, - "fault":true - } - ] - }, - "Scan":{ - "name":"Scan", - "http":{ - "method":"POST", - "requestUri":"/" - }, - "input":{"shape":"ScanInput"}, - "output":{"shape":"ScanOutput"}, - "errors":[ - { - "shape":"ProvisionedThroughputExceededException", - "exception":true - }, - { - "shape":"ResourceNotFoundException", - "exception":true - }, - { - "shape":"InternalServerError", - "exception":true, - "fault":true - } - ] - }, - "UpdateItem":{ - "name":"UpdateItem", - "http":{ - "method":"POST", - "requestUri":"/" - }, - "input":{"shape":"UpdateItemInput"}, - "output":{"shape":"UpdateItemOutput"}, - "errors":[ - { - "shape":"ConditionalCheckFailedException", - "exception":true - }, - { - "shape":"ProvisionedThroughputExceededException", - "exception":true - }, - { - "shape":"ResourceNotFoundException", - "exception":true - }, - { - "shape":"LimitExceededException", - "exception":true - }, - { - "shape":"InternalServerError", - "exception":true, - "fault":true - } - ] - }, - "UpdateTable":{ - "name":"UpdateTable", - "http":{ - "method":"POST", - "requestUri":"/" - }, - "input":{"shape":"UpdateTableInput"}, - "output":{"shape":"UpdateTableOutput"}, - "errors":[ - { - "shape":"ResourceInUseException", - "exception":true - }, - { - "shape":"ResourceNotFoundException", - "exception":true - }, - { - "shape":"LimitExceededException", - "exception":true - }, - { - "shape":"InternalServerError", - "exception":true, - "fault":true - } - ] - } - }, - "shapes":{ - "AttributeAction":{ - "type":"string", - "enum":[ - "ADD", - "PUT", - "DELETE" - ] - }, - "AttributeMap":{ - "type":"map", - "key":{"shape":"AttributeName"}, - "value":{"shape":"AttributeValue"} - }, - "AttributeName":{ - "type":"string", - "max":65535 - }, - "AttributeNameList":{ - "type":"list", - "member":{"shape":"AttributeName"}, - "min":1 - }, - "AttributeUpdates":{ - "type":"map", - "key":{"shape":"AttributeName"}, - "value":{"shape":"AttributeValueUpdate"} - }, - "AttributeValue":{ - "type":"structure", - "members":{ - "S":{"shape":"StringAttributeValue"}, - "N":{"shape":"NumberAttributeValue"}, - "B":{"shape":"BinaryAttributeValue"}, - "SS":{"shape":"StringSetAttributeValue"}, - "NS":{"shape":"NumberSetAttributeValue"}, - "BS":{"shape":"BinarySetAttributeValue"} - } - }, - "AttributeValueList":{ - "type":"list", - "member":{"shape":"AttributeValue"} - }, - "AttributeValueUpdate":{ - "type":"structure", - "members":{ - "Value":{"shape":"AttributeValue"}, - "Action":{"shape":"AttributeAction"} - } - }, - "BatchGetItemInput":{ - "type":"structure", - "required":["RequestItems"], - "members":{ - "RequestItems":{"shape":"BatchGetRequestMap"} - } - }, - "BatchGetItemOutput":{ - "type":"structure", - "members":{ - "Responses":{"shape":"BatchGetResponseMap"}, - "UnprocessedKeys":{"shape":"BatchGetRequestMap"} - } - }, - "BatchGetRequestMap":{ - "type":"map", - "key":{"shape":"TableName"}, - "value":{"shape":"KeysAndAttributes"}, - "min":1, - "max":100 - }, - "BatchGetResponseMap":{ - "type":"map", - "key":{"shape":"TableName"}, - "value":{"shape":"BatchResponse"} - }, - "BatchResponse":{ - "type":"structure", - "members":{ - "Items":{"shape":"ItemList"}, - "ConsumedCapacityUnits":{"shape":"ConsumedCapacityUnits"} - } - }, - "BatchWriteItemInput":{ - "type":"structure", - "required":["RequestItems"], - "members":{ - "RequestItems":{"shape":"BatchWriteItemRequestMap"} - } - }, - "BatchWriteItemOutput":{ - "type":"structure", - "members":{ - "Responses":{"shape":"BatchWriteResponseMap"}, - "UnprocessedItems":{"shape":"BatchWriteItemRequestMap"} - } - }, - "BatchWriteItemRequestMap":{ - "type":"map", - "key":{"shape":"TableName"}, - "value":{"shape":"WriteRequests"}, - "min":1, - "max":25 - }, - "BatchWriteResponse":{ - "type":"structure", - "members":{ - "ConsumedCapacityUnits":{"shape":"ConsumedCapacityUnits"} - } - }, - "BatchWriteResponseMap":{ - "type":"map", - "key":{"shape":"TableName"}, - "value":{"shape":"BatchWriteResponse"} - }, - "BinaryAttributeValue":{"type":"blob"}, - "BinarySetAttributeValue":{ - "type":"list", - "member":{"shape":"BinaryAttributeValue"} - }, - "BooleanObject":{"type":"boolean"}, - "ComparisonOperator":{ - "type":"string", - "enum":[ - "EQ", - "NE", - "IN", - "LE", - "LT", - "GE", - "GT", - "BETWEEN", - "NOT_NULL", - "NULL", - "CONTAINS", - "NOT_CONTAINS", - "BEGINS_WITH" - ] - }, - "Condition":{ - "type":"structure", - "required":["ComparisonOperator"], - "members":{ - "AttributeValueList":{"shape":"AttributeValueList"}, - "ComparisonOperator":{"shape":"ComparisonOperator"} - } - }, - "ConditionalCheckFailedException":{ - "type":"structure", - "members":{ - "message":{"shape":"ErrorMessage"} - }, - "exception":true - }, - "ConsistentRead":{"type":"boolean"}, - "ConsumedCapacityUnits":{"type":"double"}, - "CreateTableInput":{ - "type":"structure", - "required":[ - "TableName", - "KeySchema", - "ProvisionedThroughput" - ], - "members":{ - "TableName":{"shape":"TableName"}, - "KeySchema":{"shape":"KeySchema"}, - "ProvisionedThroughput":{"shape":"ProvisionedThroughput"} - } - }, - "CreateTableOutput":{ - "type":"structure", - "members":{ - "TableDescription":{"shape":"TableDescription"} - } - }, - "Date":{"type":"timestamp"}, - "DeleteItemInput":{ - "type":"structure", - "required":[ - "TableName", - "Key" - ], - "members":{ - "TableName":{"shape":"TableName"}, - "Key":{"shape":"Key"}, - "Expected":{"shape":"ExpectedAttributeMap"}, - "ReturnValues":{"shape":"ReturnValue"} - } - }, - "DeleteItemOutput":{ - "type":"structure", - "members":{ - "Attributes":{"shape":"AttributeMap"}, - "ConsumedCapacityUnits":{"shape":"ConsumedCapacityUnits"} - } - }, - "DeleteRequest":{ - "type":"structure", - "required":["Key"], - "members":{ - "Key":{"shape":"Key"} - } - }, - "DeleteTableInput":{ - "type":"structure", - "required":["TableName"], - "members":{ - "TableName":{"shape":"TableName"} - } - }, - "DeleteTableOutput":{ - "type":"structure", - "members":{ - "TableDescription":{"shape":"TableDescription"} - } - }, - "DescribeTableInput":{ - "type":"structure", - "required":["TableName"], - "members":{ - "TableName":{"shape":"TableName"} - } - }, - "DescribeTableOutput":{ - "type":"structure", - "members":{ - "Table":{"shape":"TableDescription"} - } - }, - "ErrorMessage":{"type":"string"}, - "ExpectedAttributeMap":{ - "type":"map", - "key":{"shape":"AttributeName"}, - "value":{"shape":"ExpectedAttributeValue"} - }, - "ExpectedAttributeValue":{ - "type":"structure", - "members":{ - "Value":{"shape":"AttributeValue"}, - "Exists":{"shape":"BooleanObject"} - } - }, - "FilterConditionMap":{ - "type":"map", - "key":{"shape":"String"}, - "value":{"shape":"Condition"} - }, - "GetItemInput":{ - "type":"structure", - "required":[ - "TableName", - "Key" - ], - "members":{ - "TableName":{"shape":"TableName"}, - "Key":{"shape":"Key"}, - "AttributesToGet":{"shape":"AttributeNameList"}, - "ConsistentRead":{"shape":"ConsistentRead"} - } - }, - "GetItemOutput":{ - "type":"structure", - "members":{ - "Item":{"shape":"AttributeMap"}, - "ConsumedCapacityUnits":{"shape":"ConsumedCapacityUnits"} - } - }, - "Integer":{"type":"integer"}, - "InternalServerError":{ - "type":"structure", - "members":{ - "message":{"shape":"ErrorMessage"} - }, - "exception":true, - "fault":true - }, - "ItemList":{ - "type":"list", - "member":{"shape":"AttributeMap"} - }, - "Key":{ - "type":"structure", - "required":["HashKeyElement"], - "members":{ - "HashKeyElement":{"shape":"AttributeValue"}, - "RangeKeyElement":{"shape":"AttributeValue"} - } - }, - "KeyList":{ - "type":"list", - "member":{"shape":"Key"}, - "min":1, - "max":100 - }, - "KeySchema":{ - "type":"structure", - "required":["HashKeyElement"], - "members":{ - "HashKeyElement":{"shape":"KeySchemaElement"}, - "RangeKeyElement":{"shape":"KeySchemaElement"} - } - }, - "KeySchemaAttributeName":{ - "type":"string", - "min":1, - "max":255 - }, - "KeySchemaElement":{ - "type":"structure", - "required":[ - "AttributeName", - "AttributeType" - ], - "members":{ - "AttributeName":{"shape":"KeySchemaAttributeName"}, - "AttributeType":{"shape":"ScalarAttributeType"} - } - }, - "KeysAndAttributes":{ - "type":"structure", - "required":["Keys"], - "members":{ - "Keys":{"shape":"KeyList"}, - "AttributesToGet":{"shape":"AttributeNameList"}, - "ConsistentRead":{"shape":"ConsistentRead"} - } - }, - "LimitExceededException":{ - "type":"structure", - "members":{ - "message":{"shape":"ErrorMessage"} - }, - "exception":true - }, - "ListTablesInput":{ - "type":"structure", - "members":{ - "ExclusiveStartTableName":{"shape":"TableName"}, - "Limit":{"shape":"ListTablesInputLimit"} - } - }, - "ListTablesInputLimit":{ - "type":"integer", - "min":1, - "max":100 - }, - "ListTablesOutput":{ - "type":"structure", - "members":{ - "TableNames":{"shape":"TableNameList"}, - "LastEvaluatedTableName":{"shape":"TableName"} - } - }, - "Long":{"type":"long"}, - "NumberAttributeValue":{"type":"string"}, - "NumberSetAttributeValue":{ - "type":"list", - "member":{"shape":"NumberAttributeValue"} - }, - "PositiveIntegerObject":{ - "type":"integer", - "min":1 - }, - "PositiveLongObject":{ - "type":"long", - "min":1 - }, - "ProvisionedThroughput":{ - "type":"structure", - "required":[ - "ReadCapacityUnits", - "WriteCapacityUnits" - ], - "members":{ - "ReadCapacityUnits":{"shape":"PositiveLongObject"}, - "WriteCapacityUnits":{"shape":"PositiveLongObject"} - } - }, - "ProvisionedThroughputDescription":{ - "type":"structure", - "members":{ - "LastIncreaseDateTime":{"shape":"Date"}, - "LastDecreaseDateTime":{"shape":"Date"}, - "NumberOfDecreasesToday":{"shape":"PositiveLongObject"}, - "ReadCapacityUnits":{"shape":"PositiveLongObject"}, - "WriteCapacityUnits":{"shape":"PositiveLongObject"} - } - }, - "ProvisionedThroughputExceededException":{ - "type":"structure", - "members":{ - "message":{"shape":"ErrorMessage"} - }, - "exception":true - }, - "PutItemInput":{ - "type":"structure", - "required":[ - "TableName", - "Item" - ], - "members":{ - "TableName":{"shape":"TableName"}, - "Item":{"shape":"PutItemInputAttributeMap"}, - "Expected":{"shape":"ExpectedAttributeMap"}, - "ReturnValues":{"shape":"ReturnValue"} - } - }, - "PutItemInputAttributeMap":{ - "type":"map", - "key":{"shape":"AttributeName"}, - "value":{"shape":"AttributeValue"} - }, - "PutItemOutput":{ - "type":"structure", - "members":{ - "Attributes":{"shape":"AttributeMap"}, - "ConsumedCapacityUnits":{"shape":"ConsumedCapacityUnits"} - } - }, - "PutRequest":{ - "type":"structure", - "required":["Item"], - "members":{ - "Item":{"shape":"PutItemInputAttributeMap"} - } - }, - "QueryInput":{ - "type":"structure", - "required":[ - "TableName", - "HashKeyValue" - ], - "members":{ - "TableName":{"shape":"TableName"}, - "AttributesToGet":{"shape":"AttributeNameList"}, - "Limit":{"shape":"PositiveIntegerObject"}, - "ConsistentRead":{"shape":"ConsistentRead"}, - "Count":{"shape":"BooleanObject"}, - "HashKeyValue":{"shape":"AttributeValue"}, - "RangeKeyCondition":{"shape":"Condition"}, - "ScanIndexForward":{"shape":"BooleanObject"}, - "ExclusiveStartKey":{"shape":"Key"} - } - }, - "QueryOutput":{ - "type":"structure", - "members":{ - "Items":{"shape":"ItemList"}, - "Count":{"shape":"Integer"}, - "LastEvaluatedKey":{"shape":"Key"}, - "ConsumedCapacityUnits":{"shape":"ConsumedCapacityUnits"} - } - }, - "ResourceInUseException":{ - "type":"structure", - "members":{ - "message":{"shape":"ErrorMessage"} - }, - "exception":true - }, - "ResourceNotFoundException":{ - "type":"structure", - "members":{ - "message":{"shape":"ErrorMessage"} - }, - "exception":true - }, - "ReturnValue":{ - "type":"string", - "enum":[ - "NONE", - "ALL_OLD", - "UPDATED_OLD", - "ALL_NEW", - "UPDATED_NEW" - ] - }, - "ScalarAttributeType":{ - "type":"string", - "enum":[ - "S", - "N", - "B" - ] - }, - "ScanInput":{ - "type":"structure", - "required":["TableName"], - "members":{ - "TableName":{"shape":"TableName"}, - "AttributesToGet":{"shape":"AttributeNameList"}, - "Limit":{"shape":"PositiveIntegerObject"}, - "Count":{"shape":"BooleanObject"}, - "ScanFilter":{"shape":"FilterConditionMap"}, - "ExclusiveStartKey":{"shape":"Key"} - } - }, - "ScanOutput":{ - "type":"structure", - "members":{ - "Items":{"shape":"ItemList"}, - "Count":{"shape":"Integer"}, - "ScannedCount":{"shape":"Integer"}, - "LastEvaluatedKey":{"shape":"Key"}, - "ConsumedCapacityUnits":{"shape":"ConsumedCapacityUnits"} - } - }, - "String":{"type":"string"}, - "StringAttributeValue":{"type":"string"}, - "StringSetAttributeValue":{ - "type":"list", - "member":{"shape":"StringAttributeValue"} - }, - "TableDescription":{ - "type":"structure", - "members":{ - "TableName":{"shape":"TableName"}, - "KeySchema":{"shape":"KeySchema"}, - "TableStatus":{"shape":"TableStatus"}, - "CreationDateTime":{"shape":"Date"}, - "ProvisionedThroughput":{"shape":"ProvisionedThroughputDescription"}, - "TableSizeBytes":{"shape":"Long"}, - "ItemCount":{"shape":"Long"} - } - }, - "TableName":{ - "type":"string", - "min":3, - "max":255, - "pattern":"[a-zA-Z0-9_.-]+" - }, - "TableNameList":{ - "type":"list", - "member":{"shape":"TableName"} - }, - "TableStatus":{ - "type":"string", - "enum":[ - "CREATING", - "UPDATING", - "DELETING", - "ACTIVE" - ] - }, - "UpdateItemInput":{ - "type":"structure", - "required":[ - "TableName", - "Key", - "AttributeUpdates" - ], - "members":{ - "TableName":{"shape":"TableName"}, - "Key":{"shape":"Key"}, - "AttributeUpdates":{"shape":"AttributeUpdates"}, - "Expected":{"shape":"ExpectedAttributeMap"}, - "ReturnValues":{"shape":"ReturnValue"} - } - }, - "UpdateItemOutput":{ - "type":"structure", - "members":{ - "Attributes":{"shape":"AttributeMap"}, - "ConsumedCapacityUnits":{"shape":"ConsumedCapacityUnits"} - } - }, - "UpdateTableInput":{ - "type":"structure", - "required":[ - "TableName", - "ProvisionedThroughput" - ], - "members":{ - "TableName":{"shape":"TableName"}, - "ProvisionedThroughput":{"shape":"ProvisionedThroughput"} - } - }, - "UpdateTableOutput":{ - "type":"structure", - "members":{ - "TableDescription":{"shape":"TableDescription"} - } - }, - "WriteRequest":{ - "type":"structure", - "members":{ - "PutRequest":{"shape":"PutRequest"}, - "DeleteRequest":{"shape":"DeleteRequest"} - } - }, - "WriteRequests":{ - "type":"list", - "member":{"shape":"WriteRequest"}, - "min":1, - "max":25 - } - } -} diff --git a/aws-sdk-core/apis/dynamodb/2011-12-05/docs-2.json b/aws-sdk-core/apis/dynamodb/2011-12-05/docs-2.json deleted file mode 100644 index c2537b4cf20..00000000000 --- a/aws-sdk-core/apis/dynamodb/2011-12-05/docs-2.json +++ /dev/null @@ -1,606 +0,0 @@ -{ - "version": "2.0", - "operations": { - "BatchGetItem": "

Retrieves the attributes for multiple items from multiple tables using their primary keys.

The maximum number of item attributes that can be retrieved for a single operation is 100. Also, the number of items retrieved is constrained by a 1 MB the size limit. If the response size limit is exceeded or a partial result is returned due to an internal processing failure, Amazon DynamoDB returns an UnprocessedKeys value so you can retry the operation starting with the next item to get.

Amazon DynamoDB automatically adjusts the number of items returned per page to enforce this limit. For example, even if you ask to retrieve 100 items, but each individual item is 50k in size, the system returns 20 items and an appropriate UnprocessedKeys value so you can get the next page of results. If necessary, your application needs its own logic to assemble the pages of results into one set.

", - "BatchWriteItem": "

Allows to execute a batch of Put and/or Delete Requests for many tables in a single call. A total of 25 requests are allowed.

There are no transaction guarantees provided by this API. It does not allow conditional puts nor does it support return values.

", - "CreateTable": "

Adds a new table to your account.

The table name must be unique among those associated with the AWS Account issuing the request, and the AWS Region that receives the request (e.g. us-east-1).

The CreateTable operation triggers an asynchronous workflow to begin creating the table. Amazon DynamoDB immediately returns the state of the table (CREATING) until the table is in the ACTIVE state. Once the table is in the ACTIVE state, you can perform data plane operations.

", - "DeleteItem": "

Deletes a single item in a table by primary key.

You can perform a conditional delete operation that deletes the item if it exists, or if it has an expected attribute value.

", - "DeleteTable": "

Deletes a table and all of its items.

If the table is in the ACTIVE state, you can delete it. If a table is in CREATING or UPDATING states then Amazon DynamoDB returns a ResourceInUseException. If the specified table does not exist, Amazon DynamoDB returns a ResourceNotFoundException.

", - "DescribeTable": "

Retrieves information about the table, including the current status of the table, the primary key schema and when the table was created.

If the table does not exist, Amazon DynamoDB returns a ResourceNotFoundException.

", - "GetItem": "

Retrieves a set of Attributes for an item that matches the primary key.

The GetItem operation provides an eventually-consistent read by default. If eventually-consistent reads are not acceptable for your application, use ConsistentRead. Although this operation might take longer than a standard read, it always returns the last updated value.

", - "ListTables": "

Retrieves a paginated list of table names created by the AWS Account of the caller in the AWS Region (e.g. us-east-1).

", - "PutItem": "

Creates a new item, or replaces an old item with a new item (including all the attributes).

If an item already exists in the specified table with the same primary key, the new item completely replaces the existing item. You can perform a conditional put (insert a new item if one with the specified primary key doesn't exist), or replace an existing item if it has certain attribute values.

", - "Query": "

Gets the values of one or more items and its attributes by primary key (composite primary key, only).

Narrow the scope of the query using comparison operators on the RangeKeyValue of the composite key. Use the ScanIndexForward parameter to get results in forward or reverse order by range key.

", - "Scan": "

Retrieves one or more items and its attributes by performing a full scan of a table.

Provide a ScanFilter to get more specific results.

", - "UpdateItem": "

Edits an existing item's attributes.

You can perform a conditional update (insert a new attribute name-value pair if it doesn't exist, or replace an existing name-value pair if it has certain expected attribute values).

", - "UpdateTable": "

Updates the provisioned throughput for the given table.

Setting the throughput for a table helps you manage performance and is part of the Provisioned Throughput feature of Amazon DynamoDB.

" - }, - "service": "

Amazon DynamoDB is a fast, highly scalable, highly available, cost-effective non-relational database service.

Amazon DynamoDB removes traditional scalability limitations on data storage while maintaining low latency and predictable performance.

", - "shapes": { - "AttributeAction": { - "base": "

The type of action for an item update operation. Only use the add action for numbers or sets; the specified value is added to the existing value. If a set of values is specified, the values are added to the existing set. Adds the specified attribute. If the attribute exists, it is replaced by the new value. If no value is specified, this removes the attribute and its value. If a set of values is specified, then the values in the specified set are removed from the old set.

", - "refs": { - "AttributeValueUpdate$Action": null - } - }, - "AttributeMap": { - "base": null, - "refs": { - "DeleteItemOutput$Attributes": "

If the ReturnValues parameter is provided as ALL_OLD in the request, Amazon DynamoDB returns an array of attribute name-value pairs (essentially, the deleted item). Otherwise, the response contains an empty set.

", - "GetItemOutput$Item": "

Contains the requested attributes.

", - "ItemList$member": null, - "PutItemOutput$Attributes": "

Attribute values before the put operation, but only if the ReturnValues parameter is specified as ALL_OLD in the request.

", - "UpdateItemOutput$Attributes": "

A map of attribute name-value pairs, but only if the ReturnValues parameter is specified as something other than NONE in the request.

" - } - }, - "AttributeName": { - "base": null, - "refs": { - "AttributeMap$key": null, - "AttributeNameList$member": null, - "AttributeUpdates$key": null, - "ExpectedAttributeMap$key": null, - "PutItemInputAttributeMap$key": null - } - }, - "AttributeNameList": { - "base": "

List of Attribute names. If attribute names are not specified then all attributes will be returned. If some attributes are not found, they will not appear in the result.

", - "refs": { - "GetItemInput$AttributesToGet": null, - "KeysAndAttributes$AttributesToGet": null, - "QueryInput$AttributesToGet": null, - "ScanInput$AttributesToGet": null - } - }, - "AttributeUpdates": { - "base": "

Map of attribute name to the new value and action for the update. The attribute names specify the attributes to modify, and cannot contain any primary key attributes.

", - "refs": { - "UpdateItemInput$AttributeUpdates": null - } - }, - "AttributeValue": { - "base": "

AttributeValue can be String, Number, Binary, StringSet, NumberSet, BinarySet.

", - "refs": { - "AttributeMap$value": null, - "AttributeValueList$member": null, - "AttributeValueUpdate$Value": null, - "ExpectedAttributeValue$Value": "

Specify whether or not a value already exists and has a specific content for the attribute name-value pair.

", - "Key$HashKeyElement": "

A hash key element is treated as the primary key, and can be a string or a number. Single attribute primary keys have one index value. The value can be String, Number, StringSet, NumberSet.

", - "Key$RangeKeyElement": "

A range key element is treated as a secondary key (used in conjunction with the primary key), and can be a string or a number, and is only used for hash-and-range primary keys. The value can be String, Number, StringSet, NumberSet.

", - "PutItemInputAttributeMap$value": null, - "QueryInput$HashKeyValue": "

Attribute value of the hash component of the composite primary key.

" - } - }, - "AttributeValueList": { - "base": "

A list of attribute values to be used with a comparison operator for a scan or query operation. For comparisons that require more than one value, such as a BETWEEN comparison, the AttributeValueList contains two attribute values and the comparison operator.

", - "refs": { - "Condition$AttributeValueList": null - } - }, - "AttributeValueUpdate": { - "base": "

Specifies the attribute to update and how to perform the update. Possible values: PUT (default), ADD or DELETE.

", - "refs": { - "AttributeUpdates$value": null - } - }, - "BatchGetItemInput": { - "base": null, - "refs": { - } - }, - "BatchGetItemOutput": { - "base": null, - "refs": { - } - }, - "BatchGetRequestMap": { - "base": "

A map of the table name and corresponding items to get by primary key. While requesting items, each table name can be invoked only once per operation.

", - "refs": { - "BatchGetItemInput$RequestItems": null, - "BatchGetItemOutput$UnprocessedKeys": "

Contains a map of tables and their respective keys that were not processed with the current response, possibly due to reaching a limit on the response size. The UnprocessedKeys value is in the same form as a RequestItems parameter (so the value can be provided directly to a subsequent BatchGetItem operation). For more information, see the above RequestItems parameter.

" - } - }, - "BatchGetResponseMap": { - "base": "

Table names and the respective item attributes from the tables.

", - "refs": { - "BatchGetItemOutput$Responses": null - } - }, - "BatchResponse": { - "base": "

The item attributes from a response in a specific table, along with the read resources consumed on the table during the request.

", - "refs": { - "BatchGetResponseMap$value": null - } - }, - "BatchWriteItemInput": { - "base": null, - "refs": { - } - }, - "BatchWriteItemOutput": { - "base": "

A container for BatchWriteItem response

", - "refs": { - } - }, - "BatchWriteItemRequestMap": { - "base": "

A map of table name to list-of-write-requests.

Key: The table name corresponding to the list of requests

Value: Essentially a list of request items. Each request item could contain either a PutRequest or DeleteRequest. Never both.

", - "refs": { - "BatchWriteItemInput$RequestItems": "

A map of table name to list-of-write-requests. Used as input to the BatchWriteItem API call

", - "BatchWriteItemOutput$UnprocessedItems": "

The Items which we could not successfully process in a BatchWriteItem call is returned as UnprocessedItems

" - } - }, - "BatchWriteResponse": { - "base": null, - "refs": { - "BatchWriteResponseMap$value": null - } - }, - "BatchWriteResponseMap": { - "base": null, - "refs": { - "BatchWriteItemOutput$Responses": "

The response object as a result of BatchWriteItem call. This is essentially a map of table name to ConsumedCapacityUnits.

" - } - }, - "BinaryAttributeValue": { - "base": null, - "refs": { - "AttributeValue$B": "

Binary attributes are sequences of unsigned bytes.

", - "BinarySetAttributeValue$member": null - } - }, - "BinarySetAttributeValue": { - "base": null, - "refs": { - "AttributeValue$BS": "

A set of binary attributes.

" - } - }, - "BooleanObject": { - "base": null, - "refs": { - "ExpectedAttributeValue$Exists": "

Specify whether or not a value already exists for the attribute name-value pair.

", - "QueryInput$Count": "

If set to true, Amazon DynamoDB returns a total number of items that match the query parameters, instead of a list of the matching items and their attributes. Do not set Count to true while providing a list of AttributesToGet, otherwise Amazon DynamoDB returns a validation error.

", - "QueryInput$ScanIndexForward": "

Specifies forward or backward traversal of the index. Amazon DynamoDB returns results reflecting the requested order, determined by the range key. The default value is true (forward).

", - "ScanInput$Count": "

If set to true, Amazon DynamoDB returns a total number of items for the Scan operation, even if the operation has no matching items for the assigned filter. Do not set Count to true while providing a list of AttributesToGet, otherwise Amazon DynamoDB returns a validation error.

" - } - }, - "ComparisonOperator": { - "base": "

A comparison operator is an enumeration of several operations:

  • EQ for equal.
  • NE for not equal.
  • IN checks for exact matches.
  • LE for less than or equal to.
  • LT for less than.
  • GE for greater than or equal to.
  • GT for greater than.
  • BETWEEN for between.
  • NOT_NULL for exists.
  • NULL for not exists.
  • CONTAINS for substring or value in a set.
  • NOT_CONTAINS for absence of a substring or absence of a value in a set.
  • BEGINS_WITH for a substring prefix.

Scan operations support all available comparison operators.

Query operations support a subset of the available comparison operators: EQ, LE, LT, GE, GT, BETWEEN, and BEGINS_WITH.

", - "refs": { - "Condition$ComparisonOperator": null - } - }, - "Condition": { - "base": null, - "refs": { - "FilterConditionMap$value": null, - "QueryInput$RangeKeyCondition": "

A container for the attribute values and comparison operators to use for the query.

" - } - }, - "ConditionalCheckFailedException": { - "base": "

This exception is thrown when an expected value does not match what was found in the system.

", - "refs": { - } - }, - "ConsistentRead": { - "base": "

If set to true, then a consistent read is issued. Otherwise eventually-consistent is used.

", - "refs": { - "GetItemInput$ConsistentRead": null, - "KeysAndAttributes$ConsistentRead": null, - "QueryInput$ConsistentRead": null - } - }, - "ConsumedCapacityUnits": { - "base": "

The number of Capacity Units of the provisioned throughput of the table consumed during the operation. GetItem, BatchGetItem, BatchWriteItem, Query, and Scan operations consume ReadCapacityUnits, while PutItem, UpdateItem, and DeleteItem operations consume WriteCapacityUnits.

", - "refs": { - "BatchResponse$ConsumedCapacityUnits": null, - "BatchWriteResponse$ConsumedCapacityUnits": null, - "DeleteItemOutput$ConsumedCapacityUnits": null, - "GetItemOutput$ConsumedCapacityUnits": null, - "PutItemOutput$ConsumedCapacityUnits": null, - "QueryOutput$ConsumedCapacityUnits": null, - "ScanOutput$ConsumedCapacityUnits": null, - "UpdateItemOutput$ConsumedCapacityUnits": null - } - }, - "CreateTableInput": { - "base": null, - "refs": { - } - }, - "CreateTableOutput": { - "base": null, - "refs": { - } - }, - "Date": { - "base": null, - "refs": { - "ProvisionedThroughputDescription$LastIncreaseDateTime": null, - "ProvisionedThroughputDescription$LastDecreaseDateTime": null, - "TableDescription$CreationDateTime": null - } - }, - "DeleteItemInput": { - "base": null, - "refs": { - } - }, - "DeleteItemOutput": { - "base": null, - "refs": { - } - }, - "DeleteRequest": { - "base": "

A container for a Delete BatchWrite request

", - "refs": { - "WriteRequest$DeleteRequest": null - } - }, - "DeleteTableInput": { - "base": null, - "refs": { - } - }, - "DeleteTableOutput": { - "base": null, - "refs": { - } - }, - "DescribeTableInput": { - "base": null, - "refs": { - } - }, - "DescribeTableOutput": { - "base": null, - "refs": { - } - }, - "ErrorMessage": { - "base": null, - "refs": { - "ConditionalCheckFailedException$message": null, - "InternalServerError$message": null, - "LimitExceededException$message": null, - "ProvisionedThroughputExceededException$message": null, - "ResourceInUseException$message": null, - "ResourceNotFoundException$message": null - } - }, - "ExpectedAttributeMap": { - "base": "

Designates an attribute for a conditional modification. The Expected parameter allows you to provide an attribute name, and whether or not Amazon DynamoDB should check to see if the attribute has a particular value before modifying it.

", - "refs": { - "DeleteItemInput$Expected": null, - "PutItemInput$Expected": null, - "UpdateItemInput$Expected": null - } - }, - "ExpectedAttributeValue": { - "base": "

Allows you to provide an attribute name, and whether or not Amazon DynamoDB should check to see if the attribute value already exists; or if the attribute value exists and has a particular value before changing it.

", - "refs": { - "ExpectedAttributeMap$value": null - } - }, - "FilterConditionMap": { - "base": null, - "refs": { - "ScanInput$ScanFilter": "

Evaluates the scan results and returns only the desired values.

" - } - }, - "GetItemInput": { - "base": null, - "refs": { - } - }, - "GetItemOutput": { - "base": null, - "refs": { - } - }, - "Integer": { - "base": null, - "refs": { - "QueryOutput$Count": "

Number of items in the response.

", - "ScanOutput$Count": "

Number of items in the response.

", - "ScanOutput$ScannedCount": "

Number of items in the complete scan before any filters are applied. A high ScannedCount value with few, or no, Count results indicates an inefficient Scan operation.

" - } - }, - "InternalServerError": { - "base": "

This exception is thrown when the service has a problem when trying to process the request.

", - "refs": { - } - }, - "ItemList": { - "base": null, - "refs": { - "BatchResponse$Items": null, - "QueryOutput$Items": null, - "ScanOutput$Items": null - } - }, - "Key": { - "base": "

The primary key that uniquely identifies each item in a table. A primary key can be a one attribute (hash) primary key or a two attribute (hash-and-range) primary key.

", - "refs": { - "DeleteItemInput$Key": null, - "DeleteRequest$Key": "

The item's key to be delete

", - "GetItemInput$Key": null, - "KeyList$member": null, - "QueryInput$ExclusiveStartKey": "

Primary key of the item from which to continue an earlier query. An earlier query might provide this value as the LastEvaluatedKey if that query operation was interrupted before completing the query; either because of the result set size or the Limit parameter. The LastEvaluatedKey can be passed back in a new query request to continue the operation from that point.

", - "QueryOutput$LastEvaluatedKey": "

Primary key of the item where the query operation stopped, inclusive of the previous result set. Use this value to start a new operation excluding this value in the new request. The LastEvaluatedKey is null when the entire query result set is complete (i.e. the operation processed the \"last page\").

", - "ScanInput$ExclusiveStartKey": "

Primary key of the item from which to continue an earlier scan. An earlier scan might provide this value if that scan operation was interrupted before scanning the entire table; either because of the result set size or the Limit parameter. The LastEvaluatedKey can be passed back in a new scan request to continue the operation from that point.

", - "ScanOutput$LastEvaluatedKey": "

Primary key of the item where the scan operation stopped. Provide this value in a subsequent scan operation to continue the operation from that point. The LastEvaluatedKey is null when the entire scan result set is complete (i.e. the operation processed the \"last page\").

", - "UpdateItemInput$Key": null - } - }, - "KeyList": { - "base": null, - "refs": { - "KeysAndAttributes$Keys": null - } - }, - "KeySchema": { - "base": "

The KeySchema identifies the primary key as a one attribute primary key (hash) or a composite two attribute (hash-and-range) primary key. Single attribute primary keys have one index value: a HashKeyElement. A composite hash-and-range primary key contains two attribute values: a HashKeyElement and a RangeKeyElement.

", - "refs": { - "CreateTableInput$KeySchema": null, - "TableDescription$KeySchema": null - } - }, - "KeySchemaAttributeName": { - "base": null, - "refs": { - "KeySchemaElement$AttributeName": "

The AttributeName of the KeySchemaElement.

" - } - }, - "KeySchemaElement": { - "base": "

KeySchemaElement is the primary key (hash or hash-and-range) structure for the table.

", - "refs": { - "KeySchema$HashKeyElement": "

A hash key element is treated as the primary key, and can be a string or a number. Single attribute primary keys have one index value. The value can be String, Number, StringSet, NumberSet.

", - "KeySchema$RangeKeyElement": "

A range key element is treated as a secondary key (used in conjunction with the primary key), and can be a string or a number, and is only used for hash-and-range primary keys. The value can be String, Number, StringSet, NumberSet.

" - } - }, - "KeysAndAttributes": { - "base": null, - "refs": { - "BatchGetRequestMap$value": null - } - }, - "LimitExceededException": { - "base": "

This exception is thrown when the subscriber exceeded the limits on the number of objects or operations.

", - "refs": { - } - }, - "ListTablesInput": { - "base": null, - "refs": { - } - }, - "ListTablesInputLimit": { - "base": "

A number of maximum table names to return.

", - "refs": { - "ListTablesInput$Limit": null - } - }, - "ListTablesOutput": { - "base": null, - "refs": { - } - }, - "Long": { - "base": null, - "refs": { - "TableDescription$TableSizeBytes": null, - "TableDescription$ItemCount": null - } - }, - "NumberAttributeValue": { - "base": null, - "refs": { - "AttributeValue$N": "

Numbers are positive or negative exact-value decimals and integers. A number can have up to 38 digits precision and can be between 10^-128 to 10^+126.

", - "NumberSetAttributeValue$member": null - } - }, - "NumberSetAttributeValue": { - "base": null, - "refs": { - "AttributeValue$NS": "

A set of numbers.

" - } - }, - "PositiveIntegerObject": { - "base": null, - "refs": { - "QueryInput$Limit": "

The maximum number of items to return. If Amazon DynamoDB hits this limit while querying the table, it stops the query and returns the matching values up to the limit, and a LastEvaluatedKey to apply in a subsequent operation to continue the query. Also, if the result set size exceeds 1MB before Amazon DynamoDB hits this limit, it stops the query and returns the matching values, and a LastEvaluatedKey to apply in a subsequent operation to continue the query.

", - "ScanInput$Limit": "

The maximum number of items to return. If Amazon DynamoDB hits this limit while scanning the table, it stops the scan and returns the matching values up to the limit, and a LastEvaluatedKey to apply in a subsequent operation to continue the scan. Also, if the scanned data set size exceeds 1 MB before Amazon DynamoDB hits this limit, it stops the scan and returns the matching values up to the limit, and a LastEvaluatedKey to apply in a subsequent operation to continue the scan.

" - } - }, - "PositiveLongObject": { - "base": null, - "refs": { - "ProvisionedThroughput$ReadCapacityUnits": "

ReadCapacityUnits are in terms of strictly consistent reads, assuming items of 1k. 2k items require twice the ReadCapacityUnits. Eventually-consistent reads only require half the ReadCapacityUnits of stirctly consistent reads.

", - "ProvisionedThroughput$WriteCapacityUnits": "

WriteCapacityUnits are in terms of strictly consistent reads, assuming items of 1k. 2k items require twice the WriteCapacityUnits.

", - "ProvisionedThroughputDescription$NumberOfDecreasesToday": null, - "ProvisionedThroughputDescription$ReadCapacityUnits": null, - "ProvisionedThroughputDescription$WriteCapacityUnits": null - } - }, - "ProvisionedThroughput": { - "base": "

Provisioned throughput reserves the required read and write resources for your table in terms of ReadCapacityUnits and WriteCapacityUnits. Values for provisioned throughput depend upon your expected read/write rates, item size, and consistency. Provide the expected number of read and write operations, assuming an item size of 1k and strictly consistent reads. For 2k item size, double the value. For 3k, triple the value, etc. Eventually-consistent reads consume half the resources of strictly consistent reads.

", - "refs": { - "CreateTableInput$ProvisionedThroughput": null, - "UpdateTableInput$ProvisionedThroughput": null - } - }, - "ProvisionedThroughputDescription": { - "base": null, - "refs": { - "TableDescription$ProvisionedThroughput": null - } - }, - "ProvisionedThroughputExceededException": { - "base": "

This exception is thrown when the level of provisioned throughput defined for the table is exceeded.

", - "refs": { - } - }, - "PutItemInput": { - "base": null, - "refs": { - } - }, - "PutItemInputAttributeMap": { - "base": "

A map of the attributes for the item, and must include the primary key values that define the item. Other attribute name-value pairs can be provided for the item.

", - "refs": { - "PutItemInput$Item": null, - "PutRequest$Item": "

The item to put

" - } - }, - "PutItemOutput": { - "base": null, - "refs": { - } - }, - "PutRequest": { - "base": "

A container for a Put BatchWrite request

", - "refs": { - "WriteRequest$PutRequest": null - } - }, - "QueryInput": { - "base": null, - "refs": { - } - }, - "QueryOutput": { - "base": null, - "refs": { - } - }, - "ResourceInUseException": { - "base": "

This exception is thrown when the resource which is being attempted to be changed is in use.

", - "refs": { - } - }, - "ResourceNotFoundException": { - "base": "

This exception is thrown when the resource which is being attempted to be changed is in use.

", - "refs": { - } - }, - "ReturnValue": { - "base": "

Use this parameter if you want to get the attribute name-value pairs before or after they are modified. For PUT operations, the possible parameter values are NONE (default) or ALL_OLD. For update operations, the possible parameter values are NONE (default) or ALL_OLD, UPDATED_OLD, ALL_NEW or UPDATED_NEW.

  • NONE: Nothing is returned.
  • ALL_OLD: Returns the attributes of the item as they were before the operation.
  • UPDATED_OLD: Returns the values of the updated attributes, only, as they were before the operation.
  • ALL_NEW: Returns all the attributes and their new values after the operation.
  • UPDATED_NEW: Returns the values of the updated attributes, only, as they are after the operation.
", - "refs": { - "DeleteItemInput$ReturnValues": null, - "PutItemInput$ReturnValues": null, - "UpdateItemInput$ReturnValues": null - } - }, - "ScalarAttributeType": { - "base": null, - "refs": { - "KeySchemaElement$AttributeType": "

The AttributeType of the KeySchemaElement which can be a String or a Number.

" - } - }, - "ScanInput": { - "base": null, - "refs": { - } - }, - "ScanOutput": { - "base": null, - "refs": { - } - }, - "String": { - "base": null, - "refs": { - "FilterConditionMap$key": null - } - }, - "StringAttributeValue": { - "base": null, - "refs": { - "AttributeValue$S": "

Strings are Unicode with UTF-8 binary encoding. The maximum size is limited by the size of the primary key (1024 bytes as a range part of a key or 2048 bytes as a single part hash key) or the item size (64k).

", - "StringSetAttributeValue$member": null - } - }, - "StringSetAttributeValue": { - "base": null, - "refs": { - "AttributeValue$SS": "

A set of strings.

" - } - }, - "TableDescription": { - "base": null, - "refs": { - "CreateTableOutput$TableDescription": null, - "DeleteTableOutput$TableDescription": null, - "DescribeTableOutput$Table": null, - "UpdateTableOutput$TableDescription": null - } - }, - "TableName": { - "base": null, - "refs": { - "BatchGetRequestMap$key": null, - "BatchGetResponseMap$key": null, - "BatchWriteItemRequestMap$key": null, - "BatchWriteResponseMap$key": null, - "CreateTableInput$TableName": "

The name of the table you want to create. Allowed characters are a-z, A-Z, 0-9, _ (underscore), - (hyphen) and . (period).

", - "DeleteItemInput$TableName": "

The name of the table in which you want to delete an item. Allowed characters are a-z, A-Z, 0-9, _ (underscore), - (hyphen) and . (period).

", - "DeleteTableInput$TableName": "

The name of the table you want to delete. Allowed characters are a-z, A-Z, 0-9, _ (underscore), - (hyphen) and . (period).

", - "DescribeTableInput$TableName": "

The name of the table you want to describe. Allowed characters are a-z, A-Z, 0-9, _ (underscore), - (hyphen) and . (period).

", - "GetItemInput$TableName": "

The name of the table in which you want to get an item. Allowed characters are a-z, A-Z, 0-9, _ (underscore), - (hyphen) and . (period).

", - "ListTablesInput$ExclusiveStartTableName": "

The name of the table that starts the list. If you already ran a ListTables operation and received a LastEvaluatedTableName value in the response, use that value here to continue the list.

", - "ListTablesOutput$LastEvaluatedTableName": "

The name of the last table in the current list. Use this value as the ExclusiveStartTableName in a new request to continue the list until all the table names are returned. If this value is null, all table names have been returned.

", - "PutItemInput$TableName": "

The name of the table in which you want to put an item. Allowed characters are a-z, A-Z, 0-9, _ (underscore), - (hyphen) and . (period).

", - "QueryInput$TableName": "

The name of the table in which you want to query. Allowed characters are a-z, A-Z, 0-9, _ (underscore), - (hyphen) and . (period).

", - "ScanInput$TableName": "

The name of the table in which you want to scan. Allowed characters are a-z, A-Z, 0-9, _ (underscore), - (hyphen) and . (period).

", - "TableDescription$TableName": "

The name of the table being described.

", - "TableNameList$member": null, - "UpdateItemInput$TableName": "

The name of the table in which you want to update an item. Allowed characters are a-z, A-Z, 0-9, _ (underscore), - (hyphen) and . (period).

", - "UpdateTableInput$TableName": "

The name of the table you want to update. Allowed characters are a-z, A-Z, 0-9, _ (underscore), - (hyphen) and . (period).

" - } - }, - "TableNameList": { - "base": null, - "refs": { - "ListTablesOutput$TableNames": null - } - }, - "TableStatus": { - "base": null, - "refs": { - "TableDescription$TableStatus": null - } - }, - "UpdateItemInput": { - "base": null, - "refs": { - } - }, - "UpdateItemOutput": { - "base": null, - "refs": { - } - }, - "UpdateTableInput": { - "base": null, - "refs": { - } - }, - "UpdateTableOutput": { - "base": null, - "refs": { - } - }, - "WriteRequest": { - "base": "

This structure is a Union of PutRequest and DeleteRequest. It can contain exactly one of PutRequest or DeleteRequest. Never Both. This is enforced in the code.

", - "refs": { - "WriteRequests$member": null - } - }, - "WriteRequests": { - "base": null, - "refs": { - "BatchWriteItemRequestMap$value": null - } - } - } -} diff --git a/aws-sdk-core/apis/dynamodb/2011-12-05/paginators-1.json b/aws-sdk-core/apis/dynamodb/2011-12-05/paginators-1.json deleted file mode 100644 index d4075e12072..00000000000 --- a/aws-sdk-core/apis/dynamodb/2011-12-05/paginators-1.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "pagination": { - "BatchGetItem": { - "input_token": "RequestItems", - "output_token": "UnprocessedKeys" - }, - "ListTables": { - "input_token": "ExclusiveStartTableName", - "output_token": "LastEvaluatedTableName", - "limit_key": "Limit", - "result_key": "TableNames" - }, - "Query": { - "input_token": "ExclusiveStartKey", - "output_token": "LastEvaluatedKey", - "limit_key": "Limit", - "result_key": "Items" - }, - "Scan": { - "input_token": "ExclusiveStartKey", - "output_token": "LastEvaluatedKey", - "limit_key": "Limit", - "result_key": "Items" - } - } -} diff --git a/aws-sdk-core/apis/dynamodb/2011-12-05/waiters-2.json b/aws-sdk-core/apis/dynamodb/2011-12-05/waiters-2.json deleted file mode 100644 index 43a55ca7bd9..00000000000 --- a/aws-sdk-core/apis/dynamodb/2011-12-05/waiters-2.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "version": 2, - "waiters": { - "TableExists": { - "delay": 20, - "operation": "DescribeTable", - "maxAttempts": 25, - "acceptors": [ - { - "expected": "ACTIVE", - "matcher": "path", - "state": "success", - "argument": "Table.TableStatus" - }, - { - "expected": "ResourceNotFoundException", - "matcher": "error", - "state": "retry" - } - ] - }, - "TableNotExists": { - "delay": 20, - "operation": "DescribeTable", - "maxAttempts": 25, - "acceptors": [ - { - "expected": "ResourceNotFoundException", - "matcher": "error", - "state": "success" - } - ] - } - } -} diff --git a/aws-sdk-core/apis/ec2/2014-10-01/api-2.json b/aws-sdk-core/apis/ec2/2014-10-01/api-2.json deleted file mode 100644 index bb625f0b33d..00000000000 --- a/aws-sdk-core/apis/ec2/2014-10-01/api-2.json +++ /dev/null @@ -1,10267 +0,0 @@ -{ - "version":"2.0", - "metadata":{ - "apiVersion":"2014-10-01", - "endpointPrefix":"ec2", - "serviceAbbreviation":"Amazon EC2", - "serviceFullName":"Amazon Elastic Compute Cloud", - "signatureVersion":"v4", - "xmlNamespace":"http://ec2.amazonaws.com/doc/2014-10-01", - "protocol":"ec2" - }, - "operations":{ - "AcceptVpcPeeringConnection":{ - "name":"AcceptVpcPeeringConnection", - "http":{ - "method":"POST", - "requestUri":"/" - }, - "input":{"shape":"AcceptVpcPeeringConnectionRequest"}, - "output":{"shape":"AcceptVpcPeeringConnectionResult"} - }, - "AllocateAddress":{ - "name":"AllocateAddress", - "http":{ - "method":"POST", - "requestUri":"/" - }, - "input":{"shape":"AllocateAddressRequest"}, - "output":{"shape":"AllocateAddressResult"} - }, - "AssignPrivateIpAddresses":{ - "name":"AssignPrivateIpAddresses", - "http":{ - "method":"POST", - "requestUri":"/" - }, - "input":{"shape":"AssignPrivateIpAddressesRequest"} - }, - "AssociateAddress":{ - "name":"AssociateAddress", - "http":{ - "method":"POST", - "requestUri":"/" - }, - "input":{"shape":"AssociateAddressRequest"}, - "output":{"shape":"AssociateAddressResult"} - }, - "AssociateDhcpOptions":{ - "name":"AssociateDhcpOptions", - "http":{ - "method":"POST", - "requestUri":"/" - }, - "input":{"shape":"AssociateDhcpOptionsRequest"} - }, - "AssociateRouteTable":{ - "name":"AssociateRouteTable", - "http":{ - "method":"POST", - "requestUri":"/" - }, - "input":{"shape":"AssociateRouteTableRequest"}, - "output":{"shape":"AssociateRouteTableResult"} - }, - "AttachClassicLinkVpc":{ - "name":"AttachClassicLinkVpc", - "http":{ - "method":"POST", - "requestUri":"/" - }, - "input":{"shape":"AttachClassicLinkVpcRequest"}, - "output":{"shape":"AttachClassicLinkVpcResult"} - }, - "AttachInternetGateway":{ - "name":"AttachInternetGateway", - "http":{ - "method":"POST", - "requestUri":"/" - }, - "input":{"shape":"AttachInternetGatewayRequest"} - }, - "AttachNetworkInterface":{ - "name":"AttachNetworkInterface", - "http":{ - "method":"POST", - "requestUri":"/" - }, - "input":{"shape":"AttachNetworkInterfaceRequest"}, - "output":{"shape":"AttachNetworkInterfaceResult"} - }, - "AttachVolume":{ - "name":"AttachVolume", - "http":{ - "method":"POST", - "requestUri":"/" - }, - "input":{"shape":"AttachVolumeRequest"}, - "output":{ - "shape":"VolumeAttachment", - "locationName":"attachment" - } - }, - "AttachVpnGateway":{ - "name":"AttachVpnGateway", - "http":{ - "method":"POST", - "requestUri":"/" - }, - "input":{"shape":"AttachVpnGatewayRequest"}, - "output":{"shape":"AttachVpnGatewayResult"} - }, - "AuthorizeSecurityGroupEgress":{ - "name":"AuthorizeSecurityGroupEgress", - "http":{ - "method":"POST", - "requestUri":"/" - }, - "input":{"shape":"AuthorizeSecurityGroupEgressRequest"} - }, - "AuthorizeSecurityGroupIngress":{ - "name":"AuthorizeSecurityGroupIngress", - "http":{ - "method":"POST", - "requestUri":"/" - }, - "input":{"shape":"AuthorizeSecurityGroupIngressRequest"} - }, - "BundleInstance":{ - "name":"BundleInstance", - "http":{ - "method":"POST", - "requestUri":"/" - }, - "input":{"shape":"BundleInstanceRequest"}, - "output":{"shape":"BundleInstanceResult"} - }, - "CancelBundleTask":{ - "name":"CancelBundleTask", - "http":{ - "method":"POST", - "requestUri":"/" - }, - "input":{"shape":"CancelBundleTaskRequest"}, - "output":{"shape":"CancelBundleTaskResult"} - }, - "CancelConversionTask":{ - "name":"CancelConversionTask", - "http":{ - "method":"POST", - "requestUri":"/" - }, - "input":{"shape":"CancelConversionRequest"} - }, - "CancelExportTask":{ - "name":"CancelExportTask", - "http":{ - "method":"POST", - "requestUri":"/" - }, - "input":{"shape":"CancelExportTaskRequest"} - }, - "CancelReservedInstancesListing":{ - "name":"CancelReservedInstancesListing", - "http":{ - "method":"POST", - "requestUri":"/" - }, - "input":{"shape":"CancelReservedInstancesListingRequest"}, - "output":{"shape":"CancelReservedInstancesListingResult"} - }, - "CancelSpotInstanceRequests":{ - "name":"CancelSpotInstanceRequests", - "http":{ - "method":"POST", - "requestUri":"/" - }, - "input":{"shape":"CancelSpotInstanceRequestsRequest"}, - "output":{"shape":"CancelSpotInstanceRequestsResult"} - }, - "ConfirmProductInstance":{ - "name":"ConfirmProductInstance", - "http":{ - "method":"POST", - "requestUri":"/" - }, - "input":{"shape":"ConfirmProductInstanceRequest"}, - "output":{"shape":"ConfirmProductInstanceResult"} - }, - "CopyImage":{ - "name":"CopyImage", - "http":{ - "method":"POST", - "requestUri":"/" - }, - "input":{"shape":"CopyImageRequest"}, - "output":{"shape":"CopyImageResult"} - }, - "CopySnapshot":{ - "name":"CopySnapshot", - "http":{ - "method":"POST", - "requestUri":"/" - }, - "input":{"shape":"CopySnapshotRequest"}, - "output":{"shape":"CopySnapshotResult"} - }, - "CreateCustomerGateway":{ - "name":"CreateCustomerGateway", - "http":{ - "method":"POST", - "requestUri":"/" - }, - "input":{"shape":"CreateCustomerGatewayRequest"}, - "output":{"shape":"CreateCustomerGatewayResult"} - }, - "CreateDhcpOptions":{ - "name":"CreateDhcpOptions", - "http":{ - "method":"POST", - "requestUri":"/" - }, - "input":{"shape":"CreateDhcpOptionsRequest"}, - "output":{"shape":"CreateDhcpOptionsResult"} - }, - "CreateImage":{ - "name":"CreateImage", - "http":{ - "method":"POST", - "requestUri":"/" - }, - "input":{"shape":"CreateImageRequest"}, - "output":{"shape":"CreateImageResult"} - }, - "CreateInstanceExportTask":{ - "name":"CreateInstanceExportTask", - "http":{ - "method":"POST", - "requestUri":"/" - }, - "input":{"shape":"CreateInstanceExportTaskRequest"}, - "output":{"shape":"CreateInstanceExportTaskResult"} - }, - "CreateInternetGateway":{ - "name":"CreateInternetGateway", - "http":{ - "method":"POST", - "requestUri":"/" - }, - "input":{"shape":"CreateInternetGatewayRequest"}, - "output":{"shape":"CreateInternetGatewayResult"} - }, - "CreateKeyPair":{ - "name":"CreateKeyPair", - "http":{ - "method":"POST", - "requestUri":"/" - }, - "input":{"shape":"CreateKeyPairRequest"}, - "output":{ - "shape":"KeyPair", - "locationName":"keyPair" - } - }, - "CreateNetworkAcl":{ - "name":"CreateNetworkAcl", - "http":{ - "method":"POST", - "requestUri":"/" - }, - "input":{"shape":"CreateNetworkAclRequest"}, - "output":{"shape":"CreateNetworkAclResult"} - }, - "CreateNetworkAclEntry":{ - "name":"CreateNetworkAclEntry", - "http":{ - "method":"POST", - "requestUri":"/" - }, - "input":{"shape":"CreateNetworkAclEntryRequest"} - }, - "CreateNetworkInterface":{ - "name":"CreateNetworkInterface", - "http":{ - "method":"POST", - "requestUri":"/" - }, - "input":{"shape":"CreateNetworkInterfaceRequest"}, - "output":{"shape":"CreateNetworkInterfaceResult"} - }, - "CreatePlacementGroup":{ - "name":"CreatePlacementGroup", - "http":{ - "method":"POST", - "requestUri":"/" - }, - "input":{"shape":"CreatePlacementGroupRequest"} - }, - "CreateReservedInstancesListing":{ - "name":"CreateReservedInstancesListing", - "http":{ - "method":"POST", - "requestUri":"/" - }, - "input":{"shape":"CreateReservedInstancesListingRequest"}, - "output":{"shape":"CreateReservedInstancesListingResult"} - }, - "CreateRoute":{ - "name":"CreateRoute", - "http":{ - "method":"POST", - "requestUri":"/" - }, - "input":{"shape":"CreateRouteRequest"} - }, - "CreateRouteTable":{ - "name":"CreateRouteTable", - "http":{ - "method":"POST", - "requestUri":"/" - }, - "input":{"shape":"CreateRouteTableRequest"}, - "output":{"shape":"CreateRouteTableResult"} - }, - "CreateSecurityGroup":{ - "name":"CreateSecurityGroup", - "http":{ - "method":"POST", - "requestUri":"/" - }, - "input":{"shape":"CreateSecurityGroupRequest"}, - "output":{"shape":"CreateSecurityGroupResult"} - }, - "CreateSnapshot":{ - "name":"CreateSnapshot", - "http":{ - "method":"POST", - "requestUri":"/" - }, - "input":{"shape":"CreateSnapshotRequest"}, - "output":{ - "shape":"Snapshot", - "locationName":"snapshot" - } - }, - "CreateSpotDatafeedSubscription":{ - "name":"CreateSpotDatafeedSubscription", - "http":{ - "method":"POST", - "requestUri":"/" - }, - "input":{"shape":"CreateSpotDatafeedSubscriptionRequest"}, - "output":{"shape":"CreateSpotDatafeedSubscriptionResult"} - }, - "CreateSubnet":{ - "name":"CreateSubnet", - "http":{ - "method":"POST", - "requestUri":"/" - }, - "input":{"shape":"CreateSubnetRequest"}, - "output":{"shape":"CreateSubnetResult"} - }, - "CreateTags":{ - "name":"CreateTags", - "http":{ - "method":"POST", - "requestUri":"/" - }, - "input":{"shape":"CreateTagsRequest"} - }, - "CreateVolume":{ - "name":"CreateVolume", - "http":{ - "method":"POST", - "requestUri":"/" - }, - "input":{"shape":"CreateVolumeRequest"}, - "output":{ - "shape":"Volume", - "locationName":"volume" - } - }, - "CreateVpc":{ - "name":"CreateVpc", - "http":{ - "method":"POST", - "requestUri":"/" - }, - "input":{"shape":"CreateVpcRequest"}, - "output":{"shape":"CreateVpcResult"} - }, - "CreateVpcPeeringConnection":{ - "name":"CreateVpcPeeringConnection", - "http":{ - "method":"POST", - "requestUri":"/" - }, - "input":{"shape":"CreateVpcPeeringConnectionRequest"}, - "output":{"shape":"CreateVpcPeeringConnectionResult"} - }, - "CreateVpnConnection":{ - "name":"CreateVpnConnection", - "http":{ - "method":"POST", - "requestUri":"/" - }, - "input":{"shape":"CreateVpnConnectionRequest"}, - "output":{"shape":"CreateVpnConnectionResult"} - }, - "CreateVpnConnectionRoute":{ - "name":"CreateVpnConnectionRoute", - "http":{ - "method":"POST", - "requestUri":"/" - }, - "input":{"shape":"CreateVpnConnectionRouteRequest"} - }, - "CreateVpnGateway":{ - "name":"CreateVpnGateway", - "http":{ - "method":"POST", - "requestUri":"/" - }, - "input":{"shape":"CreateVpnGatewayRequest"}, - "output":{"shape":"CreateVpnGatewayResult"} - }, - "DeleteCustomerGateway":{ - "name":"DeleteCustomerGateway", - "http":{ - "method":"POST", - "requestUri":"/" - }, - "input":{"shape":"DeleteCustomerGatewayRequest"} - }, - "DeleteDhcpOptions":{ - "name":"DeleteDhcpOptions", - "http":{ - "method":"POST", - "requestUri":"/" - }, - "input":{"shape":"DeleteDhcpOptionsRequest"} - }, - "DeleteInternetGateway":{ - "name":"DeleteInternetGateway", - "http":{ - "method":"POST", - "requestUri":"/" - }, - "input":{"shape":"DeleteInternetGatewayRequest"} - }, - "DeleteKeyPair":{ - "name":"DeleteKeyPair", - "http":{ - "method":"POST", - "requestUri":"/" - }, - "input":{"shape":"DeleteKeyPairRequest"} - }, - "DeleteNetworkAcl":{ - "name":"DeleteNetworkAcl", - "http":{ - "method":"POST", - "requestUri":"/" - }, - "input":{"shape":"DeleteNetworkAclRequest"} - }, - "DeleteNetworkAclEntry":{ - "name":"DeleteNetworkAclEntry", - "http":{ - "method":"POST", - "requestUri":"/" - }, - "input":{"shape":"DeleteNetworkAclEntryRequest"} - }, - "DeleteNetworkInterface":{ - "name":"DeleteNetworkInterface", - "http":{ - "method":"POST", - "requestUri":"/" - }, - "input":{"shape":"DeleteNetworkInterfaceRequest"} - }, - "DeletePlacementGroup":{ - "name":"DeletePlacementGroup", - "http":{ - "method":"POST", - "requestUri":"/" - }, - "input":{"shape":"DeletePlacementGroupRequest"} - }, - "DeleteRoute":{ - "name":"DeleteRoute", - "http":{ - "method":"POST", - "requestUri":"/" - }, - "input":{"shape":"DeleteRouteRequest"} - }, - "DeleteRouteTable":{ - "name":"DeleteRouteTable", - "http":{ - "method":"POST", - "requestUri":"/" - }, - "input":{"shape":"DeleteRouteTableRequest"} - }, - "DeleteSecurityGroup":{ - "name":"DeleteSecurityGroup", - "http":{ - "method":"POST", - "requestUri":"/" - }, - "input":{"shape":"DeleteSecurityGroupRequest"} - }, - "DeleteSnapshot":{ - "name":"DeleteSnapshot", - "http":{ - "method":"POST", - "requestUri":"/" - }, - "input":{"shape":"DeleteSnapshotRequest"} - }, - "DeleteSpotDatafeedSubscription":{ - "name":"DeleteSpotDatafeedSubscription", - "http":{ - "method":"POST", - "requestUri":"/" - }, - "input":{"shape":"DeleteSpotDatafeedSubscriptionRequest"} - }, - "DeleteSubnet":{ - "name":"DeleteSubnet", - "http":{ - "method":"POST", - "requestUri":"/" - }, - "input":{"shape":"DeleteSubnetRequest"} - }, - "DeleteTags":{ - "name":"DeleteTags", - "http":{ - "method":"POST", - "requestUri":"/" - }, - "input":{"shape":"DeleteTagsRequest"} - }, - "DeleteVolume":{ - "name":"DeleteVolume", - "http":{ - "method":"POST", - "requestUri":"/" - }, - "input":{"shape":"DeleteVolumeRequest"} - }, - "DeleteVpc":{ - "name":"DeleteVpc", - "http":{ - "method":"POST", - "requestUri":"/" - }, - "input":{"shape":"DeleteVpcRequest"} - }, - "DeleteVpcPeeringConnection":{ - "name":"DeleteVpcPeeringConnection", - "http":{ - "method":"POST", - "requestUri":"/" - }, - "input":{"shape":"DeleteVpcPeeringConnectionRequest"}, - "output":{"shape":"DeleteVpcPeeringConnectionResult"} - }, - "DeleteVpnConnection":{ - "name":"DeleteVpnConnection", - "http":{ - "method":"POST", - "requestUri":"/" - }, - "input":{"shape":"DeleteVpnConnectionRequest"} - }, - "DeleteVpnConnectionRoute":{ - "name":"DeleteVpnConnectionRoute", - "http":{ - "method":"POST", - "requestUri":"/" - }, - "input":{"shape":"DeleteVpnConnectionRouteRequest"} - }, - "DeleteVpnGateway":{ - "name":"DeleteVpnGateway", - "http":{ - "method":"POST", - "requestUri":"/" - }, - "input":{"shape":"DeleteVpnGatewayRequest"} - }, - "DeregisterImage":{ - "name":"DeregisterImage", - "http":{ - "method":"POST", - "requestUri":"/" - }, - "input":{"shape":"DeregisterImageRequest"} - }, - "DescribeAccountAttributes":{ - "name":"DescribeAccountAttributes", - "http":{ - "method":"POST", - "requestUri":"/" - }, - "input":{"shape":"DescribeAccountAttributesRequest"}, - "output":{"shape":"DescribeAccountAttributesResult"} - }, - "DescribeAddresses":{ - "name":"DescribeAddresses", - "http":{ - "method":"POST", - "requestUri":"/" - }, - "input":{"shape":"DescribeAddressesRequest"}, - "output":{"shape":"DescribeAddressesResult"} - }, - "DescribeAvailabilityZones":{ - "name":"DescribeAvailabilityZones", - "http":{ - "method":"POST", - "requestUri":"/" - }, - "input":{"shape":"DescribeAvailabilityZonesRequest"}, - "output":{"shape":"DescribeAvailabilityZonesResult"} - }, - "DescribeBundleTasks":{ - "name":"DescribeBundleTasks", - "http":{ - "method":"POST", - "requestUri":"/" - }, - "input":{"shape":"DescribeBundleTasksRequest"}, - "output":{"shape":"DescribeBundleTasksResult"} - }, - "DescribeClassicLinkInstances":{ - "name":"DescribeClassicLinkInstances", - "http":{ - "method":"POST", - "requestUri":"/" - }, - "input":{"shape":"DescribeClassicLinkInstancesRequest"}, - "output":{"shape":"DescribeClassicLinkInstancesResult"} - }, - "DescribeConversionTasks":{ - "name":"DescribeConversionTasks", - "http":{ - "method":"POST", - "requestUri":"/" - }, - "input":{"shape":"DescribeConversionTasksRequest"}, - "output":{"shape":"DescribeConversionTasksResult"} - }, - "DescribeCustomerGateways":{ - "name":"DescribeCustomerGateways", - "http":{ - "method":"POST", - "requestUri":"/" - }, - "input":{"shape":"DescribeCustomerGatewaysRequest"}, - "output":{"shape":"DescribeCustomerGatewaysResult"} - }, - "DescribeDhcpOptions":{ - "name":"DescribeDhcpOptions", - "http":{ - "method":"POST", - "requestUri":"/" - }, - "input":{"shape":"DescribeDhcpOptionsRequest"}, - "output":{"shape":"DescribeDhcpOptionsResult"} - }, - "DescribeExportTasks":{ - "name":"DescribeExportTasks", - "http":{ - "method":"POST", - "requestUri":"/" - }, - "input":{"shape":"DescribeExportTasksRequest"}, - "output":{"shape":"DescribeExportTasksResult"} - }, - "DescribeImageAttribute":{ - "name":"DescribeImageAttribute", - "http":{ - "method":"POST", - "requestUri":"/" - }, - "input":{"shape":"DescribeImageAttributeRequest"}, - "output":{ - "shape":"ImageAttribute", - "locationName":"imageAttribute" - } - }, - "DescribeImages":{ - "name":"DescribeImages", - "http":{ - "method":"POST", - "requestUri":"/" - }, - "input":{"shape":"DescribeImagesRequest"}, - "output":{"shape":"DescribeImagesResult"} - }, - "DescribeInstanceAttribute":{ - "name":"DescribeInstanceAttribute", - "http":{ - "method":"POST", - "requestUri":"/" - }, - "input":{"shape":"DescribeInstanceAttributeRequest"}, - "output":{"shape":"InstanceAttribute"} - }, - "DescribeInstanceStatus":{ - "name":"DescribeInstanceStatus", - "http":{ - "method":"POST", - "requestUri":"/" - }, - "input":{"shape":"DescribeInstanceStatusRequest"}, - "output":{"shape":"DescribeInstanceStatusResult"} - }, - "DescribeInstances":{ - "name":"DescribeInstances", - "http":{ - "method":"POST", - "requestUri":"/" - }, - "input":{"shape":"DescribeInstancesRequest"}, - "output":{"shape":"DescribeInstancesResult"} - }, - "DescribeInternetGateways":{ - "name":"DescribeInternetGateways", - "http":{ - "method":"POST", - "requestUri":"/" - }, - "input":{"shape":"DescribeInternetGatewaysRequest"}, - "output":{"shape":"DescribeInternetGatewaysResult"} - }, - "DescribeKeyPairs":{ - "name":"DescribeKeyPairs", - "http":{ - "method":"POST", - "requestUri":"/" - }, - "input":{"shape":"DescribeKeyPairsRequest"}, - "output":{"shape":"DescribeKeyPairsResult"} - }, - "DescribeNetworkAcls":{ - "name":"DescribeNetworkAcls", - "http":{ - "method":"POST", - "requestUri":"/" - }, - "input":{"shape":"DescribeNetworkAclsRequest"}, - "output":{"shape":"DescribeNetworkAclsResult"} - }, - "DescribeNetworkInterfaceAttribute":{ - "name":"DescribeNetworkInterfaceAttribute", - "http":{ - "method":"POST", - "requestUri":"/" - }, - "input":{"shape":"DescribeNetworkInterfaceAttributeRequest"}, - "output":{"shape":"DescribeNetworkInterfaceAttributeResult"} - }, - "DescribeNetworkInterfaces":{ - "name":"DescribeNetworkInterfaces", - "http":{ - "method":"POST", - "requestUri":"/" - }, - "input":{"shape":"DescribeNetworkInterfacesRequest"}, - "output":{"shape":"DescribeNetworkInterfacesResult"} - }, - "DescribePlacementGroups":{ - "name":"DescribePlacementGroups", - "http":{ - "method":"POST", - "requestUri":"/" - }, - "input":{"shape":"DescribePlacementGroupsRequest"}, - "output":{"shape":"DescribePlacementGroupsResult"} - }, - "DescribeRegions":{ - "name":"DescribeRegions", - "http":{ - "method":"POST", - "requestUri":"/" - }, - "input":{"shape":"DescribeRegionsRequest"}, - "output":{"shape":"DescribeRegionsResult"} - }, - "DescribeReservedInstances":{ - "name":"DescribeReservedInstances", - "http":{ - "method":"POST", - "requestUri":"/" - }, - "input":{"shape":"DescribeReservedInstancesRequest"}, - "output":{"shape":"DescribeReservedInstancesResult"} - }, - "DescribeReservedInstancesListings":{ - "name":"DescribeReservedInstancesListings", - "http":{ - "method":"POST", - "requestUri":"/" - }, - "input":{"shape":"DescribeReservedInstancesListingsRequest"}, - "output":{"shape":"DescribeReservedInstancesListingsResult"} - }, - "DescribeReservedInstancesModifications":{ - "name":"DescribeReservedInstancesModifications", - "http":{ - "method":"POST", - "requestUri":"/" - }, - "input":{"shape":"DescribeReservedInstancesModificationsRequest"}, - "output":{"shape":"DescribeReservedInstancesModificationsResult"} - }, - "DescribeReservedInstancesOfferings":{ - "name":"DescribeReservedInstancesOfferings", - "http":{ - "method":"POST", - "requestUri":"/" - }, - "input":{"shape":"DescribeReservedInstancesOfferingsRequest"}, - "output":{"shape":"DescribeReservedInstancesOfferingsResult"} - }, - "DescribeRouteTables":{ - "name":"DescribeRouteTables", - "http":{ - "method":"POST", - "requestUri":"/" - }, - "input":{"shape":"DescribeRouteTablesRequest"}, - "output":{"shape":"DescribeRouteTablesResult"} - }, - "DescribeSecurityGroups":{ - "name":"DescribeSecurityGroups", - "http":{ - "method":"POST", - "requestUri":"/" - }, - "input":{"shape":"DescribeSecurityGroupsRequest"}, - "output":{"shape":"DescribeSecurityGroupsResult"} - }, - "DescribeSnapshotAttribute":{ - "name":"DescribeSnapshotAttribute", - "http":{ - "method":"POST", - "requestUri":"/" - }, - "input":{"shape":"DescribeSnapshotAttributeRequest"}, - "output":{"shape":"DescribeSnapshotAttributeResult"} - }, - "DescribeSnapshots":{ - "name":"DescribeSnapshots", - "http":{ - "method":"POST", - "requestUri":"/" - }, - "input":{"shape":"DescribeSnapshotsRequest"}, - "output":{"shape":"DescribeSnapshotsResult"} - }, - "DescribeSpotDatafeedSubscription":{ - "name":"DescribeSpotDatafeedSubscription", - "http":{ - "method":"POST", - "requestUri":"/" - }, - "input":{"shape":"DescribeSpotDatafeedSubscriptionRequest"}, - "output":{"shape":"DescribeSpotDatafeedSubscriptionResult"} - }, - "DescribeSpotInstanceRequests":{ - "name":"DescribeSpotInstanceRequests", - "http":{ - "method":"POST", - "requestUri":"/" - }, - "input":{"shape":"DescribeSpotInstanceRequestsRequest"}, - "output":{"shape":"DescribeSpotInstanceRequestsResult"} - }, - "DescribeSpotPriceHistory":{ - "name":"DescribeSpotPriceHistory", - "http":{ - "method":"POST", - "requestUri":"/" - }, - "input":{"shape":"DescribeSpotPriceHistoryRequest"}, - "output":{"shape":"DescribeSpotPriceHistoryResult"} - }, - "DescribeSubnets":{ - "name":"DescribeSubnets", - "http":{ - "method":"POST", - "requestUri":"/" - }, - "input":{"shape":"DescribeSubnetsRequest"}, - "output":{"shape":"DescribeSubnetsResult"} - }, - "DescribeTags":{ - "name":"DescribeTags", - "http":{ - "method":"POST", - "requestUri":"/" - }, - "input":{"shape":"DescribeTagsRequest"}, - "output":{"shape":"DescribeTagsResult"} - }, - "DescribeVolumeAttribute":{ - "name":"DescribeVolumeAttribute", - "http":{ - "method":"POST", - "requestUri":"/" - }, - "input":{"shape":"DescribeVolumeAttributeRequest"}, - "output":{"shape":"DescribeVolumeAttributeResult"} - }, - "DescribeVolumeStatus":{ - "name":"DescribeVolumeStatus", - "http":{ - "method":"POST", - "requestUri":"/" - }, - "input":{"shape":"DescribeVolumeStatusRequest"}, - "output":{"shape":"DescribeVolumeStatusResult"} - }, - "DescribeVolumes":{ - "name":"DescribeVolumes", - "http":{ - "method":"POST", - "requestUri":"/" - }, - "input":{"shape":"DescribeVolumesRequest"}, - "output":{"shape":"DescribeVolumesResult"} - }, - "DescribeVpcAttribute":{ - "name":"DescribeVpcAttribute", - "http":{ - "method":"POST", - "requestUri":"/" - }, - "input":{"shape":"DescribeVpcAttributeRequest"}, - "output":{"shape":"DescribeVpcAttributeResult"} - }, - "DescribeVpcClassicLink":{ - "name":"DescribeVpcClassicLink", - "http":{ - "method":"POST", - "requestUri":"/" - }, - "input":{"shape":"DescribeVpcClassicLinkRequest"}, - "output":{"shape":"DescribeVpcClassicLinkResult"} - }, - "DescribeVpcPeeringConnections":{ - "name":"DescribeVpcPeeringConnections", - "http":{ - "method":"POST", - "requestUri":"/" - }, - "input":{"shape":"DescribeVpcPeeringConnectionsRequest"}, - "output":{"shape":"DescribeVpcPeeringConnectionsResult"} - }, - "DescribeVpcs":{ - "name":"DescribeVpcs", - "http":{ - "method":"POST", - "requestUri":"/" - }, - "input":{"shape":"DescribeVpcsRequest"}, - "output":{"shape":"DescribeVpcsResult"} - }, - "DescribeVpnConnections":{ - "name":"DescribeVpnConnections", - "http":{ - "method":"POST", - "requestUri":"/" - }, - "input":{"shape":"DescribeVpnConnectionsRequest"}, - "output":{"shape":"DescribeVpnConnectionsResult"} - }, - "DescribeVpnGateways":{ - "name":"DescribeVpnGateways", - "http":{ - "method":"POST", - "requestUri":"/" - }, - "input":{"shape":"DescribeVpnGatewaysRequest"}, - "output":{"shape":"DescribeVpnGatewaysResult"} - }, - "DetachClassicLinkVpc":{ - "name":"DetachClassicLinkVpc", - "http":{ - "method":"POST", - "requestUri":"/" - }, - "input":{"shape":"DetachClassicLinkVpcRequest"}, - "output":{"shape":"DetachClassicLinkVpcResult"} - }, - "DetachInternetGateway":{ - "name":"DetachInternetGateway", - "http":{ - "method":"POST", - "requestUri":"/" - }, - "input":{"shape":"DetachInternetGatewayRequest"} - }, - "DetachNetworkInterface":{ - "name":"DetachNetworkInterface", - "http":{ - "method":"POST", - "requestUri":"/" - }, - "input":{"shape":"DetachNetworkInterfaceRequest"} - }, - "DetachVolume":{ - "name":"DetachVolume", - "http":{ - "method":"POST", - "requestUri":"/" - }, - "input":{"shape":"DetachVolumeRequest"}, - "output":{ - "shape":"VolumeAttachment", - "locationName":"attachment" - } - }, - "DetachVpnGateway":{ - "name":"DetachVpnGateway", - "http":{ - "method":"POST", - "requestUri":"/" - }, - "input":{"shape":"DetachVpnGatewayRequest"} - }, - "DisableVgwRoutePropagation":{ - "name":"DisableVgwRoutePropagation", - "http":{ - "method":"POST", - "requestUri":"/" - }, - "input":{"shape":"DisableVgwRoutePropagationRequest"} - }, - "DisableVpcClassicLink":{ - "name":"DisableVpcClassicLink", - "http":{ - "method":"POST", - "requestUri":"/" - }, - "input":{"shape":"DisableVpcClassicLinkRequest"}, - "output":{"shape":"DisableVpcClassicLinkResult"} - }, - "DisassociateAddress":{ - "name":"DisassociateAddress", - "http":{ - "method":"POST", - "requestUri":"/" - }, - "input":{"shape":"DisassociateAddressRequest"} - }, - "DisassociateRouteTable":{ - "name":"DisassociateRouteTable", - "http":{ - "method":"POST", - "requestUri":"/" - }, - "input":{"shape":"DisassociateRouteTableRequest"} - }, - "EnableVgwRoutePropagation":{ - "name":"EnableVgwRoutePropagation", - "http":{ - "method":"POST", - "requestUri":"/" - }, - "input":{"shape":"EnableVgwRoutePropagationRequest"} - }, - "EnableVolumeIO":{ - "name":"EnableVolumeIO", - "http":{ - "method":"POST", - "requestUri":"/" - }, - "input":{"shape":"EnableVolumeIORequest"} - }, - "EnableVpcClassicLink":{ - "name":"EnableVpcClassicLink", - "http":{ - "method":"POST", - "requestUri":"/" - }, - "input":{"shape":"EnableVpcClassicLinkRequest"}, - "output":{"shape":"EnableVpcClassicLinkResult"} - }, - "GetConsoleOutput":{ - "name":"GetConsoleOutput", - "http":{ - "method":"POST", - "requestUri":"/" - }, - "input":{"shape":"GetConsoleOutputRequest"}, - "output":{"shape":"GetConsoleOutputResult"} - }, - "GetPasswordData":{ - "name":"GetPasswordData", - "http":{ - "method":"POST", - "requestUri":"/" - }, - "input":{"shape":"GetPasswordDataRequest"}, - "output":{"shape":"GetPasswordDataResult"} - }, - "ImportInstance":{ - "name":"ImportInstance", - "http":{ - "method":"POST", - "requestUri":"/" - }, - "input":{"shape":"ImportInstanceRequest"}, - "output":{"shape":"ImportInstanceResult"} - }, - "ImportKeyPair":{ - "name":"ImportKeyPair", - "http":{ - "method":"POST", - "requestUri":"/" - }, - "input":{"shape":"ImportKeyPairRequest"}, - "output":{"shape":"ImportKeyPairResult"} - }, - "ImportVolume":{ - "name":"ImportVolume", - "http":{ - "method":"POST", - "requestUri":"/" - }, - "input":{"shape":"ImportVolumeRequest"}, - "output":{"shape":"ImportVolumeResult"} - }, - "ModifyImageAttribute":{ - "name":"ModifyImageAttribute", - "http":{ - "method":"POST", - "requestUri":"/" - }, - "input":{"shape":"ModifyImageAttributeRequest"} - }, - "ModifyInstanceAttribute":{ - "name":"ModifyInstanceAttribute", - "http":{ - "method":"POST", - "requestUri":"/" - }, - "input":{"shape":"ModifyInstanceAttributeRequest"} - }, - "ModifyNetworkInterfaceAttribute":{ - "name":"ModifyNetworkInterfaceAttribute", - "http":{ - "method":"POST", - "requestUri":"/" - }, - "input":{"shape":"ModifyNetworkInterfaceAttributeRequest"} - }, - "ModifyReservedInstances":{ - "name":"ModifyReservedInstances", - "http":{ - "method":"POST", - "requestUri":"/" - }, - "input":{"shape":"ModifyReservedInstancesRequest"}, - "output":{"shape":"ModifyReservedInstancesResult"} - }, - "ModifySnapshotAttribute":{ - "name":"ModifySnapshotAttribute", - "http":{ - "method":"POST", - "requestUri":"/" - }, - "input":{"shape":"ModifySnapshotAttributeRequest"} - }, - "ModifySubnetAttribute":{ - "name":"ModifySubnetAttribute", - "http":{ - "method":"POST", - "requestUri":"/" - }, - "input":{"shape":"ModifySubnetAttributeRequest"} - }, - "ModifyVolumeAttribute":{ - "name":"ModifyVolumeAttribute", - "http":{ - "method":"POST", - "requestUri":"/" - }, - "input":{"shape":"ModifyVolumeAttributeRequest"} - }, - "ModifyVpcAttribute":{ - "name":"ModifyVpcAttribute", - "http":{ - "method":"POST", - "requestUri":"/" - }, - "input":{"shape":"ModifyVpcAttributeRequest"} - }, - "MonitorInstances":{ - "name":"MonitorInstances", - "http":{ - "method":"POST", - "requestUri":"/" - }, - "input":{"shape":"MonitorInstancesRequest"}, - "output":{"shape":"MonitorInstancesResult"} - }, - "PurchaseReservedInstancesOffering":{ - "name":"PurchaseReservedInstancesOffering", - "http":{ - "method":"POST", - "requestUri":"/" - }, - "input":{"shape":"PurchaseReservedInstancesOfferingRequest"}, - "output":{"shape":"PurchaseReservedInstancesOfferingResult"} - }, - "RebootInstances":{ - "name":"RebootInstances", - "http":{ - "method":"POST", - "requestUri":"/" - }, - "input":{"shape":"RebootInstancesRequest"} - }, - "RegisterImage":{ - "name":"RegisterImage", - "http":{ - "method":"POST", - "requestUri":"/" - }, - "input":{"shape":"RegisterImageRequest"}, - "output":{"shape":"RegisterImageResult"} - }, - "RejectVpcPeeringConnection":{ - "name":"RejectVpcPeeringConnection", - "http":{ - "method":"POST", - "requestUri":"/" - }, - "input":{"shape":"RejectVpcPeeringConnectionRequest"}, - "output":{"shape":"RejectVpcPeeringConnectionResult"} - }, - "ReleaseAddress":{ - "name":"ReleaseAddress", - "http":{ - "method":"POST", - "requestUri":"/" - }, - "input":{"shape":"ReleaseAddressRequest"} - }, - "ReplaceNetworkAclAssociation":{ - "name":"ReplaceNetworkAclAssociation", - "http":{ - "method":"POST", - "requestUri":"/" - }, - "input":{"shape":"ReplaceNetworkAclAssociationRequest"}, - "output":{"shape":"ReplaceNetworkAclAssociationResult"} - }, - "ReplaceNetworkAclEntry":{ - "name":"ReplaceNetworkAclEntry", - "http":{ - "method":"POST", - "requestUri":"/" - }, - "input":{"shape":"ReplaceNetworkAclEntryRequest"} - }, - "ReplaceRoute":{ - "name":"ReplaceRoute", - "http":{ - "method":"POST", - "requestUri":"/" - }, - "input":{"shape":"ReplaceRouteRequest"} - }, - "ReplaceRouteTableAssociation":{ - "name":"ReplaceRouteTableAssociation", - "http":{ - "method":"POST", - "requestUri":"/" - }, - "input":{"shape":"ReplaceRouteTableAssociationRequest"}, - "output":{"shape":"ReplaceRouteTableAssociationResult"} - }, - "ReportInstanceStatus":{ - "name":"ReportInstanceStatus", - "http":{ - "method":"POST", - "requestUri":"/" - }, - "input":{"shape":"ReportInstanceStatusRequest"} - }, - "RequestSpotInstances":{ - "name":"RequestSpotInstances", - "http":{ - "method":"POST", - "requestUri":"/" - }, - "input":{"shape":"RequestSpotInstancesRequest"}, - "output":{"shape":"RequestSpotInstancesResult"} - }, - "ResetImageAttribute":{ - "name":"ResetImageAttribute", - "http":{ - "method":"POST", - "requestUri":"/" - }, - "input":{"shape":"ResetImageAttributeRequest"} - }, - "ResetInstanceAttribute":{ - "name":"ResetInstanceAttribute", - "http":{ - "method":"POST", - "requestUri":"/" - }, - "input":{"shape":"ResetInstanceAttributeRequest"} - }, - "ResetNetworkInterfaceAttribute":{ - "name":"ResetNetworkInterfaceAttribute", - "http":{ - "method":"POST", - "requestUri":"/" - }, - "input":{"shape":"ResetNetworkInterfaceAttributeRequest"} - }, - "ResetSnapshotAttribute":{ - "name":"ResetSnapshotAttribute", - "http":{ - "method":"POST", - "requestUri":"/" - }, - "input":{"shape":"ResetSnapshotAttributeRequest"} - }, - "RevokeSecurityGroupEgress":{ - "name":"RevokeSecurityGroupEgress", - "http":{ - "method":"POST", - "requestUri":"/" - }, - "input":{"shape":"RevokeSecurityGroupEgressRequest"} - }, - "RevokeSecurityGroupIngress":{ - "name":"RevokeSecurityGroupIngress", - "http":{ - "method":"POST", - "requestUri":"/" - }, - "input":{"shape":"RevokeSecurityGroupIngressRequest"} - }, - "RunInstances":{ - "name":"RunInstances", - "http":{ - "method":"POST", - "requestUri":"/" - }, - "input":{"shape":"RunInstancesRequest"}, - "output":{ - "shape":"Reservation", - "locationName":"reservation" - } - }, - "StartInstances":{ - "name":"StartInstances", - "http":{ - "method":"POST", - "requestUri":"/" - }, - "input":{"shape":"StartInstancesRequest"}, - "output":{"shape":"StartInstancesResult"} - }, - "StopInstances":{ - "name":"StopInstances", - "http":{ - "method":"POST", - "requestUri":"/" - }, - "input":{"shape":"StopInstancesRequest"}, - "output":{"shape":"StopInstancesResult"} - }, - "TerminateInstances":{ - "name":"TerminateInstances", - "http":{ - "method":"POST", - "requestUri":"/" - }, - "input":{"shape":"TerminateInstancesRequest"}, - "output":{"shape":"TerminateInstancesResult"} - }, - "UnassignPrivateIpAddresses":{ - "name":"UnassignPrivateIpAddresses", - "http":{ - "method":"POST", - "requestUri":"/" - }, - "input":{"shape":"UnassignPrivateIpAddressesRequest"} - }, - "UnmonitorInstances":{ - "name":"UnmonitorInstances", - "http":{ - "method":"POST", - "requestUri":"/" - }, - "input":{"shape":"UnmonitorInstancesRequest"}, - "output":{"shape":"UnmonitorInstancesResult"} - } - }, - "shapes":{ - "AcceptVpcPeeringConnectionRequest":{ - "type":"structure", - "members":{ - "DryRun":{ - "shape":"Boolean", - "locationName":"dryRun" - }, - "VpcPeeringConnectionId":{ - "shape":"String", - "locationName":"vpcPeeringConnectionId" - } - } - }, - "AcceptVpcPeeringConnectionResult":{ - "type":"structure", - "members":{ - "VpcPeeringConnection":{ - "shape":"VpcPeeringConnection", - "locationName":"vpcPeeringConnection" - } - } - }, - "AccountAttribute":{ - "type":"structure", - "members":{ - "AttributeName":{ - "shape":"String", - "locationName":"attributeName" - }, - "AttributeValues":{ - "shape":"AccountAttributeValueList", - "locationName":"attributeValueSet" - } - } - }, - "AccountAttributeList":{ - "type":"list", - "member":{ - "shape":"AccountAttribute", - "locationName":"item" - } - }, - "AccountAttributeName":{ - "type":"string", - "enum":[ - "supported-platforms", - "default-vpc" - ] - }, - "AccountAttributeNameStringList":{ - "type":"list", - "member":{ - "shape":"AccountAttributeName", - "locationName":"attributeName" - } - }, - "AccountAttributeValue":{ - "type":"structure", - "members":{ - "AttributeValue":{ - "shape":"String", - "locationName":"attributeValue" - } - } - }, - "AccountAttributeValueList":{ - "type":"list", - "member":{ - "shape":"AccountAttributeValue", - "locationName":"item" - } - }, - "Address":{ - "type":"structure", - "members":{ - "InstanceId":{ - "shape":"String", - "locationName":"instanceId" - }, - "PublicIp":{ - "shape":"String", - "locationName":"publicIp" - }, - "AllocationId":{ - "shape":"String", - "locationName":"allocationId" - }, - "AssociationId":{ - "shape":"String", - "locationName":"associationId" - }, - "Domain":{ - "shape":"DomainType", - "locationName":"domain" - }, - "NetworkInterfaceId":{ - "shape":"String", - "locationName":"networkInterfaceId" - }, - "NetworkInterfaceOwnerId":{ - "shape":"String", - "locationName":"networkInterfaceOwnerId" - }, - "PrivateIpAddress":{ - "shape":"String", - "locationName":"privateIpAddress" - } - } - }, - "AddressList":{ - "type":"list", - "member":{ - "shape":"Address", - "locationName":"item" - } - }, - "AllocateAddressRequest":{ - "type":"structure", - "members":{ - "DryRun":{ - "shape":"Boolean", - "locationName":"dryRun" - }, - "Domain":{"shape":"DomainType"} - } - }, - "AllocateAddressResult":{ - "type":"structure", - "members":{ - "PublicIp":{ - "shape":"String", - "locationName":"publicIp" - }, - "Domain":{ - "shape":"DomainType", - "locationName":"domain" - }, - "AllocationId":{ - "shape":"String", - "locationName":"allocationId" - } - } - }, - "AllocationIdList":{ - "type":"list", - "member":{ - "shape":"String", - "locationName":"AllocationId" - } - }, - "ArchitectureValues":{ - "type":"string", - "enum":[ - "i386", - "x86_64" - ] - }, - "AssignPrivateIpAddressesRequest":{ - "type":"structure", - "required":["NetworkInterfaceId"], - "members":{ - "NetworkInterfaceId":{ - "shape":"String", - "locationName":"networkInterfaceId" - }, - "PrivateIpAddresses":{ - "shape":"PrivateIpAddressStringList", - "locationName":"privateIpAddress" - }, - "SecondaryPrivateIpAddressCount":{ - "shape":"Integer", - "locationName":"secondaryPrivateIpAddressCount" - }, - "AllowReassignment":{ - "shape":"Boolean", - "locationName":"allowReassignment" - } - } - }, - "AssociateAddressRequest":{ - "type":"structure", - "members":{ - "DryRun":{ - "shape":"Boolean", - "locationName":"dryRun" - }, - "InstanceId":{"shape":"String"}, - "PublicIp":{"shape":"String"}, - "AllocationId":{"shape":"String"}, - "NetworkInterfaceId":{ - "shape":"String", - "locationName":"networkInterfaceId" - }, - "PrivateIpAddress":{ - "shape":"String", - "locationName":"privateIpAddress" - }, - "AllowReassociation":{ - "shape":"Boolean", - "locationName":"allowReassociation" - } - } - }, - "AssociateAddressResult":{ - "type":"structure", - "members":{ - "AssociationId":{ - "shape":"String", - "locationName":"associationId" - } - } - }, - "AssociateDhcpOptionsRequest":{ - "type":"structure", - "required":[ - "DhcpOptionsId", - "VpcId" - ], - "members":{ - "DryRun":{ - "shape":"Boolean", - "locationName":"dryRun" - }, - "DhcpOptionsId":{"shape":"String"}, - "VpcId":{"shape":"String"} - } - }, - "AssociateRouteTableRequest":{ - "type":"structure", - "required":[ - "SubnetId", - "RouteTableId" - ], - "members":{ - "DryRun":{ - "shape":"Boolean", - "locationName":"dryRun" - }, - "SubnetId":{ - "shape":"String", - "locationName":"subnetId" - }, - "RouteTableId":{ - "shape":"String", - "locationName":"routeTableId" - } - } - }, - "AssociateRouteTableResult":{ - "type":"structure", - "members":{ - "AssociationId":{ - "shape":"String", - "locationName":"associationId" - } - } - }, - "AttachClassicLinkVpcRequest":{ - "type":"structure", - "required":[ - "InstanceId", - "VpcId", - "Groups" - ], - "members":{ - "DryRun":{ - "shape":"Boolean", - "locationName":"dryRun" - }, - "InstanceId":{ - "shape":"String", - "locationName":"instanceId" - }, - "VpcId":{ - "shape":"String", - "locationName":"vpcId" - }, - "Groups":{ - "shape":"GroupIdStringList", - "locationName":"SecurityGroupId" - } - } - }, - "AttachClassicLinkVpcResult":{ - "type":"structure", - "members":{ - "Return":{ - "shape":"Boolean", - "locationName":"return" - } - } - }, - "AttachInternetGatewayRequest":{ - "type":"structure", - "required":[ - "InternetGatewayId", - "VpcId" - ], - "members":{ - "DryRun":{ - "shape":"Boolean", - "locationName":"dryRun" - }, - "InternetGatewayId":{ - "shape":"String", - "locationName":"internetGatewayId" - }, - "VpcId":{ - "shape":"String", - "locationName":"vpcId" - } - } - }, - "AttachNetworkInterfaceRequest":{ - "type":"structure", - "required":[ - "NetworkInterfaceId", - "InstanceId", - "DeviceIndex" - ], - "members":{ - "DryRun":{ - "shape":"Boolean", - "locationName":"dryRun" - }, - "NetworkInterfaceId":{ - "shape":"String", - "locationName":"networkInterfaceId" - }, - "InstanceId":{ - "shape":"String", - "locationName":"instanceId" - }, - "DeviceIndex":{ - "shape":"Integer", - "locationName":"deviceIndex" - } - } - }, - "AttachNetworkInterfaceResult":{ - "type":"structure", - "members":{ - "AttachmentId":{ - "shape":"String", - "locationName":"attachmentId" - } - } - }, - "AttachVolumeRequest":{ - "type":"structure", - "required":[ - "VolumeId", - "InstanceId", - "Device" - ], - "members":{ - "DryRun":{ - "shape":"Boolean", - "locationName":"dryRun" - }, - "VolumeId":{"shape":"String"}, - "InstanceId":{"shape":"String"}, - "Device":{"shape":"String"} - } - }, - "AttachVpnGatewayRequest":{ - "type":"structure", - "required":[ - "VpnGatewayId", - "VpcId" - ], - "members":{ - "DryRun":{ - "shape":"Boolean", - "locationName":"dryRun" - }, - "VpnGatewayId":{"shape":"String"}, - "VpcId":{"shape":"String"} - } - }, - "AttachVpnGatewayResult":{ - "type":"structure", - "members":{ - "VpcAttachment":{ - "shape":"VpcAttachment", - "locationName":"attachment" - } - } - }, - "AttachmentStatus":{ - "type":"string", - "enum":[ - "attaching", - "attached", - "detaching", - "detached" - ] - }, - "AttributeBooleanValue":{ - "type":"structure", - "members":{ - "Value":{ - "shape":"Boolean", - "locationName":"value" - } - } - }, - "AttributeValue":{ - "type":"structure", - "members":{ - "Value":{ - "shape":"String", - "locationName":"value" - } - } - }, - "AuthorizeSecurityGroupEgressRequest":{ - "type":"structure", - "required":["GroupId"], - "members":{ - "DryRun":{ - "shape":"Boolean", - "locationName":"dryRun" - }, - "GroupId":{ - "shape":"String", - "locationName":"groupId" - }, - "SourceSecurityGroupName":{ - "shape":"String", - "locationName":"sourceSecurityGroupName" - }, - "SourceSecurityGroupOwnerId":{ - "shape":"String", - "locationName":"sourceSecurityGroupOwnerId" - }, - "IpProtocol":{ - "shape":"String", - "locationName":"ipProtocol" - }, - "FromPort":{ - "shape":"Integer", - "locationName":"fromPort" - }, - "ToPort":{ - "shape":"Integer", - "locationName":"toPort" - }, - "CidrIp":{ - "shape":"String", - "locationName":"cidrIp" - }, - "IpPermissions":{ - "shape":"IpPermissionList", - "locationName":"ipPermissions" - } - } - }, - "AuthorizeSecurityGroupIngressRequest":{ - "type":"structure", - "members":{ - "DryRun":{ - "shape":"Boolean", - "locationName":"dryRun" - }, - "GroupName":{"shape":"String"}, - "GroupId":{"shape":"String"}, - "SourceSecurityGroupName":{"shape":"String"}, - "SourceSecurityGroupOwnerId":{"shape":"String"}, - "IpProtocol":{"shape":"String"}, - "FromPort":{"shape":"Integer"}, - "ToPort":{"shape":"Integer"}, - "CidrIp":{"shape":"String"}, - "IpPermissions":{"shape":"IpPermissionList"} - } - }, - "AvailabilityZone":{ - "type":"structure", - "members":{ - "ZoneName":{ - "shape":"String", - "locationName":"zoneName" - }, - "State":{ - "shape":"AvailabilityZoneState", - "locationName":"zoneState" - }, - "RegionName":{ - "shape":"String", - "locationName":"regionName" - }, - "Messages":{ - "shape":"AvailabilityZoneMessageList", - "locationName":"messageSet" - } - } - }, - "AvailabilityZoneList":{ - "type":"list", - "member":{ - "shape":"AvailabilityZone", - "locationName":"item" - } - }, - "AvailabilityZoneMessage":{ - "type":"structure", - "members":{ - "Message":{ - "shape":"String", - "locationName":"message" - } - } - }, - "AvailabilityZoneMessageList":{ - "type":"list", - "member":{ - "shape":"AvailabilityZoneMessage", - "locationName":"item" - } - }, - "AvailabilityZoneState":{ - "type":"string", - "enum":["available"] - }, - "BlockDeviceMapping":{ - "type":"structure", - "members":{ - "VirtualName":{ - "shape":"String", - "locationName":"virtualName" - }, - "DeviceName":{ - "shape":"String", - "locationName":"deviceName" - }, - "Ebs":{ - "shape":"EbsBlockDevice", - "locationName":"ebs" - }, - "NoDevice":{ - "shape":"String", - "locationName":"noDevice" - } - } - }, - "BlockDeviceMappingList":{ - "type":"list", - "member":{ - "shape":"BlockDeviceMapping", - "locationName":"item" - } - }, - "BlockDeviceMappingRequestList":{ - "type":"list", - "member":{ - "shape":"BlockDeviceMapping", - "locationName":"BlockDeviceMapping" - } - }, - "Boolean":{"type":"boolean"}, - "BundleIdStringList":{ - "type":"list", - "member":{ - "shape":"String", - "locationName":"BundleId" - } - }, - "BundleInstanceRequest":{ - "type":"structure", - "required":[ - "InstanceId", - "Storage" - ], - "members":{ - "DryRun":{ - "shape":"Boolean", - "locationName":"dryRun" - }, - "InstanceId":{"shape":"String"}, - "Storage":{"shape":"Storage"} - } - }, - "BundleInstanceResult":{ - "type":"structure", - "members":{ - "BundleTask":{ - "shape":"BundleTask", - "locationName":"bundleInstanceTask" - } - } - }, - "BundleTask":{ - "type":"structure", - "members":{ - "InstanceId":{ - "shape":"String", - "locationName":"instanceId" - }, - "BundleId":{ - "shape":"String", - "locationName":"bundleId" - }, - "State":{ - "shape":"BundleTaskState", - "locationName":"state" - }, - "StartTime":{ - "shape":"DateTime", - "locationName":"startTime" - }, - "UpdateTime":{ - "shape":"DateTime", - "locationName":"updateTime" - }, - "Storage":{ - "shape":"Storage", - "locationName":"storage" - }, - "Progress":{ - "shape":"String", - "locationName":"progress" - }, - "BundleTaskError":{ - "shape":"BundleTaskError", - "locationName":"error" - } - } - }, - "BundleTaskError":{ - "type":"structure", - "members":{ - "Code":{ - "shape":"String", - "locationName":"code" - }, - "Message":{ - "shape":"String", - "locationName":"message" - } - } - }, - "BundleTaskList":{ - "type":"list", - "member":{ - "shape":"BundleTask", - "locationName":"item" - } - }, - "BundleTaskState":{ - "type":"string", - "enum":[ - "pending", - "waiting-for-shutdown", - "bundling", - "storing", - "cancelling", - "complete", - "failed" - ] - }, - "CancelBundleTaskRequest":{ - "type":"structure", - "required":["BundleId"], - "members":{ - "DryRun":{ - "shape":"Boolean", - "locationName":"dryRun" - }, - "BundleId":{"shape":"String"} - } - }, - "CancelBundleTaskResult":{ - "type":"structure", - "members":{ - "BundleTask":{ - "shape":"BundleTask", - "locationName":"bundleInstanceTask" - } - } - }, - "CancelConversionRequest":{ - "type":"structure", - "required":["ConversionTaskId"], - "members":{ - "DryRun":{ - "shape":"Boolean", - "locationName":"dryRun" - }, - "ConversionTaskId":{ - "shape":"String", - "locationName":"conversionTaskId" - }, - "ReasonMessage":{ - "shape":"String", - "locationName":"reasonMessage" - } - } - }, - "CancelExportTaskRequest":{ - "type":"structure", - "required":["ExportTaskId"], - "members":{ - "ExportTaskId":{ - "shape":"String", - "locationName":"exportTaskId" - } - } - }, - "CancelReservedInstancesListingRequest":{ - "type":"structure", - "required":["ReservedInstancesListingId"], - "members":{ - "ReservedInstancesListingId":{ - "shape":"String", - "locationName":"reservedInstancesListingId" - } - } - }, - "CancelReservedInstancesListingResult":{ - "type":"structure", - "members":{ - "ReservedInstancesListings":{ - "shape":"ReservedInstancesListingList", - "locationName":"reservedInstancesListingsSet" - } - } - }, - "CancelSpotInstanceRequestState":{ - "type":"string", - "enum":[ - "active", - "open", - "closed", - "cancelled", - "completed" - ] - }, - "CancelSpotInstanceRequestsRequest":{ - "type":"structure", - "required":["SpotInstanceRequestIds"], - "members":{ - "DryRun":{ - "shape":"Boolean", - "locationName":"dryRun" - }, - "SpotInstanceRequestIds":{ - "shape":"SpotInstanceRequestIdList", - "locationName":"SpotInstanceRequestId" - } - } - }, - "CancelSpotInstanceRequestsResult":{ - "type":"structure", - "members":{ - "CancelledSpotInstanceRequests":{ - "shape":"CancelledSpotInstanceRequestList", - "locationName":"spotInstanceRequestSet" - } - } - }, - "CancelledSpotInstanceRequest":{ - "type":"structure", - "members":{ - "SpotInstanceRequestId":{ - "shape":"String", - "locationName":"spotInstanceRequestId" - }, - "State":{ - "shape":"CancelSpotInstanceRequestState", - "locationName":"state" - } - } - }, - "CancelledSpotInstanceRequestList":{ - "type":"list", - "member":{ - "shape":"CancelledSpotInstanceRequest", - "locationName":"item" - } - }, - "ClassicLinkInstance":{ - "type":"structure", - "members":{ - "InstanceId":{ - "shape":"String", - "locationName":"instanceId" - }, - "VpcId":{ - "shape":"String", - "locationName":"vpcId" - }, - "Groups":{ - "shape":"GroupIdentifierList", - "locationName":"groupSet" - }, - "Tags":{ - "shape":"TagList", - "locationName":"tagSet" - } - } - }, - "ClassicLinkInstanceList":{ - "type":"list", - "member":{ - "shape":"ClassicLinkInstance", - "locationName":"item" - } - }, - "ConfirmProductInstanceRequest":{ - "type":"structure", - "required":[ - "ProductCode", - "InstanceId" - ], - "members":{ - "DryRun":{ - "shape":"Boolean", - "locationName":"dryRun" - }, - "ProductCode":{"shape":"String"}, - "InstanceId":{"shape":"String"} - } - }, - "ConfirmProductInstanceResult":{ - "type":"structure", - "members":{ - "OwnerId":{ - "shape":"String", - "locationName":"ownerId" - } - } - }, - "ContainerFormat":{ - "type":"string", - "enum":["ova"] - }, - "ConversionIdStringList":{ - "type":"list", - "member":{ - "shape":"String", - "locationName":"item" - } - }, - "ConversionTask":{ - "type":"structure", - "required":[ - "ConversionTaskId", - "State" - ], - "members":{ - "ConversionTaskId":{ - "shape":"String", - "locationName":"conversionTaskId" - }, - "ExpirationTime":{ - "shape":"String", - "locationName":"expirationTime" - }, - "ImportInstance":{ - "shape":"ImportInstanceTaskDetails", - "locationName":"importInstance" - }, - "ImportVolume":{ - "shape":"ImportVolumeTaskDetails", - "locationName":"importVolume" - }, - "State":{ - "shape":"ConversionTaskState", - "locationName":"state" - }, - "StatusMessage":{ - "shape":"String", - "locationName":"statusMessage" - }, - "Tags":{ - "shape":"TagList", - "locationName":"tagSet" - } - } - }, - "ConversionTaskState":{ - "type":"string", - "enum":[ - "active", - "cancelling", - "cancelled", - "completed" - ] - }, - "CopyImageRequest":{ - "type":"structure", - "required":[ - "SourceRegion", - "SourceImageId", - "Name" - ], - "members":{ - "DryRun":{ - "shape":"Boolean", - "locationName":"dryRun" - }, - "SourceRegion":{"shape":"String"}, - "SourceImageId":{"shape":"String"}, - "Name":{"shape":"String"}, - "Description":{"shape":"String"}, - "ClientToken":{"shape":"String"} - } - }, - "CopyImageResult":{ - "type":"structure", - "members":{ - "ImageId":{ - "shape":"String", - "locationName":"imageId" - } - } - }, - "CopySnapshotRequest":{ - "type":"structure", - "required":[ - "SourceRegion", - "SourceSnapshotId" - ], - "members":{ - "DryRun":{ - "shape":"Boolean", - "locationName":"dryRun" - }, - "SourceRegion":{"shape":"String"}, - "SourceSnapshotId":{"shape":"String"}, - "Description":{"shape":"String"}, - "DestinationRegion":{ - "shape":"String", - "locationName":"destinationRegion" - }, - "PresignedUrl":{ - "shape":"String", - "locationName":"presignedUrl" - } - } - }, - "CopySnapshotResult":{ - "type":"structure", - "members":{ - "SnapshotId":{ - "shape":"String", - "locationName":"snapshotId" - } - } - }, - "CreateCustomerGatewayRequest":{ - "type":"structure", - "required":[ - "Type", - "PublicIp", - "BgpAsn" - ], - "members":{ - "DryRun":{ - "shape":"Boolean", - "locationName":"dryRun" - }, - "Type":{"shape":"GatewayType"}, - "PublicIp":{ - "shape":"String", - "locationName":"IpAddress" - }, - "BgpAsn":{"shape":"Integer"} - } - }, - "CreateCustomerGatewayResult":{ - "type":"structure", - "members":{ - "CustomerGateway":{ - "shape":"CustomerGateway", - "locationName":"customerGateway" - } - } - }, - "CreateDhcpOptionsRequest":{ - "type":"structure", - "required":["DhcpConfigurations"], - "members":{ - "DryRun":{ - "shape":"Boolean", - "locationName":"dryRun" - }, - "DhcpConfigurations":{ - "shape":"NewDhcpConfigurationList", - "locationName":"dhcpConfiguration" - } - } - }, - "CreateDhcpOptionsResult":{ - "type":"structure", - "members":{ - "DhcpOptions":{ - "shape":"DhcpOptions", - "locationName":"dhcpOptions" - } - } - }, - "CreateImageRequest":{ - "type":"structure", - "required":[ - "InstanceId", - "Name" - ], - "members":{ - "DryRun":{ - "shape":"Boolean", - "locationName":"dryRun" - }, - "InstanceId":{ - "shape":"String", - "locationName":"instanceId" - }, - "Name":{ - "shape":"String", - "locationName":"name" - }, - "Description":{ - "shape":"String", - "locationName":"description" - }, - "NoReboot":{ - "shape":"Boolean", - "locationName":"noReboot" - }, - "BlockDeviceMappings":{ - "shape":"BlockDeviceMappingRequestList", - "locationName":"blockDeviceMapping" - } - } - }, - "CreateImageResult":{ - "type":"structure", - "members":{ - "ImageId":{ - "shape":"String", - "locationName":"imageId" - } - } - }, - "CreateInstanceExportTaskRequest":{ - "type":"structure", - "required":["InstanceId"], - "members":{ - "Description":{ - "shape":"String", - "locationName":"description" - }, - "InstanceId":{ - "shape":"String", - "locationName":"instanceId" - }, - "TargetEnvironment":{ - "shape":"ExportEnvironment", - "locationName":"targetEnvironment" - }, - "ExportToS3Task":{ - "shape":"ExportToS3TaskSpecification", - "locationName":"exportToS3" - } - } - }, - "CreateInstanceExportTaskResult":{ - "type":"structure", - "members":{ - "ExportTask":{ - "shape":"ExportTask", - "locationName":"exportTask" - } - } - }, - "CreateInternetGatewayRequest":{ - "type":"structure", - "members":{ - "DryRun":{ - "shape":"Boolean", - "locationName":"dryRun" - } - } - }, - "CreateInternetGatewayResult":{ - "type":"structure", - "members":{ - "InternetGateway":{ - "shape":"InternetGateway", - "locationName":"internetGateway" - } - } - }, - "CreateKeyPairRequest":{ - "type":"structure", - "required":["KeyName"], - "members":{ - "DryRun":{ - "shape":"Boolean", - "locationName":"dryRun" - }, - "KeyName":{"shape":"String"} - } - }, - "CreateNetworkAclEntryRequest":{ - "type":"structure", - "required":[ - "NetworkAclId", - "RuleNumber", - "Protocol", - "RuleAction", - "Egress", - "CidrBlock" - ], - "members":{ - "DryRun":{ - "shape":"Boolean", - "locationName":"dryRun" - }, - "NetworkAclId":{ - "shape":"String", - "locationName":"networkAclId" - }, - "RuleNumber":{ - "shape":"Integer", - "locationName":"ruleNumber" - }, - "Protocol":{ - "shape":"String", - "locationName":"protocol" - }, - "RuleAction":{ - "shape":"RuleAction", - "locationName":"ruleAction" - }, - "Egress":{ - "shape":"Boolean", - "locationName":"egress" - }, - "CidrBlock":{ - "shape":"String", - "locationName":"cidrBlock" - }, - "IcmpTypeCode":{ - "shape":"IcmpTypeCode", - "locationName":"Icmp" - }, - "PortRange":{ - "shape":"PortRange", - "locationName":"portRange" - } - } - }, - "CreateNetworkAclRequest":{ - "type":"structure", - "required":["VpcId"], - "members":{ - "DryRun":{ - "shape":"Boolean", - "locationName":"dryRun" - }, - "VpcId":{ - "shape":"String", - "locationName":"vpcId" - } - } - }, - "CreateNetworkAclResult":{ - "type":"structure", - "members":{ - "NetworkAcl":{ - "shape":"NetworkAcl", - "locationName":"networkAcl" - } - } - }, - "CreateNetworkInterfaceRequest":{ - "type":"structure", - "required":["SubnetId"], - "members":{ - "SubnetId":{ - "shape":"String", - "locationName":"subnetId" - }, - "Description":{ - "shape":"String", - "locationName":"description" - }, - "PrivateIpAddress":{ - "shape":"String", - "locationName":"privateIpAddress" - }, - "Groups":{ - "shape":"SecurityGroupIdStringList", - "locationName":"SecurityGroupId" - }, - "PrivateIpAddresses":{ - "shape":"PrivateIpAddressSpecificationList", - "locationName":"privateIpAddresses" - }, - "SecondaryPrivateIpAddressCount":{ - "shape":"Integer", - "locationName":"secondaryPrivateIpAddressCount" - }, - "DryRun":{ - "shape":"Boolean", - "locationName":"dryRun" - } - } - }, - "CreateNetworkInterfaceResult":{ - "type":"structure", - "members":{ - "NetworkInterface":{ - "shape":"NetworkInterface", - "locationName":"networkInterface" - } - } - }, - "CreatePlacementGroupRequest":{ - "type":"structure", - "required":[ - "GroupName", - "Strategy" - ], - "members":{ - "DryRun":{ - "shape":"Boolean", - "locationName":"dryRun" - }, - "GroupName":{ - "shape":"String", - "locationName":"groupName" - }, - "Strategy":{ - "shape":"PlacementStrategy", - "locationName":"strategy" - } - } - }, - "CreateReservedInstancesListingRequest":{ - "type":"structure", - "required":[ - "ReservedInstancesId", - "InstanceCount", - "PriceSchedules", - "ClientToken" - ], - "members":{ - "ReservedInstancesId":{ - "shape":"String", - "locationName":"reservedInstancesId" - }, - "InstanceCount":{ - "shape":"Integer", - "locationName":"instanceCount" - }, - "PriceSchedules":{ - "shape":"PriceScheduleSpecificationList", - "locationName":"priceSchedules" - }, - "ClientToken":{ - "shape":"String", - "locationName":"clientToken" - } - } - }, - "CreateReservedInstancesListingResult":{ - "type":"structure", - "members":{ - "ReservedInstancesListings":{ - "shape":"ReservedInstancesListingList", - "locationName":"reservedInstancesListingsSet" - } - } - }, - "CreateRouteRequest":{ - "type":"structure", - "required":[ - "RouteTableId", - "DestinationCidrBlock" - ], - "members":{ - "DryRun":{ - "shape":"Boolean", - "locationName":"dryRun" - }, - "RouteTableId":{ - "shape":"String", - "locationName":"routeTableId" - }, - "DestinationCidrBlock":{ - "shape":"String", - "locationName":"destinationCidrBlock" - }, - "GatewayId":{ - "shape":"String", - "locationName":"gatewayId" - }, - "InstanceId":{ - "shape":"String", - "locationName":"instanceId" - }, - "NetworkInterfaceId":{ - "shape":"String", - "locationName":"networkInterfaceId" - }, - "VpcPeeringConnectionId":{ - "shape":"String", - "locationName":"vpcPeeringConnectionId" - } - } - }, - "CreateRouteTableRequest":{ - "type":"structure", - "required":["VpcId"], - "members":{ - "DryRun":{ - "shape":"Boolean", - "locationName":"dryRun" - }, - "VpcId":{ - "shape":"String", - "locationName":"vpcId" - } - } - }, - "CreateRouteTableResult":{ - "type":"structure", - "members":{ - "RouteTable":{ - "shape":"RouteTable", - "locationName":"routeTable" - } - } - }, - "CreateSecurityGroupRequest":{ - "type":"structure", - "required":[ - "GroupName", - "Description" - ], - "members":{ - "DryRun":{ - "shape":"Boolean", - "locationName":"dryRun" - }, - "GroupName":{"shape":"String"}, - "Description":{ - "shape":"String", - "locationName":"GroupDescription" - }, - "VpcId":{"shape":"String"} - } - }, - "CreateSecurityGroupResult":{ - "type":"structure", - "members":{ - "GroupId":{ - "shape":"String", - "locationName":"groupId" - } - } - }, - "CreateSnapshotRequest":{ - "type":"structure", - "required":["VolumeId"], - "members":{ - "DryRun":{ - "shape":"Boolean", - "locationName":"dryRun" - }, - "VolumeId":{"shape":"String"}, - "Description":{"shape":"String"} - } - }, - "CreateSpotDatafeedSubscriptionRequest":{ - "type":"structure", - "required":["Bucket"], - "members":{ - "DryRun":{ - "shape":"Boolean", - "locationName":"dryRun" - }, - "Bucket":{ - "shape":"String", - "locationName":"bucket" - }, - "Prefix":{ - "shape":"String", - "locationName":"prefix" - } - } - }, - "CreateSpotDatafeedSubscriptionResult":{ - "type":"structure", - "members":{ - "SpotDatafeedSubscription":{ - "shape":"SpotDatafeedSubscription", - "locationName":"spotDatafeedSubscription" - } - } - }, - "CreateSubnetRequest":{ - "type":"structure", - "required":[ - "VpcId", - "CidrBlock" - ], - "members":{ - "DryRun":{ - "shape":"Boolean", - "locationName":"dryRun" - }, - "VpcId":{"shape":"String"}, - "CidrBlock":{"shape":"String"}, - "AvailabilityZone":{"shape":"String"} - } - }, - "CreateSubnetResult":{ - "type":"structure", - "members":{ - "Subnet":{ - "shape":"Subnet", - "locationName":"subnet" - } - } - }, - "CreateTagsRequest":{ - "type":"structure", - "required":[ - "Resources", - "Tags" - ], - "members":{ - "DryRun":{ - "shape":"Boolean", - "locationName":"dryRun" - }, - "Resources":{ - "shape":"ResourceIdList", - "locationName":"ResourceId" - }, - "Tags":{ - "shape":"TagList", - "locationName":"Tag" - } - } - }, - "CreateVolumePermission":{ - "type":"structure", - "members":{ - "UserId":{ - "shape":"String", - "locationName":"userId" - }, - "Group":{ - "shape":"PermissionGroup", - "locationName":"group" - } - } - }, - "CreateVolumePermissionList":{ - "type":"list", - "member":{ - "shape":"CreateVolumePermission", - "locationName":"item" - } - }, - "CreateVolumePermissionModifications":{ - "type":"structure", - "members":{ - "Add":{"shape":"CreateVolumePermissionList"}, - "Remove":{"shape":"CreateVolumePermissionList"} - } - }, - "CreateVolumeRequest":{ - "type":"structure", - "required":["AvailabilityZone"], - "members":{ - "DryRun":{ - "shape":"Boolean", - "locationName":"dryRun" - }, - "Size":{"shape":"Integer"}, - "SnapshotId":{"shape":"String"}, - "AvailabilityZone":{"shape":"String"}, - "VolumeType":{"shape":"VolumeType"}, - "Iops":{"shape":"Integer"}, - "Encrypted":{ - "shape":"Boolean", - "locationName":"encrypted" - }, - "KmsKeyId":{"shape":"String"} - } - }, - "CreateVpcPeeringConnectionRequest":{ - "type":"structure", - "members":{ - "DryRun":{ - "shape":"Boolean", - "locationName":"dryRun" - }, - "VpcId":{ - "shape":"String", - "locationName":"vpcId" - }, - "PeerVpcId":{ - "shape":"String", - "locationName":"peerVpcId" - }, - "PeerOwnerId":{ - "shape":"String", - "locationName":"peerOwnerId" - } - } - }, - "CreateVpcPeeringConnectionResult":{ - "type":"structure", - "members":{ - "VpcPeeringConnection":{ - "shape":"VpcPeeringConnection", - "locationName":"vpcPeeringConnection" - } - } - }, - "CreateVpcRequest":{ - "type":"structure", - "required":["CidrBlock"], - "members":{ - "DryRun":{ - "shape":"Boolean", - "locationName":"dryRun" - }, - "CidrBlock":{"shape":"String"}, - "InstanceTenancy":{ - "shape":"Tenancy", - "locationName":"instanceTenancy" - } - } - }, - "CreateVpcResult":{ - "type":"structure", - "members":{ - "Vpc":{ - "shape":"Vpc", - "locationName":"vpc" - } - } - }, - "CreateVpnConnectionRequest":{ - "type":"structure", - "required":[ - "Type", - "CustomerGatewayId", - "VpnGatewayId" - ], - "members":{ - "DryRun":{ - "shape":"Boolean", - "locationName":"dryRun" - }, - "Type":{"shape":"String"}, - "CustomerGatewayId":{"shape":"String"}, - "VpnGatewayId":{"shape":"String"}, - "Options":{ - "shape":"VpnConnectionOptionsSpecification", - "locationName":"options" - } - } - }, - "CreateVpnConnectionResult":{ - "type":"structure", - "members":{ - "VpnConnection":{ - "shape":"VpnConnection", - "locationName":"vpnConnection" - } - } - }, - "CreateVpnConnectionRouteRequest":{ - "type":"structure", - "required":[ - "VpnConnectionId", - "DestinationCidrBlock" - ], - "members":{ - "VpnConnectionId":{"shape":"String"}, - "DestinationCidrBlock":{"shape":"String"} - } - }, - "CreateVpnGatewayRequest":{ - "type":"structure", - "required":["Type"], - "members":{ - "DryRun":{ - "shape":"Boolean", - "locationName":"dryRun" - }, - "Type":{"shape":"GatewayType"}, - "AvailabilityZone":{"shape":"String"} - } - }, - "CreateVpnGatewayResult":{ - "type":"structure", - "members":{ - "VpnGateway":{ - "shape":"VpnGateway", - "locationName":"vpnGateway" - } - } - }, - "CurrencyCodeValues":{ - "type":"string", - "enum":["USD"] - }, - "CustomerGateway":{ - "type":"structure", - "members":{ - "CustomerGatewayId":{ - "shape":"String", - "locationName":"customerGatewayId" - }, - "State":{ - "shape":"String", - "locationName":"state" - }, - "Type":{ - "shape":"String", - "locationName":"type" - }, - "IpAddress":{ - "shape":"String", - "locationName":"ipAddress" - }, - "BgpAsn":{ - "shape":"String", - "locationName":"bgpAsn" - }, - "Tags":{ - "shape":"TagList", - "locationName":"tagSet" - } - } - }, - "CustomerGatewayIdStringList":{ - "type":"list", - "member":{ - "shape":"String", - "locationName":"CustomerGatewayId" - } - }, - "CustomerGatewayList":{ - "type":"list", - "member":{ - "shape":"CustomerGateway", - "locationName":"item" - } - }, - "DatafeedSubscriptionState":{ - "type":"string", - "enum":[ - "Active", - "Inactive" - ] - }, - "DateTime":{"type":"timestamp"}, - "DeleteCustomerGatewayRequest":{ - "type":"structure", - "required":["CustomerGatewayId"], - "members":{ - "DryRun":{ - "shape":"Boolean", - "locationName":"dryRun" - }, - "CustomerGatewayId":{"shape":"String"} - } - }, - "DeleteDhcpOptionsRequest":{ - "type":"structure", - "required":["DhcpOptionsId"], - "members":{ - "DryRun":{ - "shape":"Boolean", - "locationName":"dryRun" - }, - "DhcpOptionsId":{"shape":"String"} - } - }, - "DeleteInternetGatewayRequest":{ - "type":"structure", - "required":["InternetGatewayId"], - "members":{ - "DryRun":{ - "shape":"Boolean", - "locationName":"dryRun" - }, - "InternetGatewayId":{ - "shape":"String", - "locationName":"internetGatewayId" - } - } - }, - "DeleteKeyPairRequest":{ - "type":"structure", - "required":["KeyName"], - "members":{ - "DryRun":{ - "shape":"Boolean", - "locationName":"dryRun" - }, - "KeyName":{"shape":"String"} - } - }, - "DeleteNetworkAclEntryRequest":{ - "type":"structure", - "required":[ - "NetworkAclId", - "RuleNumber", - "Egress" - ], - "members":{ - "DryRun":{ - "shape":"Boolean", - "locationName":"dryRun" - }, - "NetworkAclId":{ - "shape":"String", - "locationName":"networkAclId" - }, - "RuleNumber":{ - "shape":"Integer", - "locationName":"ruleNumber" - }, - "Egress":{ - "shape":"Boolean", - "locationName":"egress" - } - } - }, - "DeleteNetworkAclRequest":{ - "type":"structure", - "required":["NetworkAclId"], - "members":{ - "DryRun":{ - "shape":"Boolean", - "locationName":"dryRun" - }, - "NetworkAclId":{ - "shape":"String", - "locationName":"networkAclId" - } - } - }, - "DeleteNetworkInterfaceRequest":{ - "type":"structure", - "required":["NetworkInterfaceId"], - "members":{ - "DryRun":{ - "shape":"Boolean", - "locationName":"dryRun" - }, - "NetworkInterfaceId":{ - "shape":"String", - "locationName":"networkInterfaceId" - } - } - }, - "DeletePlacementGroupRequest":{ - "type":"structure", - "required":["GroupName"], - "members":{ - "DryRun":{ - "shape":"Boolean", - "locationName":"dryRun" - }, - "GroupName":{ - "shape":"String", - "locationName":"groupName" - } - } - }, - "DeleteRouteRequest":{ - "type":"structure", - "required":[ - "RouteTableId", - "DestinationCidrBlock" - ], - "members":{ - "DryRun":{ - "shape":"Boolean", - "locationName":"dryRun" - }, - "RouteTableId":{ - "shape":"String", - "locationName":"routeTableId" - }, - "DestinationCidrBlock":{ - "shape":"String", - "locationName":"destinationCidrBlock" - } - } - }, - "DeleteRouteTableRequest":{ - "type":"structure", - "required":["RouteTableId"], - "members":{ - "DryRun":{ - "shape":"Boolean", - "locationName":"dryRun" - }, - "RouteTableId":{ - "shape":"String", - "locationName":"routeTableId" - } - } - }, - "DeleteSecurityGroupRequest":{ - "type":"structure", - "members":{ - "DryRun":{ - "shape":"Boolean", - "locationName":"dryRun" - }, - "GroupName":{"shape":"String"}, - "GroupId":{"shape":"String"} - } - }, - "DeleteSnapshotRequest":{ - "type":"structure", - "required":["SnapshotId"], - "members":{ - "DryRun":{ - "shape":"Boolean", - "locationName":"dryRun" - }, - "SnapshotId":{"shape":"String"} - } - }, - "DeleteSpotDatafeedSubscriptionRequest":{ - "type":"structure", - "members":{ - "DryRun":{ - "shape":"Boolean", - "locationName":"dryRun" - } - } - }, - "DeleteSubnetRequest":{ - "type":"structure", - "required":["SubnetId"], - "members":{ - "DryRun":{ - "shape":"Boolean", - "locationName":"dryRun" - }, - "SubnetId":{"shape":"String"} - } - }, - "DeleteTagsRequest":{ - "type":"structure", - "required":["Resources"], - "members":{ - "DryRun":{ - "shape":"Boolean", - "locationName":"dryRun" - }, - "Resources":{ - "shape":"ResourceIdList", - "locationName":"resourceId" - }, - "Tags":{ - "shape":"TagList", - "locationName":"tag" - } - } - }, - "DeleteVolumeRequest":{ - "type":"structure", - "required":["VolumeId"], - "members":{ - "DryRun":{ - "shape":"Boolean", - "locationName":"dryRun" - }, - "VolumeId":{"shape":"String"} - } - }, - "DeleteVpcPeeringConnectionRequest":{ - "type":"structure", - "required":["VpcPeeringConnectionId"], - "members":{ - "DryRun":{ - "shape":"Boolean", - "locationName":"dryRun" - }, - "VpcPeeringConnectionId":{ - "shape":"String", - "locationName":"vpcPeeringConnectionId" - } - } - }, - "DeleteVpcPeeringConnectionResult":{ - "type":"structure", - "members":{ - "Return":{ - "shape":"Boolean", - "locationName":"return" - } - } - }, - "DeleteVpcRequest":{ - "type":"structure", - "required":["VpcId"], - "members":{ - "DryRun":{ - "shape":"Boolean", - "locationName":"dryRun" - }, - "VpcId":{"shape":"String"} - } - }, - "DeleteVpnConnectionRequest":{ - "type":"structure", - "required":["VpnConnectionId"], - "members":{ - "DryRun":{ - "shape":"Boolean", - "locationName":"dryRun" - }, - "VpnConnectionId":{"shape":"String"} - } - }, - "DeleteVpnConnectionRouteRequest":{ - "type":"structure", - "required":[ - "VpnConnectionId", - "DestinationCidrBlock" - ], - "members":{ - "VpnConnectionId":{"shape":"String"}, - "DestinationCidrBlock":{"shape":"String"} - } - }, - "DeleteVpnGatewayRequest":{ - "type":"structure", - "required":["VpnGatewayId"], - "members":{ - "DryRun":{ - "shape":"Boolean", - "locationName":"dryRun" - }, - "VpnGatewayId":{"shape":"String"} - } - }, - "DeregisterImageRequest":{ - "type":"structure", - "required":["ImageId"], - "members":{ - "DryRun":{ - "shape":"Boolean", - "locationName":"dryRun" - }, - "ImageId":{"shape":"String"} - } - }, - "DescribeAccountAttributesRequest":{ - "type":"structure", - "members":{ - "DryRun":{ - "shape":"Boolean", - "locationName":"dryRun" - }, - "AttributeNames":{ - "shape":"AccountAttributeNameStringList", - "locationName":"attributeName" - } - } - }, - "DescribeAccountAttributesResult":{ - "type":"structure", - "members":{ - "AccountAttributes":{ - "shape":"AccountAttributeList", - "locationName":"accountAttributeSet" - } - } - }, - "DescribeAddressesRequest":{ - "type":"structure", - "members":{ - "DryRun":{ - "shape":"Boolean", - "locationName":"dryRun" - }, - "PublicIps":{ - "shape":"PublicIpStringList", - "locationName":"PublicIp" - }, - "Filters":{ - "shape":"FilterList", - "locationName":"Filter" - }, - "AllocationIds":{ - "shape":"AllocationIdList", - "locationName":"AllocationId" - } - } - }, - "DescribeAddressesResult":{ - "type":"structure", - "members":{ - "Addresses":{ - "shape":"AddressList", - "locationName":"addressesSet" - } - } - }, - "DescribeAvailabilityZonesRequest":{ - "type":"structure", - "members":{ - "DryRun":{ - "shape":"Boolean", - "locationName":"dryRun" - }, - "ZoneNames":{ - "shape":"ZoneNameStringList", - "locationName":"ZoneName" - }, - "Filters":{ - "shape":"FilterList", - "locationName":"Filter" - } - } - }, - "DescribeAvailabilityZonesResult":{ - "type":"structure", - "members":{ - "AvailabilityZones":{ - "shape":"AvailabilityZoneList", - "locationName":"availabilityZoneInfo" - } - } - }, - "DescribeBundleTasksRequest":{ - "type":"structure", - "members":{ - "DryRun":{ - "shape":"Boolean", - "locationName":"dryRun" - }, - "BundleIds":{ - "shape":"BundleIdStringList", - "locationName":"BundleId" - }, - "Filters":{ - "shape":"FilterList", - "locationName":"Filter" - } - } - }, - "DescribeBundleTasksResult":{ - "type":"structure", - "members":{ - "BundleTasks":{ - "shape":"BundleTaskList", - "locationName":"bundleInstanceTasksSet" - } - } - }, - "DescribeClassicLinkInstancesRequest":{ - "type":"structure", - "members":{ - "DryRun":{ - "shape":"Boolean", - "locationName":"dryRun" - }, - "InstanceIds":{ - "shape":"InstanceIdStringList", - "locationName":"InstanceId" - }, - "Filters":{ - "shape":"FilterList", - "locationName":"Filter" - }, - "NextToken":{ - "shape":"String", - "locationName":"nextToken" - }, - "MaxResults":{ - "shape":"Integer", - "locationName":"maxResults" - } - } - }, - "DescribeClassicLinkInstancesResult":{ - "type":"structure", - "members":{ - "Instances":{ - "shape":"ClassicLinkInstanceList", - "locationName":"instancesSet" - }, - "NextToken":{ - "shape":"String", - "locationName":"nextToken" - } - } - }, - "DescribeConversionTaskList":{ - "type":"list", - "member":{ - "shape":"ConversionTask", - "locationName":"item" - } - }, - "DescribeConversionTasksRequest":{ - "type":"structure", - "members":{ - "DryRun":{ - "shape":"Boolean", - "locationName":"dryRun" - }, - "Filters":{ - "shape":"FilterList", - "locationName":"filter" - }, - "ConversionTaskIds":{ - "shape":"ConversionIdStringList", - "locationName":"conversionTaskId" - } - } - }, - "DescribeConversionTasksResult":{ - "type":"structure", - "members":{ - "ConversionTasks":{ - "shape":"DescribeConversionTaskList", - "locationName":"conversionTasks" - } - } - }, - "DescribeCustomerGatewaysRequest":{ - "type":"structure", - "members":{ - "DryRun":{ - "shape":"Boolean", - "locationName":"dryRun" - }, - "CustomerGatewayIds":{ - "shape":"CustomerGatewayIdStringList", - "locationName":"CustomerGatewayId" - }, - "Filters":{ - "shape":"FilterList", - "locationName":"Filter" - } - } - }, - "DescribeCustomerGatewaysResult":{ - "type":"structure", - "members":{ - "CustomerGateways":{ - "shape":"CustomerGatewayList", - "locationName":"customerGatewaySet" - } - } - }, - "DescribeDhcpOptionsRequest":{ - "type":"structure", - "members":{ - "DryRun":{ - "shape":"Boolean", - "locationName":"dryRun" - }, - "DhcpOptionsIds":{ - "shape":"DhcpOptionsIdStringList", - "locationName":"DhcpOptionsId" - }, - "Filters":{ - "shape":"FilterList", - "locationName":"Filter" - } - } - }, - "DescribeDhcpOptionsResult":{ - "type":"structure", - "members":{ - "DhcpOptions":{ - "shape":"DhcpOptionsList", - "locationName":"dhcpOptionsSet" - } - } - }, - "DescribeExportTasksRequest":{ - "type":"structure", - "members":{ - "ExportTaskIds":{ - "shape":"ExportTaskIdStringList", - "locationName":"exportTaskId" - } - } - }, - "DescribeExportTasksResult":{ - "type":"structure", - "members":{ - "ExportTasks":{ - "shape":"ExportTaskList", - "locationName":"exportTaskSet" - } - } - }, - "DescribeImageAttributeRequest":{ - "type":"structure", - "required":[ - "ImageId", - "Attribute" - ], - "members":{ - "DryRun":{ - "shape":"Boolean", - "locationName":"dryRun" - }, - "ImageId":{"shape":"String"}, - "Attribute":{"shape":"ImageAttributeName"} - } - }, - "DescribeImagesRequest":{ - "type":"structure", - "members":{ - "DryRun":{ - "shape":"Boolean", - "locationName":"dryRun" - }, - "ImageIds":{ - "shape":"ImageIdStringList", - "locationName":"ImageId" - }, - "Owners":{ - "shape":"OwnerStringList", - "locationName":"Owner" - }, - "ExecutableUsers":{ - "shape":"ExecutableByStringList", - "locationName":"ExecutableBy" - }, - "Filters":{ - "shape":"FilterList", - "locationName":"Filter" - } - } - }, - "DescribeImagesResult":{ - "type":"structure", - "members":{ - "Images":{ - "shape":"ImageList", - "locationName":"imagesSet" - } - } - }, - "DescribeInstanceAttributeRequest":{ - "type":"structure", - "required":[ - "InstanceId", - "Attribute" - ], - "members":{ - "DryRun":{ - "shape":"Boolean", - "locationName":"dryRun" - }, - "InstanceId":{ - "shape":"String", - "locationName":"instanceId" - }, - "Attribute":{ - "shape":"InstanceAttributeName", - "locationName":"attribute" - } - } - }, - "DescribeInstanceStatusRequest":{ - "type":"structure", - "members":{ - "DryRun":{ - "shape":"Boolean", - "locationName":"dryRun" - }, - "InstanceIds":{ - "shape":"InstanceIdStringList", - "locationName":"InstanceId" - }, - "Filters":{ - "shape":"FilterList", - "locationName":"Filter" - }, - "NextToken":{"shape":"String"}, - "MaxResults":{"shape":"Integer"}, - "IncludeAllInstances":{ - "shape":"Boolean", - "locationName":"includeAllInstances" - } - } - }, - "DescribeInstanceStatusResult":{ - "type":"structure", - "members":{ - "InstanceStatuses":{ - "shape":"InstanceStatusList", - "locationName":"instanceStatusSet" - }, - "NextToken":{ - "shape":"String", - "locationName":"nextToken" - } - } - }, - "DescribeInstancesRequest":{ - "type":"structure", - "members":{ - "DryRun":{ - "shape":"Boolean", - "locationName":"dryRun" - }, - "InstanceIds":{ - "shape":"InstanceIdStringList", - "locationName":"InstanceId" - }, - "Filters":{ - "shape":"FilterList", - "locationName":"Filter" - }, - "NextToken":{ - "shape":"String", - "locationName":"nextToken" - }, - "MaxResults":{ - "shape":"Integer", - "locationName":"maxResults" - } - } - }, - "DescribeInstancesResult":{ - "type":"structure", - "members":{ - "Reservations":{ - "shape":"ReservationList", - "locationName":"reservationSet" - }, - "NextToken":{ - "shape":"String", - "locationName":"nextToken" - } - } - }, - "DescribeInternetGatewaysRequest":{ - "type":"structure", - "members":{ - "DryRun":{ - "shape":"Boolean", - "locationName":"dryRun" - }, - "InternetGatewayIds":{ - "shape":"ValueStringList", - "locationName":"internetGatewayId" - }, - "Filters":{ - "shape":"FilterList", - "locationName":"Filter" - } - } - }, - "DescribeInternetGatewaysResult":{ - "type":"structure", - "members":{ - "InternetGateways":{ - "shape":"InternetGatewayList", - "locationName":"internetGatewaySet" - } - } - }, - "DescribeKeyPairsRequest":{ - "type":"structure", - "members":{ - "DryRun":{ - "shape":"Boolean", - "locationName":"dryRun" - }, - "KeyNames":{ - "shape":"KeyNameStringList", - "locationName":"KeyName" - }, - "Filters":{ - "shape":"FilterList", - "locationName":"Filter" - } - } - }, - "DescribeKeyPairsResult":{ - "type":"structure", - "members":{ - "KeyPairs":{ - "shape":"KeyPairList", - "locationName":"keySet" - } - } - }, - "DescribeNetworkAclsRequest":{ - "type":"structure", - "members":{ - "DryRun":{ - "shape":"Boolean", - "locationName":"dryRun" - }, - "NetworkAclIds":{ - "shape":"ValueStringList", - "locationName":"NetworkAclId" - }, - "Filters":{ - "shape":"FilterList", - "locationName":"Filter" - } - } - }, - "DescribeNetworkAclsResult":{ - "type":"structure", - "members":{ - "NetworkAcls":{ - "shape":"NetworkAclList", - "locationName":"networkAclSet" - } - } - }, - "DescribeNetworkInterfaceAttributeRequest":{ - "type":"structure", - "required":["NetworkInterfaceId"], - "members":{ - "DryRun":{ - "shape":"Boolean", - "locationName":"dryRun" - }, - "NetworkInterfaceId":{ - "shape":"String", - "locationName":"networkInterfaceId" - }, - "Attribute":{ - "shape":"NetworkInterfaceAttribute", - "locationName":"attribute" - } - } - }, - "DescribeNetworkInterfaceAttributeResult":{ - "type":"structure", - "members":{ - "NetworkInterfaceId":{ - "shape":"String", - "locationName":"networkInterfaceId" - }, - "Description":{ - "shape":"AttributeValue", - "locationName":"description" - }, - "SourceDestCheck":{ - "shape":"AttributeBooleanValue", - "locationName":"sourceDestCheck" - }, - "Groups":{ - "shape":"GroupIdentifierList", - "locationName":"groupSet" - }, - "Attachment":{ - "shape":"NetworkInterfaceAttachment", - "locationName":"attachment" - } - } - }, - "DescribeNetworkInterfacesRequest":{ - "type":"structure", - "members":{ - "DryRun":{ - "shape":"Boolean", - "locationName":"dryRun" - }, - "NetworkInterfaceIds":{ - "shape":"NetworkInterfaceIdList", - "locationName":"NetworkInterfaceId" - }, - "Filters":{ - "shape":"FilterList", - "locationName":"filter" - } - } - }, - "DescribeNetworkInterfacesResult":{ - "type":"structure", - "members":{ - "NetworkInterfaces":{ - "shape":"NetworkInterfaceList", - "locationName":"networkInterfaceSet" - } - } - }, - "DescribePlacementGroupsRequest":{ - "type":"structure", - "members":{ - "DryRun":{ - "shape":"Boolean", - "locationName":"dryRun" - }, - "GroupNames":{ - "shape":"PlacementGroupStringList", - "locationName":"groupName" - }, - "Filters":{ - "shape":"FilterList", - "locationName":"Filter" - } - } - }, - "DescribePlacementGroupsResult":{ - "type":"structure", - "members":{ - "PlacementGroups":{ - "shape":"PlacementGroupList", - "locationName":"placementGroupSet" - } - } - }, - "DescribeRegionsRequest":{ - "type":"structure", - "members":{ - "DryRun":{ - "shape":"Boolean", - "locationName":"dryRun" - }, - "RegionNames":{ - "shape":"RegionNameStringList", - "locationName":"RegionName" - }, - "Filters":{ - "shape":"FilterList", - "locationName":"Filter" - } - } - }, - "DescribeRegionsResult":{ - "type":"structure", - "members":{ - "Regions":{ - "shape":"RegionList", - "locationName":"regionInfo" - } - } - }, - "DescribeReservedInstancesListingsRequest":{ - "type":"structure", - "members":{ - "ReservedInstancesId":{ - "shape":"String", - "locationName":"reservedInstancesId" - }, - "ReservedInstancesListingId":{ - "shape":"String", - "locationName":"reservedInstancesListingId" - }, - "Filters":{ - "shape":"FilterList", - "locationName":"filters" - } - } - }, - "DescribeReservedInstancesListingsResult":{ - "type":"structure", - "members":{ - "ReservedInstancesListings":{ - "shape":"ReservedInstancesListingList", - "locationName":"reservedInstancesListingsSet" - } - } - }, - "DescribeReservedInstancesModificationsRequest":{ - "type":"structure", - "members":{ - "ReservedInstancesModificationIds":{ - "shape":"ReservedInstancesModificationIdStringList", - "locationName":"ReservedInstancesModificationId" - }, - "NextToken":{ - "shape":"String", - "locationName":"nextToken" - }, - "Filters":{ - "shape":"FilterList", - "locationName":"Filter" - } - } - }, - "DescribeReservedInstancesModificationsResult":{ - "type":"structure", - "members":{ - "ReservedInstancesModifications":{ - "shape":"ReservedInstancesModificationList", - "locationName":"reservedInstancesModificationsSet" - }, - "NextToken":{ - "shape":"String", - "locationName":"nextToken" - } - } - }, - "DescribeReservedInstancesOfferingsRequest":{ - "type":"structure", - "members":{ - "DryRun":{ - "shape":"Boolean", - "locationName":"dryRun" - }, - "ReservedInstancesOfferingIds":{ - "shape":"ReservedInstancesOfferingIdStringList", - "locationName":"ReservedInstancesOfferingId" - }, - "InstanceType":{"shape":"InstanceType"}, - "AvailabilityZone":{"shape":"String"}, - "ProductDescription":{"shape":"RIProductDescription"}, - "Filters":{ - "shape":"FilterList", - "locationName":"Filter" - }, - "InstanceTenancy":{ - "shape":"Tenancy", - "locationName":"instanceTenancy" - }, - "OfferingType":{ - "shape":"OfferingTypeValues", - "locationName":"offeringType" - }, - "NextToken":{ - "shape":"String", - "locationName":"nextToken" - }, - "MaxResults":{ - "shape":"Integer", - "locationName":"maxResults" - }, - "IncludeMarketplace":{"shape":"Boolean"}, - "MinDuration":{"shape":"Long"}, - "MaxDuration":{"shape":"Long"}, - "MaxInstanceCount":{"shape":"Integer"} - } - }, - "DescribeReservedInstancesOfferingsResult":{ - "type":"structure", - "members":{ - "ReservedInstancesOfferings":{ - "shape":"ReservedInstancesOfferingList", - "locationName":"reservedInstancesOfferingsSet" - }, - "NextToken":{ - "shape":"String", - "locationName":"nextToken" - } - } - }, - "DescribeReservedInstancesRequest":{ - "type":"structure", - "members":{ - "DryRun":{ - "shape":"Boolean", - "locationName":"dryRun" - }, - "ReservedInstancesIds":{ - "shape":"ReservedInstancesIdStringList", - "locationName":"ReservedInstancesId" - }, - "Filters":{ - "shape":"FilterList", - "locationName":"Filter" - }, - "OfferingType":{ - "shape":"OfferingTypeValues", - "locationName":"offeringType" - } - } - }, - "DescribeReservedInstancesResult":{ - "type":"structure", - "members":{ - "ReservedInstances":{ - "shape":"ReservedInstancesList", - "locationName":"reservedInstancesSet" - } - } - }, - "DescribeRouteTablesRequest":{ - "type":"structure", - "members":{ - "DryRun":{ - "shape":"Boolean", - "locationName":"dryRun" - }, - "RouteTableIds":{ - "shape":"ValueStringList", - "locationName":"RouteTableId" - }, - "Filters":{ - "shape":"FilterList", - "locationName":"Filter" - } - } - }, - "DescribeRouteTablesResult":{ - "type":"structure", - "members":{ - "RouteTables":{ - "shape":"RouteTableList", - "locationName":"routeTableSet" - } - } - }, - "DescribeSecurityGroupsRequest":{ - "type":"structure", - "members":{ - "DryRun":{ - "shape":"Boolean", - "locationName":"dryRun" - }, - "GroupNames":{ - "shape":"GroupNameStringList", - "locationName":"GroupName" - }, - "GroupIds":{ - "shape":"GroupIdStringList", - "locationName":"GroupId" - }, - "Filters":{ - "shape":"FilterList", - "locationName":"Filter" - } - } - }, - "DescribeSecurityGroupsResult":{ - "type":"structure", - "members":{ - "SecurityGroups":{ - "shape":"SecurityGroupList", - "locationName":"securityGroupInfo" - } - } - }, - "DescribeSnapshotAttributeRequest":{ - "type":"structure", - "required":[ - "SnapshotId", - "Attribute" - ], - "members":{ - "DryRun":{ - "shape":"Boolean", - "locationName":"dryRun" - }, - "SnapshotId":{"shape":"String"}, - "Attribute":{"shape":"SnapshotAttributeName"} - } - }, - "DescribeSnapshotAttributeResult":{ - "type":"structure", - "members":{ - "SnapshotId":{ - "shape":"String", - "locationName":"snapshotId" - }, - "CreateVolumePermissions":{ - "shape":"CreateVolumePermissionList", - "locationName":"createVolumePermission" - }, - "ProductCodes":{ - "shape":"ProductCodeList", - "locationName":"productCodes" - } - } - }, - "DescribeSnapshotsRequest":{ - "type":"structure", - "members":{ - "DryRun":{ - "shape":"Boolean", - "locationName":"dryRun" - }, - "SnapshotIds":{ - "shape":"SnapshotIdStringList", - "locationName":"SnapshotId" - }, - "OwnerIds":{ - "shape":"OwnerStringList", - "locationName":"Owner" - }, - "RestorableByUserIds":{ - "shape":"RestorableByStringList", - "locationName":"RestorableBy" - }, - "Filters":{ - "shape":"FilterList", - "locationName":"Filter" - }, - "NextToken":{"shape":"String"}, - "MaxResults":{"shape":"Integer"} - } - }, - "DescribeSnapshotsResult":{ - "type":"structure", - "members":{ - "Snapshots":{ - "shape":"SnapshotList", - "locationName":"snapshotSet" - }, - "NextToken":{ - "shape":"String", - "locationName":"nextToken" - } - } - }, - "DescribeSpotDatafeedSubscriptionRequest":{ - "type":"structure", - "members":{ - "DryRun":{ - "shape":"Boolean", - "locationName":"dryRun" - } - } - }, - "DescribeSpotDatafeedSubscriptionResult":{ - "type":"structure", - "members":{ - "SpotDatafeedSubscription":{ - "shape":"SpotDatafeedSubscription", - "locationName":"spotDatafeedSubscription" - } - } - }, - "DescribeSpotInstanceRequestsRequest":{ - "type":"structure", - "members":{ - "DryRun":{ - "shape":"Boolean", - "locationName":"dryRun" - }, - "SpotInstanceRequestIds":{ - "shape":"SpotInstanceRequestIdList", - "locationName":"SpotInstanceRequestId" - }, - "Filters":{ - "shape":"FilterList", - "locationName":"Filter" - } - } - }, - "DescribeSpotInstanceRequestsResult":{ - "type":"structure", - "members":{ - "SpotInstanceRequests":{ - "shape":"SpotInstanceRequestList", - "locationName":"spotInstanceRequestSet" - } - } - }, - "DescribeSpotPriceHistoryRequest":{ - "type":"structure", - "members":{ - "DryRun":{ - "shape":"Boolean", - "locationName":"dryRun" - }, - "StartTime":{ - "shape":"DateTime", - "locationName":"startTime" - }, - "EndTime":{ - "shape":"DateTime", - "locationName":"endTime" - }, - "InstanceTypes":{ - "shape":"InstanceTypeList", - "locationName":"InstanceType" - }, - "ProductDescriptions":{ - "shape":"ProductDescriptionList", - "locationName":"ProductDescription" - }, - "Filters":{ - "shape":"FilterList", - "locationName":"Filter" - }, - "AvailabilityZone":{ - "shape":"String", - "locationName":"availabilityZone" - }, - "MaxResults":{ - "shape":"Integer", - "locationName":"maxResults" - }, - "NextToken":{ - "shape":"String", - "locationName":"nextToken" - } - } - }, - "DescribeSpotPriceHistoryResult":{ - "type":"structure", - "members":{ - "SpotPriceHistory":{ - "shape":"SpotPriceHistoryList", - "locationName":"spotPriceHistorySet" - }, - "NextToken":{ - "shape":"String", - "locationName":"nextToken" - } - } - }, - "DescribeSubnetsRequest":{ - "type":"structure", - "members":{ - "DryRun":{ - "shape":"Boolean", - "locationName":"dryRun" - }, - "SubnetIds":{ - "shape":"SubnetIdStringList", - "locationName":"SubnetId" - }, - "Filters":{ - "shape":"FilterList", - "locationName":"Filter" - } - } - }, - "DescribeSubnetsResult":{ - "type":"structure", - "members":{ - "Subnets":{ - "shape":"SubnetList", - "locationName":"subnetSet" - } - } - }, - "DescribeTagsRequest":{ - "type":"structure", - "members":{ - "DryRun":{ - "shape":"Boolean", - "locationName":"dryRun" - }, - "Filters":{ - "shape":"FilterList", - "locationName":"Filter" - }, - "MaxResults":{ - "shape":"Integer", - "locationName":"maxResults" - }, - "NextToken":{ - "shape":"String", - "locationName":"nextToken" - } - } - }, - "DescribeTagsResult":{ - "type":"structure", - "members":{ - "Tags":{ - "shape":"TagDescriptionList", - "locationName":"tagSet" - }, - "NextToken":{ - "shape":"String", - "locationName":"nextToken" - } - } - }, - "DescribeVolumeAttributeRequest":{ - "type":"structure", - "required":["VolumeId"], - "members":{ - "DryRun":{ - "shape":"Boolean", - "locationName":"dryRun" - }, - "VolumeId":{"shape":"String"}, - "Attribute":{"shape":"VolumeAttributeName"} - } - }, - "DescribeVolumeAttributeResult":{ - "type":"structure", - "members":{ - "VolumeId":{ - "shape":"String", - "locationName":"volumeId" - }, - "AutoEnableIO":{ - "shape":"AttributeBooleanValue", - "locationName":"autoEnableIO" - }, - "ProductCodes":{ - "shape":"ProductCodeList", - "locationName":"productCodes" - } - } - }, - "DescribeVolumeStatusRequest":{ - "type":"structure", - "members":{ - "DryRun":{ - "shape":"Boolean", - "locationName":"dryRun" - }, - "VolumeIds":{ - "shape":"VolumeIdStringList", - "locationName":"VolumeId" - }, - "Filters":{ - "shape":"FilterList", - "locationName":"Filter" - }, - "NextToken":{"shape":"String"}, - "MaxResults":{"shape":"Integer"} - } - }, - "DescribeVolumeStatusResult":{ - "type":"structure", - "members":{ - "VolumeStatuses":{ - "shape":"VolumeStatusList", - "locationName":"volumeStatusSet" - }, - "NextToken":{ - "shape":"String", - "locationName":"nextToken" - } - } - }, - "DescribeVolumesRequest":{ - "type":"structure", - "members":{ - "DryRun":{ - "shape":"Boolean", - "locationName":"dryRun" - }, - "VolumeIds":{ - "shape":"VolumeIdStringList", - "locationName":"VolumeId" - }, - "Filters":{ - "shape":"FilterList", - "locationName":"Filter" - }, - "NextToken":{ - "shape":"String", - "locationName":"nextToken" - }, - "MaxResults":{ - "shape":"Integer", - "locationName":"maxResults" - } - } - }, - "DescribeVolumesResult":{ - "type":"structure", - "members":{ - "Volumes":{ - "shape":"VolumeList", - "locationName":"volumeSet" - }, - "NextToken":{ - "shape":"String", - "locationName":"nextToken" - } - } - }, - "DescribeVpcAttributeRequest":{ - "type":"structure", - "required":["VpcId"], - "members":{ - "DryRun":{ - "shape":"Boolean", - "locationName":"dryRun" - }, - "VpcId":{"shape":"String"}, - "Attribute":{"shape":"VpcAttributeName"} - } - }, - "DescribeVpcAttributeResult":{ - "type":"structure", - "members":{ - "VpcId":{ - "shape":"String", - "locationName":"vpcId" - }, - "EnableDnsSupport":{ - "shape":"AttributeBooleanValue", - "locationName":"enableDnsSupport" - }, - "EnableDnsHostnames":{ - "shape":"AttributeBooleanValue", - "locationName":"enableDnsHostnames" - } - } - }, - "DescribeVpcClassicLinkRequest":{ - "type":"structure", - "members":{ - "DryRun":{ - "shape":"Boolean", - "locationName":"dryRun" - }, - "VpcIds":{ - "shape":"VpcClassicLinkIdList", - "locationName":"VpcId" - }, - "Filters":{ - "shape":"FilterList", - "locationName":"Filter" - } - } - }, - "DescribeVpcClassicLinkResult":{ - "type":"structure", - "members":{ - "Vpcs":{ - "shape":"VpcClassicLinkList", - "locationName":"vpcSet" - } - } - }, - "DescribeVpcPeeringConnectionsRequest":{ - "type":"structure", - "members":{ - "DryRun":{ - "shape":"Boolean", - "locationName":"dryRun" - }, - "VpcPeeringConnectionIds":{ - "shape":"ValueStringList", - "locationName":"VpcPeeringConnectionId" - }, - "Filters":{ - "shape":"FilterList", - "locationName":"Filter" - } - } - }, - "DescribeVpcPeeringConnectionsResult":{ - "type":"structure", - "members":{ - "VpcPeeringConnections":{ - "shape":"VpcPeeringConnectionList", - "locationName":"vpcPeeringConnectionSet" - } - } - }, - "DescribeVpcsRequest":{ - "type":"structure", - "members":{ - "DryRun":{ - "shape":"Boolean", - "locationName":"dryRun" - }, - "VpcIds":{ - "shape":"VpcIdStringList", - "locationName":"VpcId" - }, - "Filters":{ - "shape":"FilterList", - "locationName":"Filter" - } - } - }, - "DescribeVpcsResult":{ - "type":"structure", - "members":{ - "Vpcs":{ - "shape":"VpcList", - "locationName":"vpcSet" - } - } - }, - "DescribeVpnConnectionsRequest":{ - "type":"structure", - "members":{ - "DryRun":{ - "shape":"Boolean", - "locationName":"dryRun" - }, - "VpnConnectionIds":{ - "shape":"VpnConnectionIdStringList", - "locationName":"VpnConnectionId" - }, - "Filters":{ - "shape":"FilterList", - "locationName":"Filter" - } - } - }, - "DescribeVpnConnectionsResult":{ - "type":"structure", - "members":{ - "VpnConnections":{ - "shape":"VpnConnectionList", - "locationName":"vpnConnectionSet" - } - } - }, - "DescribeVpnGatewaysRequest":{ - "type":"structure", - "members":{ - "DryRun":{ - "shape":"Boolean", - "locationName":"dryRun" - }, - "VpnGatewayIds":{ - "shape":"VpnGatewayIdStringList", - "locationName":"VpnGatewayId" - }, - "Filters":{ - "shape":"FilterList", - "locationName":"Filter" - } - } - }, - "DescribeVpnGatewaysResult":{ - "type":"structure", - "members":{ - "VpnGateways":{ - "shape":"VpnGatewayList", - "locationName":"vpnGatewaySet" - } - } - }, - "DetachClassicLinkVpcRequest":{ - "type":"structure", - "required":[ - "InstanceId", - "VpcId" - ], - "members":{ - "DryRun":{ - "shape":"Boolean", - "locationName":"dryRun" - }, - "InstanceId":{ - "shape":"String", - "locationName":"instanceId" - }, - "VpcId":{ - "shape":"String", - "locationName":"vpcId" - } - } - }, - "DetachClassicLinkVpcResult":{ - "type":"structure", - "members":{ - "Return":{ - "shape":"Boolean", - "locationName":"return" - } - } - }, - "DetachInternetGatewayRequest":{ - "type":"structure", - "required":[ - "InternetGatewayId", - "VpcId" - ], - "members":{ - "DryRun":{ - "shape":"Boolean", - "locationName":"dryRun" - }, - "InternetGatewayId":{ - "shape":"String", - "locationName":"internetGatewayId" - }, - "VpcId":{ - "shape":"String", - "locationName":"vpcId" - } - } - }, - "DetachNetworkInterfaceRequest":{ - "type":"structure", - "required":["AttachmentId"], - "members":{ - "DryRun":{ - "shape":"Boolean", - "locationName":"dryRun" - }, - "AttachmentId":{ - "shape":"String", - "locationName":"attachmentId" - }, - "Force":{ - "shape":"Boolean", - "locationName":"force" - } - } - }, - "DetachVolumeRequest":{ - "type":"structure", - "required":["VolumeId"], - "members":{ - "DryRun":{ - "shape":"Boolean", - "locationName":"dryRun" - }, - "VolumeId":{"shape":"String"}, - "InstanceId":{"shape":"String"}, - "Device":{"shape":"String"}, - "Force":{"shape":"Boolean"} - } - }, - "DetachVpnGatewayRequest":{ - "type":"structure", - "required":[ - "VpnGatewayId", - "VpcId" - ], - "members":{ - "DryRun":{ - "shape":"Boolean", - "locationName":"dryRun" - }, - "VpnGatewayId":{"shape":"String"}, - "VpcId":{"shape":"String"} - } - }, - "DeviceType":{ - "type":"string", - "enum":[ - "ebs", - "instance-store" - ] - }, - "DhcpConfiguration":{ - "type":"structure", - "members":{ - "Key":{ - "shape":"String", - "locationName":"key" - }, - "Values":{ - "shape":"DhcpConfigurationValueList", - "locationName":"valueSet" - } - } - }, - "DhcpConfigurationList":{ - "type":"list", - "member":{ - "shape":"DhcpConfiguration", - "locationName":"item" - } - }, - "DhcpOptions":{ - "type":"structure", - "members":{ - "DhcpOptionsId":{ - "shape":"String", - "locationName":"dhcpOptionsId" - }, - "DhcpConfigurations":{ - "shape":"DhcpConfigurationList", - "locationName":"dhcpConfigurationSet" - }, - "Tags":{ - "shape":"TagList", - "locationName":"tagSet" - } - } - }, - "DhcpOptionsIdStringList":{ - "type":"list", - "member":{ - "shape":"String", - "locationName":"DhcpOptionsId" - } - }, - "DhcpOptionsList":{ - "type":"list", - "member":{ - "shape":"DhcpOptions", - "locationName":"item" - } - }, - "DisableVgwRoutePropagationRequest":{ - "type":"structure", - "required":[ - "RouteTableId", - "GatewayId" - ], - "members":{ - "RouteTableId":{"shape":"String"}, - "GatewayId":{"shape":"String"} - } - }, - "DisableVpcClassicLinkRequest":{ - "type":"structure", - "required":["VpcId"], - "members":{ - "DryRun":{ - "shape":"Boolean", - "locationName":"dryRun" - }, - "VpcId":{ - "shape":"String", - "locationName":"vpcId" - } - } - }, - "DisableVpcClassicLinkResult":{ - "type":"structure", - "members":{ - "Return":{ - "shape":"Boolean", - "locationName":"return" - } - } - }, - "DisassociateAddressRequest":{ - "type":"structure", - "members":{ - "DryRun":{ - "shape":"Boolean", - "locationName":"dryRun" - }, - "PublicIp":{"shape":"String"}, - "AssociationId":{"shape":"String"} - } - }, - "DisassociateRouteTableRequest":{ - "type":"structure", - "required":["AssociationId"], - "members":{ - "DryRun":{ - "shape":"Boolean", - "locationName":"dryRun" - }, - "AssociationId":{ - "shape":"String", - "locationName":"associationId" - } - } - }, - "DiskImage":{ - "type":"structure", - "members":{ - "Image":{"shape":"DiskImageDetail"}, - "Description":{"shape":"String"}, - "Volume":{"shape":"VolumeDetail"} - } - }, - "DiskImageDescription":{ - "type":"structure", - "required":[ - "Format", - "Size", - "ImportManifestUrl" - ], - "members":{ - "Format":{ - "shape":"DiskImageFormat", - "locationName":"format" - }, - "Size":{ - "shape":"Long", - "locationName":"size" - }, - "ImportManifestUrl":{ - "shape":"String", - "locationName":"importManifestUrl" - }, - "Checksum":{ - "shape":"String", - "locationName":"checksum" - } - } - }, - "DiskImageDetail":{ - "type":"structure", - "required":[ - "Format", - "Bytes", - "ImportManifestUrl" - ], - "members":{ - "Format":{ - "shape":"DiskImageFormat", - "locationName":"format" - }, - "Bytes":{ - "shape":"Long", - "locationName":"bytes" - }, - "ImportManifestUrl":{ - "shape":"String", - "locationName":"importManifestUrl" - } - } - }, - "DiskImageFormat":{ - "type":"string", - "enum":[ - "VMDK", - "RAW", - "VHD" - ] - }, - "DiskImageList":{ - "type":"list", - "member":{"shape":"DiskImage"} - }, - "DiskImageVolumeDescription":{ - "type":"structure", - "required":["Id"], - "members":{ - "Size":{ - "shape":"Long", - "locationName":"size" - }, - "Id":{ - "shape":"String", - "locationName":"id" - } - } - }, - "DomainType":{ - "type":"string", - "enum":[ - "vpc", - "standard" - ] - }, - "Double":{"type":"double"}, - "EbsBlockDevice":{ - "type":"structure", - "members":{ - "SnapshotId":{ - "shape":"String", - "locationName":"snapshotId" - }, - "VolumeSize":{ - "shape":"Integer", - "locationName":"volumeSize" - }, - "DeleteOnTermination":{ - "shape":"Boolean", - "locationName":"deleteOnTermination" - }, - "VolumeType":{ - "shape":"VolumeType", - "locationName":"volumeType" - }, - "Iops":{ - "shape":"Integer", - "locationName":"iops" - }, - "Encrypted":{ - "shape":"Boolean", - "locationName":"encrypted" - } - } - }, - "EbsInstanceBlockDevice":{ - "type":"structure", - "members":{ - "VolumeId":{ - "shape":"String", - "locationName":"volumeId" - }, - "Status":{ - "shape":"AttachmentStatus", - "locationName":"status" - }, - "AttachTime":{ - "shape":"DateTime", - "locationName":"attachTime" - }, - "DeleteOnTermination":{ - "shape":"Boolean", - "locationName":"deleteOnTermination" - } - } - }, - "EbsInstanceBlockDeviceSpecification":{ - "type":"structure", - "members":{ - "VolumeId":{ - "shape":"String", - "locationName":"volumeId" - }, - "DeleteOnTermination":{ - "shape":"Boolean", - "locationName":"deleteOnTermination" - } - } - }, - "EnableVgwRoutePropagationRequest":{ - "type":"structure", - "required":[ - "RouteTableId", - "GatewayId" - ], - "members":{ - "RouteTableId":{"shape":"String"}, - "GatewayId":{"shape":"String"} - } - }, - "EnableVolumeIORequest":{ - "type":"structure", - "required":["VolumeId"], - "members":{ - "DryRun":{ - "shape":"Boolean", - "locationName":"dryRun" - }, - "VolumeId":{ - "shape":"String", - "locationName":"volumeId" - } - } - }, - "EnableVpcClassicLinkRequest":{ - "type":"structure", - "required":["VpcId"], - "members":{ - "DryRun":{ - "shape":"Boolean", - "locationName":"dryRun" - }, - "VpcId":{ - "shape":"String", - "locationName":"vpcId" - } - } - }, - "EnableVpcClassicLinkResult":{ - "type":"structure", - "members":{ - "Return":{ - "shape":"Boolean", - "locationName":"return" - } - } - }, - "EventCode":{ - "type":"string", - "enum":[ - "instance-reboot", - "system-reboot", - "system-maintenance", - "instance-retirement", - "instance-stop" - ] - }, - "ExecutableByStringList":{ - "type":"list", - "member":{ - "shape":"String", - "locationName":"ExecutableBy" - } - }, - "ExportEnvironment":{ - "type":"string", - "enum":[ - "citrix", - "vmware", - "microsoft" - ] - }, - "ExportTask":{ - "type":"structure", - "members":{ - "ExportTaskId":{ - "shape":"String", - "locationName":"exportTaskId" - }, - "Description":{ - "shape":"String", - "locationName":"description" - }, - "State":{ - "shape":"ExportTaskState", - "locationName":"state" - }, - "StatusMessage":{ - "shape":"String", - "locationName":"statusMessage" - }, - "InstanceExportDetails":{ - "shape":"InstanceExportDetails", - "locationName":"instanceExport" - }, - "ExportToS3Task":{ - "shape":"ExportToS3Task", - "locationName":"exportToS3" - } - } - }, - "ExportTaskIdStringList":{ - "type":"list", - "member":{ - "shape":"String", - "locationName":"ExportTaskId" - } - }, - "ExportTaskList":{ - "type":"list", - "member":{ - "shape":"ExportTask", - "locationName":"item" - } - }, - "ExportTaskState":{ - "type":"string", - "enum":[ - "active", - "cancelling", - "cancelled", - "completed" - ] - }, - "ExportToS3Task":{ - "type":"structure", - "members":{ - "DiskImageFormat":{ - "shape":"DiskImageFormat", - "locationName":"diskImageFormat" - }, - "ContainerFormat":{ - "shape":"ContainerFormat", - "locationName":"containerFormat" - }, - "S3Bucket":{ - "shape":"String", - "locationName":"s3Bucket" - }, - "S3Key":{ - "shape":"String", - "locationName":"s3Key" - } - } - }, - "ExportToS3TaskSpecification":{ - "type":"structure", - "members":{ - "DiskImageFormat":{ - "shape":"DiskImageFormat", - "locationName":"diskImageFormat" - }, - "ContainerFormat":{ - "shape":"ContainerFormat", - "locationName":"containerFormat" - }, - "S3Bucket":{ - "shape":"String", - "locationName":"s3Bucket" - }, - "S3Prefix":{ - "shape":"String", - "locationName":"s3Prefix" - } - } - }, - "Filter":{ - "type":"structure", - "members":{ - "Name":{"shape":"String"}, - "Values":{ - "shape":"ValueStringList", - "locationName":"Value" - } - } - }, - "FilterList":{ - "type":"list", - "member":{ - "shape":"Filter", - "locationName":"Filter" - } - }, - "Float":{"type":"float"}, - "GatewayType":{ - "type":"string", - "enum":["ipsec.1"] - }, - "GetConsoleOutputRequest":{ - "type":"structure", - "required":["InstanceId"], - "members":{ - "DryRun":{ - "shape":"Boolean", - "locationName":"dryRun" - }, - "InstanceId":{"shape":"String"} - } - }, - "GetConsoleOutputResult":{ - "type":"structure", - "members":{ - "InstanceId":{ - "shape":"String", - "locationName":"instanceId" - }, - "Timestamp":{ - "shape":"DateTime", - "locationName":"timestamp" - }, - "Output":{ - "shape":"String", - "locationName":"output" - } - } - }, - "GetPasswordDataRequest":{ - "type":"structure", - "required":["InstanceId"], - "members":{ - "DryRun":{ - "shape":"Boolean", - "locationName":"dryRun" - }, - "InstanceId":{"shape":"String"} - } - }, - "GetPasswordDataResult":{ - "type":"structure", - "members":{ - "InstanceId":{ - "shape":"String", - "locationName":"instanceId" - }, - "Timestamp":{ - "shape":"DateTime", - "locationName":"timestamp" - }, - "PasswordData":{ - "shape":"String", - "locationName":"passwordData" - } - } - }, - "GroupIdStringList":{ - "type":"list", - "member":{ - "shape":"String", - "locationName":"groupId" - } - }, - "GroupIdentifier":{ - "type":"structure", - "members":{ - "GroupName":{ - "shape":"String", - "locationName":"groupName" - }, - "GroupId":{ - "shape":"String", - "locationName":"groupId" - } - } - }, - "GroupIdentifierList":{ - "type":"list", - "member":{ - "shape":"GroupIdentifier", - "locationName":"item" - } - }, - "GroupNameStringList":{ - "type":"list", - "member":{ - "shape":"String", - "locationName":"GroupName" - } - }, - "HypervisorType":{ - "type":"string", - "enum":[ - "ovm", - "xen" - ] - }, - "IamInstanceProfile":{ - "type":"structure", - "members":{ - "Arn":{ - "shape":"String", - "locationName":"arn" - }, - "Id":{ - "shape":"String", - "locationName":"id" - } - } - }, - "IamInstanceProfileSpecification":{ - "type":"structure", - "members":{ - "Arn":{ - "shape":"String", - "locationName":"arn" - }, - "Name":{ - "shape":"String", - "locationName":"name" - } - } - }, - "IcmpTypeCode":{ - "type":"structure", - "members":{ - "Type":{ - "shape":"Integer", - "locationName":"type" - }, - "Code":{ - "shape":"Integer", - "locationName":"code" - } - } - }, - "Image":{ - "type":"structure", - "members":{ - "ImageId":{ - "shape":"String", - "locationName":"imageId" - }, - "ImageLocation":{ - "shape":"String", - "locationName":"imageLocation" - }, - "State":{ - "shape":"ImageState", - "locationName":"imageState" - }, - "OwnerId":{ - "shape":"String", - "locationName":"imageOwnerId" - }, - "CreationDate":{ - "shape":"String", - "locationName":"creationDate" - }, - "Public":{ - "shape":"Boolean", - "locationName":"isPublic" - }, - "ProductCodes":{ - "shape":"ProductCodeList", - "locationName":"productCodes" - }, - "Architecture":{ - "shape":"ArchitectureValues", - "locationName":"architecture" - }, - "ImageType":{ - "shape":"ImageTypeValues", - "locationName":"imageType" - }, - "KernelId":{ - "shape":"String", - "locationName":"kernelId" - }, - "RamdiskId":{ - "shape":"String", - "locationName":"ramdiskId" - }, - "Platform":{ - "shape":"PlatformValues", - "locationName":"platform" - }, - "SriovNetSupport":{ - "shape":"String", - "locationName":"sriovNetSupport" - }, - "StateReason":{ - "shape":"StateReason", - "locationName":"stateReason" - }, - "ImageOwnerAlias":{ - "shape":"String", - "locationName":"imageOwnerAlias" - }, - "Name":{ - "shape":"String", - "locationName":"name" - }, - "Description":{ - "shape":"String", - "locationName":"description" - }, - "RootDeviceType":{ - "shape":"DeviceType", - "locationName":"rootDeviceType" - }, - "RootDeviceName":{ - "shape":"String", - "locationName":"rootDeviceName" - }, - "BlockDeviceMappings":{ - "shape":"BlockDeviceMappingList", - "locationName":"blockDeviceMapping" - }, - "VirtualizationType":{ - "shape":"VirtualizationType", - "locationName":"virtualizationType" - }, - "Tags":{ - "shape":"TagList", - "locationName":"tagSet" - }, - "Hypervisor":{ - "shape":"HypervisorType", - "locationName":"hypervisor" - } - } - }, - "ImageAttribute":{ - "type":"structure", - "members":{ - "ImageId":{ - "shape":"String", - "locationName":"imageId" - }, - "LaunchPermissions":{ - "shape":"LaunchPermissionList", - "locationName":"launchPermission" - }, - "ProductCodes":{ - "shape":"ProductCodeList", - "locationName":"productCodes" - }, - "KernelId":{ - "shape":"AttributeValue", - "locationName":"kernel" - }, - "RamdiskId":{ - "shape":"AttributeValue", - "locationName":"ramdisk" - }, - "Description":{ - "shape":"AttributeValue", - "locationName":"description" - }, - "SriovNetSupport":{ - "shape":"AttributeValue", - "locationName":"sriovNetSupport" - }, - "BlockDeviceMappings":{ - "shape":"BlockDeviceMappingList", - "locationName":"blockDeviceMapping" - } - } - }, - "ImageAttributeName":{ - "type":"string", - "enum":[ - "description", - "kernel", - "ramdisk", - "launchPermission", - "productCodes", - "blockDeviceMapping" - ] - }, - "ImageIdStringList":{ - "type":"list", - "member":{ - "shape":"String", - "locationName":"ImageId" - } - }, - "ImageList":{ - "type":"list", - "member":{ - "shape":"Image", - "locationName":"item" - } - }, - "ImageState":{ - "type":"string", - "enum":[ - "available", - "deregistered" - ] - }, - "ImageTypeValues":{ - "type":"string", - "enum":[ - "machine", - "kernel", - "ramdisk" - ] - }, - "ImportInstanceLaunchSpecification":{ - "type":"structure", - "members":{ - "Architecture":{ - "shape":"ArchitectureValues", - "locationName":"architecture" - }, - "GroupNames":{ - "shape":"SecurityGroupStringList", - "locationName":"GroupName" - }, - "GroupIds":{ - "shape":"SecurityGroupIdStringList", - "locationName":"GroupId" - }, - "AdditionalInfo":{ - "shape":"String", - "locationName":"additionalInfo" - }, - "UserData":{ - "shape":"UserData", - "locationName":"userData" - }, - "InstanceType":{ - "shape":"InstanceType", - "locationName":"instanceType" - }, - "Placement":{ - "shape":"Placement", - "locationName":"placement" - }, - "Monitoring":{ - "shape":"Boolean", - "locationName":"monitoring" - }, - "SubnetId":{ - "shape":"String", - "locationName":"subnetId" - }, - "InstanceInitiatedShutdownBehavior":{ - "shape":"ShutdownBehavior", - "locationName":"instanceInitiatedShutdownBehavior" - }, - "PrivateIpAddress":{ - "shape":"String", - "locationName":"privateIpAddress" - } - } - }, - "ImportInstanceRequest":{ - "type":"structure", - "required":["Platform"], - "members":{ - "DryRun":{ - "shape":"Boolean", - "locationName":"dryRun" - }, - "Description":{ - "shape":"String", - "locationName":"description" - }, - "LaunchSpecification":{ - "shape":"ImportInstanceLaunchSpecification", - "locationName":"launchSpecification" - }, - "DiskImages":{ - "shape":"DiskImageList", - "locationName":"diskImage" - }, - "Platform":{ - "shape":"PlatformValues", - "locationName":"platform" - } - } - }, - "ImportInstanceResult":{ - "type":"structure", - "members":{ - "ConversionTask":{ - "shape":"ConversionTask", - "locationName":"conversionTask" - } - } - }, - "ImportInstanceTaskDetails":{ - "type":"structure", - "required":["Volumes"], - "members":{ - "Volumes":{ - "shape":"ImportInstanceVolumeDetailSet", - "locationName":"volumes" - }, - "InstanceId":{ - "shape":"String", - "locationName":"instanceId" - }, - "Platform":{ - "shape":"PlatformValues", - "locationName":"platform" - }, - "Description":{ - "shape":"String", - "locationName":"description" - } - } - }, - "ImportInstanceVolumeDetailItem":{ - "type":"structure", - "required":[ - "BytesConverted", - "AvailabilityZone", - "Image", - "Volume", - "Status" - ], - "members":{ - "BytesConverted":{ - "shape":"Long", - "locationName":"bytesConverted" - }, - "AvailabilityZone":{ - "shape":"String", - "locationName":"availabilityZone" - }, - "Image":{ - "shape":"DiskImageDescription", - "locationName":"image" - }, - "Volume":{ - "shape":"DiskImageVolumeDescription", - "locationName":"volume" - }, - "Status":{ - "shape":"String", - "locationName":"status" - }, - "StatusMessage":{ - "shape":"String", - "locationName":"statusMessage" - }, - "Description":{ - "shape":"String", - "locationName":"description" - } - } - }, - "ImportInstanceVolumeDetailSet":{ - "type":"list", - "member":{ - "shape":"ImportInstanceVolumeDetailItem", - "locationName":"item" - } - }, - "ImportKeyPairRequest":{ - "type":"structure", - "required":[ - "KeyName", - "PublicKeyMaterial" - ], - "members":{ - "DryRun":{ - "shape":"Boolean", - "locationName":"dryRun" - }, - "KeyName":{ - "shape":"String", - "locationName":"keyName" - }, - "PublicKeyMaterial":{ - "shape":"Blob", - "locationName":"publicKeyMaterial" - } - } - }, - "ImportKeyPairResult":{ - "type":"structure", - "members":{ - "KeyName":{ - "shape":"String", - "locationName":"keyName" - }, - "KeyFingerprint":{ - "shape":"String", - "locationName":"keyFingerprint" - } - } - }, - "ImportVolumeRequest":{ - "type":"structure", - "required":[ - "AvailabilityZone", - "Image", - "Volume" - ], - "members":{ - "DryRun":{ - "shape":"Boolean", - "locationName":"dryRun" - }, - "AvailabilityZone":{ - "shape":"String", - "locationName":"availabilityZone" - }, - "Image":{ - "shape":"DiskImageDetail", - "locationName":"image" - }, - "Description":{ - "shape":"String", - "locationName":"description" - }, - "Volume":{ - "shape":"VolumeDetail", - "locationName":"volume" - } - } - }, - "ImportVolumeResult":{ - "type":"structure", - "members":{ - "ConversionTask":{ - "shape":"ConversionTask", - "locationName":"conversionTask" - } - } - }, - "ImportVolumeTaskDetails":{ - "type":"structure", - "required":[ - "BytesConverted", - "AvailabilityZone", - "Image", - "Volume" - ], - "members":{ - "BytesConverted":{ - "shape":"Long", - "locationName":"bytesConverted" - }, - "AvailabilityZone":{ - "shape":"String", - "locationName":"availabilityZone" - }, - "Description":{ - "shape":"String", - "locationName":"description" - }, - "Image":{ - "shape":"DiskImageDescription", - "locationName":"image" - }, - "Volume":{ - "shape":"DiskImageVolumeDescription", - "locationName":"volume" - } - } - }, - "Instance":{ - "type":"structure", - "members":{ - "InstanceId":{ - "shape":"String", - "locationName":"instanceId" - }, - "ImageId":{ - "shape":"String", - "locationName":"imageId" - }, - "State":{ - "shape":"InstanceState", - "locationName":"instanceState" - }, - "PrivateDnsName":{ - "shape":"String", - "locationName":"privateDnsName" - }, - "PublicDnsName":{ - "shape":"String", - "locationName":"dnsName" - }, - "StateTransitionReason":{ - "shape":"String", - "locationName":"reason" - }, - "KeyName":{ - "shape":"String", - "locationName":"keyName" - }, - "AmiLaunchIndex":{ - "shape":"Integer", - "locationName":"amiLaunchIndex" - }, - "ProductCodes":{ - "shape":"ProductCodeList", - "locationName":"productCodes" - }, - "InstanceType":{ - "shape":"InstanceType", - "locationName":"instanceType" - }, - "LaunchTime":{ - "shape":"DateTime", - "locationName":"launchTime" - }, - "Placement":{ - "shape":"Placement", - "locationName":"placement" - }, - "KernelId":{ - "shape":"String", - "locationName":"kernelId" - }, - "RamdiskId":{ - "shape":"String", - "locationName":"ramdiskId" - }, - "Platform":{ - "shape":"PlatformValues", - "locationName":"platform" - }, - "Monitoring":{ - "shape":"Monitoring", - "locationName":"monitoring" - }, - "SubnetId":{ - "shape":"String", - "locationName":"subnetId" - }, - "VpcId":{ - "shape":"String", - "locationName":"vpcId" - }, - "PrivateIpAddress":{ - "shape":"String", - "locationName":"privateIpAddress" - }, - "PublicIpAddress":{ - "shape":"String", - "locationName":"ipAddress" - }, - "StateReason":{ - "shape":"StateReason", - "locationName":"stateReason" - }, - "Architecture":{ - "shape":"ArchitectureValues", - "locationName":"architecture" - }, - "RootDeviceType":{ - "shape":"DeviceType", - "locationName":"rootDeviceType" - }, - "RootDeviceName":{ - "shape":"String", - "locationName":"rootDeviceName" - }, - "BlockDeviceMappings":{ - "shape":"InstanceBlockDeviceMappingList", - "locationName":"blockDeviceMapping" - }, - "VirtualizationType":{ - "shape":"VirtualizationType", - "locationName":"virtualizationType" - }, - "InstanceLifecycle":{ - "shape":"InstanceLifecycleType", - "locationName":"instanceLifecycle" - }, - "SpotInstanceRequestId":{ - "shape":"String", - "locationName":"spotInstanceRequestId" - }, - "ClientToken":{ - "shape":"String", - "locationName":"clientToken" - }, - "Tags":{ - "shape":"TagList", - "locationName":"tagSet" - }, - "SecurityGroups":{ - "shape":"GroupIdentifierList", - "locationName":"groupSet" - }, - "SourceDestCheck":{ - "shape":"Boolean", - "locationName":"sourceDestCheck" - }, - "Hypervisor":{ - "shape":"HypervisorType", - "locationName":"hypervisor" - }, - "NetworkInterfaces":{ - "shape":"InstanceNetworkInterfaceList", - "locationName":"networkInterfaceSet" - }, - "IamInstanceProfile":{ - "shape":"IamInstanceProfile", - "locationName":"iamInstanceProfile" - }, - "EbsOptimized":{ - "shape":"Boolean", - "locationName":"ebsOptimized" - }, - "SriovNetSupport":{ - "shape":"String", - "locationName":"sriovNetSupport" - } - } - }, - "InstanceAttribute":{ - "type":"structure", - "members":{ - "InstanceId":{ - "shape":"String", - "locationName":"instanceId" - }, - "InstanceType":{ - "shape":"AttributeValue", - "locationName":"instanceType" - }, - "KernelId":{ - "shape":"AttributeValue", - "locationName":"kernel" - }, - "RamdiskId":{ - "shape":"AttributeValue", - "locationName":"ramdisk" - }, - "UserData":{ - "shape":"AttributeValue", - "locationName":"userData" - }, - "DisableApiTermination":{ - "shape":"AttributeBooleanValue", - "locationName":"disableApiTermination" - }, - "InstanceInitiatedShutdownBehavior":{ - "shape":"AttributeValue", - "locationName":"instanceInitiatedShutdownBehavior" - }, - "RootDeviceName":{ - "shape":"AttributeValue", - "locationName":"rootDeviceName" - }, - "BlockDeviceMappings":{ - "shape":"InstanceBlockDeviceMappingList", - "locationName":"blockDeviceMapping" - }, - "ProductCodes":{ - "shape":"ProductCodeList", - "locationName":"productCodes" - }, - "EbsOptimized":{ - "shape":"AttributeBooleanValue", - "locationName":"ebsOptimized" - }, - "SriovNetSupport":{ - "shape":"AttributeValue", - "locationName":"sriovNetSupport" - }, - "SourceDestCheck":{ - "shape":"AttributeBooleanValue", - "locationName":"sourceDestCheck" - }, - "Groups":{ - "shape":"GroupIdentifierList", - "locationName":"groupSet" - } - } - }, - "InstanceAttributeName":{ - "type":"string", - "enum":[ - "instanceType", - "kernel", - "ramdisk", - "userData", - "disableApiTermination", - "instanceInitiatedShutdownBehavior", - "rootDeviceName", - "blockDeviceMapping", - "productCodes", - "sourceDestCheck", - "groupSet", - "ebsOptimized", - "sriovNetSupport" - ] - }, - "InstanceBlockDeviceMapping":{ - "type":"structure", - "members":{ - "DeviceName":{ - "shape":"String", - "locationName":"deviceName" - }, - "Ebs":{ - "shape":"EbsInstanceBlockDevice", - "locationName":"ebs" - } - } - }, - "InstanceBlockDeviceMappingList":{ - "type":"list", - "member":{ - "shape":"InstanceBlockDeviceMapping", - "locationName":"item" - } - }, - "InstanceBlockDeviceMappingSpecification":{ - "type":"structure", - "members":{ - "DeviceName":{ - "shape":"String", - "locationName":"deviceName" - }, - "Ebs":{ - "shape":"EbsInstanceBlockDeviceSpecification", - "locationName":"ebs" - }, - "VirtualName":{ - "shape":"String", - "locationName":"virtualName" - }, - "NoDevice":{ - "shape":"String", - "locationName":"noDevice" - } - } - }, - "InstanceBlockDeviceMappingSpecificationList":{ - "type":"list", - "member":{ - "shape":"InstanceBlockDeviceMappingSpecification", - "locationName":"item" - } - }, - "InstanceCount":{ - "type":"structure", - "members":{ - "State":{ - "shape":"ListingState", - "locationName":"state" - }, - "InstanceCount":{ - "shape":"Integer", - "locationName":"instanceCount" - } - } - }, - "InstanceCountList":{ - "type":"list", - "member":{ - "shape":"InstanceCount", - "locationName":"item" - } - }, - "InstanceExportDetails":{ - "type":"structure", - "members":{ - "InstanceId":{ - "shape":"String", - "locationName":"instanceId" - }, - "TargetEnvironment":{ - "shape":"ExportEnvironment", - "locationName":"targetEnvironment" - } - } - }, - "InstanceIdStringList":{ - "type":"list", - "member":{ - "shape":"String", - "locationName":"InstanceId" - } - }, - "InstanceLifecycleType":{ - "type":"string", - "enum":["spot"] - }, - "InstanceList":{ - "type":"list", - "member":{ - "shape":"Instance", - "locationName":"item" - } - }, - "InstanceMonitoring":{ - "type":"structure", - "members":{ - "InstanceId":{ - "shape":"String", - "locationName":"instanceId" - }, - "Monitoring":{ - "shape":"Monitoring", - "locationName":"monitoring" - } - } - }, - "InstanceMonitoringList":{ - "type":"list", - "member":{ - "shape":"InstanceMonitoring", - "locationName":"item" - } - }, - "InstanceNetworkInterface":{ - "type":"structure", - "members":{ - "NetworkInterfaceId":{ - "shape":"String", - "locationName":"networkInterfaceId" - }, - "SubnetId":{ - "shape":"String", - "locationName":"subnetId" - }, - "VpcId":{ - "shape":"String", - "locationName":"vpcId" - }, - "Description":{ - "shape":"String", - "locationName":"description" - }, - "OwnerId":{ - "shape":"String", - "locationName":"ownerId" - }, - "Status":{ - "shape":"NetworkInterfaceStatus", - "locationName":"status" - }, - "MacAddress":{ - "shape":"String", - "locationName":"macAddress" - }, - "PrivateIpAddress":{ - "shape":"String", - "locationName":"privateIpAddress" - }, - "PrivateDnsName":{ - "shape":"String", - "locationName":"privateDnsName" - }, - "SourceDestCheck":{ - "shape":"Boolean", - "locationName":"sourceDestCheck" - }, - "Groups":{ - "shape":"GroupIdentifierList", - "locationName":"groupSet" - }, - "Attachment":{ - "shape":"InstanceNetworkInterfaceAttachment", - "locationName":"attachment" - }, - "Association":{ - "shape":"InstanceNetworkInterfaceAssociation", - "locationName":"association" - }, - "PrivateIpAddresses":{ - "shape":"InstancePrivateIpAddressList", - "locationName":"privateIpAddressesSet" - } - } - }, - "InstanceNetworkInterfaceAssociation":{ - "type":"structure", - "members":{ - "PublicIp":{ - "shape":"String", - "locationName":"publicIp" - }, - "PublicDnsName":{ - "shape":"String", - "locationName":"publicDnsName" - }, - "IpOwnerId":{ - "shape":"String", - "locationName":"ipOwnerId" - } - } - }, - "InstanceNetworkInterfaceAttachment":{ - "type":"structure", - "members":{ - "AttachmentId":{ - "shape":"String", - "locationName":"attachmentId" - }, - "DeviceIndex":{ - "shape":"Integer", - "locationName":"deviceIndex" - }, - "Status":{ - "shape":"AttachmentStatus", - "locationName":"status" - }, - "AttachTime":{ - "shape":"DateTime", - "locationName":"attachTime" - }, - "DeleteOnTermination":{ - "shape":"Boolean", - "locationName":"deleteOnTermination" - } - } - }, - "InstanceNetworkInterfaceList":{ - "type":"list", - "member":{ - "shape":"InstanceNetworkInterface", - "locationName":"item" - } - }, - "InstanceNetworkInterfaceSpecification":{ - "type":"structure", - "members":{ - "NetworkInterfaceId":{ - "shape":"String", - "locationName":"networkInterfaceId" - }, - "DeviceIndex":{ - "shape":"Integer", - "locationName":"deviceIndex" - }, - "SubnetId":{ - "shape":"String", - "locationName":"subnetId" - }, - "Description":{ - "shape":"String", - "locationName":"description" - }, - "PrivateIpAddress":{ - "shape":"String", - "locationName":"privateIpAddress" - }, - "Groups":{ - "shape":"SecurityGroupIdStringList", - "locationName":"SecurityGroupId" - }, - "DeleteOnTermination":{ - "shape":"Boolean", - "locationName":"deleteOnTermination" - }, - "PrivateIpAddresses":{ - "shape":"PrivateIpAddressSpecificationList", - "locationName":"privateIpAddressesSet", - "queryName":"PrivateIpAddresses" - }, - "SecondaryPrivateIpAddressCount":{ - "shape":"Integer", - "locationName":"secondaryPrivateIpAddressCount" - }, - "AssociatePublicIpAddress":{ - "shape":"Boolean", - "locationName":"associatePublicIpAddress" - } - } - }, - "InstanceNetworkInterfaceSpecificationList":{ - "type":"list", - "member":{ - "shape":"InstanceNetworkInterfaceSpecification", - "locationName":"item" - } - }, - "InstancePrivateIpAddress":{ - "type":"structure", - "members":{ - "PrivateIpAddress":{ - "shape":"String", - "locationName":"privateIpAddress" - }, - "PrivateDnsName":{ - "shape":"String", - "locationName":"privateDnsName" - }, - "Primary":{ - "shape":"Boolean", - "locationName":"primary" - }, - "Association":{ - "shape":"InstanceNetworkInterfaceAssociation", - "locationName":"association" - } - } - }, - "InstancePrivateIpAddressList":{ - "type":"list", - "member":{ - "shape":"InstancePrivateIpAddress", - "locationName":"item" - } - }, - "InstanceState":{ - "type":"structure", - "members":{ - "Code":{ - "shape":"Integer", - "locationName":"code" - }, - "Name":{ - "shape":"InstanceStateName", - "locationName":"name" - } - } - }, - "InstanceStateChange":{ - "type":"structure", - "members":{ - "InstanceId":{ - "shape":"String", - "locationName":"instanceId" - }, - "CurrentState":{ - "shape":"InstanceState", - "locationName":"currentState" - }, - "PreviousState":{ - "shape":"InstanceState", - "locationName":"previousState" - } - } - }, - "InstanceStateChangeList":{ - "type":"list", - "member":{ - "shape":"InstanceStateChange", - "locationName":"item" - } - }, - "InstanceStateName":{ - "type":"string", - "enum":[ - "pending", - "running", - "shutting-down", - "terminated", - "stopping", - "stopped" - ] - }, - "InstanceStatus":{ - "type":"structure", - "members":{ - "InstanceId":{ - "shape":"String", - "locationName":"instanceId" - }, - "AvailabilityZone":{ - "shape":"String", - "locationName":"availabilityZone" - }, - "Events":{ - "shape":"InstanceStatusEventList", - "locationName":"eventsSet" - }, - "InstanceState":{ - "shape":"InstanceState", - "locationName":"instanceState" - }, - "SystemStatus":{ - "shape":"InstanceStatusSummary", - "locationName":"systemStatus" - }, - "InstanceStatus":{ - "shape":"InstanceStatusSummary", - "locationName":"instanceStatus" - } - } - }, - "InstanceStatusDetails":{ - "type":"structure", - "members":{ - "Name":{ - "shape":"StatusName", - "locationName":"name" - }, - "Status":{ - "shape":"StatusType", - "locationName":"status" - }, - "ImpairedSince":{ - "shape":"DateTime", - "locationName":"impairedSince" - } - } - }, - "InstanceStatusDetailsList":{ - "type":"list", - "member":{ - "shape":"InstanceStatusDetails", - "locationName":"item" - } - }, - "InstanceStatusEvent":{ - "type":"structure", - "members":{ - "Code":{ - "shape":"EventCode", - "locationName":"code" - }, - "Description":{ - "shape":"String", - "locationName":"description" - }, - "NotBefore":{ - "shape":"DateTime", - "locationName":"notBefore" - }, - "NotAfter":{ - "shape":"DateTime", - "locationName":"notAfter" - } - } - }, - "InstanceStatusEventList":{ - "type":"list", - "member":{ - "shape":"InstanceStatusEvent", - "locationName":"item" - } - }, - "InstanceStatusList":{ - "type":"list", - "member":{ - "shape":"InstanceStatus", - "locationName":"item" - } - }, - "InstanceStatusSummary":{ - "type":"structure", - "members":{ - "Status":{ - "shape":"SummaryStatus", - "locationName":"status" - }, - "Details":{ - "shape":"InstanceStatusDetailsList", - "locationName":"details" - } - } - }, - "InstanceType":{ - "type":"string", - "enum":[ - "t1.micro", - "m1.small", - "m1.medium", - "m1.large", - "m1.xlarge", - "m3.medium", - "m3.large", - "m3.xlarge", - "m3.2xlarge", - "t2.micro", - "t2.small", - "t2.medium", - "m2.xlarge", - "m2.2xlarge", - "m2.4xlarge", - "cr1.8xlarge", - "i2.xlarge", - "i2.2xlarge", - "i2.4xlarge", - "i2.8xlarge", - "hi1.4xlarge", - "hs1.8xlarge", - "c1.medium", - "c1.xlarge", - "c3.large", - "c3.xlarge", - "c3.2xlarge", - "c3.4xlarge", - "c3.8xlarge", - "c4.large", - "c4.xlarge", - "c4.2xlarge", - "c4.4xlarge", - "c4.8xlarge", - "cc1.4xlarge", - "cc2.8xlarge", - "g2.2xlarge", - "cg1.4xlarge", - "r3.large", - "r3.xlarge", - "r3.2xlarge", - "r3.4xlarge", - "r3.8xlarge", - "d2.xlarge", - "d2.2xlarge", - "d2.4xlarge", - "d2.8xlarge" - ] - }, - "InstanceTypeList":{ - "type":"list", - "member":{"shape":"InstanceType"} - }, - "Integer":{"type":"integer"}, - "InternetGateway":{ - "type":"structure", - "members":{ - "InternetGatewayId":{ - "shape":"String", - "locationName":"internetGatewayId" - }, - "Attachments":{ - "shape":"InternetGatewayAttachmentList", - "locationName":"attachmentSet" - }, - "Tags":{ - "shape":"TagList", - "locationName":"tagSet" - } - } - }, - "InternetGatewayAttachment":{ - "type":"structure", - "members":{ - "VpcId":{ - "shape":"String", - "locationName":"vpcId" - }, - "State":{ - "shape":"AttachmentStatus", - "locationName":"state" - } - } - }, - "InternetGatewayAttachmentList":{ - "type":"list", - "member":{ - "shape":"InternetGatewayAttachment", - "locationName":"item" - } - }, - "InternetGatewayList":{ - "type":"list", - "member":{ - "shape":"InternetGateway", - "locationName":"item" - } - }, - "IpPermission":{ - "type":"structure", - "members":{ - "IpProtocol":{ - "shape":"String", - "locationName":"ipProtocol" - }, - "FromPort":{ - "shape":"Integer", - "locationName":"fromPort" - }, - "ToPort":{ - "shape":"Integer", - "locationName":"toPort" - }, - "UserIdGroupPairs":{ - "shape":"UserIdGroupPairList", - "locationName":"groups" - }, - "IpRanges":{ - "shape":"IpRangeList", - "locationName":"ipRanges" - } - } - }, - "IpPermissionList":{ - "type":"list", - "member":{ - "shape":"IpPermission", - "locationName":"item" - } - }, - "IpRange":{ - "type":"structure", - "members":{ - "CidrIp":{ - "shape":"String", - "locationName":"cidrIp" - } - } - }, - "IpRangeList":{ - "type":"list", - "member":{ - "shape":"IpRange", - "locationName":"item" - } - }, - "KeyNameStringList":{ - "type":"list", - "member":{ - "shape":"String", - "locationName":"KeyName" - } - }, - "KeyPair":{ - "type":"structure", - "members":{ - "KeyName":{ - "shape":"String", - "locationName":"keyName" - }, - "KeyFingerprint":{ - "shape":"String", - "locationName":"keyFingerprint" - }, - "KeyMaterial":{ - "shape":"String", - "locationName":"keyMaterial" - } - } - }, - "KeyPairInfo":{ - "type":"structure", - "members":{ - "KeyName":{ - "shape":"String", - "locationName":"keyName" - }, - "KeyFingerprint":{ - "shape":"String", - "locationName":"keyFingerprint" - } - } - }, - "KeyPairList":{ - "type":"list", - "member":{ - "shape":"KeyPairInfo", - "locationName":"item" - } - }, - "LaunchPermission":{ - "type":"structure", - "members":{ - "UserId":{ - "shape":"String", - "locationName":"userId" - }, - "Group":{ - "shape":"PermissionGroup", - "locationName":"group" - } - } - }, - "LaunchPermissionList":{ - "type":"list", - "member":{ - "shape":"LaunchPermission", - "locationName":"item" - } - }, - "LaunchPermissionModifications":{ - "type":"structure", - "members":{ - "Add":{"shape":"LaunchPermissionList"}, - "Remove":{"shape":"LaunchPermissionList"} - } - }, - "LaunchSpecification":{ - "type":"structure", - "members":{ - "ImageId":{ - "shape":"String", - "locationName":"imageId" - }, - "KeyName":{ - "shape":"String", - "locationName":"keyName" - }, - "SecurityGroups":{ - "shape":"GroupIdentifierList", - "locationName":"groupSet" - }, - "UserData":{ - "shape":"String", - "locationName":"userData" - }, - "AddressingType":{ - "shape":"String", - "locationName":"addressingType" - }, - "InstanceType":{ - "shape":"InstanceType", - "locationName":"instanceType" - }, - "Placement":{ - "shape":"SpotPlacement", - "locationName":"placement" - }, - "KernelId":{ - "shape":"String", - "locationName":"kernelId" - }, - "RamdiskId":{ - "shape":"String", - "locationName":"ramdiskId" - }, - "BlockDeviceMappings":{ - "shape":"BlockDeviceMappingList", - "locationName":"blockDeviceMapping" - }, - "SubnetId":{ - "shape":"String", - "locationName":"subnetId" - }, - "NetworkInterfaces":{ - "shape":"InstanceNetworkInterfaceSpecificationList", - "locationName":"networkInterfaceSet" - }, - "IamInstanceProfile":{ - "shape":"IamInstanceProfileSpecification", - "locationName":"iamInstanceProfile" - }, - "EbsOptimized":{ - "shape":"Boolean", - "locationName":"ebsOptimized" - }, - "Monitoring":{ - "shape":"RunInstancesMonitoringEnabled", - "locationName":"monitoring" - } - } - }, - "ListingState":{ - "type":"string", - "enum":[ - "available", - "sold", - "cancelled", - "pending" - ] - }, - "ListingStatus":{ - "type":"string", - "enum":[ - "active", - "pending", - "cancelled", - "closed" - ] - }, - "Long":{"type":"long"}, - "ModifyImageAttributeRequest":{ - "type":"structure", - "required":["ImageId"], - "members":{ - "DryRun":{ - "shape":"Boolean", - "locationName":"dryRun" - }, - "ImageId":{"shape":"String"}, - "Attribute":{"shape":"String"}, - "OperationType":{"shape":"String"}, - "UserIds":{ - "shape":"UserIdStringList", - "locationName":"UserId" - }, - "UserGroups":{ - "shape":"UserGroupStringList", - "locationName":"UserGroup" - }, - "ProductCodes":{ - "shape":"ProductCodeStringList", - "locationName":"ProductCode" - }, - "Value":{"shape":"String"}, - "LaunchPermission":{"shape":"LaunchPermissionModifications"}, - "Description":{"shape":"AttributeValue"} - } - }, - "ModifyInstanceAttributeRequest":{ - "type":"structure", - "required":["InstanceId"], - "members":{ - "DryRun":{ - "shape":"Boolean", - "locationName":"dryRun" - }, - "InstanceId":{ - "shape":"String", - "locationName":"instanceId" - }, - "Attribute":{ - "shape":"InstanceAttributeName", - "locationName":"attribute" - }, - "Value":{ - "shape":"String", - "locationName":"value" - }, - "BlockDeviceMappings":{ - "shape":"InstanceBlockDeviceMappingSpecificationList", - "locationName":"blockDeviceMapping" - }, - "SourceDestCheck":{"shape":"AttributeBooleanValue"}, - "DisableApiTermination":{ - "shape":"AttributeBooleanValue", - "locationName":"disableApiTermination" - }, - "InstanceType":{ - "shape":"AttributeValue", - "locationName":"instanceType" - }, - "Kernel":{ - "shape":"AttributeValue", - "locationName":"kernel" - }, - "Ramdisk":{ - "shape":"AttributeValue", - "locationName":"ramdisk" - }, - "UserData":{ - "shape":"BlobAttributeValue", - "locationName":"userData" - }, - "InstanceInitiatedShutdownBehavior":{ - "shape":"AttributeValue", - "locationName":"instanceInitiatedShutdownBehavior" - }, - "Groups":{ - "shape":"GroupIdStringList", - "locationName":"GroupId" - }, - "EbsOptimized":{ - "shape":"AttributeBooleanValue", - "locationName":"ebsOptimized" - }, - "SriovNetSupport":{ - "shape":"AttributeValue", - "locationName":"sriovNetSupport" - } - } - }, - "ModifyNetworkInterfaceAttributeRequest":{ - "type":"structure", - "required":["NetworkInterfaceId"], - "members":{ - "DryRun":{ - "shape":"Boolean", - "locationName":"dryRun" - }, - "NetworkInterfaceId":{ - "shape":"String", - "locationName":"networkInterfaceId" - }, - "Description":{ - "shape":"AttributeValue", - "locationName":"description" - }, - "SourceDestCheck":{ - "shape":"AttributeBooleanValue", - "locationName":"sourceDestCheck" - }, - "Groups":{ - "shape":"SecurityGroupIdStringList", - "locationName":"SecurityGroupId" - }, - "Attachment":{ - "shape":"NetworkInterfaceAttachmentChanges", - "locationName":"attachment" - } - } - }, - "ModifyReservedInstancesRequest":{ - "type":"structure", - "required":[ - "ReservedInstancesIds", - "TargetConfigurations" - ], - "members":{ - "ClientToken":{ - "shape":"String", - "locationName":"clientToken" - }, - "ReservedInstancesIds":{ - "shape":"ReservedInstancesIdStringList", - "locationName":"ReservedInstancesId" - }, - "TargetConfigurations":{ - "shape":"ReservedInstancesConfigurationList", - "locationName":"ReservedInstancesConfigurationSetItemType" - } - } - }, - "ModifyReservedInstancesResult":{ - "type":"structure", - "members":{ - "ReservedInstancesModificationId":{ - "shape":"String", - "locationName":"reservedInstancesModificationId" - } - } - }, - "ModifySnapshotAttributeRequest":{ - "type":"structure", - "required":["SnapshotId"], - "members":{ - "DryRun":{ - "shape":"Boolean", - "locationName":"dryRun" - }, - "SnapshotId":{"shape":"String"}, - "Attribute":{"shape":"SnapshotAttributeName"}, - "OperationType":{"shape":"String"}, - "UserIds":{ - "shape":"UserIdStringList", - "locationName":"UserId" - }, - "GroupNames":{ - "shape":"GroupNameStringList", - "locationName":"UserGroup" - }, - "CreateVolumePermission":{"shape":"CreateVolumePermissionModifications"} - } - }, - "ModifySubnetAttributeRequest":{ - "type":"structure", - "required":["SubnetId"], - "members":{ - "SubnetId":{ - "shape":"String", - "locationName":"subnetId" - }, - "MapPublicIpOnLaunch":{"shape":"AttributeBooleanValue"} - } - }, - "ModifyVolumeAttributeRequest":{ - "type":"structure", - "required":["VolumeId"], - "members":{ - "DryRun":{ - "shape":"Boolean", - "locationName":"dryRun" - }, - "VolumeId":{"shape":"String"}, - "AutoEnableIO":{"shape":"AttributeBooleanValue"} - } - }, - "ModifyVpcAttributeRequest":{ - "type":"structure", - "required":["VpcId"], - "members":{ - "VpcId":{ - "shape":"String", - "locationName":"vpcId" - }, - "EnableDnsSupport":{"shape":"AttributeBooleanValue"}, - "EnableDnsHostnames":{"shape":"AttributeBooleanValue"} - } - }, - "MonitorInstancesRequest":{ - "type":"structure", - "required":["InstanceIds"], - "members":{ - "DryRun":{ - "shape":"Boolean", - "locationName":"dryRun" - }, - "InstanceIds":{ - "shape":"InstanceIdStringList", - "locationName":"InstanceId" - } - } - }, - "MonitorInstancesResult":{ - "type":"structure", - "members":{ - "InstanceMonitorings":{ - "shape":"InstanceMonitoringList", - "locationName":"instancesSet" - } - } - }, - "Monitoring":{ - "type":"structure", - "members":{ - "State":{ - "shape":"MonitoringState", - "locationName":"state" - } - } - }, - "MonitoringState":{ - "type":"string", - "enum":[ - "disabled", - "enabled", - "pending" - ] - }, - "NetworkAcl":{ - "type":"structure", - "members":{ - "NetworkAclId":{ - "shape":"String", - "locationName":"networkAclId" - }, - "VpcId":{ - "shape":"String", - "locationName":"vpcId" - }, - "IsDefault":{ - "shape":"Boolean", - "locationName":"default" - }, - "Entries":{ - "shape":"NetworkAclEntryList", - "locationName":"entrySet" - }, - "Associations":{ - "shape":"NetworkAclAssociationList", - "locationName":"associationSet" - }, - "Tags":{ - "shape":"TagList", - "locationName":"tagSet" - } - } - }, - "NetworkAclAssociation":{ - "type":"structure", - "members":{ - "NetworkAclAssociationId":{ - "shape":"String", - "locationName":"networkAclAssociationId" - }, - "NetworkAclId":{ - "shape":"String", - "locationName":"networkAclId" - }, - "SubnetId":{ - "shape":"String", - "locationName":"subnetId" - } - } - }, - "NetworkAclAssociationList":{ - "type":"list", - "member":{ - "shape":"NetworkAclAssociation", - "locationName":"item" - } - }, - "NetworkAclEntry":{ - "type":"structure", - "members":{ - "RuleNumber":{ - "shape":"Integer", - "locationName":"ruleNumber" - }, - "Protocol":{ - "shape":"String", - "locationName":"protocol" - }, - "RuleAction":{ - "shape":"RuleAction", - "locationName":"ruleAction" - }, - "Egress":{ - "shape":"Boolean", - "locationName":"egress" - }, - "CidrBlock":{ - "shape":"String", - "locationName":"cidrBlock" - }, - "IcmpTypeCode":{ - "shape":"IcmpTypeCode", - "locationName":"icmpTypeCode" - }, - "PortRange":{ - "shape":"PortRange", - "locationName":"portRange" - } - } - }, - "NetworkAclEntryList":{ - "type":"list", - "member":{ - "shape":"NetworkAclEntry", - "locationName":"item" - } - }, - "NetworkAclList":{ - "type":"list", - "member":{ - "shape":"NetworkAcl", - "locationName":"item" - } - }, - "NetworkInterface":{ - "type":"structure", - "members":{ - "NetworkInterfaceId":{ - "shape":"String", - "locationName":"networkInterfaceId" - }, - "SubnetId":{ - "shape":"String", - "locationName":"subnetId" - }, - "VpcId":{ - "shape":"String", - "locationName":"vpcId" - }, - "AvailabilityZone":{ - "shape":"String", - "locationName":"availabilityZone" - }, - "Description":{ - "shape":"String", - "locationName":"description" - }, - "OwnerId":{ - "shape":"String", - "locationName":"ownerId" - }, - "RequesterId":{ - "shape":"String", - "locationName":"requesterId" - }, - "RequesterManaged":{ - "shape":"Boolean", - "locationName":"requesterManaged" - }, - "Status":{ - "shape":"NetworkInterfaceStatus", - "locationName":"status" - }, - "MacAddress":{ - "shape":"String", - "locationName":"macAddress" - }, - "PrivateIpAddress":{ - "shape":"String", - "locationName":"privateIpAddress" - }, - "PrivateDnsName":{ - "shape":"String", - "locationName":"privateDnsName" - }, - "SourceDestCheck":{ - "shape":"Boolean", - "locationName":"sourceDestCheck" - }, - "Groups":{ - "shape":"GroupIdentifierList", - "locationName":"groupSet" - }, - "Attachment":{ - "shape":"NetworkInterfaceAttachment", - "locationName":"attachment" - }, - "Association":{ - "shape":"NetworkInterfaceAssociation", - "locationName":"association" - }, - "TagSet":{ - "shape":"TagList", - "locationName":"tagSet" - }, - "PrivateIpAddresses":{ - "shape":"NetworkInterfacePrivateIpAddressList", - "locationName":"privateIpAddressesSet" - } - } - }, - "NetworkInterfaceAssociation":{ - "type":"structure", - "members":{ - "PublicIp":{ - "shape":"String", - "locationName":"publicIp" - }, - "PublicDnsName":{ - "shape":"String", - "locationName":"publicDnsName" - }, - "IpOwnerId":{ - "shape":"String", - "locationName":"ipOwnerId" - }, - "AllocationId":{ - "shape":"String", - "locationName":"allocationId" - }, - "AssociationId":{ - "shape":"String", - "locationName":"associationId" - } - } - }, - "NetworkInterfaceAttachment":{ - "type":"structure", - "members":{ - "AttachmentId":{ - "shape":"String", - "locationName":"attachmentId" - }, - "InstanceId":{ - "shape":"String", - "locationName":"instanceId" - }, - "InstanceOwnerId":{ - "shape":"String", - "locationName":"instanceOwnerId" - }, - "DeviceIndex":{ - "shape":"Integer", - "locationName":"deviceIndex" - }, - "Status":{ - "shape":"AttachmentStatus", - "locationName":"status" - }, - "AttachTime":{ - "shape":"DateTime", - "locationName":"attachTime" - }, - "DeleteOnTermination":{ - "shape":"Boolean", - "locationName":"deleteOnTermination" - } - } - }, - "NetworkInterfaceAttachmentChanges":{ - "type":"structure", - "members":{ - "AttachmentId":{ - "shape":"String", - "locationName":"attachmentId" - }, - "DeleteOnTermination":{ - "shape":"Boolean", - "locationName":"deleteOnTermination" - } - } - }, - "NetworkInterfaceAttribute":{ - "type":"string", - "enum":[ - "description", - "groupSet", - "sourceDestCheck", - "attachment" - ] - }, - "NetworkInterfaceIdList":{ - "type":"list", - "member":{ - "shape":"String", - "locationName":"item" - } - }, - "NetworkInterfaceList":{ - "type":"list", - "member":{ - "shape":"NetworkInterface", - "locationName":"item" - } - }, - "NetworkInterfacePrivateIpAddress":{ - "type":"structure", - "members":{ - "PrivateIpAddress":{ - "shape":"String", - "locationName":"privateIpAddress" - }, - "PrivateDnsName":{ - "shape":"String", - "locationName":"privateDnsName" - }, - "Primary":{ - "shape":"Boolean", - "locationName":"primary" - }, - "Association":{ - "shape":"NetworkInterfaceAssociation", - "locationName":"association" - } - } - }, - "NetworkInterfacePrivateIpAddressList":{ - "type":"list", - "member":{ - "shape":"NetworkInterfacePrivateIpAddress", - "locationName":"item" - } - }, - "NetworkInterfaceStatus":{ - "type":"string", - "enum":[ - "available", - "attaching", - "in-use", - "detaching" - ] - }, - "OfferingTypeValues":{ - "type":"string", - "enum":[ - "Heavy Utilization", - "Medium Utilization", - "Light Utilization", - "No Upfront", - "Partial Upfront", - "All Upfront" - ] - }, - "OwnerStringList":{ - "type":"list", - "member":{ - "shape":"String", - "locationName":"Owner" - } - }, - "PermissionGroup":{ - "type":"string", - "enum":["all"] - }, - "Placement":{ - "type":"structure", - "members":{ - "AvailabilityZone":{ - "shape":"String", - "locationName":"availabilityZone" - }, - "GroupName":{ - "shape":"String", - "locationName":"groupName" - }, - "Tenancy":{ - "shape":"Tenancy", - "locationName":"tenancy" - } - } - }, - "PlacementGroup":{ - "type":"structure", - "members":{ - "GroupName":{ - "shape":"String", - "locationName":"groupName" - }, - "Strategy":{ - "shape":"PlacementStrategy", - "locationName":"strategy" - }, - "State":{ - "shape":"PlacementGroupState", - "locationName":"state" - } - } - }, - "PlacementGroupList":{ - "type":"list", - "member":{ - "shape":"PlacementGroup", - "locationName":"item" - } - }, - "PlacementGroupState":{ - "type":"string", - "enum":[ - "pending", - "available", - "deleting", - "deleted" - ] - }, - "PlacementGroupStringList":{ - "type":"list", - "member":{"shape":"String"} - }, - "PlacementStrategy":{ - "type":"string", - "enum":["cluster"] - }, - "PlatformValues":{ - "type":"string", - "enum":["Windows"] - }, - "PortRange":{ - "type":"structure", - "members":{ - "From":{ - "shape":"Integer", - "locationName":"from" - }, - "To":{ - "shape":"Integer", - "locationName":"to" - } - } - }, - "PriceSchedule":{ - "type":"structure", - "members":{ - "Term":{ - "shape":"Long", - "locationName":"term" - }, - "Price":{ - "shape":"Double", - "locationName":"price" - }, - "CurrencyCode":{ - "shape":"CurrencyCodeValues", - "locationName":"currencyCode" - }, - "Active":{ - "shape":"Boolean", - "locationName":"active" - } - } - }, - "PriceScheduleList":{ - "type":"list", - "member":{ - "shape":"PriceSchedule", - "locationName":"item" - } - }, - "PriceScheduleSpecification":{ - "type":"structure", - "members":{ - "Term":{ - "shape":"Long", - "locationName":"term" - }, - "Price":{ - "shape":"Double", - "locationName":"price" - }, - "CurrencyCode":{ - "shape":"CurrencyCodeValues", - "locationName":"currencyCode" - } - } - }, - "PriceScheduleSpecificationList":{ - "type":"list", - "member":{ - "shape":"PriceScheduleSpecification", - "locationName":"item" - } - }, - "PricingDetail":{ - "type":"structure", - "members":{ - "Price":{ - "shape":"Double", - "locationName":"price" - }, - "Count":{ - "shape":"Integer", - "locationName":"count" - } - } - }, - "PricingDetailsList":{ - "type":"list", - "member":{ - "shape":"PricingDetail", - "locationName":"item" - } - }, - "PrivateIpAddressSpecification":{ - "type":"structure", - "required":["PrivateIpAddress"], - "members":{ - "PrivateIpAddress":{ - "shape":"String", - "locationName":"privateIpAddress" - }, - "Primary":{ - "shape":"Boolean", - "locationName":"primary" - } - } - }, - "PrivateIpAddressSpecificationList":{ - "type":"list", - "member":{ - "shape":"PrivateIpAddressSpecification", - "locationName":"item" - } - }, - "PrivateIpAddressStringList":{ - "type":"list", - "member":{ - "shape":"String", - "locationName":"PrivateIpAddress" - } - }, - "ProductCode":{ - "type":"structure", - "members":{ - "ProductCodeId":{ - "shape":"String", - "locationName":"productCode" - }, - "ProductCodeType":{ - "shape":"ProductCodeValues", - "locationName":"type" - } - } - }, - "ProductCodeList":{ - "type":"list", - "member":{ - "shape":"ProductCode", - "locationName":"item" - } - }, - "ProductCodeStringList":{ - "type":"list", - "member":{ - "shape":"String", - "locationName":"ProductCode" - } - }, - "ProductCodeValues":{ - "type":"string", - "enum":[ - "devpay", - "marketplace" - ] - }, - "ProductDescriptionList":{ - "type":"list", - "member":{"shape":"String"} - }, - "PropagatingVgw":{ - "type":"structure", - "members":{ - "GatewayId":{ - "shape":"String", - "locationName":"gatewayId" - } - } - }, - "PropagatingVgwList":{ - "type":"list", - "member":{ - "shape":"PropagatingVgw", - "locationName":"item" - } - }, - "PublicIpStringList":{ - "type":"list", - "member":{ - "shape":"String", - "locationName":"PublicIp" - } - }, - "PurchaseReservedInstancesOfferingRequest":{ - "type":"structure", - "required":[ - "ReservedInstancesOfferingId", - "InstanceCount" - ], - "members":{ - "DryRun":{ - "shape":"Boolean", - "locationName":"dryRun" - }, - "ReservedInstancesOfferingId":{"shape":"String"}, - "InstanceCount":{"shape":"Integer"}, - "LimitPrice":{ - "shape":"ReservedInstanceLimitPrice", - "locationName":"limitPrice" - } - } - }, - "PurchaseReservedInstancesOfferingResult":{ - "type":"structure", - "members":{ - "ReservedInstancesId":{ - "shape":"String", - "locationName":"reservedInstancesId" - } - } - }, - "RIProductDescription":{ - "type":"string", - "enum":[ - "Linux/UNIX", - "Linux/UNIX (Amazon VPC)", - "Windows", - "Windows (Amazon VPC)" - ] - }, - "ReasonCodesList":{ - "type":"list", - "member":{ - "shape":"ReportInstanceReasonCodes", - "locationName":"item" - } - }, - "RebootInstancesRequest":{ - "type":"structure", - "required":["InstanceIds"], - "members":{ - "DryRun":{ - "shape":"Boolean", - "locationName":"dryRun" - }, - "InstanceIds":{ - "shape":"InstanceIdStringList", - "locationName":"InstanceId" - } - } - }, - "RecurringCharge":{ - "type":"structure", - "members":{ - "Frequency":{ - "shape":"RecurringChargeFrequency", - "locationName":"frequency" - }, - "Amount":{ - "shape":"Double", - "locationName":"amount" - } - } - }, - "RecurringChargeFrequency":{ - "type":"string", - "enum":["Hourly"] - }, - "RecurringChargesList":{ - "type":"list", - "member":{ - "shape":"RecurringCharge", - "locationName":"item" - } - }, - "Region":{ - "type":"structure", - "members":{ - "RegionName":{ - "shape":"String", - "locationName":"regionName" - }, - "Endpoint":{ - "shape":"String", - "locationName":"regionEndpoint" - } - } - }, - "RegionList":{ - "type":"list", - "member":{ - "shape":"Region", - "locationName":"item" - } - }, - "RegionNameStringList":{ - "type":"list", - "member":{ - "shape":"String", - "locationName":"RegionName" - } - }, - "RegisterImageRequest":{ - "type":"structure", - "required":["Name"], - "members":{ - "DryRun":{ - "shape":"Boolean", - "locationName":"dryRun" - }, - "ImageLocation":{"shape":"String"}, - "Name":{ - "shape":"String", - "locationName":"name" - }, - "Description":{ - "shape":"String", - "locationName":"description" - }, - "Architecture":{ - "shape":"ArchitectureValues", - "locationName":"architecture" - }, - "KernelId":{ - "shape":"String", - "locationName":"kernelId" - }, - "RamdiskId":{ - "shape":"String", - "locationName":"ramdiskId" - }, - "RootDeviceName":{ - "shape":"String", - "locationName":"rootDeviceName" - }, - "BlockDeviceMappings":{ - "shape":"BlockDeviceMappingRequestList", - "locationName":"BlockDeviceMapping" - }, - "VirtualizationType":{ - "shape":"String", - "locationName":"virtualizationType" - }, - "SriovNetSupport":{ - "shape":"String", - "locationName":"sriovNetSupport" - } - } - }, - "RegisterImageResult":{ - "type":"structure", - "members":{ - "ImageId":{ - "shape":"String", - "locationName":"imageId" - } - } - }, - "RejectVpcPeeringConnectionRequest":{ - "type":"structure", - "required":["VpcPeeringConnectionId"], - "members":{ - "DryRun":{ - "shape":"Boolean", - "locationName":"dryRun" - }, - "VpcPeeringConnectionId":{ - "shape":"String", - "locationName":"vpcPeeringConnectionId" - } - } - }, - "RejectVpcPeeringConnectionResult":{ - "type":"structure", - "members":{ - "Return":{ - "shape":"Boolean", - "locationName":"return" - } - } - }, - "ReleaseAddressRequest":{ - "type":"structure", - "members":{ - "DryRun":{ - "shape":"Boolean", - "locationName":"dryRun" - }, - "PublicIp":{"shape":"String"}, - "AllocationId":{"shape":"String"} - } - }, - "ReplaceNetworkAclAssociationRequest":{ - "type":"structure", - "required":[ - "AssociationId", - "NetworkAclId" - ], - "members":{ - "DryRun":{ - "shape":"Boolean", - "locationName":"dryRun" - }, - "AssociationId":{ - "shape":"String", - "locationName":"associationId" - }, - "NetworkAclId":{ - "shape":"String", - "locationName":"networkAclId" - } - } - }, - "ReplaceNetworkAclAssociationResult":{ - "type":"structure", - "members":{ - "NewAssociationId":{ - "shape":"String", - "locationName":"newAssociationId" - } - } - }, - "ReplaceNetworkAclEntryRequest":{ - "type":"structure", - "required":[ - "NetworkAclId", - "RuleNumber", - "Protocol", - "RuleAction", - "Egress", - "CidrBlock" - ], - "members":{ - "DryRun":{ - "shape":"Boolean", - "locationName":"dryRun" - }, - "NetworkAclId":{ - "shape":"String", - "locationName":"networkAclId" - }, - "RuleNumber":{ - "shape":"Integer", - "locationName":"ruleNumber" - }, - "Protocol":{ - "shape":"String", - "locationName":"protocol" - }, - "RuleAction":{ - "shape":"RuleAction", - "locationName":"ruleAction" - }, - "Egress":{ - "shape":"Boolean", - "locationName":"egress" - }, - "CidrBlock":{ - "shape":"String", - "locationName":"cidrBlock" - }, - "IcmpTypeCode":{ - "shape":"IcmpTypeCode", - "locationName":"Icmp" - }, - "PortRange":{ - "shape":"PortRange", - "locationName":"portRange" - } - } - }, - "ReplaceRouteRequest":{ - "type":"structure", - "required":[ - "RouteTableId", - "DestinationCidrBlock" - ], - "members":{ - "DryRun":{ - "shape":"Boolean", - "locationName":"dryRun" - }, - "RouteTableId":{ - "shape":"String", - "locationName":"routeTableId" - }, - "DestinationCidrBlock":{ - "shape":"String", - "locationName":"destinationCidrBlock" - }, - "GatewayId":{ - "shape":"String", - "locationName":"gatewayId" - }, - "InstanceId":{ - "shape":"String", - "locationName":"instanceId" - }, - "NetworkInterfaceId":{ - "shape":"String", - "locationName":"networkInterfaceId" - }, - "VpcPeeringConnectionId":{ - "shape":"String", - "locationName":"vpcPeeringConnectionId" - } - } - }, - "ReplaceRouteTableAssociationRequest":{ - "type":"structure", - "required":[ - "AssociationId", - "RouteTableId" - ], - "members":{ - "DryRun":{ - "shape":"Boolean", - "locationName":"dryRun" - }, - "AssociationId":{ - "shape":"String", - "locationName":"associationId" - }, - "RouteTableId":{ - "shape":"String", - "locationName":"routeTableId" - } - } - }, - "ReplaceRouteTableAssociationResult":{ - "type":"structure", - "members":{ - "NewAssociationId":{ - "shape":"String", - "locationName":"newAssociationId" - } - } - }, - "ReportInstanceReasonCodes":{ - "type":"string", - "enum":[ - "instance-stuck-in-state", - "unresponsive", - "not-accepting-credentials", - "password-not-available", - "performance-network", - "performance-instance-store", - "performance-ebs-volume", - "performance-other", - "other" - ] - }, - "ReportInstanceStatusRequest":{ - "type":"structure", - "required":[ - "Instances", - "Status", - "ReasonCodes" - ], - "members":{ - "DryRun":{ - "shape":"Boolean", - "locationName":"dryRun" - }, - "Instances":{ - "shape":"InstanceIdStringList", - "locationName":"instanceId" - }, - "Status":{ - "shape":"ReportStatusType", - "locationName":"status" - }, - "StartTime":{ - "shape":"DateTime", - "locationName":"startTime" - }, - "EndTime":{ - "shape":"DateTime", - "locationName":"endTime" - }, - "ReasonCodes":{ - "shape":"ReasonCodesList", - "locationName":"reasonCode" - }, - "Description":{ - "shape":"String", - "locationName":"description" - } - } - }, - "ReportStatusType":{ - "type":"string", - "enum":[ - "ok", - "impaired" - ] - }, - "RequestSpotInstancesRequest":{ - "type":"structure", - "required":["SpotPrice"], - "members":{ - "DryRun":{ - "shape":"Boolean", - "locationName":"dryRun" - }, - "SpotPrice":{ - "shape":"String", - "locationName":"spotPrice" - }, - "InstanceCount":{ - "shape":"Integer", - "locationName":"instanceCount" - }, - "Type":{ - "shape":"SpotInstanceType", - "locationName":"type" - }, - "ValidFrom":{ - "shape":"DateTime", - "locationName":"validFrom" - }, - "ValidUntil":{ - "shape":"DateTime", - "locationName":"validUntil" - }, - "LaunchGroup":{ - "shape":"String", - "locationName":"launchGroup" - }, - "AvailabilityZoneGroup":{ - "shape":"String", - "locationName":"availabilityZoneGroup" - }, - "LaunchSpecification":{"shape":"RequestSpotLaunchSpecification"} - } - }, - "RequestSpotInstancesResult":{ - "type":"structure", - "members":{ - "SpotInstanceRequests":{ - "shape":"SpotInstanceRequestList", - "locationName":"spotInstanceRequestSet" - } - } - }, - "Reservation":{ - "type":"structure", - "members":{ - "ReservationId":{ - "shape":"String", - "locationName":"reservationId" - }, - "OwnerId":{ - "shape":"String", - "locationName":"ownerId" - }, - "RequesterId":{ - "shape":"String", - "locationName":"requesterId" - }, - "Groups":{ - "shape":"GroupIdentifierList", - "locationName":"groupSet" - }, - "Instances":{ - "shape":"InstanceList", - "locationName":"instancesSet" - } - } - }, - "ReservationList":{ - "type":"list", - "member":{ - "shape":"Reservation", - "locationName":"item" - } - }, - "ReservedInstanceLimitPrice":{ - "type":"structure", - "members":{ - "Amount":{ - "shape":"Double", - "locationName":"amount" - }, - "CurrencyCode":{ - "shape":"CurrencyCodeValues", - "locationName":"currencyCode" - } - } - }, - "ReservedInstanceState":{ - "type":"string", - "enum":[ - "payment-pending", - "active", - "payment-failed", - "retired" - ] - }, - "ReservedInstances":{ - "type":"structure", - "members":{ - "ReservedInstancesId":{ - "shape":"String", - "locationName":"reservedInstancesId" - }, - "InstanceType":{ - "shape":"InstanceType", - "locationName":"instanceType" - }, - "AvailabilityZone":{ - "shape":"String", - "locationName":"availabilityZone" - }, - "Start":{ - "shape":"DateTime", - "locationName":"start" - }, - "End":{ - "shape":"DateTime", - "locationName":"end" - }, - "Duration":{ - "shape":"Long", - "locationName":"duration" - }, - "UsagePrice":{ - "shape":"Float", - "locationName":"usagePrice" - }, - "FixedPrice":{ - "shape":"Float", - "locationName":"fixedPrice" - }, - "InstanceCount":{ - "shape":"Integer", - "locationName":"instanceCount" - }, - "ProductDescription":{ - "shape":"RIProductDescription", - "locationName":"productDescription" - }, - "State":{ - "shape":"ReservedInstanceState", - "locationName":"state" - }, - "Tags":{ - "shape":"TagList", - "locationName":"tagSet" - }, - "InstanceTenancy":{ - "shape":"Tenancy", - "locationName":"instanceTenancy" - }, - "CurrencyCode":{ - "shape":"CurrencyCodeValues", - "locationName":"currencyCode" - }, - "OfferingType":{ - "shape":"OfferingTypeValues", - "locationName":"offeringType" - }, - "RecurringCharges":{ - "shape":"RecurringChargesList", - "locationName":"recurringCharges" - } - } - }, - "ReservedInstancesConfiguration":{ - "type":"structure", - "members":{ - "AvailabilityZone":{ - "shape":"String", - "locationName":"availabilityZone" - }, - "Platform":{ - "shape":"String", - "locationName":"platform" - }, - "InstanceCount":{ - "shape":"Integer", - "locationName":"instanceCount" - }, - "InstanceType":{ - "shape":"InstanceType", - "locationName":"instanceType" - } - } - }, - "ReservedInstancesConfigurationList":{ - "type":"list", - "member":{ - "shape":"ReservedInstancesConfiguration", - "locationName":"item" - } - }, - "ReservedInstancesId":{ - "type":"structure", - "members":{ - "ReservedInstancesId":{ - "shape":"String", - "locationName":"reservedInstancesId" - } - } - }, - "ReservedInstancesIdStringList":{ - "type":"list", - "member":{ - "shape":"String", - "locationName":"ReservedInstancesId" - } - }, - "ReservedInstancesList":{ - "type":"list", - "member":{ - "shape":"ReservedInstances", - "locationName":"item" - } - }, - "ReservedInstancesListing":{ - "type":"structure", - "members":{ - "ReservedInstancesListingId":{ - "shape":"String", - "locationName":"reservedInstancesListingId" - }, - "ReservedInstancesId":{ - "shape":"String", - "locationName":"reservedInstancesId" - }, - "CreateDate":{ - "shape":"DateTime", - "locationName":"createDate" - }, - "UpdateDate":{ - "shape":"DateTime", - "locationName":"updateDate" - }, - "Status":{ - "shape":"ListingStatus", - "locationName":"status" - }, - "StatusMessage":{ - "shape":"String", - "locationName":"statusMessage" - }, - "InstanceCounts":{ - "shape":"InstanceCountList", - "locationName":"instanceCounts" - }, - "PriceSchedules":{ - "shape":"PriceScheduleList", - "locationName":"priceSchedules" - }, - "Tags":{ - "shape":"TagList", - "locationName":"tagSet" - }, - "ClientToken":{ - "shape":"String", - "locationName":"clientToken" - } - } - }, - "ReservedInstancesListingList":{ - "type":"list", - "member":{ - "shape":"ReservedInstancesListing", - "locationName":"item" - } - }, - "ReservedInstancesModification":{ - "type":"structure", - "members":{ - "ReservedInstancesModificationId":{ - "shape":"String", - "locationName":"reservedInstancesModificationId" - }, - "ReservedInstancesIds":{ - "shape":"ReservedIntancesIds", - "locationName":"reservedInstancesSet" - }, - "ModificationResults":{ - "shape":"ReservedInstancesModificationResultList", - "locationName":"modificationResultSet" - }, - "CreateDate":{ - "shape":"DateTime", - "locationName":"createDate" - }, - "UpdateDate":{ - "shape":"DateTime", - "locationName":"updateDate" - }, - "EffectiveDate":{ - "shape":"DateTime", - "locationName":"effectiveDate" - }, - "Status":{ - "shape":"String", - "locationName":"status" - }, - "StatusMessage":{ - "shape":"String", - "locationName":"statusMessage" - }, - "ClientToken":{ - "shape":"String", - "locationName":"clientToken" - } - } - }, - "ReservedInstancesModificationIdStringList":{ - "type":"list", - "member":{ - "shape":"String", - "locationName":"ReservedInstancesModificationId" - } - }, - "ReservedInstancesModificationList":{ - "type":"list", - "member":{ - "shape":"ReservedInstancesModification", - "locationName":"item" - } - }, - "ReservedInstancesModificationResult":{ - "type":"structure", - "members":{ - "ReservedInstancesId":{ - "shape":"String", - "locationName":"reservedInstancesId" - }, - "TargetConfiguration":{ - "shape":"ReservedInstancesConfiguration", - "locationName":"targetConfiguration" - } - } - }, - "ReservedInstancesModificationResultList":{ - "type":"list", - "member":{ - "shape":"ReservedInstancesModificationResult", - "locationName":"item" - } - }, - "ReservedInstancesOffering":{ - "type":"structure", - "members":{ - "ReservedInstancesOfferingId":{ - "shape":"String", - "locationName":"reservedInstancesOfferingId" - }, - "InstanceType":{ - "shape":"InstanceType", - "locationName":"instanceType" - }, - "AvailabilityZone":{ - "shape":"String", - "locationName":"availabilityZone" - }, - "Duration":{ - "shape":"Long", - "locationName":"duration" - }, - "UsagePrice":{ - "shape":"Float", - "locationName":"usagePrice" - }, - "FixedPrice":{ - "shape":"Float", - "locationName":"fixedPrice" - }, - "ProductDescription":{ - "shape":"RIProductDescription", - "locationName":"productDescription" - }, - "InstanceTenancy":{ - "shape":"Tenancy", - "locationName":"instanceTenancy" - }, - "CurrencyCode":{ - "shape":"CurrencyCodeValues", - "locationName":"currencyCode" - }, - "OfferingType":{ - "shape":"OfferingTypeValues", - "locationName":"offeringType" - }, - "RecurringCharges":{ - "shape":"RecurringChargesList", - "locationName":"recurringCharges" - }, - "Marketplace":{ - "shape":"Boolean", - "locationName":"marketplace" - }, - "PricingDetails":{ - "shape":"PricingDetailsList", - "locationName":"pricingDetailsSet" - } - } - }, - "ReservedInstancesOfferingIdStringList":{ - "type":"list", - "member":{"shape":"String"} - }, - "ReservedInstancesOfferingList":{ - "type":"list", - "member":{ - "shape":"ReservedInstancesOffering", - "locationName":"item" - } - }, - "ReservedIntancesIds":{ - "type":"list", - "member":{ - "shape":"ReservedInstancesId", - "locationName":"item" - } - }, - "ResetImageAttributeName":{ - "type":"string", - "enum":["launchPermission"] - }, - "ResetImageAttributeRequest":{ - "type":"structure", - "required":[ - "ImageId", - "Attribute" - ], - "members":{ - "DryRun":{ - "shape":"Boolean", - "locationName":"dryRun" - }, - "ImageId":{"shape":"String"}, - "Attribute":{"shape":"ResetImageAttributeName"} - } - }, - "ResetInstanceAttributeRequest":{ - "type":"structure", - "required":[ - "InstanceId", - "Attribute" - ], - "members":{ - "DryRun":{ - "shape":"Boolean", - "locationName":"dryRun" - }, - "InstanceId":{ - "shape":"String", - "locationName":"instanceId" - }, - "Attribute":{ - "shape":"InstanceAttributeName", - "locationName":"attribute" - } - } - }, - "ResetNetworkInterfaceAttributeRequest":{ - "type":"structure", - "required":["NetworkInterfaceId"], - "members":{ - "DryRun":{ - "shape":"Boolean", - "locationName":"dryRun" - }, - "NetworkInterfaceId":{ - "shape":"String", - "locationName":"networkInterfaceId" - }, - "SourceDestCheck":{ - "shape":"String", - "locationName":"sourceDestCheck" - } - } - }, - "ResetSnapshotAttributeRequest":{ - "type":"structure", - "required":[ - "SnapshotId", - "Attribute" - ], - "members":{ - "DryRun":{ - "shape":"Boolean", - "locationName":"dryRun" - }, - "SnapshotId":{"shape":"String"}, - "Attribute":{"shape":"SnapshotAttributeName"} - } - }, - "ResourceIdList":{ - "type":"list", - "member":{"shape":"String"} - }, - "ResourceType":{ - "type":"string", - "enum":[ - "customer-gateway", - "dhcp-options", - "image", - "instance", - "internet-gateway", - "network-acl", - "network-interface", - "reserved-instances", - "route-table", - "snapshot", - "spot-instances-request", - "subnet", - "security-group", - "volume", - "vpc", - "vpn-connection", - "vpn-gateway" - ] - }, - "RestorableByStringList":{ - "type":"list", - "member":{"shape":"String"} - }, - "RevokeSecurityGroupEgressRequest":{ - "type":"structure", - "required":["GroupId"], - "members":{ - "DryRun":{ - "shape":"Boolean", - "locationName":"dryRun" - }, - "GroupId":{ - "shape":"String", - "locationName":"groupId" - }, - "SourceSecurityGroupName":{ - "shape":"String", - "locationName":"sourceSecurityGroupName" - }, - "SourceSecurityGroupOwnerId":{ - "shape":"String", - "locationName":"sourceSecurityGroupOwnerId" - }, - "IpProtocol":{ - "shape":"String", - "locationName":"ipProtocol" - }, - "FromPort":{ - "shape":"Integer", - "locationName":"fromPort" - }, - "ToPort":{ - "shape":"Integer", - "locationName":"toPort" - }, - "CidrIp":{ - "shape":"String", - "locationName":"cidrIp" - }, - "IpPermissions":{ - "shape":"IpPermissionList", - "locationName":"ipPermissions" - } - } - }, - "RevokeSecurityGroupIngressRequest":{ - "type":"structure", - "members":{ - "DryRun":{ - "shape":"Boolean", - "locationName":"dryRun" - }, - "GroupName":{"shape":"String"}, - "GroupId":{"shape":"String"}, - "SourceSecurityGroupName":{"shape":"String"}, - "SourceSecurityGroupOwnerId":{"shape":"String"}, - "IpProtocol":{"shape":"String"}, - "FromPort":{"shape":"Integer"}, - "ToPort":{"shape":"Integer"}, - "CidrIp":{"shape":"String"}, - "IpPermissions":{"shape":"IpPermissionList"} - } - }, - "Route":{ - "type":"structure", - "members":{ - "DestinationCidrBlock":{ - "shape":"String", - "locationName":"destinationCidrBlock" - }, - "GatewayId":{ - "shape":"String", - "locationName":"gatewayId" - }, - "InstanceId":{ - "shape":"String", - "locationName":"instanceId" - }, - "InstanceOwnerId":{ - "shape":"String", - "locationName":"instanceOwnerId" - }, - "NetworkInterfaceId":{ - "shape":"String", - "locationName":"networkInterfaceId" - }, - "VpcPeeringConnectionId":{ - "shape":"String", - "locationName":"vpcPeeringConnectionId" - }, - "State":{ - "shape":"RouteState", - "locationName":"state" - }, - "Origin":{ - "shape":"RouteOrigin", - "locationName":"origin" - } - } - }, - "RouteList":{ - "type":"list", - "member":{ - "shape":"Route", - "locationName":"item" - } - }, - "RouteOrigin":{ - "type":"string", - "enum":[ - "CreateRouteTable", - "CreateRoute", - "EnableVgwRoutePropagation" - ] - }, - "RouteState":{ - "type":"string", - "enum":[ - "active", - "blackhole" - ] - }, - "RouteTable":{ - "type":"structure", - "members":{ - "RouteTableId":{ - "shape":"String", - "locationName":"routeTableId" - }, - "VpcId":{ - "shape":"String", - "locationName":"vpcId" - }, - "Routes":{ - "shape":"RouteList", - "locationName":"routeSet" - }, - "Associations":{ - "shape":"RouteTableAssociationList", - "locationName":"associationSet" - }, - "Tags":{ - "shape":"TagList", - "locationName":"tagSet" - }, - "PropagatingVgws":{ - "shape":"PropagatingVgwList", - "locationName":"propagatingVgwSet" - } - } - }, - "RouteTableAssociation":{ - "type":"structure", - "members":{ - "RouteTableAssociationId":{ - "shape":"String", - "locationName":"routeTableAssociationId" - }, - "RouteTableId":{ - "shape":"String", - "locationName":"routeTableId" - }, - "SubnetId":{ - "shape":"String", - "locationName":"subnetId" - }, - "Main":{ - "shape":"Boolean", - "locationName":"main" - } - } - }, - "RouteTableAssociationList":{ - "type":"list", - "member":{ - "shape":"RouteTableAssociation", - "locationName":"item" - } - }, - "RouteTableList":{ - "type":"list", - "member":{ - "shape":"RouteTable", - "locationName":"item" - } - }, - "RuleAction":{ - "type":"string", - "enum":[ - "allow", - "deny" - ] - }, - "RunInstancesMonitoringEnabled":{ - "type":"structure", - "required":["Enabled"], - "members":{ - "Enabled":{ - "shape":"Boolean", - "locationName":"enabled" - } - } - }, - "RunInstancesRequest":{ - "type":"structure", - "required":[ - "ImageId", - "MinCount", - "MaxCount" - ], - "members":{ - "DryRun":{ - "shape":"Boolean", - "locationName":"dryRun" - }, - "ImageId":{"shape":"String"}, - "MinCount":{"shape":"Integer"}, - "MaxCount":{"shape":"Integer"}, - "KeyName":{"shape":"String"}, - "SecurityGroups":{ - "shape":"SecurityGroupStringList", - "locationName":"SecurityGroup" - }, - "SecurityGroupIds":{ - "shape":"SecurityGroupIdStringList", - "locationName":"SecurityGroupId" - }, - "UserData":{"shape":"String"}, - "InstanceType":{"shape":"InstanceType"}, - "Placement":{"shape":"Placement"}, - "KernelId":{"shape":"String"}, - "RamdiskId":{"shape":"String"}, - "BlockDeviceMappings":{ - "shape":"BlockDeviceMappingRequestList", - "locationName":"BlockDeviceMapping" - }, - "Monitoring":{"shape":"RunInstancesMonitoringEnabled"}, - "SubnetId":{"shape":"String"}, - "DisableApiTermination":{ - "shape":"Boolean", - "locationName":"disableApiTermination" - }, - "InstanceInitiatedShutdownBehavior":{ - "shape":"ShutdownBehavior", - "locationName":"instanceInitiatedShutdownBehavior" - }, - "PrivateIpAddress":{ - "shape":"String", - "locationName":"privateIpAddress" - }, - "ClientToken":{ - "shape":"String", - "locationName":"clientToken" - }, - "AdditionalInfo":{ - "shape":"String", - "locationName":"additionalInfo" - }, - "NetworkInterfaces":{ - "shape":"InstanceNetworkInterfaceSpecificationList", - "locationName":"networkInterface" - }, - "IamInstanceProfile":{ - "shape":"IamInstanceProfileSpecification", - "locationName":"iamInstanceProfile" - }, - "EbsOptimized":{ - "shape":"Boolean", - "locationName":"ebsOptimized" - } - } - }, - "S3Storage":{ - "type":"structure", - "members":{ - "Bucket":{ - "shape":"String", - "locationName":"bucket" - }, - "Prefix":{ - "shape":"String", - "locationName":"prefix" - }, - "AWSAccessKeyId":{"shape":"String"}, - "UploadPolicy":{ - "shape":"Blob", - "locationName":"uploadPolicy" - }, - "UploadPolicySignature":{ - "shape":"String", - "locationName":"uploadPolicySignature" - } - } - }, - "SecurityGroup":{ - "type":"structure", - "members":{ - "OwnerId":{ - "shape":"String", - "locationName":"ownerId" - }, - "GroupName":{ - "shape":"String", - "locationName":"groupName" - }, - "GroupId":{ - "shape":"String", - "locationName":"groupId" - }, - "Description":{ - "shape":"String", - "locationName":"groupDescription" - }, - "IpPermissions":{ - "shape":"IpPermissionList", - "locationName":"ipPermissions" - }, - "IpPermissionsEgress":{ - "shape":"IpPermissionList", - "locationName":"ipPermissionsEgress" - }, - "VpcId":{ - "shape":"String", - "locationName":"vpcId" - }, - "Tags":{ - "shape":"TagList", - "locationName":"tagSet" - } - } - }, - "SecurityGroupIdStringList":{ - "type":"list", - "member":{ - "shape":"String", - "locationName":"SecurityGroupId" - } - }, - "SecurityGroupList":{ - "type":"list", - "member":{ - "shape":"SecurityGroup", - "locationName":"item" - } - }, - "SecurityGroupStringList":{ - "type":"list", - "member":{ - "shape":"String", - "locationName":"SecurityGroup" - } - }, - "ShutdownBehavior":{ - "type":"string", - "enum":[ - "stop", - "terminate" - ] - }, - "Snapshot":{ - "type":"structure", - "members":{ - "SnapshotId":{ - "shape":"String", - "locationName":"snapshotId" - }, - "VolumeId":{ - "shape":"String", - "locationName":"volumeId" - }, - "State":{ - "shape":"SnapshotState", - "locationName":"status" - }, - "StartTime":{ - "shape":"DateTime", - "locationName":"startTime" - }, - "Progress":{ - "shape":"String", - "locationName":"progress" - }, - "OwnerId":{ - "shape":"String", - "locationName":"ownerId" - }, - "Description":{ - "shape":"String", - "locationName":"description" - }, - "VolumeSize":{ - "shape":"Integer", - "locationName":"volumeSize" - }, - "OwnerAlias":{ - "shape":"String", - "locationName":"ownerAlias" - }, - "Tags":{ - "shape":"TagList", - "locationName":"tagSet" - }, - "Encrypted":{ - "shape":"Boolean", - "locationName":"encrypted" - }, - "KmsKeyId":{ - "shape":"String", - "locationName":"kmsKeyId" - } - } - }, - "SnapshotAttributeName":{ - "type":"string", - "enum":[ - "productCodes", - "createVolumePermission" - ] - }, - "SnapshotIdStringList":{ - "type":"list", - "member":{ - "shape":"String", - "locationName":"SnapshotId" - } - }, - "SnapshotList":{ - "type":"list", - "member":{ - "shape":"Snapshot", - "locationName":"item" - } - }, - "SnapshotState":{ - "type":"string", - "enum":[ - "pending", - "completed", - "error" - ] - }, - "SpotDatafeedSubscription":{ - "type":"structure", - "members":{ - "OwnerId":{ - "shape":"String", - "locationName":"ownerId" - }, - "Bucket":{ - "shape":"String", - "locationName":"bucket" - }, - "Prefix":{ - "shape":"String", - "locationName":"prefix" - }, - "State":{ - "shape":"DatafeedSubscriptionState", - "locationName":"state" - }, - "Fault":{ - "shape":"SpotInstanceStateFault", - "locationName":"fault" - } - } - }, - "SpotInstanceRequest":{ - "type":"structure", - "members":{ - "SpotInstanceRequestId":{ - "shape":"String", - "locationName":"spotInstanceRequestId" - }, - "SpotPrice":{ - "shape":"String", - "locationName":"spotPrice" - }, - "Type":{ - "shape":"SpotInstanceType", - "locationName":"type" - }, - "State":{ - "shape":"SpotInstanceState", - "locationName":"state" - }, - "Fault":{ - "shape":"SpotInstanceStateFault", - "locationName":"fault" - }, - "Status":{ - "shape":"SpotInstanceStatus", - "locationName":"status" - }, - "ValidFrom":{ - "shape":"DateTime", - "locationName":"validFrom" - }, - "ValidUntil":{ - "shape":"DateTime", - "locationName":"validUntil" - }, - "LaunchGroup":{ - "shape":"String", - "locationName":"launchGroup" - }, - "AvailabilityZoneGroup":{ - "shape":"String", - "locationName":"availabilityZoneGroup" - }, - "LaunchSpecification":{ - "shape":"LaunchSpecification", - "locationName":"launchSpecification" - }, - "InstanceId":{ - "shape":"String", - "locationName":"instanceId" - }, - "CreateTime":{ - "shape":"DateTime", - "locationName":"createTime" - }, - "ProductDescription":{ - "shape":"RIProductDescription", - "locationName":"productDescription" - }, - "Tags":{ - "shape":"TagList", - "locationName":"tagSet" - }, - "LaunchedAvailabilityZone":{ - "shape":"String", - "locationName":"launchedAvailabilityZone" - } - } - }, - "SpotInstanceRequestIdList":{ - "type":"list", - "member":{ - "shape":"String", - "locationName":"SpotInstanceRequestId" - } - }, - "SpotInstanceRequestList":{ - "type":"list", - "member":{ - "shape":"SpotInstanceRequest", - "locationName":"item" - } - }, - "SpotInstanceState":{ - "type":"string", - "enum":[ - "open", - "active", - "closed", - "cancelled", - "failed" - ] - }, - "SpotInstanceStateFault":{ - "type":"structure", - "members":{ - "Code":{ - "shape":"String", - "locationName":"code" - }, - "Message":{ - "shape":"String", - "locationName":"message" - } - } - }, - "SpotInstanceStatus":{ - "type":"structure", - "members":{ - "Code":{ - "shape":"String", - "locationName":"code" - }, - "UpdateTime":{ - "shape":"DateTime", - "locationName":"updateTime" - }, - "Message":{ - "shape":"String", - "locationName":"message" - } - } - }, - "SpotInstanceType":{ - "type":"string", - "enum":[ - "one-time", - "persistent" - ] - }, - "SpotPlacement":{ - "type":"structure", - "members":{ - "AvailabilityZone":{ - "shape":"String", - "locationName":"availabilityZone" - }, - "GroupName":{ - "shape":"String", - "locationName":"groupName" - } - } - }, - "SpotPrice":{ - "type":"structure", - "members":{ - "InstanceType":{ - "shape":"InstanceType", - "locationName":"instanceType" - }, - "ProductDescription":{ - "shape":"RIProductDescription", - "locationName":"productDescription" - }, - "SpotPrice":{ - "shape":"String", - "locationName":"spotPrice" - }, - "Timestamp":{ - "shape":"DateTime", - "locationName":"timestamp" - }, - "AvailabilityZone":{ - "shape":"String", - "locationName":"availabilityZone" - } - } - }, - "SpotPriceHistoryList":{ - "type":"list", - "member":{ - "shape":"SpotPrice", - "locationName":"item" - } - }, - "StartInstancesRequest":{ - "type":"structure", - "required":["InstanceIds"], - "members":{ - "InstanceIds":{ - "shape":"InstanceIdStringList", - "locationName":"InstanceId" - }, - "AdditionalInfo":{ - "shape":"String", - "locationName":"additionalInfo" - }, - "DryRun":{ - "shape":"Boolean", - "locationName":"dryRun" - } - } - }, - "StartInstancesResult":{ - "type":"structure", - "members":{ - "StartingInstances":{ - "shape":"InstanceStateChangeList", - "locationName":"instancesSet" - } - } - }, - "StateReason":{ - "type":"structure", - "members":{ - "Code":{ - "shape":"String", - "locationName":"code" - }, - "Message":{ - "shape":"String", - "locationName":"message" - } - } - }, - "StatusName":{ - "type":"string", - "enum":["reachability"] - }, - "StatusType":{ - "type":"string", - "enum":[ - "passed", - "failed", - "insufficient-data" - ] - }, - "StopInstancesRequest":{ - "type":"structure", - "required":["InstanceIds"], - "members":{ - "DryRun":{ - "shape":"Boolean", - "locationName":"dryRun" - }, - "InstanceIds":{ - "shape":"InstanceIdStringList", - "locationName":"InstanceId" - }, - "Force":{ - "shape":"Boolean", - "locationName":"force" - } - } - }, - "StopInstancesResult":{ - "type":"structure", - "members":{ - "StoppingInstances":{ - "shape":"InstanceStateChangeList", - "locationName":"instancesSet" - } - } - }, - "Storage":{ - "type":"structure", - "members":{ - "S3":{"shape":"S3Storage"} - } - }, - "String":{"type":"string"}, - "Subnet":{ - "type":"structure", - "members":{ - "SubnetId":{ - "shape":"String", - "locationName":"subnetId" - }, - "State":{ - "shape":"SubnetState", - "locationName":"state" - }, - "VpcId":{ - "shape":"String", - "locationName":"vpcId" - }, - "CidrBlock":{ - "shape":"String", - "locationName":"cidrBlock" - }, - "AvailableIpAddressCount":{ - "shape":"Integer", - "locationName":"availableIpAddressCount" - }, - "AvailabilityZone":{ - "shape":"String", - "locationName":"availabilityZone" - }, - "DefaultForAz":{ - "shape":"Boolean", - "locationName":"defaultForAz" - }, - "MapPublicIpOnLaunch":{ - "shape":"Boolean", - "locationName":"mapPublicIpOnLaunch" - }, - "Tags":{ - "shape":"TagList", - "locationName":"tagSet" - } - } - }, - "SubnetIdStringList":{ - "type":"list", - "member":{ - "shape":"String", - "locationName":"SubnetId" - } - }, - "SubnetList":{ - "type":"list", - "member":{ - "shape":"Subnet", - "locationName":"item" - } - }, - "SubnetState":{ - "type":"string", - "enum":[ - "pending", - "available" - ] - }, - "SummaryStatus":{ - "type":"string", - "enum":[ - "ok", - "impaired", - "insufficient-data", - "not-applicable" - ] - }, - "Tag":{ - "type":"structure", - "members":{ - "Key":{ - "shape":"String", - "locationName":"key" - }, - "Value":{ - "shape":"String", - "locationName":"value" - } - } - }, - "TagDescription":{ - "type":"structure", - "members":{ - "ResourceId":{ - "shape":"String", - "locationName":"resourceId" - }, - "ResourceType":{ - "shape":"ResourceType", - "locationName":"resourceType" - }, - "Key":{ - "shape":"String", - "locationName":"key" - }, - "Value":{ - "shape":"String", - "locationName":"value" - } - } - }, - "TagDescriptionList":{ - "type":"list", - "member":{ - "shape":"TagDescription", - "locationName":"item" - } - }, - "TagList":{ - "type":"list", - "member":{ - "shape":"Tag", - "locationName":"item" - } - }, - "TelemetryStatus":{ - "type":"string", - "enum":[ - "UP", - "DOWN" - ] - }, - "Tenancy":{ - "type":"string", - "enum":[ - "default", - "dedicated" - ] - }, - "TerminateInstancesRequest":{ - "type":"structure", - "required":["InstanceIds"], - "members":{ - "DryRun":{ - "shape":"Boolean", - "locationName":"dryRun" - }, - "InstanceIds":{ - "shape":"InstanceIdStringList", - "locationName":"InstanceId" - } - } - }, - "TerminateInstancesResult":{ - "type":"structure", - "members":{ - "TerminatingInstances":{ - "shape":"InstanceStateChangeList", - "locationName":"instancesSet" - } - } - }, - "UnassignPrivateIpAddressesRequest":{ - "type":"structure", - "required":[ - "NetworkInterfaceId", - "PrivateIpAddresses" - ], - "members":{ - "NetworkInterfaceId":{ - "shape":"String", - "locationName":"networkInterfaceId" - }, - "PrivateIpAddresses":{ - "shape":"PrivateIpAddressStringList", - "locationName":"privateIpAddress" - } - } - }, - "UnmonitorInstancesRequest":{ - "type":"structure", - "required":["InstanceIds"], - "members":{ - "DryRun":{ - "shape":"Boolean", - "locationName":"dryRun" - }, - "InstanceIds":{ - "shape":"InstanceIdStringList", - "locationName":"InstanceId" - } - } - }, - "UnmonitorInstancesResult":{ - "type":"structure", - "members":{ - "InstanceMonitorings":{ - "shape":"InstanceMonitoringList", - "locationName":"instancesSet" - } - } - }, - "UserData":{ - "type":"structure", - "members":{ - "Data":{ - "shape":"String", - "locationName":"data" - } - } - }, - "UserGroupStringList":{ - "type":"list", - "member":{ - "shape":"String", - "locationName":"UserGroup" - } - }, - "UserIdGroupPair":{ - "type":"structure", - "members":{ - "UserId":{ - "shape":"String", - "locationName":"userId" - }, - "GroupName":{ - "shape":"String", - "locationName":"groupName" - }, - "GroupId":{ - "shape":"String", - "locationName":"groupId" - } - } - }, - "UserIdGroupPairList":{ - "type":"list", - "member":{ - "shape":"UserIdGroupPair", - "locationName":"item" - } - }, - "UserIdStringList":{ - "type":"list", - "member":{ - "shape":"String", - "locationName":"UserId" - } - }, - "ValueStringList":{ - "type":"list", - "member":{ - "shape":"String", - "locationName":"item" - } - }, - "VgwTelemetry":{ - "type":"structure", - "members":{ - "OutsideIpAddress":{ - "shape":"String", - "locationName":"outsideIpAddress" - }, - "Status":{ - "shape":"TelemetryStatus", - "locationName":"status" - }, - "LastStatusChange":{ - "shape":"DateTime", - "locationName":"lastStatusChange" - }, - "StatusMessage":{ - "shape":"String", - "locationName":"statusMessage" - }, - "AcceptedRouteCount":{ - "shape":"Integer", - "locationName":"acceptedRouteCount" - } - } - }, - "VgwTelemetryList":{ - "type":"list", - "member":{ - "shape":"VgwTelemetry", - "locationName":"item" - } - }, - "VirtualizationType":{ - "type":"string", - "enum":[ - "hvm", - "paravirtual" - ] - }, - "Volume":{ - "type":"structure", - "members":{ - "VolumeId":{ - "shape":"String", - "locationName":"volumeId" - }, - "Size":{ - "shape":"Integer", - "locationName":"size" - }, - "SnapshotId":{ - "shape":"String", - "locationName":"snapshotId" - }, - "AvailabilityZone":{ - "shape":"String", - "locationName":"availabilityZone" - }, - "State":{ - "shape":"VolumeState", - "locationName":"status" - }, - "CreateTime":{ - "shape":"DateTime", - "locationName":"createTime" - }, - "Attachments":{ - "shape":"VolumeAttachmentList", - "locationName":"attachmentSet" - }, - "Tags":{ - "shape":"TagList", - "locationName":"tagSet" - }, - "VolumeType":{ - "shape":"VolumeType", - "locationName":"volumeType" - }, - "Iops":{ - "shape":"Integer", - "locationName":"iops" - }, - "Encrypted":{ - "shape":"Boolean", - "locationName":"encrypted" - }, - "KmsKeyId":{ - "shape":"String", - "locationName":"kmsKeyId" - } - } - }, - "VolumeAttachment":{ - "type":"structure", - "members":{ - "VolumeId":{ - "shape":"String", - "locationName":"volumeId" - }, - "InstanceId":{ - "shape":"String", - "locationName":"instanceId" - }, - "Device":{ - "shape":"String", - "locationName":"device" - }, - "State":{ - "shape":"VolumeAttachmentState", - "locationName":"status" - }, - "AttachTime":{ - "shape":"DateTime", - "locationName":"attachTime" - }, - "DeleteOnTermination":{ - "shape":"Boolean", - "locationName":"deleteOnTermination" - } - } - }, - "VolumeAttachmentList":{ - "type":"list", - "member":{ - "shape":"VolumeAttachment", - "locationName":"item" - } - }, - "VolumeAttachmentState":{ - "type":"string", - "enum":[ - "attaching", - "attached", - "detaching", - "detached" - ] - }, - "VolumeAttributeName":{ - "type":"string", - "enum":[ - "autoEnableIO", - "productCodes" - ] - }, - "VolumeDetail":{ - "type":"structure", - "required":["Size"], - "members":{ - "Size":{ - "shape":"Long", - "locationName":"size" - } - } - }, - "VolumeIdStringList":{ - "type":"list", - "member":{ - "shape":"String", - "locationName":"VolumeId" - } - }, - "VolumeList":{ - "type":"list", - "member":{ - "shape":"Volume", - "locationName":"item" - } - }, - "VolumeState":{ - "type":"string", - "enum":[ - "creating", - "available", - "in-use", - "deleting", - "deleted", - "error" - ] - }, - "VolumeStatusAction":{ - "type":"structure", - "members":{ - "Code":{ - "shape":"String", - "locationName":"code" - }, - "Description":{ - "shape":"String", - "locationName":"description" - }, - "EventType":{ - "shape":"String", - "locationName":"eventType" - }, - "EventId":{ - "shape":"String", - "locationName":"eventId" - } - } - }, - "VolumeStatusActionsList":{ - "type":"list", - "member":{ - "shape":"VolumeStatusAction", - "locationName":"item" - } - }, - "VolumeStatusDetails":{ - "type":"structure", - "members":{ - "Name":{ - "shape":"VolumeStatusName", - "locationName":"name" - }, - "Status":{ - "shape":"String", - "locationName":"status" - } - } - }, - "VolumeStatusDetailsList":{ - "type":"list", - "member":{ - "shape":"VolumeStatusDetails", - "locationName":"item" - } - }, - "VolumeStatusEvent":{ - "type":"structure", - "members":{ - "EventType":{ - "shape":"String", - "locationName":"eventType" - }, - "Description":{ - "shape":"String", - "locationName":"description" - }, - "NotBefore":{ - "shape":"DateTime", - "locationName":"notBefore" - }, - "NotAfter":{ - "shape":"DateTime", - "locationName":"notAfter" - }, - "EventId":{ - "shape":"String", - "locationName":"eventId" - } - } - }, - "VolumeStatusEventsList":{ - "type":"list", - "member":{ - "shape":"VolumeStatusEvent", - "locationName":"item" - } - }, - "VolumeStatusInfo":{ - "type":"structure", - "members":{ - "Status":{ - "shape":"VolumeStatusInfoStatus", - "locationName":"status" - }, - "Details":{ - "shape":"VolumeStatusDetailsList", - "locationName":"details" - } - } - }, - "VolumeStatusInfoStatus":{ - "type":"string", - "enum":[ - "ok", - "impaired", - "insufficient-data" - ] - }, - "VolumeStatusItem":{ - "type":"structure", - "members":{ - "VolumeId":{ - "shape":"String", - "locationName":"volumeId" - }, - "AvailabilityZone":{ - "shape":"String", - "locationName":"availabilityZone" - }, - "VolumeStatus":{ - "shape":"VolumeStatusInfo", - "locationName":"volumeStatus" - }, - "Events":{ - "shape":"VolumeStatusEventsList", - "locationName":"eventsSet" - }, - "Actions":{ - "shape":"VolumeStatusActionsList", - "locationName":"actionsSet" - } - } - }, - "VolumeStatusList":{ - "type":"list", - "member":{ - "shape":"VolumeStatusItem", - "locationName":"item" - } - }, - "VolumeStatusName":{ - "type":"string", - "enum":[ - "io-enabled", - "io-performance" - ] - }, - "VolumeType":{ - "type":"string", - "enum":[ - "standard", - "io1", - "gp2" - ] - }, - "Vpc":{ - "type":"structure", - "members":{ - "VpcId":{ - "shape":"String", - "locationName":"vpcId" - }, - "State":{ - "shape":"VpcState", - "locationName":"state" - }, - "CidrBlock":{ - "shape":"String", - "locationName":"cidrBlock" - }, - "DhcpOptionsId":{ - "shape":"String", - "locationName":"dhcpOptionsId" - }, - "Tags":{ - "shape":"TagList", - "locationName":"tagSet" - }, - "InstanceTenancy":{ - "shape":"Tenancy", - "locationName":"instanceTenancy" - }, - "IsDefault":{ - "shape":"Boolean", - "locationName":"isDefault" - } - } - }, - "VpcAttachment":{ - "type":"structure", - "members":{ - "VpcId":{ - "shape":"String", - "locationName":"vpcId" - }, - "State":{ - "shape":"AttachmentStatus", - "locationName":"state" - } - } - }, - "VpcAttachmentList":{ - "type":"list", - "member":{ - "shape":"VpcAttachment", - "locationName":"item" - } - }, - "VpcAttributeName":{ - "type":"string", - "enum":[ - "enableDnsSupport", - "enableDnsHostnames" - ] - }, - "VpcClassicLink":{ - "type":"structure", - "members":{ - "VpcId":{ - "shape":"String", - "locationName":"vpcId" - }, - "ClassicLinkEnabled":{ - "shape":"Boolean", - "locationName":"classicLinkEnabled" - }, - "Tags":{ - "shape":"TagList", - "locationName":"tagSet" - } - } - }, - "VpcClassicLinkIdList":{ - "type":"list", - "member":{ - "shape":"String", - "locationName":"VpcId" - } - }, - "VpcClassicLinkList":{ - "type":"list", - "member":{ - "shape":"VpcClassicLink", - "locationName":"item" - } - }, - "VpcIdStringList":{ - "type":"list", - "member":{ - "shape":"String", - "locationName":"VpcId" - } - }, - "VpcList":{ - "type":"list", - "member":{ - "shape":"Vpc", - "locationName":"item" - } - }, - "VpcPeeringConnection":{ - "type":"structure", - "members":{ - "AccepterVpcInfo":{ - "shape":"VpcPeeringConnectionVpcInfo", - "locationName":"accepterVpcInfo" - }, - "ExpirationTime":{ - "shape":"DateTime", - "locationName":"expirationTime" - }, - "RequesterVpcInfo":{ - "shape":"VpcPeeringConnectionVpcInfo", - "locationName":"requesterVpcInfo" - }, - "Status":{ - "shape":"VpcPeeringConnectionStateReason", - "locationName":"status" - }, - "Tags":{ - "shape":"TagList", - "locationName":"tagSet" - }, - "VpcPeeringConnectionId":{ - "shape":"String", - "locationName":"vpcPeeringConnectionId" - } - } - }, - "VpcPeeringConnectionList":{ - "type":"list", - "member":{ - "shape":"VpcPeeringConnection", - "locationName":"item" - } - }, - "VpcPeeringConnectionStateReason":{ - "type":"structure", - "members":{ - "Code":{ - "shape":"String", - "locationName":"code" - }, - "Message":{ - "shape":"String", - "locationName":"message" - } - } - }, - "VpcPeeringConnectionVpcInfo":{ - "type":"structure", - "members":{ - "CidrBlock":{ - "shape":"String", - "locationName":"cidrBlock" - }, - "OwnerId":{ - "shape":"String", - "locationName":"ownerId" - }, - "VpcId":{ - "shape":"String", - "locationName":"vpcId" - } - } - }, - "VpcState":{ - "type":"string", - "enum":[ - "pending", - "available" - ] - }, - "VpnConnection":{ - "type":"structure", - "members":{ - "VpnConnectionId":{ - "shape":"String", - "locationName":"vpnConnectionId" - }, - "State":{ - "shape":"VpnState", - "locationName":"state" - }, - "CustomerGatewayConfiguration":{ - "shape":"String", - "locationName":"customerGatewayConfiguration" - }, - "Type":{ - "shape":"GatewayType", - "locationName":"type" - }, - "CustomerGatewayId":{ - "shape":"String", - "locationName":"customerGatewayId" - }, - "VpnGatewayId":{ - "shape":"String", - "locationName":"vpnGatewayId" - }, - "Tags":{ - "shape":"TagList", - "locationName":"tagSet" - }, - "VgwTelemetry":{ - "shape":"VgwTelemetryList", - "locationName":"vgwTelemetry" - }, - "Options":{ - "shape":"VpnConnectionOptions", - "locationName":"options" - }, - "Routes":{ - "shape":"VpnStaticRouteList", - "locationName":"routes" - } - } - }, - "VpnConnectionIdStringList":{ - "type":"list", - "member":{ - "shape":"String", - "locationName":"VpnConnectionId" - } - }, - "VpnConnectionList":{ - "type":"list", - "member":{ - "shape":"VpnConnection", - "locationName":"item" - } - }, - "VpnConnectionOptions":{ - "type":"structure", - "members":{ - "StaticRoutesOnly":{ - "shape":"Boolean", - "locationName":"staticRoutesOnly" - } - } - }, - "VpnConnectionOptionsSpecification":{ - "type":"structure", - "members":{ - "StaticRoutesOnly":{ - "shape":"Boolean", - "locationName":"staticRoutesOnly" - } - } - }, - "VpnGateway":{ - "type":"structure", - "members":{ - "VpnGatewayId":{ - "shape":"String", - "locationName":"vpnGatewayId" - }, - "State":{ - "shape":"VpnState", - "locationName":"state" - }, - "Type":{ - "shape":"GatewayType", - "locationName":"type" - }, - "AvailabilityZone":{ - "shape":"String", - "locationName":"availabilityZone" - }, - "VpcAttachments":{ - "shape":"VpcAttachmentList", - "locationName":"attachments" - }, - "Tags":{ - "shape":"TagList", - "locationName":"tagSet" - } - } - }, - "VpnGatewayIdStringList":{ - "type":"list", - "member":{ - "shape":"String", - "locationName":"VpnGatewayId" - } - }, - "VpnGatewayList":{ - "type":"list", - "member":{ - "shape":"VpnGateway", - "locationName":"item" - } - }, - "VpnState":{ - "type":"string", - "enum":[ - "pending", - "available", - "deleting", - "deleted" - ] - }, - "VpnStaticRoute":{ - "type":"structure", - "members":{ - "DestinationCidrBlock":{ - "shape":"String", - "locationName":"destinationCidrBlock" - }, - "Source":{ - "shape":"VpnStaticRouteSource", - "locationName":"source" - }, - "State":{ - "shape":"VpnState", - "locationName":"state" - } - } - }, - "VpnStaticRouteList":{ - "type":"list", - "member":{ - "shape":"VpnStaticRoute", - "locationName":"item" - } - }, - "VpnStaticRouteSource":{ - "type":"string", - "enum":["Static"] - }, - "ZoneNameStringList":{ - "type":"list", - "member":{ - "shape":"String", - "locationName":"ZoneName" - } - }, - "NewDhcpConfigurationList":{ - "type":"list", - "member":{ - "shape":"NewDhcpConfiguration", - "locationName":"item" - } - }, - "NewDhcpConfiguration":{ - "type":"structure", - "members":{ - "Key":{ - "shape":"String", - "locationName":"key" - }, - "Values":{ - "shape":"ValueStringList", - "locationName":"Value" - } - } - }, - "DhcpConfigurationValueList":{ - "type":"list", - "member":{ - "shape":"AttributeValue", - "locationName":"item" - } - }, - "Blob":{"type":"blob"}, - "BlobAttributeValue":{ - "type":"structure", - "members":{ - "Value":{ - "shape":"Blob", - "locationName":"value" - } - } - }, - "RequestSpotLaunchSpecification":{ - "type":"structure", - "members":{ - "ImageId":{ - "shape":"String", - "locationName":"imageId" - }, - "KeyName":{ - "shape":"String", - "locationName":"keyName" - }, - "SecurityGroups":{ - "shape":"ValueStringList", - "locationName":"SecurityGroup" - }, - "UserData":{ - "shape":"String", - "locationName":"userData" - }, - "AddressingType":{ - "shape":"String", - "locationName":"addressingType" - }, - "InstanceType":{ - "shape":"InstanceType", - "locationName":"instanceType" - }, - "Placement":{ - "shape":"SpotPlacement", - "locationName":"placement" - }, - "KernelId":{ - "shape":"String", - "locationName":"kernelId" - }, - "RamdiskId":{ - "shape":"String", - "locationName":"ramdiskId" - }, - "BlockDeviceMappings":{ - "shape":"BlockDeviceMappingList", - "locationName":"blockDeviceMapping" - }, - "SubnetId":{ - "shape":"String", - "locationName":"subnetId" - }, - "NetworkInterfaces":{ - "shape":"InstanceNetworkInterfaceSpecificationList", - "locationName":"NetworkInterface" - }, - "IamInstanceProfile":{ - "shape":"IamInstanceProfileSpecification", - "locationName":"iamInstanceProfile" - }, - "EbsOptimized":{ - "shape":"Boolean", - "locationName":"ebsOptimized" - }, - "Monitoring":{ - "shape":"RunInstancesMonitoringEnabled", - "locationName":"monitoring" - }, - "SecurityGroupIds":{ - "shape":"ValueStringList", - "locationName":"SecurityGroupId" - } - } - } - } -} diff --git a/aws-sdk-core/apis/ec2/2014-10-01/docs-2.json b/aws-sdk-core/apis/ec2/2014-10-01/docs-2.json deleted file mode 100644 index b8a04bffdbc..00000000000 --- a/aws-sdk-core/apis/ec2/2014-10-01/docs-2.json +++ /dev/null @@ -1,4678 +0,0 @@ -{ - "version": "2.0", - "operations": { - "AcceptVpcPeeringConnection": "

Accept a VPC peering connection request. To accept a request, the VPC peering connection must be in the pending-acceptance state, and you must be the owner of the peer VPC. Use the DescribeVpcPeeringConnections request to view your outstanding VPC peering connection requests.

", - "AllocateAddress": "

Acquires an Elastic IP address.

An Elastic IP address is for use either in the EC2-Classic platform or in a VPC. For more information, see Elastic IP Addresses in the Amazon Elastic Compute Cloud User Guide for Linux.

", - "AssignPrivateIpAddresses": "

Assigns one or more secondary private IP addresses to the specified network interface. You can specify one or more specific secondary IP addresses, or you can specify the number of secondary IP addresses to be automatically assigned within the subnet's CIDR block range. The number of secondary IP addresses that you can assign to an instance varies by instance type. For information about instance types, see Instance Types in the Amazon Elastic Compute Cloud User Guide for Linux. For more information about Elastic IP addresses, see Elastic IP Addresses in the Amazon Elastic Compute Cloud User Guide for Linux.

AssignPrivateIpAddresses is available only in EC2-VPC.

", - "AssociateAddress": "

Associates an Elastic IP address with an instance or a network interface.

An Elastic IP address is for use in either the EC2-Classic platform or in a VPC. For more information, see Elastic IP Addresses in the Amazon Elastic Compute Cloud User Guide for Linux.

[EC2-Classic, VPC in an EC2-VPC-only account] If the Elastic IP address is already associated with a different instance, it is disassociated from that instance and associated with the specified instance.

[VPC in an EC2-Classic account] If you don't specify a private IP address, the Elastic IP address is associated with the primary IP address. If the Elastic IP address is already associated with a different instance or a network interface, you get an error unless you allow reassociation.

This is an idempotent operation. If you perform the operation more than once, Amazon EC2 doesn't return an error.

", - "AssociateDhcpOptions": "

Associates a set of DHCP options (that you've previously created) with the specified VPC, or associates no DHCP options with the VPC.

After you associate the options with the VPC, any existing instances and all new instances that you launch in that VPC use the options. You don't need to restart or relaunch the instances. They automatically pick up the changes within a few hours, depending on how frequently the instance renews its DHCP lease. You can explicitly renew the lease using the operating system on the instance.

For more information, see DHCP Options Sets in the Amazon Virtual Private Cloud User Guide.

", - "AssociateRouteTable": "

Associates a subnet with a route table. The subnet and route table must be in the same VPC. This association causes traffic originating from the subnet to be routed according to the routes in the route table. The action returns an association ID, which you need in order to disassociate the route table from the subnet later. A route table can be associated with multiple subnets.

For more information about route tables, see Route Tables in the Amazon Virtual Private Cloud User Guide.

", - "AttachClassicLinkVpc": "

Links an EC2-Classic instance to a ClassicLink-enabled VPC through one or more of the VPC's security groups. You cannot link an EC2-Classic instance to more than one VPC at a time. You can only link an instance that's in the running state. An instance is automatically unlinked from a VPC when it's stopped - you can link it to the VPC again when you restart it.

After you've linked an instance, you cannot change the VPC security groups that are associated with it. To change the security groups, you must first unlink the instance, and then link it again.

Linking your instance to a VPC is sometimes referred to as attaching your instance.

", - "AttachInternetGateway": "

Attaches an Internet gateway to a VPC, enabling connectivity between the Internet and the VPC. For more information about your VPC and Internet gateway, see the Amazon Virtual Private Cloud User Guide.

", - "AttachNetworkInterface": "

Attaches a network interface to an instance.

", - "AttachVolume": "

Attaches an Amazon EBS volume to a running or stopped instance and exposes it to the instance with the specified device name.

Encrypted Amazon EBS volumes may only be attached to instances that support Amazon EBS encryption. For more information, see Amazon EBS Encryption in the Amazon Elastic Compute Cloud User Guide for Linux.

For a list of supported device names, see Attaching an Amazon EBS Volume to an Instance. Any device names that aren't reserved for instance store volumes can be used for Amazon EBS volumes. For more information, see Amazon EC2 Instance Store in the Amazon Elastic Compute Cloud User Guide for Linux.

If a volume has an AWS Marketplace product code:

  • The volume can be attached only to a stopped instance.
  • AWS Marketplace product codes are copied from the volume to the instance.
  • You must be subscribed to the product.
  • The instance type and operating system of the instance must support the product. For example, you can't detach a volume from a Windows instance and attach it to a Linux instance.

For an overview of the AWS Marketplace, see Introducing AWS Marketplace.

For more information about Amazon EBS volumes, see Attaching Amazon EBS Volumes in the Amazon Elastic Compute Cloud User Guide for Linux.

", - "AttachVpnGateway": "

Attaches a virtual private gateway to a VPC. For more information, see Adding a Hardware Virtual Private Gateway to Your VPC in the Amazon Virtual Private Cloud User Guide.

", - "AuthorizeSecurityGroupEgress": "

Adds one or more egress rules to a security group for use with a VPC. Specifically, this action permits instances to send traffic to one or more destination CIDR IP address ranges, or to one or more destination security groups for the same VPC.

You can have up to 50 rules per security group (covering both ingress and egress rules).

A security group is for use with instances either in the EC2-Classic platform or in a specific VPC. This action doesn't apply to security groups for use in EC2-Classic. For more information, see Security Groups for Your VPC in the Amazon Virtual Private Cloud User Guide.

Each rule consists of the protocol (for example, TCP), plus either a CIDR range or a source group. For the TCP and UDP protocols, you must also specify the destination port or port range. For the ICMP protocol, you must also specify the ICMP type and code. You can use -1 for the type or code to mean all types or all codes.

Rule changes are propagated to affected instances as quickly as possible. However, a small delay might occur.

", - "AuthorizeSecurityGroupIngress": "

Adds one or more ingress rules to a security group.

EC2-Classic: You can have up to 100 rules per group.

EC2-VPC: You can have up to 50 rules per group (covering both ingress and egress rules).

Rule changes are propagated to instances within the security group as quickly as possible. However, a small delay might occur.

[EC2-Classic] This action gives one or more CIDR IP address ranges permission to access a security group in your account, or gives one or more security groups (called the source groups) permission to access a security group for your account. A source group can be for your own AWS account, or another.

[EC2-VPC] This action gives one or more CIDR IP address ranges permission to access a security group in your VPC, or gives one or more other security groups (called the source groups) permission to access a security group for your VPC. The security groups must all be for the same VPC.

", - "BundleInstance": "

Bundles an Amazon instance store-backed Windows instance.

During bundling, only the root device volume (C:\\) is bundled. Data on other instance store volumes is not preserved.

This action is not applicable for Linux/Unix instances or Windows instances that are backed by Amazon EBS.

For more information, see Creating an Instance Store-Backed Windows AMI.

", - "CancelBundleTask": "

Cancels a bundling operation for an instance store-backed Windows instance.

", - "CancelConversionTask": "

Cancels an active conversion task. The task can be the import of an instance or volume. The action removes all artifacts of the conversion, including a partially uploaded volume or instance. If the conversion is complete or is in the process of transferring the final disk image, the command fails and returns an exception.

For more information, see Using the Command Line Tools to Import Your Virtual Machine to Amazon EC2 in the Amazon Elastic Compute Cloud User Guide for Linux.

", - "CancelExportTask": "

Cancels an active export task. The request removes all artifacts of the export, including any partially-created Amazon S3 objects. If the export task is complete or is in the process of transferring the final disk image, the command fails and returns an error.

", - "CancelReservedInstancesListing": "

Cancels the specified Reserved Instance listing in the Reserved Instance Marketplace.

For more information, see Reserved Instance Marketplace in the Amazon Elastic Compute Cloud User Guide for Linux.

", - "CancelSpotInstanceRequests": "

Cancels one or more Spot Instance requests. Spot Instances are instances that Amazon EC2 starts on your behalf when the bid price that you specify exceeds the current Spot Price. Amazon EC2 periodically sets the Spot Price based on available Spot Instance capacity and current Spot Instance requests. For more information, see Spot Instance Requests in the Amazon Elastic Compute Cloud User Guide for Linux.

Canceling a Spot Instance request does not terminate running Spot Instances associated with the request.

", - "ConfirmProductInstance": "

Determines whether a product code is associated with an instance. This action can only be used by the owner of the product code. It is useful when a product code owner needs to verify whether another user's instance is eligible for support.

", - "CopyImage": "

Initiates the copy of an AMI from the specified source region to the current region. You specify the destination region by using its endpoint when making the request. AMIs that use encrypted Amazon EBS snapshots cannot be copied with this method.

For more information, see Copying AMIs in the Amazon Elastic Compute Cloud User Guide for Linux.

", - "CopySnapshot": "

Copies a point-in-time snapshot of an Amazon EBS volume and stores it in Amazon S3. You can copy the snapshot within the same region or from one region to another. You can use the snapshot to create Amazon EBS volumes or Amazon Machine Images (AMIs). The snapshot is copied to the regional endpoint that you send the HTTP request to.

Copies of encrypted Amazon EBS snapshots remain encrypted. Copies of unencrypted snapshots remain unencrypted.

Copying snapshots that were encrypted with non-default AWS Key Management Service (KMS) master keys is not supported at this time.

For more information, see Copying an Amazon EBS Snapshot in the Amazon Elastic Compute Cloud User Guide for Linux.

", - "CreateCustomerGateway": "

Provides information to AWS about your VPN customer gateway device. The customer gateway is the appliance at your end of the VPN connection. (The device on the AWS side of the VPN connection is the virtual private gateway.) You must provide the Internet-routable IP address of the customer gateway's external interface. The IP address must be static and can't be behind a device performing network address translation (NAT).

For devices that use Border Gateway Protocol (BGP), you can also provide the device's BGP Autonomous System Number (ASN). You can use an existing ASN assigned to your network. If you don't have an ASN already, you can use a private ASN (in the 64512 - 65534 range).

Amazon EC2 supports all 2-byte ASN numbers in the range of 1 - 65534, with the exception of 7224, which is reserved in the us-east-1 region, and 9059, which is reserved in the eu-west-1 region.

For more information about VPN customer gateways, see Adding a Hardware Virtual Private Gateway to Your VPC in the Amazon Virtual Private Cloud User Guide.

", - "CreateDhcpOptions": "

Creates a set of DHCP options for your VPC. After creating the set, you must associate it with the VPC, causing all existing and new instances that you launch in the VPC to use this set of DHCP options. The following are the individual DHCP options you can specify. For more information about the options, see RFC 2132.

  • domain-name-servers - The IP addresses of up to four domain name servers, or AmazonProvidedDNS. The default DHCP option set specifies AmazonProvidedDNS. If specifying more than one domain name server, specify the IP addresses in a single parameter, separated by commas.
  • domain-name - If you're using AmazonProvidedDNS in us-east-1, specify ec2.internal. If you're using AmazonProvidedDNS in another region, specify region.compute.internal (for example, ap-northeast-1.compute.internal). Otherwise, specify a domain name (for example, MyCompany.com). Important: Some Linux operating systems accept multiple domain names separated by spaces. However, Windows and other Linux operating systems treat the value as a single domain, which results in unexpected behavior. If your DHCP options set is associated with a VPC that has instances with multiple operating systems, specify only one domain name.
  • ntp-servers - The IP addresses of up to four Network Time Protocol (NTP) servers.
  • netbios-name-servers - The IP addresses of up to four NetBIOS name servers.
  • netbios-node-type - The NetBIOS node type (1, 2, 4, or 8). We recommend that you specify 2 (broadcast and multicast are not currently supported). For more information about these node types, see RFC 2132.

Your VPC automatically starts out with a set of DHCP options that includes only a DNS server that we provide (AmazonProvidedDNS). If you create a set of options, and if your VPC has an Internet gateway, make sure to set the domain-name-servers option either to AmazonProvidedDNS or to a domain name server of your choice. For more information about DHCP options, see DHCP Options Sets in the Amazon Virtual Private Cloud User Guide.

", - "CreateImage": "

Creates an Amazon EBS-backed AMI from an Amazon EBS-backed instance that is either running or stopped.

If you customized your instance with instance store volumes or EBS volumes in addition to the root device volume, the new AMI contains block device mapping information for those volumes. When you launch an instance from this new AMI, the instance automatically launches with those additional volumes.

For more information, see Creating Amazon EBS-Backed Linux AMIs in the Amazon Elastic Compute Cloud User Guide for Linux.

", - "CreateInstanceExportTask": "

Exports a running or stopped instance to an Amazon S3 bucket.

For information about the supported operating systems, image formats, and known limitations for the types of instances you can export, see Exporting EC2 Instances in the Amazon Elastic Compute Cloud User Guide for Linux.

", - "CreateInternetGateway": "

Creates an Internet gateway for use with a VPC. After creating the Internet gateway, you attach it to a VPC using AttachInternetGateway.

For more information about your VPC and Internet gateway, see the Amazon Virtual Private Cloud User Guide.

", - "CreateKeyPair": "

Creates a 2048-bit RSA key pair with the specified name. Amazon EC2 stores the public key and displays the private key for you to save to a file. The private key is returned as an unencrypted PEM encoded PKCS#8 private key. If a key with the specified name already exists, Amazon EC2 returns an error.

You can have up to five thousand key pairs per region.

The key pair returned to you is available only in the region in which you create it. To create a key pair that is available in all regions, use ImportKeyPair.

For more information about key pairs, see Key Pairs in the Amazon Elastic Compute Cloud User Guide for Linux.

", - "CreateNetworkAcl": "

Creates a network ACL in a VPC. Network ACLs provide an optional layer of security (in addition to security groups) for the instances in your VPC.

For more information about network ACLs, see Network ACLs in the Amazon Virtual Private Cloud User Guide.

", - "CreateNetworkAclEntry": "

Creates an entry (a rule) in a network ACL with the specified rule number. Each network ACL has a set of numbered ingress rules and a separate set of numbered egress rules. When determining whether a packet should be allowed in or out of a subnet associated with the ACL, we process the entries in the ACL according to the rule numbers, in ascending order. Each network ACL has a set of ingress rules and a separate set of egress rules.

We recommend that you leave room between the rule numbers (for example, 100, 110, 120, ...), and not number them one right after the other (for example, 101, 102, 103, ...). This makes it easier to add a rule between existing ones without having to renumber the rules.

After you add an entry, you can't modify it; you must either replace it, or create an entry and delete the old one.

For more information about network ACLs, see Network ACLs in the Amazon Virtual Private Cloud User Guide.

", - "CreateNetworkInterface": "

Creates a network interface in the specified subnet.

For more information about network interfaces, see Elastic Network Interfaces in the Amazon Elastic Compute Cloud User Guide for Linux.

", - "CreatePlacementGroup": "

Creates a placement group that you launch cluster instances into. You must give the group a name that's unique within the scope of your account.

For more information about placement groups and cluster instances, see Cluster Instances in the Amazon Elastic Compute Cloud User Guide for Linux.

", - "CreateReservedInstancesListing": "

Creates a listing for Amazon EC2 Reserved Instances to be sold in the Reserved Instance Marketplace. You can submit one Reserved Instance listing at a time. To get a list of your Reserved Instances, you can use the DescribeReservedInstances operation.

The Reserved Instance Marketplace matches sellers who want to resell Reserved Instance capacity that they no longer need with buyers who want to purchase additional capacity. Reserved Instances bought and sold through the Reserved Instance Marketplace work like any other Reserved Instances.

To sell your Reserved Instances, you must first register as a Seller in the Reserved Instance Marketplace. After completing the registration process, you can create a Reserved Instance Marketplace listing of some or all of your Reserved Instances, and specify the upfront price to receive for them. Your Reserved Instance listings then become available for purchase. To view the details of your Reserved Instance listing, you can use the DescribeReservedInstancesListings operation.

For more information, see Reserved Instance Marketplace in the Amazon Elastic Compute Cloud User Guide for Linux.

", - "CreateRoute": "

Creates a route in a route table within a VPC.

You must specify one of the following targets: Internet gateway or virtual private gateway, NAT instance, VPC peering connection, or network interface.

When determining how to route traffic, we use the route with the most specific match. For example, let's say the traffic is destined for 192.0.2.3, and the route table includes the following two routes:

  • 192.0.2.0/24 (goes to some target A)

  • 192.0.2.0/28 (goes to some target B)

Both routes apply to the traffic destined for 192.0.2.3. However, the second route in the list covers a smaller number of IP addresses and is therefore more specific, so we use that route to determine where to target the traffic.

For more information about route tables, see Route Tables in the Amazon Virtual Private Cloud User Guide.

", - "CreateRouteTable": "

Creates a route table for the specified VPC. After you create a route table, you can add routes and associate the table with a subnet.

For more information about route tables, see Route Tables in the Amazon Virtual Private Cloud User Guide.

", - "CreateSecurityGroup": "

Creates a security group.

A security group is for use with instances either in the EC2-Classic platform or in a specific VPC. For more information, see Amazon EC2 Security Groups in the Amazon Elastic Compute Cloud User Guide for Linux and Security Groups for Your VPC in the Amazon Virtual Private Cloud User Guide.

EC2-Classic: You can have up to 500 security groups.

EC2-VPC: You can create up to 100 security groups per VPC.

When you create a security group, you specify a friendly name of your choice. You can have a security group for use in EC2-Classic with the same name as a security group for use in a VPC. However, you can't have two security groups for use in EC2-Classic with the same name or two security groups for use in a VPC with the same name.

You have a default security group for use in EC2-Classic and a default security group for use in your VPC. If you don't specify a security group when you launch an instance, the instance is launched into the appropriate default security group. A default security group includes a default rule that grants instances unrestricted network access to each other.

You can add or remove rules from your security groups using AuthorizeSecurityGroupIngress, AuthorizeSecurityGroupEgress, RevokeSecurityGroupIngress, and RevokeSecurityGroupEgress.

", - "CreateSnapshot": "

Creates a snapshot of an Amazon EBS volume and stores it in Amazon S3. You can use snapshots for backups, to make copies of Amazon EBS volumes, and to save data before shutting down an instance.

When a snapshot is created, any AWS Marketplace product codes that are associated with the source volume are propagated to the snapshot.

You can take a snapshot of an attached volume that is in use. However, snapshots only capture data that has been written to your Amazon EBS volume at the time the snapshot command is issued; this may exclude any data that has been cached by any applications or the operating system. If you can pause any file systems on the volume long enough to take a snapshot, your snapshot should be complete. However, if you cannot pause all file writes to the volume, you should unmount the volume from within the instance, issue the snapshot command, and then remount the volume to ensure a consistent and complete snapshot. You may remount and use your volume while the snapshot status is pending.

To create a snapshot for Amazon EBS volumes that serve as root devices, you should stop the instance before taking the snapshot.

Snapshots that are taken from encrypted volumes are automatically encrypted. Volumes that are created from encrypted snapshots are also automatically encrypted. Your encrypted volumes and any associated snapshots always remain protected.

For more information, see Amazon Elastic Block Store and Amazon EBS Encryption in the Amazon Elastic Compute Cloud User Guide for Linux.

", - "CreateSpotDatafeedSubscription": "

Creates a data feed for Spot Instances, enabling you to view Spot Instance usage logs. You can create one data feed per AWS account. For more information, see Spot Instance Data Feed in the Amazon Elastic Compute Cloud User Guide for Linux.

", - "CreateSubnet": "

Creates a subnet in an existing VPC.

When you create each subnet, you provide the VPC ID and the CIDR block you want for the subnet. After you create a subnet, you can't change its CIDR block. The subnet's CIDR block can be the same as the VPC's CIDR block (assuming you want only a single subnet in the VPC), or a subset of the VPC's CIDR block. If you create more than one subnet in a VPC, the subnets' CIDR blocks must not overlap. The smallest subnet (and VPC) you can create uses a /28 netmask (16 IP addresses), and the largest uses a /16 netmask (65,536 IP addresses).

AWS reserves both the first four and the last IP address in each subnet's CIDR block. They're not available for use.

If you add more than one subnet to a VPC, they're set up in a star topology with a logical router in the middle.

If you launch an instance in a VPC using an Amazon EBS-backed AMI, the IP address doesn't change if you stop and restart the instance (unlike a similar instance launched outside a VPC, which gets a new IP address when restarted). It's therefore possible to have a subnet with no running instances (they're all stopped), but no remaining IP addresses available.

For more information about subnets, see Your VPC and Subnets in the Amazon Virtual Private Cloud User Guide.

", - "CreateTags": "

Adds or overwrites one or more tags for the specified Amazon EC2 resource or resources. Each resource can have a maximum of 10 tags. Each tag consists of a key and optional value. Tag keys must be unique per resource.

For more information about tags, see Tagging Your Resources in the Amazon Elastic Compute Cloud User Guide for Linux.

", - "CreateVolume": "

Creates an Amazon EBS volume that can be attached to an instance in the same Availability Zone. The volume is created in the regional endpoint that you send the HTTP request to. For more information see Regions and Endpoints.

You can create a new empty volume or restore a volume from an Amazon EBS snapshot. Any AWS Marketplace product codes from the snapshot are propagated to the volume.

You can create encrypted volumes with the Encrypted parameter. Encrypted volumes may only be attached to instances that support Amazon EBS encryption. Volumes that are created from encrypted snapshots are also automatically encrypted. For more information, see Amazon EBS Encryption in the Amazon Elastic Compute Cloud User Guide for Linux.

For more information, see Creating or Restoring an Amazon EBS Volume in the Amazon Elastic Compute Cloud User Guide for Linux.

", - "CreateVpc": "

Creates a VPC with the specified CIDR block.

The smallest VPC you can create uses a /28 netmask (16 IP addresses), and the largest uses a /16 netmask (65,536 IP addresses). To help you decide how big to make your VPC, see Your VPC and Subnets in the Amazon Virtual Private Cloud User Guide.

By default, each instance you launch in the VPC has the default DHCP options, which includes only a default DNS server that we provide (AmazonProvidedDNS). For more information about DHCP options, see DHCP Options Sets in the Amazon Virtual Private Cloud User Guide.

", - "CreateVpcPeeringConnection": "

Requests a VPC peering connection between two VPCs: a requester VPC that you own and a peer VPC with which to create the connection. The peer VPC can belong to another AWS account. The requester VPC and peer VPC cannot have overlapping CIDR blocks.

The owner of the peer VPC must accept the peering request to activate the peering connection. The VPC peering connection request expires after 7 days, after which it cannot be accepted or rejected.

A CreateVpcPeeringConnection request between VPCs with overlapping CIDR blocks results in the VPC peering connection having a status of failed.

", - "CreateVpnConnection": "

Creates a VPN connection between an existing virtual private gateway and a VPN customer gateway. The only supported connection type is ipsec.1.

The response includes information that you need to give to your network administrator to configure your customer gateway.

We strongly recommend that you use HTTPS when calling this operation because the response contains sensitive cryptographic information for configuring your customer gateway.

If you decide to shut down your VPN connection for any reason and later create a new VPN connection, you must reconfigure your customer gateway with the new information returned from this call.

For more information about VPN connections, see Adding a Hardware Virtual Private Gateway to Your VPC in the Amazon Virtual Private Cloud User Guide.

", - "CreateVpnConnectionRoute": "

Creates a static route associated with a VPN connection between an existing virtual private gateway and a VPN customer gateway. The static route allows traffic to be routed from the virtual private gateway to the VPN customer gateway.

For more information about VPN connections, see Adding a Hardware Virtual Private Gateway to Your VPC in the Amazon Virtual Private Cloud User Guide.

", - "CreateVpnGateway": "

Creates a virtual private gateway. A virtual private gateway is the endpoint on the VPC side of your VPN connection. You can create a virtual private gateway before creating the VPC itself.

For more information about virtual private gateways, see Adding a Hardware Virtual Private Gateway to Your VPC in the Amazon Virtual Private Cloud User Guide.

", - "DeleteCustomerGateway": "

Deletes the specified customer gateway. You must delete the VPN connection before you can delete the customer gateway.

", - "DeleteDhcpOptions": "

Deletes the specified set of DHCP options. You must disassociate the set of DHCP options before you can delete it. You can disassociate the set of DHCP options by associating either a new set of options or the default set of options with the VPC.

", - "DeleteInternetGateway": "

Deletes the specified Internet gateway. You must detach the Internet gateway from the VPC before you can delete it.

", - "DeleteKeyPair": "

Deletes the specified key pair, by removing the public key from Amazon EC2.

", - "DeleteNetworkAcl": "

Deletes the specified network ACL. You can't delete the ACL if it's associated with any subnets. You can't delete the default network ACL.

", - "DeleteNetworkAclEntry": "

Deletes the specified ingress or egress entry (rule) from the specified network ACL.

", - "DeleteNetworkInterface": "

Deletes the specified network interface. You must detach the network interface before you can delete it.

", - "DeletePlacementGroup": "

Deletes the specified placement group. You must terminate all instances in the placement group before you can delete the placement group. For more information about placement groups and cluster instances, see Cluster Instances in the Amazon Elastic Compute Cloud User Guide for Linux.

", - "DeleteRoute": "

Deletes the specified route from the specified route table.

", - "DeleteRouteTable": "

Deletes the specified route table. You must disassociate the route table from any subnets before you can delete it. You can't delete the main route table.

", - "DeleteSecurityGroup": "

Deletes a security group.

If you attempt to delete a security group that is associated with an instance, or is referenced by another security group, the operation fails with InvalidGroup.InUse in EC2-Classic or DependencyViolation in EC2-VPC.

", - "DeleteSnapshot": "

Deletes the specified snapshot.

When you make periodic snapshots of a volume, the snapshots are incremental, and only the blocks on the device that have changed since your last snapshot are saved in the new snapshot. When you delete a snapshot, only the data not needed for any other snapshot is removed. So regardless of which prior snapshots have been deleted, all active snapshots will have access to all the information needed to restore the volume.

You cannot delete a snapshot of the root device of an Amazon EBS volume used by a registered AMI. You must first de-register the AMI before you can delete the snapshot.

For more information, see Deleting an Amazon EBS Snapshot in the Amazon Elastic Compute Cloud User Guide for Linux.

", - "DeleteSpotDatafeedSubscription": "

Deletes the data feed for Spot Instances. For more information, see Spot Instance Data Feed in the Amazon Elastic Compute Cloud User Guide for Linux.

", - "DeleteSubnet": "

Deletes the specified subnet. You must terminate all running instances in the subnet before you can delete the subnet.

", - "DeleteTags": "

Deletes the specified set of tags from the specified set of resources. This call is designed to follow a DescribeTags request.

For more information about tags, see Tagging Your Resources in the Amazon Elastic Compute Cloud User Guide for Linux.

", - "DeleteVolume": "

Deletes the specified Amazon EBS volume. The volume must be in the available state (not attached to an instance).

The volume may remain in the deleting state for several minutes.

For more information, see Deleting an Amazon EBS Volume in the Amazon Elastic Compute Cloud User Guide for Linux.

", - "DeleteVpc": "

Deletes the specified VPC. You must detach or delete all gateways and resources that are associated with the VPC before you can delete it. For example, you must terminate all instances running in the VPC, delete all security groups associated with the VPC (except the default one), delete all route tables associated with the VPC (except the default one), and so on.

", - "DeleteVpcPeeringConnection": "

Deletes a VPC peering connection. Either the owner of the requester VPC or the owner of the peer VPC can delete the VPC peering connection if it's in the active state. The owner of the requester VPC can delete a VPC peering connection in the pending-acceptance state.

", - "DeleteVpnConnection": "

Deletes the specified VPN connection.

If you're deleting the VPC and its associated components, we recommend that you detach the virtual private gateway from the VPC and delete the VPC before deleting the VPN connection. If you believe that the tunnel credentials for your VPN connection have been compromised, you can delete the VPN connection and create a new one that has new keys, without needing to delete the VPC or virtual private gateway. If you create a new VPN connection, you must reconfigure the customer gateway using the new configuration information returned with the new VPN connection ID.

", - "DeleteVpnConnectionRoute": "

Deletes the specified static route associated with a VPN connection between an existing virtual private gateway and a VPN customer gateway. The static route allows traffic to be routed from the virtual private gateway to the VPN customer gateway.

", - "DeleteVpnGateway": "

Deletes the specified virtual private gateway. We recommend that before you delete a virtual private gateway, you detach it from the VPC and delete the VPN connection. Note that you don't need to delete the virtual private gateway if you plan to delete and recreate the VPN connection between your VPC and your network.

", - "DeregisterImage": "

Deregisters the specified AMI. After you deregister an AMI, it can't be used to launch new instances.

This command does not delete the AMI.

", - "DescribeAccountAttributes": "

Describes attributes of your AWS account. The following are the supported account attributes:

  • supported-platforms: Indicates whether your account can launch instances into EC2-Classic and EC2-VPC, or only into EC2-VPC.

  • default-vpc: The ID of the default VPC for your account, or none.

  • max-instances: The maximum number of On-Demand instances that you can run.

  • vpc-max-security-groups-per-interface: The maximum number of security groups that you can assign to a network interface.

  • max-elastic-ips: The maximum number of Elastic IP addresses that you can allocate for use with EC2-Classic.

  • vpc-max-elastic-ips: The maximum number of Elastic IP addresses that you can allocate for use with EC2-VPC.

", - "DescribeAddresses": "

Describes one or more of your Elastic IP addresses.

An Elastic IP address is for use in either the EC2-Classic platform or in a VPC. For more information, see Elastic IP Addresses in the Amazon Elastic Compute Cloud User Guide for Linux.

", - "DescribeAvailabilityZones": "

Describes one or more of the Availability Zones that are available to you. The results include zones only for the region you're currently using. If there is an event impacting an Availability Zone, you can use this request to view the state and any provided message for that Availability Zone.

For more information, see Regions and Availability Zones in the Amazon Elastic Compute Cloud User Guide for Linux.

", - "DescribeBundleTasks": "

Describes one or more of your bundling tasks.

Completed bundle tasks are listed for only a limited time. If your bundle task is no longer in the list, you can still register an AMI from it. Just use RegisterImage with the Amazon S3 bucket name and image manifest name you provided to the bundle task.

", - "DescribeClassicLinkInstances": "

Describes one or more of your linked EC2-Classic instances. This request only returns information about EC2-Classic instances linked to a VPC through ClassicLink; you cannot use this request to return information about other instances.

", - "DescribeConversionTasks": "

Describes one or more of your conversion tasks. For more information, see Using the Command Line Tools to Import Your Virtual Machine to Amazon EC2 in the Amazon Elastic Compute Cloud User Guide for Linux.

", - "DescribeCustomerGateways": "

Describes one or more of your VPN customer gateways.

For more information about VPN customer gateways, see Adding a Hardware Virtual Private Gateway to Your VPC in the Amazon Virtual Private Cloud User Guide.

", - "DescribeDhcpOptions": "

Describes one or more of your DHCP options sets.

For more information about DHCP options sets, see DHCP Options Sets in the Amazon Virtual Private Cloud User Guide.

", - "DescribeExportTasks": "

Describes one or more of your export tasks.

", - "DescribeImageAttribute": "

Describes the specified attribute of the specified AMI. You can specify only one attribute at a time.

", - "DescribeImages": "

Describes one or more of the images (AMIs, AKIs, and ARIs) available to you. Images available to you include public images, private images that you own, and private images owned by other AWS accounts but for which you have explicit launch permissions.

Deregistered images are included in the returned results for an unspecified interval after deregistration.

", - "DescribeInstanceAttribute": "

Describes the specified attribute of the specified instance. You can specify only one attribute at a time. Valid attribute values are: instanceType | kernel | ramdisk | userData | disableApiTermination | instanceInitiatedShutdownBehavior | rootDeviceName | blockDeviceMapping | productCodes | sourceDestCheck | groupSet | ebsOptimized | sriovNetSupport

", - "DescribeInstanceStatus": "

Describes the status of one or more instances, including any scheduled events.

Instance status has two main components:

  • System Status reports impaired functionality that stems from issues related to the systems that support an instance, such as such as hardware failures and network connectivity problems. This call reports such problems as impaired reachability.

  • Instance Status reports impaired functionality that arises from problems internal to the instance. This call reports such problems as impaired reachability.

Instance status provides information about four types of scheduled events for an instance that may require your attention:

  • Scheduled Reboot: When Amazon EC2 determines that an instance must be rebooted, the instances status returns one of two event codes: system-reboot or instance-reboot. System reboot commonly occurs if certain maintenance or upgrade operations require a reboot of the underlying host that supports an instance. Instance reboot commonly occurs if the instance must be rebooted, rather than the underlying host. Rebooting events include a scheduled start and end time.

  • System Maintenance: When Amazon EC2 determines that an instance requires maintenance that requires power or network impact, the instance status is the event code system-maintenance. System maintenance is either power maintenance or network maintenance. For power maintenance, your instance will be unavailable for a brief period of time and then rebooted. For network maintenance, your instance will experience a brief loss of network connectivity. System maintenance events include a scheduled start and end time. You will also be notified by email if one of your instances is set for system maintenance. The email message indicates when your instance is scheduled for maintenance.

  • Scheduled Retirement: When Amazon EC2 determines that an instance must be shut down, the instance status is the event code instance-retirement. Retirement commonly occurs when the underlying host is degraded and must be replaced. Retirement events include a scheduled start and end time. You will also be notified by email if one of your instances is set to retiring. The email message indicates when your instance will be permanently retired.

  • Scheduled Stop: When Amazon EC2 determines that an instance must be shut down, the instances status returns an event code called instance-stop. Stop events include a scheduled start and end time. You will also be notified by email if one of your instances is set to stop. The email message indicates when your instance will be stopped.

When your instance is retired, it will either be terminated (if its root device type is the instance-store) or stopped (if its root device type is an EBS volume). Instances stopped due to retirement will not be restarted, but you can do so manually. You can also avoid retirement of EBS-backed instances by manually restarting your instance when its event code is instance-retirement. This ensures that your instance is started on a different underlying host.

For more information about failed status checks, see Troubleshooting Instances with Failed Status Checks in the Amazon Elastic Compute Cloud User Guide for Linux. For more information about working with scheduled events, see Working with an Instance That Has a Scheduled Event in the Amazon Elastic Compute Cloud User Guide for Linux.

", - "DescribeInstances": "

Describes one or more of your instances.

If you specify one or more instance IDs, Amazon EC2 returns information for those instances. If you do not specify instance IDs, Amazon EC2 returns information for all relevant instances. If you specify an instance ID that is not valid, an error is returned. If you specify an instance that you do not own, it is not included in the returned results.

Recently terminated instances might appear in the returned results. This interval is usually less than one hour.

", - "DescribeInternetGateways": "

Describes one or more of your Internet gateways.

", - "DescribeKeyPairs": "

Describes one or more of your key pairs.

For more information about key pairs, see Key Pairs in the Amazon Elastic Compute Cloud User Guide for Linux.

", - "DescribeNetworkAcls": "

Describes one or more of your network ACLs.

For more information about network ACLs, see Network ACLs in the Amazon Virtual Private Cloud User Guide.

", - "DescribeNetworkInterfaceAttribute": "

Describes a network interface attribute. You can specify only one attribute at a time.

", - "DescribeNetworkInterfaces": "

Describes one or more of your network interfaces.

", - "DescribePlacementGroups": "

Describes one or more of your placement groups. For more information about placement groups and cluster instances, see Cluster Instances in the Amazon Elastic Compute Cloud User Guide for Linux.

", - "DescribeRegions": "

Describes one or more regions that are currently available to you.

For a list of the regions supported by Amazon EC2, see Regions and Endpoints.

", - "DescribeReservedInstances": "

Describes one or more of the Reserved Instances that you purchased.

For more information about Reserved Instances, see Reserved Instances in the Amazon Elastic Compute Cloud User Guide for Linux.

", - "DescribeReservedInstancesListings": "

Describes your account's Reserved Instance listings in the Reserved Instance Marketplace.

The Reserved Instance Marketplace matches sellers who want to resell Reserved Instance capacity that they no longer need with buyers who want to purchase additional capacity. Reserved Instances bought and sold through the Reserved Instance Marketplace work like any other Reserved Instances.

As a seller, you choose to list some or all of your Reserved Instances, and you specify the upfront price to receive for them. Your Reserved Instances are then listed in the Reserved Instance Marketplace and are available for purchase.

As a buyer, you specify the configuration of the Reserved Instance to purchase, and the Marketplace matches what you're searching for with what's available. The Marketplace first sells the lowest priced Reserved Instances to you, and continues to sell available Reserved Instance listings to you until your demand is met. You are charged based on the total price of all of the listings that you purchase.

For more information, see Reserved Instance Marketplace in the Amazon Elastic Compute Cloud User Guide for Linux.

", - "DescribeReservedInstancesModifications": "

Describes the modifications made to your Reserved Instances. If no parameter is specified, information about all your Reserved Instances modification requests is returned. If a modification ID is specified, only information about the specific modification is returned.

For more information, see Modifying Reserved Instances in the Amazon Elastic Compute Cloud User Guide for Linux.

", - "DescribeReservedInstancesOfferings": "

Describes Reserved Instance offerings that are available for purchase. With Reserved Instances, you purchase the right to launch instances for a period of time. During that time period, you do not receive insufficient capacity errors, and you pay a lower usage rate than the rate charged for On-Demand instances for the actual time used.

For more information, see Reserved Instance Marketplace in the Amazon Elastic Compute Cloud User Guide for Linux.

", - "DescribeRouteTables": "

Describes one or more of your route tables.

For more information about route tables, see Route Tables in the Amazon Virtual Private Cloud User Guide.

", - "DescribeSecurityGroups": "

Describes one or more of your security groups.

A security group is for use with instances either in the EC2-Classic platform or in a specific VPC. For more information, see Amazon EC2 Security Groups in the Amazon Elastic Compute Cloud User Guide for Linux and Security Groups for Your VPC in the Amazon Virtual Private Cloud User Guide.

", - "DescribeSnapshotAttribute": "

Describes the specified attribute of the specified snapshot. You can specify only one attribute at a time.

For more information about Amazon EBS snapshots, see Amazon EBS Snapshots in the Amazon Elastic Compute Cloud User Guide for Linux.

", - "DescribeSnapshots": "

Describes one or more of the Amazon EBS snapshots available to you. Available snapshots include public snapshots available for any AWS account to launch, private snapshots that you own, and private snapshots owned by another AWS account but for which you've been given explicit create volume permissions.

The create volume permissions fall into the following categories:

  • public: The owner of the snapshot granted create volume permissions for the snapshot to the all group. All AWS accounts have create volume permissions for these snapshots.
  • explicit: The owner of the snapshot granted create volume permissions to a specific AWS account.
  • implicit: An AWS account has implicit create volume permissions for all snapshots it owns.

The list of snapshots returned can be modified by specifying snapshot IDs, snapshot owners, or AWS accounts with create volume permissions. If no options are specified, Amazon EC2 returns all snapshots for which you have create volume permissions.

If you specify one or more snapshot IDs, only snapshots that have the specified IDs are returned. If you specify an invalid snapshot ID, an error is returned. If you specify a snapshot ID for which you do not have access, it is not included in the returned results.

If you specify one or more snapshot owners, only snapshots from the specified owners and for which you have access are returned. The results can include the AWS account IDs of the specified owners, amazon for snapshots owned by Amazon, or self for snapshots that you own.

If you specify a list of restorable users, only snapshots with create snapshot permissions for those users are returned. You can specify AWS account IDs (if you own the snapshots), self for snapshots for which you own or have explicit permissions, or all for public snapshots.

If you are describing a long list of snapshots, you can paginate the output to make the list more manageable. The MaxResults parameter sets the maximum number of results returned in a single page. If the list of results exceeds your MaxResults value, then that number of results is returned along with a NextToken value that can be passed to a subsequent DescribeSnapshots request to retrieve the remaining results.

For more information about Amazon EBS snapshots, see Amazon EBS Snapshots in the Amazon Elastic Compute Cloud User Guide for Linux.

", - "DescribeSpotDatafeedSubscription": "

Describes the data feed for Spot Instances. For more information, see Spot Instance Data Feed in the Amazon Elastic Compute Cloud User Guide for Linux.

", - "DescribeSpotInstanceRequests": "

Describes the Spot Instance requests that belong to your account. Spot Instances are instances that Amazon EC2 launches when the bid price that you specify exceeds the current Spot Price. Amazon EC2 periodically sets the Spot Price based on available Spot Instance capacity and current Spot Instance requests. For more information, see Spot Instance Requests in the Amazon Elastic Compute Cloud User Guide for Linux.

You can use DescribeSpotInstanceRequests to find a running Spot Instance by examining the response. If the status of the Spot Instance is fulfilled, the instance ID appears in the response and contains the identifier of the instance. Alternatively, you can use DescribeInstances with a filter to look for instances where the instance lifecycle is spot.

", - "DescribeSpotPriceHistory": "

Describes the Spot Price history. The prices returned are listed in chronological order, from the oldest to the most recent, for up to the past 90 days. For more information, see Spot Instance Pricing History in the Amazon Elastic Compute Cloud User Guide for Linux.

When you specify a start and end time, this operation returns the prices of the instance types within the time range that you specified and the time when the price changed. The price is valid within the time period that you specified; the response merely indicates the last time that the price changed.

", - "DescribeSubnets": "

Describes one or more of your subnets.

For more information about subnets, see Your VPC and Subnets in the Amazon Virtual Private Cloud User Guide.

", - "DescribeTags": "

Describes one or more of the tags for your EC2 resources.

For more information about tags, see Tagging Your Resources in the Amazon Elastic Compute Cloud User Guide for Linux.

", - "DescribeVolumeAttribute": "

Describes the specified attribute of the specified volume. You can specify only one attribute at a time.

For more information about Amazon EBS volumes, see Amazon EBS Volumes in the Amazon Elastic Compute Cloud User Guide for Linux.

", - "DescribeVolumeStatus": "

Describes the status of the specified volumes. Volume status provides the result of the checks performed on your volumes to determine events that can impair the performance of your volumes. The performance of a volume can be affected if an issue occurs on the volume's underlying host. If the volume's underlying host experiences a power outage or system issue, after the system is restored, there could be data inconsistencies on the volume. Volume events notify you if this occurs. Volume actions notify you if any action needs to be taken in response to the event.

The DescribeVolumeStatus operation provides the following information about the specified volumes:

Status: Reflects the current status of the volume. The possible values are ok, impaired , warning, or insufficient-data. If all checks pass, the overall status of the volume is ok. If the check fails, the overall status is impaired. If the status is insufficient-data, then the checks may still be taking place on your volume at the time. We recommend that you retry the request. For more information on volume status, see Monitoring the Status of Your Volumes.

Events: Reflect the cause of a volume status and may require you to take action. For example, if your volume returns an impaired status, then the volume event might be potential-data-inconsistency. This means that your volume has been affected by an issue with the underlying host, has all I/O operations disabled, and may have inconsistent data.

Actions: Reflect the actions you may have to take in response to an event. For example, if the status of the volume is impaired and the volume event shows potential-data-inconsistency, then the action shows enable-volume-io. This means that you may want to enable the I/O operations for the volume by calling the EnableVolumeIO action and then check the volume for data consistency.

Volume status is based on the volume status checks, and does not reflect the volume state. Therefore, volume status does not indicate volumes in the error state (for example, when a volume is incapable of accepting I/O.)

", - "DescribeVolumes": "

Describes the specified Amazon EBS volumes.

If you are describing a long list of volumes, you can paginate the output to make the list more manageable. The MaxResults parameter sets the maximum number of results returned in a single page. If the list of results exceeds your MaxResults value, then that number of results is returned along with a NextToken value that can be passed to a subsequent DescribeVolumes request to retrieve the remaining results.

For more information about Amazon EBS volumes, see Amazon EBS Volumes in the Amazon Elastic Compute Cloud User Guide for Linux.

", - "DescribeVpcAttribute": "

Describes the specified attribute of the specified VPC. You can specify only one attribute at a time.

", - "DescribeVpcClassicLink": "

Describes the ClassicLink status of one or more VPCs.

", - "DescribeVpcPeeringConnections": "

Describes one or more of your VPC peering connections.

", - "DescribeVpcs": "

Describes one or more of your VPCs.

", - "DescribeVpnConnections": "

Describes one or more of your VPN connections.

For more information about VPN connections, see Adding a Hardware Virtual Private Gateway to Your VPC in the Amazon Virtual Private Cloud User Guide.

", - "DescribeVpnGateways": "

Describes one or more of your virtual private gateways.

For more information about virtual private gateways, see Adding an IPsec Hardware VPN to Your VPC in the Amazon Virtual Private Cloud User Guide.

", - "DetachClassicLinkVpc": "

Unlinks (detaches) a linked EC2-Classic instance from a VPC. After the instance has been unlinked, the VPC security groups are no longer associated with it. An instance is automatically unlinked from a VPC when it's stopped.

", - "DetachInternetGateway": "

Detaches an Internet gateway from a VPC, disabling connectivity between the Internet and the VPC. The VPC must not contain any running instances with Elastic IP addresses.

", - "DetachNetworkInterface": "

Detaches a network interface from an instance.

", - "DetachVolume": "

Detaches an Amazon EBS volume from an instance. Make sure to unmount any file systems on the device within your operating system before detaching the volume. Failure to do so results in the volume being stuck in a busy state while detaching.

If an Amazon EBS volume is the root device of an instance, it can't be detached while the instance is running. To detach the root volume, stop the instance first.

When a volume with an AWS Marketplace product code is detached from an instance, the product code is no longer associated with the instance.

For more information, see Detaching an Amazon EBS Volume in the Amazon Elastic Compute Cloud User Guide for Linux.

", - "DetachVpnGateway": "

Detaches a virtual private gateway from a VPC. You do this if you're planning to turn off the VPC and not use it anymore. You can confirm a virtual private gateway has been completely detached from a VPC by describing the virtual private gateway (any attachments to the virtual private gateway are also described).

You must wait for the attachment's state to switch to detached before you can delete the VPC or attach a different VPC to the virtual private gateway.

", - "DisableVgwRoutePropagation": "

Disables a virtual private gateway (VGW) from propagating routes to a specified route table of a VPC.

", - "DisableVpcClassicLink": "

Disables ClassicLink for a VPC. You cannot disable ClassicLink for a VPC that has EC2-Classic instances linked to it.

", - "DisassociateAddress": "

Disassociates an Elastic IP address from the instance or network interface it's associated with.

An Elastic IP address is for use in either the EC2-Classic platform or in a VPC. For more information, see Elastic IP Addresses in the Amazon Elastic Compute Cloud User Guide for Linux.

This is an idempotent operation. If you perform the operation more than once, Amazon EC2 doesn't return an error.

", - "DisassociateRouteTable": "

Disassociates a subnet from a route table.

After you perform this action, the subnet no longer uses the routes in the route table. Instead, it uses the routes in the VPC's main route table. For more information about route tables, see Route Tables in the Amazon Virtual Private Cloud User Guide.

", - "EnableVgwRoutePropagation": "

Enables a virtual private gateway (VGW) to propagate routes to the specified route table of a VPC.

", - "EnableVolumeIO": "

Enables I/O operations for a volume that had I/O operations disabled because the data on the volume was potentially inconsistent.

", - "EnableVpcClassicLink": "

Enables a VPC for ClassicLink. You can then link EC2-Classic instances to your ClassicLink-enabled VPC to allow communication over private IP addresses. You cannot enable your VPC for ClassicLink if any of your VPC's route tables have existing routes for address ranges within the 10.0.0.0/8 IP address range, excluding local routes for VPCs in the 10.0.0.0/16 and 10.1.0.0/16 IP address ranges. For more information, see ClassicLink in the Amazon Elastic Compute Cloud User Guide for Linux.

", - "GetConsoleOutput": "

Gets the console output for the specified instance.

Instances do not have a physical monitor through which you can view their console output. They also lack physical controls that allow you to power up, reboot, or shut them down. To allow these actions, we provide them through the Amazon EC2 API and command line interface.

Instance console output is buffered and posted shortly after instance boot, reboot, and termination. Amazon EC2 preserves the most recent 64 KB output which is available for at least one hour after the most recent post.

For Linux instances, the instance console output displays the exact console output that would normally be displayed on a physical monitor attached to a computer. This output is buffered because the instance produces it and then posts it to a store where the instance's owner can retrieve it.

For Windows instances, the instance console output includes output from the EC2Config service.

", - "GetPasswordData": "

Retrieves the encrypted administrator password for an instance running Windows.

The Windows password is generated at boot if the EC2Config service plugin, Ec2SetPassword, is enabled. This usually only happens the first time an AMI is launched, and then Ec2SetPassword is automatically disabled. The password is not generated for rebundled AMIs unless Ec2SetPassword is enabled before bundling.

The password is encrypted using the key pair that you specified when you launched the instance. You must provide the corresponding key pair file.

Password generation and encryption takes a few moments. We recommend that you wait up to 15 minutes after launching an instance before trying to retrieve the generated password.

", - "ImportInstance": "

Creates an import instance task using metadata from the specified disk image. After importing the image, you then upload it using the ec2-import-volume command in the EC2 command line tools. For more information, see Using the Command Line Tools to Import Your Virtual Machine to Amazon EC2 in the Amazon Elastic Compute Cloud User Guide for Linux.

", - "ImportKeyPair": "

Imports the public key from an RSA key pair that you created with a third-party tool. Compare this with CreateKeyPair, in which AWS creates the key pair and gives the keys to you (AWS keeps a copy of the public key). With ImportKeyPair, you create the key pair and give AWS just the public key. The private key is never transferred between you and AWS.

For more information about key pairs, see Key Pairs in the Amazon Elastic Compute Cloud User Guide for Linux.

", - "ImportVolume": "

Creates an import volume task using metadata from the specified disk image. After importing the image, you then upload it using the ec2-import-volume command in the Amazon EC2 command-line interface (CLI) tools. For more information, see Using the Command Line Tools to Import Your Virtual Machine to Amazon EC2 in the Amazon Elastic Compute Cloud User Guide for Linux.

", - "ModifyImageAttribute": "

Modifies the specified attribute of the specified AMI. You can specify only one attribute at a time.

AWS Marketplace product codes cannot be modified. Images with an AWS Marketplace product code cannot be made public.

", - "ModifyInstanceAttribute": "

Modifies the specified attribute of the specified instance. You can specify only one attribute at a time.

To modify some attributes, the instance must be stopped. For more information, see Modifying Attributes of a Stopped Instance in the Amazon Elastic Compute Cloud User Guide for Linux.

", - "ModifyNetworkInterfaceAttribute": "

Modifies the specified network interface attribute. You can specify only one attribute at a time.

", - "ModifyReservedInstances": "

Modifies the Availability Zone, instance count, instance type, or network platform (EC2-Classic or EC2-VPC) of your Reserved Instances. The Reserved Instances to be modified must be identical, except for Availability Zone, network platform, and instance type.

For more information, see Modifying Reserved Instances in the Amazon Elastic Compute Cloud User Guide for Linux.

", - "ModifySnapshotAttribute": "

Adds or removes permission settings for the specified snapshot. You may add or remove specified AWS account IDs from a snapshot's list of create volume permissions, but you cannot do both in a single API call. If you need to both add and remove account IDs for a snapshot, you must use multiple API calls.

For more information on modifying snapshot permissions, see Sharing Snapshots in the Amazon Elastic Compute Cloud User Guide for Linux.

Snapshots with AWS Marketplace product codes cannot be made public.

", - "ModifySubnetAttribute": "

Modifies a subnet attribute.

", - "ModifyVolumeAttribute": "

Modifies a volume attribute.

By default, all I/O operations for the volume are suspended when the data on the volume is determined to be potentially inconsistent, to prevent undetectable, latent data corruption. The I/O access to the volume can be resumed by first enabling I/O access and then checking the data consistency on your volume.

You can change the default behavior to resume I/O operations. We recommend that you change this only for boot volumes or for volumes that are stateless or disposable.

", - "ModifyVpcAttribute": "

Modifies the specified attribute of the specified VPC.

", - "MonitorInstances": "

Enables monitoring for a running instance. For more information about monitoring instances, see Monitoring Your Instances and Volumes in the Amazon Elastic Compute Cloud User Guide for Linux.

", - "PurchaseReservedInstancesOffering": "

Purchases a Reserved Instance for use with your account. With Amazon EC2 Reserved Instances, you obtain a capacity reservation for a certain instance configuration over a specified period of time. You pay a lower usage rate than with On-Demand instances for the time that you actually use the capacity reservation.

Use DescribeReservedInstancesOfferings to get a list of Reserved Instance offerings that match your specifications. After you've purchased a Reserved Instance, you can check for your new Reserved Instance with DescribeReservedInstances.

For more information, see Reserved Instances and Reserved Instance Marketplace in the Amazon Elastic Compute Cloud User Guide for Linux.

", - "RebootInstances": "

Requests a reboot of one or more instances. This operation is asynchronous; it only queues a request to reboot the specified instances. The operation succeeds if the instances are valid and belong to you. Requests to reboot terminated instances are ignored.

If a Linux/Unix instance does not cleanly shut down within four minutes, Amazon EC2 performs a hard reboot.

For more information about troubleshooting, see Getting Console Output and Rebooting Instances in the Amazon Elastic Compute Cloud User Guide for Linux.

", - "RegisterImage": "

Registers an AMI. When you're creating an AMI, this is the final step you must complete before you can launch an instance from the AMI. For more information about creating AMIs, see Creating Your Own AMIs in the Amazon Elastic Compute Cloud User Guide for Linux.

For Amazon EBS-backed instances, CreateImage creates and registers the AMI in a single request, so you don't have to register the AMI yourself.

You can also use RegisterImage to create an Amazon EBS-backed AMI from a snapshot of a root device volume. For more information, see Launching an Instance from a Snapshot in the Amazon Elastic Compute Cloud User Guide for Linux.

If needed, you can deregister an AMI at any time. Any modifications you make to an AMI backed by an instance store volume invalidates its registration. If you make changes to an image, deregister the previous image and register the new image.

You can't register an image where a secondary (non-root) snapshot has AWS Marketplace product codes.

", - "RejectVpcPeeringConnection": "

Rejects a VPC peering connection request. The VPC peering connection must be in the pending-acceptance state. Use the DescribeVpcPeeringConnections request to view your outstanding VPC peering connection requests. To delete an active VPC peering connection, or to delete a VPC peering connection request that you initiated, use DeleteVpcPeeringConnection.

", - "ReleaseAddress": "

Releases the specified Elastic IP address.

After releasing an Elastic IP address, it is released to the IP address pool and might be unavailable to you. Be sure to update your DNS records and any servers or devices that communicate with the address. If you attempt to release an Elastic IP address that you already released, you'll get an AuthFailure error if the address is already allocated to another AWS account.

[EC2-Classic, default VPC] Releasing an Elastic IP address automatically disassociates it from any instance that it's associated with. To disassociate an Elastic IP address without releasing it, use DisassociateAddress.

[Nondefault VPC] You must use DisassociateAddress to disassociate the Elastic IP address before you try to release it. Otherwise, Amazon EC2 returns an error (InvalidIPAddress.InUse).

", - "ReplaceNetworkAclAssociation": "

Changes which network ACL a subnet is associated with. By default when you create a subnet, it's automatically associated with the default network ACL. For more information about network ACLs, see Network ACLs in the Amazon Virtual Private Cloud User Guide.

", - "ReplaceNetworkAclEntry": "

Replaces an entry (rule) in a network ACL. For more information about network ACLs, see Network ACLs in the Amazon Virtual Private Cloud User Guide.

", - "ReplaceRoute": "

Replaces an existing route within a route table in a VPC. You must provide only one of the following: Internet gateway or virtual private gateway, NAT instance, VPC peering connection, or network interface.

For more information about route tables, see Route Tables in the Amazon Virtual Private Cloud User Guide.

", - "ReplaceRouteTableAssociation": "

Changes the route table associated with a given subnet in a VPC. After the operation completes, the subnet uses the routes in the new route table it's associated with. For more information about route tables, see Route Tables in the Amazon Virtual Private Cloud User Guide.

You can also use ReplaceRouteTableAssociation to change which table is the main route table in the VPC. You just specify the main route table's association ID and the route table to be the new main route table.

", - "ReportInstanceStatus": "

Submits feedback about the status of an instance. The instance must be in the running state. If your experience with the instance differs from the instance status returned by DescribeInstanceStatus, use ReportInstanceStatus to report your experience with the instance. Amazon EC2 collects this information to improve the accuracy of status checks.

Use of this action does not change the value returned by DescribeInstanceStatus.

", - "RequestSpotInstances": "

Creates a Spot Instance request. Spot Instances are instances that Amazon EC2 launches when the bid price that you specify exceeds the current Spot Price. Amazon EC2 periodically sets the Spot Price based on available Spot Instance capacity and current Spot Instance requests. For more information, see Spot Instance Requests in the Amazon Elastic Compute Cloud User Guide for Linux.

", - "ResetImageAttribute": "

Resets an attribute of an AMI to its default value.

The productCodes attribute can't be reset.

", - "ResetInstanceAttribute": "

Resets an attribute of an instance to its default value. To reset the kernel or ramdisk, the instance must be in a stopped state. To reset the SourceDestCheck, the instance can be either running or stopped.

The SourceDestCheck attribute controls whether source/destination checking is enabled. The default value is true, which means checking is enabled. This value must be false for a NAT instance to perform NAT. For more information, see NAT Instances in the Amazon Virtual Private Cloud User Guide.

", - "ResetNetworkInterfaceAttribute": "

Resets a network interface attribute. You can specify only one attribute at a time.

", - "ResetSnapshotAttribute": "

Resets permission settings for the specified snapshot.

For more information on modifying snapshot permissions, see Sharing Snapshots in the Amazon Elastic Compute Cloud User Guide for Linux.

", - "RevokeSecurityGroupEgress": "

Removes one or more egress rules from a security group for EC2-VPC. The values that you specify in the revoke request (for example, ports) must match the existing rule's values for the rule to be revoked.

Each rule consists of the protocol and the CIDR range or source security group. For the TCP and UDP protocols, you must also specify the destination port or range of ports. For the ICMP protocol, you must also specify the ICMP type and code.

Rule changes are propagated to instances within the security group as quickly as possible. However, a small delay might occur.

", - "RevokeSecurityGroupIngress": "

Removes one or more ingress rules from a security group. The values that you specify in the revoke request (for example, ports) must match the existing rule's values for the rule to be removed.

Each rule consists of the protocol and the CIDR range or source security group. For the TCP and UDP protocols, you must also specify the destination port or range of ports. For the ICMP protocol, you must also specify the ICMP type and code.

Rule changes are propagated to instances within the security group as quickly as possible. However, a small delay might occur.

", - "RunInstances": "

Launches the specified number of instances using an AMI for which you have permissions.

When you launch an instance, it enters the pending state. After the instance is ready for you, it enters the running state. To check the state of your instance, call DescribeInstances.

If you don't specify a security group when launching an instance, Amazon EC2 uses the default security group. For more information, see Security Groups in the Amazon Elastic Compute Cloud User Guide for Linux.

Linux instances have access to the public key of the key pair at boot. You can use this key to provide secure access to the instance. Amazon EC2 public images use this feature to provide secure access without passwords. For more information, see Key Pairs in the Amazon Elastic Compute Cloud User Guide for Linux.

You can provide optional user data when launching an instance. For more information, see Instance Metadata in the Amazon Elastic Compute Cloud User Guide for Linux.

If any of the AMIs have a product code attached for which the user has not subscribed, RunInstances fails.

T2 instance types can only be launched into a VPC. If you do not have a default VPC, or if you do not specify a subnet ID in the request, RunInstances fails.

For more information about troubleshooting, see What To Do If An Instance Immediately Terminates, and Troubleshooting Connecting to Your Instance in the Amazon Elastic Compute Cloud User Guide for Linux.

", - "StartInstances": "

Starts an Amazon EBS-backed AMI that you've previously stopped.

Instances that use Amazon EBS volumes as their root devices can be quickly stopped and started. When an instance is stopped, the compute resources are released and you are not billed for hourly instance usage. However, your root partition Amazon EBS volume remains, continues to persist your data, and you are charged for Amazon EBS volume usage. You can restart your instance at any time. Each time you transition an instance from stopped to started, Amazon EC2 charges a full instance hour, even if transitions happen multiple times within a single hour.

Before stopping an instance, make sure it is in a state from which it can be restarted. Stopping an instance does not preserve data stored in RAM.

Performing this operation on an instance that uses an instance store as its root device returns an error.

For more information, see Stopping Instances in the Amazon Elastic Compute Cloud User Guide for Linux.

", - "StopInstances": "

Stops an Amazon EBS-backed instance. Each time you transition an instance from stopped to started, Amazon EC2 charges a full instance hour, even if transitions happen multiple times within a single hour.

You can't start or stop Spot Instances.

Instances that use Amazon EBS volumes as their root devices can be quickly stopped and started. When an instance is stopped, the compute resources are released and you are not billed for hourly instance usage. However, your root partition Amazon EBS volume remains, continues to persist your data, and you are charged for Amazon EBS volume usage. You can restart your instance at any time.

Before stopping an instance, make sure it is in a state from which it can be restarted. Stopping an instance does not preserve data stored in RAM.

Performing this operation on an instance that uses an instance store as its root device returns an error.

You can stop, start, and terminate EBS-backed instances. You can only terminate instance store-backed instances. What happens to an instance differs if you stop it or terminate it. For example, when you stop an instance, the root device and any other devices attached to the instance persist. When you terminate an instance, the root device and any other devices attached during the instance launch are automatically deleted. For more information about the differences between stopping and terminating instances, see Instance Lifecycle in the Amazon Elastic Compute Cloud User Guide for Linux.

For more information about troubleshooting, see Troubleshooting Stopping Your Instance in the Amazon Elastic Compute Cloud User Guide for Linux.

", - "TerminateInstances": "

Shuts down one or more instances. This operation is idempotent; if you terminate an instance more than once, each call succeeds.

Terminated instances remain visible after termination (for approximately one hour).

By default, Amazon EC2 deletes all Amazon EBS volumes that were attached when the instance launched. Volumes attached after instance launch continue running.

You can stop, start, and terminate EBS-backed instances. You can only terminate instance store-backed instances. What happens to an instance differs if you stop it or terminate it. For example, when you stop an instance, the root device and any other devices attached to the instance persist. When you terminate an instance, the root device and any other devices attached during the instance launch are automatically deleted. For more information about the differences between stopping and terminating instances, see Instance Lifecycle in the Amazon Elastic Compute Cloud User Guide for Linux.

For more information about troubleshooting, see Troubleshooting Terminating Your Instance in the Amazon Elastic Compute Cloud User Guide for Linux.

", - "UnassignPrivateIpAddresses": "

Unassigns one or more secondary private IP addresses from a network interface.

", - "UnmonitorInstances": "

Disables monitoring for a running instance. For more information about monitoring instances, see Monitoring Your Instances and Volumes in the Amazon Elastic Compute Cloud User Guide for Linux.

" - }, - "service": "Amazon Elastic Compute Cloud

Amazon Elastic Compute Cloud (Amazon EC2) provides resizable computing capacity in the Amazon Web Services (AWS) cloud. Using Amazon EC2 eliminates your need to invest in hardware up front, so you can develop and deploy applications faster.

", - "shapes": { - "AcceptVpcPeeringConnectionRequest": { - "base": null, - "refs": { - } - }, - "AcceptVpcPeeringConnectionResult": { - "base": null, - "refs": { - } - }, - "AccountAttribute": { - "base": "

Describes an account attribute.

", - "refs": { - "AccountAttributeList$member": null - } - }, - "AccountAttributeList": { - "base": null, - "refs": { - "DescribeAccountAttributesResult$AccountAttributes": "

Information about one or more account attributes.

" - } - }, - "AccountAttributeName": { - "base": null, - "refs": { - "AccountAttributeNameStringList$member": null - } - }, - "AccountAttributeNameStringList": { - "base": null, - "refs": { - "DescribeAccountAttributesRequest$AttributeNames": "

One or more account attribute names.

" - } - }, - "AccountAttributeValue": { - "base": "

Describes a value of an account attribute.

", - "refs": { - "AccountAttributeValueList$member": null - } - }, - "AccountAttributeValueList": { - "base": null, - "refs": { - "AccountAttribute$AttributeValues": "

One or more values for the account attribute.

" - } - }, - "Address": { - "base": "

Describes an Elastic IP address.

", - "refs": { - "AddressList$member": null - } - }, - "AddressList": { - "base": null, - "refs": { - "DescribeAddressesResult$Addresses": "

Information about one or more Elastic IP addresses.

" - } - }, - "AllocateAddressRequest": { - "base": null, - "refs": { - } - }, - "AllocateAddressResult": { - "base": null, - "refs": { - } - }, - "AllocationIdList": { - "base": null, - "refs": { - "DescribeAddressesRequest$AllocationIds": "

[EC2-VPC] One or more allocation IDs.

Default: Describes all your Elastic IP addresses.

" - } - }, - "ArchitectureValues": { - "base": null, - "refs": { - "Image$Architecture": "

The architecture of the image.

", - "ImportInstanceLaunchSpecification$Architecture": "

The architecture of the instance.

", - "Instance$Architecture": "

The architecture of the image.

", - "RegisterImageRequest$Architecture": "

The architecture of the AMI.

Default: For Amazon EBS-backed AMIs, i386. For instance store-backed AMIs, the architecture specified in the manifest file.

" - } - }, - "AssignPrivateIpAddressesRequest": { - "base": null, - "refs": { - } - }, - "AssociateAddressRequest": { - "base": null, - "refs": { - } - }, - "AssociateAddressResult": { - "base": null, - "refs": { - } - }, - "AssociateDhcpOptionsRequest": { - "base": null, - "refs": { - } - }, - "AssociateRouteTableRequest": { - "base": null, - "refs": { - } - }, - "AssociateRouteTableResult": { - "base": null, - "refs": { - } - }, - "AttachClassicLinkVpcRequest": { - "base": null, - "refs": { - } - }, - "AttachClassicLinkVpcResult": { - "base": null, - "refs": { - } - }, - "AttachInternetGatewayRequest": { - "base": null, - "refs": { - } - }, - "AttachNetworkInterfaceRequest": { - "base": null, - "refs": { - } - }, - "AttachNetworkInterfaceResult": { - "base": null, - "refs": { - } - }, - "AttachVolumeRequest": { - "base": null, - "refs": { - } - }, - "AttachVpnGatewayRequest": { - "base": null, - "refs": { - } - }, - "AttachVpnGatewayResult": { - "base": null, - "refs": { - } - }, - "AttachmentStatus": { - "base": null, - "refs": { - "EbsInstanceBlockDevice$Status": "

The attachment state.

", - "InstanceNetworkInterfaceAttachment$Status": "

The attachment state.

", - "InternetGatewayAttachment$State": "

The current state of the attachment.

", - "NetworkInterfaceAttachment$Status": "

The attachment state.

", - "VpcAttachment$State": "

The current state of the attachment.

" - } - }, - "AttributeBooleanValue": { - "base": "

The value to use when a resource attribute accepts a Boolean value.

", - "refs": { - "DescribeNetworkInterfaceAttributeResult$SourceDestCheck": "

Indicates whether source/destination checking is enabled.

", - "DescribeVolumeAttributeResult$AutoEnableIO": "

The state of autoEnableIO attribute.

", - "DescribeVpcAttributeResult$EnableDnsSupport": "

Indicates whether DNS resolution is enabled for the VPC. If this attribute is true, the Amazon DNS server resolves DNS hostnames for your instances to their corresponding IP addresses; otherwise, it does not.

", - "DescribeVpcAttributeResult$EnableDnsHostnames": "

Indicates whether the instances launched in the VPC get DNS hostnames. If this attribute is true, instances in the VPC get DNS hostnames; otherwise, they do not.

", - "InstanceAttribute$DisableApiTermination": "

If the value is true, you can't terminate the instance through the Amazon EC2 console, CLI, or API; otherwise, you can.

", - "InstanceAttribute$EbsOptimized": "

Indicates whether the instance is optimized for EBS I/O.

", - "InstanceAttribute$SourceDestCheck": "

Indicates whether source/destination checking is enabled. A value of true means checking is enabled, and false means checking is disabled. This value must be false for a NAT instance to perform NAT.

", - "ModifyInstanceAttributeRequest$SourceDestCheck": "

Specifies whether source/destination checking is enabled. A value of true means that checking is enabled, and false means checking is disabled. This value must be false for a NAT instance to perform NAT.

", - "ModifyInstanceAttributeRequest$DisableApiTermination": "

If the value is true, you can't terminate the instance using the Amazon EC2 console, CLI, or API; otherwise, you can.

", - "ModifyInstanceAttributeRequest$EbsOptimized": "

Specifies whether the instance is optimized for EBS I/O. This optimization provides dedicated throughput to Amazon EBS and an optimized configuration stack to provide optimal EBS I/O performance. This optimization isn't available with all instance types. Additional usage charges apply when using an EBS Optimized instance.

", - "ModifyNetworkInterfaceAttributeRequest$SourceDestCheck": "

Indicates whether source/destination checking is enabled. A value of true means checking is enabled, and false means checking is disabled. This value must be false for a NAT instance to perform NAT. For more information, see NAT Instances in the Amazon Virtual Private Cloud User Guide.

", - "ModifySubnetAttributeRequest$MapPublicIpOnLaunch": "

Specify true to indicate that instances launched into the specified subnet should be assigned public IP address.

", - "ModifyVolumeAttributeRequest$AutoEnableIO": "

Indicates whether the volume should be auto-enabled for I/O operations.

", - "ModifyVpcAttributeRequest$EnableDnsSupport": "

Indicates whether the DNS resolution is supported for the VPC. If enabled, queries to the Amazon provided DNS server at the 169.254.169.253 IP address, or the reserved IP address at the base of the VPC network range \"plus two\" will succeed. If disabled, the Amazon provided DNS service in the VPC that resolves public DNS hostnames to IP addresses is not enabled.

", - "ModifyVpcAttributeRequest$EnableDnsHostnames": "

Indicates whether the instances launched in the VPC get DNS hostnames. If enabled, instances in the VPC get DNS hostnames; otherwise, they do not.

You can only enable DNS hostnames if you also enable DNS support.

" - } - }, - "AttributeValue": { - "base": "

The value to use for a resource attribute.

", - "refs": { - "DescribeNetworkInterfaceAttributeResult$Description": "

The description of the network interface.

", - "ImageAttribute$KernelId": "

The kernel ID.

", - "ImageAttribute$RamdiskId": "

The RAM disk ID.

", - "ImageAttribute$Description": "

A description for the AMI.

", - "ImageAttribute$SriovNetSupport": null, - "InstanceAttribute$InstanceType": "

The instance type.

", - "InstanceAttribute$KernelId": "

The kernel ID.

", - "InstanceAttribute$RamdiskId": "

The RAM disk ID.

", - "InstanceAttribute$UserData": "

The Base64-encoded MIME user data.

", - "InstanceAttribute$InstanceInitiatedShutdownBehavior": "

Indicates whether an instance stops or terminates when you initiate shutdown from the instance (using the operating system command for system shutdown).

", - "InstanceAttribute$RootDeviceName": "

The name of the root device (for example, /dev/sda1 or /dev/xvda).

", - "InstanceAttribute$SriovNetSupport": null, - "ModifyImageAttributeRequest$Description": "

A description for the AMI.

", - "ModifyInstanceAttributeRequest$InstanceType": "

Changes the instance type to the specified value. For more information, see Instance Types. If the instance type is not valid, the error returned is InvalidInstanceAttributeValue.

", - "ModifyInstanceAttributeRequest$Kernel": "

Changes the instance's kernel to the specified value. We recommend that you use PV-GRUB instead of kernels and RAM disks. For more information, see PV-GRUB.

", - "ModifyInstanceAttributeRequest$Ramdisk": "

Changes the instance's RAM disk to the specified value. We recommend that you use PV-GRUB instead of kernels and RAM disks. For more information, see PV-GRUB.

", - "ModifyInstanceAttributeRequest$InstanceInitiatedShutdownBehavior": "

Specifies whether an instance stops or terminates when you initiate shutdown from the instance (using the operating system command for system shutdown).

", - "ModifyInstanceAttributeRequest$SriovNetSupport": "

Set to simple to enable enhanced networking for the instance.

There is no way to disable enhanced networking at this time.

This option is supported only for HVM instances. Specifying this option with a PV instance can make it unreachable.

", - "ModifyNetworkInterfaceAttributeRequest$Description": "

A description for the network interface.

", - "DhcpConfigurationValueList$member": null - } - }, - "AuthorizeSecurityGroupEgressRequest": { - "base": null, - "refs": { - } - }, - "AuthorizeSecurityGroupIngressRequest": { - "base": null, - "refs": { - } - }, - "AvailabilityZone": { - "base": "

Describes an Availability Zone.

", - "refs": { - "AvailabilityZoneList$member": null - } - }, - "AvailabilityZoneList": { - "base": null, - "refs": { - "DescribeAvailabilityZonesResult$AvailabilityZones": "

Information about one or more Availability Zones.

" - } - }, - "AvailabilityZoneMessage": { - "base": "

Describes a message about an Availability Zone.

", - "refs": { - "AvailabilityZoneMessageList$member": null - } - }, - "AvailabilityZoneMessageList": { - "base": null, - "refs": { - "AvailabilityZone$Messages": "

Any messages about the Availability Zone.

" - } - }, - "AvailabilityZoneState": { - "base": null, - "refs": { - "AvailabilityZone$State": "

The state of the Availability Zone (available | impaired | unavailable).

" - } - }, - "BlockDeviceMapping": { - "base": "

Describes a block device mapping.

", - "refs": { - "BlockDeviceMappingList$member": null, - "BlockDeviceMappingRequestList$member": null - } - }, - "BlockDeviceMappingList": { - "base": null, - "refs": { - "Image$BlockDeviceMappings": "

Any block device mapping entries.

", - "ImageAttribute$BlockDeviceMappings": "

One or more block device mapping entries.

", - "LaunchSpecification$BlockDeviceMappings": "

One or more block device mapping entries.

", - "RequestSpotLaunchSpecification$BlockDeviceMappings": "

One or more block device mapping entries.

" - } - }, - "BlockDeviceMappingRequestList": { - "base": null, - "refs": { - "CreateImageRequest$BlockDeviceMappings": "

Information about one or more block device mappings.

", - "RegisterImageRequest$BlockDeviceMappings": "

One or more block device mapping entries.

", - "RunInstancesRequest$BlockDeviceMappings": "

The block device mapping.

" - } - }, - "Boolean": { - "base": null, - "refs": { - "AcceptVpcPeeringConnectionRequest$DryRun": null, - "AllocateAddressRequest$DryRun": null, - "AssignPrivateIpAddressesRequest$AllowReassignment": "

Indicates whether to allow an IP address that is already assigned to another network interface or instance to be reassigned to the specified network interface.

", - "AssociateAddressRequest$DryRun": null, - "AssociateAddressRequest$AllowReassociation": "

[EC2-VPC] Allows an Elastic IP address that is already associated with an instance or network interface to be re-associated with the specified instance or network interface. Otherwise, the operation fails.

Default: false

", - "AssociateDhcpOptionsRequest$DryRun": null, - "AssociateRouteTableRequest$DryRun": null, - "AttachClassicLinkVpcRequest$DryRun": null, - "AttachClassicLinkVpcResult$Return": "

Returns true if the request succeeds; otherwise, it returns an error.

", - "AttachInternetGatewayRequest$DryRun": null, - "AttachNetworkInterfaceRequest$DryRun": null, - "AttachVolumeRequest$DryRun": null, - "AttachVpnGatewayRequest$DryRun": null, - "AttributeBooleanValue$Value": "

Valid values are true or false.

", - "AuthorizeSecurityGroupEgressRequest$DryRun": null, - "AuthorizeSecurityGroupIngressRequest$DryRun": null, - "BundleInstanceRequest$DryRun": null, - "CancelBundleTaskRequest$DryRun": null, - "CancelConversionRequest$DryRun": null, - "CancelSpotInstanceRequestsRequest$DryRun": null, - "ConfirmProductInstanceRequest$DryRun": null, - "CopyImageRequest$DryRun": null, - "CopySnapshotRequest$DryRun": null, - "CreateCustomerGatewayRequest$DryRun": null, - "CreateDhcpOptionsRequest$DryRun": null, - "CreateImageRequest$DryRun": null, - "CreateImageRequest$NoReboot": "

By default, this parameter is set to false, which means Amazon EC2 attempts to shut down the instance cleanly before image creation and then reboots the instance. When the parameter is set to true, Amazon EC2 doesn't shut down the instance before creating the image. When this option is used, file system integrity on the created image can't be guaranteed.

", - "CreateInternetGatewayRequest$DryRun": null, - "CreateKeyPairRequest$DryRun": null, - "CreateNetworkAclEntryRequest$DryRun": null, - "CreateNetworkAclEntryRequest$Egress": "

Indicates whether this is an egress rule (rule is applied to traffic leaving the subnet).

", - "CreateNetworkAclRequest$DryRun": null, - "CreateNetworkInterfaceRequest$DryRun": null, - "CreatePlacementGroupRequest$DryRun": null, - "CreateRouteRequest$DryRun": null, - "CreateRouteTableRequest$DryRun": null, - "CreateSecurityGroupRequest$DryRun": null, - "CreateSnapshotRequest$DryRun": null, - "CreateSpotDatafeedSubscriptionRequest$DryRun": null, - "CreateSubnetRequest$DryRun": null, - "CreateTagsRequest$DryRun": null, - "CreateVolumeRequest$DryRun": null, - "CreateVolumeRequest$Encrypted": "

Specifies whether the volume should be encrypted. Encrypted Amazon EBS volumes may only be attached to instances that support Amazon EBS encryption. Volumes that are created from encrypted snapshots are automatically encrypted. There is no way to create an encrypted volume from an unencrypted snapshot or vice versa. If your AMI uses encrypted volumes, you can only launch it on supported instance types. For more information, see Amazon EBS Encryption in the Amazon Elastic Compute Cloud User Guide for Linux.

", - "CreateVpcPeeringConnectionRequest$DryRun": null, - "CreateVpcRequest$DryRun": null, - "CreateVpnConnectionRequest$DryRun": null, - "CreateVpnGatewayRequest$DryRun": null, - "DeleteCustomerGatewayRequest$DryRun": null, - "DeleteDhcpOptionsRequest$DryRun": null, - "DeleteInternetGatewayRequest$DryRun": null, - "DeleteKeyPairRequest$DryRun": null, - "DeleteNetworkAclEntryRequest$DryRun": null, - "DeleteNetworkAclEntryRequest$Egress": "

Indicates whether the rule is an egress rule.

", - "DeleteNetworkAclRequest$DryRun": null, - "DeleteNetworkInterfaceRequest$DryRun": null, - "DeletePlacementGroupRequest$DryRun": null, - "DeleteRouteRequest$DryRun": null, - "DeleteRouteTableRequest$DryRun": null, - "DeleteSecurityGroupRequest$DryRun": null, - "DeleteSnapshotRequest$DryRun": null, - "DeleteSpotDatafeedSubscriptionRequest$DryRun": null, - "DeleteSubnetRequest$DryRun": null, - "DeleteTagsRequest$DryRun": null, - "DeleteVolumeRequest$DryRun": null, - "DeleteVpcPeeringConnectionRequest$DryRun": null, - "DeleteVpcPeeringConnectionResult$Return": "

Returns true if the request succeeds; otherwise, it returns an error.

", - "DeleteVpcRequest$DryRun": null, - "DeleteVpnConnectionRequest$DryRun": null, - "DeleteVpnGatewayRequest$DryRun": null, - "DeregisterImageRequest$DryRun": null, - "DescribeAccountAttributesRequest$DryRun": null, - "DescribeAddressesRequest$DryRun": null, - "DescribeAvailabilityZonesRequest$DryRun": null, - "DescribeBundleTasksRequest$DryRun": null, - "DescribeClassicLinkInstancesRequest$DryRun": null, - "DescribeConversionTasksRequest$DryRun": null, - "DescribeCustomerGatewaysRequest$DryRun": null, - "DescribeDhcpOptionsRequest$DryRun": null, - "DescribeImageAttributeRequest$DryRun": null, - "DescribeImagesRequest$DryRun": null, - "DescribeInstanceAttributeRequest$DryRun": null, - "DescribeInstanceStatusRequest$DryRun": null, - "DescribeInstanceStatusRequest$IncludeAllInstances": "

When true, includes the health status for all instances. When false, includes the health status for running instances only.

Default: false

", - "DescribeInstancesRequest$DryRun": null, - "DescribeInternetGatewaysRequest$DryRun": null, - "DescribeKeyPairsRequest$DryRun": null, - "DescribeNetworkAclsRequest$DryRun": null, - "DescribeNetworkInterfaceAttributeRequest$DryRun": null, - "DescribeNetworkInterfacesRequest$DryRun": null, - "DescribePlacementGroupsRequest$DryRun": null, - "DescribeRegionsRequest$DryRun": null, - "DescribeReservedInstancesOfferingsRequest$DryRun": null, - "DescribeReservedInstancesOfferingsRequest$IncludeMarketplace": "

Include Marketplace offerings in the response.

", - "DescribeReservedInstancesRequest$DryRun": null, - "DescribeRouteTablesRequest$DryRun": null, - "DescribeSecurityGroupsRequest$DryRun": null, - "DescribeSnapshotAttributeRequest$DryRun": null, - "DescribeSnapshotsRequest$DryRun": null, - "DescribeSpotDatafeedSubscriptionRequest$DryRun": null, - "DescribeSpotInstanceRequestsRequest$DryRun": null, - "DescribeSpotPriceHistoryRequest$DryRun": null, - "DescribeSubnetsRequest$DryRun": null, - "DescribeTagsRequest$DryRun": null, - "DescribeVolumeAttributeRequest$DryRun": null, - "DescribeVolumeStatusRequest$DryRun": null, - "DescribeVolumesRequest$DryRun": null, - "DescribeVpcAttributeRequest$DryRun": null, - "DescribeVpcClassicLinkRequest$DryRun": null, - "DescribeVpcPeeringConnectionsRequest$DryRun": null, - "DescribeVpcsRequest$DryRun": null, - "DescribeVpnConnectionsRequest$DryRun": null, - "DescribeVpnGatewaysRequest$DryRun": null, - "DetachClassicLinkVpcRequest$DryRun": null, - "DetachClassicLinkVpcResult$Return": "

Returns true if the request succeeds; otherwise, it returns an error.

", - "DetachInternetGatewayRequest$DryRun": null, - "DetachNetworkInterfaceRequest$DryRun": null, - "DetachNetworkInterfaceRequest$Force": "

Specifies whether to force a detachment.

", - "DetachVolumeRequest$DryRun": null, - "DetachVolumeRequest$Force": "

Forces detachment if the previous detachment attempt did not occur cleanly (for example, logging into an instance, unmounting the volume, and detaching normally). This option can lead to data loss or a corrupted file system. Use this option only as a last resort to detach a volume from a failed instance. The instance won't have an opportunity to flush file system caches or file system metadata. If you use this option, you must perform file system check and repair procedures.

", - "DetachVpnGatewayRequest$DryRun": null, - "DisableVpcClassicLinkRequest$DryRun": null, - "DisableVpcClassicLinkResult$Return": "

Returns true if the request succeeds; otherwise, it returns an error.

", - "DisassociateAddressRequest$DryRun": null, - "DisassociateRouteTableRequest$DryRun": null, - "EbsBlockDevice$DeleteOnTermination": "

Indicates whether the Amazon EBS volume is deleted on instance termination.

", - "EbsBlockDevice$Encrypted": "

Indicates whether the Amazon EBS volume is encrypted. Encrypted Amazon EBS volumes may only be attached to instances that support Amazon EBS encryption.

", - "EbsInstanceBlockDevice$DeleteOnTermination": "

Indicates whether the volume is deleted on instance termination.

", - "EbsInstanceBlockDeviceSpecification$DeleteOnTermination": "

Indicates whether the volume is deleted on instance termination.

", - "EnableVolumeIORequest$DryRun": null, - "EnableVpcClassicLinkRequest$DryRun": null, - "EnableVpcClassicLinkResult$Return": "

Returns true if the request succeeds; otherwise, it returns an error.

", - "GetConsoleOutputRequest$DryRun": null, - "GetPasswordDataRequest$DryRun": null, - "Image$Public": "

Indicates whether the image has public launch permissions. The value is true if this image has public launch permissions or false if it has only implicit and explicit launch permissions.

", - "ImportInstanceLaunchSpecification$Monitoring": null, - "ImportInstanceRequest$DryRun": null, - "ImportKeyPairRequest$DryRun": null, - "ImportVolumeRequest$DryRun": null, - "Instance$SourceDestCheck": "

Specifies whether to enable an instance launched in a VPC to perform NAT. This controls whether source/destination checking is enabled on the instance. A value of true means checking is enabled, and false means checking is disabled. The value must be false for the instance to perform NAT. For more information, see NAT Instances in the Amazon Virtual Private Cloud User Guide.

", - "Instance$EbsOptimized": "

Indicates whether the instance is optimized for EBS I/O. This optimization provides dedicated throughput to Amazon EBS and an optimized configuration stack to provide optimal I/O performance. This optimization isn't available with all instance types. Additional usage charges apply when using an EBS Optimized instance.

", - "InstanceNetworkInterface$SourceDestCheck": "

Indicates whether to validate network traffic to or from this network interface.

", - "InstanceNetworkInterfaceAttachment$DeleteOnTermination": "

Indicates whether the network interface is deleted when the instance is terminated.

", - "InstanceNetworkInterfaceSpecification$DeleteOnTermination": "

If set to true, the interface is deleted when the instance is terminated. You can specify true only if creating a new network interface when launching an instance.

", - "InstanceNetworkInterfaceSpecification$AssociatePublicIpAddress": "

Indicates whether to assign a public IP address to an instance you launch in a VPC. The public IP address can only be assigned to a network interface for eth0, and can only be assigned to a new network interface, not an existing one. You cannot specify more than one network interface in the request. If launching into a default subnet, the default value is true.

", - "InstancePrivateIpAddress$Primary": "

Indicates whether this IP address is the primary private IP address of the network interface.

", - "LaunchSpecification$EbsOptimized": "

Indicates whether the instance is optimized for EBS I/O. This optimization provides dedicated throughput to Amazon EBS and an optimized configuration stack to provide optimal EBS I/O performance. This optimization isn't available with all instance types. Additional usage charges apply when using an EBS Optimized instance.

Default: false

", - "ModifyImageAttributeRequest$DryRun": null, - "ModifyInstanceAttributeRequest$DryRun": null, - "ModifyNetworkInterfaceAttributeRequest$DryRun": null, - "ModifySnapshotAttributeRequest$DryRun": null, - "ModifyVolumeAttributeRequest$DryRun": null, - "MonitorInstancesRequest$DryRun": null, - "NetworkAcl$IsDefault": "

Indicates whether this is the default network ACL for the VPC.

", - "NetworkAclEntry$Egress": "

Indicates whether the rule is an egress rule (applied to traffic leaving the subnet).

", - "NetworkInterface$RequesterManaged": "

Indicates whether the network interface is being managed by AWS.

", - "NetworkInterface$SourceDestCheck": "

Indicates whether traffic to or from the instance is validated.

", - "NetworkInterfaceAttachment$DeleteOnTermination": "

Indicates whether the network interface is deleted when the instance is terminated.

", - "NetworkInterfaceAttachmentChanges$DeleteOnTermination": "

Indicates whether the network interface is deleted when the instance is terminated.

", - "NetworkInterfacePrivateIpAddress$Primary": "

Indicates whether this IP address is the primary private IP address of the network interface.

", - "PriceSchedule$Active": "

The current price schedule, as determined by the term remaining for the Reserved Instance in the listing.

A specific price schedule is always in effect, but only one price schedule can be active at any time. Take, for example, a Reserved Instance listing that has five months remaining in its term. When you specify price schedules for five months and two months, this means that schedule 1, covering the first three months of the remaining term, will be active during months 5, 4, and 3. Then schedule 2, covering the last two months of the term, will be active for months 2 and 1.

", - "PrivateIpAddressSpecification$Primary": "

Indicates whether the private IP address is the primary private IP address. Only one IP address can be designated as primary.

", - "PurchaseReservedInstancesOfferingRequest$DryRun": null, - "RebootInstancesRequest$DryRun": null, - "RegisterImageRequest$DryRun": null, - "RejectVpcPeeringConnectionRequest$DryRun": null, - "RejectVpcPeeringConnectionResult$Return": "

Returns true if the request succeeds; otherwise, it returns an error.

", - "ReleaseAddressRequest$DryRun": null, - "ReplaceNetworkAclAssociationRequest$DryRun": null, - "ReplaceNetworkAclEntryRequest$DryRun": null, - "ReplaceNetworkAclEntryRequest$Egress": "

Indicates whether to replace the egress rule.

Default: If no value is specified, we replace the ingress rule.

", - "ReplaceRouteRequest$DryRun": null, - "ReplaceRouteTableAssociationRequest$DryRun": null, - "ReportInstanceStatusRequest$DryRun": null, - "RequestSpotInstancesRequest$DryRun": null, - "ReservedInstancesOffering$Marketplace": "

Indicates whether the offering is available through the Reserved Instance Marketplace (resale) or AWS. If it's a Reserved Instance Marketplace offering, this is true.

", - "ResetImageAttributeRequest$DryRun": null, - "ResetInstanceAttributeRequest$DryRun": null, - "ResetNetworkInterfaceAttributeRequest$DryRun": null, - "ResetSnapshotAttributeRequest$DryRun": null, - "RevokeSecurityGroupEgressRequest$DryRun": null, - "RevokeSecurityGroupIngressRequest$DryRun": null, - "RouteTableAssociation$Main": "

Indicates whether this is the main route table.

", - "RunInstancesMonitoringEnabled$Enabled": "

Indicates whether monitoring is enabled for the instance.

", - "RunInstancesRequest$DryRun": null, - "RunInstancesRequest$DisableApiTermination": "

If you set this parameter to true, you can't terminate the instance using the Amazon EC2 console, CLI, or API; otherwise, you can. If you set this parameter to true and then later want to be able to terminate the instance, you must first change the value of the disableApiTermination attribute to false using ModifyInstanceAttribute. Alternatively, if you set InstanceInitiatedShutdownBehavior to terminate, you can terminate the instance by running the shutdown command from the instance.

Default: false

", - "RunInstancesRequest$EbsOptimized": "

Indicates whether the instance is optimized for EBS I/O. This optimization provides dedicated throughput to Amazon EBS and an optimized configuration stack to provide optimal Amazon EBS I/O performance. This optimization isn't available with all instance types. Additional usage charges apply when using an EBS-optimized instance.

Default: false

", - "Snapshot$Encrypted": "

Indicates whether the snapshot is encrypted.

", - "StartInstancesRequest$DryRun": null, - "StopInstancesRequest$DryRun": null, - "StopInstancesRequest$Force": "

Forces the instances to stop. The instances do not have an opportunity to flush file system caches or file system metadata. If you use this option, you must perform file system check and repair procedures. This option is not recommended for Windows instances.

Default: false

", - "Subnet$DefaultForAz": "

Indicates whether this is the default subnet for the Availability Zone.

", - "Subnet$MapPublicIpOnLaunch": "

Indicates whether instances launched in this subnet receive a public IP address.

", - "TerminateInstancesRequest$DryRun": null, - "UnmonitorInstancesRequest$DryRun": null, - "Volume$Encrypted": "

Indicates whether the volume will be encrypted.

", - "VolumeAttachment$DeleteOnTermination": "

Indicates whether the Amazon EBS volume is deleted on instance termination.

", - "Vpc$IsDefault": "

Indicates whether the VPC is the default VPC.

", - "VpcClassicLink$ClassicLinkEnabled": "

Indicates whether the VPC is enabled for ClassicLink.

", - "VpnConnectionOptions$StaticRoutesOnly": "

Indicates whether the VPN connection uses static routes only. Static routes must be used for devices that don't support BGP.

", - "VpnConnectionOptionsSpecification$StaticRoutesOnly": "

Indicates whether the VPN connection uses static routes only. Static routes must be used for devices that don't support BGP.

", - "RequestSpotLaunchSpecification$EbsOptimized": "

Indicates whether the instance is optimized for EBS I/O. This optimization provides dedicated throughput to Amazon EBS and an optimized configuration stack to provide optimal EBS I/O performance. This optimization isn't available with all instance types. Additional usage charges apply when using an EBS Optimized instance.

Default: false

" - } - }, - "BundleIdStringList": { - "base": null, - "refs": { - "DescribeBundleTasksRequest$BundleIds": "

One or more bundle task IDs.

Default: Describes all your bundle tasks.

" - } - }, - "BundleInstanceRequest": { - "base": null, - "refs": { - } - }, - "BundleInstanceResult": { - "base": null, - "refs": { - } - }, - "BundleTask": { - "base": "

Describes a bundle task.

", - "refs": { - "BundleInstanceResult$BundleTask": "

Information about the bundle task.

", - "BundleTaskList$member": null, - "CancelBundleTaskResult$BundleTask": "

The bundle task.

" - } - }, - "BundleTaskError": { - "base": "

Describes an error for BundleInstance.

", - "refs": { - "BundleTask$BundleTaskError": "

If the task fails, a description of the error.

" - } - }, - "BundleTaskList": { - "base": null, - "refs": { - "DescribeBundleTasksResult$BundleTasks": "

Information about one or more bundle tasks.

" - } - }, - "BundleTaskState": { - "base": null, - "refs": { - "BundleTask$State": "

The state of the task.

" - } - }, - "CancelBundleTaskRequest": { - "base": null, - "refs": { - } - }, - "CancelBundleTaskResult": { - "base": null, - "refs": { - } - }, - "CancelConversionRequest": { - "base": null, - "refs": { - } - }, - "CancelExportTaskRequest": { - "base": null, - "refs": { - } - }, - "CancelReservedInstancesListingRequest": { - "base": null, - "refs": { - } - }, - "CancelReservedInstancesListingResult": { - "base": null, - "refs": { - } - }, - "CancelSpotInstanceRequestState": { - "base": null, - "refs": { - "CancelledSpotInstanceRequest$State": "

The state of the Spot Instance request.

" - } - }, - "CancelSpotInstanceRequestsRequest": { - "base": null, - "refs": { - } - }, - "CancelSpotInstanceRequestsResult": { - "base": null, - "refs": { - } - }, - "CancelledSpotInstanceRequest": { - "base": "

Describes a request to cancel a Spot Instance.

", - "refs": { - "CancelledSpotInstanceRequestList$member": null - } - }, - "CancelledSpotInstanceRequestList": { - "base": null, - "refs": { - "CancelSpotInstanceRequestsResult$CancelledSpotInstanceRequests": "

One or more Spot Instance requests.

" - } - }, - "ClassicLinkInstance": { - "base": "

Describes a linked EC2-Classic instance.

", - "refs": { - "ClassicLinkInstanceList$member": null - } - }, - "ClassicLinkInstanceList": { - "base": null, - "refs": { - "DescribeClassicLinkInstancesResult$Instances": "

Information about one or more linked EC2-Classic instances.

" - } - }, - "ConfirmProductInstanceRequest": { - "base": null, - "refs": { - } - }, - "ConfirmProductInstanceResult": { - "base": null, - "refs": { - } - }, - "ContainerFormat": { - "base": null, - "refs": { - "ExportToS3Task$ContainerFormat": "

The container format used to combine disk images with metadata (such as OVF). If absent, only the disk image is exported.

", - "ExportToS3TaskSpecification$ContainerFormat": null - } - }, - "ConversionIdStringList": { - "base": null, - "refs": { - "DescribeConversionTasksRequest$ConversionTaskIds": "

One or more conversion task IDs.

" - } - }, - "ConversionTask": { - "base": "

Describes a conversion task.

", - "refs": { - "DescribeConversionTaskList$member": null, - "ImportInstanceResult$ConversionTask": null, - "ImportVolumeResult$ConversionTask": null - } - }, - "ConversionTaskState": { - "base": null, - "refs": { - "ConversionTask$State": "

The state of the conversion task.

" - } - }, - "CopyImageRequest": { - "base": null, - "refs": { - } - }, - "CopyImageResult": { - "base": null, - "refs": { - } - }, - "CopySnapshotRequest": { - "base": null, - "refs": { - } - }, - "CopySnapshotResult": { - "base": null, - "refs": { - } - }, - "CreateCustomerGatewayRequest": { - "base": null, - "refs": { - } - }, - "CreateCustomerGatewayResult": { - "base": null, - "refs": { - } - }, - "CreateDhcpOptionsRequest": { - "base": null, - "refs": { - } - }, - "CreateDhcpOptionsResult": { - "base": null, - "refs": { - } - }, - "CreateImageRequest": { - "base": null, - "refs": { - } - }, - "CreateImageResult": { - "base": null, - "refs": { - } - }, - "CreateInstanceExportTaskRequest": { - "base": null, - "refs": { - } - }, - "CreateInstanceExportTaskResult": { - "base": null, - "refs": { - } - }, - "CreateInternetGatewayRequest": { - "base": null, - "refs": { - } - }, - "CreateInternetGatewayResult": { - "base": null, - "refs": { - } - }, - "CreateKeyPairRequest": { - "base": null, - "refs": { - } - }, - "CreateNetworkAclEntryRequest": { - "base": null, - "refs": { - } - }, - "CreateNetworkAclRequest": { - "base": null, - "refs": { - } - }, - "CreateNetworkAclResult": { - "base": null, - "refs": { - } - }, - "CreateNetworkInterfaceRequest": { - "base": null, - "refs": { - } - }, - "CreateNetworkInterfaceResult": { - "base": null, - "refs": { - } - }, - "CreatePlacementGroupRequest": { - "base": null, - "refs": { - } - }, - "CreateReservedInstancesListingRequest": { - "base": null, - "refs": { - } - }, - "CreateReservedInstancesListingResult": { - "base": null, - "refs": { - } - }, - "CreateRouteRequest": { - "base": null, - "refs": { - } - }, - "CreateRouteTableRequest": { - "base": null, - "refs": { - } - }, - "CreateRouteTableResult": { - "base": null, - "refs": { - } - }, - "CreateSecurityGroupRequest": { - "base": null, - "refs": { - } - }, - "CreateSecurityGroupResult": { - "base": null, - "refs": { - } - }, - "CreateSnapshotRequest": { - "base": null, - "refs": { - } - }, - "CreateSpotDatafeedSubscriptionRequest": { - "base": null, - "refs": { - } - }, - "CreateSpotDatafeedSubscriptionResult": { - "base": null, - "refs": { - } - }, - "CreateSubnetRequest": { - "base": null, - "refs": { - } - }, - "CreateSubnetResult": { - "base": null, - "refs": { - } - }, - "CreateTagsRequest": { - "base": null, - "refs": { - } - }, - "CreateVolumePermission": { - "base": null, - "refs": { - "CreateVolumePermissionList$member": null - } - }, - "CreateVolumePermissionList": { - "base": null, - "refs": { - "CreateVolumePermissionModifications$Add": "

Adds a specific AWS account ID or group to a volume's list of create volume permissions.

", - "CreateVolumePermissionModifications$Remove": "

Removes a specific AWS account ID or group from a volume's list of create volume permissions.

", - "DescribeSnapshotAttributeResult$CreateVolumePermissions": "

A list of permissions for creating volumes from the snapshot.

" - } - }, - "CreateVolumePermissionModifications": { - "base": null, - "refs": { - "ModifySnapshotAttributeRequest$CreateVolumePermission": "

A JSON representation of the snapshot attribute modification.

" - } - }, - "CreateVolumeRequest": { - "base": null, - "refs": { - } - }, - "CreateVpcPeeringConnectionRequest": { - "base": null, - "refs": { - } - }, - "CreateVpcPeeringConnectionResult": { - "base": null, - "refs": { - } - }, - "CreateVpcRequest": { - "base": null, - "refs": { - } - }, - "CreateVpcResult": { - "base": null, - "refs": { - } - }, - "CreateVpnConnectionRequest": { - "base": null, - "refs": { - } - }, - "CreateVpnConnectionResult": { - "base": null, - "refs": { - } - }, - "CreateVpnConnectionRouteRequest": { - "base": null, - "refs": { - } - }, - "CreateVpnGatewayRequest": { - "base": null, - "refs": { - } - }, - "CreateVpnGatewayResult": { - "base": null, - "refs": { - } - }, - "CurrencyCodeValues": { - "base": null, - "refs": { - "PriceSchedule$CurrencyCode": "

The currency for transacting the Reserved Instance resale. At this time, the only supported currency is USD.

", - "PriceScheduleSpecification$CurrencyCode": "

The currency for transacting the Reserved Instance resale. At this time, the only supported currency is USD.

", - "ReservedInstanceLimitPrice$CurrencyCode": "

The currency in which the limitPrice amount is specified. At this time, the only supported currency is USD.

", - "ReservedInstances$CurrencyCode": "

The currency of the Reserved Instance. It's specified using ISO 4217 standard currency codes. At this time, the only supported currency is USD.

", - "ReservedInstancesOffering$CurrencyCode": "

The currency of the Reserved Instance offering you are purchasing. It's specified using ISO 4217 standard currency codes. At this time, the only supported currency is USD.

" - } - }, - "CustomerGateway": { - "base": "

Describes a customer gateway.

", - "refs": { - "CreateCustomerGatewayResult$CustomerGateway": "

Information about the customer gateway.

", - "CustomerGatewayList$member": null - } - }, - "CustomerGatewayIdStringList": { - "base": null, - "refs": { - "DescribeCustomerGatewaysRequest$CustomerGatewayIds": "

One or more customer gateway IDs.

Default: Describes all your customer gateways.

" - } - }, - "CustomerGatewayList": { - "base": null, - "refs": { - "DescribeCustomerGatewaysResult$CustomerGateways": "

Information about one or more customer gateways.

" - } - }, - "DatafeedSubscriptionState": { - "base": null, - "refs": { - "SpotDatafeedSubscription$State": "

The state of the Spot Instance data feed subscription.

" - } - }, - "DateTime": { - "base": null, - "refs": { - "BundleTask$StartTime": "

The time this task started.

", - "BundleTask$UpdateTime": "

The time of the most recent update for the task.

", - "DescribeSpotPriceHistoryRequest$StartTime": "

The date and time, up to the past 90 days, from which to start retrieving the price history data.

", - "DescribeSpotPriceHistoryRequest$EndTime": "

The date and time, up to the current date, from which to stop retrieving the price history data.

", - "EbsInstanceBlockDevice$AttachTime": "

The time stamp when the attachment initiated.

", - "GetConsoleOutputResult$Timestamp": "

The time the output was last updated.

", - "GetPasswordDataResult$Timestamp": "

The time the data was last updated.

", - "Instance$LaunchTime": "

The time the instance was launched.

", - "InstanceNetworkInterfaceAttachment$AttachTime": "

The time stamp when the attachment initiated.

", - "InstanceStatusDetails$ImpairedSince": "

The time when a status check failed. For an instance that was launched and impaired, this is the time when the instance was launched.

", - "InstanceStatusEvent$NotBefore": "

The earliest scheduled start time for the event.

", - "InstanceStatusEvent$NotAfter": "

The latest scheduled end time for the event.

", - "NetworkInterfaceAttachment$AttachTime": "

The timestamp indicating when the attachment initiated.

", - "ReportInstanceStatusRequest$StartTime": "

The time at which the reported instance health state began.

", - "ReportInstanceStatusRequest$EndTime": "

The time at which the reported instance health state ended.

", - "RequestSpotInstancesRequest$ValidFrom": "

The start date of the request. If this is a one-time request, the request becomes active at this date and time and remains active until all instances launch, the request expires, or the request is canceled. If the request is persistent, the request becomes active at this date and time and remains active until it expires or is canceled.

Default: The request is effective indefinitely.

", - "RequestSpotInstancesRequest$ValidUntil": "

The end date of the request. If this is a one-time request, the request remains active until all instances launch, the request is canceled, or this date is reached. If the request is persistent, it remains active until it is canceled or this date and time is reached.

Default: The request is effective indefinitely.

", - "ReservedInstances$Start": "

The date and time the Reserved Instance started.

", - "ReservedInstances$End": "

The time when the Reserved Instance expires.

", - "ReservedInstancesListing$CreateDate": "

The time the listing was created.

", - "ReservedInstancesListing$UpdateDate": "

The last modified timestamp of the listing.

", - "ReservedInstancesModification$CreateDate": "

The time when the modification request was created.

", - "ReservedInstancesModification$UpdateDate": "

The time when the modification request was last updated.

", - "ReservedInstancesModification$EffectiveDate": "

The time for the modification to become effective.

", - "Snapshot$StartTime": "

The time stamp when the snapshot was initiated.

", - "SpotInstanceRequest$ValidFrom": "

The start date of the request. If this is a one-time request, the request becomes active at this date and time and remains active until all instances launch, the request expires, or the request is canceled. If the request is persistent, the request becomes active at this date and time and remains active until it expires or is canceled.

", - "SpotInstanceRequest$ValidUntil": "

The end date of the request. If this is a one-time request, the request remains active until all instances launch, the request is canceled, or this date is reached. If the request is persistent, it remains active until it is canceled or this date is reached.

", - "SpotInstanceRequest$CreateTime": "

The time stamp when the Spot Instance request was created.

", - "SpotInstanceStatus$UpdateTime": "

The time of the most recent status update.

", - "SpotPrice$Timestamp": "

The date and time the request was created.

", - "VgwTelemetry$LastStatusChange": "

The date and time of the last change in status.

", - "Volume$CreateTime": "

The time stamp when volume creation was initiated.

", - "VolumeAttachment$AttachTime": "

The time stamp when the attachment initiated.

", - "VolumeStatusEvent$NotBefore": "

The earliest start time of the event.

", - "VolumeStatusEvent$NotAfter": "

The latest end time of the event.

", - "VpcPeeringConnection$ExpirationTime": "

The time that an unaccepted VPC peering connection will expire.

" - } - }, - "DeleteCustomerGatewayRequest": { - "base": null, - "refs": { - } - }, - "DeleteDhcpOptionsRequest": { - "base": null, - "refs": { - } - }, - "DeleteInternetGatewayRequest": { - "base": null, - "refs": { - } - }, - "DeleteKeyPairRequest": { - "base": null, - "refs": { - } - }, - "DeleteNetworkAclEntryRequest": { - "base": null, - "refs": { - } - }, - "DeleteNetworkAclRequest": { - "base": null, - "refs": { - } - }, - "DeleteNetworkInterfaceRequest": { - "base": null, - "refs": { - } - }, - "DeletePlacementGroupRequest": { - "base": null, - "refs": { - } - }, - "DeleteRouteRequest": { - "base": null, - "refs": { - } - }, - "DeleteRouteTableRequest": { - "base": null, - "refs": { - } - }, - "DeleteSecurityGroupRequest": { - "base": null, - "refs": { - } - }, - "DeleteSnapshotRequest": { - "base": null, - "refs": { - } - }, - "DeleteSpotDatafeedSubscriptionRequest": { - "base": null, - "refs": { - } - }, - "DeleteSubnetRequest": { - "base": null, - "refs": { - } - }, - "DeleteTagsRequest": { - "base": null, - "refs": { - } - }, - "DeleteVolumeRequest": { - "base": null, - "refs": { - } - }, - "DeleteVpcPeeringConnectionRequest": { - "base": null, - "refs": { - } - }, - "DeleteVpcPeeringConnectionResult": { - "base": null, - "refs": { - } - }, - "DeleteVpcRequest": { - "base": null, - "refs": { - } - }, - "DeleteVpnConnectionRequest": { - "base": null, - "refs": { - } - }, - "DeleteVpnConnectionRouteRequest": { - "base": null, - "refs": { - } - }, - "DeleteVpnGatewayRequest": { - "base": null, - "refs": { - } - }, - "DeregisterImageRequest": { - "base": null, - "refs": { - } - }, - "DescribeAccountAttributesRequest": { - "base": null, - "refs": { - } - }, - "DescribeAccountAttributesResult": { - "base": null, - "refs": { - } - }, - "DescribeAddressesRequest": { - "base": null, - "refs": { - } - }, - "DescribeAddressesResult": { - "base": null, - "refs": { - } - }, - "DescribeAvailabilityZonesRequest": { - "base": null, - "refs": { - } - }, - "DescribeAvailabilityZonesResult": { - "base": null, - "refs": { - } - }, - "DescribeBundleTasksRequest": { - "base": null, - "refs": { - } - }, - "DescribeBundleTasksResult": { - "base": null, - "refs": { - } - }, - "DescribeClassicLinkInstancesRequest": { - "base": null, - "refs": { - } - }, - "DescribeClassicLinkInstancesResult": { - "base": null, - "refs": { - } - }, - "DescribeConversionTaskList": { - "base": null, - "refs": { - "DescribeConversionTasksResult$ConversionTasks": null - } - }, - "DescribeConversionTasksRequest": { - "base": null, - "refs": { - } - }, - "DescribeConversionTasksResult": { - "base": null, - "refs": { - } - }, - "DescribeCustomerGatewaysRequest": { - "base": null, - "refs": { - } - }, - "DescribeCustomerGatewaysResult": { - "base": null, - "refs": { - } - }, - "DescribeDhcpOptionsRequest": { - "base": null, - "refs": { - } - }, - "DescribeDhcpOptionsResult": { - "base": null, - "refs": { - } - }, - "DescribeExportTasksRequest": { - "base": null, - "refs": { - } - }, - "DescribeExportTasksResult": { - "base": null, - "refs": { - } - }, - "DescribeImageAttributeRequest": { - "base": null, - "refs": { - } - }, - "DescribeImagesRequest": { - "base": null, - "refs": { - } - }, - "DescribeImagesResult": { - "base": null, - "refs": { - } - }, - "DescribeInstanceAttributeRequest": { - "base": null, - "refs": { - } - }, - "DescribeInstanceStatusRequest": { - "base": null, - "refs": { - } - }, - "DescribeInstanceStatusResult": { - "base": null, - "refs": { - } - }, - "DescribeInstancesRequest": { - "base": null, - "refs": { - } - }, - "DescribeInstancesResult": { - "base": null, - "refs": { - } - }, - "DescribeInternetGatewaysRequest": { - "base": null, - "refs": { - } - }, - "DescribeInternetGatewaysResult": { - "base": null, - "refs": { - } - }, - "DescribeKeyPairsRequest": { - "base": null, - "refs": { - } - }, - "DescribeKeyPairsResult": { - "base": null, - "refs": { - } - }, - "DescribeNetworkAclsRequest": { - "base": null, - "refs": { - } - }, - "DescribeNetworkAclsResult": { - "base": null, - "refs": { - } - }, - "DescribeNetworkInterfaceAttributeRequest": { - "base": null, - "refs": { - } - }, - "DescribeNetworkInterfaceAttributeResult": { - "base": null, - "refs": { - } - }, - "DescribeNetworkInterfacesRequest": { - "base": null, - "refs": { - } - }, - "DescribeNetworkInterfacesResult": { - "base": null, - "refs": { - } - }, - "DescribePlacementGroupsRequest": { - "base": null, - "refs": { - } - }, - "DescribePlacementGroupsResult": { - "base": null, - "refs": { - } - }, - "DescribeRegionsRequest": { - "base": null, - "refs": { - } - }, - "DescribeRegionsResult": { - "base": null, - "refs": { - } - }, - "DescribeReservedInstancesListingsRequest": { - "base": null, - "refs": { - } - }, - "DescribeReservedInstancesListingsResult": { - "base": null, - "refs": { - } - }, - "DescribeReservedInstancesModificationsRequest": { - "base": null, - "refs": { - } - }, - "DescribeReservedInstancesModificationsResult": { - "base": null, - "refs": { - } - }, - "DescribeReservedInstancesOfferingsRequest": { - "base": null, - "refs": { - } - }, - "DescribeReservedInstancesOfferingsResult": { - "base": null, - "refs": { - } - }, - "DescribeReservedInstancesRequest": { - "base": null, - "refs": { - } - }, - "DescribeReservedInstancesResult": { - "base": null, - "refs": { - } - }, - "DescribeRouteTablesRequest": { - "base": null, - "refs": { - } - }, - "DescribeRouteTablesResult": { - "base": null, - "refs": { - } - }, - "DescribeSecurityGroupsRequest": { - "base": null, - "refs": { - } - }, - "DescribeSecurityGroupsResult": { - "base": null, - "refs": { - } - }, - "DescribeSnapshotAttributeRequest": { - "base": null, - "refs": { - } - }, - "DescribeSnapshotAttributeResult": { - "base": null, - "refs": { - } - }, - "DescribeSnapshotsRequest": { - "base": null, - "refs": { - } - }, - "DescribeSnapshotsResult": { - "base": null, - "refs": { - } - }, - "DescribeSpotDatafeedSubscriptionRequest": { - "base": null, - "refs": { - } - }, - "DescribeSpotDatafeedSubscriptionResult": { - "base": null, - "refs": { - } - }, - "DescribeSpotInstanceRequestsRequest": { - "base": null, - "refs": { - } - }, - "DescribeSpotInstanceRequestsResult": { - "base": null, - "refs": { - } - }, - "DescribeSpotPriceHistoryRequest": { - "base": null, - "refs": { - } - }, - "DescribeSpotPriceHistoryResult": { - "base": null, - "refs": { - } - }, - "DescribeSubnetsRequest": { - "base": null, - "refs": { - } - }, - "DescribeSubnetsResult": { - "base": null, - "refs": { - } - }, - "DescribeTagsRequest": { - "base": null, - "refs": { - } - }, - "DescribeTagsResult": { - "base": null, - "refs": { - } - }, - "DescribeVolumeAttributeRequest": { - "base": null, - "refs": { - } - }, - "DescribeVolumeAttributeResult": { - "base": null, - "refs": { - } - }, - "DescribeVolumeStatusRequest": { - "base": null, - "refs": { - } - }, - "DescribeVolumeStatusResult": { - "base": null, - "refs": { - } - }, - "DescribeVolumesRequest": { - "base": null, - "refs": { - } - }, - "DescribeVolumesResult": { - "base": null, - "refs": { - } - }, - "DescribeVpcAttributeRequest": { - "base": null, - "refs": { - } - }, - "DescribeVpcAttributeResult": { - "base": null, - "refs": { - } - }, - "DescribeVpcClassicLinkRequest": { - "base": null, - "refs": { - } - }, - "DescribeVpcClassicLinkResult": { - "base": null, - "refs": { - } - }, - "DescribeVpcPeeringConnectionsRequest": { - "base": null, - "refs": { - } - }, - "DescribeVpcPeeringConnectionsResult": { - "base": null, - "refs": { - } - }, - "DescribeVpcsRequest": { - "base": null, - "refs": { - } - }, - "DescribeVpcsResult": { - "base": null, - "refs": { - } - }, - "DescribeVpnConnectionsRequest": { - "base": null, - "refs": { - } - }, - "DescribeVpnConnectionsResult": { - "base": null, - "refs": { - } - }, - "DescribeVpnGatewaysRequest": { - "base": null, - "refs": { - } - }, - "DescribeVpnGatewaysResult": { - "base": null, - "refs": { - } - }, - "DetachClassicLinkVpcRequest": { - "base": null, - "refs": { - } - }, - "DetachClassicLinkVpcResult": { - "base": null, - "refs": { - } - }, - "DetachInternetGatewayRequest": { - "base": null, - "refs": { - } - }, - "DetachNetworkInterfaceRequest": { - "base": null, - "refs": { - } - }, - "DetachVolumeRequest": { - "base": null, - "refs": { - } - }, - "DetachVpnGatewayRequest": { - "base": null, - "refs": { - } - }, - "DeviceType": { - "base": null, - "refs": { - "Image$RootDeviceType": "

The type of root device used by the AMI. The AMI can use an Amazon EBS volume or an instance store volume.

", - "Instance$RootDeviceType": "

The root device type used by the AMI. The AMI can use an Amazon EBS volume or an instance store volume.

" - } - }, - "DhcpConfiguration": { - "base": "

Describes a DHCP configuration option.

", - "refs": { - "DhcpConfigurationList$member": null - } - }, - "DhcpConfigurationList": { - "base": null, - "refs": { - "DhcpOptions$DhcpConfigurations": "

One or more DHCP options in the set.

" - } - }, - "DhcpOptions": { - "base": "

Describes a set of DHCP options.

", - "refs": { - "CreateDhcpOptionsResult$DhcpOptions": "

A set of DHCP options.

", - "DhcpOptionsList$member": null - } - }, - "DhcpOptionsIdStringList": { - "base": null, - "refs": { - "DescribeDhcpOptionsRequest$DhcpOptionsIds": "

The IDs of one or more DHCP options sets.

Default: Describes all your DHCP options sets.

" - } - }, - "DhcpOptionsList": { - "base": null, - "refs": { - "DescribeDhcpOptionsResult$DhcpOptions": "

Information about one or more DHCP options sets.

" - } - }, - "DisableVgwRoutePropagationRequest": { - "base": null, - "refs": { - } - }, - "DisableVpcClassicLinkRequest": { - "base": null, - "refs": { - } - }, - "DisableVpcClassicLinkResult": { - "base": null, - "refs": { - } - }, - "DisassociateAddressRequest": { - "base": null, - "refs": { - } - }, - "DisassociateRouteTableRequest": { - "base": null, - "refs": { - } - }, - "DiskImage": { - "base": "

Describes a disk image.

", - "refs": { - "DiskImageList$member": null - } - }, - "DiskImageDescription": { - "base": null, - "refs": { - "ImportInstanceVolumeDetailItem$Image": "

The image.

", - "ImportVolumeTaskDetails$Image": "

The image.

" - } - }, - "DiskImageDetail": { - "base": null, - "refs": { - "DiskImage$Image": null, - "ImportVolumeRequest$Image": null - } - }, - "DiskImageFormat": { - "base": null, - "refs": { - "DiskImageDescription$Format": "

The disk image format.

", - "DiskImageDetail$Format": "

The disk image format.

", - "ExportToS3Task$DiskImageFormat": "

The format for the exported image.

", - "ExportToS3TaskSpecification$DiskImageFormat": null - } - }, - "DiskImageList": { - "base": null, - "refs": { - "ImportInstanceRequest$DiskImages": null - } - }, - "DiskImageVolumeDescription": { - "base": null, - "refs": { - "ImportInstanceVolumeDetailItem$Volume": "

The volume.

", - "ImportVolumeTaskDetails$Volume": "

The volume.

" - } - }, - "DomainType": { - "base": null, - "refs": { - "Address$Domain": "

Indicates whether this Elastic IP address is for use with instances in EC2-Classic (standard) or instances in a VPC (vpc).

", - "AllocateAddressRequest$Domain": "

Set to vpc to allocate the address for use with instances in a VPC.

Default: The address is for use with instances in EC2-Classic.

", - "AllocateAddressResult$Domain": "

Indicates whether this Elastic IP address is for use with instances in EC2-Classic (standard) or instances in a VPC (vpc).

" - } - }, - "Double": { - "base": null, - "refs": { - "PriceSchedule$Price": "

The fixed price for the term.

", - "PriceScheduleSpecification$Price": "

The fixed price for the term.

", - "PricingDetail$Price": "

The price per instance.

", - "RecurringCharge$Amount": "

The amount of the recurring charge.

", - "ReservedInstanceLimitPrice$Amount": "

Used for Reserved Instance Marketplace offerings. Specifies the limit price on the total order (instanceCount * price).

" - } - }, - "EbsBlockDevice": { - "base": "

Describes an Amazon EBS block device.

", - "refs": { - "BlockDeviceMapping$Ebs": "

Parameters used to automatically set up Amazon EBS volumes when the instance is launched.

" - } - }, - "EbsInstanceBlockDevice": { - "base": "

Describes a parameter used to set up an Amazon EBS volume in a block device mapping.

", - "refs": { - "InstanceBlockDeviceMapping$Ebs": "

Parameters used to automatically set up Amazon EBS volumes when the instance is launched.

" - } - }, - "EbsInstanceBlockDeviceSpecification": { - "base": null, - "refs": { - "InstanceBlockDeviceMappingSpecification$Ebs": "

Parameters used to automatically set up Amazon EBS volumes when the instance is launched.

" - } - }, - "EnableVgwRoutePropagationRequest": { - "base": null, - "refs": { - } - }, - "EnableVolumeIORequest": { - "base": null, - "refs": { - } - }, - "EnableVpcClassicLinkRequest": { - "base": null, - "refs": { - } - }, - "EnableVpcClassicLinkResult": { - "base": null, - "refs": { - } - }, - "EventCode": { - "base": null, - "refs": { - "InstanceStatusEvent$Code": "

The associated code of the event.

" - } - }, - "ExecutableByStringList": { - "base": null, - "refs": { - "DescribeImagesRequest$ExecutableUsers": "

Scopes the images by users with explicit launch permissions. Specify an AWS account ID, self (the sender of the request), or all (public AMIs).

" - } - }, - "ExportEnvironment": { - "base": null, - "refs": { - "CreateInstanceExportTaskRequest$TargetEnvironment": "

The target virtualization environment.

", - "InstanceExportDetails$TargetEnvironment": "

The target virtualization environment.

" - } - }, - "ExportTask": { - "base": "

Describes an export task.

", - "refs": { - "CreateInstanceExportTaskResult$ExportTask": null, - "ExportTaskList$member": null - } - }, - "ExportTaskIdStringList": { - "base": null, - "refs": { - "DescribeExportTasksRequest$ExportTaskIds": "

One or more export task IDs.

" - } - }, - "ExportTaskList": { - "base": null, - "refs": { - "DescribeExportTasksResult$ExportTasks": null - } - }, - "ExportTaskState": { - "base": null, - "refs": { - "ExportTask$State": "

The state of the conversion task.

" - } - }, - "ExportToS3Task": { - "base": null, - "refs": { - "ExportTask$ExportToS3Task": null - } - }, - "ExportToS3TaskSpecification": { - "base": null, - "refs": { - "CreateInstanceExportTaskRequest$ExportToS3Task": null - } - }, - "Filter": { - "base": "

A filter name and value pair that is used to return a more specific list of results. Filters can be used to match a set of resources by various criteria, such as tags, attributes, or IDs.

", - "refs": { - "FilterList$member": null - } - }, - "FilterList": { - "base": null, - "refs": { - "DescribeAddressesRequest$Filters": "

One or more filters. Filter names and values are case-sensitive.

  • allocation-id - [EC2-VPC] The allocation ID for the address.

  • association-id - [EC2-VPC] The association ID for the address.

  • domain - Indicates whether the address is for use in EC2-Classic (standard) or in a VPC (vpc).

  • instance-id - The ID of the instance the address is associated with, if any.

  • network-interface-id - [EC2-VPC] The ID of the network interface that the address is associated with, if any.

  • network-interface-owner-id - The AWS account ID of the owner.

  • private-ip-address - [EC2-VPC] The private IP address associated with the Elastic IP address.

  • public-ip - The Elastic IP address.

", - "DescribeAvailabilityZonesRequest$Filters": "

One or more filters.

  • message - Information about the Availability Zone.

  • region-name - The name of the region for the Availability Zone (for example, us-east-1).

  • state - The state of the Availability Zone (available | impaired | unavailable).

  • zone-name - The name of the Availability Zone (for example, us-east-1a).

", - "DescribeBundleTasksRequest$Filters": "

One or more filters.

  • bundle-id - The ID of the bundle task.

  • error-code - If the task failed, the error code returned.

  • error-message - If the task failed, the error message returned.

  • instance-id - The ID of the instance.

  • progress - The level of task completion, as a percentage (for example, 20%).

  • s3-bucket - The Amazon S3 bucket to store the AMI.

  • s3-prefix - The beginning of the AMI name.

  • start-time - The time the task started (for example, 2013-09-15T17:15:20.000Z).

  • state - The state of the task (pending | waiting-for-shutdown | bundling | storing | cancelling | complete | failed).

  • update-time - The time of the most recent update for the task.

", - "DescribeClassicLinkInstancesRequest$Filters": "

One or more filters.

  • group-id - The ID of a VPC security group that's associated with the instance.

  • instance-id - The ID of the instance.

  • tag:key=value - The key/value combination of a tag assigned to the resource.

  • tag-key - The key of a tag assigned to the resource. This filter is independent of the tag-value filter. For example, if you use both the filter \"tag-key=Purpose\" and the filter \"tag-value=X\", you get any resources assigned both the tag key Purpose (regardless of what the tag's value is), and the tag value X (regardless of what the tag's key is). If you want to list only resources where Purpose is X, see the tag:key=value filter.

  • tag-value - The value of a tag assigned to the resource. This filter is independent of the tag-key filter.

  • vpc-id - The ID of the VPC that the instance is linked to.

", - "DescribeConversionTasksRequest$Filters": null, - "DescribeCustomerGatewaysRequest$Filters": "

One or more filters.

  • bgp-asn - The customer gateway's Border Gateway Protocol (BGP) Autonomous System Number (ASN).

  • customer-gateway-id - The ID of the customer gateway.

  • ip-address - The IP address of the customer gateway's Internet-routable external interface.

  • state - The state of the customer gateway (pending | available | deleting | deleted).

  • type - The type of customer gateway. Currently, the only supported type is ipsec.1.

  • tag:key=value - The key/value combination of a tag assigned to the resource.

  • tag-key - The key of a tag assigned to the resource. This filter is independent of the tag-value filter. For example, if you use both the filter \"tag-key=Purpose\" and the filter \"tag-value=X\", you get any resources assigned both the tag key Purpose (regardless of what the tag's value is), and the tag value X (regardless of what the tag's key is). If you want to list only resources where Purpose is X, see the tag:key=value filter.

  • tag-value - The value of a tag assigned to the resource. This filter is independent of the tag-key filter.

", - "DescribeDhcpOptionsRequest$Filters": "

One or more filters.

  • dhcp-options-id - The ID of a set of DHCP options.

  • key - The key for one of the options (for example, domain-name).

  • value - The value for one of the options.

  • tag:key=value - The key/value combination of a tag assigned to the resource.

  • tag-key - The key of a tag assigned to the resource. This filter is independent of the tag-value filter. For example, if you use both the filter \"tag-key=Purpose\" and the filter \"tag-value=X\", you get any resources assigned both the tag key Purpose (regardless of what the tag's value is), and the tag value X (regardless of what the tag's key is). If you want to list only resources where Purpose is X, see the tag:key=value filter.

  • tag-value - The value of a tag assigned to the resource. This filter is independent of the tag-key filter.

", - "DescribeImagesRequest$Filters": "

One or more filters.

  • architecture - The image architecture (i386 | x86_64).

  • block-device-mapping.delete-on-termination - A Boolean value that indicates whether the Amazon EBS volume is deleted on instance termination.

  • block-device-mapping.device-name - The device name for the Amazon EBS volume (for example, /dev/sdh).

  • block-device-mapping.snapshot-id - The ID of the snapshot used for the Amazon EBS volume.

  • block-device-mapping.volume-size - The volume size of the Amazon EBS volume, in GiB.

  • block-device-mapping.volume-type - The volume type of the Amazon EBS volume (gp2 | standard | io1).

  • description - The description of the image (provided during image creation).

  • hypervisor - The hypervisor type (ovm | xen).

  • image-id - The ID of the image.

  • image-type - The image type (machine | kernel | ramdisk).

  • is-public - A Boolean that indicates whether the image is public.

  • kernel-id - The kernel ID.

  • manifest-location - The location of the image manifest.

  • name - The name of the AMI (provided during image creation).

  • owner-alias - The AWS account alias (for example, amazon).

  • owner-id - The AWS account ID of the image owner.

  • platform - The platform. To only list Windows-based AMIs, use windows.

  • product-code - The product code.

  • product-code.type - The type of the product code (devpay | marketplace).

  • ramdisk-id - The RAM disk ID.

  • root-device-name - The name of the root device volume (for example, /dev/sda1).

  • root-device-type - The type of the root device volume (ebs | instance-store).

  • state - The state of the image (available | pending | failed).

  • state-reason-code - The reason code for the state change.

  • state-reason-message - The message for the state change.

  • tag:key=value - The key/value combination of a tag assigned to the resource.

  • tag-key - The key of a tag assigned to the resource. This filter is independent of the tag-value filter. For example, if you use both the filter \"tag-key=Purpose\" and the filter \"tag-value=X\", you get any resources assigned both the tag key Purpose (regardless of what the tag's value is), and the tag value X (regardless of what the tag's key is). If you want to list only resources where Purpose is X, see the tag:key=value filter.

  • tag-value - The value of a tag assigned to the resource. This filter is independent of the tag-key filter.

  • virtualization-type - The virtualization type (paravirtual | hvm).

", - "DescribeInstanceStatusRequest$Filters": "

One or more filters.

  • availability-zone - The Availability Zone of the instance.

  • event.code - The code identifying the type of event (instance-reboot | system-reboot | system-maintenance | instance-retirement | instance-stop).

  • event.description - A description of the event.

  • event.not-after - The latest end time for the scheduled event, for example: 2010-09-15T17:15:20.000Z.

  • event.not-before - The earliest start time for the scheduled event, for example: 2010-09-15T17:15:20.000Z.

  • instance-state-code - A code representing the state of the instance, as a 16-bit unsigned integer. The high byte is an opaque internal value and should be ignored. The low byte is set based on the state represented. The valid values are 0 (pending), 16 (running), 32 (shutting-down), 48 (terminated), 64 (stopping), and 80 (stopped).

  • instance-state-name - The state of the instance (pending | running | shutting-down | terminated | stopping | stopped).

  • instance-status.reachability - Filters on instance status where the name is reachability (passed | failed | initializing | insufficient-data).

  • instance-status.status - The status of the instance (ok | impaired | initializing | insufficient-data | not-applicable).

  • system-status.reachability - Filters on system status where the name is reachability (passed | failed | initializing | insufficient-data).

  • system-status.status - The system status of the instance (ok | impaired | initializing | insufficient-data | not-applicable).

", - "DescribeInstancesRequest$Filters": "

One or more filters.

  • architecture - The instance architecture (i386 | x86_64).

  • availability-zone - The Availability Zone of the instance.

  • block-device-mapping.attach-time - The attach time for an Amazon EBS volume mapped to the instance, for example, 2010-09-15T17:15:20.000Z.

  • block-device-mapping.delete-on-termination - A Boolean that indicates whether the Amazon EBS volume is deleted on instance termination.

  • block-device-mapping.device-name - The device name for the Amazon EBS volume (for example, /dev/sdh or xvdh).

  • block-device-mapping.status - The status for the Amazon EBS volume (attaching | attached | detaching | detached).

  • block-device-mapping.volume-id - The volume ID of the Amazon EBS volume.

  • client-token - The idempotency token you provided when you launched the instance.

  • dns-name - The public DNS name of the instance.

  • group-id - The ID of the security group for the instance. EC2-Classic only.

  • group-name - The name of the security group for the instance. EC2-Classic only.

  • hypervisor - The hypervisor type of the instance (ovm | xen).

  • iam-instance-profile.arn - The instance profile associated with the instance. Specified as an ARN.

  • image-id - The ID of the image used to launch the instance.

  • instance-id - The ID of the instance.

  • instance-lifecycle - Indicates whether this is a Spot Instance (spot).

  • instance-state-code - The state of the instance, as a 16-bit unsigned integer. The high byte is an opaque internal value and should be ignored. The low byte is set based on the state represented. The valid values are: 0 (pending), 16 (running), 32 (shutting-down), 48 (terminated), 64 (stopping), and 80 (stopped).

  • instance-state-name - The state of the instance (pending | running | shutting-down | terminated | stopping | stopped).

  • instance-type - The type of instance (for example, t2.micro).

  • instance.group-id - The ID of the security group for the instance.

  • instance.group-name - The name of the security group for the instance.

  • ip-address - The public IP address of the instance.

  • kernel-id - The kernel ID.

  • key-name - The name of the key pair used when the instance was launched.

  • launch-index - When launching multiple instances, this is the index for the instance in the launch group (for example, 0, 1, 2, and so on).

  • launch-time - The time when the instance was launched.

  • monitoring-state - Indicates whether monitoring is enabled for the instance (disabled | enabled).

  • owner-id - The AWS account ID of the instance owner.

  • placement-group-name - The name of the placement group for the instance.

  • platform - The platform. Use windows if you have Windows instances; otherwise, leave blank.

  • private-dns-name - The private DNS name of the instance.

  • private-ip-address - The private IP address of the instance.

  • product-code - The product code associated with the AMI used to launch the instance.

  • product-code.type - The type of product code (devpay | marketplace).

  • ramdisk-id - The RAM disk ID.

  • reason - The reason for the current state of the instance (for example, shows \"User Initiated [date]\" when you stop or terminate the instance). Similar to the state-reason-code filter.

  • requester-id - The ID of the entity that launched the instance on your behalf (for example, AWS Management Console, Auto Scaling, and so on).

  • reservation-id - The ID of the instance's reservation. A reservation ID is created any time you launch an instance. A reservation ID has a one-to-one relationship with an instance launch request, but can be associated with more than one instance if you launch multiple instances using the same launch request. For example, if you launch one instance, you'll get one reservation ID. If you launch ten instances using the same launch request, you'll also get one reservation ID.

  • root-device-name - The name of the root device for the instance (for example, /dev/sda1 or /dev/xvda).

  • root-device-type - The type of root device that the instance uses (ebs | instance-store).

  • source-dest-check - Indicates whether the instance performs source/destination checking. A value of true means that checking is enabled, and false means checking is disabled. The value must be false for the instance to perform network address translation (NAT) in your VPC.

  • spot-instance-request-id - The ID of the Spot Instance request.

  • state-reason-code - The reason code for the state change.

  • state-reason-message - A message that describes the state change.

  • subnet-id - The ID of the subnet for the instance.

  • tag:key=value - The key/value combination of a tag assigned to the resource, where tag:key is the tag's key.

  • tag-key - The key of a tag assigned to the resource. This filter is independent of the tag-value filter. For example, if you use both the filter \"tag-key=Purpose\" and the filter \"tag-value=X\", you get any resources assigned both the tag key Purpose (regardless of what the tag's value is), and the tag value X (regardless of what the tag's key is). If you want to list only resources where Purpose is X, see the tag:key=value filter.

  • tag-value - The value of a tag assigned to the resource. This filter is independent of the tag-key filter.

  • tenancy - The tenancy of an instance (dedicated | default).

  • virtualization-type - The virtualization type of the instance (paravirtual | hvm).

  • vpc-id - The ID of the VPC that the instance is running in.

  • network-interface.description - The description of the network interface.

  • network-interface.subnet-id - The ID of the subnet for the network interface.

  • network-interface.vpc-id - The ID of the VPC for the network interface.

  • network-interface.network-interface.id - The ID of the network interface.

  • network-interface.owner-id - The ID of the owner of the network interface.

  • network-interface.availability-zone - The Availability Zone for the network interface.

  • network-interface.requester-id - The requester ID for the network interface.

  • network-interface.requester-managed - Indicates whether the network interface is being managed by AWS.

  • network-interface.status - The status of the network interface (available) | in-use).

  • network-interface.mac-address - The MAC address of the network interface.

  • network-interface-private-dns-name - The private DNS name of the network interface.

  • network-interface.source-dest-check - Whether the network interface performs source/destination checking. A value of true means checking is enabled, and false means checking is disabled. The value must be false for the network interface to perform network address translation (NAT) in your VPC.

  • network-interface.group-id - The ID of a security group associated with the network interface.

  • network-interface.group-name - The name of a security group associated with the network interface.

  • network-interface.attachment.attachment-id - The ID of the interface attachment.

  • network-interface.attachment.instance-id - The ID of the instance to which the network interface is attached.

  • network-interface.attachment.instance-owner-id - The owner ID of the instance to which the network interface is attached.

  • network-interface.addresses.private-ip-address - The private IP address associated with the network interface.

  • network-interface.attachment.device-index - The device index to which the network interface is attached.

  • network-interface.attachment.status - The status of the attachment (attaching | attached | detaching | detached).

  • network-interface.attachment.attach-time - The time that the network interface was attached to an instance.

  • network-interface.attachment.delete-on-termination - Specifies whether the attachment is deleted when an instance is terminated.

  • network-interface.addresses.primary - Specifies whether the IP address of the network interface is the primary private IP address.

  • network-interface.addresses.association.public-ip - The ID of the association of an Elastic IP address with a network interface.

  • network-interface.addresses.association.ip-owner-id - The owner ID of the private IP address associated with the network interface.

  • association.public-ip - The address of the Elastic IP address bound to the network interface.

  • association.ip-owner-id - The owner of the Elastic IP address associated with the network interface.

  • association.allocation-id - The allocation ID returned when you allocated the Elastic IP address for your network interface.

  • association.association-id - The association ID returned when the network interface was associated with an IP address.

", - "DescribeInternetGatewaysRequest$Filters": "

One or more filters.

  • attachment.state - The current state of the attachment between the gateway and the VPC (available). Present only if a VPC is attached.

  • attachment.vpc-id - The ID of an attached VPC.

  • internet-gateway-id - The ID of the Internet gateway.

  • tag:key=value - The key/value combination of a tag assigned to the resource.

  • tag-key - The key of a tag assigned to the resource. This filter is independent of the tag-value filter. For example, if you use both the filter \"tag-key=Purpose\" and the filter \"tag-value=X\", you get any resources assigned both the tag key Purpose (regardless of what the tag's value is), and the tag value X (regardless of what the tag's key is). If you want to list only resources where Purpose is X, see the tag:key=value filter.

  • tag-value - The value of a tag assigned to the resource. This filter is independent of the tag-key filter.

", - "DescribeKeyPairsRequest$Filters": "

One or more filters.

  • fingerprint - The fingerprint of the key pair.

  • key-name - The name of the key pair.

", - "DescribeNetworkAclsRequest$Filters": "

One or more filters.

  • association.association-id - The ID of an association ID for the ACL.

  • association.network-acl-id - The ID of the network ACL involved in the association.

  • association.subnet-id - The ID of the subnet involved in the association.

  • default - Indicates whether the ACL is the default network ACL for the VPC.

  • entry.cidr - The CIDR range specified in the entry.

  • entry.egress - Indicates whether the entry applies to egress traffic.

  • entry.icmp.code - The ICMP code specified in the entry, if any.

  • entry.icmp.type - The ICMP type specified in the entry, if any.

  • entry.port-range.from - The start of the port range specified in the entry.

  • entry.port-range.to - The end of the port range specified in the entry.

  • entry.protocol - The protocol specified in the entry (tcp | udp | icmp or a protocol number).

  • entry.rule-action - Allows or denies the matching traffic (allow | deny).

  • entry.rule-number - The number of an entry (in other words, rule) in the ACL's set of entries.

  • network-acl-id - The ID of the network ACL.

  • tag:key=value - The key/value combination of a tag assigned to the resource.

  • tag-key - The key of a tag assigned to the resource. This filter is independent of the tag-value filter. For example, if you use both the filter \"tag-key=Purpose\" and the filter \"tag-value=X\", you get any resources assigned both the tag key Purpose (regardless of what the tag's value is), and the tag value X (regardless of what the tag's key is). If you want to list only resources where Purpose is X, see the tag:key=value filter.

  • tag-value - The value of a tag assigned to the resource. This filter is independent of the tag-key filter.

  • vpc-id - The ID of the VPC for the network ACL.

", - "DescribeNetworkInterfacesRequest$Filters": "

One or more filters.

  • addresses.private-ip-address - The private IP addresses associated with the network interface.

  • addresses.primary - Whether the private IP address is the primary IP address associated with the network interface.

  • addresses.association.public-ip - The association ID returned when the network interface was associated with the Elastic IP address.

  • addresses.association.owner-id - The owner ID of the addresses associated with the network interface.

  • association.association-id - The association ID returned when the network interface was associated with an IP address.

  • association.allocation-id - The allocation ID returned when you allocated the Elastic IP address for your network interface.

  • association.ip-owner-id - The owner of the Elastic IP address associated with the network interface.

  • association.public-ip - The address of the Elastic IP address bound to the network interface.

  • association.public-dns-name - The public DNS name for the network interface.

  • attachment.attachment-id - The ID of the interface attachment.

  • attachment.instance-id - The ID of the instance to which the network interface is attached.

  • attachment.instance-owner-id - The owner ID of the instance to which the network interface is attached.

  • attachment.device-index - The device index to which the network interface is attached.

  • attachment.status - The status of the attachment (attaching | attached | detaching | detached).

  • attachment.attach.time - The time that the network interface was attached to an instance.

  • attachment.delete-on-termination - Indicates whether the attachment is deleted when an instance is terminated.

  • availability-zone - The Availability Zone of the network interface.

  • description - The description of the network interface.

  • group-id - The ID of a security group associated with the network interface.

  • group-name - The name of a security group associated with the network interface.

  • mac-address - The MAC address of the network interface.

  • network-interface-id - The ID of the network interface.

  • owner-id - The AWS account ID of the network interface owner.

  • private-ip-address - The private IP address or addresses of the network interface.

  • private-dns-name - The private DNS name of the network interface.

  • requester-id - The ID of the entity that launched the instance on your behalf (for example, AWS Management Console, Auto Scaling, and so on).

  • requester-managed - Indicates whether the network interface is being managed by an AWS service (for example, AWS Management Console, Auto Scaling, and so on).

  • source-desk-check - Indicates whether the network interface performs source/destination checking. A value of true means checking is enabled, and false means checking is disabled. The value must be false for the network interface to perform Network Address Translation (NAT) in your VPC.

  • status - The status of the network interface. If the network interface is not attached to an instance, the status is available; if a network interface is attached to an instance the status is in-use.

  • subnet-id - The ID of the subnet for the network interface.

  • tag:key=value - The key/value combination of a tag assigned to the resource.

  • tag-key - The key of a tag assigned to the resource. This filter is independent of the tag-value filter. For example, if you use both the filter \"tag-key=Purpose\" and the filter \"tag-value=X\", you get any resources assigned both the tag key Purpose (regardless of what the tag's value is), and the tag value X (regardless of what the tag's key is). If you want to list only resources where Purpose is X, see the tag:key=value filter.

  • tag-value - The value of a tag assigned to the resource. This filter is independent of the tag-key filter.

  • vpc-id - The ID of the VPC for the network interface.

", - "DescribePlacementGroupsRequest$Filters": "

One or more filters.

  • group-name - The name of the placement group.

  • state - The state of the placement group (pending | available | deleting | deleted).

  • strategy - The strategy of the placement group (cluster).

", - "DescribeRegionsRequest$Filters": "

One or more filters.

  • endpoint - The endpoint of the region (for example, ec2.us-east-1.amazonaws.com).

  • region-name - The name of the region (for example, us-east-1).

", - "DescribeReservedInstancesListingsRequest$Filters": "

One or more filters.

  • reserved-instances-id - The ID of the Reserved Instances.

  • reserved-instances-listing-id - The ID of the Reserved Instances listing.

  • status - The status of the Reserved Instance listing (pending | active | cancelled | closed).

  • status-message - The reason for the status.

", - "DescribeReservedInstancesModificationsRequest$Filters": "

One or more filters.

  • client-token - The idempotency token for the modification request.

  • create-date - The time when the modification request was created.

  • effective-date - The time when the modification becomes effective.

  • modification-result.reserved-instances-id - The ID for the Reserved Instances created as part of the modification request. This ID is only available when the status of the modification is fulfilled.

  • modification-result.target-configuration.availability-zone - The Availability Zone for the new Reserved Instances.

  • modification-result.target-configuration.instance-count - The number of new Reserved Instances.

  • modification-result.target-configuration.instance-type - The instance type of the new Reserved Instances.

  • modification-result.target-configuration.platform - The network platform of the new Reserved Instances (EC2-Classic | EC2-VPC).

  • reserved-instances-id - The ID of the Reserved Instances modified.

  • reserved-instances-modification-id - The ID of the modification request.

  • status - The status of the Reserved Instances modification request (processing | fulfilled | failed).

  • status-message - The reason for the status.

  • update-date - The time when the modification request was last updated.

", - "DescribeReservedInstancesOfferingsRequest$Filters": "

One or more filters.

  • availability-zone - The Availability Zone where the Reserved Instance can be used.

  • duration - The duration of the Reserved Instance (for example, one year or three years), in seconds (31536000 | 94608000).

  • fixed-price - The purchase price of the Reserved Instance (for example, 9800.0).

  • instance-type - The instance type on which the Reserved Instance can be used.

  • marketplace - Set to true to show only Reserved Instance Marketplace offerings. When this filter is not used, which is the default behavior, all offerings from AWS and Reserved Instance Marketplace are listed.

  • product-description - The description of the Reserved Instance (Linux/UNIX | Linux/UNIX (Amazon VPC) | Windows | Windows (Amazon VPC)).

  • reserved-instances-offering-id - The Reserved Instances offering ID.

  • usage-price - The usage price of the Reserved Instance, per hour (for example, 0.84).

", - "DescribeReservedInstancesRequest$Filters": "

One or more filters.

  • availability-zone - The Availability Zone where the Reserved Instance can be used.

  • duration - The duration of the Reserved Instance (one year or three years), in seconds (31536000 | 94608000).

  • end - The time when the Reserved Instance expires (for example, 2014-08-07T11:54:42.000Z).

  • fixed-price - The purchase price of the Reserved Instance (for example, 9800.0).

  • instance-type - The instance type on which the Reserved Instance can be used.

  • product-description - The product description of the Reserved Instance (Linux/UNIX | Linux/UNIX (Amazon VPC) | Windows | Windows (Amazon VPC)).

  • reserved-instances-id - The ID of the Reserved Instance.

  • start - The time at which the Reserved Instance purchase request was placed (for example, 2014-08-07T11:54:42.000Z).

  • state - The state of the Reserved Instance (pending-payment | active | payment-failed | retired).

  • tag:key=value - The key/value combination of a tag assigned to the resource.

  • tag-key - The key of a tag assigned to the resource. This filter is independent of the tag-value filter. For example, if you use both the filter \"tag-key=Purpose\" and the filter \"tag-value=X\", you get any resources assigned both the tag key Purpose (regardless of what the tag's value is), and the tag value X (regardless of what the tag's key is). If you want to list only resources where Purpose is X, see the tag:key=value filter.

  • tag-value - The value of a tag assigned to the resource. This filter is independent of the tag-key filter.

  • usage-price - The usage price of the Reserved Instance, per hour (for example, 0.84).

", - "DescribeRouteTablesRequest$Filters": "

One or more filters.

  • association.route-table-association-id - The ID of an association ID for the route table.

  • association.route-table-id - The ID of the route table involved in the association.

  • association.subnet-id - The ID of the subnet involved in the association.

  • association.main - Indicates whether the route table is the main route table for the VPC.

  • route-table-id - The ID of the route table.

  • route.destination-cidr-block - The CIDR range specified in a route in the table.

  • route.gateway-id - The ID of a gateway specified in a route in the table.

  • route.instance-id - The ID of an instance specified in a route in the table.

  • route.origin - Describes how the route was created. CreateRouteTable indicates that the route was automatically created when the route table was created; CreateRoute indicates that the route was manually added to the route table; EnableVgwRoutePropagation indicates that the route was propagated by route propagation.

  • route.state - The state of a route in the route table (active | blackhole). The blackhole state indicates that the route's target isn't available (for example, the specified gateway isn't attached to the VPC, the specified NAT instance has been terminated, and so on).

  • route.vpc-peering-connection-id - The ID of a VPC peering connection specified in a route in the table.

  • tag:key=value - The key/value combination of a tag assigned to the resource.

  • tag-key - The key of a tag assigned to the resource. This filter is independent of the tag-value filter. For example, if you use both the filter \"tag-key=Purpose\" and the filter \"tag-value=X\", you get any resources assigned both the tag key Purpose (regardless of what the tag's value is), and the tag value X (regardless of what the tag's key is). If you want to list only resources where Purpose is X, see the tag:key=value filter.

  • tag-value - The value of a tag assigned to the resource. This filter is independent of the tag-key filter.

  • vpc-id - The ID of the VPC for the route table.

", - "DescribeSecurityGroupsRequest$Filters": "

One or more filters.

  • description - The description of the security group.

  • group-id - The ID of the security group.

  • group-name - The name of the security group.

  • ip-permission.cidr - A CIDR range that has been granted permission.

  • ip-permission.from-port - The start of port range for the TCP and UDP protocols, or an ICMP type number.

  • ip-permission.group-id - The ID of a security group that has been granted permission.

  • ip-permission.group-name - The name of a security group that has been granted permission.

  • ip-permission.protocol - The IP protocol for the permission (tcp | udp | icmp or a protocol number).

  • ip-permission.to-port - The end of port range for the TCP and UDP protocols, or an ICMP code.

  • ip-permission.user-id - The ID of an AWS account that has been granted permission.

  • owner-id - The AWS account ID of the owner of the security group.

  • tag-key - The key of a tag assigned to the security group.

  • tag-value - The value of a tag assigned to the security group.

  • vpc-id - The ID of the VPC specified when the security group was created.

", - "DescribeSnapshotsRequest$Filters": "

One or more filters.

  • description - A description of the snapshot.

  • owner-alias - The AWS account alias (for example, amazon) that owns the snapshot.

  • owner-id - The ID of the AWS account that owns the snapshot.

  • progress - The progress of the snapshot, as a percentage (for example, 80%).

  • snapshot-id - The snapshot ID.

  • start-time - The time stamp when the snapshot was initiated.

  • status - The status of the snapshot (pending | completed | error).

  • tag:key=value - The key/value combination of a tag assigned to the resource.

  • tag-key - The key of a tag assigned to the resource. This filter is independent of the tag-value filter. For example, if you use both the filter \"tag-key=Purpose\" and the filter \"tag-value=X\", you get any resources assigned both the tag key Purpose (regardless of what the tag's value is), and the tag value X (regardless of what the tag's key is). If you want to list only resources where Purpose is X, see the tag:key=value filter.

  • tag-value - The value of a tag assigned to the resource. This filter is independent of the tag-key filter.

  • volume-id - The ID of the volume the snapshot is for.

  • volume-size - The size of the volume, in GiB.

", - "DescribeSpotInstanceRequestsRequest$Filters": "

One or more filters.

  • availability-zone-group - The Availability Zone group.

  • create-time - The time stamp when the Spot Instance request was created.

  • fault-code - The fault code related to the request.

  • fault-message - The fault message related to the request.

  • instance-id - The ID of the instance that fulfilled the request.

  • launch-group - The Spot Instance launch group.

  • launch.block-device-mapping.delete-on-termination - Indicates whether the Amazon EBS volume is deleted on instance termination.

  • launch.block-device-mapping.device-name - The device name for the Amazon EBS volume (for example, /dev/sdh).

  • launch.block-device-mapping.snapshot-id - The ID of the snapshot used for the Amazon EBS volume.

  • launch.block-device-mapping.volume-size - The size of the Amazon EBS volume, in GiB.

  • launch.block-device-mapping.volume-type - The type of the Amazon EBS volume (gp2 | standard | io1).

  • launch.group-id - The security group for the instance.

  • launch.image-id - The ID of the AMI.

  • launch.instance-type - The type of instance (for example, m1.small).

  • launch.kernel-id - The kernel ID.

  • launch.key-name - The name of the key pair the instance launched with.

  • launch.monitoring-enabled - Whether monitoring is enabled for the Spot Instance.

  • launch.ramdisk-id - The RAM disk ID.

  • network-interface.network-interface-id - The ID of the network interface.

  • network-interface.device-index - The index of the device for the network interface attachment on the instance.

  • network-interface.subnet-id - The ID of the subnet for the instance.

  • network-interface.description - A description of the network interface.

  • network-interface.private-ip-address - The primary private IP address of the network interface.

  • network-interface.delete-on-termination - Indicates whether the network interface is deleted when the instance is terminated.

  • network-interface.group-id - The ID of the security group associated with the network interface.

  • network-interface.group-name - The name of the security group associated with the network interface.

  • network-interface.addresses.primary - Indicates whether the IP address is the primary private IP address.

  • product-description - The product description associated with the instance (Linux/UNIX | Windows).

  • spot-instance-request-id - The Spot Instance request ID.

  • spot-price - The maximum hourly price for any Spot Instance launched to fulfill the request.

  • state - The state of the Spot Instance request (open | active | closed | cancelled | failed). Spot bid status information can help you track your Amazon EC2 Spot Instance requests. For more information, see Spot Bid Status in the Amazon Elastic Compute Cloud User Guide for Linux.

  • status-code - The short code describing the most recent evaluation of your Spot Instance request.

  • status-message - The message explaining the status of the Spot Instance request.

  • tag:key=value - The key/value combination of a tag assigned to the resource.

  • tag-key - The key of a tag assigned to the resource. This filter is independent of the tag-value filter. For example, if you use both the filter \"tag-key=Purpose\" and the filter \"tag-value=X\", you get any resources assigned both the tag key Purpose (regardless of what the tag's value is), and the tag value X (regardless of what the tag's key is). If you want to list only resources where Purpose is X, see the tag:key=value filter.

  • tag-value - The value of a tag assigned to the resource. This filter is independent of the tag-key filter.

  • type - The type of Spot Instance request (one-time | persistent).

  • launched-availability-zone - The Availability Zone in which the bid is launched.

  • valid-from - The start date of the request.

  • valid-until - The end date of the request.

", - "DescribeSpotPriceHistoryRequest$Filters": "

One or more filters.

  • availability-zone - The Availability Zone for which prices should be returned.

  • instance-type - The type of instance (for example, m1.small).

  • product-description - The product description for the Spot Price (Linux/UNIX | SUSE Linux | Windows | Linux/UNIX (Amazon VPC) | SUSE Linux (Amazon VPC) | Windows (Amazon VPC)).

  • spot-price - The Spot Price. The value must match exactly (or use wildcards; greater than or less than comparison is not supported).

  • timestamp - The timestamp of the Spot Price history (for example, 2010-08-16T05:06:11.000Z). You can use wildcards (* and ?). Greater than or less than comparison is not supported.

", - "DescribeSubnetsRequest$Filters": "

One or more filters.

  • availabilityZone - The Availability Zone for the subnet. You can also use availability-zone as the filter name.

  • available-ip-address-count - The number of IP addresses in the subnet that are available.

  • cidrBlock - The CIDR block of the subnet. The CIDR block you specify must exactly match the subnet's CIDR block for information to be returned for the subnet. You can also use cidr or cidr-block as the filter names.

  • defaultForAz - Indicates whether this is the default subnet for the Availability Zone. You can also use default-for-az as the filter name.

  • state - The state of the subnet (pending | available).

  • subnet-id - The ID of the subnet.

  • tag:key=value - The key/value combination of a tag assigned to the resource.

  • tag-key - The key of a tag assigned to the resource. This filter is independent of the tag-value filter. For example, if you use both the filter \"tag-key=Purpose\" and the filter \"tag-value=X\", you get any resources assigned both the tag key Purpose (regardless of what the tag's value is), and the tag value X (regardless of what the tag's key is). If you want to list only resources where Purpose is X, see the tag:key=value filter.

  • tag-value - The value of a tag assigned to the resource. This filter is independent of the tag-key filter.

  • vpc-id - The ID of the VPC for the subnet.

", - "DescribeTagsRequest$Filters": "

One or more filters.

  • key - The tag key.

  • resource-id - The resource ID.

  • resource-type - The resource type (customer-gateway | dhcp-options | image | instance | internet-gateway | network-acl | network-interface | reserved-instances | route-table | security-group | snapshot | spot-instances-request | subnet | volume | vpc | vpn-connection | vpn-gateway).

  • value - The tag value.

", - "DescribeVolumeStatusRequest$Filters": "

One or more filters.

  • action.code - The action code for the event (for example, enable-volume-io).

  • action.description - A description of the action.

  • action.event-id - The event ID associated with the action.

  • availability-zone - The Availability Zone of the instance.

  • event.description - A description of the event.

  • event.event-id - The event ID.

  • event.event-type - The event type (for io-enabled: passed | failed; for io-performance: io-performance:degraded | io-performance:severely-degraded | io-performance:stalled).

  • event.not-after - The latest end time for the event.

  • event.not-before - The earliest start time for the event.

  • volume-status.details-name - The cause for volume-status.status (io-enabled | io-performance).

  • volume-status.details-status - The status of volume-status.details-name (for io-enabled: passed | failed; for io-performance: normal | degraded | severely-degraded | stalled).

  • volume-status.status - The status of the volume (ok | impaired | warning | insufficient-data).

", - "DescribeVolumesRequest$Filters": "

One or more filters.

  • attachment.attach-time - The time stamp when the attachment initiated.

  • attachment.delete-on-termination - Whether the volume is deleted on instance termination.

  • attachment.device - The device name that is exposed to the instance (for example, /dev/sda1).

  • attachment.instance-id - The ID of the instance the volume is attached to.

  • attachment.status - The attachment state (attaching | attached | detaching | detached).

  • availability-zone - The Availability Zone in which the volume was created.

  • create-time - The time stamp when the volume was created.

  • encrypted - The encryption status of the volume.

  • size - The size of the volume, in GiB.

  • snapshot-id - The snapshot from which the volume was created.

  • status - The status of the volume (creating | available | in-use | deleting | deleted | error).

  • tag:key=value - The key/value combination of a tag assigned to the resource.

  • tag-key - The key of a tag assigned to the resource. This filter is independent of the tag-value filter. For example, if you use both the filter \"tag-key=Purpose\" and the filter \"tag-value=X\", you get any resources assigned both the tag key Purpose (regardless of what the tag's value is), and the tag value X (regardless of what the tag's key is). If you want to list only resources where Purpose is X, see the tag:key=value filter.

  • tag-value - The value of a tag assigned to the resource. This filter is independent of the tag-key filter.

  • volume-id - The volume ID.

  • volume-type - The Amazon EBS volume type. This can be gp2 for General Purpose (SSD) volumes, io1 for Provisioned IOPS (SSD) volumes, or standard for Magnetic volumes.

", - "DescribeVpcClassicLinkRequest$Filters": "

One or more filters.

  • is-classic-link-enabled - Whether the VPC is enabled for ClassicLink (true | false).

  • tag:key=value - The key/value combination of a tag assigned to the resource.

  • tag-key - The key of a tag assigned to the resource. This filter is independent of the tag-value filter. For example, if you use both the filter \"tag-key=Purpose\" and the filter \"tag-value=X\", you get any resources assigned both the tag key Purpose (regardless of what the tag's value is), and the tag value X (regardless of what the tag's key is). If you want to list only resources where Purpose is X, see the tag:key=value filter.

  • tag-value - The value of a tag assigned to the resource. This filter is independent of the tag-key filter.

", - "DescribeVpcPeeringConnectionsRequest$Filters": "

One or more filters.

  • accepter-vpc-info.cidr-block - The CIDR block of the peer VPC.

  • accepter-vpc-info.owner-id - The AWS account ID of the owner of the peer VPC.

  • accepter-vpc-info.vpc-id - The ID of the peer VPC.

  • expiration-time - The expiration date and time for the VPC peering connection.

  • requester-vpc-info.cidr-block - The CIDR block of the requester's VPC.

  • requester-vpc-info.owner-id - The AWS account ID of the owner of the requester VPC.

  • requester-vpc-info.vpc-id - The ID of the requester VPC.

  • status-code - The status of the VPC peering connection (pending-acceptance | failed | expired | provisioning | active | deleted | rejected).

  • status-message - A message that provides more information about the status of the VPC peering connection, if applicable.

  • tag:key=value - The key/value combination of a tag assigned to the resource.

  • tag-key - The key of a tag assigned to the resource. This filter is independent of the tag-value filter. For example, if you use both the filter \"tag-key=Purpose\" and the filter \"tag-value=X\", you get any resources assigned both the tag key Purpose (regardless of what the tag's value is), and the tag value X (regardless of what the tag's key is). If you want to list only resources where Purpose is X, see the tag:key=value filter.

  • tag-value - The value of a tag assigned to the resource. This filter is independent of the tag-key filter.

  • vpc-peering-connection-id - The ID of the VPC peering connection.

", - "DescribeVpcsRequest$Filters": "

One or more filters.

  • cidr - The CIDR block of the VPC. The CIDR block you specify must exactly match the VPC's CIDR block for information to be returned for the VPC. Must contain the slash followed by one or two digits (for example, /28).

  • dhcp-options-id - The ID of a set of DHCP options.

  • isDefault - Indicates whether the VPC is the default VPC.

  • state - The state of the VPC (pending | available).

  • tag:key=value - The key/value combination of a tag assigned to the resource.

  • tag-key - The key of a tag assigned to the resource. This filter is independent of the tag-value filter. For example, if you use both the filter \"tag-key=Purpose\" and the filter \"tag-value=X\", you get any resources assigned both the tag key Purpose (regardless of what the tag's value is), and the tag value X (regardless of what the tag's key is). If you want to list only resources where Purpose is X, see the tag:key=value filter.

  • tag-value - The value of a tag assigned to the resource. This filter is independent of the tag-key filter.

  • vpc-id - The ID of the VPC.

", - "DescribeVpnConnectionsRequest$Filters": "

One or more filters.

  • customer-gateway-configuration - The configuration information for the customer gateway.

  • customer-gateway-id - The ID of a customer gateway associated with the VPN connection.

  • state - The state of the VPN connection (pending | available | deleting | deleted).

  • option.static-routes-only - Indicates whether the connection has static routes only. Used for devices that do not support Border Gateway Protocol (BGP).

  • route.destination-cidr-block - The destination CIDR block. This corresponds to the subnet used in a customer data center.

  • bgp-asn - The BGP Autonomous System Number (ASN) associated with a BGP device.

  • tag:key=value - The key/value combination of a tag assigned to the resource.

  • tag-key - The key of a tag assigned to the resource. This filter is independent of the tag-value filter. For example, if you use both the filter \"tag-key=Purpose\" and the filter \"tag-value=X\", you get any resources assigned both the tag key Purpose (regardless of what the tag's value is), and the tag value X (regardless of what the tag's key is). If you want to list only resources where Purpose is X, see the tag:key=value filter.

  • tag-value - The value of a tag assigned to the resource. This filter is independent of the tag-key filter.

  • type - The type of VPN connection. Currently the only supported type is ipsec.1.

  • vpn-connection-id - The ID of the VPN connection.

  • vpn-gateway-id - The ID of a virtual private gateway associated with the VPN connection.

", - "DescribeVpnGatewaysRequest$Filters": "

One or more filters.

  • attachment.state - The current state of the attachment between the gateway and the VPC (attaching | attached | detaching | detached).

  • attachment.vpc-id - The ID of an attached VPC.

  • availability-zone - The Availability Zone for the virtual private gateway.

  • state - The state of the virtual private gateway (pending | available | deleting | deleted).

  • tag:key=value - The key/value combination of a tag assigned to the resource.

  • tag-key - The key of a tag assigned to the resource. This filter is independent of the tag-value filter. For example, if you use both the filter \"tag-key=Purpose\" and the filter \"tag-value=X\", you get any resources assigned both the tag key Purpose (regardless of what the tag's value is), and the tag value X (regardless of what the tag's key is). If you want to list only resources where Purpose is X, see the tag:key=value filter.

  • tag-value - The value of a tag assigned to the resource. This filter is independent of the tag-key filter.

  • type - The type of virtual private gateway. Currently the only supported type is ipsec.1.

  • vpn-gateway-id - The ID of the virtual private gateway.

" - } - }, - "Float": { - "base": null, - "refs": { - "ReservedInstances$UsagePrice": "

The usage price of the Reserved Instance, per hour.

", - "ReservedInstances$FixedPrice": "

The purchase price of the Reserved Instance.

", - "ReservedInstancesOffering$UsagePrice": "

The usage price of the Reserved Instance, per hour.

", - "ReservedInstancesOffering$FixedPrice": "

The purchase price of the Reserved Instance.

" - } - }, - "GatewayType": { - "base": null, - "refs": { - "CreateCustomerGatewayRequest$Type": "

The type of VPN connection that this customer gateway supports (ipsec.1).

", - "CreateVpnGatewayRequest$Type": "

The type of VPN connection this virtual private gateway supports.

", - "VpnConnection$Type": "

The type of VPN connection.

", - "VpnGateway$Type": "

The type of VPN connection the virtual private gateway supports.

" - } - }, - "GetConsoleOutputRequest": { - "base": null, - "refs": { - } - }, - "GetConsoleOutputResult": { - "base": null, - "refs": { - } - }, - "GetPasswordDataRequest": { - "base": null, - "refs": { - } - }, - "GetPasswordDataResult": { - "base": null, - "refs": { - } - }, - "GroupIdStringList": { - "base": null, - "refs": { - "AttachClassicLinkVpcRequest$Groups": "

The ID of one or more of the VPC's security groups. You cannot specify security groups from a different VPC.

", - "DescribeSecurityGroupsRequest$GroupIds": "

One or more security group IDs. Required for security groups in a nondefault VPC.

Default: Describes all your security groups.

", - "ModifyInstanceAttributeRequest$Groups": "

[EC2-VPC] Changes the security groups of the instance. You must specify at least one security group, even if it's just the default security group for the VPC. You must specify the security group ID, not the security group name.

" - } - }, - "GroupIdentifier": { - "base": "

Describes a security group.

", - "refs": { - "GroupIdentifierList$member": null - } - }, - "GroupIdentifierList": { - "base": null, - "refs": { - "ClassicLinkInstance$Groups": "

A list of security groups.

", - "DescribeNetworkInterfaceAttributeResult$Groups": "

The security groups associated with the network interface.

", - "Instance$SecurityGroups": "

One or more security groups for the instance.

", - "InstanceAttribute$Groups": "

The security groups associated with the instance.

", - "InstanceNetworkInterface$Groups": "

One or more security groups.

", - "LaunchSpecification$SecurityGroups": "

One or more security groups. To request an instance in a nondefault VPC, you must specify the ID of the security group. To request an instance in EC2-Classic or a default VPC, you can specify the name or the ID of the security group.

", - "NetworkInterface$Groups": "

Any security groups for the network interface.

", - "Reservation$Groups": "

One or more security groups.

" - } - }, - "GroupNameStringList": { - "base": null, - "refs": { - "DescribeSecurityGroupsRequest$GroupNames": "

[EC2-Classic and default VPC only] One or more security group names. You can specify either the security group name or the security group ID. For security groups in a nondefault VPC, use the group-name filter to describe security groups by name.

Default: Describes all your security groups.

", - "ModifySnapshotAttributeRequest$GroupNames": "

The group to modify for the snapshot.

" - } - }, - "HypervisorType": { - "base": null, - "refs": { - "Image$Hypervisor": "

The hypervisor type of the image.

", - "Instance$Hypervisor": "

The hypervisor type of the instance.

" - } - }, - "IamInstanceProfile": { - "base": "

Describes an IAM instance profile.

", - "refs": { - "Instance$IamInstanceProfile": "

The IAM instance profile associated with the instance.

" - } - }, - "IamInstanceProfileSpecification": { - "base": "

Describes an IAM instance profile.

", - "refs": { - "LaunchSpecification$IamInstanceProfile": "

The IAM instance profile.

", - "RunInstancesRequest$IamInstanceProfile": "

The IAM instance profile.

", - "RequestSpotLaunchSpecification$IamInstanceProfile": "

The IAM instance profile.

" - } - }, - "IcmpTypeCode": { - "base": "

Describes the ICMP type and code.

", - "refs": { - "CreateNetworkAclEntryRequest$IcmpTypeCode": "

ICMP protocol: The ICMP type and code. Required if specifying ICMP for the protocol.

", - "NetworkAclEntry$IcmpTypeCode": "

ICMP protocol: The ICMP type and code.

", - "ReplaceNetworkAclEntryRequest$IcmpTypeCode": "

ICMP protocol: The ICMP type and code. Required if specifying 1 (ICMP) for the protocol.

" - } - }, - "Image": { - "base": "

Describes an image.

", - "refs": { - "ImageList$member": null - } - }, - "ImageAttribute": { - "base": "

Describes an image attribute.

", - "refs": { - } - }, - "ImageAttributeName": { - "base": null, - "refs": { - "DescribeImageAttributeRequest$Attribute": "

The AMI attribute.

Note: Depending on your account privileges, the blockDeviceMapping attribute may return a Client.AuthFailure error. If this happens, use DescribeImages to get information about the block device mapping for the AMI.

" - } - }, - "ImageIdStringList": { - "base": null, - "refs": { - "DescribeImagesRequest$ImageIds": "

One or more image IDs.

Default: Describes all images available to you.

" - } - }, - "ImageList": { - "base": null, - "refs": { - "DescribeImagesResult$Images": "

Information about one or more images.

" - } - }, - "ImageState": { - "base": null, - "refs": { - "Image$State": "

The current state of the AMI. If the state is available, the image is successfully registered and can be used to launch an instance.

" - } - }, - "ImageTypeValues": { - "base": null, - "refs": { - "Image$ImageType": "

The type of image.

" - } - }, - "ImportInstanceLaunchSpecification": { - "base": null, - "refs": { - "ImportInstanceRequest$LaunchSpecification": "

" - } - }, - "ImportInstanceRequest": { - "base": null, - "refs": { - } - }, - "ImportInstanceResult": { - "base": null, - "refs": { - } - }, - "ImportInstanceTaskDetails": { - "base": null, - "refs": { - "ConversionTask$ImportInstance": "

If the task is for importing an instance, this contains information about the import instance task.

" - } - }, - "ImportInstanceVolumeDetailItem": { - "base": "

Describes an import volume task.

", - "refs": { - "ImportInstanceVolumeDetailSet$member": null - } - }, - "ImportInstanceVolumeDetailSet": { - "base": null, - "refs": { - "ImportInstanceTaskDetails$Volumes": null - } - }, - "ImportKeyPairRequest": { - "base": null, - "refs": { - } - }, - "ImportKeyPairResult": { - "base": null, - "refs": { - } - }, - "ImportVolumeRequest": { - "base": null, - "refs": { - } - }, - "ImportVolumeResult": { - "base": null, - "refs": { - } - }, - "ImportVolumeTaskDetails": { - "base": "

Describes an import volume task.

", - "refs": { - "ConversionTask$ImportVolume": "

If the task is for importing a volume, this contains information about the import volume task.

" - } - }, - "Instance": { - "base": "

Describes an instance.

", - "refs": { - "InstanceList$member": null - } - }, - "InstanceAttribute": { - "base": "

Describes an instance attribute.

", - "refs": { - } - }, - "InstanceAttributeName": { - "base": null, - "refs": { - "DescribeInstanceAttributeRequest$Attribute": "

The instance attribute.

", - "ModifyInstanceAttributeRequest$Attribute": "

The name of the attribute.

", - "ResetInstanceAttributeRequest$Attribute": "

The attribute to reset.

" - } - }, - "InstanceBlockDeviceMapping": { - "base": "

Describes a block device mapping.

", - "refs": { - "InstanceBlockDeviceMappingList$member": null - } - }, - "InstanceBlockDeviceMappingList": { - "base": null, - "refs": { - "Instance$BlockDeviceMappings": "

Any block device mapping entries for the instance.

", - "InstanceAttribute$BlockDeviceMappings": "

The block device mapping of the instance.

" - } - }, - "InstanceBlockDeviceMappingSpecification": { - "base": "

Describes a block device mapping entry.

", - "refs": { - "InstanceBlockDeviceMappingSpecificationList$member": null - } - }, - "InstanceBlockDeviceMappingSpecificationList": { - "base": null, - "refs": { - "ModifyInstanceAttributeRequest$BlockDeviceMappings": "

Modifies the DeleteOnTermination attribute for volumes that are currently attached. The volume must be owned by the caller. If no value is specified for DeleteOnTermination, the default is true and the volume is deleted when the instance is terminated.

To add instance store volumes to an Amazon EBS-backed instance, you must add them when you launch the instance. For more information, see Updating the Block Device Mapping when Launching an Instance in the Amazon Elastic Compute Cloud User Guide for Linux.

" - } - }, - "InstanceCount": { - "base": "

Describes a Reserved Instance listing state.

", - "refs": { - "InstanceCountList$member": null - } - }, - "InstanceCountList": { - "base": null, - "refs": { - "ReservedInstancesListing$InstanceCounts": "

The number of instances in this state.

" - } - }, - "InstanceExportDetails": { - "base": "

Describes an instance export task.

", - "refs": { - "ExportTask$InstanceExportDetails": "

The instance being exported.

" - } - }, - "InstanceIdStringList": { - "base": null, - "refs": { - "DescribeClassicLinkInstancesRequest$InstanceIds": "

One or more instance IDs. Must be instances linked to a VPC through ClassicLink.

", - "DescribeInstanceStatusRequest$InstanceIds": "

One or more instance IDs.

Default: Describes all your instances.

Constraints: Maximum 100 explicitly specified instance IDs.

", - "DescribeInstancesRequest$InstanceIds": "

One or more instance IDs.

Default: Describes all your instances.

", - "MonitorInstancesRequest$InstanceIds": "

One or more instance IDs.

", - "RebootInstancesRequest$InstanceIds": "

One or more instance IDs.

", - "ReportInstanceStatusRequest$Instances": "

One or more instances.

", - "StartInstancesRequest$InstanceIds": "

One or more instance IDs.

", - "StopInstancesRequest$InstanceIds": "

One or more instance IDs.

", - "TerminateInstancesRequest$InstanceIds": "

One or more instance IDs.

", - "UnmonitorInstancesRequest$InstanceIds": "

One or more instance IDs.

" - } - }, - "InstanceLifecycleType": { - "base": null, - "refs": { - "Instance$InstanceLifecycle": "

Indicates whether this is a Spot Instance.

" - } - }, - "InstanceList": { - "base": null, - "refs": { - "Reservation$Instances": "

One or more instances.

" - } - }, - "InstanceMonitoring": { - "base": "

Describes the monitoring information of the instance.

", - "refs": { - "InstanceMonitoringList$member": null - } - }, - "InstanceMonitoringList": { - "base": null, - "refs": { - "MonitorInstancesResult$InstanceMonitorings": "

Monitoring information for one or more instances.

", - "UnmonitorInstancesResult$InstanceMonitorings": "

Monitoring information for one or more instances.

" - } - }, - "InstanceNetworkInterface": { - "base": "

Describes a network interface.

", - "refs": { - "InstanceNetworkInterfaceList$member": null - } - }, - "InstanceNetworkInterfaceAssociation": { - "base": "

Describes association information for an Elastic IP address.

", - "refs": { - "InstanceNetworkInterface$Association": "

The association information for an Elastic IP associated with the network interface.

", - "InstancePrivateIpAddress$Association": "

The association information for an Elastic IP address for the network interface.

" - } - }, - "InstanceNetworkInterfaceAttachment": { - "base": "

Describes a network interface attachment.

", - "refs": { - "InstanceNetworkInterface$Attachment": "

The network interface attachment.

" - } - }, - "InstanceNetworkInterfaceList": { - "base": null, - "refs": { - "Instance$NetworkInterfaces": "

[EC2-VPC] One or more network interfaces for the instance.

" - } - }, - "InstanceNetworkInterfaceSpecification": { - "base": "

Describes a network interface.

", - "refs": { - "InstanceNetworkInterfaceSpecificationList$member": null - } - }, - "InstanceNetworkInterfaceSpecificationList": { - "base": null, - "refs": { - "LaunchSpecification$NetworkInterfaces": "

One or more network interfaces.

", - "RunInstancesRequest$NetworkInterfaces": "

One or more network interfaces.

", - "RequestSpotLaunchSpecification$NetworkInterfaces": "

One or more network interfaces.

" - } - }, - "InstancePrivateIpAddress": { - "base": "

Describes a private IP address.

", - "refs": { - "InstancePrivateIpAddressList$member": null - } - }, - "InstancePrivateIpAddressList": { - "base": null, - "refs": { - "InstanceNetworkInterface$PrivateIpAddresses": "

The private IP addresses associated with the network interface.

" - } - }, - "InstanceState": { - "base": "

Describes the current state of the instance.

", - "refs": { - "Instance$State": "

The current state of the instance.

", - "InstanceStateChange$CurrentState": "

The current state of the instance.

", - "InstanceStateChange$PreviousState": "

The previous state of the instance.

", - "InstanceStatus$InstanceState": "

The intended state of the instance. DescribeInstanceStatus requires that an instance be in the running state.

" - } - }, - "InstanceStateChange": { - "base": "

Describes an instance state change.

", - "refs": { - "InstanceStateChangeList$member": null - } - }, - "InstanceStateChangeList": { - "base": null, - "refs": { - "StartInstancesResult$StartingInstances": "

Information about one or more started instances.

", - "StopInstancesResult$StoppingInstances": "

Information about one or more stopped instances.

", - "TerminateInstancesResult$TerminatingInstances": "

Information about one or more terminated instances.

" - } - }, - "InstanceStateName": { - "base": null, - "refs": { - "InstanceState$Name": "

The current state of the instance.

" - } - }, - "InstanceStatus": { - "base": "

Describes the status of an instance.

", - "refs": { - "InstanceStatusList$member": null - } - }, - "InstanceStatusDetails": { - "base": "

Describes the instance status.

", - "refs": { - "InstanceStatusDetailsList$member": null - } - }, - "InstanceStatusDetailsList": { - "base": null, - "refs": { - "InstanceStatusSummary$Details": "

The system instance health or application instance health.

" - } - }, - "InstanceStatusEvent": { - "base": "

Describes an instance event.

", - "refs": { - "InstanceStatusEventList$member": null - } - }, - "InstanceStatusEventList": { - "base": null, - "refs": { - "InstanceStatus$Events": "

Extra information regarding events associated with the instance.

" - } - }, - "InstanceStatusList": { - "base": null, - "refs": { - "DescribeInstanceStatusResult$InstanceStatuses": "

One or more instance status descriptions.

" - } - }, - "InstanceStatusSummary": { - "base": "

Describes the status of an instance.

", - "refs": { - "InstanceStatus$SystemStatus": "

Reports impaired functionality that stems from issues related to the systems that support an instance, such as hardware failures and network connectivity problems.

", - "InstanceStatus$InstanceStatus": "

Reports impaired functionality that stems from issues internal to the instance, such as impaired reachability.

" - } - }, - "InstanceType": { - "base": null, - "refs": { - "DescribeReservedInstancesOfferingsRequest$InstanceType": "

The instance type on which the Reserved Instance can be used. For more information, see Instance Types in the Amazon Elastic Compute Cloud User Guide for Linux.

", - "ImportInstanceLaunchSpecification$InstanceType": "

The instance type. This is not supported for VMs imported into a VPC, which are assigned the default security group. After a VM is imported into a VPC, you can specify another security group using the AWS Management Console. For more information, see Instance Types in the Amazon Elastic Compute Cloud User Guide for Linux. For more information about the Linux instance types you can import, see Before You Get Started in the Amazon Elastic Compute Cloud User Guide for Linux.

", - "Instance$InstanceType": "

The instance type.

", - "InstanceTypeList$member": null, - "LaunchSpecification$InstanceType": "

The instance type.

", - "ReservedInstances$InstanceType": "

The instance type on which the Reserved Instance can be used.

", - "ReservedInstancesConfiguration$InstanceType": "

The instance type for the modified Reserved Instances.

", - "ReservedInstancesOffering$InstanceType": "

The instance type on which the Reserved Instance can be used.

", - "RunInstancesRequest$InstanceType": "

The instance type. For more information, see Instance Types in the Amazon Elastic Compute Cloud User Guide for Linux.

Default: m1.small

", - "SpotPrice$InstanceType": "

The instance type.

", - "RequestSpotLaunchSpecification$InstanceType": "

The instance type.

" - } - }, - "InstanceTypeList": { - "base": null, - "refs": { - "DescribeSpotPriceHistoryRequest$InstanceTypes": "

Filters the results by the specified instance types.

" - } - }, - "Integer": { - "base": null, - "refs": { - "AssignPrivateIpAddressesRequest$SecondaryPrivateIpAddressCount": "

The number of secondary IP addresses to assign to the network interface. You can't specify this parameter when also specifying private IP addresses.

", - "AttachNetworkInterfaceRequest$DeviceIndex": "

The index of the device for the network interface attachment.

", - "AuthorizeSecurityGroupEgressRequest$FromPort": "

The start of port range for the TCP and UDP protocols, or an ICMP type number. For the ICMP type number, use -1 to specify all ICMP types.

", - "AuthorizeSecurityGroupEgressRequest$ToPort": "

The end of port range for the TCP and UDP protocols, or an ICMP code number. For the ICMP code number, use -1 to specify all ICMP codes for the ICMP type.

", - "AuthorizeSecurityGroupIngressRequest$FromPort": "

The start of port range for the TCP and UDP protocols, or an ICMP type number. For the ICMP type number, use -1 to specify all ICMP types.

", - "AuthorizeSecurityGroupIngressRequest$ToPort": "

The end of port range for the TCP and UDP protocols, or an ICMP code number. For the ICMP code number, use -1 to specify all ICMP codes for the ICMP type.

", - "CreateCustomerGatewayRequest$BgpAsn": "

For devices that support BGP, the customer gateway's BGP ASN.

Default: 65000

", - "CreateNetworkAclEntryRequest$RuleNumber": "

The rule number for the entry (for example, 100). ACL entries are processed in ascending order by rule number.

Constraints: Positive integer from 1 to 32766

", - "CreateNetworkInterfaceRequest$SecondaryPrivateIpAddressCount": "

The number of secondary private IP addresses to assign to a network interface. When you specify a number of secondary IP addresses, Amazon EC2 selects these IP addresses within the subnet range. You can't specify this option and specify more than one private IP address using privateIpAddresses.

The number of IP addresses you can assign to a network interface varies by instance type. For more information, see Private IP Addresses Per ENI Per Instance Type in the Amazon Elastic Compute Cloud User Guide for Linux.

", - "CreateReservedInstancesListingRequest$InstanceCount": "

The number of instances that are a part of a Reserved Instance account to be listed in the Reserved Instance Marketplace. This number should be less than or equal to the instance count associated with the Reserved Instance ID specified in this call.

", - "CreateVolumeRequest$Size": "

The size of the volume, in GiBs.

Constraints: 1-1024 for standard volumes, 1-16384 for gp2 volumes, and 4-16384 for io1 volumes. If you specify a snapshot, the volume size must be equal to or larger than the snapshot size.

Default: If you're creating the volume from a snapshot and don't specify a volume size, the default is the snapshot size.

", - "CreateVolumeRequest$Iops": "

Only valid for Provisioned IOPS (SSD) volumes. The number of I/O operations per second (IOPS) to provision for the volume, with a maximum ratio of 30 IOPS/GiB.

Constraint: Range is 100 to 20000 for Provisioned IOPS (SSD) volumes

", - "DeleteNetworkAclEntryRequest$RuleNumber": "

The rule number of the entry to delete.

", - "DescribeClassicLinkInstancesRequest$MaxResults": "

The maximum number of results to return for the request in a single page. The remaining results of the initial request can be seen by sending another request with the returned NextToken value. This value can be between 5 and 1000; if MaxResults is given a value larger than 1000, only 1000 results are returned. You cannot specify this parameter and the instance IDs parameter in the same request.

Constraint: If the value is greater than 1000, we return only 1000 items.

", - "DescribeInstanceStatusRequest$MaxResults": "

The maximum number of results to return for the request in a single page. The remaining results of the initial request can be seen by sending another request with the returned NextToken value. This value can be between 5 and 1000; if MaxResults is given a value larger than 1000, only 1000 results are returned. You cannot specify this parameter and the instance IDs parameter in the same request.

", - "DescribeInstancesRequest$MaxResults": "

The maximum number of results to return for the request in a single page. The remaining results of the initial request can be seen by sending another request with the returned NextToken value. This value can be between 5 and 1000; if MaxResults is given a value larger than 1000, only 1000 results are returned. You cannot specify this parameter and the instance IDs parameter in the same request.

", - "DescribeReservedInstancesOfferingsRequest$MaxResults": "

The maximum number of results to return for the request in a single page. The remaining results of the initial request can be seen by sending another request with the returned NextToken value. The maximum is 100.

Default: 100

", - "DescribeReservedInstancesOfferingsRequest$MaxInstanceCount": "

The maximum number of instances to filter when searching for offerings.

Default: 20

", - "DescribeSnapshotsRequest$MaxResults": "

The maximum number of snapshot results returned by DescribeSnapshots in paginated output. When this parameter is used, DescribeSnapshots only returns MaxResults results in a single page along with a NextToken response element. The remaining results of the initial request can be seen by sending another DescribeSnapshots request with the returned NextToken value. This value can be between 5 and 1000; if MaxResults is given a value larger than 1000, only 1000 results are returned. If this parameter is not used, then DescribeSnapshots returns all results. You cannot specify this parameter and the snapshot IDs parameter in the same request.

", - "DescribeSpotPriceHistoryRequest$MaxResults": "

The maximum number of results to return for the request in a single page. The remaining results of the initial request can be seen by sending another request with the returned NextToken value. This value can be between 5 and 1000; if MaxResults is given a value larger than 1000, only 1000 results are returned.

", - "DescribeTagsRequest$MaxResults": "

The maximum number of results to return for the request in a single page. The remaining results of the initial request can be seen by sending another request with the returned NextToken value. This value can be between 5 and 1000; if MaxResults is given a value larger than 1000, only 1000 results are returned.

", - "DescribeVolumeStatusRequest$MaxResults": "

The maximum number of volume results returned by DescribeVolumeStatus in paginated output. When this parameter is used, the request only returns MaxResults results in a single page along with a NextToken response element. The remaining results of the initial request can be seen by sending another request with the returned NextToken value. This value can be between 5 and 1000; if MaxResults is given a value larger than 1000, only 1000 results are returned. If this parameter is not used, then DescribeVolumeStatus returns all results. You cannot specify this parameter and the volume IDs parameter in the same request.

", - "DescribeVolumesRequest$MaxResults": "

The maximum number of volume results returned by DescribeVolumes in paginated output. When this parameter is used, DescribeVolumes only returns MaxResults results in a single page along with a NextToken response element. The remaining results of the initial request can be seen by sending another DescribeVolumes request with the returned NextToken value. This value can be between 5 and 1000; if MaxResults is given a value larger than 1000, only 1000 results are returned. If this parameter is not used, then DescribeVolumes returns all results. You cannot specify this parameter and the volume IDs parameter in the same request.

", - "EbsBlockDevice$VolumeSize": "

The size of the volume, in GiB.

Constraints: 1-1024 for standard volumes, 1-16384 for gp2 volumes, and 4-16384 for io1 volumes. If you specify a snapshot, the volume size must be equal to or larger than the snapshot size.

Default: If you're creating the volume from a snapshot and don't specify a volume size, the default is the snapshot size.

", - "EbsBlockDevice$Iops": "

The number of I/O operations per second (IOPS) that the volume supports. For Provisioned IOPS (SSD) volumes, this represents the number of IOPS that are provisioned for the volume. For General Purpose (SSD) volumes, this represents the baseline performance of the volume and the rate at which the volume accumulates I/O credits for bursting. For more information on General Purpose (SSD) baseline performance, I/O credits, and bursting, see Amazon EBS Volume Types in the Amazon Elastic Compute Cloud User Guide for Linux.

Constraint: Range is 100 to 20000 for Provisioned IOPS (SSD) volumes and 3 to 10000 for General Purpose (SSD) volumes.

Condition: This parameter is required for requests to create io1 volumes; it is not used in requests to create standard or gp2 volumes.

", - "IcmpTypeCode$Type": "

The ICMP code. A value of -1 means all codes for the specified ICMP type.

", - "IcmpTypeCode$Code": "

The ICMP type. A value of -1 means all types.

", - "Instance$AmiLaunchIndex": "

The AMI launch index, which can be used to find this instance in the launch group.

", - "InstanceCount$InstanceCount": "

he number of listed Reserved Instances in the state specified by the state.

", - "InstanceNetworkInterfaceAttachment$DeviceIndex": "

The index of the device on the instance for the network interface attachment.

", - "InstanceNetworkInterfaceSpecification$DeviceIndex": "

The index of the device on the instance for the network interface attachment. If you are specifying a network interface in a RunInstances request, you must provide the device index.

", - "InstanceNetworkInterfaceSpecification$SecondaryPrivateIpAddressCount": "

The number of secondary private IP addresses. You can't specify this option and specify more than one private IP address using the private IP addresses option.

", - "InstanceState$Code": "

The low byte represents the state. The high byte is an opaque internal value and should be ignored.

  • 0 : pending

  • 16 : running

  • 32 : shutting-down

  • 48 : terminated

  • 64 : stopping

  • 80 : stopped

", - "IpPermission$FromPort": "

The start of port range for the TCP and UDP protocols, or an ICMP type number. A value of -1 indicates all ICMP types.

", - "IpPermission$ToPort": "

The end of port range for the TCP and UDP protocols, or an ICMP code. A value of -1 indicates all ICMP codes for the specified ICMP type.

", - "NetworkAclEntry$RuleNumber": "

The rule number for the entry. ACL entries are processed in ascending order by rule number.

", - "NetworkInterfaceAttachment$DeviceIndex": "

The device index of the network interface attachment on the instance.

", - "PortRange$From": "

The first port in the range.

", - "PortRange$To": "

The last port in the range.

", - "PricingDetail$Count": "

The number of instances available for the price.

", - "PurchaseReservedInstancesOfferingRequest$InstanceCount": "

The number of Reserved Instances to purchase.

", - "ReplaceNetworkAclEntryRequest$RuleNumber": "

The rule number of the entry to replace.

", - "RequestSpotInstancesRequest$InstanceCount": "

The maximum number of Spot Instances to launch.

Default: 1

", - "ReservedInstances$InstanceCount": "

The number of Reserved Instances purchased.

", - "ReservedInstancesConfiguration$InstanceCount": "

The number of modified Reserved Instances.

", - "RevokeSecurityGroupEgressRequest$FromPort": "

The start of port range for the TCP and UDP protocols, or an ICMP type number. For the ICMP type number, use -1 to specify all ICMP types.

", - "RevokeSecurityGroupEgressRequest$ToPort": "

The end of port range for the TCP and UDP protocols, or an ICMP code number. For the ICMP code number, use -1 to specify all ICMP codes for the ICMP type.

", - "RevokeSecurityGroupIngressRequest$FromPort": "

The start of port range for the TCP and UDP protocols, or an ICMP type number. For the ICMP type number, use -1 to specify all ICMP types.

", - "RevokeSecurityGroupIngressRequest$ToPort": "

The end of port range for the TCP and UDP protocols, or an ICMP code number. For the ICMP code number, use -1 to specify all ICMP codes for the ICMP type.

", - "RunInstancesRequest$MinCount": "

The minimum number of instances to launch. If you specify a minimum that is more instances than Amazon EC2 can launch in the target Availability Zone, Amazon EC2 launches no instances.

Constraints: Between 1 and the maximum number you're allowed for the specified instance type. For more information about the default limits, and how to request an increase, see How many instances can I run in Amazon EC2 in the Amazon EC2 General FAQ.

", - "RunInstancesRequest$MaxCount": "

The maximum number of instances to launch. If you specify more instances than Amazon EC2 can launch in the target Availability Zone, Amazon EC2 launches the largest possible number of instances above MinCount.

Constraints: Between 1 and the maximum number you're allowed for the specified instance type. For more information about the default limits, and how to request an increase, see How many instances can I run in Amazon EC2 in the Amazon EC2 General FAQ.

", - "Snapshot$VolumeSize": "

The size of the volume, in GiB.

", - "Subnet$AvailableIpAddressCount": "

The number of unused IP addresses in the subnet. Note that the IP addresses for any stopped instances are considered unavailable.

", - "VgwTelemetry$AcceptedRouteCount": "

The number of accepted routes.

", - "Volume$Size": "

The size of the volume, in GiBs.

", - "Volume$Iops": "

The number of I/O operations per second (IOPS) that the volume supports. For Provisioned IOPS (SSD) volumes, this represents the number of IOPS that are provisioned for the volume. For General Purpose (SSD) volumes, this represents the baseline performance of the volume and the rate at which the volume accumulates I/O credits for bursting. For more information on General Purpose (SSD) baseline performance, I/O credits, and bursting, see Amazon EBS Volume Types in the Amazon Elastic Compute Cloud User Guide for Linux.

Constraint: Range is 100 to 20000 for Provisioned IOPS (SSD) volumes and 3 to 10000 for General Purpose (SSD) volumes.

Condition: This parameter is required for requests to create io1 volumes; it is not used in requests to create standard or gp2 volumes.

" - } - }, - "InternetGateway": { - "base": "

Describes an Internet gateway.

", - "refs": { - "CreateInternetGatewayResult$InternetGateway": "

Information about the Internet gateway.

", - "InternetGatewayList$member": null - } - }, - "InternetGatewayAttachment": { - "base": "

Describes the attachment of a VPC to an Internet gateway.

", - "refs": { - "InternetGatewayAttachmentList$member": null - } - }, - "InternetGatewayAttachmentList": { - "base": null, - "refs": { - "InternetGateway$Attachments": "

Any VPCs attached to the Internet gateway.

" - } - }, - "InternetGatewayList": { - "base": null, - "refs": { - "DescribeInternetGatewaysResult$InternetGateways": "

Information about one or more Internet gateways.

" - } - }, - "IpPermission": { - "base": "

Describes a security group rule.

", - "refs": { - "IpPermissionList$member": null - } - }, - "IpPermissionList": { - "base": null, - "refs": { - "AuthorizeSecurityGroupEgressRequest$IpPermissions": "

A set of IP permissions. You can't specify a destination security group and a CIDR IP address range.

", - "AuthorizeSecurityGroupIngressRequest$IpPermissions": "

A set of IP permissions. Can be used to specify multiple rules in a single command.

", - "RevokeSecurityGroupEgressRequest$IpPermissions": "

A set of IP permissions. You can't specify a destination security group and a CIDR IP address range.

", - "RevokeSecurityGroupIngressRequest$IpPermissions": "

A set of IP permissions. You can't specify a source security group and a CIDR IP address range.

", - "SecurityGroup$IpPermissions": "

One or more inbound rules associated with the security group.

", - "SecurityGroup$IpPermissionsEgress": "

[EC2-VPC] One or more outbound rules associated with the security group.

" - } - }, - "IpRange": { - "base": "

Describes an IP range.

", - "refs": { - "IpRangeList$member": null - } - }, - "IpRangeList": { - "base": null, - "refs": { - "IpPermission$IpRanges": "

One or more IP ranges.

" - } - }, - "KeyNameStringList": { - "base": null, - "refs": { - "DescribeKeyPairsRequest$KeyNames": "

One or more key pair names.

Default: Describes all your key pairs.

" - } - }, - "KeyPair": { - "base": "

Describes a key pair.

", - "refs": { - } - }, - "KeyPairInfo": { - "base": "

Describes a key pair.

", - "refs": { - "KeyPairList$member": null - } - }, - "KeyPairList": { - "base": null, - "refs": { - "DescribeKeyPairsResult$KeyPairs": "

Information about one or more key pairs.

" - } - }, - "LaunchPermission": { - "base": "

Describes a launch permission.

", - "refs": { - "LaunchPermissionList$member": null - } - }, - "LaunchPermissionList": { - "base": null, - "refs": { - "ImageAttribute$LaunchPermissions": "

One or more launch permissions.

", - "LaunchPermissionModifications$Add": "

The AWS account ID to add to the list of launch permissions for the AMI.

", - "LaunchPermissionModifications$Remove": "

The AWS account ID to remove from the list of launch permissions for the AMI.

" - } - }, - "LaunchPermissionModifications": { - "base": "

Describes a launch permission modification.

", - "refs": { - "ModifyImageAttributeRequest$LaunchPermission": "

A launch permission modification.

" - } - }, - "LaunchSpecification": { - "base": "

Describes the launch specification for an instance.

", - "refs": { - "SpotInstanceRequest$LaunchSpecification": "

Additional information for launching instances.

" - } - }, - "ListingState": { - "base": null, - "refs": { - "InstanceCount$State": "

The states of the listed Reserved Instances.

" - } - }, - "ListingStatus": { - "base": null, - "refs": { - "ReservedInstancesListing$Status": "

The status of the Reserved Instance listing.

" - } - }, - "Long": { - "base": null, - "refs": { - "DescribeReservedInstancesOfferingsRequest$MinDuration": "

The minimum duration (in seconds) to filter when searching for offerings.

Default: 2592000 (1 month)

", - "DescribeReservedInstancesOfferingsRequest$MaxDuration": "

The maximum duration (in seconds) to filter when searching for offerings.

Default: 94608000 (3 years)

", - "DiskImageDescription$Size": "

The size of the disk image.

", - "DiskImageDetail$Bytes": null, - "DiskImageVolumeDescription$Size": "

The size of the volume.

", - "ImportInstanceVolumeDetailItem$BytesConverted": "

The number of bytes converted so far.

", - "ImportVolumeTaskDetails$BytesConverted": "

The number of bytes converted so far.

", - "PriceSchedule$Term": "

The number of months remaining in the reservation. For example, 2 is the second to the last month before the capacity reservation expires.

", - "PriceScheduleSpecification$Term": "

The number of months remaining in the reservation. For example, 2 is the second to the last month before the capacity reservation expires.

", - "ReservedInstances$Duration": "

The duration of the Reserved Instance, in seconds.

", - "ReservedInstancesOffering$Duration": "

The duration of the Reserved Instance, in seconds.

", - "VolumeDetail$Size": "

The size of the volume, in GiB.

" - } - }, - "ModifyImageAttributeRequest": { - "base": null, - "refs": { - } - }, - "ModifyInstanceAttributeRequest": { - "base": null, - "refs": { - } - }, - "ModifyNetworkInterfaceAttributeRequest": { - "base": null, - "refs": { - } - }, - "ModifyReservedInstancesRequest": { - "base": null, - "refs": { - } - }, - "ModifyReservedInstancesResult": { - "base": null, - "refs": { - } - }, - "ModifySnapshotAttributeRequest": { - "base": null, - "refs": { - } - }, - "ModifySubnetAttributeRequest": { - "base": null, - "refs": { - } - }, - "ModifyVolumeAttributeRequest": { - "base": null, - "refs": { - } - }, - "ModifyVpcAttributeRequest": { - "base": null, - "refs": { - } - }, - "MonitorInstancesRequest": { - "base": null, - "refs": { - } - }, - "MonitorInstancesResult": { - "base": null, - "refs": { - } - }, - "Monitoring": { - "base": "

Describes the monitoring for the instance.

", - "refs": { - "Instance$Monitoring": "

The monitoring information for the instance.

", - "InstanceMonitoring$Monitoring": "

The monitoring information.

" - } - }, - "MonitoringState": { - "base": null, - "refs": { - "Monitoring$State": "

Indicates whether monitoring is enabled for the instance.

" - } - }, - "NetworkAcl": { - "base": "

Describes a network ACL.

", - "refs": { - "CreateNetworkAclResult$NetworkAcl": "

Information about the network ACL.

", - "NetworkAclList$member": null - } - }, - "NetworkAclAssociation": { - "base": "

Describes an association between a network ACL and a subnet.

", - "refs": { - "NetworkAclAssociationList$member": null - } - }, - "NetworkAclAssociationList": { - "base": null, - "refs": { - "NetworkAcl$Associations": "

Any associations between the network ACL and one or more subnets

" - } - }, - "NetworkAclEntry": { - "base": "

Describes an entry in a network ACL.

", - "refs": { - "NetworkAclEntryList$member": null - } - }, - "NetworkAclEntryList": { - "base": null, - "refs": { - "NetworkAcl$Entries": "

One or more entries (rules) in the network ACL.

" - } - }, - "NetworkAclList": { - "base": null, - "refs": { - "DescribeNetworkAclsResult$NetworkAcls": "

Information about one or more network ACLs.

" - } - }, - "NetworkInterface": { - "base": "

Describes a network interface.

", - "refs": { - "CreateNetworkInterfaceResult$NetworkInterface": "

Information about the network interface.

", - "NetworkInterfaceList$member": null - } - }, - "NetworkInterfaceAssociation": { - "base": "

Describes association information for an Elastic IP address.

", - "refs": { - "NetworkInterface$Association": "

The association information for an Elastic IP associated with the network interface.

", - "NetworkInterfacePrivateIpAddress$Association": "

The association information for an Elastic IP address associated with the network interface.

" - } - }, - "NetworkInterfaceAttachment": { - "base": "

Describes a network interface attachment.

", - "refs": { - "DescribeNetworkInterfaceAttributeResult$Attachment": "

The attachment (if any) of the network interface.

", - "NetworkInterface$Attachment": "

The network interface attachment.

" - } - }, - "NetworkInterfaceAttachmentChanges": { - "base": "

Describes an attachment change.

", - "refs": { - "ModifyNetworkInterfaceAttributeRequest$Attachment": "

Information about the interface attachment. If modifying the 'delete on termination' attribute, you must specify the ID of the interface attachment.

" - } - }, - "NetworkInterfaceAttribute": { - "base": null, - "refs": { - "DescribeNetworkInterfaceAttributeRequest$Attribute": "

The attribute of the network interface.

" - } - }, - "NetworkInterfaceIdList": { - "base": null, - "refs": { - "DescribeNetworkInterfacesRequest$NetworkInterfaceIds": "

One or more network interface IDs.

Default: Describes all your network interfaces.

" - } - }, - "NetworkInterfaceList": { - "base": null, - "refs": { - "DescribeNetworkInterfacesResult$NetworkInterfaces": "

Information about one or more network interfaces.

" - } - }, - "NetworkInterfacePrivateIpAddress": { - "base": "

Describes the private IP address of a network interface.

", - "refs": { - "NetworkInterfacePrivateIpAddressList$member": null - } - }, - "NetworkInterfacePrivateIpAddressList": { - "base": null, - "refs": { - "NetworkInterface$PrivateIpAddresses": "

The private IP addresses associated with the network interface.

" - } - }, - "NetworkInterfaceStatus": { - "base": null, - "refs": { - "InstanceNetworkInterface$Status": "

The status of the network interface.

", - "NetworkInterface$Status": "

The status of the network interface.

" - } - }, - "OfferingTypeValues": { - "base": null, - "refs": { - "DescribeReservedInstancesOfferingsRequest$OfferingType": "

The Reserved Instance offering type. If you are using tools that predate the 2011-11-01 API version, you only have access to the Medium Utilization Reserved Instance offering type.

", - "DescribeReservedInstancesRequest$OfferingType": "

The Reserved Instance offering type. If you are using tools that predate the 2011-11-01 API version, you only have access to the Medium Utilization Reserved Instance offering type.

", - "ReservedInstances$OfferingType": "

The Reserved Instance offering type.

", - "ReservedInstancesOffering$OfferingType": "

The Reserved Instance offering type.

" - } - }, - "OwnerStringList": { - "base": null, - "refs": { - "DescribeImagesRequest$Owners": "

Filters the images by the owner. Specify an AWS account ID, amazon (owner is Amazon), aws-marketplace (owner is AWS Marketplace), self (owner is the sender of the request). Omitting this option returns all images for which you have launch permissions, regardless of ownership.

", - "DescribeSnapshotsRequest$OwnerIds": "

Returns the snapshots owned by the specified owner. Multiple owners can be specified.

" - } - }, - "PermissionGroup": { - "base": null, - "refs": { - "CreateVolumePermission$Group": "

The specific group that is to be added or removed from a volume's list of create volume permissions.

", - "LaunchPermission$Group": "

The name of the group.

" - } - }, - "Placement": { - "base": "

Describes the placement for the instance.

", - "refs": { - "ImportInstanceLaunchSpecification$Placement": null, - "Instance$Placement": "

The location where the instance launched.

", - "RunInstancesRequest$Placement": "

The placement for the instance.

" - } - }, - "PlacementGroup": { - "base": "

Describes a placement group.

", - "refs": { - "PlacementGroupList$member": null - } - }, - "PlacementGroupList": { - "base": null, - "refs": { - "DescribePlacementGroupsResult$PlacementGroups": "

One or more placement groups.

" - } - }, - "PlacementGroupState": { - "base": null, - "refs": { - "PlacementGroup$State": "

The state of the placement group.

" - } - }, - "PlacementGroupStringList": { - "base": null, - "refs": { - "DescribePlacementGroupsRequest$GroupNames": "

One or more placement group names.

Default: Describes all your placement groups, or only those otherwise specified.

" - } - }, - "PlacementStrategy": { - "base": null, - "refs": { - "CreatePlacementGroupRequest$Strategy": "

The placement strategy.

", - "PlacementGroup$Strategy": "

The placement strategy.

" - } - }, - "PlatformValues": { - "base": null, - "refs": { - "Image$Platform": "

The value is Windows for Windows AMIs; otherwise blank.

", - "ImportInstanceRequest$Platform": "

The instance operating system.

", - "ImportInstanceTaskDetails$Platform": "

The instance operating system.

", - "Instance$Platform": "

The value is Windows for Windows instances; otherwise blank.

" - } - }, - "PortRange": { - "base": "

Describes a range of ports.

", - "refs": { - "CreateNetworkAclEntryRequest$PortRange": "

TCP or UDP protocols: The range of ports the rule applies to.

", - "NetworkAclEntry$PortRange": "

TCP or UDP protocols: The range of ports the rule applies to.

", - "ReplaceNetworkAclEntryRequest$PortRange": "

TCP or UDP protocols: The range of ports the rule applies to. Required if specifying 6 (TCP) or 17 (UDP) for the protocol.

" - } - }, - "PriceSchedule": { - "base": "

Describes the price for a Reserved Instance.

", - "refs": { - "PriceScheduleList$member": null - } - }, - "PriceScheduleList": { - "base": null, - "refs": { - "ReservedInstancesListing$PriceSchedules": "

The price of the Reserved Instance listing.

" - } - }, - "PriceScheduleSpecification": { - "base": "

Describes the price for a Reserved Instance.

", - "refs": { - "PriceScheduleSpecificationList$member": null - } - }, - "PriceScheduleSpecificationList": { - "base": null, - "refs": { - "CreateReservedInstancesListingRequest$PriceSchedules": "

A list specifying the price of the Reserved Instance for each month remaining in the Reserved Instance term.

" - } - }, - "PricingDetail": { - "base": "

Describes a Reserved Instance offering.

", - "refs": { - "PricingDetailsList$member": null - } - }, - "PricingDetailsList": { - "base": null, - "refs": { - "ReservedInstancesOffering$PricingDetails": "

The pricing details of the Reserved Instance offering.

" - } - }, - "PrivateIpAddressSpecification": { - "base": "

Describes a secondary private IP address for a network interface.

", - "refs": { - "PrivateIpAddressSpecificationList$member": null - } - }, - "PrivateIpAddressSpecificationList": { - "base": null, - "refs": { - "CreateNetworkInterfaceRequest$PrivateIpAddresses": "

One or more private IP addresses.

", - "InstanceNetworkInterfaceSpecification$PrivateIpAddresses": "

One or more private IP addresses to assign to the network interface. Only one private IP address can be designated as primary.

" - } - }, - "PrivateIpAddressStringList": { - "base": null, - "refs": { - "AssignPrivateIpAddressesRequest$PrivateIpAddresses": "

One or more IP addresses to be assigned as a secondary private IP address to the network interface. You can't specify this parameter when also specifying a number of secondary IP addresses.

If you don't specify an IP address, Amazon EC2 automatically selects an IP address within the subnet range.

", - "UnassignPrivateIpAddressesRequest$PrivateIpAddresses": "

The secondary private IP addresses to unassign from the network interface. You can specify this option multiple times to unassign more than one IP address.

" - } - }, - "ProductCode": { - "base": "

Describes a product code.

", - "refs": { - "ProductCodeList$member": null - } - }, - "ProductCodeList": { - "base": null, - "refs": { - "DescribeSnapshotAttributeResult$ProductCodes": "

A list of product codes.

", - "DescribeVolumeAttributeResult$ProductCodes": "

A list of product codes.

", - "Image$ProductCodes": "

Any product codes associated with the AMI.

", - "ImageAttribute$ProductCodes": "

One or more product codes.

", - "Instance$ProductCodes": "

The product codes attached to this instance.

", - "InstanceAttribute$ProductCodes": "

A list of product codes.

" - } - }, - "ProductCodeStringList": { - "base": null, - "refs": { - "ModifyImageAttributeRequest$ProductCodes": "

One or more product codes. After you add a product code to an AMI, it can't be removed. This is only valid when modifying the productCodes attribute.

" - } - }, - "ProductCodeValues": { - "base": null, - "refs": { - "ProductCode$ProductCodeType": "

The type of product code.

" - } - }, - "ProductDescriptionList": { - "base": null, - "refs": { - "DescribeSpotPriceHistoryRequest$ProductDescriptions": "

Filters the results by the specified basic product descriptions.

" - } - }, - "PropagatingVgw": { - "base": "

Describes a virtual private gateway propagating route.

", - "refs": { - "PropagatingVgwList$member": null - } - }, - "PropagatingVgwList": { - "base": null, - "refs": { - "RouteTable$PropagatingVgws": "

Any virtual private gateway (VGW) propagating routes.

" - } - }, - "PublicIpStringList": { - "base": null, - "refs": { - "DescribeAddressesRequest$PublicIps": "

[EC2-Classic] One or more Elastic IP addresses.

Default: Describes all your Elastic IP addresses.

" - } - }, - "PurchaseReservedInstancesOfferingRequest": { - "base": null, - "refs": { - } - }, - "PurchaseReservedInstancesOfferingResult": { - "base": null, - "refs": { - } - }, - "RIProductDescription": { - "base": null, - "refs": { - "DescribeReservedInstancesOfferingsRequest$ProductDescription": "

The Reserved Instance description. Instances that include (Amazon VPC) in the description are for use with Amazon VPC.

", - "ReservedInstances$ProductDescription": "

The Reserved Instance description.

", - "ReservedInstancesOffering$ProductDescription": "

The Reserved Instance description.

", - "SpotInstanceRequest$ProductDescription": "

The product description associated with the Spot Instance.

", - "SpotPrice$ProductDescription": "

A general description of the AMI.

" - } - }, - "ReasonCodesList": { - "base": null, - "refs": { - "ReportInstanceStatusRequest$ReasonCodes": "

One or more reason codes that describes the health state of your instance.

  • instance-stuck-in-state: My instance is stuck in a state.

  • unresponsive: My instance is unresponsive.

  • not-accepting-credentials: My instance is not accepting my credentials.

  • password-not-available: A password is not available for my instance.

  • performance-network: My instance is experiencing performance problems which I believe are network related.

  • performance-instance-store: My instance is experiencing performance problems which I believe are related to the instance stores.

  • performance-ebs-volume: My instance is experiencing performance problems which I believe are related to an EBS volume.

  • performance-other: My instance is experiencing performance problems.

  • other: [explain using the description parameter]

" - } - }, - "RebootInstancesRequest": { - "base": null, - "refs": { - } - }, - "RecurringCharge": { - "base": "

Describes a recurring charge.

", - "refs": { - "RecurringChargesList$member": null - } - }, - "RecurringChargeFrequency": { - "base": null, - "refs": { - "RecurringCharge$Frequency": "

The frequency of the recurring charge.

" - } - }, - "RecurringChargesList": { - "base": null, - "refs": { - "ReservedInstances$RecurringCharges": "

The recurring charge tag assigned to the resource.

", - "ReservedInstancesOffering$RecurringCharges": "

The recurring charge tag assigned to the resource.

" - } - }, - "Region": { - "base": "

Describes a region.

", - "refs": { - "RegionList$member": null - } - }, - "RegionList": { - "base": null, - "refs": { - "DescribeRegionsResult$Regions": "

Information about one or more regions.

" - } - }, - "RegionNameStringList": { - "base": null, - "refs": { - "DescribeRegionsRequest$RegionNames": "

The names of one or more regions.

" - } - }, - "RegisterImageRequest": { - "base": null, - "refs": { - } - }, - "RegisterImageResult": { - "base": null, - "refs": { - } - }, - "RejectVpcPeeringConnectionRequest": { - "base": null, - "refs": { - } - }, - "RejectVpcPeeringConnectionResult": { - "base": null, - "refs": { - } - }, - "ReleaseAddressRequest": { - "base": null, - "refs": { - } - }, - "ReplaceNetworkAclAssociationRequest": { - "base": null, - "refs": { - } - }, - "ReplaceNetworkAclAssociationResult": { - "base": null, - "refs": { - } - }, - "ReplaceNetworkAclEntryRequest": { - "base": null, - "refs": { - } - }, - "ReplaceRouteRequest": { - "base": null, - "refs": { - } - }, - "ReplaceRouteTableAssociationRequest": { - "base": null, - "refs": { - } - }, - "ReplaceRouteTableAssociationResult": { - "base": null, - "refs": { - } - }, - "ReportInstanceReasonCodes": { - "base": null, - "refs": { - "ReasonCodesList$member": null - } - }, - "ReportInstanceStatusRequest": { - "base": null, - "refs": { - } - }, - "ReportStatusType": { - "base": null, - "refs": { - "ReportInstanceStatusRequest$Status": "

The status of all instances listed.

" - } - }, - "RequestSpotInstancesRequest": { - "base": null, - "refs": { - } - }, - "RequestSpotInstancesResult": { - "base": null, - "refs": { - } - }, - "Reservation": { - "base": "

Describes a reservation.

", - "refs": { - "ReservationList$member": null - } - }, - "ReservationList": { - "base": null, - "refs": { - "DescribeInstancesResult$Reservations": "

One or more reservations.

" - } - }, - "ReservedInstanceLimitPrice": { - "base": "

Describes the limit price of a Reserved Instance offering.

", - "refs": { - "PurchaseReservedInstancesOfferingRequest$LimitPrice": "

Specified for Reserved Instance Marketplace offerings to limit the total order and ensure that the Reserved Instances are not purchased at unexpected prices.

" - } - }, - "ReservedInstanceState": { - "base": null, - "refs": { - "ReservedInstances$State": "

The state of the Reserved Instance purchase.

" - } - }, - "ReservedInstances": { - "base": "

Describes a Reserved Instance.

", - "refs": { - "ReservedInstancesList$member": null - } - }, - "ReservedInstancesConfiguration": { - "base": "

Describes the configuration settings for the modified Reserved Instances.

", - "refs": { - "ReservedInstancesConfigurationList$member": null, - "ReservedInstancesModificationResult$TargetConfiguration": "

The target Reserved Instances configurations supplied as part of the modification request.

" - } - }, - "ReservedInstancesConfigurationList": { - "base": null, - "refs": { - "ModifyReservedInstancesRequest$TargetConfigurations": "

The configuration settings for the Reserved Instances to modify.

" - } - }, - "ReservedInstancesId": { - "base": "

Describes the ID of a Reserved Instance.

", - "refs": { - "ReservedIntancesIds$member": null - } - }, - "ReservedInstancesIdStringList": { - "base": null, - "refs": { - "DescribeReservedInstancesRequest$ReservedInstancesIds": "

One or more Reserved Instance IDs.

Default: Describes all your Reserved Instances, or only those otherwise specified.

", - "ModifyReservedInstancesRequest$ReservedInstancesIds": "

The IDs of the Reserved Instances to modify.

" - } - }, - "ReservedInstancesList": { - "base": null, - "refs": { - "DescribeReservedInstancesResult$ReservedInstances": "

A list of Reserved Instances.

" - } - }, - "ReservedInstancesListing": { - "base": "

Describes a Reserved Instance listing.

", - "refs": { - "ReservedInstancesListingList$member": null - } - }, - "ReservedInstancesListingList": { - "base": null, - "refs": { - "CancelReservedInstancesListingResult$ReservedInstancesListings": "

The Reserved Instance listing.

", - "CreateReservedInstancesListingResult$ReservedInstancesListings": "

Information about the Reserved Instances listing.

", - "DescribeReservedInstancesListingsResult$ReservedInstancesListings": "

Information about the Reserved Instance listing.

" - } - }, - "ReservedInstancesModification": { - "base": "

Describes a Reserved Instance modification.

", - "refs": { - "ReservedInstancesModificationList$member": null - } - }, - "ReservedInstancesModificationIdStringList": { - "base": null, - "refs": { - "DescribeReservedInstancesModificationsRequest$ReservedInstancesModificationIds": "

IDs for the submitted modification request.

" - } - }, - "ReservedInstancesModificationList": { - "base": null, - "refs": { - "DescribeReservedInstancesModificationsResult$ReservedInstancesModifications": "

The Reserved Instance modification information.

" - } - }, - "ReservedInstancesModificationResult": { - "base": null, - "refs": { - "ReservedInstancesModificationResultList$member": null - } - }, - "ReservedInstancesModificationResultList": { - "base": null, - "refs": { - "ReservedInstancesModification$ModificationResults": "

Contains target configurations along with their corresponding new Reserved Instance IDs.

" - } - }, - "ReservedInstancesOffering": { - "base": "

Describes a Reserved Instance offering.

", - "refs": { - "ReservedInstancesOfferingList$member": null - } - }, - "ReservedInstancesOfferingIdStringList": { - "base": null, - "refs": { - "DescribeReservedInstancesOfferingsRequest$ReservedInstancesOfferingIds": "

One or more Reserved Instances offering IDs.

" - } - }, - "ReservedInstancesOfferingList": { - "base": null, - "refs": { - "DescribeReservedInstancesOfferingsResult$ReservedInstancesOfferings": "

A list of Reserved Instances offerings.

" - } - }, - "ReservedIntancesIds": { - "base": null, - "refs": { - "ReservedInstancesModification$ReservedInstancesIds": "

The IDs of one or more Reserved Instances.

" - } - }, - "ResetImageAttributeName": { - "base": null, - "refs": { - "ResetImageAttributeRequest$Attribute": "

The attribute to reset (currently you can only reset the launch permission attribute).

" - } - }, - "ResetImageAttributeRequest": { - "base": null, - "refs": { - } - }, - "ResetInstanceAttributeRequest": { - "base": null, - "refs": { - } - }, - "ResetNetworkInterfaceAttributeRequest": { - "base": null, - "refs": { - } - }, - "ResetSnapshotAttributeRequest": { - "base": null, - "refs": { - } - }, - "ResourceIdList": { - "base": null, - "refs": { - "CreateTagsRequest$Resources": "

The IDs of one or more resources to tag. For example, ami-1a2b3c4d.

", - "DeleteTagsRequest$Resources": "

The ID of the resource. For example, ami-1a2b3c4d. You can specify more than one resource ID.

" - } - }, - "ResourceType": { - "base": null, - "refs": { - "TagDescription$ResourceType": "

The resource type.

" - } - }, - "RestorableByStringList": { - "base": null, - "refs": { - "DescribeSnapshotsRequest$RestorableByUserIds": "

One or more AWS accounts IDs that can create volumes from the snapshot.

" - } - }, - "RevokeSecurityGroupEgressRequest": { - "base": null, - "refs": { - } - }, - "RevokeSecurityGroupIngressRequest": { - "base": null, - "refs": { - } - }, - "Route": { - "base": "

Describes a route in a route table.

", - "refs": { - "RouteList$member": null - } - }, - "RouteList": { - "base": null, - "refs": { - "RouteTable$Routes": "

The routes in the route table.

" - } - }, - "RouteOrigin": { - "base": null, - "refs": { - "Route$Origin": "

Describes how the route was created.

  • CreateRouteTable indicates that route was automatically created when the route table was created.
  • CreateRoute indicates that the route was manually added to the route table.
  • EnableVgwRoutePropagation indicates that the route was propagated by route propagation.
" - } - }, - "RouteState": { - "base": null, - "refs": { - "Route$State": "

The state of the route. The blackhole state indicates that the route's target isn't available (for example, the specified gateway isn't attached to the VPC, or the specified NAT instance has been terminated).

" - } - }, - "RouteTable": { - "base": "

Describes a route table.

", - "refs": { - "CreateRouteTableResult$RouteTable": "

Information about the route table.

", - "RouteTableList$member": null - } - }, - "RouteTableAssociation": { - "base": "

Describes an association between a route table and a subnet.

", - "refs": { - "RouteTableAssociationList$member": null - } - }, - "RouteTableAssociationList": { - "base": null, - "refs": { - "RouteTable$Associations": "

The associations between the route table and one or more subnets.

" - } - }, - "RouteTableList": { - "base": null, - "refs": { - "DescribeRouteTablesResult$RouteTables": "

Information about one or more route tables.

" - } - }, - "RuleAction": { - "base": null, - "refs": { - "CreateNetworkAclEntryRequest$RuleAction": "

Indicates whether to allow or deny the traffic that matches the rule.

", - "NetworkAclEntry$RuleAction": "

Indicates whether to allow or deny the traffic that matches the rule.

", - "ReplaceNetworkAclEntryRequest$RuleAction": "

Indicates whether to allow or deny the traffic that matches the rule.

" - } - }, - "RunInstancesMonitoringEnabled": { - "base": "

Describes the monitoring for the instance.

", - "refs": { - "LaunchSpecification$Monitoring": null, - "RunInstancesRequest$Monitoring": "

The monitoring for the instance.

", - "RequestSpotLaunchSpecification$Monitoring": null - } - }, - "RunInstancesRequest": { - "base": null, - "refs": { - } - }, - "S3Storage": { - "base": "

Describes the storage parameters for S3 and S3 buckets for an instance store-backed AMI.

", - "refs": { - "Storage$S3": "

An Amazon S3 storage location.

" - } - }, - "SecurityGroup": { - "base": "

Describes a security group

", - "refs": { - "SecurityGroupList$member": null - } - }, - "SecurityGroupIdStringList": { - "base": null, - "refs": { - "CreateNetworkInterfaceRequest$Groups": "

The IDs of one or more security groups.

", - "ImportInstanceLaunchSpecification$GroupIds": "

One or more security group IDs.

", - "InstanceNetworkInterfaceSpecification$Groups": "

The IDs of the security groups for the network interface. Applies only if creating a network interface when launching an instance.

", - "ModifyNetworkInterfaceAttributeRequest$Groups": "

Changes the security groups for the network interface. The new set of groups you specify replaces the current set. You must specify at least one group, even if it's just the default security group in the VPC. You must specify the ID of the security group, not the name.

", - "RunInstancesRequest$SecurityGroupIds": "

One or more security group IDs. You can create a security group using CreateSecurityGroup.

Default: Amazon EC2 uses the default security group.

" - } - }, - "SecurityGroupList": { - "base": null, - "refs": { - "DescribeSecurityGroupsResult$SecurityGroups": "

Information about one or more security groups.

" - } - }, - "SecurityGroupStringList": { - "base": null, - "refs": { - "ImportInstanceLaunchSpecification$GroupNames": "

One or more security group names.

", - "RunInstancesRequest$SecurityGroups": "

[EC2-Classic, default VPC] One or more security group names. For a nondefault VPC, you must use security group IDs instead.

Default: Amazon EC2 uses the default security group.

" - } - }, - "ShutdownBehavior": { - "base": null, - "refs": { - "ImportInstanceLaunchSpecification$InstanceInitiatedShutdownBehavior": "

Indicates whether an instance stops or terminates when you initiate shutdown from the instance (using the operating system command for system shutdown).

", - "RunInstancesRequest$InstanceInitiatedShutdownBehavior": "

Indicates whether an instance stops or terminates when you initiate shutdown from the instance (using the operating system command for system shutdown).

Default: stop

" - } - }, - "Snapshot": { - "base": "

Describes a snapshot.

", - "refs": { - "SnapshotList$member": null - } - }, - "SnapshotAttributeName": { - "base": null, - "refs": { - "DescribeSnapshotAttributeRequest$Attribute": "

The snapshot attribute you would like to view.

", - "ModifySnapshotAttributeRequest$Attribute": "

The snapshot attribute to modify.

", - "ResetSnapshotAttributeRequest$Attribute": "

The attribute to reset (currently only the attribute for permission to create volumes can be reset).

" - } - }, - "SnapshotIdStringList": { - "base": null, - "refs": { - "DescribeSnapshotsRequest$SnapshotIds": "

One or more snapshot IDs.

Default: Describes snapshots for which you have launch permissions.

" - } - }, - "SnapshotList": { - "base": null, - "refs": { - "DescribeSnapshotsResult$Snapshots": null - } - }, - "SnapshotState": { - "base": null, - "refs": { - "Snapshot$State": "

The snapshot state.

" - } - }, - "SpotDatafeedSubscription": { - "base": "

Describes the data feed for a Spot Instance.

", - "refs": { - "CreateSpotDatafeedSubscriptionResult$SpotDatafeedSubscription": "

The Spot Instance data feed subscription.

", - "DescribeSpotDatafeedSubscriptionResult$SpotDatafeedSubscription": "

The Spot Instance data feed subscription.

" - } - }, - "SpotInstanceRequest": { - "base": "

Describe a Spot Instance request.

", - "refs": { - "SpotInstanceRequestList$member": null - } - }, - "SpotInstanceRequestIdList": { - "base": null, - "refs": { - "CancelSpotInstanceRequestsRequest$SpotInstanceRequestIds": "

One or more Spot Instance request IDs.

", - "DescribeSpotInstanceRequestsRequest$SpotInstanceRequestIds": "

One or more Spot Instance request IDs.

" - } - }, - "SpotInstanceRequestList": { - "base": null, - "refs": { - "DescribeSpotInstanceRequestsResult$SpotInstanceRequests": "

One or more Spot Instance requests.

", - "RequestSpotInstancesResult$SpotInstanceRequests": "

One or more Spot Instance requests.

" - } - }, - "SpotInstanceState": { - "base": null, - "refs": { - "SpotInstanceRequest$State": "

The state of the Spot Instance request. Spot bid status information can help you track your Spot Instance requests. For more information, see Spot Bid Status in the Amazon Elastic Compute Cloud User Guide for Linux.

" - } - }, - "SpotInstanceStateFault": { - "base": "

Describes a Spot Instance state change.

", - "refs": { - "SpotDatafeedSubscription$Fault": "

The fault codes for the Spot Instance request, if any.

", - "SpotInstanceRequest$Fault": "

The fault codes for the Spot Instance request, if any.

" - } - }, - "SpotInstanceStatus": { - "base": "

Describes the status of a Spot Instance request.

", - "refs": { - "SpotInstanceRequest$Status": "

The status code and status message describing the Spot Instance request.

" - } - }, - "SpotInstanceType": { - "base": null, - "refs": { - "RequestSpotInstancesRequest$Type": "

The Spot Instance request type.

Default: one-time

", - "SpotInstanceRequest$Type": "

The Spot Instance request type.

" - } - }, - "SpotPlacement": { - "base": "

Describes Spot Instance placement.

", - "refs": { - "LaunchSpecification$Placement": "

The placement information for the instance.

", - "RequestSpotLaunchSpecification$Placement": "

The placement information for the instance.

" - } - }, - "SpotPrice": { - "base": "

Describes the maximum hourly price (bid) for any Spot Instance launched to fulfill the request.

", - "refs": { - "SpotPriceHistoryList$member": null - } - }, - "SpotPriceHistoryList": { - "base": null, - "refs": { - "DescribeSpotPriceHistoryResult$SpotPriceHistory": "

The historical Spot Prices.

" - } - }, - "StartInstancesRequest": { - "base": null, - "refs": { - } - }, - "StartInstancesResult": { - "base": null, - "refs": { - } - }, - "StateReason": { - "base": "

Describes a state change.

", - "refs": { - "Image$StateReason": "

The reason for the state change.

", - "Instance$StateReason": "

The reason for the most recent state transition.

" - } - }, - "StatusName": { - "base": null, - "refs": { - "InstanceStatusDetails$Name": "

The type of instance status.

" - } - }, - "StatusType": { - "base": null, - "refs": { - "InstanceStatusDetails$Status": "

The status.

" - } - }, - "StopInstancesRequest": { - "base": null, - "refs": { - } - }, - "StopInstancesResult": { - "base": null, - "refs": { - } - }, - "Storage": { - "base": "

Describes the storage location for an instance store-backed AMI.

", - "refs": { - "BundleInstanceRequest$Storage": "

The bucket in which to store the AMI. You can specify a bucket that you already own or a new bucket that Amazon EC2 creates on your behalf. If you specify a bucket that belongs to someone else, Amazon EC2 returns an error.

", - "BundleTask$Storage": "

The Amazon S3 storage locations.

" - } - }, - "String": { - "base": null, - "refs": { - "AcceptVpcPeeringConnectionRequest$VpcPeeringConnectionId": "

The ID of the VPC peering connection.

", - "AccountAttribute$AttributeName": "

The name of the account attribute.

", - "AccountAttributeValue$AttributeValue": "

The value of the attribute.

", - "Address$InstanceId": "

The ID of the instance the address is associated with (if any).

", - "Address$PublicIp": "

The Elastic IP address.

", - "Address$AllocationId": "

The ID representing the allocation of the address for use with EC2-VPC.

", - "Address$AssociationId": "

The ID representing the association of the address with an instance in a VPC.

", - "Address$NetworkInterfaceId": "

The ID of the network interface.

", - "Address$NetworkInterfaceOwnerId": "

The ID of the AWS account that owns the network interface.

", - "Address$PrivateIpAddress": "

The private IP address associated with the Elastic IP address.

", - "AllocateAddressResult$PublicIp": "

The Elastic IP address.

", - "AllocateAddressResult$AllocationId": "

[EC2-VPC] The ID that AWS assigns to represent the allocation of the Elastic IP address for use with instances in a VPC.

", - "AllocationIdList$member": null, - "AssignPrivateIpAddressesRequest$NetworkInterfaceId": "

The ID of the network interface.

", - "AssociateAddressRequest$InstanceId": "

The ID of the instance. This is required for EC2-Classic. For EC2-VPC, you can specify either the instance ID or the network interface ID, but not both. The operation fails if you specify an instance ID unless exactly one network interface is attached.

", - "AssociateAddressRequest$PublicIp": "

The Elastic IP address. This is required for EC2-Classic.

", - "AssociateAddressRequest$AllocationId": "

[EC2-VPC] The allocation ID. This is required for EC2-VPC.

", - "AssociateAddressRequest$NetworkInterfaceId": "

[EC2-VPC] The ID of the network interface. If the instance has more than one network interface, you must specify a network interface ID.

", - "AssociateAddressRequest$PrivateIpAddress": "

[EC2-VPC] The primary or secondary private IP address to associate with the Elastic IP address. If no private IP address is specified, the Elastic IP address is associated with the primary private IP address.

", - "AssociateAddressResult$AssociationId": "

[EC2-VPC] The ID that represents the association of the Elastic IP address with an instance.

", - "AssociateDhcpOptionsRequest$DhcpOptionsId": "

The ID of the DHCP options set, or default to associate no DHCP options with the VPC.

", - "AssociateDhcpOptionsRequest$VpcId": "

The ID of the VPC.

", - "AssociateRouteTableRequest$SubnetId": "

The ID of the subnet.

", - "AssociateRouteTableRequest$RouteTableId": "

The ID of the route table.

", - "AssociateRouteTableResult$AssociationId": "

The route table association ID (needed to disassociate the route table).

", - "AttachClassicLinkVpcRequest$InstanceId": "

The ID of an EC2-Classic instance to link to the ClassicLink-enabled VPC.

", - "AttachClassicLinkVpcRequest$VpcId": "

The ID of a ClassicLink-enabled VPC.

", - "AttachInternetGatewayRequest$InternetGatewayId": "

The ID of the Internet gateway.

", - "AttachInternetGatewayRequest$VpcId": "

The ID of the VPC.

", - "AttachNetworkInterfaceRequest$NetworkInterfaceId": "

The ID of the network interface.

", - "AttachNetworkInterfaceRequest$InstanceId": "

The ID of the instance.

", - "AttachNetworkInterfaceResult$AttachmentId": "

The ID of the network interface attachment.

", - "AttachVolumeRequest$VolumeId": "

The ID of the Amazon EBS volume. The volume and instance must be within the same Availability Zone.

", - "AttachVolumeRequest$InstanceId": "

The ID of the instance.

", - "AttachVolumeRequest$Device": "

The device name to expose to the instance (for example, /dev/sdh or xvdh).

", - "AttachVpnGatewayRequest$VpnGatewayId": "

The ID of the virtual private gateway.

", - "AttachVpnGatewayRequest$VpcId": "

The ID of the VPC.

", - "AttributeValue$Value": "

Valid values are case-sensitive and vary by action.

", - "AuthorizeSecurityGroupEgressRequest$GroupId": "

The ID of the security group.

", - "AuthorizeSecurityGroupEgressRequest$SourceSecurityGroupName": "

[EC2-Classic, default VPC] The name of the destination security group. You can't specify a destination security group and a CIDR IP address range.

", - "AuthorizeSecurityGroupEgressRequest$SourceSecurityGroupOwnerId": "

The ID of the destination security group. You can't specify a destination security group and a CIDR IP address range.

", - "AuthorizeSecurityGroupEgressRequest$IpProtocol": "

The IP protocol name (tcp, udp, icmp) or number (see Protocol Numbers). Use -1 to specify all.

", - "AuthorizeSecurityGroupEgressRequest$CidrIp": "

The CIDR IP address range. You can't specify this parameter when specifying a source security group.

", - "AuthorizeSecurityGroupIngressRequest$GroupName": "

[EC2-Classic, default VPC] The name of the security group.

", - "AuthorizeSecurityGroupIngressRequest$GroupId": "

The ID of the security group. Required for a nondefault VPC.

", - "AuthorizeSecurityGroupIngressRequest$SourceSecurityGroupName": "

[EC2-Classic, default VPC] The name of the source security group. You can't specify a source security group and a CIDR IP address range.

", - "AuthorizeSecurityGroupIngressRequest$SourceSecurityGroupOwnerId": "

The ID of the source security group. You can't specify a source security group and a CIDR IP address range.

", - "AuthorizeSecurityGroupIngressRequest$IpProtocol": "

The IP protocol name (tcp, udp, icmp) or number (see Protocol Numbers). (VPC only) Use -1 to specify all.

", - "AuthorizeSecurityGroupIngressRequest$CidrIp": "

The CIDR IP address range. You can't specify this parameter when specifying a source security group.

", - "AvailabilityZone$ZoneName": "

The name of the Availability Zone.

", - "AvailabilityZone$RegionName": "

The name of the region.

", - "AvailabilityZoneMessage$Message": "

The message about the Availability Zone.

", - "BlockDeviceMapping$VirtualName": "

The virtual device name (ephemeralN). Instance store volumes are numbered starting from 0. An instance type with 2 available instance store volumes can specify mappings for ephemeral0 and ephemeral1.The number of available instance store volumes depends on the instance type. After you connect to the instance, you must mount the volume.

Constraints: For M3 instances, you must specify instance store volumes in the block device mapping for the instance. When you launch an M3 instance, we ignore any instance store volumes specified in the block device mapping for the AMI.

", - "BlockDeviceMapping$DeviceName": "

The device name exposed to the instance (for example, /dev/sdh or xvdh).

", - "BlockDeviceMapping$NoDevice": "

Suppresses the specified device included in the block device mapping of the AMI.

", - "BundleIdStringList$member": null, - "BundleInstanceRequest$InstanceId": "

The ID of the instance to bundle.

Type: String

Default: None

Required: Yes

", - "BundleTask$InstanceId": "

The ID of the instance associated with this bundle task.

", - "BundleTask$BundleId": "

The ID of the bundle task.

", - "BundleTask$Progress": "

The level of task completion, as a percent (for example, 20%).

", - "BundleTaskError$Code": "

The error code.

", - "BundleTaskError$Message": "

The error message.

", - "CancelBundleTaskRequest$BundleId": "

The ID of the bundle task.

", - "CancelConversionRequest$ConversionTaskId": "

The ID of the conversion task.

", - "CancelConversionRequest$ReasonMessage": null, - "CancelExportTaskRequest$ExportTaskId": "

The ID of the export task. This is the ID returned by CreateInstanceExportTask.

", - "CancelReservedInstancesListingRequest$ReservedInstancesListingId": "

The ID of the Reserved Instance listing.

", - "CancelledSpotInstanceRequest$SpotInstanceRequestId": "

The ID of the Spot Instance request.

", - "ClassicLinkInstance$InstanceId": "

The ID of the instance.

", - "ClassicLinkInstance$VpcId": "

The ID of the VPC.

", - "ConfirmProductInstanceRequest$ProductCode": "

The product code. This must be a product code that you own.

", - "ConfirmProductInstanceRequest$InstanceId": "

The ID of the instance.

", - "ConfirmProductInstanceResult$OwnerId": "

The AWS account ID of the instance owner. This is only present if the product code is attached to the instance.

", - "ConversionIdStringList$member": null, - "ConversionTask$ConversionTaskId": "

The ID of the conversion task.

", - "ConversionTask$ExpirationTime": "

The time when the task expires. If the upload isn't complete before the expiration time, we automatically cancel the task.

", - "ConversionTask$StatusMessage": "

The status message related to the conversion task.

", - "CopyImageRequest$SourceRegion": "

The name of the region that contains the AMI to copy.

", - "CopyImageRequest$SourceImageId": "

The ID of the AMI to copy.

", - "CopyImageRequest$Name": "

The name of the new AMI in the destination region.

", - "CopyImageRequest$Description": "

A description for the new AMI in the destination region.

", - "CopyImageRequest$ClientToken": "

Unique, case-sensitive identifier you provide to ensure idempotency of the request. For more information, see How to Ensure Idempotency in the Amazon Elastic Compute Cloud User Guide for Linux.

", - "CopyImageResult$ImageId": "

The ID of the new AMI.

", - "CopySnapshotRequest$SourceRegion": "

The ID of the region that contains the snapshot to be copied.

", - "CopySnapshotRequest$SourceSnapshotId": "

The ID of the Amazon EBS snapshot to copy.

", - "CopySnapshotRequest$Description": "

A description for the new Amazon EBS snapshot.

", - "CopySnapshotRequest$DestinationRegion": "

The destination region to use in the PresignedUrl parameter of a snapshot copy operation. This parameter is only valid for specifying the destination region in a PresignedUrl parameter, where it is required.

CopySnapshot sends the snapshot copy to the regional endpoint that you send the HTTP request to, such as ec2.us-east-1.amazonaws.com (in the AWS CLI, this is specified with the --region parameter or the default region in your AWS configuration file).

", - "CopySnapshotRequest$PresignedUrl": "

The pre-signed URL that facilitates copying an encrypted snapshot. This parameter is only required when copying an encrypted snapshot with the Amazon EC2 Query API; it is available as an optional parameter in all other cases. The PresignedUrl should use the snapshot source endpoint, the CopySnapshot action, and include the SourceRegion, SourceSnapshotId, and DestinationRegion parameters. The PresignedUrl must be signed using AWS Signature Version 4. Because Amazon EBS snapshots are stored in Amazon S3, the signing algorithm for this parameter uses the same logic that is described in Authenticating Requests by Using Query Parameters (AWS Signature Version 4) in the Amazon Simple Storage Service API Reference. An invalid or improperly signed PresignedUrl will cause the copy operation to fail asynchronously, and the snapshot will move to an error state.

", - "CopySnapshotResult$SnapshotId": "

The ID of the new snapshot.

", - "CreateCustomerGatewayRequest$PublicIp": "

The Internet-routable IP address for the customer gateway's outside interface. The address must be static.

", - "CreateImageRequest$InstanceId": "

The ID of the instance.

", - "CreateImageRequest$Name": "

A name for the new image.

Constraints: 3-128 alphanumeric characters, parentheses (()), square brackets ([]), spaces ( ), periods (.), slashes (/), dashes (-), single quotes ('), at-signs (@), or underscores(_)

", - "CreateImageRequest$Description": "

A description for the new image.

", - "CreateImageResult$ImageId": "

The ID of the new AMI.

", - "CreateInstanceExportTaskRequest$Description": "

A description for the conversion task or the resource being exported. The maximum length is 255 bytes.

", - "CreateInstanceExportTaskRequest$InstanceId": "

The ID of the instance.

", - "CreateKeyPairRequest$KeyName": "

A unique name for the key pair.

Constraints: Up to 255 ASCII characters

", - "CreateNetworkAclEntryRequest$NetworkAclId": "

The ID of the network ACL.

", - "CreateNetworkAclEntryRequest$Protocol": "

The protocol. A value of -1 means all protocols.

", - "CreateNetworkAclEntryRequest$CidrBlock": "

The network range to allow or deny, in CIDR notation (for example 172.16.0.0/24).

", - "CreateNetworkAclRequest$VpcId": "

The ID of the VPC.

", - "CreateNetworkInterfaceRequest$SubnetId": "

The ID of the subnet to associate with the network interface.

", - "CreateNetworkInterfaceRequest$Description": "

A description for the network interface.

", - "CreateNetworkInterfaceRequest$PrivateIpAddress": "

The primary private IP address of the network interface. If you don't specify an IP address, Amazon EC2 selects one for you from the subnet range. If you specify an IP address, you cannot indicate any IP addresses specified in privateIpAddresses as primary (only one IP address can be designated as primary).

", - "CreatePlacementGroupRequest$GroupName": "

A name for the placement group.

Constraints: Up to 255 ASCII characters

", - "CreateReservedInstancesListingRequest$ReservedInstancesId": "

The ID of the active Reserved Instance.

", - "CreateReservedInstancesListingRequest$ClientToken": "

Unique, case-sensitive identifier you provide to ensure idempotency of your listings. This helps avoid duplicate listings. For more information, see Ensuring Idempotency.

", - "CreateRouteRequest$RouteTableId": "

The ID of the route table for the route.

", - "CreateRouteRequest$DestinationCidrBlock": "

The CIDR address block used for the destination match. Routing decisions are based on the most specific match.

", - "CreateRouteRequest$GatewayId": "

The ID of an Internet gateway or virtual private gateway attached to your VPC.

", - "CreateRouteRequest$InstanceId": "

The ID of a NAT instance in your VPC. The operation fails if you specify an instance ID unless exactly one network interface is attached.

", - "CreateRouteRequest$NetworkInterfaceId": "

The ID of a network interface.

", - "CreateRouteRequest$VpcPeeringConnectionId": "

The ID of a VPC peering connection.

", - "CreateRouteTableRequest$VpcId": "

The ID of the VPC.

", - "CreateSecurityGroupRequest$GroupName": "

The name of the security group.

Constraints: Up to 255 characters in length

Constraints for EC2-Classic: ASCII characters

Constraints for EC2-VPC: a-z, A-Z, 0-9, spaces, and ._-:/()#,@[]+=&;{}!$*

", - "CreateSecurityGroupRequest$Description": "

A description for the security group. This is informational only.

Constraints: Up to 255 characters in length

Constraints for EC2-Classic: ASCII characters

Constraints for EC2-VPC: a-z, A-Z, 0-9, spaces, and ._-:/()#,@[]+=&;{}!$*

", - "CreateSecurityGroupRequest$VpcId": "

[EC2-VPC] The ID of the VPC. Required for EC2-VPC.

", - "CreateSecurityGroupResult$GroupId": "

The ID of the security group.

", - "CreateSnapshotRequest$VolumeId": "

The ID of the Amazon EBS volume.

", - "CreateSnapshotRequest$Description": "

A description for the snapshot.

", - "CreateSpotDatafeedSubscriptionRequest$Bucket": "

The Amazon S3 bucket in which to store the Spot Instance data feed.

", - "CreateSpotDatafeedSubscriptionRequest$Prefix": "

A prefix for the data feed file names.

", - "CreateSubnetRequest$VpcId": "

The ID of the VPC.

", - "CreateSubnetRequest$CidrBlock": "

The network range for the subnet, in CIDR notation. For example, 10.0.0.0/24.

", - "CreateSubnetRequest$AvailabilityZone": "

The Availability Zone for the subnet.

Default: Amazon EC2 selects one for you (recommended).

", - "CreateVolumePermission$UserId": "

The specific AWS account ID that is to be added or removed from a volume's list of create volume permissions.

", - "CreateVolumeRequest$SnapshotId": "

The snapshot from which to create the volume.

", - "CreateVolumeRequest$AvailabilityZone": "

The Availability Zone in which to create the volume. Use DescribeAvailabilityZones to list the Availability Zones that are currently available to you.

", - "CreateVolumeRequest$KmsKeyId": "

The full ARN of the AWS Key Management Service (KMS) master key to use when creating the encrypted volume. This parameter is only required if you want to use a non-default master key; if this parameter is not specified, the default master key is used. The ARN contains the arn:aws:kms namespace, followed by the region of the master key, the AWS account ID of the master key owner, the key namespace, and then the master key ID. For example, arn:aws:kms:us-east-1:012345678910:key/abcd1234-a123-456a-a12b-a123b4cd56ef.

", - "CreateVpcPeeringConnectionRequest$VpcId": "

The ID of the requester VPC.

", - "CreateVpcPeeringConnectionRequest$PeerVpcId": "

The ID of the VPC with which you are creating the VPC peering connection.

", - "CreateVpcPeeringConnectionRequest$PeerOwnerId": "

The AWS account ID of the owner of the peer VPC.

Default: Your AWS account ID

", - "CreateVpcRequest$CidrBlock": "

The network range for the VPC, in CIDR notation. For example, 10.0.0.0/16.

", - "CreateVpnConnectionRequest$Type": "

The type of VPN connection (ipsec.1).

", - "CreateVpnConnectionRequest$CustomerGatewayId": "

The ID of the customer gateway.

", - "CreateVpnConnectionRequest$VpnGatewayId": "

The ID of the virtual private gateway.

", - "CreateVpnConnectionRouteRequest$VpnConnectionId": "

The ID of the VPN connection.

", - "CreateVpnConnectionRouteRequest$DestinationCidrBlock": "

The CIDR block associated with the local subnet of the customer network.

", - "CreateVpnGatewayRequest$AvailabilityZone": "

The Availability Zone for the virtual private gateway.

", - "CustomerGateway$CustomerGatewayId": "

The ID of the customer gateway.

", - "CustomerGateway$State": "

The current state of the customer gateway (pending | available | deleting | deleted).

", - "CustomerGateway$Type": "

The type of VPN connection the customer gateway supports (ipsec.1).

", - "CustomerGateway$IpAddress": "

The Internet-routable IP address of the customer gateway's outside interface.

", - "CustomerGateway$BgpAsn": "

The customer gateway's Border Gateway Protocol (BGP) Autonomous System Number (ASN).

", - "CustomerGatewayIdStringList$member": null, - "DeleteCustomerGatewayRequest$CustomerGatewayId": "

The ID of the customer gateway.

", - "DeleteDhcpOptionsRequest$DhcpOptionsId": "

The ID of the DHCP options set.

", - "DeleteInternetGatewayRequest$InternetGatewayId": "

The ID of the Internet gateway.

", - "DeleteKeyPairRequest$KeyName": "

The name of the key pair.

", - "DeleteNetworkAclEntryRequest$NetworkAclId": "

The ID of the network ACL.

", - "DeleteNetworkAclRequest$NetworkAclId": "

The ID of the network ACL.

", - "DeleteNetworkInterfaceRequest$NetworkInterfaceId": "

The ID of the network interface.

", - "DeletePlacementGroupRequest$GroupName": "

The name of the placement group.

", - "DeleteRouteRequest$RouteTableId": "

The ID of the route table.

", - "DeleteRouteRequest$DestinationCidrBlock": "

The CIDR range for the route. The value you specify must match the CIDR for the route exactly.

", - "DeleteRouteTableRequest$RouteTableId": "

The ID of the route table.

", - "DeleteSecurityGroupRequest$GroupName": "

[EC2-Classic, default VPC] The name of the security group. You can specify either the security group name or the security group ID.

", - "DeleteSecurityGroupRequest$GroupId": "

The ID of the security group. Required for a nondefault VPC.

", - "DeleteSnapshotRequest$SnapshotId": "

The ID of the Amazon EBS snapshot.

", - "DeleteSubnetRequest$SubnetId": "

The ID of the subnet.

", - "DeleteVolumeRequest$VolumeId": "

The ID of the volume.

", - "DeleteVpcPeeringConnectionRequest$VpcPeeringConnectionId": "

The ID of the VPC peering connection.

", - "DeleteVpcRequest$VpcId": "

The ID of the VPC.

", - "DeleteVpnConnectionRequest$VpnConnectionId": "

The ID of the VPN connection.

", - "DeleteVpnConnectionRouteRequest$VpnConnectionId": "

The ID of the VPN connection.

", - "DeleteVpnConnectionRouteRequest$DestinationCidrBlock": "

The CIDR block associated with the local subnet of the customer network.

", - "DeleteVpnGatewayRequest$VpnGatewayId": "

The ID of the virtual private gateway.

", - "DeregisterImageRequest$ImageId": "

The ID of the AMI.

", - "DescribeClassicLinkInstancesRequest$NextToken": "

The token to retrieve the next page of results.

", - "DescribeClassicLinkInstancesResult$NextToken": "

The token to use to retrieve the next page of results. This value is null when there are no more results to return.

", - "DescribeImageAttributeRequest$ImageId": "

The ID of the AMI.

", - "DescribeInstanceAttributeRequest$InstanceId": "

The ID of the instance.

", - "DescribeInstanceStatusRequest$NextToken": "

The token to retrieve the next page of results.

", - "DescribeInstanceStatusResult$NextToken": "

The token to use to retrieve the next page of results. This value is null when there are no more results to return.

", - "DescribeInstancesRequest$NextToken": "

The token to request the next page of results.

", - "DescribeInstancesResult$NextToken": "

The token to use to retrieve the next page of results. This value is null when there are no more results to return.

", - "DescribeNetworkInterfaceAttributeRequest$NetworkInterfaceId": "

The ID of the network interface.

", - "DescribeNetworkInterfaceAttributeResult$NetworkInterfaceId": "

The ID of the network interface.

", - "DescribeReservedInstancesListingsRequest$ReservedInstancesId": "

One or more Reserved Instance IDs.

", - "DescribeReservedInstancesListingsRequest$ReservedInstancesListingId": "

One or more Reserved Instance Listing IDs.

", - "DescribeReservedInstancesModificationsRequest$NextToken": "

The token to retrieve the next page of results.

", - "DescribeReservedInstancesModificationsResult$NextToken": "

The token to use to retrieve the next page of results. This value is null when there are no more results to return.

", - "DescribeReservedInstancesOfferingsRequest$AvailabilityZone": "

The Availability Zone in which the Reserved Instance can be used.

", - "DescribeReservedInstancesOfferingsRequest$NextToken": "

The token to retrieve the next page of results.

", - "DescribeReservedInstancesOfferingsResult$NextToken": "

The token to use to retrieve the next page of results. This value is null when there are no more results to return.

", - "DescribeSnapshotAttributeRequest$SnapshotId": "

The ID of the Amazon EBS snapshot.

", - "DescribeSnapshotAttributeResult$SnapshotId": "

The ID of the Amazon EBS snapshot.

", - "DescribeSnapshotsRequest$NextToken": "

The NextToken value returned from a previous paginated DescribeSnapshots request where MaxResults was used and the results exceeded the value of that parameter. Pagination continues from the end of the previous results that returned the NextToken value. This value is null when there are no more results to return.

", - "DescribeSnapshotsResult$NextToken": "

The NextToken value to include in a future DescribeSnapshots request. When the results of a DescribeSnapshots request exceed MaxResults, this value can be used to retrieve the next page of results. This value is null when there are no more results to return.

", - "DescribeSpotPriceHistoryRequest$AvailabilityZone": "

Filters the results by the specified Availability Zone.

", - "DescribeSpotPriceHistoryRequest$NextToken": "

The token to retrieve the next page of results.

", - "DescribeSpotPriceHistoryResult$NextToken": "

The token to use to retrieve the next page of results. This value is null when there are no more results to return.

", - "DescribeTagsRequest$NextToken": "

The token to retrieve the next page of results.

", - "DescribeTagsResult$NextToken": "

The token to use to retrieve the next page of results. This value is null when there are no more results to return..

", - "DescribeVolumeAttributeRequest$VolumeId": "

The ID of the volume.

", - "DescribeVolumeAttributeResult$VolumeId": "

The ID of the volume.

", - "DescribeVolumeStatusRequest$NextToken": "

The NextToken value to include in a future DescribeVolumeStatus request. When the results of the request exceed MaxResults, this value can be used to retrieve the next page of results. This value is null when there are no more results to return.

", - "DescribeVolumeStatusResult$NextToken": "

The token to use to retrieve the next page of results. This value is null when there are no more results to return.

", - "DescribeVolumesRequest$NextToken": "

The NextToken value returned from a previous paginated DescribeVolumes request where MaxResults was used and the results exceeded the value of that parameter. Pagination continues from the end of the previous results that returned the NextToken value. This value is null when there are no more results to return.

", - "DescribeVolumesResult$NextToken": "

The NextToken value to include in a future DescribeVolumes request. When the results of a DescribeVolumes request exceed MaxResults, this value can be used to retrieve the next page of results. This value is null when there are no more results to return.

", - "DescribeVpcAttributeRequest$VpcId": "

The ID of the VPC.

", - "DescribeVpcAttributeResult$VpcId": "

The ID of the VPC.

", - "DetachClassicLinkVpcRequest$InstanceId": "

The ID of the instance to unlink from the VPC.

", - "DetachClassicLinkVpcRequest$VpcId": "

The ID of the VPC to which the instance is linked.

", - "DetachInternetGatewayRequest$InternetGatewayId": "

The ID of the Internet gateway.

", - "DetachInternetGatewayRequest$VpcId": "

The ID of the VPC.

", - "DetachNetworkInterfaceRequest$AttachmentId": "

The ID of the attachment.

", - "DetachVolumeRequest$VolumeId": "

The ID of the volume.

", - "DetachVolumeRequest$InstanceId": "

The ID of the instance.

", - "DetachVolumeRequest$Device": "

The device name.

", - "DetachVpnGatewayRequest$VpnGatewayId": "

The ID of the virtual private gateway.

", - "DetachVpnGatewayRequest$VpcId": "

The ID of the VPC.

", - "DhcpConfiguration$Key": "

The name of a DHCP option.

", - "DhcpOptions$DhcpOptionsId": "

The ID of the set of DHCP options.

", - "DhcpOptionsIdStringList$member": null, - "DisableVgwRoutePropagationRequest$RouteTableId": "

The ID of the route table.

", - "DisableVgwRoutePropagationRequest$GatewayId": "

The ID of the virtual private gateway.

", - "DisableVpcClassicLinkRequest$VpcId": "

The ID of the VPC.

", - "DisassociateAddressRequest$PublicIp": "

[EC2-Classic] The Elastic IP address. Required for EC2-Classic.

", - "DisassociateAddressRequest$AssociationId": "

[EC2-VPC] The association ID. Required for EC2-VPC.

", - "DisassociateRouteTableRequest$AssociationId": "

The association ID representing the current association between the route table and subnet.

", - "DiskImage$Description": null, - "DiskImageDescription$ImportManifestUrl": "

A presigned URL for the import manifest stored in Amazon S3. For information about creating a presigned URL for an Amazon S3 object, read the \"Query String Request Authentication Alternative\" section of the Authenticating REST Requests topic in the Amazon Simple Storage Service Developer Guide.

", - "DiskImageDescription$Checksum": "

The checksum computed for the disk image.

", - "DiskImageDetail$ImportManifestUrl": "

A presigned URL for the import manifest stored in Amazon S3 and presented here as an Amazon S3 presigned URL. For information about creating a presigned URL for an Amazon S3 object, read the \"Query String Request Authentication Alternative\" section of the Authenticating REST Requests topic in the Amazon Simple Storage Service Developer Guide.

", - "DiskImageVolumeDescription$Id": "

The volume identifier.

", - "EbsBlockDevice$SnapshotId": "

The ID of the snapshot.

", - "EbsInstanceBlockDevice$VolumeId": "

The ID of the Amazon EBS volume.

", - "EbsInstanceBlockDeviceSpecification$VolumeId": "

The ID of the Amazon EBS volume.

", - "EnableVgwRoutePropagationRequest$RouteTableId": "

The ID of the route table.

", - "EnableVgwRoutePropagationRequest$GatewayId": "

The ID of the virtual private gateway.

", - "EnableVolumeIORequest$VolumeId": "

The ID of the volume.

", - "EnableVpcClassicLinkRequest$VpcId": "

The ID of the VPC.

", - "ExecutableByStringList$member": null, - "ExportTask$ExportTaskId": "

The ID of the export task.

", - "ExportTask$Description": "

A description of the resource being exported.

", - "ExportTask$StatusMessage": "

The status message related to the export task.

", - "ExportTaskIdStringList$member": null, - "ExportToS3Task$S3Bucket": "

The Amazon S3 bucket for the destination image. The destination bucket must exist and grant WRITE and READ_ACP permissions to the AWS account vm-import-export@amazon.com.

", - "ExportToS3Task$S3Key": null, - "ExportToS3TaskSpecification$S3Bucket": null, - "ExportToS3TaskSpecification$S3Prefix": "

The image is written to a single object in the Amazon S3 bucket at the S3 key s3prefix + exportTaskId + '.' + diskImageFormat.

", - "Filter$Name": "

The name of the filter. Filter names are case-sensitive.

", - "GetConsoleOutputRequest$InstanceId": "

The ID of the instance.

", - "GetConsoleOutputResult$InstanceId": "

The ID of the instance.

", - "GetConsoleOutputResult$Output": "

The console output, Base64 encoded.

", - "GetPasswordDataRequest$InstanceId": "

The ID of the Windows instance.

", - "GetPasswordDataResult$InstanceId": "

The ID of the Windows instance.

", - "GetPasswordDataResult$PasswordData": "

The password of the instance.

", - "GroupIdStringList$member": null, - "GroupIdentifier$GroupName": "

The name of the security group.

", - "GroupIdentifier$GroupId": "

The ID of the security group.

", - "GroupNameStringList$member": null, - "IamInstanceProfile$Arn": "

The Amazon Resource Name (ARN) of the instance profile.

", - "IamInstanceProfile$Id": "

The ID of the instance profile.

", - "IamInstanceProfileSpecification$Arn": "

The Amazon Resource Name (ARN) of the instance profile.

", - "IamInstanceProfileSpecification$Name": "

The name of the instance profile.

", - "Image$ImageId": "

The ID of the AMI.

", - "Image$ImageLocation": "

The location of the AMI.

", - "Image$OwnerId": "

The AWS account ID of the image owner.

", - "Image$CreationDate": "

The date and time the image was created.

", - "Image$KernelId": "

The kernel associated with the image, if any. Only applicable for machine images.

", - "Image$RamdiskId": "

The RAM disk associated with the image, if any. Only applicable for machine images.

", - "Image$SriovNetSupport": "

Specifies whether enhanced networking is enabled.

", - "Image$ImageOwnerAlias": "

The AWS account alias (for example, amazon, self) or the AWS account ID of the AMI owner.

", - "Image$Name": "

The name of the AMI that was provided during image creation.

", - "Image$Description": "

The description of the AMI that was provided during image creation.

", - "Image$RootDeviceName": "

The device name of the root device (for example, /dev/sda1 or /dev/xvda).

", - "ImageAttribute$ImageId": "

The ID of the AMI.

", - "ImageIdStringList$member": null, - "ImportInstanceLaunchSpecification$AdditionalInfo": null, - "ImportInstanceLaunchSpecification$SubnetId": "

[EC2-VPC] The ID of the subnet to launch the instance into.

", - "ImportInstanceLaunchSpecification$PrivateIpAddress": "

[EC2-VPC] Optionally, you can use this parameter to assign the instance a specific available IP address from the IP address range of the subnet.

", - "ImportInstanceRequest$Description": "

A description for the instance being imported.

", - "ImportInstanceTaskDetails$InstanceId": null, - "ImportInstanceTaskDetails$Description": null, - "ImportInstanceVolumeDetailItem$AvailabilityZone": "

The Availability Zone where the resulting instance will reside.

", - "ImportInstanceVolumeDetailItem$Status": "

The status of the import of this particular disk image.

", - "ImportInstanceVolumeDetailItem$StatusMessage": "

The status information or errors related to the disk image.

", - "ImportInstanceVolumeDetailItem$Description": null, - "ImportKeyPairRequest$KeyName": "

A unique name for the key pair.

", - "ImportKeyPairResult$KeyName": "

The key pair name you provided.

", - "ImportKeyPairResult$KeyFingerprint": "

The MD5 public key fingerprint as specified in section 4 of RFC 4716.

", - "ImportVolumeRequest$AvailabilityZone": "

The Availability Zone for the resulting Amazon EBS volume.

", - "ImportVolumeRequest$Description": "

An optional description for the volume being imported.

", - "ImportVolumeTaskDetails$AvailabilityZone": "

The Availability Zone where the resulting volume will reside.

", - "ImportVolumeTaskDetails$Description": "

The description you provided when starting the import volume task.

", - "Instance$InstanceId": "

The ID of the instance.

", - "Instance$ImageId": "

The ID of the AMI used to launch the instance.

", - "Instance$PrivateDnsName": "

The private DNS name assigned to the instance. This DNS name can only be used inside the Amazon EC2 network. This name is not available until the instance enters the running state.

", - "Instance$PublicDnsName": "

The public DNS name assigned to the instance. This name is not available until the instance enters the running state.

", - "Instance$StateTransitionReason": "

The reason for the most recent state transition. This might be an empty string.

", - "Instance$KeyName": "

The name of the key pair, if this instance was launched with an associated key pair.

", - "Instance$KernelId": "

The kernel associated with this instance.

", - "Instance$RamdiskId": "

The RAM disk associated with this instance.

", - "Instance$SubnetId": "

The ID of the subnet in which the instance is running.

", - "Instance$VpcId": "

The ID of the VPC in which the instance is running.

", - "Instance$PrivateIpAddress": "

The private IP address assigned to the instance.

", - "Instance$PublicIpAddress": "

The public IP address assigned to the instance.

", - "Instance$RootDeviceName": "

The root device name (for example, /dev/sda1 or /dev/xvda).

", - "Instance$SpotInstanceRequestId": "

The ID of the Spot Instance request.

", - "Instance$ClientToken": "

The idempotency token you provided when you launched the instance.

", - "Instance$SriovNetSupport": "

Specifies whether enhanced networking is enabled.

", - "InstanceAttribute$InstanceId": "

The ID of the instance.

", - "InstanceBlockDeviceMapping$DeviceName": "

The device name exposed to the instance (for example, /dev/sdh or xvdh).

", - "InstanceBlockDeviceMappingSpecification$DeviceName": "

The device name exposed to the instance (for example, /dev/sdh or xvdh).

", - "InstanceBlockDeviceMappingSpecification$VirtualName": "

The virtual device name.

", - "InstanceBlockDeviceMappingSpecification$NoDevice": "

suppress the specified device included in the block device mapping.

", - "InstanceExportDetails$InstanceId": "

The ID of the resource being exported.

", - "InstanceIdStringList$member": null, - "InstanceMonitoring$InstanceId": "

The ID of the instance.

", - "InstanceNetworkInterface$NetworkInterfaceId": "

The ID of the network interface.

", - "InstanceNetworkInterface$SubnetId": "

The ID of the subnet.

", - "InstanceNetworkInterface$VpcId": "

The ID of the VPC.

", - "InstanceNetworkInterface$Description": "

The description.

", - "InstanceNetworkInterface$OwnerId": "

The ID of the AWS account that created the network interface.

", - "InstanceNetworkInterface$MacAddress": "

The MAC address.

", - "InstanceNetworkInterface$PrivateIpAddress": "

The IP address of the network interface within the subnet.

", - "InstanceNetworkInterface$PrivateDnsName": "

The private DNS name.

", - "InstanceNetworkInterfaceAssociation$PublicIp": "

The public IP address or Elastic IP address bound to the network interface.

", - "InstanceNetworkInterfaceAssociation$PublicDnsName": "

The public DNS name.

", - "InstanceNetworkInterfaceAssociation$IpOwnerId": "

The ID of the owner of the Elastic IP address.

", - "InstanceNetworkInterfaceAttachment$AttachmentId": "

The ID of the network interface attachment.

", - "InstanceNetworkInterfaceSpecification$NetworkInterfaceId": "

The ID of the network interface.

", - "InstanceNetworkInterfaceSpecification$SubnetId": "

The ID of the subnet associated with the network string. Applies only if creating a network interface when launching an instance.

", - "InstanceNetworkInterfaceSpecification$Description": "

The description of the network interface. Applies only if creating a network interface when launching an instance.

", - "InstanceNetworkInterfaceSpecification$PrivateIpAddress": "

The private IP address of the network interface. Applies only if creating a network interface when launching an instance.

", - "InstancePrivateIpAddress$PrivateIpAddress": "

The private IP address of the network interface.

", - "InstancePrivateIpAddress$PrivateDnsName": "

The private DNS name.

", - "InstanceStateChange$InstanceId": "

The ID of the instance.

", - "InstanceStatus$InstanceId": "

The ID of the instance.

", - "InstanceStatus$AvailabilityZone": "

The Availability Zone of the instance.

", - "InstanceStatusEvent$Description": "

A description of the event.

", - "InternetGateway$InternetGatewayId": "

The ID of the Internet gateway.

", - "InternetGatewayAttachment$VpcId": "

The ID of the VPC.

", - "IpPermission$IpProtocol": "

The protocol.

When you call DescribeSecurityGroups, the protocol value returned is the number. Exception: For TCP, UDP, and ICMP, the value returned is the name (for example, tcp, udp, or icmp). For a list of protocol numbers, see Protocol Numbers. (VPC only) When you call AuthorizeSecurityGroupIngress, you can use -1 to specify all.

", - "IpRange$CidrIp": "

The CIDR range. You can either specify a CIDR range or a source security group, not both.

", - "KeyNameStringList$member": null, - "KeyPair$KeyName": "

The name of the key pair.

", - "KeyPair$KeyFingerprint": "

The SHA-1 digest of the DER encoded private key.

", - "KeyPair$KeyMaterial": "

An unencrypted PEM encoded RSA private key.

", - "KeyPairInfo$KeyName": "

The name of the key pair.

", - "KeyPairInfo$KeyFingerprint": "

If you used CreateKeyPair to create the key pair, this is the SHA-1 digest of the DER encoded private key. If you used ImportKeyPair to provide AWS the public key, this is the MD5 public key fingerprint as specified in section 4 of RFC4716.

", - "LaunchPermission$UserId": "

The AWS account ID.

", - "LaunchSpecification$ImageId": "

The ID of the AMI.

", - "LaunchSpecification$KeyName": "

The name of the key pair.

", - "LaunchSpecification$UserData": "

The Base64-encoded MIME user data to make available to the instances.

", - "LaunchSpecification$AddressingType": "

Deprecated.

", - "LaunchSpecification$KernelId": "

The ID of the kernel.

", - "LaunchSpecification$RamdiskId": "

The ID of the RAM disk.

", - "LaunchSpecification$SubnetId": "

The ID of the subnet in which to launch the instance.

", - "ModifyImageAttributeRequest$ImageId": "

The ID of the AMI.

", - "ModifyImageAttributeRequest$Attribute": "

The name of the attribute to modify.

", - "ModifyImageAttributeRequest$OperationType": "

The operation type.

", - "ModifyImageAttributeRequest$Value": "

The value of the attribute being modified. This is only valid when modifying the description attribute.

", - "ModifyInstanceAttributeRequest$InstanceId": "

The ID of the instance.

", - "ModifyInstanceAttributeRequest$Value": "

A new value for the attribute. Use only with the kernel, ramdisk, userData, disableApiTermination, or intanceInitiateShutdownBehavior attribute.

", - "ModifyNetworkInterfaceAttributeRequest$NetworkInterfaceId": "

The ID of the network interface.

", - "ModifyReservedInstancesRequest$ClientToken": "

A unique, case-sensitive token you provide to ensure idempotency of your modification request. For more information, see Ensuring Idempotency.

", - "ModifyReservedInstancesResult$ReservedInstancesModificationId": "

The ID for the modification.

", - "ModifySnapshotAttributeRequest$SnapshotId": "

The ID of the snapshot.

", - "ModifySnapshotAttributeRequest$OperationType": "

The type of operation to perform to the attribute.

", - "ModifySubnetAttributeRequest$SubnetId": "

The ID of the subnet.

", - "ModifyVolumeAttributeRequest$VolumeId": "

The ID of the volume.

", - "ModifyVpcAttributeRequest$VpcId": "

The ID of the VPC.

", - "NetworkAcl$NetworkAclId": "

The ID of the network ACL.

", - "NetworkAcl$VpcId": "

The ID of the VPC for the network ACL.

", - "NetworkAclAssociation$NetworkAclAssociationId": "

The ID of the association between a network ACL and a subnet.

", - "NetworkAclAssociation$NetworkAclId": "

The ID of the network ACL.

", - "NetworkAclAssociation$SubnetId": "

The ID of the subnet.

", - "NetworkAclEntry$Protocol": "

The protocol. A value of -1 means all protocols.

", - "NetworkAclEntry$CidrBlock": "

The network range to allow or deny, in CIDR notation.

", - "NetworkInterface$NetworkInterfaceId": "

The ID of the network interface.

", - "NetworkInterface$SubnetId": "

The ID of the subnet.

", - "NetworkInterface$VpcId": "

The ID of the VPC.

", - "NetworkInterface$AvailabilityZone": "

The Availability Zone.

", - "NetworkInterface$Description": "

A description.

", - "NetworkInterface$OwnerId": "

The AWS account ID of the owner of the network interface.

", - "NetworkInterface$RequesterId": "

The ID of the entity that launched the instance on your behalf (for example, AWS Management Console or Auto Scaling).

", - "NetworkInterface$MacAddress": "

The MAC address.

", - "NetworkInterface$PrivateIpAddress": "

The IP address of the network interface within the subnet.

", - "NetworkInterface$PrivateDnsName": "

The private DNS name.

", - "NetworkInterfaceAssociation$PublicIp": "

The address of the Elastic IP address bound to the network interface.

", - "NetworkInterfaceAssociation$PublicDnsName": "

The public DNS name.

", - "NetworkInterfaceAssociation$IpOwnerId": "

The ID of the Elastic IP address owner.

", - "NetworkInterfaceAssociation$AllocationId": "

The allocation ID.

", - "NetworkInterfaceAssociation$AssociationId": "

The association ID.

", - "NetworkInterfaceAttachment$AttachmentId": "

The ID of the network interface attachment.

", - "NetworkInterfaceAttachment$InstanceId": "

The ID of the instance.

", - "NetworkInterfaceAttachment$InstanceOwnerId": "

The AWS account ID of the owner of the instance.

", - "NetworkInterfaceAttachmentChanges$AttachmentId": "

The ID of the network interface attachment.

", - "NetworkInterfaceIdList$member": null, - "NetworkInterfacePrivateIpAddress$PrivateIpAddress": "

The private IP address.

", - "NetworkInterfacePrivateIpAddress$PrivateDnsName": "

The private DNS name.

", - "OwnerStringList$member": null, - "Placement$AvailabilityZone": "

The Availability Zone of the instance.

", - "Placement$GroupName": "

The name of the placement group the instance is in (for cluster compute instances).

", - "PlacementGroup$GroupName": "

The name of the placement group.

", - "PlacementGroupStringList$member": null, - "PrivateIpAddressSpecification$PrivateIpAddress": "

The private IP addresses.

", - "PrivateIpAddressStringList$member": null, - "ProductCode$ProductCodeId": "

The product code.

", - "ProductCodeStringList$member": null, - "ProductDescriptionList$member": null, - "PropagatingVgw$GatewayId": "

The ID of the virtual private gateway (VGW).

", - "PublicIpStringList$member": null, - "PurchaseReservedInstancesOfferingRequest$ReservedInstancesOfferingId": "

The ID of the Reserved Instance offering to purchase.

", - "PurchaseReservedInstancesOfferingResult$ReservedInstancesId": "

The IDs of the purchased Reserved Instances.

", - "Region$RegionName": "

The name of the region.

", - "Region$Endpoint": "

The region service endpoint.

", - "RegionNameStringList$member": null, - "RegisterImageRequest$ImageLocation": "

The full path to your AMI manifest in Amazon S3 storage.

", - "RegisterImageRequest$Name": "

A name for your AMI.

Constraints: 3-128 alphanumeric characters, parentheses (()), square brackets ([]), spaces ( ), periods (.), slashes (/), dashes (-), single quotes ('), at-signs (@), or underscores(_)

", - "RegisterImageRequest$Description": "

A description for your AMI.

", - "RegisterImageRequest$KernelId": "

The ID of the kernel.

", - "RegisterImageRequest$RamdiskId": "

The ID of the RAM disk.

", - "RegisterImageRequest$RootDeviceName": "

The name of the root device (for example, /dev/sda1, or /dev/xvda).

", - "RegisterImageRequest$VirtualizationType": "

The type of virtualization.

Default: paravirtual

", - "RegisterImageRequest$SriovNetSupport": "

Set to simple to enable enhanced networking for the AMI and any instances that you launch from the AMI.

There is no way to disable enhanced networking at this time.

This option is supported only for HVM AMIs. Specifying this option with a PV AMI can make instances launched from the AMI unreachable.

", - "RegisterImageResult$ImageId": "

The ID of the newly registered AMI.

", - "RejectVpcPeeringConnectionRequest$VpcPeeringConnectionId": "

The ID of the VPC peering connection.

", - "ReleaseAddressRequest$PublicIp": "

[EC2-Classic] The Elastic IP address. Required for EC2-Classic.

", - "ReleaseAddressRequest$AllocationId": "

[EC2-VPC] The allocation ID. Required for EC2-VPC.

", - "ReplaceNetworkAclAssociationRequest$AssociationId": "

The ID of the current association between the original network ACL and the subnet.

", - "ReplaceNetworkAclAssociationRequest$NetworkAclId": "

The ID of the new network ACL to associate with the subnet.

", - "ReplaceNetworkAclAssociationResult$NewAssociationId": "

The ID of the new association.

", - "ReplaceNetworkAclEntryRequest$NetworkAclId": "

The ID of the ACL.

", - "ReplaceNetworkAclEntryRequest$Protocol": "

The IP protocol. You can specify all or -1 to mean all protocols.

", - "ReplaceNetworkAclEntryRequest$CidrBlock": "

The network range to allow or deny, in CIDR notation.

", - "ReplaceRouteRequest$RouteTableId": "

The ID of the route table.

", - "ReplaceRouteRequest$DestinationCidrBlock": "

The CIDR address block used for the destination match. The value you provide must match the CIDR of an existing route in the table.

", - "ReplaceRouteRequest$GatewayId": "

The ID of an Internet gateway or virtual private gateway.

", - "ReplaceRouteRequest$InstanceId": "

The ID of a NAT instance in your VPC.

", - "ReplaceRouteRequest$NetworkInterfaceId": "

The ID of a network interface.

", - "ReplaceRouteRequest$VpcPeeringConnectionId": "

The ID of a VPC peering connection.

", - "ReplaceRouteTableAssociationRequest$AssociationId": "

The association ID.

", - "ReplaceRouteTableAssociationRequest$RouteTableId": "

The ID of the new route table to associate with the subnet.

", - "ReplaceRouteTableAssociationResult$NewAssociationId": "

The ID of the new association.

", - "ReportInstanceStatusRequest$Description": "

Descriptive text about the health state of your instance.

", - "RequestSpotInstancesRequest$SpotPrice": "

The maximum hourly price (bid) for any Spot Instance launched to fulfill the request.

", - "RequestSpotInstancesRequest$LaunchGroup": "

The instance launch group. Launch groups are Spot Instances that launch together and terminate together.

Default: Instances are launched and terminated individually

", - "RequestSpotInstancesRequest$AvailabilityZoneGroup": "

The user-specified name for a logical grouping of bids.

When you specify an Availability Zone group in a Spot Instance request, all Spot Instances in the request are launched in the same Availability Zone. Instance proximity is maintained with this parameter, but the choice of Availability Zone is not. The group applies only to bids for Spot Instances of the same instance type. Any additional Spot Instance requests that are specified with the same Availability Zone group name are launched in that same Availability Zone, as long as at least one instance from the group is still active.

If there is no active instance running in the Availability Zone group that you specify for a new Spot Instance request (all instances are terminated, the bid is expired, or the bid falls below current market), then Amazon EC2 launches the instance in any Availability Zone where the constraint can be met. Consequently, the subsequent set of Spot Instances could be placed in a different zone from the original request, even if you specified the same Availability Zone group.

Default: Instances are launched in any available Availability Zone.

", - "Reservation$ReservationId": "

The ID of the reservation.

", - "Reservation$OwnerId": "

The ID of the AWS account that owns the reservation.

", - "Reservation$RequesterId": "

The ID of the requester that launched the instances on your behalf (for example, AWS Management Console or Auto Scaling).

", - "ReservedInstances$ReservedInstancesId": "

The ID of the Reserved Instance.

", - "ReservedInstances$AvailabilityZone": "

The Availability Zone in which the Reserved Instance can be used.

", - "ReservedInstancesConfiguration$AvailabilityZone": "

The Availability Zone for the modified Reserved Instances.

", - "ReservedInstancesConfiguration$Platform": "

The network platform of the modified Reserved Instances, which is either EC2-Classic or EC2-VPC.

", - "ReservedInstancesId$ReservedInstancesId": "

The ID of the Reserved Instance.

", - "ReservedInstancesIdStringList$member": null, - "ReservedInstancesListing$ReservedInstancesListingId": "

The ID of the Reserved Instance listing.

", - "ReservedInstancesListing$ReservedInstancesId": "

The ID of the Reserved Instance.

", - "ReservedInstancesListing$StatusMessage": "

The reason for the current status of the Reserved Instance listing. The response can be blank.

", - "ReservedInstancesListing$ClientToken": "

A unique, case-sensitive key supplied by the client to ensure that the request is idempotent. For more information, see Ensuring Idempotency.

", - "ReservedInstancesModification$ReservedInstancesModificationId": "

A unique ID for the Reserved Instance modification.

", - "ReservedInstancesModification$Status": "

The status of the Reserved Instances modification request.

", - "ReservedInstancesModification$StatusMessage": "

The reason for the status.

", - "ReservedInstancesModification$ClientToken": "

A unique, case-sensitive key supplied by the client to ensure that the request is idempotent. For more information, see Ensuring Idempotency.

", - "ReservedInstancesModificationIdStringList$member": null, - "ReservedInstancesModificationResult$ReservedInstancesId": "

The ID for the Reserved Instances that were created as part of the modification request. This field is only available when the modification is fulfilled.

", - "ReservedInstancesOffering$ReservedInstancesOfferingId": "

The ID of the Reserved Instance offering.

", - "ReservedInstancesOffering$AvailabilityZone": "

The Availability Zone in which the Reserved Instance can be used.

", - "ReservedInstancesOfferingIdStringList$member": null, - "ResetImageAttributeRequest$ImageId": "

The ID of the AMI.

", - "ResetInstanceAttributeRequest$InstanceId": "

The ID of the instance.

", - "ResetNetworkInterfaceAttributeRequest$NetworkInterfaceId": "

The ID of the network interface.

", - "ResetNetworkInterfaceAttributeRequest$SourceDestCheck": "

The source/destination checking attribute. Resets the value to true.

", - "ResetSnapshotAttributeRequest$SnapshotId": "

The ID of the snapshot.

", - "ResourceIdList$member": null, - "RestorableByStringList$member": null, - "RevokeSecurityGroupEgressRequest$GroupId": "

The ID of the security group.

", - "RevokeSecurityGroupEgressRequest$SourceSecurityGroupName": "

[EC2-Classic, default VPC] The name of the destination security group. You can't specify a destination security group and a CIDR IP address range.

", - "RevokeSecurityGroupEgressRequest$SourceSecurityGroupOwnerId": "

The ID of the destination security group. You can't specify a destination security group and a CIDR IP address range.

", - "RevokeSecurityGroupEgressRequest$IpProtocol": "

The IP protocol name (tcp, udp, icmp) or number (see Protocol Numbers). Use -1 to specify all.

", - "RevokeSecurityGroupEgressRequest$CidrIp": "

The CIDR IP address range. You can't specify this parameter when specifying a source security group.

", - "RevokeSecurityGroupIngressRequest$GroupName": "

[EC2-Classic, default VPC] The name of the security group.

", - "RevokeSecurityGroupIngressRequest$GroupId": "

The ID of the security group.

", - "RevokeSecurityGroupIngressRequest$SourceSecurityGroupName": "

[EC2-Classic, default VPC] The name of the source security group. You can't specify a source security group and a CIDR IP address range.

", - "RevokeSecurityGroupIngressRequest$SourceSecurityGroupOwnerId": "

The ID of the source security group. You can't specify a source security group and a CIDR IP address range.

", - "RevokeSecurityGroupIngressRequest$IpProtocol": "

The IP protocol name (tcp, udp, icmp) or number (see Protocol Numbers). Use -1 to specify all.

", - "RevokeSecurityGroupIngressRequest$CidrIp": "

The CIDR IP address range. You can't specify this parameter when specifying a source security group.

", - "Route$DestinationCidrBlock": "

The CIDR block used for the destination match.

", - "Route$GatewayId": "

The ID of a gateway attached to your VPC.

", - "Route$InstanceId": "

The ID of a NAT instance in your VPC.

", - "Route$InstanceOwnerId": "

The AWS account ID of the owner of the instance.

", - "Route$NetworkInterfaceId": "

The ID of the network interface.

", - "Route$VpcPeeringConnectionId": "

The ID of the VPC peering connection.

", - "RouteTable$RouteTableId": "

The ID of the route table.

", - "RouteTable$VpcId": "

The ID of the VPC.

", - "RouteTableAssociation$RouteTableAssociationId": "

The ID of the association between a route table and a subnet.

", - "RouteTableAssociation$RouteTableId": "

The ID of the route table.

", - "RouteTableAssociation$SubnetId": "

The ID of the subnet.

", - "RunInstancesRequest$ImageId": "

The ID of the AMI, which you can get by calling DescribeImages.

", - "RunInstancesRequest$KeyName": "

The name of the key pair. You can create a key pair using CreateKeyPair or ImportKeyPair.

If you launch an instance without specifying a key pair, you can't connect to the instance.

", - "RunInstancesRequest$UserData": "

The Base64-encoded MIME user data for the instances.

", - "RunInstancesRequest$KernelId": "

The ID of the kernel.

We recommend that you use PV-GRUB instead of kernels and RAM disks. For more information, see PV-GRUB in the Amazon Elastic Compute Cloud User Guide for Linux.

", - "RunInstancesRequest$RamdiskId": "

The ID of the RAM disk.

We recommend that you use PV-GRUB instead of kernels and RAM disks. For more information, see PV-GRUB in the Amazon Elastic Compute Cloud User Guide for Linux.

", - "RunInstancesRequest$SubnetId": "

[EC2-VPC] The ID of the subnet to launch the instance into.

", - "RunInstancesRequest$PrivateIpAddress": "

[EC2-VPC] The primary IP address. You must specify a value from the IP address range of the subnet.

Only one private IP address can be designated as primary. Therefore, you can't specify this parameter if PrivateIpAddresses.n.Primary is set to true and PrivateIpAddresses.n.PrivateIpAddress is set to an IP address.

Default: We select an IP address from the IP address range of the subnet.

", - "RunInstancesRequest$ClientToken": "

Unique, case-sensitive identifier you provide to ensure the idempotency of the request. For more information, see Ensuring Idempotency.

Constraints: Maximum 64 ASCII characters

", - "RunInstancesRequest$AdditionalInfo": "

Reserved.

", - "S3Storage$Bucket": "

The bucket in which to store the AMI. You can specify a bucket that you already own or a new bucket that Amazon EC2 creates on your behalf. If you specify a bucket that belongs to someone else, Amazon EC2 returns an error.

", - "S3Storage$Prefix": "

The beginning of the file name of the AMI.

", - "S3Storage$AWSAccessKeyId": "

The access key ID of the owner of the bucket. Before you specify a value for your access key ID, review and follow the guidance in Best Practices for Managing AWS Access Keys.

", - "S3Storage$UploadPolicySignature": "

The signature of the Base64 encoded JSON document.

", - "SecurityGroup$OwnerId": "

The AWS account ID of the owner of the security group.

", - "SecurityGroup$GroupName": "

The name of the security group.

", - "SecurityGroup$GroupId": "

The ID of the security group.

", - "SecurityGroup$Description": "

A description of the security group.

", - "SecurityGroup$VpcId": "

[EC2-VPC] The ID of the VPC for the security group.

", - "SecurityGroupIdStringList$member": null, - "SecurityGroupStringList$member": null, - "Snapshot$SnapshotId": "

The ID of the snapshot.

", - "Snapshot$VolumeId": "

The ID of the volume.

", - "Snapshot$Progress": "

The progress of the snapshot, as a percentage.

", - "Snapshot$OwnerId": "

The AWS account ID of the Amazon EBS snapshot owner.

", - "Snapshot$Description": "

The description for the snapshot.

", - "Snapshot$OwnerAlias": "

The AWS account alias (for example, amazon, self) or AWS account ID that owns the snapshot.

", - "Snapshot$KmsKeyId": "

The full ARN of the AWS Key Management Service (KMS) master key that was used to protect the volume encryption key for the parent volume.

", - "SnapshotIdStringList$member": null, - "SpotDatafeedSubscription$OwnerId": "

The AWS account ID of the account.

", - "SpotDatafeedSubscription$Bucket": "

The Amazon S3 bucket where the Spot Instance data feed is located.

", - "SpotDatafeedSubscription$Prefix": "

The prefix that is prepended to data feed files.

", - "SpotInstanceRequest$SpotInstanceRequestId": "

The ID of the Spot Instance request.

", - "SpotInstanceRequest$SpotPrice": "

The maximum hourly price (bid) for any Spot Instance launched to fulfill the request.

", - "SpotInstanceRequest$LaunchGroup": "

The instance launch group. Launch groups are Spot Instances that launch together and terminate together.

", - "SpotInstanceRequest$AvailabilityZoneGroup": "

The Availability Zone group. If you specify the same Availability Zone group for all Spot Instance requests, all Spot Instances are launched in the same Availability Zone.

", - "SpotInstanceRequest$InstanceId": "

The instance ID, if an instance has been launched to fulfill the Spot Instance request.

", - "SpotInstanceRequest$LaunchedAvailabilityZone": "

The Availability Zone in which the bid is launched.

", - "SpotInstanceRequestIdList$member": null, - "SpotInstanceStateFault$Code": "

The reason code for the Spot Instance state change.

", - "SpotInstanceStateFault$Message": "

The message for the Spot Instance state change.

", - "SpotInstanceStatus$Code": "

The status code.

", - "SpotInstanceStatus$Message": "

The description for the status code.

", - "SpotPlacement$AvailabilityZone": "

The Availability Zone.

", - "SpotPlacement$GroupName": "

The name of the placement group (for cluster instances).

", - "SpotPrice$SpotPrice": "

The maximum price (bid) that you are willing to pay for a Spot Instance.

", - "SpotPrice$AvailabilityZone": "

The Availability Zone.

", - "StartInstancesRequest$AdditionalInfo": "

Reserved.

", - "StateReason$Code": "

The reason code for the state change.

", - "StateReason$Message": "

The message for the state change.

  • Server.SpotInstanceTermination: A Spot Instance was terminated due to an increase in the market price.

  • Server.InternalError: An internal error occurred during instance launch, resulting in termination.

  • Server.InsufficientInstanceCapacity: There was insufficient instance capacity to satisfy the launch request.

  • Client.InternalError: A client error caused the instance to terminate on launch.

  • Client.InstanceInitiatedShutdown: The instance was shut down using the shutdown -h command from the instance.

  • Client.UserInitiatedShutdown: The instance was shut down using the Amazon EC2 API.

  • Client.VolumeLimitExceeded: The volume limit was exceeded.

  • Client.InvalidSnapshot.NotFound: The specified snapshot was not found.

", - "Subnet$SubnetId": "

The ID of the subnet.

", - "Subnet$VpcId": "

The ID of the VPC the subnet is in.

", - "Subnet$CidrBlock": "

The CIDR block assigned to the subnet.

", - "Subnet$AvailabilityZone": "

The Availability Zone of the subnet.

", - "SubnetIdStringList$member": null, - "Tag$Key": "

The key of the tag.

Constraints: Tag keys are case-sensitive and accept a maximum of 127 Unicode characters. May not begin with aws:

", - "Tag$Value": "

The value of the tag.

Constraints: Tag values are case-sensitive and accept a maximum of 255 Unicode characters.

", - "TagDescription$ResourceId": "

The ID of the resource. For example, ami-1a2b3c4d.

", - "TagDescription$Key": "

The tag key.

", - "TagDescription$Value": "

The tag value.

", - "UnassignPrivateIpAddressesRequest$NetworkInterfaceId": "

The ID of the network interface.

", - "UserData$Data": null, - "UserGroupStringList$member": null, - "UserIdGroupPair$UserId": "

The ID of an AWS account. EC2-Classic only.

", - "UserIdGroupPair$GroupName": "

The name of the security group. In a request, use this parameter for a security group in EC2-Classic or a default VPC only. For a security group in a nondefault VPC, use GroupId.

", - "UserIdGroupPair$GroupId": "

The ID of the security group.

", - "UserIdStringList$member": null, - "ValueStringList$member": null, - "VgwTelemetry$OutsideIpAddress": "

The Internet-routable IP address of the virtual private gateway's outside interface.

", - "VgwTelemetry$StatusMessage": "

If an error occurs, a description of the error.

", - "Volume$VolumeId": "

The ID of the volume.

", - "Volume$SnapshotId": "

The snapshot from which the volume was created, if applicable.

", - "Volume$AvailabilityZone": "

The Availability Zone for the volume.

", - "Volume$KmsKeyId": "

The full ARN of the AWS Key Management Service (KMS) master key that was used to protect the volume encryption key for the volume.

", - "VolumeAttachment$VolumeId": "

The ID of the volume.

", - "VolumeAttachment$InstanceId": "

The ID of the instance.

", - "VolumeAttachment$Device": "

The device name.

", - "VolumeIdStringList$member": null, - "VolumeStatusAction$Code": "

The code identifying the operation, for example, enable-volume-io.

", - "VolumeStatusAction$Description": "

A description of the operation.

", - "VolumeStatusAction$EventType": "

The event type associated with this operation.

", - "VolumeStatusAction$EventId": "

The ID of the event associated with this operation.

", - "VolumeStatusDetails$Status": "

The intended status of the volume status.

", - "VolumeStatusEvent$EventType": "

The type of this event.

", - "VolumeStatusEvent$Description": "

A description of the event.

", - "VolumeStatusEvent$EventId": "

The ID of this event.

", - "VolumeStatusItem$VolumeId": "

The volume ID.

", - "VolumeStatusItem$AvailabilityZone": "

The Availability Zone of the volume.

", - "Vpc$VpcId": "

The ID of the VPC.

", - "Vpc$CidrBlock": "

The CIDR block for the VPC.

", - "Vpc$DhcpOptionsId": "

The ID of the set of DHCP options you've associated with the VPC (or default if the default options are associated with the VPC).

", - "VpcAttachment$VpcId": "

The ID of the VPC.

", - "VpcClassicLink$VpcId": "

The ID of the VPC.

", - "VpcClassicLinkIdList$member": null, - "VpcIdStringList$member": null, - "VpcPeeringConnection$VpcPeeringConnectionId": "

The ID of the VPC peering connection.

", - "VpcPeeringConnectionStateReason$Code": "

The status of the VPC peering connection.

", - "VpcPeeringConnectionStateReason$Message": "

A message that provides more information about the status, if applicable.

", - "VpcPeeringConnectionVpcInfo$CidrBlock": "

The CIDR block for the VPC.

", - "VpcPeeringConnectionVpcInfo$OwnerId": "

The AWS account ID of the VPC owner.

", - "VpcPeeringConnectionVpcInfo$VpcId": "

The ID of the VPC.

", - "VpnConnection$VpnConnectionId": "

The ID of the VPN connection.

", - "VpnConnection$CustomerGatewayConfiguration": "

The configuration information for the VPN connection's customer gateway (in the native XML format). This element is always present in the CreateVpnConnection response; however, it's present in the DescribeVpnConnections response only if the VPN connection is in the pending or available state.

", - "VpnConnection$CustomerGatewayId": "

The ID of the customer gateway at your end of the VPN connection.

", - "VpnConnection$VpnGatewayId": "

The ID of the virtual private gateway at the AWS side of the VPN connection.

", - "VpnConnectionIdStringList$member": null, - "VpnGateway$VpnGatewayId": "

The ID of the virtual private gateway.

", - "VpnGateway$AvailabilityZone": "

The Availability Zone where the virtual private gateway was created.

", - "VpnGatewayIdStringList$member": null, - "VpnStaticRoute$DestinationCidrBlock": "

The CIDR block associated with the local subnet of the customer data center.

", - "ZoneNameStringList$member": null, - "NewDhcpConfiguration$Key": null, - "RequestSpotLaunchSpecification$ImageId": "

The ID of the AMI.

", - "RequestSpotLaunchSpecification$KeyName": "

The name of the key pair.

", - "RequestSpotLaunchSpecification$UserData": "

The Base64-encoded MIME user data to make available to the instances.

", - "RequestSpotLaunchSpecification$AddressingType": "

Deprecated.

", - "RequestSpotLaunchSpecification$KernelId": "

The ID of the kernel.

", - "RequestSpotLaunchSpecification$RamdiskId": "

The ID of the RAM disk.

", - "RequestSpotLaunchSpecification$SubnetId": "

The ID of the subnet in which to launch the instance.

" - } - }, - "Subnet": { - "base": "

Describes a subnet.

", - "refs": { - "CreateSubnetResult$Subnet": "

Information about the subnet.

", - "SubnetList$member": null - } - }, - "SubnetIdStringList": { - "base": null, - "refs": { - "DescribeSubnetsRequest$SubnetIds": "

One or more subnet IDs.

Default: Describes all your subnets.

" - } - }, - "SubnetList": { - "base": null, - "refs": { - "DescribeSubnetsResult$Subnets": "

Information about one or more subnets.

" - } - }, - "SubnetState": { - "base": null, - "refs": { - "Subnet$State": "

The current state of the subnet.

" - } - }, - "SummaryStatus": { - "base": null, - "refs": { - "InstanceStatusSummary$Status": "

The status.

" - } - }, - "Tag": { - "base": "

Describes a tag.

", - "refs": { - "TagList$member": null - } - }, - "TagDescription": { - "base": "

Describes a tag.

", - "refs": { - "TagDescriptionList$member": null - } - }, - "TagDescriptionList": { - "base": null, - "refs": { - "DescribeTagsResult$Tags": "

A list of tags.

" - } - }, - "TagList": { - "base": null, - "refs": { - "ClassicLinkInstance$Tags": "

Any tags assigned to the instance.

", - "ConversionTask$Tags": null, - "CreateTagsRequest$Tags": "

One or more tags. The value parameter is required, but if you don't want the tag to have a value, specify the parameter with no value, and we set the value to an empty string.

", - "CustomerGateway$Tags": "

Any tags assigned to the customer gateway.

", - "DeleteTagsRequest$Tags": "

One or more tags to delete. If you omit the value parameter, we delete the tag regardless of its value. If you specify this parameter with an empty string as the value, we delete the key only if its value is an empty string.

", - "DhcpOptions$Tags": "

Any tags assigned to the DHCP options set.

", - "Image$Tags": "

Any tags assigned to the image.

", - "Instance$Tags": "

Any tags assigned to the instance.

", - "InternetGateway$Tags": "

Any tags assigned to the Internet gateway.

", - "NetworkAcl$Tags": "

Any tags assigned to the network ACL.

", - "NetworkInterface$TagSet": "

Any tags assigned to the network interface.

", - "ReservedInstances$Tags": "

Any tags assigned to the resource.

", - "ReservedInstancesListing$Tags": "

Any tags assigned to the resource.

", - "RouteTable$Tags": "

Any tags assigned to the route table.

", - "SecurityGroup$Tags": "

Any tags assigned to the security group.

", - "Snapshot$Tags": "

Any tags assigned to the snapshot.

", - "SpotInstanceRequest$Tags": "

Any tags assigned to the resource.

", - "Subnet$Tags": "

Any tags assigned to the subnet.

", - "Volume$Tags": "

Any tags assigned to the volume.

", - "Vpc$Tags": "

Any tags assigned to the VPC.

", - "VpcClassicLink$Tags": "

Any tags assigned to the VPC.

", - "VpcPeeringConnection$Tags": "

Any tags assigned to the resource.

", - "VpnConnection$Tags": "

Any tags assigned to the VPN connection.

", - "VpnGateway$Tags": "

Any tags assigned to the virtual private gateway.

" - } - }, - "TelemetryStatus": { - "base": null, - "refs": { - "VgwTelemetry$Status": "

The status of the VPN tunnel.

" - } - }, - "Tenancy": { - "base": null, - "refs": { - "CreateVpcRequest$InstanceTenancy": "

The supported tenancy options for instances launched into the VPC. A value of default means that instances can be launched with any tenancy; a value of dedicated means all instances launched into the VPC are launched as dedicated tenancy instances regardless of the tenancy assigned to the instance at launch. Dedicated tenancy instances run on single-tenant hardware.

Default: default

", - "DescribeReservedInstancesOfferingsRequest$InstanceTenancy": "

The tenancy of the Reserved Instance offering. A Reserved Instance with dedicated tenancy runs on single-tenant hardware and can only be launched within a VPC.

Default: default

", - "Placement$Tenancy": "

The tenancy of the instance (if the instance is running in a VPC). An instance with a tenancy of dedicated runs on single-tenant hardware.

", - "ReservedInstances$InstanceTenancy": "

The tenancy of the reserved instance.

", - "ReservedInstancesOffering$InstanceTenancy": "

The tenancy of the reserved instance.

", - "Vpc$InstanceTenancy": "

The allowed tenancy of instances launched into the VPC.

" - } - }, - "TerminateInstancesRequest": { - "base": null, - "refs": { - } - }, - "TerminateInstancesResult": { - "base": null, - "refs": { - } - }, - "UnassignPrivateIpAddressesRequest": { - "base": null, - "refs": { - } - }, - "UnmonitorInstancesRequest": { - "base": null, - "refs": { - } - }, - "UnmonitorInstancesResult": { - "base": null, - "refs": { - } - }, - "UserData": { - "base": null, - "refs": { - "ImportInstanceLaunchSpecification$UserData": "

User data to be made available to the instance.

" - } - }, - "UserGroupStringList": { - "base": null, - "refs": { - "ModifyImageAttributeRequest$UserGroups": "

One or more user groups. This is only valid when modifying the launchPermission attribute.

" - } - }, - "UserIdGroupPair": { - "base": "

Describes a security group and AWS account ID pair.

", - "refs": { - "UserIdGroupPairList$member": null - } - }, - "UserIdGroupPairList": { - "base": null, - "refs": { - "IpPermission$UserIdGroupPairs": "

One or more security group and AWS account ID pairs.

" - } - }, - "UserIdStringList": { - "base": null, - "refs": { - "ModifyImageAttributeRequest$UserIds": "

One or more AWS account IDs. This is only valid when modifying the launchPermission attribute.

", - "ModifySnapshotAttributeRequest$UserIds": "

The account ID to modify for the snapshot.

" - } - }, - "ValueStringList": { - "base": null, - "refs": { - "DescribeInternetGatewaysRequest$InternetGatewayIds": "

One or more Internet gateway IDs.

Default: Describes all your Internet gateways.

", - "DescribeNetworkAclsRequest$NetworkAclIds": "

One or more network ACL IDs.

Default: Describes all your network ACLs.

", - "DescribeRouteTablesRequest$RouteTableIds": "

One or more route table IDs.

Default: Describes all your route tables.

", - "DescribeVpcPeeringConnectionsRequest$VpcPeeringConnectionIds": "

One or more VPC peering connection IDs.

Default: Describes all your VPC peering connections.

", - "Filter$Values": "

One or more filter values. Filter values are case-sensitive.

", - "NewDhcpConfiguration$Values": null, - "RequestSpotLaunchSpecification$SecurityGroups": null, - "RequestSpotLaunchSpecification$SecurityGroupIds": null - } - }, - "VgwTelemetry": { - "base": "

Describes telemetry for a VPN tunnel.

", - "refs": { - "VgwTelemetryList$member": null - } - }, - "VgwTelemetryList": { - "base": null, - "refs": { - "VpnConnection$VgwTelemetry": "

Information about the VPN tunnel.

" - } - }, - "VirtualizationType": { - "base": null, - "refs": { - "Image$VirtualizationType": "

The type of virtualization of the AMI.

", - "Instance$VirtualizationType": "

The virtualization type of the instance.

" - } - }, - "Volume": { - "base": "

Describes a volume.

", - "refs": { - "VolumeList$member": null - } - }, - "VolumeAttachment": { - "base": "

Describes volume attachment details.

", - "refs": { - "VolumeAttachmentList$member": null - } - }, - "VolumeAttachmentList": { - "base": null, - "refs": { - "Volume$Attachments": null - } - }, - "VolumeAttachmentState": { - "base": null, - "refs": { - "VolumeAttachment$State": "

The attachment state of the volume.

" - } - }, - "VolumeAttributeName": { - "base": null, - "refs": { - "DescribeVolumeAttributeRequest$Attribute": "

The instance attribute.

" - } - }, - "VolumeDetail": { - "base": "

Describes an Amazon EBS volume.

", - "refs": { - "DiskImage$Volume": null, - "ImportVolumeRequest$Volume": null - } - }, - "VolumeIdStringList": { - "base": null, - "refs": { - "DescribeVolumeStatusRequest$VolumeIds": "

One or more volume IDs.

Default: Describes all your volumes.

", - "DescribeVolumesRequest$VolumeIds": "

One or more volume IDs.

" - } - }, - "VolumeList": { - "base": null, - "refs": { - "DescribeVolumesResult$Volumes": null - } - }, - "VolumeState": { - "base": null, - "refs": { - "Volume$State": "

The volume state.

" - } - }, - "VolumeStatusAction": { - "base": "

Describes a volume status operation code.

", - "refs": { - "VolumeStatusActionsList$member": null - } - }, - "VolumeStatusActionsList": { - "base": null, - "refs": { - "VolumeStatusItem$Actions": "

The details of the operation.

" - } - }, - "VolumeStatusDetails": { - "base": "

Describes a volume status.

", - "refs": { - "VolumeStatusDetailsList$member": null - } - }, - "VolumeStatusDetailsList": { - "base": null, - "refs": { - "VolumeStatusInfo$Details": "

The details of the volume status.

" - } - }, - "VolumeStatusEvent": { - "base": "

Describes a volume status event.

", - "refs": { - "VolumeStatusEventsList$member": null - } - }, - "VolumeStatusEventsList": { - "base": null, - "refs": { - "VolumeStatusItem$Events": "

A list of events associated with the volume.

" - } - }, - "VolumeStatusInfo": { - "base": "

Describes the status of a volume.

", - "refs": { - "VolumeStatusItem$VolumeStatus": "

The volume status.

" - } - }, - "VolumeStatusInfoStatus": { - "base": null, - "refs": { - "VolumeStatusInfo$Status": "

The status of the volume.

" - } - }, - "VolumeStatusItem": { - "base": "

Describes the volume status.

", - "refs": { - "VolumeStatusList$member": null - } - }, - "VolumeStatusList": { - "base": null, - "refs": { - "DescribeVolumeStatusResult$VolumeStatuses": "

A list of volumes.

" - } - }, - "VolumeStatusName": { - "base": null, - "refs": { - "VolumeStatusDetails$Name": "

The name of the volume status.

" - } - }, - "VolumeType": { - "base": null, - "refs": { - "CreateVolumeRequest$VolumeType": "

The volume type. This can be gp2 for General Purpose (SSD) volumes, io1 for Provisioned IOPS (SSD) volumes, or standard for Magnetic volumes.

Default: standard

", - "EbsBlockDevice$VolumeType": "

The volume type. gp2 for General Purpose (SSD) volumes, io1 for Provisioned IOPS (SSD) volumes, and standard for Magnetic volumes.

Default: standard

", - "Volume$VolumeType": "

The volume type. This can be gp2 for General Purpose (SSD) volumes, io1 for Provisioned IOPS (SSD) volumes, or standard for Magnetic volumes.

" - } - }, - "Vpc": { - "base": "

Describes a VPC.

", - "refs": { - "CreateVpcResult$Vpc": "

Information about the VPC.

", - "VpcList$member": null - } - }, - "VpcAttachment": { - "base": "

Describes an attachment between a virtual private gateway and a VPC.

", - "refs": { - "AttachVpnGatewayResult$VpcAttachment": "

Information about the attachment.

", - "VpcAttachmentList$member": null - } - }, - "VpcAttachmentList": { - "base": null, - "refs": { - "VpnGateway$VpcAttachments": "

Any VPCs attached to the virtual private gateway.

" - } - }, - "VpcAttributeName": { - "base": null, - "refs": { - "DescribeVpcAttributeRequest$Attribute": "

The VPC attribute.

" - } - }, - "VpcClassicLink": { - "base": "

Describes whether a VPC is enabled for ClassicLink.

", - "refs": { - "VpcClassicLinkList$member": null - } - }, - "VpcClassicLinkIdList": { - "base": null, - "refs": { - "DescribeVpcClassicLinkRequest$VpcIds": "

One or more VPCs for which you want to describe the ClassicLink status.

" - } - }, - "VpcClassicLinkList": { - "base": null, - "refs": { - "DescribeVpcClassicLinkResult$Vpcs": "

The ClassicLink status of one or more VPCs.

" - } - }, - "VpcIdStringList": { - "base": null, - "refs": { - "DescribeVpcsRequest$VpcIds": "

One or more VPC IDs.

Default: Describes all your VPCs.

" - } - }, - "VpcList": { - "base": null, - "refs": { - "DescribeVpcsResult$Vpcs": "

Information about one or more VPCs.

" - } - }, - "VpcPeeringConnection": { - "base": "

Describes a VPC peering connection.

", - "refs": { - "AcceptVpcPeeringConnectionResult$VpcPeeringConnection": "

Information about the VPC peering connection.

", - "CreateVpcPeeringConnectionResult$VpcPeeringConnection": "

Information about the VPC peering connection.

", - "VpcPeeringConnectionList$member": null - } - }, - "VpcPeeringConnectionList": { - "base": null, - "refs": { - "DescribeVpcPeeringConnectionsResult$VpcPeeringConnections": "

Information about the VPC peering connections.

" - } - }, - "VpcPeeringConnectionStateReason": { - "base": "

Describes the status of a VPC peering connection.

", - "refs": { - "VpcPeeringConnection$Status": "

The status of the VPC peering connection.

" - } - }, - "VpcPeeringConnectionVpcInfo": { - "base": "

Describes a VPC in a VPC peering connection.

", - "refs": { - "VpcPeeringConnection$AccepterVpcInfo": "

The information of the peer VPC.

", - "VpcPeeringConnection$RequesterVpcInfo": "

The information of the requester VPC.

" - } - }, - "VpcState": { - "base": null, - "refs": { - "Vpc$State": "

The current state of the VPC.

" - } - }, - "VpnConnection": { - "base": "

Describes a VPN connection.

", - "refs": { - "CreateVpnConnectionResult$VpnConnection": "

Information about the VPN connection.

", - "VpnConnectionList$member": null - } - }, - "VpnConnectionIdStringList": { - "base": null, - "refs": { - "DescribeVpnConnectionsRequest$VpnConnectionIds": "

One or more VPN connection IDs.

Default: Describes your VPN connections.

" - } - }, - "VpnConnectionList": { - "base": null, - "refs": { - "DescribeVpnConnectionsResult$VpnConnections": "

Information about one or more VPN connections.

" - } - }, - "VpnConnectionOptions": { - "base": "

Describes VPN connection options.

", - "refs": { - "VpnConnection$Options": "

The VPN connection options.

" - } - }, - "VpnConnectionOptionsSpecification": { - "base": "

Describes VPN connection options.

", - "refs": { - "CreateVpnConnectionRequest$Options": "

Indicates whether the VPN connection requires static routes. If you are creating a VPN connection for a device that does not support BGP, you must specify true.

Default: false

" - } - }, - "VpnGateway": { - "base": "

Describes a virtual private gateway.

", - "refs": { - "CreateVpnGatewayResult$VpnGateway": "

Information about the virtual private gateway.

", - "VpnGatewayList$member": null - } - }, - "VpnGatewayIdStringList": { - "base": null, - "refs": { - "DescribeVpnGatewaysRequest$VpnGatewayIds": "

One or more virtual private gateway IDs.

Default: Describes all your virtual private gateways.

" - } - }, - "VpnGatewayList": { - "base": null, - "refs": { - "DescribeVpnGatewaysResult$VpnGateways": "

Information about one or more virtual private gateways.

" - } - }, - "VpnState": { - "base": null, - "refs": { - "VpnConnection$State": "

The current state of the VPN connection.

", - "VpnGateway$State": "

The current state of the virtual private gateway.

", - "VpnStaticRoute$State": "

The current state of the static route.

" - } - }, - "VpnStaticRoute": { - "base": "

Describes a static route for a VPN connection.

", - "refs": { - "VpnStaticRouteList$member": null - } - }, - "VpnStaticRouteList": { - "base": null, - "refs": { - "VpnConnection$Routes": "

The static routes associated with the VPN connection.

" - } - }, - "VpnStaticRouteSource": { - "base": null, - "refs": { - "VpnStaticRoute$Source": "

Indicates how the routes were provided.

" - } - }, - "ZoneNameStringList": { - "base": null, - "refs": { - "DescribeAvailabilityZonesRequest$ZoneNames": "

The names of one or more Availability Zones.

" - } - }, - "NewDhcpConfigurationList": { - "base": null, - "refs": { - "CreateDhcpOptionsRequest$DhcpConfigurations": "

A DHCP configuration option.

" - } - }, - "NewDhcpConfiguration": { - "base": null, - "refs": { - "NewDhcpConfigurationList$member": null - } - }, - "DhcpConfigurationValueList": { - "base": null, - "refs": { - "DhcpConfiguration$Values": "

One or more values for the DHCP option.

" - } - }, - "Blob": { - "base": null, - "refs": { - "ImportKeyPairRequest$PublicKeyMaterial": "

The public key. You must base64 encode the public key material before sending it to AWS.

", - "S3Storage$UploadPolicy": "

A Base64-encoded Amazon S3 upload policy that gives Amazon EC2 permission to upload items into Amazon S3 on your behalf.

", - "BlobAttributeValue$Value": null - } - }, - "BlobAttributeValue": { - "base": null, - "refs": { - "ModifyInstanceAttributeRequest$UserData": "

Changes the instance's user data to the specified value.

" - } - }, - "RequestSpotLaunchSpecification": { - "base": "

Describes the launch specification for an instance.

", - "refs": { - "RequestSpotInstancesRequest$LaunchSpecification": null - } - } - } -} diff --git a/aws-sdk-core/apis/ec2/2014-10-01/paginators-1.json b/aws-sdk-core/apis/ec2/2014-10-01/paginators-1.json deleted file mode 100644 index 740f2e36abb..00000000000 --- a/aws-sdk-core/apis/ec2/2014-10-01/paginators-1.json +++ /dev/null @@ -1,125 +0,0 @@ -{ - "pagination": { - "DescribeAccountAttributes": { - "result_key": "AccountAttributes" - }, - "DescribeAddresses": { - "result_key": "Addresses" - }, - "DescribeAvailabilityZones": { - "result_key": "AvailabilityZones" - }, - "DescribeBundleTasks": { - "result_key": "BundleTasks" - }, - "DescribeConversionTasks": { - "result_key": "ConversionTasks" - }, - "DescribeCustomerGateways": { - "result_key": "CustomerGateways" - }, - "DescribeDhcpOptions": { - "result_key": "DhcpOptions" - }, - "DescribeExportTasks": { - "result_key": "ExportTasks" - }, - "DescribeImages": { - "result_key": "Images" - }, - "DescribeInstanceStatus": { - "input_token": "NextToken", - "output_token": "NextToken", - "limit_key": "MaxResults", - "result_key": "InstanceStatuses" - }, - "DescribeInstances": { - "input_token": "NextToken", - "output_token": "NextToken", - "limit_key": "MaxResults", - "result_key": "Reservations" - }, - "DescribeInternetGateways": { - "result_key": "InternetGateways" - }, - "DescribeKeyPairs": { - "result_key": "KeyPairs" - }, - "DescribeNetworkAcls": { - "result_key": "NetworkAcls" - }, - "DescribeNetworkInterfaces": { - "result_key": "NetworkInterfaces" - }, - "DescribePlacementGroups": { - "result_key": "PlacementGroups" - }, - "DescribeRegions": { - "result_key": "Regions" - }, - "DescribeReservedInstances": { - "result_key": "ReservedInstances" - }, - "DescribeReservedInstancesListings": { - "result_key": "ReservedInstancesListings" - }, - "DescribeReservedInstancesOfferings": { - "input_token": "NextToken", - "output_token": "NextToken", - "limit_key": "MaxResults", - "result_key": "ReservedInstancesOfferings" - }, - "DescribeReservedInstancesModifications": { - "input_token": "NextToken", - "output_token": "NextToken", - "result_key": "ReservedInstancesModifications" - }, - "DescribeRouteTables": { - "result_key": "RouteTables" - }, - "DescribeSecurityGroups": { - "result_key": "SecurityGroups" - }, - "DescribeSnapshots": { - "input_token": "NextToken", - "output_token": "NextToken", - "result_key": "Snapshots" - }, - "DescribeSpotInstanceRequests": { - "result_key": "SpotInstanceRequests" - }, - "DescribeSpotPriceHistory": { - "input_token": "NextToken", - "output_token": "NextToken", - "limit_key": "MaxResults", - "result_key": "SpotPriceHistory" - }, - "DescribeSubnets": { - "result_key": "Subnets" - }, - "DescribeTags": { - "result_key": "Tags" - }, - "DescribeVolumeStatus": { - "input_token": "NextToken", - "output_token": "NextToken", - "limit_key": "MaxResults", - "result_key": "VolumeStatuses" - }, - "DescribeVolumes": { - "input_token": "NextToken", - "output_token": "NextToken", - "limit_key": "MaxResults", - "result_key": "Volumes" - }, - "DescribeVpcs": { - "result_key": "Vpcs" - }, - "DescribeVpnConnections": { - "result_key": "VpnConnections" - }, - "DescribeVpnGateways": { - "result_key": "VpnGateways" - } - } -} diff --git a/aws-sdk-core/apis/ec2/2014-10-01/resources-1.json b/aws-sdk-core/apis/ec2/2014-10-01/resources-1.json deleted file mode 100644 index 8ccf160a7f3..00000000000 --- a/aws-sdk-core/apis/ec2/2014-10-01/resources-1.json +++ /dev/null @@ -1,2289 +0,0 @@ -{ - "service": { - "actions": { - "CreateDhcpOptions": { - "request": { "operation": "CreateDhcpOptions" }, - "resource": { - "type": "DhcpOptions", - "identifiers": [ - { "target": "Id", "source": "response", "path": "DhcpOptions.DhcpOptionsId" } - ], - "path": "DhcpOptions" - } - }, - "CreateInstances": { - "request": { "operation": "RunInstances" }, - "resource": { - "type": "Instance", - "identifiers": [ - { "target": "Id", "source": "response", "path": "Instances[].InstanceId" } - ], - "path": "Instances[]" - } - }, - "CreateInternetGateway": { - "request": { "operation": "CreateInternetGateway" }, - "resource": { - "type": "InternetGateway", - "identifiers": [ - { "target": "Id", "source": "response", "path": "InternetGateway.InternetGatewayId" } - ], - "path": "InternetGateway" - } - }, - "CreateKeyPair": { - "request": { "operation": "CreateKeyPair" }, - "resource": { - "type": "KeyPair", - "identifiers": [ - { "target": "Name", "source": "response", "path": "KeyName" } - ] - } - }, - "CreateNetworkAcl": { - "request": { "operation": "CreateNetworkAcl" }, - "resource": { - "type": "NetworkAcl", - "identifiers": [ - { "target": "Id", "source": "response", "path": "NetworkAcl.NetworkAclId" } - ], - "path": "NetworkAcl" - } - }, - "CreateNetworkInterface": { - "request": { "operation": "CreateNetworkInterface" }, - "resource": { - "type": "NetworkInterface", - "identifiers": [ - { "target": "Id", "source": "response", "path": "NetworkInterface.NetworkInterfaceId" } - ], - "path": "NetworkInterface" - } - }, - "CreatePlacementGroup": { - "request": { "operation": "CreatePlacementGroup" }, - "resource": { - "type": "PlacementGroup", - "identifiers": [ - { "target": "Name", "source": "requestParameter", "path": "GroupName" } - ] - } - }, - "CreateRouteTable": { - "request": { "operation": "CreateRouteTable" }, - "resource": { - "type": "RouteTable", - "identifiers": [ - { "target": "Id", "source": "response", "path": "RouteTable.RouteTableId" } - ], - "path": "RouteTable" - } - }, - "CreateSecurityGroup": { - "request": { "operation": "CreateSecurityGroup" }, - "resource": { - "type": "SecurityGroup", - "identifiers": [ - { "target": "Id", "source": "response", "path": "GroupId" } - ] - } - }, - "CreateSnapshot": { - "request": { "operation": "CreateSnapshot" }, - "resource": { - "type": "Snapshot", - "identifiers": [ - { "target": "Id", "source": "response", "path": "SnapshotId" } - ], - "path": "@" - } - }, - "CreateSubnet": { - "request": { "operation": "CreateSubnet" }, - "resource": { - "type": "Subnet", - "identifiers": [ - { "target": "Id", "source": "response", "path": "Subnet.SubnetId" } - ], - "path": "Subnet" - } - }, - "CreateTags": { - "request": { "operation": "CreateTags" }, - "resource": { - "type": "Tag", - "identifiers": [ - { "target": "ResourceId", "source": "requestParameter", "path": "Resources[]" }, - { "target": "Key", "source": "requestParameter", "path": "Tags[].Key" }, - { "target": "Value", "source": "requestParameter", "path": "Tags[].Value" } - ] - } - }, - "CreateVolume": { - "request": { "operation": "CreateVolume" }, - "resource": { - "type": "Volume", - "identifiers": [ - { "target": "Id", "source": "response", "path": "VolumeId" } - ], - "path": "@" - } - }, - "CreateVpc": { - "request": { "operation": "CreateVpc" }, - "resource": { - "type": "Vpc", - "identifiers": [ - { "target": "Id", "source": "response", "path": "Vpc.VpcId" } - ], - "path": "Vpc" - } - }, - "CreateVpcPeeringConnection": { - "request": { "operation": "CreateVpcPeeringConnection" }, - "resource": { - "type": "VpcPeeringConnection", - "identifiers": [ - { "target": "Id", "source": "response", "path": "VpcPeeringConnection.VpcPeeringConnectionId" } - ], - "path": "VpcPeeringConnection" - } - }, - "DisassociateRouteTable": { - "request": { "operation": "DisassociateRouteTable" } - }, - "ImportKeyPair": { - "request": { "operation": "ImportKeyPair" }, - "resource": { - "type": "KeyPair", - "identifiers": [ - { "target": "Name", "source": "response", "path": "KeyName" } - ] - } - }, - "RegisterImage": { - "request": { "operation": "RegisterImage" }, - "resource": { - "type": "Image", - "identifiers": [ - { "target": "Id", "source": "response", "path": "ImageId" } - ] - } - } - }, - "has": { - "DhcpOptions": { - "resource": { - "type": "DhcpOptions", - "identifiers": [ - { "target": "Id", "source": "input" } - ] - } - }, - "Image": { - "resource": { - "type": "Image", - "identifiers": [ - { "target": "Id", "source": "input" } - ] - } - }, - "Instance": { - "resource": { - "type": "Instance", - "identifiers": [ - { "target": "Id", "source": "input" } - ] - } - }, - "InternetGateway": { - "resource": { - "type": "InternetGateway", - "identifiers": [ - { "target": "Id", "source": "input" } - ] - } - }, - "KeyPair": { - "resource": { - "type": "KeyPair", - "identifiers": [ - { "target": "Name", "source": "input" } - ] - } - }, - "NetworkAcl": { - "resource": { - "type": "NetworkAcl", - "identifiers": [ - { "target": "Id", "source": "input" } - ] - } - }, - "NetworkInterface": { - "resource": { - "type": "NetworkInterface", - "identifiers": [ - { "target": "Id", "source": "input" } - ] - } - }, - "PlacementGroup": { - "resource": { - "type": "PlacementGroup", - "identifiers": [ - { "target": "Name", "source": "input" } - ] - } - }, - "RouteTable": { - "resource": { - "type": "RouteTable", - "identifiers": [ - { "target": "Id", "source": "input" } - ] - } - }, - "RouteTableAssociation": { - "resource": { - "type": "RouteTableAssociation", - "identifiers": [ - { "target": "Id", "source": "input" } - ] - } - }, - "SecurityGroup": { - "resource": { - "type": "SecurityGroup", - "identifiers": [ - { "target": "Id", "source": "input" } - ] - } - }, - "Snapshot": { - "resource": { - "type": "Snapshot", - "identifiers": [ - { "target": "Id", "source": "input" } - ] - } - }, - "Subnet": { - "resource": { - "type": "Subnet", - "identifiers": [ - { "target": "Id", "source": "input" } - ] - } - }, - "Volume": { - "resource": { - "type": "Volume", - "identifiers": [ - { "target": "Id", "source": "input" } - ] - } - }, - "Vpc": { - "resource": { - "type": "Vpc", - "identifiers": [ - { "target": "Id", "source": "input" } - ] - } - }, - "VpcPeeringConnection": { - "resource": { - "type": "VpcPeeringConnection", - "identifiers": [ - { "target": "Id", "source": "input" } - ] - } - } - }, - "hasMany": { - "DhcpOptionsSets": { - "request": { "operation": "DescribeDhcpOptions" }, - "resource": { - "type": "DhcpOptions", - "identifiers": [ - { "target": "Id", "source": "response", "path": "DhcpOptions[].DhcpOptionsId" } - ], - "path": "DhcpOptions[]" - } - }, - "Images": { - "request": { "operation": "DescribeImages" }, - "resource": { - "type": "Image", - "identifiers": [ - { "target": "Id", "source": "response", "path": "Images[].ImageId" } - ], - "path": "Images[]" - } - }, - "Instances": { - "request": { "operation": "DescribeInstances" }, - "resource": { - "type": "Instance", - "identifiers": [ - { "target": "Id", "source": "response", "path": "Reservations[].Instances[].InstanceId" } - ], - "path": "Reservations[].Instances[]" - } - }, - "InternetGateways": { - "request": { "operation": "DescribeInternetGateways" }, - "resource": { - "type": "InternetGateway", - "identifiers": [ - { "target": "Id", "source": "response", "path": "InternetGateways[].InternetGatewayId" } - ], - "path": "InternetGateways[]" - } - }, - "KeyPairs": { - "request": { "operation": "DescribeKeyPairs" }, - "resource": { - "type": "KeyPair", - "identifiers": [ - { "target": "Name", "source": "response", "path": "KeyPairs[].KeyName" } - ], - "path": "KeyPairs[]" - } - }, - "NetworkAcls": { - "request": { "operation": "DescribeNetworkAcls" }, - "resource": { - "type": "NetworkAcl", - "identifiers": [ - { "target": "Id", "source": "response", "path": "NetworkAcls[].NetworkAclId" } - ], - "path": "NetworkAcls[]" - } - }, - "NetworkInterfaces": { - "request": { "operation": "DescribeNetworkInterfaces" }, - "resource": { - "type": "NetworkInterface", - "identifiers": [ - { "target": "Id", "source": "response", "path": "NetworkInterfaces[].NetworkInterfaceId" } - ], - "path": "NetworkInterfaces[]" - } - }, - "PlacementGroups": { - "request": { "operation": "DescribePlacementGroups" }, - "resource": { - "type": "PlacementGroup", - "identifiers": [ - { "target": "Name", "source": "response", "path": "PlacementGroups[].GroupName" } - ], - "path": "PlacementGroups[]" - } - }, - "RouteTables": { - "request": { "operation": "DescribeRouteTables" }, - "resource": { - "type": "RouteTable", - "identifiers": [ - { "target": "Id", "source": "response", "path": "RouteTables[].RouteTableId" } - ], - "path": "RouteTables[]" - } - }, - "SecurityGroups": { - "request": { "operation": "DescribeSecurityGroups" }, - "resource": { - "type": "SecurityGroup", - "identifiers": [ - { "target": "Id", "source": "response", "path": "SecurityGroups[].GroupId" } - ], - "path": "SecurityGroups[]" - } - }, - "Snapshots": { - "request": { "operation": "DescribeSnapshots" }, - "resource": { - "type": "Snapshot", - "identifiers": [ - { "target": "Id", "source": "response", "path": "Snapshots[].SnapshotId" } - ], - "path": "Snapshots[]" - } - }, - "Subnets": { - "request": { "operation": "DescribeSubnets" }, - "resource": { - "type": "Subnet", - "identifiers": [ - { "target": "Id", "source": "response", "path": "Subnets[].SubnetId" } - ], - "path": "Subnets[]" - } - }, - "Volumes": { - "request": { "operation": "DescribeVolumes" }, - "resource": { - "type": "Volume", - "identifiers": [ - { "target": "Id", "source": "response", "path": "Volumes[].VolumeId" } - ], - "path": "Volumes[]" - } - }, - "VpcPeeringConnections": { - "request": { "operation": "DescribeVpcPeeringConnections" }, - "resource": { - "type": "VpcPeeringConnection", - "identifiers": [ - { "target": "Id", "source": "response", "path": "VpcPeeringConnections[].VpcPeeringConnectionId" } - ], - "path": "VpcPeeringConnections[]" - } - }, - "Vpcs": { - "request": { "operation": "DescribeVpcs" }, - "resource": { - "type": "Vpc", - "identifiers": [ - { "target": "Id", "source": "response", "path": "Vpcs[].VpcId" } - ], - "path": "Vpcs[]" - } - } - } - }, - "resources": { - "DhcpOptions": { - "identifiers": [ - { - "name": "Id", - "memberName": "DhcpOptionsId" - } - ], - "shape": "DhcpOptions", - "load": { - "request": { - "operation": "DescribeDhcpOptions", - "params": [ - { "target": "DhcpOptionsIds[0]", "source": "identifier", "name": "Id" } - ] - }, - "path": "DhcpOptions[0]" - }, - "actions": { - "AssociateWithVpc": { - "request": { - "operation": "AssociateDhcpOptions", - "params": [ - { "target": "DhcpOptionsId", "source": "identifier", "name": "Id" } - ] - } - }, - "CreateTags": { - "request": { - "operation": "CreateTags", - "params": [ - { "target": "Resources[0]", "source": "identifier", "name": "Id" } - ] - }, - "resource": { - "type": "Tag", - "identifiers": [ - { "target": "ResourceId", "source": "identifier", "name": "Id" }, - { "target": "Key", "source": "requestParameter", "path": "Tags[].Key" }, - { "target": "Value", "source": "requestParameter", "path": "Tags[].Value" } - ] - } - }, - "Delete": { - "request": { - "operation": "DeleteDhcpOptions", - "params": [ - { "target": "DhcpOptionsId", "source": "identifier", "name": "Id" } - ] - } - } - } - }, - "Image": { - "identifiers": [ - { - "name": "Id", - "memberName": "ImageId" - } - ], - "shape": "Image", - "load": { - "request": { - "operation": "DescribeImages", - "params": [ - { "target": "ImageIds[0]", "source": "identifier", "name": "Id" } - ] - }, - "path": "Images[0]" - }, - "actions": { - "CreateTags": { - "request": { - "operation": "CreateTags", - "params": [ - { "target": "Resources[0]", "source": "identifier", "name": "Id" } - ] - }, - "resource": { - "type": "Tag", - "identifiers": [ - { "target": "ResourceId", "source": "identifier", "name": "Id" }, - { "target": "Key", "source": "requestParameter", "path": "Tags[].Key" }, - { "target": "Value", "source": "requestParameter", "path": "Tags[].Value" } - ] - } - }, - "Deregister": { - "request": { - "operation": "DeregisterImage", - "params": [ - { "target": "ImageId", "source": "identifier", "name": "Id" } - ] - } - }, - "DescribeAttribute": { - "request": { - "operation": "DescribeImageAttribute", - "params": [ - { "target": "ImageId", "source": "identifier", "name": "Id" } - ] - } - }, - "ModifyAttribute": { - "request": { - "operation": "ModifyImageAttribute", - "params": [ - { "target": "ImageId", "source": "identifier", "name": "Id" } - ] - } - }, - "ResetAttribute": { - "request": { - "operation": "ResetImageAttribute", - "params": [ - { "target": "ImageId", "source": "identifier", "name": "Id" } - ] - } - } - } - }, - "Instance": { - "identifiers": [ - { - "name": "Id", - "memberName": "InstanceId" - } - ], - "shape": "Instance", - "load": { - "request": { - "operation": "DescribeInstances", - "params": [ - { "target": "InstanceIds[0]", "source": "identifier", "name": "Id" } - ] - }, - "path": "Reservations[0].Instances[0]" - }, - "actions": { - "AttachClassicLinkVpc": { - "request": { - "operation": "AttachClassicLinkVpc", - "params": [ - { "target": "InstanceId", "source": "identifier", "name": "Id" } - ] - } - }, - "AttachVolume": { - "request": { - "operation": "AttachVolume", - "params": [ - { "target": "InstanceId", "source": "identifier", "name": "Id" } - ] - } - }, - "ConsoleOutput": { - "request": { - "operation": "GetConsoleOutput", - "params": [ - { "target": "InstanceId", "source": "identifier", "name": "Id" } - ] - } - }, - "CreateImage": { - "request": { - "operation": "CreateImage", - "params": [ - { "target": "InstanceId", "source": "identifier", "name": "Id" } - ] - }, - "resource": { - "type": "Image", - "identifiers": [ - { "target": "Id", "source": "response", "path": "ImageId" } - ] - } - }, - "CreateTags": { - "request": { - "operation": "CreateTags", - "params": [ - { "target": "Resources[0]", "source": "identifier", "name": "Id" } - ] - }, - "resource": { - "type": "Tag", - "identifiers": [ - { "target": "ResourceId", "source": "identifier", "name": "Id" }, - { "target": "Key", "source": "requestParameter", "path": "Tags[].Key" }, - { "target": "Value", "source": "requestParameter", "path": "Tags[].Value" } - ] - } - }, - "DescribeAttribute": { - "request": { - "operation": "DescribeInstanceAttribute", - "params": [ - { "target": "InstanceId", "source": "identifier", "name": "Id" } - ] - } - }, - "DetachClassicLinkVpc": { - "request": { - "operation": "DetachClassicLinkVpc", - "params": [ - { "target": "InstanceId", "source": "identifier", "name": "Id" } - ] - } - }, - "DetachVolume": { - "request": { - "operation": "DetachVolume", - "params": [ - { "target": "InstanceId", "source": "identifier", "name": "Id" } - ] - } - }, - "ModifyAttribute": { - "request": { - "operation": "ModifyInstanceAttribute", - "params": [ - { "target": "InstanceId", "source": "identifier", "name": "Id" } - ] - } - }, - "Monitor": { - "request": { - "operation": "MonitorInstances", - "params": [ - { "target": "InstanceIds[0]", "source": "identifier", "name": "Id" } - ] - } - }, - "PasswordData": { - "request": { - "operation": "GetPasswordData", - "params": [ - { "target": "InstanceId", "source": "identifier", "name": "Id" } - ] - } - }, - "Reboot": { - "request": { - "operation": "RebootInstances", - "params": [ - { "target": "InstanceIds[0]", "source": "identifier", "name": "Id" } - ] - } - }, - "ReportStatus": { - "request": { - "operation": "ReportInstanceStatus", - "params": [ - { "target": "Instances[0]", "source": "identifier", "name": "Id" } - ] - } - }, - "ResetAttribute": { - "request": { - "operation": "ResetInstanceAttribute", - "params": [ - { "target": "InstanceId", "source": "identifier", "name": "Id" } - ] - } - }, - "ResetKernel": { - "request": { - "operation": "ResetInstanceAttribute", - "params": [ - { "target": "InstanceId", "source": "identifier", "name": "Id" }, - { "target": "Attribute", "source": "string", "value": "kernel" } - ] - } - }, - "ResetRamdisk": { - "request": { - "operation": "ResetInstanceAttribute", - "params": [ - { "target": "InstanceId", "source": "identifier", "name": "Id" }, - { "target": "Attribute", "source": "string", "value": "ramdisk" } - ] - } - }, - "ResetSourceDestCheck": { - "request": { - "operation": "ResetInstanceAttribute", - "params": [ - { "target": "InstanceId", "source": "identifier", "name": "Id" }, - { "target": "Attribute", "source": "string", "value": "sourceDestCheck" } - ] - } - }, - "Start": { - "request": { - "operation": "StartInstances", - "params": [ - { "target": "InstanceIds[0]", "source": "identifier", "name": "Id" } - ] - } - }, - "Stop": { - "request": { - "operation": "StopInstances", - "params": [ - { "target": "InstanceIds[0]", "source": "identifier", "name": "Id" } - ] - } - }, - "Terminate": { - "request": { - "operation": "TerminateInstances", - "params": [ - { "target": "InstanceIds[0]", "source": "identifier", "name": "Id" } - ] - } - }, - "Unmonitor": { - "request": { - "operation": "UnmonitorInstances", - "params": [ - { "target": "InstanceIds[0]", "source": "identifier", "name": "Id" } - ] - } - } - }, - "batchActions": { - "CreateTags": { - "request": { - "operation": "CreateTags", - "params": [ - { "target": "Resources[]", "source": "identifier", "name": "Id" } - ] - } - }, - "Monitor": { - "request": { - "operation": "MonitorInstances", - "params": [ - { "target": "InstanceIds[]", "source": "identifier", "name": "Id" } - ] - } - }, - "Reboot": { - "request": { - "operation": "RebootInstances", - "params": [ - { "target": "InstanceIds[]", "source": "identifier", "name": "Id" } - ] - } - }, - "Start": { - "request": { - "operation": "StartInstances", - "params": [ - { "target": "InstanceIds[]", "source": "identifier", "name": "Id" } - ] - } - }, - "Stop": { - "request": { - "operation": "StopInstances", - "params": [ - { "target": "InstanceIds[]", "source": "identifier", "name": "Id" } - ] - } - }, - "Terminate": { - "request": { - "operation": "TerminateInstances", - "params": [ - { "target": "InstanceIds[]", "source": "identifier", "name": "Id" } - ] - } - }, - "Unmonitor": { - "request": { - "operation": "UnmonitorInstances", - "params": [ - { "target": "InstanceIds[]", "source": "identifier", "name": "Id" } - ] - } - } - }, - "waiters": { - "Exists": { - "waiterName": "InstanceExists", - "params": [ - { "target": "InstanceIds[]", "source": "identifier", "name": "Id" } - ], - "path": "Reservations[0].Instances[0]" - }, - "Running": { - "waiterName": "InstanceRunning", - "params": [ - { "target": "InstanceIds[]", "source": "identifier", "name": "Id" } - ], - "path": "Reservations[0].Instances[0]" - }, - "Stopped": { - "waiterName": "InstanceStopped", - "params": [ - { "target": "InstanceIds[]", "source": "identifier", "name": "Id" } - ], - "path": "Reservations[0].Instances[0]" - }, - "Terminated": { - "waiterName": "InstanceTerminated", - "params": [ - { "target": "InstanceIds[]", "source": "identifier", "name": "Id" } - ], - "path": "Reservations[0].Instances[0]" - } - }, - "has": { - "Image": { - "resource": { - "type": "Image", - "identifiers": [ - { "target": "Id", "source": "data", "path": "ImageId" } - ] - } - }, - "KeyPair": { - "resource": { - "type": "KeyPair", - "identifiers": [ - { "target": "Name", "source": "data", "path": "KeyName" } - ] - } - }, - "PlacementGroup": { - "resource": { - "type": "PlacementGroup", - "identifiers": [ - { "target": "Name", "source": "data", "path": "Placement.GroupName" } - ] - } - }, - "Subnet": { - "resource": { - "type": "Subnet", - "identifiers": [ - { "target": "Id", "source": "data", "path": "SubnetId" } - ] - } - }, - "Vpc": { - "resource": { - "type": "Vpc", - "identifiers": [ - { "target": "Id", "source": "data", "path": "VpcId" } - ] - } - } - }, - "hasMany": { - "Volumes": { - "request": { - "operation": "DescribeVolumes", - "params": [ - { "target": "Filters[0].Name", "source": "string", "value": "attachment.instance-id" }, - { "target": "Filters[0].Values[0]", "source": "identifier", "name": "Id" } - ] - }, - "resource": { - "type": "Volume", - "identifiers": [ - { "target": "Id", "source": "response", "path": "Volumes[].VolumeId" } - ], - "path": "Volumes[]" - } - } - } - }, - "InternetGateway": { - "identifiers": [ - { - "name": "Id", - "memberName": "InternetGatewayId" - } - ], - "shape": "InternetGateway", - "load": { - "request": { - "operation": "DescribeInternetGateways", - "params": [ - { "target": "InternetGatewayIds[0]", "source": "identifier", "name": "Id" } - ] - }, - "path": "InternetGateways[0]" - }, - "actions": { - "AttachToVpc": { - "request": { - "operation": "AttachInternetGateway", - "params": [ - { "target": "InternetGatewayId", "source": "identifier", "name": "Id" } - ] - } - }, - "CreateTags": { - "request": { - "operation": "CreateTags", - "params": [ - { "target": "Resources[0]", "source": "identifier", "name": "Id" } - ] - }, - "resource": { - "type": "Tag", - "identifiers": [ - { "target": "ResourceId", "source": "identifier", "name": "Id" }, - { "target": "Key", "source": "requestParameter", "path": "Tags[].Key" }, - { "target": "Value", "source": "requestParameter", "path": "Tags[].Value" } - ] - } - }, - "Delete": { - "request": { - "operation": "DeleteInternetGateway", - "params": [ - { "target": "InternetGatewayId", "source": "identifier", "name": "Id" } - ] - } - }, - "DetachFromVpc": { - "request": { - "operation": "DetachInternetGateway", - "params": [ - { "target": "InternetGatewayId", "source": "identifier", "name": "Id" } - ] - } - } - } - }, - "KeyPair": { - "identifiers": [ - { - "name": "Name", - "memberName": "KeyName" - } - ], - "shape": "KeyPairInfo", - "load": { - "request": { - "operation": "DescribeKeyPairs", - "params": [ - { "target": "KeyNames[0]", "source": "identifier", "name": "Name" } - ] - }, - "path": "KeyPairs[0]" - }, - "actions": { - "Delete": { - "request": { - "operation": "DeleteKeyPair", - "params": [ - { "target": "KeyName", "source": "identifier", "name": "Name" } - ] - } - } - } - }, - "NetworkAcl": { - "identifiers": [ - { - "name": "Id", - "memberName": "NetworkAclId" - } - ], - "shape": "NetworkAcl", - "load": { - "request": { - "operation": "DescribeNetworkAcls", - "params": [ - { "target": "NetworkAclIds[0]", "source": "identifier", "name": "Id" } - ] - }, - "path": "NetworkAcls[0]" - }, - "actions": { - "CreateEntry": { - "request": { - "operation": "CreateNetworkAclEntry", - "params": [ - { "target": "NetworkAclId", "source": "identifier", "name": "Id" } - ] - } - }, - "CreateTags": { - "request": { - "operation": "CreateTags", - "params": [ - { "target": "Resources[0]", "source": "identifier", "name": "Id" } - ] - }, - "resource": { - "type": "Tag", - "identifiers": [ - { "target": "ResourceId", "source": "identifier", "name": "Id" }, - { "target": "Key", "source": "requestParameter", "path": "Tags[].Key" }, - { "target": "Value", "source": "requestParameter", "path": "Tags[].Value" } - ] - } - }, - "Delete": { - "request": { - "operation": "DeleteNetworkAcl", - "params": [ - { "target": "NetworkAclId", "source": "identifier", "name": "Id" } - ] - } - }, - "DeleteEntry": { - "request": { - "operation": "DeleteNetworkAclEntry", - "params": [ - { "target": "NetworkAclId", "source": "identifier", "name": "Id" } - ] - } - }, - "ReplaceAssociation": { - "request": { - "operation": "ReplaceNetworkAclAssociation", - "params": [ - { "target": "NetworkAclId", "source": "identifier", "name": "Id" } - ] - } - }, - "ReplaceEntry": { - "request": { - "operation": "ReplaceNetworkAclEntry", - "params": [ - { "target": "NetworkAclId", "source": "identifier", "name": "Id" } - ] - } - } - }, - "has": { - "Vpc": { - "resource": { - "type": "Vpc", - "identifiers": [ - { "target": "Id", "source": "data", "path": "VpcId" } - ] - } - } - } - }, - "NetworkInterface": { - "identifiers": [ - { - "name": "Id", - "memberName": "NetworkInterfaceId" - } - ], - "shape": "NetworkInterface", - "load": { - "request": { - "operation": "DescribeNetworkInterfaces", - "params": [ - { "target": "NetworkInterfaceIds[0]", "source": "identifier", "name": "Id" } - ] - }, - "path": "NetworkInterfaces[0]" - }, - "actions": { - "AssignPrivateIpAddresses": { - "request": { - "operation": "AssignPrivateIpAddresses", - "params": [ - { "target": "NetworkInterfaceId", "source": "identifier", "name": "Id" } - ] - } - }, - "Attach": { - "request": { - "operation": "AttachNetworkInterface", - "params": [ - { "target": "NetworkInterfaceId", "source": "identifier", "name": "Id" } - ] - } - }, - "CreateTags": { - "request": { - "operation": "CreateTags", - "params": [ - { "target": "Resources[0]", "source": "identifier", "name": "Id" } - ] - }, - "resource": { - "type": "Tag", - "identifiers": [ - { "target": "ResourceId", "source": "identifier", "name": "Id" }, - { "target": "Key", "source": "requestParameter", "path": "Tags[].Key" }, - { "target": "Value", "source": "requestParameter", "path": "Tags[].Value" } - ] - } - }, - "Delete": { - "request": { - "operation": "DeleteNetworkInterface", - "params": [ - { "target": "NetworkInterfaceId", "source": "identifier", "name": "Id" } - ] - } - }, - "DescribeAttribute": { - "request": { - "operation": "DescribeNetworkInterfaceAttribute", - "params": [ - { "target": "NetworkInterfaceId", "source": "identifier", "name": "Id" } - ] - } - }, - "Detach": { - "request": { - "operation": "DetachNetworkInterface", - "params": [ - { "target": "AttachmentId", "source": "data", "path": "Attachment.AttachmentId" } - ] - } - }, - "ModifyAttribute": { - "request": { - "operation": "ModifyNetworkInterfaceAttribute", - "params": [ - { "target": "NetworkInterfaceId", "source": "identifier", "name": "Id" } - ] - } - }, - "ResetAttribute": { - "request": { - "operation": "ResetNetworkInterfaceAttribute", - "params": [ - { "target": "NetworkInterfaceId", "source": "identifier", "name": "Id" } - ] - } - }, - "UnassignPrivateIpAddresses": { - "request": { - "operation": "UnassignPrivateIpAddresses", - "params": [ - { "target": "NetworkInterfaceId", "source": "identifier", "name": "Id" } - ] - } - } - }, - "has": { - "Subnet": { - "resource": { - "type": "Subnet", - "identifiers": [ - { "target": "Id", "source": "data", "path": "SubnetId" } - ] - } - }, - "Vpc": { - "resource": { - "type": "Vpc", - "identifiers": [ - { "target": "Id", "source": "data", "path": "VpcId" } - ] - } - } - } - }, - "PlacementGroup": { - "identifiers": [ - { - "name": "Name", - "memberName": "GroupName" - } - ], - "shape": "PlacementGroup", - "load": { - "request": { - "operation": "DescribePlacementGroups", - "params": [ - { "target": "GroupNames[0]", "source": "identifier", "name": "Name" } - ] - }, - "path": "PlacementGroups[0]" - }, - "actions": { - "Delete": { - "request": { - "operation": "DeletePlacementGroup", - "params": [ - { "target": "GroupName", "source": "identifier", "name": "Name" } - ] - } - } - }, - "hasMany": { - "Instances": { - "request": { - "operation": "DescribeInstances", - "params": [ - { "target": "Filters[0].Name", "source": "string", "value": "placement-group-name" }, - { "target": "Filters[0].Values[0]", "source": "identifier", "name": "Name" } - ] - }, - "resource": { - "type": "Instance", - "identifiers": [ - { "target": "Id", "source": "response", "path": "Reservations[].Instances[].InstanceId" } - ], - "path": "Reservations[].Instances[]" - } - } - } - }, - "RouteTable": { - "identifiers": [ - { - "name": "Id", - "memberName": "RouteTableId" - } - ], - "shape": "RouteTable", - "load": { - "request": { - "operation": "DescribeRouteTables", - "params": [ - { "target": "RouteTableIds[0]", "source": "identifier", "name": "Id" } - ] - }, - "path": "RouteTables[0]" - }, - "actions": { - "AssociateWithSubnet": { - "request": { - "operation": "AssociateRouteTable", - "params": [ - { "target": "RouteTableId", "source": "identifier", "name": "Id" } - ] - }, - "resource": { - "type": "RouteTableAssociation", - "identifiers": [ - { "target": "Id", "source": "response", "path": "AssociationId" } - ] - } - }, - "CreateRoute": { - "request": { - "operation": "CreateRoute", - "params": [ - { "target": "RouteTableId", "source": "identifier", "name": "Id" } - ] - } - }, - "CreateTags": { - "request": { - "operation": "CreateTags", - "params": [ - { "target": "Resources[0]", "source": "identifier", "name": "Id" } - ] - }, - "resource": { - "type": "Tag", - "identifiers": [ - { "target": "ResourceId", "source": "identifier", "name": "Id" }, - { "target": "Key", "source": "requestParameter", "path": "Tags[].Key" }, - { "target": "Value", "source": "requestParameter", "path": "Tags[].Value" } - ] - } - }, - "Delete": { - "request": { - "operation": "DeleteRouteTable", - "params": [ - { "target": "RouteTableId", "source": "identifier", "name": "Id" } - ] - } - } - }, - "has": { - "Vpc": { - "resource": { - "type": "Vpc", - "identifiers": [ - { "target": "Id", "source": "data", "path": "VpcId" } - ] - } - } - }, - "hasMany": { - "Associations": { - "request": { - "operation": "DescribeRouteTables", - "params": [ - { "target": "RouteTableIds[0]", "source": "identifier", "name": "Id" } - ] - }, - "resource": { - "type": "RouteTableAssociation", - "identifiers": [ - { "target": "Id", "source": "response", "path": "RouteTables[0].Associations[].RouteTableAssociationId" } - ], - "path": "RouteTables[0].Associations[]" - } - } - } - }, - "RouteTableAssociation": { - "identifiers": [ - { - "name": "Id", - "memberName": "RouteTableAssociationId" - } - ], - "shape": "RouteTableAssociation", - "actions": { - "Delete": { - "request": { - "operation": "DisassociateRouteTable", - "params": [ - { "target": "AssociationId", "source": "identifier", "name": "Id" } - ] - } - }, - "ReplaceSubnet": { - "request": { - "operation": "ReplaceRouteTableAssociation", - "params": [ - { "target": "AssociationId", "source": "identifier", "name": "Id" } - ] - }, - "resource": { - "type": "RouteTableAssociation", - "identifiers": [ - { "target": "Id", "source": "response", "path": "NewAssociationId" } - ] - } - } - }, - "has": { - "RouteTable": { - "resource": { - "type": "RouteTable", - "identifiers": [ - { "target": "Id", "source": "data", "path": "RouteTableId" } - ] - } - }, - "Subnet": { - "resource": { - "type": "Subnet", - "identifiers": [ - { "target": "Id", "source": "data", "path": "SubnetId" } - ] - } - } - } - }, - "SecurityGroup": { - "identifiers": [ - { - "name": "Id", - "memberName": "GroupId" - } - ], - "shape": "SecurityGroup", - "load": { - "request": { - "operation": "DescribeSecurityGroups", - "params": [ - { "target": "GroupIds[0]", "source": "identifier", "name": "Id" } - ] - }, - "path": "SecurityGroups[0]" - }, - "actions": { - "AuthorizeEgress": { - "request": { - "operation": "AuthorizeSecurityGroupEgress", - "params": [ - { "target": "GroupId", "source": "identifier", "name": "Id" } - ] - } - }, - "AuthorizeIngress": { - "request": { - "operation": "AuthorizeSecurityGroupIngress", - "params": [ - { "target": "GroupId", "source": "identifier", "name": "Id" } - ] - } - }, - "CreateTags": { - "request": { - "operation": "CreateTags", - "params": [ - { "target": "Resources[0]", "source": "identifier", "name": "Id" } - ] - }, - "resource": { - "type": "Tag", - "identifiers": [ - { "target": "ResourceId", "source": "identifier", "name": "Id" }, - { "target": "Key", "source": "requestParameter", "path": "Tags[].Key" }, - { "target": "Value", "source": "requestParameter", "path": "Tags[].Value" } - ] - } - }, - "Delete": { - "request": { - "operation": "DeleteSecurityGroup", - "params": [ - { "target": "GroupId", "source": "identifier", "name": "Id" } - ] - } - }, - "RevokeEgress": { - "request": { - "operation": "RevokeSecurityGroupEgress", - "params": [ - { "target": "GroupId", "source": "identifier", "name": "Id" } - ] - } - }, - "RevokeIngress": { - "request": { - "operation": "RevokeSecurityGroupIngress", - "params": [ - { "target": "GroupId", "source": "identifier", "name": "Id" } - ] - } - } - } - }, - "Snapshot": { - "identifiers": [ - { - "name": "Id", - "memberName": "SnapshotId" - } - ], - "shape": "Snapshot", - "load": { - "request": { - "operation": "DescribeSnapshots", - "params": [ - { "target": "SnapshotIds[0]", "source": "identifier", "name": "Id" } - ] - }, - "path": "Snapshots[0]" - }, - "actions": { - "Copy": { - "request": { - "operation": "CopySnapshot", - "params": [ - { "target": "SourceSnapshotId", "source": "identifier", "name": "Id" } - ] - } - }, - "CreateTags": { - "request": { - "operation": "CreateTags", - "params": [ - { "target": "Resources[0]", "source": "identifier", "name": "Id" } - ] - }, - "resource": { - "type": "Tag", - "identifiers": [ - { "target": "ResourceId", "source": "identifier", "name": "Id" }, - { "target": "Key", "source": "requestParameter", "path": "Tags[].Key" }, - { "target": "Value", "source": "requestParameter", "path": "Tags[].Value" } - ] - } - }, - "Delete": { - "request": { - "operation": "DeleteSnapshot", - "params": [ - { "target": "SnapshotId", "source": "identifier", "name": "Id" } - ] - } - }, - "DescribeAttribute": { - "request": { - "operation": "DescribeSnapshotAttribute", - "params": [ - { "target": "SnapshotId", "source": "identifier", "name": "Id" } - ] - } - }, - "ModifyAttribute": { - "request": { - "operation": "ModifySnapshotAttribute", - "params": [ - { "target": "SnapshotId", "source": "identifier", "name": "Id" } - ] - } - }, - "ResetAttribute": { - "request": { - "operation": "ResetSnapshotAttribute", - "params": [ - { "target": "SnapshotId", "source": "identifier", "name": "Id" } - ] - } - } - }, - "waiters": { - "Completed": { - "waiterName": "SnapshotCompleted", - "params": [ - { "target": "SnapshotIds[]", "source": "identifier", "name": "Id" } - ], - "path": "Snapshots[]" - } - }, - "has": { - "Volume": { - "resource": { - "type": "Volume", - "identifiers": [ - { "target": "Id", "source": "data", "path": "VolumeId" } - ] - } - } - } - }, - "Subnet": { - "identifiers": [ - { - "name": "Id", - "memberName": "SubnetId" - } - ], - "shape": "Subnet", - "load": { - "request": { - "operation": "DescribeSubnets", - "params": [ - { "target": "SubnetIds[0]", "source": "identifier", "name": "Id" } - ] - }, - "path": "Subnets[0]" - }, - "actions": { - "CreateInstances": { - "request": { - "operation": "RunInstances", - "params": [ - { "target": "SubnetId", "source": "identifier", "name": "Id" } - ] - }, - "resource": { - "type": "Instance", - "identifiers": [ - { "target": "Id", "source": "response", "path": "Instances[].InstanceId" } - ], - "path": "Instances[]" - } - }, - "CreateNetworkInterface": { - "request": { - "operation": "CreateNetworkInterface", - "params": [ - { "target": "SubnetId", "source": "identifier", "name": "Id" } - ] - }, - "resource": { - "type": "NetworkInterface", - "identifiers": [ - { "target": "Id", "source": "response", "path": "NetworkInterface.NetworkInterfaceId" } - ], - "path": "NetworkInterface" - } - }, - "CreateTags": { - "request": { - "operation": "CreateTags", - "params": [ - { "target": "Resources[0]", "source": "identifier", "name": "Id" } - ] - }, - "resource": { - "type": "Tag", - "identifiers": [ - { "target": "ResourceId", "source": "identifier", "name": "Id" }, - { "target": "Key", "source": "requestParameter", "path": "Tags[].Key" }, - { "target": "Value", "source": "requestParameter", "path": "Tags[].Value" } - ] - } - }, - "Delete": { - "request": { - "operation": "DeleteSubnet", - "params": [ - { "target": "SubnetId", "source": "identifier", "name": "Id" } - ] - } - } - }, - "has": { - "Vpc": { - "resource": { - "type": "Vpc", - "identifiers": [ - { "target": "Id", "source": "data", "path": "VpcId" } - ] - } - } - }, - "hasMany": { - "Instances": { - "request": { - "operation": "DescribeInstances", - "params": [ - { "target": "Filters[0].Name", "source": "string", "value": "subnet-id" }, - { "target": "Filters[0].Values[0]", "source": "identifier", "name": "Id" } - ] - }, - "resource": { - "type": "Instance", - "identifiers": [ - { "target": "Id", "source": "response", "path": "Reservations[].Instances[].InstanceId" } - ], - "path": "Reservations[].Instances[]" - } - }, - "NetworkInterfaces": { - "request": { - "operation": "DescribeNetworkInterfaces", - "params": [ - { "target": "Filters[0].Name", "source": "string", "value": "subnet-id" }, - { "target": "Filters[0].Values[0]", "source": "identifier", "name": "Id" } - ] - }, - "resource": { - "type": "NetworkInterface", - "identifiers": [ - { "target": "Id", "source": "response", "path": "NetworkInterfaces[].NetworkInterfaceId" } - ], - "path": "NetworkInterfaces[]" - } - } - } - }, - "Tag": { - "identifiers": [ - { - "name": "ResourceId", - "memberName": "ResourceId" - }, - { - "name": "Key", - "memberName": "Key" - }, - { - "name": "Value", - "memberName": "Value" - } - ], - "shape": "TagDescription", - "load": { - "request": { - "operation": "DescribeTags", - "params": [ - { "target": "Filters[0].Name", "source": "string", "value": "key" }, - { "target": "Filters[0].Values[0]", "source": "identifier", "name": "Key" }, - { "target": "Filters[1].Name", "source": "string", "value": "value" }, - { "target": "Filters[1].Values[0]", "source": "identifier", "name": "Value" } - ] - }, - "path": "Tags[0]" - }, - "actions": { - "Delete": { - "request": { - "operation": "DeleteTags", - "params": [ - { "target": "Resources[0]", "source": "identifier", "name": "ResourceId" }, - { "target": "Tags[0].Key", "source": "identifier", "name": "Key" }, - { "target": "Tags[0].Value", "source": "identifier", "name": "Value" } - ] - } - } - }, - "batchActions": { - "Delete": { - "request": { - "operation": "DeleteTags", - "params": [ - { "target": "Resources[]", "source": "identifier", "name": "ResourceId" }, - { "target": "Tags[*].Key", "source": "identifier", "name": "Key" }, - { "target": "Tags[*].Value", "source": "identifier", "name": "Value" } - ] - } - } - } - }, - "Volume": { - "identifiers": [ - { - "name": "Id", - "memberName": "VolumeId" - } - ], - "shape": "Volume", - "load": { - "request": { - "operation": "DescribeVolumes", - "params": [ - { "target": "VolumeIds[0]", "source": "identifier", "name": "Id" } - ] - }, - "path": "Volumes[0]" - }, - "actions": { - "AttachToInstance": { - "request": { - "operation": "AttachVolume", - "params": [ - { "target": "VolumeId", "source": "identifier", "name": "Id" } - ] - } - }, - "CreateSnapshot": { - "request": { - "operation": "CreateSnapshot", - "params": [ - { "target": "VolumeId", "source": "identifier", "name": "Id" } - ] - }, - "resource": { - "type": "Snapshot", - "identifiers": [ - { "target": "Id", "source": "response", "path": "SnapshotId" } - ], - "path": "@" - } - }, - "CreateTags": { - "request": { - "operation": "CreateTags", - "params": [ - { "target": "Resources[0]", "source": "identifier", "name": "Id" } - ] - }, - "resource": { - "type": "Tag", - "identifiers": [ - { "target": "ResourceId", "source": "identifier", "name": "Id" }, - { "target": "Key", "source": "requestParameter", "path": "Tags[].Key" }, - { "target": "Value", "source": "requestParameter", "path": "Tags[].Value" } - ] - } - }, - "Delete": { - "request": { - "operation": "DeleteVolume", - "params": [ - { "target": "VolumeId", "source": "identifier", "name": "Id" } - ] - } - }, - "DescribeAttribute": { - "request": { - "operation": "DescribeVolumeAttribute", - "params": [ - { "target": "VolumeId", "source": "identifier", "name": "Id" } - ] - } - }, - "DescribeStatus": { - "request": { - "operation": "DescribeVolumeStatus", - "params": [ - { "target": "VolumeIds[0]", "source": "identifier", "name": "Id" } - ] - } - }, - "DetachFromInstance": { - "request": { - "operation": "DetachVolume", - "params": [ - { "target": "VolumeId", "source": "identifier", "name": "Id" } - ] - } - }, - "EnableIo": { - "request": { - "operation": "EnableVolumeIO", - "params": [ - { "target": "VolumeId", "source": "identifier", "name": "Id" } - ] - } - }, - "ModifyAttribute": { - "request": { - "operation": "ModifyVolumeAttribute", - "params": [ - { "target": "VolumeId", "source": "identifier", "name": "Id" } - ] - } - } - }, - "hasMany": { - "Snapshots": { - "request": { - "operation": "DescribeSnapshots", - "params": [ - { "target": "Filters[0].Name", "source": "string", "value": "volume-id" }, - { "target": "Filters[0].Values[0]", "source": "identifier", "name": "Id" } - ] - }, - "resource": { - "type": "Snapshot", - "identifiers": [ - { "target": "Id", "source": "response", "path": "Snapshots[].SnapshotId" } - ], - "path": "Snapshots[]" - } - } - } - }, - "Vpc": { - "identifiers": [ - { - "name": "Id", - "memberName": "VpcId" - } - ], - "shape": "Vpc", - "load": { - "request": { - "operation": "DescribeVpcs", - "params": [ - { "target": "VpcIds[0]", "source": "identifier", "name": "Id" } - ] - }, - "path": "Vpcs[0]" - }, - "actions": { - "AssociateDhcpOptions": { - "request": { - "operation": "AssociateDhcpOptions", - "params": [ - { "target": "VpcId", "source": "identifier", "name": "Id" } - ] - } - }, - "AttachClassicLinkInstance": { - "request": { - "operation": "AttachClassicLinkVpc", - "params": [ - { "target": "VpcId", "source": "identifier", "name": "Id" } - ] - } - }, - "AttachInternetGateway": { - "request": { - "operation": "AttachInternetGateway", - "params": [ - { "target": "VpcId", "source": "identifier", "name": "Id" } - ] - } - }, - "CreateNetworkAcl": { - "request": { - "operation": "CreateNetworkAcl", - "params": [ - { "target": "VpcId", "source": "identifier", "name": "Id" } - ] - }, - "resource": { - "type": "NetworkAcl", - "identifiers": [ - { "target": "Id", "source": "response", "path": "NetworkAcl.NetworkAclId" } - ], - "path": "NetworkAcl" - } - }, - "CreateRouteTable": { - "request": { - "operation": "CreateRouteTable", - "params": [ - { "target": "VpcId", "source": "identifier", "name": "Id" } - ] - }, - "resource": { - "type": "RouteTable", - "identifiers": [ - { "target": "Id", "source": "response", "path": "RouteTable.RouteTableId" } - ], - "path": "RouteTable" - } - }, - "CreateSecurityGroup": { - "request": { - "operation": "CreateSecurityGroup", - "params": [ - { "target": "VpcId", "source": "identifier", "name": "Id" } - ] - }, - "resource": { - "type": "SecurityGroup", - "identifiers": [ - { "target": "Id", "source": "response", "path": "GroupId" } - ] - } - }, - "CreateSubnet": { - "request": { - "operation": "CreateSubnet", - "params": [ - { "target": "VpcId", "source": "identifier", "name": "Id" } - ] - }, - "resource": { - "type": "Subnet", - "identifiers": [ - { "target": "Id", "source": "response", "path": "Subnet.SubnetId" } - ], - "path": "Subnet" - } - }, - "CreateTags": { - "request": { - "operation": "CreateTags", - "params": [ - { "target": "Resources[0]", "source": "identifier", "name": "Id" } - ] - }, - "resource": { - "type": "Tag", - "identifiers": [ - { "target": "ResourceId", "source": "identifier", "name": "Id" }, - { "target": "Key", "source": "requestParameter", "path": "Tags[].Key" }, - { "target": "Value", "source": "requestParameter", "path": "Tags[].Value" } - ] - } - }, - "Delete": { - "request": { - "operation": "DeleteVpc", - "params": [ - { "target": "VpcId", "source": "identifier", "name": "Id" } - ] - } - }, - "DescribeAttribute": { - "request": { - "operation": "DescribeVpcAttribute", - "params": [ - { "target": "VpcId", "source": "identifier", "name": "Id" } - ] - } - }, - "DetachClassicLinkInstance": { - "request": { - "operation": "DetachClassicLinkVpc", - "params": [ - { "target": "VpcId", "source": "identifier", "name": "Id" } - ] - } - }, - "DetachInternetGateway": { - "request": { - "operation": "DetachInternetGateway", - "params": [ - { "target": "VpcId", "source": "identifier", "name": "Id" } - ] - } - }, - "DisableClassicLink": { - "request": { - "operation": "DisableVpcClassicLink", - "params": [ - { "target": "VpcId", "source": "identifier", "name": "Id" } - ] - } - }, - "EnableClassicLink": { - "request": { - "operation": "EnableVpcClassicLink", - "params": [ - { "target": "VpcId", "source": "identifier", "name": "Id" } - ] - } - }, - "ModifyAttribute": { - "request": { - "operation": "ModifyVpcAttribute", - "params": [ - { "target": "VpcId", "source": "identifier", "name": "Id" } - ] - } - }, - "RequestVpcPeeringConnection": { - "request": { - "operation": "CreateVpcPeeringConnection", - "params": [ - { "target": "VpcId", "source": "identifier", "name": "Id" } - ] - }, - "resource": { - "type": "VpcPeeringConnection", - "identifiers": [ - { "target": "Id", "source": "response", "path": "VpcPeeringConnection.VpcPeeringConnectionId" } - ], - "path": "VpcPeeringConnection" - } - } - }, - "has": { - "DhcpOptions": { - "resource": { - "type": "DhcpOptions", - "identifiers": [ - { "target": "Id", "source": "data", "path": "DhcpOptionsId" } - ] - } - } - }, - "hasMany": { - "AcceptedVpcPeeringConnections": { - "request": { - "operation": "DescribeVpcPeeringConnections", - "params": [ - { "target": "Filters[0].Name", "source": "string", "value": "accepter-vpc-info.vpc-id" }, - { "target": "Filters[0].Values[0]", "source": "identifier", "name": "Id" } - ] - }, - "resource": { - "type": "VpcPeeringConnection", - "identifiers": [ - { "target": "Id", "source": "response", "path": "VpcPeeringConnections[].VpcPeeringConnectionId" } - ], - "path": "VpcPeeringConnections[]" - } - }, - "Instances": { - "request": { - "operation": "DescribeInstances", - "params": [ - { "target": "Filters[0].Name", "source": "string", "value": "vpc-id" }, - { "target": "Filters[0].Values[0]", "source": "identifier", "name": "Id" } - ] - }, - "resource": { - "type": "Instance", - "identifiers": [ - { "target": "Id", "source": "response", "path": "Reservations[].Instances[].InstanceId" } - ], - "path": "Reservations[].Instances[]" - } - }, - "InternetGateways": { - "request": { - "operation": "DescribeInternetGateways", - "params": [ - { "target": "Filters[0].Name", "source": "string", "value": "attachment.vpc-id" }, - { "target": "Filters[0].Values[0]", "source": "identifier", "name": "Id" } - ] - }, - "resource": { - "type": "InternetGateway", - "identifiers": [ - { "target": "Id", "source": "response", "path": "InternetGateways[].InternetGatewayId" } - ], - "path": "InternetGateways[]" - } - }, - "NetworkAcls": { - "request": { - "operation": "DescribeNetworkAcls", - "params": [ - { "target": "Filters[0].Name", "source": "string", "value": "vpc-id" }, - { "target": "Filters[0].Values[0]", "source": "identifier", "name": "Id" } - ] - }, - "resource": { - "type": "NetworkAcl", - "identifiers": [ - { "target": "Id", "source": "response", "path": "NetworkAcls[].NetworkAclId" } - ], - "path": "NetworkAcls[]" - } - }, - "NetworkInterfaces": { - "request": { - "operation": "DescribeNetworkInterfaces", - "params": [ - { "target": "Filters[0].Name", "source": "string", "value": "vpc-id" }, - { "target": "Filters[0].Values[0]", "source": "identifier", "name": "Id" } - ] - }, - "resource": { - "type": "NetworkInterface", - "identifiers": [ - { "target": "Id", "source": "response", "path": "NetworkInterfaces[].NetworkInterfaceId" } - ], - "path": "NetworkInterfaces[]" - } - }, - "RequestedVpcPeeringConnections": { - "request": { - "operation": "DescribeVpcPeeringConnections", - "params": [ - { "target": "Filters[0].Name", "source": "string", "value": "requester-vpc-info.vpc-id" }, - { "target": "Filters[0].Values[0]", "source": "identifier", "name": "Id" } - ] - }, - "resource": { - "type": "VpcPeeringConnection", - "identifiers": [ - { "target": "Id", "source": "response", "path": "VpcPeeringConnections[].VpcPeeringConnectionId" } - ], - "path": "VpcPeeringConnections[]" - } - }, - "RouteTables": { - "request": { - "operation": "DescribeRouteTables", - "params": [ - { "target": "Filters[0].Name", "source": "string", "value": "vpc-id" }, - { "target": "Filters[0].Values[0]", "source": "identifier", "name": "Id" } - ] - }, - "resource": { - "type": "RouteTable", - "identifiers": [ - { "target": "Id", "source": "response", "path": "RouteTables[].RouteTableId" } - ], - "path": "RouteTables[]" - } - }, - "SecurityGroups": { - "request": { - "operation": "DescribeSecurityGroups", - "params": [ - { "target": "Filters[0].Name", "source": "string", "value": "vpc-id" }, - { "target": "Filters[0].Values[0]", "source": "identifier", "name": "Id" } - ] - }, - "resource": { - "type": "SecurityGroup", - "identifiers": [ - { "target": "Id", "source": "response", "path": "SecurityGroups[].GroupId" } - ], - "path": "SecurityGroups[]" - } - }, - "Subnets": { - "request": { - "operation": "DescribeSubnets", - "params": [ - { "target": "Filters[0].Name", "source": "string", "value": "vpc-id" }, - { "target": "Filters[0].Values[0]", "source": "identifier", "name": "Id" } - ] - }, - "resource": { - "type": "Subnet", - "identifiers": [ - { "target": "Id", "source": "response", "path": "Subnets[].SubnetId" } - ], - "path": "Subnets[]" - } - } - } - }, - "VpcPeeringConnection": { - "identifiers": [ - { - "name": "Id", - "memberName": "VpcPeeringConnectionId" - } - ], - "shape": "VpcPeeringConnection", - "load": { - "request": { - "operation": "DescribeVpcPeeringConnections", - "params": [ - { "target": "VpcPeeringConnectionIds[0]", "source": "identifier", "name": "Id" } - ] - }, - "path": "VpcPeeringConnections[0]" - }, - "actions": { - "Accept": { - "request": { - "operation": "AcceptVpcPeeringConnection", - "params": [ - { "target": "VpcPeeringConnectionId", "source": "identifier", "name": "Id" } - ] - } - }, - "Delete": { - "request": { - "operation": "DeleteVpcPeeringConnection", - "params": [ - { "target": "VpcPeeringConnectionId", "source": "identifier", "name": "Id" } - ] - } - }, - "Reject": { - "request": { - "operation": "RejectVpcPeeringConnection", - "params": [ - { "target": "VpcPeeringConnectionId", "source": "identifier", "name": "Id" } - ] - } - } - }, - "has": { - "AccepterVpc": { - "resource": { - "type": "Vpc", - "identifiers": [ - { "target": "Id", "source": "data", "path": "AccepterVpcInfo.VpcId" } - ] - } - }, - "RequesterVpc": { - "resource": { - "type": "Vpc", - "identifiers": [ - { "target": "Id", "source": "data", "path": "RequesterVpcInfo.VpcId" } - ] - } - } - } - } - } -} diff --git a/aws-sdk-core/apis/ec2/2014-10-01/waiters-2.json b/aws-sdk-core/apis/ec2/2014-10-01/waiters-2.json deleted file mode 100644 index 8647c7d1462..00000000000 --- a/aws-sdk-core/apis/ec2/2014-10-01/waiters-2.json +++ /dev/null @@ -1,453 +0,0 @@ -{ - "version": 2, - "waiters": { - "InstanceExists": { - "delay": 5, - "maxAttempts": 40, - "operation": "DescribeInstances", - "acceptors": [ - { - "matcher": "status", - "expected": 200, - "state": "success" - }, - { - "matcher": "error", - "expected": "InvalidInstanceIDNotFound", - "state": "retry" - } - ] - }, - "BundleTaskComplete": { - "delay": 15, - "operation": "DescribeBundleTasks", - "maxAttempts": 40, - "acceptors": [ - { - "expected": "complete", - "matcher": "pathAll", - "state": "success", - "argument": "BundleTasks[].State" - }, - { - "expected": "failed", - "matcher": "pathAny", - "state": "failure", - "argument": "BundleTasks[].State" - } - ] - }, - "ConversionTaskCancelled": { - "delay": 15, - "operation": "DescribeConversionTasks", - "maxAttempts": 40, - "acceptors": [ - { - "expected": "cancelled", - "matcher": "pathAll", - "state": "success", - "argument": "ConversionTasks[].State" - } - ] - }, - "ConversionTaskCompleted": { - "delay": 15, - "operation": "DescribeConversionTasks", - "maxAttempts": 40, - "acceptors": [ - { - "expected": "completed", - "matcher": "pathAll", - "state": "success", - "argument": "ConversionTasks[].State" - }, - { - "expected": "cancelled", - "matcher": "pathAny", - "state": "failure", - "argument": "ConversionTasks[].State" - }, - { - "expected": "cancelling", - "matcher": "pathAny", - "state": "failure", - "argument": "ConversionTasks[].State" - } - ] - }, - "ConversionTaskDeleted": { - "delay": 15, - "operation": "DescribeConversionTasks", - "maxAttempts": 40, - "acceptors": [ - { - "expected": "deleted", - "matcher": "pathAll", - "state": "success", - "argument": "ConversionTasks[].State" - } - ] - }, - "CustomerGatewayAvailable": { - "delay": 15, - "operation": "DescribeCustomerGateways", - "maxAttempts": 40, - "acceptors": [ - { - "expected": "available", - "matcher": "pathAll", - "state": "success", - "argument": "CustomerGateways[].State" - }, - { - "expected": "deleted", - "matcher": "pathAny", - "state": "failure", - "argument": "CustomerGateways[].State" - }, - { - "expected": "deleting", - "matcher": "pathAny", - "state": "failure", - "argument": "CustomerGateways[].State" - } - ] - }, - "ExportTaskCancelled": { - "delay": 15, - "operation": "DescribeExportTasks", - "maxAttempts": 40, - "acceptors": [ - { - "expected": "cancelled", - "matcher": "pathAll", - "state": "success", - "argument": "ExportTasks[].State" - } - ] - }, - "ExportTaskCompleted": { - "delay": 15, - "operation": "DescribeExportTasks", - "maxAttempts": 40, - "acceptors": [ - { - "expected": "completed", - "matcher": "pathAll", - "state": "success", - "argument": "ExportTasks[].State" - } - ] - }, - "ImageAvailable": { - "operation": "DescribeImages", - "maxAttempts": 40, - "delay": 15, - "acceptors": [ - { - "state": "success", - "matcher": "pathAll", - "argument": "Images[].State", - "expected": "available" - }, - { - "state": "failure", - "matcher": "pathAny", - "argument": "Images[].State", - "expected": "failed" - } - ] - }, - "InstanceRunning": { - "delay": 15, - "operation": "DescribeInstances", - "maxAttempts": 40, - "acceptors": [ - { - "expected": "running", - "matcher": "pathAll", - "state": "success", - "argument": "Reservations[].Instances[].State.Name" - }, - { - "expected": "shutting-down", - "matcher": "pathAny", - "state": "failure", - "argument": "Reservations[].Instances[].State.Name" - }, - { - "expected": "terminated", - "matcher": "pathAny", - "state": "failure", - "argument": "Reservations[].Instances[].State.Name" - }, - { - "expected": "stopping", - "matcher": "pathAny", - "state": "failure", - "argument": "Reservations[].Instances[].State.Name" - } - ] - }, - "InstanceStatusOk": { - "operation": "DescribeInstanceStatus", - "maxAttempts": 40, - "delay": 15, - "acceptors": [ - { - "state": "success", - "matcher": "pathAll", - "argument": "InstanceStatuses[].InstanceStatus.Status", - "expected": "ok" - } - ] - }, - "InstanceStopped": { - "delay": 15, - "operation": "DescribeInstances", - "maxAttempts": 40, - "acceptors": [ - { - "expected": "stopped", - "matcher": "pathAll", - "state": "success", - "argument": "Reservations[].Instances[].State.Name" - }, - { - "expected": "pending", - "matcher": "pathAny", - "state": "failure", - "argument": "Reservations[].Instances[].State.Name" - }, - { - "expected": "terminated", - "matcher": "pathAny", - "state": "failure", - "argument": "Reservations[].Instances[].State.Name" - } - ] - }, - "InstanceTerminated": { - "delay": 15, - "operation": "DescribeInstances", - "maxAttempts": 40, - "acceptors": [ - { - "expected": "terminated", - "matcher": "pathAll", - "state": "success", - "argument": "Reservations[].Instances[].State.Name" - }, - { - "expected": "pending", - "matcher": "pathAny", - "state": "failure", - "argument": "Reservations[].Instances[].State.Name" - }, - { - "expected": "stopping", - "matcher": "pathAny", - "state": "failure", - "argument": "Reservations[].Instances[].State.Name" - } - ] - }, - "PasswordDataAvailable": { - "operation": "GetPasswordData", - "maxAttempts": 40, - "delay": 15, - "acceptors": [ - { - "state": "success", - "matcher": "path", - "argument": "length(PasswordData) > `0`", - "expected": true - } - ] - }, - "SnapshotCompleted": { - "delay": 15, - "operation": "DescribeSnapshots", - "maxAttempts": 40, - "acceptors": [ - { - "expected": "completed", - "matcher": "pathAll", - "state": "success", - "argument": "Snapshots[].State" - } - ] - }, - "SpotInstanceRequestFulfilled": { - "operation": "DescribeSpotInstanceRequests", - "maxAttempts": 40, - "delay": 15, - "acceptors": [ - { - "state": "success", - "matcher": "pathAll", - "argument": "SpotInstanceRequests[].Status.Code", - "expected": "fulfilled" - }, - { - "state": "failure", - "matcher": "pathAny", - "argument": "SpotInstanceRequests[].Status.Code", - "expected": "schedule-expired" - }, - { - "state": "failure", - "matcher": "pathAny", - "argument": "SpotInstanceRequests[].Status.Code", - "expected": "canceled-before-fulfillment" - }, - { - "state": "failure", - "matcher": "pathAny", - "argument": "SpotInstanceRequests[].Status.Code", - "expected": "bad-parameters" - }, - { - "state": "failure", - "matcher": "pathAny", - "argument": "SpotInstanceRequests[].Status.Code", - "expected": "system-error" - } - ] - }, - "SubnetAvailable": { - "delay": 15, - "operation": "DescribeSubnets", - "maxAttempts": 40, - "acceptors": [ - { - "expected": "available", - "matcher": "pathAll", - "state": "success", - "argument": "Subnets[].State" - } - ] - }, - "SystemStatusOk": { - "operation": "DescribeInstanceStatus", - "maxAttempts": 40, - "delay": 15, - "acceptors": [ - { - "state": "success", - "matcher": "pathAll", - "argument": "InstanceStatuses[].SystemStatus.Status", - "expected": "ok" - } - ] - }, - "VolumeAvailable": { - "delay": 15, - "operation": "DescribeVolumes", - "maxAttempts": 40, - "acceptors": [ - { - "expected": "available", - "matcher": "pathAll", - "state": "success", - "argument": "Volumes[].State" - }, - { - "expected": "deleted", - "matcher": "pathAny", - "state": "failure", - "argument": "Volumes[].State" - } - ] - }, - "VolumeDeleted": { - "delay": 15, - "operation": "DescribeVolumes", - "maxAttempts": 40, - "acceptors": [ - { - "expected": "deleted", - "matcher": "pathAll", - "state": "success", - "argument": "Volumes[].State" - } - ] - }, - "VolumeInUse": { - "delay": 15, - "operation": "DescribeVolumes", - "maxAttempts": 40, - "acceptors": [ - { - "expected": "in-use", - "matcher": "pathAll", - "state": "success", - "argument": "Volumes[].State" - }, - { - "expected": "deleted", - "matcher": "pathAny", - "state": "failure", - "argument": "Volumes[].State" - } - ] - }, - "VpcAvailable": { - "delay": 15, - "operation": "DescribeVpcs", - "maxAttempts": 40, - "acceptors": [ - { - "expected": "available", - "matcher": "pathAll", - "state": "success", - "argument": "Vpcs[].State" - } - ] - }, - "VpnConnectionAvailable": { - "delay": 15, - "operation": "DescribeVpnConnections", - "maxAttempts": 40, - "acceptors": [ - { - "expected": "available", - "matcher": "pathAll", - "state": "success", - "argument": "VpnConnections[].State" - }, - { - "expected": "deleting", - "matcher": "pathAny", - "state": "failure", - "argument": "VpnConnections[].State" - }, - { - "expected": "deleted", - "matcher": "pathAny", - "state": "failure", - "argument": "VpnConnections[].State" - } - ] - }, - "VpnConnectionDeleted": { - "delay": 15, - "operation": "DescribeVpnConnections", - "maxAttempts": 40, - "acceptors": [ - { - "expected": "deleted", - "matcher": "pathAll", - "state": "success", - "argument": "VpnConnections[].State" - }, - { - "expected": "pending", - "matcher": "pathAny", - "state": "failure", - "argument": "VpnConnections[].State" - } - ] - } - } -} From 388c5970287e17de49ed13c5ab3cdf5244f3886b Mon Sep 17 00:00:00 2001 From: Trevor Rowe Date: Fri, 15 May 2015 00:41:02 -0700 Subject: [PATCH 057/101] Added a missing Struct#to_h method for older versions of Ruby. --- aws-sdk-core/lib/aws-sdk-core/empty_structure.rb | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/aws-sdk-core/lib/aws-sdk-core/empty_structure.rb b/aws-sdk-core/lib/aws-sdk-core/empty_structure.rb index 6cfc771337a..3c0d6ffc250 100644 --- a/aws-sdk-core/lib/aws-sdk-core/empty_structure.rb +++ b/aws-sdk-core/lib/aws-sdk-core/empty_structure.rb @@ -11,5 +11,11 @@ def pretty_print(q) q.text(inspect) end + # @api private + def to_h + {} + end + alias to_hash to_h + end end From 07aa3cafedb47819e6845d4b66b51f4c7dfa5968 Mon Sep 17 00:00:00 2001 From: Trevor Rowe Date: Fri, 15 May 2015 12:39:48 -0700 Subject: [PATCH 058/101] DRY'd up the empty structure implementation. --- .../lib/aws-sdk-core/empty_structure.rb | 19 +------------------ aws-sdk-core/spec/aws/empty_structure_spec.rb | 6 ------ 2 files changed, 1 insertion(+), 24 deletions(-) diff --git a/aws-sdk-core/lib/aws-sdk-core/empty_structure.rb b/aws-sdk-core/lib/aws-sdk-core/empty_structure.rb index 3c0d6ffc250..08cd23e6ee6 100644 --- a/aws-sdk-core/lib/aws-sdk-core/empty_structure.rb +++ b/aws-sdk-core/lib/aws-sdk-core/empty_structure.rb @@ -1,21 +1,4 @@ module Aws - class EmptyStructure < Struct.new('AwsEmptyStructure') - - # @api private - def inspect - "#" - end - - # @api private - def pretty_print(q) - q.text(inspect) - end - - # @api private - def to_h - {} - end - alias to_hash to_h - + class EmptyStructure < Structure.new('AwsEmptyStructure') end end diff --git a/aws-sdk-core/spec/aws/empty_structure_spec.rb b/aws-sdk-core/spec/aws/empty_structure_spec.rb index d8e9b86efd7..b890f5e855b 100644 --- a/aws-sdk-core/spec/aws/empty_structure_spec.rb +++ b/aws-sdk-core/spec/aws/empty_structure_spec.rb @@ -65,12 +65,6 @@ module Aws expect(EmptyStructure.new.eql?(EmptyStructure.new)).to be(true) end - it 'supports pretty print' do - r = double('receiver') - expect(r).to receive(:text).with('#') - EmptyStructure.new.pretty_print(r) - end - it 'has a sensible inspect string' do expect(EmptyStructure.new.inspect).to eq('#') end From 8db1ec5fdc9aaba856e0e1c742cf42343ca056c8 Mon Sep 17 00:00:00 2001 From: Trevor Rowe Date: Fri, 15 May 2015 14:53:07 -0700 Subject: [PATCH 059/101] Addressed an issue serializing structure request params. Resolved an issue where structure parameter values, such as those returned in responses, could not be serialized as input parameters when parameter conversion is disabled. This fix resolves the issue by changing the serializes to all enumerate structure/hash values in a consistent manor, using #each_pair. Also added a few minor helpers to `Aws::Structure` making it quack more like a Hash object. Fixes #815 --- aws-sdk-core/lib/aws-sdk-core/json/builder.rb | 2 +- .../lib/aws-sdk-core/query/param_builder.rb | 2 +- aws-sdk-core/lib/aws-sdk-core/structure.rb | 11 +++++++++++ aws-sdk-core/spec/aws/json/builder_spec.rb | 14 ++++++++++++-- .../spec/aws/query/param_builder_spec.rb | 19 +++++++++++++++++-- aws-sdk-core/spec/aws/xml/builder_spec.rb | 18 ++++++++++++++++-- 6 files changed, 58 insertions(+), 8 deletions(-) diff --git a/aws-sdk-core/lib/aws-sdk-core/json/builder.rb b/aws-sdk-core/lib/aws-sdk-core/json/builder.rb index f98f710c099..9965f084ae0 100644 --- a/aws-sdk-core/lib/aws-sdk-core/json/builder.rb +++ b/aws-sdk-core/lib/aws-sdk-core/json/builder.rb @@ -18,7 +18,7 @@ def to_json(params) def structure(ref, values) shape = ref.shape - values.each.with_object({}) do |(key, value), data| + values.each_pair.with_object({}) do |(key, value), data| if shape.member?(key) && !value.nil? member_ref = shape.member(key) member_name = member_ref.location_name || key diff --git a/aws-sdk-core/lib/aws-sdk-core/query/param_builder.rb b/aws-sdk-core/lib/aws-sdk-core/query/param_builder.rb index 548cafb4738..3c6b2a86db1 100644 --- a/aws-sdk-core/lib/aws-sdk-core/query/param_builder.rb +++ b/aws-sdk-core/lib/aws-sdk-core/query/param_builder.rb @@ -20,7 +20,7 @@ def apply(ref, params) def structure(ref, values, prefix) shape = ref.shape - values.each do |name, value| + values.each_pair do |name, value| next if value.nil? member_ref = shape.member(name) format(member_ref, value, prefix + query_name(member_ref)) diff --git a/aws-sdk-core/lib/aws-sdk-core/structure.rb b/aws-sdk-core/lib/aws-sdk-core/structure.rb index 900e79c4ac3..0023e9b4392 100644 --- a/aws-sdk-core/lib/aws-sdk-core/structure.rb +++ b/aws-sdk-core/lib/aws-sdk-core/structure.rb @@ -8,6 +8,17 @@ class Structure < Struct alias orig_to_h to_h end + # @return [Boolean] Returns `true` if this structure has a value + # set for the given member. + def key?(member_name) + !self[member_name].nil? + end + + # @return [Boolean] Returns `true` if all of the member values are `nil`. + def empty? + values.compact == [] + end + # Deeply converts the Structure into a hash. Structure members that # are `nil` are omitted from the resultant hash. # diff --git a/aws-sdk-core/spec/aws/json/builder_spec.rb b/aws-sdk-core/spec/aws/json/builder_spec.rb index 7de3b8d3052..f170761848b 100644 --- a/aws-sdk-core/spec/aws/json/builder_spec.rb +++ b/aws-sdk-core/spec/aws/json/builder_spec.rb @@ -6,9 +6,11 @@ module Json let(:shapes) { ApiHelper.sample_shapes } + let(:rules) { + Api::ShapeMap.new(shapes).shape_ref('shape' => 'StructureShape') + } + def json(params) - shape_map = Api::ShapeMap.new(shapes) - rules = shape_map.shape_ref('shape' => 'StructureShape') Builder.new(rules).to_json(params) end @@ -16,6 +18,14 @@ def json(params) expect(json({})).to eq('{}') end + it 'can serialize structures' do + params = Structure.new(*rules.shape.member_names).new + params.boolean = true + params.integer = 123 + params.string = 'abc' + expect(json(params)).to eq('{"Boolean":true,"Integer":123,"String":"abc"}') + end + it 'supports locationName traits on structure members' do shapes['StructureShape']['members']['String']['locationName'] = 'str' expect(json(string: 'abc')).to eq('{"str":"abc"}') diff --git a/aws-sdk-core/spec/aws/query/param_builder_spec.rb b/aws-sdk-core/spec/aws/query/param_builder_spec.rb index 391e1be8179..7fe948fef7e 100644 --- a/aws-sdk-core/spec/aws/query/param_builder_spec.rb +++ b/aws-sdk-core/spec/aws/query/param_builder_spec.rb @@ -6,9 +6,12 @@ module Query let(:shapes) { ApiHelper.sample_shapes } - def query(params = {}) + let(:rules) { shape_map = Api::ShapeMap.new(shapes) - rules = shape_map.shape_ref('shape' => 'StructureShape') + shape_map.shape_ref('shape' => 'StructureShape') + } + + def query(params = {}) param_list = ParamList.new ParamBuilder.new(param_list).apply(rules, params) param_list.map { |param| [param.name, param.value ] }.sort @@ -18,6 +21,18 @@ def query(params = {}) expect(query({})).to eq([]) end + it 'can serialize structures' do + params = Structure.new(*rules.shape.member_names).new + params.boolean = true + params.integer = 123 + params.string = 'abc' + expect(query(params)).to eq([ + ['Boolean', 'true'], + ['Integer', '123'], + ['String', 'abc'], + ]) + end + it 'does not serialize nil values' do params = { string: 'abc', diff --git a/aws-sdk-core/spec/aws/xml/builder_spec.rb b/aws-sdk-core/spec/aws/xml/builder_spec.rb index 8a8a6eb3f29..5a01e3ece21 100644 --- a/aws-sdk-core/spec/aws/xml/builder_spec.rb +++ b/aws-sdk-core/spec/aws/xml/builder_spec.rb @@ -8,9 +8,9 @@ module Xml let(:ref) {{ 'shape' => 'StructureShape', 'locationName' => 'xml' }} + let(:rules) { Api::ShapeMap.new(shapes).shape_ref(ref) } + def xml(params) - shape_map = Api::ShapeMap.new(shapes) - rules = shape_map.shape_ref(ref) Builder.new(rules).to_xml(params) end @@ -18,6 +18,20 @@ def xml(params) expect(xml({})).to eq("\n") end + it 'can serialize structures' do + params = Structure.new(*rules.shape.member_names).new + params.boolean = true + params.integer = 123 + params.string = 'abc' + expect(xml(params)).to eq(<<-XML) + + true + 123 + abc + + XML + end + it 'orders xml elements by members order' do params = { string: 'a', From e34dae50d727ae0262ae8472e6df4365747c77b3 Mon Sep 17 00:00:00 2001 From: Trevor Rowe Date: Fri, 15 May 2015 15:38:10 -0700 Subject: [PATCH 060/101] Removed a flakey test on default behavior. --- aws-sdk-core/spec/aws/empty_structure_spec.rb | 4 ---- 1 file changed, 4 deletions(-) diff --git a/aws-sdk-core/spec/aws/empty_structure_spec.rb b/aws-sdk-core/spec/aws/empty_structure_spec.rb index b890f5e855b..021019619ae 100644 --- a/aws-sdk-core/spec/aws/empty_structure_spec.rb +++ b/aws-sdk-core/spec/aws/empty_structure_spec.rb @@ -65,10 +65,6 @@ module Aws expect(EmptyStructure.new.eql?(EmptyStructure.new)).to be(true) end - it 'has a sensible inspect string' do - expect(EmptyStructure.new.inspect).to eq('#') - end - it 'has a zero length' do expect(EmptyStructure.new.length).to be(0) expect(EmptyStructure.new.size).to be(0) From 1f4b57674b26be0cc03bdfce305554461d28d3e6 Mon Sep 17 00:00:00 2001 From: Trevor Rowe Date: Fri, 15 May 2015 17:52:58 -0700 Subject: [PATCH 061/101] Moved documentation utils to Aws::Api::Docs module. --- .simplecov | 1 + aws-sdk-core/lib/aws-sdk-core.rb | 18 +- aws-sdk-core/lib/aws-sdk-core/api/builder.rb | 4 +- .../api/client_type_documenter.rb | 32 --- .../lib/aws-sdk-core/api/doc_utils.rb | 43 --- .../lib/aws-sdk-core/api/docs/builder.rb | 246 ++++++++++++++++++ .../api/docs/client_type_documenter.rb | 34 +++ .../api/docs/docstring_provider.rb | 66 +++++ .../api/docs/operation_documenter.rb | 85 ++++++ .../api/docs/operation_example.rb | 145 +++++++++++ .../lib/aws-sdk-core/api/docs/utils.rb | 45 ++++ .../aws-sdk-core/api/docstring_provider.rb | 64 ----- .../lib/aws-sdk-core/api/documenter.rb | 240 ----------------- .../aws-sdk-core/api/operation_documenter.rb | 83 ------ .../lib/aws-sdk-core/api/operation_example.rb | 143 ---------- .../lib/aws-sdk-core/api/shape_map.rb | 2 +- doc-src/plugins/apis.rb | 2 +- 17 files changed, 635 insertions(+), 618 deletions(-) delete mode 100644 aws-sdk-core/lib/aws-sdk-core/api/client_type_documenter.rb delete mode 100644 aws-sdk-core/lib/aws-sdk-core/api/doc_utils.rb create mode 100644 aws-sdk-core/lib/aws-sdk-core/api/docs/builder.rb create mode 100644 aws-sdk-core/lib/aws-sdk-core/api/docs/client_type_documenter.rb create mode 100644 aws-sdk-core/lib/aws-sdk-core/api/docs/docstring_provider.rb create mode 100644 aws-sdk-core/lib/aws-sdk-core/api/docs/operation_documenter.rb create mode 100644 aws-sdk-core/lib/aws-sdk-core/api/docs/operation_example.rb create mode 100644 aws-sdk-core/lib/aws-sdk-core/api/docs/utils.rb delete mode 100644 aws-sdk-core/lib/aws-sdk-core/api/docstring_provider.rb delete mode 100644 aws-sdk-core/lib/aws-sdk-core/api/documenter.rb delete mode 100644 aws-sdk-core/lib/aws-sdk-core/api/operation_documenter.rb delete mode 100644 aws-sdk-core/lib/aws-sdk-core/api/operation_example.rb diff --git a/.simplecov b/.simplecov index da7561739e6..e784dba7344 100644 --- a/.simplecov +++ b/.simplecov @@ -12,6 +12,7 @@ SimpleCov.start do add_filter '/spec/' add_filter '/features/' + add_filter '/aws-sdk-core/lib/aws/api/docs' add_filter '/aws-sdk-resources/lib/aws/resource/documenter' add_filter '/aws-sdk-resources/lib/aws/resource/source.rb' diff --git a/aws-sdk-core/lib/aws-sdk-core.rb b/aws-sdk-core/lib/aws-sdk-core.rb index 1543e4ed7bf..fb57dca8e13 100644 --- a/aws-sdk-core/lib/aws-sdk-core.rb +++ b/aws-sdk-core/lib/aws-sdk-core.rb @@ -104,16 +104,16 @@ module Aws module Api autoload :Builder, 'aws-sdk-core/api/builder' autoload :Customizations, 'aws-sdk-core/api/customizations' - autoload :Documenter, 'aws-sdk-core/api/documenter' - autoload :DocstringProvider, 'aws-sdk-core/api/docstring_provider' - autoload :DocUtils, 'aws-sdk-core/api/doc_utils' - autoload :ClientTypeDocumenter, 'aws-sdk-core/api/client_type_documenter' - autoload :Manifest, 'aws-sdk-core/api/manifest' - autoload :ManifestBuilder, 'aws-sdk-core/api/manifest_builder' - autoload :NullDocstringProvider, 'aws-sdk-core/api/docstring_provider' - autoload :OperationDocumenter, 'aws-sdk-core/api/operation_documenter' - autoload :OperationExample, 'aws-sdk-core/api/operation_example' autoload :ShapeMap, 'aws-sdk-core/api/shape_map' + module Docs + autoload :Builder, 'aws-sdk-core/api/docs/builder' + autoload :ClientTypeDocumenter, 'aws-sdk-core/api/docs/client_type_documenter' + autoload :DocstringProvider, 'aws-sdk-core/api/docs/docstring_provider' + autoload :NullDocstringProvider, 'aws-sdk-core/api/docs/docstring_provider' + autoload :OperationDocumenter, 'aws-sdk-core/api/docs/operation_documenter' + autoload :OperationExample, 'aws-sdk-core/api/docs/operation_example' + autoload :Utils, 'aws-sdk-core/api/docs/utils' + end end module Plugins diff --git a/aws-sdk-core/lib/aws-sdk-core/api/builder.rb b/aws-sdk-core/lib/aws-sdk-core/api/builder.rb index 4af97f391ea..545f89961b9 100644 --- a/aws-sdk-core/lib/aws-sdk-core/api/builder.rb +++ b/aws-sdk-core/lib/aws-sdk-core/api/builder.rb @@ -45,9 +45,9 @@ def build(definition, options = {}) def build_docstring_provider(options) if options[:docs] && ENV['DOCSTRINGS'] - DocstringProvider.new(Json.load_file(options[:docs])) + Docs::DocstringProvider.new(Json.load_file(options[:docs])) else - NullDocstringProvider.new + Docs::NullDocstringProvider.new end end diff --git a/aws-sdk-core/lib/aws-sdk-core/api/client_type_documenter.rb b/aws-sdk-core/lib/aws-sdk-core/api/client_type_documenter.rb deleted file mode 100644 index 183620eb064..00000000000 --- a/aws-sdk-core/lib/aws-sdk-core/api/client_type_documenter.rb +++ /dev/null @@ -1,32 +0,0 @@ -module Aws - module Api - class ClientTypeDocumenter - - include DocUtils - - # @param [Yard::CodeObjects::Base] namespace - def initialize(namespace) - @namespace = namespace - end - - # @param [Seahorse::Model::Shapes::StructureShape] shape - def document(shape) - yard_class = YARD::CodeObjects::ClassObject.new(@namespace, shape.name) - yard_class.superclass = 'Struct' - yard_class.docstring = shape.documentation - shape.members.each do |member_name, ref| - document_struct_member(yard_class, member_name, ref) - end - end - - def document_struct_member(yard_class, member_name, ref) - m = YARD::CodeObjects::MethodObject.new(yard_class, member_name) - m.scope = :instance - m.docstring = ref.documentation - m.add_tag(tag("@return [#{output_type(ref)}] #{ref.documentation}")) - yard_class.instance_attributes[member_name] = { :read => m, :write => m } - end - - end - end -end diff --git a/aws-sdk-core/lib/aws-sdk-core/api/doc_utils.rb b/aws-sdk-core/lib/aws-sdk-core/api/doc_utils.rb deleted file mode 100644 index 7a4bbc631c6..00000000000 --- a/aws-sdk-core/lib/aws-sdk-core/api/doc_utils.rb +++ /dev/null @@ -1,43 +0,0 @@ -module Aws - module Api - module DocUtils - - include Seahorse::Model - - def tag(string) - YARD::DocstringParser.new.parse(string).to_docstring.tags.first - end - - def input_type(ref) - case ref.shape - when Shapes::StructureShape then "Types::" + ref.shape.name - when Shapes::ListShape then "Array<#{input_type(ref.shape.member)}>" - when Shapes::MapShape then "Hash" - when Shapes::BlobShape then 'String,IO' - when Shapes::BooleanShape then 'Boolean' - when Shapes::FloatShape then 'Float,Numeric' - when Shapes::IntegerShape then 'Integer,Numeric' - when Shapes::StringShape then 'String' - when Shapes::TimestampShape then 'Time,Date,DateTime,Integer' - else raise "unsupported shape #{ref.shape.class.name}" - end - end - - def output_type(ref) - case ref.shape - when Shapes::StructureShape then "Types::" + ref.shape.name - when Shapes::ListShape then "Array<#{output_type(ref.shape.member)}>" - when Shapes::MapShape then "Hash" - when Shapes::BlobShape then ref.location == 'body' ? 'StringIO' : 'String' - when Shapes::BooleanShape then 'Boolean' - when Shapes::FloatShape then 'Float' - when Shapes::IntegerShape then 'Integer' - when Shapes::StringShape then 'String' - when Shapes::TimestampShape then 'Time' - else raise "unsupported shape #{ref.shape.class.name}" - end - end - - end - end -end diff --git a/aws-sdk-core/lib/aws-sdk-core/api/docs/builder.rb b/aws-sdk-core/lib/aws-sdk-core/api/docs/builder.rb new file mode 100644 index 00000000000..09f1ed1046e --- /dev/null +++ b/aws-sdk-core/lib/aws-sdk-core/api/docs/builder.rb @@ -0,0 +1,246 @@ +require 'erb' + +module Aws + module Api + module Docs + class Builder + + def self.document(svc_module) + new(svc_module).document + end + + def initialize(svc_module) + @svc_module = svc_module + @svc_name = svc_module.name.split('::').last + @client_class = svc_module.const_get(:Client) + @api = @client_class.api + @full_name = @api.metadata['serviceFullName'] + @error_names = @api.operations.map {|_,o| o.errors.map(&:shape).map(&:name) } + @error_names = @error_names.flatten.uniq.sort + @namespace = YARD::Registry['Aws'] + end + + def document + document_service + document_client + document_errors + end + + private + + def document_service + yard_mod = YARD::CodeObjects::ModuleObject.new(@namespace, @svc_name) + yard_mod.docstring = service_docstring + yard_mod.docstring.add_tag(YARD::Tags::Tag.new(:service, @svc_name)) + @namespace = yard_mod + end + + def service_docstring + path = "doc-src/services/#{@svc_name}/service.md" + path = 'doc-src/services/default/service.md' unless File.exists?(path) + template = read(path) + svc_name = @svc_name + api = @api + full_name = @full_name + ERB.new(template).result(binding) + end + + def document_errors + yard_mod = YARD::CodeObjects::ModuleObject.new(@namespace, 'Errors') + yard_mod.docstring = errors_docstring + + base_error = YARD::CodeObjects::ClassObject.new(yard_mod, 'ServiceError') + base_error.docstring = "Base class for all Aws::#{@svc_name} errors." + base_error.superclass = YARD::Registry['Aws::Errors::ServiceError'] + + @error_names.each do |error_name| + error_klass = YARD::CodeObjects::ClassObject.new(yard_mod, error_name) + error_klass.superclass = base_error + end + end + + def errors_docstring + path = "doc-src/services/#{@svc_name}/errors.md" + path = 'doc-src/services/default/errors.md' unless File.exists?(path) + template = read(path) + svc_name = @svc_name + api = @api + full_name = @full_name + known_errors = @error_names + ERB.new(template).result(binding) + end + + def document_client + yard_class = YARD::CodeObjects::ClassObject.new(@namespace, 'Client') + yard_class.superclass = YARD::Registry['Seahorse::Client::Base'] + yard_class.docstring = client_docstring + document_client_types + document_client_constructor(yard_class) + document_client_operations(yard_class) + document_client_waiters(yard_class) + end + + def document_client_types + namespace = YARD::CodeObjects::ModuleObject.new(@namespace, 'Types') + documenter = ClientTypeDocumenter.new(namespace) + @api.metadata['shapes'].each_structure do |shape| + documenter.document(shape) + end + end + + def client_docstring + path = "doc-src/services/#{@svc_name}/client.md" + path = 'doc-src/services/default/client.md' unless File.exists?(path) + render(path) + end + + def render(path) + svc_name = @svc_name + api = @api + full_name = @full_name + ERB.new(File.read(path)).result(binding) + end + + def document_client_constructor(namespace) + constructor = YARD::CodeObjects::MethodObject.new(namespace, :initialize) + constructor.group = 'Constructor' + constructor.scope = :instance + constructor.parameters << ['options', '{}'] + constructor.docstring = client_constructor_docstring + end + + def client_constructor_docstring + <<-DOCS.strip + Constructs an API client. + #{client_constructor_options} + @return [#{@client_class.name}] Returns an API client. + DOCS + end + + def client_constructor_options + options = {} + @client_class.plugins.each do |plugin| + if p = YARD::Registry[plugin.name] + p.tags.each do |tag| + if tag.tag_name == 'seahorse_client_option' + option_name = tag.text.match(/.+(:\w+)/)[1] + option_text = "@option options " + tag.text.split("\n").join("\n ") + options[option_name] = option_text + + " See {#{plugin.name}} for more details." + end + end + end + end + options.sort_by { |k,v| k }.map(&:last).join("\n") + end + + def document_client_operations(namespace) + @api.operations.each do |method_name, operation| + document_client_operation(namespace, method_name, operation) + end + end + + def document_client_operation(namespace, method_name, operation) + documenter = OperationDocumenter.new(namespace) + documenter.document(method_name, operation) + end + + def operation_docstring(method_name, operation) + # tabs = Tabulator.new.tap do |t| + # t.tab(method_name, 'Formatting Example') do + # "
#{documentor.example}
" + # end + # t.tab(method_name, 'Request Parameters') do + # documentor.input + # end + # t.tab(method_name, 'Response Structure') do + # documentor.output + # end + # end + # + # errors = (operation.errors || []).map { |ref| ref.shape.name } + # errors = errors.map { |e| "@raise [Errors::#{e}]" }.join("\n") + # + # docstring = <<-DOCSTRING.strip + #

Calls the #{operation.name} operation.

+ ##{documentor.api_ref(operation)} + ##{tabs} + #@param [Hash] params ({}) + #@return [PageableResponse] + ##{errors} + # DOCSTRING + end + + def document_client_waiters(yard_class) + m = YARD::CodeObjects::MethodObject.new(yard_class, :wait_until) + m.scope = :instance + m.parameters << ['waiter_name', nil] + m.parameters << ['params', '{}'] + m.docstring = YARD::Registry['Aws::ClientWaiters#wait_until'].docstring + + waiters = @client_class.waiters.waiter_names.sort.inject('') do |w,name| + waiter = @client_class.waiters.waiter(name) + operation = waiter.poller.operation_name + w << ":#{name}{##{operation}}#{waiter.delay}#{waiter.max_attempts}" + end + docstring = <<-DOCSTRING + Returns the list of supported waiters. The following table lists the supported + waiters and the client method they call: + + + + + + #{waiters} + +
Waiter NameClient MethodDelayMax Attempts
+ @return [Array] the list of supported waiters. + DOCSTRING + m = YARD::CodeObjects::MethodObject.new(yard_class, :waiter_names) + m.scope = :instance + m.docstring = docstring + end + + class Tabulator + + def initialize + @tabs = [] + @tab_contents = [] + end + + def tab(method_name, tab_name, &block) + tab_class = tab_name.downcase.gsub(/[^a-z]+/i, '-') + tab_id = "#{method_name.to_s.gsub(/_/, '-')}-#{tab_class}" + class_names = ['tab-contents', tab_class] + @tabs << [tab_id, tab_name] + @tab_contents << "

" + @tab_contents << yield + @tab_contents << '
' + end + + def to_html + lines = [] + lines << '
' + lines << '
    ' + @tabs.each do |tab_id, tab_name| + lines << "
  • #{tab_name}
    • " + end + lines << '
' + lines.concat(@tab_contents) + lines << '
' + lines.join + end + alias inspect to_html + alias to_str to_html + alias to_s to_html + + end + + def read(path) + File.open(path, 'r', encoding: 'UTF-8') { |f| f.read } + end + + end + end + end +end diff --git a/aws-sdk-core/lib/aws-sdk-core/api/docs/client_type_documenter.rb b/aws-sdk-core/lib/aws-sdk-core/api/docs/client_type_documenter.rb new file mode 100644 index 00000000000..daba638233d --- /dev/null +++ b/aws-sdk-core/lib/aws-sdk-core/api/docs/client_type_documenter.rb @@ -0,0 +1,34 @@ +module Aws + module Api + module Docs + class ClientTypeDocumenter + + include Utils + + # @param [Yard::CodeObjects::Base] namespace + def initialize(namespace) + @namespace = namespace + end + + # @param [Seahorse::Model::Shapes::StructureShape] shape + def document(shape) + yard_class = YARD::CodeObjects::ClassObject.new(@namespace, shape.name) + yard_class.superclass = 'Struct' + yard_class.docstring = shape.documentation + shape.members.each do |member_name, ref| + document_struct_member(yard_class, member_name, ref) + end + end + + def document_struct_member(yard_class, member_name, ref) + m = YARD::CodeObjects::MethodObject.new(yard_class, member_name) + m.scope = :instance + m.docstring = ref.documentation + m.add_tag(tag("@return [#{output_type(ref)}] #{ref.documentation}")) + yard_class.instance_attributes[member_name] = { :read => m, :write => m } + end + + end + end + end +end diff --git a/aws-sdk-core/lib/aws-sdk-core/api/docs/docstring_provider.rb b/aws-sdk-core/lib/aws-sdk-core/api/docs/docstring_provider.rb new file mode 100644 index 00000000000..39912d93fbf --- /dev/null +++ b/aws-sdk-core/lib/aws-sdk-core/api/docs/docstring_provider.rb @@ -0,0 +1,66 @@ +module Aws + module Api + module Docs + class DocstringProvider + + def initialize(docstrings) + @docstrings = docstrings + end + + # @param [String] operation_name + # @return [String,nil] + def operation_docs(operation_name) + clean(@docstrings['operations'][operation_name]) + end + + # @param [String] shape_name + # @return [String,nil] + def shape_docs(shape_name) + clean(shape(shape_name)['base']) + end + + # @param [String] shape_name + # @param [String] target + # @return [String,nil] + def shape_ref_docs(shape_name, target) + if ref_docs = shape(shape_name)['refs'][target] + clean(ref_docs) + else + shape_docs(shape_name) + end + end + + private + + def shape(name) + @docstrings['shapes'][name] || { 'base' => nil, 'refs' => {} } + end + + def clean(value) + if value.nil? + '' + else + value.gsub(/\{(\S+)\}/, '`{\1}`').strip + end + end + + end + + class NullDocstringProvider + + def operation_docs(operation_name) + nil + end + + def shape_docs(shape_name) + nil + end + + def shape_ref_docs(shape_name, target) + nil + end + + end + end + end +end diff --git a/aws-sdk-core/lib/aws-sdk-core/api/docs/operation_documenter.rb b/aws-sdk-core/lib/aws-sdk-core/api/docs/operation_documenter.rb new file mode 100644 index 00000000000..3cd8f883671 --- /dev/null +++ b/aws-sdk-core/lib/aws-sdk-core/api/docs/operation_documenter.rb @@ -0,0 +1,85 @@ +module Aws + module Api + module Docs + class OperationDocumenter + + include Seahorse::Model + include Utils + + # @param [YARD::CodeObject::Base] namespace + def initialize(namespace) + @namespace = namespace + @optname = 'params' + end + + # @param [Symbol] method_name + # @param [Seahorse::Model::Opeation] operation + def document(method_name, operation) + m = YARD::CodeObjects::MethodObject.new(@namespace, method_name) + m.group = 'API Operations' + m.scope = :instance + m.parameters << [@optname, '{}'] + m.docstring = operation.documentation + tags(method_name, operation).each do |tag| + m.add_tag(tag) + end + end + + private + + def tags(method_name, operation) + tags = [] + tags += param_tags(method_name, operation) + tags += option_tags(method_name, operation) + tags += return_tags(method_name, operation) + tags += example_tags(method_name, operation) + tags += see_also_tags(method_name, operation) + end + + def param_tags(method_name, operation) + [] + end + + def option_tags(method_name, operation) + if operation.input + operation.input.shape.members.map do |name, ref| + req = ref.required ? 'required,' : '' + type = input_type(ref) + tag("@option #{@optname} [#{req}#{type}] :#{name} #{ref.documentation}") + end + else + [] + end + end + + def return_tags(method_name, operation) + ref = operation.output ? output_type(operation.output) : 'EmptyStructure' + resp_type = '{Seahorse::Client::Response response}' + desc = "Returns a #{resp_type} object where the data is a {#{ref}}." + [tag("@return [#{ref}] #{desc}")] + end + + def example_tags(method_name, operation) + [formatting_example(method_name, operation)] + end + + def see_also_tags(method_name, operation) + [] + end + + def formatting_example(method_name, operation) + example = OperationExample.new( + method_name: method_name, + operation: operation, + ) + parts = [] + parts << "@example Formatting example with placeholder values, " + parts << "demonstrates params structure.\n\n" + parts += example.to_s.lines.map { |line| " " + line } + tag(parts.join) + end + + end + end + end +end diff --git a/aws-sdk-core/lib/aws-sdk-core/api/docs/operation_example.rb b/aws-sdk-core/lib/aws-sdk-core/api/docs/operation_example.rb new file mode 100644 index 00000000000..6032128e612 --- /dev/null +++ b/aws-sdk-core/lib/aws-sdk-core/api/docs/operation_example.rb @@ -0,0 +1,145 @@ +module Aws + module Api + module Docs + class OperationExample + + include Seahorse::Model::Shapes + + def initialize(options) + @method_name = options[:method_name] + @operation = options[:operation] + @streaming_output = !!( + @operation.output && + @operation.output[:payload] && + @operation.output[:payload_member]['streaming'] + ) + end + + def to_str + "resp = client.#{@method_name}(#{params[1...-1]})" + end + alias to_s to_str + alias inspect to_str + + private + + def params + return '' if @operation.input.nil? + structure(@operation.input, '', []) + end + + def structure(ref, i, visited) + lines = ['{'] + if @streaming_output + lines << "#{i} response_target: '/path/to/file', # optional target file path" + end + shape = ref.shape + shape.members.each do |member_name, member_ref| + nested = "#{i} #{member_name}: #{member(member_ref, i + ' ', visited)}," + if member_ref.required + # add a required comment to the first line + nested = nested.lines + if nested[0].match(/\n$/) + nested[0] = "#{nested[0].rstrip} # required\n" + elsif nested[0].match(/# one of/) + nested[0] = nested[0].sub('# one of', '# required, one of') + else + nested[0] = "#{nested[0]} # required" + end + nested = nested.join + end + lines << nested + end + lines << "#{i}}" + lines.join("\n") + end + + def map(ref, i, visited) + if multiline?(ref.shape.value) + multiline_map(ref, i, visited) + else + "{ #{key_name(ref)} => #{value(ref.shape.value)} }" + end + end + + def multiline_map(ref, i, visited) + lines = ["{"] + lines << "#{i} #{key_name(ref)} => #{member(ref.shape.value, i + ' ', visited)}," + lines << "#{i}}" + lines.join("\n") + end + + def list(ref, i, visited) + if multiline?(ref.shape.member) + multiline_list(ref, i, visited) + else + "[#{value(ref.shape.member)}, '...']" + end + end + + def multiline_list(ref, i, visited) + lines = ["["] + lines << "#{i} #{member(ref.shape.member, i + ' ', visited)}," + lines << "#{i}]" + lines.join("\n") + end + + def member(ref, i, visited) + if visited.include?(ref.shape.name) + recursive = ['{'] + recursive << "#{i} # recursive #{ref.shape.name} ..." + recursive << "#{i}}" + return recursive.join("\n") + elsif ref.shape.name == 'AttributeValue' + msg='"value", #' + return msg + else + visited = visited + [ref.shape.name] + end + case ref.shape + when StructureShape then structure(ref, i, visited) + when MapShape then map(ref, i, visited) + when ListShape then list(ref, i, visited) + else value(ref) + end + end + + def value(ref) + case ref.shape + when StringShape then string_value(ref) + when IntegerShape then 1 + when FloatShape then 1.1 + when BooleanShape then true + when TimestampShape then 'Time.now' + when BlobShape then "#{shape_name(ref, false)}".inspect + else raise "unhandled shape type `#{ref.shape.class.name}'" + end + end + + def string_value(ref) + if enum = ref.shape.enum + #ref.shape.enum.to_a.join('|').inspect + "#{enum.first.inspect}, # one of #{enum.to_a.join(', ')}" + else + shape_name(ref) + end + end + + def multiline?(ref) + shape = ref.shape + StructureShape === shape || ListShape === shape || MapShape === shape + end + + def shape_name(ref, inspect = true) + value = ref.shape.name + inspect ? value.inspect : value + end + + def key_name(ref, inspect = true) + shape_name(ref.shape.key) + end + + end + end + end +end diff --git a/aws-sdk-core/lib/aws-sdk-core/api/docs/utils.rb b/aws-sdk-core/lib/aws-sdk-core/api/docs/utils.rb new file mode 100644 index 00000000000..d1638ed80f1 --- /dev/null +++ b/aws-sdk-core/lib/aws-sdk-core/api/docs/utils.rb @@ -0,0 +1,45 @@ +module Aws + module Api + module Docs + module Utils + + include Seahorse::Model + + def tag(string) + YARD::DocstringParser.new.parse(string).to_docstring.tags.first + end + + def input_type(ref) + case ref.shape + when Shapes::StructureShape then "Types::" + ref.shape.name + when Shapes::ListShape then "Array<#{input_type(ref.shape.member)}>" + when Shapes::MapShape then "Hash" + when Shapes::BlobShape then 'String,IO' + when Shapes::BooleanShape then 'Boolean' + when Shapes::FloatShape then 'Float,Numeric' + when Shapes::IntegerShape then 'Integer,Numeric' + when Shapes::StringShape then 'String' + when Shapes::TimestampShape then 'Time,Date,DateTime,Integer' + else raise "unsupported shape #{ref.shape.class.name}" + end + end + + def output_type(ref) + case ref.shape + when Shapes::StructureShape then "Types::" + ref.shape.name + when Shapes::ListShape then "Array<#{output_type(ref.shape.member)}>" + when Shapes::MapShape then "Hash" + when Shapes::BlobShape then ref.location == 'body' ? 'StringIO' : 'String' + when Shapes::BooleanShape then 'Boolean' + when Shapes::FloatShape then 'Float' + when Shapes::IntegerShape then 'Integer' + when Shapes::StringShape then 'String' + when Shapes::TimestampShape then 'Time' + else raise "unsupported shape #{ref.shape.class.name}" + end + end + + end + end + end +end diff --git a/aws-sdk-core/lib/aws-sdk-core/api/docstring_provider.rb b/aws-sdk-core/lib/aws-sdk-core/api/docstring_provider.rb deleted file mode 100644 index b0e27c588ab..00000000000 --- a/aws-sdk-core/lib/aws-sdk-core/api/docstring_provider.rb +++ /dev/null @@ -1,64 +0,0 @@ -module Aws - module Api - class DocstringProvider - - def initialize(docstrings) - @docstrings = docstrings - end - - # @param [String] operation_name - # @return [String,nil] - def operation_docs(operation_name) - clean(@docstrings['operations'][operation_name]) - end - - # @param [String] shape_name - # @return [String,nil] - def shape_docs(shape_name) - clean(shape(shape_name)['base']) - end - - # @param [String] shape_name - # @param [String] target - # @return [String,nil] - def shape_ref_docs(shape_name, target) - if ref_docs = shape(shape_name)['refs'][target] - clean(ref_docs) - else - shape_docs(shape_name) - end - end - - private - - def shape(name) - @docstrings['shapes'][name] || { 'base' => nil, 'refs' => {} } - end - - def clean(value) - if value.nil? - '' - else - value.gsub(/\{(\S+)\}/, '`{\1}`').strip - end - end - - end - - class NullDocstringProvider - - def operation_docs(operation_name) - nil - end - - def shape_docs(shape_name) - nil - end - - def shape_ref_docs(shape_name, target) - nil - end - - end - end -end diff --git a/aws-sdk-core/lib/aws-sdk-core/api/documenter.rb b/aws-sdk-core/lib/aws-sdk-core/api/documenter.rb deleted file mode 100644 index eb3acc878c2..00000000000 --- a/aws-sdk-core/lib/aws-sdk-core/api/documenter.rb +++ /dev/null @@ -1,240 +0,0 @@ -require 'erb' - -module Aws - module Api - class Documenter - - def initialize(svc_module) - @svc_module = svc_module - @svc_name = svc_module.name.split('::').last - @client_class = svc_module.const_get(:Client) - @api = @client_class.api - @full_name = @api.metadata['serviceFullName'] - @error_names = @api.operations.map {|_,o| o.errors.map(&:shape).map(&:name) } - @error_names = @error_names.flatten.uniq.sort - @namespace = YARD::Registry['Aws'] - end - - def apply - document_service - document_client - document_errors - end - - private - - def document_service - yard_mod = YARD::CodeObjects::ModuleObject.new(@namespace, @svc_name) - yard_mod.docstring = service_docstring - yard_mod.docstring.add_tag(YARD::Tags::Tag.new(:service, @svc_name)) - @namespace = yard_mod - end - - def service_docstring - path = "doc-src/services/#{@svc_name}/service.md" - path = 'doc-src/services/default/service.md' unless File.exists?(path) - template = read(path) - svc_name = @svc_name - api = @api - full_name = @full_name - ERB.new(template).result(binding) - end - - def document_errors - yard_mod = YARD::CodeObjects::ModuleObject.new(@namespace, 'Errors') - yard_mod.docstring = errors_docstring - - base_error = YARD::CodeObjects::ClassObject.new(yard_mod, 'ServiceError') - base_error.docstring = "Base class for all Aws::#{@svc_name} errors." - base_error.superclass = YARD::Registry['Aws::Errors::ServiceError'] - - @error_names.each do |error_name| - error_klass = YARD::CodeObjects::ClassObject.new(yard_mod, error_name) - error_klass.superclass = base_error - end - end - - def errors_docstring - path = "doc-src/services/#{@svc_name}/errors.md" - path = 'doc-src/services/default/errors.md' unless File.exists?(path) - template = read(path) - svc_name = @svc_name - api = @api - full_name = @full_name - known_errors = @error_names - ERB.new(template).result(binding) - end - - def document_client - yard_class = YARD::CodeObjects::ClassObject.new(@namespace, 'Client') - yard_class.superclass = YARD::Registry['Seahorse::Client::Base'] - yard_class.docstring = client_docstring - document_client_types - document_client_constructor(yard_class) - document_client_operations(yard_class) - document_client_waiters(yard_class) - end - - def document_client_types - namespace = YARD::CodeObjects::ModuleObject.new(@namespace, 'Types') - documenter = ClientTypeDocumenter.new(namespace) - @api.metadata['shapes'].each_structure do |shape| - documenter.document(shape) - end - end - - def client_docstring - path = "doc-src/services/#{@svc_name}/client.md" - path = 'doc-src/services/default/client.md' unless File.exists?(path) - render(path) - end - - def render(path) - svc_name = @svc_name - api = @api - full_name = @full_name - ERB.new(File.read(path)).result(binding) - end - - def document_client_constructor(namespace) - constructor = YARD::CodeObjects::MethodObject.new(namespace, :initialize) - constructor.group = 'Constructor' - constructor.scope = :instance - constructor.parameters << ['options', '{}'] - constructor.docstring = client_constructor_docstring - end - - def client_constructor_docstring - <<-DOCS.strip -Constructs an API client. -#{client_constructor_options} -@return [#{@client_class.name}] Returns an API client. - DOCS - end - - def client_constructor_options - options = {} - @client_class.plugins.each do |plugin| - if p = YARD::Registry[plugin.name] - p.tags.each do |tag| - if tag.tag_name == 'seahorse_client_option' - option_name = tag.text.match(/.+(:\w+)/)[1] - option_text = "@option options " + tag.text.split("\n").join("\n ") - options[option_name] = option_text + - " See {#{plugin.name}} for more details." - end - end - end - end - options.sort_by { |k,v| k }.map(&:last).join("\n") - end - - def document_client_operations(namespace) - @api.operations.each do |method_name, operation| - document_client_operation(namespace, method_name, operation) - end - end - - def document_client_operation(namespace, method_name, operation) - documenter = OperationDocumenter.new(namespace) - documenter.document(method_name, operation) - end - - def operation_docstring(method_name, operation) -# tabs = Tabulator.new.tap do |t| -# t.tab(method_name, 'Formatting Example') do -# "
#{documentor.example}
" -# end -# t.tab(method_name, 'Request Parameters') do -# documentor.input -# end -# t.tab(method_name, 'Response Structure') do -# documentor.output -# end -# end -# -# errors = (operation.errors || []).map { |ref| ref.shape.name } -# errors = errors.map { |e| "@raise [Errors::#{e}]" }.join("\n") -# -# docstring = <<-DOCSTRING.strip -#

Calls the #{operation.name} operation.

-##{documentor.api_ref(operation)} -##{tabs} -#@param [Hash] params ({}) -#@return [PageableResponse] -##{errors} -# DOCSTRING - end - - def document_client_waiters(yard_class) - m = YARD::CodeObjects::MethodObject.new(yard_class, :wait_until) - m.scope = :instance - m.parameters << ['waiter_name', nil] - m.parameters << ['params', '{}'] - m.docstring = YARD::Registry['Aws::ClientWaiters#wait_until'].docstring - - waiters = @client_class.waiters.waiter_names.sort.inject('') do |w,name| - waiter = @client_class.waiters.waiter(name) - operation = waiter.poller.operation_name - w << ":#{name}{##{operation}}#{waiter.delay}#{waiter.max_attempts}" - end - docstring = <<-DOCSTRING -Returns the list of supported waiters. The following table lists the supported -waiters and the client method they call: - - - - - -#{waiters} - -
Waiter NameClient MethodDelayMax Attempts
-@return [Array] the list of supported waiters. - DOCSTRING - m = YARD::CodeObjects::MethodObject.new(yard_class, :waiter_names) - m.scope = :instance - m.docstring = docstring - end - - class Tabulator - - def initialize - @tabs = [] - @tab_contents = [] - end - - def tab(method_name, tab_name, &block) - tab_class = tab_name.downcase.gsub(/[^a-z]+/i, '-') - tab_id = "#{method_name.to_s.gsub(/_/, '-')}-#{tab_class}" - class_names = ['tab-contents', tab_class] - @tabs << [tab_id, tab_name] - @tab_contents << "

" - @tab_contents << yield - @tab_contents << '
' - end - - def to_html - lines = [] - lines << '
' - lines << '
    ' - @tabs.each do |tab_id, tab_name| - lines << "
  • #{tab_name}
    • " - end - lines << '
' - lines.concat(@tab_contents) - lines << '
' - lines.join - end - alias inspect to_html - alias to_str to_html - alias to_s to_html - - end - - def read(path) - File.open(path, 'r', encoding: 'UTF-8') { |f| f.read } - end - - end - end -end diff --git a/aws-sdk-core/lib/aws-sdk-core/api/operation_documenter.rb b/aws-sdk-core/lib/aws-sdk-core/api/operation_documenter.rb deleted file mode 100644 index 74a7d1df54b..00000000000 --- a/aws-sdk-core/lib/aws-sdk-core/api/operation_documenter.rb +++ /dev/null @@ -1,83 +0,0 @@ -module Aws - module Api - class OperationDocumenter - - include Seahorse::Model - include DocUtils - - # @param [YARD::CodeObject::Base] namespace - def initialize(namespace) - @namespace = namespace - @optname = 'params' - end - - # @param [Symbol] method_name - # @param [Seahorse::Model::Opeation] operation - def document(method_name, operation) - m = YARD::CodeObjects::MethodObject.new(@namespace, method_name) - m.group = 'API Operations' - m.scope = :instance - m.parameters << [@optname, '{}'] - m.docstring = operation.documentation - tags(method_name, operation).each do |tag| - m.add_tag(tag) - end - end - - private - - def tags(method_name, operation) - tags = [] - tags += param_tags(method_name, operation) - tags += option_tags(method_name, operation) - tags += return_tags(method_name, operation) - tags += example_tags(method_name, operation) - tags += see_also_tags(method_name, operation) - end - - def param_tags(method_name, operation) - [] - end - - def option_tags(method_name, operation) - if operation.input - operation.input.shape.members.map do |name, ref| - req = ref.required ? 'required,' : '' - type = input_type(ref) - tag("@option #{@optname} [#{req}#{type}] :#{name} #{ref.documentation}") - end - else - [] - end - end - - def return_tags(method_name, operation) - ref = operation.output ? output_type(operation.output) : 'EmptyStructure' - resp_type = '{Seahorse::Client::Response response}' - desc = "Returns a #{resp_type} object where the data is a {#{ref}}." - [tag("@return [#{ref}] #{desc}")] - end - - def example_tags(method_name, operation) - [formatting_example(method_name, operation)] - end - - def see_also_tags(method_name, operation) - [] - end - - def formatting_example(method_name, operation) - example = OperationExample.new( - method_name: method_name, - operation: operation, - ) - parts = [] - parts << "@example Formatting example with placeholder values, " - parts << "demonstrates params structure.\n\n" - parts += example.to_s.lines.map { |line| " " + line } - tag(parts.join) - end - - end - end -end diff --git a/aws-sdk-core/lib/aws-sdk-core/api/operation_example.rb b/aws-sdk-core/lib/aws-sdk-core/api/operation_example.rb deleted file mode 100644 index 4e7ac2bcd48..00000000000 --- a/aws-sdk-core/lib/aws-sdk-core/api/operation_example.rb +++ /dev/null @@ -1,143 +0,0 @@ -module Aws - module Api - class OperationExample - - include Seahorse::Model::Shapes - - def initialize(options) - @method_name = options[:method_name] - @operation = options[:operation] - @streaming_output = !!( - @operation.output && - @operation.output[:payload] && - @operation.output[:payload_member]['streaming'] - ) - end - - def to_str - "resp = client.#{@method_name}(#{params[1...-1]})" - end - alias to_s to_str - alias inspect to_str - - private - - def params - return '' if @operation.input.nil? - structure(@operation.input, '', []) - end - - def structure(ref, i, visited) - lines = ['{'] - if @streaming_output - lines << "#{i} response_target: '/path/to/file', # optional target file path" - end - shape = ref.shape - shape.members.each do |member_name, member_ref| - nested = "#{i} #{member_name}: #{member(member_ref, i + ' ', visited)}," - if member_ref.required - # add a required comment to the first line - nested = nested.lines - if nested[0].match(/\n$/) - nested[0] = "#{nested[0].rstrip} # required\n" - elsif nested[0].match(/# one of/) - nested[0] = nested[0].sub('# one of', '# required, one of') - else - nested[0] = "#{nested[0]} # required" - end - nested = nested.join - end - lines << nested - end - lines << "#{i}}" - lines.join("\n") - end - - def map(ref, i, visited) - if multiline?(ref.shape.value) - multiline_map(ref, i, visited) - else - "{ #{key_name(ref)} => #{value(ref.shape.value)} }" - end - end - - def multiline_map(ref, i, visited) - lines = ["{"] - lines << "#{i} #{key_name(ref)} => #{member(ref.shape.value, i + ' ', visited)}," - lines << "#{i}}" - lines.join("\n") - end - - def list(ref, i, visited) - if multiline?(ref.shape.member) - multiline_list(ref, i, visited) - else - "[#{value(ref.shape.member)}, '...']" - end - end - - def multiline_list(ref, i, visited) - lines = ["["] - lines << "#{i} #{member(ref.shape.member, i + ' ', visited)}," - lines << "#{i}]" - lines.join("\n") - end - - def member(ref, i, visited) - if visited.include?(ref.shape.name) - recursive = ['{'] - recursive << "#{i} # recursive #{ref.shape.name} ..." - recursive << "#{i}}" - return recursive.join("\n") - elsif ref.shape.name == 'AttributeValue' - msg='"value", #' - return msg - else - visited = visited + [ref.shape.name] - end - case ref.shape - when StructureShape then structure(ref, i, visited) - when MapShape then map(ref, i, visited) - when ListShape then list(ref, i, visited) - else value(ref) - end - end - - def value(ref) - case ref.shape - when StringShape then string_value(ref) - when IntegerShape then 1 - when FloatShape then 1.1 - when BooleanShape then true - when TimestampShape then 'Time.now' - when BlobShape then "#{shape_name(ref, false)}".inspect - else raise "unhandled shape type `#{ref.shape.class.name}'" - end - end - - def string_value(ref) - if enum = ref.shape.enum - #ref.shape.enum.to_a.join('|').inspect - "#{enum.first.inspect}, # one of #{enum.to_a.join(', ')}" - else - shape_name(ref) - end - end - - def multiline?(ref) - shape = ref.shape - StructureShape === shape || ListShape === shape || MapShape === shape - end - - def shape_name(ref, inspect = true) - value = ref.shape.name - inspect ? value.inspect : value - end - - def key_name(ref, inspect = true) - shape_name(ref.shape.key) - end - - end - end -end diff --git a/aws-sdk-core/lib/aws-sdk-core/api/shape_map.rb b/aws-sdk-core/lib/aws-sdk-core/api/shape_map.rb index 170155da615..2e5141c2eca 100644 --- a/aws-sdk-core/lib/aws-sdk-core/api/shape_map.rb +++ b/aws-sdk-core/lib/aws-sdk-core/api/shape_map.rb @@ -24,7 +24,7 @@ class ShapeMap # @option options [DocstringProvider] :docs (NullDocstringProvider) def initialize(shape_definitions, options = {}) @shapes = {} - @docs = options[:docs] || NullDocstringProvider.new + @docs = options[:docs] || Docs::NullDocstringProvider.new build_shapes(shape_definitions) end diff --git a/doc-src/plugins/apis.rb b/doc-src/plugins/apis.rb index 18c50bf76b0..ae755204818 100644 --- a/doc-src/plugins/apis.rb +++ b/doc-src/plugins/apis.rb @@ -11,6 +11,6 @@ YARD::Parser::SourceParser.after_parse_list do Aws.load_all_services Aws.service_added do |_, svc_module, options| - Aws::Api::Documenter.new(svc_module).apply + Aws::Api::Docs::Builder.document(svc_module) end end From f8f8813390a13e2261e0df0098caa6c28babbcea Mon Sep 17 00:00:00 2001 From: Trevor Rowe Date: Mon, 18 May 2015 09:09:54 -0700 Subject: [PATCH 062/101] Added the first-try at response structure examples. --- aws-sdk-core/lib/aws-sdk-core.rb | 3 +- .../lib/aws-sdk-core/api/docs/builder.rb | 4 +-- .../api/docs/operation_documenter.rb | 17 +++------ ...n_example.rb => request_syntax_example.rb} | 26 ++++++++++---- .../api/docs/response_structure_example.rb | 36 +++++++++++++++++++ .../lib/aws-sdk-core/empty_structure.rb | 3 +- 6 files changed, 64 insertions(+), 25 deletions(-) rename aws-sdk-core/lib/aws-sdk-core/api/docs/{operation_example.rb => request_syntax_example.rb} (89%) create mode 100644 aws-sdk-core/lib/aws-sdk-core/api/docs/response_structure_example.rb diff --git a/aws-sdk-core/lib/aws-sdk-core.rb b/aws-sdk-core/lib/aws-sdk-core.rb index fb57dca8e13..23d1fc35300 100644 --- a/aws-sdk-core/lib/aws-sdk-core.rb +++ b/aws-sdk-core/lib/aws-sdk-core.rb @@ -111,7 +111,8 @@ module Docs autoload :DocstringProvider, 'aws-sdk-core/api/docs/docstring_provider' autoload :NullDocstringProvider, 'aws-sdk-core/api/docs/docstring_provider' autoload :OperationDocumenter, 'aws-sdk-core/api/docs/operation_documenter' - autoload :OperationExample, 'aws-sdk-core/api/docs/operation_example' + autoload :RequestSyntaxExample, 'aws-sdk-core/api/docs/request_syntax_example' + autoload :ResponseStructureExample, 'aws-sdk-core/api/docs/response_structure_example' autoload :Utils, 'aws-sdk-core/api/docs/utils' end end diff --git a/aws-sdk-core/lib/aws-sdk-core/api/docs/builder.rb b/aws-sdk-core/lib/aws-sdk-core/api/docs/builder.rb index 09f1ed1046e..29609a3df34 100644 --- a/aws-sdk-core/lib/aws-sdk-core/api/docs/builder.rb +++ b/aws-sdk-core/lib/aws-sdk-core/api/docs/builder.rb @@ -22,6 +22,7 @@ def initialize(svc_module) def document document_service + document_types document_client document_errors end @@ -74,13 +75,12 @@ def document_client yard_class = YARD::CodeObjects::ClassObject.new(@namespace, 'Client') yard_class.superclass = YARD::Registry['Seahorse::Client::Base'] yard_class.docstring = client_docstring - document_client_types document_client_constructor(yard_class) document_client_operations(yard_class) document_client_waiters(yard_class) end - def document_client_types + def document_types namespace = YARD::CodeObjects::ModuleObject.new(@namespace, 'Types') documenter = ClientTypeDocumenter.new(namespace) @api.metadata['shapes'].each_structure do |shape| diff --git a/aws-sdk-core/lib/aws-sdk-core/api/docs/operation_documenter.rb b/aws-sdk-core/lib/aws-sdk-core/api/docs/operation_documenter.rb index 3cd8f883671..734183dd819 100644 --- a/aws-sdk-core/lib/aws-sdk-core/api/docs/operation_documenter.rb +++ b/aws-sdk-core/lib/aws-sdk-core/api/docs/operation_documenter.rb @@ -60,25 +60,16 @@ def return_tags(method_name, operation) end def example_tags(method_name, operation) - [formatting_example(method_name, operation)] + [ + RequestSyntaxExample.tag(method_name, operation), + ResponseStructureExample.tag(method_name, operation), + ] end def see_also_tags(method_name, operation) [] end - def formatting_example(method_name, operation) - example = OperationExample.new( - method_name: method_name, - operation: operation, - ) - parts = [] - parts << "@example Formatting example with placeholder values, " - parts << "demonstrates params structure.\n\n" - parts += example.to_s.lines.map { |line| " " + line } - tag(parts.join) - end - end end end diff --git a/aws-sdk-core/lib/aws-sdk-core/api/docs/operation_example.rb b/aws-sdk-core/lib/aws-sdk-core/api/docs/request_syntax_example.rb similarity index 89% rename from aws-sdk-core/lib/aws-sdk-core/api/docs/operation_example.rb rename to aws-sdk-core/lib/aws-sdk-core/api/docs/request_syntax_example.rb index 6032128e612..09df5ac0bbd 100644 --- a/aws-sdk-core/lib/aws-sdk-core/api/docs/operation_example.rb +++ b/aws-sdk-core/lib/aws-sdk-core/api/docs/request_syntax_example.rb @@ -1,13 +1,18 @@ module Aws module Api module Docs - class OperationExample + class RequestSyntaxExample + include Utils include Seahorse::Model::Shapes - def initialize(options) - @method_name = options[:method_name] - @operation = options[:operation] + def self.tag(*args) + new(*args).build_tag + end + + def initialize(method_name, operation) + @method_name = method_name + @operation = operation @streaming_output = !!( @operation.output && @operation.output[:payload] && @@ -15,11 +20,18 @@ def initialize(options) ) end + def build_tag + parts = [] + parts << "@example Request syntax with placeholder values\n\n" + parts += to_str.lines.map { |line| " " + line } + tag(parts.join) + end + + private + def to_str "resp = client.#{@method_name}(#{params[1...-1]})" end - alias to_s to_str - alias inspect to_str private @@ -31,7 +43,7 @@ def params def structure(ref, i, visited) lines = ['{'] if @streaming_output - lines << "#{i} response_target: '/path/to/file', # optional target file path" + lines << "#{i} response_target: '/path/to/file', # optional IO object or file path" end shape = ref.shape shape.members.each do |member_name, member_ref| diff --git a/aws-sdk-core/lib/aws-sdk-core/api/docs/response_structure_example.rb b/aws-sdk-core/lib/aws-sdk-core/api/docs/response_structure_example.rb new file mode 100644 index 00000000000..a3c78dd6b12 --- /dev/null +++ b/aws-sdk-core/lib/aws-sdk-core/api/docs/response_structure_example.rb @@ -0,0 +1,36 @@ +require 'pp' + +module Aws + module Api + module Docs + class ResponseStructureExample + + include Utils + + def self.tag(*args) + new(*args).build_tag + end + + def initialize(method_name, operation) + @method_name = method_name + @operation = operation + end + + def build_tag + parts = [] + parts << "@example Response structure with placeholder values\n\n" + parts += to_str.lines.map { |line| " " + line } + tag(parts.join) + end + + private + + def to_str + stub = ClientStubs::Stub.new(@operation.output) + PP.pp(stub.format, '') + end + + end + end + end +end diff --git a/aws-sdk-core/lib/aws-sdk-core/empty_structure.rb b/aws-sdk-core/lib/aws-sdk-core/empty_structure.rb index 08cd23e6ee6..3f80f141c34 100644 --- a/aws-sdk-core/lib/aws-sdk-core/empty_structure.rb +++ b/aws-sdk-core/lib/aws-sdk-core/empty_structure.rb @@ -1,4 +1,3 @@ module Aws - class EmptyStructure < Structure.new('AwsEmptyStructure') - end + EmptyStructure = Class.new(Structure.new('AwsEmptyStructure')) end From edc3446bc3a46bc3fd0ee1624b305b031804d341 Mon Sep 17 00:00:00 2001 From: Trevor Rowe Date: Wed, 20 May 2015 15:41:03 -0700 Subject: [PATCH 063/101] Expanded API client examples. The request syntax examples have been improved and now have tests. Also added response syntax examples with test. --- .../api/docs/client_type_documenter.rb | 16 +- .../api/docs/operation_documenter.rb | 39 +- .../api/docs/request_syntax_example.rb | 217 ++++++----- .../api/docs/response_structure_example.rb | 81 +++- .../lib/aws-sdk-core/api/docs/utils.rb | 75 +++- .../api/docs/request_syntax_example_spec.rb | 367 ++++++++++++++++++ .../docs/response_structure_example_spec.rb | 241 ++++++++++++ aws-sdk-core/spec/spec_helper.rb | 17 + .../default/fulldoc/html/css/common.css | 4 + 9 files changed, 923 insertions(+), 134 deletions(-) create mode 100644 aws-sdk-core/spec/aws/api/docs/request_syntax_example_spec.rb create mode 100644 aws-sdk-core/spec/aws/api/docs/response_structure_example_spec.rb diff --git a/aws-sdk-core/lib/aws-sdk-core/api/docs/client_type_documenter.rb b/aws-sdk-core/lib/aws-sdk-core/api/docs/client_type_documenter.rb index daba638233d..1b867b640d7 100644 --- a/aws-sdk-core/lib/aws-sdk-core/api/docs/client_type_documenter.rb +++ b/aws-sdk-core/lib/aws-sdk-core/api/docs/client_type_documenter.rb @@ -20,12 +20,26 @@ def document(shape) end end + private + def document_struct_member(yard_class, member_name, ref) m = YARD::CodeObjects::MethodObject.new(yard_class, member_name) m.scope = :instance m.docstring = ref.documentation - m.add_tag(tag("@return [#{output_type(ref)}] #{ref.documentation}")) + returns = "@return [#{output_type(ref)}] #{summary(ref.documentation)}" + m.add_tag(tag(returns)) yard_class.instance_attributes[member_name] = { :read => m, :write => m } + document_possible_values(m, ref) + end + + def document_possible_values(m, ref) + if + Seahorse::Model::Shapes::StringShape === ref.shape && + ref.shape.enum + then + values = ref.shape.enum.map { |v| "\n * `#{v}`" }.join + m.docstring += "\nPossible values:\n#{values}" + end end end diff --git a/aws-sdk-core/lib/aws-sdk-core/api/docs/operation_documenter.rb b/aws-sdk-core/lib/aws-sdk-core/api/docs/operation_documenter.rb index 734183dd819..3c09eca6ed8 100644 --- a/aws-sdk-core/lib/aws-sdk-core/api/docs/operation_documenter.rb +++ b/aws-sdk-core/lib/aws-sdk-core/api/docs/operation_documenter.rb @@ -53,17 +53,42 @@ def option_tags(method_name, operation) end def return_tags(method_name, operation) - ref = operation.output ? output_type(operation.output) : 'EmptyStructure' - resp_type = '{Seahorse::Client::Response response}' - desc = "Returns a #{resp_type} object where the data is a {#{ref}}." - [tag("@return [#{ref}] #{desc}")] + resp = '{Seahorse::Client::Response response}' + if operation.output && operation.output.shape.members.count > 0 + rtype = output_type(operation.output) + returns = "[#{rtype}] Returns a #{resp} object which responds to " + returns << "the following methods:\n\n" + operation.output.shape.members.each do |mname, mref| + returns << " * {#{rtype}##{mname} ##{mname}} => #{output_type(mref, true)}\n" + end + else + returns = "[Struct] Returns an empty #{resp}." + end + [tag("@return #{returns}")] end def example_tags(method_name, operation) [ - RequestSyntaxExample.tag(method_name, operation), - ResponseStructureExample.tag(method_name, operation), - ] + request_syntax_example(method_name, operation), + response_structure_example(method_name, operation), + ].compact + end + + def request_syntax_example(method_name, operation) + example = RequestSyntaxExample.new(method_name, operation).to_str + parts = [] + parts << "@example Request syntax with placeholder values\n\n" + parts += example.lines.map { |line| " " + line } + tag(parts.join) + end + + def response_structure_example(method_name, operation) + if example = ResponseStructureExample.new(method_name, operation).to_str + parts = [] + parts << "@example Response structure\n\n" + parts += example.lines.map { |line| " " + line } + tag(parts.join) + end end def see_also_tags(method_name, operation) diff --git a/aws-sdk-core/lib/aws-sdk-core/api/docs/request_syntax_example.rb b/aws-sdk-core/lib/aws-sdk-core/api/docs/request_syntax_example.rb index 09df5ac0bbd..6cf59605a49 100644 --- a/aws-sdk-core/lib/aws-sdk-core/api/docs/request_syntax_example.rb +++ b/aws-sdk-core/lib/aws-sdk-core/api/docs/request_syntax_example.rb @@ -6,10 +6,6 @@ class RequestSyntaxExample include Utils include Seahorse::Model::Shapes - def self.tag(*args) - new(*args).build_tag - end - def initialize(method_name, operation) @method_name = method_name @operation = operation @@ -18,137 +14,176 @@ def initialize(method_name, operation) @operation.output[:payload] && @operation.output[:payload_member]['streaming'] ) + @recursive_shapes = Set.new + @recursive_shapes = compute_recursive_shapes(@operation.input) end - def build_tag - parts = [] - parts << "@example Request syntax with placeholder values\n\n" - parts += to_str.lines.map { |line| " " + line } - tag(parts.join) + def to_str + "resp = client.#{@method_name}(#{params})" end - private - - def to_str - "resp = client.#{@method_name}(#{params[1...-1]})" + def params + if @operation.input + ref_value(@operation.input, '', []) + else + '' + end end private - def params - return '' if @operation.input.nil? - structure(@operation.input, '', []) + def struct(ref, i, visited) + lines = ['{'] + apply_response_target_param(ref, lines, i) + ref.shape.members.each do |member_name, member_ref| + lines << struct_member(member_name, member_ref, i, visited) + end + lines << "#{i}}" + lines.join("\n") end - def structure(ref, i, visited) - lines = ['{'] - if @streaming_output - lines << "#{i} response_target: '/path/to/file', # optional IO object or file path" + def struct_member(member_name, member_ref, i, visited) + entry = "#{i} #{member_name}: #{ref_value(member_ref, i + ' ', visited)}," + apply_comments(member_ref, entry) + end + + def ref_value(ref, i, visited) + if visited.include?(ref.shape) + return "{\n#{i} # recursive #{ref.shape.name}\n#{i}}" + else + visited = visited + [ref.shape] end - shape = ref.shape - shape.members.each do |member_name, member_ref| - nested = "#{i} #{member_name}: #{member(member_ref, i + ' ', visited)}," - if member_ref.required - # add a required comment to the first line - nested = nested.lines - if nested[0].match(/\n$/) - nested[0] = "#{nested[0].rstrip} # required\n" - elsif nested[0].match(/# one of/) - nested[0] = nested[0].sub('# one of', '# required, one of') - else - nested[0] = "#{nested[0]} # required" - end - nested = nested.join + case ref.shape + when StructureShape + if ref.shape.name == 'AttributeValue' + '"value"' + else + struct(ref, i, visited) end - lines << nested + when ListShape then list(ref, i, visited) + when MapShape then map(ref, i, visited) + when BlobShape then '"data"' + when BooleanShape then "true" + when IntegerShape then '1' + when FloatShape then '1.0' + when StringShape then string(ref) + when TimestampShape then 'Time.now' + else raise "unsupported shape #{ref.shape.class.name}" end - lines << "#{i}}" - lines.join("\n") end - def map(ref, i, visited) - if multiline?(ref.shape.value) - multiline_map(ref, i, visited) + def list(ref, i, visited) + if scalar?(ref.shape.member) + scalar_list(ref.shape.member, i, visited) else - "{ #{key_name(ref)} => #{value(ref.shape.value)} }" + complex_list(ref.shape.member, i, visited) end end - def multiline_map(ref, i, visited) - lines = ["{"] - lines << "#{i} #{key_name(ref)} => #{member(ref.shape.value, i + ' ', visited)}," - lines << "#{i}}" - lines.join("\n") + def scalar_list(ref, i, visited) + "[#{ref_value(ref, i, visited)}]" end - def list(ref, i, visited) - if multiline?(ref.shape.member) - multiline_list(ref, i, visited) + def complex_list(ref, i, visited) + "[\n#{i} #{ref_value(ref, i + ' ', visited)},\n#{i}]" + end + + def map(ref, i, visited) + key = string(ref.shape.key) + value = ref_value(ref.shape.value, i + ' ', visited) + "{\n#{i} #{key} => #{value},#{comments(ref.shape.value)}\n#{i}}" + end + + def string(ref) + if ref.shape.enum + ref.shape.enum.first.inspect + elsif ref.shape.name + ref.shape.name.inspect else - "[#{value(ref.shape.member)}, '...']" + '"string"' end end - def multiline_list(ref, i, visited) - lines = ["["] - lines << "#{i} #{member(ref.shape.member, i + ' ', visited)}," - lines << "#{i}]" - lines.join("\n") + def apply_response_target_param(ref, lines, i) + if @streaming_output && ref == @operation.input + lines << "#{i} response_target: '/path/to/file', # optional file path or IO object" + end end - def member(ref, i, visited) - if visited.include?(ref.shape.name) - recursive = ['{'] - recursive << "#{i} # recursive #{ref.shape.name} ..." - recursive << "#{i}}" - return recursive.join("\n") - elsif ref.shape.name == 'AttributeValue' - msg='"value", #' - return msg + def apply_comments(ref, text) + lines = text.lines + if lines[0].match(/\n$/) + lines[0] = lines[0].sub(/\n$/, comments(ref) + "\n") else - visited = visited + [ref.shape.name] + lines[0] += comments(ref) end - case ref.shape - when StructureShape then structure(ref, i, visited) - when MapShape then map(ref, i, visited) - when ListShape then list(ref, i, visited) - else value(ref) + lines.join + end + + def comments(ref) + comments = [] + comments << 'required' if ref.required + if enum = enum_values(ref) + comments << "accepts #{enum.to_a.join(', ')}" end + comments << 'accepts ' if ddb_av?(ref) + comments == [] ? '' : " # #{comments.join(', ')}" + end + + def recursive?(ref) + @recursive_shapes.include?(ref.shape) end - def value(ref) + def enum_values(ref) case ref.shape - when StringShape then string_value(ref) - when IntegerShape then 1 - when FloatShape then 1.1 - when BooleanShape then true - when TimestampShape then 'Time.now' - when BlobShape then "#{shape_name(ref, false)}".inspect - else raise "unhandled shape type `#{ref.shape.class.name}'" + when ListShape then enum_values(ref.shape.member) + when StringShape then ref.shape.enum + else nil end end - def string_value(ref) - if enum = ref.shape.enum - #ref.shape.enum.to_a.join('|').inspect - "#{enum.first.inspect}, # one of #{enum.to_a.join(', ')}" + def complex?(ref) + if StructureShape === ref.shape + !ddb_av?(ref) else - shape_name(ref) + ListShape === ref.shape || MapShape === ref.shape end end - def multiline?(ref) - shape = ref.shape - StructureShape === shape || ListShape === shape || MapShape === shape + def scalar?(ref) + !complex?(ref) end - def shape_name(ref, inspect = true) - value = ref.shape.name - inspect ? value.inspect : value + def ddb_av?(ref) + case ref.shape + when ListShape then ddb_av?(ref.shape.member) + when StructureShape then ref.shape.name == 'AttributeValue' + else false + end end - def key_name(ref, inspect = true) - shape_name(ref.shape.key) + def compute_recursive_shapes(ref, visited = []) + # terminal case for recursion + if ref.nil? + return + elsif visited.include?(ref.shape) + @recursive_shapes << ref.shape + return + else + visited += [ref.shape] + end + + case ref.shape + when StructureShape + ref.shape.members.each do |_, member_ref| + compute_recursive_shapes(member_ref, visited) + end + when ListShape + compute_recursive_shapes(ref.shape.member, visited) + when MapShape + compute_recursive_shapes(ref.shape.key, visited) + compute_recursive_shapes(ref.shape.value, visited) + end end end diff --git a/aws-sdk-core/lib/aws-sdk-core/api/docs/response_structure_example.rb b/aws-sdk-core/lib/aws-sdk-core/api/docs/response_structure_example.rb index a3c78dd6b12..2b5955660a6 100644 --- a/aws-sdk-core/lib/aws-sdk-core/api/docs/response_structure_example.rb +++ b/aws-sdk-core/lib/aws-sdk-core/api/docs/response_structure_example.rb @@ -1,33 +1,86 @@ -require 'pp' - module Aws module Api module Docs class ResponseStructureExample include Utils - - def self.tag(*args) - new(*args).build_tag - end + include Seahorse::Model::Shapes def initialize(method_name, operation) @method_name = method_name @operation = operation + @recursive_shapes = compute_recursive_shapes(@operation.output) end - def build_tag - parts = [] - parts << "@example Response structure with placeholder values\n\n" - parts += to_str.lines.map { |line| " " + line } - tag(parts.join) + def to_str + if @operation.output + lines = entry(@operation.output, "resp", []) + lines.empty? ? nil : lines.join("\n") + else + nil + end end private - def to_str - stub = ClientStubs::Stub.new(@operation.output) - PP.pp(stub.format, '') + def structure(ref, context, visited) + lines = [] + ref.shape.members.each do |member_name, member_ref| + lines += entry(member_ref, "#{context}.#{member_name}", visited) + end + lines + end + + def list(ref, context, visited) + lines = [] + lines << "#{context} #=> Array" + lines += entry(ref.shape.member, "#{context}[0]", visited) + lines + end + + def map(ref, context, visited) + lines = [] + lines << "#{context} #=> Hash" + lines += entry(ref.shape.value, "#{context}[#{map_key(ref)}]", visited) + lines + end + + def map_key(ref) + (ref.shape.key.shape.name || 'string').inspect + end + + def entry(ref, context, visited) + if visited.include?(ref.shape) + return ["#{context} #=> Types::#{ref.shape.name}"] + else + visited = visited + [ref.shape] + end + case ref.shape + when StructureShape then structure(ref, context, visited) + when ListShape then list(ref, context, visited) + when MapShape then map(ref, context, visited) + else ["#{context} #=> #{value(ref)}"] + end + end + + def value(ref) + case ref.shape + when StringShape then string(ref) + when IntegerShape then 'Integer' + when FloatShape then 'Float' + when BooleanShape then 'true/false' + when BlobShape then 'IO' + when TimestampShape then 'Time' + else raise "unhandled shape type #{ref.shape.class.name}" + end + end + + def string(ref) + if ref.shape.enum + "String, one of #{ref.shape.enum.map(&:inspect).join(', ')}" + else + 'String' + end end end diff --git a/aws-sdk-core/lib/aws-sdk-core/api/docs/utils.rb b/aws-sdk-core/lib/aws-sdk-core/api/docs/utils.rb index d1638ed80f1..8e054f818ae 100644 --- a/aws-sdk-core/lib/aws-sdk-core/api/docs/utils.rb +++ b/aws-sdk-core/lib/aws-sdk-core/api/docs/utils.rb @@ -1,42 +1,75 @@ +require 'set' module Aws module Api module Docs module Utils include Seahorse::Model + include Seahorse::Model::Shapes def tag(string) YARD::DocstringParser.new.parse(string).to_docstring.tags.first end - def input_type(ref) + def input_type(ref, link = false) + if BlobShape === ref.shape + 'String,IO' + else + output_type(ref, link) + end + end + + def output_type(ref, link = false) case ref.shape - when Shapes::StructureShape then "Types::" + ref.shape.name - when Shapes::ListShape then "Array<#{input_type(ref.shape.member)}>" - when Shapes::MapShape then "Hash" - when Shapes::BlobShape then 'String,IO' - when Shapes::BooleanShape then 'Boolean' - when Shapes::FloatShape then 'Float,Numeric' - when Shapes::IntegerShape then 'Integer,Numeric' - when Shapes::StringShape then 'String' - when Shapes::TimestampShape then 'Time,Date,DateTime,Integer' + when StructureShape + type = "Types::" + ref.shape.name + link ? "{#{type}}" : type + when ListShape + "Array<#{output_type(ref.shape.member, link)}>" + when MapShape + "Hash" + when BlobShape + ref.location == 'body' ? 'StringIO' : 'String' + when BooleanShape then 'Boolean' + when FloatShape then 'Float' + when IntegerShape then 'Integer' + when StringShape then 'String' + when TimestampShape then 'Time' else raise "unsupported shape #{ref.shape.class.name}" end end - def output_type(ref) + def summary(string) + if string + YARD::DocstringParser.new.parse(string).to_docstring.summary + else + nil + end + end + + def compute_recursive_shapes(ref, visited = [], recursive_shapes = Set.new) + # terminal case for recursion + if ref.nil? + return recursive_shapes + elsif visited.include?(ref.shape) + recursive_shapes << ref.shape + return recursive_shapes + else + visited += [ref.shape] + end + case ref.shape - when Shapes::StructureShape then "Types::" + ref.shape.name - when Shapes::ListShape then "Array<#{output_type(ref.shape.member)}>" - when Shapes::MapShape then "Hash" - when Shapes::BlobShape then ref.location == 'body' ? 'StringIO' : 'String' - when Shapes::BooleanShape then 'Boolean' - when Shapes::FloatShape then 'Float' - when Shapes::IntegerShape then 'Integer' - when Shapes::StringShape then 'String' - when Shapes::TimestampShape then 'Time' - else raise "unsupported shape #{ref.shape.class.name}" + when StructureShape + ref.shape.members.each do |_, member_ref| + compute_recursive_shapes(member_ref, visited) + end + when ListShape + compute_recursive_shapes(ref.shape.member, visited) + when MapShape + compute_recursive_shapes(ref.shape.key, visited) + compute_recursive_shapes(ref.shape.value, visited) end + recursive_shapes end end diff --git a/aws-sdk-core/spec/aws/api/docs/request_syntax_example_spec.rb b/aws-sdk-core/spec/aws/api/docs/request_syntax_example_spec.rb new file mode 100644 index 00000000000..592dd4d42bc --- /dev/null +++ b/aws-sdk-core/spec/aws/api/docs/request_syntax_example_spec.rb @@ -0,0 +1,367 @@ +require 'spec_helper' + +module Aws + module Api + module Docs + + include Seahorse::Model + include Seahorse::Model::Shapes + + describe RequestSyntaxExample do + + let(:operation) { Operation.new } + + let(:example) { + RequestSyntaxExample.new('operation_name', operation).to_str + } + + it 'supports operations that does not accept input' do + expect(example).to match_example(<<-EXAMPLE) +resp = client.operation_name() + EXAMPLE + end + + it 'supports operations that accept hashes of scalars' do + input = StructureShape.new + input.add_member(:param_name, ShapeRef.new(shape: StringShape.new)) + input.add_member(:other_param, ShapeRef.new(shape: StringShape.new)) + operation.input = ShapeRef.new(shape: input) + + expect(example).to match_example(<<-EXAMPLE) +resp = client.operation_name({ + param_name: "string", + other_param: "string", +}) + EXAMPLE + end + + it 'comments on required entries' do + ref = ShapeRef.new(shape: StringShape.new, required: true) + input = StructureShape.new + input.add_member(:param_name, ref) + operation.input = ShapeRef.new(shape: input) + expect(example).to match_example(<<-EXAMPLE) +resp = client.operation_name({ + param_name: "string", # required +}) + EXAMPLE + end + + it 'comments on accepted values for enums' do + string = StringShape.new + string.enum = %w(abc mno xyz) + input = StructureShape.new + input.add_member(:param_name, ShapeRef.new(shape: string)) + operation.input = ShapeRef.new(shape: input) + expect(example).to match_example(<<-EXAMPLE) +resp = client.operation_name({ + param_name: "abc", # accepts abc, mno, xyz +}) + EXAMPLE + end + + it 'combines required and enum comments' do + string = StringShape.new + string.enum = %w(abc mno xyz) + input = StructureShape.new + input.add_member(:param_name, ShapeRef.new(shape: string, required: true)) + operation.input = ShapeRef.new(shape: input) + expect(example).to match_example(<<-EXAMPLE) +resp = client.operation_name({ + param_name: "abc", # required, accepts abc, mno, xyz +}) + EXAMPLE + end + + it 'supports nested structures' do + nested = StructureShape.new + nested.add_member(:param, ShapeRef.new(shape: StringShape.new, required: true)) + input = StructureShape.new + input.add_member(:nested, ShapeRef.new(shape: nested, required: true)) + operation.input = ShapeRef.new(shape: input) + expect(example).to match_example(<<-EXAMPLE) +resp = client.operation_name({ + nested: { # required + param: "string", # required + }, +}) + EXAMPLE + end + + it 'documents :response_target' do + blob = BlobShape.new + blob[:streaming] = true + output = StructureShape.new + output.add_member(:data, ShapeRef.new(shape: blob)) + output[:payload] = :data + output[:payload_member] = output.member(:data) + operation.output = output + + input = StructureShape.new + input.add_member(:value, ShapeRef.new(shape: StringShape.new)) + operation.input = ShapeRef.new(shape: input) + expect(example).to match_example(<<-EXAMPLE) +resp = client.operation_name({ + response_target: '/path/to/file', # optional file path or IO object + value: "string", +}) + EXAMPLE + end + + it 'supports recursive structures' do + input = StructureShape.new + input.name = 'RecursiveData' + input.add_member(:nested, ShapeRef.new(shape: input)) + input.add_member(:value, ShapeRef.new(shape: StringShape.new)) + operation.input = ShapeRef.new(shape: input) + expect(example).to match_example(<<-EXAMPLE) +resp = client.operation_name({ + nested: { + # recursive RecursiveData + }, + value: "string", +}) + EXAMPLE + end + + it 'supports lists of scalars' do + list = ListShape.new + list.member = ShapeRef.new(shape: StringShape.new) + input = StructureShape.new + input.add_member(:items, ShapeRef.new(shape: list)) + operation.input = ShapeRef.new(shape: input) + expect(example).to match_example(<<-EXAMPLE) +resp = client.operation_name({ + items: ["string"], +}) + EXAMPLE + end + + it 'supports list of scalars with enums' do + string = StringShape.new + string.enum = Set.new(%w(abc mno xyz)) + list = ListShape.new + list.member = ShapeRef.new(shape: string) + input = StructureShape.new + input.add_member(:items, ShapeRef.new(shape: list)) + operation.input = ShapeRef.new(shape: input) + expect(example).to match_example(<<-EXAMPLE) +resp = client.operation_name({ + items: ["abc"], # accepts abc, mno, xyz +}) + EXAMPLE + end + + it 'supports required list of scalars with enums' do + string = StringShape.new + string.enum = Set.new(%w(abc mno xyz)) + list = ListShape.new + list.member = ShapeRef.new(shape: string) + input = StructureShape.new + input.add_member(:items, ShapeRef.new(shape: list, required: true)) + operation.input = ShapeRef.new(shape: input) + expect(example).to match_example(<<-EXAMPLE) +resp = client.operation_name({ + items: ["abc"], # required, accepts abc, mno, xyz +}) + EXAMPLE + end + + it 'supports lists of structures' do + struct = StructureShape.new + struct.add_member(:value, ShapeRef.new(shape: StringShape.new)) + struct.add_member(:count, ShapeRef.new(shape: IntegerShape.new)) + list = ListShape.new + list.member = ShapeRef.new(shape: struct) + input = StructureShape.new + input.add_member(:items, ShapeRef.new(shape: list, required: true)) + operation.input = ShapeRef.new(shape: input) + expect(example).to match_example(<<-EXAMPLE) +resp = client.operation_name({ + items: [ # required + { + value: "string", + count: 1, + }, + ], +}) + EXAMPLE + end + + it 'supports maps of scalars' do + key = StringShape.new + key.name = 'KeyName' + value = StringShape.new + value.name = 'ValueName' + map = MapShape.new + map.key = ShapeRef.new(shape: key) + map.value = ShapeRef.new(shape: value) + input = StructureShape.new + input.add_member(:attributes, ShapeRef.new(shape: map)) + operation.input = ShapeRef.new(shape: input) + expect(example).to match_example(<<-EXAMPLE) +resp = client.operation_name({ + attributes: { + "KeyName" => "ValueName", + }, +}) + EXAMPLE + end + + it 'supports maps of scalars with enums' do + key = StringShape.new + key.name = 'KeyName' + value = StringShape.new + value.name = 'ValueName' + value.enum = Set.new(%w(abc mno xyz)) + map = MapShape.new + map.key = ShapeRef.new(shape: key) + map.value = ShapeRef.new(shape: value) + input = StructureShape.new + input.add_member(:attributes, ShapeRef.new(shape: map, required: true)) + operation.input = ShapeRef.new(shape: input) + expect(example).to match_example(<<-EXAMPLE) +resp = client.operation_name({ + attributes: { # required + "KeyName" => "abc", # accepts abc, mno, xyz + }, +}) + EXAMPLE + end + + it 'supports maps of list' do + string = StringShape.new + string.enum = Set.new(%w(abc mno xyz)) + key = StringShape.new + key.name = 'KeyName' + value = ListShape.new + value.member = ShapeRef.new(shape: string) + map = MapShape.new + map.key = ShapeRef.new(shape: key) + map.value = ShapeRef.new(shape: value) + input = StructureShape.new + input.add_member(:attributes, ShapeRef.new(shape: map, required: true)) + operation.input = ShapeRef.new(shape: input) + expect(example).to match_example(<<-EXAMPLE) +resp = client.operation_name({ + attributes: { # required + "KeyName" => ["abc"], # accepts abc, mno, xyz + }, +}) + EXAMPLE + end + + it 'supports maps of list' do + struct = StructureShape.new + struct.add_member(:value, ShapeRef.new(shape: StringShape.new)) + key = StringShape.new + key.name = 'KeyName' + value = ListShape.new + value.member = ShapeRef.new(shape: struct) + map = MapShape.new + map.key = ShapeRef.new(shape: key) + map.value = ShapeRef.new(shape: value) + input = StructureShape.new + input.add_member(:attributes, ShapeRef.new(shape: map, required: true)) + operation.input = ShapeRef.new(shape: input) + expect(example).to match_example(<<-EXAMPLE) +resp = client.operation_name({ + attributes: { # required + "KeyName" => [ + { + value: "string", + }, + ], + }, +}) + EXAMPLE + end + + it 'supports maps of structures' do + struct = StructureShape.new + struct.add_member(:value, ShapeRef.new(shape: StringShape.new)) + struct.add_member(:count, ShapeRef.new(shape: IntegerShape.new)) + key = StringShape.new + key.name = 'KeyName' + map = MapShape.new + map.key = ShapeRef.new(shape: key) + map.value = ShapeRef.new(shape: struct) + input = StructureShape.new + input.add_member(:attributes, ShapeRef.new(shape: map, required: true)) + operation.input = ShapeRef.new(shape: input) + expect(example).to match_example(<<-EXAMPLE) +resp = client.operation_name({ + attributes: { # required + "KeyName" => { + value: "string", + count: 1, + }, + }, +}) + EXAMPLE + end + + it 'supports complex structures' do + shapes = ShapeMap.new(ApiHelper.sample_shapes) + operation.input = shapes.shape_ref('shape' => 'StructureShape') + expect(example).to match_example(<<-EXAMPLE) +resp = client.operation_name({ + nested: { + # recursive StructureShape + }, + nested_list: [ + { + # recursive StructureShape + }, + ], + nested_map: { + "StringShape" => { + # recursive StructureShape + }, + }, + number_list: [1], + string_map: { + "StringShape" => "StringShape", + }, + blob: "data", + byte: "ByteShape", + boolean: true, + character: "CharacterShape", + double: 1.0, + float: 1.0, + integer: 1, + long: 1, + string: "StringShape", + timestamp: Time.now, +}) + EXAMPLE + end + + it 'documents the simplified dynamodb attribute values' do + attr_value = StructureShape.new + attr_value.name = 'AttributeValue' + list = ListShape.new + list.member = ShapeRef.new(shape:attr_value) + map = MapShape.new + map.key = ShapeRef.new(shape:StringShape.new) + map.value = ShapeRef.new(shape:attr_value) + input = StructureShape.new + input.add_member(:list, ShapeRef.new(shape:list)) + input.add_member(:map, ShapeRef.new(shape:map)) + input.add_member(:member, ShapeRef.new(shape:attr_value)) + operation.input = ShapeRef.new(shape:input) + expect(example).to match_example(<<-EXAMPLE) +resp = client.operation_name({ + list: ["value"], # accepts + map: { + "string" => "value", # accepts + }, + member: "value", # accepts +}) + EXAMPLE + end + + end + end + end +end diff --git a/aws-sdk-core/spec/aws/api/docs/response_structure_example_spec.rb b/aws-sdk-core/spec/aws/api/docs/response_structure_example_spec.rb new file mode 100644 index 00000000000..2bc789dfeeb --- /dev/null +++ b/aws-sdk-core/spec/aws/api/docs/response_structure_example_spec.rb @@ -0,0 +1,241 @@ +require 'spec_helper' + +module Aws + module Api + module Docs + + include Seahorse::Model + include Seahorse::Model::Shapes + + describe ResponseStructureExample do + + let(:operation) { Operation.new } + + let(:example) { + ResponseStructureExample.new('operation_name', operation).to_str + } + + it 'returns nil for operations without output' do + expect(example).to be(nil) + end + + it 'returns nil for operation with empty output structures' do + operation.output = ShapeRef.new(shape: StructureShape.new) + expect(example).to be(nil) + end + + it 'supports operations that accept hashes of scalars' do + struct = StructureShape.new + struct.add_member(:param_name, ShapeRef.new(shape: StringShape.new)) + struct.add_member(:other_param, ShapeRef.new(shape: StringShape.new)) + operation.output = ShapeRef.new(shape: struct) + expect(example).to match_example(<<-EXAMPLE) +resp.param_name #=> String +resp.other_param #=> String + EXAMPLE + end + + it 'comments on accepted values for enums' do + string = StringShape.new + string.name = 'TableName' + string.enum = %w(abc mno xyz) + struct = StructureShape.new + struct.add_member(:value, ShapeRef.new(shape: string)) + operation.output = ShapeRef.new(shape: struct) + expect(example).to match_example(<<-EXAMPLE) +resp.value #=> String, one of "abc", "mno", "xyz" + EXAMPLE + end + + it 'supports nested structures' do + nested = StructureShape.new + nested.add_member(:value, ShapeRef.new(shape: StringShape.new)) + output = StructureShape.new + output.add_member(:nested, ShapeRef.new(shape: nested)) + operation.output = ShapeRef.new(shape: output) + expect(example).to match_example(<<-EXAMPLE) +resp.nested.value #=> String + EXAMPLE + end + + it 'supports recursive structures' do + struct = StructureShape.new + struct.name = 'RecursiveData' + struct.add_member(:value, ShapeRef.new(shape: StringShape.new)) + struct.add_member(:nested, ShapeRef.new(shape: struct)) + operation.output = ShapeRef.new(shape: struct) + expect(example).to match_example(<<-EXAMPLE) +resp.value #=> String +resp.nested #=> Types::RecursiveData + EXAMPLE + end + + it 'supports lists of scalars' do + list = ListShape.new + list.member = ShapeRef.new(shape: StringShape.new) + output = StructureShape.new + output.add_member(:items, ShapeRef.new(shape: list)) + operation.output = ShapeRef.new(shape: output) + expect(example).to match_example(<<-EXAMPLE) +resp.items #=> Array +resp.items[0] #=> String + EXAMPLE + end + + it 'supports lists of structures' do + struct = StructureShape.new + struct.add_member(:value, ShapeRef.new(shape: StringShape.new)) + struct.add_member(:count, ShapeRef.new(shape: IntegerShape.new)) + list = ListShape.new + list.member = ShapeRef.new(shape: struct) + output = StructureShape.new + output.add_member(:items, ShapeRef.new(shape: list, required: true)) + operation.output = ShapeRef.new(shape: output) + expect(example).to match_example(<<-EXAMPLE) +resp.items #=> Array +resp.items[0].value #=> String +resp.items[0].count #=> Integer + EXAMPLE + end + + it 'supports lists of scalar maps' do + map = MapShape.new + map.key = ShapeRef.new(shape:StringShape.new.tap{|s|s.name="TableName"}) + map.value = ShapeRef.new(shape:StringShape.new) + list = ListShape.new + list.member = ShapeRef.new(shape: map) + output = StructureShape.new + output.add_member(:items, ShapeRef.new(shape: list, required: true)) + operation.output = ShapeRef.new(shape: output) + expect(example).to match_example(<<-EXAMPLE) +resp.items #=> Array +resp.items[0] #=> Hash +resp.items[0]["TableName"] #=> String + EXAMPLE + end + + it 'supports lists of complex maps' do + struct = StructureShape.new + struct.add_member(:value, ShapeRef.new(shape: StringShape.new)) + struct.add_member(:count, ShapeRef.new(shape: IntegerShape.new)) + map = MapShape.new + map.key = ShapeRef.new(shape:StringShape.new.tap{|s|s.name="TableName"}) + map.value = ShapeRef.new(shape:struct) + list = ListShape.new + list.member = ShapeRef.new(shape: map) + output = StructureShape.new + output.add_member(:items, ShapeRef.new(shape: list, required: true)) + operation.output = ShapeRef.new(shape: output) + expect(example).to match_example(<<-EXAMPLE) +resp.items #=> Array +resp.items[0] #=> Hash +resp.items[0]["TableName"].value #=> String +resp.items[0]["TableName"].count #=> Integer + EXAMPLE + end + + it 'supports maps of scalars' do + key = StringShape.new + key.name = 'KeyName' + value = StringShape.new + value.name = 'ValueName' + map = MapShape.new + map.key = ShapeRef.new(shape: key) + map.value = ShapeRef.new(shape: value) + output = StructureShape.new + output.add_member(:attributes, ShapeRef.new(shape: map)) + operation.output = ShapeRef.new(shape: output) + expect(example).to match_example(<<-EXAMPLE) +resp.attributes #=> Hash +resp.attributes["KeyName"] #=> String + EXAMPLE + end + + it 'supports maps of structures' do + key = StringShape.new + key.name = 'KeyName' + value = StructureShape.new + value.add_member(:name, ShapeRef.new(shape:StringShape.new)) + value.add_member(:value, ShapeRef.new(shape:StringShape.new)) + map = MapShape.new + map.key = ShapeRef.new(shape: key) + map.value = ShapeRef.new(shape: value) + output = StructureShape.new + output.add_member(:attributes, ShapeRef.new(shape: map)) + operation.output = ShapeRef.new(shape: output) + expect(example).to match_example(<<-EXAMPLE) +resp.attributes #=> Hash +resp.attributes["KeyName"].name #=> String +resp.attributes["KeyName"].value #=> String + EXAMPLE + end + + it 'supports maps of lists' do + key = StringShape.new + key.name = 'KeyName' + value = ListShape.new + value.member = ShapeRef.new(shape:StringShape.new) + map = MapShape.new + map.key = ShapeRef.new(shape: key) + map.value = ShapeRef.new(shape: value) + output = StructureShape.new + output.add_member(:attributes, ShapeRef.new(shape: map)) + operation.output = ShapeRef.new(shape: output) + expect(example).to match_example(<<-EXAMPLE) +resp.attributes #=> Hash +resp.attributes["KeyName"] #=> Array +resp.attributes["KeyName"][0] #=> String + EXAMPLE + end + + it 'supports complex structures' do + shapes = ShapeMap.new(ApiHelper.sample_shapes) + operation.output = shapes.shape_ref('shape' => 'StructureShape') + expect(example).to match_example(<<-EXAMPLE) +resp.nested #=> Types::StructureShape +resp.nested_list #=> Array +resp.nested_list[0] #=> Types::StructureShape +resp.nested_map #=> Hash +resp.nested_map["StringShape"] #=> Types::StructureShape +resp.number_list #=> Array +resp.number_list[0] #=> Integer +resp.string_map #=> Hash +resp.string_map["StringShape"] #=> String +resp.blob #=> IO +resp.byte #=> String +resp.boolean #=> true/false +resp.character #=> String +resp.double #=> Float +resp.float #=> Float +resp.integer #=> Integer +resp.long #=> Integer +resp.string #=> String +resp.timestamp #=> Time + EXAMPLE + end + + it 'documents the simplified dynamodb attribute values' do + attr_value = StructureShape.new + attr_value.name = 'AttributeValue' + list = ListShape.new + list.member = ShapeRef.new(shape:attr_value) + map = MapShape.new + map.key = ShapeRef.new(shape:StringShape.new) + map.value = ShapeRef.new(shape:attr_value) + attr_value.add_member(:list, ShapeRef.new(shape:list)) + attr_value.add_member(:map, ShapeRef.new(shape:map)) + attr_value.add_member(:member, ShapeRef.new(shape:attr_value)) + operation.output = ShapeRef.new(shape:attr_value) + expect(example).to match_example(<<-EXAMPLE) +resp.list #=> Array +resp.list[0] #=> Types::AttributeValue +resp.map #=> Hash +resp.map["string"] #=> Types::AttributeValue +resp.member #=> Types::AttributeValue + EXAMPLE + end + + end + end + end +end diff --git a/aws-sdk-core/spec/spec_helper.rb b/aws-sdk-core/spec/spec_helper.rb index 716d6c42bf9..25ede67e4f4 100644 --- a/aws-sdk-core/spec/spec_helper.rb +++ b/aws-sdk-core/spec/spec_helper.rb @@ -27,6 +27,23 @@ end end +RSpec::Matchers.define :match_example do |expected| + match do |actual| + actual.to_s.strip == expected.to_s.strip + end + failure_message do |actual| + <<-MSG +expected: + +#{expected.to_s.strip} + +got: + +#{actual.to_s.strip} + MSG + end +end + # Simply returns the request context without any http response info. class NoSendHandler < Seahorse::Client::Handler def call(context) diff --git a/doc-src/templates/default/fulldoc/html/css/common.css b/doc-src/templates/default/fulldoc/html/css/common.css index 8bfba2d4cfb..df4afa91c1c 100644 --- a/doc-src/templates/default/fulldoc/html/css/common.css +++ b/doc-src/templates/default/fulldoc/html/css/common.css @@ -97,3 +97,7 @@ ul.tabs li.active { pre.code .label { color: #C5060B; } + +pre.code .identifier { + color: #55F; +} From ec44a6964eaa8f01fd6ccf3badd31448fcb30078 Mon Sep 17 00:00:00 2001 From: Trevor Rowe Date: Wed, 20 May 2015 18:10:59 -0700 Subject: [PATCH 064/101] Documenting input structure types for input. API Structure types used as input now feature document on their structure as a vanilla Hash on their class page. --- .../lib/aws-sdk-core/api/docs/builder.rb | 2 +- .../api/docs/client_type_documenter.rb | 58 ++++++++++++++++++- .../api/docs/request_syntax_example.rb | 13 +++-- .../default/fulldoc/html/css/common.css | 4 -- 4 files changed, 65 insertions(+), 12 deletions(-) diff --git a/aws-sdk-core/lib/aws-sdk-core/api/docs/builder.rb b/aws-sdk-core/lib/aws-sdk-core/api/docs/builder.rb index 29609a3df34..afe53fa1dd6 100644 --- a/aws-sdk-core/lib/aws-sdk-core/api/docs/builder.rb +++ b/aws-sdk-core/lib/aws-sdk-core/api/docs/builder.rb @@ -84,7 +84,7 @@ def document_types namespace = YARD::CodeObjects::ModuleObject.new(@namespace, 'Types') documenter = ClientTypeDocumenter.new(namespace) @api.metadata['shapes'].each_structure do |shape| - documenter.document(shape) + documenter.document(@api, shape) end end diff --git a/aws-sdk-core/lib/aws-sdk-core/api/docs/client_type_documenter.rb b/aws-sdk-core/lib/aws-sdk-core/api/docs/client_type_documenter.rb index 1b867b640d7..1e5b0aece93 100644 --- a/aws-sdk-core/lib/aws-sdk-core/api/docs/client_type_documenter.rb +++ b/aws-sdk-core/lib/aws-sdk-core/api/docs/client_type_documenter.rb @@ -4,17 +4,23 @@ module Docs class ClientTypeDocumenter include Utils + include Seahorse::Model + include Seahorse::Model::Shapes # @param [Yard::CodeObjects::Base] namespace def initialize(namespace) @namespace = namespace end + # @param [Seahorse::Model::Api] api # @param [Seahorse::Model::Shapes::StructureShape] shape - def document(shape) + def document(api, shape) yard_class = YARD::CodeObjects::ClassObject.new(@namespace, shape.name) yard_class.superclass = 'Struct' yard_class.docstring = shape.documentation + tags(api, shape).each do |tag| + yard_class.add_tag(tag) + end shape.members.each do |member_name, ref| document_struct_member(yard_class, member_name, ref) end @@ -22,6 +28,56 @@ def document(shape) private + def tags(api, shape) + tags = [] + tags << input_example_tag(api, shape) if input_shape?(api, shape) + tags += see_also_tags(api, shape) + tags + end + + # Returns `true` if the given shape is ever used as input in the api. + def input_shape?(haystack, needle, stack = []) + if stack.include?(haystack) + return false + else + stack += [haystack] + end + case haystack + when needle + return true + when Seahorse::Model::Api + haystack.operations.each do |_, operation| + if operation.input && input_shape?(operation.input.shape, needle, stack) + return true + end + end + when StructureShape + haystack.members.each do |_, member_ref| + if input_shape?(member_ref.shape, needle, stack) + return true + end + end + when ListShape + return input_shape?(haystack.member.shape, needle, stack) + when MapShape + return input_shape?(haystack.value.shape, needle, stack) + end + false + end + + def input_example_tag(api, shape) + example = RequestSyntaxExample.new('', Operation.new) + example = example.params(ShapeRef.new(shape: shape)) + note = "@note When passing #{shape.name} as input to an #{Client} " + note << "method, you can use a\n vanilla Hash:\n\n " + note << example.lines.join(" ") + tag(note) + end + + def see_also_tags(api, shape) + [] + end + def document_struct_member(yard_class, member_name, ref) m = YARD::CodeObjects::MethodObject.new(yard_class, member_name) m.scope = :instance diff --git a/aws-sdk-core/lib/aws-sdk-core/api/docs/request_syntax_example.rb b/aws-sdk-core/lib/aws-sdk-core/api/docs/request_syntax_example.rb index 6cf59605a49..b63066ecb9d 100644 --- a/aws-sdk-core/lib/aws-sdk-core/api/docs/request_syntax_example.rb +++ b/aws-sdk-core/lib/aws-sdk-core/api/docs/request_syntax_example.rb @@ -19,15 +19,16 @@ def initialize(method_name, operation) end def to_str - "resp = client.#{@method_name}(#{params})" - end - - def params if @operation.input - ref_value(@operation.input, '', []) + params_string = params(@operation.input) else - '' + params_string = '' end + "resp = client.#{@method_name}(#{params_string})" + end + + def params(shape_ref) + ref_value(shape_ref, '', []) end private diff --git a/doc-src/templates/default/fulldoc/html/css/common.css b/doc-src/templates/default/fulldoc/html/css/common.css index df4afa91c1c..8bfba2d4cfb 100644 --- a/doc-src/templates/default/fulldoc/html/css/common.css +++ b/doc-src/templates/default/fulldoc/html/css/common.css @@ -97,7 +97,3 @@ ul.tabs li.active { pre.code .label { color: #C5060B; } - -pre.code .identifier { - color: #55F; -} From 7e907542ca659a3a65cf917ee712490b7dbbe54e Mon Sep 17 00:00:00 2001 From: Trevor Rowe Date: Wed, 20 May 2015 20:27:55 -0700 Subject: [PATCH 065/101] Fixed a bug in the documentaiton of client type enum values. --- .../aws-sdk-core/api/docs/client_type_documenter.rb | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/aws-sdk-core/lib/aws-sdk-core/api/docs/client_type_documenter.rb b/aws-sdk-core/lib/aws-sdk-core/api/docs/client_type_documenter.rb index 1e5b0aece93..bc23b798c02 100644 --- a/aws-sdk-core/lib/aws-sdk-core/api/docs/client_type_documenter.rb +++ b/aws-sdk-core/lib/aws-sdk-core/api/docs/client_type_documenter.rb @@ -81,20 +81,23 @@ def see_also_tags(api, shape) def document_struct_member(yard_class, member_name, ref) m = YARD::CodeObjects::MethodObject.new(yard_class, member_name) m.scope = :instance - m.docstring = ref.documentation + m.docstring = docstring(ref.documentation, ref) returns = "@return [#{output_type(ref)}] #{summary(ref.documentation)}" m.add_tag(tag(returns)) yard_class.instance_attributes[member_name] = { :read => m, :write => m } - document_possible_values(m, ref) end - def document_possible_values(m, ref) + def docstring(docs, ref) if Seahorse::Model::Shapes::StringShape === ref.shape && ref.shape.enum then - values = ref.shape.enum.map { |v| "\n * `#{v}`" }.join - m.docstring += "\nPossible values:\n#{values}" + docs = "#{docs}

Possible values:

    " + docs += ref.shape.enum.map { |v| "
  • #{v}
    • " }.join + docs += "
" + docs + else + docs end end From 8aad139a371448cd396e6f3e0e7dbc9d8a6d14b9 Mon Sep 17 00:00:00 2001 From: Trevor Rowe Date: Wed, 20 May 2015 22:45:12 -0700 Subject: [PATCH 066/101] Improved resource operaiton option documentaiton. Now sourcing the options tags from the called client methods for the resource actions, filtering out the provided params. --- .../api/docs/operation_documenter.rb | 2 +- .../documenter/base_operation_documenter.rb | 18 +++++++----------- 2 files changed, 8 insertions(+), 12 deletions(-) diff --git a/aws-sdk-core/lib/aws-sdk-core/api/docs/operation_documenter.rb b/aws-sdk-core/lib/aws-sdk-core/api/docs/operation_documenter.rb index 3c09eca6ed8..0458c1603ab 100644 --- a/aws-sdk-core/lib/aws-sdk-core/api/docs/operation_documenter.rb +++ b/aws-sdk-core/lib/aws-sdk-core/api/docs/operation_documenter.rb @@ -9,7 +9,7 @@ class OperationDocumenter # @param [YARD::CodeObject::Base] namespace def initialize(namespace) @namespace = namespace - @optname = 'params' + @optname = 'options' end # @param [Symbol] method_name diff --git a/aws-sdk-resources/lib/aws-sdk-resources/documenter/base_operation_documenter.rb b/aws-sdk-resources/lib/aws-sdk-resources/documenter/base_operation_documenter.rb index c5678785182..46c12b0f6cd 100644 --- a/aws-sdk-resources/lib/aws-sdk-resources/documenter/base_operation_documenter.rb +++ b/aws-sdk-resources/lib/aws-sdk-resources/documenter/base_operation_documenter.rb @@ -133,19 +133,15 @@ def example_tags def option_tags if api_request && api_request.input tags = [] - required = api_request.input.shape.required - members = api_request.input.shape.members - members = members.sort_by { |name,_| required.include?(name) ? 0 : 1 } - members.each do |member_name, member_ref| - if api_request_params.any? { |p| p.target.match(/^#{member_name}\b/) } - next + m = "#{@resource_class.client_class.name}##{api_request_name}" + YARD::Registry[m].tags.each do |tag| + if YARD::Tags::OptionTag === tag + name = tag.pair.name[1..-1] + next if api_request_params.any? { |p| p.target.match(/^#{name}\b/) } + tags << tag end - docstring = docs(member_ref) - req = ' **`required`** — ' if required.include?(member_name) - tags << "@option options [#{param_type(member_ref)}] :#{member_name} #{req}#{docstring}" end - tags = tags.join("\n") - YARD::DocstringParser.new.parse(tags).to_docstring.tags + tags else [] end From d4db5272819f8c118dfbb7a66647633710508623 Mon Sep 17 00:00:00 2001 From: Trevor Rowe Date: Thu, 21 May 2015 00:18:43 -0700 Subject: [PATCH 067/101] Various resource documentation improvements. --- .../lib/aws-sdk-core/api/docs/utils.rb | 2 +- .../documenter/base_operation_documenter.rb | 26 ++-------- .../documenter/data_operation_documenter.rb | 32 ++---------- .../has_many_operation_documenter.rb | 34 ++++++------- .../documenter/has_operation_documenter.rb | 51 ++----------------- .../documenter/operation_documenter.rb | 33 ++---------- .../resource_operation_documenter.rb | 20 ++------ .../documenter/waiter_operation_documenter.rb | 4 +- doc-src/plugins/resources.rb | 2 +- 9 files changed, 42 insertions(+), 162 deletions(-) diff --git a/aws-sdk-core/lib/aws-sdk-core/api/docs/utils.rb b/aws-sdk-core/lib/aws-sdk-core/api/docs/utils.rb index 8e054f818ae..9684a7e4cc8 100644 --- a/aws-sdk-core/lib/aws-sdk-core/api/docs/utils.rb +++ b/aws-sdk-core/lib/aws-sdk-core/api/docs/utils.rb @@ -29,7 +29,7 @@ def output_type(ref, link = false) when MapShape "Hash" when BlobShape - ref.location == 'body' ? 'StringIO' : 'String' + ref[:streaming] ? 'IO,File' when BooleanShape then 'Boolean' when FloatShape then 'Float' when IntegerShape then 'Integer' diff --git a/aws-sdk-resources/lib/aws-sdk-resources/documenter/base_operation_documenter.rb b/aws-sdk-resources/lib/aws-sdk-resources/documenter/base_operation_documenter.rb index 46c12b0f6cd..9758ba845a5 100644 --- a/aws-sdk-resources/lib/aws-sdk-resources/documenter/base_operation_documenter.rb +++ b/aws-sdk-resources/lib/aws-sdk-resources/documenter/base_operation_documenter.rb @@ -3,6 +3,7 @@ module Resources class Documenter class BaseOperationDocumenter + include Api::Docs::Utils include Seahorse::Model::Shapes def initialize(yard_class, resource_class, operation_name, operation) @@ -18,6 +19,8 @@ def initialize(yard_class, resource_class, operation_name, operation) @api_request_params = @operation.request.params @request_operation_name = @operation.request.method_name.to_s @called_operation = "Client##{@api_request_name}" + @yard_client_operation = YARD::Registry["#{@resource_class.client_class.name}##{api_request_name}"] + end if @operation.respond_to?(:builder) @builder = @operation.builder @@ -133,8 +136,7 @@ def example_tags def option_tags if api_request && api_request.input tags = [] - m = "#{@resource_class.client_class.name}##{api_request_name}" - YARD::Registry[m].tags.each do |tag| + @yard_client_operation.tags.each do |tag| if YARD::Tags::OptionTag === tag name = tag.pair.name[1..-1] next if api_request_params.any? { |p| p.target.match(/^#{name}\b/) } @@ -176,26 +178,6 @@ def related_resource_operation_tags YARD::DocstringParser.new.parse(tags.sort.join("\n")).to_docstring.tags end - def return_tag - if return_type == ['void'] && return_message.strip.empty? - nil - else - YARD::Tags::Tag.new(:return, return_message, return_type) - end - end - - # The response object type for the @return tag. This must be overridden - # in sub-classes. - def return_type - raise NotImplementedError - end - - # The message portion of the @return tag for this operation. This must - # be overidden in sub-classes. - def return_message - raise NotImplementedError - end - # Returns a suitable variable name for the resource class being # documented: # diff --git a/aws-sdk-resources/lib/aws-sdk-resources/documenter/data_operation_documenter.rb b/aws-sdk-resources/lib/aws-sdk-resources/documenter/data_operation_documenter.rb index aa768844a5a..5c984d420e6 100644 --- a/aws-sdk-resources/lib/aws-sdk-resources/documenter/data_operation_documenter.rb +++ b/aws-sdk-resources/lib/aws-sdk-resources/documenter/data_operation_documenter.rb @@ -3,44 +3,22 @@ module Resources class Documenter class DataOperationDocumenter < BaseOperationDocumenter - def docstring + def return_type if plural? - super + " Calls {#{called_operation}}, returning an array of {#{path_type}} objects." + "Array<#{path_type}>" else - super + " Calls {#{called_operation}}, returning a #{return_type.first}." + path_type end end - def return_message - if plural? && structure? - "an array of {Structure structures} with the following memers:\n" + data_members - elsif structure? - "a {Structure} with the following members:\n" + data_members - else - '' - end - end - - def data_members - "\n" + path_shape.member_names.map{ |n| "\n* `#{n}`" }.join("\n") - end - - def return_type - if plural? - ["Array<#{path_type}>"] - else - [path_type] - end + def return_tag + tag("@return [#{return_type}]") end def plural? !!@operation.path.match(/\[/) end - def structure? - Seahorse::Model::Shapes::Structure === path_shape - end - end end end diff --git a/aws-sdk-resources/lib/aws-sdk-resources/documenter/has_many_operation_documenter.rb b/aws-sdk-resources/lib/aws-sdk-resources/documenter/has_many_operation_documenter.rb index 4d1bd29a3a7..eb3fe45652e 100644 --- a/aws-sdk-resources/lib/aws-sdk-resources/documenter/has_many_operation_documenter.rb +++ b/aws-sdk-resources/lib/aws-sdk-resources/documenter/has_many_operation_documenter.rb @@ -8,50 +8,46 @@ def docstring Returns a {Resources::Collection Collection} of {#{target_resource_class_name}} resources. No API requests are made until you call an enumerable method on the collection. {#{called_operation}} will be called multiple times until every -{#{target_resource_class_name}} has been yielded. +{#{target_resource_class_name}} has been yielded. DOCSTRING end - def return_type - ["Collection<#{target_resource_class_name}>"] - end - - def return_message - "a {Aws::Resources::Collection Collection} of {#{target_resource_class_name}} resource objects." + def return_tag + tag("@return [Collection<#{target_resource_class_name}>]") end def example_tags tags = [] - tags << enumerate_example - tags << enumerate_with_limit_example - tags << batch_examples if target_resource_batches? - YARD::DocstringParser.new.parse(tags.join("\n")).to_docstring.tags + tags << enumerate_example_tag + tags << enumerate_with_limit_example_tag + tags << batch_examples_tag if target_resource_batches? + tags end - def enumerate_example - return <"] + type = "Array<#{target_resource_class_name}>" else - type = [target_resource_class_name] - end - type << 'nil' if can_return_nil? - type - end - - def return_message - if can_return_nil? - "Returns a {#{target_resource_class_name}} resource, or `nil` " + - "if `#data.#{data_member_source}` is `nil`." - else - "Returns a {#{target_resource_class_name}} resource." + type = target_resource_class_name end + type += ',nil' if can_return_nil? + tag("@return [#{type}]") end def parameters @@ -85,10 +48,6 @@ def data_member builder.sources.find { |s| BuilderSources::DataMember === s } end - def data_member_source - data_member.source - end - def argument_name argument = builder.sources.find do |source| BuilderSources::Argument === source diff --git a/aws-sdk-resources/lib/aws-sdk-resources/documenter/operation_documenter.rb b/aws-sdk-resources/lib/aws-sdk-resources/documenter/operation_documenter.rb index 9b2c9dc3d02..843f51522a6 100644 --- a/aws-sdk-resources/lib/aws-sdk-resources/documenter/operation_documenter.rb +++ b/aws-sdk-resources/lib/aws-sdk-resources/documenter/operation_documenter.rb @@ -4,37 +4,14 @@ class Documenter class OperationDocumenter < BaseOperationDocumenter def docstring - super + " #{return_base_message}" + @api_request.documentation end - def return_type - if returns_data_members - ['Structure'] - else - ['void'] - end - end - - def return_message - "#{return_base_message} #{returns_data_members}" - end - - def return_base_message - if returns_data_members - "Calls {#{called_operation}}, returning its reponse." - end - end - - def returns_data_members - if response_shape && response_shape.member_names.count > 0 - msg = "The response data has following properties:\n" - response_shape.member_names.each do |name| - msg << "\n* `#{name}`" - end - msg - else - nil + def return_tag + @yard_client_operation.tags.each do |tag| + return tag if tag.tag_name == 'return' end + nil end end diff --git a/aws-sdk-resources/lib/aws-sdk-resources/documenter/resource_operation_documenter.rb b/aws-sdk-resources/lib/aws-sdk-resources/documenter/resource_operation_documenter.rb index e0fe9f12ee2..81e87f4064a 100644 --- a/aws-sdk-resources/lib/aws-sdk-resources/documenter/resource_operation_documenter.rb +++ b/aws-sdk-resources/lib/aws-sdk-resources/documenter/resource_operation_documenter.rb @@ -8,30 +8,18 @@ def initialize(*args) @plural = @operation.builder.plural? end - # @return [Boolean] Returns `true` if this operation returns an + # @return [Boolean] Returns `true` if this operation returns an # array of resource objects. Returns `false` if this method returns # a single resource object. attr_reader :plural alias plural? plural - def docstring - super + ' ' "#{return_message} Calls {#{called_operation}}." - end - - def return_type - if plural? - ["Array<#{target_resource_class_name}>"] - else - [target_resource_class_name] - end - end - - def return_message + def return_tag if plural? - "Returns an array of {#{target_resource_class_name}} resources." + tag("@return [Array<#{target_resource_class_name}>]") else - "Returns a {#{target_resource_class_name}} resource." + tag("@return [#{target_resource_class_name}]") end end diff --git a/aws-sdk-resources/lib/aws-sdk-resources/documenter/waiter_operation_documenter.rb b/aws-sdk-resources/lib/aws-sdk-resources/documenter/waiter_operation_documenter.rb index aed6fc0173f..1387a6fc84b 100644 --- a/aws-sdk-resources/lib/aws-sdk-resources/documenter/waiter_operation_documenter.rb +++ b/aws-sdk-resources/lib/aws-sdk-resources/documenter/waiter_operation_documenter.rb @@ -23,8 +23,8 @@ def docstring DOCSTRING end - def return_type - [resource_class_name] + def return_tag + tag("@return [#{resource_class_name}] #{return_message}") end def return_message diff --git a/doc-src/plugins/resources.rb b/doc-src/plugins/resources.rb index f6bc22432c6..bbd4b160014 100644 --- a/doc-src/plugins/resources.rb +++ b/doc-src/plugins/resources.rb @@ -228,7 +228,7 @@ def document_exists_method(yard_class, resource_class) name = resource_class.name.split('::').last m = YARD::CodeObjects::MethodObject.new(yard_class, :exists?) m.scope = :instance - m.docstring = "@return [Boolean] Returns true if this #{name} exists. Returns `false` otherwise." + m.docstring = "@return [Boolean] Returns `true` if this #{name} exists. Returns `false` otherwise." end end From f517745701e5505b9ba40fb5c3fb9952b03a16d5 Mon Sep 17 00:00:00 2001 From: Trevor Rowe Date: Thu, 21 May 2015 12:53:55 -0700 Subject: [PATCH 068/101] Improved resource documentation surrounding response targets. Also DRY'd up some of the shared doc logic. --- aws-sdk-core/lib/aws-sdk-core.rb | 1 + .../api/docs/client_type_documenter.rb | 5 +- .../api/docs/operation_documenter.rb | 12 +- .../aws-sdk-core/api/docs/param_formatter.rb | 158 ++++++++++++++++ .../api/docs/request_syntax_example.rb | 175 +----------------- .../lib/aws-sdk-core/api/docs/utils.rb | 95 ++++++---- .../documenter/base_operation_documenter.rb | 15 +- .../has_many_operation_documenter.rb | 2 +- .../resource_operation_documenter.rb | 16 +- .../documenter/waiter_operation_documenter.rb | 4 +- 10 files changed, 252 insertions(+), 231 deletions(-) create mode 100644 aws-sdk-core/lib/aws-sdk-core/api/docs/param_formatter.rb diff --git a/aws-sdk-core/lib/aws-sdk-core.rb b/aws-sdk-core/lib/aws-sdk-core.rb index 23d1fc35300..fda16995548 100644 --- a/aws-sdk-core/lib/aws-sdk-core.rb +++ b/aws-sdk-core/lib/aws-sdk-core.rb @@ -111,6 +111,7 @@ module Docs autoload :DocstringProvider, 'aws-sdk-core/api/docs/docstring_provider' autoload :NullDocstringProvider, 'aws-sdk-core/api/docs/docstring_provider' autoload :OperationDocumenter, 'aws-sdk-core/api/docs/operation_documenter' + autoload :ParamFormatter, 'aws-sdk-core/api/docs/param_formatter' autoload :RequestSyntaxExample, 'aws-sdk-core/api/docs/request_syntax_example' autoload :ResponseStructureExample, 'aws-sdk-core/api/docs/response_structure_example' autoload :Utils, 'aws-sdk-core/api/docs/utils' diff --git a/aws-sdk-core/lib/aws-sdk-core/api/docs/client_type_documenter.rb b/aws-sdk-core/lib/aws-sdk-core/api/docs/client_type_documenter.rb index bc23b798c02..20f01b14ee3 100644 --- a/aws-sdk-core/lib/aws-sdk-core/api/docs/client_type_documenter.rb +++ b/aws-sdk-core/lib/aws-sdk-core/api/docs/client_type_documenter.rb @@ -66,11 +66,10 @@ def input_shape?(haystack, needle, stack = []) end def input_example_tag(api, shape) - example = RequestSyntaxExample.new('', Operation.new) - example = example.params(ShapeRef.new(shape: shape)) + params = ParamFormatter.new(ShapeRef.new(shape: shape)) note = "@note When passing #{shape.name} as input to an #{Client} " note << "method, you can use a\n vanilla Hash:\n\n " - note << example.lines.join(" ") + note << params.format.lines.join(" ") tag(note) end diff --git a/aws-sdk-core/lib/aws-sdk-core/api/docs/operation_documenter.rb b/aws-sdk-core/lib/aws-sdk-core/api/docs/operation_documenter.rb index 0458c1603ab..e4bddb44c2b 100644 --- a/aws-sdk-core/lib/aws-sdk-core/api/docs/operation_documenter.rb +++ b/aws-sdk-core/lib/aws-sdk-core/api/docs/operation_documenter.rb @@ -41,14 +41,10 @@ def param_tags(method_name, operation) end def option_tags(method_name, operation) - if operation.input - operation.input.shape.members.map do |name, ref| - req = ref.required ? 'required,' : '' - type = input_type(ref) - tag("@option #{@optname} [#{req}#{type}] :#{name} #{ref.documentation}") - end - else - [] + operation_input_ref(operation).shape.members.map do |name, ref| + req = ref.required ? 'required,' : '' + type = input_type(ref) + tag("@option #{@optname} [#{req}#{type}] :#{name} #{ref.documentation}") end end diff --git a/aws-sdk-core/lib/aws-sdk-core/api/docs/param_formatter.rb b/aws-sdk-core/lib/aws-sdk-core/api/docs/param_formatter.rb new file mode 100644 index 00000000000..9707417d0b5 --- /dev/null +++ b/aws-sdk-core/lib/aws-sdk-core/api/docs/param_formatter.rb @@ -0,0 +1,158 @@ +module Aws + module Api + module Docs + class ParamFormatter + + include Utils + include Seahorse::Model::Shapes + + def initialize(shape_ref) + @shape_ref = shape_ref + @recursive_shapes = compute_recursive_shapes(@shape_ref) + end + + def format + if @shape_ref + ref_value(@shape_ref, '', []) + else + '' + end + end + + private + + def ref_value(ref, i, visited) + if visited.include?(ref.shape) + return "{\n#{i} # recursive #{ref.shape.name}\n#{i}}" + else + visited = visited + [ref.shape] + end + case ref.shape + when StructureShape + if ref.shape.name == 'AttributeValue' + '"value"' + else + struct(ref, i, visited) + end + when BlobShape + if ref[:response_target] + '"/path/to/file"' + else + '"data"' + end + when ListShape then list(ref, i, visited) + when MapShape then map(ref, i, visited) + when BooleanShape then "true" + when IntegerShape then '1' + when FloatShape then '1.0' + when StringShape then string(ref) + when TimestampShape then 'Time.now' + else raise "unsupported shape #{ref.shape.class.name}" + end + end + + def struct(ref, i, visited) + lines = ['{'] + ref.shape.members.each do |member_name, member_ref| + lines << struct_member(member_name, member_ref, i, visited) + end + lines << "#{i}}" + lines.join("\n") + end + + def struct_member(member_name, member_ref, i, visited) + entry = "#{i} #{member_name}: #{ref_value(member_ref, i + ' ', visited)}," + apply_comments(member_ref, entry) + end + + def list(ref, i, visited) + if complex?(ref.shape.member) + complex_list(ref.shape.member, i, visited) + else + scalar_list(ref.shape.member, i, visited) + end + end + + def scalar_list(ref, i, visited) + "[#{ref_value(ref, i, visited)}]" + end + + def complex_list(ref, i, visited) + "[\n#{i} #{ref_value(ref, i + ' ', visited)},\n#{i}]" + end + + def map(ref, i, visited) + key = string(ref.shape.key) + value = ref_value(ref.shape.value, i + ' ', visited) + "{\n#{i} #{key} => #{value},#{comments(ref.shape.value)}\n#{i}}" + end + + def string(ref) + if ref.shape.enum + ref.shape.enum.first.inspect + elsif ref.shape.name + ref.shape.name.inspect + else + '"string"' + end + end + + def apply_comments(ref, text) + lines = text.lines + if lines[0].match(/\n$/) + lines[0] = lines[0].sub(/\n$/, comments(ref) + "\n") + else + lines[0] += comments(ref) + end + lines.join + end + + def comments(ref) + comments = [] + if ref[:response_target] + comments << 'where to write response data, file path, or IO object' + end + if ref.required + comments << 'required' + end + if enum = enum_values(ref) + comments << "accepts #{enum.to_a.join(', ')}" + end + if ddb_av?(ref) + comments << 'accepts ' + end + comments == [] ? '' : " # #{comments.join(', ')}" + end + + def recursive?(ref) + @recursive_shapes.include?(ref.shape) + end + + def enum_values(ref) + case ref.shape + when ListShape then enum_values(ref.shape.member) + when StringShape then ref.shape.enum + else nil + end + end + + def complex?(ref) + if StructureShape === ref.shape + !ddb_av?(ref) + else + ListShape === ref.shape || MapShape === ref.shape + end + end + + def ddb_av?(ref) + case ref.shape + when ListShape then ddb_av?(ref.shape.member) + when StructureShape then ref.shape.name == 'AttributeValue' + else false + end + end + + end + end + end +end diff --git a/aws-sdk-core/lib/aws-sdk-core/api/docs/request_syntax_example.rb b/aws-sdk-core/lib/aws-sdk-core/api/docs/request_syntax_example.rb index b63066ecb9d..2ad7e8849c2 100644 --- a/aws-sdk-core/lib/aws-sdk-core/api/docs/request_syntax_example.rb +++ b/aws-sdk-core/lib/aws-sdk-core/api/docs/request_syntax_example.rb @@ -9,182 +9,11 @@ class RequestSyntaxExample def initialize(method_name, operation) @method_name = method_name @operation = operation - @streaming_output = !!( - @operation.output && - @operation.output[:payload] && - @operation.output[:payload_member]['streaming'] - ) - @recursive_shapes = Set.new - @recursive_shapes = compute_recursive_shapes(@operation.input) end def to_str - if @operation.input - params_string = params(@operation.input) - else - params_string = '' - end - "resp = client.#{@method_name}(#{params_string})" - end - - def params(shape_ref) - ref_value(shape_ref, '', []) - end - - private - - def struct(ref, i, visited) - lines = ['{'] - apply_response_target_param(ref, lines, i) - ref.shape.members.each do |member_name, member_ref| - lines << struct_member(member_name, member_ref, i, visited) - end - lines << "#{i}}" - lines.join("\n") - end - - def struct_member(member_name, member_ref, i, visited) - entry = "#{i} #{member_name}: #{ref_value(member_ref, i + ' ', visited)}," - apply_comments(member_ref, entry) - end - - def ref_value(ref, i, visited) - if visited.include?(ref.shape) - return "{\n#{i} # recursive #{ref.shape.name}\n#{i}}" - else - visited = visited + [ref.shape] - end - case ref.shape - when StructureShape - if ref.shape.name == 'AttributeValue' - '"value"' - else - struct(ref, i, visited) - end - when ListShape then list(ref, i, visited) - when MapShape then map(ref, i, visited) - when BlobShape then '"data"' - when BooleanShape then "true" - when IntegerShape then '1' - when FloatShape then '1.0' - when StringShape then string(ref) - when TimestampShape then 'Time.now' - else raise "unsupported shape #{ref.shape.class.name}" - end - end - - def list(ref, i, visited) - if scalar?(ref.shape.member) - scalar_list(ref.shape.member, i, visited) - else - complex_list(ref.shape.member, i, visited) - end - end - - def scalar_list(ref, i, visited) - "[#{ref_value(ref, i, visited)}]" - end - - def complex_list(ref, i, visited) - "[\n#{i} #{ref_value(ref, i + ' ', visited)},\n#{i}]" - end - - def map(ref, i, visited) - key = string(ref.shape.key) - value = ref_value(ref.shape.value, i + ' ', visited) - "{\n#{i} #{key} => #{value},#{comments(ref.shape.value)}\n#{i}}" - end - - def string(ref) - if ref.shape.enum - ref.shape.enum.first.inspect - elsif ref.shape.name - ref.shape.name.inspect - else - '"string"' - end - end - - def apply_response_target_param(ref, lines, i) - if @streaming_output && ref == @operation.input - lines << "#{i} response_target: '/path/to/file', # optional file path or IO object" - end - end - - def apply_comments(ref, text) - lines = text.lines - if lines[0].match(/\n$/) - lines[0] = lines[0].sub(/\n$/, comments(ref) + "\n") - else - lines[0] += comments(ref) - end - lines.join - end - - def comments(ref) - comments = [] - comments << 'required' if ref.required - if enum = enum_values(ref) - comments << "accepts #{enum.to_a.join(', ')}" - end - comments << 'accepts ' if ddb_av?(ref) - comments == [] ? '' : " # #{comments.join(', ')}" - end - - def recursive?(ref) - @recursive_shapes.include?(ref.shape) - end - - def enum_values(ref) - case ref.shape - when ListShape then enum_values(ref.shape.member) - when StringShape then ref.shape.enum - else nil - end - end - - def complex?(ref) - if StructureShape === ref.shape - !ddb_av?(ref) - else - ListShape === ref.shape || MapShape === ref.shape - end - end - - def scalar?(ref) - !complex?(ref) - end - - def ddb_av?(ref) - case ref.shape - when ListShape then ddb_av?(ref.shape.member) - when StructureShape then ref.shape.name == 'AttributeValue' - else false - end - end - - def compute_recursive_shapes(ref, visited = []) - # terminal case for recursion - if ref.nil? - return - elsif visited.include?(ref.shape) - @recursive_shapes << ref.shape - return - else - visited += [ref.shape] - end - - case ref.shape - when StructureShape - ref.shape.members.each do |_, member_ref| - compute_recursive_shapes(member_ref, visited) - end - when ListShape - compute_recursive_shapes(ref.shape.member, visited) - when MapShape - compute_recursive_shapes(ref.shape.key, visited) - compute_recursive_shapes(ref.shape.value, visited) - end + params = ParamFormatter.new(operation_input_ref(@operation)) + "resp = client.#{@method_name}(#{params.format})" end end diff --git a/aws-sdk-core/lib/aws-sdk-core/api/docs/utils.rb b/aws-sdk-core/lib/aws-sdk-core/api/docs/utils.rb index 9684a7e4cc8..69e3dff8bb7 100644 --- a/aws-sdk-core/lib/aws-sdk-core/api/docs/utils.rb +++ b/aws-sdk-core/lib/aws-sdk-core/api/docs/utils.rb @@ -11,14 +11,72 @@ def tag(string) YARD::DocstringParser.new.parse(string).to_docstring.tags.first end + def summary(string) + if string + YARD::DocstringParser.new.parse(string).to_docstring.summary + else + nil + end + end + + def operation_input_ref(operation, options = {}) + struct = StructureShape.new + + # add the response target input member if the operation is streaming + if + operation.output && + operation.output[:payload] && + operation.output[:payload_member][:streaming] + then + target = ShapeRef.new(shape: BlobShape.new) + target[:response_target] = true + target.documentation = "Specifies where to stream response data. You can provide the path where a file will be created on disk, or you can provide an IO object. If omitted, the response data will be loaded into memory and written to a StringIO object." + struct.add_member(:response_target, target) + end + + # copy existing input members + if operation.input + operation.input.shape.members.each do |member_name, member_ref| + # TODO : allow filtering members + struct.add_member(member_name, member_ref) + end + end + + ShapeRef.new(shape: struct) + end + + # Given a shape reference, this function returns a Set of all + # of the recursive shapes found in tree. + def compute_recursive_shapes(ref, stack = [], recursive = Set.new) + if ref && !stack.include?(ref.shape) + stack.push(ref.shape) + case ref.shape + when StructureShape + ref.shape.members.each do |_, member_ref| + compute_recursive_shapes(member_ref, stack, recursive) + end + when ListShape + compute_recursive_shapes(ref.shape.member, stack, recursive) + when MapShape + compute_recursive_shapes(ref.shape.value, stack, recursive) + end + stack.pop + elsif ref + recursive << ref.shape + end + recursive + end + + # Given a shape ref, returns the type accepted when given as input. def input_type(ref, link = false) if BlobShape === ref.shape - 'String,IO' + 'IO,String' else output_type(ref, link) end end + # Given a shape ref, returns the type returned in output. def output_type(ref, link = false) case ref.shape when StructureShape @@ -29,7 +87,7 @@ def output_type(ref, link = false) when MapShape "Hash" when BlobShape - ref[:streaming] ? 'IO,File' + ref[:streaming] ? 'IO,File' : 'String' when BooleanShape then 'Boolean' when FloatShape then 'Float' when IntegerShape then 'Integer' @@ -39,39 +97,6 @@ def output_type(ref, link = false) end end - def summary(string) - if string - YARD::DocstringParser.new.parse(string).to_docstring.summary - else - nil - end - end - - def compute_recursive_shapes(ref, visited = [], recursive_shapes = Set.new) - # terminal case for recursion - if ref.nil? - return recursive_shapes - elsif visited.include?(ref.shape) - recursive_shapes << ref.shape - return recursive_shapes - else - visited += [ref.shape] - end - - case ref.shape - when StructureShape - ref.shape.members.each do |_, member_ref| - compute_recursive_shapes(member_ref, visited) - end - when ListShape - compute_recursive_shapes(ref.shape.member, visited) - when MapShape - compute_recursive_shapes(ref.shape.key, visited) - compute_recursive_shapes(ref.shape.value, visited) - end - recursive_shapes - end - end end end diff --git a/aws-sdk-resources/lib/aws-sdk-resources/documenter/base_operation_documenter.rb b/aws-sdk-resources/lib/aws-sdk-resources/documenter/base_operation_documenter.rb index 9758ba845a5..b76c2a65e98 100644 --- a/aws-sdk-resources/lib/aws-sdk-resources/documenter/base_operation_documenter.rb +++ b/aws-sdk-resources/lib/aws-sdk-resources/documenter/base_operation_documenter.rb @@ -130,7 +130,20 @@ def tags # to the method code object. # @return [Array] def example_tags - [] + if api_request && api_request.input + [request_syntax_example_tag] + else + [] + end + end + + def request_syntax_example_tag + input = operation_input_ref(api_request) + params = Api::Docs::ParamFormatter.new(input).format + example = "#{variable_name}.#{operation_name}(#{params})" + example = "@example Request syntax example with placeholder values" + + "\n\n " + example.lines.join(' ') + tag(example) end def option_tags diff --git a/aws-sdk-resources/lib/aws-sdk-resources/documenter/has_many_operation_documenter.rb b/aws-sdk-resources/lib/aws-sdk-resources/documenter/has_many_operation_documenter.rb index eb3fe45652e..e29d2d80724 100644 --- a/aws-sdk-resources/lib/aws-sdk-resources/documenter/has_many_operation_documenter.rb +++ b/aws-sdk-resources/lib/aws-sdk-resources/documenter/has_many_operation_documenter.rb @@ -17,7 +17,7 @@ def return_tag end def example_tags - tags = [] + tags = super tags << enumerate_example_tag tags << enumerate_with_limit_example_tag tags << batch_examples_tag if target_resource_batches? diff --git a/aws-sdk-resources/lib/aws-sdk-resources/documenter/resource_operation_documenter.rb b/aws-sdk-resources/lib/aws-sdk-resources/documenter/resource_operation_documenter.rb index 81e87f4064a..a4f55700e8a 100644 --- a/aws-sdk-resources/lib/aws-sdk-resources/documenter/resource_operation_documenter.rb +++ b/aws-sdk-resources/lib/aws-sdk-resources/documenter/resource_operation_documenter.rb @@ -26,17 +26,17 @@ def return_tag def example_tags id = target_resource_class.identifiers.last.to_s idv = target_resource_class_name.downcase + '-' + id.gsub('_', '-') - tag = [] - tag << "@example Basic usage" - tag << " #{resp_variable} = #{variable_name}.#{operation_name}(options)" + example = [] + example << "@example Basic usage" + example << " #{resp_variable} = #{variable_name}.#{operation_name}(options)" if plural? - tag << " #{resp_variable}.map(&:#{id})" - tag << " #=> [#{idv.inspect}, ...]" + example << " #{resp_variable}.map(&:#{id})" + example << " #=> [#{idv.inspect}, ...]" else - tag << " #{resp_variable}.#{id}" - tag << " #=> #{idv.inspect}" + example << " #{resp_variable}.#{id}" + example << " #=> #{idv.inspect}" end - YARD::DocstringParser.new.parse(tag).to_docstring.tags + super + [tag(example.join("\n"))] end def resp_variable diff --git a/aws-sdk-resources/lib/aws-sdk-resources/documenter/waiter_operation_documenter.rb b/aws-sdk-resources/lib/aws-sdk-resources/documenter/waiter_operation_documenter.rb index 1387a6fc84b..9a890424443 100644 --- a/aws-sdk-resources/lib/aws-sdk-resources/documenter/waiter_operation_documenter.rb +++ b/aws-sdk-resources/lib/aws-sdk-resources/documenter/waiter_operation_documenter.rb @@ -60,7 +60,7 @@ def option_tags end def example_tags - tag = <<-EXAMPLE.strip + example = <<-EXAMPLE.strip @example Basic usage #{variable_name}.#{operation_name} @@ -72,7 +72,7 @@ def example_tags w.before_wait do { |count, prev_resp| ... } end EXAMPLE - YARD::DocstringParser.new.parse(tag).to_docstring.tags + super + [tag(example)] end end From e8b4e77271f8be50c297144f10cb5a2d70ec30fb Mon Sep 17 00:00:00 2001 From: Trevor Rowe Date: Thu, 21 May 2015 13:50:19 -0700 Subject: [PATCH 069/101] No longer documenting fixed params for resource operations. Also improved formatting of documenting input payloads for streaming operations to reflect that you can pass an IO object such as an opened file. --- .../aws-sdk-core/api/docs/param_formatter.rb | 5 +++++ .../lib/aws-sdk-core/api/docs/utils.rb | 7 +++++-- .../documenter/base_operation_documenter.rb | 19 ++++++++++++++++--- .../documenter/waiter_operation_documenter.rb | 4 ---- 4 files changed, 26 insertions(+), 9 deletions(-) diff --git a/aws-sdk-core/lib/aws-sdk-core/api/docs/param_formatter.rb b/aws-sdk-core/lib/aws-sdk-core/api/docs/param_formatter.rb index 9707417d0b5..87555cc6934 100644 --- a/aws-sdk-core/lib/aws-sdk-core/api/docs/param_formatter.rb +++ b/aws-sdk-core/lib/aws-sdk-core/api/docs/param_formatter.rb @@ -37,6 +37,8 @@ def ref_value(ref, i, visited) when BlobShape if ref[:response_target] '"/path/to/file"' + elsif ref[:streaming] + 'source_file' else '"data"' end @@ -112,6 +114,9 @@ def comments(ref) if ref[:response_target] comments << 'where to write response data, file path, or IO object' end + if ref[:streaming] + comments << 'file/IO object, or string data' + end if ref.required comments << 'required' end diff --git a/aws-sdk-core/lib/aws-sdk-core/api/docs/utils.rb b/aws-sdk-core/lib/aws-sdk-core/api/docs/utils.rb index 69e3dff8bb7..a4dd947f6f6 100644 --- a/aws-sdk-core/lib/aws-sdk-core/api/docs/utils.rb +++ b/aws-sdk-core/lib/aws-sdk-core/api/docs/utils.rb @@ -1,4 +1,5 @@ require 'set' + module Aws module Api module Docs @@ -35,10 +36,12 @@ def operation_input_ref(operation, options = {}) end # copy existing input members + skip = options[:without] || Set.new if operation.input operation.input.shape.members.each do |member_name, member_ref| - # TODO : allow filtering members - struct.add_member(member_name, member_ref) + unless skip.include?(member_name.to_s) + struct.add_member(member_name, member_ref) + end end end diff --git a/aws-sdk-resources/lib/aws-sdk-resources/documenter/base_operation_documenter.rb b/aws-sdk-resources/lib/aws-sdk-resources/documenter/base_operation_documenter.rb index b76c2a65e98..5687a4f87e3 100644 --- a/aws-sdk-resources/lib/aws-sdk-resources/documenter/base_operation_documenter.rb +++ b/aws-sdk-resources/lib/aws-sdk-resources/documenter/base_operation_documenter.rb @@ -1,3 +1,5 @@ +require 'set' + module Aws module Resources class Documenter @@ -138,7 +140,7 @@ def example_tags end def request_syntax_example_tag - input = operation_input_ref(api_request) + input = operation_input_ref(api_request, without: fixed_param_names) params = Api::Docs::ParamFormatter.new(input).format example = "#{variable_name}.#{operation_name}(#{params})" example = "@example Request syntax example with placeholder values" + @@ -148,11 +150,11 @@ def request_syntax_example_tag def option_tags if api_request && api_request.input + skip = fixed_param_names tags = [] @yard_client_operation.tags.each do |tag| if YARD::Tags::OptionTag === tag - name = tag.pair.name[1..-1] - next if api_request_params.any? { |p| p.target.match(/^#{name}\b/) } + next if skip.include?(tag.pair.name[1..-1]) # remove `:` prefix tags << tag end end @@ -162,6 +164,17 @@ def option_tags end end + # Returns a set of root input params that are provided by default + # by this operation. These params should not be documented in syntax + # examples or in option tags. + def fixed_param_names + if api_request_params + Set.new(api_request_params.map { |p| p.target.split(/\b/).first }) + else + Set.new + end + end + # If this operation makes an API request, then a `@see` tag is # returned that references the client API operation. # @return [Array] diff --git a/aws-sdk-resources/lib/aws-sdk-resources/documenter/waiter_operation_documenter.rb b/aws-sdk-resources/lib/aws-sdk-resources/documenter/waiter_operation_documenter.rb index 9a890424443..146981d4d91 100644 --- a/aws-sdk-resources/lib/aws-sdk-resources/documenter/waiter_operation_documenter.rb +++ b/aws-sdk-resources/lib/aws-sdk-resources/documenter/waiter_operation_documenter.rb @@ -47,10 +47,6 @@ def api_request @resource_class.client_class.api.operation(api_request_name) end - def api_request_params - @operation.params - end - def api_request_name waiter.poller.operation_name end From e10afd39ca4ec36afcc09282bcb817be52d9ba46 Mon Sep 17 00:00:00 2001 From: Trevor Rowe Date: Thu, 21 May 2015 14:27:53 -0700 Subject: [PATCH 070/101] Documentation test updates. --- .../aws-sdk-core/api/docs/param_formatter.rb | 2 +- .../api/docs/request_syntax_example_spec.rb | 104 ++++++++---------- 2 files changed, 49 insertions(+), 57 deletions(-) diff --git a/aws-sdk-core/lib/aws-sdk-core/api/docs/param_formatter.rb b/aws-sdk-core/lib/aws-sdk-core/api/docs/param_formatter.rb index 87555cc6934..55588441d4e 100644 --- a/aws-sdk-core/lib/aws-sdk-core/api/docs/param_formatter.rb +++ b/aws-sdk-core/lib/aws-sdk-core/api/docs/param_formatter.rb @@ -12,7 +12,7 @@ def initialize(shape_ref) end def format - if @shape_ref + if @shape_ref && @shape_ref.shape.member_names.count > 0 ref_value(@shape_ref, '', []) else '' diff --git a/aws-sdk-core/spec/aws/api/docs/request_syntax_example_spec.rb b/aws-sdk-core/spec/aws/api/docs/request_syntax_example_spec.rb index 592dd4d42bc..14571226d6a 100644 --- a/aws-sdk-core/spec/aws/api/docs/request_syntax_example_spec.rb +++ b/aws-sdk-core/spec/aws/api/docs/request_syntax_example_spec.rb @@ -88,38 +88,22 @@ module Docs EXAMPLE end - it 'documents :response_target' do - blob = BlobShape.new - blob[:streaming] = true - output = StructureShape.new - output.add_member(:data, ShapeRef.new(shape: blob)) - output[:payload] = :data - output[:payload_member] = output.member(:data) - operation.output = output - - input = StructureShape.new - input.add_member(:value, ShapeRef.new(shape: StringShape.new)) - operation.input = ShapeRef.new(shape: input) - expect(example).to match_example(<<-EXAMPLE) -resp = client.operation_name({ - response_target: '/path/to/file', # optional file path or IO object - value: "string", -}) - EXAMPLE - end - it 'supports recursive structures' do + recursive = StructureShape.new + recursive.name = 'RecursiveData' + recursive.add_member(:recursive, ShapeRef.new(shape: recursive)) + recursive.add_member(:value, ShapeRef.new(shape: StringShape.new)) input = StructureShape.new - input.name = 'RecursiveData' - input.add_member(:nested, ShapeRef.new(shape: input)) - input.add_member(:value, ShapeRef.new(shape: StringShape.new)) + input.add_member(:nested, ShapeRef.new(shape: recursive)) operation.input = ShapeRef.new(shape: input) expect(example).to match_example(<<-EXAMPLE) resp = client.operation_name({ nested: { - # recursive RecursiveData + recursive: { + # recursive RecursiveData + }, + value: "string", }, - value: "string", }) EXAMPLE end @@ -303,36 +287,40 @@ module Docs it 'supports complex structures' do shapes = ShapeMap.new(ApiHelper.sample_shapes) - operation.input = shapes.shape_ref('shape' => 'StructureShape') + input = StructureShape.new + input.add_member(:recursive, shapes.shape_ref('shape' => 'StructureShape')) + operation.input = ShapeRef.new(shape: input) expect(example).to match_example(<<-EXAMPLE) resp = client.operation_name({ - nested: { - # recursive StructureShape - }, - nested_list: [ - { + recursive: { + nested: { # recursive StructureShape }, - ], - nested_map: { - "StringShape" => { - # recursive StructureShape + nested_list: [ + { + # recursive StructureShape + }, + ], + nested_map: { + "StringShape" => { + # recursive StructureShape + }, }, + number_list: [1], + string_map: { + "StringShape" => "StringShape", + }, + blob: "data", + byte: "ByteShape", + boolean: true, + character: "CharacterShape", + double: 1.0, + float: 1.0, + integer: 1, + long: 1, + string: "StringShape", + timestamp: Time.now, }, - number_list: [1], - string_map: { - "StringShape" => "StringShape", - }, - blob: "data", - byte: "ByteShape", - boolean: true, - character: "CharacterShape", - double: 1.0, - float: 1.0, - integer: 1, - long: 1, - string: "StringShape", - timestamp: Time.now, }) EXAMPLE end @@ -345,18 +333,22 @@ module Docs map = MapShape.new map.key = ShapeRef.new(shape:StringShape.new) map.value = ShapeRef.new(shape:attr_value) + recursive = StructureShape.new + recursive.add_member(:list, ShapeRef.new(shape:list)) + recursive.add_member(:map, ShapeRef.new(shape:map)) + recursive.add_member(:member, ShapeRef.new(shape:attr_value)) input = StructureShape.new - input.add_member(:list, ShapeRef.new(shape:list)) - input.add_member(:map, ShapeRef.new(shape:map)) - input.add_member(:member, ShapeRef.new(shape:attr_value)) + input.add_member(:recursive, ShapeRef.new(shape:recursive)) operation.input = ShapeRef.new(shape:input) expect(example).to match_example(<<-EXAMPLE) resp = client.operation_name({ - list: ["value"], # accepts - map: { - "string" => "value", # accepts + recursive: { + list: ["value"], # accepts + map: { + "string" => "value", # accepts + }, + member: "value", # accepts }, - member: "value", # accepts }) EXAMPLE end From e16733ea096d8388cb7844f4ee632ea0b367437d Mon Sep 17 00:00:00 2001 From: Trevor Rowe Date: Thu, 21 May 2015 14:54:13 -0700 Subject: [PATCH 071/101] Doc improvements for resource data attributes. These now share docstring logic with the client type structures, allowing them to link to nested types. --- .../api/docs/client_type_documenter.rb | 23 ---------------- .../lib/aws-sdk-core/api/docs/utils.rb | 27 +++++++++++++++++++ doc-src/plugins/resources.rb | 22 ++------------- 3 files changed, 29 insertions(+), 43 deletions(-) diff --git a/aws-sdk-core/lib/aws-sdk-core/api/docs/client_type_documenter.rb b/aws-sdk-core/lib/aws-sdk-core/api/docs/client_type_documenter.rb index 20f01b14ee3..1613ddffc36 100644 --- a/aws-sdk-core/lib/aws-sdk-core/api/docs/client_type_documenter.rb +++ b/aws-sdk-core/lib/aws-sdk-core/api/docs/client_type_documenter.rb @@ -77,29 +77,6 @@ def see_also_tags(api, shape) [] end - def document_struct_member(yard_class, member_name, ref) - m = YARD::CodeObjects::MethodObject.new(yard_class, member_name) - m.scope = :instance - m.docstring = docstring(ref.documentation, ref) - returns = "@return [#{output_type(ref)}] #{summary(ref.documentation)}" - m.add_tag(tag(returns)) - yard_class.instance_attributes[member_name] = { :read => m, :write => m } - end - - def docstring(docs, ref) - if - Seahorse::Model::Shapes::StringShape === ref.shape && - ref.shape.enum - then - docs = "#{docs}

Possible values:

    " - docs += ref.shape.enum.map { |v| "
  • #{v}
    • " }.join - docs += "
" - docs - else - docs - end - end - end end end diff --git a/aws-sdk-core/lib/aws-sdk-core/api/docs/utils.rb b/aws-sdk-core/lib/aws-sdk-core/api/docs/utils.rb index a4dd947f6f6..b043232a246 100644 --- a/aws-sdk-core/lib/aws-sdk-core/api/docs/utils.rb +++ b/aws-sdk-core/lib/aws-sdk-core/api/docs/utils.rb @@ -100,6 +100,33 @@ def output_type(ref, link = false) end end + # Documents a structure member as a attribute method + def document_struct_member(yard_class, member_name, ref, read_write = true) + m = YARD::CodeObjects::MethodObject.new(yard_class, member_name) + m.scope = :instance + m.docstring = struct_member_docstring(ref.documentation, ref) + returns = "@return [#{output_type(ref)}] #{summary(ref.documentation)}" + m.add_tag(tag(returns)) + yard_class.instance_attributes[member_name] = read_write ? + { :read => m, :write => m } : + { :read => m } + end + + def struct_member_docstring(docs, ref) + if + Seahorse::Model::Shapes::StringShape === ref.shape && + ref.shape.enum + then + docs = "#{docs}

Possible values:

    " + docs += ref.shape.enum.map { |v| "
  • #{v}
    • " }.join + docs += "
" + docs + else + docs + end + end + + end end end diff --git a/doc-src/plugins/resources.rb b/doc-src/plugins/resources.rb index bbd4b160014..8ab022e66ae 100644 --- a/doc-src/plugins/resources.rb +++ b/doc-src/plugins/resources.rb @@ -38,6 +38,7 @@ class ResourceDocPlugin + include Aws::Api::Docs::Utils include Seahorse::Model::Shapes def apply @@ -185,27 +186,8 @@ def document_data_attribute_getters(yard_class, resource_class) shape = resource_class.client_class.api.metadata['shapes'].shape_ref('shape' => shape_name).shape resource_class.data_attributes.each do |member_name| - member_ref = shape.member(member_name) - return_type = case member_ref.shape - when BlobShape then 'String' - when BooleanShape then 'Boolean' - when FloatShape then 'Float' - when IntegerShape then 'Integer' - when ListShape then 'Array' - when MapShape then 'Hash' - when StringShape then 'String' - when StructureShape then 'Structure' - when TimestampShape then 'Time' - else raise 'unhandled type' - end - - docstring = member_ref.documentation || member_ref.shape.documentation - - m = YARD::CodeObjects::MethodObject.new(yard_class, member_name) - m.scope = :instance - m.docstring = "#{docstring}\n@return [#{return_type}] #{docstring}" - yard_class.instance_attributes[member_name] = { :read => m } + document_struct_member(yard_class, member_name, member_ref, false) end end end From 5189acc1f385c10b6ef9ff0c872946f378c83537 Mon Sep 17 00:00:00 2001 From: Trevor Rowe Date: Thu, 21 May 2015 15:39:49 -0700 Subject: [PATCH 072/101] API documentation now loads examples from disk. The examples are kept as markdown files at the following locations: examples/SVC/client/OPERATION/EXAMPLE_NAME.md --- .../lib/aws-sdk-core/api/docs/builder.rb | 28 +------------------ .../api/docs/operation_documenter.rb | 16 +++++++++-- .../01_download_an_object_to_disk.md | 12 ++++++++ .../02_download_object_into_memory.md | 6 ++++ .../03_streaming_data_to_a_block.md | 6 ++++ .../01_streaming_a_file_from_disk.md | 4 +++ 6 files changed, 42 insertions(+), 30 deletions(-) create mode 100644 examples/s3/client/get_object/01_download_an_object_to_disk.md create mode 100644 examples/s3/client/get_object/02_download_object_into_memory.md create mode 100644 examples/s3/client/get_object/03_streaming_data_to_a_block.md create mode 100644 examples/s3/client/put_object/01_streaming_a_file_from_disk.md diff --git a/aws-sdk-core/lib/aws-sdk-core/api/docs/builder.rb b/aws-sdk-core/lib/aws-sdk-core/api/docs/builder.rb index afe53fa1dd6..dcdd2ebad1f 100644 --- a/aws-sdk-core/lib/aws-sdk-core/api/docs/builder.rb +++ b/aws-sdk-core/lib/aws-sdk-core/api/docs/builder.rb @@ -141,36 +141,10 @@ def document_client_operations(namespace) end def document_client_operation(namespace, method_name, operation) - documenter = OperationDocumenter.new(namespace) + documenter = OperationDocumenter.new(@svc_name, namespace) documenter.document(method_name, operation) end - def operation_docstring(method_name, operation) - # tabs = Tabulator.new.tap do |t| - # t.tab(method_name, 'Formatting Example') do - # "
#{documentor.example}
" - # end - # t.tab(method_name, 'Request Parameters') do - # documentor.input - # end - # t.tab(method_name, 'Response Structure') do - # documentor.output - # end - # end - # - # errors = (operation.errors || []).map { |ref| ref.shape.name } - # errors = errors.map { |e| "@raise [Errors::#{e}]" }.join("\n") - # - # docstring = <<-DOCSTRING.strip - #

Calls the #{operation.name} operation.

- ##{documentor.api_ref(operation)} - ##{tabs} - #@param [Hash] params ({}) - #@return [PageableResponse] - ##{errors} - # DOCSTRING - end - def document_client_waiters(yard_class) m = YARD::CodeObjects::MethodObject.new(yard_class, :wait_until) m.scope = :instance diff --git a/aws-sdk-core/lib/aws-sdk-core/api/docs/operation_documenter.rb b/aws-sdk-core/lib/aws-sdk-core/api/docs/operation_documenter.rb index e4bddb44c2b..d7f75493724 100644 --- a/aws-sdk-core/lib/aws-sdk-core/api/docs/operation_documenter.rb +++ b/aws-sdk-core/lib/aws-sdk-core/api/docs/operation_documenter.rb @@ -6,8 +6,8 @@ class OperationDocumenter include Seahorse::Model include Utils - # @param [YARD::CodeObject::Base] namespace - def initialize(namespace) + def initialize(service_name, namespace) + @service_name = service_name @namespace = namespace @optname = 'options' end @@ -64,12 +64,22 @@ def return_tags(method_name, operation) end def example_tags(method_name, operation) - [ + examples_from_disk(method_name, operation) + [ request_syntax_example(method_name, operation), response_structure_example(method_name, operation), ].compact end + def examples_from_disk(method_name, operation) + dir = "examples/#{@service_name.downcase}/client/#{method_name}/*.md" + Dir.glob(dir).map do |path| + title = File.basename(path).split(/\./).first + title = title.sub(/^\d+_/, '').gsub(/_/, ' ') + title = title[0].upcase + title[1..-1] + tag("@example #{title}\n\n " + File.read(path).lines.join(' ')) + end + end + def request_syntax_example(method_name, operation) example = RequestSyntaxExample.new(method_name, operation).to_str parts = [] diff --git a/examples/s3/client/get_object/01_download_an_object_to_disk.md b/examples/s3/client/get_object/01_download_an_object_to_disk.md new file mode 100644 index 00000000000..b4c759981f1 --- /dev/null +++ b/examples/s3/client/get_object/01_download_an_object_to_disk.md @@ -0,0 +1,12 @@ +# stream object directly to disk +resp = s3.get_object( + response_target: '/path/to/file', + bucket: 'bucket-name', + key: 'object-key') + +# you can still access other response data +resp.metadata +#=> { ... } + +resp.etag +#=> "..." diff --git a/examples/s3/client/get_object/02_download_object_into_memory.md b/examples/s3/client/get_object/02_download_object_into_memory.md new file mode 100644 index 00000000000..4229ab669b8 --- /dev/null +++ b/examples/s3/client/get_object/02_download_object_into_memory.md @@ -0,0 +1,6 @@ +# omit :response_target to download to a StringIO in memory +resp = s3.get_object(bucket: 'bucket-name', key: 'object-key') + +# call #read or #string on the response body +resp.body.read +#=> '...' diff --git a/examples/s3/client/get_object/03_streaming_data_to_a_block.md b/examples/s3/client/get_object/03_streaming_data_to_a_block.md new file mode 100644 index 00000000000..b462b53b726 --- /dev/null +++ b/examples/s3/client/get_object/03_streaming_data_to_a_block.md @@ -0,0 +1,6 @@ +# WARNING: yielding data to a block disables retries of networking errors +File.open('/path/to/file', 'wb') do |file| + s3.get_object(bucket: 'bucket-name', key: 'object-key') do |chunk| + file.write(chunk) + end +end diff --git a/examples/s3/client/put_object/01_streaming_a_file_from_disk.md b/examples/s3/client/put_object/01_streaming_a_file_from_disk.md new file mode 100644 index 00000000000..4337fb4fe65 --- /dev/null +++ b/examples/s3/client/put_object/01_streaming_a_file_from_disk.md @@ -0,0 +1,4 @@ +# upload file from disk in a single request, may not exceed 5GB +File.open('/source/file/path', 'rb') do |file| + s3.put_object(bucket: 'bucket-name', key: 'object-key', body: file) +end From bc4ec3510b2b1b826c57bb89ccf99b7130daf05d Mon Sep 17 00:00:00 2001 From: Trevor Rowe Date: Thu, 21 May 2015 18:02:00 -0700 Subject: [PATCH 073/101] Structure types now reference methods they are returned from. --- .../api/docs/client_type_documenter.rb | 34 ++++++++++++++++--- .../lib/aws-sdk-core/api/shape_map.rb | 4 ++- .../01_download_an_object_to_disk.md | 7 ++-- 3 files changed, 35 insertions(+), 10 deletions(-) diff --git a/aws-sdk-core/lib/aws-sdk-core/api/docs/client_type_documenter.rb b/aws-sdk-core/lib/aws-sdk-core/api/docs/client_type_documenter.rb index 1613ddffc36..15c6087d304 100644 --- a/aws-sdk-core/lib/aws-sdk-core/api/docs/client_type_documenter.rb +++ b/aws-sdk-core/lib/aws-sdk-core/api/docs/client_type_documenter.rb @@ -17,7 +17,7 @@ def initialize(namespace) def document(api, shape) yard_class = YARD::CodeObjects::ClassObject.new(@namespace, shape.name) yard_class.superclass = 'Struct' - yard_class.docstring = shape.documentation + yard_class.docstring = docstring(api, shape) tags(api, shape).each do |tag| yard_class.add_tag(tag) end @@ -28,10 +28,21 @@ def document(api, shape) private + def docstring(api, shape) + docs = shape.documentation || '' + methods = returned_by(api, shape) + unless methods.empty? + docs += "

Returned by:

" + docs += "
    " + docs += methods.map{|m| "
  • {#{m}}
    • " }.join + docs += "
" + end + docs + end + def tags(api, shape) tags = [] tags << input_example_tag(api, shape) if input_shape?(api, shape) - tags += see_also_tags(api, shape) tags end @@ -73,8 +84,23 @@ def input_example_tag(api, shape) tag(note) end - def see_also_tags(api, shape) - [] + def returned_by(api, shape) + methods = [] + + api.metadata['shapes'].each_structure do |struct| + struct.members.each do |member_name, member_ref| + if member_ref.shape == shape + methods << "Types::#{struct.name}##{member_name}" + end + end + end + + api.operations.each do |operation_name, operation| + if operation.output && operation.output.shape == shape + methods << "Client##{operation_name}" + end + end + methods end end diff --git a/aws-sdk-core/lib/aws-sdk-core/api/shape_map.rb b/aws-sdk-core/lib/aws-sdk-core/api/shape_map.rb index 2e5141c2eca..ae9dcc94627 100644 --- a/aws-sdk-core/lib/aws-sdk-core/api/shape_map.rb +++ b/aws-sdk-core/lib/aws-sdk-core/api/shape_map.rb @@ -38,7 +38,9 @@ def [](shape_name) def each_structure @shapes.each do |_, shape| - yield(shape) if StructureShape === shape + if StructureShape === shape && !shape[:error] && !shape[:exception] + yield(shape) + end end end diff --git a/examples/s3/client/get_object/01_download_an_object_to_disk.md b/examples/s3/client/get_object/01_download_an_object_to_disk.md index b4c759981f1..9f8251a260c 100644 --- a/examples/s3/client/get_object/01_download_an_object_to_disk.md +++ b/examples/s3/client/get_object/01_download_an_object_to_disk.md @@ -5,8 +5,5 @@ resp = s3.get_object( key: 'object-key') # you can still access other response data -resp.metadata -#=> { ... } - -resp.etag -#=> "..." +resp.metadata #=> { ... } +resp.etag #=> "..." From edbaa68425898e8e75344968a7baaaa6308de3c6 Mon Sep 17 00:00:00 2001 From: Trevor Rowe Date: Fri, 22 May 2015 09:02:45 -0700 Subject: [PATCH 074/101] tweaked description of DynamoDB attribute values --- aws-sdk-core/lib/aws-sdk-core/api/docs/param_formatter.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/aws-sdk-core/lib/aws-sdk-core/api/docs/param_formatter.rb b/aws-sdk-core/lib/aws-sdk-core/api/docs/param_formatter.rb index 55588441d4e..dce0ece3ef8 100644 --- a/aws-sdk-core/lib/aws-sdk-core/api/docs/param_formatter.rb +++ b/aws-sdk-core/lib/aws-sdk-core/api/docs/param_formatter.rb @@ -124,7 +124,7 @@ def comments(ref) comments << "accepts #{enum.to_a.join(', ')}" end if ddb_av?(ref) - comments << 'accepts ' + comments << 'value ' end comments == [] ? '' : " # #{comments.join(', ')}" end From 7164315c2d4337c8867451e9c79e119f2dfc2808 Mon Sep 17 00:00:00 2001 From: Trevor Rowe Date: Fri, 22 May 2015 10:00:24 -0700 Subject: [PATCH 075/101] Fix for DynamoDB response structures. --- .../api/docs/response_structure_example.rb | 4 ++- .../docs/response_structure_example_spec.rb | 26 +++++++------------ 2 files changed, 13 insertions(+), 17 deletions(-) diff --git a/aws-sdk-core/lib/aws-sdk-core/api/docs/response_structure_example.rb b/aws-sdk-core/lib/aws-sdk-core/api/docs/response_structure_example.rb index 2b5955660a6..91c7f7b126f 100644 --- a/aws-sdk-core/lib/aws-sdk-core/api/docs/response_structure_example.rb +++ b/aws-sdk-core/lib/aws-sdk-core/api/docs/response_structure_example.rb @@ -50,7 +50,9 @@ def map_key(ref) end def entry(ref, context, visited) - if visited.include?(ref.shape) + if ref.shape.name == 'AttributeValue' + return ["#{context} #=> "] + elsif visited.include?(ref.shape) return ["#{context} #=> Types::#{ref.shape.name}"] else visited = visited + [ref.shape] diff --git a/aws-sdk-core/spec/aws/api/docs/response_structure_example_spec.rb b/aws-sdk-core/spec/aws/api/docs/response_structure_example_spec.rb index 2bc789dfeeb..ddfa4d1241e 100644 --- a/aws-sdk-core/spec/aws/api/docs/response_structure_example_spec.rb +++ b/aws-sdk-core/spec/aws/api/docs/response_structure_example_spec.rb @@ -215,23 +215,17 @@ module Docs end it 'documents the simplified dynamodb attribute values' do - attr_value = StructureShape.new - attr_value.name = 'AttributeValue' - list = ListShape.new - list.member = ShapeRef.new(shape:attr_value) - map = MapShape.new - map.key = ShapeRef.new(shape:StringShape.new) - map.value = ShapeRef.new(shape:attr_value) - attr_value.add_member(:list, ShapeRef.new(shape:list)) - attr_value.add_member(:map, ShapeRef.new(shape:map)) - attr_value.add_member(:member, ShapeRef.new(shape:attr_value)) - operation.output = ShapeRef.new(shape:attr_value) + operation.output = DynamoDB::Client.api.operation(:get_item).output expect(example).to match_example(<<-EXAMPLE) -resp.list #=> Array -resp.list[0] #=> Types::AttributeValue -resp.map #=> Hash -resp.map["string"] #=> Types::AttributeValue -resp.member #=> Types::AttributeValue +resp.item #=> Hash +resp.item["AttributeName"] #=> +resp.consumed_capacity.table_name #=> String +resp.consumed_capacity.capacity_units #=> Float +resp.consumed_capacity.table.capacity_units #=> Float +resp.consumed_capacity.local_secondary_indexes #=> Hash +resp.consumed_capacity.local_secondary_indexes["IndexName"].capacity_units #=> Float +resp.consumed_capacity.global_secondary_indexes #=> Hash +resp.consumed_capacity.global_secondary_indexes["IndexName"].capacity_units #=> Float EXAMPLE end From 99f63ef57ecf297a023e73ca0f606645f3cda2bc Mon Sep 17 00:00:00 2001 From: Trevor Rowe Date: Fri, 22 May 2015 13:33:57 -0700 Subject: [PATCH 076/101] Verbage update. --- .../spec/aws/api/docs/request_syntax_example_spec.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/aws-sdk-core/spec/aws/api/docs/request_syntax_example_spec.rb b/aws-sdk-core/spec/aws/api/docs/request_syntax_example_spec.rb index 14571226d6a..f4595130ab5 100644 --- a/aws-sdk-core/spec/aws/api/docs/request_syntax_example_spec.rb +++ b/aws-sdk-core/spec/aws/api/docs/request_syntax_example_spec.rb @@ -343,11 +343,11 @@ module Docs expect(example).to match_example(<<-EXAMPLE) resp = client.operation_name({ recursive: { - list: ["value"], # accepts + list: ["value"], # value map: { - "string" => "value", # accepts + "string" => "value", # value }, - member: "value", # accepts + member: "value", # value }, }) EXAMPLE From c6b47c5593c3e85f9b45c468867f2e23e9473f28 Mon Sep 17 00:00:00 2001 From: Trevor Rowe Date: Tue, 26 May 2015 23:44:08 -0700 Subject: [PATCH 077/101] Refactor of all protocol plugins. The AWS protocols no longer reply on the restful bindings plugin or the logic of the endpoint plugin. These have been replaced by logic in the `Aws::Rest` module. --- aws-sdk-core/lib/aws-sdk-core.rb | 30 ++++++- .../lib/aws-sdk-core/api/shape_map.rb | 8 +- aws-sdk-core/lib/aws-sdk-core/client.rb | 1 - aws-sdk-core/lib/aws-sdk-core/json.rb | 5 +- aws-sdk-core/lib/aws-sdk-core/json/builder.rb | 1 + aws-sdk-core/lib/aws-sdk-core/json/handler.rb | 67 ++++++++++++++ .../lib/aws-sdk-core/json/rest_handler.rb | 15 ---- .../lib/aws-sdk-core/json/rpc_body_handler.rb | 38 -------- .../aws-sdk-core/json/rpc_headers_handler.rb | 34 ------- .../aws-sdk-core/json/simple_body_handler.rb | 34 ------- .../plugins/protocols/json_rpc.rb | 10 +-- .../plugins/protocols/rest_json.rb | 3 +- .../plugins/protocols/rest_xml.rb | 2 +- .../lib/aws-sdk-core/query/handler.rb | 1 + aws-sdk-core/lib/aws-sdk-core/rest/handler.rb | 22 +++++ .../lib/aws-sdk-core/rest/request/body.rb | 58 ++++++++++++ .../lib/aws-sdk-core/rest/request/builder.rb | 50 +++++++++++ .../lib/aws-sdk-core/rest/request/endpoint.rb | 70 +++++++++++++++ .../lib/aws-sdk-core/rest/request/headers.rb | 48 ++++++++++ .../lib/aws-sdk-core/rest/response/body.rb | 43 +++++++++ .../lib/aws-sdk-core/rest/response/headers.rb | 60 +++++++++++++ .../lib/aws-sdk-core/rest/response/parser.rb | 47 ++++++++++ .../aws-sdk-core/rest/response/status_code.rb | 24 +++++ .../lib/aws-sdk-core/rest_body_handler.rb | 88 ------------------- .../aws-sdk-core/stubbing/protocols/ec2.rb | 36 ++++++++ .../aws-sdk-core/stubbing/protocols/json.rb | 42 +++++++++ .../aws-sdk-core/stubbing/protocols/query.rb | 36 ++++++++ .../stubbing/protocols/rest_json.rb | 12 +++ .../stubbing/protocols/rest_xml.rb | 14 +++ aws-sdk-core/lib/aws-sdk-core/xml/builder.rb | 9 +- .../lib/aws-sdk-core/xml/rest_handler.rb | 15 ---- .../lib/seahorse/client/plugins/endpoint.rb | 61 ++----------- .../client/plugins/restful_bindings.rb | 1 + aws-sdk-core/spec/aws/s3/client_spec.rb | 19 +++- aws-sdk-core/spec/protocols_spec.rb | 1 - 35 files changed, 701 insertions(+), 304 deletions(-) create mode 100644 aws-sdk-core/lib/aws-sdk-core/json/handler.rb delete mode 100644 aws-sdk-core/lib/aws-sdk-core/json/rest_handler.rb delete mode 100644 aws-sdk-core/lib/aws-sdk-core/json/rpc_body_handler.rb delete mode 100644 aws-sdk-core/lib/aws-sdk-core/json/rpc_headers_handler.rb delete mode 100644 aws-sdk-core/lib/aws-sdk-core/json/simple_body_handler.rb create mode 100644 aws-sdk-core/lib/aws-sdk-core/rest/handler.rb create mode 100644 aws-sdk-core/lib/aws-sdk-core/rest/request/body.rb create mode 100644 aws-sdk-core/lib/aws-sdk-core/rest/request/builder.rb create mode 100644 aws-sdk-core/lib/aws-sdk-core/rest/request/endpoint.rb create mode 100644 aws-sdk-core/lib/aws-sdk-core/rest/request/headers.rb create mode 100644 aws-sdk-core/lib/aws-sdk-core/rest/response/body.rb create mode 100644 aws-sdk-core/lib/aws-sdk-core/rest/response/headers.rb create mode 100644 aws-sdk-core/lib/aws-sdk-core/rest/response/parser.rb create mode 100644 aws-sdk-core/lib/aws-sdk-core/rest/response/status_code.rb delete mode 100644 aws-sdk-core/lib/aws-sdk-core/rest_body_handler.rb create mode 100644 aws-sdk-core/lib/aws-sdk-core/stubbing/protocols/ec2.rb create mode 100644 aws-sdk-core/lib/aws-sdk-core/stubbing/protocols/json.rb create mode 100644 aws-sdk-core/lib/aws-sdk-core/stubbing/protocols/query.rb create mode 100644 aws-sdk-core/lib/aws-sdk-core/stubbing/protocols/rest_json.rb create mode 100644 aws-sdk-core/lib/aws-sdk-core/stubbing/protocols/rest_xml.rb delete mode 100644 aws-sdk-core/lib/aws-sdk-core/xml/rest_handler.rb diff --git a/aws-sdk-core/lib/aws-sdk-core.rb b/aws-sdk-core/lib/aws-sdk-core.rb index fda16995548..c45060aae0d 100644 --- a/aws-sdk-core/lib/aws-sdk-core.rb +++ b/aws-sdk-core/lib/aws-sdk-core.rb @@ -92,7 +92,6 @@ module Aws autoload :Pager, 'aws-sdk-core/pager' autoload :ParamConverter, 'aws-sdk-core/param_converter' autoload :ParamValidator, 'aws-sdk-core/param_validator' - autoload :RestBodyHandler, 'aws-sdk-core/rest_body_handler' autoload :RefreshingCredentials, 'aws-sdk-core/refreshing_credentials' autoload :Service, 'aws-sdk-core/service' autoload :SharedCredentials, 'aws-sdk-core/shared_credentials' @@ -170,6 +169,23 @@ module Query autoload :ParamList, 'aws-sdk-core/query/param_list' end + # @api private + module Rest + autoload :Handler, 'aws-sdk-core/rest/handler' + module Request + autoload :Body, 'aws-sdk-core/rest/request/body' + autoload :Builder, 'aws-sdk-core/rest/request/builder' + autoload :Endpoint, 'aws-sdk-core/rest/request/endpoint' + autoload :Headers, 'aws-sdk-core/rest/request/headers' + end + module Response + autoload :Body, 'aws-sdk-core/rest/response/body' + autoload :Headers, 'aws-sdk-core/rest/response/headers' + autoload :Parser, 'aws-sdk-core/rest/response/parser' + autoload :StatusCode, 'aws-sdk-core/rest/response/status_code' + end + end + # @api private module Signers autoload :Base, 'aws-sdk-core/signers/base' @@ -180,6 +196,17 @@ module Signers autoload :V4, 'aws-sdk-core/signers/v4' end + # @api private + module Stubbing + module Protocols + autoload :EC2, 'aws-sdk-core/stubbing/protocols/ec2' + autoload :Json, 'aws-sdk-core/stubbing/protocols/json' + autoload :Query, 'aws-sdk-core/stubbing/protocols/query' + autoload :RestJson, 'aws-sdk-core/stubbing/protocols/rest_json' + autoload :RestXml, 'aws-sdk-core/stubbing/protocols/rest_xml' + end + end + module Waiters autoload :Poller, 'aws-sdk-core/waiters/poller' autoload :Errors, 'aws-sdk-core/waiters/errors' @@ -196,7 +223,6 @@ module Xml autoload :DocBuilder, 'aws-sdk-core/xml/doc_builder' autoload :ErrorHandler, 'aws-sdk-core/xml/error_handler' autoload :Parser, 'aws-sdk-core/xml/parser' - autoload :RestHandler, 'aws-sdk-core/xml/rest_handler' end class << self diff --git a/aws-sdk-core/lib/aws-sdk-core/api/shape_map.rb b/aws-sdk-core/lib/aws-sdk-core/api/shape_map.rb index ae9dcc94627..966243cc9a4 100644 --- a/aws-sdk-core/lib/aws-sdk-core/api/shape_map.rb +++ b/aws-sdk-core/lib/aws-sdk-core/api/shape_map.rb @@ -4,6 +4,12 @@ class ShapeMap include Seahorse::Model::Shapes + EMPTY_REF = begin + ref = ShapeRef.new(shape: StructureShape.new) + ref[:struct_class] = Aws::EmptyStructure + ref + end + SHAPE_CLASSES = { 'blob' => BlobShape, 'byte' => StringShape, @@ -64,7 +70,7 @@ def shape_ref(definition, options = {}) documentation: documentation, metadata: meta) else - nil + EMPTY_REF end end diff --git a/aws-sdk-core/lib/aws-sdk-core/client.rb b/aws-sdk-core/lib/aws-sdk-core/client.rb index e677dd82b02..226750c7b62 100644 --- a/aws-sdk-core/lib/aws-sdk-core/client.rb +++ b/aws-sdk-core/lib/aws-sdk-core/client.rb @@ -5,7 +5,6 @@ class Client < Seahorse::Client::Base # @api private DEFAULT_PLUGINS = [ 'Seahorse::Client::Plugins::Logging', - 'Seahorse::Client::Plugins::RestfulBindings', 'Seahorse::Client::Plugins::ContentLength', 'Aws::Plugins::ParamConverter', 'Aws::Plugins::ParamValidator', diff --git a/aws-sdk-core/lib/aws-sdk-core/json.rb b/aws-sdk-core/lib/aws-sdk-core/json.rb index 500ce86f547..34e4c11f73b 100644 --- a/aws-sdk-core/lib/aws-sdk-core/json.rb +++ b/aws-sdk-core/lib/aws-sdk-core/json.rb @@ -4,11 +4,8 @@ module Json autoload :Builder, 'aws-sdk-core/json/builder' autoload :ErrorHandler, 'aws-sdk-core/json/error_handler' + autoload :Handler, 'aws-sdk-core/json/handler' autoload :Parser, 'aws-sdk-core/json/parser' - autoload :RestHandler, 'aws-sdk-core/json/rest_handler' - autoload :RpcBodyHandler, 'aws-sdk-core/json/rpc_body_handler' - autoload :RpcHeadersHandler, 'aws-sdk-core/json/rpc_headers_handler' - autoload :SimpleBodyHandler, 'aws-sdk-core/json/simple_body_handler' class ParseError < StandardError diff --git a/aws-sdk-core/lib/aws-sdk-core/json/builder.rb b/aws-sdk-core/lib/aws-sdk-core/json/builder.rb index 9965f084ae0..3a4f0cf1f38 100644 --- a/aws-sdk-core/lib/aws-sdk-core/json/builder.rb +++ b/aws-sdk-core/lib/aws-sdk-core/json/builder.rb @@ -13,6 +13,7 @@ def initialize(rules) def to_json(params) Json.dump(format(@rules, params)) end + alias serialize to_json private diff --git a/aws-sdk-core/lib/aws-sdk-core/json/handler.rb b/aws-sdk-core/lib/aws-sdk-core/json/handler.rb new file mode 100644 index 00000000000..8f84b9c5269 --- /dev/null +++ b/aws-sdk-core/lib/aws-sdk-core/json/handler.rb @@ -0,0 +1,67 @@ +module Aws + module Json + class Handler < Seahorse::Client::Handler + + CONTENT_TYPE = 'application/x-amz-json-%s' + + # @param [Seahorse::Client::RequestContext] context + # @return [Seahorse::Client::Response] + def call(context) + build_request(context) + resp = @handler.call(context) + resp.on(200..299) { |resp| parse_response(resp) } + resp.on(200..599) { |resp| apply_request_id(context) } + resp + end + + private + + def build_request(context) + context.http_request.http_method = 'POST' + context.http_request.headers['Content-Type'] = content_type(context) + context.http_request.headers['X-Amz-Target'] = target(context) + context.http_request.body = build_body(context) + end + + def build_body(context) + if simple_json?(context) + Json.dump(context.params) + else + Builder.new(context.operation.input).serialize(context.params) + end + end + + def parse_response(response) + response.data = parse_body(response.context) + end + + def parse_body(context) + if simple_json?(context) + Json.load(context.http_response.body_contents) + else + rules = context.operation.output + json = context.http_response.body_contents + Parser.new(rules).parse(json == '' ? '{}' : json) + end + end + + def content_type(context) + CONTENT_TYPE % [context.config.api.metadata['jsonVersion']] + end + + def target(context) + prefix = context.config.api.metadata['targetPrefix'] + "#{prefix}.#{context.operation.name}" + end + + def apply_request_id(context) + context[:request_id] = context.http_response.headers['x-amzn-requestid'] + end + + def simple_json?(context) + context.config.simple_json + end + + end + end +end diff --git a/aws-sdk-core/lib/aws-sdk-core/json/rest_handler.rb b/aws-sdk-core/lib/aws-sdk-core/json/rest_handler.rb deleted file mode 100644 index 867d55801e2..00000000000 --- a/aws-sdk-core/lib/aws-sdk-core/json/rest_handler.rb +++ /dev/null @@ -1,15 +0,0 @@ -module Aws - module Json - class RestHandler < RestBodyHandler - - def serialize_params(rules, params) - Builder.new(rules).to_json(params) - end - - def parse_body(json, rules, target) - Parser.new(rules).parse(json, target) - end - - end - end -end diff --git a/aws-sdk-core/lib/aws-sdk-core/json/rpc_body_handler.rb b/aws-sdk-core/lib/aws-sdk-core/json/rpc_body_handler.rb deleted file mode 100644 index f2b369a4016..00000000000 --- a/aws-sdk-core/lib/aws-sdk-core/json/rpc_body_handler.rb +++ /dev/null @@ -1,38 +0,0 @@ -module Aws - module Json - class RpcBodyHandler < Seahorse::Client::Handler - - # @param [Seahorse::Client::RequestContext] context - # @return [Seahorse::Client::Response] - def call(context) - build_json(context) - @handler.call(context).on_success do |response| - unless response.error - response.data = parse_json(context) - end - end - end - - private - - def build_json(context) - if rules = context.operation.input - context.http_request.body = Builder.new(rules).to_json(context.params) - else - context.http_request.body = '{}' - end - end - - def parse_json(context) - if rules = context.operation.output - json = context.http_response.body_contents - json = '{}' if json == '' - Parser.new(rules).parse(json) - else - EmptyStructure.new - end - end - - end - end -end diff --git a/aws-sdk-core/lib/aws-sdk-core/json/rpc_headers_handler.rb b/aws-sdk-core/lib/aws-sdk-core/json/rpc_headers_handler.rb deleted file mode 100644 index 3449bbde0af..00000000000 --- a/aws-sdk-core/lib/aws-sdk-core/json/rpc_headers_handler.rb +++ /dev/null @@ -1,34 +0,0 @@ -module Aws - module Json - class RpcHeadersHandler < Seahorse::Client::Handler - - CONTENT_TYPE = 'application/x-amz-json-%s' - - # @param [Seahorse::Client::RequestContext] context - # @return [Seahorse::Client::Response] - def call(context) - @handler.call(add_headers(context)).on(200..599) do |resp| - context[:request_id] = context.http_response.headers['x-amzn-requestid'] - end - end - - private - - def add_headers(context) - context.http_request.headers['Content-Type'] = content_type(context) - context.http_request.headers['X-Amz-Target'] = target(context) - context - end - - def content_type(context) - CONTENT_TYPE % [context.config.api.metadata['jsonVersion']] - end - - def target(context) - prefix = context.config.api.metadata['targetPrefix'] - "#{prefix}.#{context.operation.name}" - end - - end - end -end diff --git a/aws-sdk-core/lib/aws-sdk-core/json/simple_body_handler.rb b/aws-sdk-core/lib/aws-sdk-core/json/simple_body_handler.rb deleted file mode 100644 index bbf82afe046..00000000000 --- a/aws-sdk-core/lib/aws-sdk-core/json/simple_body_handler.rb +++ /dev/null @@ -1,34 +0,0 @@ -module Aws - module Json - - # This plugin performs two trivial translations: - # - # * The request parameters are serialized as JSON for the request body - # * The response body is deserialized as JSON for the response data - # - # No attempt is made to extract errors from the HTTP response body. - # Parsing the response only happens for a successful response. - # - class SimpleBodyHandler < Seahorse::Client::Handler - - def call(context) - build_json(context) - @handler.call(context).on_success do |response| - response.error = nil - response.data = parse_json(context) - end - end - - private - - def build_json(context) - context.http_request.body = Json.dump(context.params) - end - - def parse_json(context) - Json.load(context.http_response.body_contents) - end - - end - end -end diff --git a/aws-sdk-core/lib/aws-sdk-core/plugins/protocols/json_rpc.rb b/aws-sdk-core/lib/aws-sdk-core/plugins/protocols/json_rpc.rb index b479db12430..f82c0b8daab 100644 --- a/aws-sdk-core/lib/aws-sdk-core/plugins/protocols/json_rpc.rb +++ b/aws-sdk-core/lib/aws-sdk-core/plugins/protocols/json_rpc.rb @@ -20,13 +20,9 @@ class JsonRpc < Seahorse::Client::Plugin option(:convert_params) { |config| !config.simple_json } - def add_handlers(handlers, config) - handlers.add(Json::ErrorHandler, step: :sign) - handlers.add(Json::RpcHeadersHandler) - handlers.add(config.simple_json ? - Json::SimpleBodyHandler : - Json::RpcBodyHandler) - end + handler(Json::Handler) + + handler(Json::ErrorHandler, step: :sign) end end diff --git a/aws-sdk-core/lib/aws-sdk-core/plugins/protocols/rest_json.rb b/aws-sdk-core/lib/aws-sdk-core/plugins/protocols/rest_json.rb index 83b50fb1d6d..9095809f7ab 100644 --- a/aws-sdk-core/lib/aws-sdk-core/plugins/protocols/rest_json.rb +++ b/aws-sdk-core/lib/aws-sdk-core/plugins/protocols/rest_json.rb @@ -3,8 +3,7 @@ module Plugins module Protocols class RestJson < Seahorse::Client::Plugin - handler(Json::RestHandler) - + handler(Rest::Handler) handler(Json::ErrorHandler, step: :sign) end diff --git a/aws-sdk-core/lib/aws-sdk-core/plugins/protocols/rest_xml.rb b/aws-sdk-core/lib/aws-sdk-core/plugins/protocols/rest_xml.rb index 15bd8350aba..65834bd9ea7 100644 --- a/aws-sdk-core/lib/aws-sdk-core/plugins/protocols/rest_xml.rb +++ b/aws-sdk-core/lib/aws-sdk-core/plugins/protocols/rest_xml.rb @@ -3,7 +3,7 @@ module Plugins module Protocols class RestXml < Seahorse::Client::Plugin - handler(Xml::RestHandler) + handler(Rest::Handler) handler(Xml::ErrorHandler, step: :sign) end diff --git a/aws-sdk-core/lib/aws-sdk-core/query/handler.rb b/aws-sdk-core/lib/aws-sdk-core/query/handler.rb index e15dd184bff..79468a6ba14 100644 --- a/aws-sdk-core/lib/aws-sdk-core/query/handler.rb +++ b/aws-sdk-core/lib/aws-sdk-core/query/handler.rb @@ -33,6 +33,7 @@ def call(context) private def build_request(context) + context.http_request.http_method = 'POST' context.http_request.headers['Content-Type'] = CONTENT_TYPE param_list = ParamList.new param_list.set('Version', context.config.api.version) diff --git a/aws-sdk-core/lib/aws-sdk-core/rest/handler.rb b/aws-sdk-core/lib/aws-sdk-core/rest/handler.rb new file mode 100644 index 00000000000..94445d10346 --- /dev/null +++ b/aws-sdk-core/lib/aws-sdk-core/rest/handler.rb @@ -0,0 +1,22 @@ +module Aws + module Rest + class Handler < Seahorse::Client::Handler + + def call(context) + Rest::Request::Builder.new.apply(context) + resp = @handler.call(context) + resp.on(200..299) { |response| Response::Parser.new.apply(response) } + resp.on(200..599) { |response| apply_request_id(context) } + resp + end + + private + + def apply_request_id(context) + h = context.http_response.headers + context[:request_id] = h['x-amz-request-id'] || h['x-amzn-requestid'] + end + + end + end +end diff --git a/aws-sdk-core/lib/aws-sdk-core/rest/request/body.rb b/aws-sdk-core/lib/aws-sdk-core/rest/request/body.rb new file mode 100644 index 00000000000..0d1b3871557 --- /dev/null +++ b/aws-sdk-core/lib/aws-sdk-core/rest/request/body.rb @@ -0,0 +1,58 @@ +module Aws + module Rest + module Request + class Body + + include Seahorse::Model::Shapes + + # @param [Class] serializer_class + # @param [Seahorse::Model::ShapeRef] rules + def initialize(serializer_class, rules) + @serializer_class = serializer_class + @rules = rules + end + + # @param [Seahorse::Client::Http::Request] http_req + # @param [Hash] params + def apply(http_req, params) + http_req.body = build_body(params) + end + + private + + def build_body(params) + if streaming? + params[@rules[:payload]] + elsif @rules[:payload] + params = params[@rules[:payload]] + serialize(@rules[:payload_member], params) if params + else + params = body_params(params) + serialize(@rules, params) unless params.empty? + end + end + + def streaming? + @rules[:payload] && ( + BlobShape === @rules[:payload_member].shape || + StringShape === @rules[:payload_member].shape + ) + end + + def serialize(rules, params) + @serializer_class.new(rules).serialize(params) + end + + def body_params(params) + @rules.shape.members.inject({}) do |hash, (member_name, member_ref)| + if !member_ref.location && params.key?(member_name) + hash[member_name] = params[member_name] + end + hash + end + end + + end + end + end +end diff --git a/aws-sdk-core/lib/aws-sdk-core/rest/request/builder.rb b/aws-sdk-core/lib/aws-sdk-core/rest/request/builder.rb new file mode 100644 index 00000000000..1ac3dc91e71 --- /dev/null +++ b/aws-sdk-core/lib/aws-sdk-core/rest/request/builder.rb @@ -0,0 +1,50 @@ +module Aws + module Rest + module Request + class Builder + + def apply(context) + populate_http_method(context) + populate_endpoint(context) + populate_headers(context) + populate_body(context) + end + + private + + def populate_http_method(context) + context.http_request.http_method = context.operation.http_method + end + + def populate_endpoint(context) + context.http_request.endpoint = Endpoint.new( + context.operation.input, + context.operation.http_request_uri, + ).uri(context.http_request.endpoint, context.params) + end + + def populate_headers(context) + headers = Headers.new(context.operation.input) + headers.apply(context.http_request, context.params) + end + + def populate_body(context) + Body.new( + serializer_class(context), + context.operation.input, + ).apply(context.http_request, context.params) + end + + def serializer_class(context) + protocol = context.config.api.metadata['protocol'] + case protocol + when 'rest-xml' then Xml::Builder + when 'rest-json' then Json::Builder + else raise "unsupported protocol #{protocol}" + end + end + + end + end + end +end diff --git a/aws-sdk-core/lib/aws-sdk-core/rest/request/endpoint.rb b/aws-sdk-core/lib/aws-sdk-core/rest/request/endpoint.rb new file mode 100644 index 00000000000..da97eb01f1b --- /dev/null +++ b/aws-sdk-core/lib/aws-sdk-core/rest/request/endpoint.rb @@ -0,0 +1,70 @@ +require 'uri' + +module Aws + module Rest + module Request + class Endpoint + + # @param [Seahorse::Model::Shapes::ShapeRef] + # @param [String] request_uri_pattern + def initialize(rules, request_uri_pattern) + @rules = rules + request_uri_pattern.split('?').tap do |path_part, query_part| + @path_pattern = path_part + @query_pattern = query_part + end + end + + # @param [URI::HTTPS,URI::HTTP] base_uri + # @param [Hash,Struct] params + # @return [URI::HTTPS,URI::HTTP] + def uri(base_uri, params) + uri = URI.parse(base_uri.to_s) + apply_path_params(uri, params) + apply_querystring_params(uri, params) + uri + end + + private + + def apply_path_params(uri, params) + path = uri.path.sub(/\/$/, '') + @path_pattern.split('?')[0] + uri.path = path.gsub(/{\w+\+?}/) do |placeholder| + param_value_for_placeholder(placeholder, params) + end + end + + def param_value_for_placeholder(placeholder, params) + value = params[param_name(placeholder)] + placeholder.include?('+') ? + value.gsub(/[^\/]+/) { |v| escape(v) } : + escape(value) + end + + def param_name(placeholder) + location_name = placeholder.gsub(/[{}+]/,'') + param_name, _ = @rules.shape.member_by_location_name(location_name) + param_name + end + + def apply_querystring_params(uri, params) + parts = [] + parts << @query_pattern if @query_pattern + @rules.shape.members.each do |member_name, member| + if member.location == 'querystring' && !params[member_name].nil? + param_name = member.location_name + param_value = params[member_name] + parts << "#{param_name}=#{escape(param_value.to_s)}" + end + end + uri.query = parts.empty? ? nil : parts.join('&') + end + + def escape(string) + Seahorse::Util.uri_escape(string) + end + + end + end + end +end diff --git a/aws-sdk-core/lib/aws-sdk-core/rest/request/headers.rb b/aws-sdk-core/lib/aws-sdk-core/rest/request/headers.rb new file mode 100644 index 00000000000..4be1c147e4a --- /dev/null +++ b/aws-sdk-core/lib/aws-sdk-core/rest/request/headers.rb @@ -0,0 +1,48 @@ +require 'time' + +module Aws + module Rest + module Request + class Headers + + include Seahorse::Model::Shapes + + # @param [Seahorse::Model::ShapeRef] rules + def initialize(rules) + @rules = rules + end + + # @param [Seahorse::Client::Http::Request] http_req + # @param [Hash] params + def apply(http_req, params) + @rules.shape.members.each do |name, ref| + value = params[name] + next if value.nil? + case ref.location + when 'header' then apply_header_value(http_req.headers, ref, value) + when 'headers' then apply_header_map(http_req.headers, ref, value) + end + end + end + + private + + def apply_header_value(headers, ref, value) + headers[ref.location_name] = + case ref.shape + when TimestampShape then value.utc.httpdate + else value.to_s + end + end + + def apply_header_map(headers, ref, values) + prefix = ref.location_name || '' + values.each_pair do |name, value| + headers["#{prefix}#{name}"] = value.to_s + end + end + + end + end + end +end diff --git a/aws-sdk-core/lib/aws-sdk-core/rest/response/body.rb b/aws-sdk-core/lib/aws-sdk-core/rest/response/body.rb new file mode 100644 index 00000000000..52b417453a8 --- /dev/null +++ b/aws-sdk-core/lib/aws-sdk-core/rest/response/body.rb @@ -0,0 +1,43 @@ +module Aws + module Rest + module Response + class Body + + include Seahorse::Model::Shapes + + # @param [Class] parser_class + # @param [Seahorse::Model::ShapeRef] rules + def initialize(parser_class, rules) + @parser_class = parser_class + @rules = rules + end + + # @param [IO] body + # @param [Hash, Struct] data + def apply(body, data) + if streaming? + data[@rules[:payload]] = body + elsif @rules[:payload] + data[@rules[:payload]] = parse(body.read, @rules[:payload_member]) + else + parse(body.read, @rules, data) + end + end + + private + + def streaming? + @rules[:payload] && ( + BlobShape === @rules[:payload_member].shape || + StringShape === @rules[:payload_member].shape + ) + end + + def parse(body, rules, target = nil) + @parser_class.new(rules).parse(body, target) if body.size > 0 + end + + end + end + end +end diff --git a/aws-sdk-core/lib/aws-sdk-core/rest/response/headers.rb b/aws-sdk-core/lib/aws-sdk-core/rest/response/headers.rb new file mode 100644 index 00000000000..d60ac4739b5 --- /dev/null +++ b/aws-sdk-core/lib/aws-sdk-core/rest/response/headers.rb @@ -0,0 +1,60 @@ +module Aws + module Rest + module Response + class Headers + + include Seahorse::Model::Shapes + + # @param [Seahorse::Model::ShapeRef] rules + def initialize(rules) + @rules = rules + end + + # @param [Seahorse::Client::Http::Response] http_resp + # @param [Hash, Struct] target + def apply(http_resp, target) + headers = http_resp.headers + @rules.shape.members.each do |name, ref| + case ref.location + when 'header' then extract_header_value(headers, name, ref, target) + when 'headers' then extract_header_map(headers, name, ref, target) + end + end + end + + def extract_header_value(headers, name, ref, data) + if headers.key?(ref.location_name) + data[name] = cast_value(ref, headers[ref.location_name]) + end + end + + def cast_value(ref, value) + case ref.shape + when StringShape then value + when IntegerShape then value.to_i + when FloatShape then value.to_f + when BooleanShape then value == 'true' + when TimestampShape + if value =~ /\d+(\.\d*)/ + Time.at(value.to_f) + else + Time.parse(value) + end + else raise "unsupported shape #{ref.shape.class}" + end + end + + def extract_header_map(headers, name, ref, data) + data[name] = {} + prefix = ref.location_name || '' + headers.each do |header_name, header_value| + if match = header_name.match(/^#{prefix}(.+)/i) + data[name][match[1]] = header_value + end + end + end + + end + end + end +end diff --git a/aws-sdk-core/lib/aws-sdk-core/rest/response/parser.rb b/aws-sdk-core/lib/aws-sdk-core/rest/response/parser.rb new file mode 100644 index 00000000000..84494a0239f --- /dev/null +++ b/aws-sdk-core/lib/aws-sdk-core/rest/response/parser.rb @@ -0,0 +1,47 @@ +module Aws + module Rest + module Response + class Parser + + def apply(response) + # TODO : remove this unless check once response stubbing is fixed + unless response.data + response.data = response.context.operation.output[:struct_class].new + end + extract_status_code(response) + extract_headers(response) + extract_body(response) + end + + private + + def extract_status_code(response) + status_code = StatusCode.new(response.context.operation.output) + status_code.apply(response.context.http_response, response.data) + end + + def extract_headers(response) + headers = Headers.new(response.context.operation.output) + headers.apply(response.context.http_response, response.data) + end + + def extract_body(response) + Body.new( + parser_class(response), + response.context.operation.output, + ).apply(response.context.http_response.body, response.data) + end + + def parser_class(response) + protocol = response.context.config.api.metadata['protocol'] + case protocol + when 'rest-xml' then Xml::Parser + when 'rest-json' then Json::Parser + else raise "unsupported protocol #{protocol}" + end + end + + end + end + end +end diff --git a/aws-sdk-core/lib/aws-sdk-core/rest/response/status_code.rb b/aws-sdk-core/lib/aws-sdk-core/rest/response/status_code.rb new file mode 100644 index 00000000000..d2d83a3d83d --- /dev/null +++ b/aws-sdk-core/lib/aws-sdk-core/rest/response/status_code.rb @@ -0,0 +1,24 @@ +module Aws + module Rest + module Response + class StatusCode + + # @param [Seahorse::Model::Shapes::ShapeRef] rules + def initialize(rules) + @rules = rules + end + + # @param [Seahorse::Client::Http::Response] http_resp + # @param [Hash, Struct] data + def apply(http_resp, data) + @rules.shape.members.each do |member_name, member_ref| + if member_ref.location == 'statusCode' + data[member_name] = http_resp.status_code + end + end + end + + end + end + end +end diff --git a/aws-sdk-core/lib/aws-sdk-core/rest_body_handler.rb b/aws-sdk-core/lib/aws-sdk-core/rest_body_handler.rb deleted file mode 100644 index 1fb64887c43..00000000000 --- a/aws-sdk-core/lib/aws-sdk-core/rest_body_handler.rb +++ /dev/null @@ -1,88 +0,0 @@ -module Aws - # @api private - class RestBodyHandler < Seahorse::Client::Handler - - # @param [Seahorse::Client::RequestContext] context - # @return [Seahorse::Client::Response] - def call(context) - context.http_request.body = build_body(context) - @handler.call(context).on_success do |response| - response.data = extract_data(response.context) unless response.data - end.on(200..599) do |respson| - context[:request_id] = extract_request_id(context) - end - end - - private - - def extract_request_id(context) - headers = context.http_response.headers - headers['x-amz-request-id'] || headers['x-amzn-requestid'] - end - - def build_body(context) - ref = context.operation.input - case - when ref.nil? then nil - when streaming?(ref) then context.params[ref[:payload]] - when ref[:payload] - if params = context.params[ref[:payload]] - serialize_params(ref[:payload_member], params) - end - else - params = body_params(ref, context.params) - serialize_params(ref, params) unless params.empty? - end - end - - def extract_data(context) - if ref = context.operation.output - data = ref[:struct_class].new - if streaming?(ref) - data[ref[:payload]] = context.http_response.body - elsif ref[:payload] - data[ref[:payload]] = parse(context, ref[:payload_member]) - else - parse(context, ref, data) - end - data - else - EmptyStructure.new - end - end - - def body_params(ref, params) - ref.shape.members.inject({}) do |hash, (member_name, member_ref)| - if member_ref.location.nil? - hash[member_name] = params[member_name] if params.key?(member_name) - end - hash - end - end - - def streaming?(ref) - ref[:payload] && ( - Seahorse::Model::Shapes::BlobShape === ref[:payload_member].shape || - Seahorse::Model::Shapes::StringShape === ref[:payload_member].shape - ) - end - - def serialize_params(ref, params) - raise NotImplementedError, 'must be defiend in sublcasses' - end - - def parse(context, ref, target = nil) - body = context.http_response.body_contents - if body.bytesize == 0 - nil - else - parse_body(body, ref, target) - end - end - - def parse_body(body, ref, target) - raise NotImplementedError, 'must be defiend in sublcasses' - end - - end -end diff --git a/aws-sdk-core/lib/aws-sdk-core/stubbing/protocols/ec2.rb b/aws-sdk-core/lib/aws-sdk-core/stubbing/protocols/ec2.rb new file mode 100644 index 00000000000..c330afad53c --- /dev/null +++ b/aws-sdk-core/lib/aws-sdk-core/stubbing/protocols/ec2.rb @@ -0,0 +1,36 @@ +module Aws + module Stubbing + module Protocols + class EC2 + + def stub_data(api, operation, data) + resp = Seahorse::Client::Http::Response.new + resp.status_code = 200 + resp.body = build_body(api, operation, data) + resp.headers['Content-Length'] = resp.body.size + resp.headers['Date'] = Time.now.utc.httpdate + resp.headers['Content-Type'] = 'text/xml;charset=UTF-8' + resp.headers['Server'] = 'AmazonEC2' + resp + end + + private + + 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 + xmlns = "http://ec2.amazonaws.com/doc/#{api.version}/" + xml.unshift(" stubbed-data") + xml.unshift("<#{operation.name}Response xmlns=#{xmlns}>\n") + xml.push("\n") + xml.join + end + + end + end + end +end diff --git a/aws-sdk-core/lib/aws-sdk-core/stubbing/protocols/json.rb b/aws-sdk-core/lib/aws-sdk-core/stubbing/protocols/json.rb new file mode 100644 index 00000000000..c47cab015d0 --- /dev/null +++ b/aws-sdk-core/lib/aws-sdk-core/stubbing/protocols/json.rb @@ -0,0 +1,42 @@ +module Aws + module Stubbing + module Protocols + class Json + + def stub_data(api, operation, data) + resp = Seahorse::Client::Http::Response.new + resp.status_code = 200 + resp.headers["Date"] = Time.now.utc.httpdate + resp.headers["Content-Type"] = content_type(api) + resp.headers["X-Amzn-Requestid"] = "response-stub" + resp.body = build_body(operation, data) + resp + end + + def stub_error(code, message) + resp = new_http_response(400) + resp.body = Json.dump({ + code: code, + message: message, + }) + resp + end + + private + + def content_type(api) + "application/x-amz-json-#{api.metadata['jsonVerison']}" + end + + def build_body(operation, data) + if operation.output + Aws::Json::Builder.new(operation.output).to_json(data) + else + '{}' + end + end + + end + end + end +end diff --git a/aws-sdk-core/lib/aws-sdk-core/stubbing/protocols/query.rb b/aws-sdk-core/lib/aws-sdk-core/stubbing/protocols/query.rb new file mode 100644 index 00000000000..24cb9ac23e8 --- /dev/null +++ b/aws-sdk-core/lib/aws-sdk-core/stubbing/protocols/query.rb @@ -0,0 +1,36 @@ +module Aws + module Stubbing + module Protocols + class Query + + def stub_data(api, operation, data) + resp = Seahorse::Client::Http::Response.new + resp.status_code = 200 + resp.body = build_body(api, operation, data) + resp.headers['Content-Length'] = resp.body.size + resp.headers['Date'] = Time.now.utc.httpdate + resp.headers['Content-Type'] = 'text/xml' + resp + end + + private + + def build_body(api, operation, data) + xml = [] + builder = Aws::Xml::DocBuilder.new(target: xml, indent: ' ') + builder.node(operation.name + 'Response') do + if rules = operation.output + rules.location_name = operation.name + 'Result' + Xml::Builder.new(rules, target:xml, pad:' ').to_xml(data) + end + builder.node('ResponseMetadata') do + builder.node('RequestId', 'stubbed-response') + end + end + xml.join + end + + end + end + end +end diff --git a/aws-sdk-core/lib/aws-sdk-core/stubbing/protocols/rest_json.rb b/aws-sdk-core/lib/aws-sdk-core/stubbing/protocols/rest_json.rb new file mode 100644 index 00000000000..ff731aab3cf --- /dev/null +++ b/aws-sdk-core/lib/aws-sdk-core/stubbing/protocols/rest_json.rb @@ -0,0 +1,12 @@ +module Aws + module Stubbing + module Protocols + class RestJson + + def stub_data(api, operation, data) + end + + end + end + end +end diff --git a/aws-sdk-core/lib/aws-sdk-core/stubbing/protocols/rest_xml.rb b/aws-sdk-core/lib/aws-sdk-core/stubbing/protocols/rest_xml.rb new file mode 100644 index 00000000000..dd49075cbb2 --- /dev/null +++ b/aws-sdk-core/lib/aws-sdk-core/stubbing/protocols/rest_xml.rb @@ -0,0 +1,14 @@ +module Aws + module Stubbing + module Protocols + class RestXml + + def stub_data(api, operation, data) + resp = Seahorse::Client::Http::Response.new + resp.status_code = 200 + end + + end + end + end +end diff --git a/aws-sdk-core/lib/aws-sdk-core/xml/builder.rb b/aws-sdk-core/lib/aws-sdk-core/xml/builder.rb index a88ad3793b2..8b67d575d55 100644 --- a/aws-sdk-core/lib/aws-sdk-core/xml/builder.rb +++ b/aws-sdk-core/lib/aws-sdk-core/xml/builder.rb @@ -6,16 +6,19 @@ class Builder include Seahorse::Model::Shapes - def initialize(rules) + def initialize(rules, options = {}) @rules = rules - @xml = [] - @builder = DocBuilder.new(target: @xml, indent: ' ') + @xml = options[:target] || [] + indent = options[:indent] || ' ' + pad = options[:pad] || '' + @builder = DocBuilder.new(target:@xml, indent:indent, pad:pad) end def to_xml(params) structure(@rules.location_name, @rules, params) @xml.join end + alias serialize to_xml private diff --git a/aws-sdk-core/lib/aws-sdk-core/xml/rest_handler.rb b/aws-sdk-core/lib/aws-sdk-core/xml/rest_handler.rb deleted file mode 100644 index cdd17350899..00000000000 --- a/aws-sdk-core/lib/aws-sdk-core/xml/rest_handler.rb +++ /dev/null @@ -1,15 +0,0 @@ -module Aws - module Xml - class RestHandler < RestBodyHandler - - def serialize_params(rules, params) - Builder.new(rules).to_xml(params) - end - - def parse_body(xml, rules, target) - Parser.new(rules).parse(xml, target) - end - - end - end -end diff --git a/aws-sdk-core/lib/seahorse/client/plugins/endpoint.rb b/aws-sdk-core/lib/seahorse/client/plugins/endpoint.rb index b1f4118bcf8..119897dd70f 100644 --- a/aws-sdk-core/lib/seahorse/client/plugins/endpoint.rb +++ b/aws-sdk-core/lib/seahorse/client/plugins/endpoint.rb @@ -1,7 +1,6 @@ module Seahorse module Client module Plugins - # @seahorse.client.option [String] :endpoint # The HTTP or HTTPS endpoint to send requests to. # For example: @@ -14,6 +13,10 @@ class Endpoint < Plugin option(:endpoint) + def add_handlers(handlers, config) + handlers.add(Handler, priority: 90) + end + def after_initialize(client) endpoint = URI.parse(client.config.endpoint.to_s) if URI::HTTPS === endpoint or URI::HTTP === endpoint @@ -27,65 +30,11 @@ def after_initialize(client) class Handler < Client::Handler def call(context) - context.http_request.endpoint = build_endpoint(context) + context.http_request.endpoint = URI.parse(context.config.endpoint.to_s) @handler.call(context) end - private - - def build_endpoint(context) - uri = URI.parse(context.config.endpoint.to_s) - apply_path_params(uri, context) - apply_querystring_params(uri, context) - uri - end - - def apply_path_params(uri, context) - path = uri.path.sub(/\/$/, '') - path += context.operation.http_request_uri.split('?')[0] - input = context.operation.input - uri.path = path.gsub(/{\w+\+?}/) do |placeholder| - if placeholder.include?('+') - placeholder = placeholder[1..-3] - greedy = true - else - placeholder = placeholder[1..-2] - end - name, shape = input.shape.member_by_location_name(placeholder) - param = context.params[name] - if greedy - param = param.gsub(/[^\/]+/) { |v| escape(v) } - else - escape(param) - end - end - end - - def apply_querystring_params(uri, context) - parts = [] - parts << context.operation.http_request_uri.split('?')[1] - parts.compact! - if input = context.operation.input - params = context.params - input.shape.members.each do |member_name, member| - if member.location == 'querystring' && !params[member_name].nil? - param_name = member.location_name - param_value = params[member_name] - parts << "#{param_name}=#{escape(param_value.to_s)}" - end - end - end - uri.query = parts.empty? ? nil : parts.join('&') - end - - def escape(string) - Util.uri_escape(string) - end - end - - handle(Handler, priority: 90) - end end end diff --git a/aws-sdk-core/lib/seahorse/client/plugins/restful_bindings.rb b/aws-sdk-core/lib/seahorse/client/plugins/restful_bindings.rb index 458616a0c2a..48c096fa340 100644 --- a/aws-sdk-core/lib/seahorse/client/plugins/restful_bindings.rb +++ b/aws-sdk-core/lib/seahorse/client/plugins/restful_bindings.rb @@ -3,6 +3,7 @@ module Seahorse module Client module Plugins + # @api private class RestfulBindings < Plugin # @api private diff --git a/aws-sdk-core/spec/aws/s3/client_spec.rb b/aws-sdk-core/spec/aws/s3/client_spec.rb index c5a95dee641..bfea2a46ddc 100644 --- a/aws-sdk-core/spec/aws/s3/client_spec.rb +++ b/aws-sdk-core/spec/aws/s3/client_spec.rb @@ -21,13 +21,28 @@ module S3 end it 'raises an appropriate error when credentials are missing' do - creds = Aws::Credentials.new(nil, nil) - client = Aws::S3::Client.new(credentials: creds) + creds = Credentials.new(nil, nil) + client = Client.new(credentials: creds) expect { client.list_buckets }.to raise_error(Aws::Errors::MissingCredentialsError) end + describe 'endpoints' do + + it 'preserves custom endpoints' do + client = Client.new( + stub_responses:true, + endpoint: 'http://custom.domain/path/prefix', + force_path_style: true, + ) + resp = client.put_object(bucket:'bucket-name', key:'key/path') + expect(resp.context.http_request.endpoint.to_s).to eq( + "http://custom.domain/path/prefix/bucket-name/key/path") + end + + end + describe 'empty body error responses' do it 'creates an error class from empty body responses' do diff --git a/aws-sdk-core/spec/protocols_spec.rb b/aws-sdk-core/spec/protocols_spec.rb index 2a7f7e8bead..bcc5b54ed0c 100644 --- a/aws-sdk-core/spec/protocols_spec.rb +++ b/aws-sdk-core/spec/protocols_spec.rb @@ -38,7 +38,6 @@ def client_for(suite, test_case) 'shapes' => suite['shapes'], }) client_class = Seahorse::Client::Base.define(api: api) - client_class.add_plugin(Seahorse::Client::Plugins::RestfulBindings) client_class.add_plugin( case protocol when 'ec2' then Aws::Plugins::Protocols::EC2 From b7846e94ac741ff85e59ebca5e337556831022b2 Mon Sep 17 00:00:00 2001 From: Trevor Rowe Date: Wed, 27 May 2015 09:01:35 -0700 Subject: [PATCH 078/101] Fix a Ruby 1.9 and JRuby issue. --- aws-sdk-core/lib/aws-sdk-core/api/docs/param_formatter.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/aws-sdk-core/lib/aws-sdk-core/api/docs/param_formatter.rb b/aws-sdk-core/lib/aws-sdk-core/api/docs/param_formatter.rb index dce0ece3ef8..cbf25b02c9a 100644 --- a/aws-sdk-core/lib/aws-sdk-core/api/docs/param_formatter.rb +++ b/aws-sdk-core/lib/aws-sdk-core/api/docs/param_formatter.rb @@ -100,7 +100,7 @@ def string(ref) end def apply_comments(ref, text) - lines = text.lines + lines = text.lines.to_a if lines[0].match(/\n$/) lines[0] = lines[0].sub(/\n$/, comments(ref) + "\n") else From 995e65f76d6761261edb90786b4fe812ff08c66b Mon Sep 17 00:00:00 2001 From: Trevor Rowe Date: Wed, 27 May 2015 16:09:36 -0700 Subject: [PATCH 079/101] Added implementations of protocol repsonse stubs. --- aws-sdk-core/lib/aws-sdk-core.rb | 1 + .../aws-sdk-core/stubbing/protocols/ec2.rb | 7 +- .../aws-sdk-core/stubbing/protocols/json.rb | 20 +-- .../aws-sdk-core/stubbing/protocols/query.rb | 11 +- .../aws-sdk-core/stubbing/protocols/rest.rb | 67 ++++++++++ .../stubbing/protocols/rest_json.rb | 5 +- .../stubbing/protocols/rest_xml.rb | 18 ++- .../spec/aws/stubbing/protocols/ec2_spec.rb | 106 ++++++++++++++++ .../spec/aws/stubbing/protocols/json_spec.rb | 97 ++++++++++++++ .../spec/aws/stubbing/protocols/query_spec.rb | 71 +++++++++++ .../aws/stubbing/protocols/rest_json_spec.rb | 119 ++++++++++++++++++ .../aws/stubbing/protocols/rest_xml_spec.rb | 100 +++++++++++++++ 12 files changed, 591 insertions(+), 31 deletions(-) create mode 100644 aws-sdk-core/lib/aws-sdk-core/stubbing/protocols/rest.rb create mode 100644 aws-sdk-core/spec/aws/stubbing/protocols/ec2_spec.rb create mode 100644 aws-sdk-core/spec/aws/stubbing/protocols/json_spec.rb create mode 100644 aws-sdk-core/spec/aws/stubbing/protocols/query_spec.rb create mode 100644 aws-sdk-core/spec/aws/stubbing/protocols/rest_json_spec.rb create mode 100644 aws-sdk-core/spec/aws/stubbing/protocols/rest_xml_spec.rb diff --git a/aws-sdk-core/lib/aws-sdk-core.rb b/aws-sdk-core/lib/aws-sdk-core.rb index dae93c1cfda..8f08e4c2d69 100644 --- a/aws-sdk-core/lib/aws-sdk-core.rb +++ b/aws-sdk-core/lib/aws-sdk-core.rb @@ -203,6 +203,7 @@ module Protocols autoload :EC2, 'aws-sdk-core/stubbing/protocols/ec2' autoload :Json, 'aws-sdk-core/stubbing/protocols/json' autoload :Query, 'aws-sdk-core/stubbing/protocols/query' + autoload :Rest, 'aws-sdk-core/stubbing/protocols/rest' autoload :RestJson, 'aws-sdk-core/stubbing/protocols/rest_json' autoload :RestXml, 'aws-sdk-core/stubbing/protocols/rest_xml' end diff --git a/aws-sdk-core/lib/aws-sdk-core/stubbing/protocols/ec2.rb b/aws-sdk-core/lib/aws-sdk-core/stubbing/protocols/ec2.rb index c330afad53c..b6c057258b0 100644 --- a/aws-sdk-core/lib/aws-sdk-core/stubbing/protocols/ec2.rb +++ b/aws-sdk-core/lib/aws-sdk-core/stubbing/protocols/ec2.rb @@ -3,12 +3,11 @@ module Stubbing module Protocols class EC2 - def stub_data(api, operation, data) + def stub_response(api, operation, data) resp = Seahorse::Client::Http::Response.new resp.status_code = 200 resp.body = build_body(api, operation, data) resp.headers['Content-Length'] = resp.body.size - resp.headers['Date'] = Time.now.utc.httpdate resp.headers['Content-Type'] = 'text/xml;charset=UTF-8' resp.headers['Server'] = 'AmazonEC2' resp @@ -23,8 +22,8 @@ def build_body(api, operation, data) xml.shift xml.pop end - xmlns = "http://ec2.amazonaws.com/doc/#{api.version}/" - xml.unshift(" stubbed-data") + xmlns = "http://ec2.amazonaws.com/doc/#{api.version}/".inspect + xml.unshift(" stubbed-request-id") xml.unshift("<#{operation.name}Response xmlns=#{xmlns}>\n") xml.push("\n") xml.join diff --git a/aws-sdk-core/lib/aws-sdk-core/stubbing/protocols/json.rb b/aws-sdk-core/lib/aws-sdk-core/stubbing/protocols/json.rb index c47cab015d0..e68696bc3a9 100644 --- a/aws-sdk-core/lib/aws-sdk-core/stubbing/protocols/json.rb +++ b/aws-sdk-core/lib/aws-sdk-core/stubbing/protocols/json.rb @@ -3,25 +3,15 @@ module Stubbing module Protocols class Json - def stub_data(api, operation, data) + def stub_response(api, operation, data) resp = Seahorse::Client::Http::Response.new resp.status_code = 200 - resp.headers["Date"] = Time.now.utc.httpdate resp.headers["Content-Type"] = content_type(api) - resp.headers["X-Amzn-Requestid"] = "response-stub" + resp.headers["x-amzn-RequestId"] = "stubbed-request-id" resp.body = build_body(operation, data) resp end - def stub_error(code, message) - resp = new_http_response(400) - resp.body = Json.dump({ - code: code, - message: message, - }) - resp - end - private def content_type(api) @@ -29,11 +19,7 @@ def content_type(api) end def build_body(operation, data) - if operation.output - Aws::Json::Builder.new(operation.output).to_json(data) - else - '{}' - end + Aws::Json::Builder.new(operation.output).to_json(data) end end diff --git a/aws-sdk-core/lib/aws-sdk-core/stubbing/protocols/query.rb b/aws-sdk-core/lib/aws-sdk-core/stubbing/protocols/query.rb index 24cb9ac23e8..5c9fd18680d 100644 --- a/aws-sdk-core/lib/aws-sdk-core/stubbing/protocols/query.rb +++ b/aws-sdk-core/lib/aws-sdk-core/stubbing/protocols/query.rb @@ -3,12 +3,11 @@ module Stubbing module Protocols class Query - def stub_data(api, operation, data) + def stub_response(api, operation, data) resp = Seahorse::Client::Http::Response.new resp.status_code = 200 resp.body = build_body(api, operation, data) resp.headers['Content-Length'] = resp.body.size - resp.headers['Date'] = Time.now.utc.httpdate resp.headers['Content-Type'] = 'text/xml' resp end @@ -18,18 +17,22 @@ def stub_data(api, operation, data) def build_body(api, operation, data) xml = [] builder = Aws::Xml::DocBuilder.new(target: xml, indent: ' ') - builder.node(operation.name + 'Response') do + builder.node(operation.name + 'Response', xmlns: xmlns(api)) do if rules = operation.output rules.location_name = operation.name + 'Result' Xml::Builder.new(rules, target:xml, pad:' ').to_xml(data) end builder.node('ResponseMetadata') do - builder.node('RequestId', 'stubbed-response') + builder.node('RequestId', 'stubbed-request-id') end end xml.join end + def xmlns(api) + api.metadata['xmlNamespace'] + end + end end end diff --git a/aws-sdk-core/lib/aws-sdk-core/stubbing/protocols/rest.rb b/aws-sdk-core/lib/aws-sdk-core/stubbing/protocols/rest.rb new file mode 100644 index 00000000000..68e69866612 --- /dev/null +++ b/aws-sdk-core/lib/aws-sdk-core/stubbing/protocols/rest.rb @@ -0,0 +1,67 @@ +module Aws + module Stubbing + module Protocols + class Rest + + include Seahorse::Model::Shapes + + def stub_response(api, operation, data) + resp = new_http_response + apply_status_code(operation, resp, data) + apply_headers(operation, resp, data) + apply_body(api, operation, resp, data) + resp + end + + private + + def new_http_response + resp = Seahorse::Client::Http::Response.new + resp.status_code = 200 + resp.headers["x-amzn-RequestId"] = "stubbed-request-id" + resp + end + + def apply_status_code(operation, resp, data) + operation.output.shape.members.each do |member_name, member_ref| + if member_ref.location == 'statusCode' + resp.status_code = data[member_name] if data.key?(member_name) + end + end + end + + def apply_headers(operation, resp, data) + Aws::Rest::Request::Headers.new(operation.output).apply(resp, data) + end + + def apply_body(api, operation, resp, data) + resp.body = build_body(api, operation, data) + end + + def build_body(api, operation, data) + rules = operation.output + if streaming?(rules) + data[rules[:payload]] + elsif rules[:payload] + body_for(api, operation, rules[:payload_member], data[rules[:payload]]) + else + body_for(api, operation, rules, data) + end + end + + def streaming?(ref) + if ref[:payload] + case ref[:payload_member].shape + when StringShape then true + when BlobShape then true + else false + end + else + false + end + end + + end + end + end +end diff --git a/aws-sdk-core/lib/aws-sdk-core/stubbing/protocols/rest_json.rb b/aws-sdk-core/lib/aws-sdk-core/stubbing/protocols/rest_json.rb index ff731aab3cf..a57eaa73e56 100644 --- a/aws-sdk-core/lib/aws-sdk-core/stubbing/protocols/rest_json.rb +++ b/aws-sdk-core/lib/aws-sdk-core/stubbing/protocols/rest_json.rb @@ -1,9 +1,10 @@ module Aws module Stubbing module Protocols - class RestJson + class RestJson < Rest - def stub_data(api, operation, data) + def body_for(_, _, rules, data) + Aws::Json::Builder.new(rules).serialize(data) end end diff --git a/aws-sdk-core/lib/aws-sdk-core/stubbing/protocols/rest_xml.rb b/aws-sdk-core/lib/aws-sdk-core/stubbing/protocols/rest_xml.rb index dd49075cbb2..bde48f0a5e1 100644 --- a/aws-sdk-core/lib/aws-sdk-core/stubbing/protocols/rest_xml.rb +++ b/aws-sdk-core/lib/aws-sdk-core/stubbing/protocols/rest_xml.rb @@ -1,11 +1,21 @@ module Aws module Stubbing module Protocols - class RestXml + class RestXml < Rest - def stub_data(api, operation, data) - resp = Seahorse::Client::Http::Response.new - resp.status_code = 200 + include Seahorse::Model::Shapes + + 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, pad:' ').to_xml(data) + xml.join + end + + def xmlns(api) + api.metadata['xmlNamespace'] end end diff --git a/aws-sdk-core/spec/aws/stubbing/protocols/ec2_spec.rb b/aws-sdk-core/spec/aws/stubbing/protocols/ec2_spec.rb new file mode 100644 index 00000000000..258b4933ee1 --- /dev/null +++ b/aws-sdk-core/spec/aws/stubbing/protocols/ec2_spec.rb @@ -0,0 +1,106 @@ +require 'spec_helper' +require 'rexml/document' + +module Aws + module Stubbing + module Protocols + describe EC2 do + describe '#stub_response' do + + def normalize(xml) + result = '' + REXML::Document.new(xml).write(result, 2) + result.strip + end + + let(:api) { Aws::EC2::Client.api } + + let(:operation) { api.operation(:describe_instances) } + + it 'returns a stubbed http response' do + resp = EC2.new.stub_response(api, operation, {}) + expect(resp).to be_kind_of(Seahorse::Client::Http::Response) + expect(resp.status_code).to eq(200) + end + + it 'populates the content-type header' do + resp = EC2.new.stub_response(api, operation, {}) + expect(resp.headers['content-type']).to eq('text/xml;charset=UTF-8') + expect(resp.headers['server']).to eq('AmazonEC2') + end + + it 'populates the body with the stub data' do + now = Time.now + data = { + reservations: [ + { + reservation_id: 'reservation-id', + owner_id: 'owner-id', + groups: [ + { + group_id: 'group-id', + group_name: 'group-name', + } + ], + instances: [ + { + instance_id: 'i-12345678', + image_id: 'ami-12345678', + state: { + code: 16, + name: 'running', + }, + tags: [ + { key: 'Abc', value: 'mno' }, + { key: 'Name', value: '' } + ] + } + ] + } + ] + } + resp = EC2.new.stub_response(api, operation, data) + expect(normalize(resp.body.string)).to eq(normalize(<<-XML)) + + stubbed-request-id + + + reservation-id + owner-id + + + group-name + group-id + + + + + i-12345678 + ami-12345678 + + 16 + running + + + + Abc + mno + + + Name + + + + + + + + + XML + end + + end + end + end + end +end diff --git a/aws-sdk-core/spec/aws/stubbing/protocols/json_spec.rb b/aws-sdk-core/spec/aws/stubbing/protocols/json_spec.rb new file mode 100644 index 00000000000..9353714331e --- /dev/null +++ b/aws-sdk-core/spec/aws/stubbing/protocols/json_spec.rb @@ -0,0 +1,97 @@ +require 'spec_helper' +require 'json' + +module Aws + module Stubbing + module Protocols + describe Json do + describe '#stub_response' do + + def normalize(json) + JSON.pretty_generate(JSON.load(json), indent: ' ') + end + + let(:api) { DynamoDB::Client.api } + + let(:operation) { api.operation(:describe_table) } + + it 'returns a stubbed http response' do + resp = Json.new.stub_response(api, operation, {}) + expect(resp).to be_kind_of(Seahorse::Client::Http::Response) + expect(resp.status_code).to eq(200) + end + + it 'populates the expected headers' do + resp = Json.new.stub_response(api, operation, {}) + expect(resp.headers.to_h).to eq({ + "content-type" => "application/x-amz-json-", + "x-amzn-requestid" => "stubbed-request-id", + }) + end + + it 'populates the body with the stub data' do + now = Time.now + data = { + table: { + table_name: "my-table-name", + table_size_bytes: 0, + table_status: "ACTIVE", + attribute_definitions: [ + { + attribute_name: "Id", + attribute_type: "S" + } + ], + creation_date_time: now, + item_count: 0, + key_schema: [ + attribute_name: "Id", + key_type: "HASH" + ], + provisioned_throughput: { + last_increase_date_time: now, + last_decrease_date_time: now, + number_of_decreases_today: 0, + read_capacity_units: 50, + write_capacity_units: 50, + } + } + } + resp = Json.new.stub_response(api, operation, data) + expect(normalize(resp.body.string)).to eq(normalize(<<-JSON)) + { + "Table": { + "TableName": "my-table-name", + "TableSizeBytes": 0, + "TableStatus": "ACTIVE", + "AttributeDefinitions": [ + { + "AttributeName": "Id", + "AttributeType": "S" + } + ], + "CreationDateTime": #{now.to_i}, + "ItemCount": 0, + "KeySchema": [ + { + "AttributeName": "Id", + "KeyType": "HASH" + } + ], + "ProvisionedThroughput": { + "LastIncreaseDateTime": #{now.to_i}, + "LastDecreaseDateTime": #{now.to_i}, + "NumberOfDecreasesToday": 0, + "ReadCapacityUnits": 50, + "WriteCapacityUnits": 50 + } + } + } + JSON + end + + end + end + end + end +end diff --git a/aws-sdk-core/spec/aws/stubbing/protocols/query_spec.rb b/aws-sdk-core/spec/aws/stubbing/protocols/query_spec.rb new file mode 100644 index 00000000000..034bd5dfad9 --- /dev/null +++ b/aws-sdk-core/spec/aws/stubbing/protocols/query_spec.rb @@ -0,0 +1,71 @@ +require 'spec_helper' +require 'rexml/document' + +module Aws + module Stubbing + module Protocols + describe Query do + describe '#stub_response' do + + def normalize(xml) + result = '' + REXML::Document.new(xml).write(result, 2) + result.strip + end + + let(:api) { IAM::Client.api } + + let(:operation) { api.operation(:list_users) } + + it 'returns a stubbed http response' do + resp = Query.new.stub_response(api, operation, {}) + expect(resp).to be_kind_of(Seahorse::Client::Http::Response) + expect(resp.status_code).to eq(200) + end + + it 'populates the content-type header' do + resp = Query.new.stub_response(api, operation, {}) + expect(resp.headers['content-type']).to eq('text/xml') + end + + it 'populates the body with the stub data' do + now = Time.now + data = { + is_truncated: false, + users: [ + { + path: '/', + arn: 'arn:aws:iam::123456789012:user/name', + user_name: 'name', + user_id: 'user-id', + create_date: now, + } + ] + } + resp = Query.new.stub_response(api, operation, data) + expect(normalize(resp.body.string)).to eq(normalize(<<-XML)) + + + + + / + name + user-id + arn:aws:iam::123456789012:user/name + #{now.utc.iso8601} + + + false + + + stubbed-request-id + + + XML + end + + end + end + end + end +end diff --git a/aws-sdk-core/spec/aws/stubbing/protocols/rest_json_spec.rb b/aws-sdk-core/spec/aws/stubbing/protocols/rest_json_spec.rb new file mode 100644 index 00000000000..71dccfada47 --- /dev/null +++ b/aws-sdk-core/spec/aws/stubbing/protocols/rest_json_spec.rb @@ -0,0 +1,119 @@ +require 'spec_helper' +require 'json' + +module Aws + module Stubbing + module Protocols + describe RestJson do + describe '#stub_response' do + + def normalize(json) + JSON.pretty_generate(JSON.load(json), indent: ' ') + end + + let(:api) { Glacier::Client.api } + + let(:operation) { api.operation(:list_vaults) } + + it 'returns a stubbed http response' do + resp = RestJson.new.stub_response(api, operation, {}) + expect(resp).to be_kind_of(Seahorse::Client::Http::Response) + expect(resp.status_code).to eq(200) + end + + it 'populates the expected headers' do + resp = RestJson.new.stub_response(api, operation, {}) + expect(resp.headers.to_h).to eq({ + "x-amzn-requestid" => "stubbed-request-id", + }) + end + + it 'populates the body with the stub data' do + now = Time.now + data = { + vault_list: [ + { + creation_date: now, + last_inventory_date: now, + number_of_archives: 1, + size_in_bytes: 100, + vault_arn: 'arn', + vault_name: 'name', + } + ] + } + resp = RestJson.new.stub_response(api, operation, data) + expect(normalize(resp.body.string)).to eq(normalize(<<-JSON)) + { + "VaultList": [ + { + "CreationDate": #{now.to_i}, + "LastInventoryDate": #{now.to_i}, + "NumberOfArchives": 1, + "SizeInBytes": 100, + "VaultARN": "arn", + "VaultName": "name" + } + ] + } + JSON + end + + it 'supports stubbing streaming response bodies' do + now = Time.now + data = StringIO.new('DATA') + params = { + body: data, + checksum: 'checksum', + status: 201, + content_range: 'range', + accept_ranges: 'accept-range', + content_type: 'application/octet-stream', + archive_description: 'description', + } + operation = api.operation(:get_job_output) + resp = RestJson.new.stub_response(api, operation, params) + expect(resp.status_code).to eq(201) + expect(resp.headers['x-amz-sha256-tree-hash']).to eq('checksum') + expect(resp.headers['Content-Range']).to eq('range') + expect(resp.headers['Accept-Ranges']).to eq('accept-range') + expect(resp.headers['Content-Type']).to eq('application/octet-stream') + expect(resp.headers['x-amz-archive-description']).to eq('description') + expect(resp.body).to be(data) + expect(resp.body.read).to eq('DATA') + end + + it 'does not stub status code when not present' do + now = Time.now + data = StringIO.new('DATA') + params = { + body: data, + } + operation = api.operation(:get_job_output) + resp = RestJson.new.stub_response(api, operation, params) + expect(resp.status_code).to eq(200) + expect(resp.body).to be(data) + expect(resp.body.read).to eq('DATA') + end + + it 'supports structure payloads' do + params = { + policy: { + policy: 'policy-document' + } + } + operation = api.operation(:get_vault_access_policy) + resp = RestJson.new.stub_response(api, operation, params) + expect(resp.status_code).to eq(200) + expect(normalize(resp.body.string)).to eq(normalize(<<-JSON)) + { + "Policy": "policy-document" + } + JSON + end + + end + end + end + end +end diff --git a/aws-sdk-core/spec/aws/stubbing/protocols/rest_xml_spec.rb b/aws-sdk-core/spec/aws/stubbing/protocols/rest_xml_spec.rb new file mode 100644 index 00000000000..0da439a3bc8 --- /dev/null +++ b/aws-sdk-core/spec/aws/stubbing/protocols/rest_xml_spec.rb @@ -0,0 +1,100 @@ +require 'spec_helper' +require 'json' + +module Aws + module Stubbing + module Protocols + describe RestXml do + describe '#stub_response' do + + def normalize(xml) + result = '' + REXML::Document.new(xml).write(result, 2) + result.strip + end + + let(:api) { S3::Client.api } + + let(:operation) { api.operation(:list_buckets) } + + before(:each) do + api.metadata['xmlNamespace'] = 'http://xmlns' + end + + it 'returns a stubbed http response' do + resp = RestXml.new.stub_response(api, operation, {}) + expect(resp).to be_kind_of(Seahorse::Client::Http::Response) + expect(resp.status_code).to eq(200) + end + + it 'populates the expected headers' do + resp = RestXml.new.stub_response(api, operation, {}) + expect(resp.headers.to_h).to eq({ + "x-amzn-requestid" => "stubbed-request-id", + }) + end + + it 'populates the body with the stub data' do + now = Time.now + data = { + buckets: [ + { + name: 'aws-sdk', + creation_date: now, + } + ], + owner: { + display_name: 'owner-name', + id: 'owner-id', + } + } + resp = RestXml.new.stub_response(api, operation, data) + expect(normalize(resp.body.string)).to eq(normalize(<<-XML)) + + + + aws-sdk + #{now.utc.iso8601} + + + + owner-name + owner-id + + + XML + end + + it 'supports stubbing streaming response bodies' do + data = StringIO.new('DATA') + params = { + body: data, + etag: 'etag-value', + } + operation = api.operation(:get_object) + resp = RestXml.new.stub_response(api, operation, params) + expect(resp.status_code).to eq(200) + expect(resp.headers['ETag']).to eq('etag-value') + expect(resp.body).to be(data) + expect(resp.body.read).to eq('DATA') + end + + it 'supports structure payloads' do + params = { + policy: 'policy-document' + } + operation = api.operation(:get_bucket_policy) + resp = RestXml.new.stub_response(api, operation, params) + expect(resp.status_code).to eq(200) + expect(normalize(resp.body.string)).to eq(normalize(<<-JSON)) + { + "Policy": "policy-document" + } + JSON + end + + end + end + end + end +end From 70d97ea070b66d4988287b4e9ebb07ffb34c7d29 Mon Sep 17 00:00:00 2001 From: Trevor Rowe Date: Thu, 28 May 2015 17:32:46 -0700 Subject: [PATCH 080/101] WIP --- aws-sdk-core/data | Bin 0 -> 16 bytes aws-sdk-core/features/s3/objects.feature | 8 ++ aws-sdk-core/features/s3/step_definitions.rb | 5 ++ aws-sdk-core/lib/aws-sdk-core/client_stubs.rb | 78 ++++++++++++++++-- .../aws-sdk-core/plugins/stub_responses.rb | 57 +++++-------- .../aws-sdk-core/stubbing/protocols/ec2.rb | 16 +++- .../aws-sdk-core/stubbing/protocols/json.rb | 14 +++- .../aws-sdk-core/stubbing/protocols/query.rb | 7 +- .../aws-sdk-core/stubbing/protocols/rest.rb | 2 +- .../stubbing/protocols/rest_json.rb | 12 +++ .../stubbing/protocols/rest_xml.rb | 16 +++- .../spec/aws/stubbing/protocols/ec2_spec.rb | 8 +- .../spec/aws/stubbing/protocols/json_spec.rb | 8 +- .../spec/aws/stubbing/protocols/query_spec.rb | 8 +- .../aws/stubbing/protocols/rest_json_spec.rb | 14 ++-- .../aws/stubbing/protocols/rest_xml_spec.rb | 12 +-- 16 files changed, 190 insertions(+), 75 deletions(-) create mode 100644 aws-sdk-core/data diff --git a/aws-sdk-core/data b/aws-sdk-core/data new file mode 100644 index 0000000000000000000000000000000000000000..2949a235ed3ced897cd28025712a811cf536966b GIT binary patch literal 16 XcmZ=2PL%j&ufx#4^rFPa65S90Fdqgs literal 0 HcmV?d00001 diff --git a/aws-sdk-core/features/s3/objects.feature b/aws-sdk-core/features/s3/objects.feature index 0f4b2875d22..72e9015a8e8 100644 --- a/aws-sdk-core/features/s3/objects.feature +++ b/aws-sdk-core/features/s3/objects.feature @@ -31,6 +31,14 @@ Feature: S3 Objects When I get an object that doesn't exist with a read block Then an error should be raise and the block should not yield + Scenario: URL decoding Keys + Given I put "data1" to the key "a b" + And I put "data2" to the key "a+b" + Then the keys in my bucket should be + | keys | + | a b | + | a+b | + @paging Scenario: Paging responses Given I put nothing to the key "photos/camping/cascades.jpg" diff --git a/aws-sdk-core/features/s3/step_definitions.rb b/aws-sdk-core/features/s3/step_definitions.rb index 26971d410f8..6be97e02bcf 100644 --- a/aws-sdk-core/features/s3/step_definitions.rb +++ b/aws-sdk-core/features/s3/step_definitions.rb @@ -253,3 +253,8 @@ def create_bucket(options = {}) resp = @client.list_objects(bucket: @bucket_name, prefix: key, max_keys: 1) expect(resp.contents.first.storage_class).to eq(sc) end + +Then(/^the keys in my bucket should be$/) do |table| + keys = @client.list_objects(bucket:@bucket_name).contents.map(&:key) + expect(keys.sort).to eq(table.rows.map(&:first).sort) +end diff --git a/aws-sdk-core/lib/aws-sdk-core/client_stubs.rb b/aws-sdk-core/lib/aws-sdk-core/client_stubs.rb index b40dbd52fd9..5adde74792f 100644 --- a/aws-sdk-core/lib/aws-sdk-core/client_stubs.rb +++ b/aws-sdk-core/lib/aws-sdk-core/client_stubs.rb @@ -55,6 +55,26 @@ def initialize(*args) # client.get_object(bucket:'aws-sdk', key:'foo') # #=> raises the given runtime error object # + # ## Stubbing HTTP Responses + # + # As an alternative to providing the response data, you can provide + # an HTTP response. The SDK will use the response status code, headers, + # and body as if it were received over the wire. It will parse it for + # errors and data. + # + # client.stub_responses(:get_object, { + # status_code: 200, + # headers: { 'header-name' => 'header-value' }, + # body: "...", + # }) + # + # To stub a HTTP response, pass a Hash with the following three + # keys set: + # + # * `:status_code` - + # * `:headers` - Hash + # * `:body` - + # # ## Stubbing Multiple Responses # # Calling an operation multiple times will return similar responses. @@ -73,12 +93,16 @@ def initialize(*args) # resp.content_length #=> 150 # # @param [Symbol] operation_name + # # @param [Mixed] stubs One or more responses to return from the named # operation. + # # @return [void] + # # @raise [RuntimeError] Raises a runtime error when called # on a client that has not enabled response stubbing via # `:stub_responses => true`. + # def stub_responses(operation_name, *stubs) if config.stub_responses apply_stubs(operation_name, stubs.flatten) @@ -94,7 +118,7 @@ def next_stub(operation_name) @stub_mutex.synchronize do stubs = @stubs[operation_name.to_sym] || [] case stubs.length - when 0 then new_stub(operation_name.to_sym) + when 0 then { data: new_stub(operation_name.to_sym) } when 1 then stubs.first else stubs.shift end @@ -111,18 +135,56 @@ def apply_stubs(operation_name, stubs) @stub_mutex.synchronize do @stubs[operation_name.to_sym] = stubs.map do |stub| case stub - when Exception then stub - when String then service_error_class(stub) - when Hash then new_stub(operation_name, stub) - else stub + when Exception then error_stub(stub) + when String then service_error_stub(stub) + when Hash then http_response_stub(operation_name, stub) + when Seahorse::Client::Http::Response then { http: stub } + else { data: stub } end end end end - def service_error_class(name) - svc_module = Aws.const_get(self.class.name.split('::')[1]) - svc_module.const_get(:Errors).const_get(name) + def error_stub(error) + { error: stub } + end + + def service_error_stub(error_code) + { http: protocol_helper.stub_error(error_code) } + end + + def http_response_stub(operation_name, data) + if data.keys.sort == [:body, :headers, :status_code] + { http: hash_to_http_resp(data) } + else + { http: data_to_http_resp(operation_name, data) } + end + end + + def hash_to_http_resp(data) + http_resp = Seahorse::Client::Http::Response.new + http_resp.status_code = data[:status_code] + http_resp.headers.update(data[:headers]) + http_resp.body = data[:body] + http_resp + end + + def data_to_http_resp(operation_name, data) + api = config.api + operation = api.operation(operation_name) + ParamValidator.validate!(operation.output, data) + protocol_helper.stub_data(api, operation, data) + end + + def protocol_helper + case config.api.metadata['protocol'] + when 'json' then Stubbing::Protocols::Json + when 'query' then Stubbing::Protocols::Query + when 'ec2' then Stubbing::Protocols::EC2 + when 'rest-json' then Stubbing::Protocols::RestJson + when 'rest-xml' then Stubbing::Protocols::RestXml + else raise "unsupported protocol" + end.new end class Stub diff --git a/aws-sdk-core/lib/aws-sdk-core/plugins/stub_responses.rb b/aws-sdk-core/lib/aws-sdk-core/plugins/stub_responses.rb index 507e919b385..f7170ce5cbf 100644 --- a/aws-sdk-core/lib/aws-sdk-core/plugins/stub_responses.rb +++ b/aws-sdk-core/lib/aws-sdk-core/plugins/stub_responses.rb @@ -28,51 +28,38 @@ def add_handlers(handlers, config) handlers.add(Handler, step: :send) if config.stub_responses end - def after_initialize(client) - # disable retries when stubbing responses - if client.config.stub_responses - client.handlers.remove(RetryErrors::Handler) - end - end - class Handler < Seahorse::Client::Handler def call(context) - response = Seahorse::Client::Response.new(context: context) - apply_stub(response, context.client.next_stub(context.operation_name)) - response + stub = context.client.next_stub(context.operation_name) + resp = Seahorse::Client::Response.new(context: context) + apply_stub(stub, resp) + resp end - private - - def apply_stub(resp, stub) - if Exception === stub - resp.error = stub - elsif Class === stub && stub.ancestors.include?(Errors::ServiceError) - resp.error = stub.new(resp.context, 'stubbed error') - elsif Class === stub && stub.ancestors.include?(Exception) - resp.error = stub.new - else - resp.data = stub - stub_http_body(resp) if streaming?(resp) + def apply_stub(stub, response) + http_resp = response.context.http_response + case + when stub[:error] then signal_error(stub[:error], http_resp) + when stub[:http] then signal_http(stub[:http], http_resp) + when stub[:data] then response.data = stub[:data] end end - def streaming?(resp) - if output = resp.context.operation.output - payload = output[:payload_member] - payload && payload[:streaming] - else - false - end + # @param [Exception] stub + # @param [Seahorse::Client::Http::Response] http_resp + def signal_error(error, http_resp) + http_resp.signal_error(error) end - def stub_http_body(resp) - payload = resp.context.operation.output[:payload] - resp.context.http_response.signal_headers(200, {}) - resp.context.http_response.signal_data(resp.data[payload]) - resp.context.http_response.signal_done - resp.data[payload] = resp.context.http_response.body + # @param [Seahorse::Client::Http::Response] stub + # @param [Seahorse::Client::Http::Response] http_resp + def signal_http(stub, http_resp) + http_resp.signal_headers(stub.status_code, stub.headers.to_h) + while chunk = stub.body.read(1024 * 1024) + http_resp.signal_data(chunk) + end + http_resp.signal_done end end diff --git a/aws-sdk-core/lib/aws-sdk-core/stubbing/protocols/ec2.rb b/aws-sdk-core/lib/aws-sdk-core/stubbing/protocols/ec2.rb index b6c057258b0..889f8223061 100644 --- a/aws-sdk-core/lib/aws-sdk-core/stubbing/protocols/ec2.rb +++ b/aws-sdk-core/lib/aws-sdk-core/stubbing/protocols/ec2.rb @@ -3,7 +3,7 @@ module Stubbing module Protocols class EC2 - def stub_response(api, operation, data) + def stub_data(api, operation, data) resp = Seahorse::Client::Http::Response.new resp.status_code = 200 resp.body = build_body(api, operation, data) @@ -13,6 +13,20 @@ def stub_response(api, operation, data) resp end + def stub_error(error_code) + http_resp = Seahorse::Client::Http::Response.new + http_resp.status_code = 400 + http_resp.body = <<-XML.strip + + + #{error_code} + stubbed-response-error-message + + + XML + http_resp + end + private def build_body(api, operation, data) diff --git a/aws-sdk-core/lib/aws-sdk-core/stubbing/protocols/json.rb b/aws-sdk-core/lib/aws-sdk-core/stubbing/protocols/json.rb index e68696bc3a9..d81f2f2b3b5 100644 --- a/aws-sdk-core/lib/aws-sdk-core/stubbing/protocols/json.rb +++ b/aws-sdk-core/lib/aws-sdk-core/stubbing/protocols/json.rb @@ -3,7 +3,7 @@ module Stubbing module Protocols class Json - def stub_response(api, operation, data) + def stub_data(api, operation, data) resp = Seahorse::Client::Http::Response.new resp.status_code = 200 resp.headers["Content-Type"] = content_type(api) @@ -12,6 +12,18 @@ def stub_response(api, operation, data) resp end + def stub_error(error_code) + http_resp = Seahorse::Client::Http::Response.new + http_resp.status_code = 400 + http_resp.body = <<-JSON.strip +{ + "code": #{error_code.inspect}, + "message": "stubbed-response-error-message" +} + JSON + http_resp + end + private def content_type(api) diff --git a/aws-sdk-core/lib/aws-sdk-core/stubbing/protocols/query.rb b/aws-sdk-core/lib/aws-sdk-core/stubbing/protocols/query.rb index 5c9fd18680d..46ed456aba9 100644 --- a/aws-sdk-core/lib/aws-sdk-core/stubbing/protocols/query.rb +++ b/aws-sdk-core/lib/aws-sdk-core/stubbing/protocols/query.rb @@ -3,15 +3,16 @@ module Stubbing module Protocols class Query - def stub_response(api, operation, data) + def stub_data(api, operation, data) resp = Seahorse::Client::Http::Response.new resp.status_code = 200 resp.body = build_body(api, operation, data) - resp.headers['Content-Length'] = resp.body.size - resp.headers['Content-Type'] = 'text/xml' resp end + def stub_error(error_code) + end + private def build_body(api, operation, data) diff --git a/aws-sdk-core/lib/aws-sdk-core/stubbing/protocols/rest.rb b/aws-sdk-core/lib/aws-sdk-core/stubbing/protocols/rest.rb index 68e69866612..e67883d37bc 100644 --- a/aws-sdk-core/lib/aws-sdk-core/stubbing/protocols/rest.rb +++ b/aws-sdk-core/lib/aws-sdk-core/stubbing/protocols/rest.rb @@ -5,7 +5,7 @@ class Rest include Seahorse::Model::Shapes - def stub_response(api, operation, data) + def stub_data(api, operation, data) resp = new_http_response apply_status_code(operation, resp, data) apply_headers(operation, resp, data) diff --git a/aws-sdk-core/lib/aws-sdk-core/stubbing/protocols/rest_json.rb b/aws-sdk-core/lib/aws-sdk-core/stubbing/protocols/rest_json.rb index a57eaa73e56..25fc7833326 100644 --- a/aws-sdk-core/lib/aws-sdk-core/stubbing/protocols/rest_json.rb +++ b/aws-sdk-core/lib/aws-sdk-core/stubbing/protocols/rest_json.rb @@ -7,6 +7,18 @@ def body_for(_, _, rules, data) Aws::Json::Builder.new(rules).serialize(data) end + def stub_error(error_code) + http_resp = Seahorse::Client::Http::Response.new + http_resp.status_code = 400 + http_resp.body = <<-JSON.strip +{ + "code": #{error_code.inspect}, + "message": "stubbed-response-error-message" +} + JSON + http_resp + end + end end end diff --git a/aws-sdk-core/lib/aws-sdk-core/stubbing/protocols/rest_xml.rb b/aws-sdk-core/lib/aws-sdk-core/stubbing/protocols/rest_xml.rb index bde48f0a5e1..78e4215295a 100644 --- a/aws-sdk-core/lib/aws-sdk-core/stubbing/protocols/rest_xml.rb +++ b/aws-sdk-core/lib/aws-sdk-core/stubbing/protocols/rest_xml.rb @@ -10,10 +10,24 @@ def body_for(api, operation, rules, data) 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, pad:' ').to_xml(data) + Xml::Builder.new(rules, target:xml).to_xml(data) xml.join end + def stub_error(error_code) + http_resp = Seahorse::Client::Http::Response.new + http_resp.status_code = 400 + http_resp.body = <<-XML.strip + + + #{error_code} + stubbed-response-error-message + + + XML + http_resp + end + def xmlns(api) api.metadata['xmlNamespace'] end diff --git a/aws-sdk-core/spec/aws/stubbing/protocols/ec2_spec.rb b/aws-sdk-core/spec/aws/stubbing/protocols/ec2_spec.rb index 258b4933ee1..6675f3a5db7 100644 --- a/aws-sdk-core/spec/aws/stubbing/protocols/ec2_spec.rb +++ b/aws-sdk-core/spec/aws/stubbing/protocols/ec2_spec.rb @@ -5,7 +5,7 @@ module Aws module Stubbing module Protocols describe EC2 do - describe '#stub_response' do + describe '#stub_data' do def normalize(xml) result = '' @@ -18,13 +18,13 @@ def normalize(xml) let(:operation) { api.operation(:describe_instances) } it 'returns a stubbed http response' do - resp = EC2.new.stub_response(api, operation, {}) + resp = EC2.new.stub_data(api, operation, {}) expect(resp).to be_kind_of(Seahorse::Client::Http::Response) expect(resp.status_code).to eq(200) end it 'populates the content-type header' do - resp = EC2.new.stub_response(api, operation, {}) + resp = EC2.new.stub_data(api, operation, {}) expect(resp.headers['content-type']).to eq('text/xml;charset=UTF-8') expect(resp.headers['server']).to eq('AmazonEC2') end @@ -59,7 +59,7 @@ def normalize(xml) } ] } - resp = EC2.new.stub_response(api, operation, data) + resp = EC2.new.stub_data(api, operation, data) expect(normalize(resp.body.string)).to eq(normalize(<<-XML)) stubbed-request-id diff --git a/aws-sdk-core/spec/aws/stubbing/protocols/json_spec.rb b/aws-sdk-core/spec/aws/stubbing/protocols/json_spec.rb index 9353714331e..b35d38a1189 100644 --- a/aws-sdk-core/spec/aws/stubbing/protocols/json_spec.rb +++ b/aws-sdk-core/spec/aws/stubbing/protocols/json_spec.rb @@ -5,7 +5,7 @@ module Aws module Stubbing module Protocols describe Json do - describe '#stub_response' do + describe '#stub_data' do def normalize(json) JSON.pretty_generate(JSON.load(json), indent: ' ') @@ -16,13 +16,13 @@ def normalize(json) let(:operation) { api.operation(:describe_table) } it 'returns a stubbed http response' do - resp = Json.new.stub_response(api, operation, {}) + resp = Json.new.stub_data(api, operation, {}) expect(resp).to be_kind_of(Seahorse::Client::Http::Response) expect(resp.status_code).to eq(200) end it 'populates the expected headers' do - resp = Json.new.stub_response(api, operation, {}) + resp = Json.new.stub_data(api, operation, {}) expect(resp.headers.to_h).to eq({ "content-type" => "application/x-amz-json-", "x-amzn-requestid" => "stubbed-request-id", @@ -57,7 +57,7 @@ def normalize(json) } } } - resp = Json.new.stub_response(api, operation, data) + resp = Json.new.stub_data(api, operation, data) expect(normalize(resp.body.string)).to eq(normalize(<<-JSON)) { "Table": { diff --git a/aws-sdk-core/spec/aws/stubbing/protocols/query_spec.rb b/aws-sdk-core/spec/aws/stubbing/protocols/query_spec.rb index 034bd5dfad9..72dfede2335 100644 --- a/aws-sdk-core/spec/aws/stubbing/protocols/query_spec.rb +++ b/aws-sdk-core/spec/aws/stubbing/protocols/query_spec.rb @@ -5,7 +5,7 @@ module Aws module Stubbing module Protocols describe Query do - describe '#stub_response' do + describe '#stub_data' do def normalize(xml) result = '' @@ -18,13 +18,13 @@ def normalize(xml) let(:operation) { api.operation(:list_users) } it 'returns a stubbed http response' do - resp = Query.new.stub_response(api, operation, {}) + resp = Query.new.stub_data(api, operation, {}) expect(resp).to be_kind_of(Seahorse::Client::Http::Response) expect(resp.status_code).to eq(200) end it 'populates the content-type header' do - resp = Query.new.stub_response(api, operation, {}) + resp = Query.new.stub_data(api, operation, {}) expect(resp.headers['content-type']).to eq('text/xml') end @@ -42,7 +42,7 @@ def normalize(xml) } ] } - resp = Query.new.stub_response(api, operation, data) + resp = Query.new.stub_data(api, operation, data) expect(normalize(resp.body.string)).to eq(normalize(<<-XML)) diff --git a/aws-sdk-core/spec/aws/stubbing/protocols/rest_json_spec.rb b/aws-sdk-core/spec/aws/stubbing/protocols/rest_json_spec.rb index 71dccfada47..372cb8182e9 100644 --- a/aws-sdk-core/spec/aws/stubbing/protocols/rest_json_spec.rb +++ b/aws-sdk-core/spec/aws/stubbing/protocols/rest_json_spec.rb @@ -5,7 +5,7 @@ module Aws module Stubbing module Protocols describe RestJson do - describe '#stub_response' do + describe '#stub_data' do def normalize(json) JSON.pretty_generate(JSON.load(json), indent: ' ') @@ -16,13 +16,13 @@ def normalize(json) let(:operation) { api.operation(:list_vaults) } it 'returns a stubbed http response' do - resp = RestJson.new.stub_response(api, operation, {}) + resp = RestJson.new.stub_data(api, operation, {}) expect(resp).to be_kind_of(Seahorse::Client::Http::Response) expect(resp.status_code).to eq(200) end it 'populates the expected headers' do - resp = RestJson.new.stub_response(api, operation, {}) + resp = RestJson.new.stub_data(api, operation, {}) expect(resp.headers.to_h).to eq({ "x-amzn-requestid" => "stubbed-request-id", }) @@ -42,7 +42,7 @@ def normalize(json) } ] } - resp = RestJson.new.stub_response(api, operation, data) + resp = RestJson.new.stub_data(api, operation, data) expect(normalize(resp.body.string)).to eq(normalize(<<-JSON)) { "VaultList": [ @@ -72,7 +72,7 @@ def normalize(json) archive_description: 'description', } operation = api.operation(:get_job_output) - resp = RestJson.new.stub_response(api, operation, params) + resp = RestJson.new.stub_data(api, operation, params) expect(resp.status_code).to eq(201) expect(resp.headers['x-amz-sha256-tree-hash']).to eq('checksum') expect(resp.headers['Content-Range']).to eq('range') @@ -90,7 +90,7 @@ def normalize(json) body: data, } operation = api.operation(:get_job_output) - resp = RestJson.new.stub_response(api, operation, params) + resp = RestJson.new.stub_data(api, operation, params) expect(resp.status_code).to eq(200) expect(resp.body).to be(data) expect(resp.body.read).to eq('DATA') @@ -103,7 +103,7 @@ def normalize(json) } } operation = api.operation(:get_vault_access_policy) - resp = RestJson.new.stub_response(api, operation, params) + resp = RestJson.new.stub_data(api, operation, params) expect(resp.status_code).to eq(200) expect(normalize(resp.body.string)).to eq(normalize(<<-JSON)) { diff --git a/aws-sdk-core/spec/aws/stubbing/protocols/rest_xml_spec.rb b/aws-sdk-core/spec/aws/stubbing/protocols/rest_xml_spec.rb index 0da439a3bc8..5edc5996325 100644 --- a/aws-sdk-core/spec/aws/stubbing/protocols/rest_xml_spec.rb +++ b/aws-sdk-core/spec/aws/stubbing/protocols/rest_xml_spec.rb @@ -5,7 +5,7 @@ module Aws module Stubbing module Protocols describe RestXml do - describe '#stub_response' do + describe '#stub_data' do def normalize(xml) result = '' @@ -22,13 +22,13 @@ def normalize(xml) end it 'returns a stubbed http response' do - resp = RestXml.new.stub_response(api, operation, {}) + resp = RestXml.new.stub_data(api, operation, {}) expect(resp).to be_kind_of(Seahorse::Client::Http::Response) expect(resp.status_code).to eq(200) end it 'populates the expected headers' do - resp = RestXml.new.stub_response(api, operation, {}) + resp = RestXml.new.stub_data(api, operation, {}) expect(resp.headers.to_h).to eq({ "x-amzn-requestid" => "stubbed-request-id", }) @@ -48,7 +48,7 @@ def normalize(xml) id: 'owner-id', } } - resp = RestXml.new.stub_response(api, operation, data) + resp = RestXml.new.stub_data(api, operation, data) expect(normalize(resp.body.string)).to eq(normalize(<<-XML)) @@ -72,7 +72,7 @@ def normalize(xml) etag: 'etag-value', } operation = api.operation(:get_object) - resp = RestXml.new.stub_response(api, operation, params) + resp = RestXml.new.stub_data(api, operation, params) expect(resp.status_code).to eq(200) expect(resp.headers['ETag']).to eq('etag-value') expect(resp.body).to be(data) @@ -84,7 +84,7 @@ def normalize(xml) policy: 'policy-document' } operation = api.operation(:get_bucket_policy) - resp = RestXml.new.stub_response(api, operation, params) + resp = RestXml.new.stub_data(api, operation, params) expect(resp.status_code).to eq(200) expect(normalize(resp.body.string)).to eq(normalize(<<-JSON)) { From 1a965a4c09c8e35793e3f07f15dcccacf44c4dc5 Mon Sep 17 00:00:00 2001 From: Trevor Rowe Date: Wed, 3 Jun 2015 13:03:13 -0700 Subject: [PATCH 081/101] doc updates --- aws-sdk-core/lib/aws-sdk-core/client_stubs.rb | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/aws-sdk-core/lib/aws-sdk-core/client_stubs.rb b/aws-sdk-core/lib/aws-sdk-core/client_stubs.rb index 5adde74792f..0c251529d89 100644 --- a/aws-sdk-core/lib/aws-sdk-core/client_stubs.rb +++ b/aws-sdk-core/lib/aws-sdk-core/client_stubs.rb @@ -58,9 +58,7 @@ def initialize(*args) # ## Stubbing HTTP Responses # # As an alternative to providing the response data, you can provide - # an HTTP response. The SDK will use the response status code, headers, - # and body as if it were received over the wire. It will parse it for - # errors and data. + # an HTTP response. # # client.stub_responses(:get_object, { # status_code: 200, @@ -68,12 +66,12 @@ def initialize(*args) # body: "...", # }) # - # To stub a HTTP response, pass a Hash with the following three + # To stub a HTTP response, pass a Hash with all three of the following # keys set: # - # * `:status_code` - - # * `:headers` - Hash - # * `:body` - + # * **`:status_code`** - - The HTTP status code + # * **`:headers`** - Hash - A hash of HTTP header keys and values + # * **`:body`** - - The HTTP response body. # # ## Stubbing Multiple Responses # From 74880e954aac666f290be9505105fe87c7c83ffc Mon Sep 17 00:00:00 2001 From: Trevor Rowe Date: Wed, 3 Jun 2015 15:02:44 -0700 Subject: [PATCH 082/101] No longer converting Strings to IO objects for BlobShapes. --- aws-sdk-core/lib/aws-sdk-core/param_converter.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/aws-sdk-core/lib/aws-sdk-core/param_converter.rb b/aws-sdk-core/lib/aws-sdk-core/param_converter.rb index 30037302c6e..9f09e3db4c9 100644 --- a/aws-sdk-core/lib/aws-sdk-core/param_converter.rb +++ b/aws-sdk-core/lib/aws-sdk-core/param_converter.rb @@ -199,7 +199,7 @@ def each_base_class(shape_class, &block) add(BlobShape, IO) add(BlobShape, Tempfile) add(BlobShape, StringIO) - add(BlobShape, String) { |str| StringIO.new(str) } + add(BlobShape, String) end end From 86674a8640908d69c7f1dcd4757ff5d6df1118e8 Mon Sep 17 00:00:00 2001 From: Trevor Rowe Date: Thu, 4 Jun 2015 16:10:36 -0700 Subject: [PATCH 083/101] WIP --- aws-sdk-core/lib/aws-sdk-core/client_stubs.rb | 15 ++- .../aws-sdk-core/plugins/request_signer.rb | 1 + .../aws-sdk-core/plugins/stub_responses.rb | 14 ++- aws-sdk-core/spec/aws/client_spec.rb | 25 ++--- aws-sdk-core/spec/aws/param_converter_spec.rb | 4 +- .../spec/aws/stubbing/protocols/query_spec.rb | 5 - .../instance/decrypt_windows_password_spec.rb | 2 +- .../services/s3/object/upload_file_spec.rb | 39 ++++--- .../spec/services/sqs/queue_poller_spec.rb | 102 ++++++++++-------- 9 files changed, 116 insertions(+), 91 deletions(-) diff --git a/aws-sdk-core/lib/aws-sdk-core/client_stubs.rb b/aws-sdk-core/lib/aws-sdk-core/client_stubs.rb index 0c251529d89..c8734064fa8 100644 --- a/aws-sdk-core/lib/aws-sdk-core/client_stubs.rb +++ b/aws-sdk-core/lib/aws-sdk-core/client_stubs.rb @@ -116,24 +116,25 @@ def next_stub(operation_name) @stub_mutex.synchronize do stubs = @stubs[operation_name.to_sym] || [] case stubs.length - when 0 then { data: new_stub(operation_name.to_sym) } + when 0 then { data: stub_data(operation_name.to_sym) } when 1 then stubs.first else stubs.shift end end end - private - - def new_stub(operation_name, data = nil) + # @api private + def stub_data(operation_name, data = nil) Stub.new(operation(operation_name).output).format(data || {}) end + private + def apply_stubs(operation_name, stubs) @stub_mutex.synchronize do @stubs[operation_name.to_sym] = stubs.map do |stub| case stub - when Exception then error_stub(stub) + when Exception, Class then { error: stub } when String then service_error_stub(stub) when Hash then http_response_stub(operation_name, stub) when Seahorse::Client::Http::Response then { http: stub } @@ -143,10 +144,6 @@ def apply_stubs(operation_name, stubs) end end - def error_stub(error) - { error: stub } - end - def service_error_stub(error_code) { http: protocol_helper.stub_error(error_code) } end diff --git a/aws-sdk-core/lib/aws-sdk-core/plugins/request_signer.rb b/aws-sdk-core/lib/aws-sdk-core/plugins/request_signer.rb index 730576a9f69..56e872d50b1 100644 --- a/aws-sdk-core/lib/aws-sdk-core/plugins/request_signer.rb +++ b/aws-sdk-core/lib/aws-sdk-core/plugins/request_signer.rb @@ -34,6 +34,7 @@ class RequestSigner < Seahorse::Client::Plugin option(:profile) option(:credentials) do |config| + puts "HERE" CredentialProviderChain.new(config).resolve end diff --git a/aws-sdk-core/lib/aws-sdk-core/plugins/stub_responses.rb b/aws-sdk-core/lib/aws-sdk-core/plugins/stub_responses.rb index f7170ce5cbf..0d181776e7d 100644 --- a/aws-sdk-core/lib/aws-sdk-core/plugins/stub_responses.rb +++ b/aws-sdk-core/lib/aws-sdk-core/plugins/stub_responses.rb @@ -19,6 +19,7 @@ class StubResponses < Seahorse::Client::Plugin end option(:credentials) do |config| + puts "HERE2" if config.stub_responses Credentials.new('stubbed-akid', 'stubbed-secret') end @@ -28,6 +29,12 @@ def add_handlers(handlers, config) handlers.add(Handler, step: :send) if config.stub_responses end + def after_initialize(client) + if client.config.stub_responses + client.handlers.remove(RetryErrors::Handler) + end + end + class Handler < Seahorse::Client::Handler def call(context) @@ -49,7 +56,11 @@ def apply_stub(stub, response) # @param [Exception] stub # @param [Seahorse::Client::Http::Response] http_resp def signal_error(error, http_resp) - http_resp.signal_error(error) + if Exception === error + http_resp.signal_error(error) + else + http_resp.signal_error(error.new) + end end # @param [Seahorse::Client::Http::Response] stub @@ -59,6 +70,7 @@ def signal_http(stub, http_resp) while chunk = stub.body.read(1024 * 1024) http_resp.signal_data(chunk) end + stub.body.rewind http_resp.signal_done end diff --git a/aws-sdk-core/spec/aws/client_spec.rb b/aws-sdk-core/spec/aws/client_spec.rb index ae2aa37586a..0dab3537c11 100644 --- a/aws-sdk-core/spec/aws/client_spec.rb +++ b/aws-sdk-core/spec/aws/client_spec.rb @@ -2,15 +2,16 @@ module Aws describe Client do + describe '#stub_responses' do - let(:options) {{ - stub_responses: true, - region: 'us-east-1', - access_key_id: 'akid', - secret_access_key: 'secret', - }} + let(:options) {{ + stub_responses: true, + region: 'us-east-1', + access_key_id: 'akid', + secret_access_key: 'secret', + }} - describe '#stub' do + let(:client) { S3::Client.new(options) } it 'raises an error if stubbed_responses is not enabled' do client = S3::Client.new(options.merge(stub_responses: false)) @@ -20,14 +21,12 @@ module Aws end it 'returns stubbed responses without making a request' do - client = S3::Client.new(options) client.stub_responses(:list_buckets, buckets:[{name:'foo'}]) resp = client.list_buckets expect(resp.buckets.map(&:name)).to eq(['foo']) end it 'accepts a list of stubs' do - client = S3::Client.new(options) client.stub_responses(:list_buckets, [ {buckets:[{name:'foo'}]}, {buckets:[{name:'foo'},{name:'bar'}]} @@ -37,14 +36,12 @@ module Aws end it 'returns the same stub multiple times' do - client = S3::Client.new(options) client.stub_responses(:list_buckets, buckets:[{name:'foo'}]) expect(client.list_buckets.buckets.map(&:name)).to eq(%w(foo)) expect(client.list_buckets.buckets.map(&:name)).to eq(%w(foo)) end it 'returns the last stub after mulitple times' do - client = S3::Client.new(options) client.stub_responses(:list_buckets, [ {buckets:[{name:'foo'}]}, {buckets:[{name:'foo'},{name:'bar'}]} @@ -55,13 +52,12 @@ module Aws end it 'can stub errors' do - client = S3::Client.new(options) client.stub_responses(:head_bucket, ['NotFound', StandardError, RuntimeError.new('oops')]) expect { client.head_bucket(bucket:'aws-sdk') - }.to raise_error(S3::Errors::NotFound, 'stubbed error') + }.to raise_error(S3::Errors::NotFound, 'stubbed-response-error-message') expect { - client.head_bucket(bucket:'aws-sdk') + r = client.head_bucket(bucket:'aws-sdk') }.to raise_error(StandardError) expect { client.head_bucket(bucket:'aws-sdk') @@ -69,7 +65,6 @@ module Aws end it 'can stub errors and data' do - client = S3::Client.new(options) client.stub_responses(:head_bucket, ['NotFound', {}]) expect { client.head_bucket(bucket:'aws-sdk') diff --git a/aws-sdk-core/spec/aws/param_converter_spec.rb b/aws-sdk-core/spec/aws/param_converter_spec.rb index 1f6e93467f9..1753f4236cb 100644 --- a/aws-sdk-core/spec/aws/param_converter_spec.rb +++ b/aws-sdk-core/spec/aws/param_converter_spec.rb @@ -249,8 +249,8 @@ module Aws file.delete end - it 'accepts strings and returns StringIO' do - expect(ParamConverter.c(shape_class, 'abc').read).to eq('abc') + it 'accepts strings' do + expect(ParamConverter.c(shape_class, 'abc')).to eq('abc') end end diff --git a/aws-sdk-core/spec/aws/stubbing/protocols/query_spec.rb b/aws-sdk-core/spec/aws/stubbing/protocols/query_spec.rb index 72dfede2335..05211b4e8fc 100644 --- a/aws-sdk-core/spec/aws/stubbing/protocols/query_spec.rb +++ b/aws-sdk-core/spec/aws/stubbing/protocols/query_spec.rb @@ -23,11 +23,6 @@ def normalize(xml) expect(resp.status_code).to eq(200) end - it 'populates the content-type header' do - resp = Query.new.stub_data(api, operation, {}) - expect(resp.headers['content-type']).to eq('text/xml') - end - it 'populates the body with the stub data' do now = Time.now data = { diff --git a/aws-sdk-resources/spec/services/ec2/instance/decrypt_windows_password_spec.rb b/aws-sdk-resources/spec/services/ec2/instance/decrypt_windows_password_spec.rb index 325608f19af..cca2981397a 100644 --- a/aws-sdk-resources/spec/services/ec2/instance/decrypt_windows_password_spec.rb +++ b/aws-sdk-resources/spec/services/ec2/instance/decrypt_windows_password_spec.rb @@ -19,7 +19,7 @@ module EC2 }) expect(client).to receive(:get_password_data). with(instance_id:'id'). - and_return(client.next_stub(:get_password_data)) + and_return(client.stub_data(:get_password_data)) instance = Instance.new('id', client: client) expect(instance.decrypt_windows_password(keypair)).to eq('password') end diff --git a/aws-sdk-resources/spec/services/s3/object/upload_file_spec.rb b/aws-sdk-resources/spec/services/s3/object/upload_file_spec.rb index 948da3caa0f..1a1e8dfc471 100644 --- a/aws-sdk-resources/spec/services/s3/object/upload_file_spec.rb +++ b/aws-sdk-resources/spec/services/s3/object/upload_file_spec.rb @@ -77,22 +77,38 @@ module S3 describe 'large objects' do before(:each) do - client.stub_responses(:create_multipart_upload, upload_id: 'upload-id') - client.stub_responses(:upload_part, [ - { etag: 'etag-1' }, - { etag: 'etag-2' }, - { etag: 'etag-3' }, - { etag: 'etag-4' }, - ]) + client.stub_responses(:create_multipart_upload, { + upload_id: 'upload-id', + }) end it 'uses multipart APIs for objects >= 15MB' do - create_resp = double('create-resp', upload_id:'upload-id') + client.stub_responses(:create_multipart_upload, upload_id:'upload-id') + client.stub_responses(:upload_part, etag:'etag-1') + client.stub_responses(:upload_part, etag:'etag-2') + client.stub_responses(:upload_part, etag:'etag-3') + client.stub_responses(:upload_part, etag:'etag-4') + + # record actual requests made + requests = [] + client.handle_request do |context| + requests << { name:context.operation_name, params:context.params } + end + + object.upload_file(seventeen_meg_file, content_type: 'text/plain') + + expect(requests).to eq([ + { + name: :create_multipart_upload, + params: {}, + }, + ]) + expect(client).to receive(:create_multipart_upload). with(bucket:'bucket', key:'key', content_type:'text/plain'). - and_return(client.next_stub(:create_multipart_upload)) + and_return(create_resp) (1..3).each do |n| expect(client).to receive(:upload_part).with( @@ -105,7 +121,7 @@ module S3 offset: (n - 1) * 5 * one_meg, size: 5 * one_meg ) - ).and_return(client.next_stub(:upload_part)) + ).and_return(client.stub_data(:upload_part, etag: "etag-#{n}")) end expect(client).to receive(:upload_part).with( bucket: 'bucket', @@ -117,7 +133,7 @@ module S3 offset: 15 * one_meg, size: 2 * one_meg ) - ).and_return(client.next_stub(:upload_part)) + ).and_return(client.stub_data(:upload_part, etag:'etag-4')) expect(client).to receive(:complete_multipart_upload).with( bucket: 'bucket', @@ -132,7 +148,6 @@ module S3 ] } ) - object.upload_file(seventeen_meg_file, content_type: 'text/plain') end it 'raises an error if the multipart threshold is too small' do diff --git a/aws-sdk-resources/spec/services/sqs/queue_poller_spec.rb b/aws-sdk-resources/spec/services/sqs/queue_poller_spec.rb index 2e98c6e106f..28849fcd59a 100644 --- a/aws-sdk-resources/spec/services/sqs/queue_poller_spec.rb +++ b/aws-sdk-resources/spec/services/sqs/queue_poller_spec.rb @@ -12,6 +12,15 @@ module SQS let(:poller) { QueuePoller.new(queue_url, options) } + def sample_message(n = nil) + suffix = n ? "-#{n}" : '' + { + message_id: "id#{suffix}", + receipt_handle:"rh#{suffix}", + body: "body#{suffix}", + } + end + describe 'configuration' do it 'raises an error on unknown configuration options' do @@ -81,7 +90,7 @@ module SQS visibility_timeout: nil, attribute_names: ['All'], message_attribute_names: ['All'], - }).and_return(client.next_stub(:receive_message)) + }).and_return(client.stub_data(:receive_message)) poller.before_request do |stats| throw :stop_polling if stats.request_count >= 2 end @@ -90,29 +99,30 @@ module SQS it 'yields received messages to the block' do client.stub_responses(:receive_message, [ - { messages: [{ body: 'msg-1-body' }] }, + { messages: [sample_message] }, { messages: [] }, ]) yielded = nil poller.poll(idle_timeout: 0) do |msg| yielded = msg end - expect(yielded.body).to eq('msg-1-body') + expect(yielded.body).to eq('body') end it 'yields an array when max messages is greater than 1' do client.stub_responses(:receive_message, [ { messages: [ - { body: 'msg-1-body' }, - { body: 'msg-2-body' } - ] }, + sample_message(1), + sample_message(2), + ] + }, { messages: [] }, ]) yielded = nil poller.poll(idle_timeout: 0, max_number_of_messages:2) do |messages| yielded = messages end - expect(yielded.map(&:body)).to eq(%w(msg-1-body msg-2-body)) + expect(yielded.map(&:body)).to eq(%w(body-1 body-2)) end describe 'message deletion' do @@ -121,11 +131,11 @@ module SQS expect(client).to receive(:delete_message_batch).with({ queue_url: queue_url, entries: [ - { id: 'id1', receipt_handle: 'rh1' }, + { id: 'id', receipt_handle: 'rh' }, ] }) client.stub_responses(:receive_message, [ - { messages: [{ message_id: 'id1', receipt_handle: 'rh1' }] }, + { messages: [sample_message] }, { messages: [] }, ]) poller.poll(idle_timeout: 0) { |msg| } @@ -135,14 +145,14 @@ module SQS expect(client).to receive(:delete_message_batch).with({ queue_url: queue_url, entries: [ - { id: 'id1', receipt_handle: 'rh1' }, - { id: 'id2', receipt_handle: 'rh2' }, + { id: 'id-1', receipt_handle: 'rh-1' }, + { id: 'id-2', receipt_handle: 'rh-2' }, ] }) client.stub_responses(:receive_message, [ { messages: [ - { message_id: 'id1', receipt_handle: 'rh1', body: '' }, - { message_id: 'id2', receipt_handle: 'rh2', body: '' }, + sample_message(1), + sample_message(2), ] }, { messages: [] }, ]) @@ -152,7 +162,7 @@ module SQS it 'can skip default delete behavior' do expect(client).not_to receive(:delete_message_batch) client.stub_responses(:receive_message, [ - { messages: [{ message_id: 'id1', receipt_handle: 'rh1' }] }, + { messages: [sample_message] }, { messages: [] }, ]) poller.poll(idle_timeout: 0, skip_delete: true) { |msg| } @@ -161,7 +171,7 @@ module SQS it 'skips delete when :skip_delete is thrown' do expect(client).not_to receive(:delete_message_batch) client.stub_responses(:receive_message, [ - { messages: [{ message_id: 'id1', receipt_handle: 'rh1' }] }, + { messages: [sample_message] }, { messages: [] }, ]) poller.poll(idle_timeout: 0) { |msg| throw :skip_delete } @@ -170,10 +180,10 @@ module SQS it 'provides the ability to manually delete messages' do expect(client).to receive(:delete_message).with({ queue_url: queue_url, - receipt_handle: 'rh1', + receipt_handle: 'rh', }) client.stub_responses(:receive_message, [ - { messages: [{ message_id: 'id1', receipt_handle: 'rh1' }] }, + { messages: [sample_message] }, { messages: [] }, ]) poller.poll(idle_timeout: 0, skip_delete: true) do |msg| @@ -185,14 +195,14 @@ module SQS expect(client).to receive(:delete_message_batch).with({ queue_url: queue_url, entries: [ - { id: 'id1', receipt_handle: 'rh1' }, - { id: 'id2', receipt_handle: 'rh2' }, + { id: 'id-1', receipt_handle: 'rh-1' }, + { id: 'id-2', receipt_handle: 'rh-2' }, ] }) client.stub_responses(:receive_message, [ { messages: [ - { message_id: 'id1', receipt_handle: 'rh1', body: '' }, - { message_id: 'id2', receipt_handle: 'rh2', body: '' }, + sample_message(1), + sample_message(2), ] }, { messages: [] }, ]) @@ -206,7 +216,7 @@ module SQS it 'provides a method to update the visibility timeout of a message' do client.stub_responses(:receive_message, [ - { messages: [{ receipt_handle: 'rh1' }] }, + { messages: [sample_message] }, { messages: [] }, ]) resp = nil @@ -216,7 +226,7 @@ module SQS expect(resp.context.operation_name.to_s).to eq('change_message_visibility') expect(resp.context.params).to eq({ queue_url: queue_url, - receipt_handle: 'rh1', + receipt_handle: 'rh', visibility_timeout: 60, }) end @@ -227,7 +237,7 @@ module SQS it 'polls until :stop_polling is thrown from #before_request' do expect(client).to receive(:receive_message).exactly(10).times. - and_return(client.next_stub(:receive_message)) + and_return(client.stub_data(:receive_message)) poller.before_request do |stats| throw :stop_polling if stats.request_count == 10 end @@ -238,7 +248,7 @@ module SQS now = Time.now one_minute_later = now + 61 expect(client).to receive(:receive_message).exactly(10).times. - and_return(client.next_stub(:receive_message)) + and_return(client.stub_data(:receive_message)) poller.before_request do |stats| if stats.request_count == 9 allow(Time).to receive(:now).and_return(one_minute_later) @@ -253,11 +263,11 @@ module SQS it 'counts the number of requests made' do client.stub_responses(:receive_message, [ - { messages: [{ body: 'msg-1-body' }] }, + { messages: [sample_message] }, { messages: [] }, - { messages: [{ body: 'msg-2-body' }] }, + { messages: [sample_message] }, { messages: [] }, - { messages: [{ body: 'msg-3-body' }] }, + { messages: [sample_message] }, ]) poller.before_request do |stats| throw :stop_polling if stats.received_message_count == 3 @@ -268,11 +278,11 @@ module SQS it 'counts the number of messages yielded in single mode' do client.stub_responses(:receive_message, [ - { messages: [{ body: 'msg-1-body' }] }, - { messages: [{ body: 'msg-2-body' }] }, - { messages: [{ body: 'msg-3-body' }] }, - { messages: [{ body: 'msg-4-body' }] }, - { messages: [{ body: 'msg-5-body' }] }, + { messages: [sample_message] }, + { messages: [sample_message] }, + { messages: [sample_message] }, + { messages: [sample_message] }, + { messages: [sample_message] }, { messages: [] }, ]) stats = poller.poll(idle_timeout: 0) { |msg| } @@ -282,14 +292,14 @@ module SQS it 'counts the number of messages yielded in batch mode' do client.stub_responses(:receive_message, [ { messages: [ - { body: 'msg-1-body' }, - { body: 'msg-2-body' }, - { body: 'msg-3-body' }, + sample_message, + sample_message, + sample_message, ] }, { messages: [ - { body: 'msg-4-body' }, - { body: 'msg-5-body' }, - { body: 'msg-6-body' }, + sample_message, + sample_message, + sample_message, ] }, { messages: [] }, ]) @@ -299,7 +309,7 @@ module SQS it 'tracks when a message was most recently received' do client.stub_responses(:receive_message, [ - { messages: [{ body: 'msg-1-body' }] }, + { messages: [sample_message] }, { messages: [] }, ]) stats = poller.poll(idle_timeout: 0) { |msg| } @@ -327,9 +337,9 @@ module SQS it 'yields a stats object to #poll' do client.stub_responses(:receive_message, [ - { messages: [{ body: 'msg-1-body' }] }, - { messages: [{ body: 'msg-2-body' }] }, - { messages: [{ body: 'msg-3-body' }] }, + { messages: [sample_message] }, + { messages: [sample_message] }, + { messages: [sample_message] }, { messages: [] }, ]) yielded = nil @@ -344,9 +354,9 @@ module SQS it 'returns a stats object' do client.stub_responses(:receive_message, [ - { messages: [{ body: 'msg-1-body' }] }, - { messages: [{ body: 'msg-2-body' }] }, - { messages: [{ body: 'msg-3-body' }] }, + { messages: [sample_message] }, + { messages: [sample_message] }, + { messages: [sample_message] }, { messages: [] }, ]) stats = poller.poll(idle_timeout: 0) { |msg| } From b56661c58b15ca33220ff2f16cc0bdbb00efdc2f Mon Sep 17 00:00:00 2001 From: Trevor Rowe Date: Fri, 5 Jun 2015 10:55:45 -0700 Subject: [PATCH 084/101] Updated tests to work with stubbing changes. --- .../instance/decrypt_windows_password_spec.rb | 7 +- .../services/s3/object/upload_file_spec.rb | 78 +++---------------- 2 files changed, 13 insertions(+), 72 deletions(-) diff --git a/aws-sdk-resources/spec/services/ec2/instance/decrypt_windows_password_spec.rb b/aws-sdk-resources/spec/services/ec2/instance/decrypt_windows_password_spec.rb index cca2981397a..e7c6ff1a33b 100644 --- a/aws-sdk-resources/spec/services/ec2/instance/decrypt_windows_password_spec.rb +++ b/aws-sdk-resources/spec/services/ec2/instance/decrypt_windows_password_spec.rb @@ -14,12 +14,11 @@ module EC2 } it 'decrypts the password using the given key pair' do - client.stub_responses(:get_password_data, { - password_data: "dALtWVWEb9LL1rBz0oluXvTK5sHcJzzS4PtiiX/17pOFs0D6+JV7mWMPG9I4\ngRoW64SZ7hmRz7fFRuJcR5sDzfmgDs6Fimd456WR9/HJ29XBv1HyPHN7EvtR\nxJ4/+iXXhVWrQeZy8aCGhcqQhRw5/xrHE7rpc014rzxRtqybqKoeEJPV+4WP\ngUWyo3BD0ui06B7zLJL2sYfALphelAYzlzehwD63M0nuovleuMeVSJKcqqR9\nuMiXvm8nogZhLUEFvUucWxSHECB9cdTH3rJ0ANs+kl4hSgV/9KX/I3MlQYuY\ngLR4DUSpuYj/XTMyl+zjxPAPbk63zTpMd+T0NKgeWA==\n" - }) expect(client).to receive(:get_password_data). with(instance_id:'id'). - and_return(client.stub_data(:get_password_data)) + and_return(client.stub_data(:get_password_data, + password_data: "dALtWVWEb9LL1rBz0oluXvTK5sHcJzzS4PtiiX/17pOFs0D6+JV7mWMPG9I4\ngRoW64SZ7hmRz7fFRuJcR5sDzfmgDs6Fimd456WR9/HJ29XBv1HyPHN7EvtR\nxJ4/+iXXhVWrQeZy8aCGhcqQhRw5/xrHE7rpc014rzxRtqybqKoeEJPV+4WP\ngUWyo3BD0ui06B7zLJL2sYfALphelAYzlzehwD63M0nuovleuMeVSJKcqqR9\nuMiXvm8nogZhLUEFvUucWxSHECB9cdTH3rJ0ANs+kl4hSgV/9KX/I3MlQYuY\ngLR4DUSpuYj/XTMyl+zjxPAPbk63zTpMd+T0NKgeWA==\n" + )) instance = Instance.new('id', client: client) expect(instance.decrypt_windows_password(keypair)).to eq('password') end diff --git a/aws-sdk-resources/spec/services/s3/object/upload_file_spec.rb b/aws-sdk-resources/spec/services/s3/object/upload_file_spec.rb index 1a1e8dfc471..057ea08bc17 100644 --- a/aws-sdk-resources/spec/services/s3/object/upload_file_spec.rb +++ b/aws-sdk-resources/spec/services/s3/object/upload_file_spec.rb @@ -76,78 +76,20 @@ module S3 describe 'large objects' do - before(:each) do - client.stub_responses(:create_multipart_upload, { - upload_id: 'upload-id', - }) - end - it 'uses multipart APIs for objects >= 15MB' do - - client.stub_responses(:create_multipart_upload, upload_id:'upload-id') - client.stub_responses(:upload_part, etag:'etag-1') - client.stub_responses(:upload_part, etag:'etag-2') - client.stub_responses(:upload_part, etag:'etag-3') - client.stub_responses(:upload_part, etag:'etag-4') - - # record actual requests made - requests = [] + called = [] client.handle_request do |context| - requests << { name:context.operation_name, params:context.params } + called << context.operation_name end - object.upload_file(seventeen_meg_file, content_type: 'text/plain') - - expect(requests).to eq([ - { - name: :create_multipart_upload, - params: {}, - }, + expect(called).to eq([ + :create_multipart_upload, + :upload_part, + :upload_part, + :upload_part, + :upload_part, + :complete_multipart_upload ]) - - - expect(client).to receive(:create_multipart_upload). - with(bucket:'bucket', key:'key', content_type:'text/plain'). - and_return(create_resp) - - (1..3).each do |n| - expect(client).to receive(:upload_part).with( - bucket: 'bucket', - key: 'key', - upload_id: 'upload-id', - part_number: n, - body: file_part( - source: seventeen_meg_file, - offset: (n - 1) * 5 * one_meg, - size: 5 * one_meg - ) - ).and_return(client.stub_data(:upload_part, etag: "etag-#{n}")) - end - expect(client).to receive(:upload_part).with( - bucket: 'bucket', - key: 'key', - upload_id: 'upload-id', - part_number: 4, - body: file_part( - source: seventeen_meg_file, - offset: 15 * one_meg, - size: 2 * one_meg - ) - ).and_return(client.stub_data(:upload_part, etag:'etag-4')) - - expect(client).to receive(:complete_multipart_upload).with( - bucket: 'bucket', - key: 'key', - upload_id: 'upload-id', - multipart_upload: { - parts: [ - { part_number: 1, etag: 'etag-1' }, - { part_number: 2, etag: 'etag-2' }, - { part_number: 3, etag: 'etag-3' }, - { part_number: 4, etag: 'etag-4' }, - ] - } - ) end it 'raises an error if the multipart threshold is too small' do @@ -169,7 +111,7 @@ module S3 ]) expect(client).to receive(:abort_multipart_upload). - with(bucket: 'bucket', key: 'key', upload_id: 'upload-id') + with(bucket: 'bucket', key: 'key', upload_id: 'MultipartUploadId') expect { object.upload_file(seventeen_meg_file) From e34500540fdc9ce6600d664bf05df6b20b039ccf Mon Sep 17 00:00:00 2001 From: Trevor Rowe Date: Fri, 5 Jun 2015 10:56:27 -0700 Subject: [PATCH 085/101] Minor changes to squelch debug warnings from Ruby. --- aws-sdk-core/lib/aws-sdk-core/api/builder.rb | 4 +-- aws-sdk-core/lib/aws-sdk-core/client_stubs.rb | 4 +-- .../lib/aws-sdk-core/param_validator.rb | 2 +- .../aws-sdk-core/plugins/s3_request_signer.rb | 1 - aws-sdk-core/lib/aws-sdk-core/signers/s3.rb | 1 - aws-sdk-core/lib/aws-sdk-core/signers/v4.rb | 31 ++++++------------- .../lib/seahorse/client/http/request.rb | 14 ++++++--- aws-sdk-core/lib/seahorse/util.rb | 2 +- .../lib/aws-sdk-resources/builder.rb | 5 +-- 9 files changed, 28 insertions(+), 36 deletions(-) diff --git a/aws-sdk-core/lib/aws-sdk-core/api/builder.rb b/aws-sdk-core/lib/aws-sdk-core/api/builder.rb index 545f89961b9..ee4b8ee4d07 100644 --- a/aws-sdk-core/lib/aws-sdk-core/api/builder.rb +++ b/aws-sdk-core/lib/aws-sdk-core/api/builder.rb @@ -63,8 +63,8 @@ def build_shape_map(definition, api, docs) api.metadata['shapes'] = ShapeMap.new(shapes, docs: docs) end - def build_operations(definition, api, shapes, docs) - (definition['operations'] || {}).each do |name, definition| + def build_operations(definitions, api, shapes, docs) + (definitions['operations'] || {}).each do |name, definition| operation = build_operation(name, definition, shapes, docs) api.add_operation(underscore(name), operation) end diff --git a/aws-sdk-core/lib/aws-sdk-core/client_stubs.rb b/aws-sdk-core/lib/aws-sdk-core/client_stubs.rb index 068ab154a8a..a453574265b 100644 --- a/aws-sdk-core/lib/aws-sdk-core/client_stubs.rb +++ b/aws-sdk-core/lib/aws-sdk-core/client_stubs.rb @@ -250,9 +250,9 @@ def stub_list(ref, array) stubs end - def stub_map(ref, value) + def stub_map(ref, hash) stubs = {} - value.each do |key, value| + hash.each do |key, value| stubs[key] = stub(ref.shape.value, value) end stubs diff --git a/aws-sdk-core/lib/aws-sdk-core/param_validator.rb b/aws-sdk-core/lib/aws-sdk-core/param_validator.rb index f7179911bee..cb13039fae8 100644 --- a/aws-sdk-core/lib/aws-sdk-core/param_validator.rb +++ b/aws-sdk-core/lib/aws-sdk-core/param_validator.rb @@ -22,7 +22,7 @@ def initialize(rules, options = {}) # @return [void] def validate!(params) errors = [] - structure(@rules, params, errors, context = 'params') if @rules + structure(@rules, params, errors, 'params') if @rules raise ArgumentError, error_messages(errors) unless errors.empty? end diff --git a/aws-sdk-core/lib/aws-sdk-core/plugins/s3_request_signer.rb b/aws-sdk-core/lib/aws-sdk-core/plugins/s3_request_signer.rb index 3a791e91546..f34e555a39b 100644 --- a/aws-sdk-core/lib/aws-sdk-core/plugins/s3_request_signer.rb +++ b/aws-sdk-core/lib/aws-sdk-core/plugins/s3_request_signer.rb @@ -199,7 +199,6 @@ def detect_region_and_retry(resp) end def updgrade_to_v4(context, region) - bucket = context.params[:bucket] context.http_response.body.truncate(0) context.http_request.headers.delete('authorization') context.http_request.headers.delete('x-amz-security-token') diff --git a/aws-sdk-core/lib/aws-sdk-core/signers/s3.rb b/aws-sdk-core/lib/aws-sdk-core/signers/s3.rb index b52f5d3ae1b..aa39c51cf28 100644 --- a/aws-sdk-core/lib/aws-sdk-core/signers/s3.rb +++ b/aws-sdk-core/lib/aws-sdk-core/signers/s3.rb @@ -51,7 +51,6 @@ def authorization(request) end def signature(request) - secret = credentials.secret_access_key string_to_sign = string_to_sign(request) signature = digest(credentials.secret_access_key, string_to_sign) URI.escape(signature) diff --git a/aws-sdk-core/lib/aws-sdk-core/signers/v4.rb b/aws-sdk-core/lib/aws-sdk-core/signers/v4.rb index ef81d157448..5da7bf2d7b6 100644 --- a/aws-sdk-core/lib/aws-sdk-core/signers/v4.rb +++ b/aws-sdk-core/lib/aws-sdk-core/signers/v4.rb @@ -32,8 +32,8 @@ def sign(req) body_digest = req.headers['X-Amz-Content-Sha256'] || hexdigest(req.body) req.headers['X-Amz-Date'] = datetime req.headers['Host'] = req.endpoint.host - req.headers['X-Amz-Security-Token'] = credentials.session_token if - credentials.session_token + req.headers['X-Amz-Security-Token'] = @credentials.session_token if + @credentials.session_token req.headers['X-Amz-Content-Sha256'] ||= body_digest req.headers['Authorization'] = authorization(req, datetime, body_digest) req @@ -67,8 +67,8 @@ def presigned_url(request, options = {}) params.set("X-Amz-Date", now) params.set("X-Amz-Expires", options[:expires_in].to_s) params.set("X-Amz-SignedHeaders", signed_headers(request)) - params.set('X-Amz-Security-Token', credentials.session_token) if - credentials.session_token + params.set('X-Amz-Security-Token', @credentials.session_token) if + @credentials.session_token endpoint = request.endpoint if endpoint.query @@ -88,14 +88,14 @@ def authorization(request, datetime, body_digest) end def credential(datetime) - "#{credentials.access_key_id}/#{credential_scope(datetime)}" + "#{@credentials.access_key_id}/#{credential_scope(datetime)}" end def signature(request, datetime, body_digest) - k_secret = credentials.secret_access_key + k_secret = @credentials.secret_access_key k_date = hmac("AWS4" + k_secret, datetime[0,8]) - k_region = hmac(k_date, region) - k_service = hmac(k_region, service_name) + k_region = hmac(k_date, @region) + k_service = hmac(k_region, @service_name) k_credentials = hmac(k_service, 'aws4_request') hexhmac(k_credentials, string_to_sign(request, datetime, body_digest)) end @@ -112,8 +112,8 @@ def string_to_sign(request, datetime, body_digest) def credential_scope(datetime) parts = [] parts << datetime[0,8] - parts << region - parts << service_name + parts << @region + parts << @service_name parts << 'aws4_request' parts.join("/") end @@ -200,17 +200,6 @@ def hexhmac(key, value) OpenSSL::HMAC.hexdigest(OpenSSL::Digest.new('sha256'), key, value) end - private - - # @return [Credentials] - attr_reader :credentials - - # @return [String] - attr_reader :service_name - - # @return [String] - attr_reader :region - end end end diff --git a/aws-sdk-core/lib/seahorse/client/http/request.rb b/aws-sdk-core/lib/seahorse/client/http/request.rb index 92d57018107..857768b8452 100644 --- a/aws-sdk-core/lib/seahorse/client/http/request.rb +++ b/aws-sdk-core/lib/seahorse/client/http/request.rb @@ -17,17 +17,16 @@ def initialize(options = {}) self.body = options[:body] end - # @return [URI::HTTP, URI::HTTPS, nil] - attr_accessor :endpoint - # @return [String] The HTTP request method, e.g. `GET`, `PUT`, etc. attr_accessor :http_method # @return [Headers] The hash of request headers. attr_accessor :headers - # @return [IO] - attr_reader :body + # @return [URI::HTTP, URI::HTTPS, nil] + def endpoint + @endpoint + end # @param [String, URI::HTTP, URI::HTTPS, nil] endpoint def endpoint=(endpoint) @@ -41,6 +40,11 @@ def endpoint=(endpoint) end end + # @return [IO] + def body + @body + end + # @return [String] def body_contents body.rewind diff --git a/aws-sdk-core/lib/seahorse/util.rb b/aws-sdk-core/lib/seahorse/util.rb index 3b05c5efc3f..cd2fcb89861 100644 --- a/aws-sdk-core/lib/seahorse/util.rb +++ b/aws-sdk-core/lib/seahorse/util.rb @@ -21,7 +21,7 @@ def underscore(string) end def uri_escape(string) - CGI::escape(string.encode('UTF-8')).gsub('+', '%20').gsub('%7E', '~') + CGI.escape(string.encode('UTF-8')).gsub('+', '%20').gsub('%7E', '~') end end diff --git a/aws-sdk-resources/lib/aws-sdk-resources/builder.rb b/aws-sdk-resources/lib/aws-sdk-resources/builder.rb index cb954f32388..ee9c8d36a48 100644 --- a/aws-sdk-resources/lib/aws-sdk-resources/builder.rb +++ b/aws-sdk-resources/lib/aws-sdk-resources/builder.rb @@ -47,10 +47,11 @@ def build(options = {}) def build_batch(identifier_map, options, &block) resources = (0...resource_count(identifier_map)).collect do |n| - identifiers = @sources.each.with_object({}) do |source, identifiers| + identifiers = @sources.inject({}) do |hash, source| value = identifier_map[source.target] value = value[n] if source.plural? - identifiers[source.target] = value + hash[source.target] = value + hash end resource = build_one(identifiers, options) yield(resource) if block_given? From 2f72c0020bb3ecc117c6c90dc6b2e5af172a7ea9 Mon Sep 17 00:00:00 2001 From: Trevor Rowe Date: Fri, 5 Jun 2015 13:08:59 -0700 Subject: [PATCH 086/101] You can now stub responses via Aws.config and client constructors. --- aws-sdk-core/lib/aws-sdk-core/client_stubs.rb | 47 +++++++++++++++---- aws-sdk-core/spec/aws/client_spec.rb | 10 ++++ 2 files changed, 49 insertions(+), 8 deletions(-) diff --git a/aws-sdk-core/lib/aws-sdk-core/client_stubs.rb b/aws-sdk-core/lib/aws-sdk-core/client_stubs.rb index a453574265b..f80ef49e290 100644 --- a/aws-sdk-core/lib/aws-sdk-core/client_stubs.rb +++ b/aws-sdk-core/lib/aws-sdk-core/client_stubs.rb @@ -12,6 +12,12 @@ def initialize(*args) @stubs = {} @stub_mutex = Mutex.new super + if Hash === @config.stub_responses + @config.stub_responses.each do |operation_name, stubs| + apply_stubs(operation_name, Array === stubs ? stubs : [stubs]) + end + @config.stub_responses = true + end end # Configures what data / errors should be returned from the named operation @@ -19,19 +25,45 @@ def initialize(*args) # # ## Basic usage # - # By default, fake responses are generated. You can override the default - # fake data with specific response data by passing a hash. + # When you enable response stubbing, the client will generate fake + # responses and will not make any HTTP requests. # - # # enable response stubbing in the client constructor # client = Aws::S3::Client.new(stub_responses: true) + # client.list_buckets + # #=> # # - # # specify the response data for #list_buckets - # client.stub_responses(:list_buckets, buckets:[{name:'aws-sdk'}]) + # You can provide stub data that will be returned by the client. + # + # # stub data in the constructor + # client = Aws::S3::Client.new(stub_responses: { + # list_buckets: { bukets: [{name: 'my-bucket' }] }, + # get_object: { body: 'data' }, + # }) # - # # no api calls made, stub returned - # client.list_buckets.map(&:name) + # client.list_buckets.buckets.map(&:name) #=> ['my-bucket'] + # client.get_object(bucket:'name', key:'key').body.read #=> 'data' + # + # You can also specify the stub data using {#stub_responses} + # + # client = Aws::S3::Client.new(stub_responses: true) + # client.stub_resposnes(:list_buckets, { + # buckets: [{ name: 'my-bucket' }] + # }) + # + # client.list_buckets.buckets.map(&:name) #=> ['my-bucket'] # #=> ['aws-sdk'] # + # Lastly, default stubs can be configured via `Aws.config`: + # + # Aws.config[:s3] = { + # stub_responses: { + # list_buckets: { bukets: [{name: 'my-bucket' }] } + # } + # } + # + # Aws::S3::Client.new.list_buckets.buckets.map(&:name) + # #=> ['my-bucket'] + # # ## Stubbing Errors # # When stubbing is enabled, the SDK will default to generate @@ -73,7 +105,6 @@ def initialize(*args) # Calling an operation multiple times will return similar responses. # You can configure multiple stubs and they will be returned in sequence. # - # # client.stub_responses(:head_object, [ # 'NotFound', # { content_length: 150 }, diff --git a/aws-sdk-core/spec/aws/client_spec.rb b/aws-sdk-core/spec/aws/client_spec.rb index 686ac26d385..7fb7d3ddf45 100644 --- a/aws-sdk-core/spec/aws/client_spec.rb +++ b/aws-sdk-core/spec/aws/client_spec.rb @@ -80,6 +80,16 @@ module Aws expect(client.head_bucket(bucket:'aws-sdk').data.to_h).to eq({}) end + it 'accepts stubs given to the constructor' do + client = S3::Client.new(stub_responses: { + list_buckets: { buckets: [{ name: 'b1' }, { name:'b2' }] }, + get_object: [{ body: 'a' }, { body: 'b' }], + }) + expect(client.list_buckets.buckets.map(&:name)).to eq(%w(b1 b2)) + expect(client.get_object(bucket:'name', key:'key').body.read).to eq('a') + expect(client.get_object(bucket:'name', key:'key').body.read).to eq('b') + end + end end end From 8db6b36dc9bbfffe4d72bcf44771d26fd839709e Mon Sep 17 00:00:00 2001 From: Trevor Rowe Date: Fri, 5 Jun 2015 13:09:17 -0700 Subject: [PATCH 087/101] DynamoDB simplified attributes now supported via #stub_responses. Fixes #770 --- aws-sdk-core/lib/aws-sdk-core/dynamodb.rb | 12 ++++++++++++ aws-sdk-core/spec/aws/dynamodb/client_spec.rb | 11 +++++++++++ 2 files changed, 23 insertions(+) diff --git a/aws-sdk-core/lib/aws-sdk-core/dynamodb.rb b/aws-sdk-core/lib/aws-sdk-core/dynamodb.rb index 6a966cd9582..95a22731494 100644 --- a/aws-sdk-core/lib/aws-sdk-core/dynamodb.rb +++ b/aws-sdk-core/lib/aws-sdk-core/dynamodb.rb @@ -9,5 +9,17 @@ module Aws module DynamoDB autoload :AttributeValue, 'aws-sdk-core/dynamodb/attribute_value' + + class Client + def data_to_http_resp(operation_name, data) + api = config.api + operation = api.operation(operation_name) + translator = Plugins::DynamoDBSimpleAttributes::ValueTranslator + translator = translator.new(operation.output, :marshal) + data = translator.apply(data) + ParamValidator.validate!(operation.output, data) + protocol_helper.stub_data(api, operation, data) + end + end end end diff --git a/aws-sdk-core/spec/aws/dynamodb/client_spec.rb b/aws-sdk-core/spec/aws/dynamodb/client_spec.rb index e6469ddc496..7f034229b81 100644 --- a/aws-sdk-core/spec/aws/dynamodb/client_spec.rb +++ b/aws-sdk-core/spec/aws/dynamodb/client_spec.rb @@ -97,6 +97,17 @@ module DynamoDB end end + + describe '#stub_responses' do + + it 'accepts the simplified attribute format' do + client = Client.new(stub_responses: true) + client.stub_responses(:get_item, item: {'id' => 'value', }) + resp = client.get_item(table_name:'table', key: {'id' => 'value' }) + expect(resp.item).to eq('id' => 'value') + end + + end end end end From 1aa6b93cf539c461f9a4fca4f40f43c2b2337b78 Mon Sep 17 00:00:00 2001 From: Trevor Rowe Date: Fri, 5 Jun 2015 13:40:33 -0700 Subject: [PATCH 088/101] Fixed v2 signer. --- aws-sdk-core/lib/aws-sdk-core/signers/v2.rb | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/aws-sdk-core/lib/aws-sdk-core/signers/v2.rb b/aws-sdk-core/lib/aws-sdk-core/signers/v2.rb index 80b0831e6ee..b8effe0ab3f 100644 --- a/aws-sdk-core/lib/aws-sdk-core/signers/v2.rb +++ b/aws-sdk-core/lib/aws-sdk-core/signers/v2.rb @@ -25,14 +25,13 @@ def signature(http_request, params) def string_to_sign(http_request, params) [ http_request.http_method, - host(http_request), - http_request.endpoint.path, + host(http_request.endpoint), + path(http_request.endpoint), params.to_s, ].join("\n") end - def host(http_request) - endpoint = http_request.endpoint + def host(endpoint) host = endpoint.host.downcase if (endpoint.scheme == 'http' && endpoint.port != 80) || @@ -43,6 +42,10 @@ def host(http_request) host end + def path(endpoint) + endpoint.path == '' ? '/' : endpoint.path + end + end end end From d6d793c44cedba20234c031e97f3b4ff75c8926d Mon Sep 17 00:00:00 2001 From: Trevor Rowe Date: Fri, 5 Jun 2015 16:12:42 -0700 Subject: [PATCH 089/101] Structure classes can now be initialized with hashes. --- aws-sdk-core/lib/aws-sdk-core/structure.rb | 6 ++++++ aws-sdk-core/spec/aws/structure_spec.rb | 7 ++++++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/aws-sdk-core/lib/aws-sdk-core/structure.rb b/aws-sdk-core/lib/aws-sdk-core/structure.rb index 0023e9b4392..a5e3f789681 100644 --- a/aws-sdk-core/lib/aws-sdk-core/structure.rb +++ b/aws-sdk-core/lib/aws-sdk-core/structure.rb @@ -8,6 +8,12 @@ class Structure < Struct alias orig_to_h to_h end + def initialize(values = {}) + values.each do |k, v| + self[k] = v + end + end + # @return [Boolean] Returns `true` if this structure has a value # set for the given member. def key?(member_name) diff --git a/aws-sdk-core/spec/aws/structure_spec.rb b/aws-sdk-core/spec/aws/structure_spec.rb index 2bb950524de..a8ce27f34c1 100644 --- a/aws-sdk-core/spec/aws/structure_spec.rb +++ b/aws-sdk-core/spec/aws/structure_spec.rb @@ -11,6 +11,11 @@ module Aws expect(Structure.new(:abc, :xyz).members).to eq([:abc, :xyz]) end + it 'accepts values to its constructor as a hash, not, positional' do + klass = Structure.new(:name) + expect(klass.new(name:'value').name).to eq('value') + end + describe '#to_hash' do it 'returns a hash' do @@ -18,7 +23,7 @@ module Aws end it 'only serializes non-nil members' do - s = Structure.new(:abc, :mno).new('abc') + s = Structure.new(:abc, :mno).new(abc:'abc') expect(s.to_hash).to eq(abc: 'abc') end From d367f7d6e11f119b544a1144233663c79f092db5 Mon Sep 17 00:00:00 2001 From: Trevor Rowe Date: Tue, 9 Jun 2015 10:16:30 -0700 Subject: [PATCH 090/101] No longer stubbing paging tokens. Fixes #804 --- aws-sdk-core/lib/aws-sdk-core.rb | 1 + aws-sdk-core/lib/aws-sdk-core/client_stubs.rb | 121 +--------- .../lib/aws-sdk-core/stubbing/empty_stub.rb | 53 +++++ .../spec/aws/stubbing/empty_stub_spec.rb | 49 ++++ aws-sdk-core/spec/aws/stubbing/stub_spec.rb | 211 ------------------ 5 files changed, 113 insertions(+), 322 deletions(-) create mode 100644 aws-sdk-core/lib/aws-sdk-core/stubbing/empty_stub.rb create mode 100644 aws-sdk-core/spec/aws/stubbing/empty_stub_spec.rb delete mode 100644 aws-sdk-core/spec/aws/stubbing/stub_spec.rb diff --git a/aws-sdk-core/lib/aws-sdk-core.rb b/aws-sdk-core/lib/aws-sdk-core.rb index 8f08e4c2d69..3e44b7ea1fe 100644 --- a/aws-sdk-core/lib/aws-sdk-core.rb +++ b/aws-sdk-core/lib/aws-sdk-core.rb @@ -199,6 +199,7 @@ module Signers # @api private module Stubbing + autoload :EmptyStub, 'aws-sdk-core/stubbing/empty_stub' module Protocols autoload :EC2, 'aws-sdk-core/stubbing/protocols/ec2' autoload :Json, 'aws-sdk-core/stubbing/protocols/json' diff --git a/aws-sdk-core/lib/aws-sdk-core/client_stubs.rb b/aws-sdk-core/lib/aws-sdk-core/client_stubs.rb index f80ef49e290..96ba894e249 100644 --- a/aws-sdk-core/lib/aws-sdk-core/client_stubs.rb +++ b/aws-sdk-core/lib/aws-sdk-core/client_stubs.rb @@ -150,8 +150,11 @@ def next_stub(operation_name) end # @api private - def stub_data(operation_name, data = nil) - Stub.new(operation(operation_name).output).format(data || {}) + def stub_data(operation_name) + operation = self.operation(operation_name) + stub = Stubbing::EmptyStub.new(operation.output).stub + remove_paging_tokens(operation[:pager], stub) + stub end private @@ -208,117 +211,13 @@ def protocol_helper end.new end - class Stub - - include Seahorse::Model::Shapes - - # @param [Seahorse::Models::Shapes::ShapeRef] rules - def initialize(rules) - @rules = rules - end - - # @param [Hash] data An optional hash of data to format into the stubbed - # object. - def format(data = {}) - if @rules.nil? - empty_stub(data) - else - validate_data(data) - stub(@rules, data) - end - end - - private - - def stub(ref, value) - case ref.shape - when StructureShape then stub_structure(ref, value) - when ListShape then stub_list(ref, value || []) - when MapShape then stub_map(ref, value || {}) - else stub_scalar(ref, value) - end - end - - def stub_structure(ref, hash) - if hash - structure_obj(ref, hash) - else - nil - end - end - - def structure_obj(ref, hash) - stubs = ref[:struct_class].new - ref.shape.members.each do |member_name, member_ref| - if hash.key?(member_name) && hash[member_name].nil? - stubs[member_name] = nil - else - value = structure_value(ref, member_name, member_ref, hash) - stubs[member_name] = stub(member_ref, value) - end - end - stubs - end - - def structure_value(ref, member_name, member_ref, hash) - if hash.key?(member_name) - hash[member_name] - elsif - StructureShape === member_ref.shape && - ref.shape.required.include?(member_name) - then - {} - else - nil + def remove_paging_tokens(pager, stub) + if pager + pager.instance_variable_get("@tokens").keys.each do |path| + key = path.split(/\b/)[0] + stub[key] = nil end end - - def stub_list(ref, array) - stubs = [] - array.each do |value| - stubs << stub(ref.shape.member, value) - end - stubs - end - - def stub_map(ref, hash) - stubs = {} - hash.each do |key, value| - stubs[key] = stub(ref.shape.value, value) - end - stubs - end - - def stub_scalar(ref, value) - if value.nil? - case ref.shape - when StringShape then ref.shape.name - when IntegerShape then 0 - when FloatShape then 0.0 - when BooleanShape then false - when TimestampShape then Time.now - else nil - end - else - value - end - end - - def empty_stub(data) - if data.empty? - EmptyStructure.new - else - msg = 'unable to generate a stubbed response from the given data; ' - msg << 'this operation does not return data' - raise ArgumentError, msg - end - end - - def validate_data(data) - args = [@rules, { validate_required:false }] - ParamValidator.new(*args).validate!(data) - end - end end end diff --git a/aws-sdk-core/lib/aws-sdk-core/stubbing/empty_stub.rb b/aws-sdk-core/lib/aws-sdk-core/stubbing/empty_stub.rb new file mode 100644 index 00000000000..ef94f4769e3 --- /dev/null +++ b/aws-sdk-core/lib/aws-sdk-core/stubbing/empty_stub.rb @@ -0,0 +1,53 @@ +module Aws + module Stubbing + class EmptyStub + + include Seahorse::Model::Shapes + + # @param [Seahorse::Models::Shapes::ShapeRef] rules + def initialize(rules) + @rules = rules + end + + # @return [Structure] + def stub + stub_ref(@rules) + end + + private + + def stub_ref(ref, visited = []) + if visited.include?(ref.shape) + return nil + else + visited = visited + [ref.shape] + end + case ref.shape + when StructureShape then stub_structure(ref, visited) + when ListShape then [] + when MapShape then {} + else stub_scalar(ref) + end + end + + def stub_structure(ref, visited) + ref.shape.members.inject(ref[:struct_class].new) do |struct, (mname, mref)| + struct[mname] = stub_ref(mref, visited) + struct + end + end + + def stub_scalar(ref) + case ref.shape + when StringShape then ref.shape.name || 'string' + when IntegerShape then 0 + when FloatShape then 0.0 + when BooleanShape then false + when TimestampShape then Time.now + else nil + end + end + + end + end +end diff --git a/aws-sdk-core/spec/aws/stubbing/empty_stub_spec.rb b/aws-sdk-core/spec/aws/stubbing/empty_stub_spec.rb new file mode 100644 index 00000000000..a17481a8e6d --- /dev/null +++ b/aws-sdk-core/spec/aws/stubbing/empty_stub_spec.rb @@ -0,0 +1,49 @@ +require 'spec_helper' +require 'stringio' + +module Aws + module Stubbing + describe EmptyStub do + + it 'supports complex recursive structures' do + now = Time.now + allow(Time).to receive(:now).and_return(now) + rules = ApiHelper.sample_shapes + rules = Api::ShapeMap.new(rules).shape_ref('shape' => 'StructureShape') + stub = EmptyStub.new(rules).stub + expect(stub.to_h).to eq({ + nested_list: [], + nested_map: {}, + number_list: [], + string_map: {}, + byte: "ByteShape", + boolean: false, + character: "CharacterShape", + double: 0.0, + float: 0.0, + integer: 0, + long: 0, + string: "StringShape", + timestamp: now, + }) + end + + it 'does not stub paging markers' do + client = S3::Client.new(stub_responses:true) + resp = client.list_objects(bucket:'bucket') + expect(resp.to_h).to eq({ + common_prefixes: [], + contents: [], + delimiter: "Delimiter", + encoding_type: "EncodingType", + is_truncated: false, + marker: "Marker", + max_keys: 0, + name: "BucketName", + prefix: "Prefix", + }) + end + + end + end +end diff --git a/aws-sdk-core/spec/aws/stubbing/stub_spec.rb b/aws-sdk-core/spec/aws/stubbing/stub_spec.rb deleted file mode 100644 index edabe8ed05a..00000000000 --- a/aws-sdk-core/spec/aws/stubbing/stub_spec.rb +++ /dev/null @@ -1,211 +0,0 @@ -require 'spec_helper' -require 'stringio' - -module Aws - module ClientStubs - describe Stub do - describe '#format' do - - describe 'without an output shape' do - - it 'returns an empty struct when there is no output shape' do - data = Stub.new(nil).format - expect(data).to be_kind_of(EmptyStructure) - end - - it 'raises an error if data is not empty' do - expect { - Stub.new(nil).format(name:'foo') - }.to raise_error(ArgumentError, /this operation does not return data/) - end - - end - - describe 'with an output shape' do - - let(:shape_map) { Api::ShapeMap.new({ - 'Person' => { - 'type' => 'structure', - 'required' => ['FullName'], - 'members' => { - 'FullName' => { 'shape' => 'Name' }, - 'Gender' => { 'shape' => 'String' }, - 'Age' => { 'shape' => 'Integer' }, - 'Weight' => { 'shape' => 'Float' }, - 'Married' => { 'shape' => 'Boolean' }, - 'Born' => { 'shape' => 'Timestamp' }, - 'Spouse' => { 'shape' => 'Person' }, - 'Nicknames' => { 'shape' => 'StringList' }, - 'Friends' => { 'shape' => 'PersonMap' }, - 'Parents' => { 'shape' => 'PersonList' }, - }, - }, - 'PersonMap' => { - 'type' => 'map', - 'key' => { 'shape' => 'String' }, - 'value' => { 'shape' => 'Person' }, - }, - 'PersonList' => { - 'type' => 'list', - 'member' => { 'shape' => 'Person' }, - }, - 'StringList' => { - 'type' => 'list', - 'member' => { 'shape' => 'String' }, - }, - 'Name' => { - 'type' => 'structure', - 'members' => { - 'First' => { 'shape' => 'String' }, - 'Middle' => { 'shape' => 'String' }, - 'Last' => { 'shape' => 'String' }, - }, - }, - 'String' => { 'type' => 'string' }, - 'Integer' => { 'type' => 'integer' }, - 'Float' => { 'type' => 'float' }, - 'Boolean' => { 'type' => 'boolean' }, - 'Timestamp' => { 'type' => 'timestamp' }, - })} - - let(:ref) { shape_map.shape_ref('shape' => 'Person') } - - let(:stub) { Stub.new(ref) } - - it 'returns a stub with the appropriate members' do - data = stub.format - expect(data).to be_kind_of(Structure) - expect(data.members).to eq(ref.shape.member_names) - end - - it 'validates the given data matches the response shape' do - msg = 'expected params[:full_name] to be a hash' - expect { - stub.format(:full_name => 'John L. Doe') - }.to raise_error(ArgumentError, msg) - end - - it 'provides default empty structures only if required' do - data = stub.format - # full name is required structure, spouse is an optional structure - expect(data.full_name).to be_kind_of(Structure) - expect(data.full_name.members).to eq([:first, :middle, :last]) - expect(data.spouse).to be(nil) - end - - it 'provides default empty lists' do - data = stub.format - expect(data.parents).to eq([]) - end - - it 'provides default empty maps' do - data = stub.format - expect(data.friends).to eq({}) - end - - it 'defaults integers to 0' do - data = stub.format - expect(data.age).to be(0) - end - - it 'defaults floats to 0.0' do - data = stub.format - expect(data.weight).to eq(0.0) - end - - it 'defaults timestamps to now' do - now = Time.now - allow(Time).to receive(:now).and_return(now) - data = stub.format - expect(data.born).to eq(now) - end - - it 'defaults booleans to false' do - data = stub.format - expect(data.married).to be(false) - end - - it 'defaults strings to their shape name' do - data = stub.format - expect(data.full_name.first).to eq('String') - end - - it 'populates the structure from given data' do - data = { - full_name: { - first: 'John', - last: 'Doe', - } - } - stubbed_data = stub.format(data) - expect(stubbed_data.full_name.first).to eq('John') - expect(stubbed_data.full_name.last).to eq('Doe') - end - - it 'deeply converts input to structured data recursively' do - data = { - full_name: { - first: 'John', - last: 'Doe', - }, - nicknames: ['johndoe'], - friends: { - 'Best Friend' => { - full_name: { first: 'Bill' }, - gender: 'male', - age: 40, - weight: 185.5, - married: true, - spouse: { - full_name: { first: 'Janet' }, - gender: 'female', - age: 40, - married: true, - } - } - }, - parents: [ - { full_name: { first: 'John' }}, - { full_name: { first: 'Jane' }}, - ] - } - r = stub.format(data) - expect(r.full_name.first).to eq('John') - expect(r.friends['Best Friend'].full_name.first).to eq('Bill') - expect(r.friends['Best Friend'].spouse.full_name.first).to eq('Janet') - expect(r.friends['Best Friend'].spouse.gender).to eq('female') - expect(r.parents.map(&:full_name).map(&:first)).to eq(['John', 'Jane']) - end - - it 'does not replace scalar null values' do - data = { - full_name: { - first: nil, - last: nil, - } - } - r = stub.format(data) - expect(r.full_name.first).to be(nil) - expect(r.full_name.last).to be(nil) - end - - end - - describe 'streaming responses' do - - it 'stubs the HTTP response target when with streaming APIs' do - s3 = S3::Client.new(stub_responses: true) - s3.stub_responses(:get_object, { body: 'data', content_length: 4 }) - io = StringIO.new - resp = s3.get_object(bucket:'bucket', key:'key', response_target: io) - expect(resp.body.read).to eq('data') - expect(resp.body).to be(io) - expect(resp.context.http_response.body).to be(io) - expect(resp.content_length).to eq(4) - end - - end - end - end - end -end From 8907f383ee84c94c7d20254b195d7aad114e1319 Mon Sep 17 00:00:00 2001 From: Trevor Rowe Date: Tue, 9 Jun 2015 10:25:01 -0700 Subject: [PATCH 091/101] Empty stubs now stub http responses. --- aws-sdk-core/lib/aws-sdk-core/client_stubs.rb | 10 +++++----- aws-sdk-core/spec/aws/stubbing/empty_stub_spec.rb | 8 ++++---- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/aws-sdk-core/lib/aws-sdk-core/client_stubs.rb b/aws-sdk-core/lib/aws-sdk-core/client_stubs.rb index 96ba894e249..c8159cdc938 100644 --- a/aws-sdk-core/lib/aws-sdk-core/client_stubs.rb +++ b/aws-sdk-core/lib/aws-sdk-core/client_stubs.rb @@ -142,7 +142,7 @@ def next_stub(operation_name) @stub_mutex.synchronize do stubs = @stubs[operation_name.to_sym] || [] case stubs.length - when 0 then { data: stub_data(operation_name.to_sym) } + when 0 then empty_stub(operation_name.to_sym) when 1 then stubs.first else stubs.shift end @@ -150,11 +150,11 @@ def next_stub(operation_name) end # @api private - def stub_data(operation_name) + def empty_stub(operation_name) operation = self.operation(operation_name) - stub = Stubbing::EmptyStub.new(operation.output).stub - remove_paging_tokens(operation[:pager], stub) - stub + data = Stubbing::EmptyStub.new(operation.output).stub + remove_paging_tokens(operation[:pager], data) + http_response_stub(operation_name, data.to_h) end private diff --git a/aws-sdk-core/spec/aws/stubbing/empty_stub_spec.rb b/aws-sdk-core/spec/aws/stubbing/empty_stub_spec.rb index a17481a8e6d..18b486b64c1 100644 --- a/aws-sdk-core/spec/aws/stubbing/empty_stub_spec.rb +++ b/aws-sdk-core/spec/aws/stubbing/empty_stub_spec.rb @@ -30,10 +30,10 @@ module Stubbing it 'does not stub paging markers' do client = S3::Client.new(stub_responses:true) - resp = client.list_objects(bucket:'bucket') - expect(resp.to_h).to eq({ - common_prefixes: [], - contents: [], + stub = client.list_objects(bucket:'bucket') + expect(stub[:contents]).to eq([]) + expect(stub[:common_prefixes]).to eq([]) + expect(stub.to_h).to eq({ delimiter: "Delimiter", encoding_type: "EncodingType", is_truncated: false, From 43ab717116bfe5660638cac9db20408d1270ff15 Mon Sep 17 00:00:00 2001 From: Trevor Rowe Date: Tue, 9 Jun 2015 14:24:51 -0700 Subject: [PATCH 092/101] Added the ability to generate response stubs. Also, structure types are no longer converted. --- aws-sdk-core/lib/aws-sdk-core.rb | 2 + .../lib/aws-sdk-core/api/shape_map.rb | 6 +-- aws-sdk-core/lib/aws-sdk-core/client_stubs.rb | 33 ++++++------- .../lib/aws-sdk-core/param_converter.rb | 8 ++-- .../lib/aws-sdk-core/param_validator.rb | 11 +++-- .../aws-sdk-core/stubbing/data_applicator.rb | 46 +++++++++++++++++++ .../lib/aws-sdk-core/stubbing/stub_data.rb | 34 ++++++++++++++ aws-sdk-core/spec/aws/param_converter_spec.rb | 6 +-- 8 files changed, 112 insertions(+), 34 deletions(-) create mode 100644 aws-sdk-core/lib/aws-sdk-core/stubbing/data_applicator.rb create mode 100644 aws-sdk-core/lib/aws-sdk-core/stubbing/stub_data.rb diff --git a/aws-sdk-core/lib/aws-sdk-core.rb b/aws-sdk-core/lib/aws-sdk-core.rb index 3e44b7ea1fe..c432f6907d2 100644 --- a/aws-sdk-core/lib/aws-sdk-core.rb +++ b/aws-sdk-core/lib/aws-sdk-core.rb @@ -200,6 +200,8 @@ module Signers # @api private module Stubbing autoload :EmptyStub, 'aws-sdk-core/stubbing/empty_stub' + autoload :StubData, 'aws-sdk-core/stubbing/stub_data' + autoload :DataApplicator, 'aws-sdk-core/stubbing/data_applicator' module Protocols autoload :EC2, 'aws-sdk-core/stubbing/protocols/ec2' autoload :Json, 'aws-sdk-core/stubbing/protocols/json' diff --git a/aws-sdk-core/lib/aws-sdk-core/api/shape_map.rb b/aws-sdk-core/lib/aws-sdk-core/api/shape_map.rb index 966243cc9a4..cb2903a6af8 100644 --- a/aws-sdk-core/lib/aws-sdk-core/api/shape_map.rb +++ b/aws-sdk-core/lib/aws-sdk-core/api/shape_map.rb @@ -5,9 +5,9 @@ class ShapeMap include Seahorse::Model::Shapes EMPTY_REF = begin - ref = ShapeRef.new(shape: StructureShape.new) - ref[:struct_class] = Aws::EmptyStructure - ref + shape = StructureShape.new + shape[:struct_class] = Aws::EmptyStructure + ShapeRef.new(shape: shape) end SHAPE_CLASSES = { diff --git a/aws-sdk-core/lib/aws-sdk-core/client_stubs.rb b/aws-sdk-core/lib/aws-sdk-core/client_stubs.rb index c8159cdc938..2200ac4e53a 100644 --- a/aws-sdk-core/lib/aws-sdk-core/client_stubs.rb +++ b/aws-sdk-core/lib/aws-sdk-core/client_stubs.rb @@ -139,10 +139,11 @@ def stub_responses(operation_name, *stubs) # @api private def next_stub(operation_name) + operation_name = operation_name.to_sym @stub_mutex.synchronize do - stubs = @stubs[operation_name.to_sym] || [] + stubs = @stubs[operation_name] || [] case stubs.length - when 0 then empty_stub(operation_name.to_sym) + when 0 then default_stub(operation_name) when 1 then stubs.first else stubs.shift end @@ -150,15 +151,21 @@ def next_stub(operation_name) end # @api private - def empty_stub(operation_name) - operation = self.operation(operation_name) - data = Stubbing::EmptyStub.new(operation.output).stub - remove_paging_tokens(operation[:pager], data) - http_response_stub(operation_name, data.to_h) + def stub_data(operation_name, data = {}) + Stubbing::StubData.new(operation(operation_name)).stub(data) end private + def default_stub(operation_name) + stub = stub_data(operation_name) + http_response_stub(operation_name, stub) + end + + # This method converts the given stub data and converts it to a + # HTTP response (when possible). This enables the response stubbing + # plugin to provide a HTTP response that triggers all normal events + # during response handling. def apply_stubs(operation_name, stubs) @stub_mutex.synchronize do @stubs[operation_name.to_sym] = stubs.map do |stub| @@ -166,7 +173,6 @@ def apply_stubs(operation_name, stubs) when Exception, Class then { error: stub } when String then service_error_stub(stub) when Hash then http_response_stub(operation_name, stub) - when Seahorse::Client::Http::Response then { http: stub } else { data: stub } end end @@ -178,7 +184,7 @@ def service_error_stub(error_code) end def http_response_stub(operation_name, data) - if data.keys.sort == [:body, :headers, :status_code] + if Hash === data && data.keys.sort == [:body, :headers, :status_code] { http: hash_to_http_resp(data) } else { http: data_to_http_resp(operation_name, data) } @@ -210,14 +216,5 @@ def protocol_helper else raise "unsupported protocol" end.new end - - def remove_paging_tokens(pager, stub) - if pager - pager.instance_variable_get("@tokens").keys.each do |path| - key = path.split(/\b/)[0] - stub[key] = nil - end - end - end end end diff --git a/aws-sdk-core/lib/aws-sdk-core/param_converter.rb b/aws-sdk-core/lib/aws-sdk-core/param_converter.rb index 9f09e3db4c9..c07d8138ba3 100644 --- a/aws-sdk-core/lib/aws-sdk-core/param_converter.rb +++ b/aws-sdk-core/lib/aws-sdk-core/param_converter.rb @@ -27,8 +27,8 @@ def convert(params) def structure(ref, values) values = c(ref, values) - if values.is_a?(Hash) - values.each do |k, v| + if Struct === values || Hash === values + values.each_pair do |k, v| unless v.nil? if ref.shape.member?(k) values[k] = member(ref.shape.member(k), v) @@ -142,9 +142,7 @@ def each_base_class(shape_class, &block) end add(StructureShape, Hash) { |h| h.dup } - add(StructureShape, Struct) do |s| - s.members.each.with_object({}) {|k,h| h[k] = s[k] } - end + add(StructureShape, Struct) add(MapShape, Hash) { |h| h.dup } add(MapShape, Struct) do |s| diff --git a/aws-sdk-core/lib/aws-sdk-core/param_validator.rb b/aws-sdk-core/lib/aws-sdk-core/param_validator.rb index cb13039fae8..366c8cd2842 100644 --- a/aws-sdk-core/lib/aws-sdk-core/param_validator.rb +++ b/aws-sdk-core/lib/aws-sdk-core/param_validator.rb @@ -30,7 +30,7 @@ def validate!(params) def structure(ref, values, errors, context) # ensure the value is hash like - return unless hash?(values, errors, context) + return unless correct_type?(ref, values, errors, context) shape = ref.shape @@ -73,7 +73,7 @@ def list(ref, values, errors, context) def map(ref, values, errors, context) - return unless hash?(values, errors, context) + return unless correct_type?(ref, values, errors, context) key_ref = ref.shape.key value_ref = ref.shape.value @@ -118,9 +118,10 @@ def shape(ref, value, errors, context) end end - def hash?(value, errors, context) - if value.is_a?(Hash) - true + def correct_type?(ref, value, errors, context) + case value + when Hash then true + when ref[:struct_class] then true else errors << "expected #{context} to be a hash" false diff --git a/aws-sdk-core/lib/aws-sdk-core/stubbing/data_applicator.rb b/aws-sdk-core/lib/aws-sdk-core/stubbing/data_applicator.rb new file mode 100644 index 00000000000..da94180cf02 --- /dev/null +++ b/aws-sdk-core/lib/aws-sdk-core/stubbing/data_applicator.rb @@ -0,0 +1,46 @@ +module Aws + module Stubbing + class DataApplicator + + include Seahorse::Model::Shapes + + # @param [Seahorse::Models::Shapes::ShapeRef] rules + def initialize(rules) + @rules = rules + end + + # @param [Hash] data + # @param [Structure] stub + def apply_data(data, stub) + apply_data_to_struct(@rules, data, stub) + end + + private + + def apply_data_to_struct(ref, data, struct) + data.each do |key, value| + struct[key] = member_value(ref.shape.member(key), value) + end + struct + end + + def member_value(ref, value) + case ref.shape + when StructureShape + apply_data_to_struct(ref, value, ref[:struct_class].new) + when ListShape + value.inject([]) do |list, v| + list << member_value(ref.shape.member, v) + end + when MapShape + value.inject({}) do |map, (k,v)| + map[k.to_s] = member_value(ref.shape.value, v) + map + end + else + value + end + end + end + end +end diff --git a/aws-sdk-core/lib/aws-sdk-core/stubbing/stub_data.rb b/aws-sdk-core/lib/aws-sdk-core/stubbing/stub_data.rb new file mode 100644 index 00000000000..036163bb475 --- /dev/null +++ b/aws-sdk-core/lib/aws-sdk-core/stubbing/stub_data.rb @@ -0,0 +1,34 @@ +module Aws + module Stubbing + class StubData + + def initialize(operation) + @rules = operation.output + @pager = operation[:pager] + end + + def stub(data = {}) + stub = EmptyStub.new(@rules).stub + remove_paging_tokens(stub) + apply_data(data, stub) + stub + end + + private + + def remove_paging_tokens(stub) + if @pager + @pager.instance_variable_get("@tokens").keys.each do |path| + key = path.split(/\b/)[0] + stub[key] = nil + end + end + end + + def apply_data(data, stub) + ParamValidator.new(@rules, validate_required:false).validate!(data) + DataApplicator.new(@rules).apply_data(data, stub) + end + end + end +end diff --git a/aws-sdk-core/spec/aws/param_converter_spec.rb b/aws-sdk-core/spec/aws/param_converter_spec.rb index 1753f4236cb..f9b5b710ea0 100644 --- a/aws-sdk-core/spec/aws/param_converter_spec.rb +++ b/aws-sdk-core/spec/aws/param_converter_spec.rb @@ -24,7 +24,7 @@ module Aws ], data) converted = ParamConverter.convert(rules, params) - expect(converted).to eq({ + expect(converted.to_h).to eq({ boolean: true, string_map: { 'color' => 'red' }, nested_list: [ @@ -67,10 +67,10 @@ module Aws expect(converted).not_to be(value) end - it 'creates a hash from a struct' do + it 'does not modify structs' do value = Struct.new(:a).new(1) converted = ParamConverter.c(shape_class, value) - expect(converted).to eq(a: 1) + expect(converted).to be(value) end end From ff17365cd8fcdb869ddea5337f63e687b3b68437 Mon Sep 17 00:00:00 2001 From: Trevor Rowe Date: Tue, 9 Jun 2015 14:40:47 -0700 Subject: [PATCH 093/101] Test fix for Ruby 1.9.3 and JRuby that don't support Struct#to_h. --- aws-sdk-core/spec/aws/param_converter_spec.rb | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/aws-sdk-core/spec/aws/param_converter_spec.rb b/aws-sdk-core/spec/aws/param_converter_spec.rb index f9b5b710ea0..8592b0c0076 100644 --- a/aws-sdk-core/spec/aws/param_converter_spec.rb +++ b/aws-sdk-core/spec/aws/param_converter_spec.rb @@ -16,12 +16,17 @@ module Aws data = double('data') - params = Struct.new(:boolean, :string_map, :nested_list, :unknown) - params = params.new(true, { color: :red }, [ - { integer: 1 }, - { integer: 2.0 }, - { integer: '3' }, - ], data) + params = Structure.new(:boolean, :string_map, :nested_list, :unknown) + params = params.new({ + boolean: true, + string_map: { color: :red }, + nested_list: [ + { integer: 1 }, + { integer: 2.0 }, + { integer: '3' }, + ], + unknown: data + }) converted = ParamConverter.convert(rules, params) expect(converted.to_h).to eq({ From 1f5af1b1b884e806c273eca4b2ff4762da1d820d Mon Sep 17 00:00:00 2001 From: Trevor Rowe Date: Tue, 9 Jun 2015 14:59:48 -0700 Subject: [PATCH 094/101] Removed two un-necessary require statements. --- aws-sdk-core/lib/aws-sdk-core/json/parser.rb | 1 - aws-sdk-core/lib/aws-sdk-core/structure.rb | 2 -- 2 files changed, 3 deletions(-) diff --git a/aws-sdk-core/lib/aws-sdk-core/json/parser.rb b/aws-sdk-core/lib/aws-sdk-core/json/parser.rb index 077f34f0f79..a7fa257e51d 100644 --- a/aws-sdk-core/lib/aws-sdk-core/json/parser.rb +++ b/aws-sdk-core/lib/aws-sdk-core/json/parser.rb @@ -1,4 +1,3 @@ -require 'multi_json' require 'base64' require 'time' diff --git a/aws-sdk-core/lib/aws-sdk-core/structure.rb b/aws-sdk-core/lib/aws-sdk-core/structure.rb index a5e3f789681..027d5b08b40 100644 --- a/aws-sdk-core/lib/aws-sdk-core/structure.rb +++ b/aws-sdk-core/lib/aws-sdk-core/structure.rb @@ -1,5 +1,3 @@ -require 'thread' - module Aws # @api private class Structure < Struct From c7434229b4274cb710bacf06ec26730260b571b8 Mon Sep 17 00:00:00 2001 From: Trevor Rowe Date: Wed, 10 Jun 2015 01:29:24 -0700 Subject: [PATCH 095/101] Now bundling an optional ca cert. --- aws-sdk-core/aws-sdk-core.gemspec | 2 +- aws-sdk-core/ca-bundle.crt | 3554 +++++++++++++++++++++++++++++ aws-sdk-core/lib/aws-sdk-core.rb | 21 + aws-sdk-core/spec/aws_spec.rb | 26 +- 4 files changed, 3600 insertions(+), 3 deletions(-) create mode 100644 aws-sdk-core/ca-bundle.crt diff --git a/aws-sdk-core/aws-sdk-core.gemspec b/aws-sdk-core/aws-sdk-core.gemspec index e23e85876ca..99df4cfd5a4 100644 --- a/aws-sdk-core/aws-sdk-core.gemspec +++ b/aws-sdk-core/aws-sdk-core.gemspec @@ -13,7 +13,7 @@ Gem::Specification.new do |spec| spec.require_paths = ['lib'] - spec.files = ['endpoints.json'] + spec.files = ['endpoints.json', 'ca-bundle.crt'] spec.files += Dir['lib/**/*.rb'] spec.files += Dir['apis/**/**/*.json'].select { |p| !p.match(/\/docs/) } diff --git a/aws-sdk-core/ca-bundle.crt b/aws-sdk-core/ca-bundle.crt new file mode 100644 index 00000000000..93d3d2dbf41 --- /dev/null +++ b/aws-sdk-core/ca-bundle.crt @@ -0,0 +1,3554 @@ +## +## ca-bundle.crt -- Bundle of CA Root Certificates +## +## Certificate data from Mozilla as of: Sat Dec 29 20:03:40 2012 +## +## This is a bundle of X.509 certificates of public Certificate Authorities +## (CA). These were automatically extracted from Mozilla's root certificates +## file (certdata.txt). This file can be found in the mozilla source tree: +## http://mxr.mozilla.org/mozilla/source/security/nss/lib/ckfw/builtins/certdata.txt?raw=1 +## +## It contains the certificates in PEM format and therefore +## can be directly used with curl / libcurl / php_curl, or with +## an Apache+mod_ssl webserver for SSL client authentication. +## Just configure this file as the SSLCACertificateFile. +## + +# @(#) $RCSfile: certdata.txt,v $ $Revision: 1.87 $ $Date: 2012/12/29 16:32:45 $ + +GTE CyberTrust Global Root +========================== +-----BEGIN CERTIFICATE----- +MIICWjCCAcMCAgGlMA0GCSqGSIb3DQEBBAUAMHUxCzAJBgNVBAYTAlVTMRgwFgYDVQQKEw9HVEUg +Q29ycG9yYXRpb24xJzAlBgNVBAsTHkdURSBDeWJlclRydXN0IFNvbHV0aW9ucywgSW5jLjEjMCEG +A1UEAxMaR1RFIEN5YmVyVHJ1c3QgR2xvYmFsIFJvb3QwHhcNOTgwODEzMDAyOTAwWhcNMTgwODEz +MjM1OTAwWjB1MQswCQYDVQQGEwJVUzEYMBYGA1UEChMPR1RFIENvcnBvcmF0aW9uMScwJQYDVQQL +Ex5HVEUgQ3liZXJUcnVzdCBTb2x1dGlvbnMsIEluYy4xIzAhBgNVBAMTGkdURSBDeWJlclRydXN0 +IEdsb2JhbCBSb290MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCVD6C28FCc6HrHiM3dFw4u +sJTQGz0O9pTAipTHBsiQl8i4ZBp6fmw8U+E3KHNgf7KXUwefU/ltWJTSr41tiGeA5u2ylc9yMcql +HHK6XALnZELn+aks1joNrI1CqiQBOeacPwGFVw1Yh0X404Wqk2kmhXBIgD8SFcd5tB8FLztimQID +AQABMA0GCSqGSIb3DQEBBAUAA4GBAG3rGwnpXtlR22ciYaQqPEh346B8pt5zohQDhT37qw4wxYMW +M4ETCJ57NE7fQMh017l93PR2VX2bY1QY6fDq81yx2YtCHrnAlU66+tXifPVoYb+O7AWXX1uw16OF +NMQkpw0PlZPvy5TYnh+dXIVtx6quTx8itc2VrbqnzPmrC3p/ +-----END CERTIFICATE----- + +Thawte Server CA +================ +-----BEGIN CERTIFICATE----- +MIIDEzCCAnygAwIBAgIBATANBgkqhkiG9w0BAQQFADCBxDELMAkGA1UEBhMCWkExFTATBgNVBAgT +DFdlc3Rlcm4gQ2FwZTESMBAGA1UEBxMJQ2FwZSBUb3duMR0wGwYDVQQKExRUaGF3dGUgQ29uc3Vs +dGluZyBjYzEoMCYGA1UECxMfQ2VydGlmaWNhdGlvbiBTZXJ2aWNlcyBEaXZpc2lvbjEZMBcGA1UE +AxMQVGhhd3RlIFNlcnZlciBDQTEmMCQGCSqGSIb3DQEJARYXc2VydmVyLWNlcnRzQHRoYXd0ZS5j +b20wHhcNOTYwODAxMDAwMDAwWhcNMjAxMjMxMjM1OTU5WjCBxDELMAkGA1UEBhMCWkExFTATBgNV +BAgTDFdlc3Rlcm4gQ2FwZTESMBAGA1UEBxMJQ2FwZSBUb3duMR0wGwYDVQQKExRUaGF3dGUgQ29u +c3VsdGluZyBjYzEoMCYGA1UECxMfQ2VydGlmaWNhdGlvbiBTZXJ2aWNlcyBEaXZpc2lvbjEZMBcG +A1UEAxMQVGhhd3RlIFNlcnZlciBDQTEmMCQGCSqGSIb3DQEJARYXc2VydmVyLWNlcnRzQHRoYXd0 +ZS5jb20wgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBANOkUG7I/1Zr5s9dtuoMaHVHoqrC2oQl +/Kj0R1HahbUgdJSGHg91yekIYfUGbTBuFRkC6VLAYttNmZ7iagxEOM3+vuNkCXDF/rFrKbYvScg7 +1CcEJRCXL+eQbcAoQpnXTEPew/UhbVSfXcNY4cDk2VuwuNy0e982OsK1ZiIS1ocNAgMBAAGjEzAR +MA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQEEBQADgYEAB/pMaVz7lcxG7oWDTSEwjsrZqG9J +GubaUeNgcGyEYRGhGshIPllDfU+VPaGLtwtimHp1it2ITk6eQNuozDJ0uW8NxuOzRAvZim+aKZuZ +GCg70eNAKJpaPNW15yAbi8qkq43pUdniTCxZqdq5snUb9kLy78fyGPmJvKP/iiMucEc= +-----END CERTIFICATE----- + +Thawte Premium Server CA +======================== +-----BEGIN CERTIFICATE----- +MIIDJzCCApCgAwIBAgIBATANBgkqhkiG9w0BAQQFADCBzjELMAkGA1UEBhMCWkExFTATBgNVBAgT +DFdlc3Rlcm4gQ2FwZTESMBAGA1UEBxMJQ2FwZSBUb3duMR0wGwYDVQQKExRUaGF3dGUgQ29uc3Vs +dGluZyBjYzEoMCYGA1UECxMfQ2VydGlmaWNhdGlvbiBTZXJ2aWNlcyBEaXZpc2lvbjEhMB8GA1UE +AxMYVGhhd3RlIFByZW1pdW0gU2VydmVyIENBMSgwJgYJKoZIhvcNAQkBFhlwcmVtaXVtLXNlcnZl +ckB0aGF3dGUuY29tMB4XDTk2MDgwMTAwMDAwMFoXDTIwMTIzMTIzNTk1OVowgc4xCzAJBgNVBAYT +AlpBMRUwEwYDVQQIEwxXZXN0ZXJuIENhcGUxEjAQBgNVBAcTCUNhcGUgVG93bjEdMBsGA1UEChMU +VGhhd3RlIENvbnN1bHRpbmcgY2MxKDAmBgNVBAsTH0NlcnRpZmljYXRpb24gU2VydmljZXMgRGl2 +aXNpb24xITAfBgNVBAMTGFRoYXd0ZSBQcmVtaXVtIFNlcnZlciBDQTEoMCYGCSqGSIb3DQEJARYZ +cHJlbWl1bS1zZXJ2ZXJAdGhhd3RlLmNvbTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA0jY2 +aovXwlue2oFBYo847kkEVdbQ7xwblRZH7xhINTpS9CtqBo87L+pW46+GjZ4X9560ZXUCTe/LCaIh +Udib0GfQug2SBhRz1JPLlyoAnFxODLz6FVL88kRu2hFKbgifLy3j+ao6hnO2RlNYyIkFvYMRuHM/ +qgeN9EJN50CdHDcCAwEAAaMTMBEwDwYDVR0TAQH/BAUwAwEB/zANBgkqhkiG9w0BAQQFAAOBgQAm +SCwWwlj66BZ0DKqqX1Q/8tfJeGBeXm43YyJ3Nn6yF8Q0ufUIhfzJATj/Tb7yFkJD57taRvvBxhEf +8UqwKEbJw8RCfbz6q1lu1bdRiBHjpIUZa4JMpAwSremkrj/xw0llmozFyD4lt5SZu5IycQfwhl7t +UCemDaYj+bvLpgcUQg== +-----END CERTIFICATE----- + +Equifax Secure CA +================= +-----BEGIN CERTIFICATE----- +MIIDIDCCAomgAwIBAgIENd70zzANBgkqhkiG9w0BAQUFADBOMQswCQYDVQQGEwJVUzEQMA4GA1UE +ChMHRXF1aWZheDEtMCsGA1UECxMkRXF1aWZheCBTZWN1cmUgQ2VydGlmaWNhdGUgQXV0aG9yaXR5 +MB4XDTk4MDgyMjE2NDE1MVoXDTE4MDgyMjE2NDE1MVowTjELMAkGA1UEBhMCVVMxEDAOBgNVBAoT +B0VxdWlmYXgxLTArBgNVBAsTJEVxdWlmYXggU2VjdXJlIENlcnRpZmljYXRlIEF1dGhvcml0eTCB +nzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAwV2xWGcIYu6gmi0fCG2RFGiYCh7+2gRvE4RiIcPR +fM6fBeC4AfBONOziipUEZKzxa1NfBbPLZ4C/QgKO/t0BCezhABRP/PvwDN1Dulsr4R+AcJkVV5MW +8Q+XarfCaCMczE1ZMKxRHjuvK9buY0V7xdlfUNLjUA86iOe/FP3gx7kCAwEAAaOCAQkwggEFMHAG +A1UdHwRpMGcwZaBjoGGkXzBdMQswCQYDVQQGEwJVUzEQMA4GA1UEChMHRXF1aWZheDEtMCsGA1UE +CxMkRXF1aWZheCBTZWN1cmUgQ2VydGlmaWNhdGUgQXV0aG9yaXR5MQ0wCwYDVQQDEwRDUkwxMBoG +A1UdEAQTMBGBDzIwMTgwODIyMTY0MTUxWjALBgNVHQ8EBAMCAQYwHwYDVR0jBBgwFoAUSOZo+SvS +spXXR9gjIBBPM5iQn9QwHQYDVR0OBBYEFEjmaPkr0rKV10fYIyAQTzOYkJ/UMAwGA1UdEwQFMAMB +Af8wGgYJKoZIhvZ9B0EABA0wCxsFVjMuMGMDAgbAMA0GCSqGSIb3DQEBBQUAA4GBAFjOKer89961 +zgK5F7WF0bnj4JXMJTENAKaSbn+2kmOeUJXRmm/kEd5jhW6Y7qj/WsjTVbJmcVfewCHrPSqnI0kB +BIZCe/zuf6IWUrVnZ9NA2zsmWLIodz2uFHdh1voqZiegDfqnc1zqcPGUIWVEX/r87yloqaKHee95 +70+sB3c4 +-----END CERTIFICATE----- + +Digital Signature Trust Co. Global CA 1 +======================================= +-----BEGIN CERTIFICATE----- +MIIDKTCCApKgAwIBAgIENnAVljANBgkqhkiG9w0BAQUFADBGMQswCQYDVQQGEwJVUzEkMCIGA1UE +ChMbRGlnaXRhbCBTaWduYXR1cmUgVHJ1c3QgQ28uMREwDwYDVQQLEwhEU1RDQSBFMTAeFw05ODEy +MTAxODEwMjNaFw0xODEyMTAxODQwMjNaMEYxCzAJBgNVBAYTAlVTMSQwIgYDVQQKExtEaWdpdGFs +IFNpZ25hdHVyZSBUcnVzdCBDby4xETAPBgNVBAsTCERTVENBIEUxMIGdMA0GCSqGSIb3DQEBAQUA +A4GLADCBhwKBgQCgbIGpzzQeJN3+hijM3oMv+V7UQtLodGBmE5gGHKlREmlvMVW5SXIACH7TpWJE +NySZj9mDSI+ZbZUTu0M7LklOiDfBu1h//uG9+LthzfNHwJmm8fOR6Hh8AMthyUQncWlVSn5JTe2i +o74CTADKAqjuAQIxZA9SLRN0dja1erQtcQIBA6OCASQwggEgMBEGCWCGSAGG+EIBAQQEAwIABzBo +BgNVHR8EYTBfMF2gW6BZpFcwVTELMAkGA1UEBhMCVVMxJDAiBgNVBAoTG0RpZ2l0YWwgU2lnbmF0 +dXJlIFRydXN0IENvLjERMA8GA1UECxMIRFNUQ0EgRTExDTALBgNVBAMTBENSTDEwKwYDVR0QBCQw +IoAPMTk5ODEyMTAxODEwMjNagQ8yMDE4MTIxMDE4MTAyM1owCwYDVR0PBAQDAgEGMB8GA1UdIwQY +MBaAFGp5fpFpRhgTCgJ3pVlbYJglDqL4MB0GA1UdDgQWBBRqeX6RaUYYEwoCd6VZW2CYJQ6i+DAM +BgNVHRMEBTADAQH/MBkGCSqGSIb2fQdBAAQMMAobBFY0LjADAgSQMA0GCSqGSIb3DQEBBQUAA4GB +ACIS2Hod3IEGtgllsofIH160L+nEHvI8wbsEkBFKg05+k7lNQseSJqBcNJo4cvj9axY+IO6CizEq +kzaFI4iKPANo08kJD038bKTaKHKTDomAsH3+gG9lbRgzl4vCa4nuYD3Im+9/KzJic5PLPON74nZ4 +RbyhkwS7hp86W0N6w4pl +-----END CERTIFICATE----- + +Digital Signature Trust Co. Global CA 3 +======================================= +-----BEGIN CERTIFICATE----- +MIIDKTCCApKgAwIBAgIENm7TzjANBgkqhkiG9w0BAQUFADBGMQswCQYDVQQGEwJVUzEkMCIGA1UE +ChMbRGlnaXRhbCBTaWduYXR1cmUgVHJ1c3QgQ28uMREwDwYDVQQLEwhEU1RDQSBFMjAeFw05ODEy +MDkxOTE3MjZaFw0xODEyMDkxOTQ3MjZaMEYxCzAJBgNVBAYTAlVTMSQwIgYDVQQKExtEaWdpdGFs +IFNpZ25hdHVyZSBUcnVzdCBDby4xETAPBgNVBAsTCERTVENBIEUyMIGdMA0GCSqGSIb3DQEBAQUA +A4GLADCBhwKBgQC/k48Xku8zExjrEH9OFr//Bo8qhbxe+SSmJIi2A7fBw18DW9Fvrn5C6mYjuGOD +VvsoLeE4i7TuqAHhzhy2iCoiRoX7n6dwqUcUP87eZfCocfdPJmyMvMa1795JJ/9IKn3oTQPMx7JS +xhcxEzu1TdvIxPbDDyQq2gyd55FbgM2UnQIBA6OCASQwggEgMBEGCWCGSAGG+EIBAQQEAwIABzBo +BgNVHR8EYTBfMF2gW6BZpFcwVTELMAkGA1UEBhMCVVMxJDAiBgNVBAoTG0RpZ2l0YWwgU2lnbmF0 +dXJlIFRydXN0IENvLjERMA8GA1UECxMIRFNUQ0EgRTIxDTALBgNVBAMTBENSTDEwKwYDVR0QBCQw +IoAPMTk5ODEyMDkxOTE3MjZagQ8yMDE4MTIwOTE5MTcyNlowCwYDVR0PBAQDAgEGMB8GA1UdIwQY +MBaAFB6CTShlgDzJQW6sNS5ay97u+DlbMB0GA1UdDgQWBBQegk0oZYA8yUFurDUuWsve7vg5WzAM +BgNVHRMEBTADAQH/MBkGCSqGSIb2fQdBAAQMMAobBFY0LjADAgSQMA0GCSqGSIb3DQEBBQUAA4GB +AEeNg61i8tuwnkUiBbmi1gMOOHLnnvx75pO2mqWilMg0HZHRxdf0CiUPPXiBng+xZ8SQTGPdXqfi +up/1902lMXucKS1M/mQ+7LZT/uqb7YLbdHVLB3luHtgZg3Pe9T7Qtd7nS2h9Qy4qIOF+oHhEngj1 +mPnHfxsb1gYgAlihw6ID +-----END CERTIFICATE----- + +Verisign Class 3 Public Primary Certification Authority +======================================================= +-----BEGIN CERTIFICATE----- +MIICPDCCAaUCEHC65B0Q2Sk0tjjKewPMur8wDQYJKoZIhvcNAQECBQAwXzELMAkGA1UEBhMCVVMx +FzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMTcwNQYDVQQLEy5DbGFzcyAzIFB1YmxpYyBQcmltYXJ5 +IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MB4XDTk2MDEyOTAwMDAwMFoXDTI4MDgwMTIzNTk1OVow +XzELMAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMTcwNQYDVQQLEy5DbGFzcyAz +IFB1YmxpYyBQcmltYXJ5IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MIGfMA0GCSqGSIb3DQEBAQUA +A4GNADCBiQKBgQDJXFme8huKARS0EN8EQNvjV69qRUCPhAwL0TPZ2RHP7gJYHyX3KqhEBarsAx94 +f56TuZoAqiN91qyFomNFx3InzPRMxnVx0jnvT0Lwdd8KkMaOIG+YD/isI19wKTakyYbnsZogy1Ol +hec9vn2a/iRFM9x2Fe0PonFkTGUugWhFpwIDAQABMA0GCSqGSIb3DQEBAgUAA4GBALtMEivPLCYA +TxQT3ab7/AoRhIzzKBxnki98tsX63/Dolbwdj2wsqFHMc9ikwFPwTtYmwHYBV4GSXiHx0bH/59Ah +WM1pF+NEHJwZRDmJXNycAA9WjQKZ7aKQRUzkuxCkPfAyAw7xzvjoyVGM5mKf5p/AfbdynMk2Omuf +Tqj/ZA1k +-----END CERTIFICATE----- + +Verisign Class 3 Public Primary Certification Authority - G2 +============================================================ +-----BEGIN CERTIFICATE----- +MIIDAjCCAmsCEH3Z/gfPqB63EHln+6eJNMYwDQYJKoZIhvcNAQEFBQAwgcExCzAJBgNVBAYTAlVT +MRcwFQYDVQQKEw5WZXJpU2lnbiwgSW5jLjE8MDoGA1UECxMzQ2xhc3MgMyBQdWJsaWMgUHJpbWFy +eSBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eSAtIEcyMTowOAYDVQQLEzEoYykgMTk5OCBWZXJpU2ln +biwgSW5jLiAtIEZvciBhdXRob3JpemVkIHVzZSBvbmx5MR8wHQYDVQQLExZWZXJpU2lnbiBUcnVz +dCBOZXR3b3JrMB4XDTk4MDUxODAwMDAwMFoXDTI4MDgwMTIzNTk1OVowgcExCzAJBgNVBAYTAlVT +MRcwFQYDVQQKEw5WZXJpU2lnbiwgSW5jLjE8MDoGA1UECxMzQ2xhc3MgMyBQdWJsaWMgUHJpbWFy +eSBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eSAtIEcyMTowOAYDVQQLEzEoYykgMTk5OCBWZXJpU2ln +biwgSW5jLiAtIEZvciBhdXRob3JpemVkIHVzZSBvbmx5MR8wHQYDVQQLExZWZXJpU2lnbiBUcnVz +dCBOZXR3b3JrMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDMXtERXVxp0KvTuWpMmR9ZmDCO +FoUgRm1HP9SFIIThbbP4pO0M8RcPO/mn+SXXwc+EY/J8Y8+iR/LGWzOOZEAEaMGAuWQcRXfH2G71 +lSk8UOg013gfqLptQ5GVj0VXXn7F+8qkBOvqlzdUMG+7AUcyM83cV5tkaWH4mx0ciU9cZwIDAQAB +MA0GCSqGSIb3DQEBBQUAA4GBAFFNzb5cy5gZnBWyATl4Lk0PZ3BwmcYQWpSkU01UbSuvDV1Ai2TT +1+7eVmGSX6bEHRBhNtMsJzzoKQm5EWR0zLVznxxIqbxhAe7iF6YM40AIOw7n60RzKprxaZLvcRTD +Oaxxp5EJb+RxBrO6WVcmeQD2+A2iMzAo1KpYoJ2daZH9 +-----END CERTIFICATE----- + +GlobalSign Root CA +================== +-----BEGIN CERTIFICATE----- +MIIDdTCCAl2gAwIBAgILBAAAAAABFUtaw5QwDQYJKoZIhvcNAQEFBQAwVzELMAkGA1UEBhMCQkUx +GTAXBgNVBAoTEEdsb2JhbFNpZ24gbnYtc2ExEDAOBgNVBAsTB1Jvb3QgQ0ExGzAZBgNVBAMTEkds +b2JhbFNpZ24gUm9vdCBDQTAeFw05ODA5MDExMjAwMDBaFw0yODAxMjgxMjAwMDBaMFcxCzAJBgNV +BAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMRAwDgYDVQQLEwdSb290IENBMRswGQYD +VQQDExJHbG9iYWxTaWduIFJvb3QgQ0EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDa +DuaZjc6j40+Kfvvxi4Mla+pIH/EqsLmVEQS98GPR4mdmzxzdzxtIK+6NiY6arymAZavpxy0Sy6sc +THAHoT0KMM0VjU/43dSMUBUc71DuxC73/OlS8pF94G3VNTCOXkNz8kHp1Wrjsok6Vjk4bwY8iGlb +Kk3Fp1S4bInMm/k8yuX9ifUSPJJ4ltbcdG6TRGHRjcdGsnUOhugZitVtbNV4FpWi6cgKOOvyJBNP +c1STE4U6G7weNLWLBYy5d4ux2x8gkasJU26Qzns3dLlwR5EiUWMWea6xrkEmCMgZK9FGqkjWZCrX +gzT/LCrBbBlDSgeF59N89iFo7+ryUp9/k5DPAgMBAAGjQjBAMA4GA1UdDwEB/wQEAwIBBjAPBgNV +HRMBAf8EBTADAQH/MB0GA1UdDgQWBBRge2YaRQ2XyolQL30EzTSo//z9SzANBgkqhkiG9w0BAQUF +AAOCAQEA1nPnfE920I2/7LqivjTFKDK1fPxsnCwrvQmeU79rXqoRSLblCKOzyj1hTdNGCbM+w6Dj +Y1Ub8rrvrTnhQ7k4o+YviiY776BQVvnGCv04zcQLcFGUl5gE38NflNUVyRRBnMRddWQVDf9VMOyG +j/8N7yy5Y0b2qvzfvGn9LhJIZJrglfCm7ymPAbEVtQwdpf5pLGkkeB6zpxxxYu7KyJesF12KwvhH +hm4qxFYxldBniYUr+WymXUadDKqC5JlR3XC321Y9YeRq4VzW9v493kHMB65jUr9TU/Qr6cf9tveC +X4XSQRjbgbMEHMUfpIBvFSDJ3gyICh3WZlXi/EjJKSZp4A== +-----END CERTIFICATE----- + +GlobalSign Root CA - R2 +======================= +-----BEGIN CERTIFICATE----- +MIIDujCCAqKgAwIBAgILBAAAAAABD4Ym5g0wDQYJKoZIhvcNAQEFBQAwTDEgMB4GA1UECxMXR2xv +YmFsU2lnbiBSb290IENBIC0gUjIxEzARBgNVBAoTCkdsb2JhbFNpZ24xEzARBgNVBAMTCkdsb2Jh +bFNpZ24wHhcNMDYxMjE1MDgwMDAwWhcNMjExMjE1MDgwMDAwWjBMMSAwHgYDVQQLExdHbG9iYWxT +aWduIFJvb3QgQ0EgLSBSMjETMBEGA1UEChMKR2xvYmFsU2lnbjETMBEGA1UEAxMKR2xvYmFsU2ln +bjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKbPJA6+Lm8omUVCxKs+IVSbC9N/hHD6 +ErPLv4dfxn+G07IwXNb9rfF73OX4YJYJkhD10FPe+3t+c4isUoh7SqbKSaZeqKeMWhG8eoLrvozp +s6yWJQeXSpkqBy+0Hne/ig+1AnwblrjFuTosvNYSuetZfeLQBoZfXklqtTleiDTsvHgMCJiEbKjN +S7SgfQx5TfC4LcshytVsW33hoCmEofnTlEnLJGKRILzdC9XZzPnqJworc5HGnRusyMvo4KD0L5CL +TfuwNhv2GXqF4G3yYROIXJ/gkwpRl4pazq+r1feqCapgvdzZX99yqWATXgAByUr6P6TqBwMhAo6C +ygPCm48CAwEAAaOBnDCBmTAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4E +FgQUm+IHV2ccHsBqBt5ZtJot39wZhi4wNgYDVR0fBC8wLTAroCmgJ4YlaHR0cDovL2NybC5nbG9i +YWxzaWduLm5ldC9yb290LXIyLmNybDAfBgNVHSMEGDAWgBSb4gdXZxwewGoG3lm0mi3f3BmGLjAN +BgkqhkiG9w0BAQUFAAOCAQEAmYFThxxol4aR7OBKuEQLq4GsJ0/WwbgcQ3izDJr86iw8bmEbTUsp +9Z8FHSbBuOmDAGJFtqkIk7mpM0sYmsL4h4hO291xNBrBVNpGP+DTKqttVCL1OmLNIG+6KYnX3ZHu +01yiPqFbQfXf5WRDLenVOavSot+3i9DAgBkcRcAtjOj4LaR0VknFBbVPFd5uRHg5h6h+u/N5GJG7 +9G+dwfCMNYxdAfvDbbnvRG15RjF+Cv6pgsH/76tuIMRQyV+dTZsXjAzlAcmgQWpzU/qlULRuJQ/7 +TBj0/VLZjmmx6BEP3ojY+x1J96relc8geMJgEtslQIxq/H5COEBkEveegeGTLg== +-----END CERTIFICATE----- + +ValiCert Class 1 VA +=================== +-----BEGIN CERTIFICATE----- +MIIC5zCCAlACAQEwDQYJKoZIhvcNAQEFBQAwgbsxJDAiBgNVBAcTG1ZhbGlDZXJ0IFZhbGlkYXRp +b24gTmV0d29yazEXMBUGA1UEChMOVmFsaUNlcnQsIEluYy4xNTAzBgNVBAsTLFZhbGlDZXJ0IENs +YXNzIDEgUG9saWN5IFZhbGlkYXRpb24gQXV0aG9yaXR5MSEwHwYDVQQDExhodHRwOi8vd3d3LnZh +bGljZXJ0LmNvbS8xIDAeBgkqhkiG9w0BCQEWEWluZm9AdmFsaWNlcnQuY29tMB4XDTk5MDYyNTIy +MjM0OFoXDTE5MDYyNTIyMjM0OFowgbsxJDAiBgNVBAcTG1ZhbGlDZXJ0IFZhbGlkYXRpb24gTmV0 +d29yazEXMBUGA1UEChMOVmFsaUNlcnQsIEluYy4xNTAzBgNVBAsTLFZhbGlDZXJ0IENsYXNzIDEg +UG9saWN5IFZhbGlkYXRpb24gQXV0aG9yaXR5MSEwHwYDVQQDExhodHRwOi8vd3d3LnZhbGljZXJ0 +LmNvbS8xIDAeBgkqhkiG9w0BCQEWEWluZm9AdmFsaWNlcnQuY29tMIGfMA0GCSqGSIb3DQEBAQUA +A4GNADCBiQKBgQDYWYJ6ibiWuqYvaG9YLqdUHAZu9OqNSLwxlBfw8068srg1knaw0KWlAdcAAxIi +GQj4/xEjm84H9b9pGib+TunRf50sQB1ZaG6m+FiwnRqP0z/x3BkGgagO4DrdyFNFCQbmD3DD+kCm +DuJWBQ8YTfwggtFzVXSNdnKgHZ0dwN0/cQIDAQABMA0GCSqGSIb3DQEBBQUAA4GBAFBoPUn0LBwG +lN+VYH+Wexf+T3GtZMjdd9LvWVXoP+iOBSoh8gfStadS/pyxtuJbdxdA6nLWI8sogTLDAHkY7FkX +icnGah5xyf23dKUlRWnFSKsZ4UWKJWsZ7uW7EvV/96aNUcPwnXS3qT6gpf+2SQMT2iLM7XGCK5nP +Orf1LXLI +-----END CERTIFICATE----- + +ValiCert Class 2 VA +=================== +-----BEGIN CERTIFICATE----- +MIIC5zCCAlACAQEwDQYJKoZIhvcNAQEFBQAwgbsxJDAiBgNVBAcTG1ZhbGlDZXJ0IFZhbGlkYXRp +b24gTmV0d29yazEXMBUGA1UEChMOVmFsaUNlcnQsIEluYy4xNTAzBgNVBAsTLFZhbGlDZXJ0IENs +YXNzIDIgUG9saWN5IFZhbGlkYXRpb24gQXV0aG9yaXR5MSEwHwYDVQQDExhodHRwOi8vd3d3LnZh +bGljZXJ0LmNvbS8xIDAeBgkqhkiG9w0BCQEWEWluZm9AdmFsaWNlcnQuY29tMB4XDTk5MDYyNjAw +MTk1NFoXDTE5MDYyNjAwMTk1NFowgbsxJDAiBgNVBAcTG1ZhbGlDZXJ0IFZhbGlkYXRpb24gTmV0 +d29yazEXMBUGA1UEChMOVmFsaUNlcnQsIEluYy4xNTAzBgNVBAsTLFZhbGlDZXJ0IENsYXNzIDIg +UG9saWN5IFZhbGlkYXRpb24gQXV0aG9yaXR5MSEwHwYDVQQDExhodHRwOi8vd3d3LnZhbGljZXJ0 +LmNvbS8xIDAeBgkqhkiG9w0BCQEWEWluZm9AdmFsaWNlcnQuY29tMIGfMA0GCSqGSIb3DQEBAQUA +A4GNADCBiQKBgQDOOnHK5avIWZJV16vYdA757tn2VUdZZUcOBVXc65g2PFxTXdMwzzjsvUGJ7SVC +CSRrCl6zfN1SLUzm1NZ9WlmpZdRJEy0kTRxQb7XBhVQ7/nHk01xC+YDgkRoKWzk2Z/M/VXwbP7Rf +ZHM047QSv4dk+NoS/zcnwbNDu+97bi5p9wIDAQABMA0GCSqGSIb3DQEBBQUAA4GBADt/UG9vUJSZ +SWI4OB9L+KXIPqeCgfYrx+jFzug6EILLGACOTb2oWH+heQC1u+mNr0HZDzTuIYEZoDJJKPTEjlbV +UjP9UNV+mWwD5MlM/Mtsq2azSiGM5bUMMj4QssxsodyamEwCW/POuZ6lcg5Ktz885hZo+L7tdEy8 +W9ViH0Pd +-----END CERTIFICATE----- + +RSA Root Certificate 1 +====================== +-----BEGIN CERTIFICATE----- +MIIC5zCCAlACAQEwDQYJKoZIhvcNAQEFBQAwgbsxJDAiBgNVBAcTG1ZhbGlDZXJ0IFZhbGlkYXRp +b24gTmV0d29yazEXMBUGA1UEChMOVmFsaUNlcnQsIEluYy4xNTAzBgNVBAsTLFZhbGlDZXJ0IENs +YXNzIDMgUG9saWN5IFZhbGlkYXRpb24gQXV0aG9yaXR5MSEwHwYDVQQDExhodHRwOi8vd3d3LnZh +bGljZXJ0LmNvbS8xIDAeBgkqhkiG9w0BCQEWEWluZm9AdmFsaWNlcnQuY29tMB4XDTk5MDYyNjAw +MjIzM1oXDTE5MDYyNjAwMjIzM1owgbsxJDAiBgNVBAcTG1ZhbGlDZXJ0IFZhbGlkYXRpb24gTmV0 +d29yazEXMBUGA1UEChMOVmFsaUNlcnQsIEluYy4xNTAzBgNVBAsTLFZhbGlDZXJ0IENsYXNzIDMg +UG9saWN5IFZhbGlkYXRpb24gQXV0aG9yaXR5MSEwHwYDVQQDExhodHRwOi8vd3d3LnZhbGljZXJ0 +LmNvbS8xIDAeBgkqhkiG9w0BCQEWEWluZm9AdmFsaWNlcnQuY29tMIGfMA0GCSqGSIb3DQEBAQUA +A4GNADCBiQKBgQDjmFGWHOjVsQaBalfDcnWTq8+epvzzFlLWLU2fNUSoLgRNB0mKOCn1dzfnt6td +3zZxFJmP3MKS8edgkpfs2Ejcv8ECIMYkpChMMFp2bbFc893enhBxoYjHW5tBbcqwuI4V7q0zK89H +BFx1cQqYJJgpp0lZpd34t0NiYfPT4tBVPwIDAQABMA0GCSqGSIb3DQEBBQUAA4GBAFa7AliEZwgs +3x/be0kz9dNnnfS0ChCzycUs4pJqcXgn8nCDQtM+z6lU9PHYkhaM0QTLS6vJn0WuPIqpsHEzXcjF +V9+vqDWzf4mH6eglkrh/hXqu1rweN1gqZ8mRzyqBPu3GOd/APhmcGcwTTYJBtYze4D1gCCAPRX5r +on+jjBXu +-----END CERTIFICATE----- + +Verisign Class 3 Public Primary Certification Authority - G3 +============================================================ +-----BEGIN CERTIFICATE----- +MIIEGjCCAwICEQCbfgZJoz5iudXukEhxKe9XMA0GCSqGSIb3DQEBBQUAMIHKMQswCQYDVQQGEwJV +UzEXMBUGA1UEChMOVmVyaVNpZ24sIEluYy4xHzAdBgNVBAsTFlZlcmlTaWduIFRydXN0IE5ldHdv +cmsxOjA4BgNVBAsTMShjKSAxOTk5IFZlcmlTaWduLCBJbmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNl +IG9ubHkxRTBDBgNVBAMTPFZlcmlTaWduIENsYXNzIDMgUHVibGljIFByaW1hcnkgQ2VydGlmaWNh +dGlvbiBBdXRob3JpdHkgLSBHMzAeFw05OTEwMDEwMDAwMDBaFw0zNjA3MTYyMzU5NTlaMIHKMQsw +CQYDVQQGEwJVUzEXMBUGA1UEChMOVmVyaVNpZ24sIEluYy4xHzAdBgNVBAsTFlZlcmlTaWduIFRy +dXN0IE5ldHdvcmsxOjA4BgNVBAsTMShjKSAxOTk5IFZlcmlTaWduLCBJbmMuIC0gRm9yIGF1dGhv +cml6ZWQgdXNlIG9ubHkxRTBDBgNVBAMTPFZlcmlTaWduIENsYXNzIDMgUHVibGljIFByaW1hcnkg +Q2VydGlmaWNhdGlvbiBBdXRob3JpdHkgLSBHMzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC +ggEBAMu6nFL8eB8aHm8bN3O9+MlrlBIwT/A2R/XQkQr1F8ilYcEWQE37imGQ5XYgwREGfassbqb1 +EUGO+i2tKmFZpGcmTNDovFJbcCAEWNF6yaRpvIMXZK0Fi7zQWM6NjPXr8EJJC52XJ2cybuGukxUc +cLwgTS8Y3pKI6GyFVxEa6X7jJhFUokWWVYPKMIno3Nij7SqAP395ZVc+FSBmCC+Vk7+qRy+oRpfw +EuL+wgorUeZ25rdGt+INpsyow0xZVYnm6FNcHOqd8GIWC6fJXwzw3sJ2zq/3avL6QaaiMxTJ5Xpj +055iN9WFZZ4O5lMkdBteHRJTW8cs54NJOxWuimi5V5cCAwEAATANBgkqhkiG9w0BAQUFAAOCAQEA +ERSWwauSCPc/L8my/uRan2Te2yFPhpk0djZX3dAVL8WtfxUfN2JzPtTnX84XA9s1+ivbrmAJXx5f +j267Cz3qWhMeDGBvtcC1IyIuBwvLqXTLR7sdwdela8wv0kL9Sd2nic9TutoAWii/gt/4uhMdUIaC +/Y4wjylGsB49Ndo4YhYYSq3mtlFs3q9i6wHQHiT+eo8SGhJouPtmmRQURVyu565pF4ErWjfJXir0 +xuKhXFSbplQAz/DxwceYMBo7Nhbbo27q/a2ywtrvAkcTisDxszGtTxzhT5yvDwyd93gN2PQ1VoDa +t20Xj50egWTh/sVFuq1ruQp6Tk9LhO5L8X3dEQ== +-----END CERTIFICATE----- + +Verisign Class 4 Public Primary Certification Authority - G3 +============================================================ +-----BEGIN CERTIFICATE----- +MIIEGjCCAwICEQDsoKeLbnVqAc/EfMwvlF7XMA0GCSqGSIb3DQEBBQUAMIHKMQswCQYDVQQGEwJV +UzEXMBUGA1UEChMOVmVyaVNpZ24sIEluYy4xHzAdBgNVBAsTFlZlcmlTaWduIFRydXN0IE5ldHdv +cmsxOjA4BgNVBAsTMShjKSAxOTk5IFZlcmlTaWduLCBJbmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNl +IG9ubHkxRTBDBgNVBAMTPFZlcmlTaWduIENsYXNzIDQgUHVibGljIFByaW1hcnkgQ2VydGlmaWNh +dGlvbiBBdXRob3JpdHkgLSBHMzAeFw05OTEwMDEwMDAwMDBaFw0zNjA3MTYyMzU5NTlaMIHKMQsw +CQYDVQQGEwJVUzEXMBUGA1UEChMOVmVyaVNpZ24sIEluYy4xHzAdBgNVBAsTFlZlcmlTaWduIFRy +dXN0IE5ldHdvcmsxOjA4BgNVBAsTMShjKSAxOTk5IFZlcmlTaWduLCBJbmMuIC0gRm9yIGF1dGhv +cml6ZWQgdXNlIG9ubHkxRTBDBgNVBAMTPFZlcmlTaWduIENsYXNzIDQgUHVibGljIFByaW1hcnkg +Q2VydGlmaWNhdGlvbiBBdXRob3JpdHkgLSBHMzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC +ggEBAK3LpRFpxlmr8Y+1GQ9Wzsy1HyDkniYlS+BzZYlZ3tCD5PUPtbut8XzoIfzk6AzufEUiGXaS +tBO3IFsJ+mGuqPKljYXCKtbeZjbSmwL0qJJgfJxptI8kHtCGUvYynEFYHiK9zUVilQhu0GbdU6LM +8BDcVHOLBKFGMzNcF0C5nk3T875Vg+ixiY5afJqWIpA7iCXy0lOIAgwLePLmNxdLMEYH5IBtptiW +Lugs+BGzOA1mppvqySNb247i8xOOGlktqgLw7KSHZtzBP/XYufTsgsbSPZUd5cBPhMnZo0QoBmrX +Razwa2rvTl/4EYIeOGM0ZlDUPpNz+jDDZq3/ky2X7wMCAwEAATANBgkqhkiG9w0BAQUFAAOCAQEA +j/ola09b5KROJ1WrIhVZPMq1CtRK26vdoV9TxaBXOcLORyu+OshWv8LZJxA6sQU8wHcxuzrTBXtt +mhwwjIDLk5Mqg6sFUYICABFna/OIYUdfA5PVWw3g8dShMjWFsjrbsIKr0csKvE+MW8VLADsfKoKm +fjaF3H48ZwC15DtS4KjrXRX5xm3wrR0OhbepmnMUWluPQSjA1egtTaRezarZ7c7c2NU8Qh0XwRJd +RTjDOPP8hS6DRkiy1yBfkjaP53kPmF6Z6PDQpLv1U70qzlmwr25/bLvSHgCwIe34QWKCudiyxLtG +UPMxxY8BqHTr9Xgn2uf3ZkPznoM+IKrDNWCRzg== +-----END CERTIFICATE----- + +Entrust.net Secure Server CA +============================ +-----BEGIN CERTIFICATE----- +MIIE2DCCBEGgAwIBAgIEN0rSQzANBgkqhkiG9w0BAQUFADCBwzELMAkGA1UEBhMCVVMxFDASBgNV +BAoTC0VudHJ1c3QubmV0MTswOQYDVQQLEzJ3d3cuZW50cnVzdC5uZXQvQ1BTIGluY29ycC4gYnkg +cmVmLiAobGltaXRzIGxpYWIuKTElMCMGA1UECxMcKGMpIDE5OTkgRW50cnVzdC5uZXQgTGltaXRl +ZDE6MDgGA1UEAxMxRW50cnVzdC5uZXQgU2VjdXJlIFNlcnZlciBDZXJ0aWZpY2F0aW9uIEF1dGhv +cml0eTAeFw05OTA1MjUxNjA5NDBaFw0xOTA1MjUxNjM5NDBaMIHDMQswCQYDVQQGEwJVUzEUMBIG +A1UEChMLRW50cnVzdC5uZXQxOzA5BgNVBAsTMnd3dy5lbnRydXN0Lm5ldC9DUFMgaW5jb3JwLiBi +eSByZWYuIChsaW1pdHMgbGlhYi4pMSUwIwYDVQQLExwoYykgMTk5OSBFbnRydXN0Lm5ldCBMaW1p +dGVkMTowOAYDVQQDEzFFbnRydXN0Lm5ldCBTZWN1cmUgU2VydmVyIENlcnRpZmljYXRpb24gQXV0 +aG9yaXR5MIGdMA0GCSqGSIb3DQEBAQUAA4GLADCBhwKBgQDNKIM0VBuJ8w+vN5Ex/68xYMmo6LIQ +aO2f55M28Qpku0f1BBc/I0dNxScZgSYMVHINiC3ZH5oSn7yzcdOAGT9HZnuMNSjSuQrfJNqc1lB5 +gXpa0zf3wkrYKZImZNHkmGw6AIr1NJtl+O3jEP/9uElY3KDegjlrgbEWGWG5VLbmQwIBA6OCAdcw +ggHTMBEGCWCGSAGG+EIBAQQEAwIABzCCARkGA1UdHwSCARAwggEMMIHeoIHboIHYpIHVMIHSMQsw +CQYDVQQGEwJVUzEUMBIGA1UEChMLRW50cnVzdC5uZXQxOzA5BgNVBAsTMnd3dy5lbnRydXN0Lm5l +dC9DUFMgaW5jb3JwLiBieSByZWYuIChsaW1pdHMgbGlhYi4pMSUwIwYDVQQLExwoYykgMTk5OSBF +bnRydXN0Lm5ldCBMaW1pdGVkMTowOAYDVQQDEzFFbnRydXN0Lm5ldCBTZWN1cmUgU2VydmVyIENl +cnRpZmljYXRpb24gQXV0aG9yaXR5MQ0wCwYDVQQDEwRDUkwxMCmgJ6AlhiNodHRwOi8vd3d3LmVu +dHJ1c3QubmV0L0NSTC9uZXQxLmNybDArBgNVHRAEJDAigA8xOTk5MDUyNTE2MDk0MFqBDzIwMTkw +NTI1MTYwOTQwWjALBgNVHQ8EBAMCAQYwHwYDVR0jBBgwFoAU8BdiE1U9s/8KAGv7UISX8+1i0Bow +HQYDVR0OBBYEFPAXYhNVPbP/CgBr+1CEl/PtYtAaMAwGA1UdEwQFMAMBAf8wGQYJKoZIhvZ9B0EA +BAwwChsEVjQuMAMCBJAwDQYJKoZIhvcNAQEFBQADgYEAkNwwAvpkdMKnCqV8IY00F6j7Rw7/JXyN +Ewr75Ji174z4xRAN95K+8cPV1ZVqBLssziY2ZcgxxufuP+NXdYR6Ee9GTxj005i7qIcyunL2POI9 +n9cd2cNgQ4xYDiKWL2KjLB+6rQXvqzJ4h6BUcxm1XAX5Uj5tLUUL9wqT6u0G+bI= +-----END CERTIFICATE----- + +Entrust.net Premium 2048 Secure Server CA +========================================= +-----BEGIN CERTIFICATE----- +MIIEXDCCA0SgAwIBAgIEOGO5ZjANBgkqhkiG9w0BAQUFADCBtDEUMBIGA1UEChMLRW50cnVzdC5u +ZXQxQDA+BgNVBAsUN3d3dy5lbnRydXN0Lm5ldC9DUFNfMjA0OCBpbmNvcnAuIGJ5IHJlZi4gKGxp +bWl0cyBsaWFiLikxJTAjBgNVBAsTHChjKSAxOTk5IEVudHJ1c3QubmV0IExpbWl0ZWQxMzAxBgNV +BAMTKkVudHJ1c3QubmV0IENlcnRpZmljYXRpb24gQXV0aG9yaXR5ICgyMDQ4KTAeFw05OTEyMjQx +NzUwNTFaFw0xOTEyMjQxODIwNTFaMIG0MRQwEgYDVQQKEwtFbnRydXN0Lm5ldDFAMD4GA1UECxQ3 +d3d3LmVudHJ1c3QubmV0L0NQU18yMDQ4IGluY29ycC4gYnkgcmVmLiAobGltaXRzIGxpYWIuKTEl +MCMGA1UECxMcKGMpIDE5OTkgRW50cnVzdC5uZXQgTGltaXRlZDEzMDEGA1UEAxMqRW50cnVzdC5u +ZXQgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkgKDIwNDgpMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A +MIIBCgKCAQEArU1LqRKGsuqjIAcVFmQqK0vRvwtKTY7tgHalZ7d4QMBzQshowNtTK91euHaYNZOL +Gp18EzoOH1u3Hs/lJBQesYGpjX24zGtLA/ECDNyrpUAkAH90lKGdCCmziAv1h3edVc3kw37XamSr +hRSGlVuXMlBvPci6Zgzj/L24ScF2iUkZ/cCovYmjZy/Gn7xxGWC4LeksyZB2ZnuU4q941mVTXTzW +nLLPKQP5L6RQstRIzgUyVYr9smRMDuSYB3Xbf9+5CFVghTAp+XtIpGmG4zU/HoZdenoVve8AjhUi +VBcAkCaTvA5JaJG/+EfTnZVCwQ5N328mz8MYIWJmQ3DW1cAH4QIDAQABo3QwcjARBglghkgBhvhC +AQEEBAMCAAcwHwYDVR0jBBgwFoAUVeSB0RGAvtiJuQijMfmhJAkWuXAwHQYDVR0OBBYEFFXkgdER +gL7YibkIozH5oSQJFrlwMB0GCSqGSIb2fQdBAAQQMA4bCFY1LjA6NC4wAwIEkDANBgkqhkiG9w0B +AQUFAAOCAQEAWUesIYSKF8mciVMeuoCFGsY8Tj6xnLZ8xpJdGGQC49MGCBFhfGPjK50xA3B20qMo +oPS7mmNz7W3lKtvtFKkrxjYR0CvrB4ul2p5cGZ1WEvVUKcgF7bISKo30Axv/55IQh7A6tcOdBTcS +o8f0FbnVpDkWm1M6I5HxqIKiaohowXkCIryqptau37AUX7iH0N18f3v/rxzP5tsHrV7bhZ3QKw0z +2wTR5klAEyt2+z7pnIkPFc4YsIV4IU9rTw76NmfNB/L/CNDi3tm/Kq+4h4YhPATKt5Rof8886ZjX +OP/swNlQ8C5LWK5Gb9Auw2DaclVyvUxFnmG6v4SBkgPR0ml8xQ== +-----END CERTIFICATE----- + +Baltimore CyberTrust Root +========================= +-----BEGIN CERTIFICATE----- +MIIDdzCCAl+gAwIBAgIEAgAAuTANBgkqhkiG9w0BAQUFADBaMQswCQYDVQQGEwJJRTESMBAGA1UE +ChMJQmFsdGltb3JlMRMwEQYDVQQLEwpDeWJlclRydXN0MSIwIAYDVQQDExlCYWx0aW1vcmUgQ3li +ZXJUcnVzdCBSb290MB4XDTAwMDUxMjE4NDYwMFoXDTI1MDUxMjIzNTkwMFowWjELMAkGA1UEBhMC +SUUxEjAQBgNVBAoTCUJhbHRpbW9yZTETMBEGA1UECxMKQ3liZXJUcnVzdDEiMCAGA1UEAxMZQmFs +dGltb3JlIEN5YmVyVHJ1c3QgUm9vdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKME +uyKrmD1X6CZymrV51Cni4eiVgLGw41uOKymaZN+hXe2wCQVt2yguzmKiYv60iNoS6zjrIZ3AQSsB +UnuId9Mcj8e6uYi1agnnc+gRQKfRzMpijS3ljwumUNKoUMMo6vWrJYeKmpYcqWe4PwzV9/lSEy/C +G9VwcPCPwBLKBsua4dnKM3p31vjsufFoREJIE9LAwqSuXmD+tqYF/LTdB1kC1FkYmGP1pWPgkAx9 +XbIGevOF6uvUA65ehD5f/xXtabz5OTZydc93Uk3zyZAsuT3lySNTPx8kmCFcB5kpvcY67Oduhjpr +l3RjM71oGDHweI12v/yejl0qhqdNkNwnGjkCAwEAAaNFMEMwHQYDVR0OBBYEFOWdWTCCR1jMrPoI +VDaGezq1BE3wMBIGA1UdEwEB/wQIMAYBAf8CAQMwDgYDVR0PAQH/BAQDAgEGMA0GCSqGSIb3DQEB +BQUAA4IBAQCFDF2O5G9RaEIFoN27TyclhAO992T9Ldcw46QQF+vaKSm2eT929hkTI7gQCvlYpNRh +cL0EYWoSihfVCr3FvDB81ukMJY2GQE/szKN+OMY3EU/t3WgxjkzSswF07r51XgdIGn9w/xZchMB5 +hbgF/X++ZRGjD8ACtPhSNzkE1akxehi/oCr0Epn3o0WC4zxe9Z2etciefC7IpJ5OCBRLbf1wbWsa +Y71k5h+3zvDyny67G7fyUIhzksLi4xaNmjICq44Y3ekQEe5+NauQrz4wlHrQMz2nZQ/1/I6eYs9H +RCwBXbsdtTLSR9I4LtD+gdwyah617jzV/OeBHRnDJELqYzmp +-----END CERTIFICATE----- + +Equifax Secure Global eBusiness CA +================================== +-----BEGIN CERTIFICATE----- +MIICkDCCAfmgAwIBAgIBATANBgkqhkiG9w0BAQQFADBaMQswCQYDVQQGEwJVUzEcMBoGA1UEChMT +RXF1aWZheCBTZWN1cmUgSW5jLjEtMCsGA1UEAxMkRXF1aWZheCBTZWN1cmUgR2xvYmFsIGVCdXNp +bmVzcyBDQS0xMB4XDTk5MDYyMTA0MDAwMFoXDTIwMDYyMTA0MDAwMFowWjELMAkGA1UEBhMCVVMx +HDAaBgNVBAoTE0VxdWlmYXggU2VjdXJlIEluYy4xLTArBgNVBAMTJEVxdWlmYXggU2VjdXJlIEds +b2JhbCBlQnVzaW5lc3MgQ0EtMTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAuucXkAJlsTRV +PEnCUdXfp9E3j9HngXNBUmCbnaEXJnitx7HoJpQytd4zjTov2/KaelpzmKNc6fuKcxtc58O/gGzN +qfTWK8D3+ZmqY6KxRwIP1ORROhI8bIpaVIRw28HFkM9yRcuoWcDNM50/o5brhTMhHD4ePmBudpxn +hcXIw2ECAwEAAaNmMGQwEQYJYIZIAYb4QgEBBAQDAgAHMA8GA1UdEwEB/wQFMAMBAf8wHwYDVR0j +BBgwFoAUvqigdHJQa0S3ySPY+6j/s1draGwwHQYDVR0OBBYEFL6ooHRyUGtEt8kj2Puo/7NXa2hs +MA0GCSqGSIb3DQEBBAUAA4GBADDiAVGqx+pf2rnQZQ8w1j7aDRRJbpGTJxQx78T3LUX47Me/okEN +I7SS+RkAZ70Br83gcfxaz2TE4JaY0KNA4gGK7ycH8WUBikQtBmV1UsCGECAhX2xrD2yuCRyv8qIY +NMR1pHMc8Y3c7635s3a0kr/clRAevsvIO1qEYBlWlKlV +-----END CERTIFICATE----- + +Equifax Secure eBusiness CA 1 +============================= +-----BEGIN CERTIFICATE----- +MIICgjCCAeugAwIBAgIBBDANBgkqhkiG9w0BAQQFADBTMQswCQYDVQQGEwJVUzEcMBoGA1UEChMT +RXF1aWZheCBTZWN1cmUgSW5jLjEmMCQGA1UEAxMdRXF1aWZheCBTZWN1cmUgZUJ1c2luZXNzIENB +LTEwHhcNOTkwNjIxMDQwMDAwWhcNMjAwNjIxMDQwMDAwWjBTMQswCQYDVQQGEwJVUzEcMBoGA1UE +ChMTRXF1aWZheCBTZWN1cmUgSW5jLjEmMCQGA1UEAxMdRXF1aWZheCBTZWN1cmUgZUJ1c2luZXNz +IENBLTEwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAM4vGbwXt3fek6lfWg0XTzQaDJj0ItlZ +1MRoRvC0NcWFAyDGr0WlIVFFQesWWDYyb+JQYmT5/VGcqiTZ9J2DKocKIdMSODRsjQBuWqDZQu4a +IZX5UkxVWsUPOE9G+m34LjXWHXzr4vCwdYDIqROsvojvOm6rXyo4YgKwEnv+j6YDAgMBAAGjZjBk +MBEGCWCGSAGG+EIBAQQEAwIABzAPBgNVHRMBAf8EBTADAQH/MB8GA1UdIwQYMBaAFEp4MlIR21kW +Nl7fwRQ2QGpHfEyhMB0GA1UdDgQWBBRKeDJSEdtZFjZe38EUNkBqR3xMoTANBgkqhkiG9w0BAQQF +AAOBgQB1W6ibAxHm6VZMzfmpTMANmvPMZWnmJXbMWbfWVMMdzZmsGd20hdXgPfxiIKeES1hl8eL5 +lSE/9dR+WB5Hh1Q+WKG1tfgq73HnvMP2sUlG4tega+VWeponmHxGYhTnyfxuAxJ5gDgdSIKN/Bf+ +KpYrtWKmpj29f5JZzVoqgrI3eQ== +-----END CERTIFICATE----- + +Equifax Secure eBusiness CA 2 +============================= +-----BEGIN CERTIFICATE----- +MIIDIDCCAomgAwIBAgIEN3DPtTANBgkqhkiG9w0BAQUFADBOMQswCQYDVQQGEwJVUzEXMBUGA1UE +ChMORXF1aWZheCBTZWN1cmUxJjAkBgNVBAsTHUVxdWlmYXggU2VjdXJlIGVCdXNpbmVzcyBDQS0y +MB4XDTk5MDYyMzEyMTQ0NVoXDTE5MDYyMzEyMTQ0NVowTjELMAkGA1UEBhMCVVMxFzAVBgNVBAoT +DkVxdWlmYXggU2VjdXJlMSYwJAYDVQQLEx1FcXVpZmF4IFNlY3VyZSBlQnVzaW5lc3MgQ0EtMjCB +nzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA5Dk5kx5SBhsoNviyoynF7Y6yEb3+6+e0dMKP/wXn +2Z0GvxLIPw7y1tEkshHe0XMJitSxLJgJDR5QRrKDpkWNYmi7hRsgcDKqQM2mll/EcTc/BPO3QSQ5 +BxoeLmFYoBIL5aXfxavqN3HMHMg3OrmXUqesxWoklE6ce8/AatbfIb0CAwEAAaOCAQkwggEFMHAG +A1UdHwRpMGcwZaBjoGGkXzBdMQswCQYDVQQGEwJVUzEXMBUGA1UEChMORXF1aWZheCBTZWN1cmUx +JjAkBgNVBAsTHUVxdWlmYXggU2VjdXJlIGVCdXNpbmVzcyBDQS0yMQ0wCwYDVQQDEwRDUkwxMBoG +A1UdEAQTMBGBDzIwMTkwNjIzMTIxNDQ1WjALBgNVHQ8EBAMCAQYwHwYDVR0jBBgwFoAUUJ4L6q9e +uSBIplBqy/3YIHqngnYwHQYDVR0OBBYEFFCeC+qvXrkgSKZQasv92CB6p4J2MAwGA1UdEwQFMAMB +Af8wGgYJKoZIhvZ9B0EABA0wCxsFVjMuMGMDAgbAMA0GCSqGSIb3DQEBBQUAA4GBAAyGgq3oThr1 +jokn4jVYPSm0B482UJW/bsGe68SQsoWou7dC4A8HOd/7npCy0cE+U58DRLB+S/Rv5Hwf5+Kx5Lia +78O9zt4LMjTZ3ijtM2vE1Nc9ElirfQkty3D1E4qUoSek1nDFbZS1yX2doNLGCEnZZpum0/QL3MUm +V+GRMOrN +-----END CERTIFICATE----- + +AddTrust Low-Value Services Root +================================ +-----BEGIN CERTIFICATE----- +MIIEGDCCAwCgAwIBAgIBATANBgkqhkiG9w0BAQUFADBlMQswCQYDVQQGEwJTRTEUMBIGA1UEChML +QWRkVHJ1c3QgQUIxHTAbBgNVBAsTFEFkZFRydXN0IFRUUCBOZXR3b3JrMSEwHwYDVQQDExhBZGRU +cnVzdCBDbGFzcyAxIENBIFJvb3QwHhcNMDAwNTMwMTAzODMxWhcNMjAwNTMwMTAzODMxWjBlMQsw +CQYDVQQGEwJTRTEUMBIGA1UEChMLQWRkVHJ1c3QgQUIxHTAbBgNVBAsTFEFkZFRydXN0IFRUUCBO +ZXR3b3JrMSEwHwYDVQQDExhBZGRUcnVzdCBDbGFzcyAxIENBIFJvb3QwggEiMA0GCSqGSIb3DQEB +AQUAA4IBDwAwggEKAoIBAQCWltQhSWDia+hBBwzexODcEyPNwTXH+9ZOEQpnXvUGW2ulCDtbKRY6 +54eyNAbFvAWlA3yCyykQruGIgb3WntP+LVbBFc7jJp0VLhD7Bo8wBN6ntGO0/7Gcrjyvd7ZWxbWr +oulpOj0OM3kyP3CCkplhbY0wCI9xP6ZIVxn4JdxLZlyldI+Yrsj5wAYi56xz36Uu+1LcsRVlIPo1 +Zmne3yzxbrww2ywkEtvrNTVokMsAsJchPXQhI2U0K7t4WaPW4XY5mqRJjox0r26kmqPZm9I4XJui +GMx1I4S+6+JNM3GOGvDC+Mcdoq0Dlyz4zyXG9rgkMbFjXZJ/Y/AlyVMuH79NAgMBAAGjgdIwgc8w +HQYDVR0OBBYEFJWxtPCUtr3H2tERCSG+wa9J/RB7MAsGA1UdDwQEAwIBBjAPBgNVHRMBAf8EBTAD +AQH/MIGPBgNVHSMEgYcwgYSAFJWxtPCUtr3H2tERCSG+wa9J/RB7oWmkZzBlMQswCQYDVQQGEwJT +RTEUMBIGA1UEChMLQWRkVHJ1c3QgQUIxHTAbBgNVBAsTFEFkZFRydXN0IFRUUCBOZXR3b3JrMSEw +HwYDVQQDExhBZGRUcnVzdCBDbGFzcyAxIENBIFJvb3SCAQEwDQYJKoZIhvcNAQEFBQADggEBACxt +ZBsfzQ3duQH6lmM0MkhHma6X7f1yFqZzR1r0693p9db7RcwpiURdv0Y5PejuvE1Uhh4dbOMXJ0Ph +iVYrqW9yTkkz43J8KiOavD7/KCrto/8cI7pDVwlnTUtiBi34/2ydYB7YHEt9tTEv2dB8Xfjea4MY +eDdXL+gzB2ffHsdrKpV2ro9Xo/D0UrSpUwjP4E/TelOL/bscVjby/rK25Xa71SJlpz/+0WatC7xr +mYbvP33zGDLKe8bjq2RGlfgmadlVg3sslgf/WSxEo8bl6ancoWOAWiFeIc9TVPC6b4nbqKqVz4vj +ccweGyBECMB6tkD9xOQ14R0WHNC8K47Wcdk= +-----END CERTIFICATE----- + +AddTrust External Root +====================== +-----BEGIN CERTIFICATE----- +MIIENjCCAx6gAwIBAgIBATANBgkqhkiG9w0BAQUFADBvMQswCQYDVQQGEwJTRTEUMBIGA1UEChML +QWRkVHJ1c3QgQUIxJjAkBgNVBAsTHUFkZFRydXN0IEV4dGVybmFsIFRUUCBOZXR3b3JrMSIwIAYD +VQQDExlBZGRUcnVzdCBFeHRlcm5hbCBDQSBSb290MB4XDTAwMDUzMDEwNDgzOFoXDTIwMDUzMDEw +NDgzOFowbzELMAkGA1UEBhMCU0UxFDASBgNVBAoTC0FkZFRydXN0IEFCMSYwJAYDVQQLEx1BZGRU +cnVzdCBFeHRlcm5hbCBUVFAgTmV0d29yazEiMCAGA1UEAxMZQWRkVHJ1c3QgRXh0ZXJuYWwgQ0Eg +Um9vdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALf3GjPm8gAELTngTlvtH7xsD821 ++iO2zt6bETOXpClMfZOfvUq8k+0DGuOPz+VtUFrWlymUWoCwSXrbLpX9uMq/NzgtHj6RQa1wVsfw +Tz/oMp50ysiQVOnGXw94nZpAPA6sYapeFI+eh6FqUNzXmk6vBbOmcZSccbNQYArHE504B4YCqOmo +aSYYkKtMsE8jqzpPhNjfzp/haW+710LXa0Tkx63ubUFfclpxCDezeWWkWaCUN/cALw3CknLa0Dhy +2xSoRcRdKn23tNbE7qzNE0S3ySvdQwAl+mG5aWpYIxG3pzOPVnVZ9c0p10a3CitlttNCbxWyuHv7 +7+ldU9U0WicCAwEAAaOB3DCB2TAdBgNVHQ4EFgQUrb2YejS0Jvf6xCZU7wO94CTLVBowCwYDVR0P +BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wgZkGA1UdIwSBkTCBjoAUrb2YejS0Jvf6xCZU7wO94CTL +VBqhc6RxMG8xCzAJBgNVBAYTAlNFMRQwEgYDVQQKEwtBZGRUcnVzdCBBQjEmMCQGA1UECxMdQWRk +VHJ1c3QgRXh0ZXJuYWwgVFRQIE5ldHdvcmsxIjAgBgNVBAMTGUFkZFRydXN0IEV4dGVybmFsIENB +IFJvb3SCAQEwDQYJKoZIhvcNAQEFBQADggEBALCb4IUlwtYj4g+WBpKdQZic2YR5gdkeWxQHIzZl +j7DYd7usQWxHYINRsPkyPef89iYTx4AWpb9a/IfPeHmJIZriTAcKhjW88t5RxNKWt9x+Tu5w/Rw5 +6wwCURQtjr0W4MHfRnXnJK3s9EK0hZNwEGe6nQY1ShjTK3rMUUKhemPR5ruhxSvCNr4TDea9Y355 +e6cJDUCrat2PisP29owaQgVR1EX1n6diIWgVIEM8med8vSTYqZEXc4g/VhsxOBi0cQ+azcgOno4u +G+GMmIPLHzHxREzGBHNJdmAPx/i9F4BrLunMTA5amnkPIAou1Z5jJh5VkpTYghdae9C8x49OhgQ= +-----END CERTIFICATE----- + +AddTrust Public Services Root +============================= +-----BEGIN CERTIFICATE----- +MIIEFTCCAv2gAwIBAgIBATANBgkqhkiG9w0BAQUFADBkMQswCQYDVQQGEwJTRTEUMBIGA1UEChML +QWRkVHJ1c3QgQUIxHTAbBgNVBAsTFEFkZFRydXN0IFRUUCBOZXR3b3JrMSAwHgYDVQQDExdBZGRU +cnVzdCBQdWJsaWMgQ0EgUm9vdDAeFw0wMDA1MzAxMDQxNTBaFw0yMDA1MzAxMDQxNTBaMGQxCzAJ +BgNVBAYTAlNFMRQwEgYDVQQKEwtBZGRUcnVzdCBBQjEdMBsGA1UECxMUQWRkVHJ1c3QgVFRQIE5l +dHdvcmsxIDAeBgNVBAMTF0FkZFRydXN0IFB1YmxpYyBDQSBSb290MIIBIjANBgkqhkiG9w0BAQEF +AAOCAQ8AMIIBCgKCAQEA6Rowj4OIFMEg2Dybjxt+A3S72mnTRqX4jsIMEZBRpS9mVEBV6tsfSlbu +nyNu9DnLoblv8n75XYcmYZ4c+OLspoH4IcUkzBEMP9smcnrHAZcHF/nXGCwwfQ56HmIexkvA/X1i +d9NEHif2P0tEs7c42TkfYNVRknMDtABp4/MUTu7R3AnPdzRGULD4EfL+OHn3Bzn+UZKXC1sIXzSG +Aa2Il+tmzV7R/9x98oTaunet3IAIx6eH1lWfl2royBFkuucZKT8Rs3iQhCBSWxHveNCD9tVIkNAw +HM+A+WD+eeSI8t0A65RF62WUaUC6wNW0uLp9BBGo6zEFlpROWCGOn9Bg/QIDAQABo4HRMIHOMB0G +A1UdDgQWBBSBPjfYkrAfd59ctKtzquf2NGAv+jALBgNVHQ8EBAMCAQYwDwYDVR0TAQH/BAUwAwEB +/zCBjgYDVR0jBIGGMIGDgBSBPjfYkrAfd59ctKtzquf2NGAv+qFopGYwZDELMAkGA1UEBhMCU0Ux +FDASBgNVBAoTC0FkZFRydXN0IEFCMR0wGwYDVQQLExRBZGRUcnVzdCBUVFAgTmV0d29yazEgMB4G +A1UEAxMXQWRkVHJ1c3QgUHVibGljIENBIFJvb3SCAQEwDQYJKoZIhvcNAQEFBQADggEBAAP3FUr4 +JNojVhaTdt02KLmuG7jD8WS6IBh4lSknVwW8fCr0uVFV2ocC3g8WFzH4qnkuCRO7r7IgGRLlk/lL ++YPoRNWyQSW/iHVv/xD8SlTQX/D67zZzfRs2RcYhbbQVuE7PnFylPVoAjgbjPGsye/Kf8Lb93/Ao +GEjwxrzQvzSAlsJKsW2Ox5BF3i9nrEUEo3rcVZLJR2bYGozH7ZxOmuASu7VqTITh4SINhwBk/ox9 +Yjllpu9CtoAlEmEBqCQTcAARJl/6NVDFSMwGR+gn2HCNX2TmoUQmXiLsks3/QppEIW1cxeMiHV9H +EufOX1362KqxMy3ZdvJOOjMMK7MtkAY= +-----END CERTIFICATE----- + +AddTrust Qualified Certificates Root +==================================== +-----BEGIN CERTIFICATE----- +MIIEHjCCAwagAwIBAgIBATANBgkqhkiG9w0BAQUFADBnMQswCQYDVQQGEwJTRTEUMBIGA1UEChML +QWRkVHJ1c3QgQUIxHTAbBgNVBAsTFEFkZFRydXN0IFRUUCBOZXR3b3JrMSMwIQYDVQQDExpBZGRU +cnVzdCBRdWFsaWZpZWQgQ0EgUm9vdDAeFw0wMDA1MzAxMDQ0NTBaFw0yMDA1MzAxMDQ0NTBaMGcx +CzAJBgNVBAYTAlNFMRQwEgYDVQQKEwtBZGRUcnVzdCBBQjEdMBsGA1UECxMUQWRkVHJ1c3QgVFRQ +IE5ldHdvcmsxIzAhBgNVBAMTGkFkZFRydXN0IFF1YWxpZmllZCBDQSBSb290MIIBIjANBgkqhkiG +9w0BAQEFAAOCAQ8AMIIBCgKCAQEA5B6a/twJWoekn0e+EV+vhDTbYjx5eLfpMLXsDBwqxBb/4Oxx +64r1EW7tTw2R0hIYLUkVAcKkIhPHEWT/IhKauY5cLwjPcWqzZwFZ8V1G87B4pfYOQnrjfxvM0PC3 +KP0q6p6zsLkEqv32x7SxuCqg+1jxGaBvcCV+PmlKfw8i2O+tCBGaKZnhqkRFmhJePp1tUvznoD1o +L/BLcHwTOK28FSXx1s6rosAx1i+f4P8UWfyEk9mHfExUE+uf0S0R+Bg6Ot4l2ffTQO2kBhLEO+GR +wVY18BTcZTYJbqukB8c10cIDMzZbdSZtQvESa0NvS3GU+jQd7RNuyoB/mC9suWXY6QIDAQABo4HU +MIHRMB0GA1UdDgQWBBQ5lYtii1zJ1IC6WA+XPxUIQ8yYpzALBgNVHQ8EBAMCAQYwDwYDVR0TAQH/ +BAUwAwEB/zCBkQYDVR0jBIGJMIGGgBQ5lYtii1zJ1IC6WA+XPxUIQ8yYp6FrpGkwZzELMAkGA1UE +BhMCU0UxFDASBgNVBAoTC0FkZFRydXN0IEFCMR0wGwYDVQQLExRBZGRUcnVzdCBUVFAgTmV0d29y +azEjMCEGA1UEAxMaQWRkVHJ1c3QgUXVhbGlmaWVkIENBIFJvb3SCAQEwDQYJKoZIhvcNAQEFBQAD +ggEBABmrder4i2VhlRO6aQTvhsoToMeqT2QbPxj2qC0sVY8FtzDqQmodwCVRLae/DLPt7wh/bDxG +GuoYQ992zPlmhpwsaPXpF/gxsxjE1kh9I0xowX67ARRvxdlu3rsEQmr49lx95dr6h+sNNVJn0J6X +dgWTP5XHAeZpVTh/EGGZyeNfpso+gmNIquIISD6q8rKFYqa0p9m9N5xotS1WfbC3P6CxB9bpT9ze +RXEwMn8bLgn5v1Kh7sKAPgZcLlVAwRv1cEWw3F369nJad9Jjzc9YiQBCYz95OdBEsIJuQRno3eDB +iFrRHnGTHyQwdOUeqN48Jzd/g66ed8/wMLH/S5noxqE= +-----END CERTIFICATE----- + +Entrust Root Certification Authority +==================================== +-----BEGIN CERTIFICATE----- +MIIEkTCCA3mgAwIBAgIERWtQVDANBgkqhkiG9w0BAQUFADCBsDELMAkGA1UEBhMCVVMxFjAUBgNV +BAoTDUVudHJ1c3QsIEluYy4xOTA3BgNVBAsTMHd3dy5lbnRydXN0Lm5ldC9DUFMgaXMgaW5jb3Jw +b3JhdGVkIGJ5IHJlZmVyZW5jZTEfMB0GA1UECxMWKGMpIDIwMDYgRW50cnVzdCwgSW5jLjEtMCsG +A1UEAxMkRW50cnVzdCBSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MB4XDTA2MTEyNzIwMjM0 +MloXDTI2MTEyNzIwNTM0MlowgbAxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1FbnRydXN0LCBJbmMu +MTkwNwYDVQQLEzB3d3cuZW50cnVzdC5uZXQvQ1BTIGlzIGluY29ycG9yYXRlZCBieSByZWZlcmVu +Y2UxHzAdBgNVBAsTFihjKSAyMDA2IEVudHJ1c3QsIEluYy4xLTArBgNVBAMTJEVudHJ1c3QgUm9v +dCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB +ALaVtkNC+sZtKm9I35RMOVcF7sN5EUFoNu3s/poBj6E4KPz3EEZmLk0eGrEaTsbRwJWIsMn/MYsz +A9u3g3s+IIRe7bJWKKf44LlAcTfFy0cOlypowCKVYhXbR9n10Cv/gkvJrT7eTNuQgFA/CYqEAOww +Cj0Yzfv9KlmaI5UXLEWeH25DeW0MXJj+SKfFI0dcXv1u5x609mhF0YaDW6KKjbHjKYD+JXGIrb68 +j6xSlkuqUY3kEzEZ6E5Nn9uss2rVvDlUccp6en+Q3X0dgNmBu1kmwhH+5pPi94DkZfs0Nw4pgHBN +rziGLp5/V6+eF67rHMsoIV+2HNjnogQi+dPa2MsCAwEAAaOBsDCBrTAOBgNVHQ8BAf8EBAMCAQYw +DwYDVR0TAQH/BAUwAwEB/zArBgNVHRAEJDAigA8yMDA2MTEyNzIwMjM0MlqBDzIwMjYxMTI3MjA1 +MzQyWjAfBgNVHSMEGDAWgBRokORnpKZTgMeGZqTx90tD+4S9bTAdBgNVHQ4EFgQUaJDkZ6SmU4DH +hmak8fdLQ/uEvW0wHQYJKoZIhvZ9B0EABBAwDhsIVjcuMTo0LjADAgSQMA0GCSqGSIb3DQEBBQUA +A4IBAQCT1DCw1wMgKtD5Y+iRDAUgqV8ZyntyTtSx29CW+1RaGSwMCPeyvIWonX9tO1KzKtvn1ISM +Y/YPyyYBkVBs9F8U4pN0wBOeMDpQ47RgxRzwIkSNcUesyBrJ6ZuaAGAT/3B+XxFNSRuzFVJ7yVTa +v52Vr2ua2J7p8eRDjeIRRDq/r72DQnNSi6q7pynP9WQcCk3RvKqsnyrQ/39/2n3qse0wJcGE2jTS +W3iDVuycNsMm4hH2Z0kdkquM++v/eu6FSqdQgPCnXEqULl8FmTxSQeDNtGPPAUO6nIPcj2A781q0 +tHuu2guQOHXvgR1m0vdXcDazv/wor3ElhVsT/h5/WrQ8 +-----END CERTIFICATE----- + +RSA Security 2048 v3 +==================== +-----BEGIN CERTIFICATE----- +MIIDYTCCAkmgAwIBAgIQCgEBAQAAAnwAAAAKAAAAAjANBgkqhkiG9w0BAQUFADA6MRkwFwYDVQQK +ExBSU0EgU2VjdXJpdHkgSW5jMR0wGwYDVQQLExRSU0EgU2VjdXJpdHkgMjA0OCBWMzAeFw0wMTAy +MjIyMDM5MjNaFw0yNjAyMjIyMDM5MjNaMDoxGTAXBgNVBAoTEFJTQSBTZWN1cml0eSBJbmMxHTAb +BgNVBAsTFFJTQSBTZWN1cml0eSAyMDQ4IFYzMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC +AQEAt49VcdKA3XtpeafwGFAyPGJn9gqVB93mG/Oe2dJBVGutn3y+Gc37RqtBaB4Y6lXIL5F4iSj7 +Jylg/9+PjDvJSZu1pJTOAeo+tWN7fyb9Gd3AIb2E0S1PRsNO3Ng3OTsor8udGuorryGlwSMiuLgb +WhOHV4PR8CDn6E8jQrAApX2J6elhc5SYcSa8LWrg903w8bYqODGBDSnhAMFRD0xS+ARaqn1y07iH +KrtjEAMqs6FPDVpeRrc9DvV07Jmf+T0kgYim3WBU6JU2PcYJk5qjEoAAVZkZR73QpXzDuvsf9/UP ++Ky5tfQ3mBMY3oVbtwyCO4dvlTlYMNpuAWgXIszACwIDAQABo2MwYTAPBgNVHRMBAf8EBTADAQH/ +MA4GA1UdDwEB/wQEAwIBBjAfBgNVHSMEGDAWgBQHw1EwpKrpRa41JPr/JCwz0LGdjDAdBgNVHQ4E +FgQUB8NRMKSq6UWuNST6/yQsM9CxnYwwDQYJKoZIhvcNAQEFBQADggEBAF8+hnZuuDU8TjYcHnmY +v/3VEhF5Ug7uMYm83X/50cYVIeiKAVQNOvtUudZj1LGqlk2iQk3UUx+LEN5/Zb5gEydxiKRz44Rj +0aRV4VCT5hsOedBnvEbIvz8XDZXmxpBp3ue0L96VfdASPz0+f00/FGj1EVDVwfSQpQgdMWD/YIwj +VAqv/qFuxdF6Kmh4zx6CCiC0H63lhbJqaHVOrSU3lIW+vaHU6rcMSzyd6BIA8F+sDeGscGNz9395 +nzIlQnQFgCi/vcEkllgVsRch6YlL2weIZ/QVrXA+L02FO8K32/6YaCOJ4XQP3vTFhGMpG8zLB8kA +pKnXwiJPZ9d37CAFYd4= +-----END CERTIFICATE----- + +GeoTrust Global CA +================== +-----BEGIN CERTIFICATE----- +MIIDVDCCAjygAwIBAgIDAjRWMA0GCSqGSIb3DQEBBQUAMEIxCzAJBgNVBAYTAlVTMRYwFAYDVQQK +Ew1HZW9UcnVzdCBJbmMuMRswGQYDVQQDExJHZW9UcnVzdCBHbG9iYWwgQ0EwHhcNMDIwNTIxMDQw +MDAwWhcNMjIwNTIxMDQwMDAwWjBCMQswCQYDVQQGEwJVUzEWMBQGA1UEChMNR2VvVHJ1c3QgSW5j +LjEbMBkGA1UEAxMSR2VvVHJ1c3QgR2xvYmFsIENBMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB +CgKCAQEA2swYYzD99BcjGlZ+W988bDjkcbd4kdS8odhM+KhDtgPpTSEHCIjaWC9mOSm9BXiLnTjo +BbdqfnGk5sRgprDvgOSJKA+eJdbtg/OtppHHmMlCGDUUna2YRpIuT8rxh0PBFpVXLVDviS2Aelet +8u5fa9IAjbkU+BQVNdnARqN7csiRv8lVK83Qlz6cJmTM386DGXHKTubU1XupGc1V3sjs0l44U+Vc +T4wt/lAjNvxm5suOpDkZALeVAjmRCw7+OC7RHQWa9k0+bw8HHa8sHo9gOeL6NlMTOdReJivbPagU +vTLrGAMoUgRx5aszPeE4uwc2hGKceeoWMPRfwCvocWvk+QIDAQABo1MwUTAPBgNVHRMBAf8EBTAD +AQH/MB0GA1UdDgQWBBTAephojYn7qwVkDBF9qn1luMrMTjAfBgNVHSMEGDAWgBTAephojYn7qwVk +DBF9qn1luMrMTjANBgkqhkiG9w0BAQUFAAOCAQEANeMpauUvXVSOKVCUn5kaFOSPeCpilKInZ57Q +zxpeR+nBsqTP3UEaBU6bS+5Kb1VSsyShNwrrZHYqLizz/Tt1kL/6cdjHPTfStQWVYrmm3ok9Nns4 +d0iXrKYgjy6myQzCsplFAMfOEVEiIuCl6rYVSAlk6l5PdPcFPseKUgzbFbS9bZvlxrFUaKnjaZC2 +mqUPuLk/IH2uSrW4nOQdtqvmlKXBx4Ot2/Unhw4EbNX/3aBd7YdStysVAq45pmp06drE57xNNB6p +XE0zX5IJL4hmXXeXxx12E6nV5fEWCRE11azbJHFwLJhWC9kXtNHjUStedejV0NxPNO3CBWaAocvm +Mw== +-----END CERTIFICATE----- + +GeoTrust Global CA 2 +==================== +-----BEGIN CERTIFICATE----- +MIIDZjCCAk6gAwIBAgIBATANBgkqhkiG9w0BAQUFADBEMQswCQYDVQQGEwJVUzEWMBQGA1UEChMN +R2VvVHJ1c3QgSW5jLjEdMBsGA1UEAxMUR2VvVHJ1c3QgR2xvYmFsIENBIDIwHhcNMDQwMzA0MDUw +MDAwWhcNMTkwMzA0MDUwMDAwWjBEMQswCQYDVQQGEwJVUzEWMBQGA1UEChMNR2VvVHJ1c3QgSW5j +LjEdMBsGA1UEAxMUR2VvVHJ1c3QgR2xvYmFsIENBIDIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw +ggEKAoIBAQDvPE1APRDfO1MA4Wf+lGAVPoWI8YkNkMgoI5kF6CsgncbzYEbYwbLVjDHZ3CB5JIG/ +NTL8Y2nbsSpr7iFY8gjpeMtvy/wWUsiRxP89c96xPqfCfWbB9X5SJBri1WeR0IIQ13hLTytCOb1k +LUCgsBDTOEhGiKEMuzozKmKY+wCdE1l/bztyqu6mD4b5BWHqZ38MN5aL5mkWRxHCJ1kDs6ZgwiFA +Vvqgx306E+PsV8ez1q6diYD3Aecs9pYrEw15LNnA5IZ7S4wMcoKK+xfNAGw6EzywhIdLFnopsk/b +HdQL82Y3vdj2V7teJHq4PIu5+pIaGoSe2HSPqht/XvT+RSIhAgMBAAGjYzBhMA8GA1UdEwEB/wQF +MAMBAf8wHQYDVR0OBBYEFHE4NvICMVNHK266ZUapEBVYIAUJMB8GA1UdIwQYMBaAFHE4NvICMVNH +K266ZUapEBVYIAUJMA4GA1UdDwEB/wQEAwIBhjANBgkqhkiG9w0BAQUFAAOCAQEAA/e1K6tdEPx7 +srJerJsOflN4WT5CBP51o62sgU7XAotexC3IUnbHLB/8gTKY0UvGkpMzNTEv/NgdRN3ggX+d6Yvh +ZJFiCzkIjKx0nVnZellSlxG5FntvRdOW2TF9AjYPnDtuzywNA0ZF66D0f0hExghAzN4bcLUprbqL +OzRldRtxIR0sFAqwlpW41uryZfspuk/qkZN0abby/+Ea0AzRdoXLiiW9l14sbxWZJue2Kf8i7MkC +x1YAzUm5s2x7UwQa4qjJqhIFI8LO57sEAszAR6LkxCkvW0VXiVHuPOtSCP8HNR6fNWpHSlaY0VqF +H4z1Ir+rzoPz4iIprn2DQKi6bA== +-----END CERTIFICATE----- + +GeoTrust Universal CA +===================== +-----BEGIN CERTIFICATE----- +MIIFaDCCA1CgAwIBAgIBATANBgkqhkiG9w0BAQUFADBFMQswCQYDVQQGEwJVUzEWMBQGA1UEChMN +R2VvVHJ1c3QgSW5jLjEeMBwGA1UEAxMVR2VvVHJ1c3QgVW5pdmVyc2FsIENBMB4XDTA0MDMwNDA1 +MDAwMFoXDTI5MDMwNDA1MDAwMFowRTELMAkGA1UEBhMCVVMxFjAUBgNVBAoTDUdlb1RydXN0IElu +Yy4xHjAcBgNVBAMTFUdlb1RydXN0IFVuaXZlcnNhbCBDQTCCAiIwDQYJKoZIhvcNAQEBBQADggIP +ADCCAgoCggIBAKYVVaCjxuAfjJ0hUNfBvitbtaSeodlyWL0AG0y/YckUHUWCq8YdgNY96xCcOq9t +JPi8cQGeBvV8Xx7BDlXKg5pZMK4ZyzBIle0iN430SppyZj6tlcDgFgDgEB8rMQ7XlFTTQjOgNB0e +RXbdT8oYN+yFFXoZCPzVx5zw8qkuEKmS5j1YPakWaDwvdSEYfyh3peFhF7em6fgemdtzbvQKoiFs +7tqqhZJmr/Z6a4LauiIINQ/PQvE1+mrufislzDoR5G2vc7J2Ha3QsnhnGqQ5HFELZ1aD/ThdDc7d +8Lsrlh/eezJS/R27tQahsiFepdaVaH/wmZ7cRQg+59IJDTWU3YBOU5fXtQlEIGQWFwMCTFMNaN7V +qnJNk22CDtucvc+081xdVHppCZbW2xHBjXWotM85yM48vCR85mLK4b19p71XZQvk/iXttmkQ3Cga +Rr0BHdCXteGYO8A3ZNY9lO4L4fUorgtWv3GLIylBjobFS1J72HGrH4oVpjuDWtdYAVHGTEHZf9hB +Z3KiKN9gg6meyHv8U3NyWfWTehd2Ds735VzZC1U0oqpbtWpU5xPKV+yXbfReBi9Fi1jUIxaS5BZu +KGNZMN9QAZxjiRqf2xeUgnA3wySemkfWWspOqGmJch+RbNt+nhutxx9z3SxPGWX9f5NAEC7S8O08 +ni4oPmkmM8V7AgMBAAGjYzBhMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFNq7LqqwDLiIJlF0 +XG0D08DYj3rWMB8GA1UdIwQYMBaAFNq7LqqwDLiIJlF0XG0D08DYj3rWMA4GA1UdDwEB/wQEAwIB +hjANBgkqhkiG9w0BAQUFAAOCAgEAMXjmx7XfuJRAyXHEqDXsRh3ChfMoWIawC/yOsjmPRFWrZIRc +aanQmjg8+uUfNeVE44B5lGiku8SfPeE0zTBGi1QrlaXv9z+ZhP015s8xxtxqv6fXIwjhmF7DWgh2 +qaavdy+3YL1ERmrvl/9zlcGO6JP7/TG37FcREUWbMPEaiDnBTzynANXH/KttgCJwpQzgXQQpAvvL +oJHRfNbDflDVnVi+QTjruXU8FdmbyUqDWcDaU/0zuzYYm4UPFd3uLax2k7nZAY1IEKj79TiG8dsK +xr2EoyNB3tZ3b4XUhRxQ4K5RirqNPnbiucon8l+f725ZDQbYKxek0nxru18UGkiPGkzns0ccjkxF +KyDuSN/n3QmOGKjaQI2SJhFTYXNd673nxE0pN2HrrDktZy4W1vUAg4WhzH92xH3kt0tm7wNFYGm2 +DFKWkoRepqO1pD4r2czYG0eq8kTaT/kD6PAUyz/zg97QwVTjt+gKN02LIFkDMBmhLMi9ER/frslK +xfMnZmaGrGiR/9nmUxwPi1xpZQomyB40w11Re9epnAahNt3ViZS82eQtDF4JbAiXfKM9fJP/P6EU +p8+1Xevb2xzEdt+Iub1FBZUbrvxGakyvSOPOrg/SfuvmbJxPgWp6ZKy7PtXny3YuxadIwVyQD8vI +P/rmMuGNG2+k5o7Y+SlIis5z/iw= +-----END CERTIFICATE----- + +GeoTrust Universal CA 2 +======================= +-----BEGIN CERTIFICATE----- +MIIFbDCCA1SgAwIBAgIBATANBgkqhkiG9w0BAQUFADBHMQswCQYDVQQGEwJVUzEWMBQGA1UEChMN +R2VvVHJ1c3QgSW5jLjEgMB4GA1UEAxMXR2VvVHJ1c3QgVW5pdmVyc2FsIENBIDIwHhcNMDQwMzA0 +MDUwMDAwWhcNMjkwMzA0MDUwMDAwWjBHMQswCQYDVQQGEwJVUzEWMBQGA1UEChMNR2VvVHJ1c3Qg +SW5jLjEgMB4GA1UEAxMXR2VvVHJ1c3QgVW5pdmVyc2FsIENBIDIwggIiMA0GCSqGSIb3DQEBAQUA +A4ICDwAwggIKAoICAQCzVFLByT7y2dyxUxpZKeexw0Uo5dfR7cXFS6GqdHtXr0om/Nj1XqduGdt0 +DE81WzILAePb63p3NeqqWuDW6KFXlPCQo3RWlEQwAx5cTiuFJnSCegx2oG9NzkEtoBUGFF+3Qs17 +j1hhNNwqCPkuwwGmIkQcTAeC5lvO0Ep8BNMZcyfwqph/Lq9O64ceJHdqXbboW0W63MOhBW9Wjo8Q +JqVJwy7XQYci4E+GymC16qFjwAGXEHm9ADwSbSsVsaxLse4YuU6W3Nx2/zu+z18DwPw76L5GG//a +QMJS9/7jOvdqdzXQ2o3rXhhqMcceujwbKNZrVMaqW9eiLBsZzKIC9ptZvTdrhrVtgrrY6slWvKk2 +WP0+GfPtDCapkzj4T8FdIgbQl+rhrcZV4IErKIM6+vR7IVEAvlI4zs1meaj0gVbi0IMJR1FbUGrP +20gaXT73y/Zl92zxlfgCOzJWgjl6W70viRu/obTo/3+NjN8D8WBOWBFM66M/ECuDmgFz2ZRthAAn +ZqzwcEAJQpKtT5MNYQlRJNiS1QuUYbKHsu3/mjX/hVTK7URDrBs8FmtISgocQIgfksILAAX/8sgC +SqSqqcyZlpwvWOB94b67B9xfBHJcMTTD7F8t4D1kkCLm0ey4Lt1ZrtmhN79UNdxzMk+MBB4zsslG +8dhcyFVQyWi9qLo2CQIDAQABo2MwYTAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBR281Xh+qQ2 ++/CfXGJx7Tz0RzgQKzAfBgNVHSMEGDAWgBR281Xh+qQ2+/CfXGJx7Tz0RzgQKzAOBgNVHQ8BAf8E +BAMCAYYwDQYJKoZIhvcNAQEFBQADggIBAGbBxiPz2eAubl/oz66wsCVNK/g7WJtAJDday6sWSf+z +dXkzoS9tcBc0kf5nfo/sm+VegqlVHy/c1FEHEv6sFj4sNcZj/NwQ6w2jqtB8zNHQL1EuxBRa3ugZ +4T7GzKQp5y6EqgYweHZUcyiYWTjgAA1i00J9IZ+uPTqM1fp3DRgrFg5fNuH8KrUwJM/gYwx7WBr+ +mbpCErGR9Hxo4sjoryzqyX6uuyo9DRXcNJW2GHSoag/HtPQTxORb7QrSpJdMKu0vbBKJPfEncKpq +A1Ihn0CoZ1Dy81of398j9tx4TuaYT1U6U+Pv8vSfx3zYWK8pIpe44L2RLrB27FcRz+8pRPPphXpg +Y+RdM4kX2TGq2tbzGDVyz4crL2MjhF2EjD9XoIj8mZEoJmmZ1I+XRL6O1UixpCgp8RW04eWe3fiP +pm8m1wk8OhwRDqZsN/etRIcsKMfYdIKz0G9KV7s1KSegi+ghp4dkNl3M2Basx7InQJJVOCiNUW7d +FGdTbHFcJoRNdVq2fmBWqU2t+5sel/MN2dKXVHfaPRK34B7vCAas+YWH6aLcr34YEoP9VhdBLtUp +gn2Z9DH2canPLAEnpQW5qrJITirvn5NSUZU8UnOOVkwXQMAJKOSLakhT2+zNVVXxxvjpoixMptEm +X36vWkzaH6byHCx+rgIW0lbQL1dTR+iS +-----END CERTIFICATE----- + +America Online Root Certification Authority 1 +============================================= +-----BEGIN CERTIFICATE----- +MIIDpDCCAoygAwIBAgIBATANBgkqhkiG9w0BAQUFADBjMQswCQYDVQQGEwJVUzEcMBoGA1UEChMT +QW1lcmljYSBPbmxpbmUgSW5jLjE2MDQGA1UEAxMtQW1lcmljYSBPbmxpbmUgUm9vdCBDZXJ0aWZp +Y2F0aW9uIEF1dGhvcml0eSAxMB4XDTAyMDUyODA2MDAwMFoXDTM3MTExOTIwNDMwMFowYzELMAkG +A1UEBhMCVVMxHDAaBgNVBAoTE0FtZXJpY2EgT25saW5lIEluYy4xNjA0BgNVBAMTLUFtZXJpY2Eg +T25saW5lIFJvb3QgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkgMTCCASIwDQYJKoZIhvcNAQEBBQAD +ggEPADCCAQoCggEBAKgv6KRpBgNHw+kqmP8ZonCaxlCyfqXfaE0bfA+2l2h9LaaLl+lkhsmj76CG +v2BlnEtUiMJIxUo5vxTjWVXlGbR0yLQFOVwWpeKVBeASrlmLojNoWBym1BW32J/X3HGrfpq/m44z +DyL9Hy7nBzbvYjnF3cu6JRQj3gzGPTzOggjmZj7aUTsWOqMFf6Dch9Wc/HKpoH145LcxVR5lu9Rh +sCFg7RAycsWSJR74kEoYeEfffjA3PlAb2xzTa5qGUwew76wGePiEmf4hjUyAtgyC9mZweRrTT6PP +8c9GsEsPPt2IYriMqQkoO3rHl+Ee5fSfwMCuJKDIodkP1nsmgmkyPacCAwEAAaNjMGEwDwYDVR0T +AQH/BAUwAwEB/zAdBgNVHQ4EFgQUAK3Zo/Z59m50qX8zPYEX10zPM94wHwYDVR0jBBgwFoAUAK3Z +o/Z59m50qX8zPYEX10zPM94wDgYDVR0PAQH/BAQDAgGGMA0GCSqGSIb3DQEBBQUAA4IBAQB8itEf +GDeC4Liwo+1WlchiYZwFos3CYiZhzRAW18y0ZTTQEYqtqKkFZu90821fnZmv9ov761KyBZiibyrF +VL0lvV+uyIbqRizBs73B6UlwGBaXCBOMIOAbLjpHyx7kADCVW/RFo8AasAFOq73AI25jP4BKxQft +3OJvx8Fi8eNy1gTIdGcL+oiroQHIb/AUr9KZzVGTfu0uOMe9zkZQPXLjeSWdm4grECDdpbgyn43g +Kd8hdIaC2y+CMMbHNYaz+ZZfRtsMRf3zUMNvxsNIrUam4SdHCh0Om7bCd39j8uB9Gr784N/Xx6ds +sPmuujz9dLQR6FgNgLzTqIA6me11zEZ7 +-----END CERTIFICATE----- + +America Online Root Certification Authority 2 +============================================= +-----BEGIN CERTIFICATE----- +MIIFpDCCA4ygAwIBAgIBATANBgkqhkiG9w0BAQUFADBjMQswCQYDVQQGEwJVUzEcMBoGA1UEChMT +QW1lcmljYSBPbmxpbmUgSW5jLjE2MDQGA1UEAxMtQW1lcmljYSBPbmxpbmUgUm9vdCBDZXJ0aWZp +Y2F0aW9uIEF1dGhvcml0eSAyMB4XDTAyMDUyODA2MDAwMFoXDTM3MDkyOTE0MDgwMFowYzELMAkG +A1UEBhMCVVMxHDAaBgNVBAoTE0FtZXJpY2EgT25saW5lIEluYy4xNjA0BgNVBAMTLUFtZXJpY2Eg +T25saW5lIFJvb3QgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkgMjCCAiIwDQYJKoZIhvcNAQEBBQAD +ggIPADCCAgoCggIBAMxBRR3pPU0Q9oyxQcngXssNt79Hc9PwVU3dxgz6sWYFas14tNwC206B89en +fHG8dWOgXeMHDEjsJcQDIPT/DjsS/5uN4cbVG7RtIuOx238hZK+GvFciKtZHgVdEglZTvYYUAQv8 +f3SkWq7xuhG1m1hagLQ3eAkzfDJHA1zEpYNI9FdWboE2JxhP7JsowtS013wMPgwr38oE18aO6lhO +qKSlGBxsRZijQdEt0sdtjRnxrXm3gT+9BoInLRBYBbV4Bbkv2wxrkJB+FFk4u5QkE+XRnRTf04JN +RvCAOVIyD+OEsnpD8l7eXz8d3eOyG6ChKiMDbi4BFYdcpnV1x5dhvt6G3NRI270qv0pV2uh9UPu0 +gBe4lL8BPeraunzgWGcXuVjgiIZGZ2ydEEdYMtA1fHkqkKJaEBEjNa0vzORKW6fIJ/KD3l67Xnfn +6KVuY8INXWHQjNJsWiEOyiijzirplcdIz5ZvHZIlyMbGwcEMBawmxNJ10uEqZ8A9W6Wa6897Gqid +FEXlD6CaZd4vKL3Ob5Rmg0gp2OpljK+T2WSfVVcmv2/LNzGZo2C7HK2JNDJiuEMhBnIMoVxtRsX6 +Kc8w3onccVvdtjc+31D1uAclJuW8tf48ArO3+L5DwYcRlJ4jbBeKuIonDFRH8KmzwICMoCfrHRnj +B453cMor9H124HhnAgMBAAGjYzBhMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFE1FwWg4u3Op +aaEg5+31IqEjFNeeMB8GA1UdIwQYMBaAFE1FwWg4u3OpaaEg5+31IqEjFNeeMA4GA1UdDwEB/wQE +AwIBhjANBgkqhkiG9w0BAQUFAAOCAgEAZ2sGuV9FOypLM7PmG2tZTiLMubekJcmnxPBUlgtk87FY +T15R/LKXeydlwuXK5w0MJXti4/qftIe3RUavg6WXSIylvfEWK5t2LHo1YGwRgJfMqZJS5ivmae2p ++DYtLHe/YUjRYwu5W1LtGLBDQiKmsXeu3mnFzcccobGlHBD7GL4acN3Bkku+KVqdPzW+5X1R+FXg +JXUjhx5c3LqdsKyzadsXg8n33gy8CNyRnqjQ1xU3c6U1uPx+xURABsPr+CKAXEfOAuMRn0T//Zoy +zH1kUQ7rVyZ2OuMeIjzCpjbdGe+n/BLzJsBZMYVMnNjP36TMzCmT/5RtdlwTCJfy7aULTd3oyWgO +ZtMADjMSW7yV5TKQqLPGbIOtd+6Lfn6xqavT4fG2wLHqiMDn05DpKJKUe2h7lyoKZy2FAjgQ5ANh +1NolNscIWC2hp1GvMApJ9aZphwctREZ2jirlmjvXGKL8nDgQzMY70rUXOm/9riW99XJZZLF0Kjhf +GEzfz3EEWjbUvy+ZnOjZurGV5gJLIaFb1cFPj65pbVPbAZO1XB4Y3WRayhgoPmMEEf0cjQAPuDff +Z4qdZqkCapH/E8ovXYO8h5Ns3CRRFgQlZvqz2cK6Kb6aSDiCmfS/O0oxGfm/jiEzFMpPVF/7zvuP +cX/9XhmgD0uRuMRUvAawRY8mkaKO/qk= +-----END CERTIFICATE----- + +Visa eCommerce Root +=================== +-----BEGIN CERTIFICATE----- +MIIDojCCAoqgAwIBAgIQE4Y1TR0/BvLB+WUF1ZAcYjANBgkqhkiG9w0BAQUFADBrMQswCQYDVQQG +EwJVUzENMAsGA1UEChMEVklTQTEvMC0GA1UECxMmVmlzYSBJbnRlcm5hdGlvbmFsIFNlcnZpY2Ug +QXNzb2NpYXRpb24xHDAaBgNVBAMTE1Zpc2EgZUNvbW1lcmNlIFJvb3QwHhcNMDIwNjI2MDIxODM2 +WhcNMjIwNjI0MDAxNjEyWjBrMQswCQYDVQQGEwJVUzENMAsGA1UEChMEVklTQTEvMC0GA1UECxMm +VmlzYSBJbnRlcm5hdGlvbmFsIFNlcnZpY2UgQXNzb2NpYXRpb24xHDAaBgNVBAMTE1Zpc2EgZUNv +bW1lcmNlIFJvb3QwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCvV95WHm6h2mCxlCfL +F9sHP4CFT8icttD0b0/Pmdjh28JIXDqsOTPHH2qLJj0rNfVIsZHBAk4ElpF7sDPwsRROEW+1QK8b +RaVK7362rPKgH1g/EkZgPI2h4H3PVz4zHvtH8aoVlwdVZqW1LS7YgFmypw23RuwhY/81q6UCzyr0 +TP579ZRdhE2o8mCP2w4lPJ9zcc+U30rq299yOIzzlr3xF7zSujtFWsan9sYXiwGd/BmoKoMWuDpI +/k4+oKsGGelT84ATB+0tvz8KPFUgOSwsAGl0lUq8ILKpeeUYiZGo3BxN77t+Nwtd/jmliFKMAGzs +GHxBvfaLdXe6YJ2E5/4tAgMBAAGjQjBAMA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEG +MB0GA1UdDgQWBBQVOIMPPyw/cDMezUb+B4wg4NfDtzANBgkqhkiG9w0BAQUFAAOCAQEAX/FBfXxc +CLkr4NWSR/pnXKUTwwMhmytMiUbPWU3J/qVAtmPN3XEolWcRzCSs00Rsca4BIGsDoo8Ytyk6feUW +YFN4PMCvFYP3j1IzJL1kk5fui/fbGKhtcbP3LBfQdCVp9/5rPJS+TUtBjE7ic9DjkCJzQ83z7+pz +zkWKsKZJ/0x9nXGIxHYdkFsd7v3M9+79YKWxehZx0RbQfBI8bGmX265fOZpwLwU8GUYEmSA20GBu +YQa7FkKMcPcw++DbZqMAAb3mLNqRX6BGi01qnD093QVG/na/oAo85ADmJ7f/hC3euiInlhBx6yLt +398znM/jra6O1I7mT1GvFpLgXPYHDw== +-----END CERTIFICATE----- + +Certum Root CA +============== +-----BEGIN CERTIFICATE----- +MIIDDDCCAfSgAwIBAgIDAQAgMA0GCSqGSIb3DQEBBQUAMD4xCzAJBgNVBAYTAlBMMRswGQYDVQQK +ExJVbml6ZXRvIFNwLiB6IG8uby4xEjAQBgNVBAMTCUNlcnR1bSBDQTAeFw0wMjA2MTExMDQ2Mzla +Fw0yNzA2MTExMDQ2MzlaMD4xCzAJBgNVBAYTAlBMMRswGQYDVQQKExJVbml6ZXRvIFNwLiB6IG8u +by4xEjAQBgNVBAMTCUNlcnR1bSBDQTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAM6x +wS7TT3zNJc4YPk/EjG+AanPIW1H4m9LcuwBcsaD8dQPugfCI7iNS6eYVM42sLQnFdvkrOYCJ5JdL +kKWoePhzQ3ukYbDYWMzhbGZ+nPMJXlVjhNWo7/OxLjBos8Q82KxujZlakE403Daaj4GIULdtlkIJ +89eVgw1BS7Bqa/j8D35in2fE7SZfECYPCE/wpFcozo+47UX2bu4lXapuOb7kky/ZR6By6/qmW6/K +Uz/iDsaWVhFu9+lmqSbYf5VT7QqFiLpPKaVCjF62/IUgAKpoC6EahQGcxEZjgoi2IrHu/qpGWX7P +NSzVttpd90gzFFS269lvzs2I1qsb2pY7HVkCAwEAAaMTMBEwDwYDVR0TAQH/BAUwAwEB/zANBgkq +hkiG9w0BAQUFAAOCAQEAuI3O7+cUus/usESSbLQ5PqKEbq24IXfS1HeCh+YgQYHu4vgRt2PRFze+ +GXYkHAQaTOs9qmdvLdTN/mUxcMUbpgIKumB7bVjCmkn+YzILa+M6wKyrO7Do0wlRjBCDxjTgxSvg +GrZgFCdsMneMvLJymM/NzD+5yCRCFNZX/OYmQ6kd5YCQzgNUKD73P9P4Te1qCjqTE5s7FCMTY5w/ +0YcneeVMUeMBrYVdGjux1XMQpNPyvG5k9VpWkKjHDkx0Dy5xO/fIR/RpbxXyEV6DHpx8Uq79AtoS +qFlnGNu8cN2bsWntgM6JQEhqDjXKKWYVIZQs6GAqm4VKQPNriiTsBhYscw== +-----END CERTIFICATE----- + +Comodo AAA Services root +======================== +-----BEGIN CERTIFICATE----- +MIIEMjCCAxqgAwIBAgIBATANBgkqhkiG9w0BAQUFADB7MQswCQYDVQQGEwJHQjEbMBkGA1UECAwS +R3JlYXRlciBNYW5jaGVzdGVyMRAwDgYDVQQHDAdTYWxmb3JkMRowGAYDVQQKDBFDb21vZG8gQ0Eg +TGltaXRlZDEhMB8GA1UEAwwYQUFBIENlcnRpZmljYXRlIFNlcnZpY2VzMB4XDTA0MDEwMTAwMDAw +MFoXDTI4MTIzMTIzNTk1OVowezELMAkGA1UEBhMCR0IxGzAZBgNVBAgMEkdyZWF0ZXIgTWFuY2hl +c3RlcjEQMA4GA1UEBwwHU2FsZm9yZDEaMBgGA1UECgwRQ29tb2RvIENBIExpbWl0ZWQxITAfBgNV +BAMMGEFBQSBDZXJ0aWZpY2F0ZSBTZXJ2aWNlczCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC +ggEBAL5AnfRu4ep2hxxNRUSOvkbIgwadwSr+GB+O5AL686tdUIoWMQuaBtDFcCLNSS1UY8y2bmhG +C1Pqy0wkwLxyTurxFa70VJoSCsN6sjNg4tqJVfMiWPPe3M/vg4aijJRPn2jymJBGhCfHdr/jzDUs +i14HZGWCwEiwqJH5YZ92IFCokcdmtet4YgNW8IoaE+oxox6gmf049vYnMlhvB/VruPsUK6+3qszW +Y19zjNoFmag4qMsXeDZRrOme9Hg6jc8P2ULimAyrL58OAd7vn5lJ8S3frHRNG5i1R8XlKdH5kBjH +Ypy+g8cmez6KJcfA3Z3mNWgQIJ2P2N7Sw4ScDV7oL8kCAwEAAaOBwDCBvTAdBgNVHQ4EFgQUoBEK +Iz6W8Qfs4q8p74Klf9AwpLQwDgYDVR0PAQH/BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wewYDVR0f +BHQwcjA4oDagNIYyaHR0cDovL2NybC5jb21vZG9jYS5jb20vQUFBQ2VydGlmaWNhdGVTZXJ2aWNl +cy5jcmwwNqA0oDKGMGh0dHA6Ly9jcmwuY29tb2RvLm5ldC9BQUFDZXJ0aWZpY2F0ZVNlcnZpY2Vz +LmNybDANBgkqhkiG9w0BAQUFAAOCAQEACFb8AvCb6P+k+tZ7xkSAzk/ExfYAWMymtrwUSWgEdujm +7l3sAg9g1o1QGE8mTgHj5rCl7r+8dFRBv/38ErjHT1r0iWAFf2C3BUrz9vHCv8S5dIa2LX1rzNLz +Rt0vxuBqw8M0Ayx9lt1awg6nCpnBBYurDC/zXDrPbDdVCYfeU0BsWO/8tqtlbgT2G9w84FoVxp7Z +8VlIMCFlA2zs6SFz7JsDoeA3raAVGI/6ugLOpyypEBMs1OUIJqsil2D4kF501KKaU73yqWjgom7C +12yxow+ev+to51byrvLjKzg6CYG1a4XXvi3tPxq3smPi9WIsgtRqAEFQ8TmDn5XpNpaYbg== +-----END CERTIFICATE----- + +Comodo Secure Services root +=========================== +-----BEGIN CERTIFICATE----- +MIIEPzCCAyegAwIBAgIBATANBgkqhkiG9w0BAQUFADB+MQswCQYDVQQGEwJHQjEbMBkGA1UECAwS +R3JlYXRlciBNYW5jaGVzdGVyMRAwDgYDVQQHDAdTYWxmb3JkMRowGAYDVQQKDBFDb21vZG8gQ0Eg +TGltaXRlZDEkMCIGA1UEAwwbU2VjdXJlIENlcnRpZmljYXRlIFNlcnZpY2VzMB4XDTA0MDEwMTAw +MDAwMFoXDTI4MTIzMTIzNTk1OVowfjELMAkGA1UEBhMCR0IxGzAZBgNVBAgMEkdyZWF0ZXIgTWFu +Y2hlc3RlcjEQMA4GA1UEBwwHU2FsZm9yZDEaMBgGA1UECgwRQ29tb2RvIENBIExpbWl0ZWQxJDAi +BgNVBAMMG1NlY3VyZSBDZXJ0aWZpY2F0ZSBTZXJ2aWNlczCCASIwDQYJKoZIhvcNAQEBBQADggEP +ADCCAQoCggEBAMBxM4KK0HDrc4eCQNUd5MvJDkKQ+d40uaG6EfQlhfPMcm3ye5drswfxdySRXyWP +9nQ95IDC+DwN879A6vfIUtFyb+/Iq0G4bi4XKpVpDM3SHpR7LZQdqnXXs5jLrLxkU0C8j6ysNstc +rbvd4JQX7NFc0L/vpZXJkMWwrPsbQ996CF23uPJAGysnnlDOXmWCiIxe004MeuoIkbY2qitC++rC +oznl2yY4rYsK7hljxxwk3wN42ubqwUcaCwtGCd0C/N7Lh1/XMGNooa7cMqG6vv5Eq2i2pRcV/b3V +p6ea5EQz6YiO/O1R65NxTq0B50SOqy3LqP4BSUjwwN3HaNiS/j0CAwEAAaOBxzCBxDAdBgNVHQ4E +FgQUPNiTiMLAggnMAZkGkyDpnnAJY08wDgYDVR0PAQH/BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8w +gYEGA1UdHwR6MHgwO6A5oDeGNWh0dHA6Ly9jcmwuY29tb2RvY2EuY29tL1NlY3VyZUNlcnRpZmlj +YXRlU2VydmljZXMuY3JsMDmgN6A1hjNodHRwOi8vY3JsLmNvbW9kby5uZXQvU2VjdXJlQ2VydGlm +aWNhdGVTZXJ2aWNlcy5jcmwwDQYJKoZIhvcNAQEFBQADggEBAIcBbSMdflsXfcFhMs+P5/OKlFlm +4J4oqF7Tt/Q05qo5spcWxYJvMqTpjOev/e/C6LlLqqP05tqNZSH7uoDrJiiFGv45jN5bBAS0VPmj +Z55B+glSzAVIqMk/IQQezkhr/IXownuvf7fM+F86/TXGDe+X3EyrEeFryzHRbPtIgKvcnDe4IRRL +DXE97IMzbtFuMhbsmMcWi1mmNKsFVy2T96oTy9IT4rcuO81rUBcJaD61JlfutuC23bkpgHl9j6Pw +pCikFcSF9CfUa7/lXORlAnZUtOM3ZiTTGWHIUhDlizeauan5Hb/qmZJhlv8BzaFfDbxxvA6sCx1H +RR3B7Hzs/Sk= +-----END CERTIFICATE----- + +Comodo Trusted Services root +============================ +-----BEGIN CERTIFICATE----- +MIIEQzCCAyugAwIBAgIBATANBgkqhkiG9w0BAQUFADB/MQswCQYDVQQGEwJHQjEbMBkGA1UECAwS +R3JlYXRlciBNYW5jaGVzdGVyMRAwDgYDVQQHDAdTYWxmb3JkMRowGAYDVQQKDBFDb21vZG8gQ0Eg +TGltaXRlZDElMCMGA1UEAwwcVHJ1c3RlZCBDZXJ0aWZpY2F0ZSBTZXJ2aWNlczAeFw0wNDAxMDEw +MDAwMDBaFw0yODEyMzEyMzU5NTlaMH8xCzAJBgNVBAYTAkdCMRswGQYDVQQIDBJHcmVhdGVyIE1h +bmNoZXN0ZXIxEDAOBgNVBAcMB1NhbGZvcmQxGjAYBgNVBAoMEUNvbW9kbyBDQSBMaW1pdGVkMSUw +IwYDVQQDDBxUcnVzdGVkIENlcnRpZmljYXRlIFNlcnZpY2VzMIIBIjANBgkqhkiG9w0BAQEFAAOC +AQ8AMIIBCgKCAQEA33FvNlhTWvI2VFeAxHQIIO0Yfyod5jWaHiWsnOWWfnJSoBVC21ndZHoa0Lh7 +3TkVvFVIxO06AOoxEbrycXQaZ7jPM8yoMa+j49d/vzMtTGo87IvDktJTdyR0nAducPy9C1t2ul/y +/9c3S0pgePfw+spwtOpZqqPOSC+pw7ILfhdyFgymBwwbOM/JYrc/oJOlh0Hyt3BAd9i+FHzjqMB6 +juljatEPmsbS9Is6FARW1O24zG71++IsWL1/T2sr92AkWCTOJu80kTrV44HQsvAEAtdbtz6SrGsS +ivnkBbA7kUlcsutT6vifR4buv5XAwAaf0lteERv0xwQ1KdJVXOTt6wIDAQABo4HJMIHGMB0GA1Ud +DgQWBBTFe1i97doladL3WRaoszLAeydb9DAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH/BAUwAwEB +/zCBgwYDVR0fBHwwejA8oDqgOIY2aHR0cDovL2NybC5jb21vZG9jYS5jb20vVHJ1c3RlZENlcnRp +ZmljYXRlU2VydmljZXMuY3JsMDqgOKA2hjRodHRwOi8vY3JsLmNvbW9kby5uZXQvVHJ1c3RlZENl +cnRpZmljYXRlU2VydmljZXMuY3JsMA0GCSqGSIb3DQEBBQUAA4IBAQDIk4E7ibSvuIQSTI3S8Ntw +uleGFTQQuS9/HrCoiWChisJ3DFBKmwCL2Iv0QeLQg4pKHBQGsKNoBXAxMKdTmw7pSqBYaWcOrp32 +pSxBvzwGa+RZzG0Q8ZZvH9/0BAKkn0U+yNj6NkZEUD+Cl5EfKNsYEYwq5GWDVxISjBc/lDb+XbDA +BHcTuPQV1T84zJQ6VdCsmPW6AF/ghhmBeC8owH7TzEIK9a5QoNE+xqFx7D+gIIxmOom0jtTYsU0l +R+4viMi14QVFwL4Ucd56/Y57fU0IlqUSc/AtyjcndBInTMu2l+nZrghtWjlA3QVHdWpaIbOjGM9O +9y5Xt5hwXsjEeLBi +-----END CERTIFICATE----- + +QuoVadis Root CA +================ +-----BEGIN CERTIFICATE----- +MIIF0DCCBLigAwIBAgIEOrZQizANBgkqhkiG9w0BAQUFADB/MQswCQYDVQQGEwJCTTEZMBcGA1UE +ChMQUXVvVmFkaXMgTGltaXRlZDElMCMGA1UECxMcUm9vdCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0 +eTEuMCwGA1UEAxMlUXVvVmFkaXMgUm9vdCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTAeFw0wMTAz +MTkxODMzMzNaFw0yMTAzMTcxODMzMzNaMH8xCzAJBgNVBAYTAkJNMRkwFwYDVQQKExBRdW9WYWRp +cyBMaW1pdGVkMSUwIwYDVQQLExxSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MS4wLAYDVQQD +EyVRdW9WYWRpcyBSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MIIBIjANBgkqhkiG9w0BAQEF +AAOCAQ8AMIIBCgKCAQEAv2G1lVO6V/z68mcLOhrfEYBklbTRvM16z/Ypli4kVEAkOPcahdxYTMuk +J0KX0J+DisPkBgNbAKVRHnAEdOLB1Dqr1607BxgFjv2DrOpm2RgbaIr1VxqYuvXtdj182d6UajtL +F8HVj71lODqV0D1VNk7feVcxKh7YWWVJWCCYfqtffp/p1k3sg3Spx2zY7ilKhSoGFPlU5tPaZQeL +YzcS19Dsw3sgQUSj7cugF+FxZc4dZjH3dgEZyH0DWLaVSR2mEiboxgx24ONmy+pdpibu5cxfvWen +AScOospUxbF6lR1xHkopigPcakXBpBlebzbNw6Kwt/5cOOJSvPhEQ+aQuwIDAQABo4ICUjCCAk4w +PQYIKwYBBQUHAQEEMTAvMC0GCCsGAQUFBzABhiFodHRwczovL29jc3AucXVvdmFkaXNvZmZzaG9y +ZS5jb20wDwYDVR0TAQH/BAUwAwEB/zCCARoGA1UdIASCAREwggENMIIBCQYJKwYBBAG+WAABMIH7 +MIHUBggrBgEFBQcCAjCBxxqBxFJlbGlhbmNlIG9uIHRoZSBRdW9WYWRpcyBSb290IENlcnRpZmlj +YXRlIGJ5IGFueSBwYXJ0eSBhc3N1bWVzIGFjY2VwdGFuY2Ugb2YgdGhlIHRoZW4gYXBwbGljYWJs +ZSBzdGFuZGFyZCB0ZXJtcyBhbmQgY29uZGl0aW9ucyBvZiB1c2UsIGNlcnRpZmljYXRpb24gcHJh +Y3RpY2VzLCBhbmQgdGhlIFF1b1ZhZGlzIENlcnRpZmljYXRlIFBvbGljeS4wIgYIKwYBBQUHAgEW +Fmh0dHA6Ly93d3cucXVvdmFkaXMuYm0wHQYDVR0OBBYEFItLbe3TKbkGGew5Oanwl4Rqy+/fMIGu +BgNVHSMEgaYwgaOAFItLbe3TKbkGGew5Oanwl4Rqy+/foYGEpIGBMH8xCzAJBgNVBAYTAkJNMRkw +FwYDVQQKExBRdW9WYWRpcyBMaW1pdGVkMSUwIwYDVQQLExxSb290IENlcnRpZmljYXRpb24gQXV0 +aG9yaXR5MS4wLAYDVQQDEyVRdW9WYWRpcyBSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5ggQ6 +tlCLMA4GA1UdDwEB/wQEAwIBBjANBgkqhkiG9w0BAQUFAAOCAQEAitQUtf70mpKnGdSkfnIYj9lo +fFIk3WdvOXrEql494liwTXCYhGHoG+NpGA7O+0dQoE7/8CQfvbLO9Sf87C9TqnN7Az10buYWnuul +LsS/VidQK2K6vkscPFVcQR0kvoIgR13VRH56FmjffU1RcHhXHTMe/QKZnAzNCgVPx7uOpHX6Sm2x +gI4JVrmcGmD+XcHXetwReNDWXcG31a0ymQM6isxUJTkxgXsTIlG6Rmyhu576BGxJJnSP0nPrzDCi +5upZIof4l/UO/erMkqQWxFIY6iHOsfHmhIHluqmGKPJDWl0Snawe2ajlCmqnf6CHKc/yiU3U7MXi +5nrQNiOKSnQ2+Q== +-----END CERTIFICATE----- + +QuoVadis Root CA 2 +================== +-----BEGIN CERTIFICATE----- +MIIFtzCCA5+gAwIBAgICBQkwDQYJKoZIhvcNAQEFBQAwRTELMAkGA1UEBhMCQk0xGTAXBgNVBAoT +EFF1b1ZhZGlzIExpbWl0ZWQxGzAZBgNVBAMTElF1b1ZhZGlzIFJvb3QgQ0EgMjAeFw0wNjExMjQx +ODI3MDBaFw0zMTExMjQxODIzMzNaMEUxCzAJBgNVBAYTAkJNMRkwFwYDVQQKExBRdW9WYWRpcyBM +aW1pdGVkMRswGQYDVQQDExJRdW9WYWRpcyBSb290IENBIDIwggIiMA0GCSqGSIb3DQEBAQUAA4IC +DwAwggIKAoICAQCaGMpLlA0ALa8DKYrwD4HIrkwZhR0In6spRIXzL4GtMh6QRr+jhiYaHv5+HBg6 +XJxgFyo6dIMzMH1hVBHL7avg5tKifvVrbxi3Cgst/ek+7wrGsxDp3MJGF/hd/aTa/55JWpzmM+Yk +lvc/ulsrHHo1wtZn/qtmUIttKGAr79dgw8eTvI02kfN/+NsRE8Scd3bBrrcCaoF6qUWD4gXmuVbB +lDePSHFjIuwXZQeVikvfj8ZaCuWw419eaxGrDPmF60Tp+ARz8un+XJiM9XOva7R+zdRcAitMOeGy +lZUtQofX1bOQQ7dsE/He3fbE+Ik/0XX1ksOR1YqI0JDs3G3eicJlcZaLDQP9nL9bFqyS2+r+eXyt +66/3FsvbzSUr5R/7mp/iUcw6UwxI5g69ybR2BlLmEROFcmMDBOAENisgGQLodKcftslWZvB1Jdxn +wQ5hYIizPtGo/KPaHbDRsSNU30R2be1B2MGyIrZTHN81Hdyhdyox5C315eXbyOD/5YDXC2Og/zOh +D7osFRXql7PSorW+8oyWHhqPHWykYTe5hnMz15eWniN9gqRMgeKh0bpnX5UHoycR7hYQe7xFSkyy +BNKr79X9DFHOUGoIMfmR2gyPZFwDwzqLID9ujWc9Otb+fVuIyV77zGHcizN300QyNQliBJIWENie +J0f7OyHj+OsdWwIDAQABo4GwMIGtMA8GA1UdEwEB/wQFMAMBAf8wCwYDVR0PBAQDAgEGMB0GA1Ud +DgQWBBQahGK8SEwzJQTU7tD2A8QZRtGUazBuBgNVHSMEZzBlgBQahGK8SEwzJQTU7tD2A8QZRtGU +a6FJpEcwRTELMAkGA1UEBhMCQk0xGTAXBgNVBAoTEFF1b1ZhZGlzIExpbWl0ZWQxGzAZBgNVBAMT +ElF1b1ZhZGlzIFJvb3QgQ0EgMoICBQkwDQYJKoZIhvcNAQEFBQADggIBAD4KFk2fBluornFdLwUv +Z+YTRYPENvbzwCYMDbVHZF34tHLJRqUDGCdViXh9duqWNIAXINzng/iN/Ae42l9NLmeyhP3ZRPx3 +UIHmfLTJDQtyU/h2BwdBR5YM++CCJpNVjP4iH2BlfF/nJrP3MpCYUNQ3cVX2kiF495V5+vgtJodm +VjB3pjd4M1IQWK4/YY7yarHvGH5KWWPKjaJW1acvvFYfzznB4vsKqBUsfU16Y8Zsl0Q80m/DShcK ++JDSV6IZUaUtl0HaB0+pUNqQjZRG4T7wlP0QADj1O+hA4bRuVhogzG9Yje0uRY/W6ZM/57Es3zrW +IozchLsib9D45MY56QSIPMO661V6bYCZJPVsAfv4l7CUW+v90m/xd2gNNWQjrLhVoQPRTUIZ3Ph1 +WVaj+ahJefivDrkRoHy3au000LYmYjgahwz46P0u05B/B5EqHdZ+XIWDmbA4CD/pXvk1B+TJYm5X +f6dQlfe6yJvmjqIBxdZmv3lh8zwc4bmCXF2gw+nYSL0ZohEUGW6yhhtoPkg3Goi3XZZenMfvJ2II +4pEZXNLxId26F0KCl3GBUzGpn/Z9Yr9y4aOTHcyKJloJONDO1w2AFrR4pTqHTI2KpdVGl/IsELm8 +VCLAAVBpQ570su9t+Oza8eOx79+Rj1QqCyXBJhnEUhAFZdWCEOrCMc0u +-----END CERTIFICATE----- + +QuoVadis Root CA 3 +================== +-----BEGIN CERTIFICATE----- +MIIGnTCCBIWgAwIBAgICBcYwDQYJKoZIhvcNAQEFBQAwRTELMAkGA1UEBhMCQk0xGTAXBgNVBAoT +EFF1b1ZhZGlzIExpbWl0ZWQxGzAZBgNVBAMTElF1b1ZhZGlzIFJvb3QgQ0EgMzAeFw0wNjExMjQx +OTExMjNaFw0zMTExMjQxOTA2NDRaMEUxCzAJBgNVBAYTAkJNMRkwFwYDVQQKExBRdW9WYWRpcyBM +aW1pdGVkMRswGQYDVQQDExJRdW9WYWRpcyBSb290IENBIDMwggIiMA0GCSqGSIb3DQEBAQUAA4IC +DwAwggIKAoICAQDMV0IWVJzmmNPTTe7+7cefQzlKZbPoFog02w1ZkXTPkrgEQK0CSzGrvI2RaNgg +DhoB4hp7Thdd4oq3P5kazethq8Jlph+3t723j/z9cI8LoGe+AaJZz3HmDyl2/7FWeUUrH556VOij +KTVopAFPD6QuN+8bv+OPEKhyq1hX51SGyMnzW9os2l2ObjyjPtr7guXd8lyyBTNvijbO0BNO/79K +DDRMpsMhvVAEVeuxu537RR5kFd5VAYwCdrXLoT9CabwvvWhDFlaJKjdhkf2mrk7AyxRllDdLkgbv +BNDInIjbC3uBr7E9KsRlOni27tyAsdLTmZw67mtaa7ONt9XOnMK+pUsvFrGeaDsGb659n/je7Mwp +p5ijJUMv7/FfJuGITfhebtfZFG4ZM2mnO4SJk8RTVROhUXhA+LjJou57ulJCg54U7QVSWllWp5f8 +nT8KKdjcT5EOE7zelaTfi5m+rJsziO+1ga8bxiJTyPbH7pcUsMV8eFLI8M5ud2CEpukqdiDtWAEX +MJPpGovgc2PZapKUSU60rUqFxKMiMPwJ7Wgic6aIDFUhWMXhOp8q3crhkODZc6tsgLjoC2SToJyM +Gf+z0gzskSaHirOi4XCPLArlzW1oUevaPwV/izLmE1xr/l9A4iLItLRkT9a6fUg+qGkM17uGcclz +uD87nSVL2v9A6wIDAQABo4IBlTCCAZEwDwYDVR0TAQH/BAUwAwEB/zCB4QYDVR0gBIHZMIHWMIHT +BgkrBgEEAb5YAAMwgcUwgZMGCCsGAQUFBwICMIGGGoGDQW55IHVzZSBvZiB0aGlzIENlcnRpZmlj +YXRlIGNvbnN0aXR1dGVzIGFjY2VwdGFuY2Ugb2YgdGhlIFF1b1ZhZGlzIFJvb3QgQ0EgMyBDZXJ0 +aWZpY2F0ZSBQb2xpY3kgLyBDZXJ0aWZpY2F0aW9uIFByYWN0aWNlIFN0YXRlbWVudC4wLQYIKwYB +BQUHAgEWIWh0dHA6Ly93d3cucXVvdmFkaXNnbG9iYWwuY29tL2NwczALBgNVHQ8EBAMCAQYwHQYD +VR0OBBYEFPLAE+CCQz777i9nMpY1XNu4ywLQMG4GA1UdIwRnMGWAFPLAE+CCQz777i9nMpY1XNu4 +ywLQoUmkRzBFMQswCQYDVQQGEwJCTTEZMBcGA1UEChMQUXVvVmFkaXMgTGltaXRlZDEbMBkGA1UE +AxMSUXVvVmFkaXMgUm9vdCBDQSAzggIFxjANBgkqhkiG9w0BAQUFAAOCAgEAT62gLEz6wPJv92ZV +qyM07ucp2sNbtrCD2dDQ4iH782CnO11gUyeim/YIIirnv6By5ZwkajGxkHon24QRiSemd1o417+s +hvzuXYO8BsbRd2sPbSQvS3pspweWyuOEn62Iix2rFo1bZhfZFvSLgNLd+LJ2w/w4E6oM3kJpK27z +POuAJ9v1pkQNn1pVWQvVDVJIxa6f8i+AxeoyUDUSly7B4f/xI4hROJ/yZlZ25w9Rl6VSDE1JUZU2 +Pb+iSwwQHYaZTKrzchGT5Or2m9qoXadNt54CrnMAyNojA+j56hl0YgCUyyIgvpSnWbWCar6ZeXqp +8kokUvd0/bpO5qgdAm6xDYBEwa7TIzdfu4V8K5Iu6H6li92Z4b8nby1dqnuH/grdS/yO9SbkbnBC +bjPsMZ57k8HkyWkaPcBrTiJt7qtYTcbQQcEr6k8Sh17rRdhs9ZgC06DYVYoGmRmioHfRMJ6szHXu +g/WwYjnPbFfiTNKRCw51KBuav/0aQ/HKd/s7j2G4aSgWQgRecCocIdiP4b0jWy10QJLZYxkNc91p +vGJHvOB0K7Lrfb5BG7XARsWhIstfTsEokt4YutUqKLsRixeTmJlglFwjz1onl14LBQaTNx47aTbr +qZ5hHY8y2o4M1nQ+ewkk2gF3R8Q7zTSMmfXK4SVhM7JZG+Ju1zdXtg2pEto= +-----END CERTIFICATE----- + +Security Communication Root CA +============================== +-----BEGIN CERTIFICATE----- +MIIDWjCCAkKgAwIBAgIBADANBgkqhkiG9w0BAQUFADBQMQswCQYDVQQGEwJKUDEYMBYGA1UEChMP +U0VDT00gVHJ1c3QubmV0MScwJQYDVQQLEx5TZWN1cml0eSBDb21tdW5pY2F0aW9uIFJvb3RDQTEw +HhcNMDMwOTMwMDQyMDQ5WhcNMjMwOTMwMDQyMDQ5WjBQMQswCQYDVQQGEwJKUDEYMBYGA1UEChMP +U0VDT00gVHJ1c3QubmV0MScwJQYDVQQLEx5TZWN1cml0eSBDb21tdW5pY2F0aW9uIFJvb3RDQTEw +ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCzs/5/022x7xZ8V6UMbXaKL0u/ZPtM7orw +8yl89f/uKuDp6bpbZCKamm8sOiZpUQWZJtzVHGpxxpp9Hp3dfGzGjGdnSj74cbAZJ6kJDKaVv0uM +DPpVmDvY6CKhS3E4eayXkmmziX7qIWgGmBSWh9JhNrxtJ1aeV+7AwFb9Ms+k2Y7CI9eNqPPYJayX +5HA49LY6tJ07lyZDo6G8SVlyTCMwhwFY9k6+HGhWZq/NQV3Is00qVUarH9oe4kA92819uZKAnDfd +DJZkndwi92SL32HeFZRSFaB9UslLqCHJxrHty8OVYNEP8Ktw+N/LTX7s1vqr2b1/VPKl6Xn62dZ2 +JChzAgMBAAGjPzA9MB0GA1UdDgQWBBSgc0mZaNyFW2XjmygvV5+9M7wHSDALBgNVHQ8EBAMCAQYw +DwYDVR0TAQH/BAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEAaECpqLvkT115swW1F7NgE+vGkl3g +0dNq/vu+m22/xwVtWSDEHPC32oRYAmP6SBbvT6UL90qY8j+eG61Ha2POCEfrUj94nK9NrvjVT8+a +mCoQQTlSxN3Zmw7vkwGusi7KaEIkQmywszo+zenaSMQVy+n5Bw+SUEmK3TGXX8npN6o7WWWXlDLJ +s58+OmJYxUmtYg5xpTKqL8aJdkNAExNnPaJUJRDL8Try2frbSVa7pv6nQTXD4IhhyYjH3zYQIphZ +6rBK+1YWc26sTfcioU+tHXotRSflMMFe8toTyyVCUZVHA4xsIcx0Qu1T/zOLjw9XARYvz6buyXAi +FL39vmwLAw== +-----END CERTIFICATE----- + +Sonera Class 2 Root CA +====================== +-----BEGIN CERTIFICATE----- +MIIDIDCCAgigAwIBAgIBHTANBgkqhkiG9w0BAQUFADA5MQswCQYDVQQGEwJGSTEPMA0GA1UEChMG +U29uZXJhMRkwFwYDVQQDExBTb25lcmEgQ2xhc3MyIENBMB4XDTAxMDQwNjA3Mjk0MFoXDTIxMDQw +NjA3Mjk0MFowOTELMAkGA1UEBhMCRkkxDzANBgNVBAoTBlNvbmVyYTEZMBcGA1UEAxMQU29uZXJh +IENsYXNzMiBDQTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJAXSjWdyvANlsdE+hY3 +/Ei9vX+ALTU74W+oZ6m/AxxNjG8yR9VBaKQTBME1DJqEQ/xcHf+Js+gXGM2RX/uJ4+q/Tl18GybT +dXnt5oTjV+WtKcT0OijnpXuENmmz/V52vaMtmdOQTiMofRhj8VQ7Jp12W5dCsv+u8E7s3TmVToMG +f+dJQMjFAbJUWmYdPfz56TwKnoG4cPABi+QjVHzIrviQHgCWctRUz2EjvOr7nQKV0ba5cTppCD8P +tOFCx4j1P5iop7oc4HFx71hXgVB6XGt0Rg6DA5jDjqhu8nYybieDwnPz3BjotJPqdURrBGAgcVeH +nfO+oJAjPYok4doh28MCAwEAAaMzMDEwDwYDVR0TAQH/BAUwAwEB/zARBgNVHQ4ECgQISqCqWITT +XjwwCwYDVR0PBAQDAgEGMA0GCSqGSIb3DQEBBQUAA4IBAQBazof5FnIVV0sd2ZvnoiYw7JNn39Yt +0jSv9zilzqsWuasvfDXLrNAPtEwr/IDva4yRXzZ299uzGxnq9LIR/WFxRL8oszodv7ND6J+/3DEI +cbCdjdY0RzKQxmUk96BKfARzjzlvF4xytb1LyHr4e4PDKE6cCepnP7JnBBvDFNr450kkkdAdavph +Oe9r5yF1BgfYErQhIHBCcYHaPJo2vqZbDWpsmh+Re/n570K6Tk6ezAyNlNzZRZxe7EJQY670XcSx +EtzKO6gunRRaBXW37Ndj4ro1tgQIkejanZz2ZrUYrAqmVCY0M9IbwdR/GjqOC6oybtv8TyWf2TLH +llpwrN9M +-----END CERTIFICATE----- + +Staat der Nederlanden Root CA +============================= +-----BEGIN CERTIFICATE----- +MIIDujCCAqKgAwIBAgIEAJiWijANBgkqhkiG9w0BAQUFADBVMQswCQYDVQQGEwJOTDEeMBwGA1UE +ChMVU3RhYXQgZGVyIE5lZGVybGFuZGVuMSYwJAYDVQQDEx1TdGFhdCBkZXIgTmVkZXJsYW5kZW4g +Um9vdCBDQTAeFw0wMjEyMTcwOTIzNDlaFw0xNTEyMTYwOTE1MzhaMFUxCzAJBgNVBAYTAk5MMR4w +HAYDVQQKExVTdGFhdCBkZXIgTmVkZXJsYW5kZW4xJjAkBgNVBAMTHVN0YWF0IGRlciBOZWRlcmxh +bmRlbiBSb290IENBMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAmNK1URF6gaYUmHFt +vsznExvWJw56s2oYHLZhWtVhCb/ekBPHZ+7d89rFDBKeNVU+LCeIQGv33N0iYfXCxw719tV2U02P +jLwYdjeFnejKScfST5gTCaI+Ioicf9byEGW07l8Y1Rfj+MX94p2i71MOhXeiD+EwR+4A5zN9RGca +C1Hoi6CeUJhoNFIfLm0B8mBF8jHrqTFoKbt6QZ7GGX+UtFE5A3+y3qcym7RHjm+0Sq7lr7HcsBth +vJly3uSJt3omXdozSVtSnA71iq3DuD3oBmrC1SoLbHuEvVYFy4ZlkuxEK7COudxwC0barbxjiDn6 +22r+I/q85Ej0ZytqERAhSQIDAQABo4GRMIGOMAwGA1UdEwQFMAMBAf8wTwYDVR0gBEgwRjBEBgRV +HSAAMDwwOgYIKwYBBQUHAgEWLmh0dHA6Ly93d3cucGtpb3ZlcmhlaWQubmwvcG9saWNpZXMvcm9v +dC1wb2xpY3kwDgYDVR0PAQH/BAQDAgEGMB0GA1UdDgQWBBSofeu8Y6R0E3QA7Jbg0zTBLL9s+DAN +BgkqhkiG9w0BAQUFAAOCAQEABYSHVXQ2YcG70dTGFagTtJ+k/rvuFbQvBgwp8qiSpGEN/KtcCFtR +EytNwiphyPgJWPwtArI5fZlmgb9uXJVFIGzmeafR2Bwp/MIgJ1HI8XxdNGdphREwxgDS1/PTfLbw +MVcoEoJz6TMvplW0C5GUR5z6u3pCMuiufi3IvKwUv9kP2Vv8wfl6leF9fpb8cbDCTMjfRTTJzg3y +nGQI0DvDKcWy7ZAEwbEpkcUwb8GpcjPM/l0WFywRaed+/sWDCN+83CI6LiBpIzlWYGeQiy52OfsR +iJf2fL1LuCAWZwWN4jvBcj+UlTfHXbme2JOhF4//DGYVwSR8MnwDHTuhWEUykw== +-----END CERTIFICATE----- + +TDC Internet Root CA +==================== +-----BEGIN CERTIFICATE----- +MIIEKzCCAxOgAwIBAgIEOsylTDANBgkqhkiG9w0BAQUFADBDMQswCQYDVQQGEwJESzEVMBMGA1UE +ChMMVERDIEludGVybmV0MR0wGwYDVQQLExRUREMgSW50ZXJuZXQgUm9vdCBDQTAeFw0wMTA0MDUx +NjMzMTdaFw0yMTA0MDUxNzAzMTdaMEMxCzAJBgNVBAYTAkRLMRUwEwYDVQQKEwxUREMgSW50ZXJu +ZXQxHTAbBgNVBAsTFFREQyBJbnRlcm5ldCBSb290IENBMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A +MIIBCgKCAQEAxLhAvJHVYx/XmaCLDEAedLdInUaMArLgJF/wGROnN4NrXceO+YQwzho7+vvOi20j +xsNuZp+Jpd/gQlBn+h9sHvTQBda/ytZO5GhgbEaqHF1j4QeGDmUApy6mcca8uYGoOn0a0vnRrEvL +znWv3Hv6gXPU/Lq9QYjUdLP5Xjg6PEOo0pVOd20TDJ2PeAG3WiAfAzc14izbSysseLlJ28TQx5yc +5IogCSEWVmb/Bexb4/DPqyQkXsN/cHoSxNK1EKC2IeGNeGlVRGn1ypYcNIUXJXfi9i8nmHj9eQY6 +otZaQ8H/7AQ77hPv01ha/5Lr7K7a8jcDR0G2l8ktCkEiu7vmpwIDAQABo4IBJTCCASEwEQYJYIZI +AYb4QgEBBAQDAgAHMGUGA1UdHwReMFwwWqBYoFakVDBSMQswCQYDVQQGEwJESzEVMBMGA1UEChMM +VERDIEludGVybmV0MR0wGwYDVQQLExRUREMgSW50ZXJuZXQgUm9vdCBDQTENMAsGA1UEAxMEQ1JM +MTArBgNVHRAEJDAigA8yMDAxMDQwNTE2MzMxN1qBDzIwMjEwNDA1MTcwMzE3WjALBgNVHQ8EBAMC +AQYwHwYDVR0jBBgwFoAUbGQBx/2FbazI2p5QCIUItTxWqFAwHQYDVR0OBBYEFGxkAcf9hW2syNqe +UAiFCLU8VqhQMAwGA1UdEwQFMAMBAf8wHQYJKoZIhvZ9B0EABBAwDhsIVjUuMDo0LjADAgSQMA0G +CSqGSIb3DQEBBQUAA4IBAQBOQ8zR3R0QGwZ/t6T609lN+yOfI1Rb5osvBCiLtSdtiaHsmGnc540m +gwV5dOy0uaOXwTUA/RXaOYE6lTGQ3pfphqiZdwzlWqCE/xIWrG64jcN7ksKsLtB9KOy282A4aW8+ +2ARVPp7MVdK6/rtHBNcK2RYKNCn1WBPVT8+PVkuzHu7TmHnaCB4Mb7j4Fifvwm899qNLPg7kbWzb +O0ESm70NRyN/PErQr8Cv9u8btRXE64PECV90i9kR+8JWsTz4cMo0jUNAE4z9mQNUecYu6oah9jrU +Cbz0vGbMPVjQV0kK7iXiQe4T+Zs4NNEA9X7nlB38aQNiuJkFBT1reBK9sG9l +-----END CERTIFICATE----- + +UTN DATACorp SGC Root CA +======================== +-----BEGIN CERTIFICATE----- +MIIEXjCCA0agAwIBAgIQRL4Mi1AAIbQR0ypoBqmtaTANBgkqhkiG9w0BAQUFADCBkzELMAkGA1UE +BhMCVVMxCzAJBgNVBAgTAlVUMRcwFQYDVQQHEw5TYWx0IExha2UgQ2l0eTEeMBwGA1UEChMVVGhl +IFVTRVJUUlVTVCBOZXR3b3JrMSEwHwYDVQQLExhodHRwOi8vd3d3LnVzZXJ0cnVzdC5jb20xGzAZ +BgNVBAMTElVUTiAtIERBVEFDb3JwIFNHQzAeFw05OTA2MjQxODU3MjFaFw0xOTA2MjQxOTA2MzBa +MIGTMQswCQYDVQQGEwJVUzELMAkGA1UECBMCVVQxFzAVBgNVBAcTDlNhbHQgTGFrZSBDaXR5MR4w +HAYDVQQKExVUaGUgVVNFUlRSVVNUIE5ldHdvcmsxITAfBgNVBAsTGGh0dHA6Ly93d3cudXNlcnRy +dXN0LmNvbTEbMBkGA1UEAxMSVVROIC0gREFUQUNvcnAgU0dDMIIBIjANBgkqhkiG9w0BAQEFAAOC +AQ8AMIIBCgKCAQEA3+5YEKIrblXEjr8uRgnn4AgPLit6E5Qbvfa2gI5lBZMAHryv4g+OGQ0SR+ys +raP6LnD43m77VkIVni5c7yPeIbkFdicZD0/Ww5y0vpQZY/KmEQrrU0icvvIpOxboGqBMpsn0GFlo +wHDyUwDAXlCCpVZvNvlK4ESGoE1O1kduSUrLZ9emxAW5jh70/P/N5zbgnAVssjMiFdC04MwXwLLA +9P4yPykqlXvY8qdOD1R8oQ2AswkDwf9c3V6aPryuvEeKaq5xyh+xKrhfQgUL7EYw0XILyulWbfXv +33i+Ybqypa4ETLyorGkVl73v67SMvzX41MPRKA5cOp9wGDMgd8SirwIDAQABo4GrMIGoMAsGA1Ud +DwQEAwIBxjAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBRTMtGzz3/64PGgXYVOktKeRR20TzA9 +BgNVHR8ENjA0MDKgMKAuhixodHRwOi8vY3JsLnVzZXJ0cnVzdC5jb20vVVROLURBVEFDb3JwU0dD +LmNybDAqBgNVHSUEIzAhBggrBgEFBQcDAQYKKwYBBAGCNwoDAwYJYIZIAYb4QgQBMA0GCSqGSIb3 +DQEBBQUAA4IBAQAnNZcAiosovcYzMB4p/OL31ZjUQLtgyr+rFywJNn9Q+kHcrpY6CiM+iVnJowft +Gzet/Hy+UUla3joKVAgWRcKZsYfNjGjgaQPpxE6YsjuMFrMOoAyYUJuTqXAJyCyjj98C5OBxOvG0 +I3KgqgHf35g+FFCgMSa9KOlaMCZ1+XtgHI3zzVAmbQQnmt/VDUVHKWss5nbZqSl9Mt3JNjy9rjXx +EZ4du5A/EkdOjtd+D2JzHVImOBwYSf0wdJrE5SIv2MCN7ZF6TACPcn9d2t0bi0Vr591pl6jFVkwP +DPafepE39peC4N1xaf92P2BNPM/3mfnGV/TJVTl4uix5yaaIK/QI +-----END CERTIFICATE----- + +UTN USERFirst Hardware Root CA +============================== +-----BEGIN CERTIFICATE----- +MIIEdDCCA1ygAwIBAgIQRL4Mi1AAJLQR0zYq/mUK/TANBgkqhkiG9w0BAQUFADCBlzELMAkGA1UE +BhMCVVMxCzAJBgNVBAgTAlVUMRcwFQYDVQQHEw5TYWx0IExha2UgQ2l0eTEeMBwGA1UEChMVVGhl +IFVTRVJUUlVTVCBOZXR3b3JrMSEwHwYDVQQLExhodHRwOi8vd3d3LnVzZXJ0cnVzdC5jb20xHzAd +BgNVBAMTFlVUTi1VU0VSRmlyc3QtSGFyZHdhcmUwHhcNOTkwNzA5MTgxMDQyWhcNMTkwNzA5MTgx +OTIyWjCBlzELMAkGA1UEBhMCVVMxCzAJBgNVBAgTAlVUMRcwFQYDVQQHEw5TYWx0IExha2UgQ2l0 +eTEeMBwGA1UEChMVVGhlIFVTRVJUUlVTVCBOZXR3b3JrMSEwHwYDVQQLExhodHRwOi8vd3d3LnVz +ZXJ0cnVzdC5jb20xHzAdBgNVBAMTFlVUTi1VU0VSRmlyc3QtSGFyZHdhcmUwggEiMA0GCSqGSIb3 +DQEBAQUAA4IBDwAwggEKAoIBAQCx98M4P7Sof885glFn0G2f0v9Y8+efK+wNiVSZuTiZFvfgIXlI +wrthdBKWHTxqctU8EGc6Oe0rE81m65UJM6Rsl7HoxuzBdXmcRl6Nq9Bq/bkqVRcQVLMZ8Jr28bFd +tqdt++BxF2uiiPsA3/4aMXcMmgF6sTLjKwEHOG7DpV4jvEWbe1DByTCP2+UretNb+zNAHqDVmBe8 +i4fDidNdoI6yqqr2jmmIBsX6iSHzCJ1pLgkzmykNRg+MzEk0sGlRvfkGzWitZky8PqxhvQqIDsjf +Pe58BEydCl5rkdbux+0ojatNh4lz0G6k0B4WixThdkQDf2Os5M1JnMWS9KsyoUhbAgMBAAGjgbkw +gbYwCwYDVR0PBAQDAgHGMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFKFyXyYbKJhDlV0HN9WF +lp1L0sNFMEQGA1UdHwQ9MDswOaA3oDWGM2h0dHA6Ly9jcmwudXNlcnRydXN0LmNvbS9VVE4tVVNF +UkZpcnN0LUhhcmR3YXJlLmNybDAxBgNVHSUEKjAoBggrBgEFBQcDAQYIKwYBBQUHAwUGCCsGAQUF +BwMGBggrBgEFBQcDBzANBgkqhkiG9w0BAQUFAAOCAQEARxkP3nTGmZev/K0oXnWO6y1n7k57K9cM +//bey1WiCuFMVGWTYGufEpytXoMs61quwOQt9ABjHbjAbPLPSbtNk28GpgoiskliCE7/yMgUsogW +XecB5BKV5UU0s4tpvc+0hY91UZ59Ojg6FEgSxvunOxqNDYJAB+gECJChicsZUN/KHAG8HQQZexB2 +lzvukJDKxA4fFm517zP4029bHpbj4HR3dHuKom4t3XbWOTCC8KucUvIqx69JXn7HaOWCgchqJ/kn +iCrVWFCVH/A7HFe7fRQ5YiuayZSSKqMiDP+JJn1fIytH1xUdqWqeUQ0qUZ6B+dQ7XnASfxAynB67 +nfhmqA== +-----END CERTIFICATE----- + +Camerfirma Chambers of Commerce Root +==================================== +-----BEGIN CERTIFICATE----- +MIIEvTCCA6WgAwIBAgIBADANBgkqhkiG9w0BAQUFADB/MQswCQYDVQQGEwJFVTEnMCUGA1UEChMe +QUMgQ2FtZXJmaXJtYSBTQSBDSUYgQTgyNzQzMjg3MSMwIQYDVQQLExpodHRwOi8vd3d3LmNoYW1i +ZXJzaWduLm9yZzEiMCAGA1UEAxMZQ2hhbWJlcnMgb2YgQ29tbWVyY2UgUm9vdDAeFw0wMzA5MzAx +NjEzNDNaFw0zNzA5MzAxNjEzNDRaMH8xCzAJBgNVBAYTAkVVMScwJQYDVQQKEx5BQyBDYW1lcmZp +cm1hIFNBIENJRiBBODI3NDMyODcxIzAhBgNVBAsTGmh0dHA6Ly93d3cuY2hhbWJlcnNpZ24ub3Jn +MSIwIAYDVQQDExlDaGFtYmVycyBvZiBDb21tZXJjZSBSb290MIIBIDANBgkqhkiG9w0BAQEFAAOC +AQ0AMIIBCAKCAQEAtzZV5aVdGDDg2olUkfzIx1L4L1DZ77F1c2VHfRtbunXF/KGIJPov7coISjlU +xFF6tdpg6jg8gbLL8bvZkSM/SAFwdakFKq0fcfPJVD0dBmpAPrMMhe5cG3nCYsS4No41XQEMIwRH +NaqbYE6gZj3LJgqcQKH0XZi/caulAGgq7YN6D6IUtdQis4CwPAxaUWktWBiP7Zme8a7ileb2R6jW +DA+wWFjbw2Y3npuRVDM30pQcakjJyfKl2qUMI/cjDpwyVV5xnIQFUZot/eZOKjRa3spAN2cMVCFV +d9oKDMyXroDclDZK9D7ONhMeU+SsTjoF7Nuucpw4i9A5O4kKPnf+dQIBA6OCAUQwggFAMBIGA1Ud +EwEB/wQIMAYBAf8CAQwwPAYDVR0fBDUwMzAxoC+gLYYraHR0cDovL2NybC5jaGFtYmVyc2lnbi5v +cmcvY2hhbWJlcnNyb290LmNybDAdBgNVHQ4EFgQU45T1sU3p26EpW1eLTXYGduHRooowDgYDVR0P +AQH/BAQDAgEGMBEGCWCGSAGG+EIBAQQEAwIABzAnBgNVHREEIDAegRxjaGFtYmVyc3Jvb3RAY2hh +bWJlcnNpZ24ub3JnMCcGA1UdEgQgMB6BHGNoYW1iZXJzcm9vdEBjaGFtYmVyc2lnbi5vcmcwWAYD +VR0gBFEwTzBNBgsrBgEEAYGHLgoDATA+MDwGCCsGAQUFBwIBFjBodHRwOi8vY3BzLmNoYW1iZXJz +aWduLm9yZy9jcHMvY2hhbWJlcnNyb290Lmh0bWwwDQYJKoZIhvcNAQEFBQADggEBAAxBl8IahsAi +fJ/7kPMa0QOx7xP5IV8EnNrJpY0nbJaHkb5BkAFyk+cefV/2icZdp0AJPaxJRUXcLo0waLIJuvvD +L8y6C98/d3tGfToSJI6WjzwFCm/SlCgdbQzALogi1djPHRPH8EjX1wWnz8dHnjs8NMiAT9QUu/wN +UPf6s+xCX6ndbcj0dc97wXImsQEcXCz9ek60AcUFV7nnPKoF2YjpB0ZBzu9Bga5Y34OirsrXdx/n +ADydb47kMgkdTXg0eDQ8lJsm7U9xxhl6vSAiSFr+S30Dt+dYvsYyTnQeaN2oaFuzPu5ifdmA6Ap1 +erfutGWaIZDgqtCYvDi1czyL+Nw= +-----END CERTIFICATE----- + +Camerfirma Global Chambersign Root +================================== +-----BEGIN CERTIFICATE----- +MIIExTCCA62gAwIBAgIBADANBgkqhkiG9w0BAQUFADB9MQswCQYDVQQGEwJFVTEnMCUGA1UEChMe +QUMgQ2FtZXJmaXJtYSBTQSBDSUYgQTgyNzQzMjg3MSMwIQYDVQQLExpodHRwOi8vd3d3LmNoYW1i +ZXJzaWduLm9yZzEgMB4GA1UEAxMXR2xvYmFsIENoYW1iZXJzaWduIFJvb3QwHhcNMDMwOTMwMTYx +NDE4WhcNMzcwOTMwMTYxNDE4WjB9MQswCQYDVQQGEwJFVTEnMCUGA1UEChMeQUMgQ2FtZXJmaXJt +YSBTQSBDSUYgQTgyNzQzMjg3MSMwIQYDVQQLExpodHRwOi8vd3d3LmNoYW1iZXJzaWduLm9yZzEg +MB4GA1UEAxMXR2xvYmFsIENoYW1iZXJzaWduIFJvb3QwggEgMA0GCSqGSIb3DQEBAQUAA4IBDQAw +ggEIAoIBAQCicKLQn0KuWxfH2H3PFIP8T8mhtxOviteePgQKkotgVvq0Mi+ITaFgCPS3CU6gSS9J +1tPfnZdan5QEcOw/Wdm3zGaLmFIoCQLfxS+EjXqXd7/sQJ0lcqu1PzKY+7e3/HKE5TWH+VX6ox8O +by4o3Wmg2UIQxvi1RMLQQ3/bvOSiPGpVeAp3qdjqGTK3L/5cPxvusZjsyq16aUXjlg9V9ubtdepl +6DJWk0aJqCWKZQbua795B9Dxt6/tLE2Su8CoX6dnfQTyFQhwrJLWfQTSM/tMtgsL+xrJxI0DqX5c +8lCrEqWhz0hQpe/SyBoT+rB/sYIcd2oPX9wLlY/vQ37mRQklAgEDo4IBUDCCAUwwEgYDVR0TAQH/ +BAgwBgEB/wIBDDA/BgNVHR8EODA2MDSgMqAwhi5odHRwOi8vY3JsLmNoYW1iZXJzaWduLm9yZy9j +aGFtYmVyc2lnbnJvb3QuY3JsMB0GA1UdDgQWBBRDnDafsJ4wTcbOX60Qq+UDpfqpFDAOBgNVHQ8B +Af8EBAMCAQYwEQYJYIZIAYb4QgEBBAQDAgAHMCoGA1UdEQQjMCGBH2NoYW1iZXJzaWducm9vdEBj +aGFtYmVyc2lnbi5vcmcwKgYDVR0SBCMwIYEfY2hhbWJlcnNpZ25yb290QGNoYW1iZXJzaWduLm9y +ZzBbBgNVHSAEVDBSMFAGCysGAQQBgYcuCgEBMEEwPwYIKwYBBQUHAgEWM2h0dHA6Ly9jcHMuY2hh +bWJlcnNpZ24ub3JnL2Nwcy9jaGFtYmVyc2lnbnJvb3QuaHRtbDANBgkqhkiG9w0BAQUFAAOCAQEA +PDtwkfkEVCeR4e3t/mh/YV3lQWVPMvEYBZRqHN4fcNs+ezICNLUMbKGKfKX0j//U2K0X1S0E0T9Y +gOKBWYi+wONGkyT+kL0mojAt6JcmVzWJdJYY9hXiryQZVgICsroPFOrGimbBhkVVi76SvpykBMdJ +PJ7oKXqJ1/6v/2j1pReQvayZzKWGVwlnRtvWFsJG8eSpUPWP0ZIV018+xgBJOm5YstHRJw0lyDL4 +IBHNfTIzSJRUTN3cecQwn+uOuFW114hcxWokPbLTBQNRxgfvzBRydD1ucs4YKIxKoHflCStFREes +t2d/AYoFWpO+ocH/+OcOZ6RHSXZddZAa9SaP8A== +-----END CERTIFICATE----- + +NetLock Notary (Class A) Root +============================= +-----BEGIN CERTIFICATE----- +MIIGfTCCBWWgAwIBAgICAQMwDQYJKoZIhvcNAQEEBQAwga8xCzAJBgNVBAYTAkhVMRAwDgYDVQQI +EwdIdW5nYXJ5MREwDwYDVQQHEwhCdWRhcGVzdDEnMCUGA1UEChMeTmV0TG9jayBIYWxvemF0Yml6 +dG9uc2FnaSBLZnQuMRowGAYDVQQLExFUYW51c2l0dmFueWtpYWRvazE2MDQGA1UEAxMtTmV0TG9j +ayBLb3pqZWd5em9pIChDbGFzcyBBKSBUYW51c2l0dmFueWtpYWRvMB4XDTk5MDIyNDIzMTQ0N1oX +DTE5MDIxOTIzMTQ0N1owga8xCzAJBgNVBAYTAkhVMRAwDgYDVQQIEwdIdW5nYXJ5MREwDwYDVQQH +EwhCdWRhcGVzdDEnMCUGA1UEChMeTmV0TG9jayBIYWxvemF0Yml6dG9uc2FnaSBLZnQuMRowGAYD +VQQLExFUYW51c2l0dmFueWtpYWRvazE2MDQGA1UEAxMtTmV0TG9jayBLb3pqZWd5em9pIChDbGFz +cyBBKSBUYW51c2l0dmFueWtpYWRvMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAvHSM +D7tM9DceqQWC2ObhbHDqeLVu0ThEDaiDzl3S1tWBxdRL51uUcCbbO51qTGL3cfNk1mE7PetzozfZ +z+qMkjvN9wfcZnSX9EUi3fRc4L9t875lM+QVOr/bmJBVOMTtplVjC7B4BPTjbsE/jvxReB+SnoPC +/tmwqcm8WgD/qaiYdPv2LD4VOQ22BFWoDpggQrOxJa1+mm9dU7GrDPzr4PN6s6iz/0b2Y6LYOph7 +tqyF/7AlT3Rj5xMHpQqPBffAZG9+pyeAlt7ULoZgx2srXnN7F+eRP2QM2EsiNCubMvJIH5+hCoR6 +4sKtlz2O1cH5VqNQ6ca0+pii7pXmKgOM3wIDAQABo4ICnzCCApswDgYDVR0PAQH/BAQDAgAGMBIG +A1UdEwEB/wQIMAYBAf8CAQQwEQYJYIZIAYb4QgEBBAQDAgAHMIICYAYJYIZIAYb4QgENBIICURaC +Ak1GSUdZRUxFTSEgRXplbiB0YW51c2l0dmFueSBhIE5ldExvY2sgS2Z0LiBBbHRhbGFub3MgU3pv +bGdhbHRhdGFzaSBGZWx0ZXRlbGVpYmVuIGxlaXJ0IGVsamFyYXNvayBhbGFwamFuIGtlc3p1bHQu +IEEgaGl0ZWxlc2l0ZXMgZm9seWFtYXRhdCBhIE5ldExvY2sgS2Z0LiB0ZXJtZWtmZWxlbG9zc2Vn +LWJpenRvc2l0YXNhIHZlZGkuIEEgZGlnaXRhbGlzIGFsYWlyYXMgZWxmb2dhZGFzYW5hayBmZWx0 +ZXRlbGUgYXogZWxvaXJ0IGVsbGVub3J6ZXNpIGVsamFyYXMgbWVndGV0ZWxlLiBBeiBlbGphcmFz +IGxlaXJhc2EgbWVndGFsYWxoYXRvIGEgTmV0TG9jayBLZnQuIEludGVybmV0IGhvbmxhcGphbiBh +IGh0dHBzOi8vd3d3Lm5ldGxvY2submV0L2RvY3MgY2ltZW4gdmFneSBrZXJoZXRvIGF6IGVsbGVu +b3J6ZXNAbmV0bG9jay5uZXQgZS1tYWlsIGNpbWVuLiBJTVBPUlRBTlQhIFRoZSBpc3N1YW5jZSBh +bmQgdGhlIHVzZSBvZiB0aGlzIGNlcnRpZmljYXRlIGlzIHN1YmplY3QgdG8gdGhlIE5ldExvY2sg +Q1BTIGF2YWlsYWJsZSBhdCBodHRwczovL3d3dy5uZXRsb2NrLm5ldC9kb2NzIG9yIGJ5IGUtbWFp +bCBhdCBjcHNAbmV0bG9jay5uZXQuMA0GCSqGSIb3DQEBBAUAA4IBAQBIJEb3ulZv+sgoA0BO5TE5 +ayZrU3/b39/zcT0mwBQOxmd7I6gMc90Bu8bKbjc5VdXHjFYgDigKDtIqpLBJUsY4B/6+CgmM0ZjP +ytoUMaFP0jn8DxEsQ8Pdq5PHVT5HfBgaANzze9jyf1JsIPQLX2lS9O74silg6+NJMSEN1rUQQeJB +CWziGppWS3cC9qCbmieH6FUpccKQn0V4GuEVZD3QDtigdp+uxdAu6tYPVuxkf1qbFFgBJ34TUMdr +KuZoPL9coAob4Q566eKAw+np9v1sEZ7Q5SgnK1QyQhSCdeZK8CtmdWOMovsEPoMOmzbwGOQmIMOM +8CgHrTwXZoi1/baI +-----END CERTIFICATE----- + +NetLock Business (Class B) Root +=============================== +-----BEGIN CERTIFICATE----- +MIIFSzCCBLSgAwIBAgIBaTANBgkqhkiG9w0BAQQFADCBmTELMAkGA1UEBhMCSFUxETAPBgNVBAcT +CEJ1ZGFwZXN0MScwJQYDVQQKEx5OZXRMb2NrIEhhbG96YXRiaXp0b25zYWdpIEtmdC4xGjAYBgNV +BAsTEVRhbnVzaXR2YW55a2lhZG9rMTIwMAYDVQQDEylOZXRMb2NrIFV6bGV0aSAoQ2xhc3MgQikg +VGFudXNpdHZhbnlraWFkbzAeFw05OTAyMjUxNDEwMjJaFw0xOTAyMjAxNDEwMjJaMIGZMQswCQYD +VQQGEwJIVTERMA8GA1UEBxMIQnVkYXBlc3QxJzAlBgNVBAoTHk5ldExvY2sgSGFsb3phdGJpenRv +bnNhZ2kgS2Z0LjEaMBgGA1UECxMRVGFudXNpdHZhbnlraWFkb2sxMjAwBgNVBAMTKU5ldExvY2sg +VXpsZXRpIChDbGFzcyBCKSBUYW51c2l0dmFueWtpYWRvMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCB +iQKBgQCx6gTsIKAjwo84YM/HRrPVG/77uZmeBNwcf4xKgZjupNTKihe5In+DCnVMm8Bp2GQ5o+2S +o/1bXHQawEfKOml2mrriRBf8TKPV/riXiK+IA4kfpPIEPsgHC+b5sy96YhQJRhTKZPWLgLViqNhr +1nGTLbO/CVRY7QbrqHvcQ7GhaQIDAQABo4ICnzCCApswEgYDVR0TAQH/BAgwBgEB/wIBBDAOBgNV +HQ8BAf8EBAMCAAYwEQYJYIZIAYb4QgEBBAQDAgAHMIICYAYJYIZIAYb4QgENBIICURaCAk1GSUdZ +RUxFTSEgRXplbiB0YW51c2l0dmFueSBhIE5ldExvY2sgS2Z0LiBBbHRhbGFub3MgU3pvbGdhbHRh +dGFzaSBGZWx0ZXRlbGVpYmVuIGxlaXJ0IGVsamFyYXNvayBhbGFwamFuIGtlc3p1bHQuIEEgaGl0 +ZWxlc2l0ZXMgZm9seWFtYXRhdCBhIE5ldExvY2sgS2Z0LiB0ZXJtZWtmZWxlbG9zc2VnLWJpenRv +c2l0YXNhIHZlZGkuIEEgZGlnaXRhbGlzIGFsYWlyYXMgZWxmb2dhZGFzYW5hayBmZWx0ZXRlbGUg +YXogZWxvaXJ0IGVsbGVub3J6ZXNpIGVsamFyYXMgbWVndGV0ZWxlLiBBeiBlbGphcmFzIGxlaXJh +c2EgbWVndGFsYWxoYXRvIGEgTmV0TG9jayBLZnQuIEludGVybmV0IGhvbmxhcGphbiBhIGh0dHBz +Oi8vd3d3Lm5ldGxvY2submV0L2RvY3MgY2ltZW4gdmFneSBrZXJoZXRvIGF6IGVsbGVub3J6ZXNA +bmV0bG9jay5uZXQgZS1tYWlsIGNpbWVuLiBJTVBPUlRBTlQhIFRoZSBpc3N1YW5jZSBhbmQgdGhl +IHVzZSBvZiB0aGlzIGNlcnRpZmljYXRlIGlzIHN1YmplY3QgdG8gdGhlIE5ldExvY2sgQ1BTIGF2 +YWlsYWJsZSBhdCBodHRwczovL3d3dy5uZXRsb2NrLm5ldC9kb2NzIG9yIGJ5IGUtbWFpbCBhdCBj +cHNAbmV0bG9jay5uZXQuMA0GCSqGSIb3DQEBBAUAA4GBAATbrowXr/gOkDFOzT4JwG06sPgzTEdM +43WIEJessDgVkcYplswhwG08pXTP2IKlOcNl40JwuyKQ433bNXbhoLXan3BukxowOR0w2y7jfLKR +stE3Kfq51hdcR0/jHTjrn9V7lagonhVK0dHQKwCXoOKSNitjrFgBazMpUIaD8QFI +-----END CERTIFICATE----- + +NetLock Express (Class C) Root +============================== +-----BEGIN CERTIFICATE----- +MIIFTzCCBLigAwIBAgIBaDANBgkqhkiG9w0BAQQFADCBmzELMAkGA1UEBhMCSFUxETAPBgNVBAcT +CEJ1ZGFwZXN0MScwJQYDVQQKEx5OZXRMb2NrIEhhbG96YXRiaXp0b25zYWdpIEtmdC4xGjAYBgNV +BAsTEVRhbnVzaXR2YW55a2lhZG9rMTQwMgYDVQQDEytOZXRMb2NrIEV4cHJlc3N6IChDbGFzcyBD +KSBUYW51c2l0dmFueWtpYWRvMB4XDTk5MDIyNTE0MDgxMVoXDTE5MDIyMDE0MDgxMVowgZsxCzAJ +BgNVBAYTAkhVMREwDwYDVQQHEwhCdWRhcGVzdDEnMCUGA1UEChMeTmV0TG9jayBIYWxvemF0Yml6 +dG9uc2FnaSBLZnQuMRowGAYDVQQLExFUYW51c2l0dmFueWtpYWRvazE0MDIGA1UEAxMrTmV0TG9j +ayBFeHByZXNzeiAoQ2xhc3MgQykgVGFudXNpdHZhbnlraWFkbzCBnzANBgkqhkiG9w0BAQEFAAOB +jQAwgYkCgYEA6+ywbGGKIyWvYCDj2Z/8kwvbXY2wobNAOoLO/XXgeDIDhlqGlZHtU/qdQPzm6N3Z +W3oDvV3zOwzDUXmbrVWg6dADEK8KuhRC2VImESLH0iDMgqSaqf64gXadarfSNnU+sYYJ9m5tfk63 +euyucYT2BDMIJTLrdKwWRMbkQJMdf60CAwEAAaOCAp8wggKbMBIGA1UdEwEB/wQIMAYBAf8CAQQw +DgYDVR0PAQH/BAQDAgAGMBEGCWCGSAGG+EIBAQQEAwIABzCCAmAGCWCGSAGG+EIBDQSCAlEWggJN +RklHWUVMRU0hIEV6ZW4gdGFudXNpdHZhbnkgYSBOZXRMb2NrIEtmdC4gQWx0YWxhbm9zIFN6b2xn +YWx0YXRhc2kgRmVsdGV0ZWxlaWJlbiBsZWlydCBlbGphcmFzb2sgYWxhcGphbiBrZXN6dWx0LiBB +IGhpdGVsZXNpdGVzIGZvbHlhbWF0YXQgYSBOZXRMb2NrIEtmdC4gdGVybWVrZmVsZWxvc3NlZy1i +aXp0b3NpdGFzYSB2ZWRpLiBBIGRpZ2l0YWxpcyBhbGFpcmFzIGVsZm9nYWRhc2FuYWsgZmVsdGV0 +ZWxlIGF6IGVsb2lydCBlbGxlbm9yemVzaSBlbGphcmFzIG1lZ3RldGVsZS4gQXogZWxqYXJhcyBs +ZWlyYXNhIG1lZ3RhbGFsaGF0byBhIE5ldExvY2sgS2Z0LiBJbnRlcm5ldCBob25sYXBqYW4gYSBo +dHRwczovL3d3dy5uZXRsb2NrLm5ldC9kb2NzIGNpbWVuIHZhZ3kga2VyaGV0byBheiBlbGxlbm9y +emVzQG5ldGxvY2submV0IGUtbWFpbCBjaW1lbi4gSU1QT1JUQU5UISBUaGUgaXNzdWFuY2UgYW5k +IHRoZSB1c2Ugb2YgdGhpcyBjZXJ0aWZpY2F0ZSBpcyBzdWJqZWN0IHRvIHRoZSBOZXRMb2NrIENQ +UyBhdmFpbGFibGUgYXQgaHR0cHM6Ly93d3cubmV0bG9jay5uZXQvZG9jcyBvciBieSBlLW1haWwg +YXQgY3BzQG5ldGxvY2submV0LjANBgkqhkiG9w0BAQQFAAOBgQAQrX/XDDKACtiG8XmYta3UzbM2 +xJZIwVzNmtkFLp++UOv0JhQQLdRmF/iewSf98e3ke0ugbLWrmldwpu2gpO0u9f38vf5NNwgMvOOW +gyL1SRt/Syu0VMGAfJlOHdCM7tCs5ZL6dVb+ZKATj7i4Fp1hBWeAyNDYpQcCNJgEjTME1A== +-----END CERTIFICATE----- + +XRamp Global CA Root +==================== +-----BEGIN CERTIFICATE----- +MIIEMDCCAxigAwIBAgIQUJRs7Bjq1ZxN1ZfvdY+grTANBgkqhkiG9w0BAQUFADCBgjELMAkGA1UE +BhMCVVMxHjAcBgNVBAsTFXd3dy54cmFtcHNlY3VyaXR5LmNvbTEkMCIGA1UEChMbWFJhbXAgU2Vj +dXJpdHkgU2VydmljZXMgSW5jMS0wKwYDVQQDEyRYUmFtcCBHbG9iYWwgQ2VydGlmaWNhdGlvbiBB +dXRob3JpdHkwHhcNMDQxMTAxMTcxNDA0WhcNMzUwMTAxMDUzNzE5WjCBgjELMAkGA1UEBhMCVVMx +HjAcBgNVBAsTFXd3dy54cmFtcHNlY3VyaXR5LmNvbTEkMCIGA1UEChMbWFJhbXAgU2VjdXJpdHkg +U2VydmljZXMgSW5jMS0wKwYDVQQDEyRYUmFtcCBHbG9iYWwgQ2VydGlmaWNhdGlvbiBBdXRob3Jp +dHkwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCYJB69FbS638eMpSe2OAtp87ZOqCwu +IR1cRN8hXX4jdP5efrRKt6atH67gBhbim1vZZ3RrXYCPKZ2GG9mcDZhtdhAoWORlsH9KmHmf4MMx +foArtYzAQDsRhtDLooY2YKTVMIJt2W7QDxIEM5dfT2Fa8OT5kavnHTu86M/0ay00fOJIYRyO82FE +zG+gSqmUsE3a56k0enI4qEHMPJQRfevIpoy3hsvKMzvZPTeL+3o+hiznc9cKV6xkmxnr9A8ECIqs +AxcZZPRaJSKNNCyy9mgdEm3Tih4U2sSPpuIjhdV6Db1q4Ons7Be7QhtnqiXtRYMh/MHJfNViPvry +xS3T/dRlAgMBAAGjgZ8wgZwwEwYJKwYBBAGCNxQCBAYeBABDAEEwCwYDVR0PBAQDAgGGMA8GA1Ud +EwEB/wQFMAMBAf8wHQYDVR0OBBYEFMZPoj0GY4QJnM5i5ASsjVy16bYbMDYGA1UdHwQvMC0wK6Ap +oCeGJWh0dHA6Ly9jcmwueHJhbXBzZWN1cml0eS5jb20vWEdDQS5jcmwwEAYJKwYBBAGCNxUBBAMC +AQEwDQYJKoZIhvcNAQEFBQADggEBAJEVOQMBG2f7Shz5CmBbodpNl2L5JFMn14JkTpAuw0kbK5rc +/Kh4ZzXxHfARvbdI4xD2Dd8/0sm2qlWkSLoC295ZLhVbO50WfUfXN+pfTXYSNrsf16GBBEYgoyxt +qZ4Bfj8pzgCT3/3JknOJiWSe5yvkHJEs0rnOfc5vMZnT5r7SHpDwCRR5XCOrTdLaIR9NmXmd4c8n +nxCbHIgNsIpkQTG4DmyQJKSbXHGPurt+HBvbaoAPIbzp26a3QPSyi6mx5O+aGtA9aZnuqCij4Tyz +8LIRnM98QObd50N9otg6tamN8jSZxNQQ4Qb9CYQQO+7ETPTsJ3xCwnR8gooJybQDJbw= +-----END CERTIFICATE----- + +Go Daddy Class 2 CA +=================== +-----BEGIN CERTIFICATE----- +MIIEADCCAuigAwIBAgIBADANBgkqhkiG9w0BAQUFADBjMQswCQYDVQQGEwJVUzEhMB8GA1UEChMY +VGhlIEdvIERhZGR5IEdyb3VwLCBJbmMuMTEwLwYDVQQLEyhHbyBEYWRkeSBDbGFzcyAyIENlcnRp +ZmljYXRpb24gQXV0aG9yaXR5MB4XDTA0MDYyOTE3MDYyMFoXDTM0MDYyOTE3MDYyMFowYzELMAkG +A1UEBhMCVVMxITAfBgNVBAoTGFRoZSBHbyBEYWRkeSBHcm91cCwgSW5jLjExMC8GA1UECxMoR28g +RGFkZHkgQ2xhc3MgMiBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTCCASAwDQYJKoZIhvcNAQEBBQAD +ggENADCCAQgCggEBAN6d1+pXGEmhW+vXX0iG6r7d/+TvZxz0ZWizV3GgXne77ZtJ6XCAPVYYYwhv +2vLM0D9/AlQiVBDYsoHUwHU9S3/Hd8M+eKsaA7Ugay9qK7HFiH7Eux6wwdhFJ2+qN1j3hybX2C32 +qRe3H3I2TqYXP2WYktsqbl2i/ojgC95/5Y0V4evLOtXiEqITLdiOr18SPaAIBQi2XKVlOARFmR6j +YGB0xUGlcmIbYsUfb18aQr4CUWWoriMYavx4A6lNf4DD+qta/KFApMoZFv6yyO9ecw3ud72a9nmY +vLEHZ6IVDd2gWMZEewo+YihfukEHU1jPEX44dMX4/7VpkI+EdOqXG68CAQOjgcAwgb0wHQYDVR0O +BBYEFNLEsNKR1EwRcbNhyz2h/t2oatTjMIGNBgNVHSMEgYUwgYKAFNLEsNKR1EwRcbNhyz2h/t2o +atTjoWekZTBjMQswCQYDVQQGEwJVUzEhMB8GA1UEChMYVGhlIEdvIERhZGR5IEdyb3VwLCBJbmMu +MTEwLwYDVQQLEyhHbyBEYWRkeSBDbGFzcyAyIENlcnRpZmljYXRpb24gQXV0aG9yaXR5ggEAMAwG +A1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBADJL87LKPpH8EsahB4yOd6AzBhRckB4Y9wim +PQoZ+YeAEW5p5JYXMP80kWNyOO7MHAGjHZQopDH2esRU1/blMVgDoszOYtuURXO1v0XJJLXVggKt +I3lpjbi2Tc7PTMozI+gciKqdi0FuFskg5YmezTvacPd+mSYgFFQlq25zheabIZ0KbIIOqPjCDPoQ +HmyW74cNxA9hi63ugyuV+I6ShHI56yDqg+2DzZduCLzrTia2cyvk0/ZM/iZx4mERdEr/VxqHD3VI +Ls9RaRegAhJhldXRQLIQTO7ErBBDpqWeCtWVYpoNz4iCxTIM5CufReYNnyicsbkqWletNw+vHX/b +vZ8= +-----END CERTIFICATE----- + +Starfield Class 2 CA +==================== +-----BEGIN CERTIFICATE----- +MIIEDzCCAvegAwIBAgIBADANBgkqhkiG9w0BAQUFADBoMQswCQYDVQQGEwJVUzElMCMGA1UEChMc +U3RhcmZpZWxkIFRlY2hub2xvZ2llcywgSW5jLjEyMDAGA1UECxMpU3RhcmZpZWxkIENsYXNzIDIg +Q2VydGlmaWNhdGlvbiBBdXRob3JpdHkwHhcNMDQwNjI5MTczOTE2WhcNMzQwNjI5MTczOTE2WjBo +MQswCQYDVQQGEwJVUzElMCMGA1UEChMcU3RhcmZpZWxkIFRlY2hub2xvZ2llcywgSW5jLjEyMDAG +A1UECxMpU3RhcmZpZWxkIENsYXNzIDIgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkwggEgMA0GCSqG +SIb3DQEBAQUAA4IBDQAwggEIAoIBAQC3Msj+6XGmBIWtDBFk385N78gDGIc/oav7PKaf8MOh2tTY +bitTkPskpD6E8J7oX+zlJ0T1KKY/e97gKvDIr1MvnsoFAZMej2YcOadN+lq2cwQlZut3f+dZxkqZ +JRRU6ybH838Z1TBwj6+wRir/resp7defqgSHo9T5iaU0X9tDkYI22WY8sbi5gv2cOj4QyDvvBmVm +epsZGD3/cVE8MC5fvj13c7JdBmzDI1aaK4UmkhynArPkPw2vCHmCuDY96pzTNbO8acr1zJ3o/WSN +F4Azbl5KXZnJHoe0nRrA1W4TNSNe35tfPe/W93bC6j67eA0cQmdrBNj41tpvi/JEoAGrAgEDo4HF +MIHCMB0GA1UdDgQWBBS/X7fRzt0fhvRbVazc1xDCDqmI5zCBkgYDVR0jBIGKMIGHgBS/X7fRzt0f +hvRbVazc1xDCDqmI56FspGowaDELMAkGA1UEBhMCVVMxJTAjBgNVBAoTHFN0YXJmaWVsZCBUZWNo +bm9sb2dpZXMsIEluYy4xMjAwBgNVBAsTKVN0YXJmaWVsZCBDbGFzcyAyIENlcnRpZmljYXRpb24g +QXV0aG9yaXR5ggEAMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAAWdP4id0ckaVaGs +afPzWdqbAYcaT1epoXkJKtv3L7IezMdeatiDh6GX70k1PncGQVhiv45YuApnP+yz3SFmH8lU+nLM +PUxA2IGvd56Deruix/U0F47ZEUD0/CwqTRV/p2JdLiXTAAsgGh1o+Re49L2L7ShZ3U0WixeDyLJl +xy16paq8U4Zt3VekyvggQQto8PT7dL5WXXp59fkdheMtlb71cZBDzI0fmgAKhynpVSJYACPq4xJD +KVtHCN2MQWplBqjlIapBtJUhlbl90TSrE9atvNziPTnNvT51cKEYWQPJIrSPnNVeKtelttQKbfi3 +QBFGmh95DmK/D5fs4C8fF5Q= +-----END CERTIFICATE----- + +StartCom Certification Authority +================================ +-----BEGIN CERTIFICATE----- +MIIHyTCCBbGgAwIBAgIBATANBgkqhkiG9w0BAQUFADB9MQswCQYDVQQGEwJJTDEWMBQGA1UEChMN +U3RhcnRDb20gTHRkLjErMCkGA1UECxMiU2VjdXJlIERpZ2l0YWwgQ2VydGlmaWNhdGUgU2lnbmlu +ZzEpMCcGA1UEAxMgU3RhcnRDb20gQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkwHhcNMDYwOTE3MTk0 +NjM2WhcNMzYwOTE3MTk0NjM2WjB9MQswCQYDVQQGEwJJTDEWMBQGA1UEChMNU3RhcnRDb20gTHRk +LjErMCkGA1UECxMiU2VjdXJlIERpZ2l0YWwgQ2VydGlmaWNhdGUgU2lnbmluZzEpMCcGA1UEAxMg +U3RhcnRDb20gQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAw +ggIKAoICAQDBiNsJvGxGfHiflXu1M5DycmLWwTYgIiRezul38kMKogZkpMyONvg45iPwbm2xPN1y +o4UcodM9tDMr0y+v/uqwQVlntsQGfQqedIXWeUyAN3rfOQVSWff0G0ZDpNKFhdLDcfN1YjS6LIp/ +Ho/u7TTQEceWzVI9ujPW3U3eCztKS5/CJi/6tRYccjV3yjxd5srhJosaNnZcAdt0FCX+7bWgiA/d +eMotHweXMAEtcnn6RtYTKqi5pquDSR3l8u/d5AGOGAqPY1MWhWKpDhk6zLVmpsJrdAfkK+F2PrRt +2PZE4XNiHzvEvqBTViVsUQn3qqvKv3b9bZvzndu/PWa8DFaqr5hIlTpL36dYUNk4dalb6kMMAv+Z +6+hsTXBbKWWc3apdzK8BMewM69KN6Oqce+Zu9ydmDBpI125C4z/eIT574Q1w+2OqqGwaVLRcJXrJ +osmLFqa7LH4XXgVNWG4SHQHuEhANxjJ/GP/89PrNbpHoNkm+Gkhpi8KWTRoSsmkXwQqQ1vp5Iki/ +untp+HDH+no32NgN0nZPV/+Qt+OR0t3vwmC3Zzrd/qqc8NSLf3Iizsafl7b4r4qgEKjZ+xjGtrVc +UjyJthkqcwEKDwOzEmDyei+B26Nu/yYwl/WL3YlXtq09s68rxbd2AvCl1iuahhQqcvbjM4xdCUsT +37uMdBNSSwIDAQABo4ICUjCCAk4wDAYDVR0TBAUwAwEB/zALBgNVHQ8EBAMCAa4wHQYDVR0OBBYE +FE4L7xqkQFulF2mHMMo0aEPQQa7yMGQGA1UdHwRdMFswLKAqoCiGJmh0dHA6Ly9jZXJ0LnN0YXJ0 +Y29tLm9yZy9zZnNjYS1jcmwuY3JsMCugKaAnhiVodHRwOi8vY3JsLnN0YXJ0Y29tLm9yZy9zZnNj +YS1jcmwuY3JsMIIBXQYDVR0gBIIBVDCCAVAwggFMBgsrBgEEAYG1NwEBATCCATswLwYIKwYBBQUH +AgEWI2h0dHA6Ly9jZXJ0LnN0YXJ0Y29tLm9yZy9wb2xpY3kucGRmMDUGCCsGAQUFBwIBFilodHRw +Oi8vY2VydC5zdGFydGNvbS5vcmcvaW50ZXJtZWRpYXRlLnBkZjCB0AYIKwYBBQUHAgIwgcMwJxYg +U3RhcnQgQ29tbWVyY2lhbCAoU3RhcnRDb20pIEx0ZC4wAwIBARqBl0xpbWl0ZWQgTGlhYmlsaXR5 +LCByZWFkIHRoZSBzZWN0aW9uICpMZWdhbCBMaW1pdGF0aW9ucyogb2YgdGhlIFN0YXJ0Q29tIENl +cnRpZmljYXRpb24gQXV0aG9yaXR5IFBvbGljeSBhdmFpbGFibGUgYXQgaHR0cDovL2NlcnQuc3Rh +cnRjb20ub3JnL3BvbGljeS5wZGYwEQYJYIZIAYb4QgEBBAQDAgAHMDgGCWCGSAGG+EIBDQQrFilT +dGFydENvbSBGcmVlIFNTTCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTANBgkqhkiG9w0BAQUFAAOC +AgEAFmyZ9GYMNPXQhV59CuzaEE44HF7fpiUFS5Eyweg78T3dRAlbB0mKKctmArexmvclmAk8jhvh +3TaHK0u7aNM5Zj2gJsfyOZEdUauCe37Vzlrk4gNXcGmXCPleWKYK34wGmkUWFjgKXlf2Ysd6AgXm +vB618p70qSmD+LIU424oh0TDkBreOKk8rENNZEXO3SipXPJzewT4F+irsfMuXGRuczE6Eri8sxHk +fY+BUZo7jYn0TZNmezwD7dOaHZrzZVD1oNB1ny+v8OqCQ5j4aZyJecRDjkZy42Q2Eq/3JR44iZB3 +fsNrarnDy0RLrHiQi+fHLB5LEUTINFInzQpdn4XBidUaePKVEFMy3YCEZnXZtWgo+2EuvoSoOMCZ +EoalHmdkrQYuL6lwhceWD3yJZfWOQ1QOq92lgDmUYMA0yZZwLKMS9R9Ie70cfmu3nZD0Ijuu+Pwq +yvqCUqDvr0tVk+vBtfAii6w0TiYiBKGHLHVKt+V9E9e4DGTANtLJL4YSjCMJwRuCO3NJo2pXh5Tl +1njFmUNj403gdy3hZZlyaQQaRwnmDwFWJPsfvw55qVguucQJAX6Vum0ABj6y6koQOdjQK/W/7HW/ +lwLFCRsI3FU34oH7N4RDYiDK51ZLZer+bMEkkyShNOsF/5oirpt9P/FlUQqmMGqz9IgcgA38coro +g14= +-----END CERTIFICATE----- + +Taiwan GRCA +=========== +-----BEGIN CERTIFICATE----- +MIIFcjCCA1qgAwIBAgIQH51ZWtcvwgZEpYAIaeNe9jANBgkqhkiG9w0BAQUFADA/MQswCQYDVQQG +EwJUVzEwMC4GA1UECgwnR292ZXJubWVudCBSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MB4X +DTAyMTIwNTEzMjMzM1oXDTMyMTIwNTEzMjMzM1owPzELMAkGA1UEBhMCVFcxMDAuBgNVBAoMJ0dv +dmVybm1lbnQgUm9vdCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTCCAiIwDQYJKoZIhvcNAQEBBQAD +ggIPADCCAgoCggIBAJoluOzMonWoe/fOW1mKydGGEghU7Jzy50b2iPN86aXfTEc2pBsBHH8eV4qN +w8XRIePaJD9IK/ufLqGU5ywck9G/GwGHU5nOp/UKIXZ3/6m3xnOUT0b3EEk3+qhZSV1qgQdW8or5 +BtD3cCJNtLdBuTK4sfCxw5w/cP1T3YGq2GN49thTbqGsaoQkclSGxtKyyhwOeYHWtXBiCAEuTk8O +1RGvqa/lmr/czIdtJuTJV6L7lvnM4T9TjGxMfptTCAtsF/tnyMKtsc2AtJfcdgEWFelq16TheEfO +htX7MfP6Mb40qij7cEwdScevLJ1tZqa2jWR+tSBqnTuBto9AAGdLiYa4zGX+FVPpBMHWXx1E1wov +J5pGfaENda1UhhXcSTvxls4Pm6Dso3pdvtUqdULle96ltqqvKKyskKw4t9VoNSZ63Pc78/1Fm9G7 +Q3hub/FCVGqY8A2tl+lSXunVanLeavcbYBT0peS2cWeqH+riTcFCQP5nRhc4L0c/cZyu5SHKYS1t +B6iEfC3uUSXxY5Ce/eFXiGvviiNtsea9P63RPZYLhY3Naye7twWb7LuRqQoHEgKXTiCQ8P8NHuJB +O9NAOueNXdpm5AKwB1KYXA6OM5zCppX7VRluTI6uSw+9wThNXo+EHWbNxWCWtFJaBYmOlXqYwZE8 +lSOyDvR5tMl8wUohAgMBAAGjajBoMB0GA1UdDgQWBBTMzO/MKWCkO7GStjz6MmKPrCUVOzAMBgNV +HRMEBTADAQH/MDkGBGcqBwAEMTAvMC0CAQAwCQYFKw4DAhoFADAHBgVnKgMAAAQUA5vwIhP/lSg2 +09yewDL7MTqKUWUwDQYJKoZIhvcNAQEFBQADggIBAECASvomyc5eMN1PhnR2WPWus4MzeKR6dBcZ +TulStbngCnRiqmjKeKBMmo4sIy7VahIkv9Ro04rQ2JyftB8M3jh+Vzj8jeJPXgyfqzvS/3WXy6Tj +Zwj/5cAWtUgBfen5Cv8b5Wppv3ghqMKnI6mGq3ZW6A4M9hPdKmaKZEk9GhiHkASfQlK3T8v+R0F2 +Ne//AHY2RTKbxkaFXeIksB7jSJaYV0eUVXoPQbFEJPPB/hprv4j9wabak2BegUqZIJxIZhm1AHlU +D7gsL0u8qV1bYH+Mh6XgUmMqvtg7hUAV/h62ZT/FS9p+tXo1KaMuephgIqP0fSdOLeq0dDzpD6Qz +DxARvBMB1uUO07+1EqLhRSPAzAhuYbeJq4PjJB7mXQfnHyA+z2fI56wwbSdLaG5LKlwCCDTb+Hbk +Z6MmnD+iMsJKxYEYMRBWqoTvLQr/uB930r+lWKBi5NdLkXWNiYCYfm3LU05er/ayl4WXudpVBrkk +7tfGOB5jGxI7leFYrPLfhNVfmS8NVVvmONsuP3LpSIXLuykTjx44VbnzssQwmSNOXfJIoRIM3BKQ +CZBUkQM8R+XVyWXgt0t97EfTsws+rZ7QdAAO671RrcDeLMDDav7v3Aun+kbfYNucpllQdSNpc5Oy ++fwC00fmcc4QAu4njIT/rEUNE1yDMuAlpYYsfPQS +-----END CERTIFICATE----- + +Firmaprofesional Root CA +======================== +-----BEGIN CERTIFICATE----- +MIIEVzCCAz+gAwIBAgIBATANBgkqhkiG9w0BAQUFADCBnTELMAkGA1UEBhMCRVMxIjAgBgNVBAcT +GUMvIE11bnRhbmVyIDI0NCBCYXJjZWxvbmExQjBABgNVBAMTOUF1dG9yaWRhZCBkZSBDZXJ0aWZp +Y2FjaW9uIEZpcm1hcHJvZmVzaW9uYWwgQ0lGIEE2MjYzNDA2ODEmMCQGCSqGSIb3DQEJARYXY2FA +ZmlybWFwcm9mZXNpb25hbC5jb20wHhcNMDExMDI0MjIwMDAwWhcNMTMxMDI0MjIwMDAwWjCBnTEL +MAkGA1UEBhMCRVMxIjAgBgNVBAcTGUMvIE11bnRhbmVyIDI0NCBCYXJjZWxvbmExQjBABgNVBAMT +OUF1dG9yaWRhZCBkZSBDZXJ0aWZpY2FjaW9uIEZpcm1hcHJvZmVzaW9uYWwgQ0lGIEE2MjYzNDA2 +ODEmMCQGCSqGSIb3DQEJARYXY2FAZmlybWFwcm9mZXNpb25hbC5jb20wggEiMA0GCSqGSIb3DQEB +AQUAA4IBDwAwggEKAoIBAQDnIwNvbyOlXnjOlSztlB5uCp4Bx+ow0Syd3Tfom5h5VtP8c9/Qit5V +j1H5WuretXDE7aTt/6MNbg9kUDGvASdYrv5sp0ovFy3Tc9UTHI9ZpTQsHVQERc1ouKDAA6XPhUJH +lShbz++AbOCQl4oBPB3zhxAwJkh91/zpnZFx/0GaqUC1N5wpIE8fUuOgfRNtVLcK3ulqTgesrBlf +3H5idPayBQC6haD9HThuy1q7hryUZzM1gywfI834yJFxzJeL764P3CkDG8A563DtwW4O2GcLiam8 +NeTvtjS0pbbELaW+0MOUJEjb35bTALVmGotmBQ/dPz/LP6pemkr4tErvlTcbAgMBAAGjgZ8wgZww +KgYDVR0RBCMwIYYfaHR0cDovL3d3dy5maXJtYXByb2Zlc2lvbmFsLmNvbTASBgNVHRMBAf8ECDAG +AQH/AgEBMCsGA1UdEAQkMCKADzIwMDExMDI0MjIwMDAwWoEPMjAxMzEwMjQyMjAwMDBaMA4GA1Ud +DwEB/wQEAwIBBjAdBgNVHQ4EFgQUMwugZtHq2s7eYpMEKFK1FH84aLcwDQYJKoZIhvcNAQEFBQAD +ggEBAEdz/o0nVPD11HecJ3lXV7cVVuzH2Fi3AQL0M+2TUIiefEaxvT8Ub/GzR0iLjJcG1+p+o1wq +u00vR+L4OQbJnC4xGgN49Lw4xiKLMzHwFgQEffl25EvXwOaD7FnMP97/T2u3Z36mhoEyIwOdyPdf +wUpgpZKpsaSgYMN4h7Mi8yrrW6ntBas3D7Hi05V2Y1Z0jFhyGzflZKG+TQyTmAyX9odtsz/ny4Cm +7YjHX1BiAuiZdBbQ5rQ58SfLyEDW44YQqSMSkuBpQWOnryULwMWSyx6Yo1q6xTMPoJcB3X/ge9YG +VM+h4k0460tQtcsm9MracEpqoeJ5quGnM/b9Sh/22WA= +-----END CERTIFICATE----- + +Wells Fargo Root CA +=================== +-----BEGIN CERTIFICATE----- +MIID5TCCAs2gAwIBAgIEOeSXnjANBgkqhkiG9w0BAQUFADCBgjELMAkGA1UEBhMCVVMxFDASBgNV +BAoTC1dlbGxzIEZhcmdvMSwwKgYDVQQLEyNXZWxscyBGYXJnbyBDZXJ0aWZpY2F0aW9uIEF1dGhv +cml0eTEvMC0GA1UEAxMmV2VsbHMgRmFyZ28gUm9vdCBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkwHhcN +MDAxMDExMTY0MTI4WhcNMjEwMTE0MTY0MTI4WjCBgjELMAkGA1UEBhMCVVMxFDASBgNVBAoTC1dl +bGxzIEZhcmdvMSwwKgYDVQQLEyNXZWxscyBGYXJnbyBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTEv +MC0GA1UEAxMmV2VsbHMgRmFyZ28gUm9vdCBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkwggEiMA0GCSqG +SIb3DQEBAQUAA4IBDwAwggEKAoIBAQDVqDM7Jvk0/82bfuUER84A4n135zHCLielTWi5MbqNQ1mX +x3Oqfz1cQJ4F5aHiidlMuD+b+Qy0yGIZLEWukR5zcUHESxP9cMIlrCL1dQu3U+SlK93OvRw6esP3 +E48mVJwWa2uv+9iWsWCaSOAlIiR5NM4OJgALTqv9i86C1y8IcGjBqAr5dE8Hq6T54oN+J3N0Prj5 +OEL8pahbSCOz6+MlsoCultQKnMJ4msZoGK43YjdeUXWoWGPAUe5AeH6orxqg4bB4nVCMe+ez/I4j +sNtlAHCEAQgAFG5Uhpq6zPk3EPbg3oQtnaSFN9OH4xXQwReQfhkhahKpdv0SAulPIV4XAgMBAAGj +YTBfMA8GA1UdEwEB/wQFMAMBAf8wTAYDVR0gBEUwQzBBBgtghkgBhvt7hwcBCzAyMDAGCCsGAQUF +BwIBFiRodHRwOi8vd3d3LndlbGxzZmFyZ28uY29tL2NlcnRwb2xpY3kwDQYJKoZIhvcNAQEFBQAD +ggEBANIn3ZwKdyu7IvICtUpKkfnRLb7kuxpo7w6kAOnu5+/u9vnldKTC2FJYxHT7zmu1Oyl5GFrv +m+0fazbuSCUlFLZWohDo7qd/0D+j0MNdJu4HzMPBJCGHHt8qElNvQRbn7a6U+oxy+hNH8Dx+rn0R +OhPs7fpvcmR7nX1/Jv16+yWt6j4pf0zjAFcysLPp7VMX2YuyFA4w6OXVE8Zkr8QA1dhYJPz1j+zx +x32l2w8n0cbyQIjmH/ZhqPRCyLk306m+LFZ4wnKbWV01QIroTmMatukgalHizqSQ33ZwmVxwQ023 +tqcZZE6St8WRPH9IFmV7Fv3L/PvZ1dZPIWU7Sn9Ho/s= +-----END CERTIFICATE----- + +Swisscom Root CA 1 +================== +-----BEGIN CERTIFICATE----- +MIIF2TCCA8GgAwIBAgIQXAuFXAvnWUHfV8w/f52oNjANBgkqhkiG9w0BAQUFADBkMQswCQYDVQQG +EwJjaDERMA8GA1UEChMIU3dpc3Njb20xJTAjBgNVBAsTHERpZ2l0YWwgQ2VydGlmaWNhdGUgU2Vy +dmljZXMxGzAZBgNVBAMTElN3aXNzY29tIFJvb3QgQ0EgMTAeFw0wNTA4MTgxMjA2MjBaFw0yNTA4 +MTgyMjA2MjBaMGQxCzAJBgNVBAYTAmNoMREwDwYDVQQKEwhTd2lzc2NvbTElMCMGA1UECxMcRGln +aXRhbCBDZXJ0aWZpY2F0ZSBTZXJ2aWNlczEbMBkGA1UEAxMSU3dpc3Njb20gUm9vdCBDQSAxMIIC +IjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEA0LmwqAzZuz8h+BvVM5OAFmUgdbI9m2BtRsiM +MW8Xw/qabFbtPMWRV8PNq5ZJkCoZSx6jbVfd8StiKHVFXqrWW/oLJdihFvkcxC7mlSpnzNApbjyF +NDhhSbEAn9Y6cV9Nbc5fuankiX9qUvrKm/LcqfmdmUc/TilftKaNXXsLmREDA/7n29uj/x2lzZAe +AR81sH8A25Bvxn570e56eqeqDFdvpG3FEzuwpdntMhy0XmeLVNxzh+XTF3xmUHJd1BpYwdnP2IkC +b6dJtDZd0KTeByy2dbcokdaXvij1mB7qWybJvbCXc9qukSbraMH5ORXWZ0sKbU/Lz7DkQnGMU3nn +7uHbHaBuHYwadzVcFh4rUx80i9Fs/PJnB3r1re3WmquhsUvhzDdf/X/NTa64H5xD+SpYVUNFvJbN +cA78yeNmuk6NO4HLFWR7uZToXTNShXEuT46iBhFRyePLoW4xCGQMwtI89Tbo19AOeCMgkckkKmUp +WyL3Ic6DXqTz3kvTaI9GdVyDCW4pa8RwjPWd1yAv/0bSKzjCL3UcPX7ape8eYIVpQtPM+GP+HkM5 +haa2Y0EQs3MevNP6yn0WR+Kn1dCjigoIlmJWbjTb2QK5MHXjBNLnj8KwEUAKrNVxAmKLMb7dxiNY +MUJDLXT5xp6mig/p/r+D5kNXJLrvRjSq1xIBOO0CAwEAAaOBhjCBgzAOBgNVHQ8BAf8EBAMCAYYw +HQYDVR0hBBYwFDASBgdghXQBUwABBgdghXQBUwABMBIGA1UdEwEB/wQIMAYBAf8CAQcwHwYDVR0j +BBgwFoAUAyUv3m+CATpcLNwroWm1Z9SM0/0wHQYDVR0OBBYEFAMlL95vggE6XCzcK6FptWfUjNP9 +MA0GCSqGSIb3DQEBBQUAA4ICAQA1EMvspgQNDQ/NwNurqPKIlwzfky9NfEBWMXrrpA9gzXrzvsMn +jgM+pN0S734edAY8PzHyHHuRMSG08NBsl9Tpl7IkVh5WwzW9iAUPWxAaZOHHgjD5Mq2eUCzneAXQ +MbFamIp1TpBcahQq4FJHgmDmHtqBsfsUC1rxn9KVuj7QG9YVHaO+htXbD8BJZLsuUBlL0iT43R4H +VtA4oJVwIHaM190e3p9xxCPvgxNcoyQVTSlAPGrEqdi3pkSlDfTgnXceQHAm/NrZNuR55LU/vJtl +vrsRls/bxig5OgjOR1tTWsWZ/l2p3e9M1MalrQLmjAcSHm8D0W+go/MpvRLHUKKwf4ipmXeascCl +OS5cfGniLLDqN2qk4Vrh9VDlg++luyqI54zb/W1elxmofmZ1a3Hqv7HHb6D0jqTsNFFbjCYDcKF3 +1QESVwA12yPeDooomf2xEG9L/zgtYE4snOtnta1J7ksfrK/7DZBaZmBwXarNeNQk7shBoJMBkpxq +nvy5JMWzFYJ+vq6VK+uxwNrjAWALXmmshFZhvnEX/h0TD/7Gh0Xp/jKgGg0TpJRVcaUWi7rKibCy +x/yP2FS1k2Kdzs9Z+z0YzirLNRWCXf9UIltxUvu3yf5gmwBBZPCqKuy2QkPOiWaByIufOVQDJdMW +NY6E0F/6MBr1mmz0DlP5OlvRHA== +-----END CERTIFICATE----- + +DigiCert Assured ID Root CA +=========================== +-----BEGIN CERTIFICATE----- +MIIDtzCCAp+gAwIBAgIQDOfg5RfYRv6P5WD8G/AwOTANBgkqhkiG9w0BAQUFADBlMQswCQYDVQQG +EwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3d3cuZGlnaWNlcnQuY29tMSQw +IgYDVQQDExtEaWdpQ2VydCBBc3N1cmVkIElEIFJvb3QgQ0EwHhcNMDYxMTEwMDAwMDAwWhcNMzEx +MTEwMDAwMDAwWjBlMQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQL +ExB3d3cuZGlnaWNlcnQuY29tMSQwIgYDVQQDExtEaWdpQ2VydCBBc3N1cmVkIElEIFJvb3QgQ0Ew +ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCtDhXO5EOAXLGH87dg+XESpa7cJpSIqvTO +9SA5KFhgDPiA2qkVlTJhPLWxKISKityfCgyDF3qPkKyK53lTXDGEKvYPmDI2dsze3Tyoou9q+yHy +UmHfnyDXH+Kx2f4YZNISW1/5WBg1vEfNoTb5a3/UsDg+wRvDjDPZ2C8Y/igPs6eD1sNuRMBhNZYW +/lmci3Zt1/GiSw0r/wty2p5g0I6QNcZ4VYcgoc/lbQrISXwxmDNsIumH0DJaoroTghHtORedmTpy +oeb6pNnVFzF1roV9Iq4/AUaG9ih5yLHa5FcXxH4cDrC0kqZWs72yl+2qp/C3xag/lRbQ/6GW6whf +GHdPAgMBAAGjYzBhMA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBRF +66Kv9JLLgjEtUYunpyGd823IDzAfBgNVHSMEGDAWgBRF66Kv9JLLgjEtUYunpyGd823IDzANBgkq +hkiG9w0BAQUFAAOCAQEAog683+Lt8ONyc3pklL/3cmbYMuRCdWKuh+vy1dneVrOfzM4UKLkNl2Bc +EkxY5NM9g0lFWJc1aRqoR+pWxnmrEthngYTffwk8lOa4JiwgvT2zKIn3X/8i4peEH+ll74fg38Fn +SbNd67IJKusm7Xi+fT8r87cmNW1fiQG2SVufAQWbqz0lwcy2f8Lxb4bG+mRo64EtlOtCt/qMHt1i +8b5QZ7dsvfPxH2sMNgcWfzd8qVttevESRmCD1ycEvkvOl77DZypoEd+A5wwzZr8TDRRu838fYxAe ++o0bJW1sj6W3YQGx0qMmoRBxna3iw/nDmVG3KwcIzi7mULKn+gpFL6Lw8g== +-----END CERTIFICATE----- + +DigiCert Global Root CA +======================= +-----BEGIN CERTIFICATE----- +MIIDrzCCApegAwIBAgIQCDvgVpBCRrGhdWrJWZHHSjANBgkqhkiG9w0BAQUFADBhMQswCQYDVQQG +EwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3d3cuZGlnaWNlcnQuY29tMSAw +HgYDVQQDExdEaWdpQ2VydCBHbG9iYWwgUm9vdCBDQTAeFw0wNjExMTAwMDAwMDBaFw0zMTExMTAw +MDAwMDBaMGExCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3 +dy5kaWdpY2VydC5jb20xIDAeBgNVBAMTF0RpZ2lDZXJ0IEdsb2JhbCBSb290IENBMIIBIjANBgkq +hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA4jvhEXLeqKTTo1eqUKKPC3eQyaKl7hLOllsBCSDMAZOn +TjC3U/dDxGkAV53ijSLdhwZAAIEJzs4bg7/fzTtxRuLWZscFs3YnFo97nh6Vfe63SKMI2tavegw5 +BmV/Sl0fvBf4q77uKNd0f3p4mVmFaG5cIzJLv07A6Fpt43C/dxC//AH2hdmoRBBYMql1GNXRor5H +4idq9Joz+EkIYIvUX7Q6hL+hqkpMfT7PT19sdl6gSzeRntwi5m3OFBqOasv+zbMUZBfHWymeMr/y +7vrTC0LUq7dBMtoM1O/4gdW7jVg/tRvoSSiicNoxBN33shbyTApOB6jtSj1etX+jkMOvJwIDAQAB +o2MwYTAOBgNVHQ8BAf8EBAMCAYYwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUA95QNVbRTLtm +8KPiGxvDl7I90VUwHwYDVR0jBBgwFoAUA95QNVbRTLtm8KPiGxvDl7I90VUwDQYJKoZIhvcNAQEF +BQADggEBAMucN6pIExIK+t1EnE9SsPTfrgT1eXkIoyQY/EsrhMAtudXH/vTBH1jLuG2cenTnmCmr +EbXjcKChzUyImZOMkXDiqw8cvpOp/2PV5Adg06O/nVsJ8dWO41P0jmP6P6fbtGbfYmbW0W5BjfIt +tep3Sp+dWOIrWcBAI+0tKIJFPnlUkiaY4IBIqDfv8NZ5YBberOgOzW6sRBc4L0na4UU+Krk2U886 +UAb3LujEV0lsYSEY1QSteDwsOoBrp+uvFRTp2InBuThs4pFsiv9kuXclVzDAGySj4dzp30d8tbQk +CAUw7C29C79Fv1C5qfPrmAESrciIxpg0X40KPMbp1ZWVbd4= +-----END CERTIFICATE----- + +DigiCert High Assurance EV Root CA +================================== +-----BEGIN CERTIFICATE----- +MIIDxTCCAq2gAwIBAgIQAqxcJmoLQJuPC3nyrkYldzANBgkqhkiG9w0BAQUFADBsMQswCQYDVQQG +EwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3d3cuZGlnaWNlcnQuY29tMSsw +KQYDVQQDEyJEaWdpQ2VydCBIaWdoIEFzc3VyYW5jZSBFViBSb290IENBMB4XDTA2MTExMDAwMDAw +MFoXDTMxMTExMDAwMDAwMFowbDELMAkGA1UEBhMCVVMxFTATBgNVBAoTDERpZ2lDZXJ0IEluYzEZ +MBcGA1UECxMQd3d3LmRpZ2ljZXJ0LmNvbTErMCkGA1UEAxMiRGlnaUNlcnQgSGlnaCBBc3N1cmFu +Y2UgRVYgUm9vdCBDQTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMbM5XPm+9S75S0t +Mqbf5YE/yc0lSbZxKsPVlDRnogocsF9ppkCxxLeyj9CYpKlBWTrT3JTWPNt0OKRKzE0lgvdKpVMS +OO7zSW1xkX5jtqumX8OkhPhPYlG++MXs2ziS4wblCJEMxChBVfvLWokVfnHoNb9Ncgk9vjo4UFt3 +MRuNs8ckRZqnrG0AFFoEt7oT61EKmEFBIk5lYYeBQVCmeVyJ3hlKV9Uu5l0cUyx+mM0aBhakaHPQ +NAQTXKFx01p8VdteZOE3hzBWBOURtCmAEvF5OYiiAhF8J2a3iLd48soKqDirCmTCv2ZdlYTBoSUe +h10aUAsgEsxBu24LUTi4S8sCAwEAAaNjMGEwDgYDVR0PAQH/BAQDAgGGMA8GA1UdEwEB/wQFMAMB +Af8wHQYDVR0OBBYEFLE+w2kD+L9HAdSYJhoIAu9jZCvDMB8GA1UdIwQYMBaAFLE+w2kD+L9HAdSY +JhoIAu9jZCvDMA0GCSqGSIb3DQEBBQUAA4IBAQAcGgaX3NecnzyIZgYIVyHbIUf4KmeqvxgydkAQ +V8GK83rZEWWONfqe/EW1ntlMMUu4kehDLI6zeM7b41N5cdblIZQB2lWHmiRk9opmzN6cN82oNLFp +myPInngiK3BD41VHMWEZ71jFhS9OMPagMRYjyOfiZRYzy78aG6A9+MpeizGLYAiJLQwGXFK3xPkK +mNEVX58Svnw2Yzi9RKR/5CYrCsSXaQ3pjOLAEFe4yHYSkVXySGnYvCoCWw9E1CAx2/S6cCZdkGCe +vEsXCS+0yx5DaMkHJ8HSXPfqIbloEpw8nL+e/IBcm2PN7EeqJSdnoDfzAIJ9VNep+OkuE6N36B9K +-----END CERTIFICATE----- + +Certplus Class 2 Primary CA +=========================== +-----BEGIN CERTIFICATE----- +MIIDkjCCAnqgAwIBAgIRAIW9S/PY2uNp9pTXX8OlRCMwDQYJKoZIhvcNAQEFBQAwPTELMAkGA1UE +BhMCRlIxETAPBgNVBAoTCENlcnRwbHVzMRswGQYDVQQDExJDbGFzcyAyIFByaW1hcnkgQ0EwHhcN +OTkwNzA3MTcwNTAwWhcNMTkwNzA2MjM1OTU5WjA9MQswCQYDVQQGEwJGUjERMA8GA1UEChMIQ2Vy +dHBsdXMxGzAZBgNVBAMTEkNsYXNzIDIgUHJpbWFyeSBDQTCCASIwDQYJKoZIhvcNAQEBBQADggEP +ADCCAQoCggEBANxQltAS+DXSCHh6tlJw/W/uz7kRy1134ezpfgSN1sxvc0NXYKwzCkTsA18cgCSR +5aiRVhKC9+Ar9NuuYS6JEI1rbLqzAr3VNsVINyPi8Fo3UjMXEuLRYE2+L0ER4/YXJQyLkcAbmXuZ +Vg2v7tK8R1fjeUl7NIknJITesezpWE7+Tt9avkGtrAjFGA7v0lPubNCdEgETjdyAYveVqUSISnFO +YFWe2yMZeVYHDD9jC1yw4r5+FfyUM1hBOHTE4Y+L3yasH7WLO7dDWWuwJKZtkIvEcupdM5i3y95e +e++U8Rs+yskhwcWYAqqi9lt3m/V+llU0HGdpwPFC40es/CgcZlUCAwEAAaOBjDCBiTAPBgNVHRME +CDAGAQH/AgEKMAsGA1UdDwQEAwIBBjAdBgNVHQ4EFgQU43Mt38sOKAze3bOkynm4jrvoMIkwEQYJ +YIZIAYb4QgEBBAQDAgEGMDcGA1UdHwQwMC4wLKAqoCiGJmh0dHA6Ly93d3cuY2VydHBsdXMuY29t +L0NSTC9jbGFzczIuY3JsMA0GCSqGSIb3DQEBBQUAA4IBAQCnVM+IRBnL39R/AN9WM2K191EBkOvD +P9GIROkkXe/nFL0gt5o8AP5tn9uQ3Nf0YtaLcF3n5QRIqWh8yfFC82x/xXp8HVGIutIKPidd3i1R +TtMTZGnkLuPT55sJmabglZvOGtd/vjzOUrMRFcEPF80Du5wlFbqidon8BvEY0JNLDnyCt6X09l/+ +7UCmnYR0ObncHoUW2ikbhiMAybuJfm6AiB4vFLQDJKgybwOaRywwvlbGp0ICcBvqQNi6BQNwB6SW +//1IMwrh3KWBkJtN3X3n57LNXMhqlfil9o3EXXgIvnsG1knPGTZQIy4I5p4FTUcY1Rbpsda2ENW7 +l7+ijrRU +-----END CERTIFICATE----- + +DST Root CA X3 +============== +-----BEGIN CERTIFICATE----- +MIIDSjCCAjKgAwIBAgIQRK+wgNajJ7qJMDmGLvhAazANBgkqhkiG9w0BAQUFADA/MSQwIgYDVQQK +ExtEaWdpdGFsIFNpZ25hdHVyZSBUcnVzdCBDby4xFzAVBgNVBAMTDkRTVCBSb290IENBIFgzMB4X +DTAwMDkzMDIxMTIxOVoXDTIxMDkzMDE0MDExNVowPzEkMCIGA1UEChMbRGlnaXRhbCBTaWduYXR1 +cmUgVHJ1c3QgQ28uMRcwFQYDVQQDEw5EU1QgUm9vdCBDQSBYMzCCASIwDQYJKoZIhvcNAQEBBQAD +ggEPADCCAQoCggEBAN+v6ZdQCINXtMxiZfaQguzH0yxrMMpb7NnDfcdAwRgUi+DoM3ZJKuM/IUmT +rE4Orz5Iy2Xu/NMhD2XSKtkyj4zl93ewEnu1lcCJo6m67XMuegwGMoOifooUMM0RoOEqOLl5CjH9 +UL2AZd+3UWODyOKIYepLYYHsUmu5ouJLGiifSKOeDNoJjj4XLh7dIN9bxiqKqy69cK3FCxolkHRy +xXtqqzTWMIn/5WgTe1QLyNau7Fqckh49ZLOMxt+/yUFw7BZy1SbsOFU5Q9D8/RhcQPGX69Wam40d +utolucbY38EVAjqr2m7xPi71XAicPNaDaeQQmxkqtilX4+U9m5/wAl0CAwEAAaNCMEAwDwYDVR0T +AQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYEFMSnsaR7LHH62+FLkHX/xBVghYkQ +MA0GCSqGSIb3DQEBBQUAA4IBAQCjGiybFwBcqR7uKGY3Or+Dxz9LwwmglSBd49lZRNI+DT69ikug +dB/OEIKcdBodfpga3csTS7MgROSR6cz8faXbauX+5v3gTt23ADq1cEmv8uXrAvHRAosZy5Q6XkjE +GB5YGV8eAlrwDPGxrancWYaLbumR9YbK+rlmM6pZW87ipxZzR8srzJmwN0jP41ZL9c8PDHIyh8bw +RLtTcm1D9SZImlJnt1ir/md2cXjbDaJWFBM5JDGFoqgCWjBH4d1QB7wCCZAA62RjYJsWvIjJEubS +fZGL+T0yjWW06XyxV3bqxbYoOb8VZRzI9neWagqNdwvYkQsEjgfbKbYK7p2CNTUQ +-----END CERTIFICATE----- + +DST ACES CA X6 +============== +-----BEGIN CERTIFICATE----- +MIIECTCCAvGgAwIBAgIQDV6ZCtadt3js2AdWO4YV2TANBgkqhkiG9w0BAQUFADBbMQswCQYDVQQG +EwJVUzEgMB4GA1UEChMXRGlnaXRhbCBTaWduYXR1cmUgVHJ1c3QxETAPBgNVBAsTCERTVCBBQ0VT +MRcwFQYDVQQDEw5EU1QgQUNFUyBDQSBYNjAeFw0wMzExMjAyMTE5NThaFw0xNzExMjAyMTE5NTha +MFsxCzAJBgNVBAYTAlVTMSAwHgYDVQQKExdEaWdpdGFsIFNpZ25hdHVyZSBUcnVzdDERMA8GA1UE +CxMIRFNUIEFDRVMxFzAVBgNVBAMTDkRTVCBBQ0VTIENBIFg2MIIBIjANBgkqhkiG9w0BAQEFAAOC +AQ8AMIIBCgKCAQEAuT31LMmU3HWKlV1j6IR3dma5WZFcRt2SPp/5DgO0PWGSvSMmtWPuktKe1jzI +DZBfZIGxqAgNTNj50wUoUrQBJcWVHAx+PhCEdc/BGZFjz+iokYi5Q1K7gLFViYsx+tC3dr5BPTCa +pCIlF3PoHuLTrCq9Wzgh1SpL11V94zpVvddtawJXa+ZHfAjIgrrep4c9oW24MFbCswKBXy314pow +GCi4ZtPLAZZv6opFVdbgnf9nKxcCpk4aahELfrd755jWjHZvwTvbUJN+5dCOHze4vbrGn2zpfDPy +MjwmR/onJALJfh1biEITajV8fTXpLmaRcpPVMibEdPVTo7NdmvYJywIDAQABo4HIMIHFMA8GA1Ud +EwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgHGMB8GA1UdEQQYMBaBFHBraS1vcHNAdHJ1c3Rkc3Qu +Y29tMGIGA1UdIARbMFkwVwYKYIZIAWUDAgEBATBJMEcGCCsGAQUFBwIBFjtodHRwOi8vd3d3LnRy +dXN0ZHN0LmNvbS9jZXJ0aWZpY2F0ZXMvcG9saWN5L0FDRVMtaW5kZXguaHRtbDAdBgNVHQ4EFgQU +CXIGThhDD+XWzMNqizF7eI+og7gwDQYJKoZIhvcNAQEFBQADggEBAKPYjtay284F5zLNAdMEA+V2 +5FYrnJmQ6AgwbN99Pe7lv7UkQIRJ4dEorsTCOlMwiPH1d25Ryvr/ma8kXxug/fKshMrfqfBfBC6t +Fr8hlxCBPeP/h40y3JTlR4peahPJlJU90u7INJXQgNStMgiAVDzgvVJT11J8smk/f3rPanTK+gQq +nExaBqXpIK1FZg9p8d2/6eMyi/rgwYZNcjwu2JN4Cir42NInPRmJX1p7ijvMDNpRrscL9yuwNwXs +vFcj4jjSm2jzVhKIT0J8uDHEtdvkyCE06UgRNe76x5JXxZ805Mf29w4LTJxoeHtxMcfrHuBnQfO3 +oKfN5XozNmr6mis= +-----END CERTIFICATE----- + +TURKTRUST Certificate Services Provider Root 1 +============================================== +-----BEGIN CERTIFICATE----- +MIID+zCCAuOgAwIBAgIBATANBgkqhkiG9w0BAQUFADCBtzE/MD0GA1UEAww2VMOcUktUUlVTVCBF +bGVrdHJvbmlrIFNlcnRpZmlrYSBIaXptZXQgU2HEn2xhecSxY8Sxc8SxMQswCQYDVQQGDAJUUjEP +MA0GA1UEBwwGQU5LQVJBMVYwVAYDVQQKDE0oYykgMjAwNSBUw5xSS1RSVVNUIEJpbGdpIMSwbGV0 +acWfaW0gdmUgQmlsacWfaW0gR8O8dmVubGnEn2kgSGl6bWV0bGVyaSBBLsWeLjAeFw0wNTA1MTMx +MDI3MTdaFw0xNTAzMjIxMDI3MTdaMIG3MT8wPQYDVQQDDDZUw5xSS1RSVVNUIEVsZWt0cm9uaWsg +U2VydGlmaWthIEhpem1ldCBTYcSfbGF5xLFjxLFzxLExCzAJBgNVBAYMAlRSMQ8wDQYDVQQHDAZB +TktBUkExVjBUBgNVBAoMTShjKSAyMDA1IFTDnFJLVFJVU1QgQmlsZ2kgxLBsZXRpxZ9pbSB2ZSBC +aWxpxZ9pbSBHw7x2ZW5sacSfaSBIaXptZXRsZXJpIEEuxZ4uMIIBIjANBgkqhkiG9w0BAQEFAAOC +AQ8AMIIBCgKCAQEAylIF1mMD2Bxf3dJ7XfIMYGFbazt0K3gNfUW9InTojAPBxhEqPZW8qZSwu5GX +yGl8hMW0kWxsE2qkVa2kheiVfrMArwDCBRj1cJ02i67L5BuBf5OI+2pVu32Fks66WJ/bMsW9Xe8i +Si9BB35JYbOG7E6mQW6EvAPs9TscyB/C7qju6hJKjRTP8wrgUDn5CDX4EVmt5yLqS8oUBt5CurKZ +8y1UiBAG6uEaPj1nH/vO+3yC6BFdSsG5FOpU2WabfIl9BJpiyelSPJ6c79L1JuTm5Rh8i27fbMx4 +W09ysstcP4wFjdFMjK2Sx+F4f2VsSQZQLJ4ywtdKxnWKWU51b0dewQIDAQABoxAwDjAMBgNVHRME +BTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQAV9VX/N5aAWSGk/KEVTCD21F/aAyT8z5Aa9CEKmu46 +sWrv7/hg0Uw2ZkUd82YCdAR7kjCo3gp2D++Vbr3JN+YaDayJSFvMgzbC9UZcWYJWtNX+I7TYVBxE +q8Sn5RTOPEFhfEPmzcSBCYsk+1Ql1haolgxnB2+zUEfjHCQo3SqYpGH+2+oSN7wBGjSFvW5P55Fy +B0SFHljKVETd96y5y4khctuPwGkplyqjrhgjlxxBKot8KsF8kOipKMDTkcatKIdAaLX/7KfS0zgY +nNN9aV3wxqUeJBujR/xpB2jn5Jq07Q+hh4cCzofSSE7hvP/L8XKSRGQDJereW26fyfJOrN3H +-----END CERTIFICATE----- + +TURKTRUST Certificate Services Provider Root 2 +============================================== +-----BEGIN CERTIFICATE----- +MIIEPDCCAySgAwIBAgIBATANBgkqhkiG9w0BAQUFADCBvjE/MD0GA1UEAww2VMOcUktUUlVTVCBF +bGVrdHJvbmlrIFNlcnRpZmlrYSBIaXptZXQgU2HEn2xhecSxY8Sxc8SxMQswCQYDVQQGEwJUUjEP +MA0GA1UEBwwGQW5rYXJhMV0wWwYDVQQKDFRUw5xSS1RSVVNUIEJpbGdpIMSwbGV0acWfaW0gdmUg +QmlsacWfaW0gR8O8dmVubGnEn2kgSGl6bWV0bGVyaSBBLsWeLiAoYykgS2FzxLFtIDIwMDUwHhcN +MDUxMTA3MTAwNzU3WhcNMTUwOTE2MTAwNzU3WjCBvjE/MD0GA1UEAww2VMOcUktUUlVTVCBFbGVr +dHJvbmlrIFNlcnRpZmlrYSBIaXptZXQgU2HEn2xhecSxY8Sxc8SxMQswCQYDVQQGEwJUUjEPMA0G +A1UEBwwGQW5rYXJhMV0wWwYDVQQKDFRUw5xSS1RSVVNUIEJpbGdpIMSwbGV0acWfaW0gdmUgQmls +acWfaW0gR8O8dmVubGnEn2kgSGl6bWV0bGVyaSBBLsWeLiAoYykgS2FzxLFtIDIwMDUwggEiMA0G +CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCpNn7DkUNMwxmYCMjHWHtPFoylzkkBH3MOrHUTpvqe +LCDe2JAOCtFp0if7qnefJ1Il4std2NiDUBd9irWCPwSOtNXwSadktx4uXyCcUHVPr+G1QRT0mJKI +x+XlZEdhR3n9wFHxwZnn3M5q+6+1ATDcRhzviuyV79z/rxAc653YsKpqhRgNF8k+v/Gb0AmJQv2g +QrSdiVFVKc8bcLyEVK3BEx+Y9C52YItdP5qtygy/p1Zbj3e41Z55SZI/4PGXJHpsmxcPbe9TmJEr +5A++WXkHeLuXlfSfadRYhwqp48y2WBmfJiGxxFmNskF1wK1pzpwACPI2/z7woQ8arBT9pmAPAgMB +AAGjQzBBMB0GA1UdDgQWBBTZN7NOBf3Zz58SFq62iS/rJTqIHDAPBgNVHQ8BAf8EBQMDBwYAMA8G +A1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAHJglrfJ3NgpXiOFX7KzLXb7iNcX/ntt +Rbj2hWyfIvwqECLsqrkw9qtY1jkQMZkpAL2JZkH7dN6RwRgLn7Vhy506vvWolKMiVW4XSf/SKfE4 +Jl3vpao6+XF75tpYHdN0wgH6PmlYX63LaL4ULptswLbcoCb6dxriJNoaN+BnrdFzgw2lGh1uEpJ+ +hGIAF728JRhX8tepb1mIvDS3LoV4nZbcFMMsilKbloxSZj2GFotHuFEJjOp9zYhys2AzsfAKRO8P +9Qk3iCQOLGsgOqL6EfJANZxEaGM7rDNvY7wsu/LSy3Z9fYjYHcgFHW68lKlmjHdxx/qR+i9Rnuk5 +UrbnBEI= +-----END CERTIFICATE----- + +SwissSign Gold CA - G2 +====================== +-----BEGIN CERTIFICATE----- +MIIFujCCA6KgAwIBAgIJALtAHEP1Xk+wMA0GCSqGSIb3DQEBBQUAMEUxCzAJBgNVBAYTAkNIMRUw +EwYDVQQKEwxTd2lzc1NpZ24gQUcxHzAdBgNVBAMTFlN3aXNzU2lnbiBHb2xkIENBIC0gRzIwHhcN +MDYxMDI1MDgzMDM1WhcNMzYxMDI1MDgzMDM1WjBFMQswCQYDVQQGEwJDSDEVMBMGA1UEChMMU3dp +c3NTaWduIEFHMR8wHQYDVQQDExZTd2lzc1NpZ24gR29sZCBDQSAtIEcyMIICIjANBgkqhkiG9w0B +AQEFAAOCAg8AMIICCgKCAgEAr+TufoskDhJuqVAtFkQ7kpJcyrhdhJJCEyq8ZVeCQD5XJM1QiyUq +t2/876LQwB8CJEoTlo8jE+YoWACjR8cGp4QjK7u9lit/VcyLwVcfDmJlD909Vopz2q5+bbqBHH5C +jCA12UNNhPqE21Is8w4ndwtrvxEvcnifLtg+5hg3Wipy+dpikJKVyh+c6bM8K8vzARO/Ws/BtQpg +vd21mWRTuKCWs2/iJneRjOBiEAKfNA+k1ZIzUd6+jbqEemA8atufK+ze3gE/bk3lUIbLtK/tREDF +ylqM2tIrfKjuvqblCqoOpd8FUrdVxyJdMmqXl2MT28nbeTZ7hTpKxVKJ+STnnXepgv9VHKVxaSvR +AiTysybUa9oEVeXBCsdtMDeQKuSeFDNeFhdVxVu1yzSJkvGdJo+hB9TGsnhQ2wwMC3wLjEHXuend +jIj3o02yMszYF9rNt85mndT9Xv+9lz4pded+p2JYryU0pUHHPbwNUMoDAw8IWh+Vc3hiv69yFGkO +peUDDniOJihC8AcLYiAQZzlG+qkDzAQ4embvIIO1jEpWjpEA/I5cgt6IoMPiaG59je883WX0XaxR +7ySArqpWl2/5rX3aYT+YdzylkbYcjCbaZaIJbcHiVOO5ykxMgI93e2CaHt+28kgeDrpOVG2Y4OGi +GqJ3UM/EY5LsRxmd6+ZrzsECAwEAAaOBrDCBqTAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH/BAUw +AwEB/zAdBgNVHQ4EFgQUWyV7lqRlUX64OfPAeGZe6Drn8O4wHwYDVR0jBBgwFoAUWyV7lqRlUX64 +OfPAeGZe6Drn8O4wRgYDVR0gBD8wPTA7BglghXQBWQECAQEwLjAsBggrBgEFBQcCARYgaHR0cDov +L3JlcG9zaXRvcnkuc3dpc3NzaWduLmNvbS8wDQYJKoZIhvcNAQEFBQADggIBACe645R88a7A3hfm +5djV9VSwg/S7zV4Fe0+fdWavPOhWfvxyeDgD2StiGwC5+OlgzczOUYrHUDFu4Up+GC9pWbY9ZIEr +44OE5iKHjn3g7gKZYbge9LgriBIWhMIxkziWMaa5O1M/wySTVltpkuzFwbs4AOPsF6m43Md8AYOf +Mke6UiI0HTJ6CVanfCU2qT1L2sCCbwq7EsiHSycR+R4tx5M/nttfJmtS2S6K8RTGRI0Vqbe/vd6m +Gu6uLftIdxf+u+yvGPUqUfA5hJeVbG4bwyvEdGB5JbAKJ9/fXtI5z0V9QkvfsywexcZdylU6oJxp +mo/a77KwPJ+HbBIrZXAVUjEaJM9vMSNQH4xPjyPDdEFjHFWoFN0+4FFQz/EbMFYOkrCChdiDyyJk +vC24JdVUorgG6q2SpCSgwYa1ShNqR88uC1aVVMvOmttqtKay20EIhid392qgQmwLOM7XdVAyksLf +KzAiSNDVQTglXaTpXZ/GlHXQRf0wl0OPkKsKx4ZzYEppLd6leNcG2mqeSz53OiATIgHQv2ieY2Br +NU0LbbqhPcCT4H8js1WtciVORvnSFu+wZMEBnunKoGqYDs/YYPIvSbjkQuE4NRb0yG5P94FW6Lqj +viOvrv1vA+ACOzB2+httQc8Bsem4yWb02ybzOqR08kkkW8mw0FfB+j564ZfJ +-----END CERTIFICATE----- + +SwissSign Silver CA - G2 +======================== +-----BEGIN CERTIFICATE----- +MIIFvTCCA6WgAwIBAgIITxvUL1S7L0swDQYJKoZIhvcNAQEFBQAwRzELMAkGA1UEBhMCQ0gxFTAT +BgNVBAoTDFN3aXNzU2lnbiBBRzEhMB8GA1UEAxMYU3dpc3NTaWduIFNpbHZlciBDQSAtIEcyMB4X +DTA2MTAyNTA4MzI0NloXDTM2MTAyNTA4MzI0NlowRzELMAkGA1UEBhMCQ0gxFTATBgNVBAoTDFN3 +aXNzU2lnbiBBRzEhMB8GA1UEAxMYU3dpc3NTaWduIFNpbHZlciBDQSAtIEcyMIICIjANBgkqhkiG +9w0BAQEFAAOCAg8AMIICCgKCAgEAxPGHf9N4Mfc4yfjDmUO8x/e8N+dOcbpLj6VzHVxumK4DV644 +N0MvFz0fyM5oEMF4rhkDKxD6LHmD9ui5aLlV8gREpzn5/ASLHvGiTSf5YXu6t+WiE7brYT7QbNHm ++/pe7R20nqA1W6GSy/BJkv6FCgU+5tkL4k+73JU3/JHpMjUi0R86TieFnbAVlDLaYQ1HTWBCrpJH +6INaUFjpiou5XaHc3ZlKHzZnu0jkg7Y360g6rw9njxcH6ATK72oxh9TAtvmUcXtnZLi2kUpCe2Uu +MGoM9ZDulebyzYLs2aFK7PayS+VFheZteJMELpyCbTapxDFkH4aDCyr0NQp4yVXPQbBH6TCfmb5h +qAaEuSh6XzjZG6k4sIN/c8HDO0gqgg8hm7jMqDXDhBuDsz6+pJVpATqJAHgE2cn0mRmrVn5bi4Y5 +FZGkECwJMoBgs5PAKrYYC51+jUnyEEp/+dVGLxmSo5mnJqy7jDzmDrxHB9xzUfFwZC8I+bRHHTBs +ROopN4WSaGa8gzj+ezku01DwH/teYLappvonQfGbGHLy9YR0SslnxFSuSGTfjNFusB3hB48IHpmc +celM2KX3RxIfdNFRnobzwqIjQAtz20um53MGjMGg6cFZrEb65i/4z3GcRm25xBWNOHkDRUjvxF3X +CO6HOSKGsg0PWEP3calILv3q1h8CAwEAAaOBrDCBqTAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH/ +BAUwAwEB/zAdBgNVHQ4EFgQUF6DNweRBtjpbO8tFnb0cwpj6hlgwHwYDVR0jBBgwFoAUF6DNweRB +tjpbO8tFnb0cwpj6hlgwRgYDVR0gBD8wPTA7BglghXQBWQEDAQEwLjAsBggrBgEFBQcCARYgaHR0 +cDovL3JlcG9zaXRvcnkuc3dpc3NzaWduLmNvbS8wDQYJKoZIhvcNAQEFBQADggIBAHPGgeAn0i0P +4JUw4ppBf1AsX19iYamGamkYDHRJ1l2E6kFSGG9YrVBWIGrGvShpWJHckRE1qTodvBqlYJ7YH39F +kWnZfrt4csEGDyrOj4VwYaygzQu4OSlWhDJOhrs9xCrZ1x9y7v5RoSJBsXECYxqCsGKrXlcSH9/L +3XWgwF15kIwb4FDm3jH+mHtwX6WQ2K34ArZv02DdQEsixT2tOnqfGhpHkXkzuoLcMmkDlm4fS/Bx +/uNncqCxv1yL5PqZIseEuRuNI5c/7SXgz2W79WEE790eslpBIlqhn10s6FvJbakMDHiqYMZWjwFa +DGi8aRl5xB9+lwW/xekkUV7U1UtT7dkjWjYDZaPBA61BMPNGG4WQr2W11bHkFlt4dR2Xem1ZqSqP +e97Dh4kQmUlzeMg9vVE1dCrV8X5pGyq7O70luJpaPXJhkGaH7gzWTdQRdAtq/gsD/KNVV4n+Ssuu +WxcFyPKNIzFTONItaj+CuY0IavdeQXRuwxF+B6wpYJE/OMpXEA29MC/HpeZBoNquBYeaoKRlbEwJ +DIm6uNO5wJOKMPqN5ZprFQFOZ6raYlY+hAhm0sQ2fac+EPyI4NSA5QC9qvNOBqN6avlicuMJT+ub +DgEj8Z+7fNzcbBGXJbLytGMU0gYqZ4yD9c7qB9iaah7s5Aq7KkzrCWA5zspi2C5u +-----END CERTIFICATE----- + +GeoTrust Primary Certification Authority +======================================== +-----BEGIN CERTIFICATE----- +MIIDfDCCAmSgAwIBAgIQGKy1av1pthU6Y2yv2vrEoTANBgkqhkiG9w0BAQUFADBYMQswCQYDVQQG +EwJVUzEWMBQGA1UEChMNR2VvVHJ1c3QgSW5jLjExMC8GA1UEAxMoR2VvVHJ1c3QgUHJpbWFyeSBD +ZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTAeFw0wNjExMjcwMDAwMDBaFw0zNjA3MTYyMzU5NTlaMFgx +CzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1HZW9UcnVzdCBJbmMuMTEwLwYDVQQDEyhHZW9UcnVzdCBQ +cmltYXJ5IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB +CgKCAQEAvrgVe//UfH1nrYNke8hCUy3f9oQIIGHWAVlqnEQRr+92/ZV+zmEwu3qDXwK9AWbK7hWN +b6EwnL2hhZ6UOvNWiAAxz9juapYC2e0DjPt1befquFUWBRaa9OBesYjAZIVcFU2Ix7e64HXprQU9 +nceJSOC7KMgD4TCTZF5SwFlwIjVXiIrxlQqD17wxcwE07e9GceBrAqg1cmuXm2bgyxx5X9gaBGge +RwLmnWDiNpcB3841kt++Z8dtd1k7j53WkBWUvEI0EME5+bEnPn7WinXFsq+W06Lem+SYvn3h6YGt +tm/81w7a4DSwDRp35+MImO9Y+pyEtzavwt+s0vQQBnBxNQIDAQABo0IwQDAPBgNVHRMBAf8EBTAD +AQH/MA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQULNVQQZcVi/CPNmFbSvtr2ZnJM5IwDQYJKoZI +hvcNAQEFBQADggEBAFpwfyzdtzRP9YZRqSa+S7iq8XEN3GHHoOo0Hnp3DwQ16CePbJC/kRYkRj5K +Ts4rFtULUh38H2eiAkUxT87z+gOneZ1TatnaYzr4gNfTmeGl4b7UVXGYNTq+k+qurUKykG/g/CFN +NWMziUnWm07Kx+dOCQD32sfvmWKZd7aVIl6KoKv0uHiYyjgZmclynnjNS6yvGaBzEi38wkG6gZHa +Floxt/m0cYASSJlyc1pZU8FjUjPtp8nSOQJw+uCxQmYpqptR7TBUIhRf2asdweSU8Pj1K/fqynhG +1riR/aYNKxoUAT6A8EKglQdebc3MS6RFjasS6LPeWuWgfOgPIh1a6Vk= +-----END CERTIFICATE----- + +thawte Primary Root CA +====================== +-----BEGIN CERTIFICATE----- +MIIEIDCCAwigAwIBAgIQNE7VVyDV7exJ9C/ON9srbTANBgkqhkiG9w0BAQUFADCBqTELMAkGA1UE +BhMCVVMxFTATBgNVBAoTDHRoYXd0ZSwgSW5jLjEoMCYGA1UECxMfQ2VydGlmaWNhdGlvbiBTZXJ2 +aWNlcyBEaXZpc2lvbjE4MDYGA1UECxMvKGMpIDIwMDYgdGhhd3RlLCBJbmMuIC0gRm9yIGF1dGhv +cml6ZWQgdXNlIG9ubHkxHzAdBgNVBAMTFnRoYXd0ZSBQcmltYXJ5IFJvb3QgQ0EwHhcNMDYxMTE3 +MDAwMDAwWhcNMzYwNzE2MjM1OTU5WjCBqTELMAkGA1UEBhMCVVMxFTATBgNVBAoTDHRoYXd0ZSwg +SW5jLjEoMCYGA1UECxMfQ2VydGlmaWNhdGlvbiBTZXJ2aWNlcyBEaXZpc2lvbjE4MDYGA1UECxMv +KGMpIDIwMDYgdGhhd3RlLCBJbmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNlIG9ubHkxHzAdBgNVBAMT +FnRoYXd0ZSBQcmltYXJ5IFJvb3QgQ0EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCs +oPD7gFnUnMekz52hWXMJEEUMDSxuaPFsW0hoSVk3/AszGcJ3f8wQLZU0HObrTQmnHNK4yZc2AreJ +1CRfBsDMRJSUjQJib+ta3RGNKJpchJAQeg29dGYvajig4tVUROsdB58Hum/u6f1OCyn1PoSgAfGc +q/gcfomk6KHYcWUNo1F77rzSImANuVud37r8UVsLr5iy6S7pBOhih94ryNdOwUxkHt3Ph1i6Sk/K +aAcdHJ1KxtUvkcx8cXIcxcBn6zL9yZJclNqFwJu/U30rCfSMnZEfl2pSy94JNqR32HuHUETVPm4p +afs5SSYeCaWAe0At6+gnhcn+Yf1+5nyXHdWdAgMBAAGjQjBAMA8GA1UdEwEB/wQFMAMBAf8wDgYD +VR0PAQH/BAQDAgEGMB0GA1UdDgQWBBR7W0XPr87Lev0xkhpqtvNG61dIUDANBgkqhkiG9w0BAQUF +AAOCAQEAeRHAS7ORtvzw6WfUDW5FvlXok9LOAz/t2iWwHVfLHjp2oEzsUHboZHIMpKnxuIvW1oeE +uzLlQRHAd9mzYJ3rG9XRbkREqaYB7FViHXe4XI5ISXycO1cRrK1zN44veFyQaEfZYGDm/Ac9IiAX +xPcW6cTYcvnIc3zfFi8VqT79aie2oetaupgf1eNNZAqdE8hhuvU5HIe6uL17In/2/qxAeeWsEG89 +jxt5dovEN7MhGITlNgDrYyCZuen+MwS7QcjBAvlEYyCegc5C09Y/LHbTY5xZ3Y+m4Q6gLkH3LpVH +z7z9M/P2C2F+fpErgUfCJzDupxBdN49cOSvkBPB7jVaMaA== +-----END CERTIFICATE----- + +VeriSign Class 3 Public Primary Certification Authority - G5 +============================================================ +-----BEGIN CERTIFICATE----- +MIIE0zCCA7ugAwIBAgIQGNrRniZ96LtKIVjNzGs7SjANBgkqhkiG9w0BAQUFADCByjELMAkGA1UE +BhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQLExZWZXJpU2lnbiBUcnVzdCBO +ZXR3b3JrMTowOAYDVQQLEzEoYykgMjAwNiBWZXJpU2lnbiwgSW5jLiAtIEZvciBhdXRob3JpemVk +IHVzZSBvbmx5MUUwQwYDVQQDEzxWZXJpU2lnbiBDbGFzcyAzIFB1YmxpYyBQcmltYXJ5IENlcnRp +ZmljYXRpb24gQXV0aG9yaXR5IC0gRzUwHhcNMDYxMTA4MDAwMDAwWhcNMzYwNzE2MjM1OTU5WjCB +yjELMAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQLExZWZXJpU2ln +biBUcnVzdCBOZXR3b3JrMTowOAYDVQQLEzEoYykgMjAwNiBWZXJpU2lnbiwgSW5jLiAtIEZvciBh +dXRob3JpemVkIHVzZSBvbmx5MUUwQwYDVQQDEzxWZXJpU2lnbiBDbGFzcyAzIFB1YmxpYyBQcmlt +YXJ5IENlcnRpZmljYXRpb24gQXV0aG9yaXR5IC0gRzUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw +ggEKAoIBAQCvJAgIKXo1nmAMqudLO07cfLw8RRy7K+D+KQL5VwijZIUVJ/XxrcgxiV0i6CqqpkKz +j/i5Vbext0uz/o9+B1fs70PbZmIVYc9gDaTY3vjgw2IIPVQT60nKWVSFJuUrjxuf6/WhkcIzSdhD +Y2pSS9KP6HBRTdGJaXvHcPaz3BJ023tdS1bTlr8Vd6Gw9KIl8q8ckmcY5fQGBO+QueQA5N06tRn/ +Arr0PO7gi+s3i+z016zy9vA9r911kTMZHRxAy3QkGSGT2RT+rCpSx4/VBEnkjWNHiDxpg8v+R70r +fk/Fla4OndTRQ8Bnc+MUCH7lP59zuDMKz10/NIeWiu5T6CUVAgMBAAGjgbIwga8wDwYDVR0TAQH/ +BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwbQYIKwYBBQUHAQwEYTBfoV2gWzBZMFcwVRYJaW1hZ2Uv +Z2lmMCEwHzAHBgUrDgMCGgQUj+XTGoasjY5rw8+AatRIGCx7GS4wJRYjaHR0cDovL2xvZ28udmVy +aXNpZ24uY29tL3ZzbG9nby5naWYwHQYDVR0OBBYEFH/TZafC3ey78DAJ80M5+gKvMzEzMA0GCSqG +SIb3DQEBBQUAA4IBAQCTJEowX2LP2BqYLz3q3JktvXf2pXkiOOzEp6B4Eq1iDkVwZMXnl2YtmAl+ +X6/WzChl8gGqCBpH3vn5fJJaCGkgDdk+bW48DW7Y5gaRQBi5+MHt39tBquCWIMnNZBU4gcmU7qKE +KQsTb47bDN0lAtukixlE0kF6BWlKWE9gyn6CagsCqiUXObXbf+eEZSqVir2G3l6BFoMtEMze/aiC +Km0oHw0LxOXnGiYZ4fQRbxC1lfznQgUy286dUV4otp6F01vvpX1FQHKOtw5rDgb7MzVIcbidJ4vE +ZV8NhnacRHr2lVz2XTIIM6RUthg/aFzyQkqFOFSDX9HoLPKsEdao7WNq +-----END CERTIFICATE----- + +SecureTrust CA +============== +-----BEGIN CERTIFICATE----- +MIIDuDCCAqCgAwIBAgIQDPCOXAgWpa1Cf/DrJxhZ0DANBgkqhkiG9w0BAQUFADBIMQswCQYDVQQG +EwJVUzEgMB4GA1UEChMXU2VjdXJlVHJ1c3QgQ29ycG9yYXRpb24xFzAVBgNVBAMTDlNlY3VyZVRy +dXN0IENBMB4XDTA2MTEwNzE5MzExOFoXDTI5MTIzMTE5NDA1NVowSDELMAkGA1UEBhMCVVMxIDAe +BgNVBAoTF1NlY3VyZVRydXN0IENvcnBvcmF0aW9uMRcwFQYDVQQDEw5TZWN1cmVUcnVzdCBDQTCC +ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKukgeWVzfX2FI7CT8rU4niVWJxB4Q2ZQCQX +OZEzZum+4YOvYlyJ0fwkW2Gz4BERQRwdbvC4u/jep4G6pkjGnx29vo6pQT64lO0pGtSO0gMdA+9t +DWccV9cGrcrI9f4Or2YlSASWC12juhbDCE/RRvgUXPLIXgGZbf2IzIaowW8xQmxSPmjL8xk037uH +GFaAJsTQ3MBv396gwpEWoGQRS0S8Hvbn+mPeZqx2pHGj7DaUaHp3pLHnDi+BeuK1cobvomuL8A/b +01k/unK8RCSc43Oz969XL0Imnal0ugBS8kvNU3xHCzaFDmapCJcWNFfBZveA4+1wVMeT4C4oFVmH +ursCAwEAAaOBnTCBmjATBgkrBgEEAYI3FAIEBh4EAEMAQTALBgNVHQ8EBAMCAYYwDwYDVR0TAQH/ +BAUwAwEB/zAdBgNVHQ4EFgQUQjK2FvoE/f5dS3rD/fdMQB1aQ68wNAYDVR0fBC0wKzApoCegJYYj +aHR0cDovL2NybC5zZWN1cmV0cnVzdC5jb20vU1RDQS5jcmwwEAYJKwYBBAGCNxUBBAMCAQAwDQYJ +KoZIhvcNAQEFBQADggEBADDtT0rhWDpSclu1pqNlGKa7UTt36Z3q059c4EVlew3KW+JwULKUBRSu +SceNQQcSc5R+DCMh/bwQf2AQWnL1mA6s7Ll/3XpvXdMc9P+IBWlCqQVxyLesJugutIxq/3HcuLHf +mbx8IVQr5Fiiu1cprp6poxkmD5kuCLDv/WnPmRoJjeOnnyvJNjR7JLN4TJUXpAYmHrZkUjZfYGfZ +nMUFdAvnZyPSCPyI6a6Lf+Ew9Dd+/cYy2i2eRDAwbO4H3tI0/NL/QPZL9GZGBlSm8jIKYyYwa5vR +3ItHuuG51WLQoqD0ZwV4KWMabwTW+MZMo5qxN7SN5ShLHZ4swrhovO0C7jE= +-----END CERTIFICATE----- + +Secure Global CA +================ +-----BEGIN CERTIFICATE----- +MIIDvDCCAqSgAwIBAgIQB1YipOjUiolN9BPI8PjqpTANBgkqhkiG9w0BAQUFADBKMQswCQYDVQQG +EwJVUzEgMB4GA1UEChMXU2VjdXJlVHJ1c3QgQ29ycG9yYXRpb24xGTAXBgNVBAMTEFNlY3VyZSBH +bG9iYWwgQ0EwHhcNMDYxMTA3MTk0MjI4WhcNMjkxMjMxMTk1MjA2WjBKMQswCQYDVQQGEwJVUzEg +MB4GA1UEChMXU2VjdXJlVHJ1c3QgQ29ycG9yYXRpb24xGTAXBgNVBAMTEFNlY3VyZSBHbG9iYWwg +Q0EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCvNS7YrGxVaQZx5RNoJLNP2MwhR/jx +YDiJiQPpvepeRlMJ3Fz1Wuj3RSoC6zFh1ykzTM7HfAo3fg+6MpjhHZevj8fcyTiW89sa/FHtaMbQ +bqR8JNGuQsiWUGMu4P51/pinX0kuleM5M2SOHqRfkNJnPLLZ/kG5VacJjnIFHovdRIWCQtBJwB1g +8NEXLJXr9qXBkqPFwqcIYA1gBBCWeZ4WNOaptvolRTnIHmX5k/Wq8VLcmZg9pYYaDDUz+kulBAYV +HDGA76oYa8J719rO+TMg1fW9ajMtgQT7sFzUnKPiXB3jqUJ1XnvUd+85VLrJChgbEplJL4hL/VBi +0XPnj3pDAgMBAAGjgZ0wgZowEwYJKwYBBAGCNxQCBAYeBABDAEEwCwYDVR0PBAQDAgGGMA8GA1Ud +EwEB/wQFMAMBAf8wHQYDVR0OBBYEFK9EBMJBfkiD2045AuzshHrmzsmkMDQGA1UdHwQtMCswKaAn +oCWGI2h0dHA6Ly9jcmwuc2VjdXJldHJ1c3QuY29tL1NHQ0EuY3JsMBAGCSsGAQQBgjcVAQQDAgEA +MA0GCSqGSIb3DQEBBQUAA4IBAQBjGghAfaReUw132HquHw0LURYD7xh8yOOvaliTFGCRsoTciE6+ +OYo68+aCiV0BN7OrJKQVDpI1WkpEXk5X+nXOH0jOZvQ8QCaSmGwb7iRGDBezUqXbpZGRzzfTb+cn +CDpOGR86p1hcF895P4vkp9MmI50mD1hp/Ed+stCNi5O/KU9DaXR2Z0vPB4zmAve14bRDtUstFJ/5 +3CYNv6ZHdAbYiNE6KTCEztI5gGIbqMdXSbxqVVFnFUq+NQfk1XWYN3kwFNspnWzFacxHVaIw98xc +f8LDmBxrThaA63p4ZUWiABqvDA1VZDRIuJK58bRQKfJPIx/abKwfROHdI3hRW8cW +-----END CERTIFICATE----- + +COMODO Certification Authority +============================== +-----BEGIN CERTIFICATE----- +MIIEHTCCAwWgAwIBAgIQToEtioJl4AsC7j41AkblPTANBgkqhkiG9w0BAQUFADCBgTELMAkGA1UE +BhMCR0IxGzAZBgNVBAgTEkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4GA1UEBxMHU2FsZm9yZDEaMBgG +A1UEChMRQ09NT0RPIENBIExpbWl0ZWQxJzAlBgNVBAMTHkNPTU9ETyBDZXJ0aWZpY2F0aW9uIEF1 +dGhvcml0eTAeFw0wNjEyMDEwMDAwMDBaFw0yOTEyMzEyMzU5NTlaMIGBMQswCQYDVQQGEwJHQjEb +MBkGA1UECBMSR3JlYXRlciBNYW5jaGVzdGVyMRAwDgYDVQQHEwdTYWxmb3JkMRowGAYDVQQKExFD +T01PRE8gQ0EgTGltaXRlZDEnMCUGA1UEAxMeQ09NT0RPIENlcnRpZmljYXRpb24gQXV0aG9yaXR5 +MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA0ECLi3LjkRv3UcEbVASY06m/weaKXTuH ++7uIzg3jLz8GlvCiKVCZrts7oVewdFFxze1CkU1B/qnI2GqGd0S7WWaXUF601CxwRM/aN5VCaTww +xHGzUvAhTaHYujl8HJ6jJJ3ygxaYqhZ8Q5sVW7euNJH+1GImGEaaP+vB+fGQV+useg2L23IwambV +4EajcNxo2f8ESIl33rXp+2dtQem8Ob0y2WIC8bGoPW43nOIv4tOiJovGuFVDiOEjPqXSJDlqR6sA +1KGzqSX+DT+nHbrTUcELpNqsOO9VUCQFZUaTNE8tja3G1CEZ0o7KBWFxB3NH5YoZEr0ETc5OnKVI +rLsm9wIDAQABo4GOMIGLMB0GA1UdDgQWBBQLWOWLxkwVN6RAqTCpIb5HNlpW/zAOBgNVHQ8BAf8E +BAMCAQYwDwYDVR0TAQH/BAUwAwEB/zBJBgNVHR8EQjBAMD6gPKA6hjhodHRwOi8vY3JsLmNvbW9k +b2NhLmNvbS9DT01PRE9DZXJ0aWZpY2F0aW9uQXV0aG9yaXR5LmNybDANBgkqhkiG9w0BAQUFAAOC +AQEAPpiem/Yb6dc5t3iuHXIYSdOH5EOC6z/JqvWote9VfCFSZfnVDeFs9D6Mk3ORLgLETgdxb8CP +OGEIqB6BCsAvIC9Bi5HcSEW88cbeunZrM8gALTFGTO3nnc+IlP8zwFboJIYmuNg4ON8qa90SzMc/ +RxdMosIGlgnW2/4/PEZB31jiVg88O8EckzXZOFKs7sjsLjBOlDW0JB9LeGna8gI4zJVSk/BwJVmc +IGfE7vmLV2H0knZ9P4SNVbfo5azV8fUZVqZa+5Acr5Pr5RzUZ5ddBA6+C4OmF4O5MBKgxTMVBbkN ++8cFduPYSo38NBejxiEovjBFMR7HeL5YYTisO+IBZQ== +-----END CERTIFICATE----- + +Network Solutions Certificate Authority +======================================= +-----BEGIN CERTIFICATE----- +MIID5jCCAs6gAwIBAgIQV8szb8JcFuZHFhfjkDFo4DANBgkqhkiG9w0BAQUFADBiMQswCQYDVQQG +EwJVUzEhMB8GA1UEChMYTmV0d29yayBTb2x1dGlvbnMgTC5MLkMuMTAwLgYDVQQDEydOZXR3b3Jr +IFNvbHV0aW9ucyBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkwHhcNMDYxMjAxMDAwMDAwWhcNMjkxMjMx +MjM1OTU5WjBiMQswCQYDVQQGEwJVUzEhMB8GA1UEChMYTmV0d29yayBTb2x1dGlvbnMgTC5MLkMu +MTAwLgYDVQQDEydOZXR3b3JrIFNvbHV0aW9ucyBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkwggEiMA0G +CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDkvH6SMG3G2I4rC7xGzuAnlt7e+foS0zwzc7MEL7xx +jOWftiJgPl9dzgn/ggwbmlFQGiaJ3dVhXRncEg8tCqJDXRfQNJIg6nPPOCwGJgl6cvf6UDL4wpPT +aaIjzkGxzOTVHzbRijr4jGPiFFlp7Q3Tf2vouAPlT2rlmGNpSAW+Lv8ztumXWWn4Zxmuk2GWRBXT +crA/vGp97Eh/jcOrqnErU2lBUzS1sLnFBgrEsEX1QV1uiUV7PTsmjHTC5dLRfbIR1PtYMiKagMnc +/Qzpf14Dl847ABSHJ3A4qY5usyd2mFHgBeMhqxrVhSI8KbWaFsWAqPS7azCPL0YCorEMIuDTAgMB +AAGjgZcwgZQwHQYDVR0OBBYEFCEwyfsA106Y2oeqKtCnLrFAMadMMA4GA1UdDwEB/wQEAwIBBjAP +BgNVHRMBAf8EBTADAQH/MFIGA1UdHwRLMEkwR6BFoEOGQWh0dHA6Ly9jcmwubmV0c29sc3NsLmNv +bS9OZXR3b3JrU29sdXRpb25zQ2VydGlmaWNhdGVBdXRob3JpdHkuY3JsMA0GCSqGSIb3DQEBBQUA +A4IBAQC7rkvnt1frf6ott3NHhWrB5KUd5Oc86fRZZXe1eltajSU24HqXLjjAV2CDmAaDn7l2em5Q +4LqILPxFzBiwmZVRDuwduIj/h1AcgsLj4DKAv6ALR8jDMe+ZZzKATxcheQxpXN5eNK4CtSbqUN9/ +GGUsyfJj4akH/nxxH2szJGoeBfcFaMBqEssuXmHLrijTfsK0ZpEmXzwuJF/LWA/rKOyvEZbz3Htv +wKeI8lN3s2Berq4o2jUsbzRF0ybh3uxbTydrFny9RAQYgrOJeRcQcT16ohZO9QHNpGxlaKFJdlxD +ydi8NmdspZS11My5vWo1ViHe2MPr+8ukYEywVaCge1ey +-----END CERTIFICATE----- + +WellsSecure Public Root Certificate Authority +============================================= +-----BEGIN CERTIFICATE----- +MIIEvTCCA6WgAwIBAgIBATANBgkqhkiG9w0BAQUFADCBhTELMAkGA1UEBhMCVVMxIDAeBgNVBAoM +F1dlbGxzIEZhcmdvIFdlbGxzU2VjdXJlMRwwGgYDVQQLDBNXZWxscyBGYXJnbyBCYW5rIE5BMTYw +NAYDVQQDDC1XZWxsc1NlY3VyZSBQdWJsaWMgUm9vdCBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkwHhcN +MDcxMjEzMTcwNzU0WhcNMjIxMjE0MDAwNzU0WjCBhTELMAkGA1UEBhMCVVMxIDAeBgNVBAoMF1dl +bGxzIEZhcmdvIFdlbGxzU2VjdXJlMRwwGgYDVQQLDBNXZWxscyBGYXJnbyBCYW5rIE5BMTYwNAYD +VQQDDC1XZWxsc1NlY3VyZSBQdWJsaWMgUm9vdCBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkwggEiMA0G +CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDub7S9eeKPCCGeOARBJe+rWxxTkqxtnt3CxC5FlAM1 +iGd0V+PfjLindo8796jE2yljDpFoNoqXjopxaAkH5OjUDk/41itMpBb570OYj7OeUt9tkTmPOL13 +i0Nj67eT/DBMHAGTthP796EfvyXhdDcsHqRePGj4S78NuR4uNuip5Kf4D8uCdXw1LSLWwr8L87T8 +bJVhHlfXBIEyg1J55oNjz7fLY4sR4r1e6/aN7ZVyKLSsEmLpSjPmgzKuBXWVvYSV2ypcm44uDLiB +K0HmOFafSZtsdvqKXfcBeYF8wYNABf5x/Qw/zE5gCQ5lRxAvAcAFP4/4s0HvWkJ+We/SlwxlAgMB +AAGjggE0MIIBMDAPBgNVHRMBAf8EBTADAQH/MDkGA1UdHwQyMDAwLqAsoCqGKGh0dHA6Ly9jcmwu +cGtpLndlbGxzZmFyZ28uY29tL3dzcHJjYS5jcmwwDgYDVR0PAQH/BAQDAgHGMB0GA1UdDgQWBBQm +lRkQ2eihl5H/3BnZtQQ+0nMKajCBsgYDVR0jBIGqMIGngBQmlRkQ2eihl5H/3BnZtQQ+0nMKaqGB +i6SBiDCBhTELMAkGA1UEBhMCVVMxIDAeBgNVBAoMF1dlbGxzIEZhcmdvIFdlbGxzU2VjdXJlMRww +GgYDVQQLDBNXZWxscyBGYXJnbyBCYW5rIE5BMTYwNAYDVQQDDC1XZWxsc1NlY3VyZSBQdWJsaWMg +Um9vdCBDZXJ0aWZpY2F0ZSBBdXRob3JpdHmCAQEwDQYJKoZIhvcNAQEFBQADggEBALkVsUSRzCPI +K0134/iaeycNzXK7mQDKfGYZUMbVmO2rvwNa5U3lHshPcZeG1eMd/ZDJPHV3V3p9+N701NX3leZ0 +bh08rnyd2wIDBSxxSyU+B+NemvVmFymIGjifz6pBA4SXa5M4esowRBskRDPQ5NHcKDj0E0M1NSlj +qHyita04pO2t/caaH/+Xc/77szWnk4bGdpEA5qxRFsQnMlzbc9qlk1eOPm01JghZ1edE13YgY+es +E2fDbbFwRnzVlhE9iW9dqKHrjQrawx0zbKPqZxmamX9LPYNRKh3KL4YMon4QLSvUFpULB6ouFJJJ +tylv2G0xffX8oRAHh84vWdw+WNs= +-----END CERTIFICATE----- + +COMODO ECC Certification Authority +================================== +-----BEGIN CERTIFICATE----- +MIICiTCCAg+gAwIBAgIQH0evqmIAcFBUTAGem2OZKjAKBggqhkjOPQQDAzCBhTELMAkGA1UEBhMC +R0IxGzAZBgNVBAgTEkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4GA1UEBxMHU2FsZm9yZDEaMBgGA1UE +ChMRQ09NT0RPIENBIExpbWl0ZWQxKzApBgNVBAMTIkNPTU9ETyBFQ0MgQ2VydGlmaWNhdGlvbiBB +dXRob3JpdHkwHhcNMDgwMzA2MDAwMDAwWhcNMzgwMTE4MjM1OTU5WjCBhTELMAkGA1UEBhMCR0Ix +GzAZBgNVBAgTEkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4GA1UEBxMHU2FsZm9yZDEaMBgGA1UEChMR +Q09NT0RPIENBIExpbWl0ZWQxKzApBgNVBAMTIkNPTU9ETyBFQ0MgQ2VydGlmaWNhdGlvbiBBdXRo +b3JpdHkwdjAQBgcqhkjOPQIBBgUrgQQAIgNiAAQDR3svdcmCFYX7deSRFtSrYpn1PlILBs5BAH+X +4QokPB0BBO490o0JlwzgdeT6+3eKKvUDYEs2ixYjFq0JcfRK9ChQtP6IHG4/bC8vCVlbpVsLM5ni +wz2J+Wos77LTBumjQjBAMB0GA1UdDgQWBBR1cacZSBm8nZ3qQUfflMRId5nTeTAOBgNVHQ8BAf8E +BAMCAQYwDwYDVR0TAQH/BAUwAwEB/zAKBggqhkjOPQQDAwNoADBlAjEA7wNbeqy3eApyt4jf/7VG +FAkK+qDmfQjGGoe9GKhzvSbKYAydzpmfz1wPMOG+FDHqAjAU9JM8SaczepBGR7NjfRObTrdvGDeA +U/7dIOA1mjbRxwG55tzd8/8dLDoWV9mSOdY= +-----END CERTIFICATE----- + +IGC/A +===== +-----BEGIN CERTIFICATE----- +MIIEAjCCAuqgAwIBAgIFORFFEJQwDQYJKoZIhvcNAQEFBQAwgYUxCzAJBgNVBAYTAkZSMQ8wDQYD +VQQIEwZGcmFuY2UxDjAMBgNVBAcTBVBhcmlzMRAwDgYDVQQKEwdQTS9TR0ROMQ4wDAYDVQQLEwVE +Q1NTSTEOMAwGA1UEAxMFSUdDL0ExIzAhBgkqhkiG9w0BCQEWFGlnY2FAc2dkbi5wbS5nb3V2LmZy +MB4XDTAyMTIxMzE0MjkyM1oXDTIwMTAxNzE0MjkyMlowgYUxCzAJBgNVBAYTAkZSMQ8wDQYDVQQI +EwZGcmFuY2UxDjAMBgNVBAcTBVBhcmlzMRAwDgYDVQQKEwdQTS9TR0ROMQ4wDAYDVQQLEwVEQ1NT +STEOMAwGA1UEAxMFSUdDL0ExIzAhBgkqhkiG9w0BCQEWFGlnY2FAc2dkbi5wbS5nb3V2LmZyMIIB +IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAsh/R0GLFMzvABIaIs9z4iPf930Pfeo2aSVz2 +TqrMHLmh6yeJ8kbpO0px1R2OLc/mratjUMdUC24SyZA2xtgv2pGqaMVy/hcKshd+ebUyiHDKcMCW +So7kVc0dJ5S/znIq7Fz5cyD+vfcuiWe4u0dzEvfRNWk68gq5rv9GQkaiv6GFGvm/5P9JhfejcIYy +HF2fYPepraX/z9E0+X1bF8bc1g4oa8Ld8fUzaJ1O/Id8NhLWo4DoQw1VYZTqZDdH6nfK0LJYBcNd +frGoRpAxVs5wKpayMLh35nnAvSk7/ZR3TL0gzUEl4C7HG7vupARB0l2tEmqKm0f7yd1GQOGdPDPQ +tQIDAQABo3cwdTAPBgNVHRMBAf8EBTADAQH/MAsGA1UdDwQEAwIBRjAVBgNVHSAEDjAMMAoGCCqB +egF5AQEBMB0GA1UdDgQWBBSjBS8YYFDCiQrdKyFP/45OqDAxNjAfBgNVHSMEGDAWgBSjBS8YYFDC +iQrdKyFP/45OqDAxNjANBgkqhkiG9w0BAQUFAAOCAQEABdwm2Pp3FURo/C9mOnTgXeQp/wYHE4RK +q89toB9RlPhJy3Q2FLwV3duJL92PoF189RLrn544pEfMs5bZvpwlqwN+Mw+VgQ39FuCIvjfwbF3Q +MZsyK10XZZOYYLxuj7GoPB7ZHPOpJkL5ZB3C55L29B5aqhlSXa/oovdgoPaN8In1buAKBQGVyYsg +Crpa/JosPL3Dt8ldeCUFP1YUmwza+zpI/pdpXsoQhvdOlgQITeywvl3cO45Pwf2aNjSaTFR+FwNI +lQgRHAdvhQh+XU3Endv7rs6y0bO4g2wdsrN58dhwmX7wEwLOXt1R0982gaEbeC9xs/FZTEYYKKuF +0mBWWg== +-----END CERTIFICATE----- + +Security Communication EV RootCA1 +================================= +-----BEGIN CERTIFICATE----- +MIIDfTCCAmWgAwIBAgIBADANBgkqhkiG9w0BAQUFADBgMQswCQYDVQQGEwJKUDElMCMGA1UEChMc +U0VDT00gVHJ1c3QgU3lzdGVtcyBDTy4sTFRELjEqMCgGA1UECxMhU2VjdXJpdHkgQ29tbXVuaWNh +dGlvbiBFViBSb290Q0ExMB4XDTA3MDYwNjAyMTIzMloXDTM3MDYwNjAyMTIzMlowYDELMAkGA1UE +BhMCSlAxJTAjBgNVBAoTHFNFQ09NIFRydXN0IFN5c3RlbXMgQ08uLExURC4xKjAoBgNVBAsTIVNl +Y3VyaXR5IENvbW11bmljYXRpb24gRVYgUm9vdENBMTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC +AQoCggEBALx/7FebJOD+nLpCeamIivqA4PUHKUPqjgo0No0c+qe1OXj/l3X3L+SqawSERMqm4miO +/VVQYg+kcQ7OBzgtQoVQrTyWb4vVog7P3kmJPdZkLjjlHmy1V4qe70gOzXppFodEtZDkBp2uoQSX +WHnvIEqCa4wiv+wfD+mEce3xDuS4GBPMVjZd0ZoeUWs5bmB2iDQL87PRsJ3KYeJkHcFGB7hj3R4z +ZbOOCVVSPbW9/wfrrWFVGCypaZhKqkDFMxRldAD5kd6vA0jFQFTcD4SQaCDFkpbcLuUCRarAX1T4 +bepJz11sS6/vmsJWXMY1VkJqMF/Cq/biPT+zyRGPMUzXn0kCAwEAAaNCMEAwHQYDVR0OBBYEFDVK +9U2vP9eCOKyrcWUXdYydVZPmMA4GA1UdDwEB/wQEAwIBBjAPBgNVHRMBAf8EBTADAQH/MA0GCSqG +SIb3DQEBBQUAA4IBAQCoh+ns+EBnXcPBZsdAS5f8hxOQWsTvoMpfi7ent/HWtWS3irO4G8za+6xm +iEHO6Pzk2x6Ipu0nUBsCMCRGef4Eh3CXQHPRwMFXGZpppSeZq51ihPZRwSzJIxXYKLerJRO1RuGG +Av8mjMSIkh1W/hln8lXkgKNrnKt34VFxDSDbEJrbvXZ5B3eZKK2aXtqxT0QsNY6llsf9g/BYxnnW +mHyojf6GPgcWkuF75x3sM3Z+Qi5KhfmRiWiEA4Glm5q+4zfFVKtWOxgtQaQM+ELbmaDgcm+7XeEW +T1MKZPlO9L9OVL14bIjqv5wTJMJwaaJ/D8g8rQjJsJhAoyrniIPtd490 +-----END CERTIFICATE----- + +OISTE WISeKey Global Root GA CA +=============================== +-----BEGIN CERTIFICATE----- +MIID8TCCAtmgAwIBAgIQQT1yx/RrH4FDffHSKFTfmjANBgkqhkiG9w0BAQUFADCBijELMAkGA1UE +BhMCQ0gxEDAOBgNVBAoTB1dJU2VLZXkxGzAZBgNVBAsTEkNvcHlyaWdodCAoYykgMjAwNTEiMCAG +A1UECxMZT0lTVEUgRm91bmRhdGlvbiBFbmRvcnNlZDEoMCYGA1UEAxMfT0lTVEUgV0lTZUtleSBH +bG9iYWwgUm9vdCBHQSBDQTAeFw0wNTEyMTExNjAzNDRaFw0zNzEyMTExNjA5NTFaMIGKMQswCQYD +VQQGEwJDSDEQMA4GA1UEChMHV0lTZUtleTEbMBkGA1UECxMSQ29weXJpZ2h0IChjKSAyMDA1MSIw +IAYDVQQLExlPSVNURSBGb3VuZGF0aW9uIEVuZG9yc2VkMSgwJgYDVQQDEx9PSVNURSBXSVNlS2V5 +IEdsb2JhbCBSb290IEdBIENBMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAy0+zAJs9 +Nt350UlqaxBJH+zYK7LG+DKBKUOVTJoZIyEVRd7jyBxRVVuuk+g3/ytr6dTqvirdqFEr12bDYVxg +Asj1znJ7O7jyTmUIms2kahnBAbtzptf2w93NvKSLtZlhuAGio9RN1AU9ka34tAhxZK9w8RxrfvbD +d50kc3vkDIzh2TbhmYsFmQvtRTEJysIA2/dyoJaqlYfQjse2YXMNdmaM3Bu0Y6Kff5MTMPGhJ9vZ +/yxViJGg4E8HsChWjBgbl0SOid3gF27nKu+POQoxhILYQBRJLnpB5Kf+42TMwVlxSywhp1t94B3R +LoGbw9ho972WG6xwsRYUC9tguSYBBQIDAQABo1EwTzALBgNVHQ8EBAMCAYYwDwYDVR0TAQH/BAUw +AwEB/zAdBgNVHQ4EFgQUswN+rja8sHnR3JQmthG+IbJphpQwEAYJKwYBBAGCNxUBBAMCAQAwDQYJ +KoZIhvcNAQEFBQADggEBAEuh/wuHbrP5wUOxSPMowB0uyQlB+pQAHKSkq0lPjz0e701vvbyk9vIm +MMkQyh2I+3QZH4VFvbBsUfk2ftv1TDI6QU9bR8/oCy22xBmddMVHxjtqD6wU2zz0c5ypBd8A3HR4 ++vg1YFkCExh8vPtNsCBtQ7tgMHpnM1zFmdH4LTlSc/uMqpclXHLZCB6rTjzjgTGfA6b7wP4piFXa +hNVQA7bihKOmNqoROgHhGEvWRGizPflTdISzRpFGlgC3gCy24eMQ4tui5yiPAZZiFj4A4xylNoEY +okxSdsARo27mHbrjWr42U8U+dY+GaSlYU7Wcu2+fXMUY7N0v4ZjJ/L7fCg0= +-----END CERTIFICATE----- + +Microsec e-Szigno Root CA +========================= +-----BEGIN CERTIFICATE----- +MIIHqDCCBpCgAwIBAgIRAMy4579OKRr9otxmpRwsDxEwDQYJKoZIhvcNAQEFBQAwcjELMAkGA1UE +BhMCSFUxETAPBgNVBAcTCEJ1ZGFwZXN0MRYwFAYDVQQKEw1NaWNyb3NlYyBMdGQuMRQwEgYDVQQL +EwtlLVN6aWdubyBDQTEiMCAGA1UEAxMZTWljcm9zZWMgZS1Temlnbm8gUm9vdCBDQTAeFw0wNTA0 +MDYxMjI4NDRaFw0xNzA0MDYxMjI4NDRaMHIxCzAJBgNVBAYTAkhVMREwDwYDVQQHEwhCdWRhcGVz +dDEWMBQGA1UEChMNTWljcm9zZWMgTHRkLjEUMBIGA1UECxMLZS1Temlnbm8gQ0ExIjAgBgNVBAMT +GU1pY3Jvc2VjIGUtU3ppZ25vIFJvb3QgQ0EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB +AQDtyADVgXvNOABHzNuEwSFpLHSQDCHZU4ftPkNEU6+r+ICbPHiN1I2uuO/TEdyB5s87lozWbxXG +d36hL+BfkrYn13aaHUM86tnsL+4582pnS4uCzyL4ZVX+LMsvfUh6PXX5qqAnu3jCBspRwn5mS6/N +oqdNAoI/gqyFxuEPkEeZlApxcpMqyabAvjxWTHOSJ/FrtfX9/DAFYJLG65Z+AZHCabEeHXtTRbjc +QR/Ji3HWVBTji1R4P770Yjtb9aPs1ZJ04nQw7wHb4dSrmZsqa/i9phyGI0Jf7Enemotb9HI6QMVJ +PqW+jqpx62z69Rrkav17fVVA71hu5tnVvCSrwe+3AgMBAAGjggQ3MIIEMzBnBggrBgEFBQcBAQRb +MFkwKAYIKwYBBQUHMAGGHGh0dHBzOi8vcmNhLmUtc3ppZ25vLmh1L29jc3AwLQYIKwYBBQUHMAKG +IWh0dHA6Ly93d3cuZS1zemlnbm8uaHUvUm9vdENBLmNydDAPBgNVHRMBAf8EBTADAQH/MIIBcwYD +VR0gBIIBajCCAWYwggFiBgwrBgEEAYGoGAIBAQEwggFQMCgGCCsGAQUFBwIBFhxodHRwOi8vd3d3 +LmUtc3ppZ25vLmh1L1NaU1ovMIIBIgYIKwYBBQUHAgIwggEUHoIBEABBACAAdABhAG4A+gBzAO0A +dAB2AOEAbgB5ACAA6QByAHQAZQBsAG0AZQB6AOkAcwDpAGgAZQB6ACAA6QBzACAAZQBsAGYAbwBn +AGEAZADhAHMA4QBoAG8AegAgAGEAIABTAHoAbwBsAGcA4QBsAHQAYQB0APMAIABTAHoAbwBsAGcA +4QBsAHQAYQB0AOEAcwBpACAAUwB6AGEAYgDhAGwAeQB6AGEAdABhACAAcwB6AGUAcgBpAG4AdAAg +AGsAZQBsAGwAIABlAGwAagDhAHIAbgBpADoAIABoAHQAdABwADoALwAvAHcAdwB3AC4AZQAtAHMA +egBpAGcAbgBvAC4AaAB1AC8AUwBaAFMAWgAvMIHIBgNVHR8EgcAwgb0wgbqggbeggbSGIWh0dHA6 +Ly93d3cuZS1zemlnbm8uaHUvUm9vdENBLmNybIaBjmxkYXA6Ly9sZGFwLmUtc3ppZ25vLmh1L0NO +PU1pY3Jvc2VjJTIwZS1Temlnbm8lMjBSb290JTIwQ0EsT1U9ZS1Temlnbm8lMjBDQSxPPU1pY3Jv +c2VjJTIwTHRkLixMPUJ1ZGFwZXN0LEM9SFU/Y2VydGlmaWNhdGVSZXZvY2F0aW9uTGlzdDtiaW5h +cnkwDgYDVR0PAQH/BAQDAgEGMIGWBgNVHREEgY4wgYuBEGluZm9AZS1zemlnbm8uaHWkdzB1MSMw +IQYDVQQDDBpNaWNyb3NlYyBlLVN6aWduw7MgUm9vdCBDQTEWMBQGA1UECwwNZS1TemlnbsOzIEhT +WjEWMBQGA1UEChMNTWljcm9zZWMgS2Z0LjERMA8GA1UEBxMIQnVkYXBlc3QxCzAJBgNVBAYTAkhV +MIGsBgNVHSMEgaQwgaGAFMegSXUWYYTbMUuE0vE3QJDvTtz3oXakdDByMQswCQYDVQQGEwJIVTER +MA8GA1UEBxMIQnVkYXBlc3QxFjAUBgNVBAoTDU1pY3Jvc2VjIEx0ZC4xFDASBgNVBAsTC2UtU3pp +Z25vIENBMSIwIAYDVQQDExlNaWNyb3NlYyBlLVN6aWdubyBSb290IENBghEAzLjnv04pGv2i3Gal +HCwPETAdBgNVHQ4EFgQUx6BJdRZhhNsxS4TS8TdAkO9O3PcwDQYJKoZIhvcNAQEFBQADggEBANMT +nGZjWS7KXHAM/IO8VbH0jgdsZifOwTsgqRy7RlRw7lrMoHfqaEQn6/Ip3Xep1fvj1KcExJW4C+FE +aGAHQzAxQmHl7tnlJNUb3+FKG6qfx1/4ehHqE5MAyopYse7tDk2016g2JnzgOsHVV4Lxdbb9iV/a +86g4nzUGCM4ilb7N1fy+W955a9x6qWVmvrElWl/tftOsRm1M9DKHtCAE4Gx4sHfRhUZLphK3dehK +yVZs15KrnfVJONJPU+NVkBHbmJbGSfI+9J8b4PeI3CVimUTYc78/MPMMNz7UwiiAc7EBt51alhQB +S6kRnSlqLtBdgcDPsiBDxwPgN05dCtxZICU= +-----END CERTIFICATE----- + +Certigna +======== +-----BEGIN CERTIFICATE----- +MIIDqDCCApCgAwIBAgIJAP7c4wEPyUj/MA0GCSqGSIb3DQEBBQUAMDQxCzAJBgNVBAYTAkZSMRIw +EAYDVQQKDAlEaGlteW90aXMxETAPBgNVBAMMCENlcnRpZ25hMB4XDTA3MDYyOTE1MTMwNVoXDTI3 +MDYyOTE1MTMwNVowNDELMAkGA1UEBhMCRlIxEjAQBgNVBAoMCURoaW15b3RpczERMA8GA1UEAwwI +Q2VydGlnbmEwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDIaPHJ1tazNHUmgh7stL7q +XOEm7RFHYeGifBZ4QCHkYJ5ayGPhxLGWkv8YbWkj4Sti993iNi+RB7lIzw7sebYs5zRLcAglozyH +GxnygQcPOJAZ0xH+hrTy0V4eHpbNgGzOOzGTtvKg0KmVEn2lmsxryIRWijOp5yIVUxbwzBfsV1/p +ogqYCd7jX5xv3EjjhQsVWqa6n6xI4wmy9/Qy3l40vhx4XUJbzg4ij02Q130yGLMLLGq/jj8UEYkg +DncUtT2UCIf3JR7VsmAA7G8qKCVuKj4YYxclPz5EIBb2JsglrgVKtOdjLPOMFlN+XPsRGgjBRmKf +Irjxwo1p3Po6WAbfAgMBAAGjgbwwgbkwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUGu3+QTmQ +tCRZvgHyUtVF9lo53BEwZAYDVR0jBF0wW4AUGu3+QTmQtCRZvgHyUtVF9lo53BGhOKQ2MDQxCzAJ +BgNVBAYTAkZSMRIwEAYDVQQKDAlEaGlteW90aXMxETAPBgNVBAMMCENlcnRpZ25hggkA/tzjAQ/J +SP8wDgYDVR0PAQH/BAQDAgEGMBEGCWCGSAGG+EIBAQQEAwIABzANBgkqhkiG9w0BAQUFAAOCAQEA +hQMeknH2Qq/ho2Ge6/PAD/Kl1NqV5ta+aDY9fm4fTIrv0Q8hbV6lUmPOEvjvKtpv6zf+EwLHyzs+ +ImvaYS5/1HI93TDhHkxAGYwP15zRgzB7mFncfca5DClMoTOi62c6ZYTTluLtdkVwj7Ur3vkj1klu +PBS1xp81HlDQwY9qcEQCYsuuHWhBp6pX6FOqB9IG9tUUBguRA3UsbHK1YZWaDYu5Def131TN3ubY +1gkIl2PlwS6wt0QmwCbAr1UwnjvVNioZBPRcHv/PLLf/0P2HQBHVESO7SMAhqaQoLf0V+LBOK/Qw +WyH8EZE0vkHve52Xdf+XlcCWWC/qu0bXu+TZLg== +-----END CERTIFICATE----- + +AC Ra\xC3\xADz Certic\xC3\xA1mara S.A. +====================================== +-----BEGIN CERTIFICATE----- +MIIGZjCCBE6gAwIBAgIPB35Sk3vgFeNX8GmMy+wMMA0GCSqGSIb3DQEBBQUAMHsxCzAJBgNVBAYT +AkNPMUcwRQYDVQQKDD5Tb2NpZWRhZCBDYW1lcmFsIGRlIENlcnRpZmljYWNpw7NuIERpZ2l0YWwg +LSBDZXJ0aWPDoW1hcmEgUy5BLjEjMCEGA1UEAwwaQUMgUmHDrXogQ2VydGljw6FtYXJhIFMuQS4w +HhcNMDYxMTI3MjA0NjI5WhcNMzAwNDAyMjE0MjAyWjB7MQswCQYDVQQGEwJDTzFHMEUGA1UECgw+ +U29jaWVkYWQgQ2FtZXJhbCBkZSBDZXJ0aWZpY2FjacOzbiBEaWdpdGFsIC0gQ2VydGljw6FtYXJh +IFMuQS4xIzAhBgNVBAMMGkFDIFJhw616IENlcnRpY8OhbWFyYSBTLkEuMIICIjANBgkqhkiG9w0B +AQEFAAOCAg8AMIICCgKCAgEAq2uJo1PMSCMI+8PPUZYILrgIem08kBeGqentLhM0R7LQcNzJPNCN +yu5LF6vQhbCnIwTLqKL85XXbQMpiiY9QngE9JlsYhBzLfDe3fezTf3MZsGqy2IiKLUV0qPezuMDU +2s0iiXRNWhU5cxh0T7XrmafBHoi0wpOQY5fzp6cSsgkiBzPZkc0OnB8OIMfuuzONj8LSWKdf/WU3 +4ojC2I+GdV75LaeHM/J4Ny+LvB2GNzmxlPLYvEqcgxhaBvzz1NS6jBUJJfD5to0EfhcSM2tXSExP +2yYe68yQ54v5aHxwD6Mq0Do43zeX4lvegGHTgNiRg0JaTASJaBE8rF9ogEHMYELODVoqDA+bMMCm +8Ibbq0nXl21Ii/kDwFJnmxL3wvIumGVC2daa49AZMQyth9VXAnow6IYm+48jilSH5L887uvDdUhf +HjlvgWJsxS3EF1QZtzeNnDeRyPYL1epjb4OsOMLzP96a++EjYfDIJss2yKHzMI+ko6Kh3VOz3vCa +Mh+DkXkwwakfU5tTohVTP92dsxA7SH2JD/ztA/X7JWR1DhcZDY8AFmd5ekD8LVkH2ZD6mq093ICK +5lw1omdMEWux+IBkAC1vImHFrEsm5VoQgpukg3s0956JkSCXjrdCx2bD0Omk1vUgjcTDlaxECp1b +czwmPS9KvqfJpxAe+59QafMCAwEAAaOB5jCB4zAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQE +AwIBBjAdBgNVHQ4EFgQU0QnQ6dfOeXRU+Tows/RtLAMDG2gwgaAGA1UdIASBmDCBlTCBkgYEVR0g +ADCBiTArBggrBgEFBQcCARYfaHR0cDovL3d3dy5jZXJ0aWNhbWFyYS5jb20vZHBjLzBaBggrBgEF +BQcCAjBOGkxMaW1pdGFjaW9uZXMgZGUgZ2FyYW507WFzIGRlIGVzdGUgY2VydGlmaWNhZG8gc2Ug +cHVlZGVuIGVuY29udHJhciBlbiBsYSBEUEMuMA0GCSqGSIb3DQEBBQUAA4ICAQBclLW4RZFNjmEf +AygPU3zmpFmps4p6xbD/CHwso3EcIRNnoZUSQDWDg4902zNc8El2CoFS3UnUmjIz75uny3XlesuX +EpBcunvFm9+7OSPI/5jOCk0iAUgHforA1SBClETvv3eiiWdIG0ADBaGJ7M9i4z0ldma/Jre7Ir5v +/zlXdLp6yQGVwZVR6Kss+LGGIOk/yzVb0hfpKv6DExdA7ohiZVvVO2Dpezy4ydV/NgIlqmjCMRW3 +MGXrfx1IebHPOeJCgBbT9ZMj/EyXyVo3bHwi2ErN0o42gzmRkBDI8ck1fj+404HGIGQatlDCIaR4 +3NAvO2STdPCWkPHv+wlaNECW8DYSwaN0jJN+Qd53i+yG2dIPPy3RzECiiWZIHiCznCNZc6lEc7wk +eZBWN7PGKX6jD/EpOe9+XCgycDWs2rjIdWb8m0w5R44bb5tNAlQiM+9hup4phO9OSzNHdpdqy35f +/RWmnkJDW2ZaiogN9xa5P1FlK2Zqi9E4UqLWRhH6/JocdJ6PlwsCT2TG9WjTSy3/pDceiz+/RL5h +RqGEPQgnTIEgd4kI6mdAXmwIUV80WoyWaM3X94nCHNMyAK9Sy9NgWyo6R35rMDOhYil/SrnhLecU +Iw4OGEfhefwVVdCx/CVxY3UzHCMrr1zZ7Ud3YA47Dx7SwNxkBYn8eNZcLCZDqQ== +-----END CERTIFICATE----- + +TC TrustCenter Class 2 CA II +============================ +-----BEGIN CERTIFICATE----- +MIIEqjCCA5KgAwIBAgIOLmoAAQACH9dSISwRXDswDQYJKoZIhvcNAQEFBQAwdjELMAkGA1UEBhMC +REUxHDAaBgNVBAoTE1RDIFRydXN0Q2VudGVyIEdtYkgxIjAgBgNVBAsTGVRDIFRydXN0Q2VudGVy +IENsYXNzIDIgQ0ExJTAjBgNVBAMTHFRDIFRydXN0Q2VudGVyIENsYXNzIDIgQ0EgSUkwHhcNMDYw +MTEyMTQzODQzWhcNMjUxMjMxMjI1OTU5WjB2MQswCQYDVQQGEwJERTEcMBoGA1UEChMTVEMgVHJ1 +c3RDZW50ZXIgR21iSDEiMCAGA1UECxMZVEMgVHJ1c3RDZW50ZXIgQ2xhc3MgMiBDQTElMCMGA1UE +AxMcVEMgVHJ1c3RDZW50ZXIgQ2xhc3MgMiBDQSBJSTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC +AQoCggEBAKuAh5uO8MN8h9foJIIRszzdQ2Lu+MNF2ujhoF/RKrLqk2jftMjWQ+nEdVl//OEd+DFw +IxuInie5e/060smp6RQvkL4DUsFJzfb95AhmC1eKokKguNV/aVyQMrKXDcpK3EY+AlWJU+MaWss2 +xgdW94zPEfRMuzBwBJWl9jmM/XOBCH2JXjIeIqkiRUuwZi4wzJ9l/fzLganx4Duvo4bRierERXlQ +Xa7pIXSSTYtZgo+U4+lK8edJsBTj9WLL1XK9H7nSn6DNqPoByNkN39r8R52zyFTfSUrxIan+GE7u +SNQZu+995OKdy1u2bv/jzVrndIIFuoAlOMvkaZ6vQaoahPUCAwEAAaOCATQwggEwMA8GA1UdEwEB +/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMB0GA1UdDgQWBBTjq1RMgKHbVkO3kUrL84J6E1wIqzCB +7QYDVR0fBIHlMIHiMIHfoIHcoIHZhjVodHRwOi8vd3d3LnRydXN0Y2VudGVyLmRlL2NybC92Mi90 +Y19jbGFzc18yX2NhX0lJLmNybIaBn2xkYXA6Ly93d3cudHJ1c3RjZW50ZXIuZGUvQ049VEMlMjBU +cnVzdENlbnRlciUyMENsYXNzJTIwMiUyMENBJTIwSUksTz1UQyUyMFRydXN0Q2VudGVyJTIwR21i +SCxPVT1yb290Y2VydHMsREM9dHJ1c3RjZW50ZXIsREM9ZGU/Y2VydGlmaWNhdGVSZXZvY2F0aW9u +TGlzdD9iYXNlPzANBgkqhkiG9w0BAQUFAAOCAQEAjNfffu4bgBCzg/XbEeprS6iSGNn3Bzn1LL4G +dXpoUxUc6krtXvwjshOg0wn/9vYua0Fxec3ibf2uWWuFHbhOIprtZjluS5TmVfwLG4t3wVMTZonZ +KNaL80VKY7f9ewthXbhtvsPcW3nS7Yblok2+XnR8au0WOB9/WIFaGusyiC2y8zl3gK9etmF1Kdsj +TYjKUCjLhdLTEKJZbtOTVAB6okaVhgWcqRmY5TFyDADiZ9lA4CQze28suVyrZZ0srHbqNZn1l7kP +JOzHdiEoZa5X6AeIdUpWoNIFOqTmjZKILPPy4cHGYdtBxceb9w4aUUXCYWvcZCcXjFq32nQozZfk +vQ== +-----END CERTIFICATE----- + +TC TrustCenter Class 3 CA II +============================ +-----BEGIN CERTIFICATE----- +MIIEqjCCA5KgAwIBAgIOSkcAAQAC5aBd1j8AUb8wDQYJKoZIhvcNAQEFBQAwdjELMAkGA1UEBhMC +REUxHDAaBgNVBAoTE1RDIFRydXN0Q2VudGVyIEdtYkgxIjAgBgNVBAsTGVRDIFRydXN0Q2VudGVy +IENsYXNzIDMgQ0ExJTAjBgNVBAMTHFRDIFRydXN0Q2VudGVyIENsYXNzIDMgQ0EgSUkwHhcNMDYw +MTEyMTQ0MTU3WhcNMjUxMjMxMjI1OTU5WjB2MQswCQYDVQQGEwJERTEcMBoGA1UEChMTVEMgVHJ1 +c3RDZW50ZXIgR21iSDEiMCAGA1UECxMZVEMgVHJ1c3RDZW50ZXIgQ2xhc3MgMyBDQTElMCMGA1UE +AxMcVEMgVHJ1c3RDZW50ZXIgQ2xhc3MgMyBDQSBJSTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC +AQoCggEBALTgu1G7OVyLBMVMeRwjhjEQY0NVJz/GRcekPewJDRoeIMJWHt4bNwcwIi9v8Qbxq63W +yKthoy9DxLCyLfzDlml7forkzMA5EpBCYMnMNWju2l+QVl/NHE1bWEnrDgFPZPosPIlY2C8u4rBo +6SI7dYnWRBpl8huXJh0obazovVkdKyT21oQDZogkAHhg8fir/gKya/si+zXmFtGt9i4S5Po1auUZ +uV3bOx4a+9P/FRQI2AlqukWdFHlgfa9Aigdzs5OW03Q0jTo3Kd5c7PXuLjHCINy+8U9/I1LZW+Jk +2ZyqBwi1Rb3R0DHBq1SfqdLDYmAD8bs5SpJKPQq5ncWg/jcCAwEAAaOCATQwggEwMA8GA1UdEwEB +/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMB0GA1UdDgQWBBTUovyfs8PYA9NXXAek0CSnwPIA1DCB +7QYDVR0fBIHlMIHiMIHfoIHcoIHZhjVodHRwOi8vd3d3LnRydXN0Y2VudGVyLmRlL2NybC92Mi90 +Y19jbGFzc18zX2NhX0lJLmNybIaBn2xkYXA6Ly93d3cudHJ1c3RjZW50ZXIuZGUvQ049VEMlMjBU +cnVzdENlbnRlciUyMENsYXNzJTIwMyUyMENBJTIwSUksTz1UQyUyMFRydXN0Q2VudGVyJTIwR21i +SCxPVT1yb290Y2VydHMsREM9dHJ1c3RjZW50ZXIsREM9ZGU/Y2VydGlmaWNhdGVSZXZvY2F0aW9u +TGlzdD9iYXNlPzANBgkqhkiG9w0BAQUFAAOCAQEANmDkcPcGIEPZIxpC8vijsrlNirTzwppVMXzE +O2eatN9NDoqTSheLG43KieHPOh6sHfGcMrSOWXaiQYUlN6AT0PV8TtXqluJucsG7Kv5sbviRmEb8 +yRtXW+rIGjs/sFGYPAfaLFkB2otE6OF0/ado3VS6g0bsyEa1+K+XwDsJHI/OcpY9M1ZwvJbL2NV9 +IJqDnxrcOfHFcqMRA/07QlIp2+gB95tejNaNhk4Z+rwcvsUhpYeeeC422wlxo3I0+GzjBgnyXlal +092Y+tTmBvTwtiBjS+opvaqCZh77gaqnN60TGOaSw4HBM7uIHqHn4rS9MWwOUT1v+5ZWgOI2F9Hc +5A== +-----END CERTIFICATE----- + +TC TrustCenter Universal CA I +============================= +-----BEGIN CERTIFICATE----- +MIID3TCCAsWgAwIBAgIOHaIAAQAC7LdggHiNtgYwDQYJKoZIhvcNAQEFBQAweTELMAkGA1UEBhMC +REUxHDAaBgNVBAoTE1RDIFRydXN0Q2VudGVyIEdtYkgxJDAiBgNVBAsTG1RDIFRydXN0Q2VudGVy +IFVuaXZlcnNhbCBDQTEmMCQGA1UEAxMdVEMgVHJ1c3RDZW50ZXIgVW5pdmVyc2FsIENBIEkwHhcN +MDYwMzIyMTU1NDI4WhcNMjUxMjMxMjI1OTU5WjB5MQswCQYDVQQGEwJERTEcMBoGA1UEChMTVEMg +VHJ1c3RDZW50ZXIgR21iSDEkMCIGA1UECxMbVEMgVHJ1c3RDZW50ZXIgVW5pdmVyc2FsIENBMSYw +JAYDVQQDEx1UQyBUcnVzdENlbnRlciBVbml2ZXJzYWwgQ0EgSTCCASIwDQYJKoZIhvcNAQEBBQAD +ggEPADCCAQoCggEBAKR3I5ZEr5D0MacQ9CaHnPM42Q9e3s9B6DGtxnSRJJZ4Hgmgm5qVSkr1YnwC +qMqs+1oEdjneX/H5s7/zA1hV0qq34wQi0fiU2iIIAI3TfCZdzHd55yx4Oagmcw6iXSVphU9VDprv +xrlE4Vc93x9UIuVvZaozhDrzznq+VZeujRIPFDPiUHDDSYcTvFHe15gSWu86gzOSBnWLknwSaHtw +ag+1m7Z3W0hZneTvWq3zwZ7U10VOylY0Ibw+F1tvdwxIAUMpsN0/lm7mlaoMwCC2/T42J5zjXM9O +gdwZu5GQfezmlwQek8wiSdeXhrYTCjxDI3d+8NzmzSQfO4ObNDqDNOMCAwEAAaNjMGEwHwYDVR0j +BBgwFoAUkqR1LKSevoFE63n8isWVpesQdXMwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMC +AYYwHQYDVR0OBBYEFJKkdSyknr6BROt5/IrFlaXrEHVzMA0GCSqGSIb3DQEBBQUAA4IBAQAo0uCG +1eb4e/CX3CJrO5UUVg8RMKWaTzqwOuAGy2X17caXJ/4l8lfmXpWMPmRgFVp/Lw0BxbFg/UU1z/Cy +vwbZ71q+s2IhtNerNXxTPqYn8aEt2hojnczd7Dwtnic0XQ/CNnm8yUpiLe1r2X1BQ3y2qsrtYbE3 +ghUJGooWMNjsydZHcnhLEEYUjl8Or+zHL6sQ17bxbuyGssLoDZJz3KL0Dzq/YSMQiZxIQG5wALPT +ujdEWBF6AmqI8Dc08BnprNRlc/ZpjGSUOnmFKbAWKwyCPwacx/0QK54PLLae4xW/2TYcuiUaUj0a +7CIMHOCkoj3w6DnPgcB77V0fb8XQC9eY +-----END CERTIFICATE----- + +Deutsche Telekom Root CA 2 +========================== +-----BEGIN CERTIFICATE----- +MIIDnzCCAoegAwIBAgIBJjANBgkqhkiG9w0BAQUFADBxMQswCQYDVQQGEwJERTEcMBoGA1UEChMT +RGV1dHNjaGUgVGVsZWtvbSBBRzEfMB0GA1UECxMWVC1UZWxlU2VjIFRydXN0IENlbnRlcjEjMCEG +A1UEAxMaRGV1dHNjaGUgVGVsZWtvbSBSb290IENBIDIwHhcNOTkwNzA5MTIxMTAwWhcNMTkwNzA5 +MjM1OTAwWjBxMQswCQYDVQQGEwJERTEcMBoGA1UEChMTRGV1dHNjaGUgVGVsZWtvbSBBRzEfMB0G +A1UECxMWVC1UZWxlU2VjIFRydXN0IENlbnRlcjEjMCEGA1UEAxMaRGV1dHNjaGUgVGVsZWtvbSBS +b290IENBIDIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCrC6M14IspFLEUha88EOQ5 +bzVdSq7d6mGNlUn0b2SjGmBmpKlAIoTZ1KXleJMOaAGtuU1cOs7TuKhCQN/Po7qCWWqSG6wcmtoI +KyUn+WkjR/Hg6yx6m/UTAtB+NHzCnjwAWav12gz1MjwrrFDa1sPeg5TKqAyZMg4ISFZbavva4VhY +AUlfckE8FQYBjl2tqriTtM2e66foai1SNNs671x1Udrb8zH57nGYMsRUFUQM+ZtV7a3fGAigo4aK +Se5TBY8ZTNXeWHmb0mocQqvF1afPaA+W5OFhmHZhyJF81j4A4pFQh+GdCuatl9Idxjp9y7zaAzTV +jlsB9WoHtxa2bkp/AgMBAAGjQjBAMB0GA1UdDgQWBBQxw3kbuvVT1xfgiXotF2wKsyudMzAPBgNV +HRMECDAGAQH/AgEFMA4GA1UdDwEB/wQEAwIBBjANBgkqhkiG9w0BAQUFAAOCAQEAlGRZrTlk5ynr +E/5aw4sTV8gEJPB0d8Bg42f76Ymmg7+Wgnxu1MM9756AbrsptJh6sTtU6zkXR34ajgv8HzFZMQSy +zhfzLMdiNlXiItiJVbSYSKpk+tYcNthEeFpaIzpXl/V6ME+un2pMSyuOoAPjPuCp1NJ70rOo4nI8 +rZ7/gFnkm0W09juwzTkZmDLl6iFhkOQxIY40sfcvNUqFENrnijchvllj4PKFiDFT1FQUhXB59C4G +dyd1Lx+4ivn+xbrYNuSD7Odlt79jWvNGr4GUN9RBjNYj1h7P9WgbRGOiWrqnNVmh5XAFmw4jV5mU +Cm26OWMohpLzGITY+9HPBVZkVw== +-----END CERTIFICATE----- + +ComSign Secured CA +================== +-----BEGIN CERTIFICATE----- +MIIDqzCCApOgAwIBAgIRAMcoRwmzuGxFjB36JPU2TukwDQYJKoZIhvcNAQEFBQAwPDEbMBkGA1UE +AxMSQ29tU2lnbiBTZWN1cmVkIENBMRAwDgYDVQQKEwdDb21TaWduMQswCQYDVQQGEwJJTDAeFw0w +NDAzMjQxMTM3MjBaFw0yOTAzMTYxNTA0NTZaMDwxGzAZBgNVBAMTEkNvbVNpZ24gU2VjdXJlZCBD +QTEQMA4GA1UEChMHQ29tU2lnbjELMAkGA1UEBhMCSUwwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw +ggEKAoIBAQDGtWhfHZQVw6QIVS3joFd67+l0Kru5fFdJGhFeTymHDEjWaueP1H5XJLkGieQcPOqs +49ohgHMhCu95mGwfCP+hUH3ymBvJVG8+pSjsIQQPRbsHPaHA+iqYHU4Gk/v1iDurX8sWv+bznkqH +7Rnqwp9D5PGBpX8QTz7RSmKtUxvLg/8HZaWSLWapW7ha9B20IZFKF3ueMv5WJDmyVIRD9YTC2LxB +kMyd1mja6YJQqTtoz7VdApRgFrFD2UNd3V2Hbuq7s8lr9gOUCXDeFhF6K+h2j0kQmHe5Y1yLM5d1 +9guMsqtb3nQgJT/j8xH5h2iGNXHDHYwt6+UarA9z1YJZQIDTAgMBAAGjgacwgaQwDAYDVR0TBAUw +AwEB/zBEBgNVHR8EPTA7MDmgN6A1hjNodHRwOi8vZmVkaXIuY29tc2lnbi5jby5pbC9jcmwvQ29t +U2lnblNlY3VyZWRDQS5jcmwwDgYDVR0PAQH/BAQDAgGGMB8GA1UdIwQYMBaAFMFL7XC29z58ADsA +j8c+DkWfHl3sMB0GA1UdDgQWBBTBS+1wtvc+fAA7AI/HPg5Fnx5d7DANBgkqhkiG9w0BAQUFAAOC +AQEAFs/ukhNQq3sUnjO2QiBq1BW9Cav8cujvR3qQrFHBZE7piL1DRYHjZiM/EoZNGeQFsOY3wo3a +BijJD4mkU6l1P7CW+6tMM1X5eCZGbxs2mPtCdsGCuY7e+0X5YxtiOzkGynd6qDwJz2w2PQ8KRUtp +FhpFfTMDZflScZAmlaxMDPWLkz/MdXSFmLr/YnpNH4n+rr2UAJm/EaXc4HnFFgt9AmEd6oX5AhVP +51qJThRv4zdLhfXBPGHg/QVBspJ/wx2g0K5SZGBrGMYmnNj1ZOQ2GmKfig8+/21OGVZOIJFsnzQz +OjRXUDpvgV4GxvU+fE6OK85lBi5d0ipTdF7Tbieejw== +-----END CERTIFICATE----- + +Cybertrust Global Root +====================== +-----BEGIN CERTIFICATE----- +MIIDoTCCAomgAwIBAgILBAAAAAABD4WqLUgwDQYJKoZIhvcNAQEFBQAwOzEYMBYGA1UEChMPQ3li +ZXJ0cnVzdCwgSW5jMR8wHQYDVQQDExZDeWJlcnRydXN0IEdsb2JhbCBSb290MB4XDTA2MTIxNTA4 +MDAwMFoXDTIxMTIxNTA4MDAwMFowOzEYMBYGA1UEChMPQ3liZXJ0cnVzdCwgSW5jMR8wHQYDVQQD +ExZDeWJlcnRydXN0IEdsb2JhbCBSb290MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA ++Mi8vRRQZhP/8NN57CPytxrHjoXxEnOmGaoQ25yiZXRadz5RfVb23CO21O1fWLE3TdVJDm71aofW +0ozSJ8bi/zafmGWgE07GKmSb1ZASzxQG9Dvj1Ci+6A74q05IlG2OlTEQXO2iLb3VOm2yHLtgwEZL +AfVJrn5GitB0jaEMAs7u/OePuGtm839EAL9mJRQr3RAwHQeWP032a7iPt3sMpTjr3kfb1V05/Iin +89cqdPHoWqI7n1C6poxFNcJQZZXcY4Lv3b93TZxiyWNzFtApD0mpSPCzqrdsxacwOUBdrsTiXSZT +8M4cIwhhqJQZugRiQOwfOHB3EgZxpzAYXSUnpQIDAQABo4GlMIGiMA4GA1UdDwEB/wQEAwIBBjAP +BgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBS2CHsNesysIEyGVjJez6tuhS1wVzA/BgNVHR8EODA2 +MDSgMqAwhi5odHRwOi8vd3d3Mi5wdWJsaWMtdHJ1c3QuY29tL2NybC9jdC9jdHJvb3QuY3JsMB8G +A1UdIwQYMBaAFLYIew16zKwgTIZWMl7Pq26FLXBXMA0GCSqGSIb3DQEBBQUAA4IBAQBW7wojoFRO +lZfJ+InaRcHUowAl9B8Tq7ejhVhpwjCt2BWKLePJzYFa+HMjWqd8BfP9IjsO0QbE2zZMcwSO5bAi +5MXzLqXZI+O4Tkogp24CJJ8iYGd7ix1yCcUxXOl5n4BHPa2hCwcUPUf/A2kaDAtE52Mlp3+yybh2 +hO0j9n0Hq0V+09+zv+mKts2oomcrUtW3ZfA5TGOgkXmTUg9U3YO7n9GPp1Nzw8v/MOx8BLjYRB+T +X3EJIrduPuocA06dGiBh+4E37F78CkWr1+cXVdCg6mCbpvbjjFspwgZgFJ0tl0ypkxWdYcQBX0jW +WL1WMRJOEcgh4LMRkWXbtKaIOM5V +-----END CERTIFICATE----- + +ePKI Root Certification Authority +================================= +-----BEGIN CERTIFICATE----- +MIIFsDCCA5igAwIBAgIQFci9ZUdcr7iXAF7kBtK8nTANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQG +EwJUVzEjMCEGA1UECgwaQ2h1bmdod2EgVGVsZWNvbSBDby4sIEx0ZC4xKjAoBgNVBAsMIWVQS0kg +Um9vdCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTAeFw0wNDEyMjAwMjMxMjdaFw0zNDEyMjAwMjMx +MjdaMF4xCzAJBgNVBAYTAlRXMSMwIQYDVQQKDBpDaHVuZ2h3YSBUZWxlY29tIENvLiwgTHRkLjEq +MCgGA1UECwwhZVBLSSBSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MIICIjANBgkqhkiG9w0B +AQEFAAOCAg8AMIICCgKCAgEA4SUP7o3biDN1Z82tH306Tm2d0y8U82N0ywEhajfqhFAHSyZbCUNs +IZ5qyNUD9WBpj8zwIuQf5/dqIjG3LBXy4P4AakP/h2XGtRrBp0xtInAhijHyl3SJCRImHJ7K2RKi +lTza6We/CKBk49ZCt0Xvl/T29de1ShUCWH2YWEtgvM3XDZoTM1PRYfl61dd4s5oz9wCGzh1NlDiv +qOx4UXCKXBCDUSH3ET00hl7lSM2XgYI1TBnsZfZrxQWh7kcT1rMhJ5QQCtkkO7q+RBNGMD+XPNjX +12ruOzjjK9SXDrkb5wdJfzcq+Xd4z1TtW0ado4AOkUPB1ltfFLqfpo0kR0BZv3I4sjZsN/+Z0V0O +WQqraffAsgRFelQArr5T9rXn4fg8ozHSqf4hUmTFpmfwdQcGlBSBVcYn5AGPF8Fqcde+S/uUWH1+ +ETOxQvdibBjWzwloPn9s9h6PYq2lY9sJpx8iQkEeb5mKPtf5P0B6ebClAZLSnT0IFaUQAS2zMnao +lQ2zepr7BxB4EW/hj8e6DyUadCrlHJhBmd8hh+iVBmoKs2pHdmX2Os+PYhcZewoozRrSgx4hxyy/ +vv9haLdnG7t4TY3OZ+XkwY63I2binZB1NJipNiuKmpS5nezMirH4JYlcWrYvjB9teSSnUmjDhDXi +Zo1jDiVN1Rmy5nk3pyKdVDECAwEAAaNqMGgwHQYDVR0OBBYEFB4M97Zn8uGSJglFwFU5Lnc/Qkqi +MAwGA1UdEwQFMAMBAf8wOQYEZyoHAAQxMC8wLQIBADAJBgUrDgMCGgUAMAcGBWcqAwAABBRFsMLH +ClZ87lt4DJX5GFPBphzYEDANBgkqhkiG9w0BAQUFAAOCAgEACbODU1kBPpVJufGBuvl2ICO1J2B0 +1GqZNF5sAFPZn/KmsSQHRGoqxqWOeBLoR9lYGxMqXnmbnwoqZ6YlPwZpVnPDimZI+ymBV3QGypzq +KOg4ZyYr8dW1P2WT+DZdjo2NQCCHGervJ8A9tDkPJXtoUHRVnAxZfVo9QZQlUgjgRywVMRnVvwdV +xrsStZf0X4OFunHB2WyBEXYKCrC/gpf36j36+uwtqSiUO1bd0lEursC9CBWMd1I0ltabrNMdjmEP +NXubrjlpC2JgQCA2j6/7Nu4tCEoduL+bXPjqpRugc6bY+G7gMwRfaKonh+3ZwZCc7b3jajWvY9+r +GNm65ulK6lCKD2GTHuItGeIwlDWSXQ62B68ZgI9HkFFLLk3dheLSClIKF5r8GrBQAuUBo2M3IUxE +xJtRmREOc5wGj1QupyheRDmHVi03vYVElOEMSyycw5KFNGHLD7ibSkNS/jQ6fbjpKdx2qcgw+BRx +gMYeNkh0IkFch4LoGHGLQYlE535YW6i4jRPpp2zDR+2zGp1iro2C6pSe3VkQw63d4k3jMdXH7Ojy +sP6SHhYKGvzZ8/gntsm+HbRsZJB/9OTEW9c3rkIO3aQab3yIVMUWbuF6aC74Or8NpDyJO3inTmOD +BCEIZ43ygknQW/2xzQ+DhNQ+IIX3Sj0rnP0qCglN6oH4EZw= +-----END CERTIFICATE----- + +T\xc3\x9c\x42\xC4\xB0TAK UEKAE K\xC3\xB6k Sertifika Hizmet Sa\xC4\x9Flay\xc4\xb1\x63\xc4\xb1s\xc4\xb1 - S\xC3\xBCr\xC3\xBCm 3 +============================================================================================================================= +-----BEGIN CERTIFICATE----- +MIIFFzCCA/+gAwIBAgIBETANBgkqhkiG9w0BAQUFADCCASsxCzAJBgNVBAYTAlRSMRgwFgYDVQQH +DA9HZWJ6ZSAtIEtvY2FlbGkxRzBFBgNVBAoMPlTDvHJraXllIEJpbGltc2VsIHZlIFRla25vbG9q +aWsgQXJhxZ90xLFybWEgS3VydW11IC0gVMOcQsSwVEFLMUgwRgYDVQQLDD9VbHVzYWwgRWxla3Ry +b25payB2ZSBLcmlwdG9sb2ppIEFyYcWfdMSxcm1hIEVuc3RpdMO8c8O8IC0gVUVLQUUxIzAhBgNV +BAsMGkthbXUgU2VydGlmaWthc3lvbiBNZXJrZXppMUowSAYDVQQDDEFUw5xCxLBUQUsgVUVLQUUg +S8O2ayBTZXJ0aWZpa2EgSGl6bWV0IFNhxJ9sYXnEsWPEsXPEsSAtIFPDvHLDvG0gMzAeFw0wNzA4 +MjQxMTM3MDdaFw0xNzA4MjExMTM3MDdaMIIBKzELMAkGA1UEBhMCVFIxGDAWBgNVBAcMD0dlYnpl +IC0gS29jYWVsaTFHMEUGA1UECgw+VMO8cmtpeWUgQmlsaW1zZWwgdmUgVGVrbm9sb2ppayBBcmHF +n3TEsXJtYSBLdXJ1bXUgLSBUw5xCxLBUQUsxSDBGBgNVBAsMP1VsdXNhbCBFbGVrdHJvbmlrIHZl +IEtyaXB0b2xvamkgQXJhxZ90xLFybWEgRW5zdGl0w7xzw7wgLSBVRUtBRTEjMCEGA1UECwwaS2Ft +dSBTZXJ0aWZpa2FzeW9uIE1lcmtlemkxSjBIBgNVBAMMQVTDnELEsFRBSyBVRUtBRSBLw7ZrIFNl +cnRpZmlrYSBIaXptZXQgU2HEn2xhecSxY8Sxc8SxIC0gU8O8csO8bSAzMIIBIjANBgkqhkiG9w0B +AQEFAAOCAQ8AMIIBCgKCAQEAim1L/xCIOsP2fpTo6iBkcK4hgb46ezzb8R1Sf1n68yJMlaCQvEhO +Eav7t7WNeoMojCZG2E6VQIdhn8WebYGHV2yKO7Rm6sxA/OOqbLLLAdsyv9Lrhc+hDVXDWzhXcLh1 +xnnRFDDtG1hba+818qEhTsXOfJlfbLm4IpNQp81McGq+agV/E5wrHur+R84EpW+sky58K5+eeROR +6Oqeyjh1jmKwlZMq5d/pXpduIF9fhHpEORlAHLpVK/swsoHvhOPc7Jg4OQOFCKlUAwUp8MmPi+oL +hmUZEdPpCSPeaJMDyTYcIW7OjGbxmTDY17PDHfiBLqi9ggtm/oLL4eAagsNAgQIDAQABo0IwQDAd +BgNVHQ4EFgQUvYiHyY/2pAoLquvF/pEjnatKijIwDgYDVR0PAQH/BAQDAgEGMA8GA1UdEwEB/wQF +MAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAB18+kmPNOm3JpIWmgV050vQbTlswyb2zrgxvMTfvCr4 +N5EY3ATIZJkrGG2AA1nJrvhY0D7twyOfaTyGOBye79oneNGEN3GKPEs5z35FBtYt2IpNeBLWrcLT +y9LQQfMmNkqblWwM7uXRQydmwYj3erMgbOqwaSvHIOgMA8RBBZniP+Rr+KCGgceExh/VS4ESshYh +LBOhgLJeDEoTniDYYkCrkOpkSi+sDQESeUWoL4cZaMjihccwsnX5OD+ywJO0a+IDRM5noN+J1q2M +dqMTw5RhK2vZbMEHCiIHhWyFJEapvj+LeISCfiQMnf2BN+MlqO02TpUsyZyQ2uypQjyttgI= +-----END CERTIFICATE----- + +Buypass Class 2 CA 1 +==================== +-----BEGIN CERTIFICATE----- +MIIDUzCCAjugAwIBAgIBATANBgkqhkiG9w0BAQUFADBLMQswCQYDVQQGEwJOTzEdMBsGA1UECgwU +QnV5cGFzcyBBUy05ODMxNjMzMjcxHTAbBgNVBAMMFEJ1eXBhc3MgQ2xhc3MgMiBDQSAxMB4XDTA2 +MTAxMzEwMjUwOVoXDTE2MTAxMzEwMjUwOVowSzELMAkGA1UEBhMCTk8xHTAbBgNVBAoMFEJ1eXBh +c3MgQVMtOTgzMTYzMzI3MR0wGwYDVQQDDBRCdXlwYXNzIENsYXNzIDIgQ0EgMTCCASIwDQYJKoZI +hvcNAQEBBQADggEPADCCAQoCggEBAIs8B0XY9t/mx8q6jUPFR42wWsE425KEHK8T1A9vNkYgxC7M +cXA0ojTTNy7Y3Tp3L8DrKehc0rWpkTSHIln+zNvnma+WwajHQN2lFYxuyHyXA8vmIPLXl18xoS83 +0r7uvqmtqEyeIWZDO6i88wmjONVZJMHCR3axiFyCO7srpgTXjAePzdVBHfCuuCkslFJgNJQ72uA4 +0Z0zPhX0kzLFANq1KWYOOngPIVJfAuWSeyXTkh4vFZ2B5J2O6O+JzhRMVB0cgRJNcKi+EAUXfh/R +uFdV7c27UsKwHnjCTTZoy1YmwVLBvXb3WNVyfh9EdrsAiR0WnVE1703CVu9r4Iw7DekCAwEAAaNC +MEAwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUP42aWYv8e3uco684sDntkHGA1sgwDgYDVR0P +AQH/BAQDAgEGMA0GCSqGSIb3DQEBBQUAA4IBAQAVGn4TirnoB6NLJzKyQJHyIdFkhb5jatLPgcIV +1Xp+DCmsNx4cfHZSldq1fyOhKXdlyTKdqC5Wq2B2zha0jX94wNWZUYN/Xtm+DKhQ7SLHrQVMdvvt +7h5HZPb3J31cKA9FxVxiXqaakZG3Uxcu3K1gnZZkOb1naLKuBctN518fV4bVIJwo+28TOPX2EZL2 +fZleHwzoq0QkKXJAPTZSr4xYkHPB7GEseaHsh7U/2k3ZIQAw3pDaDtMaSKk+hQsUi4y8QZ5q9w5w +wDX3OaJdZtB7WZ+oRxKaJyOkLY4ng5IgodcVf/EuGO70SH8vf/GhGLWhC5SgYiAynB321O+/TIho +-----END CERTIFICATE----- + +Buypass Class 3 CA 1 +==================== +-----BEGIN CERTIFICATE----- +MIIDUzCCAjugAwIBAgIBAjANBgkqhkiG9w0BAQUFADBLMQswCQYDVQQGEwJOTzEdMBsGA1UECgwU +QnV5cGFzcyBBUy05ODMxNjMzMjcxHTAbBgNVBAMMFEJ1eXBhc3MgQ2xhc3MgMyBDQSAxMB4XDTA1 +MDUwOTE0MTMwM1oXDTE1MDUwOTE0MTMwM1owSzELMAkGA1UEBhMCTk8xHTAbBgNVBAoMFEJ1eXBh +c3MgQVMtOTgzMTYzMzI3MR0wGwYDVQQDDBRCdXlwYXNzIENsYXNzIDMgQ0EgMTCCASIwDQYJKoZI +hvcNAQEBBQADggEPADCCAQoCggEBAKSO13TZKWTeXx+HgJHqTjnmGcZEC4DVC69TB4sSveZn8AKx +ifZgisRbsELRwCGoy+Gb72RRtqfPFfV0gGgEkKBYouZ0plNTVUhjP5JW3SROjvi6K//zNIqeKNc0 +n6wv1g/xpC+9UrJJhW05NfBEMJNGJPO251P7vGGvqaMU+8IXF4Rs4HyI+MkcVyzwPX6UvCWThOia +AJpFBUJXgPROztmuOfbIUxAMZTpHe2DC1vqRycZxbL2RhzyRhkmr8w+gbCZ2Xhysm3HljbybIR6c +1jh+JIAVMYKWsUnTYjdbiAwKYjT+p0h+mbEwi5A3lRyoH6UsjfRVyNvdWQrCrXig9IsCAwEAAaNC +MEAwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUOBTmyPCppAP0Tj4io1vy1uCtQHQwDgYDVR0P +AQH/BAQDAgEGMA0GCSqGSIb3DQEBBQUAA4IBAQABZ6OMySU9E2NdFm/soT4JXJEVKirZgCFPBdy7 +pYmrEzMqnji3jG8CcmPHc3ceCQa6Oyh7pEfJYWsICCD8igWKH7y6xsL+z27sEzNxZy5p+qksP2bA +EllNC1QCkoS72xLvg3BweMhT+t/Gxv/ciC8HwEmdMldg0/L2mSlf56oBzKwzqBwKu5HEA6BvtjT5 +htOzdlSY9EqBs1OdTUDs5XcTRa9bqh/YL0yCe/4qxFi7T/ye/QNlGioOw6UgFpRreaaiErS7GqQj +el/wroQk5PMr+4okoyeYZdowdXb8GZHo2+ubPzK/QJcHJrrM85SFSnonk8+QQtS4Wxam58tAA915 +-----END CERTIFICATE----- + +EBG Elektronik Sertifika Hizmet Sa\xC4\x9Flay\xc4\xb1\x63\xc4\xb1s\xc4\xb1 +========================================================================== +-----BEGIN CERTIFICATE----- +MIIF5zCCA8+gAwIBAgIITK9zQhyOdAIwDQYJKoZIhvcNAQEFBQAwgYAxODA2BgNVBAMML0VCRyBF +bGVrdHJvbmlrIFNlcnRpZmlrYSBIaXptZXQgU2HEn2xhecSxY8Sxc8SxMTcwNQYDVQQKDC5FQkcg +QmlsacWfaW0gVGVrbm9sb2ppbGVyaSB2ZSBIaXptZXRsZXJpIEEuxZ4uMQswCQYDVQQGEwJUUjAe +Fw0wNjA4MTcwMDIxMDlaFw0xNjA4MTQwMDMxMDlaMIGAMTgwNgYDVQQDDC9FQkcgRWxla3Ryb25p +ayBTZXJ0aWZpa2EgSGl6bWV0IFNhxJ9sYXnEsWPEsXPEsTE3MDUGA1UECgwuRUJHIEJpbGnFn2lt +IFRla25vbG9qaWxlcmkgdmUgSGl6bWV0bGVyaSBBLsWeLjELMAkGA1UEBhMCVFIwggIiMA0GCSqG +SIb3DQEBAQUAA4ICDwAwggIKAoICAQDuoIRh0DpqZhAy2DE4f6en5f2h4fuXd7hxlugTlkaDT7by +X3JWbhNgpQGR4lvFzVcfd2NR/y8927k/qqk153nQ9dAktiHq6yOU/im/+4mRDGSaBUorzAzu8T2b +gmmkTPiab+ci2hC6X5L8GCcKqKpE+i4stPtGmggDg3KriORqcsnlZR9uKg+ds+g75AxuetpX/dfr +eYteIAbTdgtsApWjluTLdlHRKJ2hGvxEok3MenaoDT2/F08iiFD9rrbskFBKW5+VQarKD7JK/oCZ +TqNGFav4c0JqwmZ2sQomFd2TkuzbqV9UIlKRcF0T6kjsbgNs2d1s/OsNA/+mgxKb8amTD8UmTDGy +Y5lhcucqZJnSuOl14nypqZoaqsNW2xCaPINStnuWt6yHd6i58mcLlEOzrz5z+kI2sSXFCjEmN1Zn +uqMLfdb3ic1nobc6HmZP9qBVFCVMLDMNpkGMvQQxahByCp0OLna9XvNRiYuoP1Vzv9s6xiQFlpJI +qkuNKgPlV5EQ9GooFW5Hd4RcUXSfGenmHmMWOeMRFeNYGkS9y8RsZteEBt8w9DeiQyJ50hBs37vm +ExH8nYQKE3vwO9D8owrXieqWfo1IhR5kX9tUoqzVegJ5a9KK8GfaZXINFHDk6Y54jzJ0fFfy1tb0 +Nokb+Clsi7n2l9GkLqq+CxnCRelwXQIDAJ3Zo2MwYTAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB +/wQEAwIBBjAdBgNVHQ4EFgQU587GT/wWZ5b6SqMHwQSny2re2kcwHwYDVR0jBBgwFoAU587GT/wW +Z5b6SqMHwQSny2re2kcwDQYJKoZIhvcNAQEFBQADggIBAJuYml2+8ygjdsZs93/mQJ7ANtyVDR2t +FcU22NU57/IeIl6zgrRdu0waypIN30ckHrMk2pGI6YNw3ZPX6bqz3xZaPt7gyPvT/Wwp+BVGoGgm +zJNSroIBk5DKd8pNSe/iWtkqvTDOTLKBtjDOWU/aWR1qeqRFsIImgYZ29fUQALjuswnoT4cCB64k +XPBfrAowzIpAoHMEwfuJJPaaHFy3PApnNgUIMbOv2AFoKuB4j3TeuFGkjGwgPaL7s9QJ/XvCgKqT +bCmYIai7FvOpEl90tYeY8pUm3zTvilORiF0alKM/fCL414i6poyWqD1SNGKfAB5UVUJnxk1Gj7sU +RT0KlhaOEKGXmdXTMIXM3rRyt7yKPBgpaP3ccQfuJDlq+u2lrDgv+R4QDgZxGhBM/nV+/x5XOULK +1+EVoVZVWRvRo68R2E7DpSvvkL/A7IITW43WciyTTo9qKd+FPNMN4KIYEsxVL0e3p5sC/kH2iExt +2qkBR4NkJ2IQgtYSe14DHzSpyZH+r11thie3I6p1GMog57AP14kOpmciY/SDQSsGS7tY1dHXt7kQ +Y9iJSrSq3RZj9W6+YKH47ejWkE8axsWgKdOnIaj1Wjz3x0miIZpKlVIglnKaZsv30oZDfCK+lvm9 +AahH3eU7QPl1K5srRmSGjR70j/sHd9DqSaIcjVIUpgqT +-----END CERTIFICATE----- + +certSIGN ROOT CA +================ +-----BEGIN CERTIFICATE----- +MIIDODCCAiCgAwIBAgIGIAYFFnACMA0GCSqGSIb3DQEBBQUAMDsxCzAJBgNVBAYTAlJPMREwDwYD +VQQKEwhjZXJ0U0lHTjEZMBcGA1UECxMQY2VydFNJR04gUk9PVCBDQTAeFw0wNjA3MDQxNzIwMDRa +Fw0zMTA3MDQxNzIwMDRaMDsxCzAJBgNVBAYTAlJPMREwDwYDVQQKEwhjZXJ0U0lHTjEZMBcGA1UE +CxMQY2VydFNJR04gUk9PVCBDQTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALczuX7I +JUqOtdu0KBuqV5Do0SLTZLrTk+jUrIZhQGpgV2hUhE28alQCBf/fm5oqrl0Hj0rDKH/v+yv6efHH +rfAQUySQi2bJqIirr1qjAOm+ukbuW3N7LBeCgV5iLKECZbO9xSsAfsT8AzNXDe3i+s5dRdY4zTW2 +ssHQnIFKquSyAVwdj1+ZxLGt24gh65AIgoDzMKND5pCCrlUoSe1b16kQOA7+j0xbm0bqQfWwCHTD +0IgztnzXdN/chNFDDnU5oSVAKOp4yw4sLjmdjItuFhwvJoIQ4uNllAoEwF73XVv4EOLQunpL+943 +AAAaWyjj0pxzPjKHmKHJUS/X3qwzs08CAwEAAaNCMEAwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8B +Af8EBAMCAcYwHQYDVR0OBBYEFOCMm9slSbPxfIbWskKHC9BroNnkMA0GCSqGSIb3DQEBBQUAA4IB +AQA+0hyJLjX8+HXd5n9liPRyTMks1zJO890ZeUe9jjtbkw9QSSQTaxQGcu8J06Gh40CEyecYMnQ8 +SG4Pn0vU9x7Tk4ZkVJdjclDVVc/6IJMCopvDI5NOFlV2oHB5bc0hH88vLbwZ44gx+FkagQnIl6Z0 +x2DEW8xXjrJ1/RsCCdtZb3KTafcxQdaIOL+Hsr0Wefmq5L6IJd1hJyMctTEHBDa0GpC9oHRxUIlt +vBTjD4au8as+x6AJzKNI0eDbZOeStc+vckNwi/nDhDwTqn6Sm1dTk/pwwpEOMfmbZ13pljheX7Nz +TogVZ96edhBiIL5VaZVDADlN9u6wWk5JRFRYX0KD +-----END CERTIFICATE----- + +CNNIC ROOT +========== +-----BEGIN CERTIFICATE----- +MIIDVTCCAj2gAwIBAgIESTMAATANBgkqhkiG9w0BAQUFADAyMQswCQYDVQQGEwJDTjEOMAwGA1UE +ChMFQ05OSUMxEzARBgNVBAMTCkNOTklDIFJPT1QwHhcNMDcwNDE2MDcwOTE0WhcNMjcwNDE2MDcw +OTE0WjAyMQswCQYDVQQGEwJDTjEOMAwGA1UEChMFQ05OSUMxEzARBgNVBAMTCkNOTklDIFJPT1Qw +ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDTNfc/c3et6FtzF8LRb+1VvG7q6KR5smzD +o+/hn7E7SIX1mlwhIhAsxYLO2uOabjfhhyzcuQxauohV3/2q2x8x6gHx3zkBwRP9SFIhxFXf2tiz +VHa6dLG3fdfA6PZZxU3Iva0fFNrfWEQlMhkqx35+jq44sDB7R3IJMfAw28Mbdim7aXZOV/kbZKKT +VrdvmW7bCgScEeOAH8tjlBAKqeFkgjH5jCftppkA9nCTGPihNIaj3XrCGHn2emU1z5DrvTOTn1Or +czvmmzQgLx3vqR1jGqCA2wMv+SYahtKNu6m+UjqHZ0gNv7Sg2Ca+I19zN38m5pIEo3/PIKe38zrK +y5nLAgMBAAGjczBxMBEGCWCGSAGG+EIBAQQEAwIABzAfBgNVHSMEGDAWgBRl8jGtKvf33VKWCscC +wQ7vptU7ETAPBgNVHRMBAf8EBTADAQH/MAsGA1UdDwQEAwIB/jAdBgNVHQ4EFgQUZfIxrSr3991S +lgrHAsEO76bVOxEwDQYJKoZIhvcNAQEFBQADggEBAEs17szkrr/Dbq2flTtLP1se31cpolnKOOK5 +Gv+e5m4y3R6u6jW39ZORTtpC4cMXYFDy0VwmuYK36m3knITnA3kXr5g9lNvHugDnuL8BV8F3RTIM +O/G0HAiw/VGgod2aHRM2mm23xzy54cXZF/qD1T0VoDy7HgviyJA/qIYM/PmLXoXLT1tLYhFHxUV8 +BS9BsZ4QaRuZluBVeftOhpm4lNqGOGqTo+fLbuXf6iFViZx9fX+Y9QCJ7uOEwFyWtcVG6kbghVW2 +G8kS1sHNzYDzAgE8yGnLRUhj2JTQ7IUOO04RZfSCjKY9ri4ilAnIXOo8gV0WKgOXFlUJ24pBgp5m +mxE= +-----END CERTIFICATE----- + +ApplicationCA - Japanese Government +=================================== +-----BEGIN CERTIFICATE----- +MIIDoDCCAoigAwIBAgIBMTANBgkqhkiG9w0BAQUFADBDMQswCQYDVQQGEwJKUDEcMBoGA1UEChMT +SmFwYW5lc2UgR292ZXJubWVudDEWMBQGA1UECxMNQXBwbGljYXRpb25DQTAeFw0wNzEyMTIxNTAw +MDBaFw0xNzEyMTIxNTAwMDBaMEMxCzAJBgNVBAYTAkpQMRwwGgYDVQQKExNKYXBhbmVzZSBHb3Zl +cm5tZW50MRYwFAYDVQQLEw1BcHBsaWNhdGlvbkNBMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB +CgKCAQEAp23gdE6Hj6UG3mii24aZS2QNcfAKBZuOquHMLtJqO8F6tJdhjYq+xpqcBrSGUeQ3DnR4 +fl+Kf5Sk10cI/VBaVuRorChzoHvpfxiSQE8tnfWuREhzNgaeZCw7NCPbXCbkcXmP1G55IrmTwcrN +wVbtiGrXoDkhBFcsovW8R0FPXjQilbUfKW1eSvNNcr5BViCH/OlQR9cwFO5cjFW6WY2H/CPek9AE +jP3vbb3QesmlOmpyM8ZKDQUXKi17safY1vC+9D/qDihtQWEjdnjDuGWk81quzMKq2edY3rZ+nYVu +nyoKb58DKTCXKB28t89UKU5RMfkntigm/qJj5kEW8DOYRwIDAQABo4GeMIGbMB0GA1UdDgQWBBRU +WssmP3HMlEYNllPqa0jQk/5CdTAOBgNVHQ8BAf8EBAMCAQYwWQYDVR0RBFIwUKROMEwxCzAJBgNV +BAYTAkpQMRgwFgYDVQQKDA/ml6XmnKzlm73mlL/lupwxIzAhBgNVBAsMGuOCouODl+ODquOCseOD +vOOCt+ODp+ODs0NBMA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBADlqRHZ3ODrs +o2dGD/mLBqj7apAxzn7s2tGJfHrrLgy9mTLnsCTWw//1sogJhyzjVOGjprIIC8CFqMjSnHH2HZ9g +/DgzE+Ge3Atf2hZQKXsvcJEPmbo0NI2VdMV+eKlmXb3KIXdCEKxmJj3ekav9FfBv7WxfEPjzFvYD +io+nEhEMy/0/ecGc/WLuo89UDNErXxc+4z6/wCs+CZv+iKZ+tJIX/COUgb1up8WMwusRRdv4QcmW +dupwX3kSa+SjB1oF7ydJzyGfikwJcGapJsErEU4z0g781mzSDjJkaP+tBXhfAx2o45CsJOAPQKdL +rosot4LKGAfmt1t06SAZf7IbiVQ= +-----END CERTIFICATE----- + +GeoTrust Primary Certification Authority - G3 +============================================= +-----BEGIN CERTIFICATE----- +MIID/jCCAuagAwIBAgIQFaxulBmyeUtB9iepwxgPHzANBgkqhkiG9w0BAQsFADCBmDELMAkGA1UE +BhMCVVMxFjAUBgNVBAoTDUdlb1RydXN0IEluYy4xOTA3BgNVBAsTMChjKSAyMDA4IEdlb1RydXN0 +IEluYy4gLSBGb3IgYXV0aG9yaXplZCB1c2Ugb25seTE2MDQGA1UEAxMtR2VvVHJ1c3QgUHJpbWFy +eSBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eSAtIEczMB4XDTA4MDQwMjAwMDAwMFoXDTM3MTIwMTIz +NTk1OVowgZgxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1HZW9UcnVzdCBJbmMuMTkwNwYDVQQLEzAo +YykgMjAwOCBHZW9UcnVzdCBJbmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNlIG9ubHkxNjA0BgNVBAMT +LUdlb1RydXN0IFByaW1hcnkgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkgLSBHMzCCASIwDQYJKoZI +hvcNAQEBBQADggEPADCCAQoCggEBANziXmJYHTNXOTIz+uvLh4yn1ErdBojqZI4xmKU4kB6Yzy5j +K/BGvESyiaHAKAxJcCGVn2TAppMSAmUmhsalifD614SgcK9PGpc/BkTVyetyEH3kMSj7HGHmKAdE +c5IiaacDiGydY8hS2pgn5whMcD60yRLBxWeDXTPzAxHsatBT4tG6NmCUgLthY2xbF37fQJQeqw3C +IShwiP/WJmxsYAQlTlV+fe+/lEjetx3dcI0FX4ilm/LC7urRQEFtYjgdVgbFA0dRIBn8exALDmKu +dlW/X3e+PkkBUz2YJQN2JFodtNuJ6nnltrM7P7pMKEF/BqxqjsHQ9gUdfeZChuOl1UcCAwEAAaNC +MEAwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYEFMR5yo6hTgMdHNxr +2zFblD4/MH8tMA0GCSqGSIb3DQEBCwUAA4IBAQAtxRPPVoB7eni9n64smefv2t+UXglpp+duaIy9 +cr5HqQ6XErhK8WTTOd8lNNTBzU6B8A8ExCSzNJbGpqow32hhc9f5joWJ7w5elShKKiePEI4ufIbE +Ap7aDHdlDkQNkv39sxY2+hENHYwOB4lqKVb3cvTdFZx3NWZXqxNT2I7BQMXXExZacse3aQHEerGD +AWh9jUGhlBjBJVz88P6DAod8DQ3PLghcSkANPuyBYeYk28rgDi0Hsj5W3I31QYUHSJsMC8tJP33s +t/3LjWeJGqvtux6jAAgIFyqCXDFdRootD4abdNlF+9RAsXqqaC2Gspki4cErx5z481+oghLrGREt +-----END CERTIFICATE----- + +thawte Primary Root CA - G2 +=========================== +-----BEGIN CERTIFICATE----- +MIICiDCCAg2gAwIBAgIQNfwmXNmET8k9Jj1Xm67XVjAKBggqhkjOPQQDAzCBhDELMAkGA1UEBhMC +VVMxFTATBgNVBAoTDHRoYXd0ZSwgSW5jLjE4MDYGA1UECxMvKGMpIDIwMDcgdGhhd3RlLCBJbmMu +IC0gRm9yIGF1dGhvcml6ZWQgdXNlIG9ubHkxJDAiBgNVBAMTG3RoYXd0ZSBQcmltYXJ5IFJvb3Qg +Q0EgLSBHMjAeFw0wNzExMDUwMDAwMDBaFw0zODAxMTgyMzU5NTlaMIGEMQswCQYDVQQGEwJVUzEV +MBMGA1UEChMMdGhhd3RlLCBJbmMuMTgwNgYDVQQLEy8oYykgMjAwNyB0aGF3dGUsIEluYy4gLSBG +b3IgYXV0aG9yaXplZCB1c2Ugb25seTEkMCIGA1UEAxMbdGhhd3RlIFByaW1hcnkgUm9vdCBDQSAt +IEcyMHYwEAYHKoZIzj0CAQYFK4EEACIDYgAEotWcgnuVnfFSeIf+iha/BebfowJPDQfGAFG6DAJS +LSKkQjnE/o/qycG+1E3/n3qe4rF8mq2nhglzh9HnmuN6papu+7qzcMBniKI11KOasf2twu8x+qi5 +8/sIxpHR+ymVo0IwQDAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQU +mtgAMADna3+FGO6Lts6KDPgR4bswCgYIKoZIzj0EAwMDaQAwZgIxAN344FdHW6fmCsO99YCKlzUN +G4k8VIZ3KMqh9HneteY4sPBlcIx/AlTCv//YoT7ZzwIxAMSNlPzcU9LcnXgWHxUzI1NS41oxXZ3K +rr0TKUQNJ1uo52icEvdYPy5yAlejj6EULg== +-----END CERTIFICATE----- + +thawte Primary Root CA - G3 +=========================== +-----BEGIN CERTIFICATE----- +MIIEKjCCAxKgAwIBAgIQYAGXt0an6rS0mtZLL/eQ+zANBgkqhkiG9w0BAQsFADCBrjELMAkGA1UE +BhMCVVMxFTATBgNVBAoTDHRoYXd0ZSwgSW5jLjEoMCYGA1UECxMfQ2VydGlmaWNhdGlvbiBTZXJ2 +aWNlcyBEaXZpc2lvbjE4MDYGA1UECxMvKGMpIDIwMDggdGhhd3RlLCBJbmMuIC0gRm9yIGF1dGhv +cml6ZWQgdXNlIG9ubHkxJDAiBgNVBAMTG3RoYXd0ZSBQcmltYXJ5IFJvb3QgQ0EgLSBHMzAeFw0w +ODA0MDIwMDAwMDBaFw0zNzEyMDEyMzU5NTlaMIGuMQswCQYDVQQGEwJVUzEVMBMGA1UEChMMdGhh +d3RlLCBJbmMuMSgwJgYDVQQLEx9DZXJ0aWZpY2F0aW9uIFNlcnZpY2VzIERpdmlzaW9uMTgwNgYD +VQQLEy8oYykgMjAwOCB0aGF3dGUsIEluYy4gLSBGb3IgYXV0aG9yaXplZCB1c2Ugb25seTEkMCIG +A1UEAxMbdGhhd3RlIFByaW1hcnkgUm9vdCBDQSAtIEczMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A +MIIBCgKCAQEAsr8nLPvb2FvdeHsbnndmgcs+vHyu86YnmjSjaDFxODNi5PNxZnmxqWWjpYvVj2At +P0LMqmsywCPLLEHd5N/8YZzic7IilRFDGF/Eth9XbAoFWCLINkw6fKXRz4aviKdEAhN0cXMKQlkC ++BsUa0Lfb1+6a4KinVvnSr0eAXLbS3ToO39/fR8EtCab4LRarEc9VbjXsCZSKAExQGbY2SS99irY +7CFJXJv2eul/VTV+lmuNk5Mny5K76qxAwJ/C+IDPXfRa3M50hqY+bAtTyr2SzhkGcuYMXDhpxwTW +vGzOW/b3aJzcJRVIiKHpqfiYnODz1TEoYRFsZ5aNOZnLwkUkOQIDAQABo0IwQDAPBgNVHRMBAf8E +BTADAQH/MA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUrWyqlGCc7eT/+j4KdCtjA/e2Wb8wDQYJ +KoZIhvcNAQELBQADggEBABpA2JVlrAmSicY59BDlqQ5mU1143vokkbvnRFHfxhY0Cu9qRFHqKweK +A3rD6z8KLFIWoCtDuSWQP3CpMyVtRRooOyfPqsMpQhvfO0zAMzRbQYi/aytlryjvsvXDqmbOe1bu +t8jLZ8HJnBoYuMTDSQPxYA5QzUbF83d597YV4Djbxy8ooAw/dyZ02SUS2jHaGh7cKUGRIjxpp7sC +8rZcJwOJ9Abqm+RyguOhCcHpABnTPtRwa7pxpqpYrvS76Wy274fMm7v/OeZWYdMKp8RcTGB7BXcm +er/YB1IsYvdwY9k5vG8cwnncdimvzsUsZAReiDZuMdRAGmI0Nj81Aa6sY6A= +-----END CERTIFICATE----- + +GeoTrust Primary Certification Authority - G2 +============================================= +-----BEGIN CERTIFICATE----- +MIICrjCCAjWgAwIBAgIQPLL0SAoA4v7rJDteYD7DazAKBggqhkjOPQQDAzCBmDELMAkGA1UEBhMC +VVMxFjAUBgNVBAoTDUdlb1RydXN0IEluYy4xOTA3BgNVBAsTMChjKSAyMDA3IEdlb1RydXN0IElu +Yy4gLSBGb3IgYXV0aG9yaXplZCB1c2Ugb25seTE2MDQGA1UEAxMtR2VvVHJ1c3QgUHJpbWFyeSBD +ZXJ0aWZpY2F0aW9uIEF1dGhvcml0eSAtIEcyMB4XDTA3MTEwNTAwMDAwMFoXDTM4MDExODIzNTk1 +OVowgZgxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1HZW9UcnVzdCBJbmMuMTkwNwYDVQQLEzAoYykg +MjAwNyBHZW9UcnVzdCBJbmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNlIG9ubHkxNjA0BgNVBAMTLUdl +b1RydXN0IFByaW1hcnkgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkgLSBHMjB2MBAGByqGSM49AgEG +BSuBBAAiA2IABBWx6P0DFUPlrOuHNxFi79KDNlJ9RVcLSo17VDs6bl8VAsBQps8lL33KSLjHUGMc +KiEIfJo22Av+0SbFWDEwKCXzXV2juLaltJLtbCyf691DiaI8S0iRHVDsJt/WYC69IaNCMEAwDwYD +VR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYEFBVfNVdRVfslsq0DafwBo/q+ +EVXVMAoGCCqGSM49BAMDA2cAMGQCMGSWWaboCd6LuvpaiIjwH5HTRqjySkwCY/tsXzjbLkGTqQ7m +ndwxHLKgpxgceeHHNgIwOlavmnRs9vuD4DPTCF+hnMJbn0bWtsuRBmOiBuczrD6ogRLQy7rQkgu2 +npaqBA+K +-----END CERTIFICATE----- + +VeriSign Universal Root Certification Authority +=============================================== +-----BEGIN CERTIFICATE----- +MIIEuTCCA6GgAwIBAgIQQBrEZCGzEyEDDrvkEhrFHTANBgkqhkiG9w0BAQsFADCBvTELMAkGA1UE +BhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQLExZWZXJpU2lnbiBUcnVzdCBO +ZXR3b3JrMTowOAYDVQQLEzEoYykgMjAwOCBWZXJpU2lnbiwgSW5jLiAtIEZvciBhdXRob3JpemVk +IHVzZSBvbmx5MTgwNgYDVQQDEy9WZXJpU2lnbiBVbml2ZXJzYWwgUm9vdCBDZXJ0aWZpY2F0aW9u +IEF1dGhvcml0eTAeFw0wODA0MDIwMDAwMDBaFw0zNzEyMDEyMzU5NTlaMIG9MQswCQYDVQQGEwJV +UzEXMBUGA1UEChMOVmVyaVNpZ24sIEluYy4xHzAdBgNVBAsTFlZlcmlTaWduIFRydXN0IE5ldHdv +cmsxOjA4BgNVBAsTMShjKSAyMDA4IFZlcmlTaWduLCBJbmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNl +IG9ubHkxODA2BgNVBAMTL1ZlcmlTaWduIFVuaXZlcnNhbCBSb290IENlcnRpZmljYXRpb24gQXV0 +aG9yaXR5MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAx2E3XrEBNNti1xWb/1hajCMj +1mCOkdeQmIN65lgZOIzF9uVkhbSicfvtvbnazU0AtMgtc6XHaXGVHzk8skQHnOgO+k1KxCHfKWGP +MiJhgsWHH26MfF8WIFFE0XBPV+rjHOPMee5Y2A7Cs0WTwCznmhcrewA3ekEzeOEz4vMQGn+HLL72 +9fdC4uW/h2KJXwBL38Xd5HVEMkE6HnFuacsLdUYI0crSK5XQz/u5QGtkjFdN/BMReYTtXlT2NJ8I +AfMQJQYXStrxHXpma5hgZqTZ79IugvHw7wnqRMkVauIDbjPTrJ9VAMf2CGqUuV/c4DPxhGD5WycR +tPwW8rtWaoAljQIDAQABo4GyMIGvMA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMG0G +CCsGAQUFBwEMBGEwX6FdoFswWTBXMFUWCWltYWdlL2dpZjAhMB8wBwYFKw4DAhoEFI/l0xqGrI2O +a8PPgGrUSBgsexkuMCUWI2h0dHA6Ly9sb2dvLnZlcmlzaWduLmNvbS92c2xvZ28uZ2lmMB0GA1Ud +DgQWBBS2d/ppSEefUxLVwuoHMnYH0ZcHGTANBgkqhkiG9w0BAQsFAAOCAQEASvj4sAPmLGd75JR3 +Y8xuTPl9Dg3cyLk1uXBPY/ok+myDjEedO2Pzmvl2MpWRsXe8rJq+seQxIcaBlVZaDrHC1LGmWazx +Y8u4TB1ZkErvkBYoH1quEPuBUDgMbMzxPcP1Y+Oz4yHJJDnp/RVmRvQbEdBNc6N9Rvk97ahfYtTx +P/jgdFcrGJ2BtMQo2pSXpXDrrB2+BxHw1dvd5Yzw1TKwg+ZX4o+/vqGqvz0dtdQ46tewXDpPaj+P +wGZsY6rp2aQW9IHRlRQOfc2VNNnSj3BzgXucfr2YYdhFh5iQxeuGMMY1v/D/w1WIg0vvBZIGcfK4 +mJO37M2CYfE45k+XmCpajQ== +-----END CERTIFICATE----- + +VeriSign Class 3 Public Primary Certification Authority - G4 +============================================================ +-----BEGIN CERTIFICATE----- +MIIDhDCCAwqgAwIBAgIQL4D+I4wOIg9IZxIokYesszAKBggqhkjOPQQDAzCByjELMAkGA1UEBhMC +VVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQLExZWZXJpU2lnbiBUcnVzdCBOZXR3 +b3JrMTowOAYDVQQLEzEoYykgMjAwNyBWZXJpU2lnbiwgSW5jLiAtIEZvciBhdXRob3JpemVkIHVz +ZSBvbmx5MUUwQwYDVQQDEzxWZXJpU2lnbiBDbGFzcyAzIFB1YmxpYyBQcmltYXJ5IENlcnRpZmlj +YXRpb24gQXV0aG9yaXR5IC0gRzQwHhcNMDcxMTA1MDAwMDAwWhcNMzgwMTE4MjM1OTU5WjCByjEL +MAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQLExZWZXJpU2lnbiBU +cnVzdCBOZXR3b3JrMTowOAYDVQQLEzEoYykgMjAwNyBWZXJpU2lnbiwgSW5jLiAtIEZvciBhdXRo +b3JpemVkIHVzZSBvbmx5MUUwQwYDVQQDEzxWZXJpU2lnbiBDbGFzcyAzIFB1YmxpYyBQcmltYXJ5 +IENlcnRpZmljYXRpb24gQXV0aG9yaXR5IC0gRzQwdjAQBgcqhkjOPQIBBgUrgQQAIgNiAASnVnp8 +Utpkmw4tXNherJI9/gHmGUo9FANL+mAnINmDiWn6VMaaGF5VKmTeBvaNSjutEDxlPZCIBIngMGGz +rl0Bp3vefLK+ymVhAIau2o970ImtTR1ZmkGxvEeA3J5iw/mjgbIwga8wDwYDVR0TAQH/BAUwAwEB +/zAOBgNVHQ8BAf8EBAMCAQYwbQYIKwYBBQUHAQwEYTBfoV2gWzBZMFcwVRYJaW1hZ2UvZ2lmMCEw +HzAHBgUrDgMCGgQUj+XTGoasjY5rw8+AatRIGCx7GS4wJRYjaHR0cDovL2xvZ28udmVyaXNpZ24u +Y29tL3ZzbG9nby5naWYwHQYDVR0OBBYEFLMWkf3upm7ktS5Jj4d4gYDs5bG1MAoGCCqGSM49BAMD +A2gAMGUCMGYhDBgmYFo4e1ZC4Kf8NoRRkSAsdk1DPcQdhCPQrNZ8NQbOzWm9kA3bbEhCHQ6qQgIx +AJw9SDkjOVgaFRJZap7v1VmyHVIsmXHNxynfGyphe3HR3vPA5Q06Sqotp9iGKt0uEA== +-----END CERTIFICATE----- + +NetLock Arany (Class Gold) Főtanúsítvány +============================================ +-----BEGIN CERTIFICATE----- +MIIEFTCCAv2gAwIBAgIGSUEs5AAQMA0GCSqGSIb3DQEBCwUAMIGnMQswCQYDVQQGEwJIVTERMA8G +A1UEBwwIQnVkYXBlc3QxFTATBgNVBAoMDE5ldExvY2sgS2Z0LjE3MDUGA1UECwwuVGFuw7pzw610 +dsOhbnlraWFkw7NrIChDZXJ0aWZpY2F0aW9uIFNlcnZpY2VzKTE1MDMGA1UEAwwsTmV0TG9jayBB +cmFueSAoQ2xhc3MgR29sZCkgRsWRdGFuw7pzw610dsOhbnkwHhcNMDgxMjExMTUwODIxWhcNMjgx +MjA2MTUwODIxWjCBpzELMAkGA1UEBhMCSFUxETAPBgNVBAcMCEJ1ZGFwZXN0MRUwEwYDVQQKDAxO +ZXRMb2NrIEtmdC4xNzA1BgNVBAsMLlRhbsO6c8OtdHbDoW55a2lhZMOzayAoQ2VydGlmaWNhdGlv +biBTZXJ2aWNlcykxNTAzBgNVBAMMLE5ldExvY2sgQXJhbnkgKENsYXNzIEdvbGQpIEbFkXRhbsO6 +c8OtdHbDoW55MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxCRec75LbRTDofTjl5Bu +0jBFHjzuZ9lk4BqKf8owyoPjIMHj9DrTlF8afFttvzBPhCf2nx9JvMaZCpDyD/V/Q4Q3Y1GLeqVw +/HpYzY6b7cNGbIRwXdrzAZAj/E4wqX7hJ2Pn7WQ8oLjJM2P+FpD/sLj916jAwJRDC7bVWaaeVtAk +H3B5r9s5VA1lddkVQZQBr17s9o3x/61k/iCa11zr/qYfCGSji3ZVrR47KGAuhyXoqq8fxmRGILdw +fzzeSNuWU7c5d+Qa4scWhHaXWy+7GRWF+GmF9ZmnqfI0p6m2pgP8b4Y9VHx2BJtr+UBdADTHLpl1 +neWIA6pN+APSQnbAGwIDAKiLo0UwQzASBgNVHRMBAf8ECDAGAQH/AgEEMA4GA1UdDwEB/wQEAwIB +BjAdBgNVHQ4EFgQUzPpnk/C2uNClwB7zU/2MU9+D15YwDQYJKoZIhvcNAQELBQADggEBAKt/7hwW +qZw8UQCgwBEIBaeZ5m8BiFRhbvG5GK1Krf6BQCOUL/t1fC8oS2IkgYIL9WHxHG64YTjrgfpioTta +YtOUZcTh5m2C+C8lcLIhJsFyUR+MLMOEkMNaj7rP9KdlpeuY0fsFskZ1FSNqb4VjMIDw1Z4fKRzC +bLBQWV2QWzuoDTDPv31/zvGdg73JRm4gpvlhUbohL3u+pRVjodSVh/GeufOJ8z2FuLjbvrW5Kfna +NwUASZQDhETnv0Mxz3WLJdH0pmT1kvarBes96aULNmLazAZfNou2XjG4Kvte9nHfRCaexOYNkbQu +dZWAUWpLMKawYqGT8ZvYzsRjdT9ZR7E= +-----END CERTIFICATE----- + +Staat der Nederlanden Root CA - G2 +================================== +-----BEGIN CERTIFICATE----- +MIIFyjCCA7KgAwIBAgIEAJiWjDANBgkqhkiG9w0BAQsFADBaMQswCQYDVQQGEwJOTDEeMBwGA1UE +CgwVU3RhYXQgZGVyIE5lZGVybGFuZGVuMSswKQYDVQQDDCJTdGFhdCBkZXIgTmVkZXJsYW5kZW4g +Um9vdCBDQSAtIEcyMB4XDTA4MDMyNjExMTgxN1oXDTIwMDMyNTExMDMxMFowWjELMAkGA1UEBhMC +TkwxHjAcBgNVBAoMFVN0YWF0IGRlciBOZWRlcmxhbmRlbjErMCkGA1UEAwwiU3RhYXQgZGVyIE5l +ZGVybGFuZGVuIFJvb3QgQ0EgLSBHMjCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAMVZ +5291qj5LnLW4rJ4L5PnZyqtdj7U5EILXr1HgO+EASGrP2uEGQxGZqhQlEq0i6ABtQ8SpuOUfiUtn +vWFI7/3S4GCI5bkYYCjDdyutsDeqN95kWSpGV+RLufg3fNU254DBtvPUZ5uW6M7XxgpT0GtJlvOj +CwV3SPcl5XCsMBQgJeN/dVrlSPhOewMHBPqCYYdu8DvEpMfQ9XQ+pV0aCPKbJdL2rAQmPlU6Yiil +e7Iwr/g3wtG61jj99O9JMDeZJiFIhQGp5Rbn3JBV3w/oOM2ZNyFPXfUib2rFEhZgF1XyZWampzCR +OME4HYYEhLoaJXhena/MUGDWE4dS7WMfbWV9whUYdMrhfmQpjHLYFhN9C0lK8SgbIHRrxT3dsKpI +CT0ugpTNGmXZK4iambwYfp/ufWZ8Pr2UuIHOzZgweMFvZ9C+X+Bo7d7iscksWXiSqt8rYGPy5V65 +48r6f1CGPqI0GAwJaCgRHOThuVw+R7oyPxjMW4T182t0xHJ04eOLoEq9jWYv6q012iDTiIJh8BIi +trzQ1aTsr1SIJSQ8p22xcik/Plemf1WvbibG/ufMQFxRRIEKeN5KzlW/HdXZt1bv8Hb/C3m1r737 +qWmRRpdogBQ2HbN/uymYNqUg+oJgYjOk7Na6B6duxc8UpufWkjTYgfX8HV2qXB72o007uPc5AgMB +AAGjgZcwgZQwDwYDVR0TAQH/BAUwAwEB/zBSBgNVHSAESzBJMEcGBFUdIAAwPzA9BggrBgEFBQcC +ARYxaHR0cDovL3d3dy5wa2lvdmVyaGVpZC5ubC9wb2xpY2llcy9yb290LXBvbGljeS1HMjAOBgNV +HQ8BAf8EBAMCAQYwHQYDVR0OBBYEFJFoMocVHYnitfGsNig0jQt8YojrMA0GCSqGSIb3DQEBCwUA +A4ICAQCoQUpnKpKBglBu4dfYszk78wIVCVBR7y29JHuIhjv5tLySCZa59sCrI2AGeYwRTlHSeYAz ++51IvuxBQ4EffkdAHOV6CMqqi3WtFMTC6GY8ggen5ieCWxjmD27ZUD6KQhgpxrRW/FYQoAUXvQwj +f/ST7ZwaUb7dRUG/kSS0H4zpX897IZmflZ85OkYcbPnNe5yQzSipx6lVu6xiNGI1E0sUOlWDuYaN +kqbG9AclVMwWVxJKgnjIFNkXgiYtXSAfea7+1HAWFpWD2DU5/1JddRwWxRNVz0fMdWVSSt7wsKfk +CpYL+63C4iWEst3kvX5ZbJvw8NjnyvLplzh+ib7M+zkXYT9y2zqR2GUBGR2tUKRXCnxLvJxxcypF +URmFzI79R6d0lR2o0a9OF7FpJsKqeFdbxU2n5Z4FF5TKsl+gSRiNNOkmbEgeqmiSBeGCc1qb3Adb +CG19ndeNIdn8FCCqwkXfP+cAslHkwvgFuXkajDTznlvkN1trSt8sV4pAWja63XVECDdCcAz+3F4h +oKOKwJCcaNpQ5kUQR3i2TtJlycM33+FCY7BXN0Ute4qcvwXqZVUz9zkQxSgqIXobisQk+T8VyJoV +IPVVYpbtbZNQvOSqeK3Zywplh6ZmwcSBo3c6WB4L7oOLnR7SUqTMHW+wmG2UMbX4cQrcufx9MmDm +66+KAQ== +-----END CERTIFICATE----- + +CA Disig +======== +-----BEGIN CERTIFICATE----- +MIIEDzCCAvegAwIBAgIBATANBgkqhkiG9w0BAQUFADBKMQswCQYDVQQGEwJTSzETMBEGA1UEBxMK +QnJhdGlzbGF2YTETMBEGA1UEChMKRGlzaWcgYS5zLjERMA8GA1UEAxMIQ0EgRGlzaWcwHhcNMDYw +MzIyMDEzOTM0WhcNMTYwMzIyMDEzOTM0WjBKMQswCQYDVQQGEwJTSzETMBEGA1UEBxMKQnJhdGlz +bGF2YTETMBEGA1UEChMKRGlzaWcgYS5zLjERMA8GA1UEAxMIQ0EgRGlzaWcwggEiMA0GCSqGSIb3 +DQEBAQUAA4IBDwAwggEKAoIBAQCS9jHBfYj9mQGp2HvycXXxMcbzdWb6UShGhJd4NLxs/LxFWYgm +GErENx+hSkS943EE9UQX4j/8SFhvXJ56CbpRNyIjZkMhsDxkovhqFQ4/61HhVKndBpnXmjxUizkD +Pw/Fzsbrg3ICqB9x8y34dQjbYkzo+s7552oftms1grrijxaSfQUMbEYDXcDtab86wYqg6I7ZuUUo +hwjstMoVvoLdtUSLLa2GDGhibYVW8qwUYzrG0ZmsNHhWS8+2rT+MitcE5eN4TPWGqvWP+j1scaMt +ymfraHtuM6kMgiioTGohQBUgDCZbg8KpFhXAJIJdKxatymP2dACw30PEEGBWZ2NFAgMBAAGjgf8w +gfwwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUjbJJaJ1yCCW5wCf1UJNWSEZx+Y8wDgYDVR0P +AQH/BAQDAgEGMDYGA1UdEQQvMC2BE2Nhb3BlcmF0b3JAZGlzaWcuc2uGFmh0dHA6Ly93d3cuZGlz +aWcuc2svY2EwZgYDVR0fBF8wXTAtoCugKYYnaHR0cDovL3d3dy5kaXNpZy5zay9jYS9jcmwvY2Ff +ZGlzaWcuY3JsMCygKqAohiZodHRwOi8vY2EuZGlzaWcuc2svY2EvY3JsL2NhX2Rpc2lnLmNybDAa +BgNVHSAEEzARMA8GDSuBHpGT5goAAAABAQEwDQYJKoZIhvcNAQEFBQADggEBAF00dGFMrzvY/59t +WDYcPQuBDRIrRhCA/ec8J9B6yKm2fnQwM6M6int0wHl5QpNt/7EpFIKrIYwvF/k/Ji/1WcbvgAa3 +mkkp7M5+cTxqEEHA9tOasnxakZzArFvITV734VP/Q3f8nktnbNfzg9Gg4H8l37iYC5oyOGwwoPP/ +CBUz91BKez6jPiCp3C9WgArtQVCwyfTssuMmRAAOb54GvCKWU3BlxFAKRmukLyeBEicTXxChds6K +ezfqwzlhA5WYOudsiCUI/HloDYd9Yvi0X/vF2Ey9WLw/Q1vUHgFNPGO+I++MzVpQuGhU+QqZMxEA +4Z7CRneC9VkGjCFMhwnN5ag= +-----END CERTIFICATE----- + +Juur-SK +======= +-----BEGIN CERTIFICATE----- +MIIE5jCCA86gAwIBAgIEO45L/DANBgkqhkiG9w0BAQUFADBdMRgwFgYJKoZIhvcNAQkBFglwa2lA +c2suZWUxCzAJBgNVBAYTAkVFMSIwIAYDVQQKExlBUyBTZXJ0aWZpdHNlZXJpbWlza2Vza3VzMRAw +DgYDVQQDEwdKdXVyLVNLMB4XDTAxMDgzMDE0MjMwMVoXDTE2MDgyNjE0MjMwMVowXTEYMBYGCSqG +SIb3DQEJARYJcGtpQHNrLmVlMQswCQYDVQQGEwJFRTEiMCAGA1UEChMZQVMgU2VydGlmaXRzZWVy +aW1pc2tlc2t1czEQMA4GA1UEAxMHSnV1ci1TSzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC +ggEBAIFxNj4zB9bjMI0TfncyRsvPGbJgMUaXhvSYRqTCZUXP00B841oiqBB4M8yIsdOBSvZiF3tf +TQou0M+LI+5PAk676w7KvRhj6IAcjeEcjT3g/1tf6mTll+g/mX8MCgkzABpTpyHhOEvWgxutr2TC ++Rx6jGZITWYfGAriPrsfB2WThbkasLnE+w0R9vXW+RvHLCu3GFH+4Hv2qEivbDtPL+/40UceJlfw +UR0zlv/vWT3aTdEVNMfqPxZIe5EcgEMPPbgFPtGzlc3Yyg/CQ2fbt5PgIoIuvvVoKIO5wTtpeyDa +Tpxt4brNj3pssAki14sL2xzVWiZbDcDq5WDQn/413z8CAwEAAaOCAawwggGoMA8GA1UdEwEB/wQF +MAMBAf8wggEWBgNVHSAEggENMIIBCTCCAQUGCisGAQQBzh8BAQEwgfYwgdAGCCsGAQUFBwICMIHD +HoHAAFMAZQBlACAAcwBlAHIAdABpAGYAaQBrAGEAYQB0ACAAbwBuACAAdgDkAGwAagBhAHMAdABh +AHQAdQBkACAAQQBTAC0AaQBzACAAUwBlAHIAdABpAGYAaQB0AHMAZQBlAHIAaQBtAGkAcwBrAGUA +cwBrAHUAcwAgAGEAbABhAG0ALQBTAEsAIABzAGUAcgB0AGkAZgBpAGsAYQBhAHQAaQBkAGUAIABr +AGkAbgBuAGkAdABhAG0AaQBzAGUAawBzMCEGCCsGAQUFBwIBFhVodHRwOi8vd3d3LnNrLmVlL2Nw +cy8wKwYDVR0fBCQwIjAgoB6gHIYaaHR0cDovL3d3dy5zay5lZS9qdXVyL2NybC8wHQYDVR0OBBYE +FASqekej5ImvGs8KQKcYP2/v6X2+MB8GA1UdIwQYMBaAFASqekej5ImvGs8KQKcYP2/v6X2+MA4G +A1UdDwEB/wQEAwIB5jANBgkqhkiG9w0BAQUFAAOCAQEAe8EYlFOiCfP+JmeaUOTDBS8rNXiRTHyo +ERF5TElZrMj3hWVcRrs7EKACr81Ptcw2Kuxd/u+gkcm2k298gFTsxwhwDY77guwqYHhpNjbRxZyL +abVAyJRld/JXIWY7zoVAtjNjGr95HvxcHdMdkxuLDF2FvZkwMhgJkVLpfKG6/2SSmuz+Ne6ML678 +IIbsSt4beDI3poHSna9aEhbKmVv8b20OxaAehsmR0FyYgl9jDIpaq9iVpszLita/ZEuOyoqysOkh +Mp6qqIWYNIE5ITuoOlIyPfZrN4YGWhWY3PARZv40ILcD9EEQfTmEeZZyY7aWAuVrua0ZTbvGRNs2 +yyqcjg== +-----END CERTIFICATE----- + +Hongkong Post Root CA 1 +======================= +-----BEGIN CERTIFICATE----- +MIIDMDCCAhigAwIBAgICA+gwDQYJKoZIhvcNAQEFBQAwRzELMAkGA1UEBhMCSEsxFjAUBgNVBAoT +DUhvbmdrb25nIFBvc3QxIDAeBgNVBAMTF0hvbmdrb25nIFBvc3QgUm9vdCBDQSAxMB4XDTAzMDUx +NTA1MTMxNFoXDTIzMDUxNTA0NTIyOVowRzELMAkGA1UEBhMCSEsxFjAUBgNVBAoTDUhvbmdrb25n +IFBvc3QxIDAeBgNVBAMTF0hvbmdrb25nIFBvc3QgUm9vdCBDQSAxMIIBIjANBgkqhkiG9w0BAQEF +AAOCAQ8AMIIBCgKCAQEArP84tulmAknjorThkPlAj3n54r15/gK97iSSHSL22oVyaf7XPwnU3ZG1 +ApzQjVrhVcNQhrkpJsLj2aDxaQMoIIBFIi1WpztUlVYiWR8o3x8gPW2iNr4joLFutbEnPzlTCeqr +auh0ssJlXI6/fMN4hM2eFvz1Lk8gKgifd/PFHsSaUmYeSF7jEAaPIpjhZY4bXSNmO7ilMlHIhqqh +qZ5/dpTCpmy3QfDVyAY45tQM4vM7TG1QjMSDJ8EThFk9nnV0ttgCXjqQesBCNnLsak3c78QA3xMY +V18meMjWCnl3v/evt3a5pQuEF10Q6m/hq5URX208o1xNg1vysxmKgIsLhwIDAQABoyYwJDASBgNV +HRMBAf8ECDAGAQH/AgEDMA4GA1UdDwEB/wQEAwIBxjANBgkqhkiG9w0BAQUFAAOCAQEADkbVPK7i +h9legYsCmEEIjEy82tvuJxuC52pF7BaLT4Wg87JwvVqWuspube5Gi27nKi6Wsxkz67SfqLI37pio +l7Yutmcn1KZJ/RyTZXaeQi/cImyaT/JaFTmxcdcrUehtHJjA2Sr0oYJ71clBoiMBdDhViw+5Lmei +IAQ32pwL0xch4I+XeTRvhEgCIDMb5jREn5Fw9IBehEPCKdJsEhTkYY2sEJCehFC78JZvRZ+K88ps +T/oROhUVRsPNH4NbLUES7VBnQRM9IauUiqpOfMGx+6fWtScvl6tu4B3i0RwsH0Ti/L6RoZz71ilT +c4afU9hDDl3WY4JxHYB0yvbiAmvZWg== +-----END CERTIFICATE----- + +SecureSign RootCA11 +=================== +-----BEGIN CERTIFICATE----- +MIIDbTCCAlWgAwIBAgIBATANBgkqhkiG9w0BAQUFADBYMQswCQYDVQQGEwJKUDErMCkGA1UEChMi +SmFwYW4gQ2VydGlmaWNhdGlvbiBTZXJ2aWNlcywgSW5jLjEcMBoGA1UEAxMTU2VjdXJlU2lnbiBS +b290Q0ExMTAeFw0wOTA0MDgwNDU2NDdaFw0yOTA0MDgwNDU2NDdaMFgxCzAJBgNVBAYTAkpQMSsw +KQYDVQQKEyJKYXBhbiBDZXJ0aWZpY2F0aW9uIFNlcnZpY2VzLCBJbmMuMRwwGgYDVQQDExNTZWN1 +cmVTaWduIFJvb3RDQTExMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA/XeqpRyQBTvL +TJszi1oURaTnkBbR31fSIRCkF/3frNYfp+TbfPfs37gD2pRY/V1yfIw/XwFndBWW4wI8h9uuywGO +wvNmxoVF9ALGOrVisq/6nL+k5tSAMJjzDbaTj6nU2DbysPyKyiyhFTOVMdrAG/LuYpmGYz+/3ZMq +g6h2uRMft85OQoWPIucuGvKVCbIFtUROd6EgvanyTgp9UK31BQ1FT0Zx/Sg+U/sE2C3XZR1KG/rP +O7AxmjVuyIsG0wCR8pQIZUyxNAYAeoni8McDWc/V1uinMrPmmECGxc0nEovMe863ETxiYAcjPitA +bpSACW22s293bzUIUPsCh8U+iQIDAQABo0IwQDAdBgNVHQ4EFgQUW/hNT7KlhtQ60vFjmqC+CfZX +t94wDgYDVR0PAQH/BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAKCh +OBZmLqdWHyGcBvod7bkixTgm2E5P7KN/ed5GIaGHd48HCJqypMWvDzKYC3xmKbabfSVSSUOrTC4r +bnpwrxYO4wJs+0LmGJ1F2FXI6Dvd5+H0LgscNFxsWEr7jIhQX5Ucv+2rIrVls4W6ng+4reV6G4pQ +Oh29Dbx7VFALuUKvVaAYga1lme++5Jy/xIWrQbJUb9wlze144o4MjQlJ3WN7WmmWAiGovVJZ6X01 +y8hSyn+B/tlr0/cR7SXf+Of5pPpyl4RTDaXQMhhRdlkUbA/r7F+AjHVDg8OFmP9Mni0N5HeDk061 +lgeLKBObjBmNQSdJQO7e5iNEOdyhIta6A/I= +-----END CERTIFICATE----- + +ACEDICOM Root +============= +-----BEGIN CERTIFICATE----- +MIIFtTCCA52gAwIBAgIIYY3HhjsBggUwDQYJKoZIhvcNAQEFBQAwRDEWMBQGA1UEAwwNQUNFRElD +T00gUm9vdDEMMAoGA1UECwwDUEtJMQ8wDQYDVQQKDAZFRElDT00xCzAJBgNVBAYTAkVTMB4XDTA4 +MDQxODE2MjQyMloXDTI4MDQxMzE2MjQyMlowRDEWMBQGA1UEAwwNQUNFRElDT00gUm9vdDEMMAoG +A1UECwwDUEtJMQ8wDQYDVQQKDAZFRElDT00xCzAJBgNVBAYTAkVTMIICIjANBgkqhkiG9w0BAQEF +AAOCAg8AMIICCgKCAgEA/5KV4WgGdrQsyFhIyv2AVClVYyT/kGWbEHV7w2rbYgIB8hiGtXxaOLHk +WLn709gtn70yN78sFW2+tfQh0hOR2QetAQXW8713zl9CgQr5auODAKgrLlUTY4HKRxx7XBZXehuD +YAQ6PmXDzQHe3qTWDLqO3tkE7hdWIpuPY/1NFgu3e3eM+SW10W2ZEi5PGrjm6gSSrj0RuVFCPYew +MYWveVqc/udOXpJPQ/yrOq2lEiZmueIM15jO1FillUAKt0SdE3QrwqXrIhWYENiLxQSfHY9g5QYb +m8+5eaA9oiM/Qj9r+hwDezCNzmzAv+YbX79nuIQZ1RXve8uQNjFiybwCq0Zfm/4aaJQ0PZCOrfbk +HQl/Sog4P75n/TSW9R28MHTLOO7VbKvU/PQAtwBbhTIWdjPp2KOZnQUAqhbm84F9b32qhm2tFXTT +xKJxqvQUfecyuB+81fFOvW8XAjnXDpVCOscAPukmYxHqC9FK/xidstd7LzrZlvvoHpKuE1XI2Sf2 +3EgbsCTBheN3nZqk8wwRHQ3ItBTutYJXCb8gWH8vIiPYcMt5bMlL8qkqyPyHK9caUPgn6C9D4zq9 +2Fdx/c6mUlv53U3t5fZvie27k5x2IXXwkkwp9y+cAS7+UEaeZAwUswdbxcJzbPEHXEUkFDWug/Fq +TYl6+rPYLWbwNof1K1MCAwEAAaOBqjCBpzAPBgNVHRMBAf8EBTADAQH/MB8GA1UdIwQYMBaAFKaz +4SsrSbbXc6GqlPUB53NlTKxQMA4GA1UdDwEB/wQEAwIBhjAdBgNVHQ4EFgQUprPhKytJttdzoaqU +9QHnc2VMrFAwRAYDVR0gBD0wOzA5BgRVHSAAMDEwLwYIKwYBBQUHAgEWI2h0dHA6Ly9hY2VkaWNv +bS5lZGljb21ncm91cC5jb20vZG9jMA0GCSqGSIb3DQEBBQUAA4ICAQDOLAtSUWImfQwng4/F9tqg +aHtPkl7qpHMyEVNEskTLnewPeUKzEKbHDZ3Ltvo/Onzqv4hTGzz3gvoFNTPhNahXwOf9jU8/kzJP +eGYDdwdY6ZXIfj7QeQCM8htRM5u8lOk6e25SLTKeI6RF+7YuE7CLGLHdztUdp0J/Vb77W7tH1Pwk +zQSulgUV1qzOMPPKC8W64iLgpq0i5ALudBF/TP94HTXa5gI06xgSYXcGCRZj6hitoocf8seACQl1 +ThCojz2GuHURwCRiipZ7SkXp7FnFvmuD5uHorLUwHv4FB4D54SMNUI8FmP8sX+g7tq3PgbUhh8oI +KiMnMCArz+2UW6yyetLHKKGKC5tNSixthT8Jcjxn4tncB7rrZXtaAWPWkFtPF2Y9fwsZo5NjEFIq +nxQWWOLcpfShFosOkYuByptZ+thrkQdlVV9SH686+5DdaaVbnG0OLLb6zqylfDJKZ0DcMDQj3dcE +I2bw/FWAp/tmGYI1Z2JwOV5vx+qQQEQIHriy1tvuWacNGHk0vFQYXlPKNFHtRQrmjseCNj6nOGOp +MCwXEGCSn1WHElkQwg9naRHMTh5+Spqtr0CodaxWkHS4oJyleW/c6RrIaQXpuvoDs3zk4E7Czp3o +tkYNbn5XOmeUwssfnHdKZ05phkOTOPu220+DkdRgfks+KzgHVZhepA== +-----END CERTIFICATE----- + +Verisign Class 3 Public Primary Certification Authority +======================================================= +-----BEGIN CERTIFICATE----- +MIICPDCCAaUCEDyRMcsf9tAbDpq40ES/Er4wDQYJKoZIhvcNAQEFBQAwXzELMAkGA1UEBhMCVVMx +FzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMTcwNQYDVQQLEy5DbGFzcyAzIFB1YmxpYyBQcmltYXJ5 +IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MB4XDTk2MDEyOTAwMDAwMFoXDTI4MDgwMjIzNTk1OVow +XzELMAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMTcwNQYDVQQLEy5DbGFzcyAz +IFB1YmxpYyBQcmltYXJ5IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MIGfMA0GCSqGSIb3DQEBAQUA +A4GNADCBiQKBgQDJXFme8huKARS0EN8EQNvjV69qRUCPhAwL0TPZ2RHP7gJYHyX3KqhEBarsAx94 +f56TuZoAqiN91qyFomNFx3InzPRMxnVx0jnvT0Lwdd8KkMaOIG+YD/isI19wKTakyYbnsZogy1Ol +hec9vn2a/iRFM9x2Fe0PonFkTGUugWhFpwIDAQABMA0GCSqGSIb3DQEBBQUAA4GBABByUqkFFBky +CEHwxWsKzH4PIRnN5GfcX6kb5sroc50i2JhucwNhkcV8sEVAbkSdjbCxlnRhLQ2pRdKkkirWmnWX +bj9T/UWZYB2oK0z5XqcJ2HUw19JlYD1n1khVdWk/kfVIC0dpImmClr7JyDiGSnoscxlIaU5rfGW/ +D/xwzoiQ +-----END CERTIFICATE----- + +Microsec e-Szigno Root CA 2009 +============================== +-----BEGIN CERTIFICATE----- +MIIECjCCAvKgAwIBAgIJAMJ+QwRORz8ZMA0GCSqGSIb3DQEBCwUAMIGCMQswCQYDVQQGEwJIVTER +MA8GA1UEBwwIQnVkYXBlc3QxFjAUBgNVBAoMDU1pY3Jvc2VjIEx0ZC4xJzAlBgNVBAMMHk1pY3Jv +c2VjIGUtU3ppZ25vIFJvb3QgQ0EgMjAwOTEfMB0GCSqGSIb3DQEJARYQaW5mb0BlLXN6aWduby5o +dTAeFw0wOTA2MTYxMTMwMThaFw0yOTEyMzAxMTMwMThaMIGCMQswCQYDVQQGEwJIVTERMA8GA1UE +BwwIQnVkYXBlc3QxFjAUBgNVBAoMDU1pY3Jvc2VjIEx0ZC4xJzAlBgNVBAMMHk1pY3Jvc2VjIGUt +U3ppZ25vIFJvb3QgQ0EgMjAwOTEfMB0GCSqGSIb3DQEJARYQaW5mb0BlLXN6aWduby5odTCCASIw +DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAOn4j/NjrdqG2KfgQvvPkd6mJviZpWNwrZuuyjNA +fW2WbqEORO7hE52UQlKavXWFdCyoDh2Tthi3jCyoz/tccbna7P7ofo/kLx2yqHWH2Leh5TvPmUpG +0IMZfcChEhyVbUr02MelTTMuhTlAdX4UfIASmFDHQWe4oIBhVKZsTh/gnQ4H6cm6M+f+wFUoLAKA +pxn1ntxVUwOXewdI/5n7N4okxFnMUBBjjqqpGrCEGob5X7uxUG6k0QrM1XF+H6cbfPVTbiJfyyvm +1HxdrtbCxkzlBQHZ7Vf8wSN5/PrIJIOV87VqUQHQd9bpEqH5GoP7ghu5sJf0dgYzQ0mg/wu1+rUC +AwEAAaOBgDB+MA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMB0GA1UdDgQWBBTLD8bf +QkPMPcu1SCOhGnqmKrs0aDAfBgNVHSMEGDAWgBTLD8bfQkPMPcu1SCOhGnqmKrs0aDAbBgNVHREE +FDASgRBpbmZvQGUtc3ppZ25vLmh1MA0GCSqGSIb3DQEBCwUAA4IBAQDJ0Q5eLtXMs3w+y/w9/w0o +lZMEyL/azXm4Q5DwpL7v8u8hmLzU1F0G9u5C7DBsoKqpyvGvivo/C3NqPuouQH4frlRheesuCDfX +I/OMn74dseGkddug4lQUsbocKaQY9hK6ohQU4zE1yED/t+AFdlfBHFny+L/k7SViXITwfn4fs775 +tyERzAMBVnCnEJIeGzSBHq2cGsMEPO0CYdYeBvNfOofyK/FFh+U9rNHHV4S9a67c2Pm2G2JwCz02 +yULyMtd6YebS2z3PyKnJm9zbWETXbzivf3jTo60adbocwTZ8jx5tHMN1Rq41Bab2XD0h7lbwyYIi +LXpUq3DDfSJlgnCW +-----END CERTIFICATE----- + +E-Guven Kok Elektronik Sertifika Hizmet Saglayicisi +=================================================== +-----BEGIN CERTIFICATE----- +MIIDtjCCAp6gAwIBAgIQRJmNPMADJ72cdpW56tustTANBgkqhkiG9w0BAQUFADB1MQswCQYDVQQG +EwJUUjEoMCYGA1UEChMfRWxla3Ryb25payBCaWxnaSBHdXZlbmxpZ2kgQS5TLjE8MDoGA1UEAxMz +ZS1HdXZlbiBLb2sgRWxla3Ryb25payBTZXJ0aWZpa2EgSGl6bWV0IFNhZ2xheWljaXNpMB4XDTA3 +MDEwNDExMzI0OFoXDTE3MDEwNDExMzI0OFowdTELMAkGA1UEBhMCVFIxKDAmBgNVBAoTH0VsZWt0 +cm9uaWsgQmlsZ2kgR3V2ZW5saWdpIEEuUy4xPDA6BgNVBAMTM2UtR3V2ZW4gS29rIEVsZWt0cm9u +aWsgU2VydGlmaWthIEhpem1ldCBTYWdsYXlpY2lzaTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC +AQoCggEBAMMSIJ6wXgBljU5Gu4Bc6SwGl9XzcslwuedLZYDBS75+PNdUMZTe1RK6UxYC6lhj71vY +8+0qGqpxSKPcEC1fX+tcS5yWCEIlKBHMilpiAVDV6wlTL/jDj/6z/P2douNffb7tC+Bg62nsM+3Y +jfsSSYMAyYuXjDtzKjKzEve5TfL0TW3H5tYmNwjy2f1rXKPlSFxYvEK+A1qBuhw1DADT9SN+cTAI +JjjcJRFHLfO6IxClv7wC90Nex/6wN1CZew+TzuZDLMN+DfIcQ2Zgy2ExR4ejT669VmxMvLz4Bcpk +9Ok0oSy1c+HCPujIyTQlCFzz7abHlJ+tiEMl1+E5YP6sOVkCAwEAAaNCMEAwDgYDVR0PAQH/BAQD +AgEGMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFJ/uRLOU1fqRTy7ZVZoEVtstxNulMA0GCSqG +SIb3DQEBBQUAA4IBAQB/X7lTW2M9dTLn+sR0GstG30ZpHFLPqk/CaOv/gKlR6D1id4k9CnU58W5d +F4dvaAXBlGzZXd/aslnLpRCKysw5zZ/rTt5S/wzw9JKp8mxTq5vSR6AfdPebmvEvFZ96ZDAYBzwq +D2fK/A+JYZ1lpTzlvBNbCNvj/+27BrtqBrF6T2XGgv0enIu1De5Iu7i9qgi0+6N8y5/NkHZchpZ4 +Vwpm+Vganf2XKWDeEaaQHBkc7gGWIjQ0LpH5t8Qn0Xvmv/uARFoW5evg1Ao4vOSR49XrXMGs3xtq +fJ7lddK2l4fbzIcrQzqECK+rPNv3PGYxhrCdU3nt+CPeQuMtgvEP5fqX +-----END CERTIFICATE----- + +GlobalSign Root CA - R3 +======================= +-----BEGIN CERTIFICATE----- +MIIDXzCCAkegAwIBAgILBAAAAAABIVhTCKIwDQYJKoZIhvcNAQELBQAwTDEgMB4GA1UECxMXR2xv +YmFsU2lnbiBSb290IENBIC0gUjMxEzARBgNVBAoTCkdsb2JhbFNpZ24xEzARBgNVBAMTCkdsb2Jh +bFNpZ24wHhcNMDkwMzE4MTAwMDAwWhcNMjkwMzE4MTAwMDAwWjBMMSAwHgYDVQQLExdHbG9iYWxT +aWduIFJvb3QgQ0EgLSBSMzETMBEGA1UEChMKR2xvYmFsU2lnbjETMBEGA1UEAxMKR2xvYmFsU2ln +bjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMwldpB5BngiFvXAg7aEyiie/QV2EcWt +iHL8RgJDx7KKnQRfJMsuS+FggkbhUqsMgUdwbN1k0ev1LKMPgj0MK66X17YUhhB5uzsTgHeMCOFJ +0mpiLx9e+pZo34knlTifBtc+ycsmWQ1z3rDI6SYOgxXG71uL0gRgykmmKPZpO/bLyCiR5Z2KYVc3 +rHQU3HTgOu5yLy6c+9C7v/U9AOEGM+iCK65TpjoWc4zdQQ4gOsC0p6Hpsk+QLjJg6VfLuQSSaGjl +OCZgdbKfd/+RFO+uIEn8rUAVSNECMWEZXriX7613t2Saer9fwRPvm2L7DWzgVGkWqQPabumDk3F2 +xmmFghcCAwEAAaNCMEAwDgYDVR0PAQH/BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYE +FI/wS3+oLkUkrk1Q+mOai97i3Ru8MA0GCSqGSIb3DQEBCwUAA4IBAQBLQNvAUKr+yAzv95ZURUm7 +lgAJQayzE4aGKAczymvmdLm6AC2upArT9fHxD4q/c2dKg8dEe3jgr25sbwMpjjM5RcOO5LlXbKr8 +EpbsU8Yt5CRsuZRj+9xTaGdWPoO4zzUhw8lo/s7awlOqzJCK6fBdRoyV3XpYKBovHd7NADdBj+1E +bddTKJd+82cEHhXXipa0095MJ6RMG3NzdvQXmcIfeg7jLQitChws/zyrVQ4PkX4268NXSb7hLi18 +YIvDQVETI53O9zJrlAGomecsMx86OyXShkDOOyyGeMlhLxS67ttVb9+E7gUJTb0o2HLO02JQZR7r +kpeDMdmztcpHWD9f +-----END CERTIFICATE----- + +TC TrustCenter Universal CA III +=============================== +-----BEGIN CERTIFICATE----- +MIID4TCCAsmgAwIBAgIOYyUAAQACFI0zFQLkbPQwDQYJKoZIhvcNAQEFBQAwezELMAkGA1UEBhMC +REUxHDAaBgNVBAoTE1RDIFRydXN0Q2VudGVyIEdtYkgxJDAiBgNVBAsTG1RDIFRydXN0Q2VudGVy +IFVuaXZlcnNhbCBDQTEoMCYGA1UEAxMfVEMgVHJ1c3RDZW50ZXIgVW5pdmVyc2FsIENBIElJSTAe +Fw0wOTA5MDkwODE1MjdaFw0yOTEyMzEyMzU5NTlaMHsxCzAJBgNVBAYTAkRFMRwwGgYDVQQKExNU +QyBUcnVzdENlbnRlciBHbWJIMSQwIgYDVQQLExtUQyBUcnVzdENlbnRlciBVbml2ZXJzYWwgQ0Ex +KDAmBgNVBAMTH1RDIFRydXN0Q2VudGVyIFVuaXZlcnNhbCBDQSBJSUkwggEiMA0GCSqGSIb3DQEB +AQUAA4IBDwAwggEKAoIBAQDC2pxisLlxErALyBpXsq6DFJmzNEubkKLF5+cvAqBNLaT6hdqbJYUt +QCggbergvbFIgyIpRJ9Og+41URNzdNW88jBmlFPAQDYvDIRlzg9uwliT6CwLOunBjvvya8o84pxO +juT5fdMnnxvVZ3iHLX8LR7PH6MlIfK8vzArZQe+f/prhsq75U7Xl6UafYOPfjdN/+5Z+s7Vy+Eut +CHnNaYlAJ/Uqwa1D7KRTyGG299J5KmcYdkhtWyUB0SbFt1dpIxVbYYqt8Bst2a9c8SaQaanVDED1 +M4BDj5yjdipFtK+/fz6HP3bFzSreIMUWWMv5G/UPyw0RUmS40nZid4PxWJ//AgMBAAGjYzBhMB8G +A1UdIwQYMBaAFFbn4VslQ4Dg9ozhcbyO5YAvxEjiMA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/ +BAQDAgEGMB0GA1UdDgQWBBRW5+FbJUOA4PaM4XG8juWAL8RI4jANBgkqhkiG9w0BAQUFAAOCAQEA +g8ev6n9NCjw5sWi+e22JLumzCecYV42FmhfzdkJQEw/HkG8zrcVJYCtsSVgZ1OK+t7+rSbyUyKu+ +KGwWaODIl0YgoGhnYIg5IFHYaAERzqf2EQf27OysGh+yZm5WZ2B6dF7AbZc2rrUNXWZzwCUyRdhK +BgePxLcHsU0GDeGl6/R1yrqc0L2z0zIkTO5+4nYES0lT2PLpVDP85XEfPRRclkvxOvIAu2y0+pZV +CIgJwcyRGSmwIC3/yzikQOEXvnlhgP8HA4ZMTnsGnxGGjYnuJ8Tb4rwZjgvDwxPHLQNjO9Po5KIq +woIIlBZU8O8fJ5AluA0OKBtHd0e9HKgl8ZS0Zg== +-----END CERTIFICATE----- + +Autoridad de Certificacion Firmaprofesional CIF A62634068 +========================================================= +-----BEGIN CERTIFICATE----- +MIIGFDCCA/ygAwIBAgIIU+w77vuySF8wDQYJKoZIhvcNAQEFBQAwUTELMAkGA1UEBhMCRVMxQjBA +BgNVBAMMOUF1dG9yaWRhZCBkZSBDZXJ0aWZpY2FjaW9uIEZpcm1hcHJvZmVzaW9uYWwgQ0lGIEE2 +MjYzNDA2ODAeFw0wOTA1MjAwODM4MTVaFw0zMDEyMzEwODM4MTVaMFExCzAJBgNVBAYTAkVTMUIw +QAYDVQQDDDlBdXRvcmlkYWQgZGUgQ2VydGlmaWNhY2lvbiBGaXJtYXByb2Zlc2lvbmFsIENJRiBB +NjI2MzQwNjgwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDKlmuO6vj78aI14H9M2uDD +Utd9thDIAl6zQyrET2qyyhxdKJp4ERppWVevtSBC5IsP5t9bpgOSL/UR5GLXMnE42QQMcas9UX4P +B99jBVzpv5RvwSmCwLTaUbDBPLutN0pcyvFLNg4kq7/DhHf9qFD0sefGL9ItWY16Ck6WaVICqjaY +7Pz6FIMMNx/Jkjd/14Et5cS54D40/mf0PmbR0/RAz15iNA9wBj4gGFrO93IbJWyTdBSTo3OxDqqH +ECNZXyAFGUftaI6SEspd/NYrspI8IM/hX68gvqB2f3bl7BqGYTM+53u0P6APjqK5am+5hyZvQWyI +plD9amML9ZMWGxmPsu2bm8mQ9QEM3xk9Dz44I8kvjwzRAv4bVdZO0I08r0+k8/6vKtMFnXkIoctX +MbScyJCyZ/QYFpM6/EfY0XiWMR+6KwxfXZmtY4laJCB22N/9q06mIqqdXuYnin1oKaPnirjaEbsX +LZmdEyRG98Xi2J+Of8ePdG1asuhy9azuJBCtLxTa/y2aRnFHvkLfuwHb9H/TKI8xWVvTyQKmtFLK +bpf7Q8UIJm+K9Lv9nyiqDdVF8xM6HdjAeI9BZzwelGSuewvF6NkBiDkal4ZkQdU7hwxu+g/GvUgU +vzlN1J5Bto+WHWOWk9mVBngxaJ43BjuAiUVhOSPHG0SjFeUc+JIwuwIDAQABo4HvMIHsMBIGA1Ud +EwEB/wQIMAYBAf8CAQEwDgYDVR0PAQH/BAQDAgEGMB0GA1UdDgQWBBRlzeurNR4APn7VdMActHNH +DhpkLzCBpgYDVR0gBIGeMIGbMIGYBgRVHSAAMIGPMC8GCCsGAQUFBwIBFiNodHRwOi8vd3d3LmZp +cm1hcHJvZmVzaW9uYWwuY29tL2NwczBcBggrBgEFBQcCAjBQHk4AUABhAHMAZQBvACAAZABlACAA +bABhACAAQgBvAG4AYQBuAG8AdgBhACAANAA3ACAAQgBhAHIAYwBlAGwAbwBuAGEAIAAwADgAMAAx +ADcwDQYJKoZIhvcNAQEFBQADggIBABd9oPm03cXF661LJLWhAqvdpYhKsg9VSytXjDvlMd3+xDLx +51tkljYyGOylMnfX40S2wBEqgLk9am58m9Ot/MPWo+ZkKXzR4Tgegiv/J2Wv+xYVxC5xhOW1//qk +R71kMrv2JYSiJ0L1ILDCExARzRAVukKQKtJE4ZYm6zFIEv0q2skGz3QeqUvVhyj5eTSSPi5E6PaP +T481PyWzOdxjKpBrIF/EUhJOlywqrJ2X3kjyo2bbwtKDlaZmp54lD+kLM5FlClrD2VQS3a/DTg4f +Jl4N3LON7NWBcN7STyQF82xO9UxJZo3R/9ILJUFI/lGExkKvgATP0H5kSeTy36LssUzAKh3ntLFl +osS88Zj0qnAHY7S42jtM+kAiMFsRpvAFDsYCA0irhpuF3dvd6qJ2gHN99ZwExEWN57kci57q13XR +crHedUTnQn3iV2t93Jm8PYMo6oCTjcVMZcFwgbg4/EMxsvYDNEeyrPsiBsse3RdHHF9mudMaotoR +saS8I8nkvof/uZS2+F0gStRf571oe2XyFR7SOqkt6dhrJKyXWERHrVkY8SFlcN7ONGCoQPHzPKTD +KCOM/iczQ0CgFzzr6juwcqajuUpLXhZI9LK8yIySxZ2frHI2vDSANGupi5LAuBft7HZT9SQBjLMi +6Et8Vcad+qMUu2WFbm5PEn4KPJ2V +-----END CERTIFICATE----- + +Izenpe.com +========== +-----BEGIN CERTIFICATE----- +MIIF8TCCA9mgAwIBAgIQALC3WhZIX7/hy/WL1xnmfTANBgkqhkiG9w0BAQsFADA4MQswCQYDVQQG +EwJFUzEUMBIGA1UECgwLSVpFTlBFIFMuQS4xEzARBgNVBAMMCkl6ZW5wZS5jb20wHhcNMDcxMjEz +MTMwODI4WhcNMzcxMjEzMDgyNzI1WjA4MQswCQYDVQQGEwJFUzEUMBIGA1UECgwLSVpFTlBFIFMu +QS4xEzARBgNVBAMMCkl6ZW5wZS5jb20wggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDJ +03rKDx6sp4boFmVqscIbRTJxldn+EFvMr+eleQGPicPK8lVx93e+d5TzcqQsRNiekpsUOqHnJJAK +ClaOxdgmlOHZSOEtPtoKct2jmRXagaKH9HtuJneJWK3W6wyyQXpzbm3benhB6QiIEn6HLmYRY2xU ++zydcsC8Lv/Ct90NduM61/e0aL6i9eOBbsFGb12N4E3GVFWJGjMxCrFXuaOKmMPsOzTFlUFpfnXC +PCDFYbpRR6AgkJOhkEvzTnyFRVSa0QUmQbC1TR0zvsQDyCV8wXDbO/QJLVQnSKwv4cSsPsjLkkxT +OTcj7NMB+eAJRE1NZMDhDVqHIrytG6P+JrUV86f8hBnp7KGItERphIPzidF0BqnMC9bC3ieFUCbK +F7jJeodWLBoBHmy+E60QrLUk9TiRodZL2vG70t5HtfG8gfZZa88ZU+mNFctKy6lvROUbQc/hhqfK +0GqfvEyNBjNaooXlkDWgYlwWTvDjovoDGrQscbNYLN57C9saD+veIR8GdwYDsMnvmfzAuU8Lhij+ +0rnq49qlw0dpEuDb8PYZi+17cNcC1u2HGCgsBCRMd+RIihrGO5rUD8r6ddIBQFqNeb+Lz0vPqhbB +leStTIo+F5HUsWLlguWABKQDfo2/2n+iD5dPDNMN+9fR5XJ+HMh3/1uaD7euBUbl8agW7EekFwID +AQABo4H2MIHzMIGwBgNVHREEgagwgaWBD2luZm9AaXplbnBlLmNvbaSBkTCBjjFHMEUGA1UECgw+ +SVpFTlBFIFMuQS4gLSBDSUYgQTAxMzM3MjYwLVJNZXJjLlZpdG9yaWEtR2FzdGVpeiBUMTA1NSBG +NjIgUzgxQzBBBgNVBAkMOkF2ZGEgZGVsIE1lZGl0ZXJyYW5lbyBFdG9yYmlkZWEgMTQgLSAwMTAx +MCBWaXRvcmlhLUdhc3RlaXowDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0O +BBYEFB0cZQ6o8iV7tJHP5LGx5r1VdGwFMA0GCSqGSIb3DQEBCwUAA4ICAQB4pgwWSp9MiDrAyw6l +Fn2fuUhfGI8NYjb2zRlrrKvV9pF9rnHzP7MOeIWblaQnIUdCSnxIOvVFfLMMjlF4rJUT3sb9fbga +kEyrkgPH7UIBzg/YsfqikuFgba56awmqxinuaElnMIAkejEWOVt+8Rwu3WwJrfIxwYJOubv5vr8q +hT/AQKM6WfxZSzwoJNu0FXWuDYi6LnPAvViH5ULy617uHjAimcs30cQhbIHsvm0m5hzkQiCeR7Cs +g1lwLDXWrzY0tM07+DKo7+N4ifuNRSzanLh+QBxh5z6ikixL8s36mLYp//Pye6kfLqCTVyvehQP5 +aTfLnnhqBbTFMXiJ7HqnheG5ezzevh55hM6fcA5ZwjUukCox2eRFekGkLhObNA5me0mrZJfQRsN5 +nXJQY6aYWwa9SG3YOYNw6DXwBdGqvOPbyALqfP2C2sJbUjWumDqtujWTI6cfSN01RpiyEGjkpTHC +ClguGYEQyVB1/OpaFs4R1+7vUIgtYf8/QnMFlEPVjjxOAToZpR9GTnfQXeWBIiGH/pR9hNiTrdZo +Q0iy2+tzJOeRf1SktoA+naM8THLCV8Sg1Mw4J87VBp6iSNnpn86CcDaTmjvfliHjWbcM2pE38P1Z +WrOZyGlsQyYBNWNgVYkDOnXYukrZVP/u3oDYLdE41V4tC5h9Pmzb/CaIxw== +-----END CERTIFICATE----- + +Chambers of Commerce Root - 2008 +================================ +-----BEGIN CERTIFICATE----- +MIIHTzCCBTegAwIBAgIJAKPaQn6ksa7aMA0GCSqGSIb3DQEBBQUAMIGuMQswCQYDVQQGEwJFVTFD +MEEGA1UEBxM6TWFkcmlkIChzZWUgY3VycmVudCBhZGRyZXNzIGF0IHd3dy5jYW1lcmZpcm1hLmNv +bS9hZGRyZXNzKTESMBAGA1UEBRMJQTgyNzQzMjg3MRswGQYDVQQKExJBQyBDYW1lcmZpcm1hIFMu +QS4xKTAnBgNVBAMTIENoYW1iZXJzIG9mIENvbW1lcmNlIFJvb3QgLSAyMDA4MB4XDTA4MDgwMTEy +Mjk1MFoXDTM4MDczMTEyMjk1MFowga4xCzAJBgNVBAYTAkVVMUMwQQYDVQQHEzpNYWRyaWQgKHNl +ZSBjdXJyZW50IGFkZHJlc3MgYXQgd3d3LmNhbWVyZmlybWEuY29tL2FkZHJlc3MpMRIwEAYDVQQF +EwlBODI3NDMyODcxGzAZBgNVBAoTEkFDIENhbWVyZmlybWEgUy5BLjEpMCcGA1UEAxMgQ2hhbWJl +cnMgb2YgQ29tbWVyY2UgUm9vdCAtIDIwMDgwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoIC +AQCvAMtwNyuAWko6bHiUfaN/Gh/2NdW928sNRHI+JrKQUrpjOyhYb6WzbZSm891kDFX29ufyIiKA +XuFixrYp4YFs8r/lfTJqVKAyGVn+H4vXPWCGhSRv4xGzdz4gljUha7MI2XAuZPeEklPWDrCQiorj +h40G072QDuKZoRuGDtqaCrsLYVAGUvGef3bsyw/QHg3PmTA9HMRFEFis1tPo1+XqxQEHd9ZR5gN/ +ikilTWh1uem8nk4ZcfUyS5xtYBkL+8ydddy/Js2Pk3g5eXNeJQ7KXOt3EgfLZEFHcpOrUMPrCXZk +NNI5t3YRCQ12RcSprj1qr7V9ZS+UWBDsXHyvfuK2GNnQm05aSd+pZgvMPMZ4fKecHePOjlO+Bd5g +D2vlGts/4+EhySnB8esHnFIbAURRPHsl18TlUlRdJQfKFiC4reRB7noI/plvg6aRArBsNlVq5331 +lubKgdaX8ZSD6e2wsWsSaR6s+12pxZjptFtYer49okQ6Y1nUCyXeG0+95QGezdIp1Z8XGQpvvwyQ +0wlf2eOKNcx5Wk0ZN5K3xMGtr/R5JJqyAQuxr1yW84Ay+1w9mPGgP0revq+ULtlVmhduYJ1jbLhj +ya6BXBg14JC7vjxPNyK5fuvPnnchpj04gftI2jE9K+OJ9dC1vX7gUMQSibMjmhAxhduub+84Mxh2 +EQIDAQABo4IBbDCCAWgwEgYDVR0TAQH/BAgwBgEB/wIBDDAdBgNVHQ4EFgQU+SSsD7K1+HnA+mCI +G8TZTQKeFxkwgeMGA1UdIwSB2zCB2IAU+SSsD7K1+HnA+mCIG8TZTQKeFxmhgbSkgbEwga4xCzAJ +BgNVBAYTAkVVMUMwQQYDVQQHEzpNYWRyaWQgKHNlZSBjdXJyZW50IGFkZHJlc3MgYXQgd3d3LmNh +bWVyZmlybWEuY29tL2FkZHJlc3MpMRIwEAYDVQQFEwlBODI3NDMyODcxGzAZBgNVBAoTEkFDIENh +bWVyZmlybWEgUy5BLjEpMCcGA1UEAxMgQ2hhbWJlcnMgb2YgQ29tbWVyY2UgUm9vdCAtIDIwMDiC +CQCj2kJ+pLGu2jAOBgNVHQ8BAf8EBAMCAQYwPQYDVR0gBDYwNDAyBgRVHSAAMCowKAYIKwYBBQUH +AgEWHGh0dHA6Ly9wb2xpY3kuY2FtZXJmaXJtYS5jb20wDQYJKoZIhvcNAQEFBQADggIBAJASryI1 +wqM58C7e6bXpeHxIvj99RZJe6dqxGfwWPJ+0W2aeaufDuV2I6A+tzyMP3iU6XsxPpcG1Lawk0lgH +3qLPaYRgM+gQDROpI9CF5Y57pp49chNyM/WqfcZjHwj0/gF/JM8rLFQJ3uIrbZLGOU8W6jx+ekbU +RWpGqOt1glanq6B8aBMz9p0w8G8nOSQjKpD9kCk18pPfNKXG9/jvjA9iSnyu0/VU+I22mlaHFoI6 +M6taIgj3grrqLuBHmrS1RaMFO9ncLkVAO+rcf+g769HsJtg1pDDFOqxXnrN2pSB7+R5KBWIBpih1 +YJeSDW4+TTdDDZIVnBgizVGZoCkaPF+KMjNbMMeJL0eYD6MDxvbxrN8y8NmBGuScvfaAFPDRLLmF +9dijscilIeUcE5fuDr3fKanvNFNb0+RqE4QGtjICxFKuItLcsiFCGtpA8CnJ7AoMXOLQusxI0zcK +zBIKinmwPQN/aUv0NCB9szTqjktk9T79syNnFQ0EuPAtwQlRPLJsFfClI9eDdOTlLsn+mCdCxqvG +nrDQWzilm1DefhiYtUU79nm06PcaewaD+9CL2rvHvRirCG88gGtAPxkZumWK5r7VXNM21+9AUiRg +OGcEMeyP84LG3rlV8zsxkVrctQgVrXYlCg17LofiDKYGvCYQbTed7N14jHyAxfDZd0jQ +-----END CERTIFICATE----- + +Global Chambersign Root - 2008 +============================== +-----BEGIN CERTIFICATE----- +MIIHSTCCBTGgAwIBAgIJAMnN0+nVfSPOMA0GCSqGSIb3DQEBBQUAMIGsMQswCQYDVQQGEwJFVTFD +MEEGA1UEBxM6TWFkcmlkIChzZWUgY3VycmVudCBhZGRyZXNzIGF0IHd3dy5jYW1lcmZpcm1hLmNv +bS9hZGRyZXNzKTESMBAGA1UEBRMJQTgyNzQzMjg3MRswGQYDVQQKExJBQyBDYW1lcmZpcm1hIFMu +QS4xJzAlBgNVBAMTHkdsb2JhbCBDaGFtYmVyc2lnbiBSb290IC0gMjAwODAeFw0wODA4MDExMjMx +NDBaFw0zODA3MzExMjMxNDBaMIGsMQswCQYDVQQGEwJFVTFDMEEGA1UEBxM6TWFkcmlkIChzZWUg +Y3VycmVudCBhZGRyZXNzIGF0IHd3dy5jYW1lcmZpcm1hLmNvbS9hZGRyZXNzKTESMBAGA1UEBRMJ +QTgyNzQzMjg3MRswGQYDVQQKExJBQyBDYW1lcmZpcm1hIFMuQS4xJzAlBgNVBAMTHkdsb2JhbCBD +aGFtYmVyc2lnbiBSb290IC0gMjAwODCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAMDf +VtPkOpt2RbQT2//BthmLN0EYlVJH6xedKYiONWwGMi5HYvNJBL99RDaxccy9Wglz1dmFRP+RVyXf +XjaOcNFccUMd2drvXNL7G706tcuto8xEpw2uIRU/uXpbknXYpBI4iRmKt4DS4jJvVpyR1ogQC7N0 +ZJJ0YPP2zxhPYLIj0Mc7zmFLmY/CDNBAspjcDahOo7kKrmCgrUVSY7pmvWjg+b4aqIG7HkF4ddPB +/gBVsIdU6CeQNR1MM62X/JcumIS/LMmjv9GYERTtY/jKmIhYF5ntRQOXfjyGHoiMvvKRhI9lNNgA +TH23MRdaKXoKGCQwoze1eqkBfSbW+Q6OWfH9GzO1KTsXO0G2Id3UwD2ln58fQ1DJu7xsepeY7s2M +H/ucUa6LcL0nn3HAa6x9kGbo1106DbDVwo3VyJ2dwW3Q0L9R5OP4wzg2rtandeavhENdk5IMagfe +Ox2YItaswTXbo6Al/3K1dh3ebeksZixShNBFks4c5eUzHdwHU1SjqoI7mjcv3N2gZOnm3b2u/GSF +HTynyQbehP9r6GsaPMWis0L7iwk+XwhSx2LE1AVxv8Rk5Pihg+g+EpuoHtQ2TS9x9o0o9oOpE9Jh +wZG7SMA0j0GMS0zbaRL/UJScIINZc+18ofLx/d33SdNDWKBWY8o9PeU1VlnpDsogzCtLkykPAgMB +AAGjggFqMIIBZjASBgNVHRMBAf8ECDAGAQH/AgEMMB0GA1UdDgQWBBS5CcqcHtvTbDprru1U8VuT +BjUuXjCB4QYDVR0jBIHZMIHWgBS5CcqcHtvTbDprru1U8VuTBjUuXqGBsqSBrzCBrDELMAkGA1UE +BhMCRVUxQzBBBgNVBAcTOk1hZHJpZCAoc2VlIGN1cnJlbnQgYWRkcmVzcyBhdCB3d3cuY2FtZXJm +aXJtYS5jb20vYWRkcmVzcykxEjAQBgNVBAUTCUE4Mjc0MzI4NzEbMBkGA1UEChMSQUMgQ2FtZXJm +aXJtYSBTLkEuMScwJQYDVQQDEx5HbG9iYWwgQ2hhbWJlcnNpZ24gUm9vdCAtIDIwMDiCCQDJzdPp +1X0jzjAOBgNVHQ8BAf8EBAMCAQYwPQYDVR0gBDYwNDAyBgRVHSAAMCowKAYIKwYBBQUHAgEWHGh0 +dHA6Ly9wb2xpY3kuY2FtZXJmaXJtYS5jb20wDQYJKoZIhvcNAQEFBQADggIBAICIf3DekijZBZRG +/5BXqfEv3xoNa/p8DhxJJHkn2EaqbylZUohwEurdPfWbU1Rv4WCiqAm57OtZfMY18dwY6fFn5a+6 +ReAJ3spED8IXDneRRXozX1+WLGiLwUePmJs9wOzL9dWCkoQ10b42OFZyMVtHLaoXpGNR6woBrX/s +dZ7LoR/xfxKxueRkf2fWIyr0uDldmOghp+G9PUIadJpwr2hsUF1Jz//7Dl3mLEfXgTpZALVza2Mg +9jFFCDkO9HB+QHBaP9BrQql0PSgvAm11cpUJjUhjxsYjV5KTXjXBjfkK9yydYhz2rXzdpjEetrHH +foUm+qRqtdpjMNHvkzeyZi99Bffnt0uYlDXA2TopwZ2yUDMdSqlapskD7+3056huirRXhOukP9Du +qqqHW2Pok+JrqNS4cnhrG+055F3Lm6qH1U9OAP7Zap88MQ8oAgF9mOinsKJknnn4SPIVqczmyETr +P3iZ8ntxPjzxmKfFGBI/5rsoM0LpRQp8bfKGeS/Fghl9CYl8slR2iK7ewfPM4W7bMdaTrpmg7yVq +c5iJWzouE4gev8CSlDQb4ye3ix5vQv/n6TebUB0tovkC7stYWDpxvGjjqsGvHCgfotwjZT+B6q6Z +09gwzxMNTxXJhLynSC34MCN32EZLeW32jO06f2ARePTpm67VVMB0gNELQp/B +-----END CERTIFICATE----- + +Go Daddy Root Certificate Authority - G2 +======================================== +-----BEGIN CERTIFICATE----- +MIIDxTCCAq2gAwIBAgIBADANBgkqhkiG9w0BAQsFADCBgzELMAkGA1UEBhMCVVMxEDAOBgNVBAgT +B0FyaXpvbmExEzARBgNVBAcTClNjb3R0c2RhbGUxGjAYBgNVBAoTEUdvRGFkZHkuY29tLCBJbmMu +MTEwLwYDVQQDEyhHbyBEYWRkeSBSb290IENlcnRpZmljYXRlIEF1dGhvcml0eSAtIEcyMB4XDTA5 +MDkwMTAwMDAwMFoXDTM3MTIzMTIzNTk1OVowgYMxCzAJBgNVBAYTAlVTMRAwDgYDVQQIEwdBcml6 +b25hMRMwEQYDVQQHEwpTY290dHNkYWxlMRowGAYDVQQKExFHb0RhZGR5LmNvbSwgSW5jLjExMC8G +A1UEAxMoR28gRGFkZHkgUm9vdCBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkgLSBHMjCCASIwDQYJKoZI +hvcNAQEBBQADggEPADCCAQoCggEBAL9xYgjx+lk09xvJGKP3gElY6SKDE6bFIEMBO4Tx5oVJnyfq +9oQbTqC023CYxzIBsQU+B07u9PpPL1kwIuerGVZr4oAH/PMWdYA5UXvl+TW2dE6pjYIT5LY/qQOD ++qK+ihVqf94Lw7YZFAXK6sOoBJQ7RnwyDfMAZiLIjWltNowRGLfTshxgtDj6AozO091GB94KPutd +fMh8+7ArU6SSYmlRJQVhGkSBjCypQ5Yj36w6gZoOKcUcqeldHraenjAKOc7xiID7S13MMuyFYkMl +NAJWJwGRtDtwKj9useiciAF9n9T521NtYJ2/LOdYq7hfRvzOxBsDPAnrSTFcaUaz4EcCAwEAAaNC +MEAwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYEFDqahQcQZyi27/a9 +BUFuIMGU2g/eMA0GCSqGSIb3DQEBCwUAA4IBAQCZ21151fmXWWcDYfF+OwYxdS2hII5PZYe096ac +vNjpL9DbWu7PdIxztDhC2gV7+AJ1uP2lsdeu9tfeE8tTEH6KRtGX+rcuKxGrkLAngPnon1rpN5+r +5N9ss4UXnT3ZJE95kTXWXwTrgIOrmgIttRD02JDHBHNA7XIloKmf7J6raBKZV8aPEjoJpL1E/QYV +N8Gb5DKj7Tjo2GTzLH4U/ALqn83/B2gX2yKQOC16jdFU8WnjXzPKej17CuPKf1855eJ1usV2GDPO +LPAvTK33sefOT6jEm0pUBsV/fdUID+Ic/n4XuKxe9tQWskMJDE32p2u0mYRlynqI4uJEvlz36hz1 +-----END CERTIFICATE----- + +Starfield Root Certificate Authority - G2 +========================================= +-----BEGIN CERTIFICATE----- +MIID3TCCAsWgAwIBAgIBADANBgkqhkiG9w0BAQsFADCBjzELMAkGA1UEBhMCVVMxEDAOBgNVBAgT +B0FyaXpvbmExEzARBgNVBAcTClNjb3R0c2RhbGUxJTAjBgNVBAoTHFN0YXJmaWVsZCBUZWNobm9s +b2dpZXMsIEluYy4xMjAwBgNVBAMTKVN0YXJmaWVsZCBSb290IENlcnRpZmljYXRlIEF1dGhvcml0 +eSAtIEcyMB4XDTA5MDkwMTAwMDAwMFoXDTM3MTIzMTIzNTk1OVowgY8xCzAJBgNVBAYTAlVTMRAw +DgYDVQQIEwdBcml6b25hMRMwEQYDVQQHEwpTY290dHNkYWxlMSUwIwYDVQQKExxTdGFyZmllbGQg +VGVjaG5vbG9naWVzLCBJbmMuMTIwMAYDVQQDEylTdGFyZmllbGQgUm9vdCBDZXJ0aWZpY2F0ZSBB +dXRob3JpdHkgLSBHMjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAL3twQP89o/8ArFv +W59I2Z154qK3A2FWGMNHttfKPTUuiUP3oWmb3ooa/RMgnLRJdzIpVv257IzdIvpy3Cdhl+72WoTs +bhm5iSzchFvVdPtrX8WJpRBSiUZV9Lh1HOZ/5FSuS/hVclcCGfgXcVnrHigHdMWdSL5stPSksPNk +N3mSwOxGXn/hbVNMYq/NHwtjuzqd+/x5AJhhdM8mgkBj87JyahkNmcrUDnXMN/uLicFZ8WJ/X7Nf +ZTD4p7dNdloedl40wOiWVpmKs/B/pM293DIxfJHP4F8R+GuqSVzRmZTRouNjWwl2tVZi4Ut0HZbU +JtQIBFnQmA4O5t78w+wfkPECAwEAAaNCMEAwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMC +AQYwHQYDVR0OBBYEFHwMMh+n2TB/xH1oo2Kooc6rB1snMA0GCSqGSIb3DQEBCwUAA4IBAQARWfol +TwNvlJk7mh+ChTnUdgWUXuEok21iXQnCoKjUsHU48TRqneSfioYmUeYs0cYtbpUgSpIB7LiKZ3sx +4mcujJUDJi5DnUox9g61DLu34jd/IroAow57UvtruzvE03lRTs2Q9GcHGcg8RnoNAX3FWOdt5oUw +F5okxBDgBPfg8n/Uqgr/Qh037ZTlZFkSIHc40zI+OIF1lnP6aI+xy84fxez6nH7PfrHxBy22/L/K +pL/QlwVKvOoYKAKQvVR4CSFx09F9HdkWsKlhPdAKACL8x3vLCWRFCztAgfd9fDL1mMpYjn0q7pBZ +c2T5NnReJaH1ZgUufzkVqSr7UIuOhWn0 +-----END CERTIFICATE----- + +Starfield Services Root Certificate Authority - G2 +================================================== +-----BEGIN CERTIFICATE----- +MIID7zCCAtegAwIBAgIBADANBgkqhkiG9w0BAQsFADCBmDELMAkGA1UEBhMCVVMxEDAOBgNVBAgT +B0FyaXpvbmExEzARBgNVBAcTClNjb3R0c2RhbGUxJTAjBgNVBAoTHFN0YXJmaWVsZCBUZWNobm9s +b2dpZXMsIEluYy4xOzA5BgNVBAMTMlN0YXJmaWVsZCBTZXJ2aWNlcyBSb290IENlcnRpZmljYXRl +IEF1dGhvcml0eSAtIEcyMB4XDTA5MDkwMTAwMDAwMFoXDTM3MTIzMTIzNTk1OVowgZgxCzAJBgNV +BAYTAlVTMRAwDgYDVQQIEwdBcml6b25hMRMwEQYDVQQHEwpTY290dHNkYWxlMSUwIwYDVQQKExxT +dGFyZmllbGQgVGVjaG5vbG9naWVzLCBJbmMuMTswOQYDVQQDEzJTdGFyZmllbGQgU2VydmljZXMg +Um9vdCBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkgLSBHMjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC +AQoCggEBANUMOsQq+U7i9b4Zl1+OiFOxHz/Lz58gE20pOsgPfTz3a3Y4Y9k2YKibXlwAgLIvWX/2 +h/klQ4bnaRtSmpDhcePYLQ1Ob/bISdm28xpWriu2dBTrz/sm4xq6HZYuajtYlIlHVv8loJNwU4Pa +hHQUw2eeBGg6345AWh1KTs9DkTvnVtYAcMtS7nt9rjrnvDH5RfbCYM8TWQIrgMw0R9+53pBlbQLP +LJGmpufehRhJfGZOozptqbXuNC66DQO4M99H67FrjSXZm86B0UVGMpZwh94CDklDhbZsc7tk6mFB +rMnUVN+HL8cisibMn1lUaJ/8viovxFUcdUBgF4UCVTmLfwUCAwEAAaNCMEAwDwYDVR0TAQH/BAUw +AwEB/zAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYEFJxfAN+qAdcwKziIorhtSpzyEZGDMA0GCSqG +SIb3DQEBCwUAA4IBAQBLNqaEd2ndOxmfZyMIbw5hyf2E3F/YNoHN2BtBLZ9g3ccaaNnRbobhiCPP +E95Dz+I0swSdHynVv/heyNXBve6SbzJ08pGCL72CQnqtKrcgfU28elUSwhXqvfdqlS5sdJ/PHLTy +xQGjhdByPq1zqwubdQxtRbeOlKyWN7Wg0I8VRw7j6IPdj/3vQQF3zCepYoUz8jcI73HPdwbeyBkd +iEDPfUYd/x7H4c7/I9vG+o1VTqkC50cRRj70/b17KSa7qWFiNyi2LSr2EIZkyXCn0q23KXB56jza +YyWf/Wi3MOxw+3WKt21gZ7IeyLnp2KhvAotnDU0mV3HaIPzBSlCNsSi6 +-----END CERTIFICATE----- + +AffirmTrust Commercial +====================== +-----BEGIN CERTIFICATE----- +MIIDTDCCAjSgAwIBAgIId3cGJyapsXwwDQYJKoZIhvcNAQELBQAwRDELMAkGA1UEBhMCVVMxFDAS +BgNVBAoMC0FmZmlybVRydXN0MR8wHQYDVQQDDBZBZmZpcm1UcnVzdCBDb21tZXJjaWFsMB4XDTEw +MDEyOTE0MDYwNloXDTMwMTIzMTE0MDYwNlowRDELMAkGA1UEBhMCVVMxFDASBgNVBAoMC0FmZmly +bVRydXN0MR8wHQYDVQQDDBZBZmZpcm1UcnVzdCBDb21tZXJjaWFsMIIBIjANBgkqhkiG9w0BAQEF +AAOCAQ8AMIIBCgKCAQEA9htPZwcroRX1BiLLHwGy43NFBkRJLLtJJRTWzsO3qyxPxkEylFf6Eqdb +DuKPHx6GGaeqtS25Xw2Kwq+FNXkyLbscYjfysVtKPcrNcV/pQr6U6Mje+SJIZMblq8Yrba0F8PrV +C8+a5fBQpIs7R6UjW3p6+DM/uO+Zl+MgwdYoic+U+7lF7eNAFxHUdPALMeIrJmqbTFeurCA+ukV6 +BfO9m2kVrn1OIGPENXY6BwLJN/3HR+7o8XYdcxXyl6S1yHp52UKqK39c/s4mT6NmgTWvRLpUHhww +MmWd5jyTXlBOeuM61G7MGvv50jeuJCqrVwMiKA1JdX+3KNp1v47j3A55MQIDAQABo0IwQDAdBgNV +HQ4EFgQUnZPGU4teyq8/nx4P5ZmVvCT2lI8wDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMC +AQYwDQYJKoZIhvcNAQELBQADggEBAFis9AQOzcAN/wr91LoWXym9e2iZWEnStB03TX8nfUYGXUPG +hi4+c7ImfU+TqbbEKpqrIZcUsd6M06uJFdhrJNTxFq7YpFzUf1GO7RgBsZNjvbz4YYCanrHOQnDi +qX0GJX0nof5v7LMeJNrjS1UaADs1tDvZ110w/YETifLCBivtZ8SOyUOyXGsViQK8YvxO8rUzqrJv +0wqiUOP2O+guRMLbZjipM1ZI8W0bM40NjD9gN53Tym1+NH4Nn3J2ixufcv1SNUFFApYvHLKac0kh +sUlHRUe072o0EclNmsxZt9YCnlpOZbWUrhvfKbAW8b8Angc6F2S1BLUjIZkKlTuXfO8= +-----END CERTIFICATE----- + +AffirmTrust Networking +====================== +-----BEGIN CERTIFICATE----- +MIIDTDCCAjSgAwIBAgIIfE8EORzUmS0wDQYJKoZIhvcNAQEFBQAwRDELMAkGA1UEBhMCVVMxFDAS +BgNVBAoMC0FmZmlybVRydXN0MR8wHQYDVQQDDBZBZmZpcm1UcnVzdCBOZXR3b3JraW5nMB4XDTEw +MDEyOTE0MDgyNFoXDTMwMTIzMTE0MDgyNFowRDELMAkGA1UEBhMCVVMxFDASBgNVBAoMC0FmZmly +bVRydXN0MR8wHQYDVQQDDBZBZmZpcm1UcnVzdCBOZXR3b3JraW5nMIIBIjANBgkqhkiG9w0BAQEF +AAOCAQ8AMIIBCgKCAQEAtITMMxcua5Rsa2FSoOujz3mUTOWUgJnLVWREZY9nZOIG41w3SfYvm4SE +Hi3yYJ0wTsyEheIszx6e/jarM3c1RNg1lho9Nuh6DtjVR6FqaYvZ/Ls6rnla1fTWcbuakCNrmreI +dIcMHl+5ni36q1Mr3Lt2PpNMCAiMHqIjHNRqrSK6mQEubWXLviRmVSRLQESxG9fhwoXA3hA/Pe24 +/PHxI1Pcv2WXb9n5QHGNfb2V1M6+oF4nI979ptAmDgAp6zxG8D1gvz9Q0twmQVGeFDdCBKNwV6gb +h+0t+nvujArjqWaJGctB+d1ENmHP4ndGyH329JKBNv3bNPFyfvMMFr20FQIDAQABo0IwQDAdBgNV +HQ4EFgQUBx/S55zawm6iQLSwelAQUHTEyL0wDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMC +AQYwDQYJKoZIhvcNAQEFBQADggEBAIlXshZ6qML91tmbmzTCnLQyFE2npN/svqe++EPbkTfOtDIu +UFUaNU52Q3Eg75N3ThVwLofDwR1t3Mu1J9QsVtFSUzpE0nPIxBsFZVpikpzuQY0x2+c06lkh1QF6 +12S4ZDnNye2v7UsDSKegmQGA3GWjNq5lWUhPgkvIZfFXHeVZLgo/bNjR9eUJtGxUAArgFU2HdW23 +WJZa3W3SAKD0m0i+wzekujbgfIeFlxoVot4uolu9rxj5kFDNcFn4J2dHy8egBzp90SxdbBk6ZrV9 +/ZFvgrG+CJPbFEfxojfHRZ48x3evZKiT3/Zpg4Jg8klCNO1aAFSFHBY2kgxc+qatv9s= +-----END CERTIFICATE----- + +AffirmTrust Premium +=================== +-----BEGIN CERTIFICATE----- +MIIFRjCCAy6gAwIBAgIIbYwURrGmCu4wDQYJKoZIhvcNAQEMBQAwQTELMAkGA1UEBhMCVVMxFDAS +BgNVBAoMC0FmZmlybVRydXN0MRwwGgYDVQQDDBNBZmZpcm1UcnVzdCBQcmVtaXVtMB4XDTEwMDEy +OTE0MTAzNloXDTQwMTIzMTE0MTAzNlowQTELMAkGA1UEBhMCVVMxFDASBgNVBAoMC0FmZmlybVRy +dXN0MRwwGgYDVQQDDBNBZmZpcm1UcnVzdCBQcmVtaXVtMIICIjANBgkqhkiG9w0BAQEFAAOCAg8A +MIICCgKCAgEAxBLfqV/+Qd3d9Z+K4/as4Tx4mrzY8H96oDMq3I0gW64tb+eT2TZwamjPjlGjhVtn +BKAQJG9dKILBl1fYSCkTtuG+kU3fhQxTGJoeJKJPj/CihQvL9Cl/0qRY7iZNyaqoe5rZ+jjeRFcV +5fiMyNlI4g0WJx0eyIOFJbe6qlVBzAMiSy2RjYvmia9mx+n/K+k8rNrSs8PhaJyJ+HoAVt70VZVs ++7pk3WKL3wt3MutizCaam7uqYoNMtAZ6MMgpv+0GTZe5HMQxK9VfvFMSF5yZVylmd2EhMQcuJUmd +GPLu8ytxjLW6OQdJd/zvLpKQBY0tL3d770O/Nbua2Plzpyzy0FfuKE4mX4+QaAkvuPjcBukumj5R +p9EixAqnOEhss/n/fauGV+O61oV4d7pD6kh/9ti+I20ev9E2bFhc8e6kGVQa9QPSdubhjL08s9NI +S+LI+H+SqHZGnEJlPqQewQcDWkYtuJfzt9WyVSHvutxMAJf7FJUnM7/oQ0dG0giZFmA7mn7S5u04 +6uwBHjxIVkkJx0w3AJ6IDsBz4W9m6XJHMD4Q5QsDyZpCAGzFlH5hxIrff4IaC1nEWTJ3s7xgaVY5 +/bQGeyzWZDbZvUjthB9+pSKPKrhC9IK31FOQeE4tGv2Bb0TXOwF0lkLgAOIua+rF7nKsu7/+6qqo ++Nz2snmKtmcCAwEAAaNCMEAwHQYDVR0OBBYEFJ3AZ6YMItkm9UWrpmVSESfYRaxjMA8GA1UdEwEB +/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMA0GCSqGSIb3DQEBDAUAA4ICAQCzV00QYk465KzquByv +MiPIs0laUZx2KI15qldGF9X1Uva3ROgIRL8YhNILgM3FEv0AVQVhh0HctSSePMTYyPtwni94loMg +Nt58D2kTiKV1NpgIpsbfrM7jWNa3Pt668+s0QNiigfV4Py/VpfzZotReBA4Xrf5B8OWycvpEgjNC +6C1Y91aMYj+6QrCcDFx+LmUmXFNPALJ4fqENmS2NuB2OosSw/WDQMKSOyARiqcTtNd56l+0OOF6S +L5Nwpamcb6d9Ex1+xghIsV5n61EIJenmJWtSKZGc0jlzCFfemQa0W50QBuHCAKi4HEoCChTQwUHK ++4w1IX2COPKpVJEZNZOUbWo6xbLQu4mGk+ibyQ86p3q4ofB4Rvr8Ny/lioTz3/4E2aFooC8k4gmV +BtWVyuEklut89pMFu+1z6S3RdTnX5yTb2E5fQ4+e0BQ5v1VwSJlXMbSc7kqYA5YwH2AG7hsj/oFg +IxpHYoWlzBk0gG+zrBrjn/B7SK3VAdlntqlyk+otZrWyuOQ9PLLvTIzq6we/qzWaVYa8GKa1qF60 +g2xraUDTn9zxw2lrueFtCfTxqlB2Cnp9ehehVZZCmTEJ3WARjQUwfuaORtGdFNrHF+QFlozEJLUb +zxQHskD4o55BhrwE0GuWyCqANP2/7waj3VjFhT0+j/6eKeC2uAloGRwYQw== +-----END CERTIFICATE----- + +AffirmTrust Premium ECC +======================= +-----BEGIN CERTIFICATE----- +MIIB/jCCAYWgAwIBAgIIdJclisc/elQwCgYIKoZIzj0EAwMwRTELMAkGA1UEBhMCVVMxFDASBgNV +BAoMC0FmZmlybVRydXN0MSAwHgYDVQQDDBdBZmZpcm1UcnVzdCBQcmVtaXVtIEVDQzAeFw0xMDAx +MjkxNDIwMjRaFw00MDEyMzExNDIwMjRaMEUxCzAJBgNVBAYTAlVTMRQwEgYDVQQKDAtBZmZpcm1U +cnVzdDEgMB4GA1UEAwwXQWZmaXJtVHJ1c3QgUHJlbWl1bSBFQ0MwdjAQBgcqhkjOPQIBBgUrgQQA +IgNiAAQNMF4bFZ0D0KF5Nbc6PJJ6yhUczWLznCZcBz3lVPqj1swS6vQUX+iOGasvLkjmrBhDeKzQ +N8O9ss0s5kfiGuZjuD0uL3jET9v0D6RoTFVya5UdThhClXjMNzyR4ptlKymjQjBAMB0GA1UdDgQW +BBSaryl6wBE1NSZRMADDav5A1a7WPDAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBBjAK +BggqhkjOPQQDAwNnADBkAjAXCfOHiFBar8jAQr9HX/VsaobgxCd05DhT1wV/GzTjxi+zygk8N53X +57hG8f2h4nECMEJZh0PUUd+60wkyWs6Iflc9nF9Ca/UHLbXwgpP5WW+uZPpY5Yse42O+tYHNbwKM +eQ== +-----END CERTIFICATE----- + +Certum Trusted Network CA +========================= +-----BEGIN CERTIFICATE----- +MIIDuzCCAqOgAwIBAgIDBETAMA0GCSqGSIb3DQEBBQUAMH4xCzAJBgNVBAYTAlBMMSIwIAYDVQQK +ExlVbml6ZXRvIFRlY2hub2xvZ2llcyBTLkEuMScwJQYDVQQLEx5DZXJ0dW0gQ2VydGlmaWNhdGlv +biBBdXRob3JpdHkxIjAgBgNVBAMTGUNlcnR1bSBUcnVzdGVkIE5ldHdvcmsgQ0EwHhcNMDgxMDIy +MTIwNzM3WhcNMjkxMjMxMTIwNzM3WjB+MQswCQYDVQQGEwJQTDEiMCAGA1UEChMZVW5pemV0byBU +ZWNobm9sb2dpZXMgUy5BLjEnMCUGA1UECxMeQ2VydHVtIENlcnRpZmljYXRpb24gQXV0aG9yaXR5 +MSIwIAYDVQQDExlDZXJ0dW0gVHJ1c3RlZCBOZXR3b3JrIENBMIIBIjANBgkqhkiG9w0BAQEFAAOC +AQ8AMIIBCgKCAQEA4/t9o3K6wvDJFIf1awFO4W5AB7ptJ11/91sts1rHUV+rpDKmYYe2bg+G0jAC +l/jXaVehGDldamR5xgFZrDwxSjh80gTSSyjoIF87B6LMTXPb865Px1bVWqeWifrzq2jUI4ZZJ88J +J7ysbnKDHDBy3+Ci6dLhdHUZvSqeexVUBBvXQzmtVSjF4hq79MDkrjhJM8x2hZ85RdKknvISjFH4 +fOQtf/WsX+sWn7Et0brMkUJ3TCXJkDhv2/DM+44el1k+1WBO5gUo7Ul5E0u6SNsv+XLTOcr+H9g0 +cvW0QM8xAcPs3hEtF10fuFDRXhmnad4HMyjKUJX5p1TLVIZQRan5SQIDAQABo0IwQDAPBgNVHRMB +Af8EBTADAQH/MB0GA1UdDgQWBBQIds3LB/8k9sXN7buQvOKEN0Z19zAOBgNVHQ8BAf8EBAMCAQYw +DQYJKoZIhvcNAQEFBQADggEBAKaorSLOAT2mo/9i0Eidi15ysHhE49wcrwn9I0j6vSrEuVUEtRCj +jSfeC4Jj0O7eDDd5QVsisrCaQVymcODU0HfLI9MA4GxWL+FpDQ3Zqr8hgVDZBqWo/5U30Kr+4rP1 +mS1FhIrlQgnXdAIv94nYmem8J9RHjboNRhx3zxSkHLmkMcScKHQDNP8zGSal6Q10tz6XxnboJ5aj +Zt3hrvJBW8qYVoNzcOSGGtIxQbovvi0TWnZvTuhOgQ4/WwMioBK+ZlgRSssDxLQqKi2WF+A5VLxI +03YnnZotBqbJ7DnSq9ufmgsnAjUpsUCV5/nonFWIGUbWtzT1fs45mtk48VH3Tyw= +-----END CERTIFICATE----- + +Certinomis - Autorité Racine +============================= +-----BEGIN CERTIFICATE----- +MIIFnDCCA4SgAwIBAgIBATANBgkqhkiG9w0BAQUFADBjMQswCQYDVQQGEwJGUjETMBEGA1UEChMK +Q2VydGlub21pczEXMBUGA1UECxMOMDAwMiA0MzM5OTg5MDMxJjAkBgNVBAMMHUNlcnRpbm9taXMg +LSBBdXRvcml0w6kgUmFjaW5lMB4XDTA4MDkxNzA4Mjg1OVoXDTI4MDkxNzA4Mjg1OVowYzELMAkG +A1UEBhMCRlIxEzARBgNVBAoTCkNlcnRpbm9taXMxFzAVBgNVBAsTDjAwMDIgNDMzOTk4OTAzMSYw +JAYDVQQDDB1DZXJ0aW5vbWlzIC0gQXV0b3JpdMOpIFJhY2luZTCCAiIwDQYJKoZIhvcNAQEBBQAD +ggIPADCCAgoCggIBAJ2Fn4bT46/HsmtuM+Cet0I0VZ35gb5j2CN2DpdUzZlMGvE5x4jYF1AMnmHa +wE5V3udauHpOd4cN5bjr+p5eex7Ezyh0x5P1FMYiKAT5kcOrJ3NqDi5N8y4oH3DfVS9O7cdxbwly +Lu3VMpfQ8Vh30WC8Tl7bmoT2R2FFK/ZQpn9qcSdIhDWerP5pqZ56XjUl+rSnSTV3lqc2W+HN3yNw +2F1MpQiD8aYkOBOo7C+ooWfHpi2GR+6K/OybDnT0K0kCe5B1jPyZOQE51kqJ5Z52qz6WKDgmi92N +jMD2AR5vpTESOH2VwnHu7XSu5DaiQ3XV8QCb4uTXzEIDS3h65X27uK4uIJPT5GHfceF2Z5c/tt9q +c1pkIuVC28+BA5PY9OMQ4HL2AHCs8MF6DwV/zzRpRbWT5BnbUhYjBYkOjUjkJW+zeL9i9Qf6lSTC +lrLooyPCXQP8w9PlfMl1I9f09bze5N/NgL+RiH2nE7Q5uiy6vdFrzPOlKO1Enn1So2+WLhl+HPNb +xxaOu2B9d2ZHVIIAEWBsMsGoOBvrbpgT1u449fCfDu/+MYHB0iSVL1N6aaLwD4ZFjliCK0wi1F6g +530mJ0jfJUaNSih8hp75mxpZuWW/Bd22Ql095gBIgl4g9xGC3srYn+Y3RyYe63j3YcNBZFgCQfna +4NH4+ej9Uji29YnfAgMBAAGjWzBZMA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMB0G +A1UdDgQWBBQNjLZh2kS40RR9w759XkjwzspqsDAXBgNVHSAEEDAOMAwGCiqBegFWAgIAAQEwDQYJ +KoZIhvcNAQEFBQADggIBACQ+YAZ+He86PtvqrxyaLAEL9MW12Ukx9F1BjYkMTv9sov3/4gbIOZ/x +WqndIlgVqIrTseYyCYIDbNc/CMf4uboAbbnW/FIyXaR/pDGUu7ZMOH8oMDX/nyNTt7buFHAAQCva +R6s0fl6nVjBhK4tDrP22iCj1a7Y+YEq6QpA0Z43q619FVDsXrIvkxmUP7tCMXWY5zjKn2BCXwH40 +nJ+U8/aGH88bc62UeYdocMMzpXDn2NU4lG9jeeu/Cg4I58UvD0KgKxRA/yHgBcUn4YQRE7rWhh1B +CxMjidPJC+iKunqjo3M3NYB9Ergzd0A4wPpeMNLytqOx1qKVl4GbUu1pTP+A5FPbVFsDbVRfsbjv +JL1vnxHDx2TCDyhihWZeGnuyt++uNckZM6i4J9szVb9o4XVIRFb7zdNIu0eJOqxp9YDG5ERQL1TE +qkPFMTFYvZbF6nVsmnWxTfj3l/+WFvKXTej28xH5On2KOG4Ey+HTRRWqpdEdnV1j6CTmNhTih60b +WfVEm/vXd3wfAXBioSAaosUaKPQhA+4u2cGA6rnZgtZbdsLLO7XSAPCjDuGtbkD326C00EauFddE +wk01+dIL8hf2rGbVJLJP0RyZwG71fet0BLj5TXcJ17TPBzAJ8bgAVtkXFhYKK4bfjwEZGuW7gmP/ +vgt2Fl43N+bYdJeimUV5 +-----END CERTIFICATE----- + +Root CA Generalitat Valenciana +============================== +-----BEGIN CERTIFICATE----- +MIIGizCCBXOgAwIBAgIEO0XlaDANBgkqhkiG9w0BAQUFADBoMQswCQYDVQQGEwJFUzEfMB0GA1UE +ChMWR2VuZXJhbGl0YXQgVmFsZW5jaWFuYTEPMA0GA1UECxMGUEtJR1ZBMScwJQYDVQQDEx5Sb290 +IENBIEdlbmVyYWxpdGF0IFZhbGVuY2lhbmEwHhcNMDEwNzA2MTYyMjQ3WhcNMjEwNzAxMTUyMjQ3 +WjBoMQswCQYDVQQGEwJFUzEfMB0GA1UEChMWR2VuZXJhbGl0YXQgVmFsZW5jaWFuYTEPMA0GA1UE +CxMGUEtJR1ZBMScwJQYDVQQDEx5Sb290IENBIEdlbmVyYWxpdGF0IFZhbGVuY2lhbmEwggEiMA0G +CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDGKqtXETcvIorKA3Qdyu0togu8M1JAJke+WmmmO3I2 +F0zo37i7L3bhQEZ0ZQKQUgi0/6iMweDHiVYQOTPvaLRfX9ptI6GJXiKjSgbwJ/BXufjpTjJ3Cj9B +ZPPrZe52/lSqfR0grvPXdMIKX/UIKFIIzFVd0g/bmoGlu6GzwZTNVOAydTGRGmKy3nXiz0+J2ZGQ +D0EbtFpKd71ng+CT516nDOeB0/RSrFOyA8dEJvt55cs0YFAQexvba9dHq198aMpunUEDEO5rmXte +JajCq+TA81yc477OMUxkHl6AovWDfgzWyoxVjr7gvkkHD6MkQXpYHYTqWBLI4bft75PelAgxAgMB +AAGjggM7MIIDNzAyBggrBgEFBQcBAQQmMCQwIgYIKwYBBQUHMAGGFmh0dHA6Ly9vY3NwLnBraS5n +dmEuZXMwEgYDVR0TAQH/BAgwBgEB/wIBAjCCAjQGA1UdIASCAiswggInMIICIwYKKwYBBAG/VQIB +ADCCAhMwggHoBggrBgEFBQcCAjCCAdoeggHWAEEAdQB0AG8AcgBpAGQAYQBkACAAZABlACAAQwBl +AHIAdABpAGYAaQBjAGEAYwBpAPMAbgAgAFIAYQDtAHoAIABkAGUAIABsAGEAIABHAGUAbgBlAHIA +YQBsAGkAdABhAHQAIABWAGEAbABlAG4AYwBpAGEAbgBhAC4ADQAKAEwAYQAgAEQAZQBjAGwAYQBy +AGEAYwBpAPMAbgAgAGQAZQAgAFAAcgDhAGMAdABpAGMAYQBzACAAZABlACAAQwBlAHIAdABpAGYA +aQBjAGEAYwBpAPMAbgAgAHEAdQBlACAAcgBpAGcAZQAgAGUAbAAgAGYAdQBuAGMAaQBvAG4AYQBt +AGkAZQBuAHQAbwAgAGQAZQAgAGwAYQAgAHAAcgBlAHMAZQBuAHQAZQAgAEEAdQB0AG8AcgBpAGQA +YQBkACAAZABlACAAQwBlAHIAdABpAGYAaQBjAGEAYwBpAPMAbgAgAHMAZQAgAGUAbgBjAHUAZQBu +AHQAcgBhACAAZQBuACAAbABhACAAZABpAHIAZQBjAGMAaQDzAG4AIAB3AGUAYgAgAGgAdAB0AHAA +OgAvAC8AdwB3AHcALgBwAGsAaQAuAGcAdgBhAC4AZQBzAC8AYwBwAHMwJQYIKwYBBQUHAgEWGWh0 +dHA6Ly93d3cucGtpLmd2YS5lcy9jcHMwHQYDVR0OBBYEFHs100DSHHgZZu90ECjcPk+yeAT8MIGV +BgNVHSMEgY0wgYqAFHs100DSHHgZZu90ECjcPk+yeAT8oWykajBoMQswCQYDVQQGEwJFUzEfMB0G +A1UEChMWR2VuZXJhbGl0YXQgVmFsZW5jaWFuYTEPMA0GA1UECxMGUEtJR1ZBMScwJQYDVQQDEx5S +b290IENBIEdlbmVyYWxpdGF0IFZhbGVuY2lhbmGCBDtF5WgwDQYJKoZIhvcNAQEFBQADggEBACRh +TvW1yEICKrNcda3FbcrnlD+laJWIwVTAEGmiEi8YPyVQqHxK6sYJ2fR1xkDar1CdPaUWu20xxsdz +Ckj+IHLtb8zog2EWRpABlUt9jppSCS/2bxzkoXHPjCpaF3ODR00PNvsETUlR4hTJZGH71BTg9J63 +NI8KJr2XXPR5OkowGcytT6CYirQxlyric21+eLj4iIlPsSKRZEv1UN4D2+XFducTZnV+ZfsBn5OH +iJ35Rld8TWCvmHMTI6QgkYH60GFmuH3Rr9ZvHmw96RH9qfmCIoaZM3Fa6hlXPZHNqcCjbgcTpsnt ++GijnsNacgmHKNHEc8RzGF9QdRYxn7fofMM= +-----END CERTIFICATE----- + +A-Trust-nQual-03 +================ +-----BEGIN CERTIFICATE----- +MIIDzzCCAregAwIBAgIDAWweMA0GCSqGSIb3DQEBBQUAMIGNMQswCQYDVQQGEwJBVDFIMEYGA1UE +Cgw/QS1UcnVzdCBHZXMuIGYuIFNpY2hlcmhlaXRzc3lzdGVtZSBpbSBlbGVrdHIuIERhdGVudmVy +a2VociBHbWJIMRkwFwYDVQQLDBBBLVRydXN0LW5RdWFsLTAzMRkwFwYDVQQDDBBBLVRydXN0LW5R +dWFsLTAzMB4XDTA1MDgxNzIyMDAwMFoXDTE1MDgxNzIyMDAwMFowgY0xCzAJBgNVBAYTAkFUMUgw +RgYDVQQKDD9BLVRydXN0IEdlcy4gZi4gU2ljaGVyaGVpdHNzeXN0ZW1lIGltIGVsZWt0ci4gRGF0 +ZW52ZXJrZWhyIEdtYkgxGTAXBgNVBAsMEEEtVHJ1c3QtblF1YWwtMDMxGTAXBgNVBAMMEEEtVHJ1 +c3QtblF1YWwtMDMwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCtPWFuA/OQO8BBC4SA +zewqo51ru27CQoT3URThoKgtUaNR8t4j8DRE/5TrzAUjlUC5B3ilJfYKvUWG6Nm9wASOhURh73+n +yfrBJcyFLGM/BWBzSQXgYHiVEEvc+RFZznF/QJuKqiTfC0Li21a8StKlDJu3Qz7dg9MmEALP6iPE +SU7l0+m0iKsMrmKS1GWH2WrX9IWf5DMiJaXlyDO6w8dB3F/GaswADm0yqLaHNgBid5seHzTLkDx4 +iHQF63n1k3Flyp3HaxgtPVxO59X4PzF9j4fsCiIvI+n+u33J4PTs63zEsMMtYrWacdaxaujs2e3V +cuy+VwHOBVWf3tFgiBCzAgMBAAGjNjA0MA8GA1UdEwEB/wQFMAMBAf8wEQYDVR0OBAoECERqlWdV +eRFPMA4GA1UdDwEB/wQEAwIBBjANBgkqhkiG9w0BAQUFAAOCAQEAVdRU0VlIXLOThaq/Yy/kgM40 +ozRiPvbY7meIMQQDbwvUB/tOdQ/TLtPAF8fGKOwGDREkDg6lXb+MshOWcdzUzg4NCmgybLlBMRmr +sQd7TZjTXLDR8KdCoLXEjq/+8T/0709GAHbrAvv5ndJAlseIOrifEXnzgGWovR/TeIGgUUw3tKZd +JXDRZslo+S4RFGjxVJgIrCaSD96JntT6s3kr0qN51OyLrIdTaEJMUVF0HhsnLuP1Hyl0Te2v9+GS +mYHovjrHF1D2t8b8m7CKa9aIA5GPBnc6hQLdmNVDeD/GMBWsm2vLV7eJUYs66MmEDNuxUCAKGkq6 +ahq97BvIxYSazQ== +-----END CERTIFICATE----- + +TWCA Root Certification Authority +================================= +-----BEGIN CERTIFICATE----- +MIIDezCCAmOgAwIBAgIBATANBgkqhkiG9w0BAQUFADBfMQswCQYDVQQGEwJUVzESMBAGA1UECgwJ +VEFJV0FOLUNBMRAwDgYDVQQLDAdSb290IENBMSowKAYDVQQDDCFUV0NBIFJvb3QgQ2VydGlmaWNh +dGlvbiBBdXRob3JpdHkwHhcNMDgwODI4MDcyNDMzWhcNMzAxMjMxMTU1OTU5WjBfMQswCQYDVQQG +EwJUVzESMBAGA1UECgwJVEFJV0FOLUNBMRAwDgYDVQQLDAdSb290IENBMSowKAYDVQQDDCFUV0NB +IFJvb3QgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK +AoIBAQCwfnK4pAOU5qfeCTiRShFAh6d8WWQUe7UREN3+v9XAu1bihSX0NXIP+FPQQeFEAcK0HMMx +QhZHhTMidrIKbw/lJVBPhYa+v5guEGcevhEFhgWQxFnQfHgQsIBct+HHK3XLfJ+utdGdIzdjp9xC +oi2SBBtQwXu4PhvJVgSLL1KbralW6cH/ralYhzC2gfeXRfwZVzsrb+RH9JlF/h3x+JejiB03HFyP +4HYlmlD4oFT/RJB2I9IyxsOrBr/8+7/zrX2SYgJbKdM1o5OaQ2RgXbL6Mv87BK9NQGr5x+PvI/1r +y+UPizgN7gr8/g+YnzAx3WxSZfmLgb4i4RxYA7qRG4kHAgMBAAGjQjBAMA4GA1UdDwEB/wQEAwIB +BjAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBRqOFsmjd6LWvJPelSDGRjjCDWmujANBgkqhkiG +9w0BAQUFAAOCAQEAPNV3PdrfibqHDAhUaiBQkr6wQT25JmSDCi/oQMCXKCeCMErJk/9q56YAf4lC +mtYR5VPOL8zy2gXE/uJQxDqGfczafhAJO5I1KlOy/usrBdlsXebQ79NqZp4VKIV66IIArB6nCWlW +QtNoURi+VJq/REG6Sb4gumlc7rh3zc5sH62Dlhh9DrUUOYTxKOkto557HnpyWoOzeW/vtPzQCqVY +T0bf+215WfKEIlKuD8z7fDvnaspHYcN6+NOSBB+4IIThNlQWx0DeO4pz3N/GCUzf7Nr/1FNCocny +Yh0igzyXxfkZYiesZSLX0zzG5Y6yU8xJzrww/nsOM5D77dIUkR8Hrw== +-----END CERTIFICATE----- + +Security Communication RootCA2 +============================== +-----BEGIN CERTIFICATE----- +MIIDdzCCAl+gAwIBAgIBADANBgkqhkiG9w0BAQsFADBdMQswCQYDVQQGEwJKUDElMCMGA1UEChMc +U0VDT00gVHJ1c3QgU3lzdGVtcyBDTy4sTFRELjEnMCUGA1UECxMeU2VjdXJpdHkgQ29tbXVuaWNh +dGlvbiBSb290Q0EyMB4XDTA5MDUyOTA1MDAzOVoXDTI5MDUyOTA1MDAzOVowXTELMAkGA1UEBhMC +SlAxJTAjBgNVBAoTHFNFQ09NIFRydXN0IFN5c3RlbXMgQ08uLExURC4xJzAlBgNVBAsTHlNlY3Vy +aXR5IENvbW11bmljYXRpb24gUm9vdENBMjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB +ANAVOVKxUrO6xVmCxF1SrjpDZYBLx/KWvNs2l9amZIyoXvDjChz335c9S672XewhtUGrzbl+dp++ ++T42NKA7wfYxEUV0kz1XgMX5iZnK5atq1LXaQZAQwdbWQonCv/Q4EpVMVAX3NuRFg3sUZdbcDE3R +3n4MqzvEFb46VqZab3ZpUql6ucjrappdUtAtCms1FgkQhNBqyjoGADdH5H5XTz+L62e4iKrFvlNV +spHEfbmwhRkGeC7bYRr6hfVKkaHnFtWOojnflLhwHyg/i/xAXmODPIMqGplrz95Zajv8bxbXH/1K +EOtOghY6rCcMU/Gt1SSwawNQwS08Ft1ENCcadfsCAwEAAaNCMEAwHQYDVR0OBBYEFAqFqXdlBZh8 +QIH4D5csOPEK7DzPMA4GA1UdDwEB/wQEAwIBBjAPBgNVHRMBAf8EBTADAQH/MA0GCSqGSIb3DQEB +CwUAA4IBAQBMOqNErLlFsceTfsgLCkLfZOoc7llsCLqJX2rKSpWeeo8HxdpFcoJxDjrSzG+ntKEj +u/Ykn8sX/oymzsLS28yN/HH8AynBbF0zX2S2ZTuJbxh2ePXcokgfGT+Ok+vx+hfuzU7jBBJV1uXk +3fs+BXziHV7Gp7yXT2g69ekuCkO2r1dcYmh8t/2jioSgrGK+KwmHNPBqAbubKVY8/gA3zyNs8U6q +tnRGEmyR7jTV7JqR50S+kDFy1UkC9gLl9B/rfNmWVan/7Ir5mUf/NVoCqgTLiluHcSmRvaS0eg29 +mvVXIwAHIRc/SjnRBUkLp7Y3gaVdjKozXoEofKd9J+sAro03 +-----END CERTIFICATE----- + +EC-ACC +====== +-----BEGIN CERTIFICATE----- +MIIFVjCCBD6gAwIBAgIQ7is969Qh3hSoYqwE893EATANBgkqhkiG9w0BAQUFADCB8zELMAkGA1UE +BhMCRVMxOzA5BgNVBAoTMkFnZW5jaWEgQ2F0YWxhbmEgZGUgQ2VydGlmaWNhY2lvIChOSUYgUS0w +ODAxMTc2LUkpMSgwJgYDVQQLEx9TZXJ2ZWlzIFB1YmxpY3MgZGUgQ2VydGlmaWNhY2lvMTUwMwYD +VQQLEyxWZWdldSBodHRwczovL3d3dy5jYXRjZXJ0Lm5ldC92ZXJhcnJlbCAoYykwMzE1MDMGA1UE +CxMsSmVyYXJxdWlhIEVudGl0YXRzIGRlIENlcnRpZmljYWNpbyBDYXRhbGFuZXMxDzANBgNVBAMT +BkVDLUFDQzAeFw0wMzAxMDcyMzAwMDBaFw0zMTAxMDcyMjU5NTlaMIHzMQswCQYDVQQGEwJFUzE7 +MDkGA1UEChMyQWdlbmNpYSBDYXRhbGFuYSBkZSBDZXJ0aWZpY2FjaW8gKE5JRiBRLTA4MDExNzYt +SSkxKDAmBgNVBAsTH1NlcnZlaXMgUHVibGljcyBkZSBDZXJ0aWZpY2FjaW8xNTAzBgNVBAsTLFZl +Z2V1IGh0dHBzOi8vd3d3LmNhdGNlcnQubmV0L3ZlcmFycmVsIChjKTAzMTUwMwYDVQQLEyxKZXJh +cnF1aWEgRW50aXRhdHMgZGUgQ2VydGlmaWNhY2lvIENhdGFsYW5lczEPMA0GA1UEAxMGRUMtQUND +MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAsyLHT+KXQpWIR4NA9h0X84NzJB5R85iK +w5K4/0CQBXCHYMkAqbWUZRkiFRfCQ2xmRJoNBD45b6VLeqpjt4pEndljkYRm4CgPukLjbo73FCeT +ae6RDqNfDrHrZqJyTxIThmV6PttPB/SnCWDaOkKZx7J/sxaVHMf5NLWUhdWZXqBIoH7nF2W4onW4 +HvPlQn2v7fOKSGRdghST2MDk/7NQcvJ29rNdQlB50JQ+awwAvthrDk4q7D7SzIKiGGUzE3eeml0a +E9jD2z3Il3rucO2n5nzbcc8tlGLfbdb1OL4/pYUKGbio2Al1QnDE6u/LDsg0qBIimAy4E5S2S+zw +0JDnJwIDAQABo4HjMIHgMB0GA1UdEQQWMBSBEmVjX2FjY0BjYXRjZXJ0Lm5ldDAPBgNVHRMBAf8E +BTADAQH/MA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUoMOLRKo3pUW/l4Ba0fF4opvpXY0wfwYD +VR0gBHgwdjB0BgsrBgEEAfV4AQMBCjBlMCwGCCsGAQUFBwIBFiBodHRwczovL3d3dy5jYXRjZXJ0 +Lm5ldC92ZXJhcnJlbDA1BggrBgEFBQcCAjApGidWZWdldSBodHRwczovL3d3dy5jYXRjZXJ0Lm5l +dC92ZXJhcnJlbCAwDQYJKoZIhvcNAQEFBQADggEBAKBIW4IB9k1IuDlVNZyAelOZ1Vr/sXE7zDkJ +lF7W2u++AVtd0x7Y/X1PzaBB4DSTv8vihpw3kpBWHNzrKQXlxJ7HNd+KDM3FIUPpqojlNcAZQmNa +Al6kSBg6hW/cnbw/nZzBh7h6YQjpdwt/cKt63dmXLGQehb+8dJahw3oS7AwaboMMPOhyRp/7SNVe +l+axofjk70YllJyJ22k4vuxcDlbHZVHlUIiIv0LVKz3l+bqeLrPK9HOSAgu+TGbrIP65y7WZf+a2 +E/rKS03Z7lNGBjvGTq2TWoF+bCpLagVFjPIhpDGQh2xlnJ2lYJU6Un/10asIbvPuW/mIPX64b24D +5EI= +-----END CERTIFICATE----- + +Hellenic Academic and Research Institutions RootCA 2011 +======================================================= +-----BEGIN CERTIFICATE----- +MIIEMTCCAxmgAwIBAgIBADANBgkqhkiG9w0BAQUFADCBlTELMAkGA1UEBhMCR1IxRDBCBgNVBAoT +O0hlbGxlbmljIEFjYWRlbWljIGFuZCBSZXNlYXJjaCBJbnN0aXR1dGlvbnMgQ2VydC4gQXV0aG9y +aXR5MUAwPgYDVQQDEzdIZWxsZW5pYyBBY2FkZW1pYyBhbmQgUmVzZWFyY2ggSW5zdGl0dXRpb25z +IFJvb3RDQSAyMDExMB4XDTExMTIwNjEzNDk1MloXDTMxMTIwMTEzNDk1MlowgZUxCzAJBgNVBAYT +AkdSMUQwQgYDVQQKEztIZWxsZW5pYyBBY2FkZW1pYyBhbmQgUmVzZWFyY2ggSW5zdGl0dXRpb25z +IENlcnQuIEF1dGhvcml0eTFAMD4GA1UEAxM3SGVsbGVuaWMgQWNhZGVtaWMgYW5kIFJlc2VhcmNo +IEluc3RpdHV0aW9ucyBSb290Q0EgMjAxMTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB +AKlTAOMupvaO+mDYLZU++CwqVE7NuYRhlFhPjz2L5EPzdYmNUeTDN9KKiE15HrcS3UN4SoqS5tdI +1Q+kOilENbgH9mgdVc04UfCMJDGFr4PJfel3r+0ae50X+bOdOFAPplp5kYCvN66m0zH7tSYJnTxa +71HFK9+WXesyHgLacEnsbgzImjeN9/E2YEsmLIKe0HjzDQ9jpFEw4fkrJxIH2Oq9GGKYsFk3fb7u +8yBRQlqD75O6aRXxYp2fmTmCobd0LovUxQt7L/DICto9eQqakxylKHJzkUOap9FNhYS5qXSPFEDH +3N6sQWRstBmbAmNtJGSPRLIl6s5ddAxjMlyNh+UCAwEAAaOBiTCBhjAPBgNVHRMBAf8EBTADAQH/ +MAsGA1UdDwQEAwIBBjAdBgNVHQ4EFgQUppFC/RNhSiOeCKQp5dgTBCPuQSUwRwYDVR0eBEAwPqA8 +MAWCAy5ncjAFggMuZXUwBoIELmVkdTAGggQub3JnMAWBAy5ncjAFgQMuZXUwBoEELmVkdTAGgQQu +b3JnMA0GCSqGSIb3DQEBBQUAA4IBAQAf73lB4XtuP7KMhjdCSk4cNx6NZrokgclPEg8hwAOXhiVt +XdMiKahsog2p6z0GW5k6x8zDmjR/qw7IThzh+uTczQ2+vyT+bOdrwg3IBp5OjWEopmr95fZi6hg8 +TqBTnbI6nOulnJEWtk2C4AwFSKls9cz4y51JtPACpf1wA+2KIaWuE4ZJwzNzvoc7dIsXRSZMFpGD +/md9zU1jZ/rzAxKWeAaNsWftjj++n08C9bMJL/NMh98qy5V8AcysNnq/onN694/BtZqhFLKPM58N +7yLcZnuEvUUXBj08yrl3NI/K6s8/MT7jiOOASSXIl7WdmplNsDz4SgCbZN2fOUvRJ9e4 +-----END CERTIFICATE----- + +Actalis Authentication Root CA +============================== +-----BEGIN CERTIFICATE----- +MIIFuzCCA6OgAwIBAgIIVwoRl0LE48wwDQYJKoZIhvcNAQELBQAwazELMAkGA1UEBhMCSVQxDjAM +BgNVBAcMBU1pbGFuMSMwIQYDVQQKDBpBY3RhbGlzIFMucC5BLi8wMzM1ODUyMDk2NzEnMCUGA1UE +AwweQWN0YWxpcyBBdXRoZW50aWNhdGlvbiBSb290IENBMB4XDTExMDkyMjExMjIwMloXDTMwMDky +MjExMjIwMlowazELMAkGA1UEBhMCSVQxDjAMBgNVBAcMBU1pbGFuMSMwIQYDVQQKDBpBY3RhbGlz +IFMucC5BLi8wMzM1ODUyMDk2NzEnMCUGA1UEAwweQWN0YWxpcyBBdXRoZW50aWNhdGlvbiBSb290 +IENBMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAp8bEpSmkLO/lGMWwUKNvUTufClrJ +wkg4CsIcoBh/kbWHuUA/3R1oHwiD1S0eiKD4j1aPbZkCkpAW1V8IbInX4ay8IMKx4INRimlNAJZa +by/ARH6jDuSRzVju3PvHHkVH3Se5CAGfpiEd9UEtL0z9KK3giq0itFZljoZUj5NDKd45RnijMCO6 +zfB9E1fAXdKDa0hMxKufgFpbOr3JpyI/gCczWw63igxdBzcIy2zSekciRDXFzMwujt0q7bd9Zg1f +YVEiVRvjRuPjPdA1YprbrxTIW6HMiRvhMCb8oJsfgadHHwTrozmSBp+Z07/T6k9QnBn+locePGX2 +oxgkg4YQ51Q+qDp2JE+BIcXjDwL4k5RHILv+1A7TaLndxHqEguNTVHnd25zS8gebLra8Pu2Fbe8l +EfKXGkJh90qX6IuxEAf6ZYGyojnP9zz/GPvG8VqLWeICrHuS0E4UT1lF9gxeKF+w6D9Fz8+vm2/7 +hNN3WpVvrJSEnu68wEqPSpP4RCHiMUVhUE4Q2OM1fEwZtN4Fv6MGn8i1zeQf1xcGDXqVdFUNaBr8 +EBtiZJ1t4JWgw5QHVw0U5r0F+7if5t+L4sbnfpb2U8WANFAoWPASUHEXMLrmeGO89LKtmyuy/uE5 +jF66CyCU3nuDuP/jVo23Eek7jPKxwV2dpAtMK9myGPW1n0sCAwEAAaNjMGEwHQYDVR0OBBYEFFLY +iDrIn3hm7YnzezhwlMkCAjbQMA8GA1UdEwEB/wQFMAMBAf8wHwYDVR0jBBgwFoAUUtiIOsifeGbt +ifN7OHCUyQICNtAwDgYDVR0PAQH/BAQDAgEGMA0GCSqGSIb3DQEBCwUAA4ICAQALe3KHwGCmSUyI +WOYdiPcUZEim2FgKDk8TNd81HdTtBjHIgT5q1d07GjLukD0R0i70jsNjLiNmsGe+b7bAEzlgqqI0 +JZN1Ut6nna0Oh4lScWoWPBkdg/iaKWW+9D+a2fDzWochcYBNy+A4mz+7+uAwTc+G02UQGRjRlwKx +K3JCaKygvU5a2hi/a5iB0P2avl4VSM0RFbnAKVy06Ij3Pjaut2L9HmLecHgQHEhb2rykOLpn7VU+ +Xlff1ANATIGk0k9jpwlCCRT8AKnCgHNPLsBA2RF7SOp6AsDT6ygBJlh0wcBzIm2Tlf05fbsq4/aC +4yyXX04fkZT6/iyj2HYauE2yOE+b+h1IYHkm4vP9qdCa6HCPSXrW5b0KDtst842/6+OkfcvHlXHo +2qN8xcL4dJIEG4aspCJTQLas/kx2z/uUMsA1n3Y/buWQbqCmJqK4LL7RK4X9p2jIugErsWx0Hbhz +lefut8cl8ABMALJ+tguLHPPAUJ4lueAI3jZm/zel0btUZCzJJ7VLkn5l/9Mt4blOvH+kQSGQQXem +OR/qnuOf0GZvBeyqdn6/axag67XH/JJULysRJyU3eExRarDzzFhdFPFqSBX/wge2sY0PjlxQRrM9 +vwGYT7JZVEc+NHt4bVaTLnPqZih4zR0Uv6CPLy64Lo7yFIrM6bV8+2ydDKXhlg== +-----END CERTIFICATE----- + +Trustis FPS Root CA +=================== +-----BEGIN CERTIFICATE----- +MIIDZzCCAk+gAwIBAgIQGx+ttiD5JNM2a/fH8YygWTANBgkqhkiG9w0BAQUFADBFMQswCQYDVQQG +EwJHQjEYMBYGA1UEChMPVHJ1c3RpcyBMaW1pdGVkMRwwGgYDVQQLExNUcnVzdGlzIEZQUyBSb290 +IENBMB4XDTAzMTIyMzEyMTQwNloXDTI0MDEyMTExMzY1NFowRTELMAkGA1UEBhMCR0IxGDAWBgNV +BAoTD1RydXN0aXMgTGltaXRlZDEcMBoGA1UECxMTVHJ1c3RpcyBGUFMgUm9vdCBDQTCCASIwDQYJ +KoZIhvcNAQEBBQADggEPADCCAQoCggEBAMVQe547NdDfxIzNjpvto8A2mfRC6qc+gIMPpqdZh8mQ +RUN+AOqGeSoDvT03mYlmt+WKVoaTnGhLaASMk5MCPjDSNzoiYYkchU59j9WvezX2fihHiTHcDnlk +H5nSW7r+f2C/revnPDgpai/lkQtV/+xvWNUtyd5MZnGPDNcE2gfmHhjjvSkCqPoc4Vu5g6hBSLwa +cY3nYuUtsuvffM/bq1rKMfFMIvMFE/eC+XN5DL7XSxzA0RU8k0Fk0ea+IxciAIleH2ulrG6nS4zt +o3Lmr2NNL4XSFDWaLk6M6jKYKIahkQlBOrTh4/L68MkKokHdqeMDx4gVOxzUGpTXn2RZEm0CAwEA +AaNTMFEwDwYDVR0TAQH/BAUwAwEB/zAfBgNVHSMEGDAWgBS6+nEleYtXQSUhhgtx67JkDoshZzAd +BgNVHQ4EFgQUuvpxJXmLV0ElIYYLceuyZA6LIWcwDQYJKoZIhvcNAQEFBQADggEBAH5Y//01GX2c +GE+esCu8jowU/yyg2kdbw++BLa8F6nRIW/M+TgfHbcWzk88iNVy2P3UnXwmWzaD+vkAMXBJV+JOC +yinpXj9WV4s4NvdFGkwozZ5BuO1WTISkQMi4sKUraXAEasP41BIy+Q7DsdwyhEQsb8tGD+pmQQ9P +8Vilpg0ND2HepZ5dfWWhPBfnqFVO76DH7cZEf1T1o+CP8HxVIo8ptoGj4W1OLBuAZ+ytIJ8MYmHV +l/9D7S3B2l0pKoU/rGXuhg8FjZBf3+6f9L/uHfuY5H+QK4R4EA5sSVPvFVtlRkpdr7r7OnIdzfYl +iB6XzCGcKQENZetX2fNXlrtIzYE= +-----END CERTIFICATE----- + +StartCom Certification Authority +================================ +-----BEGIN CERTIFICATE----- +MIIHhzCCBW+gAwIBAgIBLTANBgkqhkiG9w0BAQsFADB9MQswCQYDVQQGEwJJTDEWMBQGA1UEChMN +U3RhcnRDb20gTHRkLjErMCkGA1UECxMiU2VjdXJlIERpZ2l0YWwgQ2VydGlmaWNhdGUgU2lnbmlu +ZzEpMCcGA1UEAxMgU3RhcnRDb20gQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkwHhcNMDYwOTE3MTk0 +NjM3WhcNMzYwOTE3MTk0NjM2WjB9MQswCQYDVQQGEwJJTDEWMBQGA1UEChMNU3RhcnRDb20gTHRk +LjErMCkGA1UECxMiU2VjdXJlIERpZ2l0YWwgQ2VydGlmaWNhdGUgU2lnbmluZzEpMCcGA1UEAxMg +U3RhcnRDb20gQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAw +ggIKAoICAQDBiNsJvGxGfHiflXu1M5DycmLWwTYgIiRezul38kMKogZkpMyONvg45iPwbm2xPN1y +o4UcodM9tDMr0y+v/uqwQVlntsQGfQqedIXWeUyAN3rfOQVSWff0G0ZDpNKFhdLDcfN1YjS6LIp/ +Ho/u7TTQEceWzVI9ujPW3U3eCztKS5/CJi/6tRYccjV3yjxd5srhJosaNnZcAdt0FCX+7bWgiA/d +eMotHweXMAEtcnn6RtYTKqi5pquDSR3l8u/d5AGOGAqPY1MWhWKpDhk6zLVmpsJrdAfkK+F2PrRt +2PZE4XNiHzvEvqBTViVsUQn3qqvKv3b9bZvzndu/PWa8DFaqr5hIlTpL36dYUNk4dalb6kMMAv+Z +6+hsTXBbKWWc3apdzK8BMewM69KN6Oqce+Zu9ydmDBpI125C4z/eIT574Q1w+2OqqGwaVLRcJXrJ +osmLFqa7LH4XXgVNWG4SHQHuEhANxjJ/GP/89PrNbpHoNkm+Gkhpi8KWTRoSsmkXwQqQ1vp5Iki/ +untp+HDH+no32NgN0nZPV/+Qt+OR0t3vwmC3Zzrd/qqc8NSLf3Iizsafl7b4r4qgEKjZ+xjGtrVc +UjyJthkqcwEKDwOzEmDyei+B26Nu/yYwl/WL3YlXtq09s68rxbd2AvCl1iuahhQqcvbjM4xdCUsT +37uMdBNSSwIDAQABo4ICEDCCAgwwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwHQYD +VR0OBBYEFE4L7xqkQFulF2mHMMo0aEPQQa7yMB8GA1UdIwQYMBaAFE4L7xqkQFulF2mHMMo0aEPQ +Qa7yMIIBWgYDVR0gBIIBUTCCAU0wggFJBgsrBgEEAYG1NwEBATCCATgwLgYIKwYBBQUHAgEWImh0 +dHA6Ly93d3cuc3RhcnRzc2wuY29tL3BvbGljeS5wZGYwNAYIKwYBBQUHAgEWKGh0dHA6Ly93d3cu +c3RhcnRzc2wuY29tL2ludGVybWVkaWF0ZS5wZGYwgc8GCCsGAQUFBwICMIHCMCcWIFN0YXJ0IENv +bW1lcmNpYWwgKFN0YXJ0Q29tKSBMdGQuMAMCAQEagZZMaW1pdGVkIExpYWJpbGl0eSwgcmVhZCB0 +aGUgc2VjdGlvbiAqTGVnYWwgTGltaXRhdGlvbnMqIG9mIHRoZSBTdGFydENvbSBDZXJ0aWZpY2F0 +aW9uIEF1dGhvcml0eSBQb2xpY3kgYXZhaWxhYmxlIGF0IGh0dHA6Ly93d3cuc3RhcnRzc2wuY29t +L3BvbGljeS5wZGYwEQYJYIZIAYb4QgEBBAQDAgAHMDgGCWCGSAGG+EIBDQQrFilTdGFydENvbSBG +cmVlIFNTTCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTANBgkqhkiG9w0BAQsFAAOCAgEAjo/n3JR5 +fPGFf59Jb2vKXfuM/gTFwWLRfUKKvFO3lANmMD+x5wqnUCBVJX92ehQN6wQOQOY+2IirByeDqXWm +N3PH/UvSTa0XQMhGvjt/UfzDtgUx3M2FIk5xt/JxXrAaxrqTi3iSSoX4eA+D/i+tLPfkpLst0OcN +Org+zvZ49q5HJMqjNTbOx8aHmNrs++myziebiMMEofYLWWivydsQD032ZGNcpRJvkrKTlMeIFw6T +tn5ii5B/q06f/ON1FE8qMt9bDeD1e5MNq6HPh+GlBEXoPBKlCcWw0bdT82AUuoVpaiF8H3VhFyAX +e2w7QSlc4axa0c2Mm+tgHRns9+Ww2vl5GKVFP0lDV9LdJNUso/2RjSe15esUBppMeyG7Oq0wBhjA +2MFrLH9ZXF2RsXAiV+uKa0hK1Q8p7MZAwC+ITGgBF3f0JBlPvfrhsiAhS90a2Cl9qrjeVOwhVYBs +HvUwyKMQ5bLmKhQxw4UtjJixhlpPiVktucf3HMiKf8CdBUrmQk9io20ppB+Fq9vlgcitKj1MXVuE +JnHEhV5xJMqlG2zYYdMa4FTbzrqpMrUi9nNBCV24F10OD5mQ1kfabwo6YigUZ4LZ8dCAWZvLMdib +D4x3TrVoivJs9iQOLWxwxXPR3hTQcY+203sC9uO41Alua551hDnmfyWl8kgAwKQB2j8= +-----END CERTIFICATE----- + +StartCom Certification Authority G2 +=================================== +-----BEGIN CERTIFICATE----- +MIIFYzCCA0ugAwIBAgIBOzANBgkqhkiG9w0BAQsFADBTMQswCQYDVQQGEwJJTDEWMBQGA1UEChMN +U3RhcnRDb20gTHRkLjEsMCoGA1UEAxMjU3RhcnRDb20gQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkg +RzIwHhcNMTAwMTAxMDEwMDAxWhcNMzkxMjMxMjM1OTAxWjBTMQswCQYDVQQGEwJJTDEWMBQGA1UE +ChMNU3RhcnRDb20gTHRkLjEsMCoGA1UEAxMjU3RhcnRDb20gQ2VydGlmaWNhdGlvbiBBdXRob3Jp +dHkgRzIwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQC2iTZbB7cgNr2Cu+EWIAOVeq8O +o1XJJZlKxdBWQYeQTSFgpBSHO839sj60ZwNq7eEPS8CRhXBF4EKe3ikj1AENoBB5uNsDvfOpL9HG +4A/LnooUCri99lZi8cVytjIl2bLzvWXFDSxu1ZJvGIsAQRSCb0AgJnooD/Uefyf3lLE3PbfHkffi +Aez9lInhzG7TNtYKGXmu1zSCZf98Qru23QumNK9LYP5/Q0kGi4xDuFby2X8hQxfqp0iVAXV16iul +Q5XqFYSdCI0mblWbq9zSOdIxHWDirMxWRST1HFSr7obdljKF+ExP6JV2tgXdNiNnvP8V4so75qbs +O+wmETRIjfaAKxojAuuKHDp2KntWFhxyKrOq42ClAJ8Em+JvHhRYW6Vsi1g8w7pOOlz34ZYrPu8H +vKTlXcxNnw3h3Kq74W4a7I/htkxNeXJdFzULHdfBR9qWJODQcqhaX2YtENwvKhOuJv4KHBnM0D4L +nMgJLvlblnpHnOl68wVQdJVznjAJ85eCXuaPOQgeWeU1FEIT/wCc976qUM/iUUjXuG+v+E5+M5iS +FGI6dWPPe/regjupuznixL0sAA7IF6wT700ljtizkC+p2il9Ha90OrInwMEePnWjFqmveiJdnxMa +z6eg6+OGCtP95paV1yPIN93EfKo2rJgaErHgTuixO/XWb/Ew1wIDAQABo0IwQDAPBgNVHRMBAf8E +BTADAQH/MA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUS8W0QGutHLOlHGVuRjaJhwUMDrYwDQYJ +KoZIhvcNAQELBQADggIBAHNXPyzVlTJ+N9uWkusZXn5T50HsEbZH77Xe7XRcxfGOSeD8bpkTzZ+K +2s06Ctg6Wgk/XzTQLwPSZh0avZyQN8gMjgdalEVGKua+etqhqaRpEpKwfTbURIfXUfEpY9Z1zRbk +J4kd+MIySP3bmdCPX1R0zKxnNBFi2QwKN4fRoxdIjtIXHfbX/dtl6/2o1PXWT6RbdejF0mCy2wl+ +JYt7ulKSnj7oxXehPOBKc2thz4bcQ///If4jXSRK9dNtD2IEBVeC2m6kMyV5Sy5UGYvMLD0w6dEG +/+gyRr61M3Z3qAFdlsHB1b6uJcDJHgoJIIihDsnzb02CVAAgp9KP5DlUFy6NHrgbuxu9mk47EDTc +nIhT76IxW1hPkWLIwpqazRVdOKnWvvgTtZ8SafJQYqz7Fzf07rh1Z2AQ+4NQ+US1dZxAF7L+/Xld +blhYXzD8AK6vM8EOTmy6p6ahfzLbOOCxchcKK5HsamMm7YnUeMx0HgX4a/6ManY5Ka5lIxKVCCIc +l85bBu4M4ru8H0ST9tg4RQUh7eStqxK2A6RCLi3ECToDZ2mEmuFZkIoohdVddLHRDiBYmxOlsGOm +7XtH/UVVMKTumtTm4ofvmMkyghEpIrwACjFeLQ/Ajulrso8uBtjRkcfGEvRM/TAXw8HaOFvjqerm +obp573PYtlNXLfbQ4ddI +-----END CERTIFICATE----- + +Buypass Class 2 Root CA +======================= +-----BEGIN CERTIFICATE----- +MIIFWTCCA0GgAwIBAgIBAjANBgkqhkiG9w0BAQsFADBOMQswCQYDVQQGEwJOTzEdMBsGA1UECgwU +QnV5cGFzcyBBUy05ODMxNjMzMjcxIDAeBgNVBAMMF0J1eXBhc3MgQ2xhc3MgMiBSb290IENBMB4X +DTEwMTAyNjA4MzgwM1oXDTQwMTAyNjA4MzgwM1owTjELMAkGA1UEBhMCTk8xHTAbBgNVBAoMFEJ1 +eXBhc3MgQVMtOTgzMTYzMzI3MSAwHgYDVQQDDBdCdXlwYXNzIENsYXNzIDIgUm9vdCBDQTCCAiIw +DQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBANfHXvfBB9R3+0Mh9PT1aeTuMgHbo4Yf5FkNuud1 +g1Lr6hxhFUi7HQfKjK6w3Jad6sNgkoaCKHOcVgb/S2TwDCo3SbXlzwx87vFKu3MwZfPVL4O2fuPn +9Z6rYPnT8Z2SdIrkHJasW4DptfQxh6NR/Md+oW+OU3fUl8FVM5I+GC911K2GScuVr1QGbNgGE41b +/+EmGVnAJLqBcXmQRFBoJJRfuLMR8SlBYaNByyM21cHxMlAQTn/0hpPshNOOvEu/XAFOBz3cFIqU +CqTqc/sLUegTBxj6DvEr0VQVfTzh97QZQmdiXnfgolXsttlpF9U6r0TtSsWe5HonfOV116rLJeff +awrbD02TTqigzXsu8lkBarcNuAeBfos4GzjmCleZPe4h6KP1DBbdi+w0jpwqHAAVF41og9JwnxgI +zRFo1clrUs3ERo/ctfPYV3Me6ZQ5BL/T3jjetFPsaRyifsSP5BtwrfKi+fv3FmRmaZ9JUaLiFRhn +Bkp/1Wy1TbMz4GHrXb7pmA8y1x1LPC5aAVKRCfLf6o3YBkBjqhHk/sM3nhRSP/TizPJhk9H9Z2vX +Uq6/aKtAQ6BXNVN48FP4YUIHZMbXb5tMOA1jrGKvNouicwoN9SG9dKpN6nIDSdvHXx1iY8f93ZHs +M+71bbRuMGjeyNYmsHVee7QHIJihdjK4TWxPAgMBAAGjQjBAMA8GA1UdEwEB/wQFMAMBAf8wHQYD +VR0OBBYEFMmAd+BikoL1RpzzuvdMw964o605MA4GA1UdDwEB/wQEAwIBBjANBgkqhkiG9w0BAQsF +AAOCAgEAU18h9bqwOlI5LJKwbADJ784g7wbylp7ppHR/ehb8t/W2+xUbP6umwHJdELFx7rxP462s +A20ucS6vxOOto70MEae0/0qyexAQH6dXQbLArvQsWdZHEIjzIVEpMMpghq9Gqx3tOluwlN5E40EI +osHsHdb9T7bWR9AUC8rmyrV7d35BH16Dx7aMOZawP5aBQW9gkOLo+fsicdl9sz1Gv7SEr5AcD48S +aq/v7h56rgJKihcrdv6sVIkkLE8/trKnToyokZf7KcZ7XC25y2a2t6hbElGFtQl+Ynhw/qlqYLYd +DnkM/crqJIByw5c/8nerQyIKx+u2DISCLIBrQYoIwOula9+ZEsuK1V6ADJHgJgg2SMX6OBE1/yWD +LfJ6v9r9jv6ly0UsH8SIU653DtmadsWOLB2jutXsMq7Aqqz30XpN69QH4kj3Io6wpJ9qzo6ysmD0 +oyLQI+uUWnpp3Q+/QFesa1lQ2aOZ4W7+jQF5JyMV3pKdewlNWudLSDBaGOYKbeaP4NK75t98biGC +wWg5TbSYWGZizEqQXsP6JwSxeRV0mcy+rSDeJmAc61ZRpqPq5KM/p/9h3PFaTWwyI0PurKju7koS +CTxdccK+efrCh2gdC/1cacwG0Jp9VJkqyTkaGa9LKkPzY11aWOIv4x3kqdbQCtCev9eBCfHJxyYN +rJgWVqA= +-----END CERTIFICATE----- + +Buypass Class 3 Root CA +======================= +-----BEGIN CERTIFICATE----- +MIIFWTCCA0GgAwIBAgIBAjANBgkqhkiG9w0BAQsFADBOMQswCQYDVQQGEwJOTzEdMBsGA1UECgwU +QnV5cGFzcyBBUy05ODMxNjMzMjcxIDAeBgNVBAMMF0J1eXBhc3MgQ2xhc3MgMyBSb290IENBMB4X +DTEwMTAyNjA4Mjg1OFoXDTQwMTAyNjA4Mjg1OFowTjELMAkGA1UEBhMCTk8xHTAbBgNVBAoMFEJ1 +eXBhc3MgQVMtOTgzMTYzMzI3MSAwHgYDVQQDDBdCdXlwYXNzIENsYXNzIDMgUm9vdCBDQTCCAiIw +DQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAKXaCpUWUOOV8l6ddjEGMnqb8RB2uACatVI2zSRH +sJ8YZLya9vrVediQYkwiL944PdbgqOkcLNt4EemOaFEVcsfzM4fkoF0LXOBXByow9c3EN3coTRiR +5r/VUv1xLXA+58bEiuPwKAv0dpihi4dVsjoT/Lc+JzeOIuOoTyrvYLs9tznDDgFHmV0ST9tD+leh +7fmdvhFHJlsTmKtdFoqwNxxXnUX/iJY2v7vKB3tvh2PX0DJq1l1sDPGzbjniazEuOQAnFN44wOwZ +ZoYS6J1yFhNkUsepNxz9gjDthBgd9K5c/3ATAOux9TN6S9ZV+AWNS2mw9bMoNlwUxFFzTWsL8TQH +2xc519woe2v1n/MuwU8XKhDzzMro6/1rqy6any2CbgTUUgGTLT2G/H783+9CHaZr77kgxve9oKeV +/afmiSTYzIw0bOIjL9kSGiG5VZFvC5F5GQytQIgLcOJ60g7YaEi7ghM5EFjp2CoHxhLbWNvSO1UQ +RwUVZ2J+GGOmRj8JDlQyXr8NYnon74Do29lLBlo3WiXQCBJ31G8JUJc9yB3D34xFMFbG02SrZvPA +Xpacw8Tvw3xrizp5f7NJzz3iiZ+gMEuFuZyUJHmPfWupRWgPK9Dx2hzLabjKSWJtyNBjYt1gD1iq +j6G8BaVmos8bdrKEZLFMOVLAMLrwjEsCsLa3AgMBAAGjQjBAMA8GA1UdEwEB/wQFMAMBAf8wHQYD +VR0OBBYEFEe4zf/lb+74suwvTg75JbCOPGvDMA4GA1UdDwEB/wQEAwIBBjANBgkqhkiG9w0BAQsF +AAOCAgEAACAjQTUEkMJAYmDv4jVM1z+s4jSQuKFvdvoWFqRINyzpkMLyPPgKn9iB5btb2iUspKdV +cSQy9sgL8rxq+JOssgfCX5/bzMiKqr5qb+FJEMwx14C7u8jYog5kV+qi9cKpMRXSIGrs/CIBKM+G +uIAeqcwRpTzyFrNHnfzSgCHEy9BHcEGhyoMZCCxt8l13nIoUE9Q2HJLw5QY33KbmkJs4j1xrG0aG +Q0JfPgEHU1RdZX33inOhmlRaHylDFCfChQ+1iHsaO5S3HWCntZznKWlXWpuTekMwGwPXYshApqr8 +ZORK15FTAaggiG6cX0S5y2CBNOxv033aSF/rtJC8LakcC6wc1aJoIIAE1vyxjy+7SjENSoYc6+I2 +KSb12tjE8nVhz36udmNKekBlk4f4HoCMhuWG1o8O/FMsYOgWYRqiPkN7zTlgVGr18okmAWiDSKIz +6MkEkbIRNBE+6tBDGR8Dk5AM/1E9V/RBbuHLoL7ryWPNbczk+DaqaJ3tvV2XcEQNtg413OEMXbug +UZTLfhbrES+jkkXITHHZvMmZUldGL1DPvTVp9D0VzgalLA8+9oG6lLvDu79leNKGef9JOxqDDPDe +eOzI8k1MGt6CKfjBWtrt7uYnXuhF0J0cUahoq0Tj0Itq4/g7u9xN12TyUb7mqqta6THuBrxzvxNi +Cp/HuZc= +-----END CERTIFICATE----- + +T-TeleSec GlobalRoot Class 3 +============================ +-----BEGIN CERTIFICATE----- +MIIDwzCCAqugAwIBAgIBATANBgkqhkiG9w0BAQsFADCBgjELMAkGA1UEBhMCREUxKzApBgNVBAoM +IlQtU3lzdGVtcyBFbnRlcnByaXNlIFNlcnZpY2VzIEdtYkgxHzAdBgNVBAsMFlQtU3lzdGVtcyBU +cnVzdCBDZW50ZXIxJTAjBgNVBAMMHFQtVGVsZVNlYyBHbG9iYWxSb290IENsYXNzIDMwHhcNMDgx +MDAxMTAyOTU2WhcNMzMxMDAxMjM1OTU5WjCBgjELMAkGA1UEBhMCREUxKzApBgNVBAoMIlQtU3lz +dGVtcyBFbnRlcnByaXNlIFNlcnZpY2VzIEdtYkgxHzAdBgNVBAsMFlQtU3lzdGVtcyBUcnVzdCBD +ZW50ZXIxJTAjBgNVBAMMHFQtVGVsZVNlYyBHbG9iYWxSb290IENsYXNzIDMwggEiMA0GCSqGSIb3 +DQEBAQUAA4IBDwAwggEKAoIBAQC9dZPwYiJvJK7genasfb3ZJNW4t/zN8ELg63iIVl6bmlQdTQyK +9tPPcPRStdiTBONGhnFBSivwKixVA9ZIw+A5OO3yXDw/RLyTPWGrTs0NvvAgJ1gORH8EGoel15YU +NpDQSXuhdfsaa3Ox+M6pCSzyU9XDFES4hqX2iys52qMzVNn6chr3IhUciJFrf2blw2qAsCTz34ZF +iP0Zf3WHHx+xGwpzJFu5ZeAsVMhg02YXP+HMVDNzkQI6pn97djmiH5a2OK61yJN0HZ65tOVgnS9W +0eDrXltMEnAMbEQgqxHY9Bn20pxSN+f6tsIxO0rUFJmtxxr1XV/6B7h8DR/Wgx6zAgMBAAGjQjBA +MA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMB0GA1UdDgQWBBS1A/d2O2GCahKqGFPr +AyGUv/7OyjANBgkqhkiG9w0BAQsFAAOCAQEAVj3vlNW92nOyWL6ukK2YJ5f+AbGwUgC4TeQbIXQb +fsDuXmkqJa9c1h3a0nnJ85cp4IaH3gRZD/FZ1GSFS5mvJQQeyUapl96Cshtwn5z2r3Ex3XsFpSzT +ucpH9sry9uetuUg/vBa3wW306gmv7PO15wWeph6KU1HWk4HMdJP2udqmJQV0eVp+QD6CSyYRMG7h +P0HHRwA11fXT91Q+gT3aSWqas+8QPebrb9HIIkfLzM8BMZLZGOMivgkeGj5asuRrDFR6fUNOuIml +e9eiPZaGzPImNC1qkp2aGtAw4l1OBLBfiyB+d8E9lYLRRpo7PHi4b6HQDWSieB4pTpPDpFQUWw== +-----END CERTIFICATE----- + +EE Certification Centre Root CA +=============================== +-----BEGIN CERTIFICATE----- +MIIEAzCCAuugAwIBAgIQVID5oHPtPwBMyonY43HmSjANBgkqhkiG9w0BAQUFADB1MQswCQYDVQQG +EwJFRTEiMCAGA1UECgwZQVMgU2VydGlmaXRzZWVyaW1pc2tlc2t1czEoMCYGA1UEAwwfRUUgQ2Vy +dGlmaWNhdGlvbiBDZW50cmUgUm9vdCBDQTEYMBYGCSqGSIb3DQEJARYJcGtpQHNrLmVlMCIYDzIw +MTAxMDMwMTAxMDMwWhgPMjAzMDEyMTcyMzU5NTlaMHUxCzAJBgNVBAYTAkVFMSIwIAYDVQQKDBlB +UyBTZXJ0aWZpdHNlZXJpbWlza2Vza3VzMSgwJgYDVQQDDB9FRSBDZXJ0aWZpY2F0aW9uIENlbnRy +ZSBSb290IENBMRgwFgYJKoZIhvcNAQkBFglwa2lAc2suZWUwggEiMA0GCSqGSIb3DQEBAQUAA4IB +DwAwggEKAoIBAQDIIMDs4MVLqwd4lfNE7vsLDP90jmG7sWLqI9iroWUyeuuOF0+W2Ap7kaJjbMeM +TC55v6kF/GlclY1i+blw7cNRfdCT5mzrMEvhvH2/UpvObntl8jixwKIy72KyaOBhU8E2lf/slLo2 +rpwcpzIP5Xy0xm90/XsY6KxX7QYgSzIwWFv9zajmofxwvI6Sc9uXp3whrj3B9UiHbCe9nyV0gVWw +93X2PaRka9ZP585ArQ/dMtO8ihJTmMmJ+xAdTX7Nfh9WDSFwhfYggx/2uh8Ej+p3iDXE/+pOoYtN +P2MbRMNE1CV2yreN1x5KZmTNXMWcg+HCCIia7E6j8T4cLNlsHaFLAgMBAAGjgYowgYcwDwYDVR0T +AQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYEFBLyWj7qVhy/zQas8fElyalL1BSZ +MEUGA1UdJQQ+MDwGCCsGAQUFBwMCBggrBgEFBQcDAQYIKwYBBQUHAwMGCCsGAQUFBwMEBggrBgEF +BQcDCAYIKwYBBQUHAwkwDQYJKoZIhvcNAQEFBQADggEBAHv25MANqhlHt01Xo/6tu7Fq1Q+e2+Rj +xY6hUFaTlrg4wCQiZrxTFGGVv9DHKpY5P30osxBAIWrEr7BSdxjhlthWXePdNl4dp1BUoMUq5KqM +lIpPnTX/dqQGE5Gion0ARD9V04I8GtVbvFZMIi5GQ4okQC3zErg7cBqklrkar4dBGmoYDQZPxz5u +uSlNDUmJEYcyW+ZLBMjkXOZ0c5RdFpgTlf7727FE5TpwrDdr5rMzcijJs1eg9gIWiAYLtqZLICjU +3j2LrTcFU3T+bsy8QxdxXvnFzBqpYe73dgzzcvRyrc9yAjYHR8/vGVCJYMzpJJUPwssd8m92kMfM +dcGWxZ0= +-----END CERTIFICATE----- diff --git a/aws-sdk-core/lib/aws-sdk-core.rb b/aws-sdk-core/lib/aws-sdk-core.rb index c432f6907d2..9b6287e5905 100644 --- a/aws-sdk-core/lib/aws-sdk-core.rb +++ b/aws-sdk-core/lib/aws-sdk-core.rb @@ -245,6 +245,27 @@ def config=(config) end end + # The SDK ships with a ca certificate bundle to use when verifying SSL + # peer certificates. By default, this cert bundle is *NOT* used. The + # SDK will rely on the default cert available to OpenSSL. This ensures + # the cert provided by your OS is used. + # + # For cases where the default cert is unavailable, e.g. Windows, you + # can call this method. + # + # Aws.use_bundled_cert! + # + # @return [String] Returns the path to the bundled cert. + def use_bundled_cert! + config.delete(:ssl_ca_directory) + config.delete(:ssl_ca_store) + config[:ssl_ca_bundle] = File.expand_path(File.join( + File.dirname(__FILE__), + '..', + 'ca-bundle.crt' + )) + end + # Yields to the given block for each service that has already been # defined via {add_service}. Also yields to the given block for # each new service added after the callback is registered. diff --git a/aws-sdk-core/spec/aws_spec.rb b/aws-sdk-core/spec/aws_spec.rb index c807995d3e9..300124ff6ea 100644 --- a/aws-sdk-core/spec/aws_spec.rb +++ b/aws-sdk-core/spec/aws_spec.rb @@ -11,7 +11,7 @@ module Aws end - describe 'config' do + describe '.config' do it 'defaults to an empty hash' do expect(Aws.config).to eq({}) @@ -23,7 +23,7 @@ module Aws end - describe 'add_service' do + describe '.add_service' do let(:api_path) { Dir.glob(File.join(API_DIR, 'ec2', '*')).last + '/api-2.json' } @@ -94,4 +94,26 @@ module Aws end end + + describe '.use_bundled_cert!' do + + after(:each) do + Aws.config = {} + end + + it 'configures a default ssl cert bundle' do + path = Aws.use_bundled_cert! + expect(File.exists?(path)).to be(true) + expect(Aws.config[:ssl_ca_bundle]).to eq(path) + end + + it 'replaced any other default ssl ca' do + Aws.config[:ssl_ca_directory] = 'dir' + Aws.config[:ssl_ca_store] = 'store' + path = Aws.use_bundled_cert! + expect(Aws.config).to eq(ssl_ca_bundle: path) + end + + + end end From 79f8170883e71ae5183d882c2dbe1a158402cf98 Mon Sep 17 00:00:00 2001 From: Trevor Rowe Date: Wed, 10 Jun 2015 11:25:11 -0700 Subject: [PATCH 096/101] Added Aws.eager_autoload! --- aws-sdk-core/lib/aws-sdk-core.rb | 36 +++++++++++++++---- aws-sdk-core/lib/aws-sdk-core/eager_loader.rb | 31 ++++++++++++++++ aws-sdk-core/spec/aws_spec.rb | 17 +++++++++ aws-sdk-resources/tasks/test.rake | 2 +- doc-src/plugins/apis.rb | 2 +- tasks/docs.rake | 2 +- 6 files changed, 80 insertions(+), 10 deletions(-) create mode 100644 aws-sdk-core/lib/aws-sdk-core/eager_loader.rb diff --git a/aws-sdk-core/lib/aws-sdk-core.rb b/aws-sdk-core/lib/aws-sdk-core.rb index 9b6287e5905..0fd53213e08 100644 --- a/aws-sdk-core/lib/aws-sdk-core.rb +++ b/aws-sdk-core/lib/aws-sdk-core.rb @@ -84,6 +84,7 @@ module Aws autoload :CredentialProviderChain, 'aws-sdk-core/credential_provider_chain' autoload :Credentials, 'aws-sdk-core/credentials' autoload :Deprecations, 'aws-sdk-core/deprecations' + autoload :EagerLoader, 'aws-sdk-core/eager_loader' autoload :EmptyStructure, 'aws-sdk-core/empty_structure' autoload :EndpointProvider, 'aws-sdk-core/endpoint_provider' autoload :Errors, 'aws-sdk-core/errors' @@ -266,6 +267,34 @@ def use_bundled_cert! )) end + # Loads modules that are normally loaded with Ruby's `autoload`. + # This can avoid thread-safety issues that some Ruby versions have + # with `autoload`. + # + # # loads ALL services + # Aws.eager_autoload! + # + # Loading all services can be slow. You can specify what services you + # want to load with the `:services` option. All services not named + # will continue to autoload as normal. + # + # Aws.eager_auotload(services: %w(S3 EC2)) + # + # @return [void] + def eager_autoload!(options = {}) + eager_loader = EagerLoader.new + eager_loader.load(JMESPath) + eager_loader.load(Seahorse) + (options[:services] || SERVICE_MODULE_NAMES).each do |svc_name| + begin + eager_loader.load(Aws.const_get(svc_name)) + rescue NameError + raise ArgumentError, "invalid service Aws::#{svc_name}" + end + end + eager_loader + end + # Yields to the given block for each service that has already been # defined via {add_service}. Also yields to the given block for # each new service added after the callback is registered. @@ -306,13 +335,6 @@ def add_service(svc_name, options = {}) svc_module end - # @api private - def load_all_services - SERVICE_MODULE_NAMES.each do |const_name| - const_get(const_name) - end - end - end # build service client classes diff --git a/aws-sdk-core/lib/aws-sdk-core/eager_loader.rb b/aws-sdk-core/lib/aws-sdk-core/eager_loader.rb new file mode 100644 index 00000000000..cf948a82c0b --- /dev/null +++ b/aws-sdk-core/lib/aws-sdk-core/eager_loader.rb @@ -0,0 +1,31 @@ +require 'set' + +module Aws + # @api private + class EagerLoader + + def initialize + @loaded = Set.new + end + + # @return [Set] + attr_reader :loaded + + # @param [Module] klass_or_module + # @return [self] + def load(klass_or_module) + @loaded << klass_or_module + klass_or_module.constants.each do |const_name| + path = klass_or_module.autoload?(const_name) + require(path) if path + const = klass_or_module.const_get(const_name) + if const.is_a?(Module) + unless @loaded.include?(const) + load(const) + end + end + end + self + end + end +end diff --git a/aws-sdk-core/spec/aws_spec.rb b/aws-sdk-core/spec/aws_spec.rb index 300124ff6ea..e1c5b3465b3 100644 --- a/aws-sdk-core/spec/aws_spec.rb +++ b/aws-sdk-core/spec/aws_spec.rb @@ -114,6 +114,23 @@ module Aws expect(Aws.config).to eq(ssl_ca_bundle: path) end + end + + describe '.eager_autoload!' do + + it 'loads all services by default' do + eager_loader = Aws.eager_autoload! + SERVICE_MODULE_NAMES.each do |svc_name| + expect(eager_loader.loaded).to include(Aws.const_get(svc_name)) + end + end + + it 'can load fewer than all services' do + eager_loader = Aws.eager_autoload!(services:['S3', 'IAM']) + expect(eager_loader.loaded).to include(Aws::S3) + expect(eager_loader.loaded).to include(Aws::IAM) + expect(eager_loader.loaded).not_to include(Aws::EC2) + end end end diff --git a/aws-sdk-resources/tasks/test.rake b/aws-sdk-resources/tasks/test.rake index 5c7b6941b70..4354f7b3980 100644 --- a/aws-sdk-resources/tasks/test.rake +++ b/aws-sdk-resources/tasks/test.rake @@ -10,7 +10,7 @@ task 'test:unit' => 'test:unit:aws-sdk-resources' task 'test:unit:resource-name-collisions' do ENV['AWS_SDK_SAFE_DEFINE'] = '1' - Aws.load_all_services + Aws.eager_autoload! end task 'test:unit' => 'test:unit:resource-name-collisions' diff --git a/doc-src/plugins/apis.rb b/doc-src/plugins/apis.rb index ae755204818..c1a33a6239b 100644 --- a/doc-src/plugins/apis.rb +++ b/doc-src/plugins/apis.rb @@ -9,7 +9,7 @@ YARD::Templates::Engine.register_template_path(File.join(File.dirname(__FILE__), '..', 'templates')) YARD::Parser::SourceParser.after_parse_list do - Aws.load_all_services + Aws.eager_autoload! Aws.service_added do |_, svc_module, options| Aws::Api::Docs::Builder.document(svc_module) end diff --git a/tasks/docs.rake b/tasks/docs.rake index fdbcf5fa9d6..7eb111fd524 100644 --- a/tasks/docs.rake +++ b/tasks/docs.rake @@ -9,7 +9,7 @@ end desc 'Updated the list of supported services in the README' if ENV['ALL'] task 'docs:update_readme' do # Updates the table of supported services / api version in the README - Aws.load_all_services + Aws.eager_autolaod! lines = [] skip = false File.read('README.md').lines.each do |line| From da060288cddc8c3129d8613ee7d8fecf2a5f32a5 Mon Sep 17 00:00:00 2001 From: Trevor Rowe Date: Wed, 10 Jun 2015 13:23:57 -0700 Subject: [PATCH 097/101] Test fixes for JRuby. --- .../services/s3/object/upload_file_spec.rb | 22 ++++++++----------- 1 file changed, 9 insertions(+), 13 deletions(-) diff --git a/aws-sdk-resources/spec/services/s3/object/upload_file_spec.rb b/aws-sdk-resources/spec/services/s3/object/upload_file_spec.rb index 057ea08bc17..261aee1d770 100644 --- a/aws-sdk-resources/spec/services/s3/object/upload_file_spec.rb +++ b/aws-sdk-resources/spec/services/s3/object/upload_file_spec.rb @@ -32,7 +32,7 @@ module S3 let(:ten_meg_file) { Tempfile.new('ten-meg-file') } - let(:seventeen_meg_file) { Tempfile.new('ten-meg-file') } + let(:seventeen_meg_file) { Tempfile.new('seventeen-meg-file') } before(:each) do allow(File).to receive(:size).with(one_meg_file).and_return(one_meg) @@ -77,19 +77,15 @@ module S3 describe 'large objects' do it 'uses multipart APIs for objects >= 15MB' do - called = [] - client.handle_request do |context| - called << context.operation_name - end + expect(client).to receive(:create_multipart_upload). + and_return(client.stub_data(:create_multipart_upload, upload_id:'id')) + + expect(client).to receive(:upload_part).exactly(4).times. + and_return(client.stub_data(:upload_part, etag:'etag')) + + expect(client).to receive(:complete_multipart_upload) + object.upload_file(seventeen_meg_file, content_type: 'text/plain') - expect(called).to eq([ - :create_multipart_upload, - :upload_part, - :upload_part, - :upload_part, - :upload_part, - :complete_multipart_upload - ]) end it 'raises an error if the multipart threshold is too small' do From 1687045d56a0d6c41ee1f554cd6303891d6ca5f5 Mon Sep 17 00:00:00 2001 From: Trevor Rowe Date: Thu, 11 Jun 2015 14:06:35 -0700 Subject: [PATCH 098/101] Made the `#stub_data` method on client public. --- aws-sdk-core/lib/aws-sdk-core/client_stubs.rb | 27 +++++++++++++++---- aws-sdk-core/lib/aws-sdk-core/structure.rb | 2 ++ 2 files changed, 24 insertions(+), 5 deletions(-) diff --git a/aws-sdk-core/lib/aws-sdk-core/client_stubs.rb b/aws-sdk-core/lib/aws-sdk-core/client_stubs.rb index 2200ac4e53a..48e0930f24d 100644 --- a/aws-sdk-core/lib/aws-sdk-core/client_stubs.rb +++ b/aws-sdk-core/lib/aws-sdk-core/client_stubs.rb @@ -137,6 +137,28 @@ def stub_responses(operation_name, *stubs) end end + # Generates and returns stubbed response data from the named operation. + # + # s3 = Aws::S3::Client.new + # s3.stub_data(:list_buckets) + # #=> #> + # + # In addition to generating default stubs, you can provide data to + # apply to the response stub. + # + # s3.stub_data(:list_buckets, buckets:[{name:'aws-sdk'}]) + # #=> #], + # owner=#> + # + # @param [Symbol] operation_name + # @param [Hash] data + # @return [Structure] Returns a stubbed response data structure. The + # actual class returned will depend on the given `operation_name`. + def stub_data(operation_name, data = {}) + Stubbing::StubData.new(operation(operation_name)).stub(data) + end + # @api private def next_stub(operation_name) operation_name = operation_name.to_sym @@ -150,11 +172,6 @@ def next_stub(operation_name) end end - # @api private - def stub_data(operation_name, data = {}) - Stubbing::StubData.new(operation(operation_name)).stub(data) - end - private def default_stub(operation_name) diff --git a/aws-sdk-core/lib/aws-sdk-core/structure.rb b/aws-sdk-core/lib/aws-sdk-core/structure.rb index 027d5b08b40..66b9d9ba265 100644 --- a/aws-sdk-core/lib/aws-sdk-core/structure.rb +++ b/aws-sdk-core/lib/aws-sdk-core/structure.rb @@ -49,6 +49,8 @@ def to_h(obj = self) end alias to_hash to_h + undef_method :each + class << self # @api private From e720e2ca071b7cda65e6246fdbff4e402f000b3d Mon Sep 17 00:00:00 2001 From: Trevor Rowe Date: Thu, 11 Jun 2015 14:07:43 -0700 Subject: [PATCH 099/101] Added changelog entries for 2.1 changes. --- CHANGELOG.md | 156 +++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 152 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8c9940b52d1..3b3ac4c354a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,13 +1,161 @@ Unreleased Changes ------------------ -* Issue - Response Stubbing - When enabling response stubbing via - `stub_responses: true` on a client, the default credential chain is longer - used to source credentials. Instead a set of fake stubbed static credentials - are used by default. +* Feature - Fewer gem dependencies - Removed the dependency on the follow + two 3rd party gems: + + * `multi_json` + * `builder` + + For JSON parsing and dumping, the SDK will attempt to use the `Oj` + gem if available, and will fall back on `JSON` from the Ruby + standard library. + + The only remaining gem dependency is `jmespath`. + +* Feature - Service Types - Added struct classes for all AWS data types. + Previous versions used anonymous structure classes for response data. + + Aws::IAM::Types.constants + #=> [:AccessKey, :AccessKeyLastUsed, :AccessKeyMetadata, ...] + + Each of these data type classes are now fully documented in the + [api reference docs](http://docs.aws.amazon.com/sdkforruby/api/index.html). + +* Feature - Examples - The API reference documentation can now load client + operation examples from disk. This allows users to contribute examples + to the documentation. It also allows for more targeted examples + than the auto-generated ones previously used. + + Examples are stored inside the examples folder at the root of this + repository. https://github.com/aws/aws-sdk-ruby/tree/master/examples + +* Feature - Documentation - Significant work has gone into API reference + documentation. The changes made are based on user feedback. Some of + the many changes include: + + * More concise syntax examples + * Response structure examples + * Request and response data structures each documented as their own type + * Expanded resource interface documentation on inputs and return values + + Expect more documentation improvements. + +* Feature - Smaller Gem - Reduced the size of the `aws-sdk-core` gem + by removing the AWS API documentation source files from the gemspec. + This reduces the total size of the gem by half. + +* Feature - Stub Data - Added a `#stub_data` method to `Aws::Client` that + makes it trivial to generate response data structures. + + s3 = Aws::S3::Client.new + + s3.stub_data(:list_buckets) + #=> #> + + You can also provide an optional hash of data to apply to the stub. + The data hash will be validated to ensure it is properly formed and + then it is applied. This makes it easy to generated nested response + data. + + s3.stub_data(:list_buckets, buckets:[{name:'aws-sdk'}]) + #=> # + ], + owner=#> + +* Feature - Shared Response Stubs - You can now provide default stubs to a + client via the constructor and via `Aws.config`. This can be very useful + if you need to stub client responses, but you are not constructing the + client. + + Aws.config[:s3] = { + stub_responses: { + list_buckets: { buckets: [{name:'aws-sdk'}]} + } + } + + s3 = Aws::S3::Client.new + s3.list_buckets.buckets.map(&:name) + #=> ['aws-sdk'] + + See [related GitHub issue aws/aws-sdk-core#187](https://github.com/aws/aws-sdk-core-ruby/issues/187) + +* Issue - Response Stubbing - When using response stubbing, pagination + tokens will no longer be generated. This prevents stubbed responses + from appearing pageable when they are not. + + See [related GitHub issue #804](https://github.com/aws/aws-sdk-ruby/pull/804) + +* Issue - Aws::DynamoDB::Client - Resolved an issue where it was not + possible to stub attribute values. You can now stub DynamoDB responses + as expected: + + ddb = Aws::DynamoDB::Client.new(stub_responses:true) + ddb.stub_responses(:get_item, item: { 'id' => 'value', 'color' => 'red' }) + ddb.get_item(table_name:'table', key:{'id' => 'value'}) + #=> #"value", "color"=>"red"}, consumed_capacity=nil> + + See [related GitHub issue #770](https://github.com/aws/aws-sdk-ruby/pull/770) + +* Feature - SSL Peer Verification - Added a method to configure a default + SSL CA certificate bundle to be used when verifying SSL peer certificates. + V1 did this by default, v2 is now opt-in only. + + Aws.use_bundled_cert! + + This method can be very useful for Ruby users on Windows where OpenSSL + does not tend to have access to a valid SSL cert bundle. + + See [related GitHub issue aws/aws-sdk-core#166](https://github.com/aws/aws-sdk-core-ruby/issues/166) + +* Feature - Eager auto-loading - Added a utility method that eagerly loads + classes and modules. This can help avoid thread-safety issues with + autoload affecting some versions Ruby. + + # autoload specific services (faster) + Aws.eager_autoload!(services: %w(S3 EC2)) + + # autoload everything + Aws.eager_autoload! + + See [related GitHub issue #833](https://github.com/aws/aws-sdk-ruby/pull/833) + +* Issue - Response Stubbing - Clients with `stub_responses: true` were still + attempting to load credentials from ENV, and the EC2 instance metadata + service. Instead, stubbed clients will now construct fake static credentials. See [related GitHub issue #835](https://github.com/aws/aws-sdk-ruby/pull/835) +* Upgrading - Pageable Responses - Due to frequent confusion caused by + having every response be decorated as pageable, only operations that can + possibly have multiple responses are now decorated. + + This ensures that if you call `#each` on a non-pageable response that + an appropriate `NoMethodError` is raised instead of doing nothing. Simply + remove calls to `#each` if you encounter this unlikely situation. + + s3 = Aws::S3::Client.new + s3.head_object(bucket:'name', key:'key').each do |page| + end + #=> raises NoMethodError for #each, HEAD object is not pageable + + This is correctly reflected now in the API reference documentation as + well. + +* Upgrading - Seahorse::Model - The internal representation of AWS API models + has been updated. Users digging into internals of the API model will need + to update their code to deal with shape references. + + **This change should not affect users of the public SDK interfaces**. + + Complex shapes, structures, lists, and maps, now use shape references + to nest other shapes. The entire API model now loaded when the service client + is defined. This eliminates the need to maintain a complex map of all + shapes and define them lazily. This has allows for massive simplifications + around API loading, especially when dealing with thread-safety concerns. + 2.0.48 (2015-06-04) ------------------ From bd899a05e214e8848682e0d3d24674fe1893d1ce Mon Sep 17 00:00:00 2001 From: Trevor Rowe Date: Thu, 11 Jun 2015 14:20:19 -0700 Subject: [PATCH 100/101] Minor test fixes for Aws::Structure. --- aws-sdk-core/lib/aws-sdk-core/param_validator.rb | 2 +- aws-sdk-core/spec/aws/empty_structure_spec.rb | 14 ++++---------- 2 files changed, 5 insertions(+), 11 deletions(-) diff --git a/aws-sdk-core/lib/aws-sdk-core/param_validator.rb b/aws-sdk-core/lib/aws-sdk-core/param_validator.rb index 366c8cd2842..69b30a04a9e 100644 --- a/aws-sdk-core/lib/aws-sdk-core/param_validator.rb +++ b/aws-sdk-core/lib/aws-sdk-core/param_validator.rb @@ -45,7 +45,7 @@ def structure(ref, values, errors, context) end # validate non-nil members - values.each do |name, value| + values.each_pair do |name, value| unless value.nil? if shape.member?(name) member_ref = shape.member(name) diff --git a/aws-sdk-core/spec/aws/empty_structure_spec.rb b/aws-sdk-core/spec/aws/empty_structure_spec.rb index 021019619ae..86d44f16ca8 100644 --- a/aws-sdk-core/spec/aws/empty_structure_spec.rb +++ b/aws-sdk-core/spec/aws/empty_structure_spec.rb @@ -37,28 +37,22 @@ module Aws it 'can be enumerated, but yields no members' do yields = [] - EmptyStructure.new.each { |member| yields << member } + EmptyStructure.new.each_pair { |member| yields << member } expect(yields).to be_empty end - it 'returns an enumerable from #each' do - enum = EmptyStructure.new.each + it 'returns an enumerable from #each_pair' do + enum = EmptyStructure.new.each_pair expect(enum).to be_kind_of(Enumerable) expect(enum.to_a).to eq([]) end it 'can be enumerated in pairs, but yields no members or values' do yields = [] - EmptyStructure.new.each { |*args| yields << args } + EmptyStructure.new.each_pair { |*args| yields << args } expect(yields).to be_empty end - it 'returns an enumerable from #each_pair' do - enum = EmptyStructure.new.each_pair - expect(enum).to be_kind_of(Enumerable) - expect(enum.to_a).to eq([]) - end - it 'equals other empty structures' do expect(EmptyStructure.new).to eq(EmptyStructure.new) expect(EmptyStructure.new == EmptyStructure.new).to be(true) From 3722c15a3c2cd92a9c3b142344c9bb3355c8125f Mon Sep 17 00:00:00 2001 From: Trevor Rowe Date: Thu, 11 Jun 2015 14:40:18 -0700 Subject: [PATCH 101/101] Fix for defining structures from shapes with no members. --- aws-sdk-core/lib/aws-sdk-core/structure.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/aws-sdk-core/lib/aws-sdk-core/structure.rb b/aws-sdk-core/lib/aws-sdk-core/structure.rb index 66b9d9ba265..b26ecdf21ed 100644 --- a/aws-sdk-core/lib/aws-sdk-core/structure.rb +++ b/aws-sdk-core/lib/aws-sdk-core/structure.rb @@ -57,7 +57,7 @@ class << self def new(*args) if args == ['AwsEmptyStructure'] super - elsif args.empty? + elsif args.empty? || args.first == [] EmptyStructure else super(*args)