playwright-slack-report-burak 3.4.0 → 3.5.1

package/dist/src/ResultsParser.js

@@ -7,14 +7,15 @@
 /* eslint-disable no-param-reassign */
 Object.defineProperty(exports, "__esModule", { value: true });
 const fs = require('fs');
+const os = require('os');
 const path = require('path');
 const axios = require('axios');
-const { exec } = require('child_process');
+const { exec, execFileSync } = require('child_process');
 let AdmZip;
 try {
     AdmZip = require('adm-zip');
 } catch (e) {
-    // adm-zip is required for GitHub Actions artifact extraction
+    // adm-zip is required for unzipping Playwright blob reports during merge
     AdmZip = null;
 }
 
@@ -27,8 +28,6 @@ const SUMMARIES_DIR = path.join('./', 'playwright-artifacts');
 const PLAYWRIGHT_REPORT_DIR = path.join('./', 'playwright-report');
 
 // Environment variables
-const GITHUB_TOKEN = process.env.SAFETYWINGTEST_GITHUB_TOKEN;
-const GITHUB_REPOSITORY = process.env.GITHUB_REPOSITORY;
 const GITHUB_RUN_ID = process.env.GITHUB_RUN_ID || 'local';
 const GITHUB_RUN_ATTEMPT = process.env.GITHUB_RUN_ATTEMPT || '1';
 
@@ -38,11 +37,16 @@ const GCS_SERVICE_ACCOUNT_KEY = process.env.GCS_SERVICE_ACCOUNT_KEY;
 const GCS_REPORTS_FOLDER_PREFIX = process.env.GCS_REPORTS_FOLDER_PREFIX;
 const GCS_UPLOAD_API_BASE_URL = process.env.GCS_UPLOAD_API_BASE_URL;
 
-// GitHub API endpoints (for artifact fetching)
-const GITHUB_API_BASE_URL = 'https://api.github.com';
+// MinIO artifact storage configuration (artifacts uploaded by shards 2+ as
+// <bucket>/shard-artifacts/<run_id>-<run_attempt>/shard-<shard>.tar.zst, a zstd-compressed tar of playwright-report)
+const MINIO_ENDPOINT = process.env.MINIO_ENDPOINT;
+const MINIO_ACCESS_KEY = process.env.MINIO_ACCESS_KEY;
+const MINIO_SECRET_KEY = process.env.MINIO_SECRET_KEY;
+const MINIO_BUCKET = process.env.MINIO_BUCKET;
+const MINIO_ALIAS = 'minio';
+const MINIO_ARTIFACTS_DIR = 'shard-artifacts';
 
-// Helper functions for building GitHub API URLs
-const getGitHubArtifactsApiUrl = () => `${GITHUB_API_BASE_URL}/repos/${GITHUB_REPOSITORY}/actions/runs/${GITHUB_RUN_ID}/artifacts`;
+const getMinioObjectPath = (shard) => `${MINIO_ALIAS}/${MINIO_BUCKET}/${MINIO_ARTIFACTS_DIR}/${GITHUB_RUN_ID}-${GITHUB_RUN_ATTEMPT}/shard-${shard}.tar.zst`;
 
 // Helper functions for report paths
 const getRunFolder = () => `${GCS_REPORTS_FOLDER_PREFIX}/${GITHUB_RUN_ID}-${GITHUB_RUN_ATTEMPT}`;
@@ -432,46 +436,33 @@ class ResultsParser {
     }
 
     async fetchArtifactForShard(shard) {
-        const githubApiUrl = getGitHubArtifactsApiUrl();
-        if (!AdmZip) {
-            throw new Error('adm-zip is required for GitHub Actions artifact extraction. Please install it: npm install adm-zip');
+        if (!MINIO_ENDPOINT || !MINIO_ACCESS_KEY || !MINIO_SECRET_KEY || !MINIO_BUCKET) {
+            throw new Error('MinIO configuration is required: set MINIO_ENDPOINT, MINIO_ACCESS_KEY, MINIO_SECRET_KEY and MINIO_BUCKET');
         }
+        const objectPath = getMinioObjectPath(shard);
+        const tmpDir = fs.mkdtempSync(path.join(os.tmpdir(), `mc-shard-${shard}-`));
+        const mcConfigDir = path.join(tmpDir, '.mc');
+        const tarFile = path.join(tmpDir, `shard-${shard}.tar.zst`);
         try {
-            const listResponse = await axios.get(githubApiUrl, {
-                headers: {
-                    'Authorization': `token ${GITHUB_TOKEN}`,
-                    'Accept': 'application/vnd.github.v3+json'
-                },
-                params: { per_page: 100 }
-            });
-            const runPrefix = `${GITHUB_RUN_ID}-${GITHUB_RUN_ATTEMPT}`;
-            const artifact = (listResponse.data.artifacts || []).find(
-                (a) => {
-                    const name = a.name || '';
-                    return name.startsWith(runPrefix) && name.endsWith(`-artifacts-shard-${shard}`);
-                }
-            );
-            if (!artifact?.archive_download_url) return false;
-            const downloadResponse = await axios.get(artifact.archive_download_url, {
-                headers: {
-                    'Authorization': `token ${GITHUB_TOKEN}`,
-                    'Accept': 'application/vnd.github.v3+json'
-                },
-                responseType: 'arraybuffer'
-            });
-            const zip = new AdmZip(downloadResponse.data);
+            // Pass credentials as separate args (not embedded in a URL) to avoid encoding issues.
+            execFileSync('mc', ['--config-dir', mcConfigDir, 'alias', 'set', MINIO_ALIAS, MINIO_ENDPOINT, MINIO_ACCESS_KEY, MINIO_SECRET_KEY], { stdio: 'ignore' });
+            // mc exits non-zero when the object isn't uploaded yet; the caller retries.
+            execFileSync('mc', ['--config-dir', mcConfigDir, 'cp', objectPath, tarFile], { stdio: 'ignore' });
+            // The tar holds playwright-report/<file>, matching the upload action's archive layout.
+            execFileSync('bash', ['-c', `zstd -dc "${tarFile}" | tar -xf - -C "${tmpDir}"`], { stdio: 'ignore' });
             const targetFiles = [`node_summary_${shard}.json`, `blob-report-node-${shard}.zip`];
-            for (const entry of zip.getEntries()) {
-                const baseName = path.basename(entry.entryName);
-                if (targetFiles.includes(baseName)) {
-                    fs.writeFileSync(path.join(SUMMARIES_DIR, baseName), entry.getData());
-                    console.log(`Successfully fetched ${baseName} from artifact ${artifact.name}`);
+            for (const file of targetFiles) {
+                const extracted = path.join(tmpDir, 'playwright-report', file);
+                if (fs.existsSync(extracted)) {
+                    fs.copyFileSync(extracted, path.join(SUMMARIES_DIR, file));
+                    console.log(`Successfully fetched ${file} from MinIO object ${objectPath}`);
                 }
             }
             return true;
         } catch (error) {
-            if (error.response?.status === 404) return false;
-            throw error;
+            return false;
+        } finally {
+            fs.rmSync(tmpDir, { recursive: true, force: true });
         }
     }
     async mergeReports() {

package/package.json

@@ -33,7 +33,7 @@
     "lint-fix": "npx eslint . --ext .ts --fix"
   },
   "name": "playwright-slack-report-burak",
-  "version": "3.4.0",
+  "version": "3.5.1",
   "main": "index.js",
   "types": "dist/index.d.ts",
   "author": "Burak B. <burak.boluk@hotmail.com>",