@sap-ux/adp-tooling 0.18.109 → 0.18.110

package/dist/base/helper.d.ts

@@ -1,5 +1,6 @@
 import type { Editor } from 'mem-fs-editor';
 import type { ReaderCollection } from '@ui5/fs';
+import type { ToolsLogger } from '@sap-ux/logger';
 import type { UI5Config } from '@sap-ux/ui5-config';
 import { type Inbound, AdaptationProjectType } from '@sap-ux/axios-extension';
 import { type ManifestNamespace, type Manifest } from '@sap-ux/project-access';
@@ -60,6 +61,14 @@ export declare function extractAdpConfig(ui5Conf: UI5Config): AdpPreviewConfig |
  * @returns {UI5YamlCustomTaskConfiguration} The CF build task.
  */
 export declare function extractCfBuildTask(ui5Conf: UI5Config): UI5YamlCustomTaskConfiguration;
+/**
+ * Read space GUID from ui5.yaml customTasks app-variant-bundler-build.space.
+ *
+ * @param {string} rootPath - Project root (where ui5.yaml lives).
+ * @param {ToolsLogger} logger - Optional logger.
+ * @returns {Promise<string | undefined>} Space GUID or undefined if not found.
+ */
+export declare function getSpaceGuidFromUi5Yaml(rootPath: string, logger?: ToolsLogger): Promise<string | undefined>;
 /**
  * Read the manifest from the build output folder.
  *

package/dist/base/helper.js

@@ -7,6 +7,7 @@ exports.isTypescriptSupported = isTypescriptSupported;
 exports.readUi5Config = readUi5Config;
 exports.extractAdpConfig = extractAdpConfig;
 exports.extractCfBuildTask = extractCfBuildTask;
+exports.getSpaceGuidFromUi5Yaml = getSpaceGuidFromUi5Yaml;
 exports.readManifestFromBuildPath = readManifestFromBuildPath;
 exports.loadAppVariant = loadAppVariant;
 exports.getAdpConfig = getAdpConfig;
@@ -101,6 +102,24 @@ function extractCfBuildTask(ui5Conf) {
     }
     return buildTask;
 }
+/**
+ * Read space GUID from ui5.yaml customTasks app-variant-bundler-build.space.
+ *
+ * @param {string} rootPath - Project root (where ui5.yaml lives).
+ * @param {ToolsLogger} logger - Optional logger.
+ * @returns {Promise<string | undefined>} Space GUID or undefined if not found.
+ */
+async function getSpaceGuidFromUi5Yaml(rootPath, logger) {
+    try {
+        const ui5Config = await readUi5Config(rootPath, 'ui5.yaml');
+        const buildTask = extractCfBuildTask(ui5Config);
+        return buildTask?.space;
+    }
+    catch {
+        logger?.warn('Could not read space from ui5.yaml (app-variant-bundler-build).');
+        return undefined;
+    }
+}
 /**
  * Read the manifest from the build output folder.
  *

package/dist/cf/project/index.d.ts

@@ -1,4 +1,4 @@
+export * from './mta';
 export * from './yaml';
 export * from './yaml-loader';
-export * from './mta';
 //# sourceMappingURL=index.d.ts.map

package/dist/cf/project/index.js

@@ -14,7 +14,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("./mta"), exports);
 __exportStar(require("./yaml"), exports);
 __exportStar(require("./yaml-loader"), exports);
-__exportStar(require("./mta"), exports);
 //# sourceMappingURL=index.js.map

package/dist/cf/project/mta.d.ts

@@ -1,5 +1,14 @@
 import type { ToolsLogger } from '@sap-ux/logger';
-import type { BusinessServiceResource, AppRouterType } from '../../types';
+import type { BusinessServiceResource, AppRouterType, MtaYaml } from '../../types';
+/**
+ * Builds VCAP_SERVICES by resolving MTA resources to service key credentials.
+ *
+ * @param {MtaYaml['resources']} resources - MTA YAML resources.
+ * @param {string} spaceGuid - The space GUID.
+ * @param {ToolsLogger} logger - Optional logger.
+ * @returns {Promise<Record<string, unknown>>} VCAP_SERVICES keyed by service name.
+ */
+export declare function buildVcapServicesFromResources(resources: MtaYaml['resources'], spaceGuid: string, logger?: ToolsLogger): Promise<Record<string, unknown>>;
 /**
  * Get the approuter type.
  *

package/dist/cf/project/mta.js

@@ -33,6 +33,7 @@ var __importStar = (this && this.__importStar) || (function () {
     };
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.buildVcapServicesFromResources = buildVcapServicesFromResources;
 exports.getApprouterType = getApprouterType;
 exports.getModuleNames = getModuleNames;
 exports.getServicesForFile = getServicesForFile;
@@ -42,9 +43,36 @@ exports.getResources = getResources;
 exports.readMta = readMta;
 const path = __importStar(require("node:path"));
 const i18n_1 = require("../../i18n");
+const api_1 = require("../services/api");
+const cli_1 = require("../services/cli");
 const yaml_1 = require("./yaml");
 const yaml_loader_1 = require("./yaml-loader");
-const cli_1 = require("../services/cli");
+const EXCLUDED_SERVICES_VCAP = new Set(['html5-apps-repo', 'portal']);
+/**
+ * Builds VCAP_SERVICES by resolving MTA resources to service key credentials.
+ *
+ * @param {MtaYaml['resources']} resources - MTA YAML resources.
+ * @param {string} spaceGuid - The space GUID.
+ * @param {ToolsLogger} logger - Optional logger.
+ * @returns {Promise<Record<string, unknown>>} VCAP_SERVICES keyed by service name.
+ */
+async function buildVcapServicesFromResources(resources, spaceGuid, logger) {
+    const vcapServices = {};
+    for (const resource of resources ?? []) {
+        const serviceName = resource.parameters?.service;
+        const serviceInstanceName = resource.parameters?.['service-name'];
+        const servicePlan = resource.parameters?.['service-plan'];
+        if (!serviceName || !serviceInstanceName || EXCLUDED_SERVICES_VCAP.has(serviceName)) {
+            continue;
+        }
+        const data = await (0, api_1.getServiceKeyCredentialsWithTags)(spaceGuid, serviceName, serviceInstanceName, servicePlan ?? '', logger);
+        if (!data?.credentials) {
+            throw new Error(`Credentials and tags for service '${serviceName}' ('${serviceInstanceName}') not found`);
+        }
+        vcapServices[serviceName] = [data];
+    }
+    return vcapServices;
+}
 /**
  * Get the approuter type.
  *

package/dist/cf/services/api.d.ts

@@ -1,6 +1,6 @@
 import type { ToolsLogger } from '@sap-ux/logger';
 import type { ManifestNamespace } from '@sap-ux/project-access';
-import type { CfConfig, CFApp, RequestArguments, ServiceKeys, GetServiceInstanceParams, ServiceInstance, MtaYaml, ServiceInfo, CfUi5AppInfo } from '../../types';
+import type { CfConfig, CFApp, RequestArguments, ServiceKeys, GetServiceInstanceParams, ServiceInstance, MtaYaml, ServiceInfo, CfUi5AppInfo, ServiceKeyCredentialsWithTags } from '../../types';
 interface CreateServiceOptions {
     xsSecurityProjectName?: string;
     templatePathOverwrite?: string;
@@ -98,5 +98,24 @@ export declare function getOrCreateServiceInstanceKeys(serviceInstanceQuery: Get
  * @returns {Promise<ServiceKeys[]>} The service instance keys.
  */
 export declare function getOrCreateServiceKeys(serviceInstance: ServiceInstance, logger?: ToolsLogger): Promise<ServiceKeys[]>;
