From a5214e18f3a627c620c4a99410e6c613ef20ec57 Mon Sep 17 00:00:00 2001 From: Adam Fowler Date: Mon, 16 Dec 2024 17:13:47 +0000 Subject: [PATCH] Copy logger to new AWSClient --- Sources/Soto/Extensions/S3/S3ExpressSigning.swift | 3 ++- Tests/SotoTests/Services/S3/S3Tests.swift | 12 +++++++----- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/Sources/Soto/Extensions/S3/S3ExpressSigning.swift b/Sources/Soto/Extensions/S3/S3ExpressSigning.swift index db4ff386aa..4aa05ac9ea 100644 --- a/Sources/Soto/Extensions/S3/S3ExpressSigning.swift +++ b/Sources/Soto/Extensions/S3/S3ExpressSigning.swift @@ -141,7 +141,8 @@ extension S3 { let client = AWSClient( credentialProvider: .s3Express(bucket: bucket, s3: self), middleware: S3ExpressSigningFixupMiddleware(), - httpClient: self.client.httpClient + httpClient: self.client.httpClient, + logger: self.client.logger ) let s3 = S3(client: client, region: self.region, timeout: self.config.timeout, options: self.config.options) return (client, s3) diff --git a/Tests/SotoTests/Services/S3/S3Tests.swift b/Tests/SotoTests/Services/S3/S3Tests.swift index 7296770265..a3d0757189 100644 --- a/Tests/SotoTests/Services/S3/S3Tests.swift +++ b/Tests/SotoTests/Services/S3/S3Tests.swift @@ -594,28 +594,30 @@ class S3Tests: XCTestCase { createBucketConfiguration: .init( bucket: .init(dataRedundancy: .singleAvailabilityZone, type: .directory), location: .init(name: "use1-az6", type: .availabilityZone) - ) + ), + logger: TestEnvironment.logger ) try await Self.s3.waitUntilBucketExists(.init(bucket: bucket), logger: TestEnvironment.logger) } catch let error as S3ErrorType where error == .bucketAlreadyOwnedByYou {} try await withTeardown { let (client, expressS3) = Self.s3.createS3ExpressClientAndService(bucket: bucket) try await withTeardown { - let putResponse = try await expressS3.putObject( body: .init(buffer: ByteBuffer(string: "Uploaded")), bucket: bucket, - key: "test-file" + key: "test-file", + logger: TestEnvironment.logger ) print(putResponse) let getResponse = try await expressS3.getObject( bucket: bucket, - key: "test-file" + key: "test-file", + logger: TestEnvironment.logger ) let body = try await getResponse.body.collect(upTo: .max) XCTAssertEqual(body, ByteBuffer(string: "Uploaded")) - _ = try await expressS3.deleteObject(bucket: bucket, key: "test-file") + _ = try await expressS3.deleteObject(bucket: bucket, key: "test-file", logger: TestEnvironment.logger) } teardown: { try? await client.shutdown() }