@sap-ux/adp-tooling 0.16.2 → 0.16.4

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

@@ -74,7 +74,7 @@ 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, logger);
+            await (0, api_1.createService)(spaceGuid, 'app-runtime', HTML5_APPS_REPO_RUNTIME, ['html5-apps-repo-rt'], undefined, undefined, undefined, 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

@@ -43,9 +43,10 @@ export declare function getAppParamsFromUI5Yaml(projectPath: string): AppParamsE
  *
  * @param {AdjustMtaYamlParams} params - The parameters.
  * @param {Editor} memFs - The mem-fs editor instance.
+ * @param {string} [templatePathOverwrite] - The template path overwrite.
  * @param {ToolsLogger} logger - The logger.
  * @returns {Promise<void>} The promise.
  */
-export declare function adjustMtaYaml({ projectPath, moduleName, appRouterType, businessSolutionName, businessService, spaceGuid }: AdjustMtaYamlParams, memFs: Editor, logger?: ToolsLogger): Promise<void>;
+export declare function adjustMtaYaml({ projectPath, moduleName, appRouterType, businessSolutionName, businessService, spaceGuid }: AdjustMtaYamlParams, memFs: Editor, templatePathOverwrite?: string, logger?: ToolsLogger): Promise<void>;
 export {};
 //# sourceMappingURL=yaml.d.ts.map

package/dist/cf/project/yaml.js

@@ -396,10 +396,11 @@ function adjustMtaYamlFlpModule(yamlContent, projectName, businessService) {
  *
  * @param {AdjustMtaYamlParams} params - The parameters.
  * @param {Editor} memFs - The mem-fs editor instance.
+ * @param {string} [templatePathOverwrite] - The template path overwrite.
  * @param {ToolsLogger} logger - The logger.
  * @returns {Promise<void>} The promise.
  */
-async function adjustMtaYaml({ projectPath, moduleName, appRouterType, businessSolutionName, businessService, spaceGuid }, memFs, logger) {
+async function adjustMtaYaml({ projectPath, moduleName, appRouterType, businessSolutionName, businessService, spaceGuid }, memFs, templatePathOverwrite, logger) {
     const timestamp = Date.now().toString();
     const mtaYamlPath = path.join(projectPath, 'mta.yaml');
     const loadedYamlContent = (0, yaml_loader_1.getYamlContent)(mtaYamlPath);
@@ -428,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, logger);
+    await (0, api_1.createServices)(projectPath, yamlContent, initialServices, timestamp, spaceGuid, 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

@@ -36,12 +36,13 @@ export declare function getFDCApps(appHostIds: string[], cfConfig: CfConfig, log
  * @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.
  */
 export declare function createService(spaceGuid: string, plan: string, serviceInstanceName: string, tags: string[], serviceName: string | undefined, security?: {
     filePath: string | null;
     xsappname?: string;
-}, logger?: ToolsLogger): Promise<void>;
+}, templatePathOverwrite?: string, logger?: ToolsLogger): Promise<void>;
 /**
  * Creates the services.
  *
@@ -50,10 +51,11 @@ export declare function createService(spaceGuid: string, plan: string, serviceIn
  * @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, logger?: ToolsLogger): Promise<void>;
+export declare function createServices(projectPath: string, yamlContent: MtaYaml, initialServices: string[], timestamp: string, spaceGuid: string, templatePathOverwrite?: string, logger?: ToolsLogger): Promise<void>;
 /**
  * Gets the service instance keys.
  *

package/dist/cf/services/api.js

@@ -151,9 +151,10 @@ async function getFDCApps(appHostIds, cfConfig, logger) {
  * @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.
  */
-async function createService(spaceGuid, plan, serviceInstanceName, tags, serviceName, security, logger) {
+async function createService(spaceGuid, plan, serviceInstanceName, tags, serviceName, security, templatePathOverwrite, logger) {
     try {
         const { filePath, xsappname } = security ?? {};
         if (!serviceName) {
@@ -166,7 +167,9 @@ async function createService(spaceGuid, plan, serviceInstanceName, tags, service
         if (filePath) {
             let xsSecurity = null;
             try {
-                const filePath = path.resolve(__dirname, '../../../templates/cf/xs-security.json');
+                const baseTmplPath = path.join(__dirname, '../../../templates');
+                const templatePath = templatePathOverwrite ?? baseTmplPath;
+                const filePath = path.resolve(templatePath, 'cf/xs-security.json');
                 const xsContent = fs.readFileSync(filePath, 'utf-8');
                 xsSecurity = JSON.parse(xsContent);
                 xsSecurity.xsappname = xsappname;
@@ -193,20 +196,21 @@ async function createService(spaceGuid, plan, serviceInstanceName, tags, service
  * @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, logger) {
+async function createServices(projectPath, yamlContent, initialServices, timestamp, spaceGuid, 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 }, logger);
+                await createService(spaceGuid, resource.parameters['service-plan'] ?? '', resource.parameters['service-name'] ?? '', [], resource.parameters.service, { filePath: xsSecurityPath, xsappname: xsSecurityProjectName }, templatePathOverwrite, logger);
             }
             else {
-                await createService(spaceGuid, resource.parameters['service-plan'] ?? '', resource.parameters['service-name'] ?? '', [], resource.parameters.service, { filePath: null, xsappname: xsSecurityProjectName }, logger);
+                await createService(spaceGuid, resource.parameters['service-plan'] ?? '', resource.parameters['service-name'] ?? '', [], resource.parameters.service, { filePath: null, xsappname: xsSecurityProjectName }, templatePathOverwrite, logger);
             }
         }
     }

package/dist/writer/cf.js

@@ -30,7 +30,7 @@ async function generateCf(basePath, config, logger, fs) {
         businessSolutionName: cf.businessSolutionName ?? '',
         businessService: cf.businessService,
         spaceGuid: cf.space.GUID
-    }, fs, logger);
+    }, 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.2",
+  "version": "0.16.4",
   "license": "Apache-2.0",
   "author": "@SAP/ux-tools-team",
   "main": "dist/index.js",
@@ -39,7 +39,7 @@
     "@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.7.51",
+    "@sap-ux/inquirer-common": "0.8.0",
     "@sap-ux/logger": "0.7.0",
     "@sap-ux/nodejs-utils": "0.2.7",
     "@sap-ux/odata-service-writer": "0.27.25",