diff --git a/codegen/sdk-codegen/aws-models/athena.json b/codegen/sdk-codegen/aws-models/athena.json index 5dddda82698..08f551e64eb 100644 --- a/codegen/sdk-codegen/aws-models/athena.json +++ b/codegen/sdk-codegen/aws-models/athena.json @@ -35,13 +35,13 @@ "S3AclOption": { "target": "com.amazonaws.athena#S3AclOption", "traits": { - "smithy.api#documentation": "

The Amazon S3 canned ACL that Athena should specify when storing\n query results. Currently the only supported canned ACL is\n BUCKET_OWNER_FULL_CONTROL. If a query runs in a workgroup and the\n workgroup overrides client-side settings, then the Amazon S3 canned ACL\n specified in the workgroup's settings is used for all queries that run in the workgroup.\n For more information about Amazon S3 canned ACLs, see Canned ACL in the Amazon S3 User Guide.

", + "smithy.api#documentation": "

The Amazon S3 canned ACL that Athena should specify when storing\n query results, including data files inserted by Athena as the result\n of statements like CTAS or INSERT INTO. Currently the only supported canned ACL is\n BUCKET_OWNER_FULL_CONTROL. If a query runs in a workgroup and the\n workgroup overrides client-side settings, then the Amazon S3 canned ACL\n specified in the workgroup's settings is used for all queries that run in the workgroup.\n For more information about Amazon S3 canned ACLs, see Canned ACL in the Amazon S3 User Guide.

", "smithy.api#required": {} } } }, "traits": { - "smithy.api#documentation": "

Indicates that an Amazon S3 canned ACL should be set to control ownership of\n stored query results. When Athena stores query results in Amazon S3,\n the canned ACL is set with the x-amz-acl request header. For more\n information about S3 Object Ownership, see Object Ownership settings in the Amazon S3 User\n Guide.

" + "smithy.api#documentation": "

Indicates that an Amazon S3 canned ACL should be set to control ownership of\n stored query results, including data files inserted by Athena as the result\n of statements like CTAS or INSERT INTO. When Athena stores query results in\n Amazon S3, the canned ACL is set with the x-amz-acl request\n header. For more information about S3 Object Ownership, see Object Ownership settings in the Amazon S3 User\n Guide.

" } }, "com.amazonaws.athena#Age": { @@ -2172,191 +2172,6 @@ "smithy.api#pattern": "^[\\u0020-\\uD7FF\\uE000-\\uFFFD\\uD800\\uDC00-\\uDBFF\\uDFFF\\t]*$" } }, - "com.amazonaws.athena#ConnectionType": { - "type": "enum", - "members": { - "DYNAMODB": { - "target": "smithy.api#Unit", - "traits": { - "smithy.api#enumValue": "DYNAMODB" - } - }, - "MYSQL": { - "target": "smithy.api#Unit", - "traits": { - "smithy.api#enumValue": "MYSQL" - } - }, - "POSTGRESQL": { - "target": "smithy.api#Unit", - "traits": { - "smithy.api#enumValue": "POSTGRESQL" - } - }, - "REDSHIFT": { - "target": "smithy.api#Unit", - "traits": { - "smithy.api#enumValue": "REDSHIFT" - } - }, - "ORACLE": { - "target": "smithy.api#Unit", - "traits": { - "smithy.api#enumValue": "ORACLE" - } - }, - "SYNAPSE": { - "target": "smithy.api#Unit", - "traits": { - "smithy.api#enumValue": "SYNAPSE" - } - }, - "SQLSERVER": { - "target": "smithy.api#Unit", - "traits": { - "smithy.api#enumValue": "SQLSERVER" - } - }, - "DB2": { - "target": "smithy.api#Unit", - "traits": { - "smithy.api#enumValue": "DB2" - } - }, - "OPENSEARCH": { - "target": "smithy.api#Unit", - "traits": { - "smithy.api#enumValue": "OPENSEARCH" - } - }, - "BIGQUERY": { - "target": "smithy.api#Unit", - "traits": { - "smithy.api#enumValue": "BIGQUERY" - } - }, - "GOOGLECLOUDSTORAGE": { - "target": "smithy.api#Unit", - "traits": { - "smithy.api#enumValue": "GOOGLECLOUDSTORAGE" - } - }, - "HBASE": { - "target": "smithy.api#Unit", - "traits": { - "smithy.api#enumValue": "HBASE" - } - }, - "DOCUMENTDB": { - "target": "smithy.api#Unit", - "traits": { - "smithy.api#enumValue": "DOCUMENTDB" - } - }, - "MSK": { - "target": "smithy.api#Unit", - "traits": { - "smithy.api#enumValue": "MSK" - } - }, - "NEPTUNE": { - "target": "smithy.api#Unit", - "traits": { - "smithy.api#enumValue": "NEPTUNE" - } - }, - "CMDB": { - "target": "smithy.api#Unit", - "traits": { - "smithy.api#enumValue": "CMDB" - } - }, - "TPCDS": { - "target": "smithy.api#Unit", - "traits": { - "smithy.api#enumValue": "TPCDS" - } - }, - "REDIS": { - "target": "smithy.api#Unit", - "traits": { - "smithy.api#enumValue": "REDIS" - } - }, - "CLOUDWATCH": { - "target": "smithy.api#Unit", - "traits": { - "smithy.api#enumValue": "CLOUDWATCH" - } - }, - "TIMESTREAM": { - "target": "smithy.api#Unit", - "traits": { - "smithy.api#enumValue": "TIMESTREAM" - } - }, - "SAPHANA": { - "target": "smithy.api#Unit", - "traits": { - "smithy.api#enumValue": "SAPHANA" - } - }, - "SNOWFLAKE": { - "target": "smithy.api#Unit", - "traits": { - "smithy.api#enumValue": "SNOWFLAKE" - } - }, - "TERADATA": { - "target": "smithy.api#Unit", - "traits": { - "smithy.api#enumValue": "TERADATA" - } - }, - "VERTICA": { - "target": "smithy.api#Unit", - "traits": { - "smithy.api#enumValue": "VERTICA" - } - }, - "CLOUDERAIMPALA": { - "target": "smithy.api#Unit", - "traits": { - "smithy.api#enumValue": "CLOUDERAIMPALA" - } - }, - "CLOUDERAHIVE": { - "target": "smithy.api#Unit", - "traits": { - "smithy.api#enumValue": "CLOUDERAHIVE" - } - }, - "HORTONWORKSHIVE": { - "target": "smithy.api#Unit", - "traits": { - "smithy.api#enumValue": "HORTONWORKSHIVE" - } - }, - "DATALAKEGEN2": { - "target": "smithy.api#Unit", - "traits": { - "smithy.api#enumValue": "DATALAKEGEN2" - } - }, - "DB2AS400": { - "target": "smithy.api#Unit", - "traits": { - "smithy.api#enumValue": "DB2AS400" - } - }, - "CLOUDWATCHMETRICS": { - "target": "smithy.api#Unit", - "traits": { - "smithy.api#enumValue": "CLOUDWATCHMETRICS" - } - } - } - }, "com.amazonaws.athena#CoordinatorDpuSize": { "type": "integer", "traits": { @@ -2455,7 +2270,7 @@ "Type": { "target": "com.amazonaws.athena#DataCatalogType", "traits": { - "smithy.api#documentation": "

The type of data catalog to create: LAMBDA for a federated catalog,\n GLUE for an Glue Data Catalog, and HIVE for an\n external Apache Hive metastore. FEDERATED is a federated catalog for which\n Athena creates the connection and the Lambda function for\n you based on the parameters that you pass.

", + "smithy.api#documentation": "

The type of data catalog to create: LAMBDA for a federated catalog,\n HIVE for an external hive metastore, or GLUE for an\n Glue Data Catalog.

", "smithy.api#required": {} } }, @@ -2468,7 +2283,7 @@ "Parameters": { "target": "com.amazonaws.athena#ParametersMap", "traits": { - "smithy.api#documentation": "

Specifies the Lambda function or functions to use for creating the data\n catalog. This is a mapping whose values depend on the catalog type.

\n " + "smithy.api#documentation": "

Specifies the Lambda function or functions to use for creating the data\n catalog. This is a mapping whose values depend on the catalog type.

\n " } }, "Tags": { @@ -2484,11 +2299,7 @@ }, "com.amazonaws.athena#CreateDataCatalogOutput": { "type": "structure", - "members": { - "DataCatalog": { - "target": "com.amazonaws.athena#DataCatalog" - } - }, + "members": {}, "traits": { "smithy.api#output": {} } @@ -2864,32 +2675,14 @@ "Type": { "target": "com.amazonaws.athena#DataCatalogType", "traits": { - "smithy.api#documentation": "

The type of data catalog to create: LAMBDA for a federated catalog,\n GLUE for an Glue Data Catalog, and HIVE for an\n external Apache Hive metastore. FEDERATED is a federated catalog for which\n Athena creates the connection and the Lambda function for\n you based on the parameters that you pass.

", + "smithy.api#documentation": "

The type of data catalog to create: LAMBDA for a federated catalog,\n HIVE for an external hive metastore, or GLUE for an\n Glue Data Catalog.

", "smithy.api#required": {} } }, "Parameters": { "target": "com.amazonaws.athena#ParametersMap", "traits": { - "smithy.api#documentation": "

Specifies the Lambda function or functions to use for the data catalog.\n This is a mapping whose values depend on the catalog type.

\n " - } - }, - "Status": { - "target": "com.amazonaws.athena#DataCatalogStatus", - "traits": { - "smithy.api#documentation": "

The status of the creation or deletion of the data catalog.

\n \n

Data catalog creation status:

\n \n

Data catalog deletion status:

\n " - } - }, - "ConnectionType": { - "target": "com.amazonaws.athena#ConnectionType", - "traits": { - "smithy.api#documentation": "

The type of connection for a FEDERATED data catalog (for example,\n REDSHIFT, MYSQL, or SQLSERVER). For\n information about individual connectors, see Available data source\n connectors.

" - } - }, - "Error": { - "target": "com.amazonaws.athena#ErrorMessage", - "traits": { - "smithy.api#documentation": "

Text of the error that occurred during data catalog creation or deletion.

" + "smithy.api#documentation": "

Specifies the Lambda function or functions to use for the data catalog.\n This is a mapping whose values depend on the catalog type.

\n " } } }, @@ -2897,65 +2690,6 @@ "smithy.api#documentation": "

Contains information about a data catalog in an Amazon Web Services account.

\n \n

In the Athena console, data catalogs are listed as \"data sources\" on\n the Data sources page under the Data source name column.

\n
" } }, - "com.amazonaws.athena#DataCatalogStatus": { - "type": "enum", - "members": { - "CREATE_IN_PROGRESS": { - "target": "smithy.api#Unit", - "traits": { - "smithy.api#enumValue": "CREATE_IN_PROGRESS" - } - }, - "CREATE_COMPLETE": { - "target": "smithy.api#Unit", - "traits": { - "smithy.api#enumValue": "CREATE_COMPLETE" - } - }, - "CREATE_FAILED": { - "target": "smithy.api#Unit", - "traits": { - "smithy.api#enumValue": "CREATE_FAILED" - } - }, - "CREATE_FAILED_CLEANUP_IN_PROGRESS": { - "target": "smithy.api#Unit", - "traits": { - "smithy.api#enumValue": "CREATE_FAILED_CLEANUP_IN_PROGRESS" - } - }, - "CREATE_FAILED_CLEANUP_COMPLETE": { - "target": "smithy.api#Unit", - "traits": { - "smithy.api#enumValue": "CREATE_FAILED_CLEANUP_COMPLETE" - } - }, - "CREATE_FAILED_CLEANUP_FAILED": { - "target": "smithy.api#Unit", - "traits": { - "smithy.api#enumValue": "CREATE_FAILED_CLEANUP_FAILED" - } - }, - "DELETE_IN_PROGRESS": { - "target": "smithy.api#Unit", - "traits": { - "smithy.api#enumValue": "DELETE_IN_PROGRESS" - } - }, - "DELETE_COMPLETE": { - "target": "smithy.api#Unit", - "traits": { - "smithy.api#enumValue": "DELETE_COMPLETE" - } - }, - "DELETE_FAILED": { - "target": "smithy.api#Unit", - "traits": { - "smithy.api#enumValue": "DELETE_FAILED" - } - } - } - }, "com.amazonaws.athena#DataCatalogSummary": { "type": "structure", "members": { @@ -2970,24 +2704,6 @@ "traits": { "smithy.api#documentation": "

The data catalog type.

" } - }, - "Status": { - "target": "com.amazonaws.athena#DataCatalogStatus", - "traits": { - "smithy.api#documentation": "

The status of the creation or deletion of the data catalog.

\n \n

Data catalog creation status:

\n \n

Data catalog deletion status:

\n " - } - }, - "ConnectionType": { - "target": "com.amazonaws.athena#ConnectionType", - "traits": { - "smithy.api#documentation": "

The type of connection for a FEDERATED data catalog (for example,\n REDSHIFT, MYSQL, or SQLSERVER). For\n information about individual connectors, see Available data source\n connectors.

" - } - }, - "Error": { - "target": "com.amazonaws.athena#ErrorMessage", - "traits": { - "smithy.api#documentation": "

Text of the error that occurred during data catalog creation or deletion.

" - } } }, "traits": { @@ -3020,12 +2736,6 @@ "traits": { "smithy.api#enumValue": "HIVE" } - }, - "FEDERATED": { - "target": "smithy.api#Unit", - "traits": { - "smithy.api#enumValue": "FEDERATED" - } } } }, @@ -3177,11 +2887,7 @@ }, "com.amazonaws.athena#DeleteDataCatalogOutput": { "type": "structure", - "members": { - "DataCatalog": { - "target": "com.amazonaws.athena#DataCatalog" - } - }, + "members": {}, "traits": { "smithy.api#output": {} } @@ -4445,7 +4151,7 @@ "UpdateCount": { "target": "com.amazonaws.athena#Long", "traits": { - "smithy.api#documentation": "

The number of rows inserted with a CREATE TABLE AS SELECT statement.\n

" + "smithy.api#documentation": "

The number of rows inserted with a CREATE TABLE AS SELECT, INSERT\n INTO, or UPDATE statement.

" } }, "ResultSet": { diff --git a/codegen/sdk-codegen/aws-models/bedrock-runtime.json b/codegen/sdk-codegen/aws-models/bedrock-runtime.json index c5ac829321b..25e1ead7b27 100644 --- a/codegen/sdk-codegen/aws-models/bedrock-runtime.json +++ b/codegen/sdk-codegen/aws-models/bedrock-runtime.json @@ -1027,7 +1027,7 @@ "min": 1, "max": 2048 }, - "smithy.api#pattern": "^(arn:aws(-[^:]+)?:bedrock:[a-z0-9-]{1,20}:(([0-9]{12}:custom-model/[a-z0-9-]{1,63}[.]{1}[a-z0-9-]{1,63}/[a-z0-9]{12})|(:foundation-model/[a-z0-9-]{1,63}[.]{1}[a-z0-9-]{1,63}([.:]?[a-z0-9-]{1,63}))|([0-9]{12}:provisioned-model/[a-z0-9]{12})|([0-9]{12}:inference-profile/[a-zA-Z0-9-:.]+)))|([a-z0-9-]{1,63}[.]{1}[a-z0-9-]{1,63}([.:]?[a-z0-9-]{1,63}))|(([0-9a-zA-Z][_-]?)+)|([a-zA-Z0-9-:.]+)$" + "smithy.api#pattern": "^(arn:aws(-[^:]+)?:bedrock:[a-z0-9-]{1,20}:(([0-9]{12}:custom-model/[a-z0-9-]{1,63}[.]{1}[a-z0-9-]{1,63}/[a-z0-9]{12})|(:foundation-model/[a-z0-9-]{1,63}[.]{1}[a-z0-9-]{1,63}([.:]?[a-z0-9-]{1,63}))|([0-9]{12}:imported-model/[a-z0-9]{12})|([0-9]{12}:provisioned-model/[a-z0-9]{12})))|([a-z0-9-]{1,63}[.]{1}[a-z0-9-]{1,63}([.:]?[a-z0-9-]{1,63}))|(([0-9a-zA-Z][_-]?)+)|(arn:aws(|-us-gov|-cn|-iso|-iso-b):bedrock:(|[0-9a-z-]{1,20}):(|[0-9]{12}):(model-gateway|inference-profile)/[a-zA-Z0-9-:.]+)|([a-zA-Z0-9-:.]+)$" } }, "com.amazonaws.bedrockruntime#Converse": { @@ -3078,7 +3078,7 @@ "min": 1, "max": 2048 }, - "smithy.api#pattern": "^(arn:aws(-[^:]+)?:bedrock:[a-z0-9-]{1,20}:(([0-9]{12}:custom-model/[a-z0-9-]{1,63}[.]{1}[a-z0-9-]{1,63}/[a-z0-9]{12})|(:foundation-model/[a-z0-9-]{1,63}[.]{1}[a-z0-9-]{1,63}([.:]?[a-z0-9-]{1,63}))|([0-9]{12}:imported-model/[a-z0-9]{12})|([0-9]{12}:provisioned-model/[a-z0-9]{12})|([0-9]{12}:inference-profile/[a-zA-Z0-9-:.]+)))|([a-z0-9-]{1,63}[.]{1}[a-z0-9-]{1,63}([.:]?[a-z0-9-]{1,63}))|(([0-9a-zA-Z][_-]?)+)|([a-zA-Z0-9-:.]+)$" + "smithy.api#pattern": "^(arn:aws(-[^:]+)?:bedrock:[a-z0-9-]{1,20}:(([0-9]{12}:custom-model/[a-z0-9-]{1,63}[.]{1}[a-z0-9-]{1,63}/[a-z0-9]{12})|(:foundation-model/[a-z0-9-]{1,63}[.]{1}[a-z0-9-]{1,63}([.:]?[a-z0-9-]{1,63}))|([0-9]{12}:imported-model/[a-z0-9]{12})|([0-9]{12}:provisioned-model/[a-z0-9]{12})))|([a-z0-9-]{1,63}[.]{1}[a-z0-9-]{1,63}([.:]?[a-z0-9-]{1,63}))|(([0-9a-zA-Z][_-]?)+)|(arn:aws(|-us-gov|-cn|-iso|-iso-b):bedrock:(|[0-9a-z-]{1,20}):(|[0-9]{12}):(model-gateway|inference-profile)/[a-zA-Z0-9-:.]+)|([a-zA-Z0-9-:.]+)$" } }, "com.amazonaws.bedrockruntime#InvokeModelRequest": { diff --git a/codegen/sdk-codegen/aws-models/bedrock.json b/codegen/sdk-codegen/aws-models/bedrock.json index 3ab16bd12fc..3fe8539ad60 100644 --- a/codegen/sdk-codegen/aws-models/bedrock.json +++ b/codegen/sdk-codegen/aws-models/bedrock.json @@ -2720,7 +2720,7 @@ "min": 1, "max": 2048 }, - "smithy.api#pattern": "^(arn:aws(-[^:]+)?:bedrock:[a-z0-9-]{1,20}:((:foundation-model/[a-z0-9-]{1,63}[.]{1}[a-z0-9-]{1,63}([.:]?[a-z0-9-]{1,63}))|([0-9]{12}:provisioned-model/[a-z0-9]{12})|([0-9]{12}:inference-profile/(([a-z]{2}.)[a-z0-9-]{1,63}[.]{1}[a-z0-9-]{1,63}([.:]?[a-z0-9-]{1,63})))))|(([a-z]{2}[.]{1})([a-z0-9-]{1,63}[.]{1}[a-z0-9-]{1,63}([.:]?[a-z0-9-]{1,63})))|([a-z0-9-]{1,63}[.]{1}[a-z0-9-]{1,63}([.:]?[a-z0-9-]{1,63}))$" + "smithy.api#pattern": "^(arn:aws(-[^:]+)?:bedrock:[a-z0-9-]{1,20}:((:foundation-model/[a-z0-9-]{1,63}[.]{1}[a-z0-9-]{1,63}([.:]?[a-z0-9-]{1,63}))|([0-9]{12}:provisioned-model/[a-z0-9]{12})|([0-9]{12}:imported-model/[a-z0-9]{12})|([0-9]{12}:inference-profile/(([a-z]{2}.)[a-z0-9-]{1,63}[.]{1}[a-z0-9-]{1,63}([.:]?[a-z0-9-]{1,63})))))|(([a-z]{2}[.]{1})([a-z0-9-]{1,63}[.]{1}[a-z0-9-]{1,63}([.:]?[a-z0-9-]{1,63})))|([a-z0-9-]{1,63}[.]{1}[a-z0-9-]{1,63}([.:]?[a-z0-9-]{1,63}))$" } }, "com.amazonaws.bedrock#EvaluationModelIdentifiers": { @@ -3757,6 +3757,12 @@ "traits": { "smithy.api#documentation": "

The imported model is encrypted at rest using this key.

" } + }, + "instructSupported": { + "target": "com.amazonaws.bedrock#InstructSupported", + "traits": { + "smithy.api#documentation": "

Specifies if the imported model supports fine tuning.

" + } } }, "traits": { @@ -6189,10 +6195,22 @@ "smithy.api#documentation": "

Creation time of the imported model.

", "smithy.api#required": {} } + }, + "instructSupported": { + "target": "com.amazonaws.bedrock#InstructSupported", + "traits": { + "smithy.api#documentation": "

Specifies if the imported model supports fine tuning.

" + } + }, + "modelArchitecture": { + "target": "com.amazonaws.bedrock#ModelArchitecture", + "traits": { + "smithy.api#documentation": "

The architecture of the imported model.

" + } } }, "traits": { - "smithy.api#documentation": "

Information about tne imported model.

" + "smithy.api#documentation": "

Information about the imported model.

" } }, "com.amazonaws.bedrock#ImportedModelSummaryList": { @@ -6410,6 +6428,9 @@ "target": "com.amazonaws.bedrock#InferenceType" } }, + "com.amazonaws.bedrock#InstructSupported": { + "type": "boolean" + }, "com.amazonaws.bedrock#InternalServerException": { "type": "structure", "members": { @@ -7866,6 +7887,9 @@ "com.amazonaws.bedrock#MetricFloat": { "type": "float" }, + "com.amazonaws.bedrock#ModelArchitecture": { + "type": "string" + }, "com.amazonaws.bedrock#ModelArn": { "type": "string", "traits": { diff --git a/codegen/sdk-codegen/aws-models/datazone.json b/codegen/sdk-codegen/aws-models/datazone.json index ad354b7cf07..19708345746 100644 --- a/codegen/sdk-codegen/aws-models/datazone.json +++ b/codegen/sdk-codegen/aws-models/datazone.json @@ -21325,6 +21325,12 @@ "traits": { "smithy.api#enumValue": "CONTRIBUTOR" } + }, + "PROJECT_CATALOG_STEWARD": { + "target": "smithy.api#Unit", + "traits": { + "smithy.api#enumValue": "PROJECT_CATALOG_STEWARD" + } } } }, @@ -28653,6 +28659,24 @@ "traits": { "smithy.api#enumValue": "PROJECT_CONTRIBUTOR" } + }, + "PROJECT_CATALOG_VIEWER": { + "target": "smithy.api#Unit", + "traits": { + "smithy.api#enumValue": "PROJECT_CATALOG_VIEWER" + } + }, + "PROJECT_CATALOG_CONSUMER": { + "target": "smithy.api#Unit", + "traits": { + "smithy.api#enumValue": "PROJECT_CATALOG_CONSUMER" + } + }, + "PROJECT_CATALOG_STEWARD": { + "target": "smithy.api#Unit", + "traits": { + "smithy.api#enumValue": "PROJECT_CATALOG_STEWARD" + } } } }, diff --git a/codegen/sdk-codegen/aws-models/ec2.json b/codegen/sdk-codegen/aws-models/ec2.json index 06e20ca53d6..e42bedff430 100644 --- a/codegen/sdk-codegen/aws-models/ec2.json +++ b/codegen/sdk-codegen/aws-models/ec2.json @@ -31699,7 +31699,7 @@ "Filters": { "target": "com.amazonaws.ec2#FilterList", "traits": { - "smithy.api#documentation": "

The filters.

\n ", + "smithy.api#documentation": "

The filters.

\n ", "smithy.api#xmlName": "Filter" } } @@ -90175,7 +90175,7 @@ } }, "KeyName": { - "target": "com.amazonaws.ec2#KeyPairName", + "target": "com.amazonaws.ec2#KeyPairNameWithResolver", "traits": { "aws.protocols#ec2QueryName": "KeyName", "smithy.api#documentation": "

The name of the key pair.

",