@sap/cds-dk 7.4.0 → 7.5.0

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

@@ -1,35 +1,29 @@
 const { join } = require('path')
 const cds = require('../../../cds')
-const { read, write } = cds.utils
-const { APPROUTER, HANA, KIBANA } = require('../../constants').OPTIONS
-const mvn = require('../../util/mvn')
-const { readProject } = require('../../util/projectReader')
-const { mergeJSON, mergeYAML, sort } = require('../../util/merge')
-const { copyAndTrack, parseMd5File, writeMd5File } = require('../../util/md5')
+const { read, write, copy } = cds.utils
+const mvn = require('../../mvn')
+const { readProject } = require('../../projectReader')
+const { merge, sort } = require('../../merge')
 const { copyRenderedJSON } = require('../../../util/fs')
 const {
-  srvNode4, srvJava4, // Server
+  srv4, // Server
   mtxSidecar4, // Additional Modules
   saasRegistry, serviceManager, xsuaa, // BTP Services
   srvApi4, providedMtxApiSidecar4, requiredMtxSidecarApi4 // APIs
-} = require('../_merging/registry-mta')
+} = require('../../registries/mta')
 
-module.exports = class MultitenancyTemplate extends require('../templateBase') {
+module.exports = class MultitenancyTemplate extends require('../../plugin') {
 
-  static hasFacet(env) {
+  static hasInProduction(env) {
     const { options } = cds.cli.options
     // REVISIT: Check if this can be simplified
     return options?.add?.has('mtx') || options?.add?.has('multitenancy') || !!env.requires?.multitenancy || false
   }
 
-  getRelatedFacets() {
-    return [APPROUTER, HANA, KIBANA]
-  }
-
   async run() {
-    const project = await readProject()
+    const project = readProject()
     const { isNodejs, isJava, configFile } = project
-    await mergeJSON(configFile, join(__dirname, 'files', `package.json.hbs`), project)
+    await merge(__dirname, 'files/package.json.hbs').into(configFile, { with: project })
     if (isJava) {
       const packageJson = await read('package.json')
       packageJson.workspaces = ['mtx/sidecar']
@@ -40,12 +34,12 @@ module.exports = class MultitenancyTemplate extends require('../templateBase') {
     await copyRenderedJSON(join(__dirname, 'files', 'package.sidecar.json.hbs'), join('mtx', 'sidecar', 'package.json'), project)
   }
 
-  async runDependentMerging(context = {}) {
-    const project = await readProject()
-    const { isNodejs, isJava, hasMta, hasHelm, hasXsuaa, hasHana, srvPath } = project
+  async combine() {
+    const project = readProject()
+    const { isNodejs, isJava, hasMta, hasHelm, hasHelmUnifiedRuntime, hasXsuaa, hasHana, srvPath } = project
 
     if (hasMta) {
-      const srv = (isNodejs ? srvNode4 : srvJava4)(srvPath)
+      const srv = srv4(srvPath)
       const mtxSidecar = mtxSidecar4(isJava ? 'mtx/sidecar' : 'gen/mtx/sidecar')
       const modules = [srv, mtxSidecar]
       const services = [saasRegistry]
@@ -80,91 +74,46 @@ module.exports = class MultitenancyTemplate extends require('../templateBase') {
       }
 
       const templateMtaPath = join(__dirname, 'files', 'mta.yaml.hbs')
-      const mergingRules = { additions, overwrites, relationships }
-      await mergeYAML('mta.yaml', templateMtaPath, project, mergingRules)
+      await merge(templateMtaPath).into('mta.yaml', { with: project, additions, overwrites, relationships })
     }
 
-    // REVISIT: Why not just pass a Boolean from run() to indicate the merging isn't run transitively?
-    let isIndependentCommand = false
-    if (hasHelm) {
-      // in case facet is being added to the already existing charts folder
-      if (Object.keys(context).length == 0) {
-        isIndependentCommand = true
-        context.oldTrackingData = context.newTrackingData = await parseMd5File(join('chart', '.cds-add-helm-files.md5'))
-      }
-
-      await mergeYAML(join('chart', 'values.yaml'), join(__dirname, 'files', 'values.yaml.hbs'), project)
+    if (hasHelm || hasHelmUnifiedRuntime) {
+      await merge(__dirname, 'files/values.yaml.hbs').into('chart/values.yaml', { with: project })
 
       const envFromObject = {
-        envFrom: [
-          {
-            configMapRef: {
-              name: "{{ .Release.Name }}-mtxs-configmap"
-            }
+        envFrom: [{
+          configMapRef: {
+            name: "{{ .Release.Name }}-mtxs-configmap"
           }
-        ]
+        }]
       }
 
-      await mergeYAML(
-        join('chart', 'values.yaml'),
-        {
-          ...(isNodejs) && { sidecar: envFromObject },
-          ...(isJava) && { srv: envFromObject },
-          "saas-registry": {
-            parametersFrom: [
-              {
-                secretKeyRef: {
-                  name: "{{ .Release.Name }}-saas-registry-secret",
-                  key: "parameters"
-                }
+      await merge({
+        ...(isNodejs) && { sidecar: envFromObject },
+        ...(isJava) && { srv: envFromObject },
+        'saas-registry': {
+          parametersFrom: [
+            {
+              secretKeyRef: {
+                name: "{{ .Release.Name }}-saas-registry-secret",
+                key: "parameters"
               }
-            ]
-          }
-        },
-        project
-      )
-
-      // REVISIT: Don't reference other templates except for the safe `runDependentMerging` -> low coupling, high cohesion
-      const HelmTemplate = require(`../helm`);
-      const helmTemplate = new HelmTemplate(context.oldTrackingData, context.newTrackingData);
-
-      await helmTemplate.addDependency('web-application', 'sidecar');
-
-      // copy service-instance chart
-      isIndependentCommand = isIndependentCommand | await helmTemplate.addSubChart('service-instance');
-
-      // add dependency entry in chart.yaml
-      await helmTemplate.addDependency('service-instance', 'saas-registry');
-      await helmTemplate.addDependency('service-instance', 'service-manager');
-
-      // add mtxs configmap
-      await copyAndTrack(
-        join(__dirname, 'files', `mtxs-configmap-${isJava ? 'java' : 'nodejs'}.yaml`),
-        join('chart', 'templates', 'mtxs-configmap.yaml'),
-        context,
-      )
-
-      // add saas registry secret
-      await copyAndTrack(
-        join(__dirname, 'files', 'saas-registry-secret.yaml'),
-        join('chart', 'templates', 'saas-registry-secret.yaml'),
-        context
-      );
+            }
+          ]
+        }}).into('chart/values.yaml', { with: project })
 
-      if (isIndependentCommand) await writeMd5File(join('chart', '.cds-add-helm-files.md5'), context.newTrackingData)
+      await copy(join(__dirname, 'files', `mtxs-configmap-${isJava ? 'java' : 'nodejs'}.yaml`)).to('chart', 'templates', 'mtxs-configmap.yaml') // REVISIT: Move to build task
+      await copy(join(__dirname, 'files', 'saas-registry-secret.yaml')).to('chart', 'templates', 'saas-registry-secret.yaml') // REVISIT: Move to build task
     }
 
     if (hasXsuaa) {
-      await mergeJSON('xs-security.json',join(__dirname, 'files', 'xs-security.json.hbs'), project, {
+      await merge(__dirname, 'files/xs-security.json.hbs').into('xs-security.json', {
+        project,
         additions: [{
           in: 'scopes',
-          where: [{ property: 'name', isEqualTo: '$XSAPPNAME.mtcallback' }],
+          where: { name: '$XSAPPNAME.mtcallback' },
         }]
       })
-      if (hasHelm) {
-        await mergeYAML(join('chart', 'values.yaml'), { xsuaa: { parameters: { 'tenant-mode': 'shared' }}}, null, { forceOverwrite: true })
-        if (isIndependentCommand) await writeMd5File(join('chart', '.cds-add-helm-files.md5'), context.newTrackingData)
-      }
     }
   }
 }

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

@@ -1,13 +1,14 @@
 const { join } = require('path')
 const cds = require('../../../cds')
 const { exists, mkdirp, path } = cds.utils
+const { env4 } = require('../../projectReader')
 const { URLS, OPTIONS: { NODEJS, JAVA }, COMMAND_ADD } = require('../../constants')
 const term = require('../../../util/term')
-const { renderAndCopy } = require('../../util/template')
+const { renderAndCopy } = require('../../template')
 
-module.exports = class NodejsTemplate extends require('../templateBase') {
+module.exports = class NodejsTemplate extends require('../../plugin') {
 
-    static hasFacet() {
+    static hasInProduction() {
         return !exists('pom.xml') && !cds.cli.options?.add?.has(JAVA)
     }
 
@@ -22,7 +23,7 @@ module.exports = class NodejsTemplate extends require('../templateBase') {
     }
 
     async run() {
-        const { db, srv, app } = (await this.getEnv()).folders
+        const { db, srv, app } = env4('production').folders
         await renderAndCopy(join(__dirname, 'files'), cds.root, { projectName: path.basename(cds.root) })
         await Promise.all([db, srv, app].map(p => mkdirp(p)))
     }

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

@@ -1,6 +1,6 @@
 const term = require('../../../util/term');
 
-module.exports = class NotebookTemplate extends require('../templateBase') {
+module.exports = class NotebookTemplate extends require('../../plugin') {
 
 
     async canRun() {

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

@@ -1,18 +1,21 @@
-const { join } = require('path')
-const { readProject } = require('../../util/projectReader')
-const { mergeJSON, mergeYAML } = require('../../util/merge')
+const { readProject } = require('../../projectReader')
+const { merge } = require('../../merge')
 const { DESTINATION } = require('../../constants').OPTIONS
 
-const { notificationTypesDeployer } = require('../_merging/registry-mta')
+const { notificationTypesDeployer } = require('../../registries/mta')
 
-module.exports = class NotificationsTemplate extends require('../templateBase') {
+module.exports = class NotificationsTemplate extends require('../../plugin') {
 
-  static hasFacet(env) {
-    return !!env.requires?.notifications;
+  requires() {
+    return [DESTINATION]
+  }
+
+  static hasInProduction(env) {
+    return !!env.requires?.notifications
   }
 
   async canRun() {
-    const project = await readProject()
+    const project = readProject()
     const { isJava } = project
     if (isJava) {
       throw `'cds add notifications' is not available for Java yet`
@@ -20,24 +23,18 @@ module.exports = class NotificationsTemplate extends require('../templateBase')
     return true
   }
 
-  getDependencies() {
-    return [DESTINATION]
-  }
-
   async run() {
-    const project = await readProject()
+    const project = readProject()
     const { configFile } = project
-    await mergeJSON(configFile, join(__dirname, 'files', 'package.json.hbs'), project)
+    await merge(__dirname, 'files/package.json.hbs').into(configFile, { project })
   }
 
-  async runDependentMerging() {
-    const project = await readProject()
+  async combine() {
+    const project = readProject()
     const { hasMta } = project
 
     if (hasMta) {
-      await mergeYAML('mta.yaml', join(__dirname, 'files', 'mta.yaml.hbs'), project, {
-        additions: [notificationTypesDeployer]
-      })
+      await merge(__dirname, 'files/mta.yaml.hbs').into('mta.yaml', { project, additions: [notificationTypesDeployer] })
     }
   }
 }

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

@@ -3,7 +3,7 @@ const cds = require('../../../cds')
 const { exists, copy } = cds.utils
 const { URLS } = require('../../constants')
 
-module.exports = class PipelineTemplate extends require('../templateBase') {
+module.exports = class PipelineTemplate extends require('../../plugin') {
 
     async canRun() {
         if (cds.cli.options.force) {

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

@@ -1,53 +1,47 @@
-const { join } = require('path')
 const cds = require('../../../cds')
 const { read } = cds.utils
-const { readProject } = require('../../util/projectReader')
-const { mergeJSON, mergeYAML } = require('../../util/merge')
-const mvn = require('../../util/mvn')
-const { srvNode4, srvJava4, postgres, postgresDeployer } = require('../_merging/registry-mta')
+const { readProject } = require('../../projectReader')
+const { merge } = require('../../merge')
+const mvn = require('../../mvn')
+const { srv4, postgres, postgresDeployer } = require('../../registries/mta')
 
-module.exports = class PostgresTemplate extends require('../templateBase') {
+module.exports = class PostgresTemplate extends require('../../plugin') {
 
   async canRun() {
-    const { hasMta, hasHelm } = await readProject(this.options)
-    if (hasHelm && !hasMta) throw `'cds add postgres' is not available for Kyma yet`
+    const { hasMta, hasHelm, hasHelmUnifiedRuntime } = readProject()
+    if ((hasHelm || hasHelmUnifiedRuntime) && !hasMta) throw `'cds add postgres' is not available for Kyma yet`
     return true
   }
 
-  static hasFacet(env) {
+  static hasInProduction(env) {
     return env.requires?.db?.kind === 'postgres'
   }
 
   async run() {
-    const project = await readProject(this.options)
+    const project = readProject()
     const { configFile, isJava } = project
     project.shortcut = !(await read(configFile)).cds?.requires?.db?.kind
-    await mergeJSON(configFile, join(__dirname, 'files', 'package.json.hbs'), project)
+    await merge(__dirname, 'files/package.json.hbs').into(configFile, { project })
     if (isJava) await mvn.add('postgresql')
-    await this.runDependentMerging()
   }
 
-  async runDependentMerging() {
-    const project = await readProject(this.options)
-    const { hasMta, isNodejs, srvPath } = project
+  async combine() {
+    const project = readProject()
+    const { hasMta, srvPath } = project
 
     if (hasMta) {
-      const srv = (isNodejs ? srvNode4 : srvJava4)(srvPath)
-      await mergeYAML(
-          'mta.yaml',
-          join(__dirname, 'files', 'mta.yaml.hbs'),
-          project,
-          {
-              additions: [srv, postgres, postgresDeployer],
-              relationships: [{
-                  insert: [postgres, 'name'],
-                  into: [srv, 'requires', 'name']
-              }, {
-                insert: [postgres, 'name'],
-                into: [postgresDeployer, 'requires', 'name']
-            }]
-          }
-      )
+      const srv = srv4(srvPath)
+      await merge(__dirname, 'files/mta.yml.hbs').into('mta.yaml', {
+        project,
+        additions: [srv, postgres, postgresDeployer],
+        relationships: [{
+            insert: [postgres, 'name'],
+            into: [srv, 'requires', 'name']
+        }, {
+          insert: [postgres, 'name'],
+          into: [postgresDeployer, 'requires', 'name']
+        }]
+      })
     }
   }
 }

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

@@ -1,48 +1,44 @@
-const { join } = require('path')
 const cds = require('../../../cds')
 const { read } = cds.utils
-const { readProject } = require('../../util/projectReader')
-const { mergeJSON, mergeYAML } = require('../../util/merge')
-const { srvNode4, srvJava4, redis } = require('../_merging/registry-mta')
+const { readProject } = require('../../projectReader')
+const { merge } = require('../../merge')
+const { srv4, redis } = require('../../registries/mta')
 
-module.exports = class RedisMessagingTemplate extends require('../templateBase') {
+module.exports = class RedisMessagingTemplate extends require('../../plugin') {
 
   async canRun() {
-    const { hasMta, hasHelm, isJava } = await readProject()
-    if (isJava)             throw `'cds add redis-messaging' is not available for Java yet`
-    if (hasHelm && !hasMta) throw `'cds add redis-messaging' is not available for Kyma yet`
+    const { hasMta, hasHelm, hasHelmUnifiedRuntime, isJava } = readProject()
+    const onlyHelm = !hasMta && (hasHelmUnifiedRuntime || hasHelm)
+    if (isJava)   throw `'cds add redis-messaging' is not available for Java yet`
+    if (onlyHelm) throw `'cds add redis-messaging' is not available for Kyma yet`
     return true
   }
 
-  static hasFacet(env) {
+  static hasInProduction(env) {
     return env.requires?.messaging?.kind === 'redis-messaging'
   }
 
   async run() {
-    const project = await readProject()
+    const project = readProject()
     const { configFile } = project
     project.shortcut = !(await read(configFile)).cds?.requires?.messaging?.kind
-    await mergeJSON(configFile, join(__dirname, 'files', 'package.json.hbs'), project)
+    await merge(__dirname, 'files/package.json.hbs').into(configFile, { project })
   }
 
-  async runDependentMerging() {
-    const project = await readProject()
-    const { hasMta, isNodejs, srvPath } = project
+  async combine() {
+    const project = readProject()
+    const { hasMta, srvPath } = project
 
     if (hasMta) {
-      const srv = (isNodejs ? srvNode4 : srvJava4)(srvPath)
-      await mergeYAML(
-          'mta.yaml',
-          join(__dirname, 'files', 'mta.yaml.hbs'),
-          project,
-          {
-              additions: [srv, redis],
-              relationships: [{
-                  insert: [redis, 'name'],
-                  into: [srv, 'requires', 'name']
-              }]
-          }
-      )
+      const srv = srv4(srvPath)
+      await merge(__dirname, 'files/mta.yaml.hbs').into('mta.yaml', {
+        project,
+        additions: [srv, redis],
+        relationships: [{
+          insert: [redis, 'name'],
+          into: [srv, 'requires', 'name']
+        }]
+      })
     }
   }
 }

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

@@ -1,17 +1,17 @@
 const { join } = require('path')
 const cds = require('../../../cds'), { exists, copy } = cds.utils
-const { readProject } = require('../../util/projectReader')
+const { env4, readProject } = require('../../projectReader')
 
-module.exports = class SampleTemplate extends require('../templateBase') {
+module.exports = class SampleTemplate extends require('../../plugin') {
 
     async canRun() {
-        const { isJava } = await readProject()
+        const { isJava } = readProject()
         if (isJava) throw `'cds add sample' is not available for Java yet`
         return true
     }
 
     async run() {
-        const { db, srv, app } = (await this.getEnv()).folders
+        const { db, srv, app } = env4('production').folders
         const language = exists('pom.xml') ? 'java' : 'nodejs'
         await Promise.all([
           copy(join(__dirname, 'files', 'db')).to(db),

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

@@ -1,8 +1,8 @@
 const term = require('../../../util/term')
 const { TINY_SAMPLE } = require('../../constants').OPTIONS
 
-module.exports = class SamplesTemplate extends require('../templateBase') {
-    getDependencies() {
+module.exports = class SamplesTemplate extends require('../../plugin') {
+    requires() {
         console.warn(term.warn(`'cds add samples' is deprecated and will be removed in future versions. Please use 'cds add tiny-sample' instead.\n`))
         return [TINY_SAMPLE]
     }

package/lib/init/template/sqlite/files/{package.json.hbs → package.json}

@@ -1,7 +1,5 @@
 {
-  {{#isNodejs}}
   "devDependencies": {
     "@cap-js/sqlite": "^1"
   }
-  {{/isNodejs}}
 }

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

@@ -1,18 +1,14 @@
-const { join } = require('path')
-const cds = require('../../../cds')
-const { read } = cds.utils
-const mvn = require('../../util/mvn')
-const { readProject } = require('../../util/projectReader')
-const { mergeJSON } = require('../../util/merge')
+const mvn = require('../../mvn')
+const { readProject } = require('../../projectReader')
+const { merge } = require('../../merge')
 
-module.exports = class SQLiteTemplate extends require('../templateBase') {
+module.exports = class SQLiteTemplate extends require('../../plugin') {
 
     async run() {
-      const project = await readProject()
+      const project = readProject()
       const { isNodejs, isJava, configFile } = project
       if (isNodejs) {
-        project.shortcut = !(await read(configFile)).cds?.requires?.db?.kind
-        await mergeJSON(configFile, join(__dirname, 'files', `package.json.hbs`), project)
+        await merge(__dirname, 'files/package.json').into(configFile)
       } else if (isJava) {
         await mvn.add('sqlite')
       }

package/lib/init/template/tiny-sample/index.js

@@ -1,21 +1,21 @@
 const { join } = require('path')
 const cds = require('../../../../lib/cds'), { copy } = cds.utils
-const { renderAndCopy } = require('../../util/template')
-const mvn = require('../../util/mvn')
-const { readProject } = require('../../util/projectReader')
+const { renderAndCopy } = require('../../template')
+const mvn = require('../../mvn')
+const { env4, readProject } = require('../../projectReader')
 const { JAVA } = require('../../constants')
 
-module.exports = class TinySampleTemplate extends require('../templateBase') {
+module.exports = class TinySampleTemplate extends require('../../plugin') {
 
     async run() {
-        const { isJava } = await readProject()
+        const { isJava } = readProject()
         if (isJava) {
             if (!cds.cli.options.add.has(JAVA)) {
                 await mvn.execMvn(mvn.getAddSamplesCmdArgs())
                 await mvn.execMvn(mvn.getAddTestsCmdArgs())
             }
         } else {
-            const { db, srv } = (await this.getEnv()).folders
+            const { db, srv } = env4('production').folders
             await Promise.all([
                 copy(join(__dirname, 'files', 'nodejs', 'db')).to(db),
                 renderAndCopy(join(__dirname, 'files', 'nodejs', 'srv'), srv, { dbFolder: db.replace(/[\\/]+$/, '') })

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

@@ -1,17 +1,16 @@
-const { join } = require('path')
-const { readProject } = require('../../util/projectReader')
-const { mergeJSON, sort } = require('../../util/merge')
+const { readProject } = require('../../projectReader')
+const { merge, sort } = require('../../merge')
 
-module.exports = class TogglesTemplate extends require('../templateBase') {
+module.exports = class TogglesTemplate extends require('../../plugin') {
 
-  static hasFacet(env) {
+  static hasInProduction(env) {
     return !!env.requires?.toggles
   }
 
   async run() {
-    const project = await readProject()
-    const { isNodejs , configFile} = project
-    await mergeJSON(configFile, join(__dirname, 'files', 'package.json.hbs'), project)
+    const project = readProject()
+    const { isNodejs, configFile } = project
+    await merge(__dirname, 'files/package.json.hbs').into(configFile, { with: project })
     if (isNodejs) await sort('package.json', 'dependencies')
   }
 }

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

@@ -1,13 +1,13 @@
 const { join } = require('path')
-const { readProject } = require('../../util/projectReader')
-const { mergeJSON, mergeGitignore } = require('../../util/merge')
+const { readProject } = require('../../projectReader')
+const { merge, mergeGitignore } = require('../../merge')
 const { warn, secondary } = require('../../../util/term')
 const { TYPER } = require('../../constants').OPTIONS
 const { exists, read } = require('../../../cds').utils
 
-module.exports = class TyperTemplate extends require('../templateBase') {
+module.exports = class TyperTemplate extends require('../../plugin') {
   async canRun() {
-    const { isJava } = await readProject()
+    const { isJava } = readProject()
     if (isJava) {
       console.warn(warn(`This appears to be a Java project. 'cds add ${TYPER}' is intended to be used in Node.js projects. Proceeding anyway.\n`))
     }
@@ -23,11 +23,11 @@ module.exports = class TyperTemplate extends require('../templateBase') {
       source.compilerOptions.paths["#cds-models/*"][0] += '/index.ts'
       target = 'tsconfig.json'
     }
-    await mergeJSON('package.json', template('package.json'))
+    await merge(template('package.json')).into('package.json')
     await mergeGitignore('.gitignore', template('gitignore'))
     console.log(secondary(` > Adding '@cds-models' to .gitignore to ignore generated types`)) // REVISIT: other facets are silent wrt. what they change
     try {
-      await mergeJSON(target, source)
+      await merge(source).into(target)
     } catch (e) {
       throw e instanceof SyntaxError
         ? `SyntaxError in ${target}. This could indicate a JSON file with comments, which is not supported at this time. Remove all comments from ${target} and rerun or add the following entries manually:\n${JSON.stringify(source, null, 2)}`

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

@@ -6,13 +6,13 @@ modules:
     requires:
       - name: {{appName}}-auth
 
-{{#isMultitenant}}
+{{#hasMultitenancy}}
   - name: {{appName}}-mtx
     type: nodejs
     path: {{#isNodejs}}gen/{{/isNodejs}}mtx/sidecar
     requires:
       - name: {{appName}}-auth
-{{/isMultitenant}}
+{{/hasMultitenancy}}
 
 resources:
   - name: {{appName}}-auth
@@ -23,4 +23,4 @@ resources:
       path: ./xs-security.json
       config:
         xsappname: {{appName}}-${org}-${space}
-        tenant-mode: {{#isMultitenant}}shared{{/isMultitenant}}{{^isMultitenant}}dedicated{{/isMultitenant}}
+        tenant-mode: {{#hasMultitenancy}}shared{{/hasMultitenancy}}{{^hasMultitenancy}}dedicated{{/hasMultitenancy}}

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

@@ -1,10 +1,10 @@
 ---
-{{#isMultitenant}}
+{{#hasMultitenancy}}
 sidecar:
   bindings:
     auth:
       serviceInstanceName: xsuaa
-{{/isMultitenant}}
+{{/hasMultitenancy}}
 {{#hasApprouter}}
 approuter:
   bindings:
@@ -20,7 +20,7 @@ xsuaa:
   servicePlanName: application
   parameters:
     xsappname: {{appName}}
-    tenant-mode: {{#isMultitenant}}shared{{/isMultitenant}}{{^isMultitenant}}dedicated{{/isMultitenant}}
+    tenant-mode: {{#hasMultitenancy}}shared{{/hasMultitenancy}}{{^hasMultitenancy}}dedicated{{/hasMultitenancy}}
 {{#hasApprouter}}
     oauth2-configuration:
       redirect-uris: