Set api timeout to 10s by default and make configurable via settings (#20)

Author: grant0417

crates/fig_api_client/src/clients/shared.rs

@@ -1,7 +1,11 @@
+use std::time::Duration;
+
 use aws_config::Region;
+use aws_config::timeout::TimeoutConfig;
 use aws_credential_types::Credentials;
 use aws_credential_types::provider::ProvideCredentials;
 use aws_types::SdkConfig;
+use aws_types::sdk_config::StalledStreamProtectionConfig;
 use fig_aws_common::behavior_version;
 
 use crate::credentials::CredentialsChain;
@@ -10,10 +14,34 @@ use crate::{
     Error,
 };
 
+const DEFAULT_TIMEOUT_DURATION: Duration = Duration::from_millis(10100);
+
+pub(crate) fn timeout_config() -> TimeoutConfig {
+    let timeout = fig_settings::settings::get_int("api.timeout")
+        .ok()
+        .flatten()
+        .and_then(|i| i.try_into().ok())
+        .map_or(DEFAULT_TIMEOUT_DURATION, Duration::from_millis);
+
+    TimeoutConfig::builder()
+        .read_timeout(timeout)
+        .operation_timeout(timeout)
+        .operation_attempt_timeout(timeout)
+        .connect_timeout(timeout)
+        .build()
+}
+
+pub(crate) fn stalled_stream_protection_config() -> StalledStreamProtectionConfig {
+    StalledStreamProtectionConfig::enabled()
+        .grace_period(Duration::from_secs(100))
+        .build()
+}
+
 async fn base_sdk_config(region: Region, credentials_provider: impl ProvideCredentials + 'static) -> SdkConfig {
     aws_config::defaults(behavior_version())
         .region(region)
         .credentials_provider(credentials_provider)
+        .timeout_config(timeout_config())
         .load()
         .await
 }

crates/fig_api_client/src/clients/streaming_client.rs

@@ -1,10 +1,6 @@
-use std::time::Duration;
-
 use amzn_codewhisperer_streaming_client::Client as CodewhispererStreamingClient;
 use amzn_qdeveloper_streaming_client::Client as QDeveloperStreamingClient;
-use aws_config::timeout::TimeoutConfig;
 use aws_types::request_id::RequestId;
-use aws_types::sdk_config::StalledStreamProtectionConfig;
 use fig_auth::builder_id::BearerResolver;
 use fig_aws_common::{
     UserAgentOverrideInterceptor,
@@ -14,6 +10,7 @@ use fig_aws_common::{
 use super::shared::{
     bearer_sdk_config,
     sigv4_sdk_config,
+    stalled_stream_protection_config,
 };
 use crate::interceptor::opt_out::OptOutInterceptor;
 use crate::model::{
@@ -25,21 +22,6 @@ use crate::{
     Error,
 };
 
-fn stalled_stream_protection_config() -> StalledStreamProtectionConfig {
-    StalledStreamProtectionConfig::enabled()
-        .grace_period(Duration::from_secs(100))
-        .build()
-}
-
-fn timeout_config() -> TimeoutConfig {
-    TimeoutConfig::builder()
-        .read_timeout(Duration::from_secs(10))
-        .operation_timeout(Duration::from_secs(10))
-        .operation_attempt_timeout(Duration::from_secs(10))
-        .connect_timeout(Duration::from_secs(10))
-        .build()
-}
-
 mod inner {
     use amzn_codewhisperer_streaming_client::Client as CodewhispererStreamingClient;
     use amzn_qdeveloper_streaming_client::Client as QDeveloperStreamingClient;
@@ -81,7 +63,6 @@ impl StreamingClient {
             .app_name(app_name())
             .endpoint_url(endpoint.url())
             .stalled_stream_protection(stalled_stream_protection_config())
-            .timeout_config(timeout_config())
             .build();
         let client = CodewhispererStreamingClient::from_conf(conf);
         Self(inner::Inner::Codewhisperer(client))
@@ -96,7 +77,6 @@ impl StreamingClient {
             .app_name(app_name())
             .endpoint_url(endpoint.url())
             .stalled_stream_protection(stalled_stream_protection_config())
-            .timeout_config(timeout_config())
             .build();
         let client = QDeveloperStreamingClient::from_conf(conf);
         Ok(Self(inner::Inner::QDeveloper(client)))