aws-sdk-s3 1.7.0 → 1.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a11701b039886049358e64ee720790553815f2e2
-  data.tar.gz: 7003f2e00e03c7a71f66ec5107b859350ae4f99c
+  metadata.gz: 11e9a946e4c62cd4e65425e89902c241af285bde
+  data.tar.gz: a2d9222f53c8f42be08062566e1c918619c6aa44
 SHA512:
-  metadata.gz: e386e9a7bfa2ebecbcafb8c43ebe0918e2ceb900cb649069eb8943cc846136214beeb30e5663325e7447e5dc702c5c2f1b12bf45664eb7d6beead4126c5a3e8c
-  data.tar.gz: 48e7bcf3e98a6d16580c73ba5c6745d423bd5fd4e9c79189c5598c63e2e74bdf2629ca97ffef03ff508107a2a594a23bdde6fcde60fbb728ba851a3bbf764893
+  metadata.gz: ce6d03f49def68da923382a840324f932f872f552d772abea6ceb16388088584ed18ac87d33279f0b675e594d966b771d21ace3e27f483d23f5602fbb925621e
+  data.tar.gz: e19d2fcdba9c44c11633f40cca6f66f7de128b6f48417ed2368f74dd0bde1dc2342bcfceecf665716431e8d599486be7ecb087ecd6f528f3b536d2987cd96bb9

data/lib/aws-sdk-s3.rb

@@ -62,6 +62,6 @@ require_relative 'aws-sdk-s3/customizations'
 # @service
 module Aws::S3
 
-  GEM_VERSION = '1.7.0'
+  GEM_VERSION = '1.8.0'
 
 end

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

@@ -5655,6 +5655,7 @@ module Aws::S3
     # @option params [String] :version_id
     #
     # @option params [Types::RestoreRequest] :restore_request
+    #   Container for restore job parameters.
     #
     # @option params [String] :request_payer
     #   Confirms that the requester knows that she or he will be charged for
@@ -5666,6 +5667,7 @@ module Aws::S3
     # @return [Types::RestoreObjectOutput] Returns a {Seahorse::Client::Response response} object which responds to the following methods:
     #
     #   * {Types::RestoreObjectOutput#request_charged #request_charged} => String
+    #   * {Types::RestoreObjectOutput#restore_output_path #restore_output_path} => String
     #
     #
     # @example Example: To restore an archived object
@@ -5694,10 +5696,75 @@ module Aws::S3
     #     key: "ObjectKey", # required
     #     version_id: "ObjectVersionId",
     #     restore_request: {
-    #       days: 1, # required
+    #       days: 1,
     #       glacier_job_parameters: {
     #         tier: "Standard", # required, accepts Standard, Bulk, Expedited
     #       },
+    #       type: "SELECT", # accepts SELECT
+    #       tier: "Standard", # accepts Standard, Bulk, Expedited
+    #       description: "Description",
+    #       select_parameters: {
+    #         input_serialization: { # required
+    #           csv: {
+    #             file_header_info: "USE", # accepts USE, IGNORE, NONE
+    #             comments: "Comments",
+    #             quote_escape_character: "QuoteEscapeCharacter",
+    #             record_delimiter: "RecordDelimiter",
+    #             field_delimiter: "FieldDelimiter",
+    #             quote_character: "QuoteCharacter",
+    #           },
+    #         },
+    #         expression_type: "SQL", # required, accepts SQL
+    #         expression: "Expression", # required
+    #         output_serialization: { # required
+    #           csv: {
+    #             quote_fields: "ALWAYS", # accepts ALWAYS, ASNEEDED
+    #             quote_escape_character: "QuoteEscapeCharacter",
+    #             record_delimiter: "RecordDelimiter",
+    #             field_delimiter: "FieldDelimiter",
+    #             quote_character: "QuoteCharacter",
+    #           },
+    #         },
+    #       },
+    #       output_location: {
+    #         s3: {
+    #           bucket_name: "BucketName", # required
+    #           prefix: "LocationPrefix", # required
+    #           encryption: {
+    #             encryption_type: "AES256", # required, accepts AES256, aws:kms
+    #             kms_key_id: "SSEKMSKeyId",
+    #             kms_context: "KMSContext",
+    #           },
+    #           canned_acl: "private", # accepts private, public-read, public-read-write, authenticated-read, aws-exec-read, bucket-owner-read, bucket-owner-full-control
+    #           access_control_list: [
+    #             {
+    #               grantee: {
+    #                 display_name: "DisplayName",
+    #                 email_address: "EmailAddress",
+    #                 id: "ID",
+    #                 type: "CanonicalUser", # required, accepts CanonicalUser, AmazonCustomerByEmail, Group
+    #                 uri: "URI",
+    #               },
+    #               permission: "FULL_CONTROL", # accepts FULL_CONTROL, WRITE, WRITE_ACP, READ, READ_ACP
+    #             },
+    #           ],
+    #           tagging: {
+    #             tag_set: [ # required
+    #               {
+    #                 key: "ObjectKey", # required
+    #                 value: "Value", # required
+    #               },
+    #             ],
+    #           },
+    #           user_metadata: [
+    #             {
+    #               name: "MetadataKey",
+    #               value: "MetadataValue",
+    #             },
+    #           ],
+    #           storage_class: "STANDARD", # accepts STANDARD, REDUCED_REDUNDANCY, STANDARD_IA
+    #         },
+    #       },
     #     },
     #     request_payer: "requester", # accepts requester
     #   })
@@ -5705,6 +5772,7 @@ module Aws::S3
     # @example Response structure
     #
     #   resp.request_charged #=> String, one of "requester"
+    #   resp.restore_output_path #=> String
     #
     # @see http://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/RestoreObject AWS API Documentation
     #
@@ -6019,7 +6087,7 @@ module Aws::S3
         params: params,
         config: config)
       context[:gem_name] = 'aws-sdk-s3'
-      context[:gem_version] = '1.7.0'
+      context[:gem_version] = '1.8.0'
       Seahorse::Client::Request.new(handlers, context)
     end
 

data/lib/aws-sdk-s3/client_api.rb

@@ -51,11 +51,14 @@ module Aws::S3
     CORSConfiguration = Shapes::StructureShape.new(name: 'CORSConfiguration')
     CORSRule = Shapes::StructureShape.new(name: 'CORSRule')
     CORSRules = Shapes::ListShape.new(name: 'CORSRules', flattened: true)
+    CSVInput = Shapes::StructureShape.new(name: 'CSVInput')
+    CSVOutput = Shapes::StructureShape.new(name: 'CSVOutput')
     CacheControl = Shapes::StringShape.new(name: 'CacheControl')
     CloudFunction = Shapes::StringShape.new(name: 'CloudFunction')
     CloudFunctionConfiguration = Shapes::StructureShape.new(name: 'CloudFunctionConfiguration')
     CloudFunctionInvocationRole = Shapes::StringShape.new(name: 'CloudFunctionInvocationRole')
     Code = Shapes::StringShape.new(name: 'Code')
+    Comments = Shapes::StringShape.new(name: 'Comments')
     CommonPrefix = Shapes::StructureShape.new(name: 'CommonPrefix')
     CommonPrefixList = Shapes::ListShape.new(name: 'CommonPrefixList', flattened: true)
     CompleteMultipartUploadOutput = Shapes::StructureShape.new(name: 'CompleteMultipartUploadOutput')
@@ -120,11 +123,13 @@ module Aws::S3
     DeletedObject = Shapes::StructureShape.new(name: 'DeletedObject')
     DeletedObjects = Shapes::ListShape.new(name: 'DeletedObjects', flattened: true)
     Delimiter = Shapes::StringShape.new(name: 'Delimiter')
+    Description = Shapes::StringShape.new(name: 'Description')
     Destination = Shapes::StructureShape.new(name: 'Destination')
     DisplayName = Shapes::StringShape.new(name: 'DisplayName')
     ETag = Shapes::StringShape.new(name: 'ETag')
     EmailAddress = Shapes::StringShape.new(name: 'EmailAddress')
     EncodingType = Shapes::StringShape.new(name: 'EncodingType')
+    Encryption = Shapes::StructureShape.new(name: 'Encryption')
     EncryptionConfiguration = Shapes::StructureShape.new(name: 'EncryptionConfiguration')
     Error = Shapes::StructureShape.new(name: 'Error')
     ErrorDocument = Shapes::StructureShape.new(name: 'ErrorDocument')
@@ -138,7 +143,11 @@ module Aws::S3
     ExpiresString = Shapes::StringShape.new(name: 'ExpiresString')
     ExposeHeader = Shapes::StringShape.new(name: 'ExposeHeader')
     ExposeHeaders = Shapes::ListShape.new(name: 'ExposeHeaders', flattened: true)
+    Expression = Shapes::StringShape.new(name: 'Expression')
+    ExpressionType = Shapes::StringShape.new(name: 'ExpressionType')
     FetchOwner = Shapes::BooleanShape.new(name: 'FetchOwner')
+    FieldDelimiter = Shapes::StringShape.new(name: 'FieldDelimiter')
+    FileHeaderInfo = Shapes::StringShape.new(name: 'FileHeaderInfo')
     FilterRule = Shapes::StructureShape.new(name: 'FilterRule')
     FilterRuleList = Shapes::ListShape.new(name: 'FilterRuleList', flattened: true)
     FilterRuleName = Shapes::StringShape.new(name: 'FilterRuleName')
@@ -209,6 +218,7 @@ module Aws::S3
     IndexDocument = Shapes::StructureShape.new(name: 'IndexDocument')
     Initiated = Shapes::TimestampShape.new(name: 'Initiated')
     Initiator = Shapes::StructureShape.new(name: 'Initiator')
+    InputSerialization = Shapes::StructureShape.new(name: 'InputSerialization')
     InventoryConfiguration = Shapes::StructureShape.new(name: 'InventoryConfiguration')
     InventoryConfigurationList = Shapes::ListShape.new(name: 'InventoryConfigurationList', flattened: true)
     InventoryDestination = Shapes::StructureShape.new(name: 'InventoryDestination')
@@ -225,6 +235,7 @@ module Aws::S3
     IsEnabled = Shapes::BooleanShape.new(name: 'IsEnabled')
     IsLatest = Shapes::BooleanShape.new(name: 'IsLatest')
     IsTruncated = Shapes::BooleanShape.new(name: 'IsTruncated')
+    KMSContext = Shapes::StringShape.new(name: 'KMSContext')
     KeyCount = Shapes::IntegerShape.new(name: 'KeyCount')
     KeyMarker = Shapes::StringShape.new(name: 'KeyMarker')
     KeyPrefixEquals = Shapes::StringShape.new(name: 'KeyPrefixEquals')
@@ -256,6 +267,7 @@ module Aws::S3
     ListPartsOutput = Shapes::StructureShape.new(name: 'ListPartsOutput')
     ListPartsRequest = Shapes::StructureShape.new(name: 'ListPartsRequest')
     Location = Shapes::StringShape.new(name: 'Location')
+    LocationPrefix = Shapes::StringShape.new(name: 'LocationPrefix')
     LoggingEnabled = Shapes::StructureShape.new(name: 'LoggingEnabled')
     MFA = Shapes::StringShape.new(name: 'MFA')
     MFADelete = Shapes::StringShape.new(name: 'MFADelete')
@@ -268,6 +280,7 @@ module Aws::S3
     Message = Shapes::StringShape.new(name: 'Message')
     Metadata = Shapes::MapShape.new(name: 'Metadata')
     MetadataDirective = Shapes::StringShape.new(name: 'MetadataDirective')
+    MetadataEntry = Shapes::StructureShape.new(name: 'MetadataEntry')
     MetadataKey = Shapes::StringShape.new(name: 'MetadataKey')
     MetadataValue = Shapes::StringShape.new(name: 'MetadataValue')
     MetricsAndOperator = Shapes::StructureShape.new(name: 'MetricsAndOperator')
@@ -308,6 +321,8 @@ module Aws::S3
     ObjectVersionId = Shapes::StringShape.new(name: 'ObjectVersionId')
     ObjectVersionList = Shapes::ListShape.new(name: 'ObjectVersionList', flattened: true)
     ObjectVersionStorageClass = Shapes::StringShape.new(name: 'ObjectVersionStorageClass')
+    OutputLocation = Shapes::StructureShape.new(name: 'OutputLocation')
+    OutputSerialization = Shapes::StructureShape.new(name: 'OutputSerialization')
     Owner = Shapes::StructureShape.new(name: 'Owner')
     OwnerOverride = Shapes::StringShape.new(name: 'OwnerOverride')
     Part = Shapes::StructureShape.new(name: 'Part')
@@ -349,7 +364,11 @@ module Aws::S3
     QueueConfigurationDeprecated = Shapes::StructureShape.new(name: 'QueueConfigurationDeprecated')
     QueueConfigurationList = Shapes::ListShape.new(name: 'QueueConfigurationList', flattened: true)
     Quiet = Shapes::BooleanShape.new(name: 'Quiet')
+    QuoteCharacter = Shapes::StringShape.new(name: 'QuoteCharacter')
+    QuoteEscapeCharacter = Shapes::StringShape.new(name: 'QuoteEscapeCharacter')
+    QuoteFields = Shapes::StringShape.new(name: 'QuoteFields')
     Range = Shapes::StringShape.new(name: 'Range')
+    RecordDelimiter = Shapes::StringShape.new(name: 'RecordDelimiter')
     Redirect = Shapes::StructureShape.new(name: 'Redirect')
     RedirectAllRequestsTo = Shapes::StructureShape.new(name: 'RedirectAllRequestsTo')
     ReplaceKeyPrefixWith = Shapes::StringShape.new(name: 'ReplaceKeyPrefixWith')
@@ -372,19 +391,23 @@ module Aws::S3
     Restore = Shapes::StringShape.new(name: 'Restore')
     RestoreObjectOutput = Shapes::StructureShape.new(name: 'RestoreObjectOutput')
     RestoreObjectRequest = Shapes::StructureShape.new(name: 'RestoreObjectRequest')
+    RestoreOutputPath = Shapes::StringShape.new(name: 'RestoreOutputPath')
     RestoreRequest = Shapes::StructureShape.new(name: 'RestoreRequest')
+    RestoreRequestType = Shapes::StringShape.new(name: 'RestoreRequestType')
     Role = Shapes::StringShape.new(name: 'Role')
     RoutingRule = Shapes::StructureShape.new(name: 'RoutingRule')
     RoutingRules = Shapes::ListShape.new(name: 'RoutingRules')
     Rule = Shapes::StructureShape.new(name: 'Rule')
     Rules = Shapes::ListShape.new(name: 'Rules', flattened: true)
     S3KeyFilter = Shapes::StructureShape.new(name: 'S3KeyFilter')
