@sap/cds-dk 8.6.1 → 8.7.0

package/CHANGELOG.md

@@ -7,6 +7,31 @@ This project adheres to [Semantic Versioning](https://semver.org/).
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/).
 
+## Version 8.7.0 - 2025-01-28
+
+### Added
+
+- `cds watch` supports `--exclude` and `--include` options to specify additional paths to include or exclude. Alternatively, set `cds.watch.[include|exclude]` in your CDS config.
+- `cds import` now updates configuration for Java projects (in `application.yaml` etc.)
+- `cds import --config` now also accepts a string with flat key-value pairs (like `--config "credentials.destination=foo"`), which is easier to write than the current JSON string (`--config "{\"credentials\": {\"destination\": \"foo\"}}"`).
+- `cds debug` now supports Java applications, both local and remote.
+- `cds import` can now import an odata-V4 file with external dependencies(odata-V4 file). Dependencies has to be provided with -d/--dependencies option and must not have any external dependencies. 
+
+### Changed
+
+- `cds add mta` sets backend and MTX `parameters.instances` to a default of `1` for improved discoverability.
+- `cds add sample` generates sample .ts files if the project is a TypeScript project
+- `cds import` now doesn't need beta flag to populate default value for optional action and function parameters as compiler now supports default value for @Core.OptionalParameters.
+- `cds add portal` now uses a more generic sample translated title instead of "Bookshop".
+
+### Fixed
+
+- `cds add mta` in combination with `cds add ias` correctly adds all routes to the backend module.
+- `cds add mta` adds the DB deployer module without prior installation of `@cap-js/hana`.
+- `cds add mta` adds the npm-ci builder for nodejs modules to use fixed package-lock versions for dependency vendoring.
+- `cds build --ws` will no longer require a `db/` folder in the root directory of the project.
+- `cds import` doesn't throw error while importing odata-V4 file with com.sap.vocabularies.
+
 ## Version 8.6.1 - 2024-12-18
 
 ### Fixed

package/bin/cds.js

