diff --git a/.changes/1.35.44.json b/.changes/1.35.44.json new file mode 100644 index 0000000000..e81481e2b2 --- /dev/null +++ b/.changes/1.35.44.json @@ -0,0 +1,27 @@ +[ + { + "category": "``athena``", + "description": "Removing FEDERATED from Create/List/Delete/GetDataCatalog API", + "type": "api-change" + }, + { + "category": "``bedrock``", + "description": "Adding converse support to CMI API's", + "type": "api-change" + }, + { + "category": "``bedrock-runtime``", + "description": "Added converse support for custom imported models", + "type": "api-change" + }, + { + "category": "``datazone``", + "description": "Adding the following project member designations: PROJECT_CATALOG_VIEWER, PROJECT_CATALOG_CONSUMER and PROJECT_CATALOG_STEWARD in the CreateProjectMembership API and PROJECT_CATALOG_STEWARD designation in the AddPolicyGrant API.", + "type": "api-change" + }, + { + "category": "``ec2``", + "description": "RequestSpotInstances and RequestSpotFleet feature release.", + "type": "api-change" + } +] \ No newline at end of file diff --git a/CHANGELOG.rst b/CHANGELOG.rst index bd64f6f9ee..a755447f33 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -2,6 +2,16 @@ CHANGELOG ========= +1.35.44 +======= + +* api-change:``athena``: Removing FEDERATED from Create/List/Delete/GetDataCatalog API +* api-change:``bedrock``: Adding converse support to CMI API's +* api-change:``bedrock-runtime``: Added converse support for custom imported models +* api-change:``datazone``: Adding the following project member designations: PROJECT_CATALOG_VIEWER, PROJECT_CATALOG_CONSUMER and PROJECT_CATALOG_STEWARD in the CreateProjectMembership API and PROJECT_CATALOG_STEWARD designation in the AddPolicyGrant API. +* api-change:``ec2``: RequestSpotInstances and RequestSpotFleet feature release. + + 1.35.43 ======= diff --git a/botocore/__init__.py b/botocore/__init__.py index ca70853983..b4b57ec03a 100644 --- a/botocore/__init__.py +++ b/botocore/__init__.py @@ -16,7 +16,7 @@ import os import re -__version__ = '1.35.43' +__version__ = '1.35.44' class NullHandler(logging.Handler): diff --git a/botocore/data/athena/2017-05-18/service-2.json b/botocore/data/athena/2017-05-18/service-2.json index 383a3814f5..fed4374aa3 100644 --- a/botocore/data/athena/2017-05-18/service-2.json +++ b/botocore/data/athena/2017-05-18/service-2.json @@ -1021,10 +1021,10 @@ "members":{ "S3AclOption":{ "shape":"S3AclOption", - "documentation":"
The Amazon S3 canned ACL that Athena should specify when storing query results. Currently the only supported canned ACL is BUCKET_OWNER_FULL_CONTROL
. If a query runs in a workgroup and the workgroup overrides client-side settings, then the Amazon S3 canned ACL specified in the workgroup's settings is used for all queries that run in the workgroup. For more information about Amazon S3 canned ACLs, see Canned ACL in the Amazon S3 User Guide.
The Amazon S3 canned ACL that Athena should specify when storing query results, including data files inserted by Athena as the result of statements like CTAS or INSERT INTO. Currently the only supported canned ACL is BUCKET_OWNER_FULL_CONTROL
. If a query runs in a workgroup and the workgroup overrides client-side settings, then the Amazon S3 canned ACL specified in the workgroup's settings is used for all queries that run in the workgroup. For more information about Amazon S3 canned ACLs, see Canned ACL in the Amazon S3 User Guide.
Indicates that an Amazon S3 canned ACL should be set to control ownership of stored query results. When Athena stores query results in Amazon S3, the canned ACL is set with the x-amz-acl
request header. For more information about S3 Object Ownership, see Object Ownership settings in the Amazon S3 User Guide.
Indicates that an Amazon S3 canned ACL should be set to control ownership of stored query results, including data files inserted by Athena as the result of statements like CTAS or INSERT INTO. When Athena stores query results in Amazon S3, the canned ACL is set with the x-amz-acl
request header. For more information about S3 Object Ownership, see Object Ownership settings in the Amazon S3 User Guide.
The type of data catalog to create: LAMBDA
for a federated catalog, GLUE
for an Glue Data Catalog, and HIVE
for an external Apache Hive metastore. FEDERATED
is a federated catalog for which Athena creates the connection and the Lambda function for you based on the parameters that you pass.
The type of data catalog to create: LAMBDA
for a federated catalog, HIVE
for an external hive metastore, or GLUE
for an Glue Data Catalog.
Specifies the Lambda function or functions to use for creating the data catalog. This is a mapping whose values depend on the catalog type.
For the HIVE
data catalog type, use the following syntax. The metadata-function
parameter is required. The sdk-version
parameter is optional and defaults to the currently supported version.
metadata-function=lambda_arn, sdk-version=version_number
For the LAMBDA
data catalog type, use one of the following sets of required parameters, but not both.
If you have one Lambda function that processes metadata and another for reading the actual data, use the following syntax. Both parameters are required.
metadata-function=lambda_arn, record-function=lambda_arn
If you have a composite Lambda function that processes both metadata and data, use the following syntax to specify your Lambda function.
function=lambda_arn
The GLUE
type takes a catalog ID parameter and is required. The catalog_id
is the account ID of the Amazon Web Services account to which the Glue Data Catalog belongs.
catalog-id=catalog_id
The GLUE
data catalog type also applies to the default AwsDataCatalog
that already exists in your account, of which you can have only one and cannot modify.
The FEDERATED
data catalog type uses one of the following parameters, but not both. Use connection-arn
for an existing Glue connection. Use connection-type
and connection-properties
to specify the configuration setting for a new connection.
connection-arn:<glue_connection_arn_to_reuse>
lambda-role-arn
(optional): The execution role to use for the Lambda function. If not provided, one is created.
connection-type:MYSQL|REDSHIFT|...., connection-properties:\"<json_string>\"
For <json_string>
, use escaped JSON text, as in the following example.
\"{\\\"spill_bucket\\\":\\\"my_spill\\\",\\\"spill_prefix\\\":\\\"athena-spill\\\",\\\"host\\\":\\\"abc12345.snowflakecomputing.com\\\",\\\"port\\\":\\\"1234\\\",\\\"warehouse\\\":\\\"DEV_WH\\\",\\\"database\\\":\\\"TEST\\\",\\\"schema\\\":\\\"PUBLIC\\\",\\\"SecretArn\\\":\\\"arn:aws:secretsmanager:ap-south-1:111122223333:secret:snowflake-XHb67j\\\"}\"
Specifies the Lambda function or functions to use for creating the data catalog. This is a mapping whose values depend on the catalog type.
For the HIVE
data catalog type, use the following syntax. The metadata-function
parameter is required. The sdk-version
parameter is optional and defaults to the currently supported version.
metadata-function=lambda_arn, sdk-version=version_number
For the LAMBDA
data catalog type, use one of the following sets of required parameters, but not both.
If you have one Lambda function that processes metadata and another for reading the actual data, use the following syntax. Both parameters are required.
metadata-function=lambda_arn, record-function=lambda_arn
If you have a composite Lambda function that processes both metadata and data, use the following syntax to specify your Lambda function.
function=lambda_arn
The GLUE
type takes a catalog ID parameter and is required. The catalog_id
is the account ID of the Amazon Web Services account to which the Glue Data Catalog belongs.
catalog-id=catalog_id
The GLUE
data catalog type also applies to the default AwsDataCatalog
that already exists in your account, of which you can have only one and cannot modify.
The type of data catalog to create: LAMBDA
for a federated catalog, GLUE
for an Glue Data Catalog, and HIVE
for an external Apache Hive metastore. FEDERATED
is a federated catalog for which Athena creates the connection and the Lambda function for you based on the parameters that you pass.
The type of data catalog to create: LAMBDA
for a federated catalog, HIVE
for an external hive metastore, or GLUE
for an Glue Data Catalog.
Specifies the Lambda function or functions to use for the data catalog. This is a mapping whose values depend on the catalog type.
For the HIVE
data catalog type, use the following syntax. The metadata-function
parameter is required. The sdk-version
parameter is optional and defaults to the currently supported version.
metadata-function=lambda_arn, sdk-version=version_number
For the LAMBDA
data catalog type, use one of the following sets of required parameters, but not both.
If you have one Lambda function that processes metadata and another for reading the actual data, use the following syntax. Both parameters are required.
metadata-function=lambda_arn, record-function=lambda_arn
If you have a composite Lambda function that processes both metadata and data, use the following syntax to specify your Lambda function.
function=lambda_arn
The GLUE
type takes a catalog ID parameter and is required. The catalog_id
is the account ID of the Amazon Web Services account to which the Glue catalog belongs.
catalog-id=catalog_id
The GLUE
data catalog type also applies to the default AwsDataCatalog
that already exists in your account, of which you can have only one and cannot modify.
The FEDERATED
data catalog type uses one of the following parameters, but not both. Use connection-arn
for an existing Glue connection. Use connection-type
and connection-properties
to specify the configuration setting for a new connection.
connection-arn:<glue_connection_arn_to_reuse>
connection-type:MYSQL|REDSHIFT|...., connection-properties:\"<json_string>\"
For <json_string>
, use escaped JSON text, as in the following example.
\"{\\\"spill_bucket\\\":\\\"my_spill\\\",\\\"spill_prefix\\\":\\\"athena-spill\\\",\\\"host\\\":\\\"abc12345.snowflakecomputing.com\\\",\\\"port\\\":\\\"1234\\\",\\\"warehouse\\\":\\\"DEV_WH\\\",\\\"database\\\":\\\"TEST\\\",\\\"schema\\\":\\\"PUBLIC\\\",\\\"SecretArn\\\":\\\"arn:aws:secretsmanager:ap-south-1:111122223333:secret:snowflake-XHb67j\\\"}\"
The status of the creation or deletion of the data catalog.
The LAMBDA
, GLUE
, and HIVE
data catalog types are created synchronously. Their status is either CREATE_COMPLETE
or CREATE_FAILED
.
The FEDERATED
data catalog type is created asynchronously.
Data catalog creation status:
CREATE_IN_PROGRESS
: Federated data catalog creation in progress.
CREATE_COMPLETE
: Data catalog creation complete.
CREATE_FAILED
: Data catalog could not be created.
CREATE_FAILED_CLEANUP_IN_PROGRESS
: Federated data catalog creation failed and is being removed.
CREATE_FAILED_CLEANUP_COMPLETE
: Federated data catalog creation failed and was removed.
CREATE_FAILED_CLEANUP_FAILED
: Federated data catalog creation failed but could not be removed.
Data catalog deletion status:
DELETE_IN_PROGRESS
: Federated data catalog deletion in progress.
DELETE_COMPLETE
: Federated data catalog deleted.
DELETE_FAILED
: Federated data catalog could not be deleted.
The type of connection for a FEDERATED
data catalog (for example, REDSHIFT
, MYSQL
, or SQLSERVER
). For information about individual connectors, see Available data source connectors.
Text of the error that occurred during data catalog creation or deletion.
" + "documentation":"Specifies the Lambda function or functions to use for the data catalog. This is a mapping whose values depend on the catalog type.
For the HIVE
data catalog type, use the following syntax. The metadata-function
parameter is required. The sdk-version
parameter is optional and defaults to the currently supported version.
metadata-function=lambda_arn, sdk-version=version_number
For the LAMBDA
data catalog type, use one of the following sets of required parameters, but not both.
If you have one Lambda function that processes metadata and another for reading the actual data, use the following syntax. Both parameters are required.
metadata-function=lambda_arn, record-function=lambda_arn
If you have a composite Lambda function that processes both metadata and data, use the following syntax to specify your Lambda function.
function=lambda_arn
The GLUE
type takes a catalog ID parameter and is required. The catalog_id
is the account ID of the Amazon Web Services account to which the Glue catalog belongs.
catalog-id=catalog_id
The GLUE
data catalog type also applies to the default AwsDataCatalog
that already exists in your account, of which you can have only one and cannot modify.
Contains information about a data catalog in an Amazon Web Services account.
In the Athena console, data catalogs are listed as \"data sources\" on the Data sources page under the Data source name column.
The data catalog type.
" - }, - "Status":{ - "shape":"DataCatalogStatus", - "documentation":"The status of the creation or deletion of the data catalog.
The LAMBDA
, GLUE
, and HIVE
data catalog types are created synchronously. Their status is either CREATE_COMPLETE
or CREATE_FAILED
.
The FEDERATED
data catalog type is created asynchronously.
Data catalog creation status:
CREATE_IN_PROGRESS
: Federated data catalog creation in progress.
CREATE_COMPLETE
: Data catalog creation complete.
CREATE_FAILED
: Data catalog could not be created.
CREATE_FAILED_CLEANUP_IN_PROGRESS
: Federated data catalog creation failed and is being removed.
CREATE_FAILED_CLEANUP_COMPLETE
: Federated data catalog creation failed and was removed.
CREATE_FAILED_CLEANUP_FAILED
: Federated data catalog creation failed but could not be removed.
Data catalog deletion status:
DELETE_IN_PROGRESS
: Federated data catalog deletion in progress.
DELETE_COMPLETE
: Federated data catalog deleted.
DELETE_FAILED
: Federated data catalog could not be deleted.
The type of connection for a FEDERATED
data catalog (for example, REDSHIFT
, MYSQL
, or SQLSERVER
). For information about individual connectors, see Available data source connectors.
Text of the error that occurred during data catalog creation or deletion.
" } }, "documentation":"The summary information for the data catalog, which includes its name and type.
" @@ -1902,8 +1828,7 @@ "enum":[ "LAMBDA", "GLUE", - "HIVE", - "FEDERATED" + "HIVE" ] }, "Database":{ @@ -1979,7 +1904,6 @@ "DeleteDataCatalogOutput":{ "type":"structure", "members":{ - "DataCatalog":{"shape":"DataCatalog"} } }, "DeleteNamedQueryInput":{ @@ -2539,7 +2463,7 @@ "members":{ "UpdateCount":{ "shape":"Long", - "documentation":"The number of rows inserted with a CREATE TABLE AS SELECT
statement.
The number of rows inserted with a CREATE TABLE AS SELECT
, INSERT INTO
, or UPDATE
statement.
The imported model is encrypted at rest using this key.
" + }, + "instructSupported":{ + "shape":"InstructSupported", + "documentation":"Specifies if the imported model supports fine tuning.
" } } }, @@ -3797,9 +3801,17 @@ "creationTime":{ "shape":"Timestamp", "documentation":"Creation time of the imported model.
" + }, + "instructSupported":{ + "shape":"InstructSupported", + "documentation":"Specifies if the imported model supports fine tuning.
" + }, + "modelArchitecture":{ + "shape":"ModelArchitecture", + "documentation":"The architecture of the imported model.
" } }, - "documentation":"Information about tne imported model.
" + "documentation":"Information about the imported model.
" }, "ImportedModelSummaryList":{ "type":"list", @@ -3924,6 +3936,10 @@ "type":"list", "member":{"shape":"InferenceType"} }, + "InstructSupported":{ + "type":"boolean", + "box":true + }, "InternalServerException":{ "type":"structure", "members":{ @@ -4680,6 +4696,7 @@ "type":"float", "box":true }, + "ModelArchitecture":{"type":"string"}, "ModelArn":{ "type":"string", "max":1011, diff --git a/botocore/data/datazone/2018-05-10/service-2.json b/botocore/data/datazone/2018-05-10/service-2.json index 25cbe093c1..8ccd2c3b71 100644 --- a/botocore/data/datazone/2018-05-10/service-2.json +++ b/botocore/data/datazone/2018-05-10/service-2.json @@ -13942,7 +13942,8 @@ "type":"string", "enum":[ "OWNER", - "CONTRIBUTOR" + "CONTRIBUTOR", + "PROJECT_CATALOG_STEWARD" ] }, "ProjectGrantFilter":{ @@ -18104,7 +18105,10 @@ "type":"string", "enum":[ "PROJECT_OWNER", - "PROJECT_CONTRIBUTOR" + "PROJECT_CONTRIBUTOR", + "PROJECT_CATALOG_VIEWER", + "PROJECT_CATALOG_CONSUMER", + "PROJECT_CATALOG_STEWARD" ] }, "UserDetails":{ diff --git a/botocore/data/ec2/2016-11-15/service-2.json b/botocore/data/ec2/2016-11-15/service-2.json index 572cfa5784..7a4ee2d5fc 100644 --- a/botocore/data/ec2/2016-11-15/service-2.json +++ b/botocore/data/ec2/2016-11-15/service-2.json @@ -21211,7 +21211,7 @@ }, "Filters":{ "shape":"FilterList", - "documentation":"The filters.
architecture
- The image architecture (i386
| x86_64
| arm64
| x86_64_mac
| arm64_mac
).
block-device-mapping.delete-on-termination
- A Boolean value that indicates whether the Amazon EBS volume is deleted on instance termination.
block-device-mapping.device-name
- The device name specified in the block device mapping (for example, /dev/sdh
or xvdh
).
block-device-mapping.snapshot-id
- The ID of the snapshot used for the Amazon EBS volume.
block-device-mapping.volume-size
- The volume size of the Amazon EBS volume, in GiB.
block-device-mapping.volume-type
- The volume type of the Amazon EBS volume (io1
| io2
| gp2
| gp3
| sc1
| st1
| standard
).
block-device-mapping.encrypted
- A Boolean that indicates whether the Amazon EBS volume is encrypted.
creation-date
- The time when the image was created, in the ISO 8601 format in the UTC time zone (YYYY-MM-DDThh:mm:ss.sssZ), for example, 2021-09-29T11:04:43.305Z
. You can use a wildcard (*
), for example, 2021-09-29T*
, which matches an entire day.
description
- The description of the image (provided during image creation).
ena-support
- A Boolean that indicates whether enhanced networking with ENA is enabled.
hypervisor
- The hypervisor type (ovm
| xen
).
image-id
- The ID of the image.
image-type
- The image type (machine
| kernel
| ramdisk
).
is-public
- A Boolean that indicates whether the image is public.
kernel-id
- The kernel ID.
manifest-location
- The location of the image manifest.
name
- The name of the AMI (provided during image creation).
owner-alias
- The owner alias (amazon
| aws-marketplace
). The valid aliases are defined in an Amazon-maintained list. This is not the Amazon Web Services account alias that can be set using the IAM console. We recommend that you use the Owner request parameter instead of this filter.
owner-id
- The Amazon Web Services account ID of the owner. We recommend that you use the Owner request parameter instead of this filter.
platform
- The platform. The only supported value is windows
.
product-code
- The product code.
product-code.type
- The type of the product code (marketplace
).
ramdisk-id
- The RAM disk ID.
root-device-name
- The device name of the root device volume (for example, /dev/sda1
).
root-device-type
- The type of the root device volume (ebs
| instance-store
).
source-instance-id
- The ID of the instance that the AMI was created from if the AMI was created using CreateImage. This filter is applicable only if the AMI was created using CreateImage.
state
- The state of the image (available
| pending
| failed
).
state-reason-code
- The reason code for the state change.
state-reason-message
- The message for the state change.
sriov-net-support
- A value of simple
indicates that enhanced networking with the Intel 82599 VF interface is enabled.
tag
:<key> - The key/value combination of a tag assigned to the resource. Use the tag key in the filter name and the tag value as the filter value. For example, to find all resources that have a tag with the key Owner
and the value TeamA
, specify tag:Owner
for the filter name and TeamA
for the filter value.
tag-key
- The key of a tag assigned to the resource. Use this filter to find all resources assigned a tag with a specific key, regardless of the tag value.
virtualization-type
- The virtualization type (paravirtual
| hvm
).
The filters.
architecture
- The image architecture (i386
| x86_64
| arm64
| x86_64_mac
| arm64_mac
).
block-device-mapping.delete-on-termination
- A Boolean value that indicates whether the Amazon EBS volume is deleted on instance termination.
block-device-mapping.device-name
- The device name specified in the block device mapping (for example, /dev/sdh
or xvdh
).
block-device-mapping.snapshot-id
- The ID of the snapshot used for the Amazon EBS volume.
block-device-mapping.volume-size
- The volume size of the Amazon EBS volume, in GiB.
block-device-mapping.volume-type
- The volume type of the Amazon EBS volume (io1
| io2
| gp2
| gp3
| sc1
| st1
| standard
).
block-device-mapping.encrypted
- A Boolean that indicates whether the Amazon EBS volume is encrypted.
creation-date
- The time when the image was created, in the ISO 8601 format in the UTC time zone (YYYY-MM-DDThh:mm:ss.sssZ), for example, 2021-09-29T11:04:43.305Z
. You can use a wildcard (*
), for example, 2021-09-29T*
, which matches an entire day.
description
- The description of the image (provided during image creation).
ena-support
- A Boolean that indicates whether enhanced networking with ENA is enabled.
hypervisor
- The hypervisor type (ovm
| xen
).
image-id
- The ID of the image.
image-type
- The image type (machine
| kernel
| ramdisk
).
is-public
- A Boolean that indicates whether the image is public.
kernel-id
- The kernel ID.
manifest-location
- The location of the image manifest.
name
- The name of the AMI (provided during image creation).
owner-alias
- The owner alias (amazon
| aws-marketplace
). The valid aliases are defined in an Amazon-maintained list. This is not the Amazon Web Services account alias that can be set using the IAM console. We recommend that you use the Owner request parameter instead of this filter.
owner-id
- The Amazon Web Services account ID of the owner. We recommend that you use the Owner request parameter instead of this filter.
platform
- The platform. The only supported value is windows
.
product-code
- The product code.
product-code.type
- The type of the product code (marketplace
).
ramdisk-id
- The RAM disk ID.
root-device-name
- The device name of the root device volume (for example, /dev/sda1
).
root-device-type
- The type of the root device volume (ebs
| instance-store
).
source-instance-id
- The ID of the instance that the AMI was created from if the AMI was created using CreateImage. This filter is applicable only if the AMI was created using CreateImage.
state
- The state of the image (available
| pending
| failed
).
state-reason-code
- The reason code for the state change.
state-reason-message
- The message for the state change.
sriov-net-support
- A value of simple
indicates that enhanced networking with the Intel 82599 VF interface is enabled.
tag:<key>
- The key/value combination of a tag assigned to the resource. Use the tag key in the filter name and the tag value as the filter value. For example, to find all resources that have a tag with the key Owner
and the value TeamA
, specify tag:Owner
for the filter name and TeamA
for the filter value.
tag-key
- The key of a tag assigned to the resource. Use this filter to find all resources assigned a tag with a specific key, regardless of the tag value.
virtualization-type
- The virtualization type (paravirtual
| hvm
).
The name of the key pair.
", "locationName":"keyName" }, diff --git a/docs/source/conf.py b/docs/source/conf.py index 3b8fa4d56d..d03b3d1709 100644 --- a/docs/source/conf.py +++ b/docs/source/conf.py @@ -59,7 +59,7 @@ # The short X.Y version. version = '1.35.' # The full version, including alpha/beta/rc tags. -release = '1.35.43' +release = '1.35.44' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages.