aws-sdk-glacier 1.4.0 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 84d45c295529fceba697ef874bc8bbb324fbed3f
-  data.tar.gz: af82813b68db23f6b3c2f6d9d06ebf3edbb2796d
+  metadata.gz: 54696fe2cf51bcf74ab64ede10d98b56b75814f9
+  data.tar.gz: bf6b4355fddea1eb7241d5f39ff722548c36a0c4
 SHA512:
-  metadata.gz: 3c084c8ce9ccc9f5eeced377dba0b85ed02312dbdc7251818b055022b500fe6837b0d010f201e29ecd5afbc301c78ab45a17f03361e9759b0f7518e6b08b0c9d
-  data.tar.gz: 86284fb974112ae3d79b443b26e5e6767a3557b1093bbb1fce337d412430f517c3ad6009671665bd79e329456f2edc4a21c0f9f7f3e8c9b34992a761f1a2dcd0
+  metadata.gz: fda25a1ee26ed46c44ebe1c44f544b0fe3a64920886e528104acbd6fda90db8ee659b29292b005be7135237afb554ccac7170f0ec985d317e18f348a331c5872
+  data.tar.gz: c700d73a5b685c405184d9738fff7c8208f9f484bd460b3541813ba642af19ee80fd1020793c9fa09ee21fdbfa5bf07ea4fbdf1b292011c567b4e0bca4ec55e0

data/lib/aws-sdk-glacier.rb

@@ -49,6 +49,6 @@ require_relative 'aws-sdk-glacier/customizations'
 # @service
 module Aws::Glacier
 
-  GEM_VERSION = '1.4.0'
+  GEM_VERSION = '1.5.0'
 
 end

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

@@ -895,9 +895,9 @@ module Aws::Glacier
     # permission to perform specific actions. For more information, see
     # [Access Control Using AWS Identity and Access Management (IAM)][1].
     #
-    # For information about the underlying REST API, see [Working with
-    # Archives in Amazon Glacier][2] in the *Amazon Glacier Developer
-    # Guide*.
+    # For more information about using this operation, see the documentation
+    # for the underlying REST API [Describe Job][2] in the *Amazon Glacier
+    # Developer Guide*.
     #
     #
     #
@@ -938,6 +938,9 @@ module Aws::Glacier
     #   * {Types::GlacierJobDescription#retrieval_byte_range #retrieval_byte_range} => String
     #   * {Types::GlacierJobDescription#tier #tier} => String
     #   * {Types::GlacierJobDescription#inventory_retrieval_parameters #inventory_retrieval_parameters} => Types::InventoryRetrievalJobDescription
+    #   * {Types::GlacierJobDescription#job_output_path #job_output_path} => String
+    #   * {Types::GlacierJobDescription#select_parameters #select_parameters} => Types::SelectParameters
+    #   * {Types::GlacierJobDescription#output_location #output_location} => Types::OutputLocation
     #
     #
     # @example Example: To get information about a previously initiated job
@@ -975,7 +978,7 @@ module Aws::Glacier
     #
     #   resp.job_id #=> String
     #   resp.job_description #=> String
-    #   resp.action #=> String, one of "ArchiveRetrieval", "InventoryRetrieval"
+    #   resp.action #=> String, one of "ArchiveRetrieval", "InventoryRetrieval", "Select"
     #   resp.archive_id #=> String
     #   resp.vault_arn #=> String
     #   resp.creation_date #=> Time
@@ -995,6 +998,38 @@ module Aws::Glacier
     #   resp.inventory_retrieval_parameters.end_date #=> Time
     #   resp.inventory_retrieval_parameters.limit #=> String
     #   resp.inventory_retrieval_parameters.marker #=> String
+    #   resp.job_output_path #=> String
+    #   resp.select_parameters.input_serialization.csv.file_header_info #=> String, one of "USE", "IGNORE", "NONE"
+    #   resp.select_parameters.input_serialization.csv.comments #=> String
+    #   resp.select_parameters.input_serialization.csv.quote_escape_character #=> String
+    #   resp.select_parameters.input_serialization.csv.record_delimiter #=> String
+    #   resp.select_parameters.input_serialization.csv.field_delimiter #=> String
+    #   resp.select_parameters.input_serialization.csv.quote_character #=> String
+    #   resp.select_parameters.expression_type #=> String, one of "SQL"
+    #   resp.select_parameters.expression #=> String
+    #   resp.select_parameters.output_serialization.csv.quote_fields #=> String, one of "ALWAYS", "ASNEEDED"
+    #   resp.select_parameters.output_serialization.csv.quote_escape_character #=> String
+    #   resp.select_parameters.output_serialization.csv.record_delimiter #=> String
+    #   resp.select_parameters.output_serialization.csv.field_delimiter #=> String
+    #   resp.select_parameters.output_serialization.csv.quote_character #=> String
+    #   resp.output_location.s3.bucket_name #=> String
+    #   resp.output_location.s3.prefix #=> String
+    #   resp.output_location.s3.encryption.encryption_type #=> String, one of "aws:kms", "AES256"
+    #   resp.output_location.s3.encryption.kms_key_id #=> String
+    #   resp.output_location.s3.encryption.kms_context #=> String
+    #   resp.output_location.s3.canned_acl #=> String, one of "private", "public-read", "public-read-write", "aws-exec-read", "authenticated-read", "bucket-owner-read", "bucket-owner-full-control"
+    #   resp.output_location.s3.access_control_list #=> Array
+    #   resp.output_location.s3.access_control_list[0].grantee.type #=> String, one of "AmazonCustomerByEmail", "CanonicalUser", "Group"
+    #   resp.output_location.s3.access_control_list[0].grantee.display_name #=> String
+    #   resp.output_location.s3.access_control_list[0].grantee.uri #=> String
+    #   resp.output_location.s3.access_control_list[0].grantee.id #=> String
+    #   resp.output_location.s3.access_control_list[0].grantee.email_address #=> String
+    #   resp.output_location.s3.access_control_list[0].permission #=> String, one of "FULL_CONTROL", "WRITE", "WRITE_ACP", "READ", "READ_ACP"
+    #   resp.output_location.s3.tagging #=> Hash
+    #   resp.output_location.s3.tagging["string"] #=> String
+    #   resp.output_location.s3.user_metadata #=> Hash
+    #   resp.output_location.s3.user_metadata["string"] #=> String
+    #   resp.output_location.s3.storage_class #=> String, one of "STANDARD", "REDUCED_REDUNDANCY", "STANDARD_IA"
     #
     # @overload describe_job(params = {})
     # @param [Hash] params ({})
