fix: Set ports and scheme correctly for non-TLS HTTP connections (#668)

Author: jbelkins

Sources/ClientRuntime/Networking/Endpoint.swift

@@ -31,11 +31,12 @@ public struct Endpoint: Hashable {
             throw ClientError.unknownError("invalid host \(String(describing: url.host))")
         }
 
+        let protocolType = ProtocolType(rawValue: url.scheme ?? "") ?? .https
         self.init(host: host,
                   path: url.path,
-                  port: Int16(url.port ?? 443),
+                  port: Int16(url.port ?? protocolType.port),
                   queryItems: url.toQueryItems(),
-                  protocolType: ProtocolType(rawValue: url.scheme ?? ProtocolType.https.rawValue),
+                  protocolType: protocolType,
                   headers: headers,
                   properties: properties)
     }

Sources/ClientRuntime/Networking/Http/ProtocolType.swift

@@ -15,3 +15,12 @@ public enum ALPNProtocol: String {
     case http1 = "http/1.1"
     case http2 = "h2"
 }
+
+extension ProtocolType {
+    var port: Int {
+        switch self {
+        case .http: return 80
+        case .https: return 443
+        }
+    }
+}

Sources/ClientRuntime/Networking/Http/URLSession/URLSessionHTTPClient.swift

@@ -279,6 +279,7 @@ public final class URLSessionHTTPClient: HTTPClient {
         var components = URLComponents()
         components.scheme = config.protocolType?.rawValue ?? request.endpoint.protocolType?.rawValue ?? "https"
         components.host = request.endpoint.host
+        components.port = port(for: request)
         components.percentEncodedPath = request.path
         if let queryItems = request.queryItems, !queryItems.isEmpty {
             components.percentEncodedQueryItems = queryItems.map {
@@ -296,6 +297,16 @@ public final class URLSessionHTTPClient: HTTPClient {
         }
         return urlRequest
     }
+
+    private func port(for request: SdkHttpRequest) -> Int? {
+        switch (request.endpoint.protocolType, request.endpoint.port) {
+        case (.https, 443), (.http, 80):
+            // Don't set port explicitly if it's the default port for the scheme
+            return nil
+        default:
+            return Int(request.endpoint.port)
+        }
+    }
 }
 
 /// Errors that are particular to the URLSession-based Smithy HTTP client.