From fee8473a319dd02df916e9372245ea7699682d9c Mon Sep 17 00:00:00 2001 From: aws-sdk-python-automation Date: Fri, 27 Aug 2021 18:07:55 +0000 Subject: [PATCH 1/3] Update to latest models --- .../next-release/api-change-ec2-84869.json | 5 + .../next-release/api-change-emr-36318.json | 5 + .../next-release/api-change-s3-67046.json | 5 + botocore/data/ec2/2016-11-15/service-2.json | 9 ++ botocore/data/emr/2009-03-31/service-2.json | 116 ++++++++++++++++-- botocore/data/s3/2006-03-01/service-2.json | 8 +- 6 files changed, 133 insertions(+), 15 deletions(-) create mode 100644 .changes/next-release/api-change-ec2-84869.json create mode 100644 .changes/next-release/api-change-emr-36318.json create mode 100644 .changes/next-release/api-change-s3-67046.json diff --git a/.changes/next-release/api-change-ec2-84869.json b/.changes/next-release/api-change-ec2-84869.json new file mode 100644 index 0000000000..68a238dcb9 --- /dev/null +++ b/.changes/next-release/api-change-ec2-84869.json @@ -0,0 +1,5 @@ +{ + "type": "api-change", + "category": "``ec2``", + "description": "This release adds the BootMode flag to the ImportImage API and showing the detected BootMode of an ImportImage task." +} diff --git a/.changes/next-release/api-change-emr-36318.json b/.changes/next-release/api-change-emr-36318.json new file mode 100644 index 0000000000..858929cc07 --- /dev/null +++ b/.changes/next-release/api-change-emr-36318.json @@ -0,0 +1,5 @@ +{ + "type": "api-change", + "category": "``emr``", + "description": "Update emr client to latest version" +} diff --git a/.changes/next-release/api-change-s3-67046.json b/.changes/next-release/api-change-s3-67046.json new file mode 100644 index 0000000000..6cff11ade3 --- /dev/null +++ b/.changes/next-release/api-change-s3-67046.json @@ -0,0 +1,5 @@ +{ + "type": "api-change", + "category": "``s3``", + "description": "Documentation updates for Amazon S3." +} diff --git a/botocore/data/ec2/2016-11-15/service-2.json b/botocore/data/ec2/2016-11-15/service-2.json index dc8aa4c892..1e0f673041 100644 --- a/botocore/data/ec2/2016-11-15/service-2.json +++ b/botocore/data/ec2/2016-11-15/service-2.json @@ -24786,6 +24786,10 @@ "UsageOperation":{ "shape":"String", "documentation":"

The usage operation value. For more information, see AMI billing information fields in the Amazon Elastic Compute Cloud User Guide.

" + }, + "BootMode":{ + "shape":"BootModeValues", + "documentation":"

The boot mode of the virtual machine.

" } } }, @@ -24956,6 +24960,11 @@ "shape":"String", "documentation":"

The usage operation value.

", "locationName":"usageOperation" + }, + "BootMode":{ + "shape":"BootModeValues", + "documentation":"

The boot mode of the virtual machine.

", + "locationName":"bootMode" } }, "documentation":"

Describes an import image task.

" diff --git a/botocore/data/emr/2009-03-31/service-2.json b/botocore/data/emr/2009-03-31/service-2.json index 98f9470fa0..dfb4454950 100644 --- a/botocore/data/emr/2009-03-31/service-2.json +++ b/botocore/data/emr/2009-03-31/service-2.json @@ -260,6 +260,16 @@ ], "documentation":"

Returns details for the specified Amazon EMR Studio including ID, Name, VPC, Studio access URL, and so on.

" }, + "GetAutoTerminationPolicy":{ + "name":"GetAutoTerminationPolicy", + "http":{ + "method":"POST", + "requestUri":"/" + }, + "input":{"shape":"GetAutoTerminationPolicyInput"}, + "output":{"shape":"GetAutoTerminationPolicyOutput"}, + "documentation":"

Returns the auto-termination policy for an Amazon EMR cluster.

" + }, "GetBlockPublicAccessConfiguration":{ "name":"GetBlockPublicAccessConfiguration", "http":{ @@ -272,7 +282,7 @@ {"shape":"InternalServerException"}, {"shape":"InvalidRequestException"} ], - "documentation":"

Returns the Amazon EMR block public access configuration for your account in the current Region. For more information see Configure Block Public Access for Amazon EMR in the Amazon EMR Management Guide.

" + "documentation":"

Returns the Amazon EMR block public access configuration for your Amazon Web Services account in the current Region. For more information see Configure Block Public Access for Amazon EMR in the Amazon EMR Management Guide.

" }, "GetManagedScalingPolicy":{ "name":"GetManagedScalingPolicy", @@ -324,7 +334,7 @@ {"shape":"InternalServerException"}, {"shape":"InvalidRequestException"} ], - "documentation":"

Provides the status of all clusters visible to this account. Allows you to filter the list of clusters based on certain criteria; for example, filtering by cluster creation date and time or by status. This call returns a maximum of 50 clusters in unsorted order per call, but returns a marker to track the paging of the cluster list across multiple ListClusters calls.

" + "documentation":"

Provides the status of all clusters visible to this Amazon Web Services account. Allows you to filter the list of clusters based on certain criteria; for example, filtering by cluster creation date and time or by status. This call returns a maximum of 50 clusters in unsorted order per call, but returns a marker to track the paging of the cluster list across multiple ListClusters calls.

" }, "ListInstanceFleets":{ "name":"ListInstanceFleets", @@ -450,7 +460,7 @@ {"shape":"InternalServerException"}, {"shape":"InvalidRequestException"} ], - "documentation":"

Returns a list of all Amazon EMR Studios associated with the account. The list includes details such as ID, Studio Access URL, and creation time for each Studio.

" + "documentation":"

Returns a list of all Amazon EMR Studios associated with the Amazon Web Services account. The list includes details such as ID, Studio Access URL, and creation time for each Studio.

" }, "ModifyCluster":{ "name":"ModifyCluster", @@ -501,6 +511,16 @@ "output":{"shape":"PutAutoScalingPolicyOutput"}, "documentation":"

Creates or updates an automatic scaling policy for a core instance group or task instance group in an Amazon EMR cluster. The automatic scaling policy defines how an instance group dynamically adds and terminates EC2 instances in response to the value of a CloudWatch metric.

" }, + "PutAutoTerminationPolicy":{ + "name":"PutAutoTerminationPolicy", + "http":{ + "method":"POST", + "requestUri":"/" + }, + "input":{"shape":"PutAutoTerminationPolicyInput"}, + "output":{"shape":"PutAutoTerminationPolicyOutput"}, + "documentation":"

Creates or updates an auto-termination policy for an Amazon EMR cluster. An auto-termination policy defines the amount of idle time in seconds after which a cluster automatically terminates. For alternative cluster termination options, see Control cluster termination.

" + }, "PutBlockPublicAccessConfiguration":{ "name":"PutBlockPublicAccessConfiguration", "http":{ @@ -513,7 +533,7 @@ {"shape":"InternalServerException"}, {"shape":"InvalidRequestException"} ], - "documentation":"

Creates or updates an Amazon EMR block public access configuration for your account in the current Region. For more information see Configure Block Public Access for Amazon EMR in the Amazon EMR Management Guide.

" + "documentation":"

Creates or updates an Amazon EMR block public access configuration for your Amazon Web Services account in the current Region. For more information see Configure Block Public Access for Amazon EMR in the Amazon EMR Management Guide.

" }, "PutManagedScalingPolicy":{ "name":"PutManagedScalingPolicy", @@ -535,6 +555,16 @@ "output":{"shape":"RemoveAutoScalingPolicyOutput"}, "documentation":"

Removes an automatic scaling policy from a specified instance group within an EMR cluster.

" }, + "RemoveAutoTerminationPolicy":{ + "name":"RemoveAutoTerminationPolicy", + "http":{ + "method":"POST", + "requestUri":"/" + }, + "input":{"shape":"RemoveAutoTerminationPolicyInput"}, + "output":{"shape":"RemoveAutoTerminationPolicyOutput"}, + "documentation":"

Removes an auto-termination policy from an Amazon EMR cluster.

" + }, "RemoveManagedScalingPolicy":{ "name":"RemoveManagedScalingPolicy", "http":{ @@ -594,7 +624,7 @@ "errors":[ {"shape":"InternalServerError"} ], - "documentation":"

Sets the Cluster$VisibleToAllUsers value for an EMR cluster. When true, IAM principals in the account can perform EMR cluster actions that their IAM policies allow. When false, only the IAM principal that created the cluster and the account root user can perform EMR actions on the cluster, regardless of IAM permissions policies attached to other IAM principals.

This action works on running clusters. When you create a cluster, use the RunJobFlowInput$VisibleToAllUsers parameter.

For more information, see Understanding the EMR Cluster VisibleToAllUsers Setting in the Amazon EMRManagement Guide.

" + "documentation":"

Sets the Cluster$VisibleToAllUsers value for an EMR cluster. When true, IAM principals in the Amazon Web Services account can perform EMR cluster actions that their IAM policies allow. When false, only the IAM principal that created the cluster and the Amazon Web Services account root user can perform EMR actions on the cluster, regardless of IAM permissions policies attached to other IAM principals.

This action works on running clusters. When you create a cluster, use the RunJobFlowInput$VisibleToAllUsers parameter.

For more information, see Understanding the EMR Cluster VisibleToAllUsers Setting in the Amazon EMRManagement Guide.

" }, "StartNotebookExecution":{ "name":"StartNotebookExecution", @@ -923,6 +953,16 @@ }, "documentation":"

The status of an automatic scaling policy.

" }, + "AutoTerminationPolicy":{ + "type":"structure", + "members":{ + "IdleTimeout":{ + "shape":"Long", + "documentation":"

Specifies the amount of idle time in seconds after which the cluster automatically terminates. You can specify a minimum of 60 seconds and a maximum of 604800 seconds (seven days).

" + } + }, + "documentation":"

An auto-termination policy for an Amazon EMR cluster. An auto-termination policy defines the amount of idle time in seconds after which a cluster automatically terminates. For alternative cluster termination options, see Control cluster termination.

" + }, "BlockPublicAccessConfiguration":{ "type":"structure", "required":["BlockPublicSecurityGroupRules"], @@ -1156,7 +1196,7 @@ }, "VisibleToAllUsers":{ "shape":"Boolean", - "documentation":"

Indicates whether the cluster is visible to IAM principals in the account associated with the cluster. When true, IAM principals in the account can perform EMR cluster actions on the cluster that their IAM policies allow. When false, only the IAM principal that created the cluster and the account root user can perform EMR actions, regardless of IAM permissions policies attached to other IAM principals.

The default value is true if a value is not provided when creating a cluster using the EMR API RunJobFlow command, the CLI create-cluster command, or the Management Console. IAM principals that are allowed to perform actions on the cluster can use the SetVisibleToAllUsers action to change the value on a running cluster. For more information, see Understanding the EMR Cluster VisibleToAllUsers Setting in the Amazon EMRManagement Guide.

" + "documentation":"

Indicates whether the cluster is visible to IAM principals in the Amazon Web Services account associated with the cluster. When true, IAM principals in the Amazon Web Services account can perform EMR cluster actions on the cluster that their IAM policies allow. When false, only the IAM principal that created the cluster and the Amazon Web Services account root user can perform EMR actions, regardless of IAM permissions policies attached to other IAM principals.

The default value is true if a value is not provided when creating a cluster using the EMR API RunJobFlow command, the CLI create-cluster command, or the Amazon Web Services Management Console. IAM principals that are allowed to perform actions on the cluster can use the SetVisibleToAllUsers action to change the value on a running cluster. For more information, see Understanding the EMR Cluster VisibleToAllUsers Setting in the Amazon EMRManagement Guide.

" }, "Applications":{ "shape":"ApplicationList", @@ -1977,6 +2017,25 @@ }, "documentation":"

The details of the step failure. The service attempts to detect the root cause for many common failures.

" }, + "GetAutoTerminationPolicyInput":{ + "type":"structure", + "required":["ClusterId"], + "members":{ + "ClusterId":{ + "shape":"ClusterId", + "documentation":"

Specifies the ID of the Amazon EMR cluster for which the auto-termination policy will be fetched.

" + } + } + }, + "GetAutoTerminationPolicyOutput":{ + "type":"structure", + "members":{ + "AutoTerminationPolicy":{ + "shape":"AutoTerminationPolicy", + "documentation":"

Specifies the auto-termination policy that is attached to an Amazon EMR cluster.

" + } + } + }, "GetBlockPublicAccessConfigurationInput":{ "type":"structure", "members":{ @@ -2980,7 +3039,7 @@ }, "VisibleToAllUsers":{ "shape":"Boolean", - "documentation":"

Indicates whether the cluster is visible to IAM principals in the account associated with the cluster. When true, IAM principals in the account can perform EMR cluster actions that their IAM policies allow. When false, only the IAM principal that created the cluster and the account root user can perform EMR actions, regardless of IAM permissions policies attached to other IAM principals.

The default value is true if a value is not provided when creating a cluster using the EMR API RunJobFlow command, the CLI create-cluster command, or the Management Console. IAM principals that are authorized to perform actions on the cluster can use the SetVisibleToAllUsers action to change the value on a running cluster. For more information, see Understanding the EMR Cluster VisibleToAllUsers Setting in the Amazon EMRManagement Guide.

" + "documentation":"

Indicates whether the cluster is visible to IAM principals in the Amazon Web Services account associated with the cluster. When true, IAM principals in the Amazon Web Services account can perform EMR cluster actions that their IAM policies allow. When false, only the IAM principal that created the cluster and the Amazon Web Services account root user can perform EMR actions, regardless of IAM permissions policies attached to other IAM principals.

The default value is true if a value is not provided when creating a cluster using the EMR API RunJobFlow command, the CLI create-cluster command, or the Amazon Web Services Management Console. IAM principals that are authorized to perform actions on the cluster can use the SetVisibleToAllUsers action to change the value on a running cluster. For more information, see Understanding the EMR Cluster VisibleToAllUsers Setting in the Amazon EMRManagement Guide.

" }, "JobFlowRole":{ "shape":"XmlString", @@ -3459,7 +3518,7 @@ }, "NextToken":{ "shape":"String", - "documentation":"

Specifies the next page of results. If NextToken is not specified, which is usually the case for the first request of ListReleaseLabels, the first page of results are determined by other filtering parameters or by the latest version. The ListReleaseLabels request fails if the identity (account ID) and all filtering parameters are different from the original request, or if the NextToken is expired or tampered with.

" + "documentation":"

Specifies the next page of results. If NextToken is not specified, which is usually the case for the first request of ListReleaseLabels, the first page of results are determined by other filtering parameters or by the latest version. The ListReleaseLabels request fails if the identity (Amazon Web Services account ID) and all filtering parameters are different from the original request, or if the NextToken is expired or tampered with.

" }, "MaxResults":{ "shape":"MaxResultsNumber", @@ -3964,6 +4023,25 @@ } } }, + "PutAutoTerminationPolicyInput":{ + "type":"structure", + "required":["ClusterId"], + "members":{ + "ClusterId":{ + "shape":"ClusterId", + "documentation":"

Specifies the ID of the Amazon EMR cluster to which the auto-termination policy will be attached.

" + }, + "AutoTerminationPolicy":{ + "shape":"AutoTerminationPolicy", + "documentation":"

Specifies the auto-termination policy to attach to the cluster.

" + } + } + }, + "PutAutoTerminationPolicyOutput":{ + "type":"structure", + "members":{ + } + }, "PutBlockPublicAccessConfigurationInput":{ "type":"structure", "required":["BlockPublicAccessConfiguration"], @@ -4037,6 +4115,21 @@ "members":{ } }, + "RemoveAutoTerminationPolicyInput":{ + "type":"structure", + "required":["ClusterId"], + "members":{ + "ClusterId":{ + "shape":"ClusterId", + "documentation":"

Specifies the ID of the Amazon EMR cluster from which the auto-termination policy will be removed.

" + } + } + }, + "RemoveAutoTerminationPolicyOutput":{ + "type":"structure", + "members":{ + } + }, "RemoveManagedScalingPolicyInput":{ "type":"structure", "required":["ClusterId"], @@ -4145,7 +4238,7 @@ }, "VisibleToAllUsers":{ "shape":"Boolean", - "documentation":"

Set this value to true so that IAM principals in the account associated with the cluster can perform EMR actions on the cluster that their IAM policies allow. This value defaults to true for clusters created using the EMR API or the CLI create-cluster command.

When set to false, only the IAM principal that created the cluster and the account root user can perform EMR actions for the cluster, regardless of the IAM permissions policies attached to other IAM principals. For more information, see Understanding the EMR Cluster VisibleToAllUsers Setting in the Amazon EMRManagement Guide.

" + "documentation":"

Set this value to true so that IAM principals in the Amazon Web Services account associated with the cluster can perform EMR actions on the cluster that their IAM policies allow. This value defaults to true for clusters created using the EMR API or the CLI create-cluster command.

When set to false, only the IAM principal that created the cluster and the Amazon Web Services account root user can perform EMR actions for the cluster, regardless of the IAM permissions policies attached to other IAM principals. For more information, see Understanding the EMR Cluster VisibleToAllUsers Setting in the Amazon EMRManagement Guide.

" }, "JobFlowRole":{ "shape":"XmlString", @@ -4198,7 +4291,8 @@ "PlacementGroupConfigs":{ "shape":"PlacementGroupConfigList", "documentation":"

The specified placement group configuration for an Amazon EMR cluster.

" - } + }, + "AutoTerminationPolicy":{"shape":"AutoTerminationPolicy"} }, "documentation":"

Input to the RunJobFlow operation.

" }, @@ -4434,7 +4528,7 @@ }, "VisibleToAllUsers":{ "shape":"Boolean", - "documentation":"

A value of true indicates that an IAM principal in the account can perform EMR actions on the cluster that the IAM policies attached to the principal allow. A value of false indicates that only the IAM principal that created the cluster and the Amazon Web Services root user can perform EMR actions on the cluster.

" + "documentation":"

A value of true indicates that an IAM principal in the Amazon Web Services account can perform EMR actions on the cluster that the IAM policies attached to the principal allow. A value of false indicates that only the IAM principal that created the cluster and the Amazon Web Services root user can perform EMR actions on the cluster.

" } }, "documentation":"

The input to the SetVisibleToAllUsers action.

" diff --git a/botocore/data/s3/2006-03-01/service-2.json b/botocore/data/s3/2006-03-01/service-2.json index 66ffa5a2fa..19dfd471ac 100644 --- a/botocore/data/s3/2006-03-01/service-2.json +++ b/botocore/data/s3/2006-03-01/service-2.json @@ -510,7 +510,7 @@ {"shape":"InvalidObjectState"} ], "documentationUrl":"http://docs.amazonwebservices.com/AmazonS3/latest/API/RESTObjectGET.html", - "documentation":"

Retrieves objects from Amazon S3. To use GET, you must have READ access to the object. If you grant READ access to the anonymous user, you can return the object without using an authorization header.

An Amazon S3 bucket has no directory hierarchy such as you would find in a typical computer file system. You can, however, create a logical hierarchy by using object key names that imply a folder structure. For example, instead of naming an object sample.jpg, you can name it photos/2006/February/sample.jpg.

To get an object from such a logical hierarchy, specify the full key name for the object in the GET operation. For a virtual hosted-style request example, if you have the object photos/2006/February/sample.jpg, specify the resource as /photos/2006/February/sample.jpg. For a path-style request example, if you have the object photos/2006/February/sample.jpg in the bucket named examplebucket, specify the resource as /examplebucket/photos/2006/February/sample.jpg. For more information about request types, see HTTP Host Header Bucket Specification.

To distribute large files to many people, you can save bandwidth costs by using BitTorrent. For more information, see Amazon S3 Torrent. For more information about returning the ACL of an object, see GetObjectAcl.

If the object you are retrieving is stored in the S3 Glacier or S3 Glacier Deep Archive storage class, or S3 Intelligent-Tiering Archive or S3 Intelligent-Tiering Deep Archive tiers, before you can retrieve the object you must first restore a copy using RestoreObject. Otherwise, this action returns an InvalidObjectStateError error. For information about restoring archived objects, see Restoring Archived Objects.

Encryption request headers, like x-amz-server-side-encryption, should not be sent for GET requests if your object uses server-side encryption with CMKs stored in Amazon Web Services KMS (SSE-KMS) or server-side encryption with Amazon S3–managed encryption keys (SSE-S3). If your object does use these types of keys, you’ll get an HTTP 400 BadRequest error.

If you encrypt an object by using server-side encryption with customer-provided encryption keys (SSE-C) when you store the object in Amazon S3, then when you GET the object, you must use the following headers:

For more information about SSE-C, see Server-Side Encryption (Using Customer-Provided Encryption Keys).

Assuming you have permission to read object tags (permission for the s3:GetObjectVersionTagging action), the response also returns the x-amz-tagging-count header that provides the count of number of tags associated with the object. You can use GetObjectTagging to retrieve the tag set associated with an object.

Permissions

You need the s3:GetObject permission for this operation. For more information, see Specifying Permissions in a Policy. If the object you request does not exist, the error Amazon S3 returns depends on whether you also have the s3:ListBucket permission.

Versioning

By default, the GET action returns the current version of an object. To return a different version, use the versionId subresource.

For more information about versioning, see PutBucketVersioning.

Overriding Response Header Values

There are times when you want to override certain response header values in a GET response. For example, you might override the Content-Disposition response header value in your GET request.

You can override values for a set of response headers using the following query parameters. These response header values are sent only on a successful request, that is, when status code 200 OK is returned. The set of headers you can override using these parameters is a subset of the headers that Amazon S3 accepts when you create an object. The response headers that you can override for the GET response are Content-Type, Content-Language, Expires, Cache-Control, Content-Disposition, and Content-Encoding. To override these header values in the GET response, you use the following request parameters.

You must sign the request, either using an Authorization header or a presigned URL, when using these parameters. They cannot be used with an unsigned (anonymous) request.

Additional Considerations about Request Headers

If both of the If-Match and If-Unmodified-Since headers are present in the request as follows: If-Match condition evaluates to true, and; If-Unmodified-Since condition evaluates to false; then, S3 returns 200 OK and the data requested.

If both of the If-None-Match and If-Modified-Since headers are present in the request as follows: If-None-Match condition evaluates to false, and; If-Modified-Since condition evaluates to true; then, S3 returns 304 Not Modified response code.

For more information about conditional requests, see RFC 7232.

The following operations are related to GetObject:

" + "documentation":"

Retrieves objects from Amazon S3. To use GET, you must have READ access to the object. If you grant READ access to the anonymous user, you can return the object without using an authorization header.

An Amazon S3 bucket has no directory hierarchy such as you would find in a typical computer file system. You can, however, create a logical hierarchy by using object key names that imply a folder structure. For example, instead of naming an object sample.jpg, you can name it photos/2006/February/sample.jpg.

To get an object from such a logical hierarchy, specify the full key name for the object in the GET operation. For a virtual hosted-style request example, if you have the object photos/2006/February/sample.jpg, specify the resource as /photos/2006/February/sample.jpg. For a path-style request example, if you have the object photos/2006/February/sample.jpg in the bucket named examplebucket, specify the resource as /examplebucket/photos/2006/February/sample.jpg. For more information about request types, see HTTP Host Header Bucket Specification.

To distribute large files to many people, you can save bandwidth costs by using BitTorrent. For more information, see Amazon S3 Torrent. For more information about returning the ACL of an object, see GetObjectAcl.

If the object you are retrieving is stored in the S3 Glacier or S3 Glacier Deep Archive storage class, or S3 Intelligent-Tiering Archive or S3 Intelligent-Tiering Deep Archive tiers, before you can retrieve the object you must first restore a copy using RestoreObject. Otherwise, this action returns an InvalidObjectStateError error. For information about restoring archived objects, see Restoring Archived Objects.

Encryption request headers, like x-amz-server-side-encryption, should not be sent for GET requests if your object uses server-side encryption with CMKs stored in Amazon Web Services KMS (SSE-KMS) or server-side encryption with Amazon S3–managed encryption keys (SSE-S3). If your object does use these types of keys, you’ll get an HTTP 400 BadRequest error.

If you encrypt an object by using server-side encryption with customer-provided encryption keys (SSE-C) when you store the object in Amazon S3, then when you GET the object, you must use the following headers:

For more information about SSE-C, see Server-Side Encryption (Using Customer-Provided Encryption Keys).

Assuming you have the relevant permission to read object tags, the response also returns the x-amz-tagging-count header that provides the count of number of tags associated with the object. You can use GetObjectTagging to retrieve the tag set associated with an object.

Permissions

You need the relevant read object (or version) permission for this operation. For more information, see Specifying Permissions in a Policy. If the object you request does not exist, the error Amazon S3 returns depends on whether you also have the s3:ListBucket permission.

Versioning

By default, the GET action returns the current version of an object. To return a different version, use the versionId subresource.

For more information about versioning, see PutBucketVersioning.

Overriding Response Header Values

There are times when you want to override certain response header values in a GET response. For example, you might override the Content-Disposition response header value in your GET request.

You can override values for a set of response headers using the following query parameters. These response header values are sent only on a successful request, that is, when status code 200 OK is returned. The set of headers you can override using these parameters is a subset of the headers that Amazon S3 accepts when you create an object. The response headers that you can override for the GET response are Content-Type, Content-Language, Expires, Cache-Control, Content-Disposition, and Content-Encoding. To override these header values in the GET response, you use the following request parameters.

You must sign the request, either using an Authorization header or a presigned URL, when using these parameters. They cannot be used with an unsigned (anonymous) request.

Additional Considerations about Request Headers

If both of the If-Match and If-Unmodified-Since headers are present in the request as follows: If-Match condition evaluates to true, and; If-Unmodified-Since condition evaluates to false; then, S3 returns 200 OK and the data requested.

If both of the If-None-Match and If-Modified-Since headers are present in the request as follows: If-None-Match condition evaluates to false, and; If-Modified-Since condition evaluates to true; then, S3 returns 304 Not Modified response code.

For more information about conditional requests, see RFC 7232.

The following operations are related to GetObject:

" }, "GetObjectAcl":{ "name":"GetObjectAcl", @@ -612,7 +612,7 @@ {"shape":"NoSuchKey"} ], "documentationUrl":"http://docs.amazonwebservices.com/AmazonS3/latest/API/RESTObjectHEAD.html", - "documentation":"

The HEAD action retrieves metadata from an object without returning the object itself. This action is useful if you're only interested in an object's metadata. To use HEAD, you must have READ access to the object.

A HEAD request has the same options as a GET action on an object. The response is identical to the GET response except that there is no response body. Because of this, if the HEAD request generates an error, it returns a generic 404 Not Found or 403 Forbidden code. It is not possible to retrieve the exact exception beyond these error codes.

If you encrypt an object by using server-side encryption with customer-provided encryption keys (SSE-C) when you store the object in Amazon S3, then when you retrieve the metadata from the object, you must use the following headers:

For more information about SSE-C, see Server-Side Encryption (Using Customer-Provided Encryption Keys).

Request headers are limited to 8 KB in size. For more information, see Common Request Headers.

Consider the following when using request headers:

For more information about conditional requests, see RFC 7232.

Permissions

You need the s3:GetObject permission for this operation. For more information, see Specifying Permissions in a Policy. If the object you request does not exist, the error Amazon S3 returns depends on whether you also have the s3:ListBucket permission.

The following action is related to HeadObject:

" + "documentation":"

The HEAD action retrieves metadata from an object without returning the object itself. This action is useful if you're only interested in an object's metadata. To use HEAD, you must have READ access to the object.

A HEAD request has the same options as a GET action on an object. The response is identical to the GET response except that there is no response body. Because of this, if the HEAD request generates an error, it returns a generic 404 Not Found or 403 Forbidden code. It is not possible to retrieve the exact exception beyond these error codes.

If you encrypt an object by using server-side encryption with customer-provided encryption keys (SSE-C) when you store the object in Amazon S3, then when you retrieve the metadata from the object, you must use the following headers:

For more information about SSE-C, see Server-Side Encryption (Using Customer-Provided Encryption Keys).

Request headers are limited to 8 KB in size. For more information, see Common Request Headers.

Consider the following when using request headers:

For more information about conditional requests, see RFC 7232.

Permissions

You need the relevant read object (or version) permission for this operation. For more information, see Specifying Permissions in a Policy. If the object you request does not exist, the error Amazon S3 returns depends on whether you also have the s3:ListBucket permission.

The following action is related to HeadObject:

" }, "ListBucketAnalyticsConfigurations":{ "name":"ListBucketAnalyticsConfigurations", @@ -2869,7 +2869,7 @@ }, "BypassGovernanceRetention":{ "shape":"BypassGovernanceRetention", - "documentation":"

Indicates whether S3 Object Lock should bypass Governance-mode restrictions to process this operation.

", + "documentation":"

Indicates whether S3 Object Lock should bypass Governance-mode restrictions to process this operation. To use this header, you must have the s3:PutBucketPublicAccessBlock permission.

", "location":"header", "locationName":"x-amz-bypass-governance-retention" }, @@ -2976,7 +2976,7 @@ }, "BypassGovernanceRetention":{ "shape":"BypassGovernanceRetention", - "documentation":"

Specifies whether you want to delete this object even if it has a Governance-type Object Lock in place. You must have sufficient permissions to perform this operation.

", + "documentation":"

Specifies whether you want to delete this object even if it has a Governance-type Object Lock in place. To use this header, you must have the s3:PutBucketPublicAccessBlock permission.

", "location":"header", "locationName":"x-amz-bypass-governance-retention" }, From 3d0df142228d18d4230bd75879e000e644a20679 Mon Sep 17 00:00:00 2001 From: aws-sdk-python-automation Date: Fri, 27 Aug 2021 18:07:57 +0000 Subject: [PATCH 2/3] Update to latest endpoints --- botocore/data/endpoints.json | 42 ++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) diff --git a/botocore/data/endpoints.json b/botocore/data/endpoints.json index 4bc1249f27..d1b81652e1 100644 --- a/botocore/data/endpoints.json +++ b/botocore/data/endpoints.json @@ -3796,6 +3796,36 @@ "eu-west-1" : { }, "eu-west-2" : { }, "eu-west-3" : { }, + "fips-ca-central-1" : { + "credentialScope" : { + "region" : "ca-central-1" + }, + "hostname" : "api.tunneling.iot-fips.ca-central-1.amazonaws.com" + }, + "fips-us-east-1" : { + "credentialScope" : { + "region" : "us-east-1" + }, + "hostname" : "api.tunneling.iot-fips.us-east-1.amazonaws.com" + }, + "fips-us-east-2" : { + "credentialScope" : { + "region" : "us-east-2" + }, + "hostname" : "api.tunneling.iot-fips.us-east-2.amazonaws.com" + }, + "fips-us-west-1" : { + "credentialScope" : { + "region" : "us-west-1" + }, + "hostname" : "api.tunneling.iot-fips.us-west-1.amazonaws.com" + }, + "fips-us-west-2" : { + "credentialScope" : { + "region" : "us-west-2" + }, + "hostname" : "api.tunneling.iot-fips.us-west-2.amazonaws.com" + }, "me-south-1" : { }, "sa-east-1" : { }, "us-east-1" : { }, @@ -9324,6 +9354,18 @@ }, "iotsecuredtunneling" : { "endpoints" : { + "fips-us-gov-east-1" : { + "credentialScope" : { + "region" : "us-gov-east-1" + }, + "hostname" : "api.tunneling.iot-fips.us-gov-east-1.amazonaws.com" + }, + "fips-us-gov-west-1" : { + "credentialScope" : { + "region" : "us-gov-west-1" + }, + "hostname" : "api.tunneling.iot-fips.us-gov-west-1.amazonaws.com" + }, "us-gov-east-1" : { }, "us-gov-west-1" : { } } From c442858bd3d23a28bea9cc038f7f3d9737b5b704 Mon Sep 17 00:00:00 2001 From: aws-sdk-python-automation Date: Fri, 27 Aug 2021 18:08:00 +0000 Subject: [PATCH 3/3] Bumping version to 1.21.31 --- .changes/1.21.31.json | 17 +++++++++++++++++ .changes/next-release/api-change-ec2-84869.json | 5 ----- .changes/next-release/api-change-emr-36318.json | 5 ----- .changes/next-release/api-change-s3-67046.json | 5 ----- CHANGELOG.rst | 8 ++++++++ botocore/__init__.py | 2 +- docs/source/conf.py | 2 +- 7 files changed, 27 insertions(+), 17 deletions(-) create mode 100644 .changes/1.21.31.json delete mode 100644 .changes/next-release/api-change-ec2-84869.json delete mode 100644 .changes/next-release/api-change-emr-36318.json delete mode 100644 .changes/next-release/api-change-s3-67046.json diff --git a/.changes/1.21.31.json b/.changes/1.21.31.json new file mode 100644 index 0000000000..3f7292a340 --- /dev/null +++ b/.changes/1.21.31.json @@ -0,0 +1,17 @@ +[ + { + "category": "``s3``", + "description": "Documentation updates for Amazon S3.", + "type": "api-change" + }, + { + "category": "``emr``", + "description": "Update emr client to latest version", + "type": "api-change" + }, + { + "category": "``ec2``", + "description": "This release adds the BootMode flag to the ImportImage API and showing the detected BootMode of an ImportImage task.", + "type": "api-change" + } +] \ No newline at end of file diff --git a/.changes/next-release/api-change-ec2-84869.json b/.changes/next-release/api-change-ec2-84869.json deleted file mode 100644 index 68a238dcb9..0000000000 --- a/.changes/next-release/api-change-ec2-84869.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "type": "api-change", - "category": "``ec2``", - "description": "This release adds the BootMode flag to the ImportImage API and showing the detected BootMode of an ImportImage task." -} diff --git a/.changes/next-release/api-change-emr-36318.json b/.changes/next-release/api-change-emr-36318.json deleted file mode 100644 index 858929cc07..0000000000 --- a/.changes/next-release/api-change-emr-36318.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "type": "api-change", - "category": "``emr``", - "description": "Update emr client to latest version" -} diff --git a/.changes/next-release/api-change-s3-67046.json b/.changes/next-release/api-change-s3-67046.json deleted file mode 100644 index 6cff11ade3..0000000000 --- a/.changes/next-release/api-change-s3-67046.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "type": "api-change", - "category": "``s3``", - "description": "Documentation updates for Amazon S3." -} diff --git a/CHANGELOG.rst b/CHANGELOG.rst index b5c810a40b..82c9ce35ad 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -2,6 +2,14 @@ CHANGELOG ========= +1.21.31 +======= + +* api-change:``s3``: Documentation updates for Amazon S3. +* api-change:``emr``: Update emr client to latest version +* api-change:``ec2``: This release adds the BootMode flag to the ImportImage API and showing the detected BootMode of an ImportImage task. + + 1.21.30 ======= diff --git a/botocore/__init__.py b/botocore/__init__.py index 6a35732432..8e9acb59f7 100644 --- a/botocore/__init__.py +++ b/botocore/__init__.py @@ -16,7 +16,7 @@ import re import logging -__version__ = '1.21.30' +__version__ = '1.21.31' class NullHandler(logging.Handler): diff --git a/docs/source/conf.py b/docs/source/conf.py index 767025823b..59054dd1d4 100644 --- a/docs/source/conf.py +++ b/docs/source/conf.py @@ -54,7 +54,7 @@ # The short X.Y version. version = '1.21.' # The full version, including alpha/beta/rc tags. -release = '1.21.30' +release = '1.21.31' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages.