reuse the same code in downloadArtifact

Author: jeremydubreil

src/actions.ts

@@ -3,24 +3,32 @@ import { endGroup, getInput, startGroup } from '@actions/core'
 import { context, getOctokit } from '@actions/github'
 import { retry } from '@octokit/plugin-retry'
 import { Md5 } from 'ts-md5'
-import { DefaultArtifactClient, UploadArtifactResponse } from '@actions/artifact'
+import {
+  Artifact,
+  DefaultArtifactClient,
+  GetArtifactResponse,
+  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 = await artifact.getArtifact(artifactName)
+  const downloadReponse = await artifact.downloadArtifact(getReponse.artifact.id, {
+    path: artifactName,
+  })
+  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

@@ -89,31 +89,23 @@ async function runAnalysis() {
 async function displayResults() {
   info('Displaying results')
   const downloadStart = Date.now()
-  await downloadArtifact('results-old')
-  await downloadArtifact('results-new')
+  var artifactOld = await downloadArtifact('results-old')
+  var artifactNew = await downloadArtifact('results-new')
   telemetryCollector.addField(
     'duration.download-artifacts',
     (Date.now() - downloadStart).toString()
   )
+  console.log('Artifact old: ', artifactOld)
+  console.log('Artifact new: ', artifactNew)
+
   const issuesByTool: { [tool: string]: string } = {}
-  if (existsSync(`results-old/${scaReport}`) && existsSync(`results-new/${scaReport}`)) {
+  if (existsSync(artifactOld) && existsSync(artifactNew)) {
     issuesByTool['sca'] = await compareResults(
       'sca',
-      `results-old/${scaReport}`,
-      `results-new/${scaReport}`
+      path.join(artifactOld, scaReport),
+      path.join(artifactNew, scaReport)
     )
   } 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')
   }