@@ -1541,164 +1576,14 @@ module Aws::Glacier
       req.send_request(options)
     end
 
-    # This operation initiates a job of the specified type. In this release,
-    # you can initiate a job to retrieve either an archive or a vault
-    # inventory (a list of archives in a vault).
+    # This operation initiates a job of the specified type, which can be a
+    # select, an archival retrieval, or a vault retrieval. For more
+    # information about using this operation, see the documentation for the
+    # underlying REST API [Initiate a Job][1].
     #
-    # Retrieving data from Amazon Glacier is a two-step process:
     #
-    # 1.  Initiate a retrieval job.
     #
-    #     <note markdown="1"> A data retrieval policy can cause your initiate retrieval job
-    #     request to fail with a PolicyEnforcedException exception. For more
-    #     information about data retrieval policies, see [Amazon Glacier
-    #     Data Retrieval Policies][1]. For more information about the
-    #     PolicyEnforcedException exception, see [Error Responses][2].
-    #
-    #      </note>
-    #
-    # 2.  After the job completes, download the bytes.
-    #
-    # The retrieval request is executed asynchronously. When you initiate a
-    # retrieval job, Amazon Glacier creates a job and returns a job ID in
-    # the response. When Amazon Glacier completes the job, you can get the
-    # job output (archive or inventory data). For information about getting
-    # job output, see GetJobOutput operation.
-    #
-    # The job must complete before you can get its output. To determine when
-    # a job is complete, you have the following options:
-    #
-    # * **Use Amazon SNS Notification** You can specify an Amazon Simple
-    #   Notification Service (Amazon SNS) topic to which Amazon Glacier can
-    #   post a notification after the job is completed. You can specify an
-    #   SNS topic per job request. The notification is sent only after
-    #   Amazon Glacier completes the job. In addition to specifying an SNS
-    #   topic per job request, you can configure vault notifications for a
-    #   vault so that job notifications are always sent. For more
-    #   information, see SetVaultNotifications.
-    #
-    # * **Get job details** You can make a DescribeJob request to obtain job
-    #   status information while a job is in progress. However, it is more
-    #   efficient to use an Amazon SNS notification to determine when a job
-    #   is complete.
-    #
-    # <note markdown="1"> The information you get via notification is same that you get by
-    # calling DescribeJob.
-    #
-    #  </note>
-    #
-    # If for a specific event, you add both the notification configuration
-    # on the vault and also specify an SNS topic in your initiate job
-    # request, Amazon Glacier sends both notifications. For more
-    # information, see SetVaultNotifications.
-    #
-    # An AWS account has full permission to perform all operations
-    # (actions). However, AWS Identity and Access Management (IAM) users
-    # don't have any permissions by default. You must grant them explicit
-    # permission to perform specific actions. For more information, see
-    # [Access Control Using AWS Identity and Access Management (IAM)][3].
-    #
-    # **About the Vault Inventory**
-    #
-    # Amazon Glacier prepares an inventory for each vault periodically,
-    # every 24 hours. When you initiate a job for a vault inventory, Amazon
-    # Glacier returns the last inventory for the vault. The inventory data
-    # you get might be up to a day or two days old. Also, the initiate
-    # inventory job might take some time to complete before you can download
-    # the vault inventory. So you do not want to retrieve a vault inventory
-    # for each vault operation. However, in some scenarios, you might find
-    # the vault inventory useful. For example, when you upload an archive,
-    # you can provide an archive description but not an archive name. Amazon
-    # Glacier provides you a unique archive ID, an opaque string of
-    # characters. So, you might maintain your own database that maps archive
-    # names to their corresponding Amazon Glacier assigned archive IDs. You
-    # might find the vault inventory useful in the event you need to
-    # reconcile information in your database with the actual vault
-    # inventory.
-    #
-    # **Range Inventory Retrieval**
-    #
-    # You can limit the number of inventory items retrieved by filtering on
-    # the archive creation date or by setting a limit.
-    #
-    # *Filtering by Archive Creation Date*
-    #
-    # You can retrieve inventory items for archives created between
-    # `StartDate` and `EndDate` by specifying values for these parameters in
-    # the **InitiateJob** request. Archives created on or after the
-    # `StartDate` and before the `EndDate` will be returned. If you only
-    # provide the `StartDate` without the `EndDate`, you will retrieve the
-    # inventory for all archives created on or after the `StartDate`. If you
-    # only provide the `EndDate` without the `StartDate`, you will get back
-    # the inventory for all archives created before the `EndDate`.
-    #
-    # *Limiting Inventory Items per Retrieval*
-    #
-    # You can limit the number of inventory items returned by setting the
-    # `Limit` parameter in the **InitiateJob** request. The inventory job
-    # output will contain inventory items up to the specified `Limit`. If
-    # there are more inventory items available, the result is paginated.
-    # After a job is complete you can use the DescribeJob operation to get a
-    # marker that you use in a subsequent **InitiateJob** request. The
-    # marker will indicate the starting point to retrieve the next set of
-    # inventory items. You can page through your entire inventory by
-    # repeatedly making **InitiateJob** requests with the marker from the
-    # previous **DescribeJob** output, until you get a marker from
-    # **DescribeJob** that returns null, indicating that there are no more
-    # inventory items available.
-    #
-    # You can use the `Limit` parameter together with the date range
-    # parameters.
-    #
-    # **About Ranged Archive Retrieval**
-    #
-    # You can initiate an archive retrieval for the whole archive or a range
-    # of the archive. In the case of ranged archive retrieval, you specify a
-    # byte range to return or the whole archive. The range specified must be
-    # megabyte (MB) aligned, that is the range start value must be divisible
-    # by 1 MB and range end value plus 1 must be divisible by 1 MB or equal
-    # the end of the archive. If the ranged archive retrieval is not
-    # megabyte aligned, this operation returns a 400 response. Furthermore,
-    # to ensure you get checksum values for data you download using Get Job
-    # Output API, the range must be tree hash aligned.
-    #
-    # An AWS account has full permission to perform all operations
-    # (actions). However, AWS Identity and Access Management (IAM) users
-    # don't have any permissions by default. You must grant them explicit
-    # permission to perform specific actions. For more information, see
-    # [Access Control Using AWS Identity and Access Management (IAM)][3].
-    #
-    # For conceptual information and the underlying REST API, see [Initiate
-    # a Job][4] and [Downloading a Vault Inventory][5]
-    #
-    # **Expedited and Bulk Archive Retrievals**
-    #
-    # When retrieving an archive, you can specify one of the following
-    # options in the `Tier` field of the request body:
-    #
-    # * **Standard** The default type of retrieval, which allows access to
-    #   any of your archives within several hours. Standard retrievals
-    #   typically complete within 3–5 hours.
-    #
-    # * **Bulk** Amazon Glacier’s lowest-cost retrieval option, which
-    #   enables you to retrieve large amounts of data inexpensively in a
-    #   day. Bulk retrieval requests typically complete within 5–12 hours.
-    #
-    # * **Expedited** Amazon Glacier’s option for the fastest retrievals.
-    #   Archives requested using the expedited retrievals typically become
-    #   accessible within 1–5 minutes.
-    #
-    # For more information about expedited and bulk retrievals, see
-    # [Retrieving Amazon Glacier Archives][6].
-    #
-    #
-    #
-    # [1]: http://docs.aws.amazon.com/amazonglacier/latest/dev/data-retrieval-policy.html
-    # [2]: http://docs.aws.amazon.com/amazonglacier/latest/dev/api-error-responses.html
-    # [3]: http://docs.aws.amazon.com/amazonglacier/latest/dev/using-iam-with-amazon-glacier.html
-    # [4]: http://docs.aws.amazon.com/amazonglacier/latest/dev/api-initiate-job-post.html
-    # [5]: http://docs.aws.amazon.com/amazonglacier/latest/dev/vault-inventory.html
-    # [6]: http://docs.aws.amazon.com/amazonglacier/latest/dev/downloading-an-archive-two-steps.html
+    # [1]: http://docs.aws.amazon.com/amazonglacier/latest/dev/api-initiate-job-post.html
     #
     # @option params [required, String] :account_id
     #   The `AccountId` value is the AWS account ID of the account that owns
