@sap/cds-dk 10.0.6 → 10.1.0

package/node_modules/@sap/cds-mtxs/srv/extensibility-service.js

@@ -2,9 +2,9 @@ const express = require('express')
 const cds = require('@sap/cds/lib')
 const { SELECT, DELETE } = cds.ql
 const { fs, path, tar, rimraf, read, readdir, mkdirp, write } = cds.utils
-const { token: authToken } = require('../lib/utils')
+const { token: authToken, authUrl } = require('../lib/utils')
+const main = require('./config')
 const linter = require('./extensibility/linter')
-const { getMigratedProjects } = require('../lib/migration/migration')
 
 
 const BUILT_IN_NAMESPACES = ['cds.core', 'cds.outbox', 'cds.xt'] // REVISIT: move to a more central place to be consumed also by linter
@@ -20,12 +20,14 @@ const ACTIVE = 2, DRAFT = 1, INACTIVE = 0
 //const packageJson = require(main.root + '/package.json');
 const APPID = require('../lib/utils').getAppId()
 
+const conf = () => ({ ...main.env.requires.extensibility, ...cds.env.requires['cds.xt.ExtensibilityService'] })
+
 const _async = () => {
   return cds.context.http?.req?.headers?.prefer === 'respond-async'
 }
 
 const _includeExt = () => {
-  return (cds.env.requires['cds.xt.ExtensibilityService']?.['check-existing-extensions'] !== false)
+  return conf()['check-existing-extensions'] !== false
 }
 class DbAdapter {
 
@@ -64,7 +66,7 @@ class DbAdapter {
       }
     }
 
-    if (ext.csvs && Object.keys(ext.csvs).length > 0 && cds.env.requires['cds.xt.ExtensibilityService']?.activate?.['skip-csv']) throw Error('CSV deployment is disabled')
+    if (ext.csvs && Object.keys(ext.csvs).length > 0 && conf().activate?.['skip-csv']) throw Error('CSV deployment is disabled')
 
     // insert extension
     const tenant = ext.tenant
@@ -74,14 +76,9 @@ class DbAdapter {
     const tag = ext.ID
     await cds.tx({ tenant, user: new cds.User.Privileged() }, async tx => {
       // remove current inactive extension with tag
-      // use native table names to avoid issues with missing appid
-      if (tag) await tx.run(DELETE.from('cds_xt_Extensions').where({ tag, activated: { '!=': this.activated(ACTIVE) } }))
-      try {
-        await tx.run(INSERT.into('cds_xt_Extensions').entries({ ID, csn, i18n, sources: ext.archive ?? null, activated: this.activated(ext.status), tag, appid: ext.appid ?? APPID, timestamp: new Date().toISOString() }))
-      } catch (error) {
-        DEBUG?.('Trying legacy request without appid', error)
-        await tx.run(INSERT.into('cds_xt_Extensions').entries({ ID, csn, i18n, sources: ext.archive ?? null, activated: this.activated(ext.status), tag, timestamp: new Date().toISOString() }))
-      }
+      if (tag) await tx.run(DELETE.from('cds.xt.Extensions').where({ tag, activated: { '!=': this.activated(ACTIVE) } }))
+      // will break with missing appid
+        await tx.run(INSERT.into('cds.xt.Extensions').entries({ ID, csn, i18n, sources: ext.archive ?? null, activated: this.activated(ext.status), tag, appid: ext.appid ?? APPID, timestamp: new Date().toISOString() }))
     })
     return ID
   }
@@ -213,7 +210,7 @@ module.exports = class ExtensibilityService extends cds.ApplicationService {
       if (async) { // 202 is set by the job service
         return
       }
-      const res = await _fetchExtensions(req.data.ID)
+      const res = await _fetchExtensions(req.data.ID, status)
       req.results = { ID: res?.tag, csn: res?.csn, i18n: res?.i18n !== '{}' ? res?.i18n : undefined, timestamp: res?.timestamp, appid: res?.appid, status: DbAdapter.status(res?.activated) } // REVISIT: return csvs?
     })
 
@@ -379,9 +376,9 @@ module.exports = class ExtensibilityService extends cds.ApplicationService {
       }
     })
 
