@sap/cds-dk 6.6.2 → 6.7.0

package/lib/init/template/enterprise-messaging/index.js

@@ -17,7 +17,7 @@ module.exports = class EnterpriseMessagingTemplate extends require('../templateB
     const templatePath = join(__dirname, 'files')
     const cdsTemplateFile = (isNodejs ? 'cds.package.json' : 'cdsrc.json') + (forProfile ? '.hbs' : '')
     const cdsTemplatePath = join(templatePath, cdsTemplateFile)
-    const configPath = join(this.projectPath, isNodejs ? 'package.json' : '.cdsrc.json')
+    const configPath = isNodejs ? 'package.json' : '.cdsrc.json'
     await mergeJSON(configPath, cdsTemplatePath, projectDescriptor)
     await mergeJSON('event-mesh.json', join(__dirname, 'files', 'event-mesh.json.hbs'), projectDescriptor)
     await this.runDependentMerging()
@@ -25,10 +25,10 @@ module.exports = class EnterpriseMessagingTemplate extends require('../templateB
 
   async runDependentMerging(context = {}) {
     const projectDescriptor = await readProject(this.options)
-    const { hasHelm, hasMta, isNodejs } = projectDescriptor.cap
+    const { hasHelm, hasMta, isNodejs, srvPath } = projectDescriptor.cap
 
     if (hasMta) {
-      const srv = isNodejs ? srvNode : srvJava
+      const srv = (isNodejs ? srvNode : srvJava)(srvPath)
       await mergeYAML(
           'mta.yaml',
           join(__dirname, 'files', 'mta.yaml.hbs'),
@@ -48,12 +48,11 @@ module.exports = class EnterpriseMessagingTemplate extends require('../templateB
       let isIndependentCommand = false
       if(Object.keys(context).length == 0){
           isIndependentCommand = true
-          context.projectPath = this.projectPath
-          context.oldTrackingData = context.newTrackingData = await parseMd5File(join(this.projectPath, 'chart', '.cds-add-helm-files.md5'))
+          context.oldTrackingData = context.newTrackingData = await parseMd5File(join('chart', '.cds-add-helm-files.md5'))
       }
 
       await mergeYAML(
-        join(this.projectPath, 'chart', 'values.yaml'),
+        join('chart', 'values.yaml'),
         join(__dirname, 'files', 'values.yaml')
       )
 
@@ -63,20 +62,9 @@ module.exports = class EnterpriseMessagingTemplate extends require('../templateB
       isIndependentCommand = isIndependentCommand | await helmTemplate.addSubChart('service-instance');
 
       // add dependency entry in chart.yaml
-      await mergeYAML(
-        join(this.projectPath, 'chart', 'Chart.yaml'),
-        join(__dirname, 'files', 'event-mesh.yaml'),
-        projectDescriptor,
-        { additions: [{
-            in: `dependencies`,
-            where: [{
-                property: 'alias',
-                isEqualTo: 'event-mesh'
-            }]
-        }]}
-      )
+      await helmTemplate.addDependency('service-instance', 'event-mesh');
 
-      if(isIndependentCommand) await writeMd5File(join(this.projectPath, 'chart', '.cds-add-helm-files.md5'), context.newTrackingData)
+      if(isIndependentCommand) await writeMd5File(join('chart', '.cds-add-helm-files.md5'), context.newTrackingData)
     }
   }
 }

package/lib/init/template/extensibility/index.js

@@ -19,12 +19,14 @@ module.exports = class ExtensibilityTemplate extends require('../templateBase')
   async run() {
     const projectDescriptor = await readProject(this.options)
     const { for: forProfile, isJava, hasSidecar } = projectDescriptor.cap
-    const cdsConfigPath = join(this.projectPath, isJava ? '.cdsrc.json' : 'package.json')
+    const cdsConfigPath = isJava ? '.cdsrc.json' : 'package.json'
     const cdsTemplateFile = forProfile ? (isJava ? 'cdsrc.json.hbs' : 'cds.package.json.hbs') : (isJava ? 'cdsrc.json' : 'cds.package.json')
     await mergeJSON(cdsConfigPath, join(__dirname, 'files', cdsTemplateFile), projectDescriptor)
     if (hasSidecar) {
       const out = join('mtx', 'sidecar', 'package.json')
       const config = await read(out)
+      if (!config.cds) config.cds = {}
+      if (!config.cds.requires) config.cds.requires = {}
       if (!('cds.xt.ExtensibilityService' in config.cds.requires)) {
         config.cds.requires['cds.xt.ExtensibilityService'] = true
         await write(out, config, { spaces: 2 })

package/lib/init/template/hana/files/mta.yaml.hbs

@@ -1,7 +1,8 @@
 ---
 modules:
   - name: {{cap.appName}}-srv
-    type: {{cap.pLanguage}}
+    type: {{cap.language}}
+    path: {{& cap.srvPath}}
     requires:
       - name: {{cap.appName}}-db
 
@@ -21,15 +22,13 @@ modules:
       - name: {{cap.appName}}-db
 {{/cap.isMultitenant}}
 
-{{#cap.isJava}}
 {{#cap.isMultitenant}}
-  - name: {{cap.appName}}-mtx-sidecar
+  - name: {{cap.appName}}-mtx
     type: nodejs
-    path: mtx/sidecar
+    path: {{#cap.isNodejs}}gen/{{/cap.isNodejs}}mtx/sidecar
     requires:
       - name: {{cap.appName}}-db
 {{/cap.isMultitenant}}
-{{/cap.isJava}}
 
 resources:
   - name: {{cap.appName}}-db

package/lib/init/template/hana/index.js

@@ -1,6 +1,6 @@
 const { join } = require('path');
 const cds = require('../../../cds')
-const { read, write, exists, rm, rmdir } = cds.utils
+const { read, write, exists, rmdir } = cds.utils
 const commandUtil = require('../../util/commandUtil');
 const mvnArchetypes = require('../../util/mvnArchetypeUtil');
 const term = require('../../../util/term');
@@ -12,7 +12,7 @@ const versionCompare = require('../../util/versionCompare');
 
 const { PROJECT_TYPE, OPTION_JAVA, URLS } = require('../../constants');
 
-const { srvNode, srvJava, hdbDeployer, serviceManager, hdiContainer, mtxSidecar } = require('../_merging/registry-mta');
+const { srvNode, srvJava, hdbDeployer, serviceManager, hdiContainer, mtxSidecar4 } = require('../_merging/registry-mta');
 
 module.exports = class HanaTemplate extends require('../templateBase') {
 
@@ -31,18 +31,18 @@ module.exports = class HanaTemplate extends require('../templateBase') {
     async run() {
         const env = await this.getEnv();
 
-        const hdiConfigPath = join(this.projectPath, env.folders.db, 'src', '.hdiconfig');
+        const hdiConfigPath = join(env.folders.db, 'src', '.hdiconfig');
         const hdiConfigTemplatePath = join(__dirname, 'files', 'common', 'src', '.hdiconfig');
         await mergeJSON(hdiConfigPath, hdiConfigTemplatePath);
 
-        const undeployJSONPath = join(this.projectPath, env.folders.db, 'undeploy.json');
+        const undeployJSONPath = join(env.folders.db, 'undeploy.json');
         const undeployJSONTemplatePath = join(__dirname, 'files', 'common', 'undeploy.json');
         await mergeJSON(undeployJSONPath, undeployJSONTemplatePath);
 
         const projectType = this.getProjectType();
         switch (projectType) {
             case PROJECT_TYPE.java: {
-                await copyFiles(join(__dirname, 'files', 'java', 'db'), join(this.projectPath, env.folders.db), {}, this.options.force);
+                await copyFiles(join(__dirname, 'files', 'java', 'db'), join(env.folders.db), {}, this.options.force);
                 await this._updatePomXml();
                 await this._updateCdsConfiguration();
                 break;
@@ -56,42 +56,30 @@ module.exports = class HanaTemplate extends require('../templateBase') {
         await this.runDependentMerging()
     }
 
-    async removeEntriesFromContext(context, key, pattern = false) {
-        if(pattern) {
-            Object.keys(context.oldTrackingData).forEach(fileName => {
-                if (fileName.startsWith(key)) {
-                  delete context.oldTrackingData[fileName];
-                }
-            });
-
-            Object.keys(context.newTrackingData).forEach(fileName => {
-                if (fileName.startsWith(key)) {
-                  delete context.newTrackingData[fileName];
-                }
-            });
-        } else {
-            // remove entry from oldTrackingData
-            if(context.oldTrackingData !== undefined && context.oldTrackingData[key] !== undefined) {
-                delete context.oldTrackingData[key];
+    async removeEntriesFromContext(context, key) {
+        Object.keys(context.oldTrackingData).forEach(fileName => {
+            if (fileName.startsWith(key)) {
+              delete context.oldTrackingData[fileName];
             }
+        });
 
-            // remove entry from newTrackingData
-            if(context.newTrackingData !== undefined && context.newTrackingData[key] !== undefined) {
-                delete context.newTrackingData[key];
+        Object.keys(context.newTrackingData).forEach(fileName => {
+            if (fileName.startsWith(key)) {
+              delete context.newTrackingData[fileName];
             }
-        }
+        });
     }
 
     async runDependentMerging(context = {}) {
         const projectDescriptor = await readProject(this.options)
-        const { hasMta, hasHelm, hasHtml5Repo, isNodejs, isJava, isMultitenant } = projectDescriptor.cap
+        const { hasMta, hasHelm, hasHtml5Repo, isJava, isMultitenant, srvPath } = projectDescriptor.cap
 
         if (isMultitenant) {
             await this._updateCdsConfiguration()
         }
 
         if (hasMta) {
-            const srv = isNodejs ? srvNode : srvJava
+            const srv = (isJava ? srvJava : srvNode)(srvPath)
             const db = isMultitenant ? serviceManager : hdiContainer
             const deletions = isMultitenant ? [{
                 item: hdbDeployer,
@@ -107,8 +95,6 @@ module.exports = class HanaTemplate extends require('../templateBase') {
                 }]
             }] : []
 
-            const mtaYAMLPath = join(this.projectPath, 'mta.yaml')
-
             const relationships = [{
                 insert: [db, 'name'],
                 into: [srv, 'requires', 'name']
@@ -119,19 +105,17 @@ module.exports = class HanaTemplate extends require('../templateBase') {
                     insert: [hdiContainer, 'name'],
                     into: [hdbDeployer, 'requires', 'name']
                 })
-            }
-
-            if (isJava && isMultitenant) {
+            } else {
                 relationships.push({
                     insert: [serviceManager, 'name'],
-                    into: [mtxSidecar, 'requires', 'name']
+                    into: [mtxSidecar4(isJava ? 'mtx/sidecar' : 'gen/mtx/sidecar'), 'requires', 'name']
                 })
             }
 
             const modules = !isMultitenant ? [srv, hdbDeployer] : [srv]
 
             await mergeYAML(
-                mtaYAMLPath,
+                'mta.yaml',
                 join(__dirname, 'files', 'mta.yaml.hbs'),
                 projectDescriptor,
                 { additions: [...modules, db].filter(a => a), deletions, relationships }
@@ -143,41 +127,46 @@ module.exports = class HanaTemplate extends require('../templateBase') {
             let shouldUpdateTrackingFile = false;
             if(Object.keys(context).length == 0){
                 shouldUpdateTrackingFile = true;
-                context.projectPath = this.projectPath;
-                context.oldTrackingData = context.newTrackingData = await parseMd5File(join(this.projectPath, 'chart', '.cds-add-helm-files.md5'));
+                context.oldTrackingData = context.newTrackingData = await parseMd5File(join('chart', '.cds-add-helm-files.md5'));
             }
 
+            const HelmTemplate = require(`../helm`);
+            const helmTemplate = new HelmTemplate(this.generator, context.oldTrackingData, context.newTrackingData);
+
             if(isMultitenant){
                 shouldUpdateTrackingFile = true;
 
-                const instanceTemplateKey = "templates/hana.yaml";
-                await this.removeEntriesFromContext(context, instanceTemplateKey);
-
                 // remove hana entries from values.yaml
-                await removeFromYAML(join(this.projectPath, 'chart', 'values.yaml'), ['hana-deployer', 'srv.bindings.db', 'hana']);
+                await removeFromYAML(join('chart', 'values.yaml'), ['hana-deployer', 'srv.bindings.db', 'hana']);
 
                 // remove hana entries from Chart.yaml
-                await removeFromYAMLArray(join(this.projectPath, 'chart', 'Chart.yaml'), 'dependencies', 'hana-deployer');
+                await removeFromYAMLArray(join('chart', 'Chart.yaml'), 'dependencies', 'hana-deployer');
 
                 // remove content-deployment subchart if html5Repo doesn't exist
                 if(!hasHtml5Repo) {
                     const contentDeploymentEntriesPattern = "charts/content-deployment/"
-                    await this.removeEntriesFromContext(context, contentDeploymentEntriesPattern, true);
+                    await this.removeEntriesFromContext(context, contentDeploymentEntriesPattern);
 
-                    const contentDeploymentSubchartPath = join(this.projectPath, 'chart', 'charts', 'content-deployment');
+                    const contentDeploymentSubchartPath = join('chart', 'charts', 'content-deployment');
                     if(exists(contentDeploymentSubchartPath)) {
                         await rmdir(contentDeploymentSubchartPath);
                     }
                 }
 
-                const hanaInstanceTemplatePath = join(this.projectPath, 'chart', 'templates', 'hana.yaml');
-                if(exists(hanaInstanceTemplatePath)) {
-                    await rm(hanaInstanceTemplatePath);
-                }
-
+                //remove dependency since mtx plugin is added
+                const isInternal = await helmTemplate.isInternal();
                 await mergeYAML(
-                    join(this.projectPath, 'chart', 'Chart.yaml'),
-                    join(__dirname, 'files', 'hana.yaml'),
+                    join('chart', 'Chart.yaml'),
+                    {
+                        dependencies: [
+                            {
+                                name: 'service-instance',
+                                alias: 'hana',
+                                version: '>0.0.0',
+                                ...(isInternal) && { repository: 'https://int.repositories.cloud.sap/artifactory/virtual-unified-runtime-helm-dmz' }
+                            }
+                        ]
+                    },
                     projectDescriptor,
                     { deletions: [{
                         item: {
@@ -191,48 +180,24 @@ module.exports = class HanaTemplate extends require('../templateBase') {
                 )
             } else {
                 await mergeYAML(
-                    join(this.projectPath, 'chart', 'values.yaml'),
+                    join('chart', 'values.yaml'),
                     join(__dirname, 'files', 'values.yaml.hbs'),
                     projectDescriptor
                 )
 
                 // copy content deployment chart if it is not present
-                const HelmTemplate = require(`../helm`);
-                const helmTemplate = new HelmTemplate(this.generator, context.oldTrackingData, context.newTrackingData);
                 shouldUpdateTrackingFile = shouldUpdateTrackingFile | await helmTemplate.addSubChart('content-deployment');
 
                 // add dependency entry in chart.yaml
-                await mergeYAML(
-                    join(this.projectPath, 'chart', 'Chart.yaml'),
-                    join(__dirname, 'files', 'hana-deployer.yaml'),
-                    projectDescriptor,
-                    { additions: [{
-                        in: `dependencies`,
-                        where: [{
-                            property: 'alias',
-                            isEqualTo: 'hana-deployer'
-                        }]
-                    }]}
-                )
+                await helmTemplate.addDependency('content-deployment', 'hana-deployer');
 
                 // add service instance chart if it is not present
                 shouldUpdateTrackingFile = shouldUpdateTrackingFile | await helmTemplate.addSubChart('service-instance');
 
                 // add dependency entry in chart.yaml
-                await mergeYAML(
-                    join(this.projectPath, 'chart', 'Chart.yaml'),
-                    join(__dirname, 'files', 'hana.yaml'),
-                    projectDescriptor,
-                    { additions: [{
-                        in: `dependencies`,
-                        where: [{
-                            property: 'alias',
-                            isEqualTo: 'hana'
-                        }]
-                    }]}
-                )
+                await helmTemplate.addDependency('service-instance', 'hana');
             }
-            if(shouldUpdateTrackingFile) await writeMd5File(join(this.projectPath, 'chart', '.cds-add-helm-files.md5'), context.newTrackingData);
+            if(shouldUpdateTrackingFile) await writeMd5File(join('chart', '.cds-add-helm-files.md5'), context.newTrackingData);
         }
     }
 
@@ -242,7 +207,7 @@ module.exports = class HanaTemplate extends require('../templateBase') {
             const mvnAddHanaArgs = mvnArchetypes.getAddHanaCmdArgs(this.options);
             try {
                 await commandUtil.spawnCommand('mvn', mvnAddHanaArgs, {
-                    cwd: this.projectPath
+                    cwd: cds.root
                 });
             } catch (err) {
                 if (err.code === 'ENOENT' && err.path === 'mvn') {
@@ -254,7 +219,7 @@ module.exports = class HanaTemplate extends require('../templateBase') {
     }
 
     async _updatePackageJson() {
-        const packageJsonPath = join(this.projectPath, 'package.json')
+        const packageJsonPath = join('package.json')
         const dependenciesTemplatePath = join(__dirname, 'files', 'nodejs', 'dependencies.package.json');
         await mergeJSON(packageJsonPath, dependenciesTemplatePath);
 
@@ -270,7 +235,7 @@ module.exports = class HanaTemplate extends require('../templateBase') {
     async _updateCdsConfiguration(configPath) {
         const projectType = this.getProjectType();
         const configFile = projectType === PROJECT_TYPE.nodejs ? 'package.json' : '.cdsrc.json';
-        configPath = configPath ?? join(this.projectPath, configFile)
+        configPath = configPath ?? configFile
         const projectDescriptor = await readProject(this.options);
         const { for: forProfile } = projectDescriptor.cap;
         let json; try { json = await read(configPath, 'utf8') } catch { /* ignore */ }
@@ -278,8 +243,8 @@ module.exports = class HanaTemplate extends require('../templateBase') {
         const shortcut = typeof _cds?.requires?.db === 'string' || !json ? 'shortcut.' : '';
         const profile = forProfile ? 'profile.' : '';
         const cdsTemplateFile = `cds.${shortcut}${profile}json.hbs`
-        const { pLanguage } = projectDescriptor.cap;
-        const cdsTemplatePath = join(__dirname, 'files', pLanguage, cdsTemplateFile);
+        const { language } = projectDescriptor.cap;
+        const cdsTemplatePath = join(__dirname, 'files', language, cdsTemplateFile);
         await mergeJSON(configPath, cdsTemplatePath, projectDescriptor, { forceOverwrite: true })
     }
 }

package/lib/init/template/helm/chart/templates/_helpers.tpl

@@ -137,9 +137,12 @@ spec:
 */}}
 {{- define "cap.service-instance.saasRegistryParameters" -}}
   {{- $srvHostFull := include "cap.deploymentHostFull" (merge (dict "name" "srv" "deployment" .Values.srv) . ) }}
+  {{- if .Values.saasRegistryParameters.bindSidecar }}
+    {{- $srvHostFull = include "cap.deploymentHostFull" (merge (dict "name" "sidecar" "deployment" .Values.sidecar) . ) }}
+  {{- end}}
   {{- $parameters := .Values.saasRegistryParameters }}
   {{- $appUrls := $parameters.appUrls }}
   {{- $_ := set $appUrls "getDependencies" (printf "https://%s%s" $srvHostFull $appUrls.getDependencies) }}
   {{- $_ := set $appUrls "onSubscription" (printf "https://%s%s" $srvHostFull $appUrls.onSubscription) }}
   {{- $parameters | mustToJson }}
-{{- end }}
+{{- end }}

package/lib/init/template/helm/files/Chart.yaml.hbs

@@ -7,7 +7,4 @@ description: {{cap.appDescription}}
 type: application
 version: {{cap.appVersion}}
 appVersion: {{cap.appVersion}}
-dependencies:
-  - name: web-application
-    alias: srv
-    version: 0.1.0
+

package/lib/init/template/helm/index.js

@@ -3,7 +3,6 @@ const { exists, rimraf } = require('../../../cds').utils;
 const { readProject } = require('../../util/projectReader');
 const { mergeYAML } = require('../../util/merge')
 const { parseMd5File, writeMd5File, copyAndTrack } = require('../../util/md5Tracking')
-//const { yaml } = require('@sap/cds-foss')
 
 module.exports = class HelmTemplate extends require('../templateBase') {
     constructor(generator, oldTrackingData = undefined, newTrackingData = {}) {
@@ -20,15 +19,16 @@ module.exports = class HelmTemplate extends require('../templateBase') {
 
     async canRun() {
         if (this.options.force) {
-            await rimraf(join(this.projectPath, 'chart'))
+            await rimraf(join('chart'))
             return true;
         }
         return true;
     }
 
-    async addSubChart(subchart) {
-        const subchartPath = join(this.projectPath, 'chart', 'charts', subchart);
-        if(!exists(subchartPath)) {
+    async addSubChart(subchart, force = false) {
+        const subchartPath = join('chart', 'charts', subchart);
+        const isInternal = !force && await this.isInternal();
+        if(!exists(subchartPath) && !isInternal) {
             await copyAndTrack(
                 join(__dirname, 'subcharts', subchart),
                 subchartPath,
@@ -37,34 +37,66 @@ module.exports = class HelmTemplate extends require('../templateBase') {
 
             return true;
         }
-        
+
         return false;
     }
 
+    async isInternal() {
+        return !exists(join('chart', 'charts', 'web-application')) || this.options['internal-unified-runtime-charts'];
+    }
+
+    async addDependency(name, alias){
+        const projectDescriptor = await readProject(this.options);
+        const isInternal = await this.isInternal();
+        await mergeYAML(
+            join('chart', 'Chart.yaml'),
+            {
+                dependencies: [
+                    {
+                        name,
+                        alias,
+                        version: '>0.0.0',
+                        ...(isInternal) && { repository: 'https://int.repositories.cloud.sap/artifactory/virtual-unified-runtime-helm-dmz' }
+                    }
+                ]
+            },
+            projectDescriptor,
+            { additions: [{
+                in: `dependencies`,
+                where: [{
+                    property: 'alias',
+                    isEqualTo: alias
+                }]
+            }]}
+        )
+    }
+
     async run() {
         const projectDescriptor = await readProject(this.options)
-        this.oldTrackingData = await parseMd5File(join(this.projectPath, 'chart', '.cds-add-helm-files.md5'));
-
-        await this.addSubChart('web-application');
+        const isInternal = this.options['internal-unified-runtime-charts'] !== undefined && this.options['internal-unified-runtime-charts'];
+        this.oldTrackingData = await parseMd5File(join('chart', '.cds-add-helm-files.md5'));
+        await this.addSubChart('web-application', !isInternal);
         await copyAndTrack(
             join(__dirname, 'chart'),
-            join(this.projectPath, 'chart'),
+            join('chart'),
             this
         )
 
         await mergeYAML(
-            join(this.projectPath, 'chart', 'Chart.yaml'),
+            join('chart', 'Chart.yaml'),
             join(__dirname, 'files', 'Chart.yaml.hbs'),
             projectDescriptor
         )
 
+        await this.addDependency('web-application', 'srv');
+
         await mergeYAML(
-            join(this.projectPath, 'chart', 'values.yaml'),
+            join('chart', 'values.yaml'),
             join(__dirname, 'files', 'values.yaml.hbs'),
             projectDescriptor
         )
         await this.runDependentMerging();
-        await writeMd5File(join(this.projectPath, 'chart', '.cds-add-helm-files.md5'), this.newTrackingData);
+        await writeMd5File(join('chart', '.cds-add-helm-files.md5'), this.newTrackingData);
     }
 
     async runDependentMerging() {

package/lib/init/template/html5-repo/index.js

@@ -39,11 +39,10 @@ module.exports = class Html5RepoTemplate extends require('../templateBase') {
             let isIndependentCommand = false
             if(Object.keys(context).length == 0){
                 isIndependentCommand = true
-                context.projectPath = this.projectPath
-                context.oldTrackingData = context.newTrackingData = await parseMd5File(join(this.projectPath, 'chart', '.cds-add-helm-files.md5'))
+                context.oldTrackingData = context.newTrackingData = await parseMd5File(join('chart', '.cds-add-helm-files.md5'))
             }
             await mergeYAML(
-                join(this.projectPath, 'chart', 'values.yaml'),
+                join('chart', 'values.yaml'),
                 {
                     'html5-apps-repo-host': {
                         serviceOfferingName: 'html5-apps-repo',
@@ -84,38 +83,16 @@ module.exports = class Html5RepoTemplate extends require('../templateBase') {
             isIndependentCommand = isIndependentCommand | await helmTemplate.addSubChart('content-deployment');
 
             // add dependency entry in chart.yaml
-            await mergeYAML(
-                join(this.projectPath, 'chart', 'Chart.yaml'),
-                join(__dirname, 'files', 'html5-apps-deployer.yaml'),
-                projectDescriptor,
-                { additions: [{
-                    in: `dependencies`,
-                    where: [{
-                        property: 'alias',
-                        isEqualTo: 'html5-apps-deployer'
-                    }]
-                }]}
-            )
+            await helmTemplate.addDependency('content-deployment', 'html5-apps-deployer');
 
             // copy service-instance chart
             isIndependentCommand = isIndependentCommand | await helmTemplate.addSubChart('service-instance');
 
             // add dependency entry in chart.yaml
-            await mergeYAML(
-                join(this.projectPath, 'chart', 'Chart.yaml'),
-                join(__dirname, 'files', 'html5-apps-repo-host.yaml'),
-                projectDescriptor,
-                { additions: [{
-                    in: `dependencies`,
-                    where: [{
-                        property: 'alias',
-                        isEqualTo: 'html5-apps-repo-host'
-                    }]
-                }]}
-            )
+            await helmTemplate.addDependency('service-instance', 'html5-apps-repo-host');
 
-            await copyAndTrack(join(__dirname, 'files', 'html5-apps-deployer-configmap.yaml'), join(this.projectPath, 'chart', 'templates', 'html5-apps-deployer-configmap.yaml'), context)
-            if(isIndependentCommand) await writeMd5File(join(this.projectPath, 'chart', '.cds-add-helm-files.md5'), context.newTrackingData)
+            await copyAndTrack(join(__dirname, 'files', 'html5-apps-deployer-configmap.yaml'), join('chart', 'templates', 'html5-apps-deployer-configmap.yaml'), context)
+            if(isIndependentCommand) await writeMd5File(join('chart', '.cds-add-helm-files.md5'), context.newTrackingData)
         }
     }
 }

package/lib/init/template/java/index.js

@@ -53,7 +53,7 @@ module.exports = class JavaTemplate extends require('../templateBase') {
     }
 
     async finalize() {
-        const relativeProjectPath = relative(this.cwd, this.projectPath);
+        const relativeProjectPath = relative(this.cwd, cds.root);
         if (relativeProjectPath && relativeProjectPath !== '.') {
             LOG.info(`Continue with 'cd ${relativeProjectPath}'`);
         }

package/lib/init/template/kibana-logging/files/mta.yaml.hbs

@@ -1,7 +1,8 @@
 ---
 modules:
   - name: {{cap.appName}}-srv
-    type: {{cap.pLanguage}}
+    type: {{cap.language}}
+    path: {{& cap.srvPath}}
     requires:
       - name: {{cap.appName}}-cf-logging
 

package/lib/init/template/kibana-logging/index.js

@@ -2,12 +2,11 @@ const { join } = require('path')
 const cds = require('../../../cds')
 const { readProject } = require('../../util/projectReader')
 const { mergeJSON, mergeYAML } = require('../../util/merge')
-const { PROJECT_TYPE, } = require('../../constants')
+const { PROJECT_TYPE } = require('../../constants')
 const { srvNode, srvJava, kibanaLogging } = require('../_merging/registry-mta')
 
 module.exports = class KibanaLoggingTemplate extends require('../templateBase') {
 
-
     async canRun() {
         const projectDescriptor = await readProject(this.options)
         const { hasMta, hasHelm } = projectDescriptor.cap
@@ -31,7 +30,7 @@ module.exports = class KibanaLoggingTemplate extends require('../templateBase')
                 const { for: forProfile } = projectDescriptor.cap
                 const cdsTemplateFile = forProfile ? 'cds.profile.package.json.hbs' : 'cds.package.json'
                 const cdsTemplatePath = join(__dirname, 'files', cdsTemplateFile)
-                await mergeJSON(join(this.projectPath, 'package.json'), cdsTemplatePath, projectDescriptor)
+                await mergeJSON('package.json', cdsTemplatePath, projectDescriptor)
             }
         }
         await this.runDependentMerging()
@@ -39,14 +38,12 @@ module.exports = class KibanaLoggingTemplate extends require('../templateBase')
 
     async runDependentMerging() {
         const projectDescriptor = await readProject(this.options)
-        const { hasMta, isNodejs } = projectDescriptor.cap
+        const { hasMta, isNodejs, srvPath } = projectDescriptor.cap
 
         if (hasMta) {
-            const srv = isNodejs ? srvNode : srvJava
-
-            const mtaYAMLPath = join(this.projectPath, 'mta.yaml')
+            const srv = (isNodejs ? srvNode : srvJava)(srvPath)
             await mergeYAML(
-                mtaYAMLPath,
+                'mta.yaml',
                 join(__dirname, 'files', 'mta.yaml.hbs'),
                 projectDescriptor,
                 {