+/**
+ * Gets service tags for a given service name.
+ *
+ * @param {string} spaceGuid - The space GUID.
+ * @param {string} serviceName - The service name (e.g., 'xsuaa', 'hana').
+ * @returns {Promise<string[]>} The service tags.
+ */
+export declare function getServiceTags(spaceGuid: string, serviceName: string): Promise<string[]>;
+/**
+ * Fetches service tags and credentials for a single app-router resource (xsuaa/destination).
+ *
+ * @param {string} spaceGuid - The space GUID.
+ * @param {string} serviceName - The service name (e.g. 'xsuaa', 'destination').
+ * @param {string} serviceInstanceName - The service instance name.
+ * @param {string} plan - The service plan.
+ * @param {ToolsLogger} logger - Optional logger.
+ * @returns {Promise<ServiceKeyCredentialsWithTags | null>} Service key credentials with tags returned by the CF API.
+ */
+export declare function getServiceKeyCredentialsWithTags(spaceGuid: string, serviceName: string, serviceInstanceName: string, plan: string, logger?: ToolsLogger): Promise<ServiceKeyCredentialsWithTags | null>;
 export {};
 //# sourceMappingURL=api.d.ts.map

package/dist/cf/services/api.js

@@ -46,6 +46,8 @@ exports.getServiceNameByTags = getServiceNameByTags;
 exports.createServices = createServices;
 exports.getOrCreateServiceInstanceKeys = getOrCreateServiceInstanceKeys;
 exports.getOrCreateServiceKeys = getOrCreateServiceKeys;
