@fenwave/agent 1.1.2 → 1.1.4

package/containerManager.js

@@ -70,79 +70,6 @@ class ContainerManager {
     });
   }
 
-  /**
-   * Authenticate with AWS ECR
-   */
-  async authenticateECR() {
-    return new Promise((resolve, reject) => {
-      const awsRegion = config.awsRegion;
-      const awsAccountId = config.awsAccountId;
-
-      if (!awsRegion || !awsAccountId) {
-        console.log(chalk.yellow('⚠️  AWS ECR configuration not set, skipping ECR authentication'));
-        console.log(chalk.gray('   Run "fenwave init" to configure ECR settings'));
-        resolve();
-        return;
-      }
-
-      console.log(chalk.blue('🔐 Authenticating with AWS ECR...'));
-
-      const authProcess = spawn('aws', [
-        'ecr',
-        'get-login-password',
-        '--region',
-        awsRegion,
-      ]);
-
-      let authToken = '';
-      let errorOutput = '';
-
-      authProcess.stdout.on('data', (data) => {
-        authToken += data.toString();
-      });
-
-      authProcess.stderr.on('data', (data) => {
-        errorOutput += data.toString();
-      });
-
-      authProcess.on('close', (code) => {
-        if (code === 0) {
-          // Now login to Docker with the auth token
-          const loginProcess = spawn('docker', [
-            'login',
-            '--username',
-            'AWS',
-            '--password-stdin',
-            `${awsAccountId}.dkr.ecr.${awsRegion}.amazonaws.com`,
-          ]);
-
-          loginProcess.stdin.write(authToken.trim());
-          loginProcess.stdin.end();
-
-          let loginError = '';
-          loginProcess.stderr.on('data', (data) => {
-            loginError += data.toString();
-          });
-
-          loginProcess.on('close', (loginCode) => {
-            if (loginCode === 0) {
-              console.log(chalk.green('✅ Authenticated with ECR'));
-              resolve();
-            } else {
-              console.error(chalk.red('❌ Failed to login to Docker registry:'));
-              console.error(loginError);
-              reject(new Error('ECR Docker login failed'));
-            }
-          });
-        } else {
-          console.error(chalk.red('❌ Failed to get ECR auth token:'));
-          console.error(errorOutput);
-          reject(new Error('ECR authentication failed'));
-        }
-      });
-    });
-  }
-
   /**
    * Check if image exists locally
    */