@@ -1718,6 +1603,7 @@ module Aws::Glacier
     #
     #   * {Types::InitiateJobOutput#location #location} => String
     #   * {Types::InitiateJobOutput#job_id #job_id} => String
+    #   * {Types::InitiateJobOutput#job_output_path #job_output_path} => String
     #
     #
     # @example Example: To initiate an inventory-retrieval job
@@ -1760,6 +1646,60 @@ module Aws::Glacier
     #         limit: "string",
     #         marker: "string",
     #       },
+    #       select_parameters: {
+    #         input_serialization: {
+    #           csv: {
+    #             file_header_info: "USE", # accepts USE, IGNORE, NONE
+    #             comments: "string",
+    #             quote_escape_character: "string",
+    #             record_delimiter: "string",
+    #             field_delimiter: "string",
+    #             quote_character: "string",
+    #           },
+    #         },
+    #         expression_type: "SQL", # accepts SQL
+    #         expression: "string",
+    #         output_serialization: {
+    #           csv: {
+    #             quote_fields: "ALWAYS", # accepts ALWAYS, ASNEEDED
+    #             quote_escape_character: "string",
+    #             record_delimiter: "string",
+    #             field_delimiter: "string",
+    #             quote_character: "string",
+    #           },
+    #         },
+    #       },
+    #       output_location: {
+    #         s3: {
+    #           bucket_name: "string",
+    #           prefix: "string",
+    #           encryption: {
+    #             encryption_type: "aws:kms", # accepts aws:kms, AES256
+    #             kms_key_id: "string",
+    #             kms_context: "string",
+    #           },
+    #           canned_acl: "private", # accepts private, public-read, public-read-write, aws-exec-read, authenticated-read, bucket-owner-read, bucket-owner-full-control
+    #           access_control_list: [
+    #             {
+    #               grantee: {
+    #                 type: "AmazonCustomerByEmail", # required, accepts AmazonCustomerByEmail, CanonicalUser, Group
+    #                 display_name: "string",
+    #                 uri: "string",
+    #                 id: "string",
+    #                 email_address: "string",
+    #               },
+    #               permission: "FULL_CONTROL", # accepts FULL_CONTROL, WRITE, WRITE_ACP, READ, READ_ACP
+    #             },
+    #           ],
+    #           tagging: {
+    #             "string" => "string",
+    #           },
+    #           user_metadata: {
+    #             "string" => "string",
+    #           },
+    #           storage_class: "STANDARD", # accepts STANDARD, REDUCED_REDUNDANCY, STANDARD_IA
+    #         },
+    #       },
     #     },
     #   })
     #
