@sap/cds-dk 10.0.6 → 10.1.0

package/node_modules/@sap/cds-mtxs/bin/cds-mtx-migrate.js

@@ -2,9 +2,32 @@
 /* eslint-disable no-console */
 
 async function run(param, options) {
+    const { dry, genTenantList, syncTenantList, cleanup, directory, tag, tagRule } = options
+    const skipVerification = options['skip-verification'] || options.skipVerification
+
+    function _handleError(message) {
+        console.log(message)
+        process.exit(1)
+    }
+
+    // Check for removed migration options
+    const removedOptions = []
+    if (cleanup) removedOptions.push('--cleanup')
+    if (directory) removedOptions.push('--directory')
+    if (tag) removedOptions.push('--tag')
+    if (tagRule) removedOptions.push('--tagRule')
+    if (skipVerification) removedOptions.push('--skip-verification')
+
+    if (removedOptions.length) {
+        _handleError(`The option(s) ${removedOptions.join(', ')} are no longer supported. The migration from @sap/cds-mtx to @sap/cds-mtxs has been removed.`)
+    }
+
+    if (!genTenantList && !syncTenantList) {
+        _handleError(`The migration from @sap/cds-mtx to @sap/cds-mtxs has been removed. Only --init-tenant-list and --sync-tenant-list are still supported.`)
+    }
+
     const cds = require('@sap/cds')
-    const { migrate,  cleanupMetatenants, syncTenantList: synchronizeTenantList, _hasMtEnv, getDbId } = require('../lib/migration/migration')
-    const { dry, cleanup, genTenantList, syncTenantList } = options
+    const { syncTenantList: synchronizeTenantList, _hasMtEnv } = require('../lib/migration/migration')
 
     async function cds_mtx_migrate(tenants, options) {
         if (!_hasMtEnv()) _handleError(`cds-mtx-migrate operation can only be run inside a multitenant application environment using @sap/cds-mtxs.`)
@@ -26,35 +49,9 @@ async function run(param, options) {
         await cds.serve(services)
         cds.env.requires.multitenancy = cds.env.requires.multitenancy || true // needed for current sidecar config that only enables services
 
-        // get and set database id
-        const deploymentServiceConfig = cds.env.requires['cds.xt.DeploymentService'] || {}
-        if (!deploymentServiceConfig.hdi?.create?.database_id) {
-            const foundDbId = await getDbId()
-            if (foundDbId) {
-                cds.env.requires['cds.xt.DeploymentService'] = {
-                    ...deploymentServiceConfig,
-                    hdi: { ...deploymentServiceConfig.hdi,
-                        create: {
-                            ...deploymentServiceConfig.hdi?.create,
-                            database_id: foundDbId
-                        }
-                    }
-                }
-            }
-        }
-
         await cds.emit('served')
 
-        if (cleanup) {
-            const deletedTenants = await cleanupMetatenants(tenantList, options)
-            for (let t of deletedTenants.connectedTenants) await cds.db.disconnect(t)
-            await cds.db.disconnect()
-
-            deletedTenants.logResult(dry)
-
-            // always fail gracefully
-            // if (deletedTenants.hasError) process.exit(1)
-        } else if (genTenantList) {
+        if (genTenantList) {
             const tenantListResult = await synchronizeTenantList(tenantList, options)
             for (let t of tenantListResult.connectedTenants) await cds.db.disconnect(t)
             await cds.db.disconnect()
@@ -66,22 +63,9 @@ async function run(param, options) {
             await cds.db.disconnect()
 
             tenantListResult.logResult(dry)
-        }else {
-            const migratedTenants = await migrate(tenantList, options)
-            for (let t of migratedTenants.connectedTenants) await cds.db.disconnect(t)
-            await cds.db.disconnect()
-
-            migratedTenants.logResult()
-            // make sure to get result != 0 so that potential followup scripts know of problems
-            if (migratedTenants.hasError) process.exit(1)
         }
     }
 
-    function _handleError(message) {
-        console.log(message)
-        process.exit(1)
-    }
-
     function _splitTenants(tenants) {
         return tenants.split(',')
     }
@@ -100,16 +84,16 @@ if (require.main === module) {
    // TODO use command line parser to get arguments
    // comma separated list of tenants
    const [, , tenants, ...options] = process.argv
-   const directory = getParameterValue(options, '-d')
-   const tag = getParameterValue(options, '--tag')
-   const tagRule = getParameterValue(options, '--tagRule')
    const dry = options.includes('--dry')
-   const cleanup = options.includes('--cleanup')
    const genTenantList = options.includes('--init-tenant-list')
    const syncTenantList = options.includes('--sync-tenant-list')
    const force = options.includes('--force')
+   const cleanup = options.includes('--cleanup')
    const skipVerification = options.includes('--skip-verification')
-   run(tenants, { directory, dry, force, tag, tagRule, "skip-verification": skipVerification, cleanup, genTenantList, syncTenantList }).catch(console.error)
+   const directory = getParameterValue(options, '-d') || getParameterValue(options, '--directory')
+   const tag = getParameterValue(options, '--tag')
+   const tagRule = getParameterValue(options, '--tagRule')
+   run(tenants, { dry, force, genTenantList, syncTenantList, cleanup, directory, tag, tagRule, 'skip-verification': skipVerification }).catch(console.error)
 } else {
-    module.exports.run = run
+     module.exports.run = run
 }

package/node_modules/@sap/cds-mtxs/bin/cds-mtx.js

@@ -1,4 +1,5 @@
 #!/usr/bin/env node
+/* eslint-disable no-console */
 
 const cds = require('@sap/cds')
 const { _import, isfile, local, path } = cds.utils
@@ -9,15 +10,16 @@ const SUPPORTED = ['subscribe', 'unsubscribe', 'upgrade']
 // This function must only be changed in a backward compatible way. It is used by DwC.
 async function cds_mtx(cmd, tenant, body) {
 
-    let connectedTenants = [tenant]
+    const tenants = (Array.isArray(tenant) ? tenant : [tenant]).flatMap(t => t.split(','))
+    const one = tenants.length === 1 ? tenants[0] : undefined
+
+    let connectedTenants = []
 
     try {
         if (!cmd) return _usage()
         if (!SUPPORTED.includes(cmd)) return _usage(`Unknown command ${cmd}.`)
         if (!_hasMtEnv()) return _handleError(`cds-mtx ${cmd} operation can only be run inside a multitenant application environment using @sap/cds-mtxs.`)
-        if (!tenant) return _handleError(`Please provide a tenant: cds-mtx ${cmd} <tenant>`)
-        if (/.*,.*/.test(tenant)) return _handleError(`List of tenants not supported: ${tenant}`)
-        // parse body and handle error
+        if (!tenants.length) return _handleError(`Please provide a tenant: cds-mtx ${cmd} <tenant>`)
         let parsedMetadata
         if (body) {
             try {
@@ -45,18 +47,27 @@ async function cds_mtx(cmd, tenant, body) {
             await cds.connect.to('db')
         }
 
-        if (tenant === '*') {
+        if (tenants.includes('*')) {
             if (cmd !== 'upgrade') return _handleError('"*" only supported for upgrade command')
-            const tenants = await sps.read('tenant')
-            connectedTenants = tenants.map(t => t.subscribedTenantId)
+            if (tenants.length > 1) return _handleError('"*" cannot be combined with other tenants')
+            const all = await sps.read('tenant')
+            connectedTenants = all.map(t => t.subscribedTenantId)
             await sps.tx({ user: new cds.User.Privileged() }, async (tx) => {
-                await tx.upgrade([tenant], parsedMetadata)
+                await tx.upgrade(['*'], parsedMetadata)
             })
             return
-        } else if (tenant === 't0') {
+        } else if (one === 't0') {
             return
         }
-        await ds[cmd](tenant, parsedMetadata, parsedMetadata)
+        connectedTenants = tenants
+
+        if (cmd === 'upgrade') {
+            await sps.tx({ user: new cds.User.Privileged() }, async (tx) => {
+                await tx.upgrade(tenants, parsedMetadata)
+            })
+        } else {
+            for (const t of tenants) await ds[cmd](t, parsedMetadata, parsedMetadata)
+        }
     } catch(e) {
         if (isCli) {
             console.error(e.message)
@@ -108,27 +119,35 @@ async function _usage(message = '') {
 USAGE
 
    cds-mtx <command> <tenant> [--body <json>]
+   cds-mtx <command> <tenant1> [<tenant2> ...] [--body <json>]
+   cds-mtx <command> <t1,t2,...> [--body <json>]
 
 COMMANDS
 
-   subscribe   subscribe a tenant
-   unsubscribe unsubscribe a tenant
-   upgrade     upgrade a tenant
+   subscribe   subscribe one or more tenants
+   unsubscribe unsubscribe one or more tenants
+   upgrade     upgrade one or more tenants
 
 EXAMPLES
 
    cds-mtx subscribe t1
+   cds-mtx subscribe t1 t2 t3
    cds-mtx subscribe t1 --body '{ "_": { "hdi": { "create": { "database_id": "<database id>" } } } }'
    cds-mtx unsubscribe t1
    cds-mtx upgrade t1
+   cds-mtx upgrade t1 t2 t3
+   cds-mtx upgrade t1,t2,t3
    cds-mtx upgrade "*"
 `
     )
 }
 
 if (isCli) {
-    const [, , cmd, tenant, option, json] = process.argv
-    if (option && option !== '--body') _usage(`Invalid option ${option}`)
-    ;(async () => await cds_mtx(cmd, tenant, option ? json : undefined))()
+    const [, , cmd, ...rest] = process.argv
+    const bodyIdx = rest.indexOf('--body')
+    const tenants = bodyIdx === -1 ? rest : rest.slice(0, bodyIdx)
+    const body = bodyIdx !== -1 ? rest[bodyIdx + 1] : undefined
+    if (bodyIdx !== -1 && !body) _usage(`Missing value for --body`)
+    ;(async () => await cds_mtx(cmd, tenants, body))()
 }
 module.exports = { cds_mtx }

package/node_modules/@sap/cds-mtxs/cds-plugin.js

@@ -6,6 +6,9 @@ if (major < 9) throw new Error('@sap/cds-mtxs 3 requires @sap/cds version 9 or h
 const cdscDefaults = Object.fromEntries(
     Object.entries(cds.env.defaults?.cdsc || {}).filter(([key]) => !key.startsWith('[') )
 )
+const sqlDefaults = Object.fromEntries(
+    Object.entries(cds.env.defaults?.sql || {}).filter(([key]) => !key.startsWith('[') )
+)
 
 require('./srv/extensibility/linter').legacyCheck()
 
@@ -28,3 +31,18 @@ if (main.env.cdsc && cds.env.requires['cds.xt.ModelProviderService']?._in_sideca
 } else {
     cds.env.cdsc = main.env.cdsc
 }
+
+if (cds.env.requires['cds.xt.ModelProviderService']?._in_sidecar === true) {
+    if (!(cds.env.requires['cds.xt.ModelProviderService']?.['use-root-sql-config'] === true)) {
+        const stringifiedSql = JSON.stringify(cds.env.sql)
+
+        if (stringifiedSql !== JSON.stringify(main.env.sql) && stringifiedSql !== JSON.stringify(sqlDefaults)) {
+            LOG.warn('inconsistent sql configuration: using cds.sql configuration of mtx sidecar')
+        }
+        // LATER: cds.env.sql = main.env.sql
+    } else {
+        cds.env.sql = main.env.sql
+    }
+} else {
+    cds.env.sql = main.env.sql
+}