@sap-ux/adp-tooling 0.16.9 → 0.16.11

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

@@ -74,7 +74,10 @@ async function getHtml5RepoCredentials(spaceGuid, logger) {
             names: [HTML5_APPS_REPO_RUNTIME]
         }, logger);
         if (!serviceKeys?.credentials?.length) {
-            await (0, api_1.createService)(spaceGuid, 'app-runtime', HTML5_APPS_REPO_RUNTIME, ['html5-apps-repo-rt'], undefined, undefined, undefined, logger);
+            const serviceName = await (0, api_1.getServiceNameByTags)(spaceGuid, ['html5-apps-repo-rt']);
+            await (0, api_1.createServiceInstance)('app-runtime', HTML5_APPS_REPO_RUNTIME, serviceName, {
+                logger
+            });
             serviceKeys = await (0, api_1.getServiceInstanceKeys)({ names: [HTML5_APPS_REPO_RUNTIME] }, logger);
             if (!serviceKeys?.credentials?.length) {
                 logger.debug((0, i18n_1.t)('error.noUaaCredentialsFoundForHtml5Repo'));

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

@@ -8,7 +8,6 @@ interface AdjustMtaYamlParams {
     appRouterType: AppRouterType;
     businessSolutionName: string;
     businessService: string;
-    spaceGuid: string;
 }
 /**
  * Checks if the selected path is a MTA project.
@@ -47,6 +46,6 @@ export declare function getAppParamsFromUI5Yaml(projectPath: string): AppParamsE
  * @param {ToolsLogger} logger - The logger.
  * @returns {Promise<void>} The promise.
  */
-export declare function adjustMtaYaml({ projectPath, moduleName, appRouterType, businessSolutionName, businessService, spaceGuid }: AdjustMtaYamlParams, memFs: Editor, templatePathOverwrite?: string, logger?: ToolsLogger): Promise<void>;
+export declare function adjustMtaYaml({ projectPath, moduleName, appRouterType, businessSolutionName, businessService }: AdjustMtaYamlParams, memFs: Editor, templatePathOverwrite?: string, logger?: ToolsLogger): Promise<void>;
 export {};
 //# sourceMappingURL=yaml.d.ts.map

package/dist/cf/project/yaml.js

@@ -400,7 +400,7 @@ function adjustMtaYamlFlpModule(yamlContent, projectName, businessService) {
  * @param {ToolsLogger} logger - The logger.
  * @returns {Promise<void>} The promise.
  */
-async function adjustMtaYaml({ projectPath, moduleName, appRouterType, businessSolutionName, businessService, spaceGuid }, memFs, templatePathOverwrite, logger) {
+async function adjustMtaYaml({ projectPath, moduleName, appRouterType, businessSolutionName, businessService }, memFs, templatePathOverwrite, logger) {
     const timestamp = Date.now().toString();
     const mtaYamlPath = path.join(projectPath, 'mta.yaml');
     const loadedYamlContent = (0, yaml_loader_1.getYamlContent)(mtaYamlPath);
@@ -429,7 +429,7 @@ async function adjustMtaYaml({ projectPath, moduleName, appRouterType, businessS
     adjustMtaYamlOwnModule(yamlContent, moduleName);
     // should go last since it sorts the modules (workaround, should be removed after fixed in deployment module)
     adjustMtaYamlFlpModule(yamlContent, projectName, businessService);
-    await (0, api_1.createServices)(projectPath, yamlContent, initialServices, timestamp, spaceGuid, templatePathOverwrite, logger);
+    await (0, api_1.createServices)(yamlContent, initialServices, timestamp, templatePathOverwrite, logger);
     const updatedYamlContent = js_yaml_1.default.dump(yamlContent);
     memFs.write(mtaYamlPath, updatedYamlContent);
     logger?.debug(`Adjusted MTA YAML for project ${projectPath}`);

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

@@ -1,5 +1,10 @@
 import type { ToolsLogger } from '@sap-ux/logger';
 import type { CfConfig, CFApp, RequestArguments, ServiceKeys, GetServiceInstanceParams, MtaYaml } from '../../types';
+interface CreateServiceOptions {
+    xsSecurityProjectName?: string;
+    templatePathOverwrite?: string;
+    logger?: ToolsLogger;
+}
 /**
  * Get the business service keys.
  *
@@ -26,36 +31,34 @@ export declare function getFDCRequestArguments(cfConfig: CfConfig): RequestArgum
  */
 export declare function getFDCApps(appHostIds: string[], cfConfig: CfConfig, logger: ToolsLogger): Promise<CFApp[]>;
 /**
- * Creates a service.
+ * Creates a service instance.
  *
- * @param {string} spaceGuid - The space GUID.
- * @param {string} plan - The plan.
+ * @param {string} plan - The service plan.
  * @param {string} serviceInstanceName - The service instance name.
- * @param {string[]} tags - The tags.
- * @param {string} [serviceName] - The service name.
- * @param {object} [security] - Security configuration.
- * @param {string | null} security.filePath - The security file path.
- * @param {string} [security.xsappname] - The XS app name.
- * @param {string} [templatePathOverwrite] - The template path overwrite.
- * @param {ToolsLogger} [logger] - The logger.
+ * @param {string} serviceName - The service name.
+ * @param {CreateServiceOptions} [options] - Additional options.
+ * @returns {Promise<void>} The promise.
+ */
+export declare function createServiceInstance(plan: string, serviceInstanceName: string, serviceName: string, options?: CreateServiceOptions): Promise<void>;
+/**
+ * Gets the service name by tags.
+ *
+ * @param {string} spaceGuid - The space GUID.
+ * @param {string[]} tags - The service tags for discovery.
+ * @returns {Promise<string>} The service name.
  */
-export declare function createService(spaceGuid: string, plan: string, serviceInstanceName: string, tags: string[], serviceName: string | undefined, security?: {
-    filePath: string | null;
-    xsappname?: string;
-}, templatePathOverwrite?: string, logger?: ToolsLogger): Promise<void>;
+export declare function getServiceNameByTags(spaceGuid: string, tags: string[]): Promise<string>;
 /**
  * Creates the services.
  *
- * @param {string} projectPath - The project path.
  * @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(projectPath: string, yamlContent: MtaYaml, initialServices: string[], timestamp: string, spaceGuid: string, templatePathOverwrite?: string, logger?: ToolsLogger): Promise<void>;
+export declare function createServices(yamlContent: MtaYaml, initialServices: string[], timestamp: string, templatePathOverwrite?: string, logger?: ToolsLogger): Promise<void>;
 /**
  * Gets the service instance keys.
  *
@@ -64,4 +67,5 @@ export declare function createServices(projectPath: string, yamlContent: MtaYaml
  * @returns {Promise<ServiceKeys | null>} The service instance keys.
  */
 export declare function getServiceInstanceKeys(serviceInstanceQuery: GetServiceInstanceParams, logger: ToolsLogger): Promise<ServiceKeys | null>;
+export {};
 //# sourceMappingURL=api.d.ts.map

package/dist/cf/services/api.js

@@ -39,7 +39,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getBusinessServiceKeys = getBusinessServiceKeys;
 exports.getFDCRequestArguments = getFDCRequestArguments;
 exports.getFDCApps = getFDCApps;
-exports.createService = createService;
+exports.createServiceInstance = createServiceInstance;
+exports.getServiceNameByTags = getServiceNameByTags;
 exports.createServices = createServices;
 exports.getServiceInstanceKeys = getServiceInstanceKeys;
 const fs = __importStar(require("node:fs"));
@@ -141,30 +142,20 @@ async function getFDCApps(appHostIds, cfConfig, logger) {
     }
 }
 /**
- * Creates a service.
+ * Creates a service instance.
  *
- * @param {string} spaceGuid - The space GUID.
- * @param {string} plan - The plan.
+ * @param {string} plan - The service plan.
  * @param {string} serviceInstanceName - The service instance name.
- * @param {string[]} tags - The tags.
- * @param {string} [serviceName] - The service name.
- * @param {object} [security] - Security configuration.
- * @param {string | null} security.filePath - The security file path.
- * @param {string} [security.xsappname] - The XS app name.
- * @param {string} [templatePathOverwrite] - The template path overwrite.
- * @param {ToolsLogger} [logger] - The logger.
+ * @param {string} serviceName - The service name.
+ * @param {CreateServiceOptions} [options] - Additional options.
+ * @returns {Promise<void>} The promise.
  */
-async function createService(spaceGuid, plan, serviceInstanceName, tags, serviceName, security, templatePathOverwrite, logger) {
+async function createServiceInstance(plan, serviceInstanceName, serviceName, options) {
+    const { xsSecurityProjectName, templatePathOverwrite, logger } = options ?? {};
     try {
-        const { filePath, xsappname } = security ?? {};
-        if (!serviceName) {
-            const json = await (0, cli_1.requestCfApi)(`/v3/service_offerings?per_page=1000&space_guids=${spaceGuid}`);
-            const serviceOffering = json?.resources?.find((resource) => resource.tags && tags.every((tag) => resource.tags?.includes(tag)));
-            serviceName = serviceOffering?.name;
-        }
         logger?.log(`Creating service instance '${serviceInstanceName}' of service '${serviceName}' with '${plan}' plan`);
-        const commandParameters = ['create-service', serviceName ?? '', plan, serviceInstanceName];
-        if (filePath) {
+        const commandParameters = ['create-service', serviceName, plan, serviceInstanceName];
+        if (xsSecurityProjectName) {
             let xsSecurity = null;
             try {
                 const baseTmplPath = path.join(__dirname, '../../../templates');
@@ -172,7 +163,7 @@ async function createService(spaceGuid, plan, serviceInstanceName, tags, service
                 const filePath = path.resolve(templatePath, 'cf/xs-security.json');
                 const xsContent = fs.readFileSync(filePath, 'utf-8');
                 xsSecurity = JSON.parse(xsContent);
-                xsSecurity.xsappname = xsappname;
+                xsSecurity.xsappname = xsSecurityProjectName;
             }
             catch (err) {
                 logger?.error(`Failed to parse xs-security.json file: ${err}`);
@@ -188,29 +179,45 @@ async function createService(spaceGuid, plan, serviceInstanceName, tags, service
         throw new Error((0, i18n_1.t)('error.failedToCreateServiceInstance', { serviceInstanceName, error: e.message }));
     }
 }
+/**
+ * Gets the service name by tags.
+ *
+ * @param {string} spaceGuid - The space GUID.
+ * @param {string[]} tags - The service tags for discovery.
+ * @returns {Promise<string>} The service name.
+ */
+async function getServiceNameByTags(spaceGuid, tags) {
+    const json = await (0, cli_1.requestCfApi)(`/v3/service_offerings?per_page=1000&space_guids=${spaceGuid}`);
+    const serviceOffering = json?.resources?.find((resource) => resource.tags && tags.every((tag) => resource.tags?.includes(tag)));
+    return serviceOffering?.name ?? '';
+}
 /**
  * Creates the services.
  *
- * @param {string} projectPath - The project path.
  * @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(projectPath, yamlContent, initialServices, timestamp, spaceGuid, templatePathOverwrite, logger) {
+async function createServices(yamlContent, initialServices, timestamp, templatePathOverwrite, logger) {
     const excludeServices = new Set([...initialServices, 'portal', 'html5-apps-repo']);
-    const xsSecurityPath = path.join(projectPath, 'xs-security.json');
     const xsSecurityProjectName = (0, project_1.getProjectNameForXsSecurity)(yamlContent, timestamp);
     for (const resource of yamlContent.resources ?? []) {
         if (!excludeServices.has(resource?.parameters?.service ?? '')) {
             if (resource?.parameters?.service === 'xsuaa') {
-                await createService(spaceGuid, resource.parameters['service-plan'] ?? '', resource.parameters['service-name'] ?? '', [], resource.parameters.service, { filePath: xsSecurityPath, xsappname: xsSecurityProjectName }, templatePathOverwrite, logger);
+                await createServiceInstance(resource.parameters['service-plan'] ?? '', resource.parameters['service-name'] ?? '', resource.parameters.service, {
+                    xsSecurityProjectName,
+                    templatePathOverwrite,
+                    logger
+                });
             }
             else {
-                await createService(spaceGuid, resource.parameters['service-plan'] ?? '', resource.parameters['service-name'] ?? '', [], resource.parameters.service, { filePath: null, xsappname: xsSecurityProjectName }, templatePathOverwrite, logger);
+                await createServiceInstance(resource.parameters['service-plan'] ?? '', resource.parameters['service-name'] ?? '', resource.parameters.service ?? '', {
+                    templatePathOverwrite,
+                    logger
+                });
             }
         }
     }

package/dist/writer/cf.js

@@ -28,8 +28,7 @@ async function generateCf(basePath, config, logger, fs) {
         moduleName: app.id,
         appRouterType: cf.approuter,
         businessSolutionName: cf.businessSolutionName ?? '',
-        businessService: cf.businessService,
-        spaceGuid: cf.space.GUID
+        businessService: cf.businessService
     }, fs, config.options?.templatePathOverwrite, logger);
     if (fullConfig.app.i18nModels) {
         (0, i18n_1.writeI18nModels)(basePath, fullConfig.app.i18nModels, fs);

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.16.9",
+  "version": "0.16.11",
   "license": "Apache-2.0",
   "author": "@SAP/ux-tools-team",
   "main": "dist/index.js",
@@ -39,12 +39,12 @@
     "@sap-ux/axios-extension": "1.23.0",
     "@sap-ux/btp-utils": "1.1.4",
     "@sap-ux/i18n": "0.3.4",
-    "@sap-ux/inquirer-common": "0.8.4",
+    "@sap-ux/inquirer-common": "0.8.5",
     "@sap-ux/logger": "0.7.0",
     "@sap-ux/nodejs-utils": "0.2.7",
-    "@sap-ux/odata-service-writer": "0.27.26",
-    "@sap-ux/project-access": "1.32.5",
-    "@sap-ux/project-input-validator": "0.6.27",
+    "@sap-ux/odata-service-writer": "0.27.27",
+    "@sap-ux/project-access": "1.32.6",
+    "@sap-ux/project-input-validator": "0.6.28",
     "@sap-ux/store": "1.2.1",
     "@sap-ux/system-access": "0.6.21",
     "@sap-ux/ui5-config": "0.29.8",