From ce428dcf88861e71205025df7cbcab9c852920e3 Mon Sep 17 00:00:00 2001
From: Andrew Foss <fossand@amazon.com>
Date: Tue, 30 Apr 2024 17:18:18 -0700
Subject: [PATCH] fix: default HTTPClient uses HttpClientConfiguration passed
 in from client config

---
 .../Config/DefaultSDKRuntimeConfiguration.swift   |  3 +++
 Sources/WeatherSDK/WeatherClient.swift            |  2 +-
 Sources/WeatherSDK/models/Baz.swift               |  2 +-
 Sources/WeatherSDK/models/CityCoordinates.swift   |  2 +-
 Sources/WeatherSDK/models/CitySummary.swift       |  2 +-
 Sources/WeatherSDK/models/CreateCityInput.swift   |  2 +-
 .../models/CreateCityInputBody+Decodable.swift    |  2 +-
 Sources/WeatherSDK/models/CreateCityOutput.swift  |  2 +-
 .../models/CreateCityOutputBody+Decodable.swift   |  2 +-
 Sources/WeatherSDK/models/Foo.swift               |  2 +-
 .../models/GetCityAnnouncementsInput.swift        |  2 +-
 .../GetCityAnnouncementsInputBody+Decodable.swift |  2 +-
 .../models/GetCityAnnouncementsOutput.swift       |  2 +-
 Sources/WeatherSDK/models/GetCityImageInput.swift |  2 +-
 .../models/GetCityImageInputBody+Decodable.swift  |  2 +-
 .../WeatherSDK/models/GetCityImageOutput.swift    |  2 +-
 .../models/GetCityImageOutputBody+Decodable.swift |  2 +-
 Sources/WeatherSDK/models/GetCityInput.swift      |  2 +-
 .../models/GetCityInputBody+Decodable.swift       |  2 +-
 Sources/WeatherSDK/models/GetCityOutput.swift     |  2 +-
 .../models/GetCityOutputBody+Decodable.swift      |  2 +-
 .../WeatherSDK/models/GetCurrentTimeInput.swift   |  2 +-
 .../GetCurrentTimeInputBody+Decodable.swift       |  2 +-
 .../WeatherSDK/models/GetCurrentTimeOutput.swift  |  2 +-
 .../GetCurrentTimeOutputBody+Decodable.swift      |  2 +-
 Sources/WeatherSDK/models/GetForecastInput.swift  |  2 +-
 .../models/GetForecastInputBody+Decodable.swift   |  2 +-
 Sources/WeatherSDK/models/GetForecastOutput.swift |  2 +-
 .../models/GetForecastOutputBody+Decodable.swift  |  2 +-
 Sources/WeatherSDK/models/InvokeInput.swift       |  2 +-
 .../models/InvokeInputBody+Decodable.swift        |  2 +-
 Sources/WeatherSDK/models/InvokeOutput.swift      |  2 +-
 .../models/InvokeOutputBody+Decodable.swift       |  2 +-
 Sources/WeatherSDK/models/ListCitiesInput.swift   |  2 +-
 .../models/ListCitiesInputBody+Decodable.swift    |  2 +-
 Sources/WeatherSDK/models/ListCitiesOutput.swift  |  2 +-
 .../models/ListCitiesOutputBody+Decodable.swift   |  2 +-
 .../models/NoSuchResourceBody+Decodable.swift     |  2 +-
 Sources/WeatherSDK/models/OnlyFakeAuthInput.swift |  2 +-
 .../models/OnlyFakeAuthInputBody+Decodable.swift  |  2 +-
 .../models/OnlyFakeAuthOptionalInput.swift        |  2 +-
 .../OnlyFakeAuthOptionalInputBody+Decodable.swift |  2 +-
 .../models/OnlyFakeAuthOptionalOutput.swift       |  2 +-
 .../WeatherSDK/models/OnlyFakeAuthOutput.swift    |  2 +-
 .../models/OnlyHttpApiKeyAndBearerAuthInput.swift |  2 +-
 ...tpApiKeyAndBearerAuthInputBody+Decodable.swift |  2 +-
 .../OnlyHttpApiKeyAndBearerAuthOutput.swift       |  2 +-
 ...OnlyHttpApiKeyAndBearerAuthReversedInput.swift |  2 +-
 ...AndBearerAuthReversedInputBody+Decodable.swift |  2 +-
 ...nlyHttpApiKeyAndBearerAuthReversedOutput.swift |  2 +-
 .../models/OnlyHttpApiKeyAuthInput.swift          |  2 +-
 .../OnlyHttpApiKeyAuthInputBody+Decodable.swift   |  2 +-
 .../models/OnlyHttpApiKeyAuthOptionalInput.swift  |  2 +-
 ...ttpApiKeyAuthOptionalInputBody+Decodable.swift |  2 +-
 .../models/OnlyHttpApiKeyAuthOptionalOutput.swift |  2 +-
 .../models/OnlyHttpApiKeyAuthOutput.swift         |  2 +-
 .../models/OnlyHttpBearerAuthInput.swift          |  2 +-
 .../OnlyHttpBearerAuthInputBody+Decodable.swift   |  2 +-
 .../models/OnlyHttpBearerAuthOptionalInput.swift  |  2 +-
 ...ttpBearerAuthOptionalInputBody+Decodable.swift |  2 +-
 .../models/OnlyHttpBearerAuthOptionalOutput.swift |  2 +-
 .../models/OnlyHttpBearerAuthOutput.swift         |  2 +-
 .../WeatherSDK/models/OnlySigv4AuthInput.swift    |  2 +-
 .../models/OnlySigv4AuthInputBody+Decodable.swift |  2 +-
 .../models/OnlySigv4AuthOptionalInput.swift       |  2 +-
 ...OnlySigv4AuthOptionalInputBody+Decodable.swift |  2 +-
 .../models/OnlySigv4AuthOptionalOutput.swift      |  2 +-
 .../WeatherSDK/models/OnlySigv4AuthOutput.swift   |  2 +-
 Sources/WeatherSDK/models/OtherStructure.swift    |  2 +-
 Sources/WeatherSDK/models/Precipitation.swift     |  2 +-
 .../WeatherSDK/models/SameAsServiceInput.swift    |  2 +-
 .../models/SameAsServiceInputBody+Decodable.swift |  2 +-
 .../WeatherSDK/models/SameAsServiceOutput.swift   |  2 +-
 .../GetCityAnnouncementsErrorTest.swift           |  3 +--
 Tests/WeatherSDKTests/GetCityErrorTest.swift      |  3 +--
 Tests/WeatherSDKTests/GetCityImageErrorTest.swift |  3 +--
 Tests/WeatherSDKTests/GetCityResponseTest.swift   |  4 +---
 Tests/WeatherSDKTests/ListCitiesErrorTest.swift   |  3 +--
 .../models/CityCoordinates+Equatable.swift        | 13 +++++++++++++
 .../models/CitySummary+Equatable.swift            | 15 +++++++++++++++
 .../GetCityAnnouncementsInput+Equatable.swift     | 12 ++++++++++++
 .../GetCityAnnouncementsOutput+Equatable.swift    | 12 ++++++++++++
 .../models/GetCityImageInput+Equatable.swift      | 12 ++++++++++++
 .../models/GetCityImageOutput+Equatable.swift     | 12 ++++++++++++
 .../models/GetCityInput+Equatable.swift           | 12 ++++++++++++
 .../models/GetCityOutput+Equatable.swift          | 14 ++++++++++++++
 .../models/ListCitiesInput+Equatable.swift        | 11 +++++++++++
 .../models/ListCitiesOutput+Equatable.swift       | 13 +++++++++++++
 .../models/NoSuchResource+Equatable.swift         | 13 +++++++++++++
 .../codegen/config/DefaultClientConfiguration.kt  |  6 +++---
 .../config/DefaultHttpClientConfiguration.kt      |  8 +++++---
 .../kotlin/HttpProtocolClientGeneratorTests.kt    |  2 +-
 92 files changed, 228 insertions(+), 90 deletions(-)
 create mode 100644 Tests/WeatherSDKTests/models/CityCoordinates+Equatable.swift
 create mode 100644 Tests/WeatherSDKTests/models/CitySummary+Equatable.swift
 create mode 100644 Tests/WeatherSDKTests/models/GetCityAnnouncementsInput+Equatable.swift
 create mode 100644 Tests/WeatherSDKTests/models/GetCityAnnouncementsOutput+Equatable.swift
 create mode 100644 Tests/WeatherSDKTests/models/GetCityImageInput+Equatable.swift
 create mode 100644 Tests/WeatherSDKTests/models/GetCityImageOutput+Equatable.swift
 create mode 100644 Tests/WeatherSDKTests/models/GetCityInput+Equatable.swift
 create mode 100644 Tests/WeatherSDKTests/models/GetCityOutput+Equatable.swift
 create mode 100644 Tests/WeatherSDKTests/models/ListCitiesInput+Equatable.swift
 create mode 100644 Tests/WeatherSDKTests/models/ListCitiesOutput+Equatable.swift
 create mode 100644 Tests/WeatherSDKTests/models/NoSuchResource+Equatable.swift

diff --git a/Sources/ClientRuntime/Config/DefaultSDKRuntimeConfiguration.swift b/Sources/ClientRuntime/Config/DefaultSDKRuntimeConfiguration.swift
index 1018990e1..fb0cb8369 100644
--- a/Sources/ClientRuntime/Config/DefaultSDKRuntimeConfiguration.swift
+++ b/Sources/ClientRuntime/Config/DefaultSDKRuntimeConfiguration.swift
@@ -149,3 +149,6 @@ public class DefaultAuthSchemeResolver: AuthSchemeResolver {
         return DefaultAuthSchemeResolverParameters(operation: opName)
     }
 }
