@sap-ux/cf-deploy-config-writer 0.3.14 → 0.3.16

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

@@ -209,9 +209,7 @@ async function appendAppRouter(cfConfig, fs) {
         if ((cfConfig.addMtaDestination && cfConfig.isCap) || cfConfig.destinationName === constants_1.DefaultMTADestination) {
             // If the destination instance identifier is passed, create a destination instance
             cfConfig.destinationName =
-                cfConfig.destinationName === constants_1.DefaultMTADestination
-                    ? mtaInstance.getFormattedPrefix(constants_1.ResourceMTADestination)
-                    : cfConfig.destinationName;
+                cfConfig.destinationName === constants_1.DefaultMTADestination ? constants_1.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()) {

package/dist/constants.d.ts

@@ -10,7 +10,6 @@ export declare const HTML5RepoHost = "html5-apps-repo:app-host";
 export declare const SRV_API = "srv-api";
 export declare const DefaultMTADestination = "fiori-default-srv-api";
 export declare const EmptyDestination = "NONE";
-export declare const ResourceMTADestination = "%s-srv-api";
 export declare const MTADescription = "Generated by Fiori Tools";
 export declare const RouterModule = "router";
 export declare const CloudFoundry = "cf";

package/dist/constants.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.undeployMTAScript = exports.rootDeployMTAScript = exports.appDeployMTAScript = exports.MTABuildScript = exports.UI5DeployBuildScript = exports.UI5DeployBuildScriptForCap = exports.HTMLAppBuildParams = exports.ServiceAPIRequires = exports.DestinationServiceConfig = exports.UI5StandaloneModuleDestination = exports.UI5ResourceDestination = exports.CAPAppfrontDestination = exports.UI5AppfrontDestinationParameter = exports.UI5Destination = exports.MTAAPIDestination = exports.CDSDestinationService = exports.CDSHTML5RepoService = exports.CDSXSUAAService = exports.CDSAddMtaParams = exports.UI5PackageVersion = exports.UI5Package = exports.UI5TaskZipperPackageVersion = exports.UI5TaskZipperPackage = exports.MbtPackageVersion = exports.MbtPackage = exports.Rimraf = exports.RimrafVersion = exports.MTAVersion = exports.MTAPackage = exports.MTAExecutable = exports.CDSPackage = exports.CDSDKPackage = exports.CDSExecutable = exports.enableParallelDeployments = exports.deployMode = exports.CloudFoundry = exports.RouterModule = exports.MTADescription = exports.ResourceMTADestination = exports.EmptyDestination = exports.DefaultMTADestination = exports.SRV_API = exports.HTML5RepoHost = exports.ManagedDestination = exports.ManagedAppFront = exports.ManagedXSUAA = exports.DefaultServiceURL = exports.MTABuildParams = exports.MTABuildResult = exports.WelcomeFile = void 0;
-exports.MTABinNotFound = exports.CDSBinNotFound = void 0;
+exports.CDSBinNotFound = exports.undeployMTAScript = exports.rootDeployMTAScript = exports.appDeployMTAScript = exports.MTABuildScript = exports.UI5DeployBuildScript = exports.UI5DeployBuildScriptForCap = exports.HTMLAppBuildParams = exports.ServiceAPIRequires = exports.DestinationServiceConfig = exports.UI5StandaloneModuleDestination = exports.UI5ResourceDestination = exports.CAPAppfrontDestination = exports.UI5AppfrontDestinationParameter = exports.UI5Destination = exports.MTAAPIDestination = exports.CDSDestinationService = exports.CDSHTML5RepoService = exports.CDSXSUAAService = exports.CDSAddMtaParams = exports.UI5PackageVersion = exports.UI5Package = exports.UI5TaskZipperPackageVersion = exports.UI5TaskZipperPackage = exports.MbtPackageVersion = exports.MbtPackage = exports.Rimraf = exports.RimrafVersion = exports.MTAVersion = exports.MTAPackage = exports.MTAExecutable = exports.CDSPackage = exports.CDSDKPackage = exports.CDSExecutable = exports.enableParallelDeployments = exports.deployMode = exports.CloudFoundry = exports.RouterModule = exports.MTADescription = exports.EmptyDestination = exports.DefaultMTADestination = exports.SRV_API = exports.HTML5RepoHost = exports.ManagedDestination = exports.ManagedAppFront = exports.ManagedXSUAA = exports.DefaultServiceURL = exports.MTABuildParams = exports.MTABuildResult = exports.WelcomeFile = void 0;
+exports.MTABinNotFound = void 0;
 const i18n_1 = require("./i18n");
 exports.WelcomeFile = 'welcomeFile';
 exports.MTABuildResult = 'build-result';
@@ -14,7 +14,6 @@ exports.HTML5RepoHost = 'html5-apps-repo:app-host';
 exports.SRV_API = 'srv-api';
 exports.DefaultMTADestination = 'fiori-default-srv-api';
 exports.EmptyDestination = 'NONE';
-exports.ResourceMTADestination = '%s-srv-api';
 exports.MTADescription = 'Generated by Fiori Tools';
 exports.RouterModule = 'router';
 exports.CloudFoundry = 'cf';
@@ -39,7 +38,7 @@ exports.CDSXSUAAService = 'xsuaa';
 exports.CDSHTML5RepoService = 'html5-repo';
 exports.CDSDestinationService = 'destination';
 exports.MTAAPIDestination = {
-    Name: exports.ResourceMTADestination,
+    Name: exports.SRV_API,
     Type: 'HTTP',
     URL: `~{srv-api/srv-url}`,
     ProxyType: 'Internet',
@@ -59,7 +58,7 @@ exports.UI5AppfrontDestinationParameter = {
     url: "https://ui5.sap.com" /* UI5_DEFAULT.SAPUI5_CDN */
 };
 exports.CAPAppfrontDestination = {
-    name: exports.ResourceMTADestination,
+    name: exports.SRV_API,
     url: '~{srv-api/srv-url}',
     forwardAuthToken: true
 };

package/dist/mta-config/mta.js

@@ -827,9 +827,7 @@ class MtaConfig {
         const module = this.modules.get('com.sap.application.content:appfront');
         if (module) {
             // If the destination provided is `fiori-default-srv-api` then use the default destination name
-            const destName = cfDestination === constants_1.DefaultMTADestination
-                ? this.getFormattedPrefix(constants_1.ResourceMTADestination)
-                : cfDestination;
+            const destName = cfDestination === constants_1.DefaultMTADestination ? constants_1.SRV_API : cfDestination;
             // Ensure the destination does not exist already!
             if (!module.parameters?.config?.destinations?.some((destination) => destination.Name === destName)) {
                 const destination = {
@@ -850,6 +848,7 @@ class MtaConfig {
     async appendInstanceBasedDestination(cfDestination) {
         // Part 1. Update the destination service with the new instance based destination
         const destinationResource = this.resources.get('destination');
+        const capDestName = cfDestination === constants_1.DefaultMTADestination ? constants_1.SRV_API : cfDestination;
         if (destinationResource) {
             if (!destinationResource.requires?.some((ele) => ele.name === constants_1.SRV_API)) {
                 destinationResource.requires = [
@@ -861,16 +860,17 @@ class MtaConfig {
                     ]
                 ];
             }
-            // If the destination provided is `fiori-default-srv-api` then use the default destination name
-            const capDestName = cfDestination === constants_1.DefaultMTADestination
-                ? this.getFormattedPrefix(constants_1.ResourceMTADestination)
-                : cfDestination;
-            // Ensure the destination does not exist already!
-            if (!destinationResource.parameters?.config?.init_data?.instance?.destinations?.some((destination) => destination.Name === capDestName)) {
-                destinationResource.parameters?.config?.init_data?.instance?.destinations?.push({
-                    ...constants_1.MTAAPIDestination,
-                    Name: capDestName
-                });
+            // Part 2. Only append the default destination if it does not exist already
+            const isSrvApiExisting = cfDestination === constants_1.SRV_API &&
+                destinationResource.parameters?.config?.init_data?.instance?.destinations?.some((destination) => destination.Name === constants_1.SRV_API);
+            // Part 3. If the destination is not already existing, append it
+            if (!isSrvApiExisting) {
+                if (!destinationResource.parameters?.config?.init_data?.instance?.destinations?.some((destination) => destination.Name === capDestName)) {
+                    destinationResource.parameters?.config?.init_data?.instance?.destinations?.push({
+                        ...constants_1.MTAAPIDestination,
+                        Name: capDestName
+                    });
+                }
             }
             await this.mta.updateResource(destinationResource);
             this.resources.set('destination', destinationResource);

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.14",
+  "version": "0.3.16",
   "repository": {
     "type": "git",
     "url": "https://github.com/SAP/open-ux-tools.git",
@@ -34,7 +34,7 @@
     "@sap-ux/btp-utils": "1.1.0",
     "@sap-ux/logger": "0.7.0",
     "@sap-ux/ui5-config": "0.29.0",
-    "@sap-ux/nodejs-utils": "0.2.1"
+    "@sap-ux/nodejs-utils": "0.2.2"
   },
   "devDependencies": {
     "@types/ejs": "3.1.2",