@aifabrix/builder 2.36.2 → 2.37.5

package/lib/utils/secrets-helpers.js

@@ -33,7 +33,17 @@ function interpolateEnvVars(content, envVars) {
 }
 
 /**
- * Collect missing kv:// secrets referenced in content
+ * Returns true if the line is a comment or empty (should be skipped for kv:// resolution)
+ * @param {string} line - Single line
+ * @returns {boolean}
+ */
+function isCommentOrEmptyLine(line) {
+  const t = line.trim();
+  return t === '' || t.startsWith('#');
+}
+
+/**
+ * Collect missing kv:// secrets referenced in content (skips commented and empty lines)
  * @function collectMissingSecrets
  * @param {string} content - Text content
  * @param {Object} secrets - Available secrets
@@ -42,11 +52,16 @@ function interpolateEnvVars(content, envVars) {
 function collectMissingSecrets(content, secrets) {
   const kvPattern = /kv:\/\/([a-zA-Z0-9-_]+)/g;
   const missing = [];
-  let match;
-  while ((match = kvPattern.exec(content)) !== null) {
-    const secretKey = match[1];
-    if (!(secretKey in secrets)) {
-      missing.push(`kv://${secretKey}`);
+  const lines = content.split('\n');
+  for (const line of lines) {
+    if (isCommentOrEmptyLine(line)) continue;
+    let match;
+    kvPattern.lastIndex = 0;
+    while ((match = kvPattern.exec(line)) !== null) {
+      const secretKey = match[1];
+      if (!(secretKey in secrets)) {
+        missing.push(`kv://${secretKey}`);
+      }
     }
   }
   return missing;
@@ -76,7 +91,7 @@ function formatMissingSecretsFileInfo(secretsFilePaths) {
 }
 
 /**
- * Replace kv:// references with actual values, after also interpolating any ${VAR} within secret values
+ * Replace kv:// references with actual values (skips commented and empty lines)
  * @function replaceKvInContent
  * @param {string} content - Text content containing kv:// references
  * @param {Object} secrets - Secrets map
@@ -85,15 +100,20 @@ function formatMissingSecretsFileInfo(secretsFilePaths) {
  */
 function replaceKvInContent(content, secrets, envVars) {
   const kvPattern = /kv:\/\/([a-zA-Z0-9-_]+)/g;
-  return content.replace(kvPattern, (match, secretKey) => {
-    let value = secrets[secretKey];
-    if (typeof value === 'string') {
-      value = value.replace(/\$\{([A-Z_]+)\}/g, (m, envVar) => {
-        return envVars[envVar] || m;
-      });
-    }
-    return value;
+  const lines = content.split('\n');
+  const result = lines.map(line => {
+    if (isCommentOrEmptyLine(line)) return line;
+    return line.replace(kvPattern, (match, secretKey) => {
+      let value = secrets[secretKey];
+      if (typeof value === 'string') {
+        value = value.replace(/\$\{([A-Z_]+)\}/g, (m, envVar) => {
+          return envVars[envVar] || m;
+        });
+      }
+      return value;
+    });
   });
+  return result.join('\n');
 }
 
 /**
@@ -420,7 +440,7 @@ function ensureNonEmptySecrets(secrets) {
 }
 
 /**
- * Validate secrets against the env template, returning missing refs
+ * Validate secrets against the env template (skips commented and empty lines)
  * @function validateSecrets
  * @param {string} envTemplate - Environment template content
  * @param {Object} secrets - Available secrets
@@ -429,11 +449,16 @@ function ensureNonEmptySecrets(secrets) {
 function validateSecrets(envTemplate, secrets) {
   const kvPattern = /kv:\/\/([a-zA-Z0-9-_]+)/g;
   const missing = [];
-  let match;
-  while ((match = kvPattern.exec(envTemplate)) !== null) {
-    const secretKey = match[1];
-    if (!(secretKey in secrets)) {
-      missing.push(`kv://${secretKey}`);
+  const lines = envTemplate.split('\n');
+  for (const line of lines) {
+    if (isCommentOrEmptyLine(line)) continue;
+    let match;
+    kvPattern.lastIndex = 0;
+    while ((match = kvPattern.exec(line)) !== null) {
+      const secretKey = match[1];
+      if (!(secretKey in secrets)) {
+        missing.push(`kv://${secretKey}`);
+      }
     }
   }
   return {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aifabrix/builder",
-  "version": "2.36.2",
+  "version": "2.37.5",
   "description": "AI Fabrix Local Fabric & Deployment SDK",
   "main": "lib/index.js",
   "bin": {

package/scripts/install-local.js

@@ -114,10 +114,19 @@ function installLocal() {
   console.log('Linking @aifabrix/builder globally...\n');
 
   try {
+    const projectRoot = path.join(__dirname, '..');
     if (pm === 'pnpm') {
-      execSync('pnpm link --global', { stdio: 'inherit' });
+      // Update pnpm global.
+      execSync('pnpm link --global', { stdio: 'inherit', cwd: projectRoot });
+      // Also run npm link so npm's global bin points here; often PATH has
+      // npm's global bin before pnpm's, so "aifabrix" would otherwise stay old.
+      try {
+        execSync('npm link', { stdio: 'inherit', cwd: projectRoot });
+      } catch {
+        // npm may not be available or may fail; pnpm link already ran
+      }
     } else {
-      execSync('npm link', { stdio: 'inherit' });
+      execSync('npm link', { stdio: 'inherit', cwd: projectRoot });
     }
 
     // Get new version after linking

package/templates/applications/README.md.hbs

@@ -47,8 +47,8 @@ docker logs aifabrix-{{appName}} -f
 
 **Stop:**
 ```bash
-aifabrix down {{appName}}
-# aifabrix down {{appName}} --volumes   # also remove data volume
+aifabrix down-infra {{appName}}
+# aifabrix down-infra {{appName}} --volumes   # also remove data volume
 ```
 
 ### 4. Deploy to Azure
@@ -87,7 +87,7 @@ aifabrix app rotate-secret {{appName}}
 # Development
 aifabrix build {{appName}}                        # Build app
 aifabrix run {{appName}}                          # Run locally
-aifabrix down {{appName}} [--volumes]             # Stop app (optionally remove volume)
+aifabrix down-infra {{appName}} [--volumes]             # Stop app (optionally remove volume)
 aifabrix dockerfile {{appName}} --force           # Generate Dockerfile
 aifabrix resolve {{appName}}                      # Generate .env file
 

package/templates/applications/dataplane/variables.yaml

@@ -43,8 +43,6 @@ authentication:
   type: azure
   enableSSO: true
   requiredRoles: ["aifabrix-user"]
-  endpoints:
-    local: "https://dataplane.aifabrix.ai/auth/callback"
 
 # Build Configuration
 build:

package/templates/applications/miso-controller/variables.yaml

@@ -38,8 +38,6 @@ authentication:
   enableSSO: true
   requiredRoles:
     - aifabrix-user
-  endpoints:
-    local: http://localhost:3000/auth/callback
 
 # Build Configuration
 build:

package/templates/external-system/deploy.js.hbs

@@ -0,0 +1,69 @@
+#!/usr/bin/env node
+/* eslint-disable no-console */
+/**
+ * Deploy {{systemKey}} external system and datasources using aifabrix CLI.
+ * Run: node deploy.js
+ * Flow: check auth → login if needed → deploy → run integration tests.
+ */
+
+const { execSync } = require('child_process');
+const path = require('path');
+
+const scriptDir = __dirname;
+const appKey = '{{systemKey}}';
+const env = process.env.ENVIRONMENT || 'dev';
+// Controller URL: from config (aifabrix auth config) or set CONTROLLER env before running
+
+/**
+ * Run a shell command with optional options.
+ * @param {string} cmd - Command to run
+ * @param {Object} [options={}] - Options (cwd, stdio, ignoreExit)
+ * @returns {boolean} True if command succeeded
+ */
+function run(cmd, options = {}) {
+  const opts = { cwd: scriptDir, stdio: 'inherit', ...options };
+  try {
+    execSync(cmd, opts);
+    return true;
+  } catch (err) {
+    if (options.ignoreExit) return false;
+    process.exit(err.status ?? 1);
+  }
+}
+
+/**
+ * Check if aifabrix auth is logged in.
+ * @returns {boolean} True if logged in
+ */
+function isLoggedIn() {
+  try {
+    execSync('aifabrix auth status', { cwd: scriptDir, stdio: 'pipe' });
+    return true;
+  } catch {
+    return false;
+  }
+}
+
+console.log('🔍 Checking authentication...');
+if (!isLoggedIn()) {
+  console.log('⚠️  Not logged in. Run login (e.g. aifabrix login --controller <url> --method device --environment ' + env + ').');
+  run('aifabrix login --environment ' + env);
+}
+
+console.log('🔍 Validating configuration...');
+{{#each allJsonFiles}}
+run('aifabrix validate "' + path.join(scriptDir, '{{this}}') + '"');
+{{/each}}
+console.log('✅ Validation passed');
+
+console.log('🚀 Deploying ' + appKey + '...');
+run('aifabrix deploy ' + appKey);
+console.log('✅ Deployment complete');
+
+if (process.env.RUN_TESTS !== 'false') {
+  console.log('🧪 Running integration tests...');
+  run('aifabrix test-integration ' + appKey);
+  console.log('✅ Tests passed');
+}
+
+console.log('✅ Done.');

package/templates/infra/environment-dev.json

@@ -0,0 +1,10 @@
+{
+    "environmentConfig": {
+      "key": "dev",
+      "environment": "dev",
+      "preset": "s",
+      "serviceName": "aifabrix",
+      "location": "swedencentral"
+    },
+    "dryRun": false
+  }