@sap-ux/cf-deploy-config-writer 1.0.8 → 1.0.10

package/dist/cf-writer/app-config.js

@@ -195,31 +195,33 @@ export async function generateMTAFile(cfConfig, fs) {
  */
 async function appendAppRouter(cfConfig, fs) {
     const mtaInstance = await getMtaConfig(cfConfig.rootPath);
-    if (mtaInstance) {
-        await mtaInstance.addRoutingModules({
-            isManagedApp: cfConfig.addManagedAppRouter,
-            isAppFrontApp: cfConfig.addAppFrontendRouter,
-            addMissingModules: !cfConfig.addAppFrontendRouter
-        });
-        const appModule = cfConfig.appId;
-        const appRelativePath = toPosixPath(relative(cfConfig.rootPath, cfConfig.appPath));
-        await mtaInstance.addApp(appModule, appRelativePath ?? '.');
-        if ((cfConfig.addMtaDestination && cfConfig.isCap) || cfConfig.destinationName === DefaultMTADestination) {
-            // If the destination instance identifier is passed, create a destination instance
-            cfConfig.destinationName =
-                cfConfig.destinationName === DefaultMTADestination ? SRV_API : cfConfig.destinationName;
-            await mtaInstance.addDestinationToAppRouter(cfConfig.destinationName);
-            // This is required where a managed or standalone router hasn't been added yet to mta.yaml
-            if (!mtaInstance.hasManagedXsuaaResource()) {
-                cfConfig.destinationAuthentication = Authentication.NO_AUTHENTICATION;
-            }
-        }
-        cleanupStandaloneRoutes(cfConfig, mtaInstance, fs);
-        await saveMta(cfConfig, mtaInstance);
-        // Modify existing config, required in later steps
-        cfConfig.cloudServiceName = mtaInstance.cloudServiceName;
-        cfConfig.addAppFrontendRouter = mtaInstance.hasAppFrontendRouter();
+    if (!mtaInstance) {
+        return;
+    }
+    await mtaInstance.addRoutingModules({
+        isManagedApp: cfConfig.addManagedAppRouter,
+        isAppFrontApp: cfConfig.addAppFrontendRouter,
+        addMissingModules: !cfConfig.addAppFrontendRouter
+    });
+    const appRelativePath = toPosixPath(relative(cfConfig.rootPath, cfConfig.appPath));
+    await mtaInstance.addApp(cfConfig.appId, appRelativePath ?? '.');
+    // Resolve destination name before any mutations — DefaultMTADestination is a sentinel for "use SRV_API"
+    const shouldAddDestination = (!!cfConfig.addMtaDestination && !!cfConfig.isCap) || cfConfig.destinationName === DefaultMTADestination;
+    const destinationNameForMta = cfConfig.destinationName === DefaultMTADestination ? SRV_API : cfConfig.destinationName;
+    const resolvedDestinationName = shouldAddDestination ? destinationNameForMta : cfConfig.destinationName;
+    if (shouldAddDestination) {
+        await mtaInstance.addDestinationToAppRouter(resolvedDestinationName);
+    }
+    cleanupStandaloneRoutes(cfConfig, mtaInstance, fs);
+    // Apply all config mutations together once MTA state is finalised
+    cfConfig.destinationName = resolvedDestinationName;
+    // Required where a managed or standalone router hasn't been added yet to mta.yaml
+    if (shouldAddDestination && !mtaInstance.hasManagedXsuaaResource()) {
+        cfConfig.destinationAuthentication = Authentication.NO_AUTHENTICATION;
     }
+    cfConfig.cloudServiceName = mtaInstance.cloudServiceName;
+    cfConfig.addAppFrontendRouter = mtaInstance.hasAppFrontendRouter();
+    await saveMta(cfConfig, mtaInstance);
 }
 /**
  * Cleans up standalone routes in a Cloud Foundry application configuration.

package/dist/mta-config/index.js

@@ -133,7 +133,7 @@ async function createCAPMTAAppFrontend(config, fs) {
         mtaVersion: config.mtaVersion ?? MTAVersion
     });
     // Add missing configurations
-    addXSSecurityConfig(config, fs, false);
+    addXSSecurityConfig(config, fs);
     LoggerHelper.logger?.debug(t('debug.mtaCreated', { mtaPath: config.mtaPath }));
 }
 /**

package/dist/mta-config/mta.js

@@ -161,7 +161,7 @@ export class MtaConfig {
                 path: './xs-security.json',
                 'service-name': `${this.prefix?.slice(0, MAX_MTA_PREFIX_LENGTH)}-xsuaa-service`,
                 config: {
-                    xsappname: `${this.prefix?.slice(0, MAX_MTA_PREFIX_LENGTH)}` + '-${space-guid}',
+                    xsappname: `${this.prefix?.slice(0, MAX_MTA_PREFIX_LENGTH)}-\${org}-\${space}`,
                     'tenant-mode': 'dedicated'
                 }
             }
@@ -338,14 +338,10 @@ export class MtaConfig {
                 service: 'xsuaa',
                 'service-name': `${this.prefix?.slice(0, MAX_MTA_PREFIX_LENGTH)}-xsuaa-service`,
                 'service-plan': 'application',
-                ...(this.modules.has('nodejs') && this.modules.has('com.sap.application.content:appfront')
-                    ? {
-                        config: {
-                            xsappname: `${this.prefix?.slice(0, MAX_MTA_PREFIX_LENGTH)}-\${org}-\${space}`,
-                            'tenant-mode': 'dedicated'
-                        }
-                    }
-                    : {})
+                config: {
+                    xsappname: `${this.prefix?.slice(0, MAX_MTA_PREFIX_LENGTH)}-\${org}-\${space}`,
+                    'tenant-mode': 'dedicated'
+                }
             }
         };
         await this.mta?.addResource(resource);

package/dist/utils.d.ts

@@ -76,11 +76,9 @@ export declare function validateVersion(mtaVersion?: string): boolean;
  *
  * @param config MTA base configuration
  * @param config.mtaPath Path to the MTA project
- * @param config.mtaId MTA ID used for security configuration
  * @param fs Reference to a mem-fs editor
- * @param addTenant If true, append tenant configuration to the xs-security.json file (default: true)
  */
-export declare function addXSSecurityConfig({ mtaPath, mtaId }: MTABaseConfig, fs: Editor, addTenant?: boolean): void;
+export declare function addXSSecurityConfig({ mtaPath }: MTABaseConfig, fs: Editor): void;
 /**
  * Appends .gitignore to project folder.
  *
@@ -109,9 +107,8 @@ export declare function addCommonPackageDependencies(targetPath: string, fs: Edi
  *
  * @param config Writer configuration
  * @param fs Reference to a mem-fs editor
- * @param addTenant If true, append tenant configuration to the xs-security.json file (default: true)
  */
-export declare function generateSupportingConfig(config: MTABaseConfig, fs: Editor, addTenant?: boolean): Promise<void>;
+export declare function generateSupportingConfig(config: MTABaseConfig, fs: Editor): Promise<void>;
 /**
  * Update the writer configuration with defaults.
  *

package/dist/utils.js

@@ -3,7 +3,7 @@ import { coerce, satisfies } from 'semver';
 import { CommandRunner } from '@sap-ux/nodejs-utils';
 import { isAppStudio, listDestinations, isFullUrlDestination } from '@sap-ux/btp-utils';
 import { addPackageDevDependency, FileName, updatePackageScript } from '@sap-ux/project-access';
-import { MTAVersion, UI5Package, UI5PackageVersion, UI5TaskZipperPackage, UI5TaskZipperPackageVersion, rootDeployMTAScript, undeployMTAScript, Rimraf, RimrafVersion, MbtPackageVersion, MbtPackage, MTABuildScript, CDSDKPackage, CDSPackage, MAX_MTA_PREFIX_LENGTH } from './constants.js';
+import { MTAVersion, UI5Package, UI5PackageVersion, UI5TaskZipperPackage, UI5TaskZipperPackageVersion, rootDeployMTAScript, undeployMTAScript, Rimraf, RimrafVersion, MbtPackageVersion, MbtPackage, MTABuildScript, CDSDKPackage, CDSPackage } from './constants.js';
 import { fileURLToPath } from 'node:url';
 /**
  * Read manifest file for processing.
@@ -104,15 +104,10 @@ export function validateVersion(mtaVersion) {
  *
  * @param config MTA base configuration
  * @param config.mtaPath Path to the MTA project
- * @param config.mtaId MTA ID used for security configuration
  * @param fs Reference to a mem-fs editor
- * @param addTenant If true, append tenant configuration to the xs-security.json file (default: true)
  */
-export function addXSSecurityConfig({ mtaPath, mtaId }, fs, addTenant = true) {
-    fs.copyTpl(getTemplatePath(`common/${FileName.XSSecurityJson}`), join(mtaPath, FileName.XSSecurityJson), {
-        id: mtaId.slice(0, MAX_MTA_PREFIX_LENGTH),
-        addTenant
-    });
+export function addXSSecurityConfig({ mtaPath }, fs) {
+    fs.copyTpl(getTemplatePath(`common/${FileName.XSSecurityJson}`), join(mtaPath, FileName.XSSecurityJson), {});
 }
 /**
  * Appends .gitignore to project folder.
@@ -151,14 +146,13 @@ export async function addCommonPackageDependencies(targetPath, fs) {
  *
  * @param config Writer configuration
  * @param fs Reference to a mem-fs editor
- * @param addTenant If true, append tenant configuration to the xs-security.json file (default: true)
  */
-export async function generateSupportingConfig(config, fs, addTenant = true) {
+export async function generateSupportingConfig(config, fs) {
     if (config.mtaId && !fs.exists(join(config.mtaPath, 'package.json'))) {
         addRootPackage(config, fs);
     }
     if (config.mtaId && !fs.exists(join(config.mtaPath, FileName.XSSecurityJson))) {
-        addXSSecurityConfig(config, fs, addTenant);
+        addXSSecurityConfig(config, fs);
     }
     // Be a good citizen and add a .gitignore if missing from the existing project root
     if (!fs.exists(join(config.mtaPath, '.gitignore'))) {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@sap-ux/cf-deploy-config-writer",
   "description": "Add or amend Cloud Foundry and ABAP deployment configuration for SAP projects",
-  "version": "1.0.8",
+  "version": "1.0.10",
   "repository": {
     "type": "git",
     "url": "https://github.com/SAP/open-ux-tools.git",

package/templates/common/xs-security.json

@@ -1,7 +1,6 @@
-{<% if (addTenant) { %>
-  "xsappname": "<%- id %>",
-  "tenant-mode": "dedicated",<% } %>
+{
   "description": "Security profile of called application",
   "scopes": [],
+  "attributes": [],
   "role-templates": []
 }