fix: utilize endpoint ports (#311)

Author: ianbotsf

aws-runtime/auth/common/src/aws/sdk/kotlin/runtime/auth/Presigner.kt

@@ -88,7 +88,13 @@ public suspend fun createPresignedRequest(serviceConfig: ServicePresignConfig, r
         expirationInSeconds = requestConfig.durationSeconds
     }
 
-    val unsignedUrl = Url(Protocol.HTTPS, endpoint.hostname, path = requestConfig.path, parameters = requestConfig.queryString)
+    val unsignedUrl = Url(
+        scheme = Protocol.HTTPS,
+        host = endpoint.hostname,
+        port = endpoint.port ?: Protocol.HTTPS.defaultPort,
+        path = requestConfig.path,
+        parameters = requestConfig.queryString,
+    )
 
     val request = CrtHttpRequest(
         requestConfig.method.name,
@@ -105,9 +111,10 @@ public suspend fun createPresignedRequest(serviceConfig: ServicePresignConfig, r
         url = Url(
             scheme = Protocol.HTTPS,
             host = endpoint.hostname,
+            port = endpoint.port ?: Protocol.HTTPS.defaultPort,
             path = signedRequest.path(),
             parameters = signedRequest.queryParameters() ?: QueryParameters.Empty,
-            encodeParameters = false
+            encodeParameters = false,
         ),
         headers = signedRequest.headers.toSdkHeaders(),
         body = HttpBody.Empty

aws-runtime/http-client-engine-crt/common/src/aws/sdk/kotlin/runtime/http/engine/crt/CrtHttpEngine.kt

@@ -82,7 +82,7 @@ public class CrtHttpEngine(public val config: HttpClientEngineConfig) : HttpClie
     }
 
     private suspend fun getManagerForUri(uri: Uri): HttpClientConnectionManager = mutex.withLock {
-        connManagers.getOrPut(uri.host) {
+        connManagers.getOrPut(uri.authority) {
             HttpClientConnectionManager(options.apply { this.uri = uri }.build())
         }
     }

aws-runtime/http-client-engine-crt/jvm/test/aws/sdk/kotlin/runtime/http/engine/crt/AsyncStressTest.kt

@@ -48,6 +48,7 @@ class AsyncStressTest : TestWithLocalServer() {
                 scheme = Protocol.HTTP
                 method = HttpMethod.GET
                 host = testHost
+                port = serverPort
                 path = "/largeResponse"
             }
         }
@@ -82,6 +83,7 @@ class AsyncStressTest : TestWithLocalServer() {
                 scheme = Protocol.HTTP
                 method = HttpMethod.GET
                 host = testHost
+                port = serverPort
                 path = "/largeResponse"
             }
         }

aws-runtime/http-client-engine-crt/jvm/test/aws/sdk/kotlin/runtime/http/engine/crt/TestWithLocalServer.kt

@@ -14,8 +14,7 @@ import kotlin.test.BeforeTest
 
 public abstract class TestWithLocalServer {
     protected val serverPort: Int = ServerSocket(0).use { it.localPort }
-    protected val testHost: String = "localhost:$serverPort"
-    protected val testUrl: String = "http://$testHost"
+    protected val testHost: String = "localhost"
 
     public abstract val server: ApplicationEngine
 
@@ -29,7 +28,7 @@ public abstract class TestWithLocalServer {
             attempt++
             try {
                 server.start()
-                logger.info { "test server listening on: $testHost" }
+                logger.info { "test server listening on: $testHost:$serverPort" }
                 break
             } catch (cause: Throwable) {
                 if (attempt >= 10) throw cause

aws-runtime/protocols/http/common/src/aws/sdk/kotlin/runtime/http/middleware/ServiceEndpointResolver.kt

@@ -55,6 +55,7 @@ public class ServiceEndpointResolver(
             val hostname = "${hostPrefix}${endpoint.hostname}"
             req.subject.url.scheme = Protocol.parse(endpoint.protocol)
             req.subject.url.host = hostname
+            req.subject.url.port = endpoint.port
             req.subject.headers["Host"] = hostname
 
             endpoint.signingName?.let {

aws-runtime/protocols/http/common/test/aws/sdk/kotlin/runtime/http/middleware/ServiceEndpointResolverTest.kt

@@ -33,6 +33,7 @@ class ServiceEndpointResolverTest {
                 assertEquals(expectedHost, request.url.host)
                 assertEquals(expectedHost, request.headers["Host"])
                 assertEquals("https", request.url.scheme.protocolName)
+                assertEquals(443, request.url.port)
                 val resp = HttpResponse(HttpStatusCode.fromValue(200), Headers.Empty, HttpBody.Empty)
                 val now = Instant.now()
                 return HttpCall(request, resp, now, now)
@@ -63,6 +64,48 @@ class ServiceEndpointResolverTest {
         assertNotNull(response)
     }
 
+    @Test
+    fun `it sets the port when present`(): Unit = runSuspendTest {
+        val expectedProtocol = "https"
+        val expectedHost = "test.com"
+        val expectedPort = 8080
+
+        val mockEngine = object : HttpClientEngineBase("test") {
+            override suspend fun roundTrip(request: HttpRequest): HttpCall {
+                assertEquals(expectedHost, request.url.host)
+                assertEquals(expectedHost, request.headers["Host"])
+                assertEquals(expectedProtocol, request.url.scheme.protocolName)
+                assertEquals(expectedPort, request.url.port)
+                val resp = HttpResponse(HttpStatusCode.fromValue(200), Headers.Empty, HttpBody.Empty)
+                val now = Instant.now()
+                return HttpCall(request, resp, now, now)
+            }
+        }
+
+        val client = sdkHttpClient(mockEngine)
+
+        val op = SdkHttpOperation.build<Unit, HttpResponse> {
+            serializer = UnitSerializer
+            deserializer = IdentityDeserializer
+            context {
+                service = "TestService"
+                operationName = "testOperation"
+            }
+        }
+
+        op.install(ServiceEndpointResolver) {
+            serviceId = "TestService"
+            resolver = object : EndpointResolver {
+                override suspend fun resolve(service: String, region: String): Endpoint =
+                    Endpoint(expectedHost, expectedProtocol, port = expectedPort)
+            }
+        }
+
+        op.context[AwsClientOption.Region] = "us-east-1"
+        val response = op.roundTrip(client, Unit)
+        assertNotNull(response)
+    }
+
     @Test
     fun `it prepends hostPrefix when present`(): Unit = runSuspendTest {
         val expectedHost = "prefix.test.com"