@sap-ux/cf-deploy-config-writer 1.1.7 → 1.1.9

package/dist/constants.d.ts

@@ -121,6 +121,7 @@ export declare const MAX_MTA_ID_LENGTH = 128;
 export declare const MAX_MTA_PREFIX_LENGTH = 100;
 export declare const MAX_MTA_PREFIX_SHORT_LENGTH = 94;
 export declare const MAX_MTA_PREFIX_SHORTER_LENGTH = 96;
+export declare const MAX_SERVICE_INSTANCE_NAME_LENGTH = 50;
 export declare const MAX_ABAP_SERVICE_PREFIX_LENGTH = 24;
 export declare const MAX_ABAP_SERVICE_NAME_LENGTH = 20;
 export declare const MTA_FILE_OPERATION_DELAY_MS = 1000;

package/dist/constants.js

@@ -122,6 +122,12 @@ export const MAX_MTA_ID_LENGTH = 128;
 export const MAX_MTA_PREFIX_LENGTH = 100;
 export const MAX_MTA_PREFIX_SHORT_LENGTH = 94;
 export const MAX_MTA_PREFIX_SHORTER_LENGTH = 96;
+// Cloud Foundry limits service instance names to 50 characters. The MTA deploy service silently renames
+// any longer `service-name` to `<mta-id>-<hash>` (also capped at 50) at deploy time, but leaves the
+// `destination-content` ServiceInstanceName reference pointing at the original untruncated name, which
+// then fails content deployment. Keep every generated `service-name` within this limit so the name is
+// used verbatim and references stay consistent.
+export const MAX_SERVICE_INSTANCE_NAME_LENGTH = 50;
 export const MAX_ABAP_SERVICE_PREFIX_LENGTH = 24;
 export const MAX_ABAP_SERVICE_NAME_LENGTH = 20;
 // MTA file operation timing

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