+    S3Location = Shapes::StructureShape.new(name: 'S3Location')
     SSECustomerAlgorithm = Shapes::StringShape.new(name: 'SSECustomerAlgorithm')
     SSECustomerKey = Shapes::StringShape.new(name: 'SSECustomerKey')
     SSECustomerKeyMD5 = Shapes::StringShape.new(name: 'SSECustomerKeyMD5')
     SSEKMS = Shapes::StructureShape.new(name: 'SSEKMS')
     SSEKMSKeyId = Shapes::StringShape.new(name: 'SSEKMSKeyId')
     SSES3 = Shapes::StructureShape.new(name: 'SSES3')
+    SelectParameters = Shapes::StructureShape.new(name: 'SelectParameters')
     ServerSideEncryption = Shapes::StringShape.new(name: 'ServerSideEncryption')
     ServerSideEncryptionByDefault = Shapes::StructureShape.new(name: 'ServerSideEncryptionByDefault')
     ServerSideEncryptionConfiguration = Shapes::StructureShape.new(name: 'ServerSideEncryptionConfiguration')
@@ -426,6 +449,7 @@ module Aws::S3
     UploadPartCopyRequest = Shapes::StructureShape.new(name: 'UploadPartCopyRequest')
     UploadPartOutput = Shapes::StructureShape.new(name: 'UploadPartOutput')
     UploadPartRequest = Shapes::StructureShape.new(name: 'UploadPartRequest')
+    UserMetadata = Shapes::ListShape.new(name: 'UserMetadata')
     Value = Shapes::StringShape.new(name: 'Value')
     VersionIdMarker = Shapes::StringShape.new(name: 'VersionIdMarker')
     VersioningConfiguration = Shapes::StructureShape.new(name: 'VersioningConfiguration')
@@ -509,6 +533,21 @@ module Aws::S3
 
     CORSRules.member = Shapes::ShapeRef.new(shape: CORSRule)
 
+    CSVInput.add_member(:file_header_info, Shapes::ShapeRef.new(shape: FileHeaderInfo, location_name: "FileHeaderInfo"))
+    CSVInput.add_member(:comments, Shapes::ShapeRef.new(shape: Comments, location_name: "Comments"))
+    CSVInput.add_member(:quote_escape_character, Shapes::ShapeRef.new(shape: QuoteEscapeCharacter, location_name: "QuoteEscapeCharacter"))
+    CSVInput.add_member(:record_delimiter, Shapes::ShapeRef.new(shape: RecordDelimiter, location_name: "RecordDelimiter"))
+    CSVInput.add_member(:field_delimiter, Shapes::ShapeRef.new(shape: FieldDelimiter, location_name: "FieldDelimiter"))
+    CSVInput.add_member(:quote_character, Shapes::ShapeRef.new(shape: QuoteCharacter, location_name: "QuoteCharacter"))
+    CSVInput.struct_class = Types::CSVInput
+
+    CSVOutput.add_member(:quote_fields, Shapes::ShapeRef.new(shape: QuoteFields, location_name: "QuoteFields"))
+    CSVOutput.add_member(:quote_escape_character, Shapes::ShapeRef.new(shape: QuoteEscapeCharacter, location_name: "QuoteEscapeCharacter"))
+    CSVOutput.add_member(:record_delimiter, Shapes::ShapeRef.new(shape: RecordDelimiter, location_name: "RecordDelimiter"))
+    CSVOutput.add_member(:field_delimiter, Shapes::ShapeRef.new(shape: FieldDelimiter, location_name: "FieldDelimiter"))
+    CSVOutput.add_member(:quote_character, Shapes::ShapeRef.new(shape: QuoteCharacter, location_name: "QuoteCharacter"))
+    CSVOutput.struct_class = Types::CSVOutput
+
     CloudFunctionConfiguration.add_member(:id, Shapes::ShapeRef.new(shape: NotificationId, location_name: "Id"))
     CloudFunctionConfiguration.add_member(:event, Shapes::ShapeRef.new(shape: Event, deprecated: true, location_name: "Event"))
     CloudFunctionConfiguration.add_member(:events, Shapes::ShapeRef.new(shape: EventList, location_name: "Event"))
@@ -762,6 +801,11 @@ module Aws::S3
     Destination.add_member(:encryption_configuration, Shapes::ShapeRef.new(shape: EncryptionConfiguration, location_name: "EncryptionConfiguration"))
     Destination.struct_class = Types::Destination
 
+    Encryption.add_member(:encryption_type, Shapes::ShapeRef.new(shape: ServerSideEncryption, required: true, location_name: "EncryptionType"))
+    Encryption.add_member(:kms_key_id, Shapes::ShapeRef.new(shape: SSEKMSKeyId, location_name: "KMSKeyId"))
+    Encryption.add_member(:kms_context, Shapes::ShapeRef.new(shape: KMSContext, location_name: "KMSContext"))
+    Encryption.struct_class = Types::Encryption
+
     EncryptionConfiguration.add_member(:replica_kms_key_id, Shapes::ShapeRef.new(shape: ReplicaKmsKeyID, location_name: "ReplicaKmsKeyID"))
     EncryptionConfiguration.struct_class = Types::EncryptionConfiguration
 
@@ -1065,6 +1109,9 @@ module Aws::S3
     Initiator.add_member(:display_name, Shapes::ShapeRef.new(shape: DisplayName, location_name: "DisplayName"))
     Initiator.struct_class = Types::Initiator
 
+    InputSerialization.add_member(:csv, Shapes::ShapeRef.new(shape: CSVInput, location_name: "CSV"))
+    InputSerialization.struct_class = Types::InputSerialization
+
     InventoryConfiguration.add_member(:destination, Shapes::ShapeRef.new(shape: InventoryDestination, required: true, location_name: "Destination"))
     InventoryConfiguration.add_member(:is_enabled, Shapes::ShapeRef.new(shape: IsEnabled, required: true, location_name: "IsEnabled"))
     InventoryConfiguration.add_member(:filter, Shapes::ShapeRef.new(shape: InventoryFilter, location_name: "Filter"))
@@ -1295,6 +1342,10 @@ module Aws::S3
     Metadata.key = Shapes::ShapeRef.new(shape: MetadataKey)
     Metadata.value = Shapes::ShapeRef.new(shape: MetadataValue)
 
+    MetadataEntry.add_member(:name, Shapes::ShapeRef.new(shape: MetadataKey, location_name: "Name"))
+    MetadataEntry.add_member(:value, Shapes::ShapeRef.new(shape: MetadataValue, location_name: "Value"))
+    MetadataEntry.struct_class = Types::MetadataEntry
+
     MetricsAndOperator.add_member(:prefix, Shapes::ShapeRef.new(shape: Prefix, location_name: "Prefix"))
     MetricsAndOperator.add_member(:tags, Shapes::ShapeRef.new(shape: TagSet, location_name: "Tag", metadata: {"flattened"=>true}))
     MetricsAndOperator.struct_class = Types::MetricsAndOperator
@@ -1370,6 +1421,12 @@ module Aws::S3
 
     ObjectVersionList.member = Shapes::ShapeRef.new(shape: ObjectVersion)
 
