@sap/cds-dk 9.4.1 → 9.4.3

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

@@ -24,26 +24,22 @@ 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) {
-            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 +48,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')
     }
   }

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

@@ -41,9 +41,9 @@ module.exports = class EnterpriseMessagingTemplate extends require('../../plugin
 
   async combine() {
     const project = readProject()
-    const { hasXsuaa, hasHelm, hasHelmUnifiedRuntime, hasMta, srvPath, appName } = project
+    const { addXsuaa, addHelm, addHelmUnifiedRuntime, addMta, srvPath, appName } = project
 
-    if (hasMta) {
+    if (addMta) {
       const srv = srv4(srvPath)
       await merge(__dirname, 'files/mta.yaml.hbs').into('mta.yaml', {
           project,
@@ -55,8 +55,8 @@ module.exports = class EnterpriseMessagingTemplate extends require('../../plugin
       })
     }
 
-    if (hasXsuaa) {
-      if (hasMta) {
+    if (addXsuaa || addMta) {
+      if (addMta) {
         await merge(__dirname, 'files/mta.yaml.hbs').into('mta.yaml', {
           project,
           additions: [xsuaa]
@@ -72,7 +72,7 @@ module.exports = class EnterpriseMessagingTemplate extends require('../../plugin
       })
     }
 
-    if (hasHelm || hasHelmUnifiedRuntime) {
+    if (addHelm || addHelmUnifiedRuntime) {
       await merge(__dirname, 'files', 'values.yaml').into('chart/values.yaml')
     }
 

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

@@ -34,7 +34,7 @@ module.exports = class EnterpriseMessagingSharedTemplate extends require('../../
     const project = readProject()
     const { configFile, isNodejs } = project
     if (isNodejs) {
-      project.shortcut = typeof (await read(configFile)).cds?.requires?.messaging !== 'object'
+      project.shortcut = !exists(configFile) || typeof (await read(configFile)).cds?.requires?.messaging !== 'object'
       project.cloudevents = cds.cli.options.cloudevents
       await merge(__dirname, 'files/package.json.hbs').into(configFile, { with: project })
     }
@@ -42,9 +42,9 @@ module.exports = class EnterpriseMessagingSharedTemplate extends require('../../
 
   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)
       await merge(__dirname, 'files', 'mta.yaml.hbs').into('mta.yaml', {
         project,
@@ -56,7 +56,7 @@ module.exports = class EnterpriseMessagingSharedTemplate extends require('../../
       })
     }
 
-    if (hasHelm || hasHelmUnifiedRuntime) {
+    if (addHelm || addHelmUnifiedRuntime) {
       await merge(__dirname, 'files/values.yaml').into('chart/values.yaml')
     }
 

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/files/kyma-setup/action.yaml

@@ -45,8 +45,6 @@ runs:
       shell: bash
     - run: curl -fsSL https://raw.githubusercontent.com/helm/helm/main/scripts/get-helm-3 | bash
       shell: bash
-    - run: npm install -g ctz
-      shell: bash
     - shell: bash
       run: |
           mkdir ${HOME}/kyma-binaries

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, hasMta, addHelm, addHelmUnifiedRuntime, addMultitenancy, addContainerize, isJava, hasHelm, hasHelmUnifiedRuntime, hasMultitenancy, srvPath } = project
 
-        if (hasMta) {
+        if (addMta || (addMultitenancy && hasMta)) {
             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 || hasHelmUnifiedRuntime)) {
+            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/helm/index.js

@@ -1,7 +1,6 @@
 const { join } = require('path')
-const yaml = require('yaml')
 const cds = require('../../../cds')
-const { exists, rimraf, copy, readFileSync } = cds.utils
+const { readFileSync, exists, rimraf, copy, yaml } = cds.utils
 const { readProject } = require('../../projectReader')
 const { merge } = require('../../merge')
 const { ask4 } = require('../../../util/question')
@@ -37,47 +36,36 @@ module.exports = class HelmTemplate extends require('../../plugin') {
     // Won't need this any more with plugin approach: package not there -> plugin not pulled
     static hasInProduction() {
         if (exists('chart/Chart.yaml')) {
-            const chartFile = readFileSync(join(cds.root, 'chart', 'Chart.yaml'), 'utf8')
-            const chartYaml = yaml.parseDocument(chartFile).toJS()
+            const chartYaml = yaml.parse(readFileSync(join(cds.root, 'chart', 'Chart.yaml'), 'utf8'))
             return chartYaml.annotations?.["app.kubernetes.io/managed-by"] === 'cds-dk/helm'
-          }
-          return false
+        }
+        return false
     }
 
     async run() {
         const project = readProject()
-        project.domain = 'abc.com'
-        project.registry = 'registry-server'
-        project.imagePullSecret = 'docker-registry'
-        project.tag = 'latest'
-
-        if (cds.cli.command === 'add' && !HelmTemplate.hasInProduction()) {
-            let registry = 'registry-server', tag = 'latest', domain = 'abc.com'
-
+        let imagePullSecret, registry, domain, tag
+        if (!HelmTemplate.hasInProduction() && !project.isBas /* don't run this for the BAS Yeoman generator */) {
             try {
                 const domainGuess = execSync(`kubectl config view --minify --output jsonpath="{.clusters[*].cluster.server}"`, { stdio: "pipe" }).toString()
                 const domainStartIndex = domainGuess.indexOf('api.')
                 if (domainStartIndex !== -1) domain = domainGuess.substring(domainStartIndex + 4)
             } catch (error) { /* ignore */ }
 
-            // read project.registry
             if (exists('containerize.yaml')) {
-                const containerizeYamlFile = readFileSync(join(cds.root, 'containerize.yaml'), 'utf8')
-                const containerizeYaml = yaml.parseDocument(containerizeYamlFile).toJS()
-                registry = containerizeYaml.repository
-                tag = containerizeYaml.tag
+                const { repository: r, tag: t } = yaml.parse(join(cds.root, 'containerize.yaml'))
+                if (r) registry = r
+                if (t) tag = t
             }
-
-            if (!cds.cli.options['y']) {
-                const [registryAns] = await ask4(`registry server (${registry}): `)
-                registry = registryAns || registry
+            if (!cds.cli.options.y && !cds.cli.options.force) {
+                registry ??= await ask4(`registry server: `)
+                domain ??= await ask4(`cluster domain: `)
             }
-
-            project.domain = domain
-            project.registry = registry
-            project.tag = tag
         }
-
+        project.registry = registry ?? '<registry-server>'
+        project.domain = domain ?? '<cluster-domain>'
+        project.imagePullSecret = imagePullSecret ?? 'docker-registry'
+        project.tag = tag ?? 'latest'
         await copy(join(__dirname, 'files', 'values.schema.json')).to('chart/values.schema.json')
         await merge(__dirname, 'files/Chart.yaml.hbs').into('chart/Chart.yaml', { with: project })
         await merge(__dirname, 'files/values.yaml.hbs').into('chart/values.yaml', { with: project })
@@ -87,40 +75,49 @@ module.exports = class HelmTemplate extends require('../../plugin') {
 
     async combine() {
         // REVISIT: This must be moved to the respective plugins
-        const { hasDestination, hasEnterpriseMessaging, hasEnterpriseMessagingShared, hasHana, hasMultitenancy, hasXsuaa, hasHtml5Repo, hasApprouter, hasKafka, hasAttachments, hasPortal, hasMalwareScanner, hasDynatrace, hasCloudLogging, hasAuditLogging } = readProject()
-
-        if (hasApprouter) {
+        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 {
@@ -128,23 +125,23 @@ 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 (hasAuditLogging) {
+        if (addAuditLogging) {
             await this._mergeDependency('service-instance', 'auditlog')
         }
     }

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

@@ -1,14 +1,4 @@
 ---
-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
-{{/apps}}
-{{/hasUI5}}
 modules:
   - name: {{appName}}-html5-deployer
     build-parameters:

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

@@ -28,13 +28,6 @@ modules:
       {{#hasXsuaa}}
       - name: {{appName}}-auth
       {{/hasXsuaa}}
-      {{#hasIas}}
-      - name: {{appName}}-ias
-        parameters:
-          config:
-            credential-type: X509_GENERATED
-            app-identifier: app-deployer
-      {{/hasIas}}
       - name: srv-api
       - name: {{appName}}-html5-repo-host
         parameters:
@@ -52,6 +45,7 @@ modules:
           target-path: {{#isNodejs}}{{& appPath }}{{/isNodejs}}{{#isJava}}resources{{/isJava}}
       {{/apps}}
     {{#hasWorkzoneStandard}}
+    {{#hasMultitenancy}}
     parameters:
       config:
         HTML5Runtime_enabled: true
@@ -66,11 +60,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/files/values.yaml.hbs

@@ -53,3 +53,9 @@ approuter:
     html5-apps-repo-runtime:
       serviceInstanceName: html5-apps-repo-runtime
 {{/hasApprouter}}
+{{#hasMultitenancy}}
+sidecar:
+  bindings:
+    html5-apps-repo-host:
+      serviceInstanceName: html5-apps-repo-host
+{{/hasMultitenancy}}

package/lib/init/template/html5-repo/files/xs-app.json.hbs

@@ -7,13 +7,15 @@
       "target": "/odata/$1",
       "destination": "srv-api",
       {{#hasXsuaa}}"authenticationType": "xsuaa",{{/hasXsuaa}}
+      {{#hasIas}}"authenticationType": "ias",{{/hasIas}}
       "csrfProtection": true
     },
     {
       "source": "^(.*)$",
-      "target": "$1",
-      "service": "html5-apps-repo-rt"{{#hasXsuaa}},
-      "authenticationType": "xsuaa"{{/hasXsuaa}}
+      "service": "html5-apps-repo-rt",
+      {{#hasXsuaa}}"authenticationType": "xsuaa",{{/hasXsuaa}}
+      {{#hasIas}}"authenticationType": "ias",{{/hasIas}}
+      "target": "$1"
     }
   ]
 }

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

@@ -2,7 +2,7 @@ const { join } = require('path')
 const { readProject } = require('../../projectReader')
 const { merge } = require('../../merge')
 const { srv4, html5RepoHost, html5Runtime, xsuaa, appDeployer, approuter, mtxSidecar4 } = require('../../registries/mta')
-const { odataApi } = require('../../registries/xs-app')
+const { odataApi, html5RepoApi } = require('../../registries/xs-app')
 const { exists } = require('../../../cds').utils
 const { renderAndCopy } = require('../../template')
 
@@ -37,14 +37,14 @@ 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 }) => {
             project.app = app
             project.hasIndexHtml = exists(join(appPath, app, 'webapp/index.html'))
-            const additions = [odataApi]
+            const additions = [odataApi, html5RepoApi]
             await merge(__dirname, 'files/xs-app.json.hbs').into(join(appPath, app, 'xs-app.json'), { with: project, additions })
             await merge(__dirname, 'files/app-package.json.hbs').into(join(appPath, app, 'package.json'), { project })
         }))
@@ -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
    */