playwright-slack-report-burak 3.0.41 → 3.1.0

package/dist/src/ResultsParser.js

@@ -18,15 +18,47 @@ try {
     AdmZip = null;
 }
 
+// ============================================================================
+// CONSTANTS
+// ============================================================================
+
+// Directory paths
 const SUMMARIES_DIR = path.join('./', 'playwright-artifacts');
 const PLAYWRIGHT_REPORT_DIR = path.join('./', 'playwright-report');
-const FINAL_OUTPUT_DIR = path.join('./', 'playwright-report');
 
 // Environment variables
 const IS_CI = !!process.env.CI;
 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';
+
+// Google Cloud Storage configuration
+const GCS_BUCKET_NAME = 'sw-automation-tests';
+const GCS_SERVICE_ACCOUNT_KEY = process.env.GCS_SERVICE_ACCOUNT_KEY;
+const GCS_REPORTS_FOLDER_PREFIX = 'playwright-reports';
+const GCS_UPLOAD_API_BASE_URL = 'https://storage.googleapis.com/upload/storage/v1';
+
+// Artifact patterns
+const ARTIFACT_NAME_PATTERNS = [
+    'html-report',
+    'blob-report-node',
+    'test-results',
+];
+
+// GitHub API endpoints (for artifact fetching)
+const GITHUB_API_BASE_URL = 'https://api.github.com';
+const GITHUB_API_ARTIFACTS_ENDPOINT = '/actions/artifacts';
+
+// Helper functions for building GitHub API URLs and patterns
+const getGitHubArtifactsApiUrl = () => `${GITHUB_API_BASE_URL}/repos/${GITHUB_REPOSITORY}${GITHUB_API_ARTIFACTS_ENDPOINT}`;
+const getArtifactNamePatterns = (shardIndex) => ARTIFACT_NAME_PATTERNS.map(pattern => `${pattern}-${shardIndex}`);
+
+// Helper functions for report paths
+const getRunFolder = () => `${GCS_REPORTS_FOLDER_PREFIX}/${GITHUB_RUN_ID}-${GITHUB_RUN_ATTEMPT}`;
+const getGcsObjectPath = (relativePath) => `${getRunFolder()}/${relativePath}`;
+
+// ============================================================================
 
 class ResultsParser {
     result;
@@ -145,7 +177,8 @@ class ResultsParser {
                 }
             }
             
-            this.mergeReports();
+            await this.mergeReports();
+            await this.pushReportsToGCS();
         }
         return summary;
     }
@@ -379,14 +412,8 @@ class ResultsParser {
     }
 
     async fetchArtifactFromGitHubActions(i, file, filePath) {
-        const githubApiUrl = `https://api.github.com/repos/${GITHUB_REPOSITORY}/actions/artifacts`;
-        
-        // Try multiple artifact naming patterns
-        const artifactNamePatterns = [
-            `html-report-${i}`,
-            `blob-report-node-${i}`,
-            `test-results-${i}`,
-        ];
+        const githubApiUrl = getGitHubArtifactsApiUrl();
+        const artifactNamePatterns = getArtifactNamePatterns(i);
         
         while (true) {
             try {
@@ -454,7 +481,7 @@ class ResultsParser {
             }
         }
     }
-    mergeReports() {
+    async mergeReports() {
       let breakMergeWaiter = false;
       try {
         
@@ -564,5 +591,133 @@ class ResultsParser {
             }
         }
     }
+    
+    async getGcsAccessToken() {
+        if (!GCS_SERVICE_ACCOUNT_KEY) {
+            throw new Error('GCS_SERVICE_ACCOUNT_KEY environment variable is required');
+        }
+        
+        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');
+            }
+        }
+        
+        // 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 (!IS_CI || !GCS_SERVICE_ACCOUNT_KEY) {
+            console.log('Skipping GCS push: not in CI or missing GCS_SERVICE_ACCOUNT_KEY');
+            return;
+        }
+        
+        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(`Uploaded ${objectPath} to GCS`);
+            }
+            
+            console.log(`Successfully uploaded ${files.length} files to GCS bucket: ${GCS_BUCKET_NAME} in folder: ${getRunFolder()}`);
+        } 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);
+            }
+        }
+        
+        return fileList;
+    }
 }
 exports.default = ResultsParser;

package/package.json

@@ -4,7 +4,8 @@
     "@slack/webhook": "^6.1.0",
     "https-proxy-agent": "^7.0.1",
     "adm-zip": "^0.5.10",
-    "axios": "^1.0.0"
+    "axios": "^1.0.0",
+    "jsonwebtoken": "^9.0.0"
   },
   "devDependencies": {
     "@playwright/test": "^1.23.3",
@@ -32,7 +33,7 @@
     "lint-fix": "npx eslint . --ext .ts --fix"
   },
   "name": "playwright-slack-report-burak",
-  "version": "3.0.41",
+  "version": "3.1.0",
   "main": "index.js",
   "types": "dist/index.d.ts",
   "author": "Burak B. <burak.boluk@hotmail.com>",