@@ -204,7 +204,7 @@ function _dieForUnknownCommand(cmd) {
 
   const commands = getCommands();
 
-  const bestMatches = fuzzySearch(cmd, commands, DEBUG);
+  const bestMatches = fuzzySearch(cmd, commands, DEBUG, { maxListLength: commands.length });
 
   switch (bestMatches.length) {
     case 0:

package/bin/debug.js

@@ -1,59 +1,133 @@
 module.exports = Object.assign(debug, {
     options: ['--port', '--host'],
-    shortcuts: [],
+    shortcuts: ['-p', '-h'],
     flags: [/*'--vscode', '--k8s'*/],
     help: `
 # SYNOPSIS
 
     *cds debug* [<app>]
 
-    Debugs a CAP-based application in the Chrome Developer Tools.
+    Debug applications running locally or remotely on Cloud Foundry.
+    Local applications will be started in debug mode, while remote applications
+    are put into debug mode.
 
-    If <app> is given, it's assumed to be running on the currently logged-in Cloud Foundry space.
+    If <app> is given, it's assumed to be running on the currently logged-in
+    Cloud Foundry space (check with 'cf target').
+    SSH access to the app is required (check with 'cf ssh-enabled').
 
-    If no <app> is given, the app in the current working is started with 'cds watch --debug'.
+    If no <app> is given, the app in the current working is started
+    (with 'cds watch --debug' for Node.js and 'mvn spring-boot:run' for Java).
 
 # OPTIONS
 
-    *--host* the debug host (default: '127.0.0.1')
+    *-h* | *--host*
 
-    *--port* the debug port (default: 9229)
+      the debug host (default: '127.0.0.1')
+
+    *-p* | *--port*
+
+      the debug port (default: '9229' for Node.js, '8000' for Java)
 
 # EXAMPLES
 
     *cds debug*
-    *cds debug* bookshop-srv
+    *cds debug* bookshop-srv --port 8001
 `})
 
 async function debug() {
-  const cds = require('../lib/cds')
   const { fork, spawn, execSync, exec } = require('node:child_process')
   const os = require('node:os').platform()
+  const cds = require('../lib/cds')
+  const DEBUG = /\b(y|all|debug)\b/.test(process.env.DEBUG) ? console.debug : undefined
 
   const [appName] = cds.cli.argv
-  const { port = 9229, host = '127.0.0.1', vscode } = cds.cli.options
-  const ide = vscode ? 'vscode' : 'chrome'
+  const { port, host = '127.0.0.1', vscode } = cds.cli.options
+
+  const maxAttempts = 15
+  let attempts = 0
 
   if (!appName) { // local app
-    const script = process.argv[1] // `.../cds` or `.../cds-tsx`
-    console.log(`Starting '${cds.utils.path.basename(script)} watch --debug'`)
-    fork(script, ['watch', '--debug']).on('error', e => { throw 'Failed to start debug process:' + e.message })
-  } else if (cds.cli.options.k8s) { // Kyma/Kubernetes
+    if (cds.env['project-nature'] === 'java') {
+      const portLocal = port || 8000
+      const cmd = `mvn`
+      const args = ['spring-boot:run', `-Dspring-boot.run.jvmArguments="-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=${portLocal}"`]
+      console.log(`Starting '${cmd} ${args.join(' ')}'\n`)
+      spawn(cmd, args, { stdio: 'inherit' })
+    }
+    else {
+      const script = process.argv[1] // `.../cds` or `.../cds-tsx`
+      console.log(`Starting '${cds.utils.path.basename(script)} watch --debug'`)
+      fork(script, ['watch', '--debug']).on('error', e => { throw 'Failed to start debug process:' + e.message })
+    }
+  }
+  else if (cds.cli.options.k8s) { // Kyma/Kubernetes
     // to be implemented
-  } else { // Cloud Foundry
-    const script = `ps aux | grep '[n]ode' | awk '{print \\$2}' | head -n 1`
-    const pid = execSync(`cf ssh ${appName} -c "${script}"`, { encoding: 'utf-8', shell: true }).trim()
-    if (!pid) throw `Node.js process for app '${appName}' not found`
-    execSync(`cf ssh ${appName} -c "kill -usr1 ${pid}"`, { stdio: 'inherit' })
-    console.log(`Opening SSH tunnel for CF app '${appName}'`)
-    spawn('cf', ['ssh', '-N', '-L', `${port}:${host}:${port}`, appName], { stdio: 'inherit' })
   }
+  else { // Cloud Foundry
+    const [pid, kind] = processInfo(appName)
+    console.log(`Found process of type ${kind}, ID: ${pid}`)
 
-  const maxAttempts = 15
-  let attempts = 0
+    if (kind === 'node') {
+      enableNodeDebugging(pid, appName)
+      const portLocal = openTunnel(9229)
+      openDevTools(portLocal)
+    }
+    else if (kind === 'java') {
+      const portRemote = findJavaDebugPort(pid, appName)
+      const portLocal = openTunnel(portRemote)
+      printHints(portLocal)
+    }
+  }
+
+  function enableNodeDebugging(pid, appName) {
+    return _execSync(`cf ssh ${appName} -c "kill -usr1 ${pid}"`, { stdio: 'inherit' })
+  }
 
-  const openDevTools = async () => {
+  function findJavaDebugPort(pid, appName) {
+    assertSapMachine(appName)
+    const cmdLine = _execSync(`cf ssh ${appName} -c "~/app/META-INF/.sap_java_buildpack/sap_machine_jre/bin/jcmd ${pid} VM.command_line"`)
+    const address = cmdLine.match(/agentlib:jdwp=.*?address=.*?(\d+)/i)
+    if (address) {
+      console.log(`Found debug port ${address[1]}`)
+      return address[1]
+    }
+    throw `Failed to find debug port. JVM command line: ${cmdLine}`
+  }
+
+  function assertSapMachine(appName) {
+    try {
+      _execSync(`cf ssh ${appName} -c "ls ~/app/META-INF/.sap_java_buildpack/sap_machine_jre/bin/jcmd"`)
+    } catch (err) {
+      const message = err.message || err
+      if (message.match(/cannot access.*jcmd/i)) {
+        throw `Debugging is only supported for apps running with SapMachine.`
+        + `\n\nTo set it, add the following environment variable to your _mta.yaml_ or _manifest.yml_:\n\n`
+        + `  JBP_CONFIG_COMPONENTS: "jres: ['com.sap.xs.java.buildpack.jre.SapMachine']"`
+        + `\n\nSee https://help.sap.com/docs/btp/sap-business-technology-platform/sapmachine for more.\n`
+      }
+    }
+  }
+
+  function openTunnel(portRemote) {
+    const portLocal = port || portRemote
+    console.log(`\nOpening SSH tunnel on ${portRemote}:${host}:${portLocal}`)
+    spawn('cf', ['ssh', '-N', '-L', `${portRemote}:${host}:${portLocal}`, appName], { stdio: 'inherit' })
+    return portLocal
+  }
+
+  function processInfo(appName) {
+    const pidOf = exe => _execSyncSafe(`cf ssh ${appName} -c "pidof ${exe}"`)
+    const exeTypes = ['node', 'java']
+    for (const exe of exeTypes) {
+      const pid = pidOf(exe)
+      if (pid)  return [pid, exe]
+    }
+    throw `No ${exeTypes.join(' or ')} process found for app '${appName}'`
+  }
+
+  async function openDevTools(port) {
     attempts++
+    const ide = vscode ? 'vscode' : 'chrome'
     try {
       switch (ide) {
         case 'chrome': {
@@ -78,13 +152,35 @@ async function debug() {
           // to be implemented
         }
       }
+      printHints(port)
     } catch (err) {
       if (attempts < maxAttempts) {
-        setTimeout(openDevTools, 1000) // connection fails sometimes, retry
+        setTimeout(() => openDevTools(port), 1000).unref() // connection fails sometimes, retry
       } else {
         throw `Failed to connect to debugger after ${maxAttempts} attempts: ${err}`
       }
     }
   }
-  openDevTools()
+
+  function printHints(portLocal) {
+    console.log()
+    console.log(`> Now attach a debugger to port ${portLocal}.`)
+    console.log('> Keep this terminal open while debugging.')
+    console.log('> See https://cap.cloud.sap/docs/tools/cds-cli#cds-debug for more.')
+  }
+
+  function _execSyncSafe(...args) {
+    try {
+      return _execSync(...args)
+    } catch (_) {/* ignore */ }
+  }
+  function _execSync(cmd, options={ encoding: 'utf-8', shell: true }) {
+    try {
+      return execSync(cmd, options)?.trim()
+    } catch (err) {
+      if (DEBUG) throw err
+      throw err.message
+    }
+  }
+
 }

package/bin/deploy/index.js

@@ -148,6 +148,13 @@ async function deploy(_model, options) { // NOSONAR
       options.schema_log = []
     }
 
+    const isVersionLess8 = Number(cds.version.split('.')[0]) < 8
+    const localizedViewsSetting = cds.env?.sql?.transitive_localized_views
+    if (isVersionLess8 && !localizedViewsSetting ) {
+      cds.env.sql ??= {}
+      cds.env.sql.transitive_localized_views = true
+      console.warn(`transitive_localized_views = false requires @sap/cds >= 8.0.0, current version is ${cds.version}. transitive_localized_views has been set to true for this run. Will continue accordingly.`)
+    }
     await deployer.deploy(_model, _db, options)
     const log = this.log || _log
     if (options.messages.length) log (options.messages, options)

package/bin/import.js

@@ -1,8 +1,8 @@
 module.exports = Object.assign(_import, {
     _name: 'import',
-    options: ['--out', '--as', '--name', '--include-namespaces', '--from',  '--config', '--destination', '--group'],
-    shortcuts: ['-o', '-as',   '-n',     '-ns',                  undefined, '-c',       undefined,       undefined, '-', '-f'],
-    flags: ['--dry', '--force', '--no-copy', '--no-save', '--keep-namespace', '--beta'],
+    options:   ['--for', '--out', '--as', '--name', '--include-namespaces', '--dependencies', '--from', '--config', '--destination', '--group'],
+    shortcuts: ['-4',    '-o',    '-as',  '-n',     '-ns',                    '-d',            undefined,  '-c',       undefined,       undefined, '-', '-f'],
+    flags: ['--dry', '--force', '--no-copy', '--no-save', '--keep-namespace'],
     help: `
 # SYNOPSIS
 
@@ -26,8 +26,9 @@ module.exports = Object.assign(_import, {
     *--no-save*
         Skips updating ./package.json.
 
-    *-o | --out* <filename>
+    *-o | --out* <filename/dirname>
         Skips copying to ./srv/external and writes to the specified location.
+        Dirname is only applicable for importing odata-V4 file with dependencies.
 
     *- | --dry*
         Writes the converted csn to stdout only.
@@ -44,12 +45,12 @@ module.exports = Object.assign(_import, {
         Imports the model from the one of the given options "edmx", "openapi" or
         "asyncapi".
 
-    *-c | --config* <JSON Object>
-        Adds the provided JSON Object as custom configuration data to the package.json.
+    *-c | --config* <JSON string | comma-separated key-value pairs>
+        Adds the provided JSON or key-value pairs to the configuration.
 
-    *--beta*
-        Enables beta mode in cds import.
-        - Populates default value for optional action and function parameters in the CSN or CDS.
+    *-4 | --for* <profile>
+
+      Write configuration data for the given profile.
 
     *--destination*
         Destination name under which the remote service can be reached.
@@ -66,6 +67,13 @@ module.exports = Object.assign(_import, {
         For OData V2 attributes with the namespace "sap" & "m" are captured by
         default.
 
+    *-d | --dependencies* <comma-separated list of dependencies>
+        Imports the given list of dependencies along with the main file. Valid for OData V4 only.
+        The dependencies are written to the given dirname(-o option) or ./srv/external.
+        If the cds files of dependencies are already present in the destination, it will be skipped 
+        if -f option is not given.
+        NOTE: The dependencies must not have any dependency.
+
     *Below options are valid for RFC only*
 
     *-n | --name*
@@ -83,51 +91,68 @@ module.exports = Object.assign(_import, {
     cds import ~/Downloads/API_BUSINESS_PARTNER.edmx --from edmx --as cds
     cds import ~/Downloads/API_BUSINESS_PARTNER.edmx --include-namespaces "sap,c4c"
     cds import ~/Downloads/API_BUSINESS_PARTNER.edmx --include-namespaces "\x2A"
+    cds import ~/Downloads/sap.graph.edmx -d ./sap.c4c.edmx,./sap.s4.edmx --as cds -o ./graph
     cds import ~/Downloads/Petstore_OpenAPI.json
     cds import ~/Downloads/Petstore_OpenAPI.json --from openapi
     cds import ~/Downloads/BookStore_AsyncAPI.json
     cds import ~/Downloads/BookStore_AsyncAPI.json --from asyncapi
     cds import ~/Downloads/API_BUSINESS_PARTNER.edmx -c "{\\"[production]\\":{\\"credentials\\":{\\"destination\\":\\"UI3_noauth\\",\\"path\\":\\"/sap/cap/odata\\"}}}"
+    cds import ~/Downloads/API_BUSINESS_PARTNER.edmx --for sandbox    -c "destination.properties.url=https://sandbox.api.sap.com/s4hanacloud/sap/opu/odata/sap"
+    cds import ~/Downloads/API_BUSINESS_PARTNER.edmx --for production -c "http.suffix=/sap/opu/odata/sap,http.csrf.enabled=true"
 
 `})
-const messages = require('../lib/import/message').getMessages();
-const common = require('../lib/import/common');
-const cdsImport = require('../lib/index');
 
 async function _import(args, options = {}) {
-    let csn = '';
-    let apiOptions = {};
-    // preprocess
-    let cwd = process.cwd();
-    // process options
-    await common.processOptions(options, apiOptions);
+    const messages = require('../lib/import/message').getMessages();
+    const common = require('../lib/import/common');
+    const cds = require('../lib/index');
+    
+    // check if dependencies are provided and import them first
+    if (options.dependencies) {
+        const dependencies = options.dependencies.split(',');
+        delete options.dependencies;
+        for (let dependency of dependencies) {
+            const o = structuredClone(options);
+            o.isDependency = true;
+            if (dependency) await _import(dependency, o);
+        }
+        options.isDependent = true;
+    }
 
-    const cds = require('../lib/cds')
     await cds.plugins
+    const cwd = process.cwd();
 
-    let file
-    let input
-    if (!options.name) {
-        file = Array.isArray(args) ? args[0] : args
+    // process options
+    const apiOptions = {};
+    await common.processOptions(options, apiOptions);
+
+    const file = Array.isArray(args) ? args[0] : args
+    let input = file
+    if (!options.name) { // if no --name is given, use the positional file argument
         if (!file) return this.help('import')
         input = await common.preProcess(file, options, cwd);
     }
 
-    // process - csn generation
-    // if --from option is given, call api directly accordingly
+    const fileType = await common.identifyFile(input);
+    if ((options.isDependency || options.isDependent) 
+            && fileType !== 'edmx') {
+        throw messages.DEPENDENCY_NOT_SUPPORTED;
+    }
+
+    let csn
     if (options.from) {
-        if (!cdsImport.import.from[options.from]) {
+        if (!cds.import.from[options.from]) {
             // the required plugin might not be installed, e.g. rfc importer
             throw messages.UNSUPPORTED_FROM_OPTION;
         }
-        csn = await cdsImport.import.from[options.from](input, apiOptions);
+        csn = await cds.import.from[options.from](input, apiOptions);
     } else {
-        csn = await cdsImport.import(input, apiOptions);
+        csn = await cds.import(input, apiOptions);
     }
 
     // reads the file version
     options.inputFileKind = apiOptions.odataVersion ? apiOptions.odataVersion : apiOptions.inputFileKind;
 
     // postprocess
-    return await common.postProcess(apiOptions.file ?? file, options, csn, cwd);
+    return common.postProcess(apiOptions.file ?? file, options, csn, cwd);
 }

package/bin/repl.js

@@ -83,7 +83,7 @@ async function repl (_, options={}) {
   const fs = require('fs')
   fs.readFile(history, 'utf-8', (e, txt) => e || Object.assign(repl.history, txt.split('\n')))
   repl.on('exit', () => fs.writeFile(history, repl.history.join('\n'), () => {}))
-
+  repl.on('exit', cds.shutdown)
   process.on('uncaughtException', console.error)
   process.on('unhandledRejection', console.error)
 
@@ -108,7 +108,7 @@ async function repl (_, options={}) {
       console.log (`}`)
       console.log()
     }
-    console.log('Simply type e.g.', GREEN+ Object.keys(context).at(-1) +RESET, 'in the prompt to use the respective objects.')
+    console.log('Simply type e.g.', GREEN+ Object.keys(repl.context).at(-1) +RESET, 'in the prompt to use the respective objects.')
     console.log()
     repl.displayPrompt()
   }

package/bin/util/fuzzySearch.js

@@ -1,20 +1,20 @@
+const cache = new Map();
+
 /**
  * Levenshtein distance algorithm using recursive calls and cache
  *
- * @param input search the list for a best match for this string
- * @param list a list of strings to match input against
- * @param log logging method to use, might be null if no logging is wanted
- * @returns array with best matches, is never null but might be empty in case no search was possible
+ * @param {string} input - search the list for a best match for this string
+ * @param {string[]} list - a list of strings to match input against
+ * @param {null | (s:string) => unknown} log logging method to use, might be null if no logging is wanted
+ * @param {{maxListLength?: number, maxInputLength?: number}} [options] - optional parameters to control the search
+ * @returns {string[]} array with best matches, is never null but might be empty in case no search was possible
  */
+module.exports = (input, list, log, options = {}) => {
+  const { maxListLength, maxInputLength } = {...{ maxListLength: 50, maxInputLength: 50 }, ...options};
 
-
-const cache = new Map();
-
-
-module.exports = (input, list, log) => {
   let minDistWords = [];
 
-  if (input.length > 50 || list.length > 50) {
+  if (input.length > maxInputLength || list.length > maxListLength) {
     return minDistWords;
   }
 

package/bin/watch.js

@@ -1,4 +1,5 @@
-const watchOnlyOptions = ['--ext', '--livereload', '--open', '--debug', '--inspect', '--inspect-brk']
+const watchOnlyOptions = ['--ext', '--livereload', '--open', '--debug', '--inspect', '--inspect-brk', '--include', '--exclude']
+
 module.exports = Object.assign ( watch, {
   flags: [ '--in-memory', '--in-memory?', '--with-mocks' ],
   options: [ '--port', ...watchOnlyOptions ],
@@ -27,6 +28,14 @@ module.exports = Object.assign ( watch, {
     Specify file extensions to watch for in a comma-separated list.
     *Example:* cds w --ext cds,json,js.
 
+  *--include* <paths,...>
+
+    Comma-separated list of additional paths to watch.
+
+  *--exclude* <paths,...>
+
+    Comma-separated list of additional paths to ignore.
+
   *--livereload* <port | false>
 
     Specify the port for the livereload server. Defaults to '35729'.
@@ -65,22 +74,33 @@ const {codes} = require('../lib/util/term'), t = codes
 const fs = require ('fs')
 
 const extDefaults = 'cds,csn,csv,ts,mjs,cjs,js,json,properties,edmx,xml,env'
-const ignore = RegExp(
-  `(\\.git|node_modules|_out|@types|@cds-models)\\${sep}` +
-  `|app(\\${sep}.+)?\\${sep}(` +
-    `(webapp|dist|target)\\${sep}|` +
-    `tsconfig\\.json$|` +
-    `.*\\.tsbuildinfo$` +
-  ')' +
-  `|package-lock\\.json$` +
-  `|\\${sep}gen\\${sep}`
-)
+
+const ignoreDefaults = [
+  /\.git/,
+  /node_modules/,
+  /_out/,
+  /@types/,
+  /@cds-models/,
+  new RegExp(`app${sep}.+?${sep}webapp${sep}`),
+  new RegExp(`app${sep}.+?${sep}dist${sep}`),
+  new RegExp(`app${sep}.+?${sep}target${sep}`),
+  new RegExp(`app${sep}.+?${sep}tsconfig\\.json$`),
+  new RegExp(`app${sep}.+?${sep}.*\\.tsbuildinfo$`),
+  /package-lock\.json$/,
+  new RegExp(`\\${sep}gen\\${sep}`)
+]
 
 async function watch ([cwd], {
   args = ['serve', 'all'],
   ext = extDefaults,
+  include = cds.env.watch?.include ?? [],
+  exclude = cds.env.watch?.exclude ?? [],
   ...options
 }={}) {
+  const paths4 = p => typeof p === 'string' ? p.split(',').map(p => p.trim()) : (p || [])
+  const included = paths4(include), excluded = paths4(exclude)
+  const nonexisting = included.filter(p => !fs.existsSync(p))
+  if (nonexisting.length > 0) throw `${nonexisting.length > 1 ? 'Paths do' : 'Path does'} not exist: ${nonexisting.join(', ')}`
   if (cwd && !cds.utils.exists(cwd)) try { // try module name like `@capire/bookshop`
     cwd = require.resolve(cwd+'/package.json', {paths:[ process.cwd() ]}).slice(0,-13)
   } catch (err) {
@@ -133,9 +153,19 @@ async function watch ([cwd], {
   }
   log ()
   log (`${t.bold}cds ${args.join(' ')}`)
-  DEBUG && log (process.pid, 'watching:', ext, '...')
-  DEBUG && log ('ignoring:', ignore.source)
-  if (liveReload) log (`live reload enabled for browsers`)
+  const escapedRegex = s => s.replace(/[-/\\^$*+?.()|[\]{}]/g, '\\$&')
+  const resolved = p => resolve(_cwd, p)
+  const excludedPaths = excluded.map(resolved).map(escapedRegex)
+  const ignore = excluded.length
+    ? new RegExp(ignoreDefaults.map(d => d.source).concat(excludedPaths).join('|'))
+    : new RegExp(ignoreDefaults.map(d => d.source).join('|'))
+  const watched = [ _cwd, ...included.map(resolved) ]
+  if (DEBUG) {
+    console.log(`\nwatching (pid ${process.pid})`, {
+      extensions:ext, roots:watched, ignoring: [...excludedPaths.map(s => new RegExp(s)), ...ignoreDefaults]
+    })
+  }
+  if (liveReload) console.log (`live reload enabled for browsers`)
 
   const BindingManager = require('../lib/bind/bindingManager')
   const bindingManager = new BindingManager({cwd})
@@ -144,7 +174,7 @@ async function watch ([cwd], {
 
   const nodemon = require('../lib/watch/node-watch')
   const watcher = nodemon ({
-    script: resolve(__dirname,'../lib/watch/watched'), cwd, env, ext, ignore,
+    script: resolve(__dirname,'../lib/watch/watched'), cwd, env, ext, ignore, watched,
     delay,
     options
   }).on('restart', (files)=>{
@@ -216,4 +246,4 @@ function paths (dir) {
 function installed(id, ...paths) {
   try { return require.resolve (id, { paths }) }
   catch(e) { if (e.code !== 'MODULE_NOT_FOUND')  throw e }
-}
+}

package/lib/build/buildTaskProviderFactory.js

@@ -121,11 +121,14 @@ class BuildTaskProviderFactory {
         // located under 'C:\SAPDevelop\git\...' using a sym-link from '%USERHOME%\git' to 'C:\SAPDevelop\git'.
         // see cap/issues/#8694
         resolvedTask.src = path.resolve(cds.root, task.src)
-        try {
-            //validate source path
-            fs.realpathSync(resolvedTask.src)
-        } catch (e) {
-            throw new BuildError(`The 'src' folder '${path.resolve(cds.root, task.src)}' for build task '${resolvedTask.for}' does not exist`)
+        // if --ws is passed, the db/ folder is not required, as the task will gather the model from the workspaces
+        if (!this.options.ws) {
+            try {
+                //validate source path
+                fs.realpathSync(resolvedTask.src)
+            } catch (e) {
+                throw new BuildError(`The 'src' folder '${path.resolve(cds.root, task.src)}' for build task '${resolvedTask.for}' does not exist`)
+            }
         }
         resolvedTask.dest = path.resolve(cds.root, cds.env.build.target, task.dest || task.src)
         resolvedTask.options = task.options || {}

package/lib/build/plugins/helm/files/subcharts/content-deployment/Chart.yaml

@@ -4,4 +4,4 @@ name: content-deployment
 sources:
 - https://github.tools.sap/unified-runtime/content-deployment
 type: application
-version: 1.7.0
+version: 1.7.1

package/lib/build/plugins/helm/files/subcharts/content-deployment/templates/job.yaml

@@ -16,9 +16,8 @@ spec:
   template:
     metadata:
       labels: {{- include "content-deployment.internal.labels" . | nindent 8 }}
-      annotations:
-        container.apparmor.security.beta.kubernetes.io/{{ include "content-deployment.internal.name" . }}: runtime/default
         {{- if or .Values.annotations.job }}
+      annotations:
         {{- tpl (toYaml .Values.annotations.job) $ | nindent 8 }}
         {{- end }}
     spec:
@@ -65,6 +64,8 @@ spec:
           runAsUser: {{ .Values.runAsUser }}
           {{- end }}
           readOnlyRootFilesystem: false
+          appArmorProfile:
+            type: RuntimeDefault
         volumeMounts:
         - mountPath: /tmp
           name: tmp

package/lib/build/plugins/helm/files/subcharts/content-deployment/values.yaml

@@ -14,7 +14,7 @@ global:
     _internal:
       content-deployment:
         versions:
-          1.7.0: true
+          1.7.1: true
 # Will be used instead of the `.Chart.Name`, e.g. when generating the Deployment name.
 # nameOverride: name
 

package/lib/build/plugins/helm/files/subcharts/web-application/Chart.yaml

@@ -5,4 +5,4 @@ name: web-application
 sources:
 - https://github.tools.sap/unified-runtime/web-application
 type: application
-version: 1.20.0
+version: 1.22.0

package/lib/build/plugins/helm/files/subcharts/web-application/templates/_helpers.tpl

@@ -208,11 +208,11 @@ If release name contains chart name it will be used as service instance name.
 {{ .checkName }}:
 {{- if .checkValues.path }}
   httpGet:
-    path: {{ .checkValues.path }}
-    port: http
+    path: {{ tpl .checkValues.path .context }}
+    port: {{ .values.port | default .context.Values.port }}
 {{- else }}
   tcpSocket:
-    port: {{ .context.Values.port }}
+    port: {{ .values.port | default .context.Values.port}}
 {{- end }}
 {{- if eq .checkName "startupProbe" }}
   periodSeconds: 2

package/lib/build/plugins/helm/files/subcharts/web-application/templates/api-rule.yaml

@@ -20,7 +20,7 @@ spec:
     name: {{ include "web-application.fullname" . }}
     port: {{ .Values.port }}
   rules:
-    {{- toYaml .Values.expose.rules | nindent 4 }}
+    {{- tpl (toYaml .Values.expose.rules) $ | nindent 4 }}
   {{- if .Values.expose.corsPolicy }}
   corsPolicy:
     {{- toYaml .Values.expose.corsPolicy | nindent 4 }}