chore: fix failing integ tests

Author: smilkuri

packages/eventstream-serde-universal/src/eventstream-cbor.integ.spec.ts

@@ -9,7 +9,8 @@ describe("local model integration test for cbor eventstreams", () => {
   it("should read and write cbor event streams", async () => {
     const client = new XYZService({
       endpoint: "https://localhost",
-    });
+      apiKey: { apiKey: "test-api-key" },
+    } as any);
 
     const body = cbor.serialize({
       id: "alpha",

packages/middleware-endpoint/src/adaptors/getEndpointFromInstructions.ts

@@ -92,9 +92,9 @@ export const resolveParams = async <
       case "clientContextParams":
       case "builtInParams":
         endpointParams[name] = await createConfigValueProvider<Config>(
-          instruction.name, 
-          name, 
-          clientConfig, 
+          instruction.name,
+          name,
+          clientConfig,
           instruction.type !== "builtInParams"
         )();
         break;

packages/util-retry/src/retries.integ.spec.ts

@@ -20,7 +20,8 @@ describe("retries", () => {
   it("should retry throttling and transient-error status codes", async () => {
     const client = new XYZService({
       endpoint: "https://localhost/nowhere",
-    });
+      apiKey: { apiKey: "test-api-key" },
+    } as any);
 
     requireRequestsFrom(client)
       .toMatch({
@@ -50,7 +51,8 @@ describe("retries", () => {
   it("should retry when a retryable trait is modeled", async () => {
     const client = new XYZService({
       endpoint: "https://localhost/nowhere",
-    });
+      apiKey: { apiKey: "test-api-key" },
+    } as any);
 
     requireRequestsFrom(client)
       .toMatch({
@@ -80,7 +82,8 @@ describe("retries", () => {
   it("should retry retryable trait with throttling", async () => {
     const client = new XYZService({
       endpoint: "https://localhost/nowhere",
-    });
+      apiKey: { apiKey: "test-api-key" },
+    } as any);
 
     requireRequestsFrom(client)
       .toMatch({
@@ -110,7 +113,8 @@ describe("retries", () => {
   it("should not retry if the error is not modeled with retryable trait and is not otherwise retryable", async () => {
     const client = new XYZService({
       endpoint: "https://localhost/nowhere",
-    });
+      apiKey: { apiKey: "test-api-key" },
+    } as any);
 
     requireRequestsFrom(client)
       .toMatch({

private/my-local-model-schema/src/XYZServiceClient.ts

@@ -243,12 +243,12 @@ export class XYZServiceClient extends __Client<
     const _config_0 = __getRuntimeConfig(configuration || {});
     super(_config_0 as any);
     this.initConfig = _config_0;
-    let _config_1 = resolveClientEndpointParameters(_config_0);
-    let _config_2 = resolveRetryConfig(_config_1);
-    let _config_3 = resolveEndpointConfig(_config_2);
-    let _config_4 = resolveEventStreamSerdeConfig(_config_3);
-    let _config_5 = resolveHttpAuthSchemeConfig(_config_4);
-    let _config_6 = resolveRuntimeExtensions(_config_5, configuration?.extensions || []);
+    const _config_1 = resolveClientEndpointParameters(_config_0);
+    const _config_2 = resolveRetryConfig(_config_1);
+    const _config_3 = resolveEndpointConfig(_config_2);
+    const _config_4 = resolveEventStreamSerdeConfig(_config_3);
+    const _config_5 = resolveHttpAuthSchemeConfig(_config_4);
+    const _config_6 = resolveRuntimeExtensions(_config_5, configuration?.extensions || []);
     this.config = _config_6;
     this.middlewareStack.use(getSchemaSerdePlugin(this.config));
     this.middlewareStack.use(getRetryPlugin(this.config));

private/my-local-model-schema/src/endpoint/EndpointParameters.ts

@@ -13,6 +13,7 @@ export interface ClientInputEndpointParameters {
     nonConflictingParam?: string | undefined | Provider<string | undefined>;
   };
   endpoint?: string | Provider<string> | Endpoint | Provider<Endpoint> | EndpointV2 | Provider<EndpointV2>;
+  apiKey?: string | undefined | Provider<string | undefined>;
   customParam?: string | undefined | Provider<string | undefined>;
   enableFeature?: boolean | undefined | Provider<boolean | undefined>;
   debugMode?: boolean | undefined | Provider<boolean | undefined>;
@@ -43,6 +44,9 @@ const clientContextParamDefaults = {
   enableFeature: true,
 } as const;
 
+/**
+ * @internal
+ */
 export const resolveClientEndpointParameters = <T>(
   options: T & ClientInputEndpointParameters
 ): T & ClientResolvedEndpointParameters => {

private/my-local-model/src/XYZServiceClient.ts

@@ -229,24 +229,13 @@ export class XYZServiceClient extends __Client<
     const _config_0 = __getRuntimeConfig(configuration || {});
     super(_config_0 as any);
     this.initConfig = _config_0;
-<<<<<<< HEAD
     const _config_1 = resolveClientEndpointParameters(_config_0);
     const _config_2 = resolveRetryConfig(_config_1);
     const _config_3 = resolveEndpointConfig(_config_2);
-    const _config_4 = resolveEndpointRequiredConfig(_config_3);
-    const _config_5 = resolveEventStreamSerdeConfig(_config_4);
-    const _config_6 = resolveHttpAuthSchemeConfig(_config_5);
-    const _config_7 = resolveRuntimeExtensions(_config_6, configuration?.extensions || []);
-    this.config = _config_7;
-=======
-    let _config_1 = resolveClientEndpointParameters(_config_0);
-    let _config_2 = resolveRetryConfig(_config_1);
-    let _config_3 = resolveEndpointConfig(_config_2);
-    let _config_4 = resolveEventStreamSerdeConfig(_config_3);
-    let _config_5 = resolveHttpAuthSchemeConfig(_config_4);
-    let _config_6 = resolveRuntimeExtensions(_config_5, configuration?.extensions || []);
+    const _config_4 = resolveEventStreamSerdeConfig(_config_3);
+    const _config_5 = resolveHttpAuthSchemeConfig(_config_4);
+    const _config_6 = resolveRuntimeExtensions(_config_5, configuration?.extensions || []);
     this.config = _config_6;
->>>>>>> 815c7a737 (chore: refactor code and add custom ruleset)
     this.middlewareStack.use(getRetryPlugin(this.config));
     this.middlewareStack.use(getContentLengthPlugin(this.config));
     this.middlewareStack.use(

private/my-local-model/src/endpoint/EndpointParameters.ts

@@ -13,6 +13,7 @@ export interface ClientInputEndpointParameters {
     nonConflictingParam?: string | undefined | Provider<string | undefined>;
   };
   endpoint?: string | Provider<string> | Endpoint | Provider<Endpoint> | EndpointV2 | Provider<EndpointV2>;
+  apiKey?: string | undefined | Provider<string | undefined>;
   customParam?: string | undefined | Provider<string | undefined>;
   enableFeature?: boolean | undefined | Provider<boolean | undefined>;
   debugMode?: boolean | undefined | Provider<boolean | undefined>;
@@ -43,6 +44,9 @@ const clientContextParamDefaults = {
   enableFeature: true,
 } as const;
 
+/**
+ * @internal
+ */
 export const resolveClientEndpointParameters = <T>(
   options: T & ClientInputEndpointParameters
 ): T & ClientResolvedEndpointParameters => {

private/smithy-rpcv2-cbor-schema/src/endpoint/EndpointParameters.ts

@@ -8,9 +8,6 @@ export interface ClientInputEndpointParameters {
   endpoint?: string | Provider<string> | Endpoint | Provider<Endpoint> | EndpointV2 | Provider<EndpointV2>;
 }
 
-/**
- * @public
- */
 export type ClientResolvedEndpointParameters = Omit<ClientInputEndpointParameters, "endpoint"> & {
   defaultSigningName: string;
 };

private/smithy-rpcv2-cbor/src/endpoint/EndpointParameters.ts

@@ -8,9 +8,6 @@ export interface ClientInputEndpointParameters {
   endpoint?: string | Provider<string> | Endpoint | Provider<Endpoint> | EndpointV2 | Provider<EndpointV2>;
 }
 
-/**
- * @public
- */
 export type ClientResolvedEndpointParameters = Omit<ClientInputEndpointParameters, "endpoint"> & {
   defaultSigningName: string;
 };