@sap-ux/adp-tooling 0.18.113 → 0.18.114

package/dist/cf/core/auth.js

@@ -26,8 +26,8 @@ async function isLoggedInCf(cfConfig, logger) {
         return false;
     }
     try {
-        const orgs = await (0, cf_tools_1.cfGetAvailableOrgs)();
-        logger?.log(`Available organizations: ${JSON.stringify(orgs)}`);
+        const token = await (0, cf_tools_1.cfGetAuthToken)();
+        logger?.log(`Retrieved CF auth token: ${token}`);
         return true;
     }
     catch (e) {

package/dist/cf/deploy.d.ts

@@ -0,0 +1,48 @@
+import type { CfConfig, CfDeploymentInfo, DeployCfOptions } from '../types';
+import type { ToolsLogger } from '@sap-ux/logger';
+/**
+ * Gathers MTA project and CF environment information needed for deployment.
+ *
+ * @param {string} projectPath - Path to the MTA project root (containing mta.yaml).
+ * @param {CfConfig} cfConfig - The CF configuration.
+ * @returns {CfDeploymentInfo} Deployment information for the MTA project.
+ */
+export declare function getCfDeploymentInfo(projectPath: string, cfConfig: CfConfig): CfDeploymentInfo;
+/**
+ * Formats the deployment summary for console output.
+ *
+ * @param {CfDeploymentInfo} info - The deployment information to format.
+ * @returns {string} Formatted summary string ready for display.
+ */
+export declare function formatDeploymentSummary(info: CfDeploymentInfo): string;
+/**
+ * Finds the MTA project root by recursively searching the given path and its ancestors for mta.yaml.
+ *
+ * @param {string} projectPath - The starting project path.
+ * @returns {Promise<string | undefined>} The MTA root path, or undefined if not found.
+ */
+export declare function findMtaRoot(projectPath: string): Promise<string | undefined>;
+/**
+ * Builds the MTA archive by running the project's build-mta npm script.
+ *
+ * @param {string} projectPath - Path to the ADP project root.
+ * @param {ToolsLogger} logger - Logger instance.
+ */
+export declare function buildMtaArchive(projectPath: string, logger: ToolsLogger): Promise<void>;
+/**
+ * Deploys the MTA archive to Cloud Foundry by running the project's deploy npm script.
+ *
+ * @param {string} projectPath - Path to the ADP project root.
+ * @param {ToolsLogger} logger - Logger instance.
+ */
+export declare function deployMtaArchive(projectPath: string, logger: ToolsLogger): Promise<void>;
+/**
+ * Deploys a CF ADP project by building the MTA archive and deploying it to Cloud Foundry.
+ *
+ * @param {string} projectPath - Path to the ADP project root.
+ * @param {ToolsLogger} logger - Logger instance.
+ * @param {DeployCfOptions} [options] - Deployment options (confirmation callback, output callback).
+ * @returns {Promise<void>} Resolves when deployment completes.
+ */
+export declare function deployCf(projectPath: string, logger: ToolsLogger, options?: DeployCfOptions): Promise<void>;
+//# sourceMappingURL=deploy.d.ts.map

package/dist/cf/deploy.js

@@ -0,0 +1,153 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getCfDeploymentInfo = getCfDeploymentInfo;
+exports.formatDeploymentSummary = formatDeploymentSummary;
+exports.findMtaRoot = findMtaRoot;
+exports.buildMtaArchive = buildMtaArchive;
+exports.deployMtaArchive = deployMtaArchive;
+exports.deployCf = deployCf;
+const node_path_1 = __importDefault(require("node:path"));
+const nodejs_utils_1 = require("@sap-ux/nodejs-utils");
+const project_access_1 = require("@sap-ux/project-access");
+const cli_1 = require("./services/cli");
+const auth_1 = require("./core/auth");
+const config_1 = require("./core/config");
+const yaml_loader_1 = require("./project/yaml-loader");
+const i18n_1 = require("../i18n");
+const SEPARATOR = '------------------------------------';
+/**
+ * Gathers MTA project and CF environment information needed for deployment.
+ *
+ * @param {string} projectPath - Path to the MTA project root (containing mta.yaml).
+ * @param {CfConfig} cfConfig - The CF configuration.
+ * @returns {CfDeploymentInfo} Deployment information for the MTA project.
+ */
+function getCfDeploymentInfo(projectPath, cfConfig) {
+    const mtaYamlPath = node_path_1.default.join(projectPath, 'mta.yaml');
+    const mtaYaml = (0, yaml_loader_1.getYamlContent)(mtaYamlPath);
+    return {
+        mtaProjectName: mtaYaml.ID ?? '',
+        mtaVersion: mtaYaml.version ?? '',
+        space: cfConfig.space?.Name ?? '',
+        org: cfConfig.org?.Name ?? '',
+        apiUrl: cfConfig.url ?? '',
+        mtaRoot: projectPath,
+        modules: mtaYaml.modules?.map((m) => ({
+            name: m.name,
+            type: m.type,
+            path: m.path
+        })) ?? []
+    };
+}
+/**
+ * Formats the deployment summary for console output.
+ *
+ * @param {CfDeploymentInfo} info - The deployment information to format.
+ * @returns {string} Formatted summary string ready for display.
+ */
+function formatDeploymentSummary(info) {
+    const lines = [];
+    lines.push(`mta-project-name: ${info.mtaProjectName}`, `mta-version: ${info.mtaVersion}`, `space: ${info.space}`, `org: ${info.org}`, `api-url: ${info.apiUrl}`);
+    for (const mod of info.modules) {
+        lines.push(SEPARATOR, `project name: ${mod.name}`, `type: ${mod.type}`);
+        if (mod.path) {
+            lines.push(`path: ${mod.path}`);
+        }
+    }
+    lines.push('', (0, i18n_1.t)('deploy.confirmPrompt'));
+    return lines.join('\n');
+}
+/**
+ * Finds the MTA project root by recursively searching the given path and its ancestors for mta.yaml.
+ *
+ * @param {string} projectPath - The starting project path.
+ * @returns {Promise<string | undefined>} The MTA root path, or undefined if not found.
+ */
+async function findMtaRoot(projectPath) {
+    const result = await (0, project_access_1.getMtaPath)(projectPath);
+    return result ? node_path_1.default.dirname(result.mtaPath) : undefined;
+}
+/**
+ * Validates the CF environment: checks CF CLI is installed, user is logged in, and locates the MTA root.
+ *
+ * @param {string} projectPath - Path to the ADP project root.
+ * @param {ToolsLogger} logger - Logger instance.
+ * @returns {Promise<{ cfConfig: CfConfig; mtaRoot: string }>} The validated CF config and MTA root path.
+ */
+async function validateCfEnvironment(projectPath, logger) {
+    const cfInstalled = await (0, cli_1.isCfInstalled)(logger);
+    if (!cfInstalled) {
+        throw new Error((0, i18n_1.t)('deploy.cfNotInstalled'));
+    }
+    const cfConfig = (0, config_1.loadCfConfig)(logger);
+    const loggedIn = await (0, auth_1.isLoggedInCf)(cfConfig, logger);
+    if (!loggedIn) {
+        throw new Error((0, i18n_1.t)('deploy.notLoggedIn'));
+    }
+    const mtaRoot = await findMtaRoot(projectPath);
+    if (!mtaRoot) {
+        throw new Error((0, i18n_1.t)('deploy.mtaNotFound', { projectPath }));
+    }
+    return { cfConfig, mtaRoot };
+}
+/**
+ * Builds the MTA archive by running the project's build-mta npm script.
+ *
+ * @param {string} projectPath - Path to the ADP project root.
+ * @param {ToolsLogger} logger - Logger instance.
+ */
+async function buildMtaArchive(projectPath, logger) {
+    const commandRunner = new nodejs_utils_1.CommandRunner();
+    try {
+        await commandRunner.run('npm', ['run', 'build-mta'], { cwd: projectPath }, logger);
+    }
+    catch (e) {
+        throw new Error((0, i18n_1.t)('deploy.buildFailed', { error: String(e) }));
+    }
+}
+/**
+ * Deploys the MTA archive to Cloud Foundry by running the project's deploy npm script.
+ *
+ * @param {string} projectPath - Path to the ADP project root.
+ * @param {ToolsLogger} logger - Logger instance.
+ */
+async function deployMtaArchive(projectPath, logger) {
+    const commandRunner = new nodejs_utils_1.CommandRunner();
+    try {
+        await commandRunner.run('npm', ['run', 'deploy'], { cwd: projectPath }, logger);
+    }
+    catch (e) {
+        throw new Error((0, i18n_1.t)('deploy.deployFailed', { error: String(e) }));
+    }
+}
+/**
+ * Deploys a CF ADP project by building the MTA archive and deploying it to Cloud Foundry.
+ *
+ * @param {string} projectPath - Path to the ADP project root.
+ * @param {ToolsLogger} logger - Logger instance.
+ * @param {DeployCfOptions} [options] - Deployment options (confirmation callback, output callback).
+ * @returns {Promise<void>} Resolves when deployment completes.
+ */
+async function deployCf(projectPath, logger, options = {}) {
+    const { cfConfig, mtaRoot } = await validateCfEnvironment(projectPath, logger);
+    const info = getCfDeploymentInfo(mtaRoot, cfConfig);
+    const summary = formatDeploymentSummary(info);
+    const output = options.onOutput ?? ((data) => logger.info(data));
+    output(summary);
+    if (options.confirmDeployment) {
+        const confirmed = await options.confirmDeployment(summary);
+        if (!confirmed) {
+            logger.info((0, i18n_1.t)('deploy.cancelled'));
+            return;
+        }
+    }
+    logger.info((0, i18n_1.t)('deploy.buildStarted'));
+    await buildMtaArchive(projectPath, logger);
+    logger.info((0, i18n_1.t)('deploy.deployStarted'));
+    await deployMtaArchive(projectPath, logger);
+    logger.info((0, i18n_1.t)('deploy.success'));
+}
+//# sourceMappingURL=deploy.js.map

package/dist/cf/index.d.ts

@@ -1,3 +1,4 @@
+export * from './deploy';
 export * from './project';
 export * from './app';
 export * from './core';

package/dist/cf/index.js

@@ -14,6 +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("./deploy"), exports);
 __exportStar(require("./project"), exports);
 __exportStar(require("./app"), exports);
 __exportStar(require("./core"), exports);

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

