haven-cypress-integration 1.6.1 → 2.0.0

package/index.js

@@ -1,231 +1,103 @@
 const fs = require('fs');
 const path = require('path');
-const { execSync } = require('child_process');
-
-class HavenCypressIntegration {
-  constructor() {
-    this.templatesDir = path.join(__dirname, 'templates');
-  }
-
-  /**
-   * Build Docker image with Haven integration
-   * @param {string} tag - Docker image tag
-   * @param {Object} options - Build options
-   */
-  buildImage(tag = 'haven-cypress-tests:latest', options = {}) {
-    console.log('🐳 Building Haven-integrated Docker image...');
-
-    // Validate product name if pushing
-    if (options.push && !options.product) {
-      throw new Error('❌ --product is required when using --push');
-    }
-
-    // Create temporary build directory
-    const buildDir = path.join(process.cwd(), '.haven-build');
-    if (fs.existsSync(buildDir)) {
-      fs.rmSync(buildDir, { recursive: true });
-    }
-    fs.mkdirSync(buildDir, { recursive: true });
-
-    try {
-      // Copy user's project files
-      console.log('📁 Copying project files...');
-      this.copyProjectFiles(buildDir);
-
-      // Copy Haven integration files
-      console.log('🔧 Adding Haven integration files...');
-      this.copyHavenFiles(buildDir);
-
-      // Build Docker image
-      console.log('🏗️ Building Docker image...');
-      execSync(`docker build -t ${tag} .`, {
-        cwd: buildDir,
-        stdio: 'inherit'
-      });
-
-      console.log(`✅ Docker image built successfully: ${tag}`);
-
-      // Push if requested
-      if (options.push) {
-        this.pushToECR(tag, options.product);
-      }
-
-    } finally {
-      // Cleanup build directory
-      if (fs.existsSync(buildDir)) {
-        fs.rmSync(buildDir, { recursive: true });
-      }
-    }
-  }
-
-  /**
-   * Copy user's project files to build directory
-   */
-  copyProjectFiles(buildDir) {
-    const filesToCopy = [
-      'package.json',
-      'package-lock.json',
-      'cypress.config.js',
-      'cypress'
-    ];
-
-    filesToCopy.forEach(file => {
-      const src = path.join(process.cwd(), file);
-      const dest = path.join(buildDir, file);
-
-      if (fs.existsSync(src)) {
-        if (fs.statSync(src).isDirectory()) {
-          this.copyDir(src, dest);
-        } else {
-          fs.copyFileSync(src, dest);
-        }
-        console.log(`  ✅ Copied ${file}`);
-      } else {
-        console.log(`  ⚠️ Skipped ${file} (not found)`);
-      }
-    });
-  }
-
-  /**
-   * Copy Haven integration files to build directory
-   */
-  copyHavenFiles(buildDir) {
-    const havenFiles = [
-      'Dockerfile',
-      'run-filtered.sh',
-      'syncCypressResults.js'
-    ];
-
-    havenFiles.forEach(file => {
-      const src = path.join(this.templatesDir, file);
-      const dest = path.join(buildDir, file);
-
-      if (fs.existsSync(src)) {
-        fs.copyFileSync(src, dest);
-        console.log(`  ✅ Added ${file}`);
-      }
-    });
-
-    // Make run-filtered.sh executable
-    execSync('chmod +x run-filtered.sh', { cwd: buildDir });
-  }
-
-  /**
-   * Copy directory recursively
-   */
-  copyDir(src, dest) {
-    if (!fs.existsSync(dest)) {
-      fs.mkdirSync(dest, { recursive: true });
-    }
+const { spawnSync } = require('child_process');
 
-    const entries = fs.readdirSync(src, { withFileTypes: true });
+function run(cmd, args, opts = {}) {
+    const res = spawnSync(cmd, args, { stdio: 'inherit', shell: false, ...opts });
+    if (res.status !== 0) throw new Error(`${cmd} ${args.join(' ')} failed`);
+    return res;
+}
 
-    for (const entry of entries) {
-      const srcPath = path.join(src, entry.name);
-      const destPath = path.join(dest, entry.name);
+module.exports = {
+    buildImage(tag = 'haven-cypress-tests:latest', options = {}) {
+        const buildType = options.type || 'thin';
+        console.log(`Building Haven-integrated Cypress image (${buildType} mode)...`);
 
-      if (entry.isDirectory()) {
-        this.copyDir(srcPath, destPath);
-      } else {
-        fs.copyFileSync(srcPath, destPath);
-      }
-    }
-  }
-
-  /**
- * Push image to ECR with product organization
- * @param {string} localTag - Local Docker image tag
- * @param {string} product - Product name for organization
- */
-  pushToECR(localTag, product) {
-    console.log(`📤 Pushing image to ECR for product: ${product}`);
-
-    try {
-      // Get AWS account ID and region
-      console.log('🔍 Getting AWS account information...');
-      const accountId = execSync('aws sts get-caller-identity --query Account --output text', { encoding: 'utf8' }).trim();
-      const region = execSync('aws configure get region', { encoding: 'utf8' }).trim() || 'us-east-1';
-
-      console.log(`📋 Account: ${accountId}, Region: ${region}`);
-
-      // ECR repository and image details
-      const ecrRepo = 'haven-test-images';
-      const ecrUri = `${accountId}.dkr.ecr.${region}.amazonaws.com/${ecrRepo}`;
-
-      // Extract version from local tag or use package.json version
-      const localVersion = localTag.split(':')[1] || 'latest';
-
-      // Generate ECR tag with product and version
-      let ecrTag;
-      if (localVersion === 'latest') {
-        // Try to read version from package.json first
-        let packageVersion = null;
-        try {
-          const packageJsonPath = path.join(process.cwd(), 'package.json');
-          if (fs.existsSync(packageJsonPath)) {
-            const packageJson = JSON.parse(fs.readFileSync(packageJsonPath, 'utf-8'));
-            packageVersion = packageJson.version;
-          }
-        } catch (error) {
-          console.warn('⚠️  Could not read package.json version:', error.message);
+        // Validate product name if pushing
+        if (options.push && !options.product) {
+            throw new Error('--product is required when using --push');
         }
 
-        if (packageVersion) {
-          // Use package.json version
-          const cleanVersion = packageVersion.startsWith('v') ? packageVersion.slice(1) : packageVersion;
-          ecrTag = `${product}-${cleanVersion}`;
+        const buildDir = path.join(process.cwd(), '.haven-cypress-build');
+        if (fs.existsSync(buildDir)) fs.rmSync(buildDir, { recursive: true });
+        fs.mkdirSync(buildDir, { recursive: true });
+
+        // Copy templates (always needed)
+        const tplDir = path.join(__dirname, 'templates');
+        run('bash', ['-lc', `cp -R ${JSON.stringify(path.join(tplDir, 'Dockerfile'))} ${JSON.stringify(buildDir)}`]);
+        run('bash', ['-lc', `cp -R ${JSON.stringify(path.join(tplDir, 'run-filtered.sh'))} ${JSON.stringify(path.join(buildDir, 'run-filtered.sh'))}`]);
+        run('bash', ['-lc', `cp -R ${JSON.stringify(path.join(tplDir, 'syncCypressResults.js'))} ${JSON.stringify(path.join(buildDir, 'syncCypressResults.js'))}`]);
+
+        // For full image: copy project files
+        if (buildType === 'full') {
+            console.log('Full image: copying project files...');
+            const include = ['package.json', 'package-lock.json', 'cypress.config.js', 'cypress.config.ts', 'cypress', 'src', 'node_modules'];
+            for (const item of include) {
+                if (fs.existsSync(path.join(process.cwd(), item))) {
+                    run('bash', ['-lc', `cp -R ${JSON.stringify(item)} ${JSON.stringify(buildDir)}`]);
+                }
+            }
         } else {
-          // Fallback to build number format
-          const buildNumber = process.env.BUILD_NUMBER || Date.now().toString().slice(-6);
-          ecrTag = `${product}-1.0.${buildNumber}`;
+            console.log('Thin image: skipping project files (will be cloned at runtime)...');
         }
-      } else {
-        // For custom versions, preserve semantic versioning without 'v' prefix
-        const cleanVersion = localVersion.startsWith('v') ? localVersion.slice(1) : localVersion;
-        ecrTag = `${product}-${cleanVersion}`;
-      }
 
-      const fullEcrUri = `${ecrUri}:${ecrTag}`;
+        // Build with target stage
+        const target = buildType === 'thin' ? 'thin-image' : 'full-image';
+        console.log(`Building Docker image with target: ${target}`);
+        run('bash', ['-lc', `podman build --platform linux/amd64 --target ${target} -t ${tag} ${JSON.stringify(buildDir)}`]);
 
-      console.log(`🏷️  ECR tag: ${ecrTag}`);
-
-      // Login to ECR
-      console.log('🔐 Logging in to ECR...');
-      const loginCmd = `aws ecr get-login-password --region ${region} | docker login --username AWS --password-stdin ${ecrUri}`;
-      execSync(loginCmd, { stdio: 'inherit' });
+        if (options.push) {
+            this.pushToECR(tag, options.product, buildType);
+        } else {
+            console.log(`${buildType.charAt(0).toUpperCase() + buildType.slice(1)} image build complete (not pushed)`);
+        }
+    },
 
-      // Tag image for ECR
-      console.log(`🏷️  Tagging image: ${localTag} -> ${fullEcrUri}`);
-      execSync(`docker tag ${localTag} ${fullEcrUri}`, { stdio: 'inherit' });
+    pushToECR(localTag, product = 'unknown', buildType = 'full') {
+        console.log(`Pushing ${buildType} image to ECR for product: ${product}`);
 
-      // Push to ECR
-      console.log(`📤 Pushing to ECR: ${fullEcrUri}`);
-      execSync(`docker push ${fullEcrUri}`, { stdio: 'inherit' });
+        // Account + region
+        const accountId = spawnSync('bash', ['-lc', 'aws sts get-caller-identity --query Account --output text'], { encoding: 'utf-8' }).stdout.trim();
+        const region = spawnSync('bash', ['-lc', 'aws configure get region || echo us-east-1'], { encoding: 'utf-8' }).stdout.trim();
 
-      console.log(`✅ Image pushed successfully!`);
-      console.log(`📍 ECR URI: ${fullEcrUri}`);
-      console.log(`🗂️  Product: ${product}`);
-      console.log(`🏷️  Version: ${ecrTag}`);
+        const ecrRepo = 'haven-test-images';
+        const ecrRegistry = `${accountId}.dkr.ecr.${region}.amazonaws.com`;
+        const ecrUri = `${ecrRegistry}/${ecrRepo}`;
 
-    } catch (error) {
-      console.error(`❌ Failed to push to ECR: ${error.message}`);
-      throw error;
+        // Version from consumer package.json
+        let version = '1.0.0';
+        try {
+            const pkg = JSON.parse(fs.readFileSync(path.join(process.cwd(), 'package.json'), 'utf-8'));
+            version = (pkg.version || '1.0.0').replace(/^v/, '');
+        } catch { }
+
+        // Include build type in tag: product-thin-version (e.g., BE-thin-1.0.0)
+        const ecrTag = buildType === 'full' ? `${product}-${version}` : `${product}-${buildType}-${version}`;
+
+        // Ensure ECR repository exists
+        run('bash', ['-lc', `aws ecr describe-repositories --repository-names ${ecrRepo} --region ${region} >/dev/null 2>&1 || aws ecr create-repository --repository-name ${ecrRepo} --region ${region}`]);
+
+        // Clear stale credentials before login to prevent "token expired" errors
+        console.log('Clearing stale ECR credentials...');
+        spawnSync('bash', ['-lc', `podman logout ${ecrRegistry} 2>/dev/null || true`], { stdio: 'inherit' });
+
+        // Fresh login to ECR
+        console.log(`Logging in to ECR: ${ecrRegistry}`);
+        run('bash', ['-lc', `aws ecr get-login-password --region ${region} | podman login --username AWS --password-stdin ${ecrRegistry}`]);
+
+        run('bash', ['-lc', `podman tag ${localTag} ${ecrUri}:${ecrTag}`]);
+
+        // Use --force-compression to avoid 403 errors when podman tries to reuse
+        // blobs from other registries (e.g., when switching AWS accounts)
+        console.log(`Pushing image: ${ecrUri}:${ecrTag}`);
+        run('bash', ['-lc', `podman push --force-compression ${ecrUri}:${ecrTag}`]);
+        console.log(`${buildType.charAt(0).toUpperCase() + buildType.slice(1)} image pushed: ${ecrUri}:${ecrTag}`);
+    },
+
+    runTests(automationIds = '', customTags = '') {
+        console.log('Running Cypress tests via run-filtered.sh inside container');
+        console.log(`Automation IDs: ${automationIds || 'None'}`);
+        console.log(`Custom Tags: ${customTags || 'None'}`);
+        return { success: true };
     }
-  }
-
-  /**
-   * Run tests with Haven integration
-   * This is called by Haven when the container runs
-   */
-  runTests(automationIds = '', customTags = '') {
-    console.log('🧪 Running Haven-integrated Cypress tests...');
-    console.log(`🔍 Automation IDs: ${automationIds || 'None'}`);
-    console.log(`🔍 Custom Tags: ${customTags || 'None'}`);
-
-    // This will be handled by run-filtered.sh when container runs
-    // The library just provides the interface
-    return { success: true, message: 'Tests will run via run-filtered.sh' };
-  }
-}
-
-module.exports = HavenCypressIntegration;
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "haven-cypress-integration",
-  "version": "1.6.1",
+  "version": "2.0.0",
   "description": "Seamless Cypress integration with HAVEN test case management",
   "main": "index.js",
   "bin": {
@@ -18,9 +18,10 @@
   "files": [
     "index.js",
     "bin/",
-    "templates/"
+    "templates/",
+    "README.md"
   ],
   "engines": {
-    "node": ">=14.0.0"
+    "node": ">=16.0.0"
   }
-}
+}

package/templates/Dockerfile

@@ -1,29 +1,39 @@
-FROM cypress/included:14.3.1
+# =============================================================================
+# Haven Cypress Test Image - Supports Full and Thin modes
+# =============================================================================
 
-WORKDIR /app
-
-# Copy project files
-COPY . .
+# -----------------------------------------------------------------------------
+# Base Stage
+# -----------------------------------------------------------------------------
+FROM cypress/included:14.3.1 AS base
 
-# ✅ Install zip and AWS CLI v2 via official method
+# Install git, zip, AWS CLI
 RUN apt-get update && \
-    apt-get install -y \
-    zip \
-    unzip \
-    curl && \
+    apt-get install -y zip unzip curl git && \
     curl "https://awscli.amazonaws.com/awscli-exe-linux-x86_64.zip" -o "awscliv2.zip" && \
-    unzip awscliv2.zip && \
-    ./aws/install && \
-    rm -rf aws awscliv2.zip
+    unzip awscliv2.zip && ./aws/install && rm -rf aws awscliv2.zip && \
+    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
+# Haven scripts go in /haven (not /app)
+WORKDIR /haven
+COPY run-filtered.sh /haven/run-filtered.sh
+COPY syncCypressResults.js /haven/syncCypressResults.js
+RUN chmod +x /haven/run-filtered.sh
 
-# ✅ Ensure script is executable
-COPY run-filtered.sh /app/run-filtered.sh
-RUN chmod +x /app/run-filtered.sh
+# App code goes in /app
+WORKDIR /app
+
+# -----------------------------------------------------------------------------
+# Full Image - App code baked in
+# -----------------------------------------------------------------------------
+FROM base AS full-image
+COPY . /app
+RUN npm ci --include=dev
+ENTRYPOINT ["/haven/run-filtered.sh"]
 
-# ✅ Entrypoint
-ENTRYPOINT ["/app/run-filtered.sh"]
-CMD []
+# -----------------------------------------------------------------------------
+# Thin Image - App code cloned at runtime
+# -----------------------------------------------------------------------------
+FROM base AS thin-image
+# /app is empty - will be filled by ADO clone at runtime
+ENTRYPOINT ["/haven/run-filtered.sh"]