@sap/cds-dk 7.0.2 → 7.0.3

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

@@ -28,16 +28,15 @@ module.exports = class ApprouterTemplate extends require('../templateBase') {
     }
 
     async run() {
-        const { appPath = 'app' } = await readProject(this.options)
+        const { appPath = 'app' } = await readProject()
         const appPackageJSONPath = join(appPath, 'package.json')
         await mergeJSON(appPackageJSONPath, join(__dirname, 'files', 'package.json'))
         await sort(appPackageJSONPath, 'dependencies')
         await mergeJSON(join(appPath, 'default-env.json'), join(__dirname, 'files', 'default-env.json'))
-        await this.runDependentMerging()
     }
 
     async runDependentMerging(context = {}) {
-        const project = await readProject(this.options)
+        const project = await readProject()
         const { isNodejs, isJava, isExtensible, isMultitenant, hasMta, hasHelm, srvPath, appPath } = project
 
         if (hasMta) {
@@ -76,7 +75,7 @@ module.exports = class ApprouterTemplate extends require('../templateBase') {
 
             // add dependency entry in chart.yaml
             const HelmTemplate = require(`../helm`);
-            const helmTemplate = new HelmTemplate(this.generator, context.oldTrackingData, context.newTrackingData);
+            const helmTemplate = new HelmTemplate(context.oldTrackingData, context.newTrackingData);
             await helmTemplate.addDependency('web-application', 'approuter');
 
             await mergeYAML(

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

@@ -13,15 +13,14 @@ module.exports = class AuditlogTemplate extends require('../templateBase') {
     }
 
     async run() {
-        const project = await readProject(this.options)
+        const project = await readProject()
         const { configFile } = project
         project.shortcut = !(await read(configFile)).cds?.requires?.['audit-log']?.kind
         await mergeJSON(configFile, join(__dirname, 'files', 'package.json.hbs'), project)
-        await this.runDependentMerging()
     }
 
     async runDependentMerging(context = {}) {
-        const project = await readProject(this.options)
+        const project = await readProject()
         const { isNodejs, hasMta, hasHelm, srvPath } = project
 
         if (hasMta) {
@@ -63,7 +62,7 @@ module.exports = class AuditlogTemplate extends require('../templateBase') {
 
             // copy service instance chart if it is not present
             const HelmTemplate = require(`../helm`);
-            const helmTemplate = new HelmTemplate(this.generator, context.oldTrackingData, context.newTrackingData);
+            const helmTemplate = new HelmTemplate(context.oldTrackingData, context.newTrackingData);
             isIndependentCommand = isIndependentCommand | await helmTemplate.addSubChart('service-instance');
 
             // add dependency entry in chart.yaml

package/lib/init/template/cf-manifest/files/manifest.yml.hbs

@@ -7,7 +7,7 @@ applications:
 # -----------------------------------------------------------------------------------
 # Backend Service
 # -----------------------------------------------------------------------------------
-- name: {{appName}}-{{srvName}}
+- name: {{appName}}-srv
   random-route: true  # for development only
 {{#isNodejs}}
   path: {{& srvPath}}
@@ -15,42 +15,34 @@ applications:
   buildpack: nodejs_buildpack
 {{/isNodejs}}
 {{#isJava}}
-  path: {{& srvPath}}/target/{{srvExt.archiveName}}
+  path: {{& srvPath}}/target/{{archiveName}}
   memory: 1G
   disk_quota: 512M
   env:
     SPRING_PROFILES_ACTIVE: cloud
   buildpack: java_buildpack
 {{/isJava}}
-{{#hasRequires}}
   services:
-{{#requires}}
-{{#resource.isHana}}
-  - {{resource.name}}
-{{/resource.isHana}}
-{{#resource.isXsuaa}}
-  - {{resource.name}}
-{{/resource.isXsuaa}}
-{{/requires}}
-{{/hasRequires}}
+{{#hasHana}}
+  - {{appName}}-db
+{{/hasHana}}
+{{#hasXsuaa}}
+  - {{appNames}}-auth
+{{/hasXsuaa}}
 
-{{#needsSidecar}}
+{{#hasHana}}
+{{^isMultitenant}}
 # -----------------------------------------------------------------------------------
 # HANA Database Content Deployer App
 # -----------------------------------------------------------------------------------
-- name: {{appName}}-{{db.0.name}}-deployer
-  path: {{& db.0.path}}
+- name: {{appName}}-{{db.name}}-deployer
+  path: {{& db.path}}
   no-route: true
   health-check-type: process
   memory: 256M
   instances: 1
   buildpack: nodejs_buildpack
-{{#hasRequires}}
   services:
-{{#requires}}
-{{#resource.isHana}}
-  - {{resource.name}}
-{{/resource.isHana}}
-{{/requires}}
-{{/hasRequires}}
-{{/needsSidecar}}
+  - {{appName}}-db
+{{/isMultitenant}}
+{{/hasHana}}

package/lib/init/template/cf-manifest/files/services-manifest.yml.hbs

@@ -2,21 +2,26 @@
 # appName = {{appName}}
 ---
 create-services:
-{{#requires}}
-# ------------------------------------------------------------
-  - name:   {{resource.name}}
-{{#resource.isHana}}
-{{#resource.isPlainHana}}
-    broker: {{resource.service}}  # 'hanatrial' on trial landscapes
-    plan: "hdi-shared"
-{{/resource.isPlainHana}}
-{{/resource.isHana}}
-{{#resource.isXsuaa}}
-    broker: {{resource.service}}
+{{#hasHana}}
+{{#isMultitenant}}
+  - name: {{appName}}-db
+    broker: service-manager
+    plan: container
+{{/isMultitenant}}
+{{^isMultitenant}}
+  - name: {{appName}}-db
+    broker: hana
+    plan: hdi-shared
+{{/isMultitenant}}
+{{/hasHana}}
+{{#hasXsuaa}}
+  - name: {{appName}}-auth
+    broker: xsuaa
     plan: application
-{{/resource.isXsuaa}}
-{{#resource.vcap.name}}
-    broker: {{resource.service}}
-    plan: {{resource.vcap.name}}
-{{/resource.vcap.name}}
-{{/requires}}
+    parameters: xs-security.json
+{{/hasXsuaa}}
+{{#hasAuditlog}}
+  - name: {{appName}}-auditlog
+    broker: auditlog
+    plan: application
+{{/hasAuditlog}}

package/lib/init/template/cf-manifest/index.js

@@ -9,7 +9,7 @@ const SERVICES_MANIFEST_FILE = 'services-manifest.yml'
 module.exports = class CfManifestTemplate extends require('../templateBase') {
 
     async canRun() {
-        if (this.options.force) {
+        if (cds.cli.options.force) {
             return true
         }
         if (exists(MANIFEST_FILE) || exists(SERVICES_MANIFEST_FILE)) {
@@ -20,6 +20,6 @@ module.exports = class CfManifestTemplate extends require('../templateBase') {
 
     async run() {
         const project = await readProject()
-        await copyFiles(join(__dirname, 'files'), cds.root, project, this.options.force)
+        await copyFiles(join(__dirname, 'files'), cds.root, project, true)
     }
 }

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

@@ -11,14 +11,13 @@ module.exports = class ConnectivityTemplate extends require('../templateBase') {
     }
 
     async run() {
-        const project = await readProject(this.options)
+        const project = await readProject()
         const { configFile } = project
         await mergeJSON(configFile, join(__dirname, 'files', 'package.json.hbs'), project)
-        await this.runDependentMerging()
     }
 
     async runDependentMerging(context = {}) {
-        const project = await readProject(this.options)
+        const project = await readProject()
         const { isJava, srvPath, hasHelm, hasMta } = project
 
         if (hasMta) {

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

@@ -8,19 +8,19 @@ const DEBUG = cds.debug('cli')
 module.exports = class DataTemplate extends require('../templateBase') {
 
   async run() {
-    if (this.options['for']) {
+    if (cds.cli.options.for) {
       throw `\nError: Did you mean \`... --data:for\` ?`
     }
 
     const env = await this.getEnv();
 
-    let dest = (typeof this.options.out === 'string') // target folder
-      ? this.options.out
+    let dest = (typeof cds.cli.options.out === 'string') // target folder
+      ? cds.cli.options.out
       : getDefaultTargetFolder(env);
     dest = resolve(cds.root, dest);
 
-    const nameFilter = asRegex(this.options['data:for'])
-    const force = this.options.force;
+    const nameFilter = asRegex(cds.cli.options['data:for'])
+    const { force } = cds.cli.options
 
     let csn = await cds.compile.to.csn(cds.env.roots) // normal CSN
 

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

@@ -15,14 +15,13 @@ module.exports = class DestinationTemplate extends require('../templateBase') {
     }
 
     async run() {
-        const project = await readProject(this.options)
+        const project = await readProject()
         const { configFile } = project
         await mergeJSON(configFile, join(__dirname, 'files', `package.json.hbs`), project)
-        await this.runDependentMerging()
     }
 
     async runDependentMerging(context = {}) {
-        const project = await readProject(this.options)
+        const project = await readProject()
         const { isJava, hasHelm, hasDestination, hasMta, srvPath, hasHtml5Repo } = project
 
         if (hasMta) {
@@ -36,7 +35,6 @@ module.exports = class DestinationTemplate extends require('../templateBase') {
         }
 
         if (hasHelm) {
-            //const env = await this.getEnv()
             const binding = hasDestination && { srv: { bindings: { destination: { serviceInstanceName: 'destination' }}}}
             const html5Binding = hasHtml5Repo && { 'html5-apps-deployer': { bindings: { destination: { serviceInstanceName: 'destination' }}}}
 
@@ -64,7 +62,7 @@ module.exports = class DestinationTemplate extends require('../templateBase') {
 
             // copy service instance chart if it is not present
             const HelmTemplate = require(`../helm`);
-            const helmTemplate = new HelmTemplate(this.generator, context.oldTrackingData, context.newTrackingData);
+            const helmTemplate = new HelmTemplate(context.oldTrackingData, context.newTrackingData);
             isIndependentCommand = isIndependentCommand | await helmTemplate.addSubChart('service-instance');
 
             // add dependency entry in chart.yaml

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

@@ -10,7 +10,7 @@ const { srvNode4, srvJava4, enterpriseMessaging } = require('../_merging/registr
 module.exports = class EnterpriseMessagingTemplate extends require('../templateBase') {
 
   async canRun() {
-    const { isJava } = await readProject(this.options)
+    const { isJava } = await readProject()
     if (isJava) throw `'cds add enterprise-messaging' is not available for Java yet`
     return true
   }
@@ -20,14 +20,13 @@ module.exports = class EnterpriseMessagingTemplate extends require('../templateB
   }
 
   async run() {
-    const project = await readProject(this.options)
+    const project = await readProject()
     const { configFile } = project
     await mergeJSON(configFile, join(__dirname, 'files', 'package.json.hbs'), project)
-    await this.runDependentMerging()
   }
 
   async runDependentMerging(context = {}) {
-    const project = await readProject(this.options)
+    const project = await readProject()
     const { hasXsuaa, hasHelm, hasMta, isNodejs, srvPath, appName } = project
 
     if (hasMta) {
@@ -81,7 +80,7 @@ module.exports = class EnterpriseMessagingTemplate extends require('../templateB
 
       // copy service instance chart if it is not present
       const HelmTemplate = require(`../helm`);
-      const helmTemplate = new HelmTemplate(this.generator, context.oldTrackingData, context.newTrackingData);
+      const helmTemplate = new HelmTemplate(context.oldTrackingData, context.newTrackingData);
       isIndependentCommand = isIndependentCommand | await helmTemplate.addSubChart('service-instance');
 
       // add dependency entry in chart.yaml

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

@@ -8,7 +8,7 @@ const { srvNode4, srvJava4, enterpriseMessaging } = require('../_merging/registr
 module.exports = class EnterpriseMessagingSharedTemplate extends require('../templateBase') {
 
   async canRun() {
-    const { hasMta, hasHelm, isJava }  = await readProject(this.options)
+    const { hasMta, hasHelm, isJava }  = await readProject()
     if (isJava)             throw `'cds add enterprise-messaging-shared' is not available for Java yet`
     if (hasHelm && !hasMta) throw `'cds add enterprise-messaging-shared' is not available for Kyma yet`
     return true
@@ -19,16 +19,15 @@ module.exports = class EnterpriseMessagingSharedTemplate extends require('../tem
   }
 
   async run() {
-    const project = await readProject(this.options)
+    const project = await readProject()
     const { configFile } = project
     project.shortcut = !(await read(configFile)).cds?.requires?.messaging?.kind
     await mergeJSON(configFile, join(__dirname, 'files', 'package.json.hbs'), project)
     await mergeJSON('event-mesh.json', join(__dirname, 'files', 'event-mesh.json.hbs'), project)
-    await this.runDependentMerging()
   }
 
   async runDependentMerging() {
-    const project = await readProject(this.options)
+    const project = await readProject()
     const { hasMta, isNodejs, srvPath } = project
 
     if (hasMta) {

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

@@ -21,14 +21,13 @@ module.exports = class ExtensibilityTemplate extends require('../templateBase')
   }
 
   async run() {
-    const project = await readProject(this.options)
+    const project = await readProject()
     const { configFile } = project
     await mergeJSON(configFile, join(__dirname, 'files', 'package.json.hbs'), project)
-    await this.runDependentMerging()
   }
 
   async runDependentMerging() {
-    const project = await readProject(this.options)
+    const project = await readProject()
     const { hasXsuaa } = project
     if (hasXsuaa) {
       await mergeJSON(

package/lib/init/template/file-based-messaging/index.js

@@ -6,7 +6,7 @@ const { mergeJSON } = require('../../util/merge')
 module.exports = class FileBasedMessagingTemplate extends require('../templateBase') {
 
   async canRun() {
-    const { isJava } = await readProject(this.options)
+    const { isJava } = await readProject()
     if (isJava) throw `'cds add file-based-messaging' is not available for Java yet`
     return true
   }
@@ -16,7 +16,7 @@ module.exports = class FileBasedMessagingTemplate extends require('../templateBa
   }
 
   async run() {
-    const project = await readProject(this.options)
+    const project = await readProject()
     const { configFile } = project
     project.shortcut = !(await read(configFile)).cds?.requires?.messaging?.kind
     await mergeJSON(configFile, join(__dirname, 'files', 'package.json.hbs'), project)

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

@@ -9,7 +9,7 @@ modules:
 {{^isMultitenant}}
   - name: {{appName}}-db-deployer
     type: hdb
-    path: {{& db.0.path}}
+    path: {{& db.path}}
     parameters:
       buildpack: nodejs_buildpack
 {{#isJava}}

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

@@ -1,17 +1,15 @@
-const { join } = require('path');
+const { join } = require('path')
 const cds = require('../../../cds')
 const { read, write, exists, rmdir } = cds.utils
-const commandUtil = require('../../../util/command');
-const mvnArchetypes = require('../../util/mvn');
-const term = require('../../../util/term');
+const { readProject } = require('../../util/projectReader')
 const { mergeJSON, mergeYAML, removeFromYAML, removeFromYAMLArray } = require('../../util/merge')
+const mvn = require('../../util/mvn')
 const { parseMd5File, writeMd5File } = require('../../util/md5')
 const { copyFiles } = require('../../util/template')
-const { readProject } = require('../../util/projectReader');
 
-const { OPTIONS: { JAVA }, URLS } = require('../../constants');
+const { OPTIONS: { JAVA } } = require('../../constants')
 
-const { srvNode4, srvJava4, hdbDeployer, serviceManager, hdiContainer, mtxSidecar4 } = require('../_merging/registry-mta');
+const { srvNode4, srvJava4, hdbDeployer, serviceManager, hdiContainer, mtxSidecar4 } = require('../_merging/registry-mta')
 
 module.exports = class HanaTemplate extends require('../templateBase') {
 
@@ -20,56 +18,40 @@ module.exports = class HanaTemplate extends require('../templateBase') {
     }
 
     async run() {
-        const project = await readProject(this.options)
-        const { isJava, configFile } = project
+        const project = await readProject()
+        const { isJava, configFile, db } = project
         project.shortcut = !(await read(configFile)).cds?.requires?.db?.kind
 
-        const env = await this.getEnv() // REVISIT: Get info from project
-
         // REVISIT: Let cds build generate by default
-        const hdiConfigPath = join(env.folders.db, 'src', '.hdiconfig')
+        const hdiConfigPath = join(db.folder, 'src', '.hdiconfig')
         const hdiConfigTemplatePath = join(__dirname, 'files', 'src', '.hdiconfig')
         await mergeJSON(hdiConfigPath, hdiConfigTemplatePath)
 
         // REVISIT: Let csd build generate by default
-        const undeployJSONPath = join(env.folders.db, 'undeploy.json')
+        const undeployJSONPath = join(db.folder, 'undeploy.json')
         const undeployJSONTemplatePath = join(__dirname, 'files', 'undeploy.json')
         await mergeJSON(undeployJSONPath, undeployJSONTemplatePath)
 
         if (isJava) {
-            await copyFiles(join(__dirname, 'files', 'db'), env.folders.db, {}, this.options.force)
-            await this._updatePomXml()
+            await copyFiles(join(__dirname, 'files', 'db'), db.folder, {}, cds.cli.options.force)
+            // REVISIT: shouldn't behave differently during cds init
+            // if called during cds init the project generation call to AT will add settings
+            if (!cds.cli.options.add.has(JAVA)) await mvn.execMvn(mvn.getAddHanaCmdArgs())
         }
 
-        await mergeJSON(configFile, join(__dirname, 'files', 'package.json.hbs'), project, { forceOverwrite: true })
+        await mergeJSON(configFile, join(__dirname, 'files', 'package.json.hbs'), project, { forceOverwrite: true }) // REVISIT: forceOverwrite: true as default?
 
-        const packageJson = exists('package.json') ? await read('package.json') : undefined
+        const packageJson = exists('package.json') ? await read('package.json') : null
         if (packageJson?.dependencies) {
             delete packageJson.dependencies['@sap/hana-client']
             await write('package.json', packageJson, { spaces: 2 })
         }
-        await this.runDependentMerging()
-    }
-
-    async removeEntriesFromContext(context, key) {
-        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];
-            }
-        });
     }
 
     async runDependentMerging(context = {}) {
-        const project = await readProject(this.options)
+        const project = await readProject()
         const { hasMta, hasHelm, hasHtml5Repo, isJava, isMultitenant, srvPath } = project
 
-
         if (hasMta) {
             const srv = (isJava ? srvJava4 : srvNode4)(srvPath)
             const db = isMultitenant ? serviceManager : hdiContainer
@@ -92,26 +74,23 @@ module.exports = class HanaTemplate extends require('../templateBase') {
                 into: [srv, 'requires', 'name']
             }]
 
-            if (!isMultitenant) {
+            if (isMultitenant) {
                 relationships.push({
-                    insert: [hdiContainer, 'name'],
-                    into: [hdbDeployer, 'requires', 'name']
+                    insert: [serviceManager, 'name'],
+                    into: [mtxSidecar4(isJava ? 'mtx/sidecar' : 'gen/mtx/sidecar'), 'requires', 'name']
                 })
             } else {
                 relationships.push({
-                    insert: [serviceManager, 'name'],
-                    into: [mtxSidecar4(isJava ? 'mtx/sidecar' : 'gen/mtx/sidecar'), 'requires', 'name']
+                    insert: [hdiContainer, 'name'],
+                    into: [hdbDeployer, 'requires', 'name']
                 })
             }
 
-            const modules = !isMultitenant ? [srv, hdbDeployer] : [srv]
+            const modules = isMultitenant ? [srv] : [srv, hdbDeployer]
 
-            await mergeYAML(
-                'mta.yaml',
-                join(__dirname, 'files', 'mta.yaml.hbs'),
-                project,
-                { additions: [...modules, db].filter(a => a), deletions, relationships }
-            )
+            await mergeYAML('mta.yaml', join(__dirname, 'files', 'mta.yaml.hbs'), project, {
+                additions: [...modules, db].filter(a => a), deletions, relationships
+            })
         }
 
         if (hasHelm) {
@@ -123,7 +102,7 @@ module.exports = class HanaTemplate extends require('../templateBase') {
             }
 
             const HelmTemplate = require(`../helm`);
-            const helmTemplate = new HelmTemplate(this.generator, context.oldTrackingData, context.newTrackingData);
+            const helmTemplate = new HelmTemplate(context.oldTrackingData, context.newTrackingData);
 
             if(isMultitenant){
                 shouldUpdateTrackingFile = true;
@@ -137,7 +116,7 @@ module.exports = class HanaTemplate extends require('../templateBase') {
                 // remove content-deployment subchart if html5Repo doesn't exist
                 if(!hasHtml5Repo) {
                     const contentDeploymentEntriesPattern = "charts/content-deployment/"
-                    await this.removeEntriesFromContext(context, contentDeploymentEntriesPattern);
+                    this.removeEntriesFromContext(context, contentDeploymentEntriesPattern);
 
                     const contentDeploymentSubchartPath = join('chart', 'charts', 'content-deployment');
                     if(exists(contentDeploymentSubchartPath)) {
@@ -193,21 +172,18 @@ module.exports = class HanaTemplate extends require('../templateBase') {
         }
     }
 
-    async _updatePomXml() {
-        // if called during cds init the project generation call to AT will add settings
-        if (!this.options.add.has(JAVA)) {
-            const mvnAddHanaArgs = mvnArchetypes.getAddHanaCmdArgs(this.options);
-            try {
-                await commandUtil.spawnCommand('mvn', mvnAddHanaArgs, {
-                    cwd: cds.root
-                });
-            } catch (err) {
-                // REVISIT: This should not have to be checked and tested in a facet implementation, move to Maven util
-                if (err.code === 'ENOENT' && err.path === 'mvn') {
-                    throw `Maven executable 'mvn' not found, follow ${term.info(URLS.MAVEN_INSTALL_HELP)} and install Maven on your machine.`
-                }
-                throw err;
+    // REVISIT: tracking data massaging is getting too much -> revisit md5 tracking
+    removeEntriesFromContext(context, key) {
+        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]
+            }
+        })
     }
 }

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

@@ -1,13 +1,14 @@
 const { join } = require('path');
-const { exists, rimraf } = require('../../../cds').utils;
+const cds = require('../../../cds')
+const { exists, rimraf } = cds.utils
 const { readProject } = require('../../util/projectReader');
 const { mergeYAML } = require('../../util/merge')
 const { parseMd5File, writeMd5File, copyAndTrack } = require('../../util/md5')
 
 module.exports = class HelmTemplate extends require('../templateBase') {
 
-    constructor(generator, oldTrackingData = undefined, newTrackingData = {}) {
-        super(generator)
+    constructor(oldTrackingData = undefined, newTrackingData = {}) {
+        super()
         this.oldTrackingData = oldTrackingData;
         this.newTrackingData = newTrackingData;
     }
@@ -16,18 +17,19 @@ module.exports = class HelmTemplate extends require('../templateBase') {
         return ['hana', 'xsuaa', 'auditlog', 'enterprise-messaging', 'destination' , 'multitenancy', 'extensibility', 'approuter', 'connectivity']
     }
 
-    static hasFacet(_, options) {
+    static hasFacet() {
         // REVISIT: this works, but could be semantically nicer with a 'shouldRunDependentMerging' or the like
-        if (options?.add.has('mta') && !options?.add.has('helm')) return false
+        const { add } = cds.cli.options
+        if (add.has('mta') && !add.has('helm')) return false
         return exists(join('chart', 'values.yaml'))
     }
 
     async canRun() {
-        if (this.options.force) {
+        if (cds.cli.options.force) {
             await rimraf(join('chart'))
-            return true;
+            return true
         }
-        return true;
+        return true
     }
 
     async addSubChart(subchart, force = false) {
@@ -47,11 +49,11 @@ module.exports = class HelmTemplate extends require('../templateBase') {
     }
 
     async isInternal() {
-        return !exists(join('chart', 'charts', 'web-application')) || this.options['internal-unified-runtime-charts'];
+        return !exists(join('chart', 'charts', 'web-application')) || cds.cli.options['internal-unified-runtime-charts'];
     }
 
     async addDependency(name, alias){
-        const project = await readProject(this.options);
+        const project = await readProject();
         const isInternal = await this.isInternal();
         await mergeYAML(
             join('chart', 'Chart.yaml'),
@@ -77,8 +79,8 @@ module.exports = class HelmTemplate extends require('../templateBase') {
     }
 
     async run() {
-        const project = await readProject(this.options)
-        const isInternal = this.options['internal-unified-runtime-charts'] !== undefined && this.options['internal-unified-runtime-charts'];
+        const project = await readProject()
+        const isInternal = cds.cli.options['internal-unified-runtime-charts'] !== undefined && cds.cli.options['internal-unified-runtime-charts'];
         this.oldTrackingData = await parseMd5File(join('chart', '.cds-add-helm-files.md5'));
         await this.addSubChart('web-application', !isInternal);
         await copyAndTrack(
@@ -100,7 +102,6 @@ module.exports = class HelmTemplate extends require('../templateBase') {
             join(__dirname, 'files', 'values.yaml.hbs'),
             project
         )
-        await this.runDependentMerging();
         await writeMd5File(join('chart', '.cds-add-helm-files.md5'), this.newTrackingData);
     }
-};
+}