Skip to content

Use ApiViewArtifact directly #34751

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
chidozieononiwu merged 2 commits into from
May 19, 2025
Merged

Use ApiViewArtifact directly #34751

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6c297f3
Use apiViewArtifact directly
chidozieononiwu May 16, 2025
5631aae
Merge branch 'main' into spec-gen-sdk-bug-fix
chidozieononiwu May 19, 2025
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
7 changes: 1 addition & 6 deletions eng/tools/spec-gen-sdk-runner/src/commands.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
import fs from "node:fs";
import path from "node:path";
import { runSpecGenSdkCommand, resetGitRepo } from "./utils.js";
Expand Down Expand Up @@ -135,16 +135,11 @@

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),
});
}
}
Expand Down
1 change: 1 addition & 0 deletions eng/tools/spec-gen-sdk-runner/test/src/commands.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
import { describe, test, expect, vi, beforeEach, type Mock } from "vitest";
import * as utils from "../../src/utils.js";
import {
Expand Down Expand Up @@ -196,6 +196,7 @@
];
const mockExecutionReport = {
executionResult: "succeeded",
packages: [],
vsoLogPath: "path/to/log",
};

Expand Down
8 changes: 4 additions & 4 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
Loading