@@ -1767,6 +1707,7 @@ module Aws::Glacier
     #
     #   resp.location #=> String
     #   resp.job_id #=> String
+    #   resp.job_output_path #=> String
     #
     # @overload initiate_job(params = {})
     # @param [Hash] params ({})
@@ -1987,7 +1928,8 @@ module Aws::Glacier
     end
 
     # This operation lists jobs for a vault, including jobs that are
-    # in-progress and jobs that have recently finished.
+    # in-progress and jobs that have recently finished. The List Job
+    # operation returns a list of these jobs sorted by job initiation time.
     #
     # <note markdown="1"> Amazon Glacier retains recently completed jobs for a period before
     # deleting them; however, it eventually removes completed jobs. The
@@ -2002,13 +1944,6 @@ module Aws::Glacier
     #
     #  </note>
     #
-    # To retrieve an archive or retrieve a vault inventory from Amazon
-    # Glacier, you first initiate a job, and after the job completes, you
-    # download the data. For an archive retrieval, the output is the archive
-    # data. For an inventory retrieval, it is the inventory list. The List
-    # Job operation returns a list of these jobs sorted by job initiation
-    # time.
-    #
     # The List Jobs operation supports pagination. You should always check
     # the response `Marker` field. If there are no more jobs to list, the
     # `Marker` field is set to `null`. If there are more jobs to list, the
@@ -2031,7 +1966,8 @@ module Aws::Glacier
     # that were completed (`true`) or jobs that were not completed
     # (`false`).
     #
-    # For the underlying REST API, see [List Jobs][1].
+    # For more information about using this operation, see the documentation
+    # for the underlying REST API [List Jobs][1].
     #
     #
     #
@@ -2130,7 +2066,7 @@ module Aws::Glacier
     #   resp.job_list #=> Array
     #   resp.job_list[0].job_id #=> String
     #   resp.job_list[0].job_description #=> String
-    #   resp.job_list[0].action #=> String, one of "ArchiveRetrieval", "InventoryRetrieval"
+    #   resp.job_list[0].action #=> String, one of "ArchiveRetrieval", "InventoryRetrieval", "Select"
     #   resp.job_list[0].archive_id #=> String
     #   resp.job_list[0].vault_arn #=> String
     #   resp.job_list[0].creation_date #=> Time
@@ -2150,6 +2086,38 @@ module Aws::Glacier
     #   resp.job_list[0].inventory_retrieval_parameters.end_date #=> Time
     #   resp.job_list[0].inventory_retrieval_parameters.limit #=> String
     #   resp.job_list[0].inventory_retrieval_parameters.marker #=> String
+    #   resp.job_list[0].job_output_path #=> String
+    #   resp.job_list[0].select_parameters.input_serialization.csv.file_header_info #=> String, one of "USE", "IGNORE", "NONE"
+    #   resp.job_list[0].select_parameters.input_serialization.csv.comments #=> String
+    #   resp.job_list[0].select_parameters.input_serialization.csv.quote_escape_character #=> String
+    #   resp.job_list[0].select_parameters.input_serialization.csv.record_delimiter #=> String
+    #   resp.job_list[0].select_parameters.input_serialization.csv.field_delimiter #=> String
+    #   resp.job_list[0].select_parameters.input_serialization.csv.quote_character #=> String
+    #   resp.job_list[0].select_parameters.expression_type #=> String, one of "SQL"
+    #   resp.job_list[0].select_parameters.expression #=> String
+    #   resp.job_list[0].select_parameters.output_serialization.csv.quote_fields #=> String, one of "ALWAYS", "ASNEEDED"
+    #   resp.job_list[0].select_parameters.output_serialization.csv.quote_escape_character #=> String
+    #   resp.job_list[0].select_parameters.output_serialization.csv.record_delimiter #=> String
+    #   resp.job_list[0].select_parameters.output_serialization.csv.field_delimiter #=> String
+    #   resp.job_list[0].select_parameters.output_serialization.csv.quote_character #=> String
+    #   resp.job_list[0].output_location.s3.bucket_name #=> String
+    #   resp.job_list[0].output_location.s3.prefix #=> String
+    #   resp.job_list[0].output_location.s3.encryption.encryption_type #=> String, one of "aws:kms", "AES256"
+    #   resp.job_list[0].output_location.s3.encryption.kms_key_id #=> String
+    #   resp.job_list[0].output_location.s3.encryption.kms_context #=> String
+    #   resp.job_list[0].output_location.s3.canned_acl #=> String, one of "private", "public-read", "public-read-write", "aws-exec-read", "authenticated-read", "bucket-owner-read", "bucket-owner-full-control"
+    #   resp.job_list[0].output_location.s3.access_control_list #=> Array
+    #   resp.job_list[0].output_location.s3.access_control_list[0].grantee.type #=> String, one of "AmazonCustomerByEmail", "CanonicalUser", "Group"
+    #   resp.job_list[0].output_location.s3.access_control_list[0].grantee.display_name #=> String
+    #   resp.job_list[0].output_location.s3.access_control_list[0].grantee.uri #=> String
+    #   resp.job_list[0].output_location.s3.access_control_list[0].grantee.id #=> String
+    #   resp.job_list[0].output_location.s3.access_control_list[0].grantee.email_address #=> String
+    #   resp.job_list[0].output_location.s3.access_control_list[0].permission #=> String, one of "FULL_CONTROL", "WRITE", "WRITE_ACP", "READ", "READ_ACP"
+    #   resp.job_list[0].output_location.s3.tagging #=> Hash
+    #   resp.job_list[0].output_location.s3.tagging["string"] #=> String
+    #   resp.job_list[0].output_location.s3.user_metadata #=> Hash
+    #   resp.job_list[0].output_location.s3.user_metadata["string"] #=> String
+    #   resp.job_list[0].output_location.s3.storage_class #=> String, one of "STANDARD", "REDUCED_REDUNDANCY", "STANDARD_IA"
     #   resp.marker #=> String
     #
     # @overload list_jobs(params = {})
