@sap/cds-dk 9.4.2 → 9.4.3

package/CHANGELOG.md

@@ -6,6 +6,23 @@ This project adheres to [Semantic Versioning](https://semver.org/).
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/).
 
+## Version 9.4.3 - 2025-10-29
+
+### Changed
+
+- `cds add containerize` omits the Unix-based `before_all` scripts in `containerize.yaml` in favor of a cross-platform compatible `cds up --to k8s` integration.
+- `cds up --to k8s` now uses built-in containerization, eliminating the hard dependency on the `ctz` library.
+- `cds up --to k8s` will interactively ask for a domain if it can't be determined from the current Kubernetes configuration.
+- `cds build --for hana` no longer requires `.hdbgrants` and `.hdbrevokes` to be specified as a plugin in the `.hdiconfig` file.
+
+### Fixed
+
+- `cds add pipeline` does not add UI5 template files in some cases.
+- `cds add ias` does not write to the `mta.yaml` for non-MTA projects.
+- `cds add ias` automatically adds the `authenticationType` to `xs-app.json` if required.
+- `cds add ias` adds a binding to the approuter component if required.
+- `cds import --from ...` yields a better error message for unknown import kinds.
+
 ## Version 9.4.2 - 2025-10-23
 
 ### Changed

package/bin/data-products/index.js