+    OutputLocation.add_member(:s3, Shapes::ShapeRef.new(shape: S3Location, location_name: "S3"))
+    OutputLocation.struct_class = Types::OutputLocation
+
+    OutputSerialization.add_member(:csv, Shapes::ShapeRef.new(shape: CSVOutput, location_name: "CSV"))
+    OutputSerialization.struct_class = Types::OutputSerialization
+
     Owner.add_member(:display_name, Shapes::ShapeRef.new(shape: DisplayName, location_name: "DisplayName"))
     Owner.add_member(:id, Shapes::ShapeRef.new(shape: ID, location_name: "ID"))
     Owner.struct_class = Types::Owner
@@ -1626,6 +1683,7 @@ module Aws::S3
     RequestPaymentConfiguration.struct_class = Types::RequestPaymentConfiguration
 
     RestoreObjectOutput.add_member(:request_charged, Shapes::ShapeRef.new(shape: RequestCharged, location: "header", location_name: "x-amz-request-charged"))
+    RestoreObjectOutput.add_member(:restore_output_path, Shapes::ShapeRef.new(shape: RestoreOutputPath, location: "header", location_name: "x-amz-restore-output-path"))
     RestoreObjectOutput.struct_class = Types::RestoreObjectOutput
 
     RestoreObjectRequest.add_member(:bucket, Shapes::ShapeRef.new(shape: BucketName, required: true, location: "uri", location_name: "Bucket"))
@@ -1637,8 +1695,13 @@ module Aws::S3
     RestoreObjectRequest[:payload] = :restore_request
     RestoreObjectRequest[:payload_member] = RestoreObjectRequest.member(:restore_request)
 
-    RestoreRequest.add_member(:days, Shapes::ShapeRef.new(shape: Days, required: true, location_name: "Days"))
+    RestoreRequest.add_member(:days, Shapes::ShapeRef.new(shape: Days, location_name: "Days"))
     RestoreRequest.add_member(:glacier_job_parameters, Shapes::ShapeRef.new(shape: GlacierJobParameters, location_name: "GlacierJobParameters"))
+    RestoreRequest.add_member(:type, Shapes::ShapeRef.new(shape: RestoreRequestType, location_name: "Type"))
+    RestoreRequest.add_member(:tier, Shapes::ShapeRef.new(shape: Tier, location_name: "Tier"))
+    RestoreRequest.add_member(:description, Shapes::ShapeRef.new(shape: Description, location_name: "Description"))
+    RestoreRequest.add_member(:select_parameters, Shapes::ShapeRef.new(shape: SelectParameters, location_name: "SelectParameters"))
+    RestoreRequest.add_member(:output_location, Shapes::ShapeRef.new(shape: OutputLocation, location_name: "OutputLocation"))
     RestoreRequest.struct_class = Types::RestoreRequest
 
     RoutingRule.add_member(:condition, Shapes::ShapeRef.new(shape: Condition, location_name: "Condition"))
@@ -1662,11 +1725,27 @@ module Aws::S3
     S3KeyFilter.add_member(:filter_rules, Shapes::ShapeRef.new(shape: FilterRuleList, location_name: "FilterRule"))
     S3KeyFilter.struct_class = Types::S3KeyFilter
 
+    S3Location.add_member(:bucket_name, Shapes::ShapeRef.new(shape: BucketName, required: true, location_name: "BucketName"))
+    S3Location.add_member(:prefix, Shapes::ShapeRef.new(shape: LocationPrefix, required: true, location_name: "Prefix"))
+    S3Location.add_member(:encryption, Shapes::ShapeRef.new(shape: Encryption, location_name: "Encryption"))
+    S3Location.add_member(:canned_acl, Shapes::ShapeRef.new(shape: ObjectCannedACL, location_name: "CannedACL"))
+    S3Location.add_member(:access_control_list, Shapes::ShapeRef.new(shape: Grants, location_name: "AccessControlList"))
+    S3Location.add_member(:tagging, Shapes::ShapeRef.new(shape: Tagging, location_name: "Tagging"))
+    S3Location.add_member(:user_metadata, Shapes::ShapeRef.new(shape: UserMetadata, location_name: "UserMetadata"))
+    S3Location.add_member(:storage_class, Shapes::ShapeRef.new(shape: StorageClass, location_name: "StorageClass"))
+    S3Location.struct_class = Types::S3Location
+
     SSEKMS.add_member(:key_id, Shapes::ShapeRef.new(shape: SSEKMSKeyId, required: true, location_name: "KeyId"))
     SSEKMS.struct_class = Types::SSEKMS
 
     SSES3.struct_class = Types::SSES3
 
+    SelectParameters.add_member(:input_serialization, Shapes::ShapeRef.new(shape: InputSerialization, required: true, location_name: "InputSerialization"))
+    SelectParameters.add_member(:expression_type, Shapes::ShapeRef.new(shape: ExpressionType, required: true, location_name: "ExpressionType"))
+    SelectParameters.add_member(:expression, Shapes::ShapeRef.new(shape: Expression, required: true, location_name: "Expression"))
+    SelectParameters.add_member(:output_serialization, Shapes::ShapeRef.new(shape: OutputSerialization, required: true, location_name: "OutputSerialization"))
+    SelectParameters.struct_class = Types::SelectParameters
+
     ServerSideEncryptionByDefault.add_member(:sse_algorithm, Shapes::ShapeRef.new(shape: ServerSideEncryption, required: true, location_name: "SSEAlgorithm"))
     ServerSideEncryptionByDefault.add_member(:kms_master_key_id, Shapes::ShapeRef.new(shape: SSEKMSKeyId, location_name: "KMSMasterKeyID"))
     ServerSideEncryptionByDefault.struct_class = Types::ServerSideEncryptionByDefault
@@ -1781,6 +1860,8 @@ module Aws::S3
     UploadPartRequest[:payload] = :body
     UploadPartRequest[:payload_member] = UploadPartRequest.member(:body)
 
+    UserMetadata.member = Shapes::ShapeRef.new(shape: MetadataEntry, location_name: "MetadataEntry")
+
     VersioningConfiguration.add_member(:mfa_delete, Shapes::ShapeRef.new(shape: MFADelete, location_name: "MfaDelete"))
     VersioningConfiguration.add_member(:status, Shapes::ShapeRef.new(shape: BucketVersioningStatus, location_name: "Status"))
     VersioningConfiguration.struct_class = Types::VersioningConfiguration

data/lib/aws-sdk-s3/object.rb

@@ -882,16 +882,82 @@ module Aws::S3
     #   object.restore_object({
     #     version_id: "ObjectVersionId",
     #     restore_request: {
-    #       days: 1, # required
+    #       days: 1,
     #       glacier_job_parameters: {
     #         tier: "Standard", # required, accepts Standard, Bulk, Expedited
     #       },
