@sap-ux/adp-tooling 0.18.90 → 0.18.92

package/dist/cf/app/html5-repo.js

@@ -68,7 +68,7 @@ async function downloadZip(token, appHostId, uri) {
  */
 async function getHtml5RepoCredentials(spaceGuid, logger) {
     try {
-        let serviceInfo = await (0, api_1.getServiceInstanceKeys)({
+        let serviceInfo = await (0, api_1.getOrCreateServiceInstanceKeys)({
             spaceGuids: [spaceGuid],
             planNames: ['app-runtime'],
             names: [HTML5_APPS_REPO_RUNTIME]
@@ -78,7 +78,7 @@ async function getHtml5RepoCredentials(spaceGuid, logger) {
             await (0, api_1.createServiceInstance)('app-runtime', HTML5_APPS_REPO_RUNTIME, serviceName, {
                 logger
             });
-            serviceInfo = await (0, api_1.getServiceInstanceKeys)({ names: [HTML5_APPS_REPO_RUNTIME] }, logger);
+            serviceInfo = await (0, api_1.getOrCreateServiceInstanceKeys)({ names: [HTML5_APPS_REPO_RUNTIME] }, logger);
             if (!serviceInfo?.serviceKeys?.length) {
                 logger.debug((0, i18n_1.t)('error.noUaaCredentialsFoundForHtml5Repo'));
                 throw new Error((0, i18n_1.t)('error.cannotFindHtml5RepoRuntime'));

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

@@ -10,6 +10,7 @@ interface AdjustMtaYamlParams {
     businessSolutionName: string;
     businessService: string;
     serviceKeys?: ServiceKeys[];
+    spaceGuid: string;
 }
 /**
  * Checks if the selected path is a MTA project.
@@ -49,7 +50,7 @@ export declare function getAppParamsFromUI5Yaml(projectPath: string): AppParamsE
  * @param {ToolsLogger} logger - The logger.
  * @returns {Promise<void>} The promise.
  */
-export declare function adjustMtaYaml({ projectPath, adpProjectName, appRouterType, businessSolutionName, businessService, serviceKeys }: AdjustMtaYamlParams, memFs: Editor, timestamp: string, templatePathOverwrite?: string, logger?: ToolsLogger): Promise<MtaYaml>;
+export declare function adjustMtaYaml({ projectPath, adpProjectName, appRouterType, businessSolutionName, businessService, serviceKeys, spaceGuid }: AdjustMtaYamlParams, memFs: Editor, timestamp: string, templatePathOverwrite?: string, logger?: ToolsLogger): Promise<MtaYaml>;
 /**
  * Add fiori-tools-servestatic configuration to ui5.yaml and removes previously added configuration.
  *

package/dist/cf/project/yaml.js

@@ -418,7 +418,7 @@ function adjustMtaYamlFlpModule(yamlContent, projectName, businessService) {
  * @param {ToolsLogger} logger - The logger.
  * @returns {Promise<void>} The promise.
  */
-async function adjustMtaYaml({ projectPath, adpProjectName, appRouterType, businessSolutionName, businessService, serviceKeys }, memFs, timestamp, templatePathOverwrite, logger) {
+async function adjustMtaYaml({ projectPath, adpProjectName, appRouterType, businessSolutionName, businessService, serviceKeys, spaceGuid }, memFs, timestamp, templatePathOverwrite, logger) {
     const mtaYamlPath = path.join(projectPath, 'mta.yaml');
     const loadedYamlContent = (0, yaml_loader_1.getYamlContent)(mtaYamlPath);
     const defaultYaml = {
@@ -446,7 +446,7 @@ async function adjustMtaYaml({ projectPath, adpProjectName, appRouterType, busin
     adjustMtaYamlOwnModule(yamlContent, adpProjectName);
     // should go last since it sorts the modules (workaround, should be removed after fixed in deployment module)
     adjustMtaYamlFlpModule(yamlContent, mtaProjectName, businessService);
-    await (0, api_1.createServices)(yamlContent, initialServices, timestamp, templatePathOverwrite, logger);
+    await (0, api_1.createServices)(yamlContent, initialServices, timestamp, spaceGuid, templatePathOverwrite, logger);
     const updatedYamlContent = js_yaml_1.default.dump(yamlContent, {
         lineWidth: -1 // Disable line wrapping to keep URLs on single lines
     });

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

@@ -64,11 +64,12 @@ export declare function getServiceNameByTags(spaceGuid: string, tags: string[]):
  * @param {MtaYaml} yamlContent - The YAML content.
  * @param {string[]} initialServices - The initial services.
  * @param {string} timestamp - The timestamp.
+ * @param {string} spaceGuid - The space GUID.
  * @param {string} [templatePathOverwrite] - The template path overwrite.
  * @param {ToolsLogger} logger - The logger.
  * @returns {Promise<void>} The promise.
  */
-export declare function createServices(yamlContent: MtaYaml, initialServices: string[], timestamp: string, templatePathOverwrite?: string, logger?: ToolsLogger): Promise<void>;
+export declare function createServices(yamlContent: MtaYaml, initialServices: string[], timestamp: string, spaceGuid: string, templatePathOverwrite?: string, logger?: ToolsLogger): Promise<void>;
 /**
  * Gets the service instance keys.
  *
@@ -76,7 +77,7 @@ export declare function createServices(yamlContent: MtaYaml, initialServices: st
  * @param {ToolsLogger} logger - The logger.
  * @returns {Promise<ServiceInfo | null>} The service instance keys.
  */
-export declare function getServiceInstanceKeys(serviceInstanceQuery: GetServiceInstanceParams, logger?: ToolsLogger): Promise<ServiceInfo | null>;
+export declare function getOrCreateServiceInstanceKeys(serviceInstanceQuery: GetServiceInstanceParams, logger?: ToolsLogger): Promise<ServiceInfo | null>;
 /**
  * Gets the service instance keys.
  *

package/dist/cf/services/api.js

@@ -43,7 +43,7 @@ exports.getCfUi5AppInfo = getCfUi5AppInfo;
 exports.createServiceInstance = createServiceInstance;
 exports.getServiceNameByTags = getServiceNameByTags;
 exports.createServices = createServices;
-exports.getServiceInstanceKeys = getServiceInstanceKeys;
+exports.getOrCreateServiceInstanceKeys = getOrCreateServiceInstanceKeys;
 exports.getOrCreateServiceKeys = getOrCreateServiceKeys;
 const fs = __importStar(require("node:fs"));
 const axios_1 = __importDefault(require("axios"));
@@ -67,7 +67,7 @@ const PARAM_MAP = new Map([
  * @returns {Promise<ServiceInfo | null>} The service info.
  */
 async function getBusinessServiceInfo(businessService, config, logger) {
-    const serviceKeys = await getServiceInstanceKeys({
+    const serviceKeys = await getOrCreateServiceInstanceKeys({
         spaceGuids: [config.space.GUID],
         names: [businessService]
     }, logger);
@@ -190,7 +190,7 @@ async function createServiceInstance(plan, serviceInstanceName, serviceName, opt
     const { xsSecurityProjectName, templatePathOverwrite, logger } = options ?? {};
     try {
         logger?.log(`Creating service instance '${serviceInstanceName}' of service '${serviceName}' with '${plan}' plan`);
-        const commandParameters = ['create-service', serviceName, plan, serviceInstanceName];
+        const commandParameters = ['create-service', serviceName, plan, serviceInstanceName, '--wait'];
         if (xsSecurityProjectName) {
             let xsSecurity = null;
             try {
@@ -207,7 +207,11 @@ async function createServiceInstance(plan, serviceInstanceName, serviceName, opt
             }
             commandParameters.push('-c', JSON.stringify(xsSecurity));
         }
-        await cf_tools_1.Cli.execute(commandParameters);
+        const result = await cf_tools_1.Cli.execute(commandParameters);
+        if (result && result.exitCode !== 0) {
+            logger?.error(`Service creation failed: ${result.stderr || 'Unknown error'}`);
+            throw new Error(`Service creation failed with code ${result.exitCode}: ${result.stderr || ''}`);
+        }
         logger?.log(`Service instance '${serviceInstanceName}' created successfully`);
     }
     catch (e) {
@@ -233,11 +237,12 @@ async function getServiceNameByTags(spaceGuid, tags) {
  * @param {MtaYaml} yamlContent - The YAML content.
  * @param {string[]} initialServices - The initial services.
  * @param {string} timestamp - The timestamp.
+ * @param {string} spaceGuid - The space GUID.
  * @param {string} [templatePathOverwrite] - The template path overwrite.
  * @param {ToolsLogger} logger - The logger.
  * @returns {Promise<void>} The promise.
  */
-async function createServices(yamlContent, initialServices, timestamp, templatePathOverwrite, logger) {
+async function createServices(yamlContent, initialServices, timestamp, spaceGuid, templatePathOverwrite, logger) {
     const excludeServices = new Set([...initialServices, 'portal', 'html5-apps-repo']);
     const xsSecurityProjectName = (0, project_1.getProjectNameForXsSecurity)(yamlContent, timestamp);
     for (const resource of yamlContent.resources ?? []) {
@@ -255,6 +260,10 @@ async function createServices(yamlContent, initialServices, timestamp, templateP
                     logger
                 });
             }
+            await getOrCreateServiceInstanceKeys({
+                spaceGuids: [spaceGuid],
+                names: [resource.parameters?.['service-name'] ?? '']
+            }, logger);
         }
     }
 }
@@ -265,7 +274,7 @@ async function createServices(yamlContent, initialServices, timestamp, templateP
  * @param {ToolsLogger} logger - The logger.
  * @returns {Promise<ServiceInfo | null>} The service instance keys.
  */
-async function getServiceInstanceKeys(serviceInstanceQuery, logger) {
+async function getOrCreateServiceInstanceKeys(serviceInstanceQuery, logger) {
     try {
         const serviceInstances = await getServiceInstance(serviceInstanceQuery);
         if (serviceInstances?.length > 0) {

package/dist/cf/services/cli.js

@@ -55,7 +55,7 @@ async function getServiceKeys(serviceInstanceGuid) {
  */
 async function createServiceKey(serviceInstanceName, serviceKeyName) {
     try {
-        const cliResult = await cf_tools_1.Cli.execute(['create-service-key', serviceInstanceName, serviceKeyName], ENV);
+        const cliResult = await cf_tools_1.Cli.execute(['create-service-key', serviceInstanceName, serviceKeyName, '--wait'], ENV);
         if (cliResult.exitCode !== 0) {
             throw new Error(cliResult.stderr);
         }

package/dist/types.d.ts

@@ -982,6 +982,10 @@ export interface CfAdpWriterConfig {
          * Business service instance keys.
          */
         serviceInfo?: ServiceInfo | null;
+        /**
+         * GUID of the BTP space.
+         */
+        spaceGuid: string;
     };
     project: {
         name: string;
@@ -1021,6 +1025,7 @@ export interface CreateCfConfigParams {
     packageJson: Package;
     toolsId: string;
     serviceInfo?: ServiceInfo | null;
+    spaceGuid: string;
 }
 export declare const AppRouterType: {
     readonly MANAGED: "Managed HTML5 Application Runtime";

package/dist/writer/cf.js

@@ -40,7 +40,8 @@ async function generateCf(basePath, config, logger, fs) {
         appRouterType: cf.approuter,
         businessSolutionName: cf.businessSolutionName ?? '',
         businessService: cf.businessService,
-        serviceKeys: cf.serviceInfo?.serviceKeys
+        serviceKeys: cf.serviceInfo?.serviceKeys,
+        spaceGuid: cf.space.GUID
     }, fs, timestamp, config.options?.templatePathOverwrite, logger);
     if (fullConfig.app.i18nModels) {
         (0, i18n_1.writeI18nModels)(basePath, fullConfig.app.i18nModels, fs);
@@ -111,8 +112,9 @@ async function generateCfConfig(basePath, yamlPath, cfConfig, logger, fs) {
     if (!serviceInstanceName) {
         throw new Error('No serviceInstanceName found in app-variant-bundler-build configuration');
     }
-    const serviceInfo = await (0, cf_1.getServiceInstanceKeys)({
-        names: [serviceInstanceName]
+    const serviceInfo = await (0, cf_1.getOrCreateServiceInstanceKeys)({
+        names: [serviceInstanceName],
+        spaceGuids: [bundlerTask?.configuration?.space ?? '']
     }, logger);
     if (!serviceInfo || serviceInfo.serviceKeys.length === 0) {
         throw new Error(`No service keys found for service instance: ${serviceInstanceName}`);

package/dist/writer/project-utils.d.ts

@@ -1,5 +1,5 @@
 import type { Editor } from 'mem-fs-editor';
-import { type AdpWriterConfig, type TypesConfig, type CfAdpWriterConfig, type DescriptorVariant } from '../types';
+import type { AdpWriterConfig, TypesConfig, CfAdpWriterConfig, DescriptorVariant } from '../types';
 import type { Package } from '@sap-ux/project-access';
 /**
  * Retrieves the package name and version from the package.json file located two levels up the directory tree.

package/dist/writer/writer-config.js

@@ -125,7 +125,8 @@ function getCfConfig(params) {
             serviceInstanceGuid: params.serviceInstanceGuid,
             backendUrls: params.backendUrls,
             oauthPaths: params.oauthPaths,
-            serviceInfo: params.serviceInfo
+            serviceInfo: params.serviceInfo,
+            spaceGuid: params.spaceGuid
         },
         project: {
             name: params.attributeAnswers.projectName,

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.90",
+  "version": "0.18.92",
   "license": "Apache-2.0",
   "author": "@SAP/ux-tools-team",
   "main": "dist/index.js",
@@ -28,7 +28,7 @@
     "adm-zip": "0.5.10",
     "axios": "1.13.5",
     "ejs": "3.1.10",
-    "i18next": "25.8.12",
+    "i18next": "25.8.18",
     "inquirer": "8.2.7",
     "js-yaml": "4.1.1",
     "mem-fs": "2.1.0",
@@ -36,19 +36,19 @@
     "prompts": "2.4.2",
     "sanitize-filename": "1.6.3",
     "uuid": "11.1.0",
-    "@sap-ux/axios-extension": "1.25.22",
-    "@sap-ux/btp-utils": "1.1.9",
+    "@sap-ux/axios-extension": "1.25.23",
+    "@sap-ux/btp-utils": "1.1.10",
     "@sap-ux/i18n": "0.3.9",
-    "@sap-ux/inquirer-common": "0.11.23",
+    "@sap-ux/inquirer-common": "0.11.24",
     "@sap-ux/logger": "0.8.2",
-    "@sap-ux/nodejs-utils": "0.2.16",
-    "@sap-ux/odata-service-writer": "0.30.0",
+    "@sap-ux/nodejs-utils": "0.2.17",
+    "@sap-ux/odata-service-writer": "0.30.1",
     "@sap-ux/project-access": "1.35.13",
-    "@sap-ux/project-input-validator": "0.6.67",
-    "@sap-ux/store": "1.5.9",
-    "@sap-ux/system-access": "0.6.64",
+    "@sap-ux/project-input-validator": "0.6.68",
+    "@sap-ux/store": "1.5.10",
+    "@sap-ux/system-access": "0.6.65",
     "@sap-ux/ui5-config": "0.29.21",
-    "@sap-ux/ui5-info": "0.13.14"
+    "@sap-ux/ui5-info": "0.13.15"
   },
   "devDependencies": {
     "@types/adm-zip": "0.5.5",
@@ -65,10 +65,10 @@
     "cross-env": "^10.0.0",
     "dotenv": "17.3.1",
     "express": "4.22.1",
-    "nock": "13.4.0",
+    "nock": "14.0.11",
     "rimraf": "6.1.3",
     "supertest": "7.2.2",
-    "@sap-ux/store": "1.5.9"
+    "@sap-ux/store": "1.5.10"
   },
   "engines": {
     "node": ">=20.x"