@sap/cds-dk 9.6.1 → 9.7.1

package/lib/init/index.js

@@ -1,15 +1,13 @@
-const path = require('path')
-const term = require('../util/term')
-const validate = require('./validate')
 
-const { OPTIONS, COMMAND_INIT, PROJECT_FILES } = require('./constants')
-const { readdirSync } = require('fs')
-const { join } = require('path')
+const { readdirSync } = require('node:fs')
+const { basename, join, relative, resolve } = require('node:path')
+const { OPTIONS, COMMAND_INIT } = require('./constants'), { JAVA, COMPLETION } = OPTIONS
+const validate = require('./validate')
 const cmd = require('../util/command')
-const { NODEJS, JAVA } = OPTIONS
 
 const cds = require('..'), { exists } = cds.utils
-const DEBUG = /\b(y|all|cli)\b/.test(process.env.DEBUG) ? console.debug : undefined
+const { BOLD, DIMMED, RESET } = cds.utils.colors
+const DEBUG = /\b(y|all|cli|init|add)\b/.test(process.env.DEBUG) ? console.debug : undefined
 
 module.exports = class CDSGenerator {
 
@@ -71,14 +69,6 @@ module.exports = class CDSGenerator {
         this._initialize(null);
         this._greetings();
 
-        // `add completion` configures global shell completion and not project settings
-        // `add data` can live without project metadata
-        const nonProjectFacets = { completion:1, data:1 }
-        const needsProject = facets.some(facet => !nonProjectFacets[facet])
-        if (needsProject && !PROJECT_FILES.some(exists)) {
-            throw `The current folder doesn't seem to contain a project. None of the following files found: ${PROJECT_FILES.join(', ')}.`
-        }
-
         await this._process(facets);
         await this.stepEnd();
     }
@@ -92,6 +82,7 @@ module.exports = class CDSGenerator {
     }
 
     async stepInit(projectName, options) { // Also used by CAP Generator
+        projectName = projectName?.trim();
         if (options) {
             // called from CAP generator with options
             // cds.cli is not set correctly when called from CAP generator
@@ -100,7 +91,7 @@ module.exports = class CDSGenerator {
                 command: COMMAND_INIT,
                 // keep caller independent from internal names
                 options: {
-                    cwd: options.cwd,
+                    ...options,
                     add: new Set(options.add)
                 },
                 argv:[]
@@ -123,18 +114,13 @@ module.exports = class CDSGenerator {
         }
         const { options } = cds.cli
         this.cwd = options.cwd || process.cwd();
-        cds.root = path.resolve(this.cwd, projectName || '.');
-        this.projectName = path.basename(cds.root);
+        cds.root = resolve(this.cwd, projectName || '.');
+        this.projectName = basename(cds.root);
 
         this._cleanupOptions();
     }
 
     _greetings() {
-        if (cds.cli.command === COMMAND_INIT) {
-            const relativeProjectPath = path.relative(this.cwd, cds.root)
-            const folderName = relativeProjectPath ? `.${path.sep}${relativeProjectPath}` : 'the current folder'
-            console.log(`creating new CAP project in ${term.bold(folderName)}\n`)
-        }
         if (cds.cli.options.for && typeof cds.cli.options.for !== 'string') {
             throw 'the --for argument must not be empty'
         }
@@ -157,12 +143,14 @@ module.exports = class CDSGenerator {
         const cmds = Object.values(OPTIONS)
         const byPriority = (a, b) => cmds.indexOf(a) - cmds.indexOf(b)
         const sorted = Array.from(plugins).sort(byPriority)
+        const skipLogFacets = ['initial', COMPLETION]
         for (const [i, facet] of Object.entries(sorted)) {
-            if (!cds.cli.options.dry) console.log(`adding ${term.bold(facet)}`)
+            if (!cds.cli.options.dry && !skipLogFacets.includes(facet))
+                console.log(`Adding facet: ${BOLD + facet + RESET}`)
             const template = this.templateList[i]
             await template.run()
         }
-        DEBUG && console.log()
+        if ((cds.cli.command !== 'init' || cds.cli.options.add.size !== 1 || !cds.cli.options.add.has('initial')) && !cds.cli.options.dry) console.log()
         DEBUG && console.log('plugins active for production:')
         const fromDk = readdirSync(join(__dirname, './template'))
         const { registered } = require('./add')
@@ -191,19 +179,17 @@ module.exports = class CDSGenerator {
             await cmd.spawnCommand('npm' , ['i', '--package-lock-only'], { cwd:cds.root })
             if (exists('mtx/sidecar/package.json') && !exists('mtx/sidecar/package-lock.json')) {
                 console.log('updating frozen dependencies in mtx/sidecar/package-lock.json…')
-                await cmd.spawnCommand('npm', ['i', '--package-lock-only'], { cwd: path.join(cds.root, 'mtx/sidecar') })
+                await cmd.spawnCommand('npm', ['i', '--package-lock-only', '--prefix', 'mtx/sidecar'], { cwd:cds.root })
             }
         }
 
         if (cds.cli.command === COMMAND_INIT) {
-            const relativeProjectPath = path.relative(this.cwd, cds.root)
-            let message = 'successfully created project'
-            if (relativeProjectPath) {
-                message += ` – continue with ${term.bold('cd ' + relativeProjectPath)}`
-            }
-            console.log('\n' + message)
+            console.log ('Successfully initialized CAP project')
+            let relativeProjectPath = relative(this.cwd, cds.root)
+            if (relativeProjectPath)
+                console.log ('Continue with:', BOLD +'code', relativeProjectPath, RESET)
         } else if (!cds.cli.options.dry) {
-            console.log(`\nsuccessfully added features to your project`)
+            console.log(`Successfully added features to your project`)
         }
     }
 
@@ -219,10 +205,10 @@ module.exports = class CDSGenerator {
                 const max = entries.reduce((max, {name}) => Math.max(max, name.length), 0)
                 const allFacetsText = entries.filter(({module})=> module.help()).map(({name, module}) => {
                     const help = module.help?.() ?? ''
-                    return `${term.bold(name) + ' '.repeat(max - name.length)}  ${term.dim(help)}`
+                    return `${BOLD+ name +RESET + ' '.repeat(max - name.length)}  ${DIMMED+ help +RESET}`
                 }).join('\n')
                 DEBUG?.(err)
-                throw `unknown facet ${term.bold(plugin)} – did you mean ${term.bold(`cds add ${bestMatch}`)}?\n\nall supported facets:\n\n${allFacetsText}\n`
+                throw `unknown facet ${BOLD+ plugin +RESET} – did you mean ${BOLD + `cds add ` + bestMatch + RESET}?\n\nall supported facets:\n\n${allFacetsText}\n`
             }
             throw err
         }
@@ -231,14 +217,14 @@ module.exports = class CDSGenerator {
     async _fillTemplateList(plugins) {
         const templates = new Map
         for (let plugin of plugins) {
-            // cds 10 remove
-            if(plugin === "helm" || plugin === "helm-unified-runtime") {
+            // cds10: remove
+            if (plugin === "helm" || plugin === "helm-unified-runtime") {
                 cds.cli.options.add?.add("kyma")
                 cds.cli.argv[0] += ",kyma"
             }
             // Compat
             if (plugin === 'helm' && cds.cli.options['internal-unified-runtime-charts']) {
-                console.warn(term.warn('"--internal-unified-runtime-charts" is deprecated, please use "cds add kyma --unified-runtime" instead'))
+                console.warn('"--internal-unified-runtime-charts" is deprecated, please use "cds add kyma --unified-runtime" instead')
                 plugin = 'helm-unified-runtime'
                 cds.cli.options.add?.delete('helm')
                 cds.cli.options.add?.add('helm-unified-runtime')
@@ -258,6 +244,21 @@ module.exports = class CDSGenerator {
             _alias('kibana', 'application-logging')
             _alias('kibana-logging', 'application-logging')
 
+            const runtimeAgnostic = { initial:1, 'tiny-sample':1, data:1, completion: 1 }
+            if (!(plugin in runtimeAgnostic)) {
+                const creating = ['java', 'nodejs', 'typescript', 'esm', 'extension']
+                const { command, options, argv } = cds.cli
+                const inOptions = option => command === 'init' && options.add.has(option) ||
+                                            command === 'add'  && argv[0]?.split(',').includes(option)
+                if (!exists('pom.xml') && !exists('package.json') && !creating.some(inOptions)) {
+                    if (command === 'init') {
+                        const project = argv[0] ? argv[0]+' ' : ''
+                        throw `First decide if this is a Node.js or Java project. Either run\n  ${BOLD+`cds init ${project}--java`+RESET} ...\nor\n  ${BOLD+`cds init ${project}--nodejs`+RESET} ...\n`
+                    }
+                    throw `First decide if this is a Node.js or Java project. Either run\n  ${BOLD+'cds add nodejs'+RESET}\nor\n  ${BOLD+'cds add java'+RESET}\n`
+                }
+            }
+
             if (!templates.has(plugin)) {
                 const template = await this._createTemplate(plugin)
                 if (await template.canRun()) {
@@ -313,15 +314,21 @@ module.exports = class CDSGenerator {
             return facet;
         }).filter(Boolean);
 
-        // set is ordered ... always
         options.add = new Set(trimmedTokens);
 
+        if (options?.nodejs) { // --nodejs -> --add nodejs
+            options.add.add('nodejs')
+        }
         if (options?.java) { // --java -> --add java
             options.add.add('java')
         }
 
         if (cds.cli.command === COMMAND_INIT && !options.add.has(JAVA)) {
-            options.add.add(NODEJS);
+            options.add.add('initial')
+
+            // cds10: remove
+            const { isBas } = require('./projectReader').readProject()
+            if (isBas) options.add.add('nodejs')
         }
     }
 }

package/lib/init/merge.js

@@ -326,8 +326,13 @@ async function _mergeYAML(into, from, project, semantics = {}) {
                 let [,parent] = collectionStack
                 additions?.filter(addition => {
                         if (typeof addition.in === 'string' || Array.isArray(addition.in) && typeof addition.in[0] === 'string') return true
-                        const inEntry = Array.isArray(addition.in) ? entryMap.get(addition.in[0]) : entryMap.get(addition.in)
-                        return inEntry?.node === parent
+                            const base = Array.isArray(addition.in) ? addition.in[0] : addition.in
+                            const keyPath = Array.isArray(addition.in) ? addition.in[1] : ''
+                            const inEntry = entryMap.get(base)
+                            if (!inEntry) return false
+                            const depth = String(keyPath).split('.').filter(Boolean).length
+                            const expectedParent = depth > 1 ? collectionStack[depth] : parent
+                            return inEntry.node === expectedParent
                     })
                     .filter(addition => {
                         const keyPath = typeof addition.in === 'string' ? addition.in : Array.isArray(addition.in) && typeof addition.in[0] === 'string' ? addition.in[0] : addition.in[1]

package/lib/init/projectReader.js

@@ -90,6 +90,7 @@ module.exports = new class ProjectReader {
             has: x => _inProd(x),
             profile: () => cds.cli.options?.for,
             profileSpecified: () => !!cds.cli.options.for,
+            profileProduction: () => cds.cli.options?.for === 'production',
             language: () => _isJava() ? 'java' : 'nodejs',
             isJava: () => _isJava(),
             isNodejs: () => !_isJava(),
@@ -193,14 +194,7 @@ module.exports = new class ProjectReader {
                     values: values ?? {},
                     containerize: containerize ?? {}
                 }
-            },
-            hasHelmUnifiedRuntime: () =>
-                exists(join(cds.root, 'chart', 'Chart.yaml')) &&
-                    (() => {
-                        const chartYaml = cds.load.yaml(join(cds.root, 'chart', 'Chart.yaml'))
-                        return chartYaml.annotations?.['app.kubernetes.io/managed-by'] === 'cds-dk/helm'
-                            && chartYaml.dependencies?.find(dep => dep.name === 'web-application')?.repository !== undefined
-                    })()
+            }
         }
 
         // Automatically creates availability checks for `cds add` commands.
@@ -337,4 +331,5 @@ function _normalizeSpringBootCfg(obj) {
  * @property {String} githubSlug GitHub org/repo.
  * @property {boolean} isMonorepoMicroservice Indicates if the project is a monorepo microservice.
  * @property {String} npmWorkspaceRoot The root path of the monorepo workspace.
+ * @property {String} isBas Indicates if the project is running in Business Application Studio (BAS).
  */

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

@@ -28,7 +28,7 @@ module.exports = class AmsTemplate extends require('../../plugin') {
 
     async combine() {
         const project = readProject()
-        const { addMta, addCfManifest, addContainerize, addKyma } = project
+        const { addMta, addCfManifest, addKyma } = project
 
         if (addMta) {
             await this.#combineWithMta(project)
@@ -40,9 +40,6 @@ module.exports = class AmsTemplate extends require('../../plugin') {
 
         if (addKyma) {
             await this.#combineWithHelm(project)
-        }
-
-        if (addContainerize) {
             await this.#combineWithContainerize(project)
         }
     }

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

@@ -1,5 +1,5 @@
 {
   "dependencies": {
-    "@cap-js/attachments": "^2"
+    "@cap-js/attachments": "^3"
   }
 }

package/lib/init/template/completion/completionSetup.js

@@ -90,7 +90,7 @@ module.exports = new class CompletionSetup {
                 profileFile = '.config/fish/config.fish';
                 break;
             default:
-                throw `Completion is only supported for ${SUPPORTED_LINUX_SHELLS.join(', ')}.`;
+                throw `Current shell is '${shell}'. Completion is only supported for ${SUPPORTED_LINUX_SHELLS.join(', ')}.`;
         }
 
         profileFile = path.join(os.homedir(), profileFile);

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

@@ -28,7 +28,10 @@ module.exports = async (data={}, csn, { headerOnly=false, separator=',' }={}) =>
           if (value === undefined)
             continue
           if (element._type === 'cds.Composition') {
-            data[element.target] = value // Add object for a new entity. Next pass will process it.
+            const t = element.target
+            if (data[t] === undefined) {
+              data[t] = value // Add object for a new entity. Next pass will process it.
+            }
           }
           else if (element._type === 'cds.Association') {
             if (element.on) {

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

@@ -68,7 +68,7 @@ module.exports = class DataTemplate extends require('../../plugin') {
       : getDefaultTargetFolder(env)
     dest = resolve(cds.root, dest)
 
-    let csn = await cds.load([cds.env.roots, join(`${cds.env.folders.srv}`, `external`) ]) // normal CSN. Default paths and models imported with `cds import`
+    let csn = await cds.load([...cds.env.roots, join(`${cds.env.folders.srv}`, `external`) ]) // normal CSN. Default paths and models imported with `cds import`
     // Skip of unused reuse entities like Language, Country, Currency
     csn = cds.minify(csn)
     csn = cds.reflect(csn) // reflected model (adds additional helper functions)

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

@@ -7,6 +7,10 @@ const npmPackageRegex = /^(@[a-z0-9-~][a-z0-9-._~]*\/)?[a-z0-9-~][a-z0-9-._~]*$/
 
 module.exports = class ExtensionProjectTemplate extends require('../../plugin') {
 
+  requires() {
+    return ['nodejs']
+  }
+
   static help() {
     return 'extension project'
   }
@@ -72,10 +76,6 @@ module.exports = class ExtensionProjectTemplate extends require('../../plugin')
     }
 
   }
-
-  // async finalize() {
-  //     console.log(`For information on project "Piper" and its pipelines see ${URLS.PIPELINE_HELP}`);
-  // }
 }
 
 function namespacify(s) {

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

@@ -2,9 +2,8 @@
   {{#isNodejs}}
   "dependencies": {
     "@cap-js/hana": "^2"
-  },
+  }{{#profile}},
   "cds": {
-    {{#profile}}
     "requires": {
       "[{{profile}}]": {
       {{#shortcut}}
@@ -16,8 +15,9 @@
         }
       {{/shortcut}}
       }
-    }{{/profile}}
+    }
   }
+  {{/profile}}
   {{/isNodejs}}
   {{#isJava}}
   "requires": {

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

@@ -155,7 +155,7 @@ async function createExtCodeHandler(service, proj, out, force) {
  */
 async function loadModel() {
   try {
-    return cds.linked(cds.minify(await cds.load([cds.env.roots])))
+    return cds.linked(cds.minify(await cds.load(cds.env.roots)))
   } catch (err) {
     if (err.code === 'MODEL_NOT_FOUND')  return null
     throw new Error(`Error compiling CDS files. Run 'npm install' and try again.`, {cause:err})

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

@@ -22,9 +22,9 @@ module.exports = class HelmTemplate extends require('../../plugin') {
     async canRun() {
         const hasInProduction = HelmTemplate.hasInProduction()
         if (cds.cli.options.force) {
-            await rimraf(join('chart'))
+            await rimraf('chart')
             return true
-        } else if (exists(join(cds.root, 'chart')) && !hasInProduction) {
+        } else if (exists('chart') && !hasInProduction) {
             throw `Chart already exists. Use --force to overwrite.`
         }
         return true
@@ -60,7 +60,7 @@ module.exports = class HelmTemplate extends require('../../plugin') {
                 domain ??= await ask4([`cluster domain: `])
             }
         }
-        project.registry = registry ?? '<registry-server>'
+        project.registry = registry ?? '<your-container-registry-server>'
         project.domain = domain ?? '<cluster-domain>'
         project.imagePullSecret = imagePullSecret ?? 'docker-registry'
         project.tag = tag ?? 'latest'

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

@@ -29,7 +29,11 @@ module.exports = class HelmUnifiedRuntimeTemplate extends require('../helm') {
   }
 
   static hasInProduction() {
-    if (cds.cli.options?.add?.has('helm-unified-runtime')) return true
+    if (cds.cli.options?.add?.has('helm-unified-runtime') ||
+        cds.cli.options['unified-runtime']) {
+
+      return true
+    }
 
     if (exists(join(cds.root, 'chart', 'Chart.yaml'))) {
       const chartFile = readFileSync(join(cds.root, 'chart', 'Chart.yaml'), 'utf8')

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

@@ -34,7 +34,7 @@ modules:
           content-target: true
           config:
             HTML5Runtime_enabled: true{{#hasIas}}
-            IASDependencyName: {{appName}}-api{{/hasIas}}
+            IASDependencyName: {{appName}}-ias-api{{/hasIas}}
     build-parameters:
       build-result: {{#isNodejs}}{{& appPath }}{{/isNodejs}}{{#isJava}}resources{{/isJava}}
       requires:

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, addApprouter, addContainerize, addKyma, addHelm, addHelmUnifiedRuntime,  addMultitenancy, addWorkzoneStandard, addXsuaa,
-            addSample, hasMta, addMta, hasXsuaa, hasMultitenancy, hasUI5
+            hasApprouter, hasMta, addMta, hasKyma, hasXsuaa, hasMultitenancy, hasUI5,
+            addSample, addApprouter, addContainerize, addKyma, addHelm, addHelmUnifiedRuntime,  addMultitenancy, addWorkzoneStandard, addXsuaa, addIas
         } = project
 
         await Promise.all(apps.map(async ({ app }) => {
@@ -65,7 +65,8 @@ module.exports = class Html5RepoTemplate extends require('../../plugin') {
             await merge({ cds: { requires: { 'html5-repo': true } } }).into('mtx/sidecar/package.json')
         }
 
-        if (addMta || (addXsuaa || addApprouter || addWorkzoneStandard || addMultitenancy || addSample) && hasMta) {
+        const affected = addXsuaa || addApprouter || addWorkzoneStandard || addMultitenancy || addSample || addIas
+        if (addMta || affected && hasMta) {
             const srv = srv4(srvPath)
             project.apps = apps
             const relationships = [{
@@ -109,7 +110,7 @@ module.exports = class Html5RepoTemplate extends require('../../plugin') {
             })
         }
 
-        // cds10
+        // cds10: change to if (addKyma)
         // needed because of adding kyma to cli options in case of helm
         if (addContainerize || (addKyma && !addHelm && !addHelmUnifiedRuntime)) {
             const additions = [{
@@ -119,7 +120,7 @@ module.exports = class Html5RepoTemplate extends require('../../plugin') {
             await merge(__dirname, '/files/containerize.yaml.hbs').into('containerize.yaml', { with: project, additions })
         }
 
-        if (addKyma) {
+        if (addKyma || affected && hasKyma) {
             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/ias/files/mta.yaml.hbs

@@ -66,10 +66,10 @@ resources:
             access-token-format: "jwt"
         {{#hasApprouter}}
           redirect-uris:
-            - ~{app-api/app-protocol}://*.~{app-api/app-uri}/login/callback
-            - ~{app-api/app-protocol}://~{app-api/app-uri}/login/callback
+            - http://localhost:5000/login/callback?authType=ias
+            - ~{app-api/app-protocol}://*~{app-api/app-uri}/login/callback
           post-logout-redirect-uris:
-            - ~{app-api/app-protocol}://*.~{app-api/app-uri}/*/logout.html
+            - ~{app-api/app-protocol}://*~{app-api/app-uri}/*/logout.html
         {{/hasApprouter}}
         {{#hasAms}}
         authorization:

package/lib/init/template/initial/files/.vscode/tasks.json

@@ -0,0 +1,10 @@
+{
+  "version": "2.0.0",
+  "tasks": [
+    {
+      "type": "shell",
+      "label": "cds watch",
+      "command": "cds watch",
+    }
+  ]
+}

package/lib/init/template/{nodejs/files/README.md → initial/files/readme.md}

@@ -1,6 +1,6 @@
 # Getting Started
 
-Welcome to your new project.
+Welcome to your new CAP project.
 
 It contains these folders and files, following our recommended project layout:
 
@@ -9,7 +9,6 @@ File or Folder | Purpose
 `app/` | content for UI frontends goes here
 `db/` | your domain models and data go here
 `srv/` | your service models and code go here
-`package.json` | project metadata and configuration
 `readme.md` | this getting started guide
 
 
@@ -22,4 +21,4 @@ File or Folder | Purpose
 
 ## Learn More
 
-Learn more at https://cap.cloud.sap/docs/get-started/.
+Learn more at https://cap.cloud.sap.

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

@@ -0,0 +1,15 @@
+const { join } = require('path')
+const cds = require('../../../cds')
+const { mkdirp, path } = cds.utils
+const { env4 } = require('../../projectReader')
+const { renderAndCopy } = require('../../template')
+
+module.exports = class extends require('../../plugin') {
+
+    async run() {
+        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/java/index.js

@@ -4,9 +4,9 @@ const { exists, copy, rimraf, fs:{promises:{ mkdtemp }}, path } = cds.utils, { j
 const cmd = require('../../../util/command')
 const mvn = require('../../mvn')
 const { merge } = require('../../merge')
-const { bold, info, link } = require('../../../util/term')
-const { URLS, OPTIONS: { NODEJS, JAVA }, COMMAND_ADD } = require('../../constants')
-const { command, options } = cds.cli
+const { bold, info } = require('../../../util/term')
+const { URLS, OPTIONS: { NODEJS, JAVA } } = require('../../constants')
+const { options } = cds.cli
 
 module.exports = class JavaTemplate extends require('../../plugin') {
 
@@ -15,13 +15,10 @@ module.exports = class JavaTemplate extends require('../../plugin') {
     }
 
     static hasInProduction() {
-        return exists('pom.xml') || options?.add?.has(JAVA)
+        return exists('pom.xml')
     }
 
     async canRun() {
-        if (command === COMMAND_ADD) {
-            throw `You can't change the runtime of an existing project.`
-        }
         if (options.add?.has(NODEJS)) {
             throw `only one runtime per project is supported – specify either ${bold(JAVA)} or ${bold(NODEJS)}`
         }
@@ -59,8 +56,4 @@ module.exports = class JavaTemplate extends require('../../plugin') {
             await rimraf(temp)
         }
     }
-
-    async finalize() {
-        console.log(`learn about next steps at ${link(URLS.CAPIRE)}`)
-    }
 }

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

@@ -9,17 +9,28 @@ const { mvn } = require('../../add')
 
 module.exports = class KymaTemplate extends require('../../plugin') {
 
-    static hasInProduction() {
-        return exists('chart/Chart.yaml')
+  options() {
+    return {
+      'unified-runtime': {
+        type: 'boolean'
+      },
+      'y': {
+        type: 'boolean',
+      }
     }
+  }
+
+  static hasInProduction() {
+    return exists('chart/Chart.yaml')
+  }
 
   async canRun() {
     const hasInProduction = KymaTemplate.hasInProduction()
     if (cds.cli.options.force) {
-      await rimraf(join('chart'))
+      await rimraf('chart')
       await rimraf('containerize.yaml')
       return true
-    } else if (hasInProduction) {
+    } else if (exists('chart') && !hasInProduction) {
       throw `Chart already exists. Use --force to overwrite.`
     }
     return true
@@ -31,7 +42,6 @@ module.exports = class KymaTemplate extends require('../../plugin') {
 
   async run() {
     const project = readProject()
-
     let imagePullSecret, registry, domain, tag
     if (!KymaTemplate.hasInProduction() && !project.isBas /* don't run this for the BAS Yeoman generator */) {
       try {
@@ -40,7 +50,7 @@ module.exports = class KymaTemplate extends require('../../plugin') {
         if (domainStartIndex !== -1) domain = domainGuess.substring(domainStartIndex + 4)
       } catch (error) { /* ignore */ }
 
-      //REVISIT: remove cds10 
+      // cds10: remove
       if (exists('containerize.yaml')) {
         const { repository: r, tag: t } = yaml.parse(join(cds.root, 'containerize.yaml'))
         if (r) registry = r
@@ -51,30 +61,19 @@ module.exports = class KymaTemplate extends require('../../plugin') {
         domain ??= await ask4([`cluster domain: `])
       }
     }
-    project.registry = registry ?? '<registry-server>'
+    project.registry = registry ?? '<your-container-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 merge(__dirname, '/files/containerize.yaml.hbs').into('containerize.yaml', { with: project })
+    await merge(__dirname, 'files/containerize.yaml.hbs').into('containerize.yaml', { with: project })
     await KymaTemplate.mergeDependency('web-application', 'srv')
     if (project.isJava) await mvn.add('k8s')
 
   }
 
-  options() {
-    return {
-      'unified-runtime': {
-        type: 'boolean'
-      },
-      'y': {
-        type: 'boolean',
-      }
-    }
-  }
-
   async combine() {
     // REVISIT: This must be moved to the respective plugins
     const {
@@ -105,6 +104,7 @@ module.exports = class KymaTemplate extends require('../../plugin') {
     if (addHana || addMultitenancy) {
       if (hasMultitenancy) {
         await KymaTemplate.mergeDependency('service-instance', 'service-manager')
+        await KymaTemplate.mergeDependency('content-deployment', 'mtx-upgrade')
       } else {
         await KymaTemplate.mergeDependency('service-instance', 'hana')
         await KymaTemplate.mergeDependency('content-deployment', 'hana-deployer')
@@ -127,7 +127,8 @@ module.exports = class KymaTemplate extends require('../../plugin') {
       additions: [{
         in: 'dependencies',
         where: { alias }
-      }]}
+      }]
+    }
     )
 
   }