update

Azure · Apr 19, 2024 · ca89bb9 · ca89bb9
1 parent d2e677e
commit ca89bb9
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 4 deletions.
diff --git a/packages/extensions/openapi-to-typespec/src/constants.ts b/packages/extensions/openapi-to-typespec/src/constants.ts
@@ -1 +1 @@
-const ApiVersion = "ApiVersion";
+export const ApiVersion = "ApiVersion";
diff --git a/packages/extensions/openapi-to-typespec/src/generate/generate-service-information.ts b/packages/extensions/openapi-to-typespec/src/generate/generate-service-information.ts
@@ -2,6 +2,7 @@ import { TypespecProgram, EndpointParameter, Auth } from "../interfaces";
 import { getOptions } from "../options";
 import { generateDocs } from "../utils/docs";
 import { getNamespaceStatement } from "../utils/namespace";
+import { ApiVersion } from "../constants";
 
 const VALID_VERSIONS = ["v3", "v4", "v5"];
 
@@ -53,7 +54,7 @@ export function generateServiceInformation(program: TypespecProgram) {
       for (const param of allParams ?? []) {
         const doc = generateDocs(param);
         doc && definitions.push(doc);
-        definitions.push(`${param.name}: ${param.name.startsWith("ApiVersion") ? "Versions" : "string"} `);
+        definitions.push(`${param.name}: ${param.name.startsWith(ApiVersion) ? "Versions" : "string"} `);
       }
     }
     hasParameters && definitions.push("}");

diff --git a/packages/extensions/openapi-to-typespec/src/transforms/transform-arm-resources.ts b/packages/extensions/openapi-to-typespec/src/transforms/transform-arm-resources.ts
@@ -290,7 +290,7 @@ function getCustomizations(
   if (bodyParam) {
     if (bodyParam.language.default.name !== templateName && isFullCompatible) {
       augmentedDecorators.push(
-        `@@encodedName(${tspOperationGroupName}.\`${operationName}\`::parameters.${templateName}, "application/json", "${bodyParam.language.default.name}");`,
+        `@@encodedName(${tspOperationGroupName}.\`${operationName}\`::parameters.${templateName}, "json", "${bodyParam.language.default.name}");`,
       );
       augmentedDecorators.push(
         `@@extension(${tspOperationGroupName}.\`${operationName}\`::parameters.${templateName}, "x-ms-client-name", "${bodyParam.language.default.name}");`,

diff --git a/packages/extensions/openapi-to-typespec/src/transforms/transform-service-information.ts b/packages/extensions/openapi-to-typespec/src/transforms/transform-service-information.ts
@@ -5,13 +5,13 @@ import {
   OAuth2SecurityScheme,
   ParameterLocation,
   SecurityScheme,
-  codeModelSchema,
 } from "@autorest/codemodel";
 import { getArmCommonTypeVersion } from "../autorest-session";
 import { AadOauth2AuthFlow, ApiKeyAuthentication, Auth, EndpointParameter, ServiceInformation } from "../interfaces";
 import { getOptions } from "../options";
 import { getFirstEndpoint } from "../utils/get-endpoint";
 import { isConstantSchema } from "../utils/schemas";
+import { ApiVersion } from "../constants";
 
 export function transformServiceInformation(model: CodeModel): ServiceInformation {
   const { isArm } = getOptions();