From 6c297f3bc6e51fd27e436efe6fd05ac0c86d6080 Mon Sep 17 00:00:00 2001 From: Chidozie Ononiwu Date: Fri, 16 May 2025 14:48:18 -0700 Subject: [PATCH] Use apiViewArtifact directly --- eng/tools/spec-gen-sdk-runner/src/commands.ts | 7 +------ eng/tools/spec-gen-sdk-runner/test/src/commands.test.ts | 1 + package-lock.json | 8 ++++---- package.json | 2 +- 4 files changed, 7 insertions(+), 11 deletions(-) diff --git a/eng/tools/spec-gen-sdk-runner/src/commands.ts b/eng/tools/spec-gen-sdk-runner/src/commands.ts index a6b818c87495..a7172d008571 100644 --- a/eng/tools/spec-gen-sdk-runner/src/commands.ts +++ b/eng/tools/spec-gen-sdk-runner/src/commands.ts @@ -135,16 +135,11 @@ export async function generateSdkForSpecPr(): Promise { if (executionReport.stagedArtifactsFolder) { stagedArtifactsFolder = executionReport.stagedArtifactsFolder; - } - - if (executionReport.stagedArtifactsFolder && executionReport.sdkApiViewArtifactFolder) { - const apiViewArtifactRelPath = path.relative(executionReport.stagedArtifactsFolder, executionReport.sdkApiViewArtifactFolder); for (const pkg of executionReport.packages) { if (pkg.apiViewArtifact) { - const fileName = path.basename(pkg.apiViewArtifact); apiViewRequestData.push({ packageName: pkg.packageName, - filePath: path.join(apiViewArtifactRelPath, fileName), + filePath: path.relative(stagedArtifactsFolder, pkg.apiViewArtifact), }); } } diff --git a/eng/tools/spec-gen-sdk-runner/test/src/commands.test.ts b/eng/tools/spec-gen-sdk-runner/test/src/commands.test.ts index 2e1cea7b9626..f913e3b2594c 100644 --- a/eng/tools/spec-gen-sdk-runner/test/src/commands.test.ts +++ b/eng/tools/spec-gen-sdk-runner/test/src/commands.test.ts @@ -196,6 +196,7 @@ describe("generateSdkForSpecPr", () => { ]; const mockExecutionReport = { executionResult: "succeeded", + packages: [], vsoLogPath: "path/to/log", }; diff --git a/package-lock.json b/package-lock.json index 79851732c980..659dbb3cf7f2 100644 --- a/package-lock.json +++ b/package-lock.json @@ -7,7 +7,7 @@ "name": "azure-rest-api-specs", "devDependencies": { "@autorest/openapi-to-typespec": "0.11.0", - "@azure-tools/spec-gen-sdk": "~0.6.1", + "@azure-tools/spec-gen-sdk": "~0.7.0", "@azure-tools/specs-shared": "file:.github/shared", "@azure-tools/typespec-apiview": "0.7.2", "@azure-tools/typespec-autorest": "0.56.0", @@ -1510,9 +1510,9 @@ "link": true }, "node_modules/@azure-tools/spec-gen-sdk": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/@azure-tools/spec-gen-sdk/-/spec-gen-sdk-0.6.1.tgz", - "integrity": "sha512-EXAQBRpb6m35yzy1O4gsmTXsdLlQ+gdhfgtxh/0I5qdLD3/ubnLcWGypkMvkvjr9SQ/KfPpn5Ibr+Epb5jXi+A==", + "version": "0.7.0", + "resolved": "https://registry.npmjs.org/@azure-tools/spec-gen-sdk/-/spec-gen-sdk-0.7.0.tgz", + "integrity": "sha512-dx5FNu+DxIRfS4L7omxtFh6unV5Qp3/pMGXgNeCqOGpmDFgGDHQ4HyVoMYbkf0aeG73Ehj41WLESZTSIJj4KUw==", "dev": true, "license": "MIT", "dependencies": { diff --git a/package.json b/package.json index c1ad1998525c..e15e153509ff 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "azure-rest-api-specs", "devDependencies": { - "@azure-tools/spec-gen-sdk": "~0.6.1", + "@azure-tools/spec-gen-sdk": "~0.7.0", "@azure-tools/specs-shared": "file:.github/shared", "@azure-tools/typespec-apiview": "0.7.2", "@azure-tools/typespec-autorest": "0.56.0",