+exports.getServiceTags = getServiceTags;
+exports.getServiceKeyCredentialsWithTags = getServiceKeyCredentialsWithTags;
 const fs = __importStar(require("node:fs"));
 const axios_1 = __importDefault(require("axios"));
 const path = __importStar(require("node:path"));
@@ -374,4 +376,51 @@ async function getOrCreateServiceKeys(serviceInstance, logger) {
         throw new Error((0, i18n_1.t)('error.failedToGetOrCreateServiceKeys', { serviceInstanceName, error: e.message }));
     }
 }
+/**
+ * Gets service tags for a given service name.
+ *
+ * @param {string} spaceGuid - The space GUID.
+ * @param {string} serviceName - The service name (e.g., 'xsuaa', 'hana').
+ * @returns {Promise<string[]>} The service tags.
+ */
+async function getServiceTags(spaceGuid, serviceName) {
+    const json = await (0, cli_1.requestCfApi)(`/v3/service_offerings?per_page=1000&space_guids=${spaceGuid}&names=${serviceName}`);
+    const serviceOffering = json?.resources?.find((resource) => resource.name === serviceName);
+    return serviceOffering?.tags ?? [];
+}
+/**
+ * Fetches service tags and credentials for a single app-router resource (xsuaa/destination).
+ *
+ * @param {string} spaceGuid - The space GUID.
+ * @param {string} serviceName - The service name (e.g. 'xsuaa', 'destination').
+ * @param {string} serviceInstanceName - The service instance name.
+ * @param {string} plan - The service plan.
+ * @param {ToolsLogger} logger - Optional logger.
+ * @returns {Promise<ServiceKeyCredentialsWithTags | null>} Service key credentials with tags returned by the CF API.
+ */
+async function getServiceKeyCredentialsWithTags(spaceGuid, serviceName, serviceInstanceName, plan, logger) {
+    try {
+        const tags = await getServiceTags(spaceGuid, serviceName);
+        const serviceInstances = await getServiceInstance({
+            names: [serviceInstanceName],
+            spaceGuids: [spaceGuid]
+        });
+        if (serviceInstances.length === 0) {
+            logger?.error(`Service instance '${serviceInstanceName}' not found, skipping`);
+            return null;
+        }
+        const credentials = await getOrCreateServiceKeys(serviceInstances[0], logger);
+        return {
+            label: serviceName,
+            name: serviceInstanceName,
+            tags,
+            plan,
+            credentials: credentials?.[0].credentials
+        };
+    }
+    catch (e) {
+        logger?.error(`Failed to get credentials and tags for service '${serviceName}' (instance: '${serviceInstanceName}'): ${e.message}`);
+        return null;
+    }
+}
 //# sourceMappingURL=api.js.map

package/dist/cf/services/cli.d.ts

