fix test case

awslabs · Oct 7, 2022 · a371261 · a371261
1 parent 9996024
commit a371261
Show file tree

Hide file tree

Showing 2 changed files with 46 additions and 36 deletions.
diff --git a/...gen/src/main/kotlin/software/amazon/smithy/aws/swift/codegen/EndpointResolverGenerator.kt b/...gen/src/main/kotlin/software/amazon/smithy/aws/swift/codegen/EndpointResolverGenerator.kt
@@ -66,44 +66,46 @@ class EndpointResolverGenerator() {
     }
 
     private fun renderResolver(writer: SwiftWriter, endpointRules: EndpointRuleset?) {
-        writer.openBlock("public struct \$L: \$L  {", "}", AWSServiceTypes.DefaultEndpointResolver, AWSServiceTypes.EndpointResolver) {
-            writer.write("")
-            writer.write("private let engine: \$L", AWSClientRuntimeTypes.Core.AWSEndpointsRuleEngine)
-            writer.write("private let ruleSetString = \$S", Node.printJson(endpointRules?.toNode()))
-            writer.write("")
-            writer.openBlock("public init() throws {", "}") {
-                writer.write("engine = try \$L(ruleSetString: ruleSetString)", AWSClientRuntimeTypes.Core.AWSEndpointsRuleEngine)
-            }
-            writer.write("")
-            writer.openBlock(
-                "public func resolve(params: EndpointParams) throws -> \$L {", "}", ClientRuntimeTypes.Core.Endpoint
-            ) {
-                writer.write("let context = try \$L()", AWSClientRuntimeTypes.Core.AWSEndpointsRequestContext)
-                endpointRules?.parameters?.toList()?.sortedBy { it.name.toString() }?.let { sortedParameters ->
-                    sortedParameters.forEach { param ->
-                        val memberName = param.name.toString().toCamelCase()
-                        val paramName = param.name.toString()
-                        writer.write("try context.add(name: \$S, value: params.\$L)", paramName, memberName)
-                    }
-                    writer.write("")
+        endpointRules?.let { endpointRules ->
+            writer.openBlock("public struct \$L: \$L  {", "}", AWSServiceTypes.DefaultEndpointResolver, AWSServiceTypes.EndpointResolver) {
+                writer.write("")
+                writer.write("private let engine: \$L", AWSClientRuntimeTypes.Core.AWSEndpointsRuleEngine)
+                writer.write("private let ruleSetString = \$S", Node.printJson(endpointRules.toNode()))
+                writer.write("")
+                writer.openBlock("public init() throws {", "}") {
+                    writer.write("engine = try \$L(ruleSetString: ruleSetString)", AWSClientRuntimeTypes.Core.AWSEndpointsRuleEngine)
                 }
-                writer.openBlock("guard let crtResolvedEndpoint = try engine.resolve(context: context) else {", "}") {
-                    writer.write("throw EndpointError.unresolved(\"Failed to resolved endpoint\")")
-                }.write("")
+                writer.write("")
+                writer.openBlock(
+                    "public func resolve(params: EndpointParams) throws -> \$L {", "}", ClientRuntimeTypes.Core.Endpoint
+                ) {
+                    writer.write("let context = try \$L()", AWSClientRuntimeTypes.Core.AWSEndpointsRequestContext)
+                    endpointRules.parameters?.toList()?.sortedBy { it.name.toString() }?.let { sortedParameters ->
+                        sortedParameters.forEach { param ->
+                            val memberName = param.name.toString().toCamelCase()
+                            val paramName = param.name.toString()
+                            writer.write("try context.add(name: \$S, value: params.\$L)", paramName, memberName)
+                        }
+                        writer.write("")
+                    }
+                    writer.openBlock("guard let crtResolvedEndpoint = try engine.resolve(context: context) else {", "}") {
+                        writer.write("throw EndpointError.unresolved(\"Failed to resolved endpoint\")")
+                    }.write("")
 
-                writer.openBlock("if crtResolvedEndpoint.getType() == .error {", "}") {
-                    writer.write("let error = try crtResolvedEndpoint.getError()")
-                    writer.write("throw EndpointError.unresolved(error)")
-                }.write("")
+                    writer.openBlock("if crtResolvedEndpoint.getType() == .error {", "}") {
+                        writer.write("let error = try crtResolvedEndpoint.getError()")
+                        writer.write("throw EndpointError.unresolved(error)")
+                    }.write("")
 
-                writer.openBlock("guard let url = try crtResolvedEndpoint.getURL() else {", "}") {
-                    writer.write("assertionFailure(\"This must be a bug in either CRT or the rule engine, if the endpoint is not an error, it must have a url\")")
-                    writer.write("throw EndpointError.unresolved(\"Failed to resolved endpoint\")")
-                }.write("")
+                    writer.openBlock("guard let url = try crtResolvedEndpoint.getURL() else {", "}") {
+                        writer.write("assertionFailure(\"This must be a bug in either CRT or the rule engine, if the endpoint is not an error, it must have a url\")")
+                        writer.write("throw EndpointError.unresolved(\"Failed to resolved endpoint\")")
+                    }.write("")
 
-                writer.write("let headers = try crtResolvedEndpoint.getHeaders() ?? [:]")
-                writer.write("let properties = try crtResolvedEndpoint.getProperties() ?? [:]")
-                writer.write("return try Endpoint(urlString: url, headers: Headers(headers), properties: properties)")
+                    writer.write("let headers = try crtResolvedEndpoint.getHeaders() ?? [:]")
+                    writer.write("let properties = try crtResolvedEndpoint.getProperties() ?? [:]")
+                    writer.write("return try Endpoint(urlString: url, headers: Headers(headers), properties: properties)")
+                }
             }
         }
     }

diff --git a/...rc/test/kotlin/software/amazon/smithy/aws/swift/codegen/RestJsonProtocolGeneratorTests.kt b/...rc/test/kotlin/software/amazon/smithy/aws/swift/codegen/RestJsonProtocolGeneratorTests.kt
@@ -150,7 +150,11 @@ class RestJsonProtocolGeneratorTests {
                             self.credentialsProvider = try AWSClientRuntime.AWSCredentialsProvider.fromChain()
                         }
                         self.endpoint = endpoint
-                        self.endpointResolver = endpointResolver ?? DefaultEndpointResolver()
+                        if let endpointResolver = endpointResolver {
+                            self.endpointResolver = endpointResolver
+                        } else {
+                            self.endpointResolver = try DefaultEndpointResolver()
+                        }
                         self.frameworkMetadata = frameworkMetadata
                         self.region = region
                         self.regionResolver = regionResolver ?? DefaultRegionResolver()
@@ -210,7 +214,11 @@ class RestJsonProtocolGeneratorTests {
                             self.credentialsProvider = try AWSClientRuntime.AWSCredentialsProvider.fromChain()
                         }
                         self.endpoint = endpoint
-                        self.endpointResolver = endpointResolver ?? DefaultEndpointResolver()
+                        if let endpointResolver = endpointResolver {
+                            self.endpointResolver = endpointResolver
+                        } else {
+                            self.endpointResolver = try DefaultEndpointResolver()
+                        }
                         self.frameworkMetadata = frameworkMetadata
                         let resolvedRegionResolver = regionResolver ?? DefaultRegionResolver()
                         self.region = await resolvedRegionResolver.resolveRegion()