+    #       type: "SELECT", # accepts SELECT
+    #       tier: "Standard", # accepts Standard, Bulk, Expedited
+    #       description: "Description",
+    #       select_parameters: {
+    #         input_serialization: { # required
+    #           csv: {
+    #             file_header_info: "USE", # accepts USE, IGNORE, NONE
+    #             comments: "Comments",
+    #             quote_escape_character: "QuoteEscapeCharacter",
+    #             record_delimiter: "RecordDelimiter",
+    #             field_delimiter: "FieldDelimiter",
+    #             quote_character: "QuoteCharacter",
+    #           },
+    #         },
+    #         expression_type: "SQL", # required, accepts SQL
+    #         expression: "Expression", # required
+    #         output_serialization: { # required
+    #           csv: {
+    #             quote_fields: "ALWAYS", # accepts ALWAYS, ASNEEDED
+    #             quote_escape_character: "QuoteEscapeCharacter",
+    #             record_delimiter: "RecordDelimiter",
+    #             field_delimiter: "FieldDelimiter",
+    #             quote_character: "QuoteCharacter",
+    #           },
+    #         },
+    #       },
+    #       output_location: {
+    #         s3: {
+    #           bucket_name: "BucketName", # required
+    #           prefix: "LocationPrefix", # required
+    #           encryption: {
+    #             encryption_type: "AES256", # required, accepts AES256, aws:kms
+    #             kms_key_id: "SSEKMSKeyId",
+    #             kms_context: "KMSContext",
+    #           },
+    #           canned_acl: "private", # accepts private, public-read, public-read-write, authenticated-read, aws-exec-read, bucket-owner-read, bucket-owner-full-control
+    #           access_control_list: [
+    #             {
+    #               grantee: {
+    #                 display_name: "DisplayName",
+    #                 email_address: "EmailAddress",
+    #                 id: "ID",
+    #                 type: "CanonicalUser", # required, accepts CanonicalUser, AmazonCustomerByEmail, Group
+    #                 uri: "URI",
+    #               },
+    #               permission: "FULL_CONTROL", # accepts FULL_CONTROL, WRITE, WRITE_ACP, READ, READ_ACP
+    #             },
+    #           ],
+    #           tagging: {
+    #             tag_set: [ # required
+    #               {
+    #                 key: "ObjectKey", # required
+    #                 value: "Value", # required
+    #               },
+    #             ],
+    #           },
+    #           user_metadata: [
+    #             {
+    #               name: "MetadataKey",
+    #               value: "MetadataValue",
+    #             },
+    #           ],
+    #           storage_class: "STANDARD", # accepts STANDARD, REDUCED_REDUNDANCY, STANDARD_IA
+    #         },
+    #       },
     #     },
     #     request_payer: "requester", # accepts requester
     #   })
     # @param [Hash] options ({})
     # @option options [String] :version_id
     # @option options [Types::RestoreRequest] :restore_request
+    #   Container for restore job parameters.
     # @option options [String] :request_payer
     #   Confirms that the requester knows that she or he will be charged for
     #   the request. Bucket owners need not specify this parameter in their

data/lib/aws-sdk-s3/object_summary.rb

@@ -725,16 +725,82 @@ module Aws::S3
     #   object_summary.restore_object({
     #     version_id: "ObjectVersionId",
     #     restore_request: {
-    #       days: 1, # required
+    #       days: 1,
     #       glacier_job_parameters: {
     #         tier: "Standard", # required, accepts Standard, Bulk, Expedited
     #       },
+    #       type: "SELECT", # accepts SELECT
+    #       tier: "Standard", # accepts Standard, Bulk, Expedited
+    #       description: "Description",
+    #       select_parameters: {
+    #         input_serialization: { # required
+    #           csv: {
+    #             file_header_info: "USE", # accepts USE, IGNORE, NONE
+    #             comments: "Comments",
+    #             quote_escape_character: "QuoteEscapeCharacter",
+    #             record_delimiter: "RecordDelimiter",
+    #             field_delimiter: "FieldDelimiter",
+    #             quote_character: "QuoteCharacter",
+    #           },
+    #         },
+    #         expression_type: "SQL", # required, accepts SQL
+    #         expression: "Expression", # required
+    #         output_serialization: { # required
+    #           csv: {
+    #             quote_fields: "ALWAYS", # accepts ALWAYS, ASNEEDED
+    #             quote_escape_character: "QuoteEscapeCharacter",
+    #             record_delimiter: "RecordDelimiter",
+    #             field_delimiter: "FieldDelimiter",
+    #             quote_character: "QuoteCharacter",
+    #           },
+    #         },
+    #       },
+    #       output_location: {
+    #         s3: {
+    #           bucket_name: "BucketName", # required
+    #           prefix: "LocationPrefix", # required
+    #           encryption: {
+    #             encryption_type: "AES256", # required, accepts AES256, aws:kms
+    #             kms_key_id: "SSEKMSKeyId",
+    #             kms_context: "KMSContext",
+    #           },
+    #           canned_acl: "private", # accepts private, public-read, public-read-write, authenticated-read, aws-exec-read, bucket-owner-read, bucket-owner-full-control
+    #           access_control_list: [
+    #             {
+    #               grantee: {
+    #                 display_name: "DisplayName",
+    #                 email_address: "EmailAddress",
+    #                 id: "ID",
+    #                 type: "CanonicalUser", # required, accepts CanonicalUser, AmazonCustomerByEmail, Group
+    #                 uri: "URI",
+    #               },
+    #               permission: "FULL_CONTROL", # accepts FULL_CONTROL, WRITE, WRITE_ACP, READ, READ_ACP
+    #             },
+    #           ],
+    #           tagging: {
+    #             tag_set: [ # required
+    #               {
+    #                 key: "ObjectKey", # required
+    #                 value: "Value", # required
+    #               },
+    #             ],
+    #           },
+    #           user_metadata: [
+    #             {
+    #               name: "MetadataKey",
+    #               value: "MetadataValue",
+    #             },
+    #           ],
+    #           storage_class: "STANDARD", # accepts STANDARD, REDUCED_REDUNDANCY, STANDARD_IA
+    #         },
+    #       },
     #     },
     #     request_payer: "requester", # accepts requester
     #   })
     # @param [Hash] options ({})
     # @option options [String] :version_id
     # @option options [Types::RestoreRequest] :restore_request
+    #   Container for restore job parameters.
     # @option options [String] :request_payer
     #   Confirms that the requester knows that she or he will be charged for
     #   the request. Bucket owners need not specify this parameter in their

data/lib/aws-sdk-s3/types.rb

@@ -534,6 +534,105 @@ module Aws::S3
       include Aws::Structure
     end
 
