@aifabrix/builder 2.40.2 → 2.42.0

package/lib/deployment/environment.js

@@ -9,10 +9,7 @@
  * @version 2.0.0
  */
 
-const fs = require('fs');
-const path = require('path');
 const chalk = require('chalk');
-const Ajv = require('ajv');
 const logger = require('../utils/logger');
 const config = require('../core/config');
 const { resolveControllerUrl } = require('../utils/controller-url');
@@ -21,9 +18,12 @@ const { getOrRefreshDeviceToken } = require('../utils/token-manager');
 const { getPipelineDeployment } = require('../api/pipeline.api');
 const { deployEnvironment: deployEnvironmentInfra, getDeployment } = require('../api/deployments.api');
 const { handleDeploymentErrors } = require('../utils/deployment-errors');
-const { formatValidationErrors } = require('../utils/error-formatter');
 const auditLogger = require('../core/audit-logger');
-const environmentDeployRequestSchema = require('../schema/environment-deploy-request.schema.json');
+const {
+  normalizePreset,
+  buildEnvironmentConfigFromPreset,
+  loadAndValidateEnvironmentDeployConfig
+} = require('./environment-config');
 
 /**
  * Validates environment deployment prerequisites
@@ -82,102 +82,26 @@ async function getEnvironmentAuth(controllerUrl) {
  * @returns {Promise<Object>} Deployment result
  * @throws {Error} If deployment fails
  */