@@ -6,8 +6,16 @@ const path = require ('node:path')
 
 exports.load_data_product  = async function (sources, o) {
   let service = /\/([^/]+)\//.exec(o.services)?.[1].replaceAll('\\.','.')
-  if (!service.includes(':apiResource:')) {
-    const [,namespace,name,version] = /^(.+)-([^-]+)-(v[0-9]+)\.json$/ .exec (path.basename(String(sources)))
+  if (service != 'all') {
+    // ORD ID has been provided as parameter "-s", valid example: "sap.s4com:apiResource:Product:v1"
+    if (!service.match(/^([^:]+):apiResource:([^:]+):(v[0-9]+)$/))
+      throw new Error(`"${service}" is not a valid output port ORD ID`)
+  }
+  else {
+    // try to deduce ORD ID from file name, valid example: "sap-s4com-Product-v1.json"
+    const m = /^(.+)-([^-]+)-(v[0-9]+)\.(json|csn)$/ .exec (path.basename(String(sources)))
+    if (m?.length != 5) throw new Error(`Output port ORD ID cannot be deduced from file name`)
+    const [,namespace,name,version] = m
     service = namespace.replace(/-/g,'.') + ':apiResource:' + name + ':' + version
   }
 

package/bin/data-products/prepare-csn.js

@@ -180,38 +180,75 @@ exports.prepareCsn = function (csn, srvName, ordId) {
   //
   // ---------- step 5: wrap everyting into service if not yet done -------------------------------
   //
-  // Prefix all entity names with service name. Adapt association targets.
-  // Add CAP specific annotations for DP handling.
+  // This function must be called with a service name "srvName" as argument.
+  if (!srvName) throw new Error('No service name has been provided.')
 
-  if (srvName) {
-    if (!csn.definitions[srvName] || csn.definitions[srvName].kind !== 'service') {
-      // add the service
-      csn.definitions[srvName] = {kind: 'service'}
-      // loop over all entities and prefix names with service name
-      for (let n in csn.definitions) {
-        let entity = csn.definitions[n]
-        if (entity.kind === 'entity') {
-          // find association elements and rename the targets
-          for (let en in entity.elements || {} ) {
-            let element = entity.elements[en]
-            if (element?.type == 'cds.Association' || element?.type == 'cds.Composition') {
-              element.target = srvName + '.' + element.target
-            }
-          }
-          csn.definitions[srvName + '.' + n] = entity
-          delete csn.definitions[n]
+  // Assumptions (based on the rules for DP CSNs):
+  // 1) there is no or one context or service in the CSN
+  // 2) if there is a context or service, all objects in the CSN belong to it
+  //
+  // If there is no context/service (this is a DP CSN coming from BAH):
+  //   put all entities into a new service "srvName", i.e.
+  //   - prefix all object and association target names with "srvName"
+  //   - add a service "srvName" with CAP specific annotations for DP handling
+  // If there is a context/service (DP CSN comes from UCL, context/service name is the schema name in the HDLFS share):
+  //   move all entities out of the context/service and put them into a new service "srvName", i.e.
+  //   - remove the context/service
+  //   - change the prefix for all entity and association target names from
+  //     the old context/service name to "srvName"
+  //   - add a service "srvName" with CAP specific annotations for DP handling
+  //
+  // Note: Currently an existing context/service doesn't contain further info (e.g. annos),
+  //       so deleting it is ok.
+
+  let ctxName = null;
+  const ctxs = Object.entries(csn.definitions).filter(([,o]) => o.kind === 'context' || o.kind === 'service')
+  if (ctxs.length > 0) {
+    // check assumption 1
+    if (ctxs.length > 1) throw new Error('Data Product CSN is invalid: it has more than one context or service.')
+    ctxName = ctxs[0][0]
+    delete csn.definitions[ctxName]
+    // check assumption 2
+    const bad = Object.keys(csn.definitions).filter((n) => !n.startsWith(ctxName + '.'))
+    if (bad.length > 0)
+      throw new Error(`Unexpected entity name "${bad[0]}" without prefix in Data product CSN with context "${ctxName}"`)
+  }
+
+  function changePrefix(name) {
+    if (ctxName) {
+      name = name.substring(ctxName.length + 1) // remove prefix incl. '.'
+    }
+    return srvName + '.' + name
+  }
+
+  // loop over all definitions and prefix names with service name
+  // if ctxName accidentially equals srvName, do nothing
+  if (ctxName != srvName) {
+    for (let n in csn.definitions) {
+      let def = csn.definitions[n]
+      // adapt assoc targets
+      for (let en in def.elements || {} ) {
+        let element = def.elements[en]
+        if (element?.type === 'cds.Association' || element?.type === 'cds.Composition') {
+          element.target = changePrefix(element.target)
         }
       }
+      csn.definitions[changePrefix(n)] = def
+      delete csn.definitions[n]
     }
-    // add service annotations
-    Object.assign(csn.definitions[srvName], {
-      '@cds.dp.ordId': ordId,
-      '@cds.external': true,
-      '@data.product': true,
-      '@protocol'    : 'none'  // don't serve via OData
-    })
   }
 
+   // add the service
+  csn.definitions[srvName] = {
+     kind          : 'service',
+    '@cds.dp.ordId': ordId,
+    '@cds.external': true,
+    '@data.product': true,
+    '@protocol'    : 'none'  // don't serve via OData
+  };
+  if (ctxName) csn.definitions[srvName]['@data.product.schema'] = ctxName;
+
+
   //
   // ---------- step 6: move entity/element annotations into extensions section -------------------
   //

package/bin/help.js

@@ -32,10 +32,10 @@ module.exports = exports = Object.assign (help, {formatHelp, handleCompletion, h
     * * | *logout*      logout from extensible multitenant SaaS app
     * * | *pull*        pull base model of extensible SaaS app
     * * | *push*        push extension to extensible SaaS app
-    *t* | *lint*        run linter for env or model checks
+    * * | *lint*        run linter for env or model checks
     *v* | *version*     get detailed version information
     * * | *completion*  add/remove cli completion for cds commands
-    *?* | *help*        get detailed usage information
+    *h* | *help*        get detailed usage information
 
   Learn more about each command using:
   *cds help* <command> or

package/bin/import.js

@@ -1,6 +1,6 @@
 module.exports = Object.assign(_import, {
     _name: 'import',
-    options:   [ '--services', '--for', '--out', '--as', '--name', '--include-namespaces', '--dependencies', '--from', '--config', '--destination', '--group' ],
+    options:   [ '--services', '--for', '--out', '--as', '--name', '--include-namespaces', '--dependencies', '--from', '--config', '--destination', '--group', '--data-product' ],
     shortcuts: [ '-s', '-4',    '-o',    '-as',  '-n',     '-ns',                    '-d',            undefined,  '-c',       undefined,       undefined, '-', '-f'],
     flags: [ '--dry', '--force', '--no-copy', '--no-save', '--keep-namespace', '--data-product', '--edmx', '--rfc', '--odata', '--openapi', '--asyncapi' ],
     help: `
@@ -55,6 +55,11 @@ module.exports = Object.assign(_import, {
         Destination name under which the remote service can be reached.
         Not supported by import types "edmx", "openapi" or "asyncapi".
 
+    *--data-product*
+        Tells cds import to import a data product. The source must be a valid 
+        data product CSN file, e.g. as found on http://api.sap.com/dataproducts.
+        (Not released with general availability yet)
+
     *Below options are valid for OData only*
 
     *--keep-namespace*
@@ -153,7 +158,7 @@ async function _import(args, options = {}) {
     if (options.from) {
         if (!cds.import.from[options.from]) {
             // the required plugin might not be installed, e.g. rfc importer
-            throw messages.UNSUPPORTED_FROM_OPTION;
+            throw messages.UNSUPPORTED_FROM_OPTION.replace('{0}', options.from).replace('{1}', Object.keys(cds.import.from).join(', '));
         }
         csn = await cds.import.from[options.from](input, apiOptions);
     } else {

package/bin/up.js

@@ -32,6 +32,8 @@ const cds = require('../lib/cds')
 const { highlight } = require('../lib/util/term')
 const { exists, fs, path, path: { join } } = cds.utils
 const { readProject } = require('../lib/init/projectReader')
+const { mkdirp, copy } = cds.utils
+const { containerize } = require('../bin/util/containerize')
 
 const run = cmd => {
   console.log(highlight(cmd))
@@ -49,10 +51,16 @@ async function up() {
   const project = readProject()
   const { apps, appName, hasApprouter, hasXsuaa, isMonorepoMicroservice } = project
 
+  const html5DeployerPath = join(cds.root, cds.env.folders.app, 'html5-deployer', 'resources')
+
   for (const { app } of apps) {
     const appPath = path.join(cds.root, cds.env.folders.app, app)
-    if (exists(path.join(appPath, 'package.json')) && !exists(path.join(appPath, 'package-lock.json'))) {
-      run(`npm i --prefix ${appPath}`)
+    if (exists(path.join(appPath, 'package.json'))) {
+      if (!exists(path.join(appPath, 'package-lock.json'))) {
+        run(`npm i --prefix ${appPath}`)
+      } else if (process.env.CI) {
+        run(`npm ci --prefix ${appPath}`)
+      }
     }
   }
 
@@ -75,6 +83,16 @@ async function up() {
 
   if (cds.cli.options.to === 'k8s') {
     if (!exists('chart')) run('cds add helm')
+    if (apps.length > 0) {
+      await mkdirp(html5DeployerPath)
+    }
+
+    for (const { app } of apps) {
+      const appPath = path.join(cds.root, cds.env.folders.app, app)
+      run(`npm run build --prefix ${appPath}`)
+      await copy(path.join(appPath, `dist/${app}.zip`)).to(html5DeployerPath, `${app}.zip`)
+    }
+
     if (!exists('containerize.yaml')) run('cds add containerize')
   } else {
     if (!exists('mta.yaml')) {
@@ -100,7 +118,10 @@ async function up() {
     const nsKubectl = ns ? `-n ${ns}` : ''
 
     run('npm i --package-lock')
-    run('ctz containerize.yaml --log --push')
+    run('cds build --production')
+    await containerize('containerize.yaml', { push: true, clearCache: !!process.env.CLEAR_CACHE })
+    console.log('Containerization completed')
+
     let helmUpgrade = `helm upgrade --install ${appName} ./gen/chart ${nsHelm} --wait --wait-for-jobs --timeout=10m`
     if (hasXsuaa) helmUpgrade += ' --set-file xsuaa.jsonParameters=xs-security.json'
     run(helmUpgrade)

package/bin/util/containerize.js

@@ -0,0 +1,142 @@
+const cds = require('../../lib/cds')
+const { path } = cds.utils
+const { join } = path
+const { execSync } = require('node:child_process')
+const { highlight } = require('../../lib/util/term')
+
+const buildpacks = new Set([
+  'java', 'nodejs', 'sap-machine', 'executable-jar', 'spring-boot', 'syft'
+])
+const builders = new Set([
+  'builder-jammy-base', 'builder-jammy-buildpackless-base', 'builder-jammy-full', 'builder-jammy-buildpackless-full'
+])
+
+const keyProcessorMap = {
+  dockerfile: processDockerfile,
+  commands: processCommands,
+  buildpack: processBuildpack
+}
+
+const run = cmd => {
+  cmd = Array.isArray(cmd) ? cmd.join(' ') : cmd
+  console.log(highlight(cmd))
+  try {
+    return execSync(cmd, {
+      stdio: 'inherit',
+      env: { ...process.env, FORCE_COLOR: cds.utils.colors.enabled }
+    })
+  } catch (error) {
+    throw error.message
+  }
+}
+
+function appendSubcommand(param, subcommand) {
+  if (!param) return []
+  if (subcommand === '--env') {
+    return Object.entries(param).flatMap(([k, v]) =>
+      String(v).split(',').map(env => [subcommand, `${k}=${env.trim() || '""'}`])
+    ).flat()
+  }
+  return param.split(',').map(e => [subcommand, e.trim()]).flat()
+}
+
+function processDockerfile(bp, name, tag) {
+  if (!bp.dockerfile) return []
+  return [['docker', 'build',
+    ...appendSubcommand(`${name}:${tag ?? 'latest'}`, '-t'),
+    ...appendSubcommand(bp.dockerfile, '-f'),
+    '.']]
+}
+
+function processCommands(bp) {
+  return bp.commands ? bp.commands.map(c => c.trim().split(' ')) : []
+}
+function processBuildpack(bp, name, tag, clearCache = false) {
+  let { type, path, env, builder } = bp.buildpack
+  type = type ? type.split(',').map(t => buildpacks.has(t.trim()) ? `paketo-buildpacks/${t.trim()}` : t.trim()) : []
+  if (builders.has(builder)) builder = `paketobuildpacks/${builder}`
+  const cacheArgs = clearCache ? ['--clear-cache'] : []
+  return [['pack',
+    ...appendSubcommand(`${name}:${tag}`, 'build'),
+    ...appendSubcommand(path, '--path'),
+    ...type.flatMap(t => appendSubcommand(t, '--buildpack')),
+    ...appendSubcommand(builder, '--builder'),
+    ...appendSubcommand(env, '--env'),
+    ...cacheArgs
+  ]]
+}
+
+/**
+ * Parses a YAML configuration file to extract Docker build and push commands for modules.
+ *
+ * @param {string} filename - The path to the YAML file to parse.
+ * @param {string} [repoOpt=''] - Optional repository override. If not provided, uses the repository defined in the YAML file.
+ * @param {boolean} [clearCache=false] - Whether to clear cache for buildpack builds.
+ * @returns {{
+ *   commands: Array<{
+ *     name: string,
+ *     tag: string,
+ *     buildCmd: Array<string>,
+ *     tagCmd: Array<string>,
+ *     pushCmd: Array<string>
+ *   }>,
+ *   before_all: Array<Array<string>>,
+ *   repository: string
+ * }} An object containing the commands for each module, any global pre-commands, and the repository name.
+ * @throws {Error} If modules are not defined in the YAML file or if build-parameters are invalid.
+ */
+function parseYAML(filename, repoOpt = '', options) {
+  const file = cds.load.yaml(join(cds.root, filename))
+  const { repository: repoFile, modules, tag: globalTag = 'latest' } = file
+  const repository = repoOpt || repoFile
+  const before_all = file['before-all'] ? file['before-all'].map(c => c.trim().split(' ')) : []
+  if (!modules) throw new Error('Modules not defined')
+  console.log(`Using repository: ${repository}`)
+  const commands = modules.map(m => {
+    const name = m.name, tag = m.tag || globalTag, bp = m['build-parameters']
+    const source = `${name}:${tag}`, repoImg = `${repository}/${source}`
+    const key = Object.keys(bp)[0]
+    const buildType = keyProcessorMap[key]
+    if (!buildType) throw new Error(`build-parameters ${Object.keys(bp)} is invalid.`)
+    return {
+      name, tag,
+      buildCmd: key === 'buildpack'
+        ? buildType(bp, name, tag, options.clearCache)
+        : buildType(bp, name, tag),
+      tagCmd: ['docker', 'tag', source, repoImg],
+      pushCmd: ['docker', 'push', repoImg]
+    }
+  })
+  return { commands, before_all, repository }
+}
+
+/**
+ * Executes the containerization commands for each module.
+ * @param {*} modules - The list of modules with their respective build, tag, and push commands.
+ * @param {*} options - Options object, e.g., { push: true } to push images after building.
+ */
+async function executeModules(modules, options) {
+  for (const m of modules) {
+    console.log(`Containerising module ${m.name}`)
+    for (const cmd of m.buildCmd) run(cmd)
+    if (options.push) {
+      run(m.tagCmd)
+      run(m.pushCmd)
+    }
+  }
+}
+
+/**
+ * Main function to containerize modules based on a YAML configuration file.
+ * @param {string} filename - The path to the YAML configuration file.
+ * @param {{ push: boolean, clearCache: boolean }} options - Options object, e.g., { push: true } to push images after building.
+ * @returns {Promise<void>}
+ */
+async function containerize(filename, options = { push: false, clearCache: false }) {
+  const { repository, before_all, commands: modules } = parseYAML(filename, '', options)
+  if (!repository || !modules) return
+  for (const cmd of before_all) await run(cmd)
+  await executeModules(modules, options)
+}
+
+module.exports = { containerize }

package/lib/build/buildTaskEngine.js

@@ -179,7 +179,7 @@ class BuildTaskEngine {
 
     /** @private */
     _resolveHandlerResponse(results, pluginMessages = []) {
-        /** @type {BuildError[]}*/
+        /** @type {(BuildError | Error)[]}*/
         const errors = []
         const resolvedResults = results.reduce((acc, r) => {
             if (r.status === 'fulfilled') {
@@ -195,7 +195,10 @@ class BuildTaskEngine {
             const error = errors.find(e => e.constructor.name !== COMPILATION_ERROR)
             if (error) {
                 // throw original BuildError including existing BuildMessages
-                error.messages = error.messages.map(m => typeof m === 'string' ? new BuildMessage(m, SEVERITY_ERROR) : m)
+                if (!(error instanceof BuildError)) {
+                    throw error
+                }
+                error.messages = error.messages?.map(m => typeof m === 'string' ? new BuildMessage(m, SEVERITY_ERROR) : m)
                 error.messages = this._sortMessagesUnique(pluginMessages.filter(m => m instanceof BuildMessage), error.messages)
                 throw error
             }

package/lib/build/plugin.js

@@ -126,7 +126,7 @@ class Plugin {
      * @abstract
      * Called by the framework to create the artifacts of this build plugin.
      */
-    async build() { /* abstract */}
+    async build() { /* abstract */ }
 
     /**
      * Called by the framework immediately before 'build' to delete any output created by this build plugin.

package/lib/build/plugins/helm/index.js

@@ -1,6 +1,5 @@
 const cds = require('../../../cds')
-const yaml = require('yaml')
-const { exists, path, readFileSync } = cds.utils
+const { exists, path, readFileSync, yaml } = cds.utils
 const { Plugin, BuildError } = require('../..')
 const { join } = path
 const { readProject } = require('../../../init/projectReader')
@@ -11,7 +10,7 @@ module.exports = class HelmBuildPlugin extends Plugin {
   static hasTask() {
     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(chartFile)
       return chartYaml.annotations?.["app.kubernetes.io/managed-by"] === 'cds-dk/helm'
     }
     return false
@@ -27,15 +26,16 @@ module.exports = class HelmBuildPlugin extends Plugin {
   }
 
   async build() {
-    if(!HelmBuildPlugin.hasTask()) {
+    if (!HelmBuildPlugin.hasTask()) {
       this.pushMessage("Helm Chart not found. Execute `cds add helm` to add the helm chart.", Plugin.WARNING)
       return
     }
 
-    const { hasApprouter, hasConnectivity, hasHtml5Repo } = readProject()
+    const project = readProject()
+    const { hasApprouter, hasConnectivity, hasHtml5Repo } = project
 
     const chartFile = readFileSync(join(cds.root, 'chart', 'Chart.yaml'), 'utf8')
-    const chartYaml = yaml.parseDocument(chartFile).toJS()
+    const chartYaml = yaml.parse(chartFile)
     const isInternal = chartYaml.dependencies?.find(dep => dep.name === 'web-application')?.repository !== undefined
 
     if (!isInternal) {

package/lib/build/provider/hana/index.js

@@ -21,6 +21,10 @@ const FILE_NAME_UNDEPLOY_JSON = "undeploy.json"
 const DEPLOY_FORMAT = "deploy-format"
 const DEBUG = cds.debug('cli|build')
 
+// Some HDI artifacts do not require explicit plugin specification in _.hdiconfig_.
+// This list contains exceptions which will be ignored during the consistency check.
+const PLUGINLESS_HDB_FILES = new Set([".hdbgrants", ".hdbrevokes"])
+
 class HanaBuildPlugin extends InternalBuildPlugin {
     init() {
         if (this.hasBuildOption(OUTPUT_MODE, OUTPUT_MODE_RESULT)) {
@@ -473,8 +477,12 @@ class HanaBuildPlugin extends InternalBuildPlugin {
             }
         }
         if (Object.keys(content['file_suffixes']).length < hdiPlugins.size) {
-            const missingPlugins = Array.from(hdiPlugins).filter(key => !content['file_suffixes'][key.slice(1)])
-            this.pushMessage(`'HANA database plugin not found for following file suffix [${missingPlugins.join(', ')}]`)
+            const missingPlugins = Array.from(hdiPlugins)
+                .filter(key => !content['file_suffixes'][key.slice(1)])
+                .filter(key => !PLUGINLESS_HDB_FILES.has(key))
+            if (missingPlugins.length) {
+                this.pushMessage(`'HANA database plugin not found for following file suffix [${missingPlugins.join(', ')}]`)
+            }
         }
         await this.write(content).to(hdiConfigPath)
     }

package/lib/import/common.js

@@ -336,12 +336,12 @@ function _printUsageHint(dest, service, cwd) {
     dest = dest.replace(extension, '');
     let using
     if (service.length > 1){
-        using = `using { ${service.join(', ')}} from './${path.relative(cds.env.folders.srv, dest).replace(/\\/g, '/')}'`;
+        using = `using { ${service.join(', ')}} from './${path.relative(cds.env.folders.srv, dest).replace(/\\/g, '/')}';`;
     } else {
-        using = `using { ${service} as external } from './${path.relative(cds.env.folders.srv, dest).replace(/\\/g, '/')}'`;
+        using = `using { ${service} as external } from './${path.relative(cds.env.folders.srv, dest).replace(/\\/g, '/')}';`;
     }
     const message = `\n[cds] - imported API to ${path.relative(cwd, dest)}
-> use it in your CDS models through the like of:
+> use it in your CDS models through the likes of:
 
 ${require('../util/term').info(using)}
 `;

package/lib/import/message.js

@@ -12,7 +12,7 @@ const messages = {
 	FILE_MODIFIED: 'The file with the same name exists and is been modified. Use --force flag to forcefully overwrite the file.',
 	OUTPUT_FILE_MISMATCH: 'Specify the file extension that --as option supports.',
 	INVALID_AS_OPTION: 'For --as option, please specify one of these output file format [cds, csn, json].',
-	UNSUPPORTED_FROM_OPTION: 'For --from option, please specify one of these types [edmx, openapi, asyncapi, rfc]. Make sure the required importer plugin is installed.',
+	UNSUPPORTED_FROM_OPTION: `No importer is installed for type '{0}'. Known import kinds are: {1}. Make sure the required importer plugin is installed.`,
 	INCORRECT_EXTENSION: 'If --as option is not provided, then please provide either .json or .csn output file extension.',
 	INCORRECT_INPUT_NAMESPACES: 'Invalid value for --include-namespaces option. Specify namespaces as comma-separated list or "*"',
 	MISSING_ASSOCIATION: 'Association is missing in the input file provided. Please check the edmx file.',

package/lib/init/projectReader.js

@@ -15,7 +15,7 @@ module.exports = new class ProjectReader {
 
     #setPackageInfo() {
         this.isJava = (exists('pom.xml') || cds.cli.options?.add?.has('java'))
-                        && !cds.env.for('cds').profiles.includes('node') // opt-out for hybrid projects like sflight
+            && !cds.env.for('cds').profiles.includes('node') // opt-out for hybrid projects like sflight
 
         // 1. Use project name and static default values
         this.appVersion = this.isJava ? '1.0.0-SNAPSHOT' : '1.0.0'
@@ -32,7 +32,7 @@ module.exports = new class ProjectReader {
             const v = version?.[0] === '${revision}' ? properties?.[0]?.revision[0] : version?.[0] ?? '1.0.0-SNAPSHOT'
             if (v && REGEX_JAVA_VERSION.test(v)) this.appVersion = v
             this.jdkVersion = properties?.[0]?.['jdk.version']?.[0]?._text?.[0] ?? JAVA_LTS_VERSIONS[JAVA_LTS_VERSIONS.length - 1]
-            if (artifactId?.[0])  this.appName = this.appId = artifactId?.[0]?.split(/-parent/)[0]
+            if (artifactId?.[0]) this.appName = this.appId = artifactId?.[0]?.split(/-parent/)[0]
             if (description?.[0]) this.appDescription = description[0]
         }
         else if (exists('package.json')) {
@@ -73,9 +73,9 @@ module.exports = new class ProjectReader {
         TRACE?.({ env })
 
         const pkgJson = () => exists('package.json') ? JSON.parse(fs.readFileSync(join(cds.root, 'package.json'))) : {}
-        const _isESM        = () => pkgJson().type === 'module'
+        const _isESM = () => pkgJson().type === 'module'
         const _isTypescript = () => !!pkgJson().dependencies?.typescript || !!pkgJson().devDependencies?.typescript
-        const _hasTyper     = () => !!pkgJson().dependencies?.['@cap-js/cds-typer'] || !!pkgJson().devDependencies?.['@cap-js/cds-typer']
+        const _hasTyper = () => !!pkgJson().dependencies?.['@cap-js/cds-typer'] || !!pkgJson().devDependencies?.['@cap-js/cds-typer']
         const _inProd = plugin => require(`./template/${plugin}`).hasInProduction(env) || cds.cli.argv[0]?.includes(plugin) || cds.cli.options.add?.has(plugin)
         const _uiEmbedded = () => exists(join(env.folders.app, 'xs-app.json'))
         const _uiModule = () => !_uiEmbedded() && isdir(env.folders.app) && fs.readdirSync(resolve(cds.root, env.folders.app)).length > 0
@@ -121,9 +121,22 @@ module.exports = new class ProjectReader {
                     const manifestPath = path.resolve(cds.root, cds.env.folders.app, app, 'webapp/manifest.json')
                     const manifest = exists(manifestPath) ? JSON.parse(fs.readFileSync(manifestPath, 'utf-8')) : {}
                     const inbounds = manifest?.['sap.app']?.crossNavigation?.inbounds
-                    const [firstInbound] = Object.values(inbounds ?? { intent: { semanticObject: 'Books', action: 'display' }})
+                    const [firstInbound] = Object.values(inbounds ?? { intent: { semanticObject: 'Books', action: 'display' } })
                     const vizId = firstInbound.semanticObject + '-' + firstInbound.action
-                    return { app, strippedApp: app.replace(/-/g, ''), vizId, isNotLast: i < apps.length - 1, manifestAppId: manifest?.['sap.app']?.id ?? app}
+                    // Try to read archiveName from ui5-deploy.yaml if it exists
+                    let archiveName = ''
+                    const ui5DeployPath = path.resolve(cds.root, cds.env.folders.app, app, 'ui5-deploy.yaml')
+                    if (exists(ui5DeployPath)) {
+                        const ui5Deploy = cds.load.yaml(ui5DeployPath)
+                        const customTasks = ui5Deploy?.builder?.customTasks
+                        if (Array.isArray(customTasks)) {
+                            const zipperTask = customTasks.find(t => t.name === 'ui5-task-zipper')
+                            if (zipperTask?.configuration?.archiveName) {
+                                archiveName = `${zipperTask.configuration.archiveName}.zip`
+                            }
+                        }
+                    }
+                    return { app, strippedApp: app.replace(/-/g, ''), vizId, isNotLast: i < apps.length - 1, manifestAppId: manifest?.['sap.app']?.id ?? app, archiveName }
                 })
             },
             appUIPaths: () => {
@@ -133,7 +146,7 @@ module.exports = new class ProjectReader {
                     isdir(path.join(cds.root, cds.env.folders.app, e)) && isApp(e)
                 )
             },
-            hasIndexHtml: () => {},
+            hasIndexHtml: () => { },
             appPath: () => env.folders.app,
             appVersion: () => appVersion,
             jdkVersion: () => jdkVersion,
@@ -152,6 +165,7 @@ module.exports = new class ProjectReader {
             sap: () => cds.cli.options.sap,
             imageRegistry: () => exists('chart/values.yaml') ? cds.load.yaml(join(cds.root, 'chart/values.yaml')).global?.image?.registry ?? '<your-container-registry-server>' : '<your-container-registry-server>',
             extendsApp: _extends,
+            isBas: () => Object.entries(process.env).some(([key, value]) => key === 'WS_BASE_URL' && value.includes('applicationstudio') || /THEIA_(DEFAULT_)?PLUGINS/.test(key)),
             npmWorkspaceRoot: () => {
                 if (this.cachedWorkspaceRoot) return this.cachedWorkspaceRoot
                 this.cachedWorkspaceRoot = execSync('npm prefix', { encoding: 'utf8', cwd: cds.root, stdio: 'pipe' }).trim()
@@ -160,7 +174,7 @@ module.exports = new class ProjectReader {
             isMonorepoMicroservice: function () {
                 return this.npmWorkspaceRoot() !== cds.root
             },
-            hasRoles: () => {}, roles: () => {}, // for xs-security generation
+            hasRoles: () => { }, roles: () => { }, // for xs-security generation
             hasCustomRoleCollections: () => exists('xs-security.json') && !!JSON.parse(fs.readFileSync(path.join(cds.root, 'xs-security.json')))['role-collections']
         }
 
@@ -169,7 +183,8 @@ module.exports = new class ProjectReader {
         // E.g. `cds add hana` can be checked using `hasHana` or `isHana`
         const project = (() => {
             const defined = {}
-            const _get = property => { const p = property
+            const _get = property => {
+                const p = property
                 if (p in reserved) return reserved[p]()
                 for (const prefix of ['has', 'is', 'add']) if (p.startsWith(prefix) && p.length > prefix.length) {
                     const facet = p.slice(prefix.length).replace(/([a-z0-9])([A-Z])/g, '$1-$2').toLowerCase()
@@ -200,23 +215,23 @@ module.exports = new class ProjectReader {
  * @param {string[]?} roots array of directories to search for application.yaml, like `srv`
  * @returns {Promise<object[]>} array of objects with `cds` property
  */
-module.exports._readSpringBootConfig = async function (roots=[cds.env.folders.srv]) {
+module.exports._readSpringBootConfig = async function (roots = [cds.env.folders.srv]) {
     const configNodes = []
     const rootDirs = roots.map(d => join(cds.root, d))
     for (let r of rootDirs) {
-      const file = isfile (join (r,'./src/main/resources/application.yaml'))
-      if (file) {
-        const yaml = cds.load.yaml(file)
-        for (let yamlDoc of Array.isArray(yaml) ? yaml : [yaml]) {
-          let cds = yamlDoc?.cds;
-          if (!cds)   continue
-          cds = _normalizeSpringBootCfg(cds)
-          configNodes.push({cds})
+        const file = isfile(join(r, './src/main/resources/application.yaml'))
+        if (file) {
+            const yaml = cds.load.yaml(file)
+            for (let yamlDoc of Array.isArray(yaml) ? yaml : [yaml]) {
+                let cds = yamlDoc?.cds;
+                if (!cds) continue
+                cds = _normalizeSpringBootCfg(cds)
+                configNodes.push({ cds })
+            }
         }
-      }
     }
     return configNodes
-  }
+}
 
 /**
  * Normalize SpringBoot's dots in keys to express nested objects
@@ -226,7 +241,7 @@ module.exports._readSpringBootConfig = async function (roots=[cds.env.folders.sr
  * @returns {object}
  */
 function _normalizeSpringBootCfg(obj) {
-    if (typeof obj !== 'object')  return obj
+    if (typeof obj !== 'object') return obj
     Object.keys(obj).forEach(k => {
         const prop = k.split('.')
         const last = prop.pop()
@@ -239,7 +254,7 @@ function _normalizeSpringBootCfg(obj) {
         // recursively normalize
         _normalizeSpringBootCfg(obj[k])
         // delete the original property from object if it was rewritten
-        if (prop.length)  delete obj[k]
+        if (prop.length) delete obj[k]
     })
     return obj
 }

package/lib/init/registries/mta.js

@@ -15,6 +15,8 @@ const appFront = {
     where: { type: 'org.cloudfoundry.managed-service', 'parameters.service': 'app-front' }
 }
 
+const ias = { in: 'resources', where: { 'parameters.service': 'identity' } }
+
 const xsuaa = {
     in: 'resources',
     where: { type: 'org.cloudfoundry.managed-service', 'parameters.service': 'xsuaa', 'parameters.service-plan': 'application' }
@@ -208,6 +210,7 @@ const auditlog = {
 module.exports = {
     srv4,
     approuter,
+    ias,
     xsuaa,
     xsuaa4,
     destination,

package/lib/init/registries/xs-app.js

@@ -5,6 +5,12 @@ const odataApi = {
   where: { target: '/odata/$1' }
 }
 
+const html5RepoApi = {
+  in: 'routes',
+  where: { service: 'html5-apps-repo-rt' }
+}
+
 module.exports = {
-  odataApi
+  odataApi,
+  html5RepoApi
 }

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

@@ -83,3 +83,10 @@ resources:
         oauth2-configuration:
           redirect-uris:
             - https://*~{app-api/app-uri}/**
+
+  - name: {{appName}}-ias
+    type: org.cloudfoundry.managed-service
+    requires:
+      - name: app-api
+    parameters:
+      service: identity

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

@@ -5,7 +5,7 @@ const { readProject } = require('../../projectReader')
 const { sort, merge } = require('../../merge')
 const {
     srv4, mtxSidecar4, approuter, // Modules
-    xsuaa, // BTP Services
+    xsuaa, ias, // BTP Services
     requiredMtxApi, requiredJavaApprouterApi4, providedJavaApprouterApi, // APIs
     requiredAppApi4, providedAppApi,
     approuterMTXRoute,
@@ -34,13 +34,13 @@ module.exports = class ApprouterTemplate extends require('../../plugin') {
         const project = readProject()
         const {
             isNodejs, isJava,
-            addXsuaa, hasXsuaa, addMultitenancy, hasMTXRoute, hasMTXRouteJava,
+            addIas, addXsuaa, hasXsuaa, hasIas, addMultitenancy, hasMTXRoute, hasMTXRouteJava,
             addMta, addHelm, addHelmUnifiedRuntime, hasMta, hasHelm, hasHelmUnifiedRuntime,
             addContainerize, srvPath, approuterPath
         } = project
 
 
-        if (addMta || (addMultitenancy || addXsuaa) && hasMta) {
+        if (addMta || (addMultitenancy || addXsuaa || addIas) && hasMta) {
             const srv = srv4(srvPath)
             const apis = isJava && addMultitenancy ? [requiredJavaApprouterApi4(srv), providedJavaApprouterApi] : []
             const mtxSidecar = mtxSidecar4(isJava ? 'mtx/sidecar' : 'gen/mtx/sidecar')
@@ -49,15 +49,21 @@ module.exports = class ApprouterTemplate extends require('../../plugin') {
             const modules = [srv, approuter]
             if (addMultitenancy) modules.push(mtxSidecar)
             const additions = [...modules, ...apis]
-            if (hasXsuaa) additions.push(xsuaa)
             const relationships = []
-            if (hasXsuaa) relationships.push({
-                insert: [xsuaa, 'name'],
-                into: [srv, 'requires', 'name']
-            }, {
-                insert: [xsuaa, 'name'],
-                into: [approuter, 'requires', 'name']
-            })
+            if (hasXsuaa) {
+                additions.push(xsuaa)
+                relationships.push({
+                    insert: [xsuaa, 'name'],
+                    into: [approuter, 'requires', 'name']
+                })
+            }
+            if (hasIas) {
+                additions.push(ias)
+                relationships.push({
+                    insert: [ias, 'name'],
+                    into: [approuter, 'requires', 'name']
+                })
+            }
             await merge(__dirname, 'files/mta.yaml.hbs').into('mta.yaml', {
                 with: project, additions, relationships,
             })

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

@@ -33,7 +33,7 @@ module.exports = class AuditLoggingTemplate extends require('../../plugin') {
 
   async combine() {
     const project = readProject()
-    const { addMta, addHelm, addMultitenancy, srvPath } = project
+    const { addMta, addHelm, addHelmUnifiedRuntime, addMultitenancy, srvPath } = project
     const { plan = 'premium' } = cds.cli.options
     project.servicePlan = plan
 
@@ -53,7 +53,7 @@ module.exports = class AuditLoggingTemplate extends require('../../plugin') {
         ]
       })
     }
-    if (addHelm) {
+    if (addHelm || addHelmUnifiedRuntime) {
       await merge({
         srv: { bindings: { auditlog: { serviceInstanceName: 'auditlog' }}},
         auditlog: {

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

@@ -2,9 +2,8 @@
 _schema-version: '1.0'
 repository: {{& imageRegistry}}
 tag: latest
-before-all:
-  - npx cds build --production
   {{#isJava}}
+before-all:
   - mvn clean package -DskipTests=true --batch-mode
   {{/isJava}}
 modules:

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

@@ -26,10 +26,6 @@ module.exports = class DestinationTemplate extends require('../../plugin') {
         const project = readProject()
         const { addHelm, addApprouter, addMultitenancy, addHelmUnifiedRuntime, addMta, hasMta, srvPath, isJava } = project
 
-        if (addMultitenancy) {
-            await merge({ cds: { requires: { destinations:true } } }).into('mtx/sidecar/package.json')
-        }
-
         if (addMta || (addApprouter || addMultitenancy) && hasMta) {
             const srv = srv4(srvPath)
             const additions = [srv, destination]

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/hana/index.js

@@ -44,9 +44,9 @@ module.exports = class HanaTemplate extends require('../../plugin') {
 
     async combine() {
         const project = readProject()
-        const { addMta, addHelm, addHelmUnifiedRuntime, addMultitenancy, addContainerize, isJava, hasHelm, hasMultitenancy, srvPath } = project
+        const { addMta, hasMta, addHelm, addHelmUnifiedRuntime, addMultitenancy, addContainerize, isJava, hasHelm, hasHelmUnifiedRuntime, hasMultitenancy, srvPath } = project
 
-        if (addMta || addMultitenancy) {
+        if (addMta || (addMultitenancy && hasMta)) {
             const srv = srv4(srvPath)
             const db = hasMultitenancy ? serviceManager : hdiContainer
             const deletions = hasMultitenancy ? [{
@@ -91,7 +91,7 @@ module.exports = class HanaTemplate extends require('../../plugin') {
 
         }
 
-        if (addMultitenancy && hasHelm) {
+        if (addMultitenancy && (hasHelm || hasHelmUnifiedRuntime)) {
             await merge('chart/values.yaml')
                 .remove(['hana-deployer', 'srv.bindings.db', 'hana'])
 

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 })

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

@@ -1,13 +1,4 @@
 ---
-before-all:
-{{#hasUI5}}
-  - mkdir -p app/html5-deployer/resources
-{{#apps}}
-  - 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:

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')
 
@@ -44,7 +44,7 @@ module.exports = class Html5RepoTemplate extends require('../../plugin') {
         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 })
         }))

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

@@ -1,6 +1,6 @@
 const { readProject } = require('../../projectReader')
 const { merge, sort } = require('../../merge')
-const { srv4, approuter, mtxSidecar4 } = require('../../registries/mta')
+const { srv4, approuter, ias, mtxSidecar4 } = require('../../registries/mta')
 const cds = require('../../../cds')
 const { exists, read } = cds.utils
 
@@ -28,7 +28,7 @@ module.exports = class IasTemplate extends require('../../plugin') {
 
     async combine() {
         const project = readProject()
-        const { isJava, addMta, addCfManifest, addHelm, addHelmUnifiedRuntime, addApprouter, addMultitenancy, srvPath } = project
+        const { isJava, addMta, hasMta, addCfManifest, addHelm, addHelmUnifiedRuntime, addApprouter, addMultitenancy, srvPath } = project
 
         if (addMultitenancy) {
             const conf = exists('mtx/sidecar/package.json') ? await read('mtx/sidecar/package.json') : {}
@@ -43,12 +43,11 @@ module.exports = class IasTemplate extends require('../../plugin') {
             await merge(__dirname, 'files/sidecar.package.json.hbs').into('mtx/sidecar/package.json')
         }
 
-        if (addMta || addApprouter || addMultitenancy) {
+        if (addMta || (addApprouter || addMultitenancy) && hasMta) {
             const srv = srv4(srvPath)
-            const identity = { in: 'resources', where: { 'parameters.service': 'identity' } }
             const srvIdentityBinding = { in: [srv, 'requires'], where: { 'parameters.config.app-identifier': 'srv' } }
             const srvCertUrlApi = { in: [srv, 'provides'], where: { 'name': 'srv-api' } }
-            const additions = [srv, identity, srvIdentityBinding, srvCertUrlApi]
+            const additions = [srv, ias, srvIdentityBinding, srvCertUrlApi]
             const overwrites = []
 
             if (addApprouter) {

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

@@ -42,12 +42,12 @@ module.exports = class MultitenancyTemplate extends require('../../plugin') {
   async combine() {
     const project = readProject()
     const {
-      isNodejs, isJava, addMta, addHelm, addHelmUnifiedRuntime,
+      isNodejs, isJava, addMta, hasMta, addHelm, addHelmUnifiedRuntime,
       addXsuaa, hasXsuaa, addIas, hasIas, hasHana, addContainerize, hasApprouter,
       srvPath, appName
     } = project
 
-    if (addMta || addIas || addXsuaa) {
+    if (addMta || (addIas || addXsuaa) && hasMta) {
       const srv = srv4(srvPath)
       const mtxSidecar = mtxSidecar4(isJava ? 'mtx/sidecar' : 'gen/mtx/sidecar')
       const modules = [srv, mtxSidecar]

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

@@ -24,12 +24,16 @@ module.exports = class PipelineTemplate extends require('../../plugin') {
     }
 
     async run() {
-        await copy(join(__dirname, 'files')).to(cds.root)
+        await Promise.all([
+            copy(join(__dirname, 'files', '.pipeline')).to(join(cds.root, '.pipeline')),
+            copy(join(__dirname, 'files', 'Jenkinsfile')).to(join(cds.root, 'Jenkinsfile'))
+        ])
 
         const project = readProject()
         const { apps, appPath, hasUI5 } = project
 
         if (hasUI5) { // UI5 integration might be needed even without HTML5 repo
+            console.log('Adding UI5 integration to the pipeline for the detected UI5 apps...')
             for (const { app } of apps) {
                 project.app = app
                 await Promise.all([

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

@@ -33,14 +33,14 @@ module.exports = class XsuaaTemplate extends require('../../plugin') {
 
     async combine() {
         const project = readProject()
-        const { addMultitenancy, addMta, hasMta, addHelm, hasHelm, addHelmUnifiedRuntime, isJava, srvPath } = project
+        const { addMultitenancy, addMta, hasMta, addHelm, hasHelm, hasHelmUnifiedRuntime, addHelmUnifiedRuntime, isJava, srvPath } = project
 
         const cds = require('../../../../lib')
         const xsSecurity = await (async () => {
             try {
                 const models = await cds.load(cds.env.folders.srv)
                 return cds.compile.to.xsuaa(models)
-            } catch (error) { /* ignore */ }
+            } catch { /* ignore */ }
         })() ?? { scopes: [], attributes: [], 'role-templates': [], 'authorities-inheritance': false }
 
         const additions = xsSecurity.scopes.map(scope => ({ in: 'scopes', where: { name: scope.name } }))
@@ -84,7 +84,7 @@ module.exports = class XsuaaTemplate extends require('../../plugin') {
             await merge(__dirname, 'files/mta.yaml.hbs').into('mta.yaml', { project, additions, overwrites, relationships })
         }
 
-        if (addHelm || addHelmUnifiedRuntime || addMultitenancy && hasHelm) {
+        if (addHelm || addHelmUnifiedRuntime || addMultitenancy && (hasHelm || hasHelmUnifiedRuntime)) {
             const overwrites = addMultitenancy ? [{ item: 'xsuaa.parameters.tenant-mode', withValue: 'shared' }] : []
             await merge(__dirname, 'files/values.yaml.hbs').into('chart/values.yaml', { with: project, overwrites })
             await merge({

package/lib/util/question.js

@@ -25,7 +25,7 @@ async function ask4(...args) {
     await askQuestion(question)
   }
   rl.close()
-  return answers
+  return Array.isArray(args) ? answers[0] : answers
 }
 
 module.exports = { ask4 }

package/npm-shrinkwrap.json

@@ -1,12 +1,12 @@
 {
   "name": "@sap/cds-dk",
-  "version": "9.4.2",
+  "version": "9.4.3",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@sap/cds-dk",
-      "version": "9.4.2",
+      "version": "9.4.3",
       "license": "SEE LICENSE IN LICENSE",
       "dependencies": {
         "@cap-js/asyncapi": "^1.0.0",
@@ -42,8 +42,8 @@
       }
     },
     "node_modules/@cap-js/db-service": {
-      "version": "2.5.1",
-      "integrity": "sha512-dpz9lvOepcXOgE8uTs9abCotLcCt1odpwlrUT4AW2pnSrMB0EVMRbHKVIlufmrm8Kh/Y5c2d6ODald8eahsEDw==",
+      "version": "2.6.0",
+      "integrity": "sha512-t72/FcAYFbPdx+5iV+lVKcwF2MLOx8II3jJdlC1dX/KXQORoS3wDFwWbakP0f/eharE5hfa7KMFJqrSMtDigbQ==",
       "devOptional": true,
       "license": "Apache-2.0",
       "dependencies": {
@@ -65,12 +65,12 @@
       }
     },
     "node_modules/@cap-js/sqlite": {
-      "version": "2.0.3",
-      "integrity": "sha512-Zm2JLpPuddFkeqM47TX7V7IC6x3WOfn5lTRbaiVOMvRQoshCNXTkjv083ssfiwF/jF/46/PSVox+fTElozg6XA==",
+      "version": "2.0.4",
+      "integrity": "sha512-QPVkycLJG6EubtjrPeiK4dTI1zPH/nabvhiYnTeg2AbeQ8mbazm5pjmcLrzOOKF/5bGS8KQo2J+49fU5LPRR3A==",
       "license": "Apache-2.0",
       "optional": true,
       "dependencies": {
-        "@cap-js/db-service": "^2",
+        "@cap-js/db-service": "^2.6.0",
         "better-sqlite3": "^12.0.0"
       },
       "peerDependencies": {
@@ -120,8 +120,8 @@
       }
     },
     "node_modules/@sap/cds-compiler": {
-      "version": "6.4.2",
-      "integrity": "sha512-kjhq8GxzCLIfsM4aln9saxkifPC26MYuAqT82QB7RGZDVFM5Pw09Dp6TcKCSp65hut0YgHkvHlVGWMZWWBJNdA==",
+      "version": "6.4.6",
+      "integrity": "sha512-auAjRh9t0KKj4LiGAr/fxikZRIngx9YXVHTJWf0LeaGv0ZpYOi6iWbSnU1XRB2e6hsf+Ou1w5oTOHooC5sZfog==",
       "license": "SEE LICENSE IN LICENSE",
       "bin": {
         "cdsc": "bin/cdsc.js",
@@ -133,8 +133,8 @@
       }
     },
     "node_modules/@sap/cds-fiori": {
-      "version": "2.1.0",
-      "integrity": "sha512-EoNtPT5aVurxwsqHQfW2FgnXA3Ysu9GvihR0jTQNUZ4pVlHHFkfFehH6G2DIHKyfTROWaahegJsMpiwpE8clkg==",
+      "version": "2.1.1",
+      "integrity": "sha512-X+4v4LBAT8HIt0zr28/kJNS15nlNlcM97vAMW+agLrmK134nyBiMwUMcp8BMhxlG9B2PykrnAKH56D9O3tfoBg==",
       "license": "SEE LICENSE IN LICENSE",
       "peerDependencies": {
         "@sap/cds": ">=8",
@@ -142,8 +142,8 @@
       }
     },
     "node_modules/@sap/cds-mtxs": {
-      "version": "3.4.2",
-      "integrity": "sha512-bpKHKbehDSZpe9IoY1Vn2LQ5kgQns6RdlMsTOE9rw9zP//Yq5hFtl7SKFEM0A0/+WL3E+Rp/7Y2tc76erKYqdA==",
+      "version": "3.4.3",
+      "integrity": "sha512-vgABFr7huaKWGx2fWHeGom5bVgsQKD7/gqkC7aQ/7yC9hdZdrx0mz4iZ0ASHUZ5PZWp2FWLD+eaJ9sXKUGHgpA==",
       "license": "SEE LICENSE IN LICENSE",
       "dependencies": {
         "@sap/hdi-deploy": "^5"
@@ -261,8 +261,8 @@
       "license": "MIT"
     },
     "node_modules/axios": {
-      "version": "1.12.2",
-      "integrity": "sha512-vMJzPewAlRyOgxV2dU0Cuz2O8zzzx9VYtbJOaBgXFeLc4IV/Eg50n4LowmehOOR61S8ZMpc2K5Sa7g6A4jfkUw==",
+      "version": "1.13.1",
+      "integrity": "sha512-hU4EGxxt+j7TQijx1oYdAjw4xuIp1wRQSsbMFwSthCWeBQur1eF+qJ5iQ5sN3Tw8YRzQNKb8jszgBdMDVqwJcw==",
       "license": "MIT",
       "dependencies": {
         "follow-redirects": "^1.15.6",
@@ -1213,8 +1213,8 @@
       "license": "MIT"
     },
     "node_modules/node-abi": {
-      "version": "3.78.0",
-      "integrity": "sha512-E2wEyrgX/CqvicaQYU3Ze1PFGjc4QYPGsjUrlYkqAE0WjHEZwgOsGMPMzkMse4LjJbDmaEuDX3CM036j5K2DSQ==",
+      "version": "3.79.0",
+      "integrity": "sha512-Pr/5KdBQGG8TirdkS0qN3B+f3eo8zTOfZQWAxHoJqopMz2/uvRnG+S4fWu/6AZxKei2CP2p/psdQ5HFC2Ap5BA==",
       "license": "MIT",
       "optional": true,
       "dependencies": {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sap/cds-dk",
-  "version": "9.4.2",
+  "version": "9.4.3",
   "description": "Command line client and development toolkit for the SAP Cloud Application Programming Model",
   "homepage": "https://cap.cloud.sap/",
   "keywords": [