@@ -126,5 +126,17 @@
             "selectFromWorkspace": "Select annotation file from workspace",
             "createTemplateFile": "Create local annotation file from template"
         }
+    },
+    "deploy": {
+        "cfNotInstalled": "The Cloud Foundary CLI is not installed. Please install it and try again.",
+        "notLoggedIn": "Not logged in to Cloud Foundry. Please log in with 'cf login' and try again.",
+        "mtaNotFound": "No mta.yaml file was found at the {{projectPath}} project path. Ensure this is a valid MTA project.",
+        "confirmPrompt": "This action deploys all listed projects. Confirm (Y/N)?",
+        "cancelled": "Deployment cancelled by user.",
+        "buildStarted": "Starting MTA build...",
+        "buildFailed": "MTA build failed: {{error}}",
+        "deployStarted": "Starting Cloud Foundry deployment...",
+        "deployFailed": "Cloud Foundry deployment failed: {{error}}",
+        "success": "Deployment completed successfully."
     }
 }

package/dist/types.d.ts

@@ -1261,5 +1261,28 @@ export interface CfServiceOffering {
     };
     [key: string]: unknown;
 }
+/**
+ * Information about the MTA project and its modules for CF deployment.
+ */
+export interface CfDeploymentInfo {
+    mtaProjectName: string;
+    mtaVersion: string;
+    space: string;
+    org: string;
+    apiUrl: string;
+    mtaRoot: string;
+    modules: Array<{
+        name: string;
+        type: string;
+        path?: string;
+    }>;
+}
+/**
+ * Options for the CF deployment command.
+ */
+export interface DeployCfOptions {
+    confirmDeployment?: (summary: string) => Promise<boolean>;
+    onOutput?: (data: string) => void;
+}
 export {};
 //# sourceMappingURL=types.d.ts.map

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.113",
+  "version": "0.18.114",
   "license": "Apache-2.0",
   "author": "@SAP/ux-tools-team",
   "main": "dist/index.js",
@@ -41,8 +41,8 @@
     "@sap-ux/i18n": "0.3.10",
     "@sap-ux/inquirer-common": "0.11.34",
     "@sap-ux/logger": "0.8.5",
-    "@sap-ux/nodejs-utils": "0.2.19",
     "@sap-ux/odata-service-writer": "0.31.6",
+    "@sap-ux/nodejs-utils": "0.2.19",
     "@sap-ux/project-access": "1.35.19",
     "@sap-ux/project-input-validator": "0.6.75",
     "@sap-ux/store": "1.5.13",