@aifabrix/builder 2.47.1 → 2.47.2

package/lib/build/docker-build-args.js

@@ -0,0 +1,83 @@
+/**
+ * Docker build-arg resolution from resolved env and shell overlays.
+ *
+ * @fileoverview Build-time args for `aifabrix build` / docker build
+ * @author AI Fabrix Team
+ * @version 1.0.0
+ */
+
+'use strict';
+
+const path = require('path');
+const secretsEnvWrite = require('../core/secrets-env-write');
+const { assertMisoControllerNpmSdkDeps } = require('./miso-controller-npm-sdk-guard');
+
+const MISO_CONTROLLER_UI_BUILD_ARG_KEYS = [
+  'MISO_RELATIVE_PATH',
+  'MISO_WEB_SERVER_URL',
+  'VITE_BASE_PATH',
+  'KEYCLOAK_SERVER_URL',
+  'KEYCLOAK_REALM',
+  'KEYCLOAK_CLIENT_ID'
+];
+
+/**
+ * @param {Object.<string, string>} buildArgs
+ * @param {Object.<string, string>} envMap
+ */
+function applyMisoControllerUiBuildArgs(buildArgs, envMap) {
+  for (const key of MISO_CONTROLLER_UI_BUILD_ARG_KEYS) {
+    const value = envMap[key];
+    if (typeof value === 'string' && value.trim() && !value.includes('://')) {
+      buildArgs[key] = value.trim();
+    }
+  }
+  if (!buildArgs.VITE_BASE_PATH && buildArgs.MISO_RELATIVE_PATH) {
+    buildArgs.VITE_BASE_PATH = buildArgs.MISO_RELATIVE_PATH;
+  }
+  if (!buildArgs.VITE_BASE_PATH && buildArgs.MISO_WEB_SERVER_URL) {
+    try {
+      const pathname = new URL(buildArgs.MISO_WEB_SERVER_URL).pathname.replace(/\/+$/, '');
+      if (pathname && pathname !== '/') {
+        buildArgs.VITE_BASE_PATH = pathname;
+      }
+    } catch {
+      // ignore invalid public URL
+    }
+  }
+}
+
+/**
+ * Resolve Docker build-args from resolved env map and merged BASH_* secrets.
+ *
+ * @param {string} appName
+ * @param {string} [contextPath] Docker build context (repo root for miso-controller)
+ * @returns {Promise<Object.<string, string>>}
+ */
+async function resolveDockerBuildArgsForApp(appName, contextPath) {
+  const envMap = await secretsEnvWrite.resolveAndGetEnvMap(appName, { environment: 'docker' });
+  const { getBashPrefixedProcessEnvOverlay } = require('../utils/bash-secret-env');
+  const bashOverlay = await getBashPrefixedProcessEnvOverlay(null, appName);
+  const buildArgs = {};
+  if (envMap.NPM_TOKEN) buildArgs.NPM_TOKEN = envMap.NPM_TOKEN;
+  if (envMap.PYPI_TOKEN) buildArgs.PYPI_TOKEN = envMap.PYPI_TOKEN;
+  for (const [k, v] of Object.entries(bashOverlay)) {
+    if (v && buildArgs[k] === undefined) buildArgs[k] = v;
+  }
+  const shellNpm = typeof process.env.NPM_TOKEN === 'string' ? process.env.NPM_TOKEN.trim() : '';
+  const shellPypi = typeof process.env.PYPI_TOKEN === 'string' ? process.env.PYPI_TOKEN.trim() : '';
+  if (shellNpm) buildArgs.NPM_TOKEN = shellNpm;
+  if (shellPypi) buildArgs.PYPI_TOKEN = shellPypi;
+  if (appName === 'miso-controller') {
+    applyMisoControllerUiBuildArgs(buildArgs, envMap);
+  }
+  if (appName === 'miso-controller' && contextPath) {
+    assertMisoControllerNpmSdkDeps(path.resolve(contextPath));
+  }
+  return buildArgs;
+}
+
+module.exports = {
+  resolveDockerBuildArgsForApp,
+  applyMisoControllerUiBuildArgs
+};

package/lib/build/index.js

@@ -35,9 +35,8 @@ const dockerBuild = require('../utils/docker-build');
 const buildCopy = require('../utils/build-copy');
 const { resolveBuildDockerTagNames } = require('../utils/build-resolve-image');
 const buildHelpers = require('../utils/build-helpers');
-const secretsEnvWrite = require('../core/secrets-env-write');
 const { ensureRunSecretsForApp } = require('../app/run-env-compose');
