Skip to content

Commit

Permalink
Merge branch 'main' into jbe/sesv2_rules_based_auth
Browse files Browse the repository at this point in the history
  • Loading branch information
jbelkins committed Oct 21, 2024
2 parents e364bc7 + 8ee495d commit 5b259e3
Show file tree
Hide file tree
Showing 12 changed files with 164 additions and 675 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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 */

Expand Down
2 changes: 1 addition & 1 deletion Package.version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.0.22
1.0.23
2 changes: 1 addition & 1 deletion Package.version.next
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.0.23
1.0.24
Original file line number Diff line number Diff line change
Expand Up @@ -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).


Expand Down
428 changes: 66 additions & 362 deletions Sources/Services/AWSAthena/Sources/AWSAthena/Models.swift

Large diffs are not rendered by default.

17 changes: 16 additions & 1 deletion Sources/Services/AWSBedrock/Sources/AWSBedrock/Models.swift
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand All @@ -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,
Expand All @@ -3263,6 +3266,7 @@ public struct GetImportedModelOutput: Swift.Sendable {
)
{
self.creationTime = creationTime
self.instructSupported = instructSupported
self.jobArn = jobArn
self.jobName = jobName
self.modelArchitecture = modelArchitecture
Expand Down Expand Up @@ -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?
Expand All @@ -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
}
Expand Down Expand Up @@ -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()
Expand Down Expand Up @@ -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
}
}
Expand Down
14 changes: 13 additions & 1 deletion Sources/Services/AWSDataZone/Sources/AWSDataZone/Models.swift
Original file line number Diff line number Diff line change
Expand Up @@ -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
]
}

Expand All @@ -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
}
}
Expand Down Expand Up @@ -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
]
Expand All @@ -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
Expand Down
Loading

0 comments on commit 5b259e3

Please sign in to comment.