From 3e1ac0408bf7986172ac5d9ebfbb863b11f52206 Mon Sep 17 00:00:00 2001
From: smilkuri <smilkuri@amazon.com>
Date: Fri, 5 Dec 2025 15:58:10 +0000
Subject: [PATCH] chore: codegen changes for handling conflicting params

---
 clients/client-s3/src/endpoint/EndpointParameters.ts     | 9 +++++++++
 .../client-s3/impl/initializeWithMaximalConfiguration.ts | 1 +
 .../weather/src/auth/httpAuthExtensionConfiguration.ts   | 4 ++--
 private/weather/src/auth/httpAuthSchemeProvider.ts       | 4 ++--
 4 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/clients/client-s3/src/endpoint/EndpointParameters.ts b/clients/client-s3/src/endpoint/EndpointParameters.ts
index 73589d530a0b..a7da62dc935a 100644
--- a/clients/client-s3/src/endpoint/EndpointParameters.ts
+++ b/clients/client-s3/src/endpoint/EndpointParameters.ts
@@ -5,6 +5,9 @@ import type { Endpoint, EndpointParameters as __EndpointParameters, EndpointV2,
  * @public
  */
 export interface ClientInputEndpointParameters {
+  clientContextParams?: {
+    disableS3ExpressSessionAuth?: boolean | undefined | Provider<boolean | undefined>;
+  };
   region?: string | undefined | Provider<string | undefined>;
   useFipsEndpoint?: boolean | undefined | Provider<boolean | undefined>;
   useDualstackEndpoint?: boolean | undefined | Provider<boolean | undefined>;
@@ -24,6 +27,11 @@ export type ClientResolvedEndpointParameters = Omit<ClientInputEndpointParameter
   defaultSigningName: string;
 };
 
+/**
+ * @internal
+ */
+const clientContextParamDefaults = {} as const;
+
 /**
  * @internal
  */
@@ -38,6 +46,7 @@ export const resolveClientEndpointParameters = <T>(
     useGlobalEndpoint: options.useGlobalEndpoint ?? false,
     disableMultiregionAccessPoints: options.disableMultiregionAccessPoints ?? false,
     defaultSigningName: "s3",
+    clientContextParams: options.clientContextParams ?? {},
   });
 };
 
diff --git a/private/aws-client-api-test/src/client-interface-tests/client-s3/impl/initializeWithMaximalConfiguration.ts b/private/aws-client-api-test/src/client-interface-tests/client-s3/impl/initializeWithMaximalConfiguration.ts
index 48915588f4c4..801dd28cf873 100644
--- a/private/aws-client-api-test/src/client-interface-tests/client-s3/impl/initializeWithMaximalConfiguration.ts
+++ b/private/aws-client-api-test/src/client-interface-tests/client-s3/impl/initializeWithMaximalConfiguration.ts
@@ -121,6 +121,7 @@ export const initializeWithMaximalConfiguration = () => {
     httpAuthSchemes: [],
     httpAuthSchemeProvider: (() => null) as unknown as HttpAuthSchemeProvider<any>,
     serviceConfiguredEndpoint: null as never,
+    clientContextParams: {},
     // END internal options
 
     // S3 specific options below
diff --git a/private/weather/src/auth/httpAuthExtensionConfiguration.ts b/private/weather/src/auth/httpAuthExtensionConfiguration.ts
index b7f36cf48aac..7ecffb889668 100644
--- a/private/weather/src/auth/httpAuthExtensionConfiguration.ts
+++ b/private/weather/src/auth/httpAuthExtensionConfiguration.ts
@@ -1,8 +1,8 @@
 // smithy-typescript generated code
 import {
+  type ApiKeyIdentity,
+  type ApiKeyIdentityProvider,
   type HttpAuthScheme,
-  ApiKeyIdentity,
-  ApiKeyIdentityProvider,
   AwsCredentialIdentity,
   AwsCredentialIdentityProvider,
   TokenIdentity,
diff --git a/private/weather/src/auth/httpAuthSchemeProvider.ts b/private/weather/src/auth/httpAuthSchemeProvider.ts
index da1c65ffe2e6..fbd5fa88ddfe 100644
--- a/private/weather/src/auth/httpAuthSchemeProvider.ts
+++ b/private/weather/src/auth/httpAuthSchemeProvider.ts
@@ -1,6 +1,8 @@
 // smithy-typescript generated code
 import { doesIdentityRequireRefresh, isIdentityExpired, memoizeIdentityProvider } from "@smithy/core";
 import {
+  type ApiKeyIdentity,
+  type ApiKeyIdentityProvider,
   type HandlerExecutionContext,
   type HttpAuthOption,
   type HttpAuthScheme,
@@ -8,8 +10,6 @@ import {
   type HttpAuthSchemeParametersProvider,
   type HttpAuthSchemeProvider,
   type Provider,
-  ApiKeyIdentity,
-  ApiKeyIdentityProvider,
   AwsCredentialIdentity,
   AwsCredentialIdentityProvider,
   HttpApiKeyAuthLocation,