@@ -158,7 +85,7 @@ class ContainerManager {
   }
 
   /**
-   * Pull the Fenwave DevApp image from ECR
+   * Pull the Fenwave DevApp image from GHCR
    */
   async pullImage() {
     return new Promise(async (resolve, reject) => {
@@ -169,7 +96,7 @@ class ContainerManager {
           console.log(chalk.green('✅ Image already exists locally, checking for updates...'));
         }
 
-        console.log(chalk.blue('📥 Pulling Fenwave DevApp image from ECR...'));
+        console.log(chalk.blue('📥 Pulling Fenwave DevApp image...'));
         console.log(chalk.gray(`   Image: ${DOCKER_IMAGE}`));
 
         const pullProcess = spawn('docker', ['pull', DOCKER_IMAGE], {
@@ -234,22 +161,14 @@ class ContainerManager {
       // Stop existing container if running
       await this.stopContainer();
 
-      // Authenticate with ECR
-      try {
-        await this.authenticateECR();
-      } catch (ecrError) {
-        console.log(chalk.yellow('⚠️  ECR authentication failed, attempting to use cached image...'));
-        // Continue with cached image if authentication fails
-      }
-
-      // Pull image from ECR
+      // Pull image from GHCR (public registry, no auth required)
       try {
         await this.pullImage();
       } catch (pullError) {
         console.log(chalk.yellow('⚠️  Image pull failed, checking for local image...'));
         const imageExists = await this.imageExistsLocally();
         if (!imageExists) {
-          throw new Error('No local image available and pull failed. Please check your AWS credentials and network connection.');
+          throw new Error('No local image available and pull failed. Please check your network connection.');
         }
         console.log(chalk.green('✅ Using cached local image'));
       }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fenwave/agent",
-  "version": "1.1.2",
+  "version": "1.1.4",
   "description": "Fenwave Docker Agent and CLI",
   "keywords": [
     "fenwave",

package/setup/setupWizard.js

@@ -36,10 +36,9 @@ import {
   SetupStep,
   isSetupInProgress,
 } from "../store/setupState.js";
-import { authenticateDockerWithECR } from "../utils/ecrAuth.js";
 import { initializeConfig } from "../store/configStore.js";
 
-const TOTAL_STEPS = 7;
+const TOTAL_STEPS = 6; // Reduced from 7 - no ECR auth step needed for GHCR
 
 /**
  * Setup Wizard Orchestrator
@@ -49,8 +48,6 @@ export class SetupWizard {
   constructor(options = {}) {
     this.backendUrl = options.backendUrl || "http://localhost:7007";
     this.frontendUrl = options.frontendUrl || "http://localhost:3000";
-    this.awsRegion = options.awsRegion || "eu-west-1";
-    this.awsAccountId = options.awsAccountId || null; // Will be set from Backstage during registration
     this.skipPrerequisites = options.skipPrerequisites || false;
     this.registrationToken = options.token || null;
   }
@@ -67,8 +64,6 @@ export class SetupWizard {
       const agentConfig = {
         backendUrl: this.backendUrl,
         frontendUrl: this.frontendUrl,
-        awsRegion: this.awsRegion,
-        awsAccountId: this.awsAccountId,
       };
 
       initializeConfig(agentConfig);
@@ -76,10 +71,6 @@ export class SetupWizard {
       displayInfo("Agent configuration initialized:");
       displayKeyValue("Backend URL", this.backendUrl);
       displayKeyValue("Frontend URL", this.frontendUrl);
-      displayKeyValue("AWS Region", this.awsRegion);
-      if (this.awsAccountId) {
-        displayKeyValue("AWS Account ID", this.awsAccountId);
-      }
       console.log("");
 
       // Check if already registered
@@ -116,19 +107,16 @@ export class SetupWizard {
       // Step 2: Device Registration
       const registrationData = await this.registrationStep();
 
-      // Step 3: Docker Registry Configuration
-      await this.dockerRegistryStep(registrationData);
-
-      // Step 4: Pull DevApp Image
+      // Step 3: Pull DevApp Image (GHCR is public, no auth required)
       await this.pullImageStep(registrationData);
 
-      // Step 5: NPM Configuration
+      // Step 4: NPM Configuration
       await this.npmConfigStep(registrationData);
 
-      // Step 6: Start Agent (optional)
+      // Step 5: Start Agent (optional)
       await this.startAgentStep();
 
-      // Step 7: Complete
+      // Step 6: Complete
       this.displayComplete(registrationData);
 
       // Clear setup state
@@ -288,73 +276,10 @@ export class SetupWizard {
   }
 
   /**
-   * Step 3: Docker Registry Configuration
-   */
-  async dockerRegistryStep(registrationData) {
-    displayStep(3, TOTAL_STEPS, "Docker Registry Configuration");
-
-    const shouldConfigure = await promptConfirmation(
-      "Configure AWS ECR for Fenwave images?",
-      true
-    );
-
-    if (!shouldConfigure) {
-      displayInfo("Skipping Docker registry configuration");
-      saveSetupProgress(SetupStep.DOCKER_REGISTRY, { skipped: true });
-      return;
-    }
-
-    const { awsRegion, awsAccountId } = registrationData.registryConfig;
-
-    displayInfo(`Authenticating with AWS ECR (${awsRegion})...`);
-    displayInfo(
-      "🔐 Using Backstage-controlled credential flow (temporary credentials)"
-    );
-
-    try {
-      // Use Backstage-controlled credential flow
-      const authResult = await authenticateDockerWithECR(this.backendUrl);
-
-      displaySuccess("AWS ECR authenticated successfully");
-      displayInfo(`✅ Credentials expire at: ${authResult.expiration}`);
-      displayInfo(`📦 Registry: ${authResult.registryUri}`);
-
-      saveSetupProgress(SetupStep.DOCKER_REGISTRY, {
-        awsRegion: authResult.region,
-        awsAccountId: authResult.accountId,
-        registryUri: authResult.registryUri,
-        expiration: authResult.expiration,
-      });
-    } catch (error) {
-      displayError("Failed to authenticate with AWS ECR");
-      displayError(`Error: ${error.message}`);
-      displayWarning(
-        "Make sure your device is registered and Backstage is running"
-      );
-
-      const shouldContinue = await promptConfirmation(
-        "Continue without ECR authentication?",
-        true
-      );
-      if (!shouldContinue) {
-        throw createError(
-          ErrorCode.ECR_AUTH_FAILED,
-          "ECR authentication failed"
-        );
-      }
-
-      saveSetupProgress(SetupStep.DOCKER_REGISTRY, {
-        failed: true,
-        error: error.message,
-      });
-    }
-  }
-
-  /**
-   * Step 4: Pull Fenwave DevApp Image
+   * Step 3: Pull Fenwave DevApp Image (GHCR is public, no auth required)
    */
   async pullImageStep(registrationData) {
-    displayStep(4, TOTAL_STEPS, "Pull Fenwave DevApp Image");
+    displayStep(3, TOTAL_STEPS, "Pull Fenwave DevApp Image");
 
     const shouldPull = await promptConfirmation(
       "Pull Fenwave DevApp Docker image?",
@@ -412,10 +337,10 @@ export class SetupWizard {
   }
 
   /**
-   * Step 5: NPM Configuration
+   * Step 4: NPM Configuration
    */
   async npmConfigStep(registrationData) {
-    displayStep(5, TOTAL_STEPS, "NPM Configuration");
+    displayStep(4, TOTAL_STEPS, "NPM Configuration");
 
     const { npmToken } = registrationData;
 
@@ -430,10 +355,10 @@ export class SetupWizard {
   }
 
   /**
-   * Step 6: Start Agent (optional)
+   * Step 5: Start Agent (optional)
    */
   async startAgentStep() {
-    displayStep(6, TOTAL_STEPS, "Start Agent Service");
+    displayStep(5, TOTAL_STEPS, "Start Agent Service");
 
     const shouldStart = await promptConfirmation("Start the agent now?", true);
 
@@ -453,7 +378,7 @@ export class SetupWizard {
    * Display completion message
    */
   displayComplete(registrationData) {
-    displayStep(7, TOTAL_STEPS, "Setup Complete! 🎉");
+    displayStep(6, TOTAL_STEPS, "Setup Complete! 🎉");
 
     console.log("");
     displayHeader("Setup Summary");

package/store/configStore.js

@@ -25,10 +25,8 @@ const DEFAULT_CONFIG = {
   registriesDir: 'registries',
   containerDataDir: '/data',
 
-  // AWS/ECR Configuration
-  awsRegion: 'eu-west-1',
-  awsAccountId: null, // Set during registration from Backstage
-  dockerImage: null, // Will be computed if awsAccountId is set
+  // Docker Image (GHCR - public registry, no auth required)
+  dockerImage: 'ghcr.io/fenleap/fenwave/dev-app:latest',
 
   // Other Settings
   authTimeoutMs: 60000,
@@ -68,11 +66,6 @@ export function loadConfig() {
     config.appBuilderUrl = config.backendUrl;
   }
 
-  // Only compute dockerImage if awsAccountId is configured
-  if (!config.dockerImage && config.awsAccountId && config.awsRegion) {
-    config.dockerImage = `${config.awsAccountId}.dkr.ecr.${config.awsRegion}.amazonaws.com/fenwave/devapp:latest`;
-  }
-
   // Fall back to environment variables if config values are not set
   config.backendUrl = config.backendUrl || process.env.BACKEND_URL || DEFAULT_CONFIG.backendUrl;
   config.frontendUrl = config.frontendUrl || process.env.FRONTEND_URL || DEFAULT_CONFIG.frontendUrl;