Fixes #120 Artifacts can be removed even when new ones aren't provided

src/Action.ts

@@ -9,18 +9,25 @@ import {
 import {ArtifactUploader} from "./ArtifactUploader";
 import {GithubError} from "./GithubError";
 import {Outputs} from "./Outputs";
+import {ArtifactDestroyer} from "./ArtifactDestroyer";
 
 export class Action {
     private inputs: Inputs
     private outputs: Outputs
     private releases: Releases
+    private artifactDestroyer: ArtifactDestroyer
     private uploader: ArtifactUploader
 
-    constructor(inputs: Inputs, outputs: Outputs, releases: Releases, uploader: ArtifactUploader) {
+    constructor(inputs: Inputs,
+                outputs: Outputs,
+                releases: Releases,
+                uploader: ArtifactUploader,
+                artifactDestroyer: ArtifactDestroyer) {
         this.inputs = inputs
         this.outputs = outputs
         this.releases = releases
         this.uploader = uploader
+        this.artifactDestroyer = artifactDestroyer
     }
 
     async perform() {
@@ -28,12 +35,16 @@ export class Action {
         const releaseData = releaseResponse.data
         const releaseId = releaseData.id
         const uploadUrl = releaseData.upload_url
-
+        
+        if (this.inputs.removeArtifacts) {
+            await this.artifactDestroyer.destroyArtifacts(releaseId)
+        }
+        
         const artifacts = this.inputs.artifacts
         if (artifacts.length > 0) {
             await this.uploader.uploadArtifacts(artifacts, releaseId, uploadUrl)
         }
-        
+
         this.outputs.applyReleaseData(releaseData)
     }
 

src/ArtifactDestroyer.ts

@@ -0,0 +1,20 @@
+import {Releases} from "./Releases";
+import * as core from "@actions/core";
+
+export interface ArtifactDestroyer {
+    destroyArtifacts(releaseId: number): Promise<void>
+}
+
+export class GithubArtifactDestroyer implements ArtifactDestroyer {
+    constructor(private releases: Releases) {
+    }
+
+    async destroyArtifacts(releaseId: number): Promise<void> {
+        const releaseAssets = await this.releases.listArtifactsForRelease(releaseId)
+        for (const artifact of releaseAssets) {
+            const asset = artifact
+            core.debug(`Deleting existing artifact ${artifact.name}...`)
+            await this.releases.deleteArtifact(asset.id)
+        }
+    }
+}

src/ArtifactUploader.ts

@@ -10,7 +10,6 @@ export class GithubArtifactUploader implements ArtifactUploader {
     constructor(
         private releases: Releases,
         private replacesExistingArtifacts: boolean = true,
-        private removeArtifacts: boolean = false,
         private throwsUploadErrors: boolean = false,
     ) {
     }
@@ -21,9 +20,6 @@ export class GithubArtifactUploader implements ArtifactUploader {
         if (this.replacesExistingArtifacts) {
             await this.deleteUpdatedArtifacts(artifacts, releaseId)
         }
-        if (this.removeArtifacts) {
-            await this.deleteUploadedArtifacts(releaseId)
-        }
         for (const artifact of artifacts) {
             await this.uploadArtifact(artifact, releaseId, uploadUrl)
         }
@@ -69,13 +65,4 @@ export class GithubArtifactUploader implements ArtifactUploader {
             }
         }
     }
-
-    private async deleteUploadedArtifacts(releaseId: number): Promise<void> {
-        const releaseAssets = await this.releases.listArtifactsForRelease(releaseId)
-        for (const artifact of releaseAssets) {
-            const asset = artifact
-            core.debug(`Deleting existing artifact ${artifact.name}...`)
-            await this.releases.deleteArtifact(asset.id)
-        }
-    }
 }

src/Main.ts

@@ -7,6 +7,7 @@ import {GithubArtifactUploader} from './ArtifactUploader';
 import {FileArtifactGlobber} from './ArtifactGlobber';
 import {GithubError} from './GithubError';
 import {CoreOutputs} from "./Outputs";
+import {GithubArtifactDestroyer} from "./ArtifactDestroyer";
 
 async function run() {
     try {
@@ -27,8 +28,10 @@ function createAction(): Action {
     const inputs = new CoreInputs(globber, context)
     const outputs = new CoreOutputs()
     const releases = new GithubReleases(inputs, git)
-    const uploader = new GithubArtifactUploader(releases, inputs.replacesArtifacts, inputs.removeArtifacts, inputs.artifactErrorsFailBuild)
-    return new Action(inputs, outputs, releases, uploader)
+    const uploader = new GithubArtifactUploader(releases, inputs.replacesArtifacts, inputs.artifactErrorsFailBuild)
+    const artifactDestroyer = new GithubArtifactDestroyer(releases)
+    
+    return new Action(inputs, outputs, releases, uploader, artifactDestroyer)
 }
 
 run();