Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main' into jbe/spr2
Browse files Browse the repository at this point in the history
  • Loading branch information
jbelkins committed Sep 9, 2024
2 parents acab93a + 5a4fe93 commit 640eeb0
Show file tree
Hide file tree
Showing 388 changed files with 21,524 additions and 18,387 deletions.
22 changes: 11 additions & 11 deletions .github/workflows/continuous-integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,35 +21,35 @@ jobs:
- macos-14
xcode:
- Xcode_15.2
- Xcode_15.4
- Xcode_16.0
destination:
- 'platform=iOS Simulator,OS=17.2,name=iPhone 15'
- 'platform=iOS Simulator,OS=17.5,name=iPhone 15'
- 'platform=iOS Simulator,OS=18.0,name=iPhone 15'
- 'platform=tvOS Simulator,OS=17.2,name=Apple TV 4K (3rd generation) (at 1080p)'
- 'platform=tvOS Simulator,OS=17.5,name=Apple TV 4K (3rd generation) (at 1080p)'
- 'platform=tvOS Simulator,OS=18.0,name=Apple TV 4K (3rd generation) (at 1080p)'
- 'platform=visionOS Simulator,OS=1.0,name=Apple Vision Pro'
- 'platform=visionOS Simulator,OS=1.2,name=Apple Vision Pro'
- 'platform=visionOS Simulator,OS=2.0,name=Apple Vision Pro'
- 'platform=OS X'
exclude:
# Don't run old macOS with new Xcode
- runner: macos-13
xcode: Xcode_15.4
xcode: Xcode_16.0
# Don't run new macOS with old Xcode
- runner: macos-14
xcode: Xcode_15.2
# Don't run old simulators with new Xcode
- destination: 'platform=tvOS Simulator,OS=17.2,name=Apple TV 4K (3rd generation) (at 1080p)'
xcode: Xcode_15.4
xcode: Xcode_16.0
- destination: 'platform=iOS Simulator,OS=17.2,name=iPhone 15'
xcode: Xcode_15.4
xcode: Xcode_16.0
- destination: 'platform=visionOS Simulator,OS=1.0,name=Apple Vision Pro'
xcode: Xcode_15.4
xcode: Xcode_16.0
# Don't run new simulators with old Xcode
- destination: 'platform=tvOS Simulator,OS=17.5,name=Apple TV 4K (3rd generation) (at 1080p)'
- destination: 'platform=tvOS Simulator,OS=18.0,name=Apple TV 4K (3rd generation) (at 1080p)'
xcode: Xcode_15.2
- destination: 'platform=iOS Simulator,OS=17.5,name=iPhone 15'
- destination: 'platform=iOS Simulator,OS=18.0,name=iPhone 15'
xcode: Xcode_15.2
- destination: 'platform=visionOS Simulator,OS=1.2,name=Apple Vision Pro'
- destination: 'platform=visionOS Simulator,OS=2.0,name=Apple Vision Pro'
xcode: Xcode_15.2
steps:
- name: Checkout aws-sdk-swift
Expand Down
22 changes: 11 additions & 11 deletions .github/workflows/integration-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,35 +24,35 @@ jobs:
- macos-14
xcode:
- Xcode_15.2
- Xcode_15.4
- Xcode_16.0
destination:
- 'platform=iOS Simulator,OS=17.2,name=iPhone 15'
- 'platform=iOS Simulator,OS=17.5,name=iPhone 15'
- 'platform=iOS Simulator,OS=18.0,name=iPhone 15'
- 'platform=tvOS Simulator,OS=17.2,name=Apple TV 4K (3rd generation) (at 1080p)'
- 'platform=tvOS Simulator,OS=17.5,name=Apple TV 4K (3rd generation) (at 1080p)'
- 'platform=tvOS Simulator,OS=18.0,name=Apple TV 4K (3rd generation) (at 1080p)'
- 'platform=visionOS Simulator,OS=1.0,name=Apple Vision Pro'
- 'platform=visionOS Simulator,OS=1.2,name=Apple Vision Pro'
- 'platform=visionOS Simulator,OS=2.0,name=Apple Vision Pro'
- 'platform=OS X'
exclude:
# Don't run old macOS with new Xcode
- runner: macos-13
xcode: Xcode_15.4
xcode: Xcode_16.0
# Don't run new macOS with old Xcode
- runner: macos-14
xcode: Xcode_15.2
# Don't run old simulators with new Xcode
- destination: 'platform=tvOS Simulator,OS=17.2,name=Apple TV 4K (3rd generation) (at 1080p)'
xcode: Xcode_15.4
xcode: Xcode_16.0
- destination: 'platform=iOS Simulator,OS=17.2,name=iPhone 15'
xcode: Xcode_15.4
xcode: Xcode_16.0
- destination: 'platform=visionOS Simulator,OS=1.0,name=Apple Vision Pro'
xcode: Xcode_15.4
xcode: Xcode_16.0
# Don't run new simulators with old Xcode
- destination: 'platform=tvOS Simulator,OS=17.5,name=Apple TV 4K (3rd generation) (at 1080p)'
- destination: 'platform=tvOS Simulator,OS=18.0,name=Apple TV 4K (3rd generation) (at 1080p)'
xcode: Xcode_15.2
- destination: 'platform=iOS Simulator,OS=17.5,name=iPhone 15'
- destination: 'platform=iOS Simulator,OS=18.0,name=iPhone 15'
xcode: Xcode_15.2
- destination: 'platform=visionOS Simulator,OS=1.2,name=Apple Vision Pro'
- destination: 'platform=visionOS Simulator,OS=2.0,name=Apple Vision Pro'
xcode: Xcode_15.2
steps:
- name: Configure AWS Credentials for Integration Tests
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release-configuration-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ env:

