Merge branch 'main' into day/initial-response-rpc-support

AWSSDKSwiftCLI/Sources/AWSSDKSwiftCLI/Resources/Package.Base.swift

@@ -1,4 +1,4 @@
-// swift-tools-version:5.5
+// swift-tools-version:5.7
 
 //
 // Copyright Amazon.com Inc. or its affiliates.
@@ -68,18 +68,18 @@ func addClientRuntimeDependency(_ version: Version) {
         ]
     case (false, true):
         package.dependencies += [
-            .package(url: smithySwiftURL, .branch("main"))
+            .package(url: smithySwiftURL, branch: "main")
         ]
     case (false, false):
         package.dependencies += [
-            .package(url: smithySwiftURL, .exact(version))
+            .package(url: smithySwiftURL, exact: version)
         ]
     }
 }
 
 func addCRTDependency(_ version: Version) {
     package.dependencies += [
-        .package(url: "https://github.com/awslabs/aws-crt-swift", .exact(version))
+        .package(url: "https://github.com/awslabs/aws-crt-swift", exact: version)
     ]
 }
 

Package.swift

@@ -1,4 +1,4 @@
-// swift-tools-version:5.5
+// swift-tools-version:5.7
 
 //
 // Copyright Amazon.com Inc. or its affiliates.
@@ -68,18 +68,18 @@ func addClientRuntimeDependency(_ version: Version) {
         ]
     case (false, true):
         package.dependencies += [
-            .package(url: smithySwiftURL, .branch("main"))
+            .package(url: smithySwiftURL, branch: "main")
         ]
     case (false, false):
         package.dependencies += [
-            .package(url: smithySwiftURL, .exact(version))
+            .package(url: smithySwiftURL, exact: version)
         ]
     }
 }
 
 func addCRTDependency(_ version: Version) {
     package.dependencies += [
-        .package(url: "https://github.com/awslabs/aws-crt-swift", .exact(version))
+        .package(url: "https://github.com/awslabs/aws-crt-swift", exact: version)
     ]
 }
 
@@ -555,4 +555,4 @@ let servicesWithIntegrationTests: [String] = [
 servicesWithIntegrationTests.forEach(addIntegrationTestTarget)
 
 // Uncomment this line to enable protocol tests
-// addProtocolTests()
+addProtocolTests()

README.md

@@ -56,7 +56,7 @@ $ swift package init --type executable
 
 2. Edit your new package's `Package.swift` file to read:
 ```
-// swift-tools-version: 5.5
+// swift-tools-version: 5.7
 
 import PackageDescription
 

Tests/Core/AWSClientRuntimeTests/Auth/CredentialsProvidersTests/CachedCredentialsProviderTests.swift

@@ -12,31 +12,34 @@ import XCTest
 @_spi(FileBasedConfig) @testable import AWSClientRuntime
 
 class CachedCredentialsProviderTests: XCTestCase {
+
     func testGetCredentials() async throws {
         var counter: Int = 0
+        let accessKey = UUID().uuidString
+        let secret = UUID().uuidString
         let coreProvider = MockCredentialsProvider {
             counter += 1
-            return .init(accessKey: "some_access_key", secret: "some_secret")
+            return .init(accessKey: accessKey, secret: secret)
         }
-
         let subject = try CachedCredentialsProvider(
             source: coreProvider,
-            refreshTime: 1
+            refreshTime: 0.01
         )
-        
+
         _ = try await subject.getCredentials()
         _ = try await subject.getCredentials()
         _ = try await subject.getCredentials()
         _ = try await subject.getCredentials()
-
+
+        // Counter is 1 because the last three accesses use cached credentials
         XCTAssertEqual(counter, 1)
-        
-        try! await Task.sleep(nanoseconds: 1 * 1_000_000_000)
-
-        let credentials = try! await subject.getCredentials()
-
+
+        try! await Task.sleep(nanoseconds: 1_000_000_000 / 100)  // 0.01 seconds
+        let credentials = try await subject.getCredentials()
+
+        // Counter is 2 because we slept long enough for cache to expire
         XCTAssertEqual(counter, 2)
-        XCTAssertEqual(credentials.accessKey, "some_access_key")
-        XCTAssertEqual(credentials.secret, "some_secret")
+        XCTAssertEqual(credentials.accessKey, accessKey)
+        XCTAssertEqual(credentials.secret, secret)
     }
 }

codegen/Package.swift

@@ -1,4 +1,4 @@
-// swift-tools-version:5.5.0
+// swift-tools-version:5.7
 
 /*
  * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
@@ -7,7 +7,6 @@
 
 import PackageDescription
 import class Foundation.ProcessInfo
-import class Foundation.FileManager
 
 let baseDir = "./protocol-test-codegen/build/smithyprojections/protocol-test-codegen"
 let baseDirLocal = "./protocol-test-codegen-local/build/smithyprojections/protocol-test-codegen-local"
@@ -87,11 +86,7 @@ func appendLibTarget(name: String, path: String) {
 
 func appendTstTarget(name: String, path: String, dependency: String) {
     var dependencies: [Target.Dependency]  = [.product(name: "SmithyTestUtil", package: "smithy-swift")]
-#if swift(>=5.7)
     dependencies.append(.byNameItem(name: dependency, condition: nil))
-#else
-    dependencies.append(._byNameItem(name: dependency, condition: nil))
-#endif
     package.targets.append(.testTarget(name: name,
                                        dependencies:  dependencies,
                                        path: "\(path)/swift-codegen/\(name)")

codegen/protocol-test-codegen-local/Tests/swift-codegen/WaitersTests/ErrorTypeMatcherTests.swift

@@ -37,7 +37,7 @@ class ErrorTypeMatcherTests: XCTestCase {
     }
 
     func test_errorType_doesNotMatchWhenResultIsSuccess() async throws {
-        let response = GetWidgetOutputResponse()
+        let response = GetWidgetOutput()
         let subject = try WaitersClient.errorTypeMatcherWaiterConfig().acceptors[0]
         let match = subject.evaluate(input: anInput, result: .success(response))
         XCTAssertNil(match)

codegen/protocol-test-codegen-local/Tests/swift-codegen/WaitersTests/InputOutputMatcherTests.swift

@@ -21,7 +21,7 @@ class InputOutputMatcherTests: XCTestCase {
     func test_inputOutput_acceptorMatchesWhenInputAndOutputPropertiesMatch() async throws {
         let value = UUID().uuidString
         let input = GetWidgetInput(stringProperty: value)
-        let output = GetWidgetOutputResponse(stringProperty: value)
+        let output = GetWidgetOutput(stringProperty: value)
         let subject = try WaitersClient.inputOutputPropertyMatcherWaiterConfig().acceptors[0]
         let match = subject.evaluate(input: input, result: .success(output))
         XCTAssertEqual(match, .success(.success(output)))
@@ -30,7 +30,7 @@ class InputOutputMatcherTests: XCTestCase {
     func test_inputOutput_acceptorFailsToMatchWhenInputAndOutputPropertiesDontMatch() async throws {
         let value = UUID().uuidString
         let input = GetWidgetInput(stringProperty: value)
-        let output = GetWidgetOutputResponse(stringProperty: value + "xxx")
+        let output = GetWidgetOutput(stringProperty: value + "xxx")
         let subject = try WaitersClient.inputOutputPropertyMatcherWaiterConfig().acceptors[0]
         let match = subject.evaluate(input: input, result: .success(output))
         XCTAssertNil(match)