+
+public typealias ClientConfigurationDefaults
+    = DefaultSDKRuntimeConfiguration<DefaultRetryStrategy, DefaultRetryErrorInfoProvider>
diff --git a/Sources/WeatherSDK/WeatherClient.swift b/Sources/WeatherSDK/WeatherClient.swift
index 38450da64..441b16284 100644
--- a/Sources/WeatherSDK/WeatherClient.swift
+++ b/Sources/WeatherSDK/WeatherClient.swift
@@ -68,7 +68,7 @@ extension WeatherClient {
         }
 
         public convenience init(telemetryProvider: ClientRuntime.TelemetryProvider? = nil, retryStrategyOptions: ClientRuntime.RetryStrategyOptions? = nil, clientLogMode: ClientRuntime.ClientLogMode? = nil, endpoint: Swift.String? = nil, idempotencyTokenGenerator: ClientRuntime.IdempotencyTokenGenerator? = nil, httpClientEngine: ClientRuntime.HTTPClient? = nil, httpClientConfiguration: ClientRuntime.HttpClientConfiguration? = nil, authSchemes: [ClientRuntime.AuthScheme]? = nil, authSchemeResolver: ClientRuntime.AuthSchemeResolver? = nil) throws {
-            self.init(telemetryProvider ?? ClientRuntime.DefaultTelemetry.provider, retryStrategyOptions ?? DefaultSDKRuntimeConfiguration<DefaultRetryStrategy, DefaultRetryErrorInfoProvider>.defaultRetryStrategyOptions, clientLogMode ?? DefaultSDKRuntimeConfiguration<DefaultRetryStrategy, DefaultRetryErrorInfoProvider>.defaultClientLogMode, endpoint, idempotencyTokenGenerator ?? DefaultSDKRuntimeConfiguration<DefaultRetryStrategy, DefaultRetryErrorInfoProvider>.defaultIdempotencyTokenGenerator, httpClientEngine ?? DefaultSDKRuntimeConfiguration<DefaultRetryStrategy, DefaultRetryErrorInfoProvider>.makeClient(), httpClientConfiguration ?? DefaultSDKRuntimeConfiguration<DefaultRetryStrategy, DefaultRetryErrorInfoProvider>.defaultHttpClientConfiguration, authSchemes, authSchemeResolver ?? DefaultSDKRuntimeConfiguration<DefaultRetryStrategy, DefaultRetryErrorInfoProvider>.defaultAuthSchemeResolver)
+            self.init(telemetryProvider ?? ClientRuntime.DefaultTelemetry.provider, retryStrategyOptions ?? ClientConfigurationDefaults.defaultRetryStrategyOptions, clientLogMode ?? ClientConfigurationDefaults.defaultClientLogMode, endpoint, idempotencyTokenGenerator ?? ClientConfigurationDefaults.defaultIdempotencyTokenGenerator, httpClientEngine ?? ClientConfigurationDefaults.makeClient(httpClientConfiguration: httpClientConfiguration ?? ClientConfigurationDefaults.defaultHttpClientConfiguration), httpClientConfiguration ?? ClientConfigurationDefaults.defaultHttpClientConfiguration, authSchemes, authSchemeResolver ?? ClientConfigurationDefaults.defaultAuthSchemeResolver)
         }
 
         public convenience required init() async throws {
diff --git a/Sources/WeatherSDK/models/Baz.swift b/Sources/WeatherSDK/models/Baz.swift
index 544ad1fc2..325131cbe 100644
--- a/Sources/WeatherSDK/models/Baz.swift
+++ b/Sources/WeatherSDK/models/Baz.swift
@@ -3,7 +3,7 @@
 import ClientRuntime
 
 extension WeatherClientTypes {
-    public struct Baz: Swift.Equatable {
+    public struct Baz {
         public var bar: Swift.String?
         public var baz: Swift.String?
 
diff --git a/Sources/WeatherSDK/models/CityCoordinates.swift b/Sources/WeatherSDK/models/CityCoordinates.swift
index 227156537..e46b2a3d7 100644
--- a/Sources/WeatherSDK/models/CityCoordinates.swift
+++ b/Sources/WeatherSDK/models/CityCoordinates.swift
@@ -3,7 +3,7 @@
 import ClientRuntime
 
 extension WeatherClientTypes {
-    public struct CityCoordinates: Swift.Equatable {
+    public struct CityCoordinates {
         /// This member is required.
         public var latitude: Swift.Float?
         /// This member is required.
diff --git a/Sources/WeatherSDK/models/CitySummary.swift b/Sources/WeatherSDK/models/CitySummary.swift
index df3eec651..2490fb0e0 100644
--- a/Sources/WeatherSDK/models/CitySummary.swift
+++ b/Sources/WeatherSDK/models/CitySummary.swift
@@ -3,7 +3,7 @@
 import ClientRuntime
 
 extension WeatherClientTypes {
-    public struct CitySummary: Swift.Equatable {
+    public struct CitySummary {
         public var `case`: Swift.String?
         /// This member is required.
         public var cityId: Swift.String?
diff --git a/Sources/WeatherSDK/models/CreateCityInput.swift b/Sources/WeatherSDK/models/CreateCityInput.swift
index 4f12e5b8b..a81370d61 100644
--- a/Sources/WeatherSDK/models/CreateCityInput.swift
+++ b/Sources/WeatherSDK/models/CreateCityInput.swift
@@ -2,7 +2,7 @@
 
 import ClientRuntime
 
-public struct CreateCityInput: Swift.Equatable {
+public struct CreateCityInput {
     public var city: WeatherClientTypes.CitySummary?
     /// This member is required.
     public var coordinates: WeatherClientTypes.CityCoordinates?
diff --git a/Sources/WeatherSDK/models/CreateCityInputBody+Decodable.swift b/Sources/WeatherSDK/models/CreateCityInputBody+Decodable.swift
index 7572a4ae7..4f7fecd0b 100644
--- a/Sources/WeatherSDK/models/CreateCityInputBody+Decodable.swift
+++ b/Sources/WeatherSDK/models/CreateCityInputBody+Decodable.swift
@@ -2,7 +2,7 @@
 
 import ClientRuntime
 
-struct CreateCityInputBody: Swift.Equatable {
+struct CreateCityInputBody {
     let name: Swift.String?
     let coordinates: WeatherClientTypes.CityCoordinates?
     let city: WeatherClientTypes.CitySummary?
diff --git a/Sources/WeatherSDK/models/CreateCityOutput.swift b/Sources/WeatherSDK/models/CreateCityOutput.swift
index 9c8ca21b6..bd75e94e8 100644
--- a/Sources/WeatherSDK/models/CreateCityOutput.swift
+++ b/Sources/WeatherSDK/models/CreateCityOutput.swift
@@ -2,7 +2,7 @@
 
 import ClientRuntime
 
-public struct CreateCityOutput: Swift.Equatable {
+public struct CreateCityOutput {
     /// This member is required.
     public var cityId: Swift.String?
 
diff --git a/Sources/WeatherSDK/models/CreateCityOutputBody+Decodable.swift b/Sources/WeatherSDK/models/CreateCityOutputBody+Decodable.swift
index 76a25dca6..e90b52396 100644
--- a/Sources/WeatherSDK/models/CreateCityOutputBody+Decodable.swift
+++ b/Sources/WeatherSDK/models/CreateCityOutputBody+Decodable.swift
@@ -2,7 +2,7 @@
 
 import ClientRuntime
 
-struct CreateCityOutputBody: Swift.Equatable {
+struct CreateCityOutputBody {
     let cityId: Swift.String?
 }
 
diff --git a/Sources/WeatherSDK/models/Foo.swift b/Sources/WeatherSDK/models/Foo.swift
index 3c023c29e..b60bf1c04 100644
--- a/Sources/WeatherSDK/models/Foo.swift
+++ b/Sources/WeatherSDK/models/Foo.swift
@@ -3,7 +3,7 @@
 import ClientRuntime
 
 extension WeatherClientTypes {
-    public struct Foo: Swift.Equatable {
+    public struct Foo {
         public var bar: Swift.String?
         public var baz: Swift.String?
 
diff --git a/Sources/WeatherSDK/models/GetCityAnnouncementsInput.swift b/Sources/WeatherSDK/models/GetCityAnnouncementsInput.swift
index 98f89b7b2..04e35ef2a 100644
--- a/Sources/WeatherSDK/models/GetCityAnnouncementsInput.swift
+++ b/Sources/WeatherSDK/models/GetCityAnnouncementsInput.swift
@@ -2,7 +2,7 @@
 
 import ClientRuntime
 
-public struct GetCityAnnouncementsInput: Swift.Equatable {
+public struct GetCityAnnouncementsInput {
     /// This member is required.
     public var cityId: Swift.String?
 
diff --git a/Sources/WeatherSDK/models/GetCityAnnouncementsInputBody+Decodable.swift b/Sources/WeatherSDK/models/GetCityAnnouncementsInputBody+Decodable.swift
index f9f6aa9f9..3b0f5f1e0 100644
--- a/Sources/WeatherSDK/models/GetCityAnnouncementsInputBody+Decodable.swift
+++ b/Sources/WeatherSDK/models/GetCityAnnouncementsInputBody+Decodable.swift
@@ -2,7 +2,7 @@
 
 import ClientRuntime
 
-struct GetCityAnnouncementsInputBody: Swift.Equatable {
+struct GetCityAnnouncementsInputBody {
 }
 
 extension GetCityAnnouncementsInputBody: Swift.Decodable {
diff --git a/Sources/WeatherSDK/models/GetCityAnnouncementsOutput.swift b/Sources/WeatherSDK/models/GetCityAnnouncementsOutput.swift
index e1ca58e45..a89d81d24 100644
--- a/Sources/WeatherSDK/models/GetCityAnnouncementsOutput.swift
+++ b/Sources/WeatherSDK/models/GetCityAnnouncementsOutput.swift
@@ -2,7 +2,7 @@
 
 import ClientRuntime
 
-public struct GetCityAnnouncementsOutput: Swift.Equatable {
+public struct GetCityAnnouncementsOutput {
     public var lastUpdated: ClientRuntime.Date?
 
     public init(
diff --git a/Sources/WeatherSDK/models/GetCityImageInput.swift b/Sources/WeatherSDK/models/GetCityImageInput.swift
index e9b4e40fc..a6ff8288f 100644
--- a/Sources/WeatherSDK/models/GetCityImageInput.swift
+++ b/Sources/WeatherSDK/models/GetCityImageInput.swift
@@ -2,7 +2,7 @@
 
 import ClientRuntime
 
-public struct GetCityImageInput: Swift.Equatable {
+public struct GetCityImageInput {
     /// This member is required.
     public var cityId: Swift.String?
 
diff --git a/Sources/WeatherSDK/models/GetCityImageInputBody+Decodable.swift b/Sources/WeatherSDK/models/GetCityImageInputBody+Decodable.swift
index 565bdee13..8ecb9634e 100644
--- a/Sources/WeatherSDK/models/GetCityImageInputBody+Decodable.swift
+++ b/Sources/WeatherSDK/models/GetCityImageInputBody+Decodable.swift
@@ -2,7 +2,7 @@
 
 import ClientRuntime
 
-struct GetCityImageInputBody: Swift.Equatable {
+struct GetCityImageInputBody {
 }
 
 extension GetCityImageInputBody: Swift.Decodable {
diff --git a/Sources/WeatherSDK/models/GetCityImageOutput.swift b/Sources/WeatherSDK/models/GetCityImageOutput.swift
index 5ce05d36a..d69255663 100644
--- a/Sources/WeatherSDK/models/GetCityImageOutput.swift
+++ b/Sources/WeatherSDK/models/GetCityImageOutput.swift
@@ -2,7 +2,7 @@
 
 import ClientRuntime
 
-public struct GetCityImageOutput: Swift.Equatable {
+public struct GetCityImageOutput {
     /// This member is required.
     public var image: ClientRuntime.ByteStream?
 
diff --git a/Sources/WeatherSDK/models/GetCityImageOutputBody+Decodable.swift b/Sources/WeatherSDK/models/GetCityImageOutputBody+Decodable.swift
index a78ee1967..46256dea6 100644
--- a/Sources/WeatherSDK/models/GetCityImageOutputBody+Decodable.swift
+++ b/Sources/WeatherSDK/models/GetCityImageOutputBody+Decodable.swift
@@ -2,7 +2,7 @@
 
 import ClientRuntime
 
-struct GetCityImageOutputBody: Swift.Equatable {
+struct GetCityImageOutputBody {
     let image: ClientRuntime.ByteStream?
 }
 
diff --git a/Sources/WeatherSDK/models/GetCityInput.swift b/Sources/WeatherSDK/models/GetCityInput.swift
index 339f23e28..d530d7655 100644
--- a/Sources/WeatherSDK/models/GetCityInput.swift
+++ b/Sources/WeatherSDK/models/GetCityInput.swift
@@ -3,7 +3,7 @@
 import ClientRuntime
 
 /// The input used to get a city.
-public struct GetCityInput: Swift.Equatable {
+public struct GetCityInput {
     /// This member is required.
     public var cityId: Swift.String?
 
diff --git a/Sources/WeatherSDK/models/GetCityInputBody+Decodable.swift b/Sources/WeatherSDK/models/GetCityInputBody+Decodable.swift
index 982c2a254..4e64ca635 100644
--- a/Sources/WeatherSDK/models/GetCityInputBody+Decodable.swift
+++ b/Sources/WeatherSDK/models/GetCityInputBody+Decodable.swift
@@ -2,7 +2,7 @@
 
 import ClientRuntime
 
-struct GetCityInputBody: Swift.Equatable {
+struct GetCityInputBody {
 }
 
 extension GetCityInputBody: Swift.Decodable {
diff --git a/Sources/WeatherSDK/models/GetCityOutput.swift b/Sources/WeatherSDK/models/GetCityOutput.swift
index 8c8ffeb0e..ee4fe056f 100644
--- a/Sources/WeatherSDK/models/GetCityOutput.swift
+++ b/Sources/WeatherSDK/models/GetCityOutput.swift
@@ -2,7 +2,7 @@
 
 import ClientRuntime
 
-public struct GetCityOutput: Swift.Equatable {
+public struct GetCityOutput {
     public var city: WeatherClientTypes.CitySummary?
     /// This member is required.
     public var coordinates: WeatherClientTypes.CityCoordinates?
diff --git a/Sources/WeatherSDK/models/GetCityOutputBody+Decodable.swift b/Sources/WeatherSDK/models/GetCityOutputBody+Decodable.swift
index dd84af51d..1e8e89ac4 100644
--- a/Sources/WeatherSDK/models/GetCityOutputBody+Decodable.swift
+++ b/Sources/WeatherSDK/models/GetCityOutputBody+Decodable.swift
@@ -2,7 +2,7 @@
 
 import ClientRuntime
 
-struct GetCityOutputBody: Swift.Equatable {
+struct GetCityOutputBody {
     let name: Swift.String?
     let coordinates: WeatherClientTypes.CityCoordinates?
     let city: WeatherClientTypes.CitySummary?
diff --git a/Sources/WeatherSDK/models/GetCurrentTimeInput.swift b/Sources/WeatherSDK/models/GetCurrentTimeInput.swift
index 3ca1e530e..aec2ce184 100644
--- a/Sources/WeatherSDK/models/GetCurrentTimeInput.swift
+++ b/Sources/WeatherSDK/models/GetCurrentTimeInput.swift
@@ -2,7 +2,7 @@
 
 
 
-public struct GetCurrentTimeInput: Swift.Equatable {
+public struct GetCurrentTimeInput {
 
     public init() { }
 }
diff --git a/Sources/WeatherSDK/models/GetCurrentTimeInputBody+Decodable.swift b/Sources/WeatherSDK/models/GetCurrentTimeInputBody+Decodable.swift
index 9a3eac72f..d7361aa89 100644
--- a/Sources/WeatherSDK/models/GetCurrentTimeInputBody+Decodable.swift
+++ b/Sources/WeatherSDK/models/GetCurrentTimeInputBody+Decodable.swift
@@ -2,7 +2,7 @@
 
 import ClientRuntime
 
-struct GetCurrentTimeInputBody: Swift.Equatable {
+struct GetCurrentTimeInputBody {
 }
 
 extension GetCurrentTimeInputBody: Swift.Decodable {
diff --git a/Sources/WeatherSDK/models/GetCurrentTimeOutput.swift b/Sources/WeatherSDK/models/GetCurrentTimeOutput.swift
index 3a260dedc..741d6918a 100644
--- a/Sources/WeatherSDK/models/GetCurrentTimeOutput.swift
+++ b/Sources/WeatherSDK/models/GetCurrentTimeOutput.swift
@@ -2,7 +2,7 @@
 
 import ClientRuntime
 
-public struct GetCurrentTimeOutput: Swift.Equatable {
+public struct GetCurrentTimeOutput {
     /// This member is required.
     public var time: ClientRuntime.Date?
 
diff --git a/Sources/WeatherSDK/models/GetCurrentTimeOutputBody+Decodable.swift b/Sources/WeatherSDK/models/GetCurrentTimeOutputBody+Decodable.swift
index 78426b1c5..08efba7db 100644
--- a/Sources/WeatherSDK/models/GetCurrentTimeOutputBody+Decodable.swift
+++ b/Sources/WeatherSDK/models/GetCurrentTimeOutputBody+Decodable.swift
@@ -2,7 +2,7 @@
 
 import ClientRuntime
 
-struct GetCurrentTimeOutputBody: Swift.Equatable {
+struct GetCurrentTimeOutputBody {
     let time: ClientRuntime.Date?
 }
 
diff --git a/Sources/WeatherSDK/models/GetForecastInput.swift b/Sources/WeatherSDK/models/GetForecastInput.swift
index 285f683b5..18a2ac84e 100644
--- a/Sources/WeatherSDK/models/GetForecastInput.swift
+++ b/Sources/WeatherSDK/models/GetForecastInput.swift
@@ -2,7 +2,7 @@
 
 import ClientRuntime
 
-public struct GetForecastInput: Swift.Equatable {
+public struct GetForecastInput {
     /// This member is required.
     public var cityId: Swift.String?
 
diff --git a/Sources/WeatherSDK/models/GetForecastInputBody+Decodable.swift b/Sources/WeatherSDK/models/GetForecastInputBody+Decodable.swift
index deba7ff10..6262bf61f 100644
--- a/Sources/WeatherSDK/models/GetForecastInputBody+Decodable.swift
+++ b/Sources/WeatherSDK/models/GetForecastInputBody+Decodable.swift
@@ -2,7 +2,7 @@
 
 import ClientRuntime
 
-struct GetForecastInputBody: Swift.Equatable {
+struct GetForecastInputBody {
 }
 
 extension GetForecastInputBody: Swift.Decodable {
diff --git a/Sources/WeatherSDK/models/GetForecastOutput.swift b/Sources/WeatherSDK/models/GetForecastOutput.swift
index d8ea62182..52d902f25 100644
--- a/Sources/WeatherSDK/models/GetForecastOutput.swift
+++ b/Sources/WeatherSDK/models/GetForecastOutput.swift
@@ -2,7 +2,7 @@
 
 import ClientRuntime
 
-public struct GetForecastOutput: Swift.Equatable {
+public struct GetForecastOutput {
     public var chanceOfRain: Swift.Float?
     public var precipitation: WeatherClientTypes.Precipitation?
 
diff --git a/Sources/WeatherSDK/models/GetForecastOutputBody+Decodable.swift b/Sources/WeatherSDK/models/GetForecastOutputBody+Decodable.swift
index 087449c3f..1bfe108de 100644
--- a/Sources/WeatherSDK/models/GetForecastOutputBody+Decodable.swift
+++ b/Sources/WeatherSDK/models/GetForecastOutputBody+Decodable.swift
@@ -2,7 +2,7 @@
 
 import ClientRuntime
 
-struct GetForecastOutputBody: Swift.Equatable {
+struct GetForecastOutputBody {
     let chanceOfRain: Swift.Float?
     let precipitation: WeatherClientTypes.Precipitation?
 }
diff --git a/Sources/WeatherSDK/models/InvokeInput.swift b/Sources/WeatherSDK/models/InvokeInput.swift
index 88de613da..d6ecd3f39 100644
--- a/Sources/WeatherSDK/models/InvokeInput.swift
+++ b/Sources/WeatherSDK/models/InvokeInput.swift
@@ -2,7 +2,7 @@
 
 import ClientRuntime
 
-public struct InvokeInput: Swift.Equatable {
+public struct InvokeInput {
     public var payload: ClientRuntime.Data?
 
     public init(
diff --git a/Sources/WeatherSDK/models/InvokeInputBody+Decodable.swift b/Sources/WeatherSDK/models/InvokeInputBody+Decodable.swift
index b7d4812c8..1aeed7f48 100644
--- a/Sources/WeatherSDK/models/InvokeInputBody+Decodable.swift
+++ b/Sources/WeatherSDK/models/InvokeInputBody+Decodable.swift
@@ -2,7 +2,7 @@
 
 import ClientRuntime
 
-struct InvokeInputBody: Swift.Equatable {
+struct InvokeInputBody {
     let payload: ClientRuntime.Data?
 }
 
diff --git a/Sources/WeatherSDK/models/InvokeOutput.swift b/Sources/WeatherSDK/models/InvokeOutput.swift
index 6a0e86099..1b2b51a18 100644
--- a/Sources/WeatherSDK/models/InvokeOutput.swift
+++ b/Sources/WeatherSDK/models/InvokeOutput.swift
@@ -2,7 +2,7 @@
 
 import ClientRuntime
 
-public struct InvokeOutput: Swift.Equatable {
+public struct InvokeOutput {
     public var payload: ClientRuntime.Data?
 
     public init(
diff --git a/Sources/WeatherSDK/models/InvokeOutputBody+Decodable.swift b/Sources/WeatherSDK/models/InvokeOutputBody+Decodable.swift
index b52318cf6..c06373481 100644
--- a/Sources/WeatherSDK/models/InvokeOutputBody+Decodable.swift
+++ b/Sources/WeatherSDK/models/InvokeOutputBody+Decodable.swift
@@ -2,7 +2,7 @@
 
 import ClientRuntime
 
-struct InvokeOutputBody: Swift.Equatable {
+struct InvokeOutputBody {
     let payload: ClientRuntime.Data?
 }
 
diff --git a/Sources/WeatherSDK/models/ListCitiesInput.swift b/Sources/WeatherSDK/models/ListCitiesInput.swift
index 80833f5b4..5af98dded 100644
--- a/Sources/WeatherSDK/models/ListCitiesInput.swift
+++ b/Sources/WeatherSDK/models/ListCitiesInput.swift
@@ -2,7 +2,7 @@
 
 import ClientRuntime
 
-public struct ListCitiesInput: Swift.Equatable {
+public struct ListCitiesInput {
     public var nextToken: Swift.String?
     public var pageSize: Swift.Int?
 
diff --git a/Sources/WeatherSDK/models/ListCitiesInputBody+Decodable.swift b/Sources/WeatherSDK/models/ListCitiesInputBody+Decodable.swift
index 21d0ee29d..710e33f28 100644
--- a/Sources/WeatherSDK/models/ListCitiesInputBody+Decodable.swift
+++ b/Sources/WeatherSDK/models/ListCitiesInputBody+Decodable.swift
@@ -2,7 +2,7 @@
 
 import ClientRuntime
 
-struct ListCitiesInputBody: Swift.Equatable {
+struct ListCitiesInputBody {
 }
 
 extension ListCitiesInputBody: Swift.Decodable {
diff --git a/Sources/WeatherSDK/models/ListCitiesOutput.swift b/Sources/WeatherSDK/models/ListCitiesOutput.swift
index 595160ae7..1db3594ee 100644
--- a/Sources/WeatherSDK/models/ListCitiesOutput.swift
+++ b/Sources/WeatherSDK/models/ListCitiesOutput.swift
@@ -2,7 +2,7 @@
 
 import ClientRuntime
 
-public struct ListCitiesOutput: Swift.Equatable {
+public struct ListCitiesOutput {
     /// This member is required.
     public var items: [WeatherClientTypes.CitySummary]?
     public var nextToken: Swift.String?
diff --git a/Sources/WeatherSDK/models/ListCitiesOutputBody+Decodable.swift b/Sources/WeatherSDK/models/ListCitiesOutputBody+Decodable.swift
index 3242ef68b..38076bca2 100644
--- a/Sources/WeatherSDK/models/ListCitiesOutputBody+Decodable.swift
+++ b/Sources/WeatherSDK/models/ListCitiesOutputBody+Decodable.swift
@@ -2,7 +2,7 @@
 
 import ClientRuntime
 
-struct ListCitiesOutputBody: Swift.Equatable {
+struct ListCitiesOutputBody {
     let nextToken: Swift.String?
     let items: [WeatherClientTypes.CitySummary]?
 }
diff --git a/Sources/WeatherSDK/models/NoSuchResourceBody+Decodable.swift b/Sources/WeatherSDK/models/NoSuchResourceBody+Decodable.swift
index 9abb54bb9..6b4d1e355 100644
--- a/Sources/WeatherSDK/models/NoSuchResourceBody+Decodable.swift
+++ b/Sources/WeatherSDK/models/NoSuchResourceBody+Decodable.swift
@@ -2,7 +2,7 @@
 
 import ClientRuntime
 
-struct NoSuchResourceBody: Swift.Equatable {
+struct NoSuchResourceBody {
     let resourceType: Swift.String?
     let message: Swift.String?
 }
diff --git a/Sources/WeatherSDK/models/OnlyFakeAuthInput.swift b/Sources/WeatherSDK/models/OnlyFakeAuthInput.swift
index a23dbe79c..9dee5845f 100644
--- a/Sources/WeatherSDK/models/OnlyFakeAuthInput.swift
+++ b/Sources/WeatherSDK/models/OnlyFakeAuthInput.swift
@@ -2,7 +2,7 @@
 
 
 
-public struct OnlyFakeAuthInput: Swift.Equatable {
+public struct OnlyFakeAuthInput {
 
     public init() { }
 }
diff --git a/Sources/WeatherSDK/models/OnlyFakeAuthInputBody+Decodable.swift b/Sources/WeatherSDK/models/OnlyFakeAuthInputBody+Decodable.swift
index 2cb963a5d..85506c967 100644
--- a/Sources/WeatherSDK/models/OnlyFakeAuthInputBody+Decodable.swift
+++ b/Sources/WeatherSDK/models/OnlyFakeAuthInputBody+Decodable.swift
@@ -2,7 +2,7 @@
 
 import ClientRuntime
 
-struct OnlyFakeAuthInputBody: Swift.Equatable {
+struct OnlyFakeAuthInputBody {
 }
 
 extension OnlyFakeAuthInputBody: Swift.Decodable {
diff --git a/Sources/WeatherSDK/models/OnlyFakeAuthOptionalInput.swift b/Sources/WeatherSDK/models/OnlyFakeAuthOptionalInput.swift
index ff8e535ae..b6949b86b 100644
--- a/Sources/WeatherSDK/models/OnlyFakeAuthOptionalInput.swift
+++ b/Sources/WeatherSDK/models/OnlyFakeAuthOptionalInput.swift
@@ -2,7 +2,7 @@
 
 
 
-public struct OnlyFakeAuthOptionalInput: Swift.Equatable {
+public struct OnlyFakeAuthOptionalInput {
 
     public init() { }
 }
diff --git a/Sources/WeatherSDK/models/OnlyFakeAuthOptionalInputBody+Decodable.swift b/Sources/WeatherSDK/models/OnlyFakeAuthOptionalInputBody+Decodable.swift
index e246468b7..b57def6fb 100644
--- a/Sources/WeatherSDK/models/OnlyFakeAuthOptionalInputBody+Decodable.swift
+++ b/Sources/WeatherSDK/models/OnlyFakeAuthOptionalInputBody+Decodable.swift
@@ -2,7 +2,7 @@
 
 import ClientRuntime
 
-struct OnlyFakeAuthOptionalInputBody: Swift.Equatable {
+struct OnlyFakeAuthOptionalInputBody {
 }
 
 extension OnlyFakeAuthOptionalInputBody: Swift.Decodable {
diff --git a/Sources/WeatherSDK/models/OnlyFakeAuthOptionalOutput.swift b/Sources/WeatherSDK/models/OnlyFakeAuthOptionalOutput.swift
index 130daa6ff..25f12b256 100644
--- a/Sources/WeatherSDK/models/OnlyFakeAuthOptionalOutput.swift
+++ b/Sources/WeatherSDK/models/OnlyFakeAuthOptionalOutput.swift
@@ -2,7 +2,7 @@
 
 
 
-public struct OnlyFakeAuthOptionalOutput: Swift.Equatable {
+public struct OnlyFakeAuthOptionalOutput {
 
     public init() { }
 }
diff --git a/Sources/WeatherSDK/models/OnlyFakeAuthOutput.swift b/Sources/WeatherSDK/models/OnlyFakeAuthOutput.swift
index dda4a750a..51b267c9b 100644
--- a/Sources/WeatherSDK/models/OnlyFakeAuthOutput.swift
+++ b/Sources/WeatherSDK/models/OnlyFakeAuthOutput.swift
@@ -2,7 +2,7 @@
 
 
 
-public struct OnlyFakeAuthOutput: Swift.Equatable {
+public struct OnlyFakeAuthOutput {
 
     public init() { }
 }
diff --git a/Sources/WeatherSDK/models/OnlyHttpApiKeyAndBearerAuthInput.swift b/Sources/WeatherSDK/models/OnlyHttpApiKeyAndBearerAuthInput.swift
index 6e794b15c..5c7dc2de7 100644
--- a/Sources/WeatherSDK/models/OnlyHttpApiKeyAndBearerAuthInput.swift
+++ b/Sources/WeatherSDK/models/OnlyHttpApiKeyAndBearerAuthInput.swift
@@ -2,7 +2,7 @@
 
 
 
-public struct OnlyHttpApiKeyAndBearerAuthInput: Swift.Equatable {
+public struct OnlyHttpApiKeyAndBearerAuthInput {
 
     public init() { }
 }
diff --git a/Sources/WeatherSDK/models/OnlyHttpApiKeyAndBearerAuthInputBody+Decodable.swift b/Sources/WeatherSDK/models/OnlyHttpApiKeyAndBearerAuthInputBody+Decodable.swift
index b495cc02f..1bb9402a0 100644
--- a/Sources/WeatherSDK/models/OnlyHttpApiKeyAndBearerAuthInputBody+Decodable.swift
+++ b/Sources/WeatherSDK/models/OnlyHttpApiKeyAndBearerAuthInputBody+Decodable.swift
@@ -2,7 +2,7 @@
 
 import ClientRuntime
 
-struct OnlyHttpApiKeyAndBearerAuthInputBody: Swift.Equatable {
+struct OnlyHttpApiKeyAndBearerAuthInputBody {
 }
 
 extension OnlyHttpApiKeyAndBearerAuthInputBody: Swift.Decodable {
diff --git a/Sources/WeatherSDK/models/OnlyHttpApiKeyAndBearerAuthOutput.swift b/Sources/WeatherSDK/models/OnlyHttpApiKeyAndBearerAuthOutput.swift
index 1f12742b4..0a033be71 100644
--- a/Sources/WeatherSDK/models/OnlyHttpApiKeyAndBearerAuthOutput.swift
+++ b/Sources/WeatherSDK/models/OnlyHttpApiKeyAndBearerAuthOutput.swift
@@ -2,7 +2,7 @@
 
 
 
-public struct OnlyHttpApiKeyAndBearerAuthOutput: Swift.Equatable {
+public struct OnlyHttpApiKeyAndBearerAuthOutput {
 
     public init() { }
 }
diff --git a/Sources/WeatherSDK/models/OnlyHttpApiKeyAndBearerAuthReversedInput.swift b/Sources/WeatherSDK/models/OnlyHttpApiKeyAndBearerAuthReversedInput.swift
index e919fd0e2..a95573114 100644
--- a/Sources/WeatherSDK/models/OnlyHttpApiKeyAndBearerAuthReversedInput.swift
+++ b/Sources/WeatherSDK/models/OnlyHttpApiKeyAndBearerAuthReversedInput.swift
@@ -2,7 +2,7 @@
 
 
 
-public struct OnlyHttpApiKeyAndBearerAuthReversedInput: Swift.Equatable {
+public struct OnlyHttpApiKeyAndBearerAuthReversedInput {
 
     public init() { }
 }
diff --git a/Sources/WeatherSDK/models/OnlyHttpApiKeyAndBearerAuthReversedInputBody+Decodable.swift b/Sources/WeatherSDK/models/OnlyHttpApiKeyAndBearerAuthReversedInputBody+Decodable.swift
index f921377c8..0ff8fccc8 100644
--- a/Sources/WeatherSDK/models/OnlyHttpApiKeyAndBearerAuthReversedInputBody+Decodable.swift
+++ b/Sources/WeatherSDK/models/OnlyHttpApiKeyAndBearerAuthReversedInputBody+Decodable.swift
@@ -2,7 +2,7 @@
 
 import ClientRuntime
 
-struct OnlyHttpApiKeyAndBearerAuthReversedInputBody: Swift.Equatable {
+struct OnlyHttpApiKeyAndBearerAuthReversedInputBody {
 }
 
 extension OnlyHttpApiKeyAndBearerAuthReversedInputBody: Swift.Decodable {
diff --git a/Sources/WeatherSDK/models/OnlyHttpApiKeyAndBearerAuthReversedOutput.swift b/Sources/WeatherSDK/models/OnlyHttpApiKeyAndBearerAuthReversedOutput.swift
index aceb1f3e4..442231c64 100644
--- a/Sources/WeatherSDK/models/OnlyHttpApiKeyAndBearerAuthReversedOutput.swift
+++ b/Sources/WeatherSDK/models/OnlyHttpApiKeyAndBearerAuthReversedOutput.swift
@@ -2,7 +2,7 @@
 
 
 
-public struct OnlyHttpApiKeyAndBearerAuthReversedOutput: Swift.Equatable {
+public struct OnlyHttpApiKeyAndBearerAuthReversedOutput {
 
     public init() { }
 }
diff --git a/Sources/WeatherSDK/models/OnlyHttpApiKeyAuthInput.swift b/Sources/WeatherSDK/models/OnlyHttpApiKeyAuthInput.swift
index f2928ba63..38bcb3a92 100644
--- a/Sources/WeatherSDK/models/OnlyHttpApiKeyAuthInput.swift
+++ b/Sources/WeatherSDK/models/OnlyHttpApiKeyAuthInput.swift
@@ -2,7 +2,7 @@
 
 
 
-public struct OnlyHttpApiKeyAuthInput: Swift.Equatable {
+public struct OnlyHttpApiKeyAuthInput {
 
     public init() { }
 }
diff --git a/Sources/WeatherSDK/models/OnlyHttpApiKeyAuthInputBody+Decodable.swift b/Sources/WeatherSDK/models/OnlyHttpApiKeyAuthInputBody+Decodable.swift
index 0cbb3d80c..d8cade4a5 100644
--- a/Sources/WeatherSDK/models/OnlyHttpApiKeyAuthInputBody+Decodable.swift
+++ b/Sources/WeatherSDK/models/OnlyHttpApiKeyAuthInputBody+Decodable.swift
@@ -2,7 +2,7 @@
 
 import ClientRuntime
 
-struct OnlyHttpApiKeyAuthInputBody: Swift.Equatable {
+struct OnlyHttpApiKeyAuthInputBody {
 }
 
 extension OnlyHttpApiKeyAuthInputBody: Swift.Decodable {
diff --git a/Sources/WeatherSDK/models/OnlyHttpApiKeyAuthOptionalInput.swift b/Sources/WeatherSDK/models/OnlyHttpApiKeyAuthOptionalInput.swift
index f9bf051d4..f15ca9fd5 100644
--- a/Sources/WeatherSDK/models/OnlyHttpApiKeyAuthOptionalInput.swift
+++ b/Sources/WeatherSDK/models/OnlyHttpApiKeyAuthOptionalInput.swift
@@ -2,7 +2,7 @@
 
 
 
-public struct OnlyHttpApiKeyAuthOptionalInput: Swift.Equatable {
+public struct OnlyHttpApiKeyAuthOptionalInput {
 
     public init() { }
 }
diff --git a/Sources/WeatherSDK/models/OnlyHttpApiKeyAuthOptionalInputBody+Decodable.swift b/Sources/WeatherSDK/models/OnlyHttpApiKeyAuthOptionalInputBody+Decodable.swift
index 652cbde88..c3bfa702a 100644
--- a/Sources/WeatherSDK/models/OnlyHttpApiKeyAuthOptionalInputBody+Decodable.swift
+++ b/Sources/WeatherSDK/models/OnlyHttpApiKeyAuthOptionalInputBody+Decodable.swift
@@ -2,7 +2,7 @@
 
 import ClientRuntime
 
-struct OnlyHttpApiKeyAuthOptionalInputBody: Swift.Equatable {
+struct OnlyHttpApiKeyAuthOptionalInputBody {
 }
 
 extension OnlyHttpApiKeyAuthOptionalInputBody: Swift.Decodable {
diff --git a/Sources/WeatherSDK/models/OnlyHttpApiKeyAuthOptionalOutput.swift b/Sources/WeatherSDK/models/OnlyHttpApiKeyAuthOptionalOutput.swift
index fea3b5522..6d3fd3135 100644
--- a/Sources/WeatherSDK/models/OnlyHttpApiKeyAuthOptionalOutput.swift
+++ b/Sources/WeatherSDK/models/OnlyHttpApiKeyAuthOptionalOutput.swift
@@ -2,7 +2,7 @@
 
 
 
-public struct OnlyHttpApiKeyAuthOptionalOutput: Swift.Equatable {
+public struct OnlyHttpApiKeyAuthOptionalOutput {
 
     public init() { }
 }
diff --git a/Sources/WeatherSDK/models/OnlyHttpApiKeyAuthOutput.swift b/Sources/WeatherSDK/models/OnlyHttpApiKeyAuthOutput.swift
index ac46c5dd0..0bf71ce53 100644
--- a/Sources/WeatherSDK/models/OnlyHttpApiKeyAuthOutput.swift
+++ b/Sources/WeatherSDK/models/OnlyHttpApiKeyAuthOutput.swift
@@ -2,7 +2,7 @@
 
 
 
-public struct OnlyHttpApiKeyAuthOutput: Swift.Equatable {
+public struct OnlyHttpApiKeyAuthOutput {
 
     public init() { }
 }
diff --git a/Sources/WeatherSDK/models/OnlyHttpBearerAuthInput.swift b/Sources/WeatherSDK/models/OnlyHttpBearerAuthInput.swift
index 32e2bce5f..beb2a0389 100644
--- a/Sources/WeatherSDK/models/OnlyHttpBearerAuthInput.swift
+++ b/Sources/WeatherSDK/models/OnlyHttpBearerAuthInput.swift
@@ -2,7 +2,7 @@
 
 
 
-public struct OnlyHttpBearerAuthInput: Swift.Equatable {
+public struct OnlyHttpBearerAuthInput {
 
     public init() { }
 }
diff --git a/Sources/WeatherSDK/models/OnlyHttpBearerAuthInputBody+Decodable.swift b/Sources/WeatherSDK/models/OnlyHttpBearerAuthInputBody+Decodable.swift
index 63d4728dd..5d985f222 100644
--- a/Sources/WeatherSDK/models/OnlyHttpBearerAuthInputBody+Decodable.swift
+++ b/Sources/WeatherSDK/models/OnlyHttpBearerAuthInputBody+Decodable.swift
@@ -2,7 +2,7 @@
 
 import ClientRuntime
 
-struct OnlyHttpBearerAuthInputBody: Swift.Equatable {
+struct OnlyHttpBearerAuthInputBody {
 }
 
 extension OnlyHttpBearerAuthInputBody: Swift.Decodable {
diff --git a/Sources/WeatherSDK/models/OnlyHttpBearerAuthOptionalInput.swift b/Sources/WeatherSDK/models/OnlyHttpBearerAuthOptionalInput.swift
index ef5ad7ab8..431db9802 100644
--- a/Sources/WeatherSDK/models/OnlyHttpBearerAuthOptionalInput.swift
+++ b/Sources/WeatherSDK/models/OnlyHttpBearerAuthOptionalInput.swift
@@ -2,7 +2,7 @@
 
 
 
-public struct OnlyHttpBearerAuthOptionalInput: Swift.Equatable {
+public struct OnlyHttpBearerAuthOptionalInput {
 
     public init() { }
 }
diff --git a/Sources/WeatherSDK/models/OnlyHttpBearerAuthOptionalInputBody+Decodable.swift b/Sources/WeatherSDK/models/OnlyHttpBearerAuthOptionalInputBody+Decodable.swift
index 5b620925f..738c81497 100644
--- a/Sources/WeatherSDK/models/OnlyHttpBearerAuthOptionalInputBody+Decodable.swift
+++ b/Sources/WeatherSDK/models/OnlyHttpBearerAuthOptionalInputBody+Decodable.swift
@@ -2,7 +2,7 @@
 
 import ClientRuntime
 
-struct OnlyHttpBearerAuthOptionalInputBody: Swift.Equatable {
+struct OnlyHttpBearerAuthOptionalInputBody {
 }
 
 extension OnlyHttpBearerAuthOptionalInputBody: Swift.Decodable {
diff --git a/Sources/WeatherSDK/models/OnlyHttpBearerAuthOptionalOutput.swift b/Sources/WeatherSDK/models/OnlyHttpBearerAuthOptionalOutput.swift
index b8318456a..fa8fa4185 100644
--- a/Sources/WeatherSDK/models/OnlyHttpBearerAuthOptionalOutput.swift
+++ b/Sources/WeatherSDK/models/OnlyHttpBearerAuthOptionalOutput.swift
@@ -2,7 +2,7 @@
 
 
 
-public struct OnlyHttpBearerAuthOptionalOutput: Swift.Equatable {
+public struct OnlyHttpBearerAuthOptionalOutput {
 
     public init() { }
 }
diff --git a/Sources/WeatherSDK/models/OnlyHttpBearerAuthOutput.swift b/Sources/WeatherSDK/models/OnlyHttpBearerAuthOutput.swift
index 1109f19ee..543b482db 100644
--- a/Sources/WeatherSDK/models/OnlyHttpBearerAuthOutput.swift
+++ b/Sources/WeatherSDK/models/OnlyHttpBearerAuthOutput.swift
@@ -2,7 +2,7 @@
 
 
 
-public struct OnlyHttpBearerAuthOutput: Swift.Equatable {
+public struct OnlyHttpBearerAuthOutput {
 
     public init() { }
 }
diff --git a/Sources/WeatherSDK/models/OnlySigv4AuthInput.swift b/Sources/WeatherSDK/models/OnlySigv4AuthInput.swift
index 629904965..e8e32da66 100644
--- a/Sources/WeatherSDK/models/OnlySigv4AuthInput.swift
+++ b/Sources/WeatherSDK/models/OnlySigv4AuthInput.swift
@@ -2,7 +2,7 @@
 
 
 
-public struct OnlySigv4AuthInput: Swift.Equatable {
+public struct OnlySigv4AuthInput {
 
     public init() { }
 }
diff --git a/Sources/WeatherSDK/models/OnlySigv4AuthInputBody+Decodable.swift b/Sources/WeatherSDK/models/OnlySigv4AuthInputBody+Decodable.swift
index ee63ddd6d..bf62a34c1 100644
--- a/Sources/WeatherSDK/models/OnlySigv4AuthInputBody+Decodable.swift
+++ b/Sources/WeatherSDK/models/OnlySigv4AuthInputBody+Decodable.swift
@@ -2,7 +2,7 @@
 
 import ClientRuntime
 
-struct OnlySigv4AuthInputBody: Swift.Equatable {
+struct OnlySigv4AuthInputBody {
 }
 
 extension OnlySigv4AuthInputBody: Swift.Decodable {
diff --git a/Sources/WeatherSDK/models/OnlySigv4AuthOptionalInput.swift b/Sources/WeatherSDK/models/OnlySigv4AuthOptionalInput.swift
index 4c3e3187a..d5ed2ab51 100644
--- a/Sources/WeatherSDK/models/OnlySigv4AuthOptionalInput.swift
+++ b/Sources/WeatherSDK/models/OnlySigv4AuthOptionalInput.swift
@@ -2,7 +2,7 @@
 
 
 
-public struct OnlySigv4AuthOptionalInput: Swift.Equatable {
+public struct OnlySigv4AuthOptionalInput {
 
     public init() { }
 }
diff --git a/Sources/WeatherSDK/models/OnlySigv4AuthOptionalInputBody+Decodable.swift b/Sources/WeatherSDK/models/OnlySigv4AuthOptionalInputBody+Decodable.swift
index 499b8516f..f2348d1c9 100644
--- a/Sources/WeatherSDK/models/OnlySigv4AuthOptionalInputBody+Decodable.swift
+++ b/Sources/WeatherSDK/models/OnlySigv4AuthOptionalInputBody+Decodable.swift
@@ -2,7 +2,7 @@
 
 import ClientRuntime
 
-struct OnlySigv4AuthOptionalInputBody: Swift.Equatable {
+struct OnlySigv4AuthOptionalInputBody {
 }
 
 extension OnlySigv4AuthOptionalInputBody: Swift.Decodable {
diff --git a/Sources/WeatherSDK/models/OnlySigv4AuthOptionalOutput.swift b/Sources/WeatherSDK/models/OnlySigv4AuthOptionalOutput.swift
index 5551fdcd3..60acbebd2 100644
--- a/Sources/WeatherSDK/models/OnlySigv4AuthOptionalOutput.swift
+++ b/Sources/WeatherSDK/models/OnlySigv4AuthOptionalOutput.swift
@@ -2,7 +2,7 @@
 
 
 
-public struct OnlySigv4AuthOptionalOutput: Swift.Equatable {
+public struct OnlySigv4AuthOptionalOutput {
 
     public init() { }
 }
diff --git a/Sources/WeatherSDK/models/OnlySigv4AuthOutput.swift b/Sources/WeatherSDK/models/OnlySigv4AuthOutput.swift
index ae8505a16..4a603d7c9 100644
--- a/Sources/WeatherSDK/models/OnlySigv4AuthOutput.swift
+++ b/Sources/WeatherSDK/models/OnlySigv4AuthOutput.swift
@@ -2,7 +2,7 @@
 
 
 
-public struct OnlySigv4AuthOutput: Swift.Equatable {
+public struct OnlySigv4AuthOutput {
 
     public init() { }
 }
diff --git a/Sources/WeatherSDK/models/OtherStructure.swift b/Sources/WeatherSDK/models/OtherStructure.swift
index 1fd5bfbf2..f4602049d 100644
--- a/Sources/WeatherSDK/models/OtherStructure.swift
+++ b/Sources/WeatherSDK/models/OtherStructure.swift
@@ -3,7 +3,7 @@
 
 
 extension WeatherClientTypes {
-    public struct OtherStructure: Swift.Equatable {
+    public struct OtherStructure {
 
         public init() { }
     }
diff --git a/Sources/WeatherSDK/models/Precipitation.swift b/Sources/WeatherSDK/models/Precipitation.swift
index aba631eff..5180437f0 100644
--- a/Sources/WeatherSDK/models/Precipitation.swift
+++ b/Sources/WeatherSDK/models/Precipitation.swift
@@ -3,7 +3,7 @@
 import ClientRuntime
 
 extension WeatherClientTypes {
-    public enum Precipitation: Swift.Equatable {
+    public enum Precipitation {
         case rain(Swift.Bool)
         case sleet(Swift.Bool)
         case hail([Swift.String:Swift.String])
diff --git a/Sources/WeatherSDK/models/SameAsServiceInput.swift b/Sources/WeatherSDK/models/SameAsServiceInput.swift
index ceb161c9e..613cb04b1 100644
--- a/Sources/WeatherSDK/models/SameAsServiceInput.swift
+++ b/Sources/WeatherSDK/models/SameAsServiceInput.swift
@@ -2,7 +2,7 @@
 
 
 
-public struct SameAsServiceInput: Swift.Equatable {
+public struct SameAsServiceInput {
 
     public init() { }
 }
diff --git a/Sources/WeatherSDK/models/SameAsServiceInputBody+Decodable.swift b/Sources/WeatherSDK/models/SameAsServiceInputBody+Decodable.swift
index 098f896cf..c7d307384 100644
--- a/Sources/WeatherSDK/models/SameAsServiceInputBody+Decodable.swift
+++ b/Sources/WeatherSDK/models/SameAsServiceInputBody+Decodable.swift
@@ -2,7 +2,7 @@
 
 import ClientRuntime
 
-struct SameAsServiceInputBody: Swift.Equatable {
+struct SameAsServiceInputBody {
 }
 
 extension SameAsServiceInputBody: Swift.Decodable {
diff --git a/Sources/WeatherSDK/models/SameAsServiceOutput.swift b/Sources/WeatherSDK/models/SameAsServiceOutput.swift
index 2e9a54cc9..35ff2b086 100644
--- a/Sources/WeatherSDK/models/SameAsServiceOutput.swift
+++ b/Sources/WeatherSDK/models/SameAsServiceOutput.swift
@@ -2,7 +2,7 @@
 
 
 
-public struct SameAsServiceOutput: Swift.Equatable {
+public struct SameAsServiceOutput {
 
     public init() { }
 }
diff --git a/Tests/WeatherSDKTests/GetCityAnnouncementsErrorTest.swift b/Tests/WeatherSDKTests/GetCityAnnouncementsErrorTest.swift
index 3751e824a..fe45a19a4 100644
--- a/Tests/WeatherSDKTests/GetCityAnnouncementsErrorTest.swift
+++ b/Tests/WeatherSDKTests/GetCityAnnouncementsErrorTest.swift
@@ -37,8 +37,7 @@ class GetCityAnnouncementsNoSuchResourceTest: HttpResponseTestBase {
                     resourceType: "City"
                 )
                 XCTAssertEqual(actual.httpResponse.statusCode, HttpStatusCode(rawValue: 404))
-                XCTAssertEqual(expected.properties.resourceType, actual.properties.resourceType)
-                XCTAssertEqual(expected.properties.message, actual.properties.message)
+                XCTAssertEqual(actual, expected)
             } else {
                 XCTFail("The deserialized error type does not match expected type")
             }
diff --git a/Tests/WeatherSDKTests/GetCityErrorTest.swift b/Tests/WeatherSDKTests/GetCityErrorTest.swift
index b531d37c8..0577aeb71 100644
--- a/Tests/WeatherSDKTests/GetCityErrorTest.swift
+++ b/Tests/WeatherSDKTests/GetCityErrorTest.swift
@@ -37,8 +37,7 @@ class GetCityNoSuchResourceTest: HttpResponseTestBase {
                     resourceType: "City"
                 )
                 XCTAssertEqual(actual.httpResponse.statusCode, HttpStatusCode(rawValue: 404))
-                XCTAssertEqual(expected.properties.resourceType, actual.properties.resourceType)
-                XCTAssertEqual(expected.properties.message, actual.properties.message)
+                XCTAssertEqual(actual, expected)
             } else {
                 XCTFail("The deserialized error type does not match expected type")
             }
diff --git a/Tests/WeatherSDKTests/GetCityImageErrorTest.swift b/Tests/WeatherSDKTests/GetCityImageErrorTest.swift
index dec9e7f71..c0f27a804 100644
--- a/Tests/WeatherSDKTests/GetCityImageErrorTest.swift
+++ b/Tests/WeatherSDKTests/GetCityImageErrorTest.swift
@@ -37,8 +37,7 @@ class GetCityImageNoSuchResourceTest: HttpResponseTestBase {
                     resourceType: "City"
                 )
                 XCTAssertEqual(actual.httpResponse.statusCode, HttpStatusCode(rawValue: 404))
-                XCTAssertEqual(expected.properties.resourceType, actual.properties.resourceType)
-                XCTAssertEqual(expected.properties.message, actual.properties.message)
+                XCTAssertEqual(actual, expected)
             } else {
                 XCTFail("The deserialized error type does not match expected type")
             }
diff --git a/Tests/WeatherSDKTests/GetCityResponseTest.swift b/Tests/WeatherSDKTests/GetCityResponseTest.swift
index 9e07c0da7..cd28201fb 100644
--- a/Tests/WeatherSDKTests/GetCityResponseTest.swift
+++ b/Tests/WeatherSDKTests/GetCityResponseTest.swift
@@ -51,9 +51,7 @@ class GetCityResponseTest: HttpResponseTestBase {
             name: "Seattle"
         )
 
-        XCTAssertEqual(expected.name, actual.name)
-        XCTAssertEqual(expected.coordinates, actual.coordinates)
-        XCTAssertEqual(expected.city, actual.city)
+        XCTAssertEqual(actual, expected)
 
     }
 }
diff --git a/Tests/WeatherSDKTests/ListCitiesErrorTest.swift b/Tests/WeatherSDKTests/ListCitiesErrorTest.swift
index 48706d02b..890adb237 100644
--- a/Tests/WeatherSDKTests/ListCitiesErrorTest.swift
+++ b/Tests/WeatherSDKTests/ListCitiesErrorTest.swift
@@ -37,8 +37,7 @@ class ListCitiesNoSuchResourceTest: HttpResponseTestBase {
                     resourceType: "City"
                 )
                 XCTAssertEqual(actual.httpResponse.statusCode, HttpStatusCode(rawValue: 404))
-                XCTAssertEqual(expected.properties.resourceType, actual.properties.resourceType)
-                XCTAssertEqual(expected.properties.message, actual.properties.message)
+                XCTAssertEqual(actual, expected)
             } else {
                 XCTFail("The deserialized error type does not match expected type")
             }
diff --git a/Tests/WeatherSDKTests/models/CityCoordinates+Equatable.swift b/Tests/WeatherSDKTests/models/CityCoordinates+Equatable.swift
new file mode 100644
index 000000000..c730ee1f1
--- /dev/null
+++ b/Tests/WeatherSDKTests/models/CityCoordinates+Equatable.swift
@@ -0,0 +1,13 @@
+// Code generated by smithy-swift-codegen. DO NOT EDIT!
+
+import SmithyTestUtil
+import WeatherSDK
+
+extension WeatherClientTypes.CityCoordinates: Swift.Equatable {
+
+    public static func ==(lhs: WeatherClientTypes.CityCoordinates, rhs: WeatherClientTypes.CityCoordinates) -> Bool {
+        if (!floatingPointValuesMatch(lhs: lhs.latitude, rhs: rhs.latitude)) { return false }
+        if (!floatingPointValuesMatch(lhs: lhs.longitude, rhs: rhs.longitude)) { return false }
+        return true
+    }
+}
diff --git a/Tests/WeatherSDKTests/models/CitySummary+Equatable.swift b/Tests/WeatherSDKTests/models/CitySummary+Equatable.swift
new file mode 100644
index 000000000..e97bddce0
--- /dev/null
+++ b/Tests/WeatherSDKTests/models/CitySummary+Equatable.swift
@@ -0,0 +1,15 @@
+// Code generated by smithy-swift-codegen. DO NOT EDIT!
+
+import SmithyTestUtil
+import WeatherSDK
+
+extension WeatherClientTypes.CitySummary: Swift.Equatable {
+
+    public static func ==(lhs: WeatherClientTypes.CitySummary, rhs: WeatherClientTypes.CitySummary) -> Bool {
+        if lhs.cityId != rhs.cityId { return false }
+        if lhs.name != rhs.name { return false }
+        if lhs.number != rhs.number { return false }
+        if lhs.`case` != rhs.`case` { return false }
+        return true
+    }
+}
diff --git a/Tests/WeatherSDKTests/models/GetCityAnnouncementsInput+Equatable.swift b/Tests/WeatherSDKTests/models/GetCityAnnouncementsInput+Equatable.swift
new file mode 100644
index 000000000..d5108a4c5
--- /dev/null
+++ b/Tests/WeatherSDKTests/models/GetCityAnnouncementsInput+Equatable.swift
@@ -0,0 +1,12 @@
+// Code generated by smithy-swift-codegen. DO NOT EDIT!
+
+import SmithyTestUtil
+import WeatherSDK
+
+extension GetCityAnnouncementsInput: Swift.Equatable {
+
+    public static func ==(lhs: GetCityAnnouncementsInput, rhs: GetCityAnnouncementsInput) -> Bool {
+        if lhs.cityId != rhs.cityId { return false }
+        return true
+    }
+}
diff --git a/Tests/WeatherSDKTests/models/GetCityAnnouncementsOutput+Equatable.swift b/Tests/WeatherSDKTests/models/GetCityAnnouncementsOutput+Equatable.swift
new file mode 100644
index 000000000..673717702
--- /dev/null
+++ b/Tests/WeatherSDKTests/models/GetCityAnnouncementsOutput+Equatable.swift
@@ -0,0 +1,12 @@
+// Code generated by smithy-swift-codegen. DO NOT EDIT!
+
+import SmithyTestUtil
+import WeatherSDK
+
+extension GetCityAnnouncementsOutput: Swift.Equatable {
+
+    public static func ==(lhs: GetCityAnnouncementsOutput, rhs: GetCityAnnouncementsOutput) -> Bool {
+        if lhs.lastUpdated != rhs.lastUpdated { return false }
+        return true
+    }
+}
diff --git a/Tests/WeatherSDKTests/models/GetCityImageInput+Equatable.swift b/Tests/WeatherSDKTests/models/GetCityImageInput+Equatable.swift
new file mode 100644
index 000000000..c867036a4
--- /dev/null
+++ b/Tests/WeatherSDKTests/models/GetCityImageInput+Equatable.swift
@@ -0,0 +1,12 @@
+// Code generated by smithy-swift-codegen. DO NOT EDIT!
+
+import SmithyTestUtil
+import WeatherSDK
+
+extension GetCityImageInput: Swift.Equatable {
+
+    public static func ==(lhs: GetCityImageInput, rhs: GetCityImageInput) -> Bool {
+        if lhs.cityId != rhs.cityId { return false }
+        return true
+    }
+}
diff --git a/Tests/WeatherSDKTests/models/GetCityImageOutput+Equatable.swift b/Tests/WeatherSDKTests/models/GetCityImageOutput+Equatable.swift
new file mode 100644
index 000000000..0db601b16
--- /dev/null
+++ b/Tests/WeatherSDKTests/models/GetCityImageOutput+Equatable.swift
@@ -0,0 +1,12 @@
+// Code generated by smithy-swift-codegen. DO NOT EDIT!
+
+import SmithyTestUtil
+import WeatherSDK
+
+extension GetCityImageOutput: Swift.Equatable {
+
+    public static func ==(lhs: GetCityImageOutput, rhs: GetCityImageOutput) -> Bool {
+        if lhs.image != rhs.image { return false }
+        return true
+    }
+}
diff --git a/Tests/WeatherSDKTests/models/GetCityInput+Equatable.swift b/Tests/WeatherSDKTests/models/GetCityInput+Equatable.swift
new file mode 100644
index 000000000..30c818d39
--- /dev/null
+++ b/Tests/WeatherSDKTests/models/GetCityInput+Equatable.swift
@@ -0,0 +1,12 @@
+// Code generated by smithy-swift-codegen. DO NOT EDIT!
+
+import SmithyTestUtil
+import WeatherSDK
+
+extension GetCityInput: Swift.Equatable {
+
+    public static func ==(lhs: GetCityInput, rhs: GetCityInput) -> Bool {
+        if lhs.cityId != rhs.cityId { return false }
+        return true
+    }
+}
diff --git a/Tests/WeatherSDKTests/models/GetCityOutput+Equatable.swift b/Tests/WeatherSDKTests/models/GetCityOutput+Equatable.swift
new file mode 100644
index 000000000..ca498e73d
--- /dev/null
+++ b/Tests/WeatherSDKTests/models/GetCityOutput+Equatable.swift
@@ -0,0 +1,14 @@
+// Code generated by smithy-swift-codegen. DO NOT EDIT!
+
+import SmithyTestUtil
+import WeatherSDK
+
+extension GetCityOutput: Swift.Equatable {
+
+    public static func ==(lhs: GetCityOutput, rhs: GetCityOutput) -> Bool {
+        if lhs.name != rhs.name { return false }
+        if lhs.coordinates != rhs.coordinates { return false }
+        if lhs.city != rhs.city { return false }
+        return true
+    }
+}
diff --git a/Tests/WeatherSDKTests/models/ListCitiesInput+Equatable.swift b/Tests/WeatherSDKTests/models/ListCitiesInput+Equatable.swift
new file mode 100644
index 000000000..6283df2eb
--- /dev/null
+++ b/Tests/WeatherSDKTests/models/ListCitiesInput+Equatable.swift
@@ -0,0 +1,11 @@
+// Code generated by smithy-swift-codegen. DO NOT EDIT!
+
+import SmithyTestUtil
+import WeatherSDK
+
+extension ListCitiesInput: Swift.Equatable {
+
+    public static func ==(lhs: ListCitiesInput, rhs: ListCitiesInput) -> Bool {
+        return true
+    }
+}
diff --git a/Tests/WeatherSDKTests/models/ListCitiesOutput+Equatable.swift b/Tests/WeatherSDKTests/models/ListCitiesOutput+Equatable.swift
new file mode 100644
index 000000000..8d8719237
--- /dev/null
+++ b/Tests/WeatherSDKTests/models/ListCitiesOutput+Equatable.swift
@@ -0,0 +1,13 @@
+// Code generated by smithy-swift-codegen. DO NOT EDIT!
+
+import SmithyTestUtil
+import WeatherSDK
+
+extension ListCitiesOutput: Swift.Equatable {
+
+    public static func ==(lhs: ListCitiesOutput, rhs: ListCitiesOutput) -> Bool {
+        if lhs.nextToken != rhs.nextToken { return false }
+        if lhs.items != rhs.items { return false }
+        return true
+    }
+}
diff --git a/Tests/WeatherSDKTests/models/NoSuchResource+Equatable.swift b/Tests/WeatherSDKTests/models/NoSuchResource+Equatable.swift
new file mode 100644
index 000000000..e6dbc552a
--- /dev/null
+++ b/Tests/WeatherSDKTests/models/NoSuchResource+Equatable.swift
@@ -0,0 +1,13 @@
+// Code generated by smithy-swift-codegen. DO NOT EDIT!
+
+import SmithyTestUtil
+import WeatherSDK
+
+extension NoSuchResource: Swift.Equatable {
+
+    public static func ==(lhs: NoSuchResource, rhs: NoSuchResource) -> Bool {
+        if lhs.properties.resourceType != rhs.properties.resourceType { return false }
+        if lhs.properties.message != rhs.properties.message { return false }
+        return true
+    }
+}
diff --git a/smithy-swift-codegen/src/main/kotlin/software/amazon/smithy/swift/codegen/config/DefaultClientConfiguration.kt b/smithy-swift-codegen/src/main/kotlin/software/amazon/smithy/swift/codegen/config/DefaultClientConfiguration.kt
index aea6ed9b9..c9a2efd48 100644
--- a/smithy-swift-codegen/src/main/kotlin/software/amazon/smithy/swift/codegen/config/DefaultClientConfiguration.kt
+++ b/smithy-swift-codegen/src/main/kotlin/software/amazon/smithy/swift/codegen/config/DefaultClientConfiguration.kt
@@ -26,18 +26,18 @@ class DefaultClientConfiguration : ClientConfiguration {
         ConfigProperty(
             "retryStrategyOptions",
             ClientRuntimeTypes.Core.RetryStrategyOptions,
-            "DefaultSDKRuntimeConfiguration<DefaultRetryStrategy, DefaultRetryErrorInfoProvider>.defaultRetryStrategyOptions"
+            "ClientConfigurationDefaults.defaultRetryStrategyOptions"
         ),
         ConfigProperty(
             "clientLogMode",
             ClientRuntimeTypes.Core.ClientLogMode,
-            "DefaultSDKRuntimeConfiguration<DefaultRetryStrategy, DefaultRetryErrorInfoProvider>.defaultClientLogMode"
+            "ClientConfigurationDefaults.defaultClientLogMode"
         ),
         ConfigProperty("endpoint", SwiftTypes.String.toOptional()),
         ConfigProperty(
             "idempotencyTokenGenerator",
             ClientRuntimeTypes.Core.IdempotencyTokenGenerator,
-            "DefaultSDKRuntimeConfiguration<DefaultRetryStrategy, DefaultRetryErrorInfoProvider>.defaultIdempotencyTokenGenerator"
+            "ClientConfigurationDefaults.defaultIdempotencyTokenGenerator"
         ),
     )
 }
diff --git a/smithy-swift-codegen/src/main/kotlin/software/amazon/smithy/swift/codegen/config/DefaultHttpClientConfiguration.kt b/smithy-swift-codegen/src/main/kotlin/software/amazon/smithy/swift/codegen/config/DefaultHttpClientConfiguration.kt
index 93df43901..56ed5a401 100644
--- a/smithy-swift-codegen/src/main/kotlin/software/amazon/smithy/swift/codegen/config/DefaultHttpClientConfiguration.kt
+++ b/smithy-swift-codegen/src/main/kotlin/software/amazon/smithy/swift/codegen/config/DefaultHttpClientConfiguration.kt
@@ -20,18 +20,20 @@ class DefaultHttpClientConfiguration : ClientConfiguration {
         ConfigProperty(
             "httpClientEngine",
             ClientRuntimeTypes.Http.HttpClient,
-            "DefaultSDKRuntimeConfiguration<DefaultRetryStrategy, DefaultRetryErrorInfoProvider>.makeClient()"
+            "ClientConfigurationDefaults.makeClient(httpClientConfiguration: " +
+                "httpClientConfiguration ?? ClientConfigurationDefaults.defaultHttpClientConfiguration" +
+                ")"
         ),
         ConfigProperty(
             "httpClientConfiguration",
             ClientRuntimeTypes.Http.HttpClientConfiguration,
-            "DefaultSDKRuntimeConfiguration<DefaultRetryStrategy, DefaultRetryErrorInfoProvider>.defaultHttpClientConfiguration"
+            "ClientConfigurationDefaults.defaultHttpClientConfiguration"
         ),
         ConfigProperty("authSchemes", ClientRuntimeTypes.Auth.AuthSchemes.toOptional()),
         ConfigProperty(
             "authSchemeResolver",
             ClientRuntimeTypes.Auth.AuthSchemeResolver,
-            "DefaultSDKRuntimeConfiguration<DefaultRetryStrategy, DefaultRetryErrorInfoProvider>.defaultAuthSchemeResolver"
+            "ClientConfigurationDefaults.defaultAuthSchemeResolver"
         )
     )
 }
diff --git a/smithy-swift-codegen/src/test/kotlin/HttpProtocolClientGeneratorTests.kt b/smithy-swift-codegen/src/test/kotlin/HttpProtocolClientGeneratorTests.kt
index 2c59b6b2d..e2da97388 100644
--- a/smithy-swift-codegen/src/test/kotlin/HttpProtocolClientGeneratorTests.kt
+++ b/smithy-swift-codegen/src/test/kotlin/HttpProtocolClientGeneratorTests.kt
@@ -77,7 +77,7 @@ class HttpProtocolClientGeneratorTests {
                     }
             
                     public convenience init(telemetryProvider: ClientRuntime.TelemetryProvider? = nil, retryStrategyOptions: ClientRuntime.RetryStrategyOptions? = nil, clientLogMode: ClientRuntime.ClientLogMode? = nil, endpoint: Swift.String? = nil, idempotencyTokenGenerator: ClientRuntime.IdempotencyTokenGenerator? = nil, httpClientEngine: ClientRuntime.HTTPClient? = nil, httpClientConfiguration: ClientRuntime.HttpClientConfiguration? = nil, authSchemes: [ClientRuntime.AuthScheme]? = nil, authSchemeResolver: ClientRuntime.AuthSchemeResolver? = nil) throws {
-                        self.init(telemetryProvider ?? ClientRuntime.DefaultTelemetry.provider, retryStrategyOptions ?? DefaultSDKRuntimeConfiguration<DefaultRetryStrategy, DefaultRetryErrorInfoProvider>.defaultRetryStrategyOptions, clientLogMode ?? DefaultSDKRuntimeConfiguration<DefaultRetryStrategy, DefaultRetryErrorInfoProvider>.defaultClientLogMode, endpoint, idempotencyTokenGenerator ?? DefaultSDKRuntimeConfiguration<DefaultRetryStrategy, DefaultRetryErrorInfoProvider>.defaultIdempotencyTokenGenerator, httpClientEngine ?? DefaultSDKRuntimeConfiguration<DefaultRetryStrategy, DefaultRetryErrorInfoProvider>.makeClient(), httpClientConfiguration ?? DefaultSDKRuntimeConfiguration<DefaultRetryStrategy, DefaultRetryErrorInfoProvider>.defaultHttpClientConfiguration, authSchemes, authSchemeResolver ?? DefaultSDKRuntimeConfiguration<DefaultRetryStrategy, DefaultRetryErrorInfoProvider>.defaultAuthSchemeResolver)
+                        self.init(telemetryProvider ?? ClientRuntime.DefaultTelemetry.provider, retryStrategyOptions ?? ClientConfigurationDefaults.defaultRetryStrategyOptions, clientLogMode ?? ClientConfigurationDefaults.defaultClientLogMode, endpoint, idempotencyTokenGenerator ?? ClientConfigurationDefaults.defaultIdempotencyTokenGenerator, httpClientEngine ?? ClientConfigurationDefaults.makeClient(httpClientConfiguration: httpClientConfiguration ?? ClientConfigurationDefaults.defaultHttpClientConfiguration), httpClientConfiguration ?? ClientConfigurationDefaults.defaultHttpClientConfiguration, authSchemes, authSchemeResolver ?? ClientConfigurationDefaults.defaultAuthSchemeResolver)
                     }
             
                     public convenience required init() async throws {