-/** Reads and parses config file; throws if missing, unreadable, or invalid structure. */
-function parseEnvironmentConfigFile(resolvedPath) {
-  let raw;
-  try {
-    raw = fs.readFileSync(resolvedPath, 'utf8');
-  } catch (e) {
-    throw new Error(`Cannot read config file: ${resolvedPath}. ${e.message}`);
-  }
-  let parsed;
-  try {
-    parsed = JSON.parse(raw);
-  } catch (e) {
-    throw new Error(
-      `Invalid JSON in config file: ${resolvedPath}\n${e.message}\n` +
-      'Expected format: { "environmentConfig": { "key", "environment", "preset", "serviceName", "location" }, "dryRun": false }'
-    );
-  }
-  if (parsed === null || typeof parsed !== 'object') {
-    throw new Error(
-      `Config file must be a JSON object with "environmentConfig". File: ${resolvedPath}\n` +
-      'Example: { "environmentConfig": { "key": "dev", "environment": "dev", "preset": "s", "serviceName": "aifabrix", "location": "swedencentral" }, "dryRun": false }'
-    );
-  }
-  if (parsed.environmentConfig === undefined) {
-    throw new Error(
-      `Config file must contain "environmentConfig" (object). File: ${resolvedPath}\n` +
-      'Example: { "environmentConfig": { "key": "dev", "environment": "dev", "preset": "s", "serviceName": "aifabrix", "location": "swedencentral" } }'
-    );
-  }
-  if (typeof parsed.environmentConfig !== 'object' || parsed.environmentConfig === null) {
-    throw new Error(`"environmentConfig" must be an object. File: ${resolvedPath}`);
-  }
-  return parsed;
-}
-
 /**
- * Validates parsed config against schema and returns deploy request.
- * @param {Object} parsed - Parsed config object
- * @param {string} resolvedPath - Path for error messages
- * @returns {Object} { environmentConfig, dryRun? }
- */
-function validateEnvironmentDeployParsed(parsed, resolvedPath) {
-  const ajv = new Ajv({ allErrors: true, strict: false });
-  const validate = ajv.compile(environmentDeployRequestSchema);
-  if (!validate(parsed)) {
-    const messages = formatValidationErrors(validate.errors);
-    throw new Error(
-      `Environment config validation failed (${resolvedPath}):\n  • ${messages.join('\n  • ')}\n` +
-      'Fix the config file and run the command again. See templates/infra/environment-dev.json for a valid example.'
-    );
-  }
-  return {
-    environmentConfig: parsed.environmentConfig,
-    dryRun: Boolean(parsed.dryRun)
-  };
-}
-
-/**
- * Loads and validates environment deploy config from a JSON file
- * @param {string} configPath - Absolute or relative path to config JSON
- * @returns {Object} Valid deploy request { environmentConfig, dryRun? }
- * @throws {Error} If file missing, invalid JSON, or validation fails
- */
-function loadAndValidateEnvironmentDeployConfig(configPath) {
-  const resolvedPath = path.isAbsolute(configPath) ? configPath : path.resolve(process.cwd(), configPath);
-  if (!fs.existsSync(resolvedPath)) {
-    throw new Error(
-      `Environment config file not found: ${resolvedPath}\n` +
-      'Use --config <file> with a JSON file containing "environmentConfig" (e.g. templates/infra/environment-dev.json).'
-    );
-  }
-  const parsed = parseEnvironmentConfigFile(resolvedPath);
-  return validateEnvironmentDeployParsed(parsed, resolvedPath);
-}
-
-/**
- * Builds environment deployment request from options (config file required)
+ * Builds environment deployment request from options (config file or --preset)
+ * When --config is provided, uses that file; otherwise uses --preset (default s).
  * @function buildEnvironmentDeploymentRequest
  * @param {string} validatedEnvKey - Validated environment key
- * @param {Object} options - Deployment options (must include options.config)
+ * @param {Object} options - Deployment options (options.config optional; options.preset used when no config)
  * @returns {Object} Deployment request object for API
  */
 function buildEnvironmentDeploymentRequest(validatedEnvKey, options) {
-  if (!options.config || typeof options.config !== 'string') {
-    throw new Error(
-      'Environment deploy requires a config file with "environmentConfig". Use --config <file>.\n' +
-      'Example: aifabrix environment deploy dev --config templates/infra/environment-dev.json'
-    );
-  }
-  const deployRequest = loadAndValidateEnvironmentDeployConfig(options.config);
-  if (deployRequest.environmentConfig.key && deployRequest.environmentConfig.key !== validatedEnvKey) {
-    logger.log(chalk.yellow(
-      `⚠ Config key "${deployRequest.environmentConfig.key}" does not match deploy target "${validatedEnvKey}"; using target "${validatedEnvKey}".`
-    ));
+  if (options.config && typeof options.config === 'string') {
+    const deployRequest = loadAndValidateEnvironmentDeployConfig(options.config);
+    if (deployRequest.environmentConfig.key && deployRequest.environmentConfig.key !== validatedEnvKey) {
+      logger.log(chalk.yellow(
+        `⚠ Config key "${deployRequest.environmentConfig.key}" does not match deploy target "${validatedEnvKey}"; using target "${validatedEnvKey}".`
+      ));
+    }
+    return deployRequest;
   }
-  return deployRequest;
+  const preset = normalizePreset(options.preset);
+  return buildEnvironmentConfigFromPreset(validatedEnvKey, preset);
 }
 
 /**
@@ -371,7 +295,8 @@ function displayDeploymentResults(result) {
  * @param {string} envKey - Environment key (miso, dev, tst, pro)
  * @param {Object} options - Deployment options
  * @param {string} options.controller - Controller URL (required)
- * @param {string} [options.config] - Environment configuration file (optional)
+ * @param {string} [options.config] - Environment configuration file (optional; if omitted, --preset is used)
+ * @param {string} [options.preset] - Environment size preset: s, m, l, xl (default: s), used when config is not provided
  * @param {boolean} [options.skipValidation] - Skip validation checks
  * @param {boolean} [options.poll] - Poll for deployment status (default: true)
  * @param {boolean} [options.noPoll] - Do not poll for status
@@ -492,6 +417,4 @@ async function deployEnvironment(envKey, options = {}) {
     throw error;
   }
 }
-module.exports = {
-  deployEnvironment
-};
+module.exports = { deployEnvironment };

package/lib/deployment/push.js

@@ -16,6 +16,29 @@ const logger = require('../utils/logger');
 
 const execAsync = promisify(exec);
 
+/** Timeout for az account show (fail fast when not logged in) */
+const AZ_ACCOUNT_SHOW_TIMEOUT_MS = 10000;
+/** Timeout for az acr show (avoid hang when Azure CLI prompts for login) */
+const AZ_ACR_SHOW_TIMEOUT_MS = 15000;
+/** Timeout for az acr login */
+const AZ_ACR_LOGIN_TIMEOUT_MS = 120000;
+
+/**
+ * Check if user is logged in to Azure CLI
+ * Fails fast so push does not hang when user is not logged in.
+ * @param {Object} [execOptions] - Options for exec (e.g. shell on Windows)
+ * @returns {Promise<boolean>} True if logged in
+ */
+async function checkAzureLogin(execOptions = {}) {
+  const options = process.platform === 'win32' ? { shell: true, ...execOptions } : execOptions;
+  try {
+    await execAsync('az account show', { ...options, timeout: AZ_ACCOUNT_SHOW_TIMEOUT_MS });
+    return true;
+  } catch (_error) {
+    return false;
+  }
+}
+
 /**
  * Check if Azure CLI is installed
  * @returns {Promise<boolean>} True if Azure CLI is available
@@ -128,7 +151,7 @@ async function checkACRAuthentication(registry) {
     const registryName = extractRegistryName(registry);
     // On Windows, use shell option to ensure proper command resolution
     const options = process.platform === 'win32' ? { shell: true } : {};
-    await execAsync(`az acr show --name ${registryName}`, options);
+    await execAsync(`az acr show --name ${registryName}`, { ...options, timeout: AZ_ACR_SHOW_TIMEOUT_MS });
     return true;
   } catch (error) {
     return false;
@@ -146,9 +169,15 @@ async function authenticateACR(registry) {
     logger.log(chalk.blue(`Authenticating with ${registry}...`));
     // On Windows, use shell option to ensure proper command resolution
     const options = process.platform === 'win32' ? { shell: true } : {};
-    await execAsync(`az acr login --name ${registryName}`, options);
+    await execAsync(`az acr login --name ${registryName}`, { ...options, timeout: AZ_ACR_LOGIN_TIMEOUT_MS });
     logger.log(chalk.green(`✓ Authenticated with ${registry}`));
   } catch (error) {
+    const msg = error.message || String(error);
+    if (msg.includes('ETIMEDOUT') || msg.includes('timeout')) {
+      throw new Error(
+        'Authentication timed out. Make sure you\'re logged in to Azure first: az login'
+      );
+    }
     throw new Error(`Failed to authenticate with Azure Container Registry: ${error.message}`);
   }
 }
@@ -267,6 +296,7 @@ async function pushImage(imageWithTag, registry = null) {
 
 module.exports = {
   checkAzureCLIInstalled,
+  checkAzureLogin,
   extractRegistryName,
   validateRegistryURL,
   checkACRAuthentication,