haven-cypress-integration 1.4.1 → 1.6.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "haven-cypress-integration",
-  "version": "1.4.1",
+  "version": "1.6.0",
   "description": "Seamless Cypress integration with HAVEN test case management",
   "main": "index.js",
   "bin": {

package/templates/Dockerfile

@@ -5,20 +5,15 @@ WORKDIR /app
 # Copy project files
 COPY . .
 
-# ✅ Install zip and AWS CLI v2 via official method
+# Install zip utility (AWS CLI removed - EC2 handles S3 uploads)
 RUN apt-get update && \
-    apt-get install -y \
-    zip \
-    unzip \
-    curl && \
-    curl "https://awscli.amazonaws.com/awscli-exe-linux-x86_64.zip" -o "awscliv2.zip" && \
-    unzip awscliv2.zip && \
-    ./aws/install && \
-    rm -rf aws awscliv2.zip
+    apt-get install -y zip && \
+    apt-get clean && \
+    rm -rf /var/lib/apt/lists/*
 
 # ✅ Install Node deps (including dev dependencies for mochawesome)
 RUN npm ci --include=dev
-RUN npm install --no-save aws-sdk mochawesome mochawesome-merge mochawesome-report-generator
+RUN npm install --no-save mochawesome mochawesome-merge mochawesome-report-generator
 
 # ✅ Ensure script is executable
 COPY run-filtered.sh /app/run-filtered.sh

package/templates/run-filtered.sh

@@ -108,24 +108,22 @@ else
   echo "❌ Mochawesome report folder not found: ${MOCHAWESOME_DIR}"
 fi
 
-# Upload zipped report to S3
+# Copy artifacts to shared volume for EC2 to upload
+mkdir -p /shared/test-logs
 if [ -f "${ZIP_PATH}" ]; then
-  S3_BASE_KEY="artifacts/${PLAN_ID}/automation/${RUN_ID}"
-  S3_ZIP_KEY="${S3_BASE_KEY}/${ZIP_NAME}"
-  echo "☁️ Uploading ZIP to s3://${BUCKET_NAME}/${S3_ZIP_KEY}"
-  aws s3 cp "${ZIP_PATH}" "s3://${BUCKET_NAME}/${S3_ZIP_KEY}" || echo "❌ S3 ZIP upload failed"
+  echo "📁 Copying ZIP to shared volume: ${ZIP_NAME}"
+  cp "${ZIP_PATH}" "/shared/test-logs/${ZIP_NAME}" || echo "❌ Failed to copy ZIP to shared volume"
 else
-  echo "❌ No zip file to upload"
+  echo "❌ No zip file to copy"
 fi
 
-# Upload HTML report file to S3
+# Copy HTML report file to shared volume
 if [ -f "${REPORT_HTML}" ]; then
   HTML_NAME=$(basename "$REPORT_HTML")
-  S3_HTML_KEY="${S3_BASE_KEY}/${HTML_NAME}"
-  echo "🌐 Uploading HTML to s3://${BUCKET_NAME}/${S3_HTML_KEY}"
-  aws s3 cp "${REPORT_HTML}" "s3://${BUCKET_NAME}/${S3_HTML_KEY}" || echo "❌ S3 HTML upload failed"
+  echo "📁 Copying HTML to shared volume: ${HTML_NAME}"
+  cp "${REPORT_HTML}" "/shared/test-logs/${HTML_NAME}" || echo "❌ Failed to copy HTML to shared volume"
 else
-  echo "❌ No HTML report found to upload"
+  echo "❌ No HTML report found to copy"
 fi
 
 # Run result sync

package/templates/syncCypressResults.js

@@ -2,13 +2,7 @@ const fs = require("fs");
 const path = require("path");
 const axios = require("axios");
 const glob = require("glob");
-const AWS = require("aws-sdk");
-
-// AWS setup
-const s3 = new AWS.S3({
-  region: process.env.AWS_REGION || "us-east-1",
-});
-const bucketName = process.env.S3_BUCKET || "your-bucket-name";
+// AWS SDK removed - EC2 instance handles S3 uploads
 
 // Paths
 const automationCasesPath = "/shared/automation-cases.json";
@@ -165,7 +159,7 @@ async function postSummary(results, notFound, planId, runId) {
   const url = baseUrl.replace('/api/test-results', '/api/test-run-summary');
 
   const logs =
-    (await uploadLogToS3(planId, runId)) || "Log upload failed or missing";
+    (await copyLogToShared(planId, runId)) || "Log copy failed or missing";
 
   const summaryPayload = {
     runId,
@@ -197,30 +191,26 @@ async function postSummary(results, notFound, planId, runId) {
   }
 }
 
-async function uploadLogToS3(planId, runId) {
+async function copyLogToShared(planId, runId) {
   const logsPath = "results/logs.txt";
 
   if (!fs.existsSync(logsPath)) {
-    console.warn("⚠️ No logs.txt file found to upload.");
+    console.warn("⚠️ No logs.txt file found to copy.");
     return null;
   }
 
-  const key = `artifacts/${planId}/automation/${runId}/run_log`;
-  const fileStream = fs.createReadStream(logsPath);
+  const sharedDir = "/shared/test-logs";
+  if (!fs.existsSync(sharedDir)) {
+    fs.mkdirSync(sharedDir, { recursive: true });
+  }
 
   try {
-    await s3
-      .upload({
-        Bucket: bucketName,
-        Key: key,
-        Body: fileStream,
-        ContentType: "text/plain",
-      })
-      .promise();
-
-    return `s3://${bucketName}/${key}`;
+    const destPath = path.join(sharedDir, "run_log.txt");
+    fs.copyFileSync(logsPath, destPath);
+    console.log(`📁 Logs copied to shared volume: ${destPath}`);
+    return destPath;
   } catch (err) {
-    console.error("❌ Failed to upload log to S3:", err.message);
+    console.error("❌ Failed to copy log to shared volume:", err.message);
     return null;
   }
 }