@testomatio/reporter 1.6.2 → 1.6.3-beta-artifacts-2

package/lib/bin/cli.js

@@ -219,7 +219,28 @@ program
       await client.addTestRun(undefined, { rid, files });
     }
 
-    console.log(APP_PREFIX, '🗄️', client.uploader.totalSuccessfulUploadsCount, 'artifacts 🟢uploaded');
+    console.log(APP_PREFIX, '🗄️', client.uploader.successfulUploads.length, 'artifacts 🟢uploaded');
+
+    if (client.uploader.successfulUploads.length) {
+      debug('\n', APP_PREFIX, `🗄️ ${client.uploader.successfulUploads.length} artifacts uploaded to S3 bucket`);
+      const uploadedArtifacts = client.uploader.successfulUploads.map(file => ({
+        relativePath: file.path.replace(process.cwd(), ''),
+        link: file.link,
+        sizePretty: prettyBytes(file.size, { round: 0 }).toString(),
+      }));
+
+      uploadedArtifacts.forEach(upload => {
+        debug(
+          `🟢 Uploaded artifact`,
+          `${upload.relativePath},`,
+          'size:',
+          `${upload.sizePretty},`,
+          'link:',
+          `${upload.link}`,
+        );
+      });
+    }
+
     const filesizeStrMaxLength = 7;
 
     if (client.uploader.failedUploads.length) {

package/lib/bin/uploadArtifacts.js

@@ -74,7 +74,7 @@ program
       });
     }
 
-    console.log(APP_PREFIX, client.uploader.totalSuccessfulUploadsCount, 'artifacts uploaded');
+    console.log(APP_PREFIX, client.uploader.successfulUploads.length, 'artifacts uploaded');
     if (client.uploader.failedUploads.length) {
       console.log(APP_PREFIX, client.uploader.failedUploads.length, 'artifacts failed to upload');
     }

package/lib/client.js

@@ -35,7 +35,6 @@ class Client {
     this.version = JSON.parse(fs.readFileSync(join(__dirname, '..', 'package.json')).toString()).version;
     this.executionList = Promise.resolve();
     this.uploader = new S3Uploader();
-    this.uploader.checkEnabled();
 
     console.log(APP_PREFIX, `Testomatio Reporter v${this.version}`);
   }
@@ -110,7 +109,8 @@ class Client {
         const runId = this.pipeStore?.runId;
         if (runId) this.runId = runId;
         storeRunId(this.runId);
-
+      })
+      .then(() => {
         this.uploader.checkEnabled();
       })
       .then(() => undefined); // fixes return type
@@ -251,10 +251,12 @@ class Client {
     this.queue = this.queue
       .then(() => Promise.all(this.pipes.map(p => p.finishRun(runParams))))
       .then(() => {
-        if (this.uploader.totalSuccessfulUploadsCount && this.uploader.isEnabled) {
+        if (!this.uploader.isEnabled) return;
+
+        if (this.uploader.successfulUploads.length) {
           console.log(
             APP_PREFIX,
-            `🗄️ ${this.uploader.totalSuccessfulUploadsCount} artifacts ${
+            `🗄️ ${this.uploader.successfulUploads.length} artifacts ${
               process.env.TESTOMATIO_PRIVATE_ARTIFACTS ? 'privately' : chalk.bold('publicly')
             } 🟢 uploaded to S3 bucket`,
           );
@@ -262,6 +264,26 @@ class Client {
 
         const filesizeStrMaxLength = 7;
 
+        if (this.uploader.successfulUploads.length) {
+          debug('\n', APP_PREFIX, `🗄️ ${this.uploader.successfulUploads.length} artifacts uploaded to S3 bucket`);
+          const uploadedArtifacts = this.uploader.successfulUploads.map(file => ({
+            relativePath: file.path.replace(process.cwd(), ''),
+            link: file.link,
+            sizePretty: prettyBytes(file.size, { round: 0 }).toString(),
+          }));
+
+          uploadedArtifacts.forEach(upload => {
+            debug(
+              `🟢 Uploaded artifact`,
+              `${upload.relativePath},`,
+              'size:',
+              `${upload.sizePretty},`,
+              'link:',
+              `${upload.link}`,
+            );
+          });
+        }
+
         if (this.uploader.failedUploads.length) {
           console.log(
             '\n',
@@ -284,7 +306,7 @@ class Client {
           });
         }
 
-        if (this.uploader.isEnabled && this.uploader.skippedUploads.length) {
+        if (this.uploader.skippedUploads.length) {
           console.log(
             '\n',
             APP_PREFIX,

package/lib/uploader.js

@@ -21,9 +21,10 @@ class S3Uploader {
      */
     this.skippedUploads = [];
     this.failedUploads = [];
-    this.totalSuccessfulUploadsCount = 0;
-
-    this.succesfulUploads = {};
+    /**
+     * @type {{path: string, size: number, link: string}[]}
+     */
+    this.successfulUploads = [];
 
     this.configKeys = [
       'S3_ENDPOINT',
@@ -66,7 +67,7 @@ class S3Uploader {
     if (this.isEnabled !== undefined) return this.isEnabled;
 
     const { S3_BUCKET, TESTOMATIO_DISABLE_ARTIFACTS } = this.getConfig();
-    if (!S3_BUCKET) debug(`Upload is disabled because S3_BUCKET is not set`);
+    if (!S3_BUCKET) debug(`Artifacts uploading is disabled because S3_BUCKET is not set`);
     this.isEnabled = !!(S3_BUCKET && !TESTOMATIO_DISABLE_ARTIFACTS);
 
     if (this.isEnabled) debug('S3 uploader is enabled');
@@ -119,8 +120,8 @@ class S3Uploader {
       });
 
       const link = await this.getS3LocationLink(upload);
-      this.totalSuccessfulUploadsCount++;
-      this.succesfulUploads[Key] = link;
+      this.successfulUploads.push({ path: file.path, size: file.size, link });
+      debug(`📤 Uploaded artifact. File: ${file.path}, size: ${prettyBytes(file.size)}, link: ${link}`);
       return link;
     } catch (e) {
       this.failedUploads.push({ path: file.path, size: file.size });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@testomatio/reporter",
-  "version": "1.6.2",
+  "version": "1.6.3-beta-artifacts-2",
   "description": "Testomatio Reporter Client",
   "main": "./lib/reporter.js",
   "typings": "typings/index.d.ts",