diff --git a/IntegrationTests/Services/AWSS3IntegrationTests/S3ConcurrentTests.swift b/IntegrationTests/Services/AWSS3IntegrationTests/S3ConcurrentTests.swift index 75b4953d3bb..1c2ae4e8fe8 100644 --- a/IntegrationTests/Services/AWSS3IntegrationTests/S3ConcurrentTests.swift +++ b/IntegrationTests/Services/AWSS3IntegrationTests/S3ConcurrentTests.swift @@ -16,6 +16,7 @@ class S3ConcurrentTests: S3XCTestCase { public var fileData: Data! let MEGABYTE: Double = 1_000_000 + #if !os(macOS) && !os(iOS) && !os(tvOS) // Payload below 1,048,576 bytes; sends as simple data payload func test_20x_1MB_getObject() async throws { fileData = try generateDummyTextData(numMegabytes: MEGABYTE) @@ -27,6 +28,7 @@ class S3ConcurrentTests: S3XCTestCase { fileData = try generateDummyTextData(numMegabytes: MEGABYTE * 1.5) try await repeatConcurrentlyWithArgs(count: 20, test: getObject, args: fileData!) } + #endif /* Helper functions */ diff --git a/Package.version b/Package.version index 2fa39017939..1c2de38aad8 100644 --- a/Package.version +++ b/Package.version @@ -1 +1 @@ -1.0.22 \ No newline at end of file +1.0.23 \ No newline at end of file diff --git a/Package.version.next b/Package.version.next index 1c2de38aad8..321816a02d1 100644 --- a/Package.version.next +++ b/Package.version.next @@ -1 +1 @@ -1.0.23 \ No newline at end of file +1.0.24 \ No newline at end of file diff --git a/Sources/Core/AWSSDKForSwift/Documentation.docc/AWSSDKForSwift.md b/Sources/Core/AWSSDKForSwift/Documentation.docc/AWSSDKForSwift.md index 03e214b1a75..34f2b35a440 100644 --- a/Sources/Core/AWSSDKForSwift/Documentation.docc/AWSSDKForSwift.md +++ b/Sources/Core/AWSSDKForSwift/Documentation.docc/AWSSDKForSwift.md @@ -4,6 +4,8 @@ A pure-Swift SDK for accessing all published AWS services. ## Overview +**The AWS SDK for Swift is currently in developer preview and is intended strictly for feedback purposes only. Do not use this SDK for production workloads. Refer to the SDK [stability guidelines](docs/stability.md) for more detail.** + This SDK is open-source. Code is available on Github [here](https://github.com/awslabs/aws-sdk-swift). diff --git a/Sources/Services/AWSAthena/Sources/AWSAthena/Models.swift b/Sources/Services/AWSAthena/Sources/AWSAthena/Models.swift index af03f9fd558..581f4a7aae7 100644 --- a/Sources/Services/AWSAthena/Sources/AWSAthena/Models.swift +++ b/Sources/Services/AWSAthena/Sources/AWSAthena/Models.swift @@ -54,9 +54,9 @@ extension AthenaClientTypes { extension AthenaClientTypes { - /// 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](https://docs.aws.amazon.com/AmazonS3/latest/userguide/about-object-ownership.html#object-ownership-overview) 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](https://docs.aws.amazon.com/AmazonS3/latest/userguide/about-object-ownership.html#object-ownership-overview) in the Amazon S3 User Guide. public struct AclConfiguration: Swift.Sendable { - /// 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](https://docs.aws.amazon.com/AmazonS3/latest/userguide/acl-overview.html#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](https://docs.aws.amazon.com/AmazonS3/latest/userguide/acl-overview.html#canned-acl) in the Amazon S3 User Guide. /// This member is required. public var s3AclOption: AthenaClientTypes.S3AclOption? @@ -901,7 +901,6 @@ public struct CreateCapacityReservationOutput: Swift.Sendable { extension AthenaClientTypes { public enum DataCatalogType: Swift.Sendable, Swift.Equatable, Swift.RawRepresentable, Swift.CaseIterable, Swift.Hashable { - case federated case glue case hive case lambda @@ -909,7 +908,6 @@ extension AthenaClientTypes { public static var allCases: [DataCatalogType] { return [ - .federated, .glue, .hive, .lambda @@ -923,7 +921,6 @@ extension AthenaClientTypes { public var rawValue: Swift.String { switch self { - case .federated: return "FEDERATED" case .glue: return "GLUE" case .hive: return "HIVE" case .lambda: return "LAMBDA" @@ -955,21 +952,10 @@ public struct CreateDataCatalogInput: Swift.Sendable { /// * 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: - /// - /// * 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:"" For , 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\"}" public var parameters: [Swift.String: Swift.String]? /// A list of comma separated tags to add to the data catalog that is created. public var tags: [AthenaClientTypes.Tag]? - /// 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. /// This member is required. public var type: AthenaClientTypes.DataCatalogType? @@ -989,273 +975,9 @@ public struct CreateDataCatalogInput: Swift.Sendable { } } -extension AthenaClientTypes { - - public enum ConnectionType: Swift.Sendable, Swift.Equatable, Swift.RawRepresentable, Swift.CaseIterable, Swift.Hashable { - case bigquery - case clouderahive - case clouderaimpala - case cloudwatch - case cloudwatchmetrics - case cmdb - case datalakegen2 - case db2 - case db2as400 - case documentdb - case dynamodb - case googlecloudstorage - case hbase - case hortonworkshive - case msk - case mysql - case neptune - case opensearch - case oracle - case postgresql - case redis - case redshift - case saphana - case snowflake - case sqlserver - case synapse - case teradata - case timestream - case tpcds - case vertica - case sdkUnknown(Swift.String) - - public static var allCases: [ConnectionType] { - return [ - .bigquery, - .clouderahive, - .clouderaimpala, - .cloudwatch, - .cloudwatchmetrics, - .cmdb, - .datalakegen2, - .db2, - .db2as400, - .documentdb, - .dynamodb, - .googlecloudstorage, - .hbase, - .hortonworkshive, - .msk, - .mysql, - .neptune, - .opensearch, - .oracle, - .postgresql, - .redis, - .redshift, - .saphana, - .snowflake, - .sqlserver, - .synapse, - .teradata, - .timestream, - .tpcds, - .vertica - ] - } - - public init?(rawValue: Swift.String) { - let value = Self.allCases.first(where: { $0.rawValue == rawValue }) - self = value ?? Self.sdkUnknown(rawValue) - } - - public var rawValue: Swift.String { - switch self { - case .bigquery: return "BIGQUERY" - case .clouderahive: return "CLOUDERAHIVE" - case .clouderaimpala: return "CLOUDERAIMPALA" - case .cloudwatch: return "CLOUDWATCH" - case .cloudwatchmetrics: return "CLOUDWATCHMETRICS" - case .cmdb: return "CMDB" - case .datalakegen2: return "DATALAKEGEN2" - case .db2: return "DB2" - case .db2as400: return "DB2AS400" - case .documentdb: return "DOCUMENTDB" - case .dynamodb: return "DYNAMODB" - case .googlecloudstorage: return "GOOGLECLOUDSTORAGE" - case .hbase: return "HBASE" - case .hortonworkshive: return "HORTONWORKSHIVE" - case .msk: return "MSK" - case .mysql: return "MYSQL" - case .neptune: return "NEPTUNE" - case .opensearch: return "OPENSEARCH" - case .oracle: return "ORACLE" - case .postgresql: return "POSTGRESQL" - case .redis: return "REDIS" - case .redshift: return "REDSHIFT" - case .saphana: return "SAPHANA" - case .snowflake: return "SNOWFLAKE" - case .sqlserver: return "SQLSERVER" - case .synapse: return "SYNAPSE" - case .teradata: return "TERADATA" - case .timestream: return "TIMESTREAM" - case .tpcds: return "TPCDS" - case .vertica: return "VERTICA" - case let .sdkUnknown(s): return s - } - } - } -} - -extension AthenaClientTypes { - - public enum DataCatalogStatus: Swift.Sendable, Swift.Equatable, Swift.RawRepresentable, Swift.CaseIterable, Swift.Hashable { - case createComplete - case createFailed - case createFailedCleanupComplete - case createFailedCleanupFailed - case createFailedCleanupInProgress - case createInProgress - case deleteComplete - case deleteFailed - case deleteInProgress - case sdkUnknown(Swift.String) - - public static var allCases: [DataCatalogStatus] { - return [ - .createComplete, - .createFailed, - .createFailedCleanupComplete, - .createFailedCleanupFailed, - .createFailedCleanupInProgress, - .createInProgress, - .deleteComplete, - .deleteFailed, - .deleteInProgress - ] - } - - public init?(rawValue: Swift.String) { - let value = Self.allCases.first(where: { $0.rawValue == rawValue }) - self = value ?? Self.sdkUnknown(rawValue) - } - - public var rawValue: Swift.String { - switch self { - case .createComplete: return "CREATE_COMPLETE" - case .createFailed: return "CREATE_FAILED" - case .createFailedCleanupComplete: return "CREATE_FAILED_CLEANUP_COMPLETE" - case .createFailedCleanupFailed: return "CREATE_FAILED_CLEANUP_FAILED" - case .createFailedCleanupInProgress: return "CREATE_FAILED_CLEANUP_IN_PROGRESS" - case .createInProgress: return "CREATE_IN_PROGRESS" - case .deleteComplete: return "DELETE_COMPLETE" - case .deleteFailed: return "DELETE_FAILED" - case .deleteInProgress: return "DELETE_IN_PROGRESS" - case let .sdkUnknown(s): return s - } - } - } -} - -extension AthenaClientTypes { - - /// 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. - public struct DataCatalog: Swift.Sendable { - /// 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](https://docs.aws.amazon.com/athena/latest/ug/connectors-available.html). - public var connectionType: AthenaClientTypes.ConnectionType? - /// An optional description of the data catalog. - public var description: Swift.String? - /// Text of the error that occurred during data catalog creation or deletion. - public var error: Swift.String? - /// The name of the data catalog. The catalog name must be unique for the Amazon Web Services account and can use a maximum of 127 alphanumeric, underscore, at sign, or hyphen characters. The remainder of the length constraint of 256 is reserved for use by Athena. - /// This member is required. - public var name: Swift.String? - /// 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: - /// - /// * connection-type:MYSQL|REDSHIFT|...., connection-properties:"" For , 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\"}" - public var parameters: [Swift.String: Swift.String]? - /// 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. - public var status: AthenaClientTypes.DataCatalogStatus? - /// 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. - /// This member is required. - public var type: AthenaClientTypes.DataCatalogType? - - public init( - connectionType: AthenaClientTypes.ConnectionType? = nil, - description: Swift.String? = nil, - error: Swift.String? = nil, - name: Swift.String? = nil, - parameters: [Swift.String: Swift.String]? = nil, - status: AthenaClientTypes.DataCatalogStatus? = nil, - type: AthenaClientTypes.DataCatalogType? = nil - ) - { - self.connectionType = connectionType - self.description = description - self.error = error - self.name = name - self.parameters = parameters - self.status = status - self.type = type - } - } -} - public struct CreateDataCatalogOutput: Swift.Sendable { - /// 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. - public var dataCatalog: AthenaClientTypes.DataCatalog? - public init( - dataCatalog: AthenaClientTypes.DataCatalog? = nil - ) - { - self.dataCatalog = dataCatalog - } + public init() { } } public struct CreateNamedQueryInput: Swift.Sendable { @@ -1649,15 +1371,8 @@ public struct DeleteDataCatalogInput: Swift.Sendable { } public struct DeleteDataCatalogOutput: Swift.Sendable { - /// 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. - public var dataCatalog: AthenaClientTypes.DataCatalog? - public init( - dataCatalog: AthenaClientTypes.DataCatalog? = nil - ) - { - self.dataCatalog = dataCatalog - } + public init() { } } public struct DeleteNamedQueryInput: Swift.Sendable { @@ -2394,6 +2109,51 @@ public struct GetDataCatalogInput: Swift.Sendable { } } +extension AthenaClientTypes { + + /// 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. + public struct DataCatalog: Swift.Sendable { + /// An optional description of the data catalog. + public var description: Swift.String? + /// The name of the data catalog. The catalog name must be unique for the Amazon Web Services account and can use a maximum of 127 alphanumeric, underscore, at sign, or hyphen characters. The remainder of the length constraint of 256 is reserved for use by Athena. + /// This member is required. + public var name: Swift.String? + /// 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. + public var parameters: [Swift.String: Swift.String]? + /// 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. + /// This member is required. + public var type: AthenaClientTypes.DataCatalogType? + + public init( + description: Swift.String? = nil, + name: Swift.String? = nil, + parameters: [Swift.String: Swift.String]? = nil, + type: AthenaClientTypes.DataCatalogType? = nil + ) + { + self.description = description + self.name = name + self.parameters = parameters + self.type = type + } + } +} + public struct GetDataCatalogOutput: Swift.Sendable { /// The data catalog returned. public var dataCatalog: AthenaClientTypes.DataCatalog? @@ -2691,7 +2451,7 @@ public struct GetQueryResultsOutput: Swift.Sendable { public var nextToken: Swift.String? /// The results of the query execution. public var resultSet: AthenaClientTypes.ResultSet? - /// 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. public var updateCount: Swift.Int? public init( @@ -3489,55 +3249,15 @@ extension AthenaClientTypes { public struct DataCatalogSummary: Swift.Sendable { /// The name of the data catalog. The catalog name is unique for the Amazon Web Services account and can use a maximum of 127 alphanumeric, underscore, at sign, or hyphen characters. The remainder of the length constraint of 256 is reserved for use by Athena. public var catalogName: Swift.String? - /// 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](https://docs.aws.amazon.com/athena/latest/ug/connectors-available.html). - public var connectionType: AthenaClientTypes.ConnectionType? - /// Text of the error that occurred during data catalog creation or deletion. - public var error: Swift.String? - /// 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. - public var status: AthenaClientTypes.DataCatalogStatus? /// The data catalog type. public var type: AthenaClientTypes.DataCatalogType? public init( catalogName: Swift.String? = nil, - connectionType: AthenaClientTypes.ConnectionType? = nil, - error: Swift.String? = nil, - status: AthenaClientTypes.DataCatalogStatus? = nil, type: AthenaClientTypes.DataCatalogType? = nil ) { self.catalogName = catalogName - self.connectionType = connectionType - self.error = error - self.status = status self.type = type } } @@ -6165,12 +5885,7 @@ extension CreateCapacityReservationOutput { extension CreateDataCatalogOutput { static func httpOutput(from httpResponse: SmithyHTTPAPI.HTTPResponse) async throws -> CreateDataCatalogOutput { - let data = try await httpResponse.data() - let responseReader = try SmithyJSON.Reader.from(data: data) - let reader = responseReader - var value = CreateDataCatalogOutput() - value.dataCatalog = try reader["DataCatalog"].readIfPresent(with: AthenaClientTypes.DataCatalog.read(from:)) - return value + return CreateDataCatalogOutput() } } @@ -6236,12 +5951,7 @@ extension DeleteCapacityReservationOutput { extension DeleteDataCatalogOutput { static func httpOutput(from httpResponse: SmithyHTTPAPI.HTTPResponse) async throws -> DeleteDataCatalogOutput { - let data = try await httpResponse.data() - let responseReader = try SmithyJSON.Reader.from(data: data) - let reader = responseReader - var value = DeleteDataCatalogOutput() - value.dataCatalog = try reader["DataCatalog"].readIfPresent(with: AthenaClientTypes.DataCatalog.read(from:)) - return value + return DeleteDataCatalogOutput() } } @@ -8286,22 +7996,6 @@ extension AthenaClientTypes.UnprocessedQueryExecutionId { } } -extension AthenaClientTypes.DataCatalog { - - static func read(from reader: SmithyJSON.Reader) throws -> AthenaClientTypes.DataCatalog { - guard reader.hasContent else { throw SmithyReadWrite.ReaderError.requiredValueNotPresent } - var value = AthenaClientTypes.DataCatalog() - value.name = try reader["Name"].readIfPresent() ?? "" - value.description = try reader["Description"].readIfPresent() - value.type = try reader["Type"].readIfPresent() ?? .sdkUnknown("") - value.parameters = try reader["Parameters"].readMapIfPresent(valueReadingClosure: SmithyReadWrite.ReadingClosures.readString(from:), keyNodeInfo: "key", valueNodeInfo: "value", isFlattened: false) - value.status = try reader["Status"].readIfPresent() - value.connectionType = try reader["ConnectionType"].readIfPresent() - value.error = try reader["Error"].readIfPresent() - return value - } -} - extension AthenaClientTypes.NotebookMetadata { static func read(from reader: SmithyJSON.Reader) throws -> AthenaClientTypes.NotebookMetadata { @@ -8421,6 +8115,19 @@ extension AthenaClientTypes.Database { } } +extension AthenaClientTypes.DataCatalog { + + static func read(from reader: SmithyJSON.Reader) throws -> AthenaClientTypes.DataCatalog { + guard reader.hasContent else { throw SmithyReadWrite.ReaderError.requiredValueNotPresent } + var value = AthenaClientTypes.DataCatalog() + value.name = try reader["Name"].readIfPresent() ?? "" + value.description = try reader["Description"].readIfPresent() + value.type = try reader["Type"].readIfPresent() ?? .sdkUnknown("") + value.parameters = try reader["Parameters"].readMapIfPresent(valueReadingClosure: SmithyReadWrite.ReadingClosures.readString(from:), keyNodeInfo: "key", valueNodeInfo: "value", isFlattened: false) + return value + } +} + extension AthenaClientTypes.ResultSet { static func read(from reader: SmithyJSON.Reader) throws -> AthenaClientTypes.ResultSet { @@ -8755,9 +8462,6 @@ extension AthenaClientTypes.DataCatalogSummary { var value = AthenaClientTypes.DataCatalogSummary() value.catalogName = try reader["CatalogName"].readIfPresent() value.type = try reader["Type"].readIfPresent() - value.status = try reader["Status"].readIfPresent() - value.connectionType = try reader["ConnectionType"].readIfPresent() - value.error = try reader["Error"].readIfPresent() return value } } diff --git a/Sources/Services/AWSBedrock/Sources/AWSBedrock/Models.swift b/Sources/Services/AWSBedrock/Sources/AWSBedrock/Models.swift index 4f5d79f241c..7eff5b3f795 100644 --- a/Sources/Services/AWSBedrock/Sources/AWSBedrock/Models.swift +++ b/Sources/Services/AWSBedrock/Sources/AWSBedrock/Models.swift @@ -3236,6 +3236,8 @@ public struct GetImportedModelInput: Swift.Sendable { public struct GetImportedModelOutput: Swift.Sendable { /// Creation time of the imported model. public var creationTime: Foundation.Date? + /// Specifies if the imported model supports fine tuning. + public var instructSupported: Swift.Bool? /// Job Amazon Resource Name (ARN) associated with the imported model. public var jobArn: Swift.String? /// Job name associated with the imported model. @@ -3253,6 +3255,7 @@ public struct GetImportedModelOutput: Swift.Sendable { public init( creationTime: Foundation.Date? = nil, + instructSupported: Swift.Bool? = nil, jobArn: Swift.String? = nil, jobName: Swift.String? = nil, modelArchitecture: Swift.String? = nil, @@ -3263,6 +3266,7 @@ public struct GetImportedModelOutput: Swift.Sendable { ) { self.creationTime = creationTime + self.instructSupported = instructSupported self.jobArn = jobArn self.jobName = jobName self.modelArchitecture = modelArchitecture @@ -3442,11 +3446,15 @@ public struct ListImportedModelsInput: Swift.Sendable { extension BedrockClientTypes { - /// Information about tne imported model. + /// Information about the imported model. public struct ImportedModelSummary: Swift.Sendable { /// Creation time of the imported model. /// This member is required. public var creationTime: Foundation.Date? + /// Specifies if the imported model supports fine tuning. + public var instructSupported: Swift.Bool? + /// The architecture of the imported model. + public var modelArchitecture: Swift.String? /// The Amazon Resource Name (ARN) of the imported model. /// This member is required. public var modelArn: Swift.String? @@ -3456,11 +3464,15 @@ extension BedrockClientTypes { public init( creationTime: Foundation.Date? = nil, + instructSupported: Swift.Bool? = nil, + modelArchitecture: Swift.String? = nil, modelArn: Swift.String? = nil, modelName: Swift.String? = nil ) { self.creationTime = creationTime + self.instructSupported = instructSupported + self.modelArchitecture = modelArchitecture self.modelArn = modelArn self.modelName = modelName } @@ -6812,6 +6824,7 @@ extension GetImportedModelOutput { let reader = responseReader var value = GetImportedModelOutput() value.creationTime = try reader["creationTime"].readTimestampIfPresent(format: SmithyTimestamps.TimestampFormat.dateTime) + value.instructSupported = try reader["instructSupported"].readIfPresent() value.jobArn = try reader["jobArn"].readIfPresent() value.jobName = try reader["jobName"].readIfPresent() value.modelArchitecture = try reader["modelArchitecture"].readIfPresent() @@ -8953,6 +8966,8 @@ extension BedrockClientTypes.ImportedModelSummary { value.modelArn = try reader["modelArn"].readIfPresent() ?? "" value.modelName = try reader["modelName"].readIfPresent() ?? "" value.creationTime = try reader["creationTime"].readTimestampIfPresent(format: SmithyTimestamps.TimestampFormat.dateTime) ?? SmithyTimestamps.TimestampFormatter(format: .dateTime).date(from: "1970-01-01T00:00:00Z") + value.instructSupported = try reader["instructSupported"].readIfPresent() + value.modelArchitecture = try reader["modelArchitecture"].readIfPresent() return value } } diff --git a/Sources/Services/AWSDataZone/Sources/AWSDataZone/Models.swift b/Sources/Services/AWSDataZone/Sources/AWSDataZone/Models.swift index 7c264aeb02d..f95078495bd 100644 --- a/Sources/Services/AWSDataZone/Sources/AWSDataZone/Models.swift +++ b/Sources/Services/AWSDataZone/Sources/AWSDataZone/Models.swift @@ -1268,12 +1268,14 @@ extension DataZoneClientTypes { public enum ProjectDesignation: Swift.Sendable, Swift.Equatable, Swift.RawRepresentable, Swift.CaseIterable, Swift.Hashable { case contributor case owner + case projectCatalogSteward case sdkUnknown(Swift.String) public static var allCases: [ProjectDesignation] { return [ .contributor, - .owner + .owner, + .projectCatalogSteward ] } @@ -1286,6 +1288,7 @@ extension DataZoneClientTypes { switch self { case .contributor: return "CONTRIBUTOR" case .owner: return "OWNER" + case .projectCatalogSteward: return "PROJECT_CATALOG_STEWARD" case let .sdkUnknown(s): return s } } @@ -6295,12 +6298,18 @@ extension CreateProjectOutput: Swift.CustomDebugStringConvertible { extension DataZoneClientTypes { public enum UserDesignation: Swift.Sendable, Swift.Equatable, Swift.RawRepresentable, Swift.CaseIterable, Swift.Hashable { + case projectCatalogConsumer + case projectCatalogSteward + case projectCatalogViewer case projectContributor case projectOwner case sdkUnknown(Swift.String) public static var allCases: [UserDesignation] { return [ + .projectCatalogConsumer, + .projectCatalogSteward, + .projectCatalogViewer, .projectContributor, .projectOwner ] @@ -6313,6 +6322,9 @@ extension DataZoneClientTypes { public var rawValue: Swift.String { switch self { + case .projectCatalogConsumer: return "PROJECT_CATALOG_CONSUMER" + case .projectCatalogSteward: return "PROJECT_CATALOG_STEWARD" + case .projectCatalogViewer: return "PROJECT_CATALOG_VIEWER" case .projectContributor: return "PROJECT_CONTRIBUTOR" case .projectOwner: return "PROJECT_OWNER" case let .sdkUnknown(s): return s 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.

",