playwright-slack-report-burak 3.1.1 → 3.1.3

package/dist/src/ResultsParser.js

@@ -39,20 +39,12 @@ 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;
 
-// 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
+// Helper functions for building GitHub API URLs
 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}`;
@@ -388,14 +380,11 @@ class ResultsParser {
         const playwrightReportDir = path.join('./', 'playwright-report');
         if (fs.existsSync(playwrightReportDir)) {
             this.copyDirectoryRecursive(playwrightReportDir, SUMMARIES_DIR);
-            console.log(`Copied entire contents of playwright-report to ${SUMMARIES_DIR}`);
         } else {
             console.warn('Warning: playwright-report directory not found');
         }
         
         while (!this.allNodeSummaryFilesExist() || !this.allBlobZipsExist()) {
-          console.log('Checking if all node summary files exist...');
-          console.log('Waiting for all blob zips to exist...');
           if (!fs.existsSync(SUMMARIES_DIR)) {
               fs.mkdirSync(SUMMARIES_DIR, { recursive: true });
           }
@@ -413,11 +402,15 @@ class ResultsParser {
 
     async fetchArtifactFromGitHubActions(i, file, filePath) {
         const githubApiUrl = getGitHubArtifactsApiUrl();
-        const artifactNamePatterns = getArtifactNamePatterns(i);
+        
+        if (!AdmZip) {
+            console.error('adm-zip is required for GitHub Actions artifact extraction. Please install it: npm install adm-zip');
+            return;
+        }
         
         while (true) {
             try {
-                // List all artifacts to find the one we need
+                // List all artifacts
                 const listResponse = await axios.get(githubApiUrl, {
                     headers: {
                         'Authorization': `token ${GITHUB_TOKEN}`,
@@ -428,46 +421,41 @@ class ResultsParser {
                     }
                 });
                 
-                // Try to find artifact matching any of our patterns
-                let artifact = null;
-                for (const pattern of artifactNamePatterns) {
-                    artifact = listResponse.data.artifacts.find(
-                        (a) => a.name === pattern || 
-                               a.name.includes(`shard-${i}`) ||
-                               a.name.includes(`node-${i}`)
-                    );
-                    if (artifact) break;
-                }
-                
-                if (artifact && artifact.archive_download_url) {
-                    // Download the artifact ZIP
-                    const downloadResponse = await axios.get(artifact.archive_download_url, {
-                        headers: {
-                            'Authorization': `token ${GITHUB_TOKEN}`,
-                            'Accept': 'application/vnd.github.v3+json'
-                        },
-                        responseType: 'arraybuffer'
-                    });
-                    
-                    if (!AdmZip) {
-                        console.error('adm-zip is required for GitHub Actions artifact extraction. Please install it: npm install adm-zip');
-                        return;
-                    }
+                // Search through all artifacts to find the one containing our file
+                let found = false;
+                for (const artifact of listResponse.data.artifacts) {
+                    if (!artifact.archive_download_url) continue;
                     
-                    // Extract ZIP and find the specific file
-                    const zip = new AdmZip(downloadResponse.data);
-                    const zipEntry = zip.getEntry(file) || zip.getEntry(`playwright-artifacts/${file}`);
-                    
-                    if (zipEntry) {
-                        fs.writeFileSync(filePath, zipEntry.getData());
-                        console.log(`Successfully fetched file ${file} from shard ${i}`);
-                        break;
-                    } else {
-                        console.warn(`File ${file} not found in artifact ${artifact.name}. Retrying in 10 seconds...`);
-                        await new Promise(resolve => setTimeout(resolve, 10000));
+                    try {
+                        // Download the artifact ZIP
+                        const downloadResponse = await axios.get(artifact.archive_download_url, {
+                            headers: {
+                                'Authorization': `token ${GITHUB_TOKEN}`,
+                                'Accept': 'application/vnd.github.v3+json'
+                            },
+                            responseType: 'arraybuffer'
+                        });
+                        
+                        // Extract ZIP and find the specific file
+                        const zip = new AdmZip(downloadResponse.data);
+                        const zipEntry = zip.getEntry(file) || zip.getEntry(`playwright-artifacts/${file}`);
+                        
+                        if (zipEntry) {
+                            fs.writeFileSync(filePath, zipEntry.getData());
+                            console.log(`Successfully fetched file ${file} from artifact ${artifact.name}`);
+                            found = true;
+                            break;
+                        }
+                    } catch (searchError) {
+                        // Continue searching other artifacts
+                        continue;
                     }
+                }
+                
+                if (found) {
+                    break;
                 } else {
-                    console.warn(`Artifact not found (tried: ${artifactNamePatterns.join(', ')}). Retrying in 10 seconds...`);
+                    console.warn(`File ${file} not found in any artifact. Retrying in 10 seconds...`);
                     await new Promise(resolve => setTimeout(resolve, 10000));
                 }
             } catch (error) {
@@ -492,7 +480,6 @@ class ResultsParser {
                 try {
                     const destFile = path.join(PLAYWRIGHT_REPORT_DIR, `blob-report-node-${i}.zip`);
                     fs.copyFileSync(blobZipFile, destFile);
-                    console.log(`Copied blob-report-node-${i}.zip to playwright-report for merging`);
                 } catch (error) {
                     console.warn(`Failed to copy blob-report-node-${i}.zip for merging:`, error.message);
                 }
@@ -561,7 +548,6 @@ class ResultsParser {
                 try {
                     const zip = new AdmZip(blobZipFile);
                     zip.extractAllTo(extractDir, true);
-                    console.log(`Extracted blob-report-node-${i}.zip to ${extractDir}`);
                     
                     // Check if this folder contains a "resources" folder with zip files
                     const resourcesDir = path.join(extractDir, 'resources');
@@ -581,7 +567,6 @@ class ResultsParser {
                                 const sourceFile = path.join(resourcesDir, zipFile);
                                 const destFile = path.join(finalResourcesDir, zipFile);
                                 fs.copyFileSync(sourceFile, destFile);
-                                console.log(`Copied ${zipFile} to finalOutput/resources`);
                             }
                         }
                     }
@@ -667,8 +652,6 @@ class ResultsParser {
                         '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()}`);

package/package.json

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