reuse the same code in downloadArtifact

Author: jeremydubreil

src/actions.ts

@@ -1,26 +1,38 @@
-import create from '@actions/artifact'
+import {
+  DefaultArtifactClient,
+  DownloadArtifactOptions,
+  DownloadArtifactResponse,
+  GetArtifactResponse,
+} from '@actions/artifact'
 import { endGroup, getInput, startGroup } from '@actions/core'
 import { context, getOctokit } from '@actions/github'
 import { retry } from '@octokit/plugin-retry'
+import path from 'path'
 import { Md5 } from 'ts-md5'
-import { DefaultArtifactClient, UploadArtifactResponse } from '@actions/artifact'
 
 const artifact = new DefaultArtifactClient()
 
-export function uploadArtifact(
-  artifactName: string,
-  ...files: string[]
-): Promise<UploadArtifactResponse> {
+export async function uploadArtifact(artifactName: string, ...files: string[]) {
   startGroup('Uploading artifact ' + artifactName)
-  var reponse = artifact.uploadArtifact(artifactName, files, '.')
+  await artifact.uploadArtifact(artifactName, files, '.')
   endGroup()
-  return reponse
 }
 
-export async function downloadArtifact(artifactName: string) {
+export async function downloadArtifact(artifactName: string): Promise<string> {
   startGroup('Downloading artifact ' + artifactName)
-  await create.getArtifact(artifactName)
+  const getReponse: GetArtifactResponse = await artifact.getArtifact(artifactName)
+  const option: DownloadArtifactOptions = {
+    path: path.join(process.env['GITHUB_WORKSPACE'] || '.', artifactName),
+  }
+  const downloadReponse: DownloadArtifactResponse = await artifact.downloadArtifact(
+    getReponse.artifact.id,
+    option
+  )
+  if (downloadReponse.downloadPath === undefined) {
+    throw new Error('Failed to download artifact ' + artifactName)
+  }
   endGroup()
+  return downloadReponse.downloadPath
 }
 
 export async function postCommentIfInPr(message: string): Promise<string | undefined> {

src/index.ts

@@ -20,7 +20,7 @@ import {
   telemetryCollector,
 } from './util'
 
-import { exec } from 'child_process'
+import path from 'path'
 
 const scaSarifReport = 'scaReport/output.sarif'
 const scaReport = 'sca.sarif'
@@ -89,32 +89,22 @@ async function runAnalysis() {
 async function displayResults() {
   info('Displaying results')
   const downloadStart = Date.now()
-  await downloadArtifact('results-old')
-  await downloadArtifact('results-new')
+  const artifactOld = await downloadArtifact('results-old')
+  const artifactNew = await downloadArtifact('results-new')
   telemetryCollector.addField(
     'duration.download-artifacts',
     (Date.now() - downloadStart).toString()
   )
+  const sarifFileOld = path.join(artifactOld, scaReport)
+  const sarifFileNew = path.join(artifactNew, scaReport)
+  console.log('Artifact old: ', sarifFileOld)
+  console.log('Artifact new: ', sarifFileNew)
+
   const issuesByTool: { [tool: string]: string } = {}
-  if (existsSync(`results-old/${scaReport}`) && existsSync(`results-new/${scaReport}`)) {
-    issuesByTool['sca'] = await compareResults(
-      'sca',
-      `results-old/${scaReport}`,
-      `results-new/${scaReport}`
-    )
+  if (existsSync(sarifFileOld) && existsSync(sarifFileNew)) {
+    issuesByTool['sca'] = await compareResults('sca', sarifFileOld, sarifFileNew)
   } else {
-    exec('ls -R -lh', (error, stdout, stderr) => {
-      if (error) {
-        console.error(`Error: ${error.message}`)
-        return
-      }
-      if (stderr) {
-        console.error(`Stderr: ${stderr}`)
-        return
-      }
-      console.log(`Output:\n${stdout}`)
-    })
-    throw new Error('No results found for SCA')
+    throw new Error('SARIF file not found for SCA')
   }
 
   const commentStart = Date.now()