@@ -2417,16 +2385,15 @@ module Aws::Glacier
       req.send_request(options)
     end
 
-    # This operation lists the provisioned capacity for the specified AWS
-    # account.
+    # This operation lists the provisioned capacity units for the specified
+    # AWS account.
     #
     # @option params [required, String] :account_id
-    #   The `AccountId` value is the AWS account ID of the account that owns
-    #   the vault. You can either specify an AWS account ID or optionally a
-    #   single '-' (hyphen), in which case Amazon Glacier uses the AWS
-    #   account ID associated with the credentials used to sign the request.
-    #   If you use an account ID, don't include any hyphens ('-') in the
-    #   ID.
+    #   The AWS account ID of the account that owns the vault. You can either
+    #   specify an AWS account ID or optionally a single '-' (hyphen), in
+    #   which case Amazon Glacier uses the AWS account ID associated with the
+    #   credentials used to sign the request. If you use an account ID, don't
+    #   include any hyphens ('-') in the ID.
     #
     # @return [Types::ListProvisionedCapacityOutput] Returns a {Seahorse::Client::Response response} object which responds to the following methods:
     #
@@ -3213,7 +3180,7 @@ module Aws::Glacier
         params: params,
         config: config)
       context[:gem_name] = 'aws-sdk-glacier'
-      context[:gem_version] = '1.4.0'
+      context[:gem_version] = '1.5.0'
       Seahorse::Client::Request.new(handlers, context)
     end
 

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

@@ -13,9 +13,13 @@ module Aws::Glacier
 
     AbortMultipartUploadInput = Shapes::StructureShape.new(name: 'AbortMultipartUploadInput')
     AbortVaultLockInput = Shapes::StructureShape.new(name: 'AbortVaultLockInput')
+    AccessControlPolicyList = Shapes::ListShape.new(name: 'AccessControlPolicyList')
     ActionCode = Shapes::StringShape.new(name: 'ActionCode')
     AddTagsToVaultInput = Shapes::StructureShape.new(name: 'AddTagsToVaultInput')
     ArchiveCreationOutput = Shapes::StructureShape.new(name: 'ArchiveCreationOutput')
+    CSVInput = Shapes::StructureShape.new(name: 'CSVInput')
+    CSVOutput = Shapes::StructureShape.new(name: 'CSVOutput')
+    CannedACL = Shapes::StringShape.new(name: 'CannedACL')
     CompleteMultipartUploadInput = Shapes::StructureShape.new(name: 'CompleteMultipartUploadInput')
     CompleteVaultLockInput = Shapes::StructureShape.new(name: 'CompleteVaultLockInput')
     CreateVaultInput = Shapes::StructureShape.new(name: 'CreateVaultInput')
@@ -31,6 +35,10 @@ module Aws::Glacier
     DescribeJobInput = Shapes::StructureShape.new(name: 'DescribeJobInput')
     DescribeVaultInput = Shapes::StructureShape.new(name: 'DescribeVaultInput')
     DescribeVaultOutput = Shapes::StructureShape.new(name: 'DescribeVaultOutput')
+    Encryption = Shapes::StructureShape.new(name: 'Encryption')
+    EncryptionType = Shapes::StringShape.new(name: 'EncryptionType')
+    ExpressionType = Shapes::StringShape.new(name: 'ExpressionType')
+    FileHeaderInfo = Shapes::StringShape.new(name: 'FileHeaderInfo')
     GetDataRetrievalPolicyInput = Shapes::StructureShape.new(name: 'GetDataRetrievalPolicyInput')
     GetDataRetrievalPolicyOutput = Shapes::StructureShape.new(name: 'GetDataRetrievalPolicyOutput')
     GetJobOutputInput = Shapes::StructureShape.new(name: 'GetJobOutputInput')
@@ -42,12 +50,15 @@ module Aws::Glacier
     GetVaultNotificationsInput = Shapes::StructureShape.new(name: 'GetVaultNotificationsInput')
     GetVaultNotificationsOutput = Shapes::StructureShape.new(name: 'GetVaultNotificationsOutput')
     GlacierJobDescription = Shapes::StructureShape.new(name: 'GlacierJobDescription')
+    Grant = Shapes::StructureShape.new(name: 'Grant')
+    Grantee = Shapes::StructureShape.new(name: 'Grantee')
     InitiateJobInput = Shapes::StructureShape.new(name: 'InitiateJobInput')
     InitiateJobOutput = Shapes::StructureShape.new(name: 'InitiateJobOutput')
     InitiateMultipartUploadInput = Shapes::StructureShape.new(name: 'InitiateMultipartUploadInput')
     InitiateMultipartUploadOutput = Shapes::StructureShape.new(name: 'InitiateMultipartUploadOutput')
     InitiateVaultLockInput = Shapes::StructureShape.new(name: 'InitiateVaultLockInput')
     InitiateVaultLockOutput = Shapes::StructureShape.new(name: 'InitiateVaultLockOutput')
