From 06c04d878b0ce8315978252437bb7ca825fcf08d Mon Sep 17 00:00:00 2001 From: Pan Shao <97225342+pshao25@users.noreply.github.com> Date: Wed, 11 Sep 2024 08:39:29 +0800 Subject: [PATCH] Remove dependency of @autorest/csharp (#8940) * Remove dependency of @autorest/csharp * update * Update tools/tsp-client/CHANGELOG.md Co-authored-by: catalinaperalta --------- Co-authored-by: Pan Shao Co-authored-by: catalinaperalta --- tools/tsp-client/CHANGELOG.md | 5 +++++ tools/tsp-client/package-lock.json | 18 ++++++------------ tools/tsp-client/package.json | 5 ++--- tools/tsp-client/src/commands.ts | 30 +----------------------------- 4 files changed, 14 insertions(+), 44 deletions(-) diff --git a/tools/tsp-client/CHANGELOG.md b/tools/tsp-client/CHANGELOG.md index c9da73f2373..f43d2168808 100644 --- a/tools/tsp-client/CHANGELOG.md +++ b/tools/tsp-client/CHANGELOG.md @@ -1,5 +1,10 @@ # Release +## 2024-09-10 - 0.13.0 + +- Bumped `@autorest/openapi-to-typespec` version to `0.10.0`. +- Removed the dependency `@autorest/csharp`. + ## 2024-08-30 - 0.12.2 - Bumped `@autorest/openapi-to-typespec` version to `0.9.1`. diff --git a/tools/tsp-client/package-lock.json b/tools/tsp-client/package-lock.json index d87e17e567a..69f59555630 100644 --- a/tools/tsp-client/package-lock.json +++ b/tools/tsp-client/package-lock.json @@ -1,16 +1,15 @@ { "name": "@azure-tools/typespec-client-generator-cli", - "version": "0.12.2", + "version": "0.13.0", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@azure-tools/typespec-client-generator-cli", - "version": "0.12.2", + "version": "0.13.0", "license": "MIT", "dependencies": { - "@autorest/csharp": "https://aka.ms/azsdk/openapi-to-typespec-csharp", - "@autorest/openapi-to-typespec": "0.9.1", + "@autorest/openapi-to-typespec": "0.10.0", "@azure-tools/rest-api-diff": ">=0.1.0 <1.0.0", "@azure-tools/typespec-autorest": ">=0.44.0 <1.0.0", "@azure/core-rest-pipeline": "^1.12.0", @@ -65,11 +64,6 @@ "node": ">=12.0.0" } }, - "node_modules/@autorest/csharp": { - "version": "3.0.0-alpha.20231017.8", - "resolved": "https://aka.ms/azsdk/openapi-to-typespec-csharp", - "integrity": "sha512-f3/e8asQVyFmGw6apnPF3bhJXUmsQyLHa3o5hPuoqlKDYkWMwB1R4sayAF4PR0/rTA/RDXaTtheumG0BGUwN6Q==" - }, "node_modules/@autorest/extension-base": { "version": "3.6.0", "resolved": "https://registry.npmjs.org/@autorest/extension-base/-/extension-base-3.6.0.tgz", @@ -84,9 +78,9 @@ } }, "node_modules/@autorest/openapi-to-typespec": { - "version": "0.9.1", - "resolved": "https://registry.npmjs.org/@autorest/openapi-to-typespec/-/openapi-to-typespec-0.9.1.tgz", - "integrity": "sha512-pNINBX9+XjPAn3Z+phhuulEseJVFAg80yun6pBQUkr4cUthm5BtMUQFnsZLia17bt0Kl0DSJf21v3/Aqszl1wA==", + "version": "0.10.0", + "resolved": "https://registry.npmjs.org/@autorest/openapi-to-typespec/-/openapi-to-typespec-0.10.0.tgz", + "integrity": "sha512-2+dpiF+gj0lEsjbJP1WX9BIdYT0b3+NoamhXY4PbNS0p9eNHT2lFCVzaHYNbY0fwRMR1yRDUd7dvwcsZi8qUgQ==", "license": "MIT", "dependencies": { "@autorest/codemodel": "~4.20.0", diff --git a/tools/tsp-client/package.json b/tools/tsp-client/package.json index 245d4a0af29..eab65c8e0ba 100644 --- a/tools/tsp-client/package.json +++ b/tools/tsp-client/package.json @@ -1,6 +1,6 @@ { "name": "@azure-tools/typespec-client-generator-cli", - "version": "0.12.2", + "version": "0.13.0", "description": "A tool to generate Azure SDKs from TypeSpec", "main": "dist/index.js", "homepage": "https://github.com/Azure/azure-sdk-tools/tree/main/tools/tsp-client#readme", @@ -51,8 +51,7 @@ "typescript": "^5.1.6" }, "dependencies": { - "@autorest/csharp": "https://aka.ms/azsdk/openapi-to-typespec-csharp", - "@autorest/openapi-to-typespec": "0.9.1", + "@autorest/openapi-to-typespec": "0.10.0", "@azure-tools/typespec-autorest": ">=0.44.0 <1.0.0", "@azure/core-rest-pipeline": "^1.12.0", "@azure-tools/rest-api-diff": ">=0.1.0 <1.0.0", diff --git a/tools/tsp-client/src/commands.ts b/tools/tsp-client/src/commands.ts index d1a231ec2e7..948df0fa4db 100644 --- a/tools/tsp-client/src/commands.ts +++ b/tools/tsp-client/src/commands.ts @@ -7,7 +7,7 @@ import { readTspLocation, removeDirectory, } from "./fs.js"; -import { cp, mkdir, readFile, rename, stat, unlink, writeFile } from "fs/promises"; +import { cp, mkdir, readFile, stat, unlink, writeFile } from "fs/promises"; import { npmCommand, nodeCommand } from "./npm.js"; import { compileTsp, discoverMainFile, resolveTspConfigUrl, TspLocation } from "./typespec.js"; import { @@ -360,35 +360,7 @@ export async function convertCommand(argv: any): Promise { `"${readme}"`, ]; - // If the swagger is an ARM swagger, generate ARM metadata if (arm) { - const autorestCsharpPath = await getPathToDependency("@autorest/csharp"); - const generateMetadataCmd = [ - autorestBinPath, - "--csharp", - "--max-memory-size=8192", - `--use="${autorestCsharpPath}"`, - `--output-folder="${outputDir}"`, - "--mgmt-debug.only-generate-metadata", - "--mgmt-debug.suppress-list-exception", - "--azure-arm", - "--skip-csproj", - `"${readme}"`, - ]; - try { - await nodeCommand(outputDir, generateMetadataCmd); - } catch (err) { - Logger.error(`Error occurred while attempting to generate ARM metadata: ${err}`); - process.exit(1); - } - try { - await rename(joinPaths(outputDir, "metadata.json"), joinPaths(outputDir, "resources.json")); - } catch (err) { - Logger.error( - `Error occurred while attempting to rename metadata.json to resources.json: ${err}`, - ); - process.exit(1); - } args.push("--isArm"); } await nodeCommand(outputDir, args);