Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
timovv merged 7 commits into from
Aug 14, 2024
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
8d97679
Fix setting client default for api version parameters without TSP ver…
timovv Aug 8, 2024
485f92b
Clear apiVersion from options before passing to Core
timovv Aug 8, 2024
f9351cb
Update tests
timovv Aug 8, 2024
ca8bd64
Update smoke tests
timovv Aug 8, 2024
d9a97e8
Always extract apiversion from options
timovv Aug 14, 2024
b252322
Merge branch 'main' into fix-some-api-version-things
timovv Aug 14, 2024
451a9cc
Fix bad merge
timovv Aug 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ...test/NetworkAnalytics.Management/generated/typespec-ts/src/api/networkAnalyticsContext.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ export function createNetworkAnalytics(
const userAgentPrefix = prefixFromOptions
? `${prefixFromOptions} azsdk-js-api`
: "azsdk-js-api";
const updatedOptions = {
const { apiVersion: _, ...updatedOptions } = {
Comment thread
timovv marked this conversation as resolved.
...options,
userAgentOptions: { userAgentPrefix },
loggingOptions: { logger: options.loggingOptions?.logger ?? logger.info },
Expand Down
2 changes: 1 addition & 1 deletion ...ypespec-test/test/anomalyDetector/generated/typespec-ts/src/api/anomalyDetectorContext.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ export function createAnomalyDetector(
const userAgentPrefix = prefixFromOptions
? `${prefixFromOptions} azsdk-js-api`
: "azsdk-js-api";
const updatedOptions = {
const { apiVersion: _, ...updatedOptions } = {
Comment thread
timovv marked this conversation as resolved.
...options,
userAgentOptions: { userAgentPrefix },
loggingOptions: { logger: options.loggingOptions?.logger ?? logger.info },
Expand Down
2 changes: 1 addition & 1 deletion packages/typespec-test/test/batch_modular/generated/typespec-ts/src/api/batchContext.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 },
Expand Down
2 changes: 1 addition & 1 deletion ...s/typespec-test/test/chatApi_modular/generated/typespec-ts/src/api/chatProtocolContext.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 },
Expand Down
2 changes: 1 addition & 1 deletion ...pec-test/test/contentsafety_modular/generated/typespec-ts/src/api/contentSafetyContext.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 },
Expand Down
2 changes: 1 addition & 1 deletion ...es/typespec-test/test/eventgrid_modular/generated/typespec-ts/src/api/eventGridContext.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 },
Expand Down
2 changes: 1 addition & 1 deletion packages/typespec-test/test/hierarchy_generic/generated/typespec-ts/src/api/fooContext.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 },
Expand Down
2 changes: 1 addition & 1 deletion ...generated/typespec-ts/src/administrationOperations/api/administrationOperationsContext.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 },
Expand Down
2 changes: 1 addition & 1 deletion ...src/testProfileAdministrationOperations/api/testProfileAdministrationOperationsContext.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 },
Expand Down
2 changes: 1 addition & 1 deletion ...generated/typespec-ts/src/testProfileRunOperations/api/testProfileRunOperationsContext.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 },
Expand Down
2 changes: 1 addition & 1 deletion ...sting_modular/generated/typespec-ts/src/testRunOperations/api/testRunOperationsContext.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 },
Expand Down
2 changes: 1 addition & 1 deletion packages/typespec-test/test/openai_generic/generated/typespec-ts/src/api/openAIContext.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 },
Expand Down
2 changes: 1 addition & 1 deletion packages/typespec-test/test/openai_modular/generated/typespec-ts/src/api/openAIContext.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 },
Expand Down
5 changes: 4 additions & 1 deletion ...ages/typespec-test/test/openai_non_branded/generated/typespec-ts/src/api/openAIContext.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)) {
Expand Down
2 changes: 1 addition & 1 deletion ...ypespec-test/test/overloads_modular/generated/typespec-ts/src/api/widgetManagerContext.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 },
Expand Down
4 changes: 2 additions & 2 deletions ...espec-test/test/parametrizedHost/generated/typespec-ts/src/api/parametrizedHostContext.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 ??
Expand All @@ -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 },
Expand Down
2 changes: 1 addition & 1 deletion .../typespec-test/test/schemaRegistry/generated/typespec-ts/src/api/schemaRegistryContext.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 },
Expand Down
2 changes: 1 addition & 1 deletion packages/typespec-test/test/spread/generated/typespec-ts/src/api/demoServiceContext.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 },
Expand Down
2 changes: 1 addition & 1 deletion packages/typespec-test/test/widget_dpg/generated/typespec-ts/src/api/widgetServiceContext.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 },
Expand Down
5 changes: 4 additions & 1 deletion packages/typespec-ts/src/modular/buildCodeModel.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
) {
Expand Down
4 changes: 3 additions & 1 deletion packages/typespec-ts/src/modular/helpers/clientHelpers.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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},`;
Expand Down
6 changes: 3 additions & 3 deletions packages/typespec-ts/test/modularUnit/apiOperations.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }
Expand Down Expand Up @@ -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 },
Expand Down Expand Up @@ -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) {
Expand Down
4 changes: 2 additions & 2 deletions packages/typespec-ts/test/modularUnit/clientContext.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }
Expand Down Expand Up @@ -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 },
Expand Down
⚡