-const { assertMisoControllerNpmSdkDeps } = require('./miso-controller-npm-sdk-guard');
+const { resolveDockerBuildArgsForApp } = require('./docker-build-args');
 
 /**
  * Loads application config for an application
@@ -394,33 +393,6 @@ async function handleDockerfileGeneration(appName, params, options, buildHelpers
   }, generateDockerfile);
 }
 
-/**
- * Resolve Docker build-args from resolved env map and merged BASH_* secrets.
- * @param {string} appName
- * @param {string} [contextPath] Docker build context (repo root for miso-controller)
- * @returns {Promise<Object.<string, string>>}
- */
-async function resolveDockerBuildArgsForApp(appName, contextPath) {
-  const envMap = await secretsEnvWrite.resolveAndGetEnvMap(appName, { environment: 'docker' });
-  const { getBashPrefixedProcessEnvOverlay } = require('../utils/bash-secret-env');
-  const bashOverlay = await getBashPrefixedProcessEnvOverlay(null, appName);
-  const buildArgs = {};
-  if (envMap.NPM_TOKEN) buildArgs.NPM_TOKEN = envMap.NPM_TOKEN;
-  if (envMap.PYPI_TOKEN) buildArgs.PYPI_TOKEN = envMap.PYPI_TOKEN;
-  for (const [k, v] of Object.entries(bashOverlay)) {
-    if (v && buildArgs[k] === undefined) buildArgs[k] = v;
-  }
-  // Exported shell tokens win (local dev: export NPM_TOKEN=... before af build / docker build).
-  const shellNpm = typeof process.env.NPM_TOKEN === 'string' ? process.env.NPM_TOKEN.trim() : '';
-  const shellPypi = typeof process.env.PYPI_TOKEN === 'string' ? process.env.PYPI_TOKEN.trim() : '';
-  if (shellNpm) buildArgs.NPM_TOKEN = shellNpm;
-  if (shellPypi) buildArgs.PYPI_TOKEN = shellPypi;
-  if (appName === 'miso-controller' && contextPath) {
-    assertMisoControllerNpmSdkDeps(path.resolve(contextPath));
-  }
-  return buildArgs;
-}
-
 /**
  * Standard Docker build path after CLI header is printed (non-external apps).
  * @param {string} appName

package/package.json

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

package/.npmrc.token

@@ -1 +0,0 @@
-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

package/.temp/jest-protection-convert/run-IFN2nv/.protection/hubspot-companies.json

@@ -1 +0,0 @@
-{"apiVersion":"dataplane.aifabrix.ai/v1","kind":"Protection","metadata":{"key":"hubspot-country-sales","displayName":"HubSpot Country Sales Access"},"spec":{"enabled":true,"datasourceKey":"hubspot-companies","mode":"replaceForSource","rules":[{"key":"sales-country-users","principal":{"type":"group","expression":"Sales {{fk.country.metadata.iso3}} Users"},"grants":[{"dimensionKey":"country","valueExpression":"{{fk.country.metadata.iso2}}"}]}]}}

package/.temp/jest-protection-convert/run-IvmKLO/.protection/hubspot-companies.yaml

@@ -1,17 +0,0 @@
-apiVersion: dataplane.aifabrix.ai/v1
-kind: Protection
-metadata:
-  key: hubspot-country-sales
-  displayName: HubSpot Country Sales Access
-spec:
-  enabled: true
-  datasourceKey: hubspot-companies
-  mode: replaceForSource
-  rules:
-    - key: sales-country-users
-      principal:
-        type: group
-        expression: "Sales {{fk.country.metadata.iso3}} Users"
-      grants:
-        - dimensionKey: country
-          valueExpression: "{{fk.country.metadata.iso2}}"

package/.temp/jest-protection-convert/run-SdvblF/.protection/hubspot-companies.json

@@ -1 +0,0 @@
-{"kind":"Protection"}

package/.temp/jest-protection-convert/run-b51TsW/.protection/hubspot-companies.json

@@ -1 +0,0 @@
-{"apiVersion":"dataplane.aifabrix.ai/v1","kind":"Protection","metadata":{"key":"hubspot-country-sales","displayName":"HubSpot Country Sales Access"},"spec":{"enabled":true,"datasourceKey":"hubspot-companies","mode":"replaceForSource","rules":[{"key":"sales-country-users","principal":{"type":"group","expression":"Sales {{fk.country.metadata.iso3}} Users"},"grants":[{"dimensionKey":"country","valueExpression":"{{fk.country.metadata.iso2}}"}]}]}}

package/.temp/jest-protection-convert/run-fiLmb1/.protection/hubspot-companies.json

@@ -1 +0,0 @@
-{"kind":"Protection"}

package/.temp/jest-protection-convert/run-qYGHMU/.protection/hubspot-companies.yaml

@@ -1,17 +0,0 @@
-apiVersion: dataplane.aifabrix.ai/v1
-kind: Protection
-metadata:
-  key: hubspot-country-sales
-  displayName: HubSpot Country Sales Access
-spec:
-  enabled: true
-  datasourceKey: hubspot-companies
-  mode: replaceForSource
-  rules:
-    - key: sales-country-users
-      principal:
-        type: group
-        expression: "Sales {{fk.country.metadata.iso3}} Users"
-      grants:
-        - dimensionKey: country
-          valueExpression: "{{fk.country.metadata.iso2}}"

package/.temp/jest-protection-fixtures/hubspot-Mq5re8/hubspot-companies.yaml

@@ -1,17 +0,0 @@
-apiVersion: dataplane.aifabrix.ai/v1
-kind: Protection
-metadata:
-  key: hubspot-country-sales
-  displayName: HubSpot Country Sales Access
-spec:
-  enabled: true
-  datasourceKey: hubspot-companies
-  mode: replaceForSource
-  rules:
-    - key: sales-country-users
-      principal:
-        type: group
-        expression: "Sales {{fk.country.metadata.iso3}} Users"
-      grants:
-        - dimensionKey: country
-          valueExpression: "{{fk.country.metadata.iso2}}"

package/.temp/jest-protection-fixtures/hubspot-f3u4YL/hubspot-companies.yaml

@@ -1,17 +0,0 @@
-apiVersion: dataplane.aifabrix.ai/v1
-kind: Protection
-metadata:
-  key: hubspot-country-sales
-  displayName: HubSpot Country Sales Access
-spec:
-  enabled: true
-  datasourceKey: hubspot-companies
-  mode: replaceForSource
-  rules:
-    - key: sales-country-users
-      principal:
-        type: group
-        expression: "Sales {{fk.country.metadata.iso3}} Users"
-      grants:
-        - dimensionKey: country
-          valueExpression: "{{fk.country.metadata.iso2}}"

package/.temp/jest-protection-fixtures/hubspot-iQtd1O/hubspot-companies.yaml

@@ -1,17 +0,0 @@
-apiVersion: dataplane.aifabrix.ai/v1
-kind: Protection
-metadata:
-  key: hubspot-country-sales
-  displayName: HubSpot Country Sales Access
-spec:
-  enabled: true
-  datasourceKey: hubspot-companies
-  mode: replaceForSource
-  rules:
-    - key: sales-country-users
-      principal:
-        type: group
-        expression: "Sales {{fk.country.metadata.iso3}} Users"
-      grants:
-        - dimensionKey: country
-          valueExpression: "{{fk.country.metadata.iso2}}"

package/.temp/jest-protection-fixtures/hubspot-mdmz5M/hubspot-companies.yaml

@@ -1,17 +0,0 @@
-apiVersion: dataplane.aifabrix.ai/v1
-kind: Protection
-metadata:
-  key: hubspot-country-sales
-  displayName: HubSpot Country Sales Access
-spec:
-  enabled: true
-  datasourceKey: hubspot-companies
-  mode: replaceForSource
-  rules:
-    - key: sales-country-users
-      principal:
-        type: group
-        expression: "Sales {{fk.country.metadata.iso3}} Users"
-      grants:
-        - dimensionKey: country
-          valueExpression: "{{fk.country.metadata.iso2}}"

package/.temp/jest-protection-fixtures/hubspot-qbKYxQ/hubspot-companies.yaml

@@ -1,17 +0,0 @@
-apiVersion: dataplane.aifabrix.ai/v1
-kind: Protection
-metadata:
-  key: hubspot-country-sales
-  displayName: HubSpot Country Sales Access
-spec:
-  enabled: true
-  datasourceKey: hubspot-companies
-  mode: replaceForSource
-  rules:
-    - key: sales-country-users
-      principal:
-        type: group
-        expression: "Sales {{fk.country.metadata.iso3}} Users"
-      grants:
-        - dimensionKey: country
-          valueExpression: "{{fk.country.metadata.iso2}}"

package/.temp/jest-protection-fixtures/hubspot-yzlJy6/hubspot-companies.yaml

@@ -1,17 +0,0 @@
-apiVersion: dataplane.aifabrix.ai/v1
-kind: Protection
-metadata:
-  key: hubspot-country-sales
-  displayName: HubSpot Country Sales Access
-spec:
-  enabled: true
-  datasourceKey: hubspot-companies
-  mode: replaceForSource
-  rules:
-    - key: sales-country-users
-      principal:
-        type: group
-        expression: "Sales {{fk.country.metadata.iso3}} Users"
-      grants:
-        - dimensionKey: country
-          valueExpression: "{{fk.country.metadata.iso2}}"

package/.temp/validation/summary.txt

@@ -1,5 +0,0 @@
-lint:fix exit=0
-lint exit=0
-test exit=0
-miso typecheck exit=0
-miso build exit=0