From 5de14c1398c78516f5a08a81953beec2473e3ca0 Mon Sep 17 00:00:00 2001 From: Pan Shao Date: Thu, 22 Aug 2024 10:37:58 +0800 Subject: [PATCH 1/2] Remove inapplicable logic for dashboard --- .../cadl-ranch-coverage-sdk/src/client.ts | 31 +++++-------------- 1 file changed, 7 insertions(+), 24 deletions(-) diff --git a/packages/cadl-ranch-coverage-sdk/src/client.ts b/packages/cadl-ranch-coverage-sdk/src/client.ts index 7a7dd5967..460a00648 100644 --- a/packages/cadl-ranch-coverage-sdk/src/client.ts +++ b/packages/cadl-ranch-coverage-sdk/src/client.ts @@ -87,10 +87,11 @@ export class CadlRanchCoverageOperations { this.#container.getBlockBlobClient(`${generatorName}/index.json`), ); - // Compatible with current format, delete later - const blobClientOldVersion = this.#container.getBlockBlobClient(`${generatorName}/reports/${index.version}.json`); - if (await blobClientOldVersion.exists()) { - const blob = await blobClientOldVersion.download(); + const blobClient = this.#container.getBlockBlobClient( + `${generatorName}/reports/${index.version}/${generatorMode}.json`, + ); + if (await blobClient.exists()) { + const blob = await blobClient.download(); const body = await blob.blobBody; const content = await body?.text(); const report = content ? JSON.parse(content) : undefined; @@ -98,29 +99,11 @@ export class CadlRanchCoverageOperations { generatorMetadata: { version: blob.metadata?.generatorversion, name: blob.metadata?.generatorname, - mode: "azure", + mode: blob.metadata?.generatorMode, }, ...report, }; - } else { - const blobClient = this.#container.getBlockBlobClient( - `${generatorName}/reports/${index.version}/${generatorMode}.json`, - ); - if (await blobClient.exists()) { - const blob = await blobClient.download(); - const body = await blob.blobBody; - const content = await body?.text(); - const report = content ? JSON.parse(content) : undefined; - return { - generatorMetadata: { - version: blob.metadata?.generatorversion, - name: blob.metadata?.generatorname, - mode: blob.metadata?.generatorMode, - }, - ...report, - }; - } else return undefined; - } + } else return undefined; } private async updateIndex(generatorName: string, version: string) { From 3b566c3d074758b84dc399a5e54ee06ebbe410ca Mon Sep 17 00:00:00 2001 From: Pan Shao Date: Thu, 22 Aug 2024 10:48:14 +0800 Subject: [PATCH 2/2] update --- .changeset/unlucky-candles-type.md | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 .changeset/unlucky-candles-type.md diff --git a/.changeset/unlucky-candles-type.md b/.changeset/unlucky-candles-type.md new file mode 100644 index 000000000..e9e88310e --- /dev/null +++ b/.changeset/unlucky-candles-type.md @@ -0,0 +1,6 @@ +--- +"@azure-tools/cadl-ranch-coverage-sdk": patch +"@azure-tools/cadl-ranch-dashboard": patch +--- + +Remove inapplicable code in dashboard