@@ -23,6 +23,13 @@ export declare function getServiceKeys(serviceInstanceGuid: string, sortBy?: Ser
  * @param {string} serviceKeyName - The service key name.
  */
 export declare function createServiceKey(serviceInstanceName: string, serviceKeyName: string): Promise<void>;
+/**
+ * Updates a Cloud Foundry service instance with the given parameters.
+ *
+ * @param {string} serviceInstanceName - The service instance name.
+ * @param {object} parameters - The configuration parameters to update.
+ */
+export declare function updateServiceInstance(serviceInstanceName: string, parameters: object): Promise<void>;
 /**
  * Request CF API.
  *

package/dist/cf/services/cli.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.isCfInstalled = isCfInstalled;
 exports.getServiceKeys = getServiceKeys;
 exports.createServiceKey = createServiceKey;
+exports.updateServiceInstance = updateServiceInstance;
 exports.requestCfApi = requestCfApi;
 const cf_tools_1 = require("@sap/cf-tools");
 const i18n_1 = require("../../i18n");
@@ -96,6 +97,23 @@ async function createServiceKey(serviceInstanceName, serviceKeyName) {
         throw new Error((0, i18n_1.t)('error.createServiceKeyFailed', { serviceInstanceName, error: e.message }));
     }
 }
+/**
+ * Updates a Cloud Foundry service instance with the given parameters.
+ *
+ * @param {string} serviceInstanceName - The service instance name.
+ * @param {object} parameters - The configuration parameters to update.
+ */
+async function updateServiceInstance(serviceInstanceName, parameters) {
+    try {
+        const cliResult = await cf_tools_1.Cli.execute(['update-service', serviceInstanceName, '-c', JSON.stringify(parameters), '--wait'], ENV);
+        if (cliResult.exitCode !== 0) {
+            throw new Error(cliResult.stderr);
+        }
+    }
+    catch (e) {
+        throw new Error((0, i18n_1.t)('error.failedToUpdateServiceInstance', { serviceInstanceName, error: e.message }));
+    }
+}
 /**
  * Request CF API.
  *

package/dist/translations/adp-tooling.i18n.json

@@ -103,6 +103,7 @@
         "emptyCFAPIResponse": "Empty response from CF API. Please verify your CF login status with 'cf target' and re-authenticate if needed with 'cf login'.",
         "xsSecurityJsonCouldNotBeParsed": "The xs-security.json file could not be parsed. Ensure the xs-security.json file exists and try again.",
         "failedToCreateServiceInstance": "Failed to create the service instance: '{{serviceInstanceName}}'. Error: {{error}}",
+        "failedToUpdateServiceInstance": "Failed to update the service instance: '{{serviceInstanceName}}'. Error: {{error}}",
         "failedToGetFDCApps": "Retrieving FDC apps failed: {{error}}",
         "failedToGetFDCInbounds": "Retrieving inbounds from the UI5 Flexibility Design and Configuration service failed: {{error}}",
         "failedToConnectToFDCService": "Failed to connect to the FDC service: '{{status}}'",

package/dist/types.d.ts

@@ -824,6 +824,23 @@ export interface ServiceInstance {
     name: string;
     guid: string;
 }
+/**
+ * Service key credentials with tags returned by the CF API.
+ */
+export interface ServiceKeyCredentialsWithTags {
+    label: string;
+    name: string;
+    tags: string[];
+    plan: string;
+    credentials: ServiceKeys['credentials'] | undefined;
+}
+export interface AppRouterEnvOptions {
+    'VCAP_SERVICES'?: Record<string, unknown>;
+    destinations?: {
+        name: string;
+        url: string;
+    }[];
+}
 export interface GetServiceInstanceParams {
     spaceGuids?: string[];
     planNames?: string[];

package/package.json

@@ -9,7 +9,7 @@
   "bugs": {
     "url": "https://github.com/SAP/open-ux-tools/issues?q=is%3Aopen+is%3Aissue+label%3Abug+label%3Aadp-tooling"
   },
-  "version": "0.18.109",
+  "version": "0.18.110",
   "license": "Apache-2.0",
   "author": "@SAP/ux-tools-team",
   "main": "dist/index.js",