haven-cypress-integration 1.0.0 → 1.1.0

package/bin/haven-cypress.js

@@ -17,12 +17,14 @@ Commands:
 
 Options:
   --tag=name:version    Docker image tag (default: haven-cypress-tests:latest)
-  --push                Push image to registry after building
+  --product=name        Product name for ECR organization (required for --push)
+  --push                Push image to ECR haven-test-images repository
   --automationIds=ID1,ID2  Run specific test cases
 
 Examples:
-  npx haven-cypress build
-  npx haven-cypress build --tag=my-tests:v1.0 --push
+  npx haven-cypress build --product=billexplainer
+  npx haven-cypress build --product=billexplainer --push
+  npx haven-cypress build --product=billexplainer --tag=v1.0 --push
   npx haven-cypress run --automationIds=TC-AUTO-123,TC-AUTO-124
 `);
   process.exit(1);
@@ -45,12 +47,12 @@ try {
       const tag = options.tag || 'haven-cypress-tests:latest';
       integration.buildImage(tag, options);
       break;
-      
+
     case 'run':
       const automationIds = options.automationIds || '';
       integration.runTests(automationIds);
       break;
-      
+
     default:
       console.error(`❌ Unknown command: ${command}`);
       process.exit(1);

package/index.js

@@ -14,39 +14,42 @@ class HavenCypressIntegration {
    */
   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' 
+      execSync(`docker build -t ${tag} .`, {
+        cwd: buildDir,
+        stdio: 'inherit'
       });
-      
+
       console.log(`✅ Docker image built successfully: ${tag}`);
-      
+
       // Push if requested
       if (options.push) {
-        console.log('📤 Pushing image to registry...');
-        execSync(`docker push ${tag}`, { stdio: 'inherit' });
-        console.log('✅ Image pushed successfully');
+        this.pushToECR(tag, options.product);
       }
-      
+
     } finally {
       // Cleanup build directory
       if (fs.existsSync(buildDir)) {
@@ -65,11 +68,11 @@ class HavenCypressIntegration {
       '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);
@@ -92,17 +95,17 @@ class HavenCypressIntegration {
       '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 });
   }
@@ -114,13 +117,13 @@ class HavenCypressIntegration {
     if (!fs.existsSync(dest)) {
       fs.mkdirSync(dest, { recursive: true });
     }
-    
+
     const entries = fs.readdirSync(src, { withFileTypes: true });
-    
+
     for (const entry of entries) {
       const srcPath = path.join(src, entry.name);
       const destPath = path.join(dest, entry.name);
-      
+
       if (entry.isDirectory()) {
         this.copyDir(srcPath, destPath);
       } else {
@@ -129,6 +132,54 @@ class HavenCypressIntegration {
     }
   }
 
+  /**
+ * 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}`;
+      const timestamp = new Date().toISOString().replace(/[:.]/g, '-').slice(0, 19);
+      const ecrTag = `${product}/${localTag.split(':')[1] || 'latest'}-${timestamp}`;
+      const fullEcrUri = `${ecrUri}:${ecrTag}`;
+
+      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' });
+
+      // Tag image for ECR
+      console.log(`🏷️  Tagging image: ${localTag} -> ${fullEcrUri}`);
+      execSync(`docker tag ${localTag} ${fullEcrUri}`, { stdio: 'inherit' });
+
+      // Push to ECR
+      console.log(`📤 Pushing to ECR: ${fullEcrUri}`);
+      execSync(`docker push ${fullEcrUri}`, { stdio: 'inherit' });
+
+      console.log(`✅ Image pushed successfully!`);
+      console.log(`📍 ECR URI: ${fullEcrUri}`);
+      console.log(`🗂️  Organization: ${ecrRepo}/${product}/`);
+
+    } catch (error) {
+      console.error(`❌ Failed to push to ECR: ${error.message}`);
+      throw error;
+    }
+  }
+
   /**
    * Run tests with Haven integration
    * This is called by Haven when the container runs
@@ -136,7 +187,7 @@ class HavenCypressIntegration {
   runTests(automationIds = '') {
     console.log('🧪 Running Haven-integrated Cypress tests...');
     console.log(`🔍 Automation IDs: ${automationIds || 'All tests'}`);
-    
+
     // 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' };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "haven-cypress-integration",
-  "version": "1.0.0",
+  "version": "1.1.0",
   "description": "Seamless Cypress integration with HAVEN test case management",
   "main": "index.js",
   "bin": {
@@ -23,4 +23,4 @@
   "engines": {
     "node": ">=14.0.0"
   }
-}
+}