haven-cypress-integration 1.2.1 → 1.3.0

package/README.md

@@ -67,29 +67,46 @@ npx haven-cypress run --automationIds=TC-AUTO-123,TC-AUTO-124
 Images are organized in the `haven-test-images` ECR repository with product-based versioning:
 ```
 Repository: haven-test-images
-├── BE-v1.0.123456     (latest with build number)
-├── BE-v2.1.0          (semantic version)  
-├── payments-v1.0.789012
-└── auth-v3.0.0
+├── BE-1.0.123456     (latest with build number)
+├── BE-2.1.0          (semantic version)  
+├── payments-1.0.789012
+└── auth-3.0.0
 ```
 
 **Tag Format**: `{PRODUCT}-{VERSION}`
 - **Product**: Organizes images by product/team
-- **Version**: Semantic versioning (e.g., `v2.1.0`) or build numbers (e.g., `v1.0.123456`)
+- **Version**: Semantic versioning (e.g., `2.1.0`) or build numbers (e.g., `1.0.123456`)
 
 ### Versioning Examples
+
+**Using package.json version (Recommended):**
+```json
+// package.json
+{
+  "version": "2.1.0"
+}
+```
 ```bash
-# Build with auto-generated build number
+# Automatically uses package.json version
 npx haven-cypress build --product=BE --push
-→ ECR tag: BE-v1.0.123456
+→ ECR tag: BE-2.1.0
+```
 
-# Build with semantic version
-npx haven-cypress build --product=BE --tag=v2.1.0 --push
-→ ECR tag: BE-v2.1.0
+**Manual version override:**
+```bash
+# Override with custom semantic version
+npx haven-cypress build --product=BE --tag=v3.0.0 --push
+→ ECR tag: BE-3.0.0
 
-# Build with custom build number (CI/CD)
+npx haven-cypress build --product=BE --tag=3.0.0 --push
+→ ECR tag: BE-3.0.0
+```
+
+**Fallback for missing package.json:**
+```bash
+# Falls back to build number if no package.json version found
 BUILD_NUMBER=456 npx haven-cypress build --product=BE --push
-→ ECR tag: BE-v1.0.456
+→ ECR tag: BE-1.0.456
 ```
 
 ## What's Included

package/bin/haven-cypress.js

@@ -28,9 +28,14 @@ Examples:
   npx haven-cypress run --automationIds=TC-AUTO-123,TC-AUTO-124
 
 Versioning:
-  --tag=latest        → ECR tag: BE-v1.0.{BUILD_NUMBER}
-  --tag=v2.1.0        → ECR tag: BE-v2.1.0
-  BUILD_NUMBER env    → Custom build number (default: timestamp)
+  --tag=latest        → ECR tag: BE-{package.json.version} or BE-1.0.{BUILD_NUMBER}
+  --tag=v2.1.0        → ECR tag: BE-2.1.0
+  --tag=2.1.0         → ECR tag: BE-2.1.0
+  
+  Version Priority:
+  1. Custom --tag (if provided)
+  2. package.json version (for --tag=latest)
+  3. BUILD_NUMBER fallback (if package.json not found)
 `);
   process.exit(1);
 }

package/index.js

@@ -152,20 +152,37 @@ class HavenCypressIntegration {
       const ecrRepo = 'haven-test-images';
       const ecrUri = `${accountId}.dkr.ecr.${region}.amazonaws.com/${ecrRepo}`;
 
-      // Extract version from local tag or use 'latest'
+      // 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') {
-        // For 'latest', use build number format: product-v1.0.BUILD_NUMBER
-        const buildNumber = process.env.BUILD_NUMBER || Date.now().toString().slice(-6);
-        ecrTag = `${product}-v1.0.${buildNumber}`;
+        // 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);
+        }
+
+        if (packageVersion) {
+          // Use package.json version
+          const cleanVersion = packageVersion.startsWith('v') ? packageVersion.slice(1) : packageVersion;
+          ecrTag = `${product}-${cleanVersion}`;
+        } else {
+          // Fallback to build number format
+          const buildNumber = process.env.BUILD_NUMBER || Date.now().toString().slice(-6);
+          ecrTag = `${product}-1.0.${buildNumber}`;
+        }
       } else {
-        // For custom versions, preserve semantic versioning exactly
-        // Ensure version starts with 'v' prefix for consistency
-        const versionTag = localVersion.startsWith('v') ? localVersion : `v${localVersion}`;
-        ecrTag = `${product}-${versionTag}`;
+        // 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}`;

package/package.json

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