Merge pull request #97 from amzn/awsclientinvocationdelegate_factory_…

…method Use the AWSClientInvocationDelegate factory function
amzn · Dec 18, 2023 · 49c7c32 · 49c7c32
2 parents 0ad25ea + 1bcc83a
commit 49c7c32
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 3 deletions.
diff --git a/Sources/SmokeAWSGenerate/main.swift b/Sources/SmokeAWSGenerate/main.swift
@@ -177,7 +177,7 @@ func generatePackageFile(baseNames: [String]) -> String {
                 .package(url: "https://github.com/apple/swift-metrics.git", "1.0.0"..<"3.0.0"),
                 .package(url: "https://github.com/LiveUI/XMLCoding.git", from: "0.4.1"),
                 .package(url: "https://github.com/amzn/smoke-http.git", from: "2.19.1"),
-                .package(url: "https://github.com/amzn/smoke-aws-support.git", from: "1.0.0"),
+                .package(url: "https://github.com/amzn/smoke-aws-support.git", from: "1.7.0"),
                 .package(url: "https://github.com/apple/swift-crypto.git", from: "1.0.0"),
             ],
             targets: [\n

diff --git a/Sources/SmokeAWSModelGenerate/AWSClientDelegate+addAWSClientOperationBody.swift b/Sources/SmokeAWSModelGenerate/AWSClientDelegate+addAWSClientOperationBody.swift
@@ -30,9 +30,19 @@ internal extension AWSClientDelegate {
         fileBuilder.incIndent()
 
         let typeName = function.name.getNormalizedTypeName(forModel: codeGenerator.model)
+
+        let initializerPrefix: String
+        let initializerPostfix: String
+        if case .asyncFunction = invokeType {
+            initializerPrefix = "try await "
+            initializerPostfix = ".get"
+        } else {
+            initializerPrefix = ""
+            initializerPostfix = ""
+        }
 
         fileBuilder.appendLine("""
-            let handlerDelegate = AWSClientInvocationDelegate(
+            let handlerDelegate = \(initializerPrefix)AWSClientInvocationDelegate\(initializerPostfix)(
                         credentialsProvider: credentialsProvider,
                         awsRegion: awsRegion,
                         service: service,

diff --git a/Sources/SmokeAWSModelGenerate/AWSClientDelegate+addAWSClientQueryOperationBody.swift b/Sources/SmokeAWSModelGenerate/AWSClientDelegate+addAWSClientQueryOperationBody.swift
@@ -39,8 +39,18 @@ internal extension AWSClientDelegate {
             wrappedTypeDeclaration = "NoHTTPRequestInput(encodable: input)"
         }
 
+        let initializerPrefix: String
+        let initializerPostfix: String
+        if case .asyncFunction = invokeType {
+            initializerPrefix = "try await "
+            initializerPostfix = ".get"
+        } else {
+            initializerPrefix = ""
+            initializerPostfix = ""
+        }
+
         fileBuilder.appendLine("""
-            let handlerDelegate = AWSClientInvocationDelegate(
+            let handlerDelegate = \(initializerPrefix)AWSClientInvocationDelegate\(initializerPostfix)(
                         credentialsProvider: credentialsProvider,
                         awsRegion: awsRegion,
                         service: service,