+    # Describes how a CSV-formatted input object is formatted.
+    #
+    # @note When making an API call, you may pass CSVInput
+    #   data as a hash:
+    #
+    #       {
+    #         file_header_info: "USE", # accepts USE, IGNORE, NONE
+    #         comments: "Comments",
+    #         quote_escape_character: "QuoteEscapeCharacter",
+    #         record_delimiter: "RecordDelimiter",
+    #         field_delimiter: "FieldDelimiter",
+    #         quote_character: "QuoteCharacter",
+    #       }
+    #
+    # @!attribute [rw] file_header_info
+    #   Describes the first line of input. Valid values: None, Ignore, Use.
+    #   @return [String]
+    #
+    # @!attribute [rw] comments
+    #   Single character used to indicate a row should be ignored when
+    #   present at the start of a row.
+    #   @return [String]
+    #
+    # @!attribute [rw] quote_escape_character
+    #   Single character used for escaping the quote character inside an
+    #   already escaped value.
+    #   @return [String]
+    #
+    # @!attribute [rw] record_delimiter
+    #   Value used to separate individual records.
+    #   @return [String]
+    #
+    # @!attribute [rw] field_delimiter
+    #   Value used to separate individual fields in a record.
+    #   @return [String]
+    #
+    # @!attribute [rw] quote_character
+    #   Value used for escaping where the field delimiter is part of the
+    #   value.
+    #   @return [String]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/CSVInput AWS API Documentation
+    #
+    class CSVInput < Struct.new(
+      :file_header_info,
+      :comments,
+      :quote_escape_character,
+      :record_delimiter,
+      :field_delimiter,
+      :quote_character)
+      include Aws::Structure
+    end
+
+    # Describes how CSV-formatted results are formatted.
+    #
+    # @note When making an API call, you may pass CSVOutput
+    #   data as a hash:
+    #
+    #       {
+    #         quote_fields: "ALWAYS", # accepts ALWAYS, ASNEEDED
+    #         quote_escape_character: "QuoteEscapeCharacter",
+    #         record_delimiter: "RecordDelimiter",
+    #         field_delimiter: "FieldDelimiter",
+    #         quote_character: "QuoteCharacter",
+    #       }
+    #
+    # @!attribute [rw] quote_fields
+    #   Indicates whether or not all output fields should be quoted.
+    #   @return [String]
+    #
+    # @!attribute [rw] quote_escape_character
+    #   Single character used for escaping the quote character inside an
+    #   already escaped value.
+    #   @return [String]
+    #
+    # @!attribute [rw] record_delimiter
+    #   Value used to separate individual records.
+    #   @return [String]
+    #
+    # @!attribute [rw] field_delimiter
+    #   Value used to separate individual fields in a record.
+    #   @return [String]
+    #
+    # @!attribute [rw] quote_character
+    #   Value used for escaping where the field delimiter is part of the
+    #   value.
+    #   @return [String]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/CSVOutput AWS API Documentation
+    #
+    class CSVOutput < Struct.new(
+      :quote_fields,
+      :quote_escape_character,
+      :record_delimiter,
+      :field_delimiter,
+      :quote_character)
+      include Aws::Structure
+    end
+
     # @note When making an API call, you may pass CloudFunctionConfiguration
     #   data as a hash:
     #
@@ -1955,6 +2054,42 @@ module Aws::S3
       include Aws::Structure
     end
 
+    # Describes the server-side encryption that will be applied to the
+    # restore results.
+    #
+    # @note When making an API call, you may pass Encryption
+    #   data as a hash:
+    #
+    #       {
+    #         encryption_type: "AES256", # required, accepts AES256, aws:kms
+    #         kms_key_id: "SSEKMSKeyId",
+    #         kms_context: "KMSContext",
+    #       }
+    #
+    # @!attribute [rw] encryption_type
+    #   The server-side encryption algorithm used when storing job results
+    #   in Amazon S3 (e.g., AES256, aws:kms).
+    #   @return [String]
+    #
+    # @!attribute [rw] kms_key_id
+    #   If the encryption type is aws:kms, this optional value specifies the
+    #   AWS KMS key ID to use for encryption of job results.
+    #   @return [String]
+    #
+    # @!attribute [rw] kms_context
+    #   If the encryption type is aws:kms, this optional value can be used
+    #   to specify the encryption context for the restore results.
+    #   @return [String]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/Encryption AWS API Documentation
+    #
+    class Encryption < Struct.new(
+      :encryption_type,
+      :kms_key_id,
+      :kms_context)
+      include Aws::Structure
+    end
+
     # Container for information regarding encryption based configuration for
     # replicas.
     #
@@ -3464,6 +3599,33 @@ module Aws::S3
       include Aws::Structure
     end
 
+    # Describes the serialization format of the object.
+    #
+    # @note When making an API call, you may pass InputSerialization
+    #   data as a hash:
+    #
+    #       {
+    #         csv: {
+    #           file_header_info: "USE", # accepts USE, IGNORE, NONE
+    #           comments: "Comments",
+    #           quote_escape_character: "QuoteEscapeCharacter",
+    #           record_delimiter: "RecordDelimiter",
+    #           field_delimiter: "FieldDelimiter",
+    #           quote_character: "QuoteCharacter",
+    #         },
+    #       }
+    #
+    # @!attribute [rw] csv
+    #   Describes the serialization of a CSV-encoded object.
+    #   @return [Types::CSVInput]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/InputSerialization AWS API Documentation
+    #
+    class InputSerialization < Struct.new(
+      :csv)
+      include Aws::Structure
+    end
+
     # @note When making an API call, you may pass InventoryConfiguration
     #   data as a hash:
     #
@@ -4924,6 +5086,30 @@ module Aws::S3
       include Aws::Structure
     end
 
+    # A metadata key-value pair to store with an object.
+    #
+    # @note When making an API call, you may pass MetadataEntry
+    #   data as a hash:
+    #
+    #       {
+    #         name: "MetadataKey",
+    #         value: "MetadataValue",
+    #       }
+    #
+    # @!attribute [rw] name
+    #   @return [String]
+    #
+    # @!attribute [rw] value
+    #   @return [String]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/MetadataEntry AWS API Documentation
+    #
+    class MetadataEntry < Struct.new(
+      :name,
+      :value)
+      include Aws::Structure
+    end
+
     # @note When making an API call, you may pass MetricsAndOperator
     #   data as a hash:
     #
@@ -5398,6 +5584,89 @@ module Aws::S3
       include Aws::Structure
     end
 
+    # Describes the location where the restore job's output is stored.
+    #
+    # @note When making an API call, you may pass OutputLocation
+    #   data as a hash:
+    #
+    #       {
+    #         s3: {
+    #           bucket_name: "BucketName", # required
+    #           prefix: "LocationPrefix", # required
+    #           encryption: {
+    #             encryption_type: "AES256", # required, accepts AES256, aws:kms
+    #             kms_key_id: "SSEKMSKeyId",
+    #             kms_context: "KMSContext",
+    #           },
+    #           canned_acl: "private", # accepts private, public-read, public-read-write, authenticated-read, aws-exec-read, bucket-owner-read, bucket-owner-full-control
+    #           access_control_list: [
+    #             {
+    #               grantee: {
+    #                 display_name: "DisplayName",
+    #                 email_address: "EmailAddress",
+    #                 id: "ID",
+    #                 type: "CanonicalUser", # required, accepts CanonicalUser, AmazonCustomerByEmail, Group
+    #                 uri: "URI",
+    #               },
+    #               permission: "FULL_CONTROL", # accepts FULL_CONTROL, WRITE, WRITE_ACP, READ, READ_ACP
+    #             },
+    #           ],
+    #           tagging: {
+    #             tag_set: [ # required
+    #               {
+    #                 key: "ObjectKey", # required
+    #                 value: "Value", # required
+    #               },
+    #             ],
+    #           },
+    #           user_metadata: [
+    #             {
+    #               name: "MetadataKey",
+    #               value: "MetadataValue",
+    #             },
+    #           ],
+    #           storage_class: "STANDARD", # accepts STANDARD, REDUCED_REDUNDANCY, STANDARD_IA
+    #         },
+    #       }
+    #
+    # @!attribute [rw] s3
+    #   Describes an S3 location that will receive the results of the
+    #   restore request.
+    #   @return [Types::S3Location]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/OutputLocation AWS API Documentation
+    #
+    class OutputLocation < Struct.new(
+      :s3)
+      include Aws::Structure
+    end
+
+    # Describes how results of the Select job are serialized.
+    #
+    # @note When making an API call, you may pass OutputSerialization
+    #   data as a hash:
+    #
+    #       {
+    #         csv: {
+    #           quote_fields: "ALWAYS", # accepts ALWAYS, ASNEEDED
+    #           quote_escape_character: "QuoteEscapeCharacter",
+    #           record_delimiter: "RecordDelimiter",
+    #           field_delimiter: "FieldDelimiter",
+    #           quote_character: "QuoteCharacter",
+    #         },
+    #       }
+    #
+    # @!attribute [rw] csv
+    #   Describes the serialization of CSV-encoded Select results.
+    #   @return [Types::CSVOutput]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/OutputSerialization AWS API Documentation
+    #
+    class OutputSerialization < Struct.new(
+      :csv)
+      include Aws::Structure
+    end
+
     # @note When making an API call, you may pass Owner
     #   data as a hash:
     #