jobs:
codegen-build-with-release-configuration:
runs-on: macos-14-xlarge
runs-on: macos-14
env:
DEVELOPER_DIR: /Applications/Xcode_15.4.app/Contents/Developer
steps:
Expand Down
2 changes: 1 addition & 1 deletion Package.swift
Original file line number Diff line number Diff line change
Expand Up @@ -257,7 +257,7 @@ func addResolvedTargets() {
// MARK: - Generated

addDependencies(
clientRuntimeVersion: "0.63.0",
clientRuntimeVersion: "0.65.0",
crtVersion: "0.33.0"
)

Expand Down
2 changes: 1 addition & 1 deletion Package.version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.73.0
0.75.0
Original file line number Diff line number Diff line change
Expand Up @@ -24,14 +24,8 @@ public struct Sha256TreeHashMiddleware<OperationStackInput, OperationStackOutput
context: Context
) async throws {
switch request.body {
case .data(let data):
guard let data = data else {
return
}
if !request.headers.exists(name: X_AMZ_CONTENT_SHA256_HEADER_NAME) {
let sha256 = try data.computeSHA256().encodeToHexString()
builder.withHeader(name: X_AMZ_CONTENT_SHA256_HEADER_NAME, value: sha256)
}
case .data:
break
case .stream(let stream):
let streamBytes: Data?
let currentPosition = stream.position
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ public extension Context {
get { attributes.get(key: businessMetricsKey) ?? [:] }
set(newPair) {
var combined = businessMetrics
combined.merge(newPair) { (current, new) in new }
combined.merge(newPair) { (_, new) in new }
attributes.set(key: businessMetricsKey, value: combined)
}
}
Expand Down Expand Up @@ -82,7 +82,7 @@ public let businessMetricsKey = AttributeKey<Dictionary<String, String>>(name: "
"SIGV4A_SIGNING" : "S" : Y
"RESOLVED_ACCOUNT_ID" : "T" :
*/
fileprivate func setFlagsIntoContext(
private func setFlagsIntoContext(
config: UserAgentValuesFromConfig,
context: Context
) {
Expand Down
17 changes: 9 additions & 8 deletions Sources/Services/AWSACM/Sources/AWSACM/Models.swift
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ import protocol ClientRuntime.ModeledError
@_spi(UnknownAWSHTTPServiceError) import struct AWSClientRuntime.UnknownAWSHTTPServiceError
@_spi(SmithyReadWrite) import struct SmithyReadWrite.ReadingClosureBox
@_spi(SmithyReadWrite) import struct SmithyReadWrite.WritingClosureBox
@_spi(SmithyTimestamps) import struct SmithyTimestamps.TimestampFormatter

public struct AddTagsToCertificateOutput {

Expand Down Expand Up @@ -2886,10 +2887,10 @@ extension ACMClientTypes.RenewalSummary {
static func read(from reader: SmithyJSON.Reader) throws -> ACMClientTypes.RenewalSummary {
guard reader.hasContent else { throw SmithyReadWrite.ReaderError.requiredValueNotPresent }
var value = ACMClientTypes.RenewalSummary()
value.renewalStatus = try reader["RenewalStatus"].readIfPresent()
value.domainValidationOptions = try reader["DomainValidationOptions"].readListIfPresent(memberReadingClosure: ACMClientTypes.DomainValidation.read(from:), memberNodeInfo: "member", isFlattened: false)
value.renewalStatus = try reader["RenewalStatus"].readIfPresent() ?? .sdkUnknown("")
value.domainValidationOptions = try reader["DomainValidationOptions"].readListIfPresent(memberReadingClosure: ACMClientTypes.DomainValidation.read(from:), memberNodeInfo: "member", isFlattened: false) ?? []
value.renewalStatusReason = try reader["RenewalStatusReason"].readIfPresent()
value.updatedAt = try reader["UpdatedAt"].readTimestampIfPresent(format: SmithyTimestamps.TimestampFormat.epochSeconds)
value.updatedAt = try reader["UpdatedAt"].readTimestampIfPresent(format: SmithyTimestamps.TimestampFormat.epochSeconds) ?? SmithyTimestamps.TimestampFormatter(format: .dateTime).date(from: "1970-01-01T00:00:00Z")
return value
}
}
Expand All @@ -2899,7 +2900,7 @@ extension ACMClientTypes.DomainValidation {
static func read(from reader: SmithyJSON.Reader) throws -> ACMClientTypes.DomainValidation {
guard reader.hasContent else { throw SmithyReadWrite.ReaderError.requiredValueNotPresent }
var value = ACMClientTypes.DomainValidation()
value.domainName = try reader["DomainName"].readIfPresent()
value.domainName = try reader["DomainName"].readIfPresent() ?? ""
value.validationEmails = try reader["ValidationEmails"].readListIfPresent(memberReadingClosure: SmithyReadWrite.ReadingClosures.readString(from:), memberNodeInfo: "member", isFlattened: false)
value.validationDomain = try reader["ValidationDomain"].readIfPresent()
value.validationStatus = try reader["ValidationStatus"].readIfPresent()
Expand All @@ -2914,9 +2915,9 @@ extension ACMClientTypes.ResourceRecord {
static func read(from reader: SmithyJSON.Reader) throws -> ACMClientTypes.ResourceRecord {
guard reader.hasContent else { throw SmithyReadWrite.ReaderError.requiredValueNotPresent }
var value = ACMClientTypes.ResourceRecord()
value.name = try reader["Name"].readIfPresent()
value.type = try reader["Type"].readIfPresent()
value.value = try reader["Value"].readIfPresent()
value.name = try reader["Name"].readIfPresent() ?? ""
value.type = try reader["Type"].readIfPresent() ?? .sdkUnknown("")
value.value = try reader["Value"].readIfPresent() ?? ""
return value
}
}
Expand Down Expand Up @@ -2974,7 +2975,7 @@ extension ACMClientTypes.Tag {
static func read(from reader: SmithyJSON.Reader) throws -> ACMClientTypes.Tag {
guard reader.hasContent else { throw SmithyReadWrite.ReaderError.requiredValueNotPresent }
var value = ACMClientTypes.Tag()
value.key = try reader["Key"].readIfPresent()
value.key = try reader["Key"].readIfPresent() ?? ""
value.value = try reader["Value"].readIfPresent()
return value
}
Expand Down
24 changes: 12 additions & 12 deletions Sources/Services/AWSACMPCA/Sources/AWSACMPCA/Models.swift
Original file line number Diff line number Diff line change
Expand Up @@ -681,7 +681,7 @@ extension ACMPCAClientTypes {
public var omitExtension: Swift.Bool?

public init(
omitExtension: Swift.Bool? = nil
omitExtension: Swift.Bool? = false
)
{
self.omitExtension = omitExtension
Expand Down Expand Up @@ -781,7 +781,7 @@ extension ACMPCAClientTypes {
public init(
crlDistributionPointExtensionConfiguration: ACMPCAClientTypes.CrlDistributionPointExtensionConfiguration? = nil,
customCname: Swift.String? = nil,
enabled: Swift.Bool? = nil,
enabled: Swift.Bool? = false,
expirationInDays: Swift.Int? = nil,
s3BucketName: Swift.String? = nil,
s3ObjectAcl: ACMPCAClientTypes.S3ObjectAcl? = nil
Expand All @@ -808,7 +808,7 @@ extension ACMPCAClientTypes {
public var ocspCustomCname: Swift.String?

public init(
enabled: Swift.Bool? = nil,
enabled: Swift.Bool? = false,
ocspCustomCname: Swift.String? = nil
)
{
Expand Down Expand Up @@ -1898,7 +1898,7 @@ extension ACMPCAClientTypes {
public var value: Swift.String?

public init(
critical: Swift.Bool? = nil,
critical: Swift.Bool? = false,
objectIdentifier: Swift.String? = nil,
value: Swift.String? = nil
)
Expand Down Expand Up @@ -3963,8 +3963,8 @@ extension ACMPCAClientTypes.CertificateAuthorityConfiguration {
static func read(from reader: SmithyJSON.Reader) throws -> ACMPCAClientTypes.CertificateAuthorityConfiguration {
guard reader.hasContent else { throw SmithyReadWrite.ReaderError.requiredValueNotPresent }
var value = ACMPCAClientTypes.CertificateAuthorityConfiguration()
value.keyAlgorithm = try reader["KeyAlgorithm"].readIfPresent()
value.signingAlgorithm = try reader["SigningAlgorithm"].readIfPresent()
value.keyAlgorithm = try reader["KeyAlgorithm"].readIfPresent() ?? .sdkUnknown("")
value.signingAlgorithm = try reader["SigningAlgorithm"].readIfPresent() ?? .sdkUnknown("")
value.subject = try reader["Subject"].readIfPresent(with: ACMPCAClientTypes.ASN1Subject.read(from:))
value.csrExtensions = try reader["CsrExtensions"].readIfPresent(with: ACMPCAClientTypes.CsrExtensions.read(from:))
return value
Expand Down Expand Up @@ -4045,7 +4045,7 @@ extension ACMPCAClientTypes.EdiPartyName {
static func read(from reader: SmithyJSON.Reader) throws -> ACMPCAClientTypes.EdiPartyName {
guard reader.hasContent else { throw SmithyReadWrite.ReaderError.requiredValueNotPresent }
var value = ACMPCAClientTypes.EdiPartyName()
value.partyName = try reader["PartyName"].readIfPresent()
value.partyName = try reader["PartyName"].readIfPresent() ?? ""
value.nameAssigner = try reader["NameAssigner"].readIfPresent()
return value
}
Expand Down Expand Up @@ -4105,8 +4105,8 @@ extension ACMPCAClientTypes.CustomAttribute {
static func read(from reader: SmithyJSON.Reader) throws -> ACMPCAClientTypes.CustomAttribute {
guard reader.hasContent else { throw SmithyReadWrite.ReaderError.requiredValueNotPresent }
var value = ACMPCAClientTypes.CustomAttribute()
value.objectIdentifier = try reader["ObjectIdentifier"].readIfPresent()
value.value = try reader["Value"].readIfPresent()
value.objectIdentifier = try reader["ObjectIdentifier"].readIfPresent() ?? ""
value.value = try reader["Value"].readIfPresent() ?? ""
return value
}
}
Expand All @@ -4122,8 +4122,8 @@ extension ACMPCAClientTypes.OtherName {
static func read(from reader: SmithyJSON.Reader) throws -> ACMPCAClientTypes.OtherName {
guard reader.hasContent else { throw SmithyReadWrite.ReaderError.requiredValueNotPresent }
var value = ACMPCAClientTypes.OtherName()
value.typeId = try reader["TypeId"].readIfPresent()
value.value = try reader["Value"].readIfPresent()
value.typeId = try reader["TypeId"].readIfPresent() ?? ""
value.value = try reader["Value"].readIfPresent() ?? ""
return value
}
}
Expand Down Expand Up @@ -4202,7 +4202,7 @@ extension ACMPCAClientTypes.Tag {
static func read(from reader: SmithyJSON.Reader) throws -> ACMPCAClientTypes.Tag {
guard reader.hasContent else { throw SmithyReadWrite.ReaderError.requiredValueNotPresent }
var value = ACMPCAClientTypes.Tag()
value.key = try reader["Key"].readIfPresent()
value.key = try reader["Key"].readIfPresent() ?? ""
value.value = try reader["Value"].readIfPresent()
return value
}
Expand Down
Loading

0 comments on commit 640eeb0

Please sign in to comment.