+    InputSerialization = Shapes::StructureShape.new(name: 'InputSerialization')
     InsufficientCapacityException = Shapes::StructureShape.new(name: 'InsufficientCapacityException')
     InvalidParameterValueException = Shapes::StructureShape.new(name: 'InvalidParameterValueException')
     InventoryRetrievalJobDescription = Shapes::StructureShape.new(name: 'InventoryRetrievalJobDescription')
@@ -70,28 +81,36 @@ module Aws::Glacier
     MissingParameterValueException = Shapes::StructureShape.new(name: 'MissingParameterValueException')
     NotificationEventList = Shapes::ListShape.new(name: 'NotificationEventList')
     NullableLong = Shapes::IntegerShape.new(name: 'NullableLong')
+    OutputLocation = Shapes::StructureShape.new(name: 'OutputLocation')
+    OutputSerialization = Shapes::StructureShape.new(name: 'OutputSerialization')
     PartList = Shapes::ListShape.new(name: 'PartList')
     PartListElement = Shapes::StructureShape.new(name: 'PartListElement')
+    Permission = Shapes::StringShape.new(name: 'Permission')
     PolicyEnforcedException = Shapes::StructureShape.new(name: 'PolicyEnforcedException')
     ProvisionedCapacityDescription = Shapes::StructureShape.new(name: 'ProvisionedCapacityDescription')
     ProvisionedCapacityList = Shapes::ListShape.new(name: 'ProvisionedCapacityList')
     PurchaseProvisionedCapacityInput = Shapes::StructureShape.new(name: 'PurchaseProvisionedCapacityInput')
     PurchaseProvisionedCapacityOutput = Shapes::StructureShape.new(name: 'PurchaseProvisionedCapacityOutput')
+    QuoteFields = Shapes::StringShape.new(name: 'QuoteFields')
     RemoveTagsFromVaultInput = Shapes::StructureShape.new(name: 'RemoveTagsFromVaultInput')
     RequestTimeoutException = Shapes::StructureShape.new(name: 'RequestTimeoutException')
     ResourceNotFoundException = Shapes::StructureShape.new(name: 'ResourceNotFoundException')
+    S3Location = Shapes::StructureShape.new(name: 'S3Location')
+    SelectParameters = Shapes::StructureShape.new(name: 'SelectParameters')
     ServiceUnavailableException = Shapes::StructureShape.new(name: 'ServiceUnavailableException')
     SetDataRetrievalPolicyInput = Shapes::StructureShape.new(name: 'SetDataRetrievalPolicyInput')
     SetVaultAccessPolicyInput = Shapes::StructureShape.new(name: 'SetVaultAccessPolicyInput')
     SetVaultNotificationsInput = Shapes::StructureShape.new(name: 'SetVaultNotificationsInput')
     Size = Shapes::IntegerShape.new(name: 'Size')
     StatusCode = Shapes::StringShape.new(name: 'StatusCode')
+    StorageClass = Shapes::StringShape.new(name: 'StorageClass')
     Stream = Shapes::BlobShape.new(name: 'Stream')
     TagKey = Shapes::StringShape.new(name: 'TagKey')
     TagKeyList = Shapes::ListShape.new(name: 'TagKeyList')
     TagMap = Shapes::MapShape.new(name: 'TagMap')
     TagValue = Shapes::StringShape.new(name: 'TagValue')
     Timestamp = Shapes::TimestampShape.new(name: 'Timestamp', timestampFormat: "iso8601")
+    Type = Shapes::StringShape.new(name: 'Type')
     UploadArchiveInput = Shapes::StructureShape.new(name: 'UploadArchiveInput')
     UploadListElement = Shapes::StructureShape.new(name: 'UploadListElement')
     UploadMultipartPartInput = Shapes::StructureShape.new(name: 'UploadMultipartPartInput')
@@ -102,6 +121,7 @@ module Aws::Glacier
     VaultLockPolicy = Shapes::StructureShape.new(name: 'VaultLockPolicy')
     VaultNotificationConfig = Shapes::StructureShape.new(name: 'VaultNotificationConfig')
     boolean = Shapes::BooleanShape.new(name: 'boolean')
+    hashmap = Shapes::MapShape.new(name: 'hashmap')
     httpstatus = Shapes::IntegerShape.new(name: 'httpstatus')
     long = Shapes::IntegerShape.new(name: 'long')
     string = Shapes::StringShape.new(name: 'string')
@@ -115,6 +135,8 @@ module Aws::Glacier
     AbortVaultLockInput.add_member(:vault_name, Shapes::ShapeRef.new(shape: string, required: true, location: "uri", location_name: "vaultName"))
     AbortVaultLockInput.struct_class = Types::AbortVaultLockInput
 
+    AccessControlPolicyList.member = Shapes::ShapeRef.new(shape: Grant)
+
     AddTagsToVaultInput.add_member(:account_id, Shapes::ShapeRef.new(shape: string, required: true, location: "uri", location_name: "accountId"))
     AddTagsToVaultInput.add_member(:vault_name, Shapes::ShapeRef.new(shape: string, required: true, location: "uri", location_name: "vaultName"))
     AddTagsToVaultInput.add_member(:tags, Shapes::ShapeRef.new(shape: TagMap, location_name: "Tags"))
@@ -125,6 +147,21 @@ module Aws::Glacier
     ArchiveCreationOutput.add_member(:archive_id, Shapes::ShapeRef.new(shape: string, location: "header", location_name: "x-amz-archive-id"))
     ArchiveCreationOutput.struct_class = Types::ArchiveCreationOutput
 
