@sap/cds-dk 9.3.2 → 9.4.2

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

@@ -26,8 +26,8 @@ module.exports = class ExtensibilityTemplate extends require('../../plugin') {
 
   async combine() {
     const project = readProject()
-    const { hasXsuaa } = project
-    if (hasXsuaa) {
+    const { addXsuaa } = project
+    if (addXsuaa) {
       await merge(__dirname, 'files', 'xs-security.json.hbs').into('xs-security.json', {
         project,
         additions: [

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

@@ -1,4 +1,4 @@
-const cds = require('../../../cds'), { read } = cds.utils
+const cds = require('../../../cds'), { exists, read } = cds.utils
 const { readProject } = require('../../projectReader')
 const { merge } = require('../../merge')
 
@@ -21,7 +21,7 @@ module.exports = class FileBasedMessagingTemplate extends require('../../plugin'
   async run() {
     const project = readProject()
     const { configFile } = project
-    project.shortcut = typeof (await read(configFile)).cds?.requires?.messaging !== 'object'
+    project.shortcut = !exists(configFile) || typeof (await read(configFile)).cds?.requires?.messaging !== 'object'
     await merge(__dirname, 'files/package.json.hbs').into(configFile, { with: project })
   }
 }

package/lib/init/template/github-actions/index.js

@@ -50,9 +50,9 @@ module.exports = class GitHubActionTemplate extends require('../../plugin') {
 
   async combine() {
     const project = readProject()
-    const { hasMta, hasHelm } = project, { force } = cds.cli.options
+    const { addMta, addHelm } = project, { force } = cds.cli.options
     project.sap = cds.cli.options.sap
-    if (hasMta) {
+    if (addMta) {
       const cf = '.github/workflows/cf.yaml'
       if (force || !exists(cf)) {
         await renderAndCopy(path.join(__dirname, 'files/workflows/cf.yaml.hbs'), cf, project)
@@ -62,7 +62,7 @@ module.exports = class GitHubActionTemplate extends require('../../plugin') {
         await copy(path.join(__dirname, 'files/cf-setup'), cfSetup)
       }
     }
-    if (hasHelm) {
+    if (addHelm) {
       const kyma = '.github/workflows/kyma.yaml'
       if (force || !exists(kyma)) {
         await renderAndCopy(path.join(__dirname, 'files/workflows/kyma.yaml.hbs'), kyma, project)

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

@@ -1,6 +1,6 @@
 const { join } = require('path')
 const cds = require('../../../cds')
-const { read, write, exists, copy, rimraf } = cds.utils
+const { read, write, exists, copy } = cds.utils
 const { readProject } = require('../../projectReader')
 const { merge, sort } = require('../../merge')
 const mvn = require('../../mvn')
@@ -21,7 +21,7 @@ module.exports = class HanaTemplate extends require('../../plugin') {
     async run() {
         const project = readProject()
         const { isJava, configFile, db } = project
-        project.shortcut = typeof (await read(configFile)).cds?.requires?.db !== 'object'
+        project.shortcut = !exists(configFile) || typeof (await read(configFile)).cds?.requires?.db !== 'object'
 
         // REVISIT: Let cds build generate those by default
         await merge(__dirname, 'files/src/.hdiconfig').into(join(db.folder, 'src/.hdiconfig'))
@@ -44,9 +44,9 @@ module.exports = class HanaTemplate extends require('../../plugin') {
 
     async combine() {
         const project = readProject()
-        const { hasMta, hasHelm, hasHelmUnifiedRuntime, hasHtml5Repo, hasContainerize, isJava, hasMultitenancy, srvPath } = project
+        const { addMta, addHelm, addHelmUnifiedRuntime, addMultitenancy, addContainerize, isJava, hasHelm, hasMultitenancy, srvPath } = project
 
-        if (hasMta) {
+        if (addMta || addMultitenancy) {
             const srv = srv4(srvPath)
             const db = hasMultitenancy ? serviceManager : hdiContainer
             const deletions = hasMultitenancy ? [{
@@ -86,26 +86,23 @@ module.exports = class HanaTemplate extends require('../../plugin') {
             })
         }
 
-        if (hasHelm || hasHelmUnifiedRuntime) {
-            if (hasMultitenancy) {
-                await merge('chart/values.yaml')
-                    .remove(['hana-deployer', 'srv.bindings.db', 'hana'])
-
-                await merge('chart/Chart.yaml')
-                    .remove([
-                        { dependencies: { alias: 'hana' } },
-                        { dependencies: { alias: 'hana-deployer' } }
-                    ])
-
-                if (!hasHtml5Repo) {
-                    await rimraf('chart/charts/content-deployment') // REVISIT: Move to build task
-                }
-            } else {
-                await merge(__dirname, 'files', 'values.yaml.hbs').into('chart/values.yaml', { with: project })
-            }
+        if (!hasMultitenancy && (addHelm || addHelmUnifiedRuntime)) {
+            await merge(__dirname, 'files', 'values.yaml.hbs').into('chart/values.yaml', { with: project })
+
+        }
+
+        if (addMultitenancy && hasHelm) {
+            await merge('chart/values.yaml')
+                .remove(['hana-deployer', 'srv.bindings.db', 'hana'])
+
+            await merge('chart/Chart.yaml')
+                .remove([
+                    { dependencies: { alias: 'hana' } },
+                    { dependencies: { alias: 'hana-deployer' } }
+                ])
         }
 
-        if (hasContainerize && !hasMultitenancy) {
+        if (addContainerize && !hasMultitenancy) {
             const additions = [{
                 in: 'modules',
                 where: { name: `${project.appName}-hana-deployer` }

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

@@ -56,6 +56,7 @@ async function createNodeHandler(proj) {
   const nameFilter = filterStringAsRegex(filter)
 
   for (const service of csn.services) {
+    if (service['@cds.external']) continue
     if (!service.$location.file)  continue
 
     proj.serviceName = service.name

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

@@ -86,40 +86,50 @@ module.exports = class HelmTemplate extends require('../../plugin') {
     }
 
     async combine() {
-        const { hasDestination, hasEnterpriseMessaging, hasEnterpriseMessagingShared, hasHana, hasMultitenancy, hasXsuaa, hasHtml5Repo, hasApprouter, hasKafka, hasAttachments, hasPortal, hasMalwareScanner, hasDynatrace, hasCloudLogging } = readProject()
-
-        if (hasApprouter) {
+        // REVISIT: This must be moved to the respective plugins
+        const {
+            addHana, addMultitenancy, addXsuaa,
+            addApprouter, addIas, addAms, hasXsuaa, hasMultitenancy,
+            addDestination, addEnterpriseMessaging, addEnterpriseMessagingShared, addHtml5Repo, hasHtml5Repo, addKafka, addAttachments, addPortal, addMalwareScanner,
+            addDynatrace, addCloudLogging, addAuditLogging,
+        } = readProject()
+
+        if (addApprouter) {
             await this._mergeDependency('web-application', 'approuter')
         }
 
-        if (hasHtml5Repo) {
-            await this._mergeDependency('service-instance', 'html5-apps-repo-host')
-            await this._mergeDependency('content-deployment', 'html5-apps-deployer')
-            if (hasApprouter) {
+        if (addHtml5Repo || addApprouter && hasHtml5Repo) {
+            if (addHtml5Repo) {
+                await this._mergeDependency('service-instance', 'html5-apps-repo-host')
+                await this._mergeDependency('content-deployment', 'html5-apps-deployer')
+            }
+            if (addApprouter) {
                 await this._mergeDependency('service-instance', 'html5-apps-repo-runtime')
             }
         }
-        if (hasMultitenancy) {
-            await this._mergeDependency('web-application', 'sidecar')
-            if (hasXsuaa) {
+        if (addMultitenancy || addXsuaa || addIas || addAms) {
+            if (addMultitenancy) {
+                await this._mergeDependency('web-application', 'sidecar')
+            }
+            if (hasXsuaa && hasMultitenancy) {
                 await this._mergeDependency('service-instance', 'saas-registry')
-            } else {
+            } else if (hasMultitenancy) {
                 await this._mergeDependency('service-instance', 'subscription-manager')
             }
         }
-        if (hasDestination) {
+        if (addDestination) {
             await this._mergeDependency('service-instance', 'destination')
         }
-        if (hasAttachments) {
+        if (addAttachments) {
             await this._mergeDependency('service-instance', 'attachments')
         }
-        if (hasEnterpriseMessaging || hasEnterpriseMessagingShared) {
+        if (addEnterpriseMessaging || addEnterpriseMessagingShared) {
             await this._mergeDependency('service-instance', 'event-mesh')
         }
-        if (hasXsuaa) {
+        if (addXsuaa) {
             await this._mergeDependency('service-instance', 'xsuaa')
         }
-        if (hasHana) {
+        if (addHana || addMultitenancy) {
             if (hasMultitenancy) {
                 await this._mergeDependency('service-instance', 'service-manager')
             } else {
@@ -127,22 +137,25 @@ module.exports = class HelmTemplate extends require('../../plugin') {
                 await this._mergeDependency('content-deployment', 'hana-deployer')
             }
         }
-        if (hasKafka) {
+        if (addKafka) {
             await this._mergeDependency('service-instance', 'kafka')
         }
-        if (hasPortal) {
+        if (addPortal) {
             await this._mergeDependency('service-instance', 'portal')
             await this._mergeDependency('content-deployment', 'portal-deployer')
         }
-        if (hasMalwareScanner) {
+        if (addMalwareScanner) {
             await this._mergeDependency('service-instance', 'malware-scanner')
         }
-        if (hasCloudLogging) {
+        if (addCloudLogging) {
             await this._mergeDependency('service-instance', 'cloud-logging')
         }
-        if (hasDynatrace) {
+        if (addDynatrace) {
             await this._mergeDependency('service-instance', 'dynatrace')
         }
+        if (addAuditLogging) {
+            await this._mergeDependency('service-instance', 'auditlog')
+        }
     }
 
     async _mergeDependency(name, alias) {

package/lib/init/template/html5-repo/files/containerize.yaml.hbs

@@ -3,7 +3,6 @@ before-all:
 {{#hasUI5}}
   - mkdir -p app/html5-deployer/resources
 {{#apps}}
-  - npm i --prefix app/{{app}}
   - npm run build --prefix app/{{app}}
   # zip filename should match the archiveName specified in ui5-deploy.yaml
   - cp -f app/{{app}}/dist/{{app}}.zip app/html5-deployer/resources/{{app}}.zip

package/lib/init/template/html5-repo/files/mta.yaml.hbs

@@ -25,11 +25,16 @@ modules:
     type: com.sap.application.content
     path: {{#isNodejs}}gen{{/isNodejs}}{{#isJava}}.{{/isJava}}
     requires:
-      - name: {{appName}}-auth{{#hasIas}}
+      {{#hasXsuaa}}
+      - name: {{appName}}-auth
+      {{/hasXsuaa}}
+      {{#hasIas}}
+      - name: {{appName}}-ias
         parameters:
           config:
             credential-type: X509_GENERATED
-            app-identifier: app-deployer{{/hasIas}}
+            app-identifier: app-deployer
+      {{/hasIas}}
       - name: srv-api
       - name: {{appName}}-html5-repo-host
         parameters:
@@ -47,6 +52,7 @@ modules:
           target-path: {{#isNodejs}}{{& appPath }}{{/isNodejs}}{{#isJava}}resources{{/isJava}}
       {{/apps}}
     {{#hasWorkzoneStandard}}
+    {{#hasMultitenancy}}
     parameters:
       config:
         HTML5Runtime_enabled: true
@@ -61,11 +67,13 @@ modules:
                 ProxyType: Internet
                 HTML5.ForwardAuthToken: true
                 HTML5.DynamicDestination: true
+                {{#hasIas}}HTML5.IASDependencyName: {{appName}}-ias-api{{/hasIas}}
               - Name: ui5
                 URL: https://ui5.sap.com
                 Authentication: NoAuthentication
                 Type: HTTP
                 ProxyType: Internet
+    {{/hasMultitenancy}}
     {{/hasWorkzoneStandard}}
 
   {{#apps}}

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

@@ -37,8 +37,8 @@ module.exports = class Html5RepoTemplate extends require('../../plugin') {
         const project = readProject()
         const {
             isJava, srvPath, appPath, apps,
-            hasApprouter, hasContainerize,  hasMultitenancy, hasWorkzoneStandard,
-            hasMta, hasXsuaa, hasHelm, hasHelmUnifiedRuntime, hasUI5
+            hasApprouter, addApprouter, addContainerize,  addMultitenancy, addWorkzoneStandard,
+            addSample, hasMta, addMta, hasXsuaa, hasMultitenancy, hasWorkzoneStandard, addHelm, addHelmUnifiedRuntime, hasUI5
         } = project
 
         await Promise.all(apps.map(async ({ app }) => {
@@ -65,11 +65,11 @@ module.exports = class Html5RepoTemplate extends require('../../plugin') {
             }
         }
 
-        if (hasMultitenancy) {
+        if (addMultitenancy) {
             await merge({ cds: { requires: { 'html5-repo': true } } }).into('mtx/sidecar/package.json')
         }
 
-        if (hasMta) {
+        if (addMta || (addApprouter || addWorkzoneStandard || addMultitenancy || addSample) && hasMta) {
             const srv = srv4(srvPath)
             project.apps = apps
             const relationships = [{
@@ -114,14 +114,16 @@ module.exports = class Html5RepoTemplate extends require('../../plugin') {
                 relationships
             })
         }
-        if (hasContainerize) {
+
+        if (addContainerize) {
             const additions = [{
                 in: 'modules',
                 where: { name: `${project.appName}-html5-deployer` }
             }]
             await merge(__dirname, '/files/containerize.yaml.hbs').into('containerize.yaml', { with: project, additions })
         }
-        if (hasHelm || hasHelmUnifiedRuntime) {
+
+        if (addHelm || addHelmUnifiedRuntime) {
             await renderAndCopy(join(__dirname, 'files/html5-deployer.package.json.hbs'), 'app/html5-deployer/package.json', project)
             await merge(__dirname, 'files/values.yaml.hbs').into('chart/values.yaml', { with: project })
         }

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

@@ -77,10 +77,40 @@ module.exports = class HttpTemplate extends require('../../plugin') {
       let entities = []
       let actions = []
 
+      const containedTargets = new Set()
+      for (const c of csn.childrenOf(s.name)) {
+        if (c.kind !== 'entity' || !c.elements) continue
+        for (const e of Object.values(c.elements)) {
+          if (e?.type !== 'cds.Composition' || !e.target) continue
+          const containment = Array.isArray(e.on) && e.on.some(t => t?.ref?.[0] === '$self')
+          if (!containment) continue
+          const target = csn.definitions?.[e.target] || csn.childrenOf(s.name).find(x => x.name === e.target)
+          const struct_key = Object.values(target?.keys || {}).some(k => k?.is_struct)
+          const struct_up  = target?.elements?.up_?.is_struct === true
+          if (struct_key || struct_up) containedTargets.add(e.target)
+        }
+      }
+
+      const exposed = new Set((sInfo?.entities || []).map(e => e?.name || e).filter(Boolean))
       for (const c of csn.childrenOf(s.name)) {
         if (c.name.match(filterStringAsRegex(filter))) {
           if (c.name.includes('.texts')) continue
-          c.kind === 'entity' ? entities.push(this.#addEntityInfo(c)) : c.kind === 'action' ? actions.push(c) : null
+          if (c.kind === 'entity') {
+            // Skip composition targets – they are not exposed as entity sets
+            if (containedTargets.has(c.name)) continue
+            if (exposed.size && !exposed.has(c.name)) continue
+            const autoexposed = c['@cds.autoexposed'] || c['@cds.autoexpose']
+            const valuelist = c['@cds.odata.valuelist'] === true
+            if (!exposed.size && autoexposed && !valuelist) continue
+            entities.push({
+              name: c.name,
+              readOnly: (c["@readonly"] || autoexposed || c['@odata.singleton']) ?? false,
+              isDraft: c['@odata.draft.enabled'] ?? false,
+              keys: c.keys
+            })
+          } else if (c.kind === 'action') {
+            actions.push(c)
+          }
         }
       }
       if (entities.length === 0 && actions.length === 0) return
@@ -96,15 +126,6 @@ module.exports = class HttpTemplate extends require('../../plugin') {
     return services
   }
 
-  #addEntityInfo(e) {
-    return {
-      name: e.name,
-      readOnly: (e["@readonly"] || e["@cds.autoexpose"] || e['@odata.singleton']) ?? false,
-      isDraft: e['@odata.draft.enabled'] ?? false,
-      keys: e.keys
-    }
-  }
-
   /**
    * @param {ServiceMap} services
    */

package/lib/init/template/ias/files/manifest.yml.hbs

@@ -2,7 +2,7 @@
 applications:
   - name: {{appName}}-srv
     services:
-      - name: {{appName}}-auth
+      - name: {{appName}}-ias
         parameters:
           credential-type: X509_GENERATED
           app-identifier: srv

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

@@ -4,7 +4,7 @@ modules:
     type: {{language}}
     path: {{& srvPath}}
     requires:
-      - name: {{appName}}-auth
+      - name: {{appName}}-ias
         parameters:
           config:
             credential-type: X509_GENERATED
@@ -22,7 +22,7 @@ modules:
     type: approuter.nodejs
     path: {{& approuterPath}}
     requires:
-      - name: {{appName}}-auth
+      - name: {{appName}}-ias
         parameters:
           config:
             credential-type: X509_GENERATED
@@ -32,20 +32,21 @@ modules:
         properties:
           url: ~{srv-cert-url}
           forwardAuthCertificates: true
+          forwardAuthToken: true
           strictSSL: true
 
   - name: {{appName}}-mtx
     type: nodejs
     path: {{#isNodejs}}gen/{{/isNodejs}}mtx/sidecar
     requires:
-      - name: {{appName}}-auth
+      - name: {{appName}}-ias
         parameters:
           config:
             credential-type: X509_GENERATED
             app-identifier: mtx
 
 resources:
-  - name: {{appName}}-auth
+  - name: {{appName}}-ias
     type: org.cloudfoundry.managed-service
     {{#hasApprouter}}
     requires:
@@ -53,9 +54,12 @@ resources:
     {{/hasApprouter}}
     parameters:
       service: identity
-      service-name: {{appName}}-auth
+      service-name: {{appName}}-ias
       service-plan: application
       config:
+        provided-apis:
+          - name: {{appName}}-ias-api
+            description: API exposed by the application
         display-name: {{appName}}
         oauth2-configuration:
           token-policy:

package/lib/init/template/ias/files/values.yaml.hbs

@@ -1,5 +1,8 @@
 {{#hasMultitenancy}}
 sidecar:
+  expose:
+    gateway: default/kyma-mtls-gateway
+    host: {{#literal}}"{{ .Release.Name }}-sidecar-{{ .Release.Namespace }}.cert"{{/literal}}
   bindings:
     auth:
       serviceInstanceName: identity
@@ -9,6 +12,9 @@ sidecar:
 {{/hasMultitenancy}}
 {{#hasApprouter}}
 approuter:
+  expose:
+    gateway: default/kyma-mtls-gateway
+    host: {{#literal}}"{{ .Release.Name }}-approuter-{{ .Release.Namespace }}.cert"{{/literal}}
   bindings:
     auth:
       serviceInstanceName: identity
@@ -17,6 +23,9 @@ approuter:
           app-identifier: approuter
 {{/hasApprouter}}
 srv:
+  expose:
+    gateway: default/kyma-mtls-gateway
+    host: {{#literal}}"{{ .Release.Name }}-srv-{{ .Release.Namespace }}.cert"{{/literal}}
   bindings:
     auth:
       serviceInstanceName: identity
@@ -35,13 +44,16 @@ identity:
     {{#hasXsuaa}}
     xsuaa-cross-consumption: true
     {{/hasXsuaa}}
-    {{#hasApprouter}}
+    provided-apis:
+      - name: {{appName}}-ias-api
+        description: API exposed by the application
     oauth2-configuration:
       token-policy:
         access-token-format: "jwt"
+    {{#hasApprouter}}
       redirect-uris:
         {{=<% %>=}}
-        - https://*.{{ tpl .Values.global.domain . }}/login/callback
+        - https://*.{{ tpl .Values.global.domain . }}/**
         <%={{ }}=%>
       post-logout-redirect-uris:
         {{=<% %>=}}

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

@@ -21,16 +21,16 @@ module.exports = class IasTemplate extends require('../../plugin') {
         const project = readProject()
         const { configFile, isNodejs } = project
         project.profile ??= 'production'
-        project.shortcut = typeof (await read(configFile)).cds?.requires?.auth !== 'object'
+        project.shortcut = exists(configFile) ? typeof (await read(configFile)).cds?.requires?.db !== 'object' : true
         await merge(__dirname, 'files/package.json.hbs').into(configFile, { project, forceOverwrite: true })
         if (isNodejs) await sort('package.json', 'dependencies')
     }
 
     async combine() {
         const project = readProject()
-        const { isJava, hasMta, hasCfManifest, hasHelm, hasHelmUnifiedRuntime, hasApprouter, hasMultitenancy, srvPath } = project
+        const { isJava, addMta, addCfManifest, addHelm, addHelmUnifiedRuntime, addApprouter, addMultitenancy, srvPath } = project
 
-        if (hasMultitenancy) {
+        if (addMultitenancy) {
             const conf = exists('mtx/sidecar/package.json') ? await read('mtx/sidecar/package.json') : {}
             conf.cds ??= {}
             const profile = conf.cds.profile
@@ -43,7 +43,7 @@ module.exports = class IasTemplate extends require('../../plugin') {
             await merge(__dirname, 'files/sidecar.package.json.hbs').into('mtx/sidecar/package.json')
         }
 
-        if (hasMta) {
+        if (addMta || addApprouter || addMultitenancy) {
             const srv = srv4(srvPath)
             const identity = { in: 'resources', where: { 'parameters.service': 'identity' } }
             const srvIdentityBinding = { in: [srv, 'requires'], where: { 'parameters.config.app-identifier': 'srv' } }
@@ -51,7 +51,7 @@ module.exports = class IasTemplate extends require('../../plugin') {
             const additions = [srv, identity, srvIdentityBinding, srvCertUrlApi]
             const overwrites = []
 
-            if (hasApprouter) {
+            if (addApprouter) {
                 additions.push(approuter)
                 additions.push({ in: [approuter, 'requires'], where: { 'parameters.config.app-identifier': 'approuter' }})
                 const approuterSrvApi = { in: [approuter, 'requires'], where: { 'name': 'srv-api' } }
@@ -60,7 +60,7 @@ module.exports = class IasTemplate extends require('../../plugin') {
                 overwrites.push({ item: [approuterSrvApi, 'properties.forwardAuthCertificates'], withValue: true })
                 overwrites.push({ item: [approuterSrvApi, 'properties.strictSSL'], withValue: true })
             }
-            if (hasMultitenancy) {
+            if (addMultitenancy) {
                 const mtxSidecar = mtxSidecar4(isJava ? 'mtx/sidecar' : 'gen/mtx/sidecar')
                 const mtxIdentityBinding = { in: [mtxSidecar, 'requires'], where: { 'parameters.config.app-identifier': 'mtx' } }
                 additions.push(mtxSidecar, mtxIdentityBinding)
@@ -68,13 +68,13 @@ module.exports = class IasTemplate extends require('../../plugin') {
             await merge(__dirname, 'files/mta.yaml.hbs').into('mta.yaml', { project, additions, overwrites })
         }
 
-        if (hasHelm || hasHelmUnifiedRuntime) {
+        if (addHelm || addHelmUnifiedRuntime) {
             const identity = { in: 'dependencies', where: { 'alias': 'identity' } }
             await merge(__dirname, 'files/Chart.yaml.hbs').into('chart/Chart.yaml', { project, additions: [identity] })
             await merge(__dirname, 'files/values.yaml.hbs').into('chart/values.yaml', { project })
         }
 
-        if (hasCfManifest) {
+        if (addCfManifest) {
             await this.#combineWithCfManifest(project) // REVISIT: we shouldn't overly promote cf-manifest
         }
     }

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

@@ -28,9 +28,9 @@ module.exports = class KafkaTemplate extends require('../../plugin') {
 
   async combine() {
     const project = readProject()
-    const { hasMta, srvPath, hasHelm, hasHelmUnifiedRuntime } = project
+    const { addMta, srvPath, addHelm, addHelmUnifiedRuntime } = project
 
-    if (hasMta) {
+    if (addMta) {
       const srv = srv4(srvPath)
       await merge(__dirname, 'files/mta.yaml.hbs').into('mta.yaml', {
           project,
@@ -42,7 +42,7 @@ module.exports = class KafkaTemplate extends require('../../plugin') {
       })
     }
 
-    if (hasHelm || hasHelmUnifiedRuntime) {
+    if (addHelm || addHelmUnifiedRuntime) {
       await merge(__dirname, 'files/values.yaml').into('chart/values.yaml')
     }
   }

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

@@ -1,5 +1,5 @@
 const cds = require('../../../cds')
-const { read } = cds.utils
+const { read, exists } = cds.utils
 const { readProject } = require('../../projectReader')
 const { merge } = require('../../merge')
 
@@ -22,7 +22,7 @@ module.exports = class LocalMessagingTemplate extends require('../../plugin') {
   async run() {
     const project = readProject()
     const { configFile } = project
-    project.shortcut = typeof (await read(configFile)).cds?.requires?.messaging !== 'object'
+    project.shortcut = !exists(configFile) || typeof (await read(configFile)).cds?.requires?.messaging !== 'object'
     await merge(__dirname, 'files/package.json.hbs').into(configFile, { with: project })
   }
 }

package/lib/init/template/malware-scanner/index.js

@@ -12,10 +12,6 @@ module.exports = class MalwareScannerTemplate extends require('../../plugin') {
         return !!env.requires['malware-scanner']
     }
 
-    async canRun() {
-        return true
-    }
-
     async run() {
         const project = readProject()
         const { isNodejs } = project
@@ -26,9 +22,9 @@ module.exports = class MalwareScannerTemplate 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, malwareScanner ]
             const relationships = [{
@@ -40,7 +36,7 @@ module.exports = class MalwareScannerTemplate extends require('../../plugin') {
             })
         }
 
-        if (hasHelm || hasHelmUnifiedRuntime) {
+        if (addHelm || addHelmUnifiedRuntime) {
             await merge(__dirname, 'files', 'values.yaml').into('chart/values.yaml')
         }
     }

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

@@ -43,6 +43,16 @@ modules:
         properties:
           srv-url: ${default-url}
     requires: []
+{{#externalServices}}
+  - name: {{name}}
+    type: nodejs
+    path: {{& path }}
+    parameters:
+      instances: 1
+      buildpack: nodejs_buildpack
+    build-parameters:
+      builder: npm-ci
+{{/externalServices}}
 
 resources:
   []