From 0207d665d74b05d12e1a66db53239fefc3cc2c33 Mon Sep 17 00:00:00 2001 From: Mike Harder Date: Fri, 28 Feb 2025 08:43:32 +0000 Subject: [PATCH] [ARM Incremental TypeSpec] Return false if swagger cannot be parsed as JSON --- .../src/arm-incremental-typespec-preview.js | 9 ++++++++- .../test/arm-incremental-typespec-preview.test.js | 14 ++++++++++++++ 2 files changed, 22 insertions(+), 1 deletion(-) diff --git a/.github/workflows/src/arm-incremental-typespec-preview.js b/.github/workflows/src/arm-incremental-typespec-preview.js index 120ee75ea9d9..c69a6d53cf19 100644 --- a/.github/workflows/src/arm-incremental-typespec-preview.js +++ b/.github/workflows/src/arm-incremental-typespec-preview.js @@ -39,7 +39,14 @@ export default async function incrementalTypeSpec({ github, context, core }) { } } - const swaggerObj = JSON.parse(swagger); + let swaggerObj; + try { + swaggerObj = JSON.parse(swagger); + } catch { + // If swagger cannot be parsed as JSON, it's not "incremental typespec" + core.info(`File "${file}" cannot be parsed as JSON`); + return false; + } if (!swaggerObj["info"]?.["x-typespec-generated"]) { core.info(`File "${file}" does not contain "info.x-typespec-generated"`); diff --git a/.github/workflows/test/arm-incremental-typespec-preview.test.js b/.github/workflows/test/arm-incremental-typespec-preview.test.js index 10798b63a622..7e6f9f03bfe4 100644 --- a/.github/workflows/test/arm-incremental-typespec-preview.test.js +++ b/.github/workflows/test/arm-incremental-typespec-preview.test.js @@ -75,6 +75,20 @@ describe("incrementalTypeSpec", () => { await expect(incrementalTypeSpec({ core })).resolves.toBe(false); }); + it("returns false if swagger cannot be parsed as JSON", async () => { + const swaggerPath = + "/specification/contosowidgetmanager/resource-manager/Microsoft.Contoso/preview/2021-10-01-preview/contoso.json"; + + vi.spyOn( + changedFiles, + "getChangedResourceManagerSwaggerFiles", + ).mockResolvedValue([swaggerPath]); + + vi.spyOn(git, "show").mockResolvedValue("not } valid { json"); + + await expect(incrementalTypeSpec({ core })).resolves.toBe(false); + }); + it("returns false if tsp conversion", async () => { const swaggerPath = "/specification/contosowidgetmanager/resource-manager/Microsoft.Contoso/preview/2021-10-01-preview/contoso.json";