fixes merge conflict

Author: dingfeli

Cargo.lock

@@ -81,7 +81,7 @@ r2d2_sqlite = "0.25.0"
 rand = "0.9.0"
 rayon = "1.10.0"
 regex = "1.7.0"
-reqwest = { version = "0.12.14", default-features = false, features = ["http2", "charset", "rustls-tls", "rustls-tls-native-roots", "gzip", "json", "socks", "cookies"] }
+reqwest = { version = "0.12.14", default-features = false, features = ["http2", "charset", "rustls-tls", "rustls-tls-native-roots", "gzip", "json", "socks", "cookies", "stream"] }
 ring = "0.17.14"
 rusqlite = { version = "0.32.1", features = ["bundled", "serde_json"] }
 rustls = "0.23.23"

Cargo.toml

@@ -12,7 +12,7 @@
 [package]
 edition = "2021"
 name = "amzn-codewhisperer-client"
-version = "0.1.10016"
+version = "0.1.10231"
 authors = ["Grant Gurvis <[email protected]>"]
 build = false
 exclude = [

crates/amzn-codewhisperer-client/Cargo.toml

@@ -7,17 +7,18 @@ impl super::Client {
     /// - The fluent builder is configurable:
     ///   - [`profile_arn(impl Into<String>)`](crate::operation::get_usage_limits::builders::GetUsageLimitsFluentBuilder::profile_arn) / [`set_profile_arn(Option<String>)`](crate::operation::get_usage_limits::builders::GetUsageLimitsFluentBuilder::set_profile_arn):<br>required: **false**<br>The ARN of the Q Developer profile. Required for enterprise customers, optional for Builder ID users.<br>
     ///   - [`resource_type(ResourceType)`](crate::operation::get_usage_limits::builders::GetUsageLimitsFluentBuilder::resource_type) / [`set_resource_type(Option<ResourceType>)`](crate::operation::get_usage_limits::builders::GetUsageLimitsFluentBuilder::set_resource_type):<br>required: **false**<br>(undocumented)<br>
+    ///   - [`is_email_required(bool)`](crate::operation::get_usage_limits::builders::GetUsageLimitsFluentBuilder::is_email_required) / [`set_is_email_required(Option<bool>)`](crate::operation::get_usage_limits::builders::GetUsageLimitsFluentBuilder::set_is_email_required):<br>required: **false**<br>(undocumented)<br>
     /// - On success, responds with
     ///   [`GetUsageLimitsOutput`](crate::operation::get_usage_limits::GetUsageLimitsOutput) with
     ///   field(s):
     ///   - [`limits(Option<Vec::<UsageLimitList>>)`](crate::operation::get_usage_limits::GetUsageLimitsOutput::limits): (undocumented)
+    ///   - [`next_date_reset(Option<DateTime>)`](crate::operation::get_usage_limits::GetUsageLimitsOutput::next_date_reset): The next reset date in UTC timezone.
     ///   - [`days_until_reset(Option<i32>)`](crate::operation::get_usage_limits::GetUsageLimitsOutput::days_until_reset): Number of days remaining until the usage metrics reset
     ///   - [`usage_breakdown(Option<UsageBreakdown>)`](crate::operation::get_usage_limits::GetUsageLimitsOutput::usage_breakdown): Usage breakdown by SKU type
     ///   - [`usage_breakdown_list(Option<Vec::<UsageBreakdown>>)`](crate::operation::get_usage_limits::GetUsageLimitsOutput::usage_breakdown_list): List of usage by resource type
     ///   - [`subscription_info(Option<SubscriptionInfo>)`](crate::operation::get_usage_limits::GetUsageLimitsOutput::subscription_info): Subscription Info
     ///   - [`overage_configuration(Option<OverageConfiguration>)`](crate::operation::get_usage_limits::GetUsageLimitsOutput::overage_configuration): Overage Configuration
     ///   - [`user_info(Option<UserInfo>)`](crate::operation::get_usage_limits::GetUsageLimitsOutput::user_info): User Information
-    ///   - [`free_trial_info(Option<FreeTrialInfo>)`](crate::operation::get_usage_limits::GetUsageLimitsOutput::free_trial_info): User's free trial info
     /// - On failure, responds with
     ///   [`SdkError<GetUsageLimitsError>`](crate::operation::get_usage_limits::GetUsageLimitsError)
     pub fn get_usage_limits(&self) -> crate::operation::get_usage_limits::builders::GetUsageLimitsFluentBuilder {

crates/amzn-codewhisperer-client/src/client/get_usage_limits.rs

@@ -16,7 +16,7 @@ impl super::Client {
     ///   [`ListAvailableModelsOutput`](crate::operation::list_available_models::ListAvailableModelsOutput)
     ///   with field(s):
     ///   - [`models(Vec::<Model>)`](crate::operation::list_available_models::ListAvailableModelsOutput::models): List of available models
-    ///   - [`default_model(Option<Model>)`](crate::operation::list_available_models::ListAvailableModelsOutput::default_model): Default model set by the client
+    ///   - [`default_model(Model)`](crate::operation::list_available_models::ListAvailableModelsOutput::default_model): Default model set by the client
     ///   - [`next_token(Option<String>)`](crate::operation::list_available_models::ListAvailableModelsOutput::next_token): Token for retrieving the next page of results
     /// - On failure, responds with
     ///   [`SdkError<ListAvailableModelsError>`](crate::operation::list_available_models::ListAvailableModelsError)

crates/amzn-codewhisperer-client/src/client/list_available_models.rs

@@ -6,6 +6,7 @@ impl super::Client {
     ///
     /// - The fluent builder is configurable:
     ///   - [`overage_configuration(OverageConfiguration)`](crate::operation::set_user_preference::builders::SetUserPreferenceFluentBuilder::overage_configuration) / [`set_overage_configuration(Option<OverageConfiguration>)`](crate::operation::set_user_preference::builders::SetUserPreferenceFluentBuilder::set_overage_configuration):<br>required: **false**<br>(undocumented)<br>
+    ///   - [`profile_arn(impl Into<String>)`](crate::operation::set_user_preference::builders::SetUserPreferenceFluentBuilder::profile_arn) / [`set_profile_arn(Option<String>)`](crate::operation::set_user_preference::builders::SetUserPreferenceFluentBuilder::set_profile_arn):<br>required: **false**<br>(undocumented)<br>
     /// - On success, responds with
     ///   [`SetUserPreferenceOutput`](crate::operation::set_user_preference::SetUserPreferenceOutput)
     /// - On failure, responds with

crates/amzn-codewhisperer-client/src/client/set_user_preference.rs

@@ -214,6 +214,14 @@ impl ::aws_smithy_runtime_api::client::ser_de::SerializeRequest for GetUsageLimi
                         query.push_kv("resourceType", &::aws_smithy_http::query::fmt_string(inner_2));
                     }
                 }
+                if let ::std::option::Option::Some(inner_3) = &_input.is_email_required {
+                    {
+                        query.push_kv(
+                            "isEmailRequired",
+                            ::aws_smithy_types::primitive::Encoder::from(*inner_3).encode(),
+                        );
+                    }
+                }
                 ::std::result::Result::Ok(())
             }
             #[allow(clippy::unnecessary_wraps)]