From 89d2479d02d4c5645069f97146686857852ed511 Mon Sep 17 00:00:00 2001
From: George Fu <kuhe@users.noreply.github.com>
Date: Fri, 20 Jun 2025 15:44:13 -0400
Subject: [PATCH] fix: omit endpoint polymorphs from resolved config types
---
.../src/endpoint/EndpointParameters.ts | 2 +-
private/smithy-rpcv2-cbor/src/endpoint/EndpointParameters.ts | 2 +-
.../typescript/codegen/endpointsV2/EndpointsV2Generator.java | 4 +++-
3 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/private/smithy-rpcv2-cbor-schema/src/endpoint/EndpointParameters.ts b/private/smithy-rpcv2-cbor-schema/src/endpoint/EndpointParameters.ts
index 530b60dace6..9eb4c922345 100644
--- a/private/smithy-rpcv2-cbor-schema/src/endpoint/EndpointParameters.ts
+++ b/private/smithy-rpcv2-cbor-schema/src/endpoint/EndpointParameters.ts
@@ -8,7 +8,7 @@ export interface ClientInputEndpointParameters {
endpoint?: string | Provider<string> | Endpoint | Provider<Endpoint> | EndpointV2 | Provider<EndpointV2>;
}
-export type ClientResolvedEndpointParameters = ClientInputEndpointParameters & {
+export type ClientResolvedEndpointParameters = Omit<ClientInputEndpointParameters, "endpoint"> & {
defaultSigningName: string;
};
diff --git a/private/smithy-rpcv2-cbor/src/endpoint/EndpointParameters.ts b/private/smithy-rpcv2-cbor/src/endpoint/EndpointParameters.ts
index 530b60dace6..9eb4c922345 100644
--- a/private/smithy-rpcv2-cbor/src/endpoint/EndpointParameters.ts
+++ b/private/smithy-rpcv2-cbor/src/endpoint/EndpointParameters.ts
@@ -8,7 +8,7 @@ export interface ClientInputEndpointParameters {
endpoint?: string | Provider<string> | Endpoint | Provider<Endpoint> | EndpointV2 | Provider<EndpointV2>;
}
-export type ClientResolvedEndpointParameters = ClientInputEndpointParameters & {
+export type ClientResolvedEndpointParameters = Omit<ClientInputEndpointParameters, "endpoint"> & {
defaultSigningName: string;
};
diff --git a/smithy-typescript-codegen/src/main/java/software/amazon/smithy/typescript/codegen/endpointsV2/EndpointsV2Generator.java b/smithy-typescript-codegen/src/main/java/software/amazon/smithy/typescript/codegen/endpointsV2/EndpointsV2Generator.java
index 31d8cef42f8..e7353cd4c15 100644
--- a/smithy-typescript-codegen/src/main/java/software/amazon/smithy/typescript/codegen/endpointsV2/EndpointsV2Generator.java
+++ b/smithy-typescript-codegen/src/main/java/software/amazon/smithy/typescript/codegen/endpointsV2/EndpointsV2Generator.java
@@ -132,7 +132,9 @@ private void generateEndpointParameters() {
writer.write("");
writer.openBlock(
- "export type ClientResolvedEndpointParameters = ClientInputEndpointParameters & {",
+ """
+ export type ClientResolvedEndpointParameters = Omit<ClientInputEndpointParameters, "endpoint"> & {
+ """,
"};",
() -> {
writer.write("defaultSigningName: string;");