+    CSVInput.add_member(:file_header_info, Shapes::ShapeRef.new(shape: FileHeaderInfo, location_name: "FileHeaderInfo"))
+    CSVInput.add_member(:comments, Shapes::ShapeRef.new(shape: string, location_name: "Comments"))
+    CSVInput.add_member(:quote_escape_character, Shapes::ShapeRef.new(shape: string, location_name: "QuoteEscapeCharacter"))
+    CSVInput.add_member(:record_delimiter, Shapes::ShapeRef.new(shape: string, location_name: "RecordDelimiter"))
+    CSVInput.add_member(:field_delimiter, Shapes::ShapeRef.new(shape: string, location_name: "FieldDelimiter"))
+    CSVInput.add_member(:quote_character, Shapes::ShapeRef.new(shape: string, 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: string, location_name: "QuoteEscapeCharacter"))
+    CSVOutput.add_member(:record_delimiter, Shapes::ShapeRef.new(shape: string, location_name: "RecordDelimiter"))
+    CSVOutput.add_member(:field_delimiter, Shapes::ShapeRef.new(shape: string, location_name: "FieldDelimiter"))
+    CSVOutput.add_member(:quote_character, Shapes::ShapeRef.new(shape: string, location_name: "QuoteCharacter"))
+    CSVOutput.struct_class = Types::CSVOutput
+
     CompleteMultipartUploadInput.add_member(:account_id, Shapes::ShapeRef.new(shape: string, required: true, location: "uri", location_name: "accountId"))
     CompleteMultipartUploadInput.add_member(:vault_name, Shapes::ShapeRef.new(shape: string, required: true, location: "uri", location_name: "vaultName"))
     CompleteMultipartUploadInput.add_member(:upload_id, Shapes::ShapeRef.new(shape: string, required: true, location: "uri", location_name: "uploadId"))
@@ -187,6 +224,11 @@ module Aws::Glacier
     DescribeVaultOutput.add_member(:size_in_bytes, Shapes::ShapeRef.new(shape: long, location_name: "SizeInBytes"))
     DescribeVaultOutput.struct_class = Types::DescribeVaultOutput
 
+    Encryption.add_member(:encryption_type, Shapes::ShapeRef.new(shape: EncryptionType, location_name: "EncryptionType"))
+    Encryption.add_member(:kms_key_id, Shapes::ShapeRef.new(shape: string, location_name: "KMSKeyId"))
+    Encryption.add_member(:kms_context, Shapes::ShapeRef.new(shape: string, location_name: "KMSContext"))
+    Encryption.struct_class = Types::Encryption
+
     GetDataRetrievalPolicyInput.add_member(:account_id, Shapes::ShapeRef.new(shape: string, required: true, location: "uri", location_name: "accountId"))
     GetDataRetrievalPolicyInput.struct_class = Types::GetDataRetrievalPolicyInput
 
@@ -256,8 +298,22 @@ module Aws::Glacier
     GlacierJobDescription.add_member(:retrieval_byte_range, Shapes::ShapeRef.new(shape: string, location_name: "RetrievalByteRange"))
     GlacierJobDescription.add_member(:tier, Shapes::ShapeRef.new(shape: string, location_name: "Tier"))
     GlacierJobDescription.add_member(:inventory_retrieval_parameters, Shapes::ShapeRef.new(shape: InventoryRetrievalJobDescription, location_name: "InventoryRetrievalParameters"))
+    GlacierJobDescription.add_member(:job_output_path, Shapes::ShapeRef.new(shape: string, location_name: "JobOutputPath"))
+    GlacierJobDescription.add_member(:select_parameters, Shapes::ShapeRef.new(shape: SelectParameters, location_name: "SelectParameters"))
+    GlacierJobDescription.add_member(:output_location, Shapes::ShapeRef.new(shape: OutputLocation, location_name: "OutputLocation"))
     GlacierJobDescription.struct_class = Types::GlacierJobDescription
 
+    Grant.add_member(:grantee, Shapes::ShapeRef.new(shape: Grantee, location_name: "Grantee"))
+    Grant.add_member(:permission, Shapes::ShapeRef.new(shape: Permission, location_name: "Permission"))
+    Grant.struct_class = Types::Grant
+
+    Grantee.add_member(:type, Shapes::ShapeRef.new(shape: Type, required: true, location_name: "Type"))
+    Grantee.add_member(:display_name, Shapes::ShapeRef.new(shape: string, location_name: "DisplayName"))
+    Grantee.add_member(:uri, Shapes::ShapeRef.new(shape: string, location_name: "URI"))
+    Grantee.add_member(:id, Shapes::ShapeRef.new(shape: string, location_name: "ID"))
+    Grantee.add_member(:email_address, Shapes::ShapeRef.new(shape: string, location_name: "EmailAddress"))
+    Grantee.struct_class = Types::Grantee
+
     InitiateJobInput.add_member(:account_id, Shapes::ShapeRef.new(shape: string, required: true, location: "uri", location_name: "accountId"))
     InitiateJobInput.add_member(:vault_name, Shapes::ShapeRef.new(shape: string, required: true, location: "uri", location_name: "vaultName"))
     InitiateJobInput.add_member(:job_parameters, Shapes::ShapeRef.new(shape: JobParameters, location_name: "jobParameters"))
@@ -267,6 +323,7 @@ module Aws::Glacier
 
     InitiateJobOutput.add_member(:location, Shapes::ShapeRef.new(shape: string, location: "header", location_name: "Location"))
     InitiateJobOutput.add_member(:job_id, Shapes::ShapeRef.new(shape: string, location: "header", location_name: "x-amz-job-id"))
