@sap-ux/cf-deploy-config-writer 0.3.62 → 0.3.64

package/dist/mta-config/mta.d.ts

@@ -57,6 +57,14 @@ export declare class MtaConfig {
      * @param {string} resourceName - resource name
      */
     private updateServiceName;
+    /**
+     * Gets the effective service instance name for a resource.
+     * If service-name exists, returns it. Otherwise, returns the resource name.
+     *
+     * @param {string} resourceName - The resource identifier (e.g., HTML5RepoHost, ManagedXSUAA)
+     * @returns {string | undefined} The service instance name to use in destinations
+     */
+    private getServiceInstanceName;
     private addAppFrontResource;
     private addHtml5Host;
     /**

package/dist/mta-config/mta.js

@@ -198,6 +198,24 @@ class MtaConfig {
             this.dirty = true;
         }
     }
+    /**
+     * Gets the effective service instance name for a resource.
+     * If service-name exists, returns it. Otherwise, returns the resource name.
+     *
+     * @param {string} resourceName - The resource identifier (e.g., HTML5RepoHost, ManagedXSUAA)
+     * @returns {string | undefined} The service instance name to use in destinations
+     */
+    getServiceInstanceName(resourceName) {
+        const resource = this.resources.get(resourceName);
+        // Prefer explicit service-name if it exists
+        const explicitServiceName = resource?.parameters?.['service-name'];
+        if (explicitServiceName) {
+            return explicitServiceName;
+        }
+        // Fallback: Use the resource name (CF will auto-generate using MTA ID + resource name)
+        // This matches what Cloud Foundry actually creates when service-name is missing
+        return resource?.name;
+    }
     async addAppFrontResource() {
         const resource = {
             name: `${this.prefix?.slice(0, 94)}-app-front`,
@@ -949,18 +967,19 @@ class MtaConfig {
         if (!this.resources.has(constants_1.HTML5RepoHost)) {
             await this.addHtml5Host();
         }
-        // Assume these need to be updated for safety!
-        await this.updateServiceName('html5', constants_1.HTML5RepoHost);
-        await this.updateServiceName('xsuaa', constants_1.ManagedXSUAA);
         // We only want to append a new one, if missing from the existing mta config
         if (!this.modules.has('com.sap.application.content:destination')) {
             this.log?.debug((0, i18n_1.t)('debug.addingRouter', { routerType: types_1.RouterModuleType.Managed }));
             const destinationName = this.resources.get('destination')?.name;
             const appHostName = this.resources.get(constants_1.HTML5RepoHost)?.name;
-            const appHostServiceName = this.resources.get(constants_1.HTML5RepoHost)?.parameters?.['service-name'];
             const managedXSUAAName = this.resources.get(constants_1.ManagedXSUAA)?.name;
-            const managedXSUAAServiceName = this.resources.get(constants_1.ManagedXSUAA)?.parameters?.['service-name'];
-            if (destinationName && appHostName && managedXSUAAName && managedXSUAAServiceName) {
+            if (destinationName && appHostName && managedXSUAAName) {
+                // Align the service-name, not always present
+                await this.updateServiceName('html5', constants_1.HTML5RepoHost);
+                await this.updateServiceName('xsuaa', constants_1.ManagedXSUAA);
+                // Retrieve the service-name
+                const appHostServiceName = this.getServiceInstanceName(constants_1.HTML5RepoHost);
+                const managedXSUAAServiceName = this.getServiceInstanceName(constants_1.ManagedXSUAA);
                 const router = {
                     name: `${this.prefix?.slice(0, 100)}-destination-content`,
                     type: 'com.sap.application.content',

package/dist/utils.js

@@ -268,7 +268,7 @@ async function runCommand(cwd, cmd, args, errorMsg) {
         await commandRunner.run(cmd, args, { cwd });
     }
     catch (e) {
-        throw new Error(`${errorMsg} ${e.message}`);
+        throw new Error(`${errorMsg} ${e.message ?? e}`);
     }
 }
 /**

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": "0.3.62",
+  "version": "0.3.64",
   "repository": {
     "type": "git",
     "url": "https://github.com/SAP/open-ux-tools.git",
@@ -29,7 +29,7 @@
     "mem-fs": "2.1.0",
     "mem-fs-editor": "9.4.0",
     "hasbin": "1.2.3",
-    "@sap-ux/project-access": "1.35.1",
+    "@sap-ux/project-access": "1.35.2",
     "@sap-ux/yaml": "0.17.4",
     "@sap-ux/btp-utils": "1.1.8",
     "@sap-ux/logger": "0.8.1",