playwright-slack-report-burak 3.5.1 → 3.5.2

package/dist/src/ResultsParser.js

@@ -9,7 +9,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const fs = require('fs');
 const os = require('os');
 const path = require('path');
-const axios = require('axios');
 const { exec, execFileSync } = require('child_process');
 let AdmZip;
 try {
@@ -31,26 +30,19 @@ const PLAYWRIGHT_REPORT_DIR = path.join('./', 'playwright-report');
 const GITHUB_RUN_ID = process.env.GITHUB_RUN_ID || 'local';
 const GITHUB_RUN_ATTEMPT = process.env.GITHUB_RUN_ATTEMPT || '1';
 
-// Google Cloud Storage configuration
-const GCS_BUCKET_NAME = process.env.GCS_BUCKET_NAME;
-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;
-
-// 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)
+// MinIO 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),
+// merged HTML reports uploaded by shard 1 under <bucket>/playwright-reports/<run_id>-<run_attempt>/
 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';
+const MINIO_REPORTS_DIR = 'playwright-reports';
 
 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}`;
-const getGcsObjectPath = (relativePath) => `${getRunFolder()}/${relativePath}`;
+const getMinioReportsPath = () => `${MINIO_ALIAS}/${MINIO_BUCKET}/${MINIO_REPORTS_DIR}/${GITHUB_RUN_ID}-${GITHUB_RUN_ATTEMPT}`;
 
 // ============================================================================
 
@@ -185,7 +177,7 @@ class ResultsParser {
             }
             
             await this.mergeReports();
-            await this.pushReportsToGCS();
+            await this.pushReportsToMinio();
         } else if (singleShardNoBlob) {
             // Single shard without blob (e.g. different reporter config): use node summary for Slack report
             const nodeSummaryFile = path.join(SUMMARIES_DIR, 'node_summary_1.json');
@@ -573,130 +565,32 @@ class ResultsParser {
         }
     }
     
-    async getGcsAccessToken() {
-        if (!GCS_SERVICE_ACCOUNT_KEY) {
-            throw new Error('GCS_SERVICE_ACCOUNT_KEY environment variable is required');
+    async pushReportsToMinio() {
+        if (!process.env.CI) {
+            console.log('Skipping MinIO push: not in CI');
+            return;
         }
-        
-        let serviceAccount;
-        try {
-            serviceAccount = JSON.parse(GCS_SERVICE_ACCOUNT_KEY);
-        } catch (e) {
-            // Try reading from file path
-            if (fs.existsSync(GCS_SERVICE_ACCOUNT_KEY)) {
-                serviceAccount = JSON.parse(fs.readFileSync(GCS_SERVICE_ACCOUNT_KEY, 'utf-8'));
-            } else {
-                throw new Error('Invalid GCS_SERVICE_ACCOUNT_KEY: must be JSON string or file path');
-            }
+        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');
         }
-        
-        // Request OAuth2 token from Google
-        const jwt = require('jsonwebtoken');
-        const now = Math.floor(Date.now() / 1000);
-        const token = jwt.sign(
-            {
-                iss: serviceAccount.client_email,
-                scope: 'https://www.googleapis.com/auth/devstorage.full_control',
-                aud: 'https://oauth2.googleapis.com/token',
-                exp: now + 3600,
-                iat: now
-            },
-            serviceAccount.private_key,
-            { algorithm: 'RS256' }
-        );
-        
-        const tokenResponse = await axios.post('https://oauth2.googleapis.com/token', {
-            grant_type: 'urn:ietf:params:oauth:grant-type:jwt-bearer',
-            assertion: token
-        });
-        
-        return tokenResponse.data.access_token;
-    }
-    
-    async pushReportsToGCS() {
-        // Only push in CI environment with required configuration
-        if (!process.env.CI || !GCS_SERVICE_ACCOUNT_KEY) {
-            console.log('Skipping GCS push: not in CI or missing GCS_SERVICE_ACCOUNT_KEY');
+        if (!fs.existsSync(PLAYWRIGHT_REPORT_DIR)) {
+            console.warn('Warning: playwright-report directory not found, nothing to upload to MinIO');
             return;
         }
-        
+        const destination = getMinioReportsPath();
+        const tmpDir = fs.mkdtempSync(path.join(os.tmpdir(), 'mc-reports-'));
+        const mcConfigDir = path.join(tmpDir, '.mc');
         try {
-            console.log(`Uploading playwright-report files to GCS bucket: ${GCS_BUCKET_NAME} in folder: ${getRunFolder()}`);
-            
-            // Get access token
-            const accessToken = await this.getGcsAccessToken();
-            
-            // Collect all files from playwright-report directory
-            const files = this.getAllFilesRecursive(PLAYWRIGHT_REPORT_DIR);
-            
-            // Normalize the base directory path for path replacement
-            const baseDirPath = path.resolve(PLAYWRIGHT_REPORT_DIR);
-            
-            // Upload all files to GCS
-            for (const file of files) {
-                // Get relative path from playwright-report directory
-                const relativePath = path.relative(baseDirPath, file).replace(/\\/g, '/');
-                const objectPath = getGcsObjectPath(relativePath);
-                const content = fs.readFileSync(file);
-                
-                // Upload file to GCS
-                const uploadUrl = `${GCS_UPLOAD_API_BASE_URL}/b/${GCS_BUCKET_NAME}/o?uploadType=media&name=${encodeURIComponent(objectPath)}`;
-                
-                await axios.post(uploadUrl, content, {
-                    headers: {
-                        'Authorization': `Bearer ${accessToken}`,
-                        'Content-Type': this.getContentType(file)
-                    }
-                });
-            }
-            
-            console.log(`Successfully uploaded ${files.length} files to GCS bucket: ${GCS_BUCKET_NAME} in folder: ${getRunFolder()}`);
+            console.log(`Uploading playwright-report to MinIO: ${destination}`);
+            // 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' });
+            execFileSync('mc', ['--config-dir', mcConfigDir, 'cp', '--recursive', `${PLAYWRIGHT_REPORT_DIR}/`, `${destination}/`], { stdio: 'inherit' });
+            console.log(`Successfully uploaded playwright-report to MinIO: ${destination}`);
         } catch (error) {
-            console.warn('Warning: Failed to push reports to GCS. This may not affect the overall process.', error.message);
-            if (error.response) {
-                console.warn('GCS API error:', error.response.data);
-            }
-        }
-    }
-    
-    getContentType(filePath) {
-        const ext = path.extname(filePath).toLowerCase();
-        const contentTypes = {
-            '.html': 'text/html',
-            '.css': 'text/css',
-            '.js': 'application/javascript',
-            '.json': 'application/json',
-            '.png': 'image/png',
-            '.jpg': 'image/jpeg',
-            '.jpeg': 'image/jpeg',
-            '.gif': 'image/gif',
-            '.svg': 'image/svg+xml',
-            '.zip': 'application/zip',
-            '.txt': 'text/plain',
-            '.xml': 'application/xml'
-        };
-        return contentTypes[ext] || 'application/octet-stream';
-    }
-    
-    getAllFilesRecursive(dir, fileList = []) {
-        if (!fs.existsSync(dir)) {
-            return fileList;
-        }
-        
-        const files = fs.readdirSync(dir);
-        
-        for (const file of files) {
-            const filePath = path.join(dir, file);
-            const stat = fs.statSync(filePath);
-            
-            if (stat.isDirectory()) {
-                this.getAllFilesRecursive(filePath, fileList);
-            } else {
-                fileList.push(filePath);
-            }
+            console.warn('Warning: Failed to push reports to MinIO. This may not affect the overall process.', error.message);
+        } finally {
+            fs.rmSync(tmpDir, { recursive: true, force: true });
         }
-        
-        return fileList;
     }
 }
 exports.default = ResultsParser;

package/dist/src/SlackReporter.js

@@ -86,7 +86,7 @@ class SlackReporter {
             return;
         }
         if (this.sendResults === 'branch') {
-          this.log('🛑 Branch mode: skipping Slack post (GCS upload completed)');
+          this.log('🛑 Branch mode: skipping Slack post (MinIO upload completed)');
           return;
         }
         const agent = this.proxy ? new https_proxy_agent_1.HttpsProxyAgent(this.proxy) : undefined;

package/package.json

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