+    InitiateJobOutput.add_member(:job_output_path, Shapes::ShapeRef.new(shape: string, location: "header", location_name: "x-amz-job-output-path"))
     InitiateJobOutput.struct_class = Types::InitiateJobOutput
 
     InitiateMultipartUploadInput.add_member(:account_id, Shapes::ShapeRef.new(shape: string, required: true, location: "uri", location_name: "accountId"))
@@ -289,6 +346,9 @@ module Aws::Glacier
     InitiateVaultLockOutput.add_member(:lock_id, Shapes::ShapeRef.new(shape: string, location: "header", location_name: "x-amz-lock-id"))
     InitiateVaultLockOutput.struct_class = Types::InitiateVaultLockOutput
 
+    InputSerialization.add_member(:csv, Shapes::ShapeRef.new(shape: CSVInput, location_name: "csv"))
+    InputSerialization.struct_class = Types::InputSerialization
+
     InventoryRetrievalJobDescription.add_member(:format, Shapes::ShapeRef.new(shape: string, location_name: "Format"))
     InventoryRetrievalJobDescription.add_member(:start_date, Shapes::ShapeRef.new(shape: Timestamp, location_name: "StartDate"))
     InventoryRetrievalJobDescription.add_member(:end_date, Shapes::ShapeRef.new(shape: Timestamp, location_name: "EndDate"))
@@ -312,6 +372,8 @@ module Aws::Glacier
     JobParameters.add_member(:retrieval_byte_range, Shapes::ShapeRef.new(shape: string, location_name: "RetrievalByteRange"))
     JobParameters.add_member(:tier, Shapes::ShapeRef.new(shape: string, location_name: "Tier"))
     JobParameters.add_member(:inventory_retrieval_parameters, Shapes::ShapeRef.new(shape: InventoryRetrievalJobInput, location_name: "InventoryRetrievalParameters"))
+    JobParameters.add_member(:select_parameters, Shapes::ShapeRef.new(shape: SelectParameters, location_name: "SelectParameters"))
+    JobParameters.add_member(:output_location, Shapes::ShapeRef.new(shape: OutputLocation, location_name: "OutputLocation"))
     JobParameters.struct_class = Types::JobParameters
 
     ListJobsInput.add_member(:account_id, Shapes::ShapeRef.new(shape: string, required: true, location: "uri", location_name: "accountId"))
@@ -376,6 +438,12 @@ module Aws::Glacier
 
     NotificationEventList.member = Shapes::ShapeRef.new(shape: string)
 
+    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
+
     PartList.member = Shapes::ShapeRef.new(shape: PartListElement)
 
     PartListElement.add_member(:range_in_bytes, Shapes::ShapeRef.new(shape: string, location_name: "RangeInBytes"))
@@ -400,6 +468,22 @@ module Aws::Glacier
     RemoveTagsFromVaultInput.add_member(:tag_keys, Shapes::ShapeRef.new(shape: TagKeyList, location_name: "TagKeys"))
     RemoveTagsFromVaultInput.struct_class = Types::RemoveTagsFromVaultInput
 
+    S3Location.add_member(:bucket_name, Shapes::ShapeRef.new(shape: string, location_name: "BucketName"))
+    S3Location.add_member(:prefix, Shapes::ShapeRef.new(shape: string, location_name: "Prefix"))
+    S3Location.add_member(:encryption, Shapes::ShapeRef.new(shape: Encryption, location_name: "Encryption"))
+    S3Location.add_member(:canned_acl, Shapes::ShapeRef.new(shape: CannedACL, location_name: "CannedACL"))
+    S3Location.add_member(:access_control_list, Shapes::ShapeRef.new(shape: AccessControlPolicyList, location_name: "AccessControlList"))
+    S3Location.add_member(:tagging, Shapes::ShapeRef.new(shape: hashmap, location_name: "Tagging"))
+    S3Location.add_member(:user_metadata, Shapes::ShapeRef.new(shape: hashmap, location_name: "UserMetadata"))
+    S3Location.add_member(:storage_class, Shapes::ShapeRef.new(shape: StorageClass, location_name: "StorageClass"))
+    S3Location.struct_class = Types::S3Location
+
+    SelectParameters.add_member(:input_serialization, Shapes::ShapeRef.new(shape: InputSerialization, location_name: "InputSerialization"))
+    SelectParameters.add_member(:expression_type, Shapes::ShapeRef.new(shape: ExpressionType, location_name: "ExpressionType"))
+    SelectParameters.add_member(:expression, Shapes::ShapeRef.new(shape: string, location_name: "Expression"))
+    SelectParameters.add_member(:output_serialization, Shapes::ShapeRef.new(shape: OutputSerialization, location_name: "OutputSerialization"))
+    SelectParameters.struct_class = Types::SelectParameters
+
     SetDataRetrievalPolicyInput.add_member(:account_id, Shapes::ShapeRef.new(shape: string, required: true, location: "uri", location_name: "accountId"))
     SetDataRetrievalPolicyInput.add_member(:policy, Shapes::ShapeRef.new(shape: DataRetrievalPolicy, location_name: "Policy"))
     SetDataRetrievalPolicyInput.struct_class = Types::SetDataRetrievalPolicyInput
@@ -466,6 +550,9 @@ module Aws::Glacier
     VaultNotificationConfig.add_member(:events, Shapes::ShapeRef.new(shape: NotificationEventList, location_name: "Events"))
     VaultNotificationConfig.struct_class = Types::VaultNotificationConfig
 
+    hashmap.key = Shapes::ShapeRef.new(shape: string)
+    hashmap.value = Shapes::ShapeRef.new(shape: string)
+
 
     # @api private
     API = Seahorse::Model::Api.new.tap do |api|