@@ -7064,10 +7333,16 @@ module Aws::S3
     #   for the request.
     #   @return [String]
     #
+    # @!attribute [rw] restore_output_path
+    #   Indicates the path in the provided S3 output location where Select
+    #   results will be restored to.
+    #   @return [String]
+    #
     # @see http://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/RestoreObjectOutput AWS API Documentation
     #
     class RestoreObjectOutput < Struct.new(
-      :request_charged)
+      :request_charged,
+      :restore_output_path)
       include Aws::Structure
     end
 
@@ -7079,10 +7354,75 @@ module Aws::S3
     #         key: "ObjectKey", # required
     #         version_id: "ObjectVersionId",
     #         restore_request: {
-    #           days: 1, # required
+    #           days: 1,
     #           glacier_job_parameters: {
     #             tier: "Standard", # required, accepts Standard, Bulk, Expedited
     #           },
+    #           type: "SELECT", # accepts SELECT
+    #           tier: "Standard", # accepts Standard, Bulk, Expedited
+    #           description: "Description",
+    #           select_parameters: {
+    #             input_serialization: { # required
+    #               csv: {
+    #                 file_header_info: "USE", # accepts USE, IGNORE, NONE
+    #                 comments: "Comments",
+    #                 quote_escape_character: "QuoteEscapeCharacter",
+    #                 record_delimiter: "RecordDelimiter",
+    #                 field_delimiter: "FieldDelimiter",
+    #                 quote_character: "QuoteCharacter",
+    #               },
+    #             },
+    #             expression_type: "SQL", # required, accepts SQL
+    #             expression: "Expression", # required
+    #             output_serialization: { # required
+    #               csv: {
+    #                 quote_fields: "ALWAYS", # accepts ALWAYS, ASNEEDED
+    #                 quote_escape_character: "QuoteEscapeCharacter",
+    #                 record_delimiter: "RecordDelimiter",
+    #                 field_delimiter: "FieldDelimiter",
+    #                 quote_character: "QuoteCharacter",
+    #               },
+    #             },
+    #           },
+    #           output_location: {
+    #             s3: {
+    #               bucket_name: "BucketName", # required
+    #               prefix: "LocationPrefix", # required
+    #               encryption: {
+    #                 encryption_type: "AES256", # required, accepts AES256, aws:kms
+    #                 kms_key_id: "SSEKMSKeyId",
+    #                 kms_context: "KMSContext",
+    #               },
+    #               canned_acl: "private", # accepts private, public-read, public-read-write, authenticated-read, aws-exec-read, bucket-owner-read, bucket-owner-full-control
+    #               access_control_list: [
+    #                 {
+    #                   grantee: {
+    #                     display_name: "DisplayName",
+    #                     email_address: "EmailAddress",
+    #                     id: "ID",
+    #                     type: "CanonicalUser", # required, accepts CanonicalUser, AmazonCustomerByEmail, Group
+    #                     uri: "URI",
+    #                   },
+    #                   permission: "FULL_CONTROL", # accepts FULL_CONTROL, WRITE, WRITE_ACP, READ, READ_ACP
+    #                 },
+    #               ],
+    #               tagging: {
+    #                 tag_set: [ # required
+    #                   {
+    #                     key: "ObjectKey", # required
+    #                     value: "Value", # required
+    #                   },
+    #                 ],
+    #               },
+    #               user_metadata: [
+    #                 {
+    #                   name: "MetadataKey",
+    #                   value: "MetadataValue",
+    #                 },
+    #               ],
+    #               storage_class: "STANDARD", # accepts STANDARD, REDUCED_REDUNDANCY, STANDARD_IA
+    #             },
+    #           },
     #         },
     #         request_payer: "requester", # accepts requester
     #       }
@@ -7097,6 +7437,7 @@ module Aws::S3
     #   @return [String]
     #
     # @!attribute [rw] restore_request
+    #   Container for restore job parameters.
     #   @return [Types::RestoreRequest]
     #
     # @!attribute [rw] request_payer
@@ -7118,29 +7459,123 @@ module Aws::S3
       include Aws::Structure
     end
 
+    # Container for restore job parameters.
+    #
     # @note When making an API call, you may pass RestoreRequest
     #   data as a hash:
     #
     #       {
-    #         days: 1, # required
+    #         days: 1,
     #         glacier_job_parameters: {
     #           tier: "Standard", # required, accepts Standard, Bulk, Expedited
     #         },
+    #         type: "SELECT", # accepts SELECT
+    #         tier: "Standard", # accepts Standard, Bulk, Expedited
+    #         description: "Description",
+    #         select_parameters: {
+    #           input_serialization: { # required
+    #             csv: {
+    #               file_header_info: "USE", # accepts USE, IGNORE, NONE
+    #               comments: "Comments",
+    #               quote_escape_character: "QuoteEscapeCharacter",
+    #               record_delimiter: "RecordDelimiter",
+    #               field_delimiter: "FieldDelimiter",
+    #               quote_character: "QuoteCharacter",
+    #             },
+    #           },
+    #           expression_type: "SQL", # required, accepts SQL
+    #           expression: "Expression", # required
+    #           output_serialization: { # required
+    #             csv: {
+    #               quote_fields: "ALWAYS", # accepts ALWAYS, ASNEEDED
+    #               quote_escape_character: "QuoteEscapeCharacter",
+    #               record_delimiter: "RecordDelimiter",
+    #               field_delimiter: "FieldDelimiter",
+    #               quote_character: "QuoteCharacter",
+    #             },
+    #           },
+    #         },
+    #         output_location: {
+    #           s3: {
+    #             bucket_name: "BucketName", # required
+    #             prefix: "LocationPrefix", # required
+    #             encryption: {
+    #               encryption_type: "AES256", # required, accepts AES256, aws:kms
+    #               kms_key_id: "SSEKMSKeyId",
+    #               kms_context: "KMSContext",
+    #             },
+    #             canned_acl: "private", # accepts private, public-read, public-read-write, authenticated-read, aws-exec-read, bucket-owner-read, bucket-owner-full-control
+    #             access_control_list: [
+    #               {
+    #                 grantee: {
+    #                   display_name: "DisplayName",
+    #                   email_address: "EmailAddress",
+    #                   id: "ID",
+    #                   type: "CanonicalUser", # required, accepts CanonicalUser, AmazonCustomerByEmail, Group
+    #                   uri: "URI",
+    #                 },
+    #                 permission: "FULL_CONTROL", # accepts FULL_CONTROL, WRITE, WRITE_ACP, READ, READ_ACP
+    #               },
+    #             ],
+    #             tagging: {
+    #               tag_set: [ # required
+    #                 {
+    #                   key: "ObjectKey", # required
+    #                   value: "Value", # required
+    #                 },
+    #               ],
+    #             },
+    #             user_metadata: [
+    #               {
+    #                 name: "MetadataKey",
+    #                 value: "MetadataValue",
+    #               },
+    #             ],
+    #             storage_class: "STANDARD", # accepts STANDARD, REDUCED_REDUNDANCY, STANDARD_IA
+    #           },
+    #         },
     #       }
     #
     # @!attribute [rw] days
