@sap/cds-dk 9.2.0 → 9.2.1

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.2.1 - 2025-08-22
+
+### Changed
+
+- `cds add github-actions` adds `if: always()` to the scripts retrieving Cloud Foundry logs.
+- `cds up` uses a default timeout of 10 minutes for Helm upgrades.
+- `cds bind` works out-of-the-box for PostgreSQL databases.
+- `cds bind -a` gives warning if no services are bound to the targeted app.
+
+### Fixed
+
+- `cds add github-actions` won't try to merge a `cf-info` action if there's an existing `mta.yaml`.
+- `cds add workzone` with missing `sap.app` config in `manifest.json` does not throw a `TypeError`.
+- `cds compile --to xsuaa` generates roles for `@requires` in bound actions.
+- `cds add lint` now adds proper configuration to enable linting of JavaScript and TypeScript files in VS Code.
+- `cds add mta` does no longer adds services in `mta.yaml` for plugins coming from `devDependencies`.
+
 ## Version 9.2.0 - 2025-07-31
 
 ### Added

package/bin/bind.js

@@ -159,6 +159,8 @@ async function cds_bind(args, options) {
         const resolvedServices = [], unresolvedServices = {}
         const services = (await require('../lib/util/cf').services(app)).filter(s => Object.keys(s.credentials).length > 0)
 
+        if (!services) console.warn(`no services bound to app ${app} - nothing to bind`)
+
         services.forEach(service => {
             const type = service.label || service.type;
             const requiredServiceEntry = Object.entries(cds.env.requires).find(([, requiredService]) => requiredService.kind === type && requiredService?.vcap?.name === service.name)

package/bin/up.js

@@ -116,7 +116,7 @@ async function up() {
 
     run('npm i --package-lock')
     await runDetectingError('ctz containerize.yaml --log --push', /^\[?ERROR\]?.*/m)
-    let helmUpgrade = `helm upgrade --install ${appName} ./gen/chart ${nsHelm} --wait --wait-for-jobs`
+    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)
     run(`kubectl rollout status deployment ${appName}-srv ${nsKubectl} --timeout=8m`)

package/lib/bind/shared.js

@@ -23,7 +23,8 @@ const KindToRequiresNameMap = {
     'enterprise-messaging-shared': 'messaging',
     'redis-messaging': 'messaging',
     'multitenancy': 'multitenancy',
-    'portal': 'portal'
+    'portal': 'portal',
+    'postgres': 'db'
 }
 
 const PreferredKinds = {
@@ -77,7 +78,8 @@ async function bind(options = { on: 'cf' }) {
             resolved.name = options.serviceArg
         } else if (kind) {
             const requiresName = KindToRequiresNameMap[kind]
-            if (!requiresName) throw new Error(`Unknown CDS service name for service ${bold(instance)}. Please specify as argument for ${bold('cds bind')}.`)
+
+            if (!requiresName) throw `unknown CDS service name for service ${bold(instance)} of kind ${bold(kind)} – please specify as argument for ${bold('cds bind')}`
             resolved.name = requiresName
         }
         resolved.name ??= `custom-service:${instance || secret}`

package/lib/compile/to-xsuaa.js

@@ -60,8 +60,10 @@ module.exports = function compile_to_xsuaa (model, options) {
     return findUserAttrInExpression(expr)
   }
 
-  cds.reflect(model).foreach(def => {
-    var reqAnnotations = def['@requires']
+  const authAnnotations = def => {
+    if (!def) return
+
+    let reqAnnotations = def['@requires']
     if(!Array.isArray(reqAnnotations)) reqAnnotations=[reqAnnotations]
 
     reqAnnotations.forEach(scope => {
@@ -84,7 +86,14 @@ module.exports = function compile_to_xsuaa (model, options) {
         lattributes.forEach(attr => attributes[attr] = true)
       })
     }
+  }
+
+  cds.reflect(model).foreach(def => {
+    authAnnotations(def)
+    if (def.actions)   Object.values(def.actions).forEach(authAnnotations)
+    if (def.functions) Object.values(def.functions).forEach(authAnnotations)
   })
+
   const roleTemplates = Object.keys(scopes).map((s) => {
     return {
       name: s,

package/lib/deploy/to-hana/hana.js

@@ -250,7 +250,7 @@ spec:
     if (/[^\w-_]+/g.exec(cfServiceInstanceName)) {
       throw `Service name ${cfServiceInstanceName} must only contain alpha-numeric, hyphens, and underscores.`;
     }
-    console.log(`Using container ${bold(cfServiceInstanceName)}`);
+    console.log(`using container ${bold(cfServiceInstanceName)}`);
 
     const cfConfig = cfServiceInstanceMta?.parameters?.config;
     const serviceInstance = await cfUtil.getOrCreateService('hana', 'hdi-shared', cfServiceInstanceName, cfConfig);

package/lib/deploy/to-hana/hdiDeployUtil.js

@@ -6,7 +6,7 @@ const HDI_DEPLOY_LIB = '@sap/hdi-deploy';
 module.exports = new class HdiDeployUtil {
 
     async deploy(dbDir, vcapEnv = {}, { autoUndeploy, parameter={} } = {}) {
-        console.log(`Deploying to HANA from ${dbDir}`);
+        console.log(`deploying to HANA from ${dbDir}`);
 
         const { clean_env, deploy } = this._loadHdiDeployLib(dbDir);
 

package/lib/init/projectReader.js

@@ -47,12 +47,14 @@ module.exports = new class ProjectReader {
      * Returns cds.env using 'production' profile by default as mta deployment is executed with having production profile set.
      */
     env4(profile = 'production') {
+        const nodeEnv = process.env.NODE_ENV
         const cdsEnv = process.env.CDS_ENV
-        process.env.CDS_ENV = profile
+        process.env.CDS_ENV = process.env.NODE_ENV = profile
         try {
             return cds.env.for('cds')
         } finally {
             cdsEnv ? process.env.CDS_ENV = cdsEnv : delete process.env.CDS_ENV
+            nodeEnv ? process.env.NODE_ENV = nodeEnv : delete process.env.NODE_ENV
         }
     }
 

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

@@ -13,7 +13,7 @@ module.exports = class AttachmentsTemplate extends require('../../plugin') {
     }
 
     static hasInProduction(env) {
-        return !!env.requires?.attachments
+        return !!env.requires?.attachments || readProject().dependencies?.['@cap-js/attachments']
     }
 
     async canRun() {

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

@@ -12,7 +12,7 @@ module.exports = class AuditLoggingTemplate extends require('../../plugin') {
   }
 
   static hasInProduction(env) {
-    return env.requires?.['audit-log']
+    return env.requires?.['audit-log'] || readProject().dependencies?.['@cap-js/audit-logging']
   }
 
   options() {

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

@@ -38,11 +38,15 @@ jobs:
 
       {{#hasApprouter}}
       - run: cf logs "${{ env.APP_NAME }}" --recent
+        if: always()
       {{/hasApprouter}}
       - run: cf logs "${{ env.APP_NAME }}-srv" --recent
+        if: always()
       {{^hasMultitenancy}}
       - run: cf logs "${{ env.APP_NAME }}-db-deployer" --recent
+        if: always()
       {{/hasMultitenancy}}
       {{#hasMultitenancy}}
       - run: cf logs "${{ env.APP_NAME }}-mtx" --recent
+        if: always()
       {{/hasMultitenancy}}

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

@@ -49,10 +49,6 @@ module.exports = class GitHubActionTemplate extends require('../../plugin') {
       if (!exists(cfGithub) || force) {
         await copy(path.join(__dirname, 'files/cf-github-deploy'), cfGithub)
       }
-      const cfInfo = '.github/actions/cf-info'
-      if (!exists(cfInfo) || force) {
-        await copy(path.join(__dirname, 'files/cf-info'), cfInfo)
-      }
     }
     if (hasHelm) {
       const kyma = '.github/workflows/kyma.yaml'

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

@@ -5,8 +5,11 @@ const cds = require('../../../cds')
 const { merge } = require('../../merge')
 const { dim, bold } = require('../../../util/term')
 
-const VSCODE_FILE_ASSOCIATIONS = {
-  csv: ['csv', 'csv (semicolon)', 'tsv', 'tab']
+const ESLINT_LANGS_FOR_FILE_TYPE = {
+  cds: ['cds', 'csn'],
+  csv: ['csv', 'csv (semicolon)', 'tsv', 'tab'],
+  js:  ['javascript'],
+  ts:  ['typescript']
 }
 
 /**
@@ -54,15 +57,7 @@ module.exports = class LintTemplate extends require('../../plugin') {
     await this.#addEslintPluginConfig()
 
     // Generate VS Code extension settings
-    const ALLOWED_FILE_EXTENSIONS = ['*.cds', '*.csn', '*.csv']
-    const extensions = new Set(ALLOWED_FILE_EXTENSIONS.map((ext) => path.extname(ext).replace('.', '')))
-    for (const ext of extensions) {
-      if (ext in VSCODE_FILE_ASSOCIATIONS) {
-        for (const assoc of VSCODE_FILE_ASSOCIATIONS[ext]) {
-          extensions.add(assoc)
-        }
-      }
-    }
+    const extensions = new Set(Object.values(ESLINT_LANGS_FOR_FILE_TYPE).flat())
     await io.sanitizeVscodeSettings(
       path.join(cds.root, '.vscode/settings.json'),
       Array.from(extensions),

package/lib/init/template/nodejs/files/.vscode/settings.json

@@ -1,8 +1,8 @@
 {
   // uncomment entries once all libraries have been installed via 'npm install'
   "eslint.validate": [
-    // "cds",
-    // "csn",
+    // "javascript",
+    // "typescript",
     // "csv",
     // "csv (semicolon)",
     // "tab",

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

@@ -15,7 +15,7 @@ module.exports = class NotificationsTemplate extends require('../../plugin') {
   }
 
   static hasInProduction(env) {
-    return !!env.requires?.notifications
+    return !!env.requires?.notifications || readProject().dependencies?.['@cap-js/notifications']
   }
 
   async canRun() {

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

@@ -18,7 +18,7 @@ module.exports = class PostgresTemplate extends require('../../plugin') {
   }
 
   static hasInProduction(env) {
-    return env.requires?.db?.kind === 'postgres'
+    return env.requires?.db?.kind === 'postgres' || readProject().dependencies?.['@cap-js/postgres']
   }
 
   async run() {

package/lib/init/template/workzone-standard/index.js

@@ -46,7 +46,7 @@ module.exports = class extends require('../../plugin') {
       project.uiApp = p
       const manifestPath = join(appPath, p, 'webapp/manifest.json')
       const manifest = exists(manifestPath) ? await read(manifestPath) : {}
-      if (!manifest['sap.app'].crossNavigation.inbounds) {
+      if (!manifest['sap.app']?.crossNavigation?.inbounds) {
         return merge(__dirname, 'files/manifest.json.hbs').into(join(appPath, p, 'webapp/manifest.json'), { project })
       } else {
         return merge({ 'sap.cloud': {

package/lib/util/cf.js

@@ -223,7 +223,7 @@ module.exports = new class CfUtil {
     async env(app) {
         const { spaceGuid: space_guids, orgGuid: organization_guids } = await this.target();
         const apps = await this.curl('/v3/apps', { space_guids, organization_guids, names: app });
-        if (apps.resources.length < 1) throw `Cannot find app with name '${app}'`
+        if (apps.resources.length < 1) throw `cannot find app with name '${app}'`
         const guid = apps.resources[0].guid;
         return await this.curl('/v3/apps/' + guid + '/env', { space_guids, organization_guids, names: app });
     }
@@ -257,15 +257,15 @@ module.exports = new class CfUtil {
                     if (!LOG._debug && serviceInstance?.last_operation?.description) {
                         throw serviceInstance.last_operation.description;
                     }
-                    throw `The returned service reported state '${OPERATION_STATE_FAILED}'.\n${JSON.stringify(serviceInstance, null, 4)}`;
+                    throw `the returned service reported state '${OPERATION_STATE_FAILED}'.\n${JSON.stringify(serviceInstance, null, 4)}`;
 
                 default:
-                    console.error(`Unsupported server response state '${serviceInstance?.last_operation?.state}'. Waiting for next response.`);
+                    console.error(`unsupported server response state '${serviceInstance?.last_operation?.state}' – waiting for next response`);
                     break;
             }
         }
 
-        throw `Timeout occurred while getting service ${bold(serviceName)}`;
+        throw `timeout occurred while getting service ${bold(serviceName)}`;
     }
 
     async getOrCreateService(serviceOfferingName, planName, serviceName, options) {
@@ -275,7 +275,7 @@ module.exports = new class CfUtil {
             return probeService;
         }
 
-        console.log(`Creating service ${bold(serviceName)} - please be patient...`);
+        console.log(`creating service ${bold(serviceName)} - please be patient...`);
 
         const target = await this.target();
 
@@ -287,7 +287,7 @@ module.exports = new class CfUtil {
         });
 
         if (!servicePlan?.resources?.length) {
-            throw `No service plans found for ${planName} in service offering ${serviceOfferingName}.`;
+            throw `no service plans found for ${planName} in service offering ${serviceOfferingName}`;
         }
 
         const body = {
@@ -353,7 +353,7 @@ module.exports = new class CfUtil {
                     throw `The returned binding reported state '${OPERATION_STATE_FAILED}'.\n${JSON.stringify(binding, null, 4)}`;
 
                 default:
-                    console.error(`Unsupported server response state '${binding?.last_operation?.state}'. Waiting for next response.`);
+                    console.error(`unsupported server response state '${binding?.last_operation?.state}'. Waiting for next response.`);
                     break;
             }
         }

package/npm-shrinkwrap.json

@@ -1,12 +1,12 @@
 {
   "name": "@sap/cds-dk",
-  "version": "9.2.0",
+  "version": "9.2.1",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@sap/cds-dk",
-      "version": "9.2.0",
+      "version": "9.2.1",
       "license": "SEE LICENSE IN LICENSE",
       "dependencies": {
         "@cap-js/asyncapi": "^1.0.0",
@@ -78,8 +78,8 @@
       }
     },
     "node_modules/@eslint/js": {
-      "version": "9.32.0",
-      "integrity": "sha512-BBpRFZK3eX6uMLKz8WxFOBIFFcGFJ/g8XuwjTHCqHROSIsopI+ddn/d5Cfh36+7+e5edVS8dbSHnBNhrLEX0zg==",
+      "version": "9.33.0",
+      "integrity": "sha512-5K1/mKhWaMfreBGJTwval43JJmkip0RmM+3+IuqupeSKNC/Th2Kc7ucaq5ovTSra/OOKB9c58CGSz3QMVbWt0A==",
       "license": "MIT",
       "peer": true,
       "engines": {
@@ -90,8 +90,8 @@
       }
     },
     "node_modules/@sap/cds": {
-      "version": "9.2.0",
-      "integrity": "sha512-u/R+Bzz8RsiL4JINwwmbPFmSD8Y10PGpXetGHYvUyefUG/V/S8OBAWy/elu4FmTr1X8J4+kuynCgoETaWRveKw==",
+      "version": "9.2.1",
+      "integrity": "sha512-0zjjZGlBvcJMyVj48hTs6Q22/w9hNnJR6O88rGoEj4R87uaP4uM5gFLf3PDnPDUwkAeveVHgJRnWPqDGqIMgvA==",
       "license": "SEE LICENSE IN LICENSE",
       "dependencies": {
         "@sap/cds-compiler": "^6",
@@ -789,8 +789,8 @@
       "license": "MIT"
     },
     "node_modules/follow-redirects": {
-      "version": "1.15.10",
-      "integrity": "sha512-V7O/fFKM539IC2bweloFWuoiJ9OtI3W2uIqJPWM8IT5xxNyt73QtvVqmSpcDmk07ivmmlKB+rRY0vpQjIYNtKw==",
+      "version": "1.15.11",
+      "integrity": "sha512-deG2P0JfjrTxl50XGCDyfI97ZGVCxIpfKYmfyrQ54n5FO/0gfIES8C/Psl6kWVDolizcaaxZJnTS0QSMxvnsBQ==",
       "funding": [
         {
           "type": "individual",
@@ -1833,8 +1833,8 @@
       }
     },
     "node_modules/yaml": {
-      "version": "2.8.0",
-      "integrity": "sha512-4lLa/EcQCB0cJkyts+FpIRx5G/llPxfP6VQU5KByHEhLxY3IJCH0f0Hy1MHI8sClTvsIb8qwRJ6R/ZdlDJ/leQ==",
+      "version": "2.8.1",
+      "integrity": "sha512-lcYcMxX2PO9XMGvAJkJ3OsNMw+/7FKes7/hgerGUYWIoWu5j/+YQqcZr5JnPZWzOsEBgMbSbiSTn/dv/69Mkpw==",
       "license": "ISC",
       "bin": {
         "yaml": "bin.mjs"

package/package.json

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