-    async function _fetchExtensions(ID) {
+    async function _fetchExtensions(ID, status) {
       try {
-        return !ID ? await SELECT.from('cds.xt.Extensions') : await SELECT.one.from('cds.xt.Extensions').where({ tag: ID })
+        return !ID ? await SELECT.from('cds.xt.Extensions') : await SELECT.one.from('cds.xt.Extensions').where(status != undefined ? { tag: ID, activated: DbAdapter.activated(status) } : { tag: ID })
       } catch (error) {
         DEBUG?.('Trying legacy request without appid', error)
         const fields = ['ID', 'csn', 'tag', 'activated', 'timestamp', 'i18n']
@@ -401,25 +398,22 @@ module.exports = class ExtensibilityService extends cds.ApplicationService {
 
     })
 
-    this.on('getMigratedProjects', req => {
-      const { tagRule, defaultTag } = req.data
-      const tenant = req.tenant // REVISIT: check if access for arbitrary tenants needed
-      if (!tenant)  req.reject(401, 'User not assigned to any tenant')
-      return getMigratedProjects(req, tagRule || undefined, defaultTag || undefined, tenant)
-    })
-
     cds.on('served', () => {
-      cds.app?.post('/-/cds/login/token', express.urlencoded({ extended: false }), async (req, res) => {
+      cds.app?.post('/-/cds/login/grant', express.urlencoded({ extended: false }), async (req, res) => {
         try {
-          if (req.method === 'HEAD') return res.status(204).send()
-
           const cred = cds.env.requires.auth.credentials || {}
           if (!cred.clientid) throw cds.error('missing authentication service binding', { status: 500 })
 
-          const query = req.method === 'POST' ? (req.body || {}) : (req.query || {})
+          const query = req.body || {}
+
+          // Endpoint accepts only passcode and refresh_token grant requests.
+          const refresh_token = typeof query.refresh_token === 'string' ? query.refresh_token : undefined
+          const passcode = typeof query.passcode === 'string' ? query.passcode : undefined
+          if (!refresh_token && !passcode)
+            throw cds.error('missing passcode or refresh_token', { status: 400 })
 
-          const form = query.refresh_token ? { grant_type: 'refresh_token', refresh_token: query.refresh_token } :
-                       query.passcode      ? { grant_type: 'password', passcode: query.passcode } : {}
+          const form = refresh_token ? { grant_type: 'refresh_token', refresh_token } :
+                                       { grant_type: 'password', passcode }
           form.scope = `${cred.xsappname}.cds.ExtensionDeveloper`
           const raw = await authToken(cred, { form, subdomain: query.subdomain })
           const data = JSON.parse(raw)
@@ -434,7 +428,11 @@ module.exports = class ExtensibilityService extends cds.ApplicationService {
         }
       })
 
-      cds.app?.get('/-/cds/login/authorization-metadata', authMeta)
+      cds.app?.get('/-/cds/login/grant-metadata', authMeta)
+
+      const redirectTo = to => (req, res) => res.redirect(308, to + req.url.slice(req.path.length))
+      cds.app?.post('/-/cds/login/token', redirectTo('/-/cds/login/grant'))
+      cds.app?.get('/-/cds/login/authorization-metadata', redirectTo('/-/cds/login/grant-metadata'))
     })
 
     const _tenant = function (req) {
@@ -483,7 +481,7 @@ module.exports = class ExtensibilityService extends cds.ApplicationService {
         else await UPDATE('cds.xt.Extensions', { tag, ID: extEntry.ID }).with({ activated: DbAdapter.activated(status) }) // update status
 
         // really activate extension
-        if (status === ACTIVE && !(cds.env.requires['cds.xt.ExtensibilityService']?.activate?.['skip-db'] === true)) {
+        if (status === ACTIVE && !(conf().activate?.['skip-db'] === true)) {
           const { 'cds.xt.DeploymentService': ds } = cds.services
           if (!ds) {
             LOG.info('database activation skipped for extension', tag, '- no deployment service')
@@ -503,15 +501,16 @@ module.exports = class ExtensibilityService extends cds.ApplicationService {
 }
 
 function _passcodeUrl(c, sub) {
-  const u = new URL(c.url)
-  if (sub) u.hostname = u.hostname.replace(/^[^.]+/, sub)
-  u.pathname = '/passcode'
-  return u.toString()
+  return authUrl(c.url, sub, '/passcode').toString()
 }
 
 function authMeta(req, res) {
   const cred = cds.env.requires?.auth?.credentials || {}
-  res.send({ passcode_url: _passcodeUrl(cred, req.query?.subdomain) })
+  try {
+    res.send({ passcode_url: _passcodeUrl(cred, req.query?.subdomain) })
+  } catch (err) {
+    res.status(err.status || err.statusCode || 500).json({ error: err.message })
+  }
 }
 
 const _getCompilerError = messages => {

package/node_modules/@sap/cds-mtxs/srv/jobs-service.js

@@ -7,14 +7,6 @@ const Jobs = 'cds.xt.Jobs', Tasks = 'cds.xt.Tasks'
 
 const { t0_ } = require('../lib/utils')
 
-const {
-  queueSize = 100, clusterSize = 3, workerSize = 4, poolSize = 1
-} = {
-  ...(cds.env.requires.multitenancy?.jobs ?? {}),
-  ...(cds.env.requires['cds.xt.SaasProvisioningService']?.jobs ?? {}),
-  ...(cds.env.requires['cds.xt.SmsProvisioningService']?.jobs ?? {})
-}
-
 const RUNNING = 'RUNNING', FINISHED = 'FINISHED', FAILED = 'FAILED', QUEUED = 'QUEUED', TIMEOUT = 'TIMEOUT'
 
 // A queue, implemented as a circular buffer for O(1) insert + delete
@@ -41,12 +33,15 @@ class Queue {
     return value
   }
 }
-const jobQueue = new Queue(queueSize)
-let runningJobs = new Map()
 
 module.exports = class JobsService extends cds.ApplicationService {
 
   async init() {
+
+    this._conf = this._config()
+    this.jobQueue = new Queue(this._conf.queueSize)
+    this.runningJobs = new Map()
+
     if (cds.requires.multitenancy?.diagnostics) _diagnostics4(this)
     cds.on('listening', () => _scheduled(this))
 
@@ -57,16 +52,16 @@ module.exports = class JobsService extends cds.ApplicationService {
       return jobs.map(job => ({ ...job, tasks: job.tasks.sort((a, b) => a.tenant.localeCompare(b.tenant))}))
     })
     this.on('config', () => {
-      const conf = main.requires.extensibility, es = main.requires['cds.xt.ExtensibilityService']
+      const conf = main.requires['cds.xt.ExtensibilityService'], ext = main.requires.extensibility
       const allowlist = 'extension-allowlist', blocklist = 'namespace-blocklist'
       return {
         pool: main.requires.db.pool,
         poolMtx: cds.requires.db.pool,
         jobs: cds.requires.multitenancy.jobs,
         extensibility: {
-          tenantCheckInterval: conf?.tenantCheckInterval,
-          [allowlist]: conf?.[allowlist] ?? es?.[allowlist],
-          [blocklist]: conf?.[blocklist] ?? es?.[blocklist]
+          tenantCheckInterval: conf?.tenantCheckInterval ?? ext?.tenantCheckInterval,
+          [allowlist]: conf?.[allowlist] ?? ext?.[allowlist],
+          [blocklist]: conf?.[blocklist] ?? ext?.[blocklist]
         }
       }
     })
@@ -74,6 +69,17 @@ module.exports = class JobsService extends cds.ApplicationService {
     return super.init()
   }
 
+  _config() {
+    const {
+      queueSize = 100, clusterSize = 3, workerSize = 4, poolSize = 1
+    } = {
+      ...(cds.env.requires.multitenancy?.jobs ?? {}),
+      ...(cds.env.requires['cds.xt.SaasProvisioningService']?.jobs ?? {}),
+      ...(cds.env.requires['cds.xt.SmsProvisioningService']?.jobs ?? {})
+    }
+    return { queueSize, clusterSize, workerSize, poolSize }
+  }
+
   async enqueue(service, op, clusters, args, onJobDone) {
     const _inspect = obj => obj && Object.values(obj).filter(Boolean).length > 0 ? inspect(obj, { depth: 5, colors: cds.utils.colors.enabled }) : []
     const inspected = Object.entries(args).reduce((acc, [k, v]) => {
@@ -112,9 +118,9 @@ module.exports = class JobsService extends cds.ApplicationService {
     if (tasks.length) {
       if (cds.services[service]) {
         const fn = task => cds.services[service].tx({ tenant: task.tenant }, tx => tx[op](task.tenant, ...Object.values(args)))
-        jobQueue.enqueue({ job_ID, clusters: clustered, fn, onJobDone })
+        this.jobQueue.enqueue({ job_ID, clusters: clustered, fn, onJobDone })
       } else {
-        jobQueue.enqueue({ job_ID, clusters: clustered, fn: () => {
+        this.jobQueue.enqueue({ job_ID, clusters: clustered, fn: () => {
           LOG.warn('service', service, 'is not available, skipping job')
         }, onJobDone })
       }
@@ -186,16 +192,16 @@ module.exports = class JobsService extends cds.ApplicationService {
   }
 
   async pickJob() {
-    if (jobQueue.size === 0) return
+    if (this.jobQueue.size === 0) return
 
-    const next = new Set(jobQueue.peek().clusters.flat().map(t => t.tenant).flat())
-    const running = [...runningJobs.values()].flatMap(j => j.clusters.flat().map(t => t.tenant))
+    const next = new Set(this.jobQueue.peek().clusters.flat().map(t => t.tenant).flat())
+    const running = [...this.runningJobs.values()].flatMap(j => j.clusters.flat().map(t => t.tenant))
     if (running.some(t => next.has(t))) return
 
-    const job = jobQueue.dequeue()
+    const job = this.jobQueue.dequeue()
     const { job_ID, clusters, fn, onJobDone } = job
     try {
-      runningJobs.set(job_ID, job)
+      this.runningJobs.set(job_ID, job)
       await t0_(async () => {
         await UPDATE(Jobs, { ID: job_ID }).with({ status: RUNNING })
         await this.emit('jobUpdate', { job: { ID: job_ID, status: RUNNING }})
@@ -207,16 +213,16 @@ module.exports = class JobsService extends cds.ApplicationService {
         await this.emit('jobUpdate', { job: { ID: job_ID, status: FAILED, error: _errorMessage(e) }})
       })
     } finally {
-      runningJobs.delete(job_ID)
+      this.runningJobs.delete(job_ID)
     }
     setImmediate(() => this.pickJob())
   }
 
   async _nextJob(clusters, fn, onJobDone) {
     if (clusters.length > 1) {
-      await this.limiter(clusterSize, clusters, cluster => this.limiter(workerSize ?? poolSize, Array.from(cluster), fn, true))
+      await this.limiter(this._conf.clusterSize, clusters, cluster => this.limiter(this._conf.workerSize ?? this._conf.poolSize, Array.from(cluster), fn, true))
     } else {
-      await this.limiter(workerSize ?? poolSize, Array.from(clusters[0]), fn, true)
+      await this.limiter(this._conf.workerSize ?? this._conf.poolSize, Array.from(clusters[0]), fn, true)
     }
 
     const { job_ID } = clusters[0][0] // all tasks have the same job ID -> just take the first

package/node_modules/@sap/cds-mtxs/srv/model-provider.js

@@ -208,8 +208,14 @@ module.exports = class ModelProviderService extends cds.ApplicationService {
       if (extensions) {
         const key = crypto.createHash('sha256').update(JSON.stringify({ extensions, models, javaornode })).digest('hex')
         csn = lru4(extensionCache, key, () => {
-          const result = cds.extend(csn).with(extensions)
-          return _delayMinify ? cds.minify(result) : result
+          try {
+            const result = cds.extend(csn).with(extensions)
+            return _delayMinify ? cds.minify(result) : result
+          } catch (e) {
+            if (!activated || e.code !== 'ERR_CDS_COMPILATION_FAILURE') throw e
+            const message = _getCompilerError(e.messages)
+            throw cds.error(`Extensions of tenant '${tenant}' are incompatible with the base model: ${message}`, { code: 'ERR_CDS_COMPILATION_FAILURE', status: 422, tenant, messages: e.messages })
+          }
         })
       }
 
@@ -334,7 +340,7 @@ module.exports = class ModelProviderService extends cds.ApplicationService {
     async function _getETag(tenant, activated = true) {
       if (!main.requires.extensibility || main.requires.multitenancy && !tenant) return BASE_MODEL_ETAG
       try {
-        const query = SELECT('max(timestamp) as TS').from('cds_xt_Extensions')
+        const query = SELECT('max(timestamp) as TS').from('cds.xt.Extensions')
         if (activated) query.where('activated=', 'database')
         const exts = await cds.db.run(query)
         if (!exts.length || !exts[0].TS) return BASE_MODEL_ETAG
@@ -377,7 +383,7 @@ module.exports = class ModelProviderService extends cds.ApplicationService {
     }
 
     async function getExtCsvs(req) {
-      if (cds.env.requires['cds.xt.ExtensibilityService']?.activate?.['skip-csv']) return {}
+      if (cds.env.requires['cds.xt.ExtensibilityService']?.activate?.['skip-csv'] ?? main.env.requires.extensibility?.activate?.['skip-csv']) return {}
 
       const tenant = req.data.tenant || req.tenant
       if (tenant) cds.context = { tenant }
@@ -410,3 +416,12 @@ module.exports = class ModelProviderService extends cds.ApplicationService {
 }
 
 module.exports.prototype._add_stub_methods = true
+
+const _getCompilerError = messages => {
+  const defaultMsg = 'Error while compiling extension'
+  if (!messages) return defaultMsg
+  for (const msg of messages) {
+    if (msg.severity === 'Error') return msg.message
+  }
+  return defaultMsg
+}

package/node_modules/@sap/cds-mtxs/srv/plugins/hana/ctnr-mgr-base.js

@@ -48,7 +48,7 @@ class AbstractContainerManagerClient {
     if (this.cachedToken && this.cachedToken.expiry >= Date.now() + 30_000) {
       return `Bearer ${this.cachedToken.access_token}`
     }
-    const raw = await token(this)
+    const raw = await token(this, { form: { grant_type: 'client_credentials' } })
     const { access_token, expires_in } = JSON.parse(raw)
     this.cachedToken = { access_token, expiry: Date.now() + expires_in * 1000 }
     return `Bearer ${access_token}`
@@ -68,7 +68,7 @@ class AbstractContainerManagerClient {
     conf.baseURL ??= url.startsWith('http') ? '' : this.sm_url + '/v1/'
 
     const { retries, maxRetryAfter } = cds.requires?.multitenancy?.serviceManager ?? cds.requires?.multitenancy?.containerManager ?? {}
-    return fetchResiliently(conf.baseURL + url, conf, { retries: retries ?? 10, maxRetryAfter: maxRetryAfter ?? 5000, retryUntil, failures })
+    return fetchResiliently(conf.baseURL + url, conf, { retriesLeft: retries ?? 10, maxRetryAfter: maxRetryAfter ?? 5000, retryUntil, failures })
   }
 
   _poll = async (location, conf = {}) => {
@@ -89,9 +89,12 @@ class AbstractContainerManagerClient {
     return new Promise(_next)
   }
 
+  // base implementation used by srv-mgr
   _succeeded = (response) => response.data?.state === 'succeeded'
   _failed = (response) => response.data?.state === 'failed'
-  _pollError = (response) => response.data.errors[0] ?? response.data.errors
+  _pollError = (response) =>
+    response.data?.errors?.[0] ?? response.data.errors
+    ?? { error: 'Unknown Error', description: `Polling failed with state ${response.data?.state ?? 'unknown'}. Last operation ${response.data?.id}` }
 
   static _errorMessage = (e, action, tenant) => {
     const msg = `Error ${action} tenant ${tenant}: ${e.response?.data?.error ?? e.code ?? e.message ?? 'unknown error'}`

package/node_modules/@sap/cds-mtxs/srv/plugins/hana/hdi.js

@@ -13,7 +13,7 @@ exports._logDirectory = async () => {
     await mkdirp(defaultDir)
     return defaultDir
   } catch (e) {
-    if (e.code !== 'EACCES') throw e
+    if (e.code !== 'EACCES' && e.code !== 'EROFS' && e.code !== 'ENOENT') throw e
     LOG?.(`using temporary directory ${TEMP_DIR} for deployment logs`)
     return join(TEMP_DIR, 'logs')
   }
@@ -86,9 +86,10 @@ exports.deploy = async (hana, tenant, cwd, options, deployEnv) => {
  */
 exports._hdi_env4 = async (t,container,options,deployEnv)=>{
 
+  let vcapFromFile
   if (process.env.VCAP_SERVICES_FILE_PATH) {
     try {
-      process.env.VCAP_SERVICES = await fs.read(process.env.VCAP_SERVICES_FILE_PATH, 'utf-8')
+      vcapFromFile = await fs.read(process.env.VCAP_SERVICES_FILE_PATH, 'utf-8')
     } catch (e) {
       LOG.warn(`Could not read or parse VCAP_SERVICES_FILE_PATH at ${process.env.VCAP_SERVICES_FILE_PATH}: ${e.message}`)
     }
@@ -104,7 +105,8 @@ exports._hdi_env4 = async (t,container,options,deployEnv)=>{
     ...deployEnv // Although VCAP is in here, it will be overwritten
   }
 
-  const { hana=[], 'user-provided':up=[] } = _parse_env (process.env, 'VCAP_SERVICES')
+  const vcapEnv = vcapFromFile ? { VCAP_SERVICES: vcapFromFile } : process.env
+  const { hana=[], 'user-provided':up=[] } = _parse_env (vcapEnv, 'VCAP_SERVICES')
   const { hana: customEnvHana=[], 'user-provided':customEnvUp=[] } = _parse_env(deployEnv ?? {}, 'VCAP_SERVICES')
 
   const vcapFromEnv = {

package/node_modules/@sap/cds-mtxs/srv/plugins/hana/srv-mgr.js

@@ -126,6 +126,7 @@ class ServiceManagerClient extends AbstractContainerManagerClient {
 
   get = async (tenant, options = {}) => {
     const { invalidCredentials, retryUntil } = options
+    if (invalidCredentials && cacheBindings) delete this._bindingsCache[tenant]
     try {
       const previousFailures = this.failures.has(tenant) ? this.failures.get(tenant).count : 0
       const [binding] = await this._bindings4([tenant], { ...options, tenant, failures: previousFailures, retryUntil })
@@ -292,9 +293,9 @@ class ServiceManagerClient extends AbstractContainerManagerClient {
       }
       fetched.push(...directMatches)
     }
-    const cacheMisses = Object.fromEntries(fetched.filter(b => b.labels?.tenant_id).map(b => [b.labels.tenant_id[0], b]))
-    Object.assign(this._bindingsCache, cacheMisses)
     if (useCache) {
+      const cacheMisses = Object.fromEntries(fetched.filter(b => b.labels?.tenant_id).map(b => [b.labels.tenant_id[0], b]))
+      Object.assign(this._bindingsCache, cacheMisses)
       return tenants.map(t => this._bindingsCache[t])
     }
     return fetched

package/node_modules/@sap/cds-mtxs/srv/plugins/hana/tms.js

@@ -17,6 +17,23 @@ class TMSClient extends AbstractContainerManagerClient {
     this.tmsHost = credentials.baseurl
 
     this.credentialCache = {}
+
+    // clusterSize > 1 not supported yet for TMS
+    const {
+      clusterSize
+    } = {
+      ...(cds.env.requires.multitenancy?.jobs ?? {}),
+      ...(cds.env.requires['cds.xt.SaasProvisioningService']?.jobs ?? {}),
+      ...(cds.env.requires['cds.xt.SmsProvisioningService']?.jobs ?? {})
+    }
+
+    if (clusterSize && clusterSize > 1) {
+      LOG.warn(`Cluster size of ${clusterSize} is not supported for TMS. Defaulting to 1.`)
+    }
+
+    cds.utils.merge(cds.env.requires, { multitenancy: { jobs: { clusterSize: 1 } } })
+    cds.utils.merge(cds.env.requires, { 'cds.xt.SaasProvisioningService': { jobs: { clusterSize: 1 } } })
+    cds.utils.merge(cds.env.requires, { 'cds.xt.SmsProvisioningService': { jobs: { clusterSize: 1 } } })
   }
 
   static defaultInstance() {

package/node_modules/@sap/cds-mtxs/srv/plugins/hana.js

@@ -15,8 +15,6 @@ const resources = new Map()
 
 const { deepMerge } = require('../../lib/utils')
 
-const migration = require('../../lib/migration/migration')
-
 if (db?.kind === 'hana') {
   if (!db.credentials?.sm_url && !db.credentials?.baseurl) cds.error('No Service Manager credentials found. Make sure the application is bound to a BTP Service Manager instance.')
 
@@ -89,20 +87,24 @@ if (db?.kind === 'hana') {
       })
       ds.on ('tenantsByDb', async req => {
         const tenantsInT0 = await ds.getTenants()
-        const mtxTenants = await migration.getMissingMtxTenants(tenantsInT0)
-        const tenants = req.data.tenants ?? [...tenantsInT0, ...mtxTenants]
+        const tenants = req.data.tenants ?? [...tenantsInT0]
         const hana = require('./hana/hdi-ctnr-mgr').defaultInstance() // TODO tms more generic handling -> new functions hana.toTenantId + hana.toDbId
         const toTenantId = t => t.tenant_id ?? t.labels.tenant_id[0]
         const smTenants = (await hana.getAll(tenants.length > 0 ? tenants : '*')).filter(Boolean).filter(t => toTenantId(t) !== t0)
+        const byDb = {}
         if (tenants.length !== smTenants.length) {
           const smSet = new Set(smTenants.map(toTenantId))
           const inconsistent = tenants.filter(t => !smSet.has(t))
           if (!inconsistent.length)
             LOG.warn('Tenants', smTenants.map(toTenantId).join(', '), 'are subscribed in Service Manager but not in t0. Make sure to re-subscribe the tenants.')
-          else if (inconsistent.length === 1)
+          else if (inconsistent.length === 1) {
             LOG.warn('Warning: Tenant', inconsistent[0], 'does not exist in Service Manager any more and is therefore ignored. Make sure to unsubscribe the tenant.')
-          else
+            byDb['no-db'] = inconsistent
+          }
+          else {
             LOG.warn('Warning: Tenants', inconsistent.join(', '), 'do not exist in Service Manager any more and are therefore ignored. Make sure to unsubscribe the tenants.')
+            byDb['no-db'] = inconsistent
+          }
         }
         const tenantToDbUrl = smTenants.reduce((res, t) => {
           const id = toTenantId(t)
@@ -110,7 +112,7 @@ if (db?.kind === 'hana') {
           return { ...res, [id]: `${t.credentials.host}:${t.credentials.port}` }
         }
         , {})
-        const byDb = {}
+
         for (const tenant of Object.keys(tenantToDbUrl)) {
           const dbUrl = tenantToDbUrl[tenant]
           if (!byDb[dbUrl]) byDb[dbUrl] = new Set
@@ -129,11 +131,6 @@ if (db?.kind === 'hana') {
         }
         return byDb
       })
-
-      // check migration before upgrade
-      ds.before('upgrade', async (req) => {
-        await migration.checkMigration(req)
-      })
     })
   })
 
@@ -178,7 +175,11 @@ async function resources4(out) {
       throw error
     }
   }
-  if (cache) resources.set(out, _resources4(out).catch(e => { resources.delete(out); throw e }))
+  if (cache) {
+    const p = _resources4(out).catch(e => { resources.delete(out); throw e })
+    resources.set(out, p)
+    return p
+  }
   return _resources4(out)
 }
 module.exports.resources4 = resources4 // required in abstract provisioning service to prepare shared deployment directory
@@ -323,14 +324,10 @@ async function _deploy (req, _container, { skipExt = false, skipResources = fals
     if (cacheBindings) {
       // health-check credentials for DB connection, get uncached if stale
 
-      let driver = 'hdb'
-      const projectPackage = require(cds.root + '/package.json')
-      const dependencies = {
-        ...projectPackage.dependencies,
-        ...(process.env.NODE_ENV !== 'production' && projectPackage.devDependencies),
-      }
-      if (dependencies.hdb) driver = 'hdb'
-      if (dependencies['@sap/hana-client']) driver = '@sap/hana-client'
+      let driver
+      try { require.resolve('hdb'); driver = 'hdb' } catch { /* continue */ }
+      if (!driver) try { require.resolve('@sap/hana-client'); driver = '@sap/hana-client' } catch { /* continue */ }
+      if (!driver) cds.error('No HANA client driver found. Add hdb or @sap/hana-client to your sidecar dependencies.')
 
       const client = require(driver).createClient(container.credentials)
       const connect = promisify(client.connect.bind(client))

package/node_modules/@sap/xsenv/CHANGELOG.md

@@ -5,6 +5,13 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 
 The format is based on [Keep a Changelog](http://keepachangelog.com/).
 
+## 6.2.2 - 2026-08-11
+
+### Updated
+- Updated `filter-node-package` dependency to 6.2.2
+- Updated `mocha` dependency to 11.8.0
+- Updated `diff` dependency to 9
+
 ## 6.2.1 - 2026-05-13
 
 ### Updated

package/node_modules/@sap/xsenv/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sap/xsenv",
-  "version": "6.2.1",
+  "version": "6.2.2",
   "description": "Utility for easy setup and access of SAP HANA XS Advanced environment variables",
   "repository": {},
   "license": "SEE LICENSE IN LICENSE",
@@ -23,13 +23,13 @@
     "prepareRelease": "clean-packages -i"
   },
   "devDependencies": {
-    "@eslint/js": "9.39.4",
+    "@eslint/js": "9.39.5",
     "@eslint/eslintrc": "3.3.5",
-    "@babel/eslint-parser": "7.28.6",
+    "@babel/eslint-parser": "7.29.7",
     "c8": "11.0.0",
-    "filter-node-package": "6.2.0",
+    "filter-node-package": "6.2.2",
     "lodash": "4.18.1",
-    "mocha": "11.7.5",
+    "mocha": "11.8.0",
     "mock-fs": "5.5.0",
     "node-build": "^3.0.0",
     "node-style": "2.0.0",
@@ -43,7 +43,10 @@
   },
   "overrides": {
     "mocha": {
-      "glob": "^13.0.0"
-    }
+      "glob": "^13.0.0",
+      "serialize-javascript": "^7.0.0"
+    },
+    "diff": "^9.0.0",
+    "lodash": "4.18.1"
   }
 }

package/node_modules/body-parser/node_modules/content-type/README.md

@@ -36,6 +36,8 @@ The parser is lenient and does not error. You should validate `type` and `parame
 #### Options
 
 - `parameters` (default: `true`): Set to `false` to skip parameters.
+- `comma` (default: `false`): Set to `true` to stop on a comma. This can be used to parse the media range in an `Accept` header.
+- `start` (default: `0`): Set index to start parsing from.
 
 ### contentType.format(obj)
 

package/node_modules/body-parser/node_modules/content-type/dist/index.d.ts

@@ -8,6 +8,7 @@
  */
 export interface ContentType {
     type: string;
+    index: number;
     parameters: Record<string, string>;
 }
 /**
@@ -18,7 +19,26 @@ export declare function format(obj: Partial<ContentType>): string;
  * Options for parsing a `Content-Type` header.
  */
 export interface ParseOptions {
+    /**
+     * Exit early on the first semicolon, returning only the type.
+     * This is useful for parsing the MIME from `Content-Type` headers.
+     *
+     * @default false
+     */
     parameters?: boolean;
+    /**
+     * Exits early on a comma, returning the first value and parameters.
+     * This is useful for parsing `Accept` headers.
+     *
+     * @default false
+     */
+    comma?: boolean;
+    /**
+     * The index to start parsing from.
+     *
+     * @default 0
+     */
+    start?: number;
 }
 /**
  * Parse a `Content-Type` header.