Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

chore: Add integration test for S3 operations that use Content-MD5 headers #1737

Merged
merged 6 commits into from
Sep 13, 2024
Merged

chore: Add integration test for S3 operations that use Content-MD5 headers #1737

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
5f084db
Empty commit
Sep 12, 2024
5f3e822
Add integration test using DeleteObjects API.
Sep 12, 2024
655a8ec
Mini fix for UA version; update to 2.1 from 2.0.
Sep 12, 2024
676b636
Update useragent unit tests to have ua/2.1
Sep 12, 2024
33c7c6d
Merge branch 'main' into fix/content-md5-header
sichanyoo Sep 12, 2024
9dcee4f
Merge branch 'main' into fix/content-md5-header
sichanyoo Sep 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 43 additions & 0 deletions IntegrationTests/Services/AWSS3IntegrationTests/S3ContentMD5HeaderTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
//
// Copyright Amazon.com Inc. or its affiliates.
// All Rights Reserved.
//
// SPDX-License-Identifier: Apache-2.0
//

import XCTest
import AWSS3

/// Test S3 operations that use Content-MD5 header by using S3::deleteObjects API
final class S3ContentMD5HeaderTests: S3XCTestCase {
var objectKeys: [String] = []
let objectContent = "filler-content"

override func setUp() async throws {
try await super.setUp()
// Generate 3 UUIDs to use as object keys and save them
for _ in 1...3 {
objectKeys.append("key-\(UUID().uuidString.split(separator: "-").first!.lowercased())")
}
}

func testDeleteObjects() async throws {
// Upload 3 objects
for key in objectKeys {
try await putObject(body: objectContent, key: key)
}

// Delete the 3 objects at once using DeleteObjects
let input = DeleteObjectsInput(
bucket: bucketName,
delete: S3ClientTypes.Delete(
objects: objectKeys.map { S3ClientTypes.ObjectIdentifier(key: $0) }
)
)
let result = try await client.deleteObjects(input: input)

// Confirm all deletions succeeded
XCTAssertNil(result.errors)
XCTAssertEqual(result.deleted?.count, objectKeys.count)
}
}
2 changes: 1 addition & 1 deletion Sources/Core/AWSClientRuntime/Sources/AWSClientRuntime/UserAgent/UserAgentMetadata.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,6 @@ struct UserAgentMetadata {}
extension UserAgentMetadata: CustomStringConvertible {

var description: String {
"ua/2.0"
"ua/2.1"
}
}
28 changes: 14 additions & 14 deletions ...re/AWSClientRuntime/Tests/AWSClientRuntimeTests/UserAgent/AWSUserAgentMetadataTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ class AWSUseragentMetadataTests: XCTestCase {
apiMetadata: apiMetadata,
osMetadata: osMetadata,
languageMetadata: languageMetadata)
XCTAssertEqual("aws-sdk-swift/0.0.1 ua/2.0 api/meow#1.1 os/ios#13.1 md/simulator lang/swift#5.0", sut.userAgent)
XCTAssertEqual("aws-sdk-swift/0.0.1 ua/2.1 api/meow#1.1 os/ios#13.1 md/simulator lang/swift#5.0", sut.userAgent)
}
#else
func testHappyPathMinimum() {
Expand All @@ -32,7 +32,7 @@ class AWSUseragentMetadataTests: XCTestCase {
osMetadata: osMetadata,
languageMetadata: languageMetadata)

XCTAssertEqual("aws-sdk-swift/0.0.1 ua/2.0 api/meow#1.1 os/ios#13.1 lang/swift#5.0", sut.userAgent)
XCTAssertEqual("aws-sdk-swift/0.0.1 ua/2.1 api/meow#1.1 os/ios#13.1 lang/swift#5.0", sut.userAgent)
}

func testWithLanguageMetadataExtras() {
Expand All @@ -43,7 +43,7 @@ class AWSUseragentMetadataTests: XCTestCase {
osMetadata: osMetadata,
languageMetadata: languageMetadataWithExtras)

XCTAssertEqual("aws-sdk-swift/0.0.1 ua/2.0 api/meow#1.1 os/ios#13.1 lang/swift#5.0 md/test1#1.2.3", sut.userAgent)
XCTAssertEqual("aws-sdk-swift/0.0.1 ua/2.1 api/meow#1.1 os/ios#13.1 lang/swift#5.0 md/test1#1.2.3", sut.userAgent)
}

func testWithExecutionEnv() {
Expand All @@ -53,7 +53,7 @@ class AWSUseragentMetadataTests: XCTestCase {
languageMetadata: languageMetadata,
executionEnvMetadata: executionEnvMetadata)

XCTAssertEqual("aws-sdk-swift/0.0.1 ua/2.0 api/meow#1.1 os/ios#13.1 lang/swift#5.0 exec-env/e123", sut.userAgent)
XCTAssertEqual("aws-sdk-swift/0.0.1 ua/2.1 api/meow#1.1 os/ios#13.1 lang/swift#5.0 exec-env/e123", sut.userAgent)
}

