Add the ConnectTimeout property on the service client config for the .NET 8 target of the SDK. (#3820)

Author: normj

generator/.DevConfigs/378BAE5D-9864-4E0F-853F-BBA0ACD3F60D.json

@@ -0,0 +1,9 @@
+{
+    "core": {
+        "updateMinimum": true,
+        "type": "Patch",
+        "changeLogMessages": [
+            "Add the ConnectTimeout property on the service client config for the .NET 8 target of the SDK."
+        ]
+    }
+}

sdk/src/Core/Amazon.Runtime/ClientConfig.cs

@@ -832,6 +832,31 @@ public TimeSpan? Timeout
             }
         }
 
+#if NET8_0_OR_GREATER
+        TimeSpan? _connectTimeout;
+
+        /// <summary>
+        /// Gets and sets the connection timeout that will be set on the HttpClient used by the service client to make requests.
+        /// The connection timeout is used control the wait time for the connection to be established to the service. The default
+        /// connection timeout for the HttpClient is infinite waiting period.
+        /// </summary>
+        public TimeSpan? ConnectTimeout
+        {
+            get
+            {
+                if (!this._connectTimeout.HasValue)
+                    return null;
+
+                return this._connectTimeout.Value;
+            }
+            set
+            {
+                ValidateTimeout(value);
+                this._connectTimeout = value;
+            }
+        }
+#endif
+
 #if AWS_ASYNC_API
         /// <summary>
         /// Generates a <see cref="CancellationToken"/> based on the value

sdk/src/Core/Amazon.Runtime/IClientConfig.cs

@@ -245,6 +245,14 @@ public partial interface IClientConfig
         /// </remarks>
         TimeSpan? Timeout { get; }
 
+#if NET8_0_OR_GREATER
+        /// <summary>
+        /// Gets the connection timeout that will be set on the HttpClient used by the service client to make requests.
+        /// The connection timeout is used control the wait time for the connection to be established to the service.
+        /// </summary>
+        TimeSpan? ConnectTimeout { get; }
+#endif
+
         /// <summary>
         /// Configures the endpoint calculation for a service to go to a dual stack (ipv6 enabled) endpoint
         /// for the configured region.

sdk/src/Core/Amazon.Runtime/Pipeline/HttpHandler/_netstandard/HttpRequestMessageFactory.cs

@@ -245,7 +245,16 @@ private static HttpClient CreateHttpClient(IClientConfig clientConfig)
          /// <returns></returns>
         private static HttpClient CreateManagedHttpClient(IClientConfig clientConfig)
         {
+#if NET8_0_OR_GREATER
+            var httpMessageHandler = new SocketsHttpHandler();
+
+            if (clientConfig.ConnectTimeout.HasValue)
+            {
+                httpMessageHandler.ConnectTimeout = clientConfig.ConnectTimeout.Value;
+            }
+#else
             var httpMessageHandler = new HttpClientHandler();
+#endif
 
             if (clientConfig.MaxConnectionsPerServer.HasValue)
                 httpMessageHandler.MaxConnectionsPerServer = clientConfig.MaxConnectionsPerServer.Value;

sdk/src/Core/Amazon.Runtime/_netstandard/ClientConfig.cs

@@ -168,6 +168,11 @@ internal static string CreateConfigUniqueString(IClientConfig clientConfig)
             if (clientConfig.MaxConnectionsPerServer.HasValue)
                 uniqueString = string.Concat(uniqueString, "MaxConnectionsPerServer:", clientConfig.MaxConnectionsPerServer.Value.ToString());
 
+#if NET8_0_OR_GREATER
+            if (clientConfig.ConnectTimeout.HasValue)
+                uniqueString = string.Concat(uniqueString, "ConnectTimeout:", clientConfig.ConnectTimeout.Value.ToString());
+#endif
+
             return uniqueString;
         }
 

sdk/test/NetStandard/UnitTests/ClientConfigTests.cs

@@ -38,6 +38,9 @@ public class ClientConfigTests
             "DisableLogging",
             "ProxyCredentials",
             "Timeout",
+#if NET8_0_OR_GREATER
+            "ConnectTimeout",
+#endif
             "UseDualstackEndpoint",
             "UseFIPSEndpoint",
             "ProxyHost",