-    #   Lifetime of the active copy in days
+    #   Lifetime of the active copy in days. Do not use with restores that
+    #   specify OutputLocation.
     #   @return [Integer]
     #
     # @!attribute [rw] glacier_job_parameters
-    #   Glacier related prameters pertaining to this job.
+    #   Glacier related parameters pertaining to this job. Do not use with
+    #   restores that specify OutputLocation.
     #   @return [Types::GlacierJobParameters]
     #
+    # @!attribute [rw] type
+    #   Type of restore request.
+    #   @return [String]
+    #
+    # @!attribute [rw] tier
+    #   Glacier retrieval tier at which the restore will be processed.
+    #   @return [String]
+    #
+    # @!attribute [rw] description
+    #   The optional description for the job.
+    #   @return [String]
+    #
+    # @!attribute [rw] select_parameters
+    #   Describes the parameters for Select job types.
+    #   @return [Types::SelectParameters]
+    #
+    # @!attribute [rw] output_location
+    #   Describes the location where the restore job's output is stored.
+    #   @return [Types::OutputLocation]
+    #
     # @see http://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/RestoreRequest AWS API Documentation
     #
     class RestoreRequest < Struct.new(
       :days,
-      :glacier_job_parameters)
+      :glacier_job_parameters,
+      :type,
+      :tier,
+      :description,
+      :select_parameters,
+      :output_location)
       include Aws::Structure
     end
 
@@ -7297,6 +7732,98 @@ module Aws::S3
       include Aws::Structure
     end
 
+    # Describes an S3 location that will receive the results of the restore
+    # request.
+    #
+    # @note When making an API call, you may pass S3Location
+    #   data as a hash:
+    #
+    #       {
+    #         bucket_name: "BucketName", # required
+    #         prefix: "LocationPrefix", # required
+    #         encryption: {
+    #           encryption_type: "AES256", # required, accepts AES256, aws:kms
+    #           kms_key_id: "SSEKMSKeyId",
+    #           kms_context: "KMSContext",
+    #         },
+    #         canned_acl: "private", # accepts private, public-read, public-read-write, authenticated-read, aws-exec-read, bucket-owner-read, bucket-owner-full-control
+    #         access_control_list: [
+    #           {
+    #             grantee: {
+    #               display_name: "DisplayName",
+    #               email_address: "EmailAddress",
+    #               id: "ID",
+    #               type: "CanonicalUser", # required, accepts CanonicalUser, AmazonCustomerByEmail, Group
+    #               uri: "URI",
+    #             },
+    #             permission: "FULL_CONTROL", # accepts FULL_CONTROL, WRITE, WRITE_ACP, READ, READ_ACP
+    #           },
+    #         ],
+    #         tagging: {
+    #           tag_set: [ # required
+    #             {
+    #               key: "ObjectKey", # required
+    #               value: "Value", # required
+    #             },
+    #           ],
+    #         },
+    #         user_metadata: [
+    #           {
+    #             name: "MetadataKey",
+    #             value: "MetadataValue",
+    #           },
+    #         ],
+    #         storage_class: "STANDARD", # accepts STANDARD, REDUCED_REDUNDANCY, STANDARD_IA
+    #       }
+    #
+    # @!attribute [rw] bucket_name
+    #   The name of the bucket where the restore results will be placed.
+    #   @return [String]
+    #
+    # @!attribute [rw] prefix
+    #   The prefix that is prepended to the restore results for this
+    #   request.
+    #   @return [String]
+    #
+    # @!attribute [rw] encryption
+    #   Describes the server-side encryption that will be applied to the
+    #   restore results.
+    #   @return [Types::Encryption]
+    #
+    # @!attribute [rw] canned_acl
+    #   The canned ACL to apply to the restore results.
+    #   @return [String]
+    #
+    # @!attribute [rw] access_control_list
+    #   A list of grants that control access to the staged results.
+    #   @return [Array<Types::Grant>]
+    #
+    # @!attribute [rw] tagging
+    #   The tag-set that is applied to the restore results.
+    #   @return [Types::Tagging]
+    #
+    # @!attribute [rw] user_metadata
+    #   A list of metadata to store with the restore results in S3.
+    #   @return [Array<Types::MetadataEntry>]
+    #
+    # @!attribute [rw] storage_class
+    #   The class of storage used to store the restore results.
+    #   @return [String]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/S3Location AWS API Documentation
+    #
+    class S3Location < Struct.new(
+      :bucket_name,
+      :prefix,
+      :encryption,
+      :canned_acl,
+      :access_control_list,
+      :tagging,
+      :user_metadata,
+      :storage_class)
+      include Aws::Structure
+    end
+
     # Specifies the use of SSE-KMS to encrypt delievered Inventory reports.
     #
     # @note When making an API call, you may pass SSEKMS
@@ -7326,6 +7853,61 @@ module Aws::S3
     #
     class SSES3 < Aws::EmptyStructure; end
 
+    # Describes the parameters for Select job types.
+    #
+    # @note When making an API call, you may pass SelectParameters
+    #   data as a hash:
+    #
+    #       {
+    #         input_serialization: { # required
+    #           csv: {
+    #             file_header_info: "USE", # accepts USE, IGNORE, NONE
+    #             comments: "Comments",
+    #             quote_escape_character: "QuoteEscapeCharacter",
+    #             record_delimiter: "RecordDelimiter",
+    #             field_delimiter: "FieldDelimiter",
+    #             quote_character: "QuoteCharacter",
+    #           },
+    #         },
+    #         expression_type: "SQL", # required, accepts SQL
+    #         expression: "Expression", # required
+    #         output_serialization: { # required
+    #           csv: {
+    #             quote_fields: "ALWAYS", # accepts ALWAYS, ASNEEDED
+    #             quote_escape_character: "QuoteEscapeCharacter",
+    #             record_delimiter: "RecordDelimiter",
+    #             field_delimiter: "FieldDelimiter",
+    #             quote_character: "QuoteCharacter",
+    #           },
+    #         },
+    #       }
+    #
+    # @!attribute [rw] input_serialization
+    #   Describes the serialization format of the object.
+    #   @return [Types::InputSerialization]
+    #
+    # @!attribute [rw] expression_type
+    #   The type of the provided expression (e.g., SQL).
+    #   @return [String]
+    #
+    # @!attribute [rw] expression
+    #   The expression that is used to query the object.
+    #   @return [String]
+    #
+    # @!attribute [rw] output_serialization
+    #   Describes how the results of the Select job are serialized.
+    #   @return [Types::OutputSerialization]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/SelectParameters AWS API Documentation
+    #
+    class SelectParameters < Struct.new(
+      :input_serialization,
+      :expression_type,
+      :expression,
+      :output_serialization)
+      include Aws::Structure
+    end
+
     # Describes the default server-side encryption to apply to new objects
     # in the bucket. If Put Object request does not specify any server-side
     # encryption, this default encryption will be applied.

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aws-sdk-s3
 version: !ruby/object:Gem::Version
-  version: 1.7.0
+  version: 1.8.0
 platform: ruby
 authors:
 - Amazon Web Services
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-17 00:00:00.000000000 Z
+date: 2017-11-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-kms