func testWithLanguageMetadataExtrasAndExecutionEnv() {
Expand All @@ -65,7 +65,7 @@ class AWSUseragentMetadataTests: XCTestCase {
languageMetadata: languageMetadataWithExtras,
executionEnvMetadata: executionEnvMetadata)

XCTAssertEqual("aws-sdk-swift/0.0.1 ua/2.0 api/meow#1.1 os/ios#13.1 lang/swift#5.0 md/test1#1.2.3 exec-env/e123", sut.userAgent)
XCTAssertEqual("aws-sdk-swift/0.0.1 ua/2.1 api/meow#1.1 os/ios#13.1 lang/swift#5.0 md/test1#1.2.3 exec-env/e123", sut.userAgent)
}

func testWithLanguageMetadataExtrasAndExecutionEnvWithFramework() {
Expand All @@ -78,7 +78,7 @@ class AWSUseragentMetadataTests: XCTestCase {
executionEnvMetadata: executionEnvMetadata,
frameworkMetadata: frameworkMetadata)

XCTAssertEqual("aws-sdk-swift/0.0.1 ua/2.0 api/meow#1.1 os/ios#13.1 lang/swift#5.0 md/test1#1.2.3 exec-env/e123 lib/aws-amplify#2.0.1", sut.userAgent)
XCTAssertEqual("aws-sdk-swift/0.0.1 ua/2.1 api/meow#1.1 os/ios#13.1 lang/swift#5.0 md/test1#1.2.3 exec-env/e123 lib/aws-amplify#2.0.1", sut.userAgent)
}

func testWithLanguageMetadataExtrasAndExecutionEnvWithFrameworkExtras() {
Expand All @@ -93,7 +93,7 @@ class AWSUseragentMetadataTests: XCTestCase {
executionEnvMetadata: executionEnvMetadata,
frameworkMetadata: frameworkMetadataWithExtras)

XCTAssertEqual("aws-sdk-swift/0.0.1 ua/2.0 api/meow#1.1 os/ios#13.1 lang/swift#5.0 md/test1#1.2.3 exec-env/e123 lib/aws-amplify#2.0.1 md/f1#c1", sut.userAgent)
XCTAssertEqual("aws-sdk-swift/0.0.1 ua/2.1 api/meow#1.1 os/ios#13.1 lang/swift#5.0 md/test1#1.2.3 exec-env/e123 lib/aws-amplify#2.0.1 md/f1#c1", sut.userAgent)
}

func testUserAgent() {
Expand All @@ -109,19 +109,19 @@ class AWSUseragentMetadataTests: XCTestCase {
var expected: String = ""
switch currentOS {
case .linux:
expected = "aws-sdk-swift/1.2.3 ua/2.0 api/test_service#1.2.3 os/linux#11.4 lang/swift#9.9"
expected = "aws-sdk-swift/1.2.3 ua/2.1 api/test_service#1.2.3 os/linux#11.4 lang/swift#9.9"
case .macOS:
expected = "aws-sdk-swift/1.2.3 ua/2.0 api/test_service#1.2.3 os/macos#11.4 lang/swift#9.9"
expected = "aws-sdk-swift/1.2.3 ua/2.1 api/test_service#1.2.3 os/macos#11.4 lang/swift#9.9"
case .iOS:
expected = "aws-sdk-swift/1.2.3 ua/2.0 api/test_service#1.2.3 os/ios#11.4 lang/swift#9.9"
expected = "aws-sdk-swift/1.2.3 ua/2.1 api/test_service#1.2.3 os/ios#11.4 lang/swift#9.9"
case .tvOS:
expected = "aws-sdk-swift/1.2.3 ua/2.0 api/test_service#1.2.3 os/tvos#11.4 lang/swift#9.9"
expected = "aws-sdk-swift/1.2.3 ua/2.1 api/test_service#1.2.3 os/tvos#11.4 lang/swift#9.9"
case .visionOS:
expected = "aws-sdk-swift/1.2.3 ua/2.0 api/test_service#1.2.3 os/visionos#11.4 lang/swift#9.9"
expected = "aws-sdk-swift/1.2.3 ua/2.1 api/test_service#1.2.3 os/visionos#11.4 lang/swift#9.9"
case .watchOS:
expected = "aws-sdk-swift/1.2.3 ua/2.0 api/test_service#1.2.3 os/watchos#11.4 lang/swift#9.9"
expected = "aws-sdk-swift/1.2.3 ua/2.1 api/test_service#1.2.3 os/watchos#11.4 lang/swift#9.9"
case .unknown:
expected = "aws-sdk-swift/1.2.3 ua/2.0 api/test_service#1.2.3 os/unknown#11.4 lang/swift#9.9"
expected = "aws-sdk-swift/1.2.3 ua/2.1 api/test_service#1.2.3 os/unknown#11.4 lang/swift#9.9"
default:
XCTFail("Unexpected OS")
}
Expand Down
2 changes: 1 addition & 1 deletion .../Core/AWSClientRuntime/Tests/AWSClientRuntimeTests/UserAgent/UserAgentMetadataTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,6 @@ class UserAgentMetadataTests: XCTestCase {

func test_description_isAsExpected() {
let subject = UserAgentMetadata()
XCTAssertEqual(subject.description, "ua/2.0")
XCTAssertEqual(subject.description, "ua/2.1")
}
}
Loading