@@ -65,6 +65,16 @@ export declare class MtaConfig {
      * @returns {string | undefined} The service instance name to use in destinations
      */
     private getServiceInstanceName;
+    /**
+     * Builds a Cloud Foundry service instance name from the MTA prefix and a suffix, capped at the
+     * CF 50 character limit. The prefix is truncated (never the suffix) so the resulting `service-name`
+     * is used verbatim by the MTA deploy service instead of being silently renamed to `<mta-id>-<hash>`,
+     * which would otherwise break the matching `destination-content` ServiceInstanceName reference.
+     *
+     * @param {string} suffix - The service suffix including its leading dash (e.g. `-html5-service`)
+     * @returns {string} The service instance name, guaranteed to be at most 50 characters
+     */
+    private buildServiceInstanceName;
     private addAppFrontResource;
     private addHtml5Host;
     /**

package/dist/mta-config/mta.js

@@ -5,7 +5,7 @@ import { Mta } from '@sap/mta-lib';
 import { isGenericODataDestination, isAbapEnvironmentOnBtp } from '@sap-ux/btp-utils';
 import { YamlDocument } from '@sap-ux/yaml';
 import { FileName, getMtaPath, hasDependency } from '@sap-ux/project-access';
-import { CloudFoundry, RouterModule, DefaultMTADestination, SRV_API, ManagedXSUAA, MTABuildParams, MTABuildResult, DestinationServiceConfig, UI5ResourceDestination, UI5Destination, MTAAPIDestination, UI5StandaloneModuleDestination, ServiceAPIRequires, HTMLAppBuildParams, HTML5RepoHost, UI5AppfrontDestinationParameter, ManagedAppFront, CAPAppfrontDestination, deployMode, enableParallelDeployments, MAX_MTA_PREFIX_LENGTH, MAX_MTA_PREFIX_SHORT_LENGTH, MAX_MTA_PREFIX_SHORTER_LENGTH, MAX_ABAP_SERVICE_PREFIX_LENGTH, MAX_ABAP_SERVICE_NAME_LENGTH, MAX_MTA_ID_LENGTH } from '../constants.js';
+import { CloudFoundry, RouterModule, DefaultMTADestination, SRV_API, ManagedXSUAA, MTABuildParams, MTABuildResult, DestinationServiceConfig, UI5ResourceDestination, UI5Destination, MTAAPIDestination, UI5StandaloneModuleDestination, ServiceAPIRequires, HTMLAppBuildParams, HTML5RepoHost, UI5AppfrontDestinationParameter, ManagedAppFront, CAPAppfrontDestination, deployMode, enableParallelDeployments, MAX_MTA_PREFIX_LENGTH, MAX_MTA_PREFIX_SHORT_LENGTH, MAX_ABAP_SERVICE_PREFIX_LENGTH, MAX_ABAP_SERVICE_NAME_LENGTH, MAX_MTA_ID_LENGTH, MAX_SERVICE_INSTANCE_NAME_LENGTH } from '../constants.js';
 import { t } from '../i18n.js';
 import { CloudFoundryServiceType, RouterModuleType } from '../types/index.js';
 import { renderTemplateToDisk } from './template-renderer.js';
@@ -159,7 +159,7 @@ export class MtaConfig {
                 service: 'xsuaa',
                 'service-plan': 'application',
                 path: './xs-security.json',
-                'service-name': `${this.prefix?.slice(0, MAX_MTA_PREFIX_LENGTH)}-xsuaa-service`,
+                'service-name': this.buildServiceInstanceName('-xsuaa-service'),
                 config: {
                     xsappname: `${this.prefix?.slice(0, MAX_MTA_PREFIX_LENGTH)}-\${org}-\${space}`,
                     'tenant-mode': 'dedicated',
@@ -194,7 +194,7 @@ export class MtaConfig {
         if (resource && !resource.parameters?.['service-name']) {
             resource.parameters = {
                 ...(resource.parameters ?? {}),
-                'service-name': `${this.prefix?.slice(0, MAX_MTA_PREFIX_LENGTH)}-${serviceName}-service`
+                'service-name': this.buildServiceInstanceName(`-${serviceName}-service`)
             };
             await this.mta?.updateResource(resource);
             this.resources.set(resourceName, resource);
@@ -219,13 +219,26 @@ export class MtaConfig {
         // This matches what Cloud Foundry actually creates when service-name is missing
         return resource?.name;
     }
+    /**
+     * Builds a Cloud Foundry service instance name from the MTA prefix and a suffix, capped at the
+     * CF 50 character limit. The prefix is truncated (never the suffix) so the resulting `service-name`
+     * is used verbatim by the MTA deploy service instead of being silently renamed to `<mta-id>-<hash>`,
+     * which would otherwise break the matching `destination-content` ServiceInstanceName reference.
+     *
+     * @param {string} suffix - The service suffix including its leading dash (e.g. `-html5-service`)
+     * @returns {string} The service instance name, guaranteed to be at most 50 characters
+     */
+    buildServiceInstanceName(suffix) {
+        const maxPrefixLength = Math.max(0, MAX_SERVICE_INSTANCE_NAME_LENGTH - suffix.length);
+        return `${this.prefix?.slice(0, maxPrefixLength)}${suffix}`;
+    }
     async addAppFrontResource() {
         const resource = {
             name: `${this.prefix?.slice(0, MAX_MTA_PREFIX_SHORT_LENGTH)}-app-front`,
             type: 'org.cloudfoundry.managed-service',
             parameters: {
                 service: 'app-front',
-                'service-name': `${this.prefix?.slice(0, MAX_MTA_PREFIX_SHORTER_LENGTH)}-app-front-service`,
+                'service-name': this.buildServiceInstanceName('-app-front-service'),
                 'service-plan': 'developer'
             }
         };
@@ -239,7 +252,7 @@ export class MtaConfig {
             name: html5host,
             type: 'org.cloudfoundry.managed-service',
             parameters: {
-                'service-name': `${this.prefix?.slice(0, MAX_MTA_PREFIX_LENGTH)}-html5-service`,
+                'service-name': this.buildServiceInstanceName('-html5-service'),
                 'service-plan': 'app-host',
                 service: 'html5-apps-repo'
             }
@@ -260,7 +273,7 @@ export class MtaConfig {
             type: 'org.cloudfoundry.managed-service',
             parameters: {
                 service: 'destination',
-                'service-name': destinationName,
+                'service-name': this.buildServiceInstanceName('-destination-service'),
                 'service-plan': 'lite',
                 config: {
                     ...DestinationServiceConfig.config,

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.1.7",
+  "version": "1.1.9",
   "repository": {
     "type": "git",
     "url": "https://github.com/SAP/open-ux-tools.git",
@@ -30,7 +30,7 @@
     "mem-fs": "2.1.0",
     "mem-fs-editor": "9.4.0",
     "hasbin": "1.2.3",
-    "@sap-ux/project-access": "2.2.2",
+    "@sap-ux/project-access": "2.3.0",
     "@sap-ux/yaml": "1.0.2",
     "@sap-ux/btp-utils": "2.0.6",
     "@sap-ux/logger": "1.0.3",