Fix some issues with API version handling in new getClient (#2738)

Azure · Aug 14, 2024 · a77ad85 · a77ad85
1 parent 4e45ca1
commit a77ad85
Show file tree

Hide file tree

Showing 23 changed files with 35 additions and 27 deletions.
diff --git a/...test/NetworkAnalytics.Management/generated/typespec-ts/src/api/networkAnalyticsContext.ts b/...test/NetworkAnalytics.Management/generated/typespec-ts/src/api/networkAnalyticsContext.ts
@@ -24,7 +24,7 @@ export function createNetworkAnalytics(
   const userAgentPrefix = prefixFromOptions
     ? `${prefixFromOptions} azsdk-js-api`
     : "azsdk-js-api";
-  const updatedOptions = {
+  const { apiVersion: _, ...updatedOptions } = {
     ...options,
     userAgentOptions: { userAgentPrefix },
     loggingOptions: { logger: options.loggingOptions?.logger ?? logger.info },

diff --git a/...ypespec-test/test/anomalyDetector/generated/typespec-ts/src/api/anomalyDetectorContext.ts b/...ypespec-test/test/anomalyDetector/generated/typespec-ts/src/api/anomalyDetectorContext.ts
@@ -46,7 +46,7 @@ export function createAnomalyDetector(
   const userAgentPrefix = prefixFromOptions
     ? `${prefixFromOptions} azsdk-js-api`
     : "azsdk-js-api";
-  const updatedOptions = {
+  const { apiVersion: _, ...updatedOptions } = {
     ...options,
     userAgentOptions: { userAgentPrefix },
     loggingOptions: { logger: options.loggingOptions?.logger ?? logger.info },

diff --git a/packages/typespec-test/test/batch_modular/generated/typespec-ts/src/api/batchContext.ts b/packages/typespec-test/test/batch_modular/generated/typespec-ts/src/api/batchContext.ts
@@ -22,7 +22,7 @@ export function createBatch(
   const userAgentPrefix = prefixFromOptions
     ? `${prefixFromOptions} azsdk-js-api`
     : "azsdk-js-api";
-  const updatedOptions = {
+  const { apiVersion: _, ...updatedOptions } = {
     ...options,
     userAgentOptions: { userAgentPrefix },
     loggingOptions: { logger: options.loggingOptions?.logger ?? logger.info },

diff --git a/...s/typespec-test/test/chatApi_modular/generated/typespec-ts/src/api/chatProtocolContext.ts b/...s/typespec-test/test/chatApi_modular/generated/typespec-ts/src/api/chatProtocolContext.ts
@@ -22,7 +22,7 @@ export function createChatProtocol(
   const userAgentPrefix = prefixFromOptions
     ? `${prefixFromOptions} azsdk-js-api`
     : "azsdk-js-api";
-  const updatedOptions = {
+  const { apiVersion: _, ...updatedOptions } = {
     ...options,
     userAgentOptions: { userAgentPrefix },
     loggingOptions: { logger: options.loggingOptions?.logger ?? logger.info },

diff --git a/...pec-test/test/contentsafety_modular/generated/typespec-ts/src/api/contentSafetyContext.ts b/...pec-test/test/contentsafety_modular/generated/typespec-ts/src/api/contentSafetyContext.ts
@@ -26,7 +26,7 @@ export function createContentSafety(
   const userAgentPrefix = prefixFromOptions
     ? `${prefixFromOptions} azsdk-js-api`
     : "azsdk-js-api";
-  const updatedOptions = {
+  const { apiVersion: _, ...updatedOptions } = {
     ...options,
     userAgentOptions: { userAgentPrefix },
     loggingOptions: { logger: options.loggingOptions?.logger ?? logger.info },

diff --git a/...es/typespec-test/test/eventgrid_modular/generated/typespec-ts/src/api/eventGridContext.ts b/...es/typespec-test/test/eventgrid_modular/generated/typespec-ts/src/api/eventGridContext.ts
@@ -25,7 +25,7 @@ export function createEventGrid(
   const userAgentPrefix = prefixFromOptions
     ? `${prefixFromOptions} azsdk-js-api`
     : "azsdk-js-api";
-  const updatedOptions = {
+  const { apiVersion: _, ...updatedOptions } = {
     ...options,
     userAgentOptions: { userAgentPrefix },
     loggingOptions: { logger: options.loggingOptions?.logger ?? logger.info },

diff --git a/packages/typespec-test/test/hierarchy_generic/generated/typespec-ts/src/api/fooContext.ts b/packages/typespec-test/test/hierarchy_generic/generated/typespec-ts/src/api/fooContext.ts
@@ -17,7 +17,7 @@ export function createFoo(
   const userAgentPrefix = prefixFromOptions
     ? `${prefixFromOptions} azsdk-js-api`
     : "azsdk-js-api";
-  const updatedOptions = {
+  const { apiVersion: _, ...updatedOptions } = {
     ...options,
     userAgentOptions: { userAgentPrefix },
     loggingOptions: { logger: options.loggingOptions?.logger ?? logger.info },

diff --git a/...generated/typespec-ts/src/administrationOperations/api/administrationOperationsContext.ts b/...generated/typespec-ts/src/administrationOperations/api/administrationOperationsContext.ts
@@ -26,7 +26,7 @@ export function createAdministrationOperations(
   const userAgentPrefix = prefixFromOptions
     ? `${prefixFromOptions} azsdk-js-api`
     : "azsdk-js-api";
-  const updatedOptions = {
+  const { apiVersion: _, ...updatedOptions } = {
     ...options,
     userAgentOptions: { userAgentPrefix },
     loggingOptions: { logger: options.loggingOptions?.logger ?? logger.info },

diff --git a/...src/testProfileAdministrationOperations/api/testProfileAdministrationOperationsContext.ts b/...src/testProfileAdministrationOperations/api/testProfileAdministrationOperationsContext.ts
@@ -26,7 +26,7 @@ export function createTestProfileAdministrationOperations(
   const userAgentPrefix = prefixFromOptions
     ? `${prefixFromOptions} azsdk-js-api`
     : "azsdk-js-api";
-  const updatedOptions = {
+  const { apiVersion: _, ...updatedOptions } = {
     ...options,
     userAgentOptions: { userAgentPrefix },
     loggingOptions: { logger: options.loggingOptions?.logger ?? logger.info },

diff --git a/...generated/typespec-ts/src/testProfileRunOperations/api/testProfileRunOperationsContext.ts b/...generated/typespec-ts/src/testProfileRunOperations/api/testProfileRunOperationsContext.ts
@@ -26,7 +26,7 @@ export function createTestProfileRunOperations(
   const userAgentPrefix = prefixFromOptions
     ? `${prefixFromOptions} azsdk-js-api`
     : "azsdk-js-api";
-  const updatedOptions = {
+  const { apiVersion: _, ...updatedOptions } = {
     ...options,
     userAgentOptions: { userAgentPrefix },
     loggingOptions: { logger: options.loggingOptions?.logger ?? logger.info },

diff --git a/...sting_modular/generated/typespec-ts/src/testRunOperations/api/testRunOperationsContext.ts b/...sting_modular/generated/typespec-ts/src/testRunOperations/api/testRunOperationsContext.ts
@@ -25,7 +25,7 @@ export function createTestRunOperations(
   const userAgentPrefix = prefixFromOptions
     ? `${prefixFromOptions} azsdk-js-api`
     : "azsdk-js-api";
-  const updatedOptions = {
+  const { apiVersion: _, ...updatedOptions } = {
     ...options,
     userAgentOptions: { userAgentPrefix },
     loggingOptions: { logger: options.loggingOptions?.logger ?? logger.info },

diff --git a/packages/typespec-test/test/openai_generic/generated/typespec-ts/src/api/openAIContext.ts b/packages/typespec-test/test/openai_generic/generated/typespec-ts/src/api/openAIContext.ts
@@ -23,7 +23,7 @@ export function createOpenAI(
   const userAgentPrefix = prefixFromOptions
     ? `${prefixFromOptions} azsdk-js-api`
     : "azsdk-js-api";
-  const updatedOptions = {
+  const { apiVersion: _, ...updatedOptions } = {
     ...options,
     userAgentOptions: { userAgentPrefix },
     loggingOptions: { logger: options.loggingOptions?.logger ?? logger.info },

diff --git a/packages/typespec-test/test/openai_modular/generated/typespec-ts/src/api/openAIContext.ts b/packages/typespec-test/test/openai_modular/generated/typespec-ts/src/api/openAIContext.ts
@@ -25,7 +25,7 @@ export function createOpenAI(
   const userAgentPrefix = prefixFromOptions
     ? `${prefixFromOptions} azsdk-js-api`
     : "azsdk-js-api";
-  const updatedOptions = {
+  const { apiVersion: _, ...updatedOptions } = {
     ...options,
     userAgentOptions: { userAgentPrefix },
     loggingOptions: { logger: options.loggingOptions?.logger ?? logger.info },

diff --git a/...ages/typespec-test/test/openai_non_branded/generated/typespec-ts/src/api/openAIContext.ts b/...ages/typespec-test/test/openai_non_branded/generated/typespec-ts/src/api/openAIContext.ts
@@ -21,7 +21,10 @@ export function createOpenAI(
   const userAgentPrefix = prefixFromOptions
     ? `${prefixFromOptions} azsdk-js-api`
     : "azsdk-js-api";
-  const updatedOptions = { ...options, userAgentOptions: { userAgentPrefix } };
+  const { apiVersion: _, ...updatedOptions } = {
+    ...options,
+    userAgentOptions: { userAgentPrefix },
+  };
   const clientContext = getClient(endpointUrl, undefined, updatedOptions);
 
   if (isKeyCredential(credential)) {

diff --git a/...ypespec-test/test/overloads_modular/generated/typespec-ts/src/api/widgetManagerContext.ts b/...ypespec-test/test/overloads_modular/generated/typespec-ts/src/api/widgetManagerContext.ts
@@ -25,7 +25,7 @@ export function createWidgetManager(
   const userAgentPrefix = prefixFromOptions
     ? `${prefixFromOptions} azsdk-js-api`
     : "azsdk-js-api";
-  const updatedOptions = {
+  const { apiVersion: _, ...updatedOptions } = {
     ...options,
     userAgentOptions: { userAgentPrefix },
     loggingOptions: { logger: options.loggingOptions?.logger ?? logger.info },

diff --git a/...espec-test/test/parametrizedHost/generated/typespec-ts/src/api/parametrizedHostContext.ts b/...espec-test/test/parametrizedHost/generated/typespec-ts/src/api/parametrizedHostContext.ts
@@ -22,7 +22,7 @@ export function createParametrizedHost(
   const host = options.host ?? "one";
   const subdomain = options.subdomain ?? "two";
   const sufix = options.sufix ?? "three";
-  const apiVersion = options.apiVersion;
+  const apiVersion = options.apiVersion ?? "v1";
   const endpointUrl =
     options.endpoint ??
     options.baseUrl ??
@@ -32,7 +32,7 @@ export function createParametrizedHost(
   const userAgentPrefix = prefixFromOptions
     ? `${prefixFromOptions} azsdk-js-api`
     : "azsdk-js-api";
-  const updatedOptions = {
+  const { apiVersion: _, ...updatedOptions } = {
     ...options,
     userAgentOptions: { userAgentPrefix },
     loggingOptions: { logger: options.loggingOptions?.logger ?? logger.info },

diff --git a/.../typespec-test/test/schemaRegistry/generated/typespec-ts/src/api/schemaRegistryContext.ts b/.../typespec-test/test/schemaRegistry/generated/typespec-ts/src/api/schemaRegistryContext.ts
@@ -26,7 +26,7 @@ export function createSchemaRegistry(
   const userAgentPrefix = prefixFromOptions
     ? `${prefixFromOptions} azsdk-js-api`
     : "azsdk-js-api";
-  const updatedOptions = {
+  const { apiVersion: _, ...updatedOptions } = {
     ...options,
     userAgentOptions: { userAgentPrefix },
     loggingOptions: { logger: options.loggingOptions?.logger ?? logger.info },

diff --git a/packages/typespec-test/test/spread/generated/typespec-ts/src/api/demoServiceContext.ts b/packages/typespec-test/test/spread/generated/typespec-ts/src/api/demoServiceContext.ts
@@ -17,7 +17,7 @@ export function createDemoService(
   const userAgentPrefix = prefixFromOptions
     ? `${prefixFromOptions} azsdk-js-api`
     : "azsdk-js-api";
-  const updatedOptions = {
+  const { apiVersion: _, ...updatedOptions } = {
     ...options,
     userAgentOptions: { userAgentPrefix },
     loggingOptions: { logger: options.loggingOptions?.logger ?? logger.info },

diff --git a/packages/typespec-test/test/widget_dpg/generated/typespec-ts/src/api/widgetServiceContext.ts b/packages/typespec-test/test/widget_dpg/generated/typespec-ts/src/api/widgetServiceContext.ts
@@ -17,7 +17,7 @@ export function createWidgetService(
   const userAgentPrefix = prefixFromOptions
     ? `${prefixFromOptions} azsdk-js-api`
     : "azsdk-js-api";
-  const updatedOptions = {
+  const { apiVersion: _, ...updatedOptions } = {
     ...options,
     userAgentOptions: { userAgentPrefix },
     loggingOptions: { logger: options.loggingOptions?.logger ?? logger.info },

diff --git a/packages/typespec-ts/src/modular/buildCodeModel.ts b/packages/typespec-ts/src/modular/buildCodeModel.ts
@@ -535,7 +535,10 @@ function emitParameter(
     if (clientDefaultValue !== undefined) {
       (paramMap as any).optional = true;
     }
-  } else if (
+  }
+
+  if (
+    clientDefaultValue === undefined &&
     paramMap.location === "endpointPath" &&
     parameter.param.defaultValue?.valueKind === "StringValue"
   ) {

diff --git a/packages/typespec-ts/src/modular/helpers/clientHelpers.ts b/packages/typespec-ts/src/modular/helpers/clientHelpers.ts
@@ -122,7 +122,9 @@ export function buildGetClientOptionsParam(
   const loggingOptions = buildLoggingOptions(codeModel.options.flavor);
   const credentials = buildCredentials(codeModel, endpointParam);
 
-  let expr = `const updatedOptions = { ...options,`;
+  let expr = "const { apiVersion: _, ...updatedOptions } = {";
+
+  expr += "...options,";
 
   if (userAgentOptions) {
     expr += `userAgentOptions: ${userAgentOptions},`;

diff --git a/packages/typespec-ts/test/modularUnit/apiOperations.spec.ts b/packages/typespec-ts/test/modularUnit/apiOperations.spec.ts
@@ -548,7 +548,7 @@ describe("api operations in Modular", () => {
           const userAgentPrefix = prefixFromOptions
             ? \`\${prefixFromOptions} azsdk-js-api\`
             : "azsdk-js-api";
-          const updatedOptions = {
+          const { apiVersion: _, ...updatedOptions } = {
             ...options,
             userAgentOptions: { userAgentPrefix },
             loggingOptions: { logger: options.loggingOptions?.logger ?? logger.info }
@@ -702,7 +702,7 @@ describe("api operations in Modular", () => {
           const userAgentPrefix = prefixFromOptions
             ? \`\${prefixFromOptions} azsdk-js-api\`
             : "azsdk-js-api";
-          const updatedOptions = {
+          const { apiVersion: _, ...updatedOptions } = {
             ...options,
             userAgentOptions: { userAgentPrefix },
             loggingOptions: { logger: options.loggingOptions?.logger ?? logger.info },
@@ -882,7 +882,7 @@ describe("api operations in Modular", () => {
         export function createTesting(endpoint: string, options: TestingClientOptionalParams = {}): TestingContext {
           const prefixFromOptions = options?.userAgentOptions?.userAgentPrefix;
           const userAgentPrefix = prefixFromOptions ? \`\${prefixFromOptions} azsdk-js-api\` : "azsdk-js-api";
-          const updatedOptions = { ...options,userAgentOptions: { userAgentPrefix },loggingOptions: { logger: options.loggingOptions?.logger ?? logger.info },}
+          const { apiVersion: _, ...updatedOptions } = { ...options,userAgentOptions: { userAgentPrefix },loggingOptions: { logger: options.loggingOptions?.logger ?? logger.info },}
           const clientContext = getClient(options.endpoint ?? options.baseUrl ?? endpoint, undefined, updatedOptions);
           clientContext.pipeline.removePolicy({ name: "ApiVersionPolicy" });
           if (options.apiVersion) {

diff --git a/packages/typespec-ts/test/modularUnit/clientContext.spec.ts b/packages/typespec-ts/test/modularUnit/clientContext.spec.ts
@@ -80,7 +80,7 @@ describe("modular client context type", () => {
           const userAgentPrefix = prefixFromOptions
             ? \`\$\{prefixFromOptions\} azsdk-js-api\`
             : "azsdk-js-api";
-          const updatedOptions = {
+          const { apiVersion: _, ...updatedOptions } = {
             ...options,
             userAgentOptions: { userAgentPrefix },
             loggingOptions: { logger: options.loggingOptions?.logger ?? logger.info }
@@ -176,7 +176,7 @@ describe("modular client context type", () => {
           const userAgentPrefix = prefixFromOptions
             ? \`\$\{prefixFromOptions\} azsdk-js-api\`
             : "azsdk-js-api";
-          const updatedOptions = {
+          const { apiVersion: _, ...updatedOptions } = {
             ...options,
             userAgentOptions: { userAgentPrefix },
             loggingOptions: { logger: options.loggingOptions?.logger ?? logger.info },