@testomatio/reporter 1.6.3-beta-artlog → 1.6.3-beta-artifacts-3

package/lib/bin/cli.js

@@ -220,6 +220,27 @@ program
     }
 
     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/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,7 +251,9 @@ class Client {
     this.queue = this.queue
       .then(() => Promise.all(this.pipes.map(p => p.finishRun(runParams))))
       .then(() => {
-        if (this.uploader.successfulUploads.length && this.uploader.isEnabled) {
+        if (!this.uploader.isEnabled) return;
+
+        if (this.uploader.successfulUploads.length) {
           console.log(
             APP_PREFIX,
             `🗄️ ${this.uploader.successfulUploads.length} artifacts ${
@@ -304,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

@@ -67,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');
@@ -106,17 +106,24 @@ class S3Uploader {
 
     debug('Uploading to S3:', Key);
 
-    const s3 = new S3(this.#getS3Config());
+    const s3Config = this.#getS3Config()
+    const s3 = new S3(s3Config);
+
+    const params = {
+      Bucket: S3_BUCKET,
+      Key,
+      Body,
+    }
+
+    // disable ACL for I AM roles
+    if (!s3Config.credentials.sessionToken) {
+      params.ACL = ACL;
+    }
 
     try {
       const upload = new Upload({
         client: s3,
-        params: {
-          Bucket: S3_BUCKET,
-          Key,
-          Body,
-          ACL,
-        },
+        params,
       });
 
       const link = await this.getS3LocationLink(upload);

package/package.json

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