@sap/cds-dk 9.4.1 → 9.4.2

package/CHANGELOG.md

@@ -6,6 +6,24 @@ This project adheres to [Semantic Versioning](https://semver.org/).
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/).
 
+## Version 9.4.2 - 2025-10-23
+
+### Changed
+
+- `cds add containerize` does not add app module installations scripts to its `containerize.yaml`. Use `cds up --to k8s` instead.
+- `cds add` is less eager with respect to changing unaffected configuration.
+- `cds add ias` adds less unnecessary configuration in combination with the HTML5 repository.
+- `cds add test` includes the service name in the test suite description.
+
+### Fixed
+
+- `cds add ams` followed by `cds add mta` correctly generates the AMS deployer module.
+- `cds add hana` does not fail if there's no `.cdsrc.json`.
+- `cds up` doesn't try to create a symlink to the monorepo _package-lock.json_ if a submodule-local one already exists.
+- `cds add test` creates correct OData URLs with unqualified entity names in service paths.
+- `cds add http` skips contained composition targets.
+- `cds add sample` no longer comes with an error when creating a Book through Fiori.
+
 ## Version 9.4.1 - 2025-10-09
 
 ### Added

package/bin/up.js

@@ -52,7 +52,7 @@ async function up() {
   for (const { app } of apps) {
     const appPath = path.join(cds.root, cds.env.folders.app, app)
     if (exists(path.join(appPath, 'package.json')) && !exists(path.join(appPath, 'package-lock.json'))) {
-      run(`npm i --package-lock-only --prefix ${appPath}`)
+      run(`npm i --prefix ${appPath}`)
     }
   }
 
@@ -91,7 +91,7 @@ async function up() {
     const target = path.join(process.cwd(), 'package-lock.json')
     if (exists(target) && fs.lstatSync(target).isSymbolicLink()) fs.unlinkSync(target)
     const relative = path.relative(process.cwd(), source)
-    fs.symlinkSync(relative, target, 'junction')
+    if (!exists(target)) fs.symlinkSync(relative, target, 'junction')
   }
 
   if (cds.cli.options.to === 'k8s') {

package/lib/build/plugins/helm/index.js

@@ -66,7 +66,6 @@ module.exports = class HelmBuildPlugin extends Plugin {
       await this.copy(join(pluginResourcePath, 'connectivity/connectivity-proxy-info.yaml')).to('templates/connectivity-proxy-info.yaml')
     }
 
-
     if (hasHtml5Repo) {
       await this.copy(join(pluginResourcePath, 'html5-repo/html5-apps-deployer-configmap.yaml')).to('templates/html5-apps-deployer-configmap.yaml')
     }

package/lib/init/constants.js

@@ -5,7 +5,7 @@ module.exports = {
     COMMAND_ADD: 'add',
 
     JAVA_LTS_VERSIONS: [17, 21],
-    MAVEN_ARCHETYPE_VERSION: '4.4.0',
+    MAVEN_ARCHETYPE_VERSION: '4.4.1',
 
     OPTIONS: Object.freeze({
         COMPLETION: 'completion',
@@ -57,6 +57,8 @@ module.exports = {
         APP_FRONTEND: 'app-frontend',
         PORTAL: 'portal',
         APPLICATION_LOGGING: 'application-logging',
+        CLOUD_LOGGING: 'cloud-logging',
+        TELEMETRY: 'telemetry',
         AUDIT_LOGGING: 'audit-logging',
         NOTIFICATIONS: 'notifications',
         WORKZONE: 'workzone',

package/lib/init/index.js

@@ -161,9 +161,7 @@ module.exports = class CDSGenerator {
             if (!cds.cli.options.dry) console.log(`adding ${term.bold(facet)}`)
             const template = this.templateList[i]
             await template.run()
-            await template.combine()
         }
-
         DEBUG && console.log()
         DEBUG && console.log('plugins active for production:')
         const fromDk = readdirSync(join(__dirname, './template'))
@@ -176,7 +174,7 @@ module.exports = class CDSGenerator {
             for (const plugin of sorted) {
                 const Plugin = registered.get(plugin) ?? require('./template/' + plugin)
                 const template = new Plugin()
-                const inProduction = Plugin.hasInProduction(env4('production')) || cds.cli.argv.includes(plugin) || cds.cli.options.add?.has(plugin)
+                const inProduction = Plugin.hasInProduction(env4('production')) || cds.cli.argv[0]?.includes(plugin) || cds.cli.options.add?.has(plugin)
                 DEBUG && console.log(inProduction ? '✅' : '❌', plugin)
                 if (inProduction) await template.combine()
             }
@@ -236,8 +234,8 @@ module.exports = class CDSGenerator {
             if (plugin === 'appfront') plugin = 'app-front'
             if (plugin === 'helm' && cds.cli.options['internal-unified-runtime-charts']) {
                 plugin = 'helm-unified-runtime'
-                cds.cli.options.add.delete('helm')
-                cds.cli.options.add.add('helm-unified-runtime')
+                cds.cli.options.add?.delete('helm')
+                cds.cli.options.add?.add('helm-unified-runtime')
             }
             if (plugin === 'sample-tiny') plugin = 'tiny-sample'
             if (plugin in { 'kibana-logging': 1, 'kibana': 1 }) plugin = 'application-logging'
@@ -250,6 +248,7 @@ module.exports = class CDSGenerator {
                 if (await template.canRun()) {
                     templates.set(plugin, template)
                     const dependencies = await template.requires()
+                    dependencies?.forEach(d => cds.cli.options.add?.add(d))
                     dependencies?.forEach(d => plugins.add(d))
                 } else {
                     throw 'cannot run plugin \'' + plugin + '\'' + (DEBUG ? 'Does not satisfy the canRun() function:\n    ' + template.canRun : '')

package/lib/init/projectReader.js

@@ -60,58 +60,6 @@ module.exports = new class ProjectReader {
         }
     }
 
-    /**
-     * @typedef {Object} ProjectConfig
-     * @property {string} appVersion The version of the application.
-     * @property {string} appName The name of the application.
-     * @property {string} appId The ID of the application.
-     * @property {string} appDescription The description of the application.
-     * @property {'java' | 'nodejs'} language The programming language of the project.
-     * @property {string} srvPath The path to the server module.
-     * @property {string} archiveName The name of the archive.
-     * @property {Object} db Database configuration.
-     * @property {string} configFile The name of the configuration file. This is typically the `package.json` for Node.js and `.cdsrc.json` for Java.
-     * @property {string} appPath The path to the app folder.
-     * @property {string} approuterPath The path to the approuter folder.
-     * @property {boolean} hasUIEmbedded Indicates if the project uses an embedded UI.
-     * @property {boolean} hasUIModule Indicates if the project is using a modular UI.
-     * @property {boolean} hasUI Indicates if the project has a UI.
-     * @property {boolean} hasUI5 Indicates if the project is a UI5 project.
-     * @property {boolean} isUI5 Indicates if the project is a UI5 project.
-     * @property {boolean} isJava Indicates if the project is using Java.
-     * @property {boolean} isNodejs Indicates if the project is using Node.js.
-     * @property {boolean} isESM Indicates if the project is an ESM project (type 'module')
-     * @property {boolean} hasEsmStyle Indicates if code supports ESM-style imports and exports. This is true for ESM and Typescript projects.
-     * @property {boolean} isTypescript Indicates if the project is a Typescript project.
-     * @property {boolean} hasTyper Indicates if code supports CDS typer.
-     * @property {boolean} hasHelmUnifiedRuntime Indicates if the project uses Unified Runtime Helm deployment.
-     * @property {boolean} hasHelm Indicates if the project uses CAP Helm deployment.
-     * @property {boolean} hasMta Indicates if the project uses MTA deployment.
-     * @property {boolean} hasConnectivity Indicates if the project uses connectivity.
-     * @property {boolean} hasMultitenancy Indicates if the project is multitenant.
-     * @property {boolean} hasToggles Indicates if the project uses feature toggles.
-     * @property {boolean} hasExtensibility Indicates if the project is extensible.
-     * @property {boolean} hasXsuaa Indicates if the project uses XSUAA.
-     * @property {boolean} hasHana Indicates if the project uses HANA.
-     * @property {boolean} hasPostgres Indicates if the project uses PostgreSQL.
-     * @property {boolean} hasEnterpriseMessaging Indicates if the project uses SAP BTP Event Mesh.
-     * @property {boolean} hasAttachments Indicates if the project uses SAP BTP Object Store Service.
-     * @property {boolean} hasApprouter Indicates if the project uses the SAP Application Router.
-     * @property {boolean} hasHtml5Repo Indicates if the project uses the SAP BTP HTML5 Application Repository.
-     * @property {boolean} hasPortal Indicates if the project uses the SAP Cloud Portal service.
-     * @property {boolean} hasWorkzoneStandard Indicates if the project uses the SAP Build Work Zone, Standard Edition service.
-     * @property {boolean} hasDestination Indicates if the project uses the SAP BTP Destination service.
-     * @property {boolean} hasMTXRoute Indicates if the approuter should have a multitenant route.
-     * @property {boolean} hasMTXRouteJava Indicates if the approuter should have a multitenant subscription route (java).
-     * @property {boolean} hasMalwareScanner Indicates if the project uses the SAP Malware Scanning service.
-     * @property {boolean} hasDynatrace Indicates if the project uses Dynatrace.
-     * @property {boolean} hasCloudLogging Indicates if the project uses Cloud Logging.
-     * @property {String} extendsApp Indicates which project is extended if any.
-     * @property {String} githubSlug GitHub org/repo.
-     * @property {boolean} isMonorepoMicroservice Indicates if the project is a monorepo microservice.
-     * @property {String} npmWorkspaceRoot The root path of the monorepo workspace.
-     */
-
     /**
      * Reads the project configuration and constructs a project object.
      * This function dynamically resolves project properties and returns an object with these properties.
@@ -128,7 +76,7 @@ module.exports = new class ProjectReader {
         const _isESM        = () => pkgJson().type === 'module'
         const _isTypescript = () => !!pkgJson().dependencies?.typescript || !!pkgJson().devDependencies?.typescript
         const _hasTyper     = () => !!pkgJson().dependencies?.['@cap-js/cds-typer'] || !!pkgJson().devDependencies?.['@cap-js/cds-typer']
-        const _inProd = plugin => require(`./template/${plugin}`).hasInProduction(env) || cds.cli.argv.includes(plugin) || cds.cli.options.add?.has(plugin)
+        const _inProd = plugin => require(`./template/${plugin}`).hasInProduction(env) || cds.cli.argv[0]?.includes(plugin) || cds.cli.options.add?.has(plugin)
         const _uiEmbedded = () => exists(join(env.folders.app, 'xs-app.json'))
         const _uiModule = () => !_uiEmbedded() && isdir(env.folders.app) && fs.readdirSync(resolve(cds.root, env.folders.app)).length > 0
         const _isJava = () => this.isJava
@@ -223,8 +171,15 @@ module.exports = new class ProjectReader {
             const defined = {}
             const _get = property => { const p = property
                 if (p in reserved) return reserved[p]()
-                for (const prefix of ['has', 'is']) if (p.startsWith(prefix) && p.length > prefix.length) {
-                    return _inProd(p.slice(prefix.length).replace(/([a-z0-9])([A-Z])/g, '$1-$2').toLowerCase())
+                for (const prefix of ['has', 'is', 'add']) if (p.startsWith(prefix) && p.length > prefix.length) {
+                    const facet = p.slice(prefix.length).replace(/([a-z0-9])([A-Z])/g, '$1-$2').toLowerCase()
+                    const inProd = _inProd(facet)
+                    if (prefix === 'add') {
+                        const adding = facet => cds.cli.argv[0]?.includes(facet) || cds.cli.options.add?.has(facet)
+                        const caller = new Error().stack.split('\n')[3].replace(/\\/g, '/').match(/lib\/init\/template\/([^/]+)\/index\.js/)[1]
+                        return inProd && (adding(facet) || adding(caller))
+                    }
+                    return inProd
                 }
             }
             return new Proxy({}, {
@@ -288,3 +243,57 @@ function _normalizeSpringBootCfg(obj) {
     })
     return obj
 }
+
+/* Types */
+
+/**
+ * @typedef {Object} ProjectConfig
+ * @property {string} appVersion The version of the application.
+ * @property {string} appName The name of the application.
+ * @property {string} appId The ID of the application.
+ * @property {string} appDescription The description of the application.
+ * @property {'java' | 'nodejs'} language The programming language of the project.
+ * @property {string} srvPath The path to the server module.
+ * @property {string} archiveName The name of the archive.
+ * @property {Object} db Database configuration.
+ * @property {string} configFile The name of the configuration file. This is typically the `package.json` for Node.js and `.cdsrc.json` for Java.
+ * @property {string} appPath The path to the app folder.
+ * @property {string} approuterPath The path to the approuter folder.
+ * @property {boolean} hasUIEmbedded Indicates if the project uses an embedded UI.
+ * @property {boolean} hasUIModule Indicates if the project is using a modular UI.
+ * @property {boolean} hasUI Indicates if the project has a UI.
+ * @property {boolean} hasUI5 Indicates if the project is a UI5 project.
+ * @property {boolean} isUI5 Indicates if the project is a UI5 project.
+ * @property {boolean} isJava Indicates if the project is using Java.
+ * @property {boolean} isNodejs Indicates if the project is using Node.js.
+ * @property {boolean} isESM Indicates if the project is an ESM project (type 'module')
+ * @property {boolean} hasEsmStyle Indicates if code supports ESM-style imports and exports. This is true for ESM and Typescript projects.
+ * @property {boolean} isTypescript Indicates if the project is a Typescript project.
+ * @property {boolean} hasTyper Indicates if code supports CDS typer.
+ * @property {boolean} hasHelmUnifiedRuntime Indicates if the project uses Unified Runtime Helm deployment.
+ * @property {boolean} hasHelm Indicates if the project uses CAP Helm deployment.
+ * @property {boolean} hasMta Indicates if the project uses MTA deployment.
+ * @property {boolean} hasConnectivity Indicates if the project uses connectivity.
+ * @property {boolean} hasMultitenancy Indicates if the project is multitenant.
+ * @property {boolean} hasToggles Indicates if the project uses feature toggles.
+ * @property {boolean} hasExtensibility Indicates if the project is extensible.
+ * @property {boolean} hasXsuaa Indicates if the project uses XSUAA.
+ * @property {boolean} hasHana Indicates if the project uses HANA.
+ * @property {boolean} hasPostgres Indicates if the project uses PostgreSQL.
+ * @property {boolean} hasEnterpriseMessaging Indicates if the project uses SAP BTP Event Mesh.
+ * @property {boolean} hasAttachments Indicates if the project uses SAP BTP Object Store Service.
+ * @property {boolean} hasApprouter Indicates if the project uses the SAP Application Router.
+ * @property {boolean} hasHtml5Repo Indicates if the project uses the SAP BTP HTML5 Application Repository.
+ * @property {boolean} hasPortal Indicates if the project uses the SAP Cloud Portal service.
+ * @property {boolean} hasWorkzoneStandard Indicates if the project uses the SAP Build Work Zone, Standard Edition service.
+ * @property {boolean} hasDestination Indicates if the project uses the SAP BTP Destination service.
+ * @property {boolean} hasMTXRoute Indicates if the approuter should have a multitenant route.
+ * @property {boolean} hasMTXRouteJava Indicates if the approuter should have a multitenant subscription route (java).
+ * @property {boolean} hasMalwareScanner Indicates if the project uses the SAP Malware Scanning service.
+ * @property {boolean} hasDynatrace Indicates if the project uses Dynatrace.
+ * @property {boolean} hasCloudLogging Indicates if the project uses Cloud Logging.
+ * @property {String} extendsApp Indicates which project is extended if any.
+ * @property {String} githubSlug GitHub org/repo.
+ * @property {boolean} isMonorepoMicroservice Indicates if the project is a monorepo microservice.
+ * @property {String} npmWorkspaceRoot The root path of the monorepo workspace.
+ */

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

@@ -14,7 +14,8 @@ module.exports = class AmsTemplate extends require('../../plugin') {
     }
 
     static hasInProduction(env) {
-        return env.requires?.auth?.ams || readProject().devDependencies?.['@sap/ams']
+        const { dependencies, devDependencies } = readProject()
+        return env.requires?.auth?.ams || devDependencies?.['@sap/ams-dev'] || dependencies?.['@sap/ams']
     }
 
     async run() {
@@ -27,21 +28,21 @@ module.exports = class AmsTemplate extends require('../../plugin') {
 
     async combine() {
         const project = readProject()
-        const { hasMta, hasCfManifest, hasHelm, hasHelmUnifiedRuntime, hasContainerize } = project
+        const { addMta, addCfManifest, addHelm, addHelmUnifiedRuntime, addContainerize } = project
 
-        if (hasMta) {
+        if (addMta) {
             await this.#combineWithMta(project)
         }
 
-        if (hasCfManifest) {
+        if (addCfManifest) {
             await this.#combineWithCfManifest(project)
         }
 
-        if (hasHelm || hasHelmUnifiedRuntime) {
+        if (addHelm || addHelmUnifiedRuntime) {
             await this.#combineWithHelm(project)
         }
 
-        if (hasContainerize) {
+        if (addContainerize) {
             await this.#combineWithContainerize(project)
         }
     }

package/lib/init/template/app-frontend/files/mta.yaml.hbs

@@ -29,13 +29,6 @@ modules:
       {{#hasXsuaa}}
       - name: {{appName}}-auth
       {{/hasXsuaa}}
-      {{#hasIas}}
-      - name: {{appName}}-ias
-        parameters:
-          config:
-            credential-type: X509_GENERATED
-            app-identifier: app-deployer
-      {{/hasIas}}
       - name: {{appName}}-app-front
         parameters:
           content-target: true

package/lib/init/template/app-frontend/index.js

@@ -49,7 +49,7 @@ module.exports = class extends require('../../plugin') {
 
     async combine() {
         const project = readProject()
-        const { srvPath, appPath, hasMta, apps } = project
+        const { srvPath, appPath, addMta, apps } = project
 
         await Promise.all(apps.map(async ({ app }) => {
             project.app = app
@@ -63,7 +63,7 @@ module.exports = class extends require('../../plugin') {
         //  await merge({ cds: { requires: { 'app-front':true } } }).into('mtx/sidecar/package.json')
         // }
 
-        if (hasMta) {
+        if (addMta) {
             const srv = srv4(srvPath)
             project.apps = apps
             const appModules = project.apps.map(app => ({

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

@@ -28,16 +28,19 @@ module.exports = class ApplicationLoggingTemplate extends require('../../plugin'
 
     async combine() {
         const project = readProject()
-        const { hasMta, hasApprouter, isJava, hasMultitenancy, srvPath } = project
+        const { addMta, addApprouter, isJava, addMultitenancy, srvPath } = project
 
-        if (hasMta) {
-            const srv = srv4(srvPath)
-            const additions = [srv, applicationLogging]
-            const relationships = [{
-                insert: [applicationLogging, 'name'],
-                into: [srv, 'requires', 'name']
-            }]
-            if (hasMultitenancy) {
+        if (addMta || addMultitenancy) {
+            const additions = [], relationships = []
+            if (addMta) {
+                const srv = srv4(srvPath)
+                additions.push(srv, applicationLogging)
+                relationships.push({
+                    insert: [applicationLogging, 'name'],
+                    into: [srv, 'requires', 'name']
+                })
+            }
+            if (addMultitenancy) {
                 const mtxSidecar = mtxSidecar4(isJava ? 'mtx/sidecar' : 'gen/mtx/sidecar')
                 additions.push(mtxSidecar)
                 relationships.push({
@@ -45,7 +48,7 @@ module.exports = class ApplicationLoggingTemplate extends require('../../plugin'
                     into: [mtxSidecar, 'requires', 'name']
                 })
             }
-            if (hasApprouter) {
+            if (addApprouter) {
                 additions.push(approuter)
                 relationships.push({
                     insert: [applicationLogging, 'name'],

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

@@ -31,17 +31,23 @@ module.exports = class ApprouterTemplate extends require('../../plugin') {
     }
 
     async combine() {
-        const project = readProject(this.options)
-        const { isNodejs, isJava, hasMTXRoute, hasMultitenancy, hasXsuaa, hasMta, hasHelm, hasHelmUnifiedRuntime, hasMTXRouteJava, hasContainerize, srvPath, approuterPath } = project
+        const project = readProject()
+        const {
+            isNodejs, isJava,
+            addXsuaa, hasXsuaa, addMultitenancy, hasMTXRoute, hasMTXRouteJava,
+            addMta, addHelm, addHelmUnifiedRuntime, hasMta, hasHelm, hasHelmUnifiedRuntime,
+            addContainerize, srvPath, approuterPath
+        } = project
 
-        if (hasMta) {
+
+        if (addMta || (addMultitenancy || addXsuaa) && hasMta) {
             const srv = srv4(srvPath)
-            const apis = isJava && hasMultitenancy ? [requiredJavaApprouterApi4(srv), providedJavaApprouterApi] : []
+            const apis = isJava && addMultitenancy ? [requiredJavaApprouterApi4(srv), providedJavaApprouterApi] : []
             const mtxSidecar = mtxSidecar4(isJava ? 'mtx/sidecar' : 'gen/mtx/sidecar')
-            if (isNodejs && hasMultitenancy) apis.push(requiredMtxApi, requiredAppApi4(mtxSidecar), providedAppApi)
-            if (isJava && hasMultitenancy) apis.push(requiredMtxApi)
+            if (isNodejs && addMultitenancy) apis.push(requiredMtxApi, requiredAppApi4(mtxSidecar), providedAppApi)
+            if (isJava && addMultitenancy) apis.push(requiredMtxApi)
             const modules = [srv, approuter]
-            if (hasMultitenancy) modules.push(mtxSidecar)
+            if (addMultitenancy) modules.push(mtxSidecar)
             const additions = [...modules, ...apis]
             if (hasXsuaa) additions.push(xsuaa)
             const relationships = []
@@ -57,11 +63,11 @@ module.exports = class ApprouterTemplate extends require('../../plugin') {
             })
         }
 
-        if (hasHelm || hasHelmUnifiedRuntime) {
+        if (addHelm || addHelmUnifiedRuntime || addMultitenancy && (hasHelm || hasHelmUnifiedRuntime)) {
             await merge(__dirname, 'files', 'values.yaml.hbs').into('chart/values.yaml', { with: project })
         }
 
-        if (hasContainerize) {
+        if (addContainerize) {
             const additions = [{
                 in: 'modules',
                 where: { name: `${project.appName}-approuter` }

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

@@ -26,9 +26,9 @@ module.exports = class AttachmentsTemplate extends require('../../plugin') {
 
     async combine() {
         const project = readProject()
-        const { hasMta, hasHelm, hasHelmUnifiedRuntime, srvPath } = project
+        const { addMta, addHelm, addHelmUnifiedRuntime, srvPath } = project
 
-        if (hasMta) {
+        if (addMta) {
             const srv = srv4(srvPath)
             const additions = [srv, attachments]
             const relationships = [{
@@ -40,7 +40,7 @@ module.exports = class AttachmentsTemplate extends require('../../plugin') {
             })
         }
 
-        if (hasHelm || hasHelmUnifiedRuntime) {
+        if (addHelm || addHelmUnifiedRuntime) {
             await merge(__dirname, 'files', 'values.yaml').into('chart/values.yaml')
         }
     }

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

@@ -33,15 +33,15 @@ module.exports = class AuditLoggingTemplate extends require('../../plugin') {
 
   async combine() {
     const project = readProject()
-    const { hasMta, hasHelm, hasMultitenancy, srvPath } = project
+    const { addMta, addHelm, addMultitenancy, srvPath } = project
     const { plan = 'premium' } = cds.cli.options
     project.servicePlan = plan
 
-    if (hasMultitenancy) {
+    if (addMultitenancy) {
       await merge(__dirname, 'files/package.sidecar.json').into('mtx/sidecar/package.json')
     }
 
-    if (hasMta) {
+    if (addMta) {
       const srv = srv4(srvPath)
       await merge(join(__dirname, 'files/mta.yaml.hbs')).into('mta.yaml', {
         with: project,
@@ -53,7 +53,7 @@ module.exports = class AuditLoggingTemplate extends require('../../plugin') {
         ]
       })
     }
-    if (hasHelm) {
+    if (addHelm) {
       await merge({
         srv: { bindings: { auditlog: { serviceInstanceName: 'auditlog' }}},
         auditlog: {

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

@@ -37,9 +37,9 @@ module.exports = class extends require('../../plugin') {
 
   async combine() {
     const project = readProject()
-    const { hasMta, hasHelm, hasHelmUnifiedRuntime, hasApprouter, isJava, hasMultitenancy, srvPath } = project
+    const { hasMta, addMta, addHelm, addHelmUnifiedRuntime, addApprouter, isJava, addMultitenancy, srvPath } = project
 
-    if (hasMta) {
+    if (addMta || (addMultitenancy || addApprouter) && hasMta) {
       const cloudLogging = {
         in: 'resources',
         where: {
@@ -47,13 +47,16 @@ module.exports = class extends require('../../plugin') {
           'parameters.service': 'cloud-logging'
         }
       }
+      const additions = [cloudLogging], relationships = []
       const srv = srv4(srvPath)
-      const additions = [srv, cloudLogging]
-      const relationships = [{
-        insert: [cloudLogging, 'name'],
-        into: [srv, 'requires', 'name']
-      }]
-      if (hasMultitenancy) {
+      if (addMta) {
+        additions.push(srv)
+        relationships.push({
+          insert: [cloudLogging, 'name'],
+          into: [srv, 'requires', 'name']
+        })
+      }
+      if (addMultitenancy) {
         const mtxSidecar = mtxSidecar4(isJava ? 'mtx/sidecar' : 'gen/mtx/sidecar')
         additions.push(mtxSidecar)
         relationships.push({
@@ -61,7 +64,7 @@ module.exports = class extends require('../../plugin') {
           into: [mtxSidecar, 'requires', 'name']
         })
       }
-      if (hasApprouter) {
+      if (addApprouter) {
         additions.push(approuter)
         relationships.push({
           insert: [cloudLogging, 'name'],
@@ -74,7 +77,7 @@ module.exports = class extends require('../../plugin') {
         with: project, additions, relationships
       })
     }
-    if (hasHelm || hasHelmUnifiedRuntime) {
+    if (addHelm || addHelmUnifiedRuntime) {
       await merge(__dirname, 'files/values.yaml.hbs').into('chart/values.yaml')
     }
   }

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

@@ -20,9 +20,9 @@ module.exports = class ConnectivityTemplate extends require('../../plugin') {
 
     async combine() {
         const project = readProject()
-        const { srvPath, hasHelm, hasHelmUnifiedRuntime, hasMta } = project
+        const { srvPath, addHelm, addHelmUnifiedRuntime, addMta } = project
 
-        if (hasMta) {
+        if (addMta) {
             const srv = srv4(srvPath)
             const additions = [srv, connectivity]
             const relationships = [{
@@ -32,7 +32,7 @@ module.exports = class ConnectivityTemplate extends require('../../plugin') {
             await merge(__dirname, 'files/mta.yaml.hbs').into('mta.yaml', { project, additions, relationships })
         }
 
-        if (hasHelm || hasHelmUnifiedRuntime) {
+        if (addHelm || addHelmUnifiedRuntime) {
             await merge(__dirname, 'files/values.yaml.hbs').into('chart/values.yaml', {
                 project,
                 additions: [{

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

@@ -24,26 +24,26 @@ module.exports = class DestinationTemplate extends require('../../plugin') {
 
     async combine() {
         const project = readProject()
-        const { hasHelm, hasApprouter, hasMultitenancy, hasHelmUnifiedRuntime, hasMta, srvPath, isJava } = project
+        const { addHelm, addApprouter, addMultitenancy, addHelmUnifiedRuntime, addMta, hasMta, srvPath, isJava } = project
 
-        if (hasMultitenancy) {
+        if (addMultitenancy) {
             await merge({ cds: { requires: { destinations:true } } }).into('mtx/sidecar/package.json')
         }
 
-        if (hasMta) {
+        if (addMta || (addApprouter || addMultitenancy) && hasMta) {
             const srv = srv4(srvPath)
             const additions = [srv, destination]
             const relationships = [{
                 insert: [destination, 'name'],
                 into: [srv, 'requires', 'name']
             }]
-            if (hasApprouter) {
+            if (addApprouter) {
                 relationships.push({
                     insert: [destination, 'name'],
                     into: [approuter, 'requires', 'name']
                 })
             }
-            if (hasMultitenancy) {
+            if (addMultitenancy) {
                 relationships.push({
                     insert: [destination, 'name'],
                     into: [mtxSidecar4(isJava ? 'mtx/sidecar' : 'gen/mtx/sidecar'), 'requires', 'name']
@@ -52,7 +52,7 @@ module.exports = class DestinationTemplate extends require('../../plugin') {
             await merge(__dirname, 'files/mta.yaml.hbs').into('mta.yaml', { with: project, additions, relationships })
         }
 
-        if (hasHelm || hasHelmUnifiedRuntime) {
+        if (addHelm || addHelmUnifiedRuntime) {
             await merge(__dirname, 'files/values.yaml').into('chart/values.yaml')
         }
     }

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

@@ -24,9 +24,9 @@ module.exports = class extends require('../../plugin') {
 
   async combine() {
     const project = readProject()
-    const { appName, hasMta, hasHelm, hasHelmUnifiedRuntime, isJava, hasMultitenancy, srvPath } = project
+    const { appName, addMta, addHelm, addHelmUnifiedRuntime, isJava, addMultitenancy, srvPath } = project
 
-    if (hasMta) {
+    if (addMta || addMultitenancy) {
       const dynatrace = {
         in: 'resources',
         where: {
@@ -34,13 +34,16 @@ module.exports = class extends require('../../plugin') {
           'parameters.service': 'dynatrace'
         }
       }
-      const srv = srv4(srvPath)
-      const additions = [srv, dynatrace]
-      const relationships = [{
-        insert: [dynatrace, 'name'],
-        into: [srv, 'requires', 'name']
-      }]
-      if (hasMultitenancy) {
+      const additions = [dynatrace], relationships = []
+      if (addMta) {
+        const srv = srv4(srvPath)
+        additions.push(srv)
+        relationships.push({
+          insert: [dynatrace, 'name'],
+          into: [srv, 'requires', 'name']
+        })
+      }
+      if (addMultitenancy) {
         const mtxSidecar = mtxSidecar4(isJava ? 'mtx/sidecar' : 'gen/mtx/sidecar')
         additions.push(mtxSidecar)
         relationships.push({
@@ -54,7 +57,7 @@ module.exports = class extends require('../../plugin') {
       })
     }
 
-    if (hasHelm || hasHelmUnifiedRuntime) {
+    if (addHelm || addHelmUnifiedRuntime) {
       await merge(__dirname, 'files', 'values.yaml').into('chart/values.yaml')
     }
   }