@sap-ux/cf-deploy-config-writer 0.3.21 → 0.3.22

package/dist/mta-config/mta.js

@@ -58,7 +58,7 @@ class MtaConfig {
         try {
             await this.loadMTAResources();
             await this.loadMTAModules();
-            this.mtaId = await this.mta.getMtaID();
+            this.mtaId = await this.mta?.getMtaID();
         }
         catch (error) {
             this.log?.error((0, i18n_1.t)('error.unableToLoadMTA', { error, mtaDir: this.mtaDir }));
@@ -105,7 +105,7 @@ class MtaConfig {
         this.log?.debug((0, i18n_1.t)('debug.mtaLoaded', { type: 'resources', size: this.resources.size }));
     }
     async loadMTAModules() {
-        const modules = (await this.mta.getModules()) || [];
+        const modules = (await this.mta?.getModules()) || [];
         modules.forEach((module) => {
             if (module.type) {
                 if (module.type === 'html5') {
@@ -135,7 +135,7 @@ class MtaConfig {
         const appHostName = this.resources.get(constants_1.HTML5RepoHost)?.name;
         if (appHostName) {
             const appContentModule = {
-                name: `${this.prefix.slice(0, 100)}-app-content`,
+                name: `${this.prefix?.slice(0, 100)}-app-content`,
                 type: 'com.sap.application.content',
                 path: '.',
                 requires: [
@@ -151,32 +151,32 @@ class MtaConfig {
                     requires: []
                 }
             };
-            await this.mta.addModule(appContentModule);
+            await this.mta?.addModule(appContentModule);
             this.modules.set('com.sap.application.content:resource', appContentModule);
             this.dirty = true;
         }
     }
     async addUaa() {
         const resource = {
-            name: `${this.prefix.slice(0, 100)}-uaa`,
+            name: `${this.prefix?.slice(0, 100)}-uaa`,
             type: 'org.cloudfoundry.managed-service',
             parameters: {
                 'service-plan': 'application',
                 service: 'xsuaa',
-                config: { xsappname: `${this.prefix.slice(0, 100)}` + '-${space-guid}', 'tenant-mode': 'dedicated' }
+                config: { xsappname: `${this.prefix?.slice(0, 100)}` + '-${space-guid}', 'tenant-mode': 'dedicated' }
             }
         };
-        await this.mta.addResource(resource);
+        await this.mta?.addResource(resource);
         this.resources.set('xsuaa', resource);
         this.dirty = true;
     }
     async addHtml5Runtime() {
         const resource = {
-            name: `${this.prefix.slice(0, 100)}-html5-repo-runtime`,
+            name: `${this.prefix?.slice(0, 100)}-html5-repo-runtime`,
             type: 'org.cloudfoundry.managed-service',
             parameters: { 'service-plan': 'app-runtime', service: 'html5-apps-repo' }
         };
-        await this.mta.addResource(resource);
+        await this.mta?.addResource(resource);
         this.resources.set('html5-apps-repo:app-runtime', resource);
         this.dirty = true;
     }
@@ -191,39 +191,39 @@ class MtaConfig {
         if (resource && !resource.parameters?.['service-name']) {
             resource.parameters = {
                 ...(resource.parameters ?? {}),
-                'service-name': `${this.prefix.slice(0, 100)}-${serviceName}-service`
+                'service-name': `${this.prefix?.slice(0, 100)}-${serviceName}-service`
             };
-            await this.mta.updateResource(resource);
+            await this.mta?.updateResource(resource);
             this.resources.set(resourceName, resource);
             this.dirty = true;
         }
     }
     async addAppFrontResource() {
         const resource = {
-            name: `${this.prefix.slice(0, 94)}-app-front`,
+            name: `${this.prefix?.slice(0, 94)}-app-front`,
             type: 'org.cloudfoundry.managed-service',
             parameters: {
                 service: 'app-front',
-                'service-name': `${this.prefix.slice(0, 96)}-app-front-service`,
+                'service-name': `${this.prefix?.slice(0, 96)}-app-front-service`,
                 'service-plan': 'developer'
             }
         };
-        await this.mta.addResource(resource);
+        await this.mta?.addResource(resource);
         this.resources.set(constants_1.ManagedAppFront, resource);
         this.dirty = true;
     }
     async addHtml5Host() {
-        const html5host = `${this.prefix.slice(0, 100)}-repo-host`; // Need to cater for -key being added too!
+        const html5host = `${this.prefix?.slice(0, 100)}-repo-host`; // Need to cater for -key being added too!
         const resource = {
             name: html5host,
             type: 'org.cloudfoundry.managed-service',
             parameters: {
-                'service-name': `${this.prefix.slice(0, 100)}-html5-service`,
+                'service-name': `${this.prefix?.slice(0, 100)}-html5-service`,
                 'service-plan': 'app-host',
                 service: 'html5-apps-repo'
             }
         };
-        await this.mta.addResource(resource);
+        await this.mta?.addResource(resource);
         this.resources.set(constants_1.HTML5RepoHost, resource);
         this.dirty = true;
     }
@@ -233,7 +233,7 @@ class MtaConfig {
      * @param isManagedApp - If the destination service is for a managed app
      */
     async addDestinationResource(isManagedApp = false) {
-        const destinationName = `${this.prefix.slice(0, 100)}-destination-service`;
+        const destinationName = `${this.prefix?.slice(0, 100)}-destination-service`;
         const resource = {
             name: destinationName,
             type: 'org.cloudfoundry.managed-service',
@@ -247,7 +247,7 @@ class MtaConfig {
                 }
             }
         };
-        await this.mta.addResource(resource);
+        await this.mta?.addResource(resource);
         this.resources.set('destination', resource);
         this.dirty = true;
     }
@@ -278,7 +278,7 @@ class MtaConfig {
             if (!resource.parameters?.config?.init_data?.instance?.destinations?.some((destination) => destination.Name === constants_1.UI5Destination.Name)) {
                 resource.parameters.config.init_data.instance.destinations.push(constants_1.UI5Destination);
             }
-            await this.mta.updateResource(resource);
+            await this.mta?.updateResource(resource);
             this.resources.set('destination', resource);
             this.dirty = true;
         }
@@ -300,7 +300,7 @@ class MtaConfig {
             if (mtaResource && !serverModule.requires?.some((ele) => ele.name === mtaResource.name)) {
                 serverModule.requires = [...(serverModule.requires ?? []), ...[{ name: mtaResource.name }]];
             }
-            await this.mta.updateModule(serverModule);
+            await this.mta?.updateModule(serverModule);
             this.modules.set(moduleType, serverModule);
             this.dirty = true;
         }
@@ -313,24 +313,24 @@ class MtaConfig {
     async addManagedUAAWithSecurity() {
         this.log?.debug((0, i18n_1.t)('debug.addXsuaaService'));
         const resource = {
-            name: `${this.prefix.slice(0, 100)}-uaa`,
+            name: `${this.prefix?.slice(0, 100)}-uaa`,
             type: 'org.cloudfoundry.managed-service',
             parameters: {
                 path: './xs-security.json',
                 service: 'xsuaa',
-                'service-name': `${this.prefix.slice(0, 100)}-xsuaa-service`,
+                'service-name': `${this.prefix?.slice(0, 100)}-xsuaa-service`,
                 'service-plan': 'application',
                 ...(this.modules.has('nodejs') && this.modules.has('com.sap.application.content:appfront')
                     ? {
                         config: {
-                            xsappname: `${this.prefix.slice(0, 100)}-\${org}-\${space}`,
+                            xsappname: `${this.prefix?.slice(0, 100)}-\${org}-\${space}`,
                             'tenant-mode': 'dedicated'
                         }
                     }
                     : {})
             }
         };
-        await this.mta.addResource(resource);
+        await this.mta?.addResource(resource);
         this.resources.set(constants_1.ManagedXSUAA, resource);
         this.dirty = true;
     }
@@ -373,7 +373,7 @@ class MtaConfig {
             this.modules.get('com.sap.application.content:destination'),
             this.modules.get('approuter.nodejs')
         ].filter((elem) => elem !== undefined)) {
-            const destinationName = this.resources.get('destination')?.name ?? `${this.prefix.slice(0, 100)}-destination-service`;
+            const destinationName = this.resources.get('destination')?.name ?? `${this.prefix?.slice(0, 100)}-destination-service`;
             if (module?.requires?.findIndex((app) => app.name === destinationName) === -1) {
                 if (module.type === 'approuter.nodejs') {
                     module.requires.push({
@@ -389,7 +389,7 @@ class MtaConfig {
                         }
                     });
                 }
-                await this.mta.updateModule(module);
+                await this.mta?.updateModule(module);
                 this.dirty = true;
             }
         }
@@ -423,9 +423,7 @@ class MtaConfig {
                 // In theory, if there is more than one, it should be same!
                 moduleDestinations.some((destination) => {
                     cloudServiceName = destination['sap.cloud.service'] || undefined;
-                    if (cloudServiceName) {
-                        return true; // breakout
-                    }
+                    return !!cloudServiceName;
                 });
             }
         });
@@ -462,7 +460,7 @@ class MtaConfig {
      * @returns {Promise<void>} A promise that resolves when the change request has been processed.
      */
     async updateParameters(parameters) {
-        await this.mta.updateParameters(parameters);
+        await this.mta?.updateParameters(parameters);
         this.dirty = true;
     }
     /**
@@ -472,7 +470,7 @@ class MtaConfig {
      * @returns {Promise<void>} A promise that resolves when the change request has been processed.
      */
     async updateBuildParams(parameters) {
-        await this.mta.updateBuildParameters(parameters);
+        await this.mta?.updateBuildParameters(parameters);
         this.dirty = true;
     }
     /**
@@ -503,7 +501,7 @@ class MtaConfig {
                     'target-path': `${contentModule[constants_1.MTABuildParams][constants_1.MTABuildResult]}/`.replace(/\/{2,}/g, '/') // Matches two or more consecutive slashes where at least 2 repetitions of /
                 });
             }
-            await this.mta.updateModule(contentModule);
+            await this.mta?.updateModule(contentModule);
             this.dirty = true;
         }
         // Add application module, if not found already
@@ -514,7 +512,7 @@ class MtaConfig {
                 path: appPath,
                 'build-parameters': constants_1.HTMLAppBuildParams
             };
-            await this.mta.addModule(app);
+            await this.mta?.addModule(app);
             this.apps.set(appName, app);
             this.dirty = true;
             this.log?.debug((0, i18n_1.t)('debug.html5AppAdded', { appName }));
@@ -532,7 +530,7 @@ class MtaConfig {
                     const packageJson = JSON.parse((0, fs_1.readFileSync)((0, path_1.join)(this.mtaDir, app.path, project_access_1.FileName.Package), 'utf8'));
                     if (packageJson && (0, project_access_1.hasDependency)(packageJson, '@sap/ux-ui5-tooling')) {
                         app['build-parameters'].commands = ['npm install', 'npm run build:cf'];
-                        await this.mta.updateModule(app);
+                        await this.mta?.updateModule(app);
                         this.dirty = true;
                     }
                 }
@@ -550,12 +548,12 @@ class MtaConfig {
     async addConnectivityResource() {
         const serviceType = 'connectivity';
         const resourceType = types_1.CloudFoundryServiceType.Managed;
-        const resourceName = `${this.prefix.slice(0, 100)}-connectivity`;
+        const resourceName = `${this.prefix?.slice(0, 100)}-connectivity`;
         const router = this.modules.get('approuter.nodejs');
         if (router) {
             if (router.requires?.findIndex((resource) => resource.name === resourceName) === -1) {
                 router.requires.push({ name: resourceName });
-                await this.mta.updateModule(router);
+                await this.mta?.updateModule(router);
             }
         }
         const connectivityResource = {
@@ -567,7 +565,7 @@ class MtaConfig {
             }
         };
         if (!this.resources.has(serviceType)) {
-            await this.mta.addResource(connectivityResource);
+            await this.mta?.addResource(connectivityResource);
             this.resources.set(serviceType, connectivityResource);
         }
         this.dirty = true;
@@ -631,12 +629,12 @@ class MtaConfig {
      * @returns {Promise<void>} A promise that resolves when the change request has been processed.
      */
     async addAbapService(serviceName, btpService) {
-        const newResourceName = `${this.prefix.slice(0, 24)}-abap-${serviceName.slice(0, 20)}`;
+        const newResourceName = `${this.prefix?.slice(0, 24)}-abap-${serviceName.slice(0, 20)}`;
         const router = this.modules.get('approuter.nodejs');
         if (router) {
             if (router.requires?.findIndex((resource) => resource.name === newResourceName) === -1) {
                 router.requires.push({ name: newResourceName });
-                await this.mta.updateModule(router);
+                await this.mta?.updateModule(router);
             }
         }
         const abapServiceResource = {
@@ -650,7 +648,7 @@ class MtaConfig {
             }
         };
         if (!this.resources.has(newResourceName)) {
-            await this.mta.addResource(abapServiceResource);
+            await this.mta?.addResource(abapServiceResource);
             this.resources.set(newResourceName, abapServiceResource);
         }
         this.dirty = true;
@@ -693,7 +691,7 @@ class MtaConfig {
         const destinationName = this.resources.get('destination')?.name;
         if (destinationName && xsuaaName && appRuntimeName) {
             const router = {
-                name: `${this.prefix.slice(0, 100)}-router`,
+                name: `${this.prefix?.slice(0, 100)}-router`,
                 type: 'approuter.nodejs',
                 path: fromServerGenerator ? `${constants_1.RouterModule}` : `${constants_1.CloudFoundry}/${constants_1.RouterModule}`,
                 parameters: {
@@ -710,7 +708,7 @@ class MtaConfig {
                     }
                 ]
             };
-            await this.mta.addModule(router);
+            await this.mta?.addModule(router);
             this.modules.set('approuter.nodejs', router);
             this.dirty = true;
         }
@@ -747,7 +745,7 @@ class MtaConfig {
         let destinationServiceName = this.resources.get('destination')?.name;
         if (!destinationServiceName) {
             this.log?.info((0, i18n_1.t)('info.existingDestinationNotFound'));
-            destinationServiceName = `${this.prefix.slice(0, 100)}-destination-service`;
+            destinationServiceName = `${this.prefix?.slice(0, 100)}-destination-service`;
         }
         const appMtaId = this.mtaId;
         const mtaExtFilePath = (0, path_1.join)(this.mta.mtaDirPath, project_access_1.FileName.MtaExtYaml);
@@ -835,7 +833,7 @@ class MtaConfig {
                     name: destName
                 };
                 module.parameters?.config?.destinations.push(destination);
-                await this.mta.updateModule(module);
+                await this.mta?.updateModule(module);
             }
         }
     }
@@ -872,7 +870,7 @@ class MtaConfig {
                     });
                 }
             }
-            await this.mta.updateResource(destinationResource);
+            await this.mta?.updateResource(destinationResource);
             this.resources.set('destination', destinationResource);
             // Only make additional modifications if the MTA destination is added
             await this.updateServerModule(this.modules.has('nodejs') ? 'nodejs' : 'java');
@@ -886,7 +884,7 @@ class MtaConfig {
      */
     async save() {
         if (this.dirty) {
-            await this.mta.save();
+            await this.mta?.save();
         }
         return this.dirty;
     }
@@ -906,7 +904,7 @@ class MtaConfig {
             const appHostName = this.resources.get(constants_1.ManagedAppFront)?.name;
             if (appHostName) {
                 const appContentModule = {
-                    name: `${this.prefix.slice(0, 100)}-app-content`,
+                    name: `${this.prefix?.slice(0, 100)}-app-content`,
                     type: 'com.sap.application.content',
                     path: '.',
                     requires: [
@@ -927,7 +925,7 @@ class MtaConfig {
                 if (this.modules.has('nodejs')) {
                     appContentModule.requires?.push({ name: constants_1.SRV_API });
                 }
-                await this.mta.addModule(appContentModule);
+                await this.mta?.addModule(appContentModule);
                 this.modules.set('com.sap.application.content:appfront', appContentModule);
                 this.dirty = true;
             }
@@ -964,7 +962,7 @@ class MtaConfig {
             const managedXSUAAServiceName = this.resources.get(constants_1.ManagedXSUAA)?.parameters?.['service-name'];
             if (destinationName && appHostName && managedXSUAAName && managedXSUAAServiceName) {
                 const router = {
-                    name: `${this.prefix.slice(0, 100)}-destination-content`,
+                    name: `${this.prefix?.slice(0, 100)}-destination-content`,
                     type: 'com.sap.application.content',
                     requires: [
                         {
@@ -995,17 +993,17 @@ class MtaConfig {
                             instance: {
                                 destinations: [
                                     {
-                                        Name: `${this.prefix.slice(0, 100)}_html_repo_host`,
+                                        Name: `${this.prefix?.slice(0, 100)}_html_repo_host`,
                                         ServiceInstanceName: appHostServiceName,
                                         ServiceKeyName: `${appHostName}-key`,
-                                        'sap.cloud.service': `${this.prefix.slice(0, 100)}`
+                                        'sap.cloud.service': `${this.prefix?.slice(0, 100)}`
                                     },
                                     {
                                         Authentication: 'OAuth2UserTokenExchange',
-                                        Name: `${this.prefix.slice(0, 100)}_uaa`,
+                                        Name: `${this.prefix?.slice(0, 100)}_uaa`,
                                         ServiceInstanceName: managedXSUAAServiceName,
                                         ServiceKeyName: `${managedXSUAAName}-key`,
-                                        'sap.cloud.service': `${this.prefix.slice(0, 100)}`
+                                        'sap.cloud.service': `${this.prefix?.slice(0, 100)}`
                                     }
                                 ],
                                 'existing_destinations_policy': 'update'
@@ -1016,7 +1014,7 @@ class MtaConfig {
                         'no-source': true
                     }
                 };
-                await this.mta.addModule(router);
+                await this.mta?.addModule(router);
                 this.modules.set('com.sap.application.content:destination', router);
                 this.dirty = true;
             }

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.21",
+  "version": "0.3.22",
   "repository": {
     "type": "git",
     "url": "https://github.com/SAP/open-ux-tools.git",
@@ -29,12 +29,12 @@
     "mem-fs": "2.1.0",
     "mem-fs-editor": "9.4.0",
     "hasbin": "1.2.3",
-    "@sap-ux/project-access": "1.30.12",
+    "@sap-ux/project-access": "1.30.13",
     "@sap-ux/yaml": "0.17.0",
-    "@sap-ux/btp-utils": "1.1.0",
+    "@sap-ux/btp-utils": "1.1.1",
     "@sap-ux/logger": "0.7.0",
-    "@sap-ux/ui5-config": "0.29.2",
-    "@sap-ux/nodejs-utils": "0.2.2"
+    "@sap-ux/ui5-config": "0.29.3",
+    "@sap-ux/nodejs-utils": "0.2.3"
   },
   "devDependencies": {
     "@types/ejs": "3.1.2",