@sap/cds-dk 9.4.3 → 9.6.0

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

@@ -1,8 +1,10 @@
 const cds = require('../../../cds')
 const { merge, sort } = require('../../merge')
 
+const mvn = require('../../mvn')
 const { readProject } = require('../../projectReader')
 const { srv4, mtxSidecar4, approuter } = require('../../registries/mta')
+const KymaTemplate = require('../kyma')
 
 module.exports = class extends require('../../plugin') {
 
@@ -32,12 +34,13 @@ module.exports = class extends require('../../plugin') {
       await sort('package.json', 'dependencies')
     } else if (isJava) {
       await merge(__dirname, 'files/java-cdsrc.json.hbs').into('.cdsrc.json', { with: project })
+      await mvn.add('APPLICATION_LOGGING')
     }
   }
 
   async combine() {
     const project = readProject()
-    const { hasMta, addMta, addHelm, addHelmUnifiedRuntime, addApprouter, isJava, addMultitenancy, srvPath } = project
+    const { hasMta, addMta, addKyma, addApprouter, isJava, addMultitenancy, srvPath } = project
 
     if (addMta || (addMultitenancy || addApprouter) && hasMta) {
       const cloudLogging = {
@@ -50,7 +53,6 @@ module.exports = class extends require('../../plugin') {
       const additions = [cloudLogging], relationships = []
       const srv = srv4(srvPath)
       if (addMta) {
-        additions.push(srv)
         relationships.push({
           insert: [cloudLogging, 'name'],
           into: [srv, 'requires', 'name']
@@ -58,14 +60,12 @@ module.exports = class extends require('../../plugin') {
       }
       if (addMultitenancy) {
         const mtxSidecar = mtxSidecar4(isJava ? 'mtx/sidecar' : 'gen/mtx/sidecar')
-        additions.push(mtxSidecar)
         relationships.push({
           insert: [cloudLogging, 'name'],
           into: [mtxSidecar, 'requires', 'name']
         })
       }
       if (addApprouter) {
-        additions.push(approuter)
         relationships.push({
           insert: [cloudLogging, 'name'],
           into: [approuter, 'requires', 'name']
@@ -77,8 +77,9 @@ module.exports = class extends require('../../plugin') {
         with: project, additions, relationships
       })
     }
-    if (addHelm || addHelmUnifiedRuntime) {
+    if (addKyma) {
       await merge(__dirname, 'files/values.yaml.hbs').into('chart/values.yaml')
+      await KymaTemplate.mergeDependency('service-instance', 'cloud-logging')
     }
   }
 }

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

@@ -20,7 +20,7 @@ module.exports = class ConnectivityTemplate extends require('../../plugin') {
 
     async combine() {
         const project = readProject()
-        const { srvPath, addHelm, addHelmUnifiedRuntime, addMta } = project
+        const { srvPath, addKyma, addMta } = project
 
         if (addMta) {
             const srv = srv4(srvPath)
@@ -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 (addHelm || addHelmUnifiedRuntime) {
+        if (addKyma) {
             await merge(__dirname, 'files/values.yaml.hbs').into('chart/values.yaml', {
                 project,
                 additions: [{

package/lib/init/template/console/files/package.json

@@ -0,0 +1,5 @@
+{
+  "dependencies": {
+    "@cap-js/console": "^1.0.0"
+  }
+}

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

@@ -0,0 +1,25 @@
+const { join } = require("path");
+const mvn = require("../../mvn");
+
+const { readProject } = require("../../projectReader");
+const { merge } = require("../../merge");
+
+module.exports = class ConsoleTemplate extends require("../../plugin") {
+  static help() {
+    return "installs the CAP console plugin";
+  }
+
+  async run() {
+    const { isJava } = readProject();
+
+    if (isJava) {
+      await mvn.add("CAP_JAVA_PLUGIN", {
+        groupId: "com.sap.cds",
+        artifactId: "cds-feature-console",
+        version: "1.0.0"
+      });
+    } else {
+      await merge(join(__dirname, "files", "package.json")).into("package.json");
+    }
+  }
+};

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

@@ -2,23 +2,21 @@ const cds = require('../../../cds')
 const { exists, rimraf } = cds.utils
 const { readProject } = require('../../projectReader');
 const { merge } = require('../../merge')
+const term = require('../../../../lib/util/term')
 
+// cds10: Remove this and all usages of addContainerize/hasContainerize
 module.exports = class ContainerizeTemplate extends require('../../plugin') {
 
-    static help() {
-        return 'containerization using ctz CLI'
-    }
-
     static hasInProduction () {
         return exists('containerize.yaml')
     }
-
     async run() {
+        console.warn(term.warn(`The "cds add containerize" command is deprecated and will be removed in the next major release. Please use the "cds add kyma" command instead.`))
         if (cds.cli.options.force) {
             await rimraf('containerize.yaml')
         }
 
         const project = readProject()
-        await merge(__dirname, '/files/containerize.yaml.hbs').into('containerize.yaml', { with: project })
+        await merge(__dirname, '../kyma/files/containerize.yaml.hbs').into('containerize.yaml', { with: project })
     }
 }

package/lib/init/template/data/as-json.js

@@ -12,7 +12,7 @@ const MAX_ASSOC_DEPTH = 5
  * @param {object} csn the model
  * @param {Number} numRecords the number of records to be created for each artifact
  * @param {{referenceData? : Record<string, string}} options misc. options
- * @returns {Record<string, object[]>} the filled data
+ * @returns {Promise<Record<string, object[]>>} the filled data
  */
 const asJson = module.exports = async (data, csn, numRecords=1, options={}) => {
   let { referenceData, contentType, artifact='entity' } = options
@@ -66,10 +66,10 @@ const asJson = module.exports = async (data, csn, numRecords=1, options={}) => {
     data[name] = uniqRecords(data[name], artifact)
   }
   for (let [key, d] of Object.entries(data)) {
-    if (contentType === 'json' && d.deleteReference && !d.keepReferece) {
+    if (contentType === 'json' && d.deleteReference && !d.keepReference) {
       delete data[key]
     }
-    delete d.keepReferece
+    delete d.keepReference
     delete d.deleteReference
     uniqRecords(d, csn.definitions[key])
   }
@@ -235,7 +235,10 @@ function dataForField(element, artifact, csn, record, data, parent, depth, refer
       const prec  = element.precision ? Math.min(Math.pow(10, element.precision - scale) - 1, Number.MAX_SAFE_INTEGER) : 100
       const range = { from: 0, to: prec }
       annotatedIntRange(element, range)
-      return +(randomDecimalInRange(range).toFixed(scale))
+      if (scale === 0) return randomIntInRange(range)
+      const intPart = randomIntInRange(range)
+      const frac = Math.floor(randomUnit() * Math.pow(10, scale))
+      return +(intPart + frac / Math.pow(10, scale)).toFixed(scale)
     }
     case 'cds.Double': {
       const range = {from: 0, to: 100}
@@ -287,7 +290,7 @@ function dataForField(element, artifact, csn, record, data, parent, depth, refer
         else if (!targetRecords) // target entity is not in the list of entities to be created
           return
 
-        if (targetRecords.length > 0) { // use record generated by following asociation
+        if (targetRecords.length > 0) { // use record generated by following association
           targetRecord = targetRecords.at(-1)  // make sure the localized record references the newly generated texts
         } else {
           targetRecord = fillRecord({}, randomNumber(), target, csn, data, artifact, depth+1, referenceData)
@@ -295,7 +298,7 @@ function dataForField(element, artifact, csn, record, data, parent, depth, refer
             targetRecords.push(targetRecord)
             uniqRecords(targetRecords, target)
           }
-          if (parent && (parent.name != artifact.name)) data[target.name].keepReferece = true
+          if (parent && (parent.name != artifact.name)) data[target.name].keepReference = true
         }
       }
 
@@ -371,7 +374,7 @@ asJson.randomFromReferenceData = function(entity, csn, referenceData) {
 /* whether the given name matches the entity or one of its projections */
 function matchesEntityOrProjection(name, entity, csn) {
   if (name === entity?.name)  return true
-  // follow simle projections
+  // follow simple projections
   const p = entity?.query?.SELECT || entity?.projection
   if (p?.from?.ref?.length === 1) {
     if (p.from.ref[0] === name)  return true
@@ -551,21 +554,13 @@ function randomDateInRange(dateRange) {
   return returnDate
 }
 
-function randomDecimalInRange(decimalRange) {
-  const max = decimalRange.to
-  const min = decimalRange.from
-  const num = max === 0 ? 0 : min + (randomNumber() % (max - min))
-  let dec = randomNumber()
-  const divider = Math.pow(10, dec.toString().length)
-  dec = dec / divider
-  const returnValue = num + dec
-  return returnValue
+function randomDecimalInRange({ from: min, to: max }) {
+  return min + randomUnit() * (max - min)
 }
 
-function randomIntInRange(intRange) {
-  const max = intRange.to
-  const min = intRange.from
-  return min + (randomNumber() % max)
+function randomIntInRange({ from: min, to: max }) {
+  const span = Math.max(0, max - min + 1)
+  return min + Math.floor(randomUnit() * span)
 }
 
 const p = 5651;
@@ -575,3 +570,6 @@ function randomNumber() {
   counter = (counter * counter) % M
   return counter;
 }
+function randomUnit() {
+  return randomNumber() / (M - 1) // ~[0,1]
+}

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

@@ -1,6 +1,7 @@
 const { readProject } = require('../../projectReader')
 const { merge } = require('../../merge')
 const { srv4, approuter, destination, mtxSidecar4 } = require('../../registries/mta')
+const KymaTemplate = require('../kyma')
 
 module.exports = class DestinationTemplate extends require('../../plugin') {
 
@@ -24,7 +25,7 @@ module.exports = class DestinationTemplate extends require('../../plugin') {
 
     async combine() {
         const project = readProject()
-        const { addHelm, addApprouter, addMultitenancy, addHelmUnifiedRuntime, addMta, hasMta, srvPath, isJava } = project
+        const { addApprouter, addMultitenancy, addKyma, addMta, hasMta, srvPath, isJava } = project
 
         if (addMta || (addApprouter || addMultitenancy) && hasMta) {
             const srv = srv4(srvPath)
@@ -48,8 +49,9 @@ module.exports = class DestinationTemplate extends require('../../plugin') {
             await merge(__dirname, 'files/mta.yaml.hbs').into('mta.yaml', { with: project, additions, relationships })
         }
 
-        if (addHelm || addHelmUnifiedRuntime) {
+        if (addKyma) {
             await merge(__dirname, 'files/values.yaml').into('chart/values.yaml')
+            await KymaTemplate.mergeDependency('service-instance', 'destination')
         }
     }
 }

package/lib/init/template/dynatrace/files/package.json.hbs

@@ -1,9 +1,9 @@
 {
   "dependencies": {
     "@cap-js/telemetry": ">=0",
-    "@opentelemetry/exporter-metrics-otlp-proto": "<0.200"{{#hasHelm}},
+    "@opentelemetry/exporter-metrics-otlp-proto": "<0.200"{{#hasKyma}},
     "@opentelemetry/host-metrics": "<0.200"
-    {{/hasHelm}}
+    {{/hasKyma}}
   },
   "cds": {
     "requires": {

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

@@ -2,6 +2,7 @@ const { merge, sort } = require('../../merge')
 
 const { readProject } = require('../../projectReader')
 const { srv4, mtxSidecar4 } = require('../../registries/mta')
+const KymaTemplate = require('../kyma')
 
 module.exports = class extends require('../../plugin') {
 
@@ -24,7 +25,7 @@ module.exports = class extends require('../../plugin') {
 
   async combine() {
     const project = readProject()
-    const { appName, addMta, addHelm, addHelmUnifiedRuntime, isJava, addMultitenancy, srvPath } = project
+    const { appName, addMta, addKyma, isJava, addMultitenancy, srvPath } = project
 
     if (addMta || addMultitenancy) {
       const dynatrace = {
@@ -37,7 +38,6 @@ module.exports = class extends require('../../plugin') {
       const additions = [dynatrace], relationships = []
       if (addMta) {
         const srv = srv4(srvPath)
-        additions.push(srv)
         relationships.push({
           insert: [dynatrace, 'name'],
           into: [srv, 'requires', 'name']
@@ -45,7 +45,6 @@ module.exports = class extends require('../../plugin') {
       }
       if (addMultitenancy) {
         const mtxSidecar = mtxSidecar4(isJava ? 'mtx/sidecar' : 'gen/mtx/sidecar')
-        additions.push(mtxSidecar)
         relationships.push({
           insert: [dynatrace, 'name'],
           into: [mtxSidecar, 'requires', 'name']
@@ -57,8 +56,9 @@ module.exports = class extends require('../../plugin') {
       })
     }
 
-    if (addHelm || addHelmUnifiedRuntime) {
+    if (addKyma) {
       await merge(__dirname, 'files', 'values.yaml').into('chart/values.yaml')
+      await KymaTemplate.mergeDependency('service-instance', 'dynatrace')
     }
   }
 }

package/lib/init/template/enterprise-messaging/files/mta.yaml.hbs

@@ -13,7 +13,9 @@ resources:
       service: enterprise-messaging
       service-plan: default
       path: ./event-mesh.json
-  - type: org.cloudfoundry.managed-service
+
+  - name: {{appName}}-auth
+    type: org.cloudfoundry.managed-service
     parameters:
       service: xsuaa
       service-plan: application

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

@@ -3,6 +3,7 @@ const { read, exists, yaml: YAML } = cds.utils
 const { readProject } = require('../../projectReader')
 const { merge } = require('../../merge')
 const { srv4, enterpriseMessaging, xsuaa } = require('../../registries/mta')
+const KymaTemplate = require('../kyma')
 
 module.exports = class EnterpriseMessagingTemplate extends require('../../plugin') {
 
@@ -41,7 +42,7 @@ module.exports = class EnterpriseMessagingTemplate extends require('../../plugin
 
   async combine() {
     const project = readProject()
-    const { addXsuaa, addHelm, addHelmUnifiedRuntime, addMta, srvPath, appName } = project
+    const { addXsuaa, addKyma, addMta, srvPath, appName } = project
 
     if (addMta) {
       const srv = srv4(srvPath)
@@ -72,8 +73,9 @@ module.exports = class EnterpriseMessagingTemplate extends require('../../plugin
       })
     }
 
-    if (addHelm || addHelmUnifiedRuntime) {
+    if (addKyma) {
       await merge(__dirname, 'files', 'values.yaml').into('chart/values.yaml')
+      await KymaTemplate.mergeDependency('service-instance', 'event-mesh')
     }
 
     if (!exists('event-mesh.json')) await merge(__dirname, 'files/event-mesh.json.hbs').into('event-mesh.json', { project })

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

@@ -3,6 +3,7 @@ const { read, exists } = cds.utils
 const { readProject } = require('../../projectReader')
 const { merge } = require('../../merge')
 const { srv4, enterpriseMessaging } = require('../../registries/mta')
+const KymaTemplate = require('../kyma')
 
 module.exports = class EnterpriseMessagingSharedTemplate extends require('../../plugin') {
 
@@ -42,7 +43,7 @@ module.exports = class EnterpriseMessagingSharedTemplate extends require('../../
 
   async combine() {
     const project = readProject()
-    const { addMta, addHelm, addHelmUnifiedRuntime, srvPath } = project
+    const { addMta, addKyma, srvPath } = project
 
     if (addMta) {
       const srv = srv4(srvPath)
@@ -56,8 +57,9 @@ module.exports = class EnterpriseMessagingSharedTemplate extends require('../../
       })
     }
 
-    if (addHelm || addHelmUnifiedRuntime) {
+    if (addKyma) {
       await merge(__dirname, 'files/values.yaml').into('chart/values.yaml')
+      await KymaTemplate.mergeDependency('service-instance', 'event-mesh')
     }
 
     if (!exists('event-mesh.json')) await merge(__dirname, 'files/event-mesh.json.hbs').into('event-mesh.json', { project })

package/lib/init/template/github-actions/files/workflows/cf.yaml.hbs

@@ -29,7 +29,22 @@ jobs:
       - uses: actions/setup-node@v5
         with:
           node-version: 22
-      - uses: ./.github/actions/cf-setup
+      {{#isJava}}
+      - uses: actions/setup-java@v5
+        with:
+          distribution: sapmachine
+          java-version: 21
+          cache: maven
+      {{#sap}}
+      - name: Install Maven
+        run: |
+          MAVEN_VERSION=3.9.6
+          curl -fsSL "https://archive.apache.org/dist/maven/maven-3/${MAVEN_VERSION}/binaries/apache-maven-${MAVEN_VERSION}-bin.tar.gz" -o maven.tgz
+          tar -xzf maven.tgz
+          echo "${PWD}/apache-maven-${MAVEN_VERSION}/bin" >> "$GITHUB_PATH"
+      {{/sap}}
+      {{/isJava}}
+      - uses: cap-js/cf-setup@v1
         with:
           cf-api: {{#literal}}${{ vars.CF_API }}{{/literal}}
           cf-org: {{#literal}}${{ vars.CF_ORG }}{{/literal}}

package/lib/init/template/github-actions/files/workflows/release.yaml.hbs

@@ -20,11 +20,11 @@ jobs:
     secrets: inherit
     with:
       environment: Production
-{{/hasMta}}{{^hasMta}}{{#hasHelm}}
+{{/hasMta}}{{^hasMta}}{{#hasKyma}}
   deploy-kyma:
     needs: [tests]
     uses: {{& githubSlug}}/.github/workflows/kyma.yaml@main
     secrets: inherit
     with:
       environment: Production
-{{/hasHelm}}{{/hasMta}}
+{{/hasKyma}}{{/hasMta}}

package/lib/init/template/github-actions/files/workflows/test.yaml.hbs

@@ -21,4 +21,24 @@ jobs:
           node-version: 22
       - uses: actions/checkout@v5
       - run: npm install
+      {{#isJava}}
+      - uses: actions/setup-java@v5
+        with:
+          distribution: sapmachine
+          java-version: 21
+          cache: maven
+      {{#sap}}
+      - name: Install Maven
+        run: |
+          MAVEN_VERSION=3.9.6
+          curl -fsSL "https://archive.apache.org/dist/maven/maven-3/${MAVEN_VERSION}/binaries/apache-maven-${MAVEN_VERSION}-bin.tar.gz" -o maven.tgz
+          tar -xzf maven.tgz
+          echo "${PWD}/apache-maven-${MAVEN_VERSION}/bin" >> "$GITHUB_PATH"
+      {{/sap}}
+      {{/isJava}}
+      {{#isNodejs}}
       - run: npm test
+      {{/isNodejs}}
+      {{#isJava}}
+      - run: mvn test -B
+      {{/isJava}}

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

@@ -24,9 +24,11 @@ module.exports = class GitHubActionTemplate extends require('../../plugin') {
   }
 
   async run() {
+    const { hasMta, hasKyma, isJava } = readProject()
     const test = `.github/workflows/test.yaml`
-    if (!exists(test) || cds.cli.options.force) {
-      await renderAndCopy(path.join(__dirname, 'files/workflows/test.yaml.hbs'), test, { sap: cds.cli.options.sap })
+    const { force, sap } = cds.cli.options
+    if (!exists(test) || force) {
+      await renderAndCopy(path.join(__dirname, 'files/workflows/test.yaml.hbs'), test, { sap, isJava })
     } else {
       console.log('> skipping ' + test)
     }
@@ -41,8 +43,7 @@ module.exports = class GitHubActionTemplate extends require('../../plugin') {
         githubSlug = '<org/repo>'
         // console.log(`\ncould not determine GitHub URL for the project – replace '<org/repo>' in ${release}`, DEBUG ? error : '')
       }
-      const { hasMta, hasHelm } = readProject()
-      await renderAndCopy(path.join(__dirname, 'files/workflows/release.yaml.hbs'), release, { sap: cds.cli.options.sap, githubSlug, hasMta, hasHelm })
+      await renderAndCopy(path.join(__dirname, 'files/workflows/release.yaml.hbs'), release, { isJava, sap: cds.cli.options.sap, githubSlug, hasMta, hasKyma })
     } else {
       console.log('> skipping ' + release)
     }
@@ -50,19 +51,15 @@ module.exports = class GitHubActionTemplate extends require('../../plugin') {
 
   async combine() {
     const project = readProject()
-    const { addMta, addHelm } = project, { force } = cds.cli.options
+    const { addMta, addKyma } = project, { force } = cds.cli.options
     project.sap = cds.cli.options.sap
     if (addMta) {
       const cf = '.github/workflows/cf.yaml'
       if (force || !exists(cf)) {
         await renderAndCopy(path.join(__dirname, 'files/workflows/cf.yaml.hbs'), cf, project)
       }
-      const cfSetup = '.github/actions/cf-setup'
-      if (force || !exists(cfSetup)) {
-        await copy(path.join(__dirname, 'files/cf-setup'), cfSetup)
-      }
     }
-    if (addHelm) {
+    if (addKyma) {
       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/files/db/package.json

@@ -1,11 +1,11 @@
 {
   "name": "deploy",
   "dependencies": {
-    "hdb": "^0",
+    "hdb": "^2.0.0",
     "@sap/hdi-deploy": "^5"
   },
   "engines": {
-    "node": "^22.0.0"
+    "node": "^24.0.0"
   },
   "scripts": {
     "start": "node node_modules/@sap/hdi-deploy/deploy.js --use-hdb --parameter com.sap.hana.di.table/try_fast_table_migration=true",

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

@@ -6,7 +6,6 @@ modules:
     requires:
       - name: {{appName}}-db
 
-{{^hasMultitenancy}}
   - name: {{appName}}-db-deployer
     type: hdb
     path: {{& db.path}}
@@ -20,15 +19,12 @@ modules:
 {{/isJava}}
     requires:
       - name: {{appName}}-db
-{{/hasMultitenancy}}
 
-{{#hasMultitenancy}}
   - name: {{appName}}-mtx
     type: nodejs
     path: {{#isNodejs}}gen/{{/isNodejs}}mtx/sidecar
     requires:
       - name: {{appName}}-db
-{{/hasMultitenancy}}
 
 resources:
   - name: {{appName}}-db

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

@@ -23,8 +23,7 @@ module.exports = class HanaTemplate extends require('../../plugin') {
         const { isJava, configFile, db } = project
         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'))
+        // cds10: Let cds build generate this by default
         await merge(__dirname, 'files/undeploy.json').into(join(db.folder, 'undeploy.json'))
 
         if (isJava) {
@@ -44,9 +43,9 @@ module.exports = class HanaTemplate extends require('../../plugin') {
 
     async combine() {
         const project = readProject()
-        const { addMta, hasMta, addHelm, addHelmUnifiedRuntime, addMultitenancy, addContainerize, isJava, hasHelm, hasHelmUnifiedRuntime, hasMultitenancy, srvPath } = project
+        const { addMta, hasMta, addMultitenancy, addContainerize, addKyma, isJava, hasKyma, hasMultitenancy, srvPath } = project
 
-        if (addMta || (addMultitenancy && hasMta)) {
+        if (addMta || addMultitenancy && hasMta) {
             const srv = srv4(srvPath)
             const db = hasMultitenancy ? serviceManager : hdiContainer
             const deletions = hasMultitenancy ? [{
@@ -82,16 +81,15 @@ module.exports = class HanaTemplate extends require('../../plugin') {
 
             const modules = hasMultitenancy ? [srv] : [srv, hdbDeployer]
             await merge(__dirname, 'files/mta.yaml.hbs').into('mta.yaml', {
-                with: project, additions: [...modules, db].filter(a => a), deletions, relationships
+                with: project, additions: [...modules, db], deletions, relationships
             })
         }
 
-        if (!hasMultitenancy && (addHelm || addHelmUnifiedRuntime)) {
+        if (!hasMultitenancy && addKyma) {
             await merge(__dirname, 'files', 'values.yaml.hbs').into('chart/values.yaml', { with: project })
-
         }
 
-        if (addMultitenancy && (hasHelm || hasHelmUnifiedRuntime)) {
+        if (addMultitenancy && hasKyma) {
             await merge('chart/values.yaml')
                 .remove(['hana-deployer', 'srv.bindings.db', 'hana'])
 
@@ -102,7 +100,7 @@ module.exports = class HanaTemplate extends require('../../plugin') {
                 ])
         }
 
-        if (addContainerize && !hasMultitenancy) {
+        if ((addContainerize || addKyma) && !hasMultitenancy) {
             const additions = [{
                 in: 'modules',
                 where: { name: `${project.appName}-hana-deployer` }

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

@@ -6,18 +6,15 @@ const { merge } = require('../../merge')
 const { ask4 } = require('../../../util/question')
 const { execSync } = require('child_process')
 const { mvn } = require('../../add')
+const term = require('../../../../lib/util/term')
 
+// cds10: Remove this plugin and hasHelm doc in projectReader
 module.exports = class HelmTemplate extends require('../../plugin') {
 
-    static help() {
-        return 'Kyma deployment using Helm charts'
-    }
-
     options() {
         return {
             'y': {
                 type: 'boolean',
-                help: 'If provided, the default values will be used for all prompts.'
             }
         }
     }
@@ -43,6 +40,7 @@ module.exports = class HelmTemplate extends require('../../plugin') {
     }
 
     async run() {
+        console.warn(term.warn(`The "cds add helm" command is deprecated and will be removed in the next major release. Please use the "cds add kyma" command instead.`))
         const project = readProject()
         let imagePullSecret, registry, domain, tag
         if (!HelmTemplate.hasInProduction() && !project.isBas /* don't run this for the BAS Yeoman generator */) {
@@ -58,17 +56,17 @@ module.exports = class HelmTemplate extends require('../../plugin') {
                 if (t) tag = t
             }
             if (!cds.cli.options.y && !cds.cli.options.force) {
-                registry ??= await ask4(`registry server: `)
-                domain ??= await ask4(`cluster domain: `)
+                registry ??= await ask4([`registry server: `])
+                domain ??= await ask4([`cluster domain: `])
             }
         }
         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 })
+        await copy(join(__dirname, '../kyma/files/values.schema.json')).to('chart/values.schema.json')
+        await merge(__dirname, '../kyma/files/Chart.yaml.hbs').into('chart/Chart.yaml', { with: project })
+        await merge(__dirname, '../kyma/files/values.yaml.hbs').into('chart/values.yaml', { with: project })
         await this._mergeDependency('web-application', 'srv')
         if (project.isJava) await mvn.add('k8s')
     }

package/lib/init/template/helm-unified-runtime/index.js

@@ -6,12 +6,9 @@ const { join } = require('path')
 const { readProject } = require('../../projectReader')
 const { merge } = require('../../merge')
 
+// cds10: Remove this plugin (hasHelmUnifiedRuntime is already replaced in projectReader)
 module.exports = class HelmUnifiedRuntimeTemplate extends require('../helm') {
 
-  static help() {
-    return 'Kyma deployment using Unified Runtime Helm charts'
-  }
-
   options() {
     return {
       'internal-unified-runtime-charts': {