@sap/cds-dk 10.0.6 → 10.1.0

package/node_modules/@sap/cds-mtxs/lib/migration/migration.js

@@ -1,12 +1,6 @@
-const path = require('path')
-const mtxAdapter = require('./mtx-adapter')
-const { createProjects } = require('./extension-project')
 const cds = require('@sap/cds')
-const LOG = cds.log('mtx'), DEBUG = cds.debug('mtx')
-const { mkdirp, rimraf, tar, exists, readdir, read, write, isdir, isfile } = cds.utils
-const fs = cds.utils.fs.promises
+const LOG = cds.log('mtx')
 
-const linter = require('../../srv/extensibility/linter')
 const { t0_ } = require('../utils')
 const Tenants = 'cds.xt.Tenants'
 
@@ -14,14 +8,6 @@ const Tenants = 'cds.xt.Tenants'
 module.exports._hasMtEnv = () => cds.requires.multitenancy || (cds.env.requires['cds.xt.DeploymentService'] && cds.env.requires['cds.xt.ModelProviderService'])
 module.exports._hasExtensibilityEnv = () => cds.requires.extensibility || cds.env.requires['cds.xt.ExtensibilityService']
 
-module.exports._getExtensionProjectDirectory = function(dir) {
-    if (dir) {
-        LOG.log('Project directory', dir, 'does not exist.', dir, 'has been created.')
-        return mkdirp(dir)
-    }
-    return mtxAdapter.mkdirTemp()
-}
-
 class MigrationResult {
     constructor() {
         this.connectedTenants = []
@@ -29,9 +15,8 @@ class MigrationResult {
         this.hasError = false
     }
 
-    addTenant(tenant, meta = true) {
+    addTenant(tenant) {
         this.connectedTenants.push(tenant)
-        if (meta) this.connectedTenants.push(mtxAdapter.getMetaTenantName(tenant))
     }
 
     log(tenant, message) {
@@ -59,17 +44,13 @@ function getT0() {
     return cds.env.requires.multitenancy?.t0 ?? 't0'
 }
 
-module.exports.getDbId = async function () {
-    return mtxAdapter.getDbId()
-}
-
 module.exports.syncTenantList = async function syncTenantList(tenants, options, deleteEntries = false) {
     const EXCLUDED_TENANTS = /^MT_LIB_TENANT-.*/
 
     const migrationResult = new MigrationResult()
     const { dry, force } = options
     const t0 = getT0()
-    migrationResult.addTenant(t0, false) // adds tenant for disconnect
+    migrationResult.addTenant(t0) // adds tenant for disconnect
 
     // get all containers + create metadata in t0
     const ds = await cds.connect.to('cds.xt.DeploymentService')
@@ -96,390 +77,4 @@ module.exports.syncTenantList = async function syncTenantList(tenants, options,
     }
     migrationResult.log(t0, `Tenant list created for ${JSON.stringify(tenantContainers)} ${dry ? '(dry run only)' : ''}.`)
     return migrationResult
-}
-
-module.exports.cleanupMetatenants = async function cleanup(tenants, options) {
-    const migrationResult = new MigrationResult()
-    const { dry } = options
-
-    let tenantsToCleanup = tenants
-    // handle tenant "*" -> retrieve all tenants
-    if (tenants.includes('*')) {
-        tenantsToCleanup = await mtxAdapter.getAllTenantIds()
-    }
-
-    const t0 = getT0()
-    migrationResult.addTenant(t0, false) // adds tenant for disconnect
-
-    const metatenantsToCleanup = {}
-    for (const tenant of tenantsToCleanup) {
-        if (tenant === t0) continue
-        const metatenant = mtxAdapter.getMetaTenantName(tenant)
-        metatenantsToCleanup[tenant] = metatenant
-    }
-
-    for (const [tenant, metatenant] of Object.entries(metatenantsToCleanup)) {
-        migrationResult.addTenant(metatenant, false)
-
-        try {
-            // check if tenant was already migrated
-            try {
-                const migrated = tenant !== '__META__' ? await mtxAdapter.isMigrated(tenant) : { timestamp: true }
-                if (!migrated.timestamp) {
-                    migrationResult.error(tenant, `Tenant ${tenant} was not migrated. Skipping cleanup.`, new Error(`Tenant ${tenant} was not migrated`))
-                    continue
-                }
-            } catch (e) {
-                if (e.status === 404) {
-                    migrationResult.log(tenant, `No @sap/cds-mtx meta-tenant found for ${tenant}. Skipping cleanup.`)
-                    continue
-                } else throw e
-            }
-
-            // do the cleanup
-            if (!dry) {
-                const ds = await cds.connect.to('cds.xt.DeploymentService')
-                await ds.unsubscribe(metatenant)
-            }
-            migrationResult.log(metatenant, `Metatenant ${metatenant} successfully deleted.`)
-        } catch (error) {
-            migrationResult.error(metatenant, `Cleanup of tenant ${metatenant} failed.`, error)
-            continue
-        }
-    }
-
-    // only cleanup __META__ if all other meta tenants have been cleaned up successfully
-    if (!dry && tenants.includes('*') && !migrationResult.hasError) {
-        const ds = await cds.connect.to('cds.xt.DeploymentService')
-        const commonMetaTenant = '__META__'
-        await ds.unsubscribe(commonMetaTenant)
-        migrationResult.log(commonMetaTenant, `Common metatenant ${commonMetaTenant} successfully deleted.`)
-    }
-
-    LOG.log('Cleanup done')
-    return migrationResult
-}
-
-module.exports.checkMigration = async function checkMigration(req) {
-    const { tenant } = req.data
-    if (await mtxAdapter.hasExtensions(tenant)) {
-        if (module.exports._hasExtensibilityEnv()) {
-            if (!await mtxAdapter.isMigrated(tenant))
-                req.reject(422, `Upgrade of tenant ${tenant} aborted. Extensions have not been migrated yet`)
-        } else {
-            req.reject(422, `Upgrade of tenant ${tenant} aborted. Old MTX Extensions exist but extensibility is not configured (cds.requires.extensibility is false)`)
-        }
-    }
-}
-
-module.exports.getMissingMtxTenants = async (existingTenants) => {
-    if (await mtxAdapter.wasOldMtx()) {
-        // TODO do this only once
-        // get all mtx tenants
-        const mtxTenants = await mtxAdapter.getAllTenantIds()
-        // add metadata for non-existing entries
-        return await Promise.all(mtxTenants.filter( mtxTenant => !existingTenants.includes(mtxTenant)).map( async mtxTenant => {
-            await module.exports.addMetadata(mtxTenant, {
-                subscribedTenantId: mtxTenant
-            })
-            return mtxTenant
-        }))
-    }
-    return []
-}
-
-module.exports.migrate = async function migrate(tenants, options) {
-
-    const { directory, dry, force, tagRule, tag: defaultTag, "skip-verification": skipVerification} = options
-
-    const migrationResult = new MigrationResult()
-    let tenantsToMigrate = tenants
-
-    // handle tenant "*" -> retrieve all tenants
-    if (tenants.includes('*')) {
-        tenantsToMigrate = await mtxAdapter.getAllTenantIds()
-    }
-
-    const t0 = getT0()
-    migrationResult.addTenant(t0, false) // adds tenant for disconnect
-
-    const extensibility = module.exports._hasExtensibilityEnv()
-    let projectsDir
-
-    for (const tenant of tenantsToMigrate) {
-
-        migrationResult.addTenant(tenant)
-
-        // skip migration of t0
-        if (tenant === t0) {
-            migrationResult.log(tenant, `Skipping internal tenant ${tenant}.`)
-            continue
-        }
-
-        try {
-            // check if tenant was already migrated
-            try {
-                const migrated = await mtxAdapter.isMigrated(tenant)
-                if (migrated?.timestamp && !force) {
-                    migrationResult.log(tenant, `Tenant ${tenant} is already migrated. Skipping migration.`)
-                    continue
-                }
-            } catch (e) {
-                if (e.status === 404) {
-                    migrationResult.log(tenant, `No @sap/cds-mtx meta-tenant found for ${tenant}. Skipping migration.`)
-                    continue
-                } else throw e
-            }
-
-            // Get from old mtx
-            const metadata = await mtxAdapter.getMetadata(tenant)
-
-            if (extensibility) {
-
-                // update tenant metadata + extension tables
-                // add extension tables - TODO could also be done on-the-fly with push
-                const extTables = await cds.load(`${__dirname}/../../db/extensions.cds`)
-                cds.model = cds.db.model = cds.compile.for.nodejs(extTables)
-                if (!dry) {
-                    // disable extension deployment to avoid lengthy redeployments when doing the push()
-                    const ds = await cds.connect.to('cds.xt.DeploymentService')
-                    ds.prepend (srv => srv.on ('extend', () => { }))
-
-                    try {
-                        await cds.tx({ tenant}, tx => tx.run(SELECT.one(1).from('cds.xt.Extensions')))
-                        // add metadata in case it had not been added before
-                        await module.exports.addMetadata(tenant, metadata)
-                    } catch (error) {
-                        LOG.log('cds.xt.Extensions not yet deployed, deploying ...')
-                        DEBUG && DEBUG(error)
-                        await ds.subscribe({ tenant, metadata, options: { csn: extTables } }) // also creates metadata ...
-                    }
-                }
-
-                // run extend -> into memory?
-                const mtxExtension = await mtxAdapter.getExtension(tenant)
-
-                if (mtxExtension) {
-                    // allow different folder from command line to preserve results
-                    projectsDir = projectsDir || await module.exports._getExtensionProjectDirectory(directory)
-                    const tenantProjectFolder = path.join(projectsDir, tenant)
-
-                    const tags = await createProjects(mtxExtension, tenantProjectFolder, tagRule, defaultTag)
-
-                    // upload and verify extensions
-                    // iterate all tags
-                    migrationResult.log(tenant, `Created projects for tags "${tags}"`)
-
-                    // Verify migrated extension
-                    if (!skipVerification) {
-                        try {
-                            // check diff and abort if necessary
-                            const existingCsn = await mtxAdapter.getCsn(tenant)
-
-                            await fs.mkdir(path.join(tenantProjectFolder, 'mtx_original_csn'), { recursive: true })
-                            await fs.writeFile(path.join(tenantProjectFolder, 'mtx_original_csn', 'csn.json'), JSON.stringify(existingCsn, null, 2))
-
-                            await _verifyExtension(migrationResult, tenantProjectFolder, tenant, tags, existingCsn, options)
-                            migrationResult.log(tenant, `Extension verification successful for tenant ${tenant} [${tenantProjectFolder}]`)
-                        } catch (error) {
-                            migrationResult.error(tenant, `Extension verification failed for tenant ${tenant} [${tenantProjectFolder}]), skipping migration.`, error)
-                            continue
-                        }
-                    } else {
-                        migrationResult.log(tenant, `Extension verification skipped for tenant ${tenant}`)
-                    }
-
-                    if (!dry && force) {
-                        // cleanup in case extension ids have changed
-                        if (tenant) cds.context = { tenant }
-                        await DELETE.from('cds.xt.Extensions')
-                    }
-
-                    for (const tag of tags) {
-                        const projectFolder = path.join(tenantProjectFolder, tag)
-
-                        if (!dry) {
-                            try {
-                                const extensionTgz = await fs.readFile(path.join(projectFolder, 'gen', 'extension.tgz'))
-                                const es = await cds.connect.to('cds.xt.ExtensibilityService')
-                                await es.tx({ tenant, user: new cds.User.Privileged }, tx =>
-                                    tx.push(extensionTgz.toString('base64'), tag)
-                                )
-                                migrationResult.log(tenant, `Extension for tenant ${tenant} and tag ${tag} pushed.`)
-                            } catch (error) {
-                                migrationResult.error(tenant, `Error pushing extension for tenant ${tenant} and tag ${tag}`, error)
-                                continue
-                            }
-                        }
-                    }
-                }
-            } else {
-                // check if extensions exist -> abort if yes
-                if (await mtxAdapter.hasExtensions(tenant)) throw new Error(`Extensions exist but extensibility is not configured (cds.requires.extensibilty is false)`)
-
-                if (!dry) {
-                    await module.exports.addMetadata(tenant, metadata)
-                    migrationResult.log(tenant, `Metadata for tenant ${tenant} added.`)
-                }
-            }
-
-            if (!dry) await mtxAdapter.setMigrated(tenant, tagRule, defaultTag, !!force /* ensure it is not undefined so that a record is written */)
-            migrationResult.log(tenant, `Migration of tenant ${tenant} done.`)
-        } catch (error) {
-            migrationResult.error(tenant, `Migration of tenant ${tenant} failed.`, error)
-        }
-    }
-
-    // cleanup tmpdir, keep directory if it was set externally
-    if (!directory && projectsDir) await fs.rm(projectsDir, { recursive: true, force: true })
-
-    LOG.log('Extension migration done')
-    return migrationResult
-}
-
-module.exports.addMetadata = async function addMetadata(tenant, metadata) {
-    try {
-        // can't use UPSERT here so @cds.on.insert still works for createdAt
-        await t0_(INSERT.into('cds.xt.Tenants', { ID: tenant, metadata: JSON.stringify(metadata) }))
-      } catch (e) {
-        if (e.message === 'ENTITY_ALREADY_EXISTS' || e.code === 301 || e.message.match(/unique constraint/i)) {
-          await t0_(UPSERT.into('cds.xt.Tenants', { ID: tenant, metadata: JSON.stringify(metadata) }))
-        } else throw e
-      }
-}
-
-async function _verifyExtension(migrationResult, tenantProjectFolder, tenant, tags, existingCsn, options) {
-
-    const { "ignore-migrations": ignoreMigrations  } = options
-
-    const projectFolders = tags
-
-    const mp = await cds.connect.to('cds.xt.ModelProviderService')
-    const mainCsn = await mp.getCsn({ tenant, flavor: 'inferred', activated: true, base: true, options: { skipMinify: true } })
-
-    if (!mainCsn) throw new Error(`Verification error for tenant ${tenant}: Empty base model`)
-
-    let previewCsn = mainCsn
-
-    // calculate model with extensions to be pushed later
-    for (const projectFolder of projectFolders) {
-        const extensionCsnString = await fs.readFile(path.join(tenantProjectFolder, projectFolder, 'gen', 'ext', 'extension.csn'))
-        const extensionCsn = JSON.parse(extensionCsnString)
-        previewCsn = cds.extend(previewCsn).with(extensionCsn)
-    }
-
-    // ensure flavor
-    const inferredExistingCsn = cds.compile({inferred: existingCsn}, {flavor: 'inferred'})
-
-    const existingHana = cds.compiler.to.hdi.migration(inferredExistingCsn)
-    const newHana = cds.compiler.to.hdi.migration(previewCsn)
-
-    const diffMessages = []
-
-    // are artifacts lost?
-    const hanaDiffNewToOld = cds.compiler.to.hdi.migration(cds.minify(previewCsn), {}, cds.minify(existingHana.afterImage))
-    if (hanaDiffNewToOld.deletions.length) {
-        diffMessages.push(`Migrated model is missing artifacts:\n ${hanaDiffNewToOld.deletions.map( ({ name, suffix }) => `${name}${suffix}\n`)}`)
-    }
-
-     if (hanaDiffNewToOld.migrations.length) {
-        const ignore = ignoreMigrations ?? '^sap.common'
-        const relevantMigrations = hanaDiffNewToOld.migrations.filter( m => !new RegExp(ignore).test(m.name))
-        migrationResult.log(tenant, `Table migrations found but ignored for /${ignore}/`)
-
-        if (relevantMigrations.length) diffMessages.push(`Table migrations found\n` +
-            `${relevantMigrations.map( ({ name, suffix, changeset }) => `  ${name}${suffix}: ${changeset.map(({sql}) => sql)}\n`)}`)
-    }
-
-    // does the new model contain more artifacts?
-    const MTXS_ENTITIES = ['cds.xt.Extensions']
-    const hanaDiffOldToNew = cds.compiler.to.hdi.migration(cds.minify(inferredExistingCsn), {}, cds.minify(newHana.afterImage)) // cds.xt.Extensions is allowed
-    const filteredDeletions = hanaDiffOldToNew.deletions.filter( ({name}) => !MTXS_ENTITIES.includes(name))
-    if (filteredDeletions.length) {
-        diffMessages.push(`Migrated model has additional artifacts:\n ${hanaDiffOldToNew.deletions.map( ({ name, suffix }) => `${name}${suffix}\n`)}`)
-        throw new Error(`Verification error for tenant ${tenant}: migrated model has additional artifacts:\n ${hanaDiffOldToNew.deletions.map( ({ name, suffix }) => `${name}${suffix}\n`)}`)
-    }
-
-    if (diffMessages.length) throw new Error(`Verification error for tenant ${tenant}:\n${diffMessages.join('\n')}`)
-}
-
-module.exports.getMigratedProjects = async (req, tagRule, defaultTag, tenant) => {
-    const temp = await mtxAdapter.mkdirTemp()
-
-    let parameters = { tagRule, defaultTag }
-    if (!(tagRule || defaultTag)) {
-        try {
-            const storedParameters = await mtxAdapter.getMigrationParameters(tenant) ?? {}
-            parameters = { ...parameters, ...storedParameters }
-        } catch (e) {
-            req.reject(404, `No migrated projects found for tenant ${tenant}: ${e.message}`)
-        }
-    }
-
-    // run dry migration with force + own temp directory
-    // { directory, dry, force, tagRule: tagRegex, tag: defaultTag, "skip-verification": skipVerification, "ignore-migrations": ignoreMigrations }
-    await module.exports.migrate([tenant], { directory: temp, dry: true, skipVerification: true, tagRule: parameters.tagRule, tag: parameters.defaultTag, force: true})
-
-    const projectsLocation = path.join(temp, tenant)
-    if (!exists(projectsLocation)) req.reject(404, `No migrated projects found for tenant ${tenant}`)
-
-    // postprocessing: remove cds-based base model, adjust references
-    await module.exports.fixBaseModelReferences(projectsLocation)
-
-    try {
-        return await tar.cz(projectsLocation)
-    } finally {
-        rimraf(temp)
-    }
-}
-
-module.exports.fixBaseModelReferences = async (directory) => {
-
-    await traverse(directory, async (file) => {
-        // remove base cds files
-        if (/.*\/node_modules\/_base\//.test(file)) {
-            await rimraf(file)
-        }
-
-        // remove gen folder
-        if (new RegExp(`${directory}/.*/gen$`).test(file)) {
-            await rimraf(file)
-        }
-
-        // fix using statements
-        if (/.*\.cds$/.test(file) && isfile(file)) {
-            const content = await read(file, 'utf-8')
-            const fixedContent = content.replace(/'_base\/.*'/g, '\'_base\'')
-            await write(file, fixedContent, 'utf-8')
-        }
-    })
-
-    // add index.csn and .cdsrc.json
-    await traverse(directory, async (file) => {
-        if (/.*\/node_modules\/_base$/.test(file)) {
-            await addBaseAndConfig(file)
-        }
-    })
-
-    async function traverse(dir, visitor) {
-        const list = await readdir(dir)
-        for (const entry of list) {
-            const fullPath = path.join(dir, entry)
-            await visitor(fullPath)
-            if (await isdir(fullPath)) {
-                await traverse(fullPath, visitor)
-            }
-        }
-    }
-}
-
-const addBaseAndConfig = async function (directory) {
-    const { 'cds.xt.ModelProviderService': mps } = cds.services
-    const csn = await mps.getCsn({
-      base: true, // without any custom extensions
-      flavor: 'xtended'
-    })
-    await write(path.join(directory, 'index.csn'), cds.compile.to.json(csn))
-    const config = linter.configCopyFrom(cds.env)
-    await write(path.join(directory, '.cdsrc.json'), JSON.stringify(config, null, 2))
 }

package/node_modules/@sap/cds-mtxs/lib/utils.js

@@ -89,13 +89,27 @@ const t0_ = async (query) => retry(async () => {
   return cds.tx({ tenant: t0 }, tx => { tx.model = _t0Csn; return tx.run(query) })
 })
 
+const SUBDOMAIN_RE = /^[a-z0-9](?:[a-z0-9-]{0,61}[a-z0-9])?$/i
+
+function authUrl(baseUrl, subdomain, pathname) {
+  const u = new URL(baseUrl)
+  if (subdomain) {
+    if (typeof subdomain !== 'string' || !SUBDOMAIN_RE.test(subdomain)) {
+      throw cds.error('invalid subdomain', { status: 400 })
+    }
+    const dot = u.hostname.indexOf('.')
+    u.hostname = subdomain + (dot >= 0 ? u.hostname.slice(dot) : '')
+  }
+  u.pathname = pathname
+  return u
+}
+
 async function token(credentials, { query = {}, form = {}, subdomain } = {}) {
   const { clientid, clientsecret, certurl, url, certificate, key } = credentials ?? {}
-  const u = new URL(certurl || url)
-  if (subdomain) u.hostname = u.hostname.replace(/^[^.]+/, subdomain)
-  u.pathname = '/oauth/token'
+  if (!form.grant_type) throw cds.error('grant_type is required', { status: 400 })
+  const u = authUrl(certurl || url, subdomain, '/oauth/token')
   Object.entries(query).forEach(([k, v]) => u.searchParams.append(k, v))
-  const body = new URLSearchParams({ grant_type: 'client_credentials', client_id: clientid, ...form })
+  const body = new URLSearchParams({ client_id: clientid, ...form })
   const headers = { 'Content-Type': 'application/x-www-form-urlencoded', Accept: 'application/json' }
   let raw
   if (certificate) {
@@ -249,6 +263,7 @@ module.exports = {
   readData,
   readDataCsv,
   token,
+  authUrl,
   fetchResiliently,
   getAppId,
   deepMerge

package/node_modules/@sap/cds-mtxs/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sap/cds-mtxs",
-  "version": "3.9.5",
+  "version": "4.0.3",
   "description": "SAP Cloud Application Programming Model - Multitenancy library",
   "homepage": "https://cap.cloud.sap/",
   "keywords": [

package/node_modules/@sap/cds-mtxs/srv/cf/abstract-provisioning-service.js

@@ -2,7 +2,6 @@ const cds = require('@sap/cds/lib')
 const LOG = cds.log('mtx'), DEBUG = cds.debug('mtx')
 const main = require('../config')
 const { fetchResiliently, token } = require('../../lib/utils')
-const migration = require('../../lib/migration/migration')
 const DeploymentService = 'cds.xt.DeploymentService'
 const JobsService = 'cds.xt.JobsService'
 const Tenants = 'cds.xt.Tenants'
@@ -89,6 +88,7 @@ module.exports = class ProvisioningService extends cds.ApplicationService {
 
 
   _toMetadataJson(metadata, subscribedTenantId) {
+    if (!metadata) return { subscribedTenantId };
     try {
       return JSON.parse(metadata);
     } catch (error) {
@@ -114,9 +114,7 @@ module.exports = class ProvisioningService extends cds.ApplicationService {
 
   async _getTenants() {
     const ds = await cds.connect.to(DeploymentService)
-    const tenants = await ds.getTenants()
-    const mtxTenants = await migration.getMissingMtxTenants(tenants)
-    const all = [...tenants, ...mtxTenants]
+    const all = await ds.getTenants()
     if (cds.env.requires[this.name]?.upgrade?.ignoreNonExistingContainers) {
       const containers = await ds.getContainers()
       return all.filter(t => containers.includes(t))
@@ -140,12 +138,13 @@ module.exports = class ProvisioningService extends cds.ApplicationService {
       await resources4(out)
       await csvs4('base', out)
     }
-    const { clusterSize = 1 } = cds.env.requires.multitenancy.jobs ?? cds.env.requires[this.name]?.jobs ?? {}
     const { 'cds.xt.DeploymentService': ds } = cds.services
+    const js = await cds.connect.to(JobsService)
+    const { clusterSize = 3 } = js._config()
     const dbToTenants = (clusterSize > 1 && ds) ? await ds.tenantsByDb(tenants) : [new Set(tenants)]
     LOG.info('upgrading', { tenants })
 
-    const js = await cds.connect.to(JobsService)
+
     return await new Promise((resolve, reject) => {
       const tx = js.tx({ tenant: cds.context.tenant, user: new cds.User.Privileged() })
       const job = tx.enqueue(DeploymentService, 'upgrade', dbToTenants, { options }, async error => {
@@ -292,7 +291,7 @@ module.exports = class ProvisioningService extends cds.ApplicationService {
   async _token() {
     const serviceName = 'cds.xt.' + this.constructor.name
     const cred = this._getCredentials()
-    const raw = await token(cred, { query: { response_type: 'token' } })
+    const raw = await token(cred, { query: { response_type: 'token' }, form: { grant_type: 'client_credentials' } })
     const { access_token } = JSON.parse(raw)
     if (!access_token) cds.error(`could not get token for ${serviceName}: token is empty`)
     return access_token

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

@@ -8,6 +8,7 @@ const checkedExtensionAnnotations = new Map([
   ['@cds.persistence.journal', _createJournalAnnotationWarning],
   ['@mandatory', _createMandatoryAnnotationWarning],
   ['@readonly', _createMandatoryAnnotationWarning],
+  ['@Common.FieldControl', _createMandatoryAnnotationWarning],
   ['@assert.notNull', _createMandatoryAnnotationWarning],
   ['@assert.range', _createMandatoryAnnotationWarning]
 ])
@@ -18,6 +19,7 @@ const criticalExtensionAnnotations = new RegExp('^@(?:'
   + '|restrict'
   + '|readonly'
   + '|mandatory'
+  + '|Common\\.FieldControl'
   + '|assert.*'
   + '|cds.persistence.*'
   + '|sql.append'
@@ -31,7 +33,8 @@ const criticalExtensionAnnotations = new RegExp('^@(?:'
   + '|cds.query.limit'
   + '|cds.localized'
   + '|cds.valid.*'
-  + '|cds.search)'
+  + '|cds.search'
+  + '|Capabilities.*)'
 );
 
 function locationString(element) {
@@ -52,7 +55,7 @@ function _createMandatoryAnnotationWarning(annotationName, { element, parent })
   if (element.default || element[annotationName] === false) return
   const message = `Annotation '${annotationName}' in '${
     element.annotate || element.name || parent.extend || parent.annotate
-  }' is not supported in extensions without default value`
+  }' is not supported in extensions`
   return new LinterMessage(locationString(element) + message, element)
 }
 

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

@@ -27,7 +27,7 @@ module.exports.legacyCheck = (env = cds.env) => {
 }
 
 module.exports.lint = (extCsn, fullCsn, env = cds.env, cloneExt = false) => {
-  const conf = env.requires[EXT_SERVICE_NAME] || env.mtx || {}
+  const conf = env.requires[EXT_SERVICE_NAME] || env.requires.extensibility || env.mtx || {}
   const linter_options = {}
   let x
   for (let p of LINTER_OPTIONS) if ((x = conf[p])) {
@@ -62,13 +62,14 @@ module.exports.ERR_CDS_VALIDATION_FAILURE = 'ERR_CDS_VALIDATION_FAILURE'
  * Sparsely copies the linter-relevant config from the given env into the given target
  */
 module.exports.configCopyFrom = (env, target = {}) => {
-  if (!env.requires?.[EXT_SERVICE_NAME]) return target
+  const source = env.requires?.[EXT_SERVICE_NAME] ?? env.requires?.extensibility
+  if (!source) return target
 
   const config = {}
-  Object.keys(env.requires[EXT_SERVICE_NAME])
+  Object.keys(source)
     .filter(key => LINTER_OPTIONS.includes(key)) // only let some keys pass, to not compromise security
-    .filter(key => !!env.requires[EXT_SERVICE_NAME][key])
-    .forEach(key => (config[key] = env.requires[EXT_SERVICE_NAME][key]))
+    .filter(key => !!source[key])
+    .forEach(key => (config[key] = source[key]))
 
   target.requires = target.requires || {}
   target.requires[EXT_SERVICE_NAME] = config // overwrite ext.service key, though

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

@@ -69,14 +69,3 @@ extend service cds.xt.ExtensibilityService with @private {
   );
 
 }
-
-// Access to legacy content
-extend service cds.xt.ExtensibilityService {
-
-  @requires: ['cds.ExtensionDeveloper']
-  @private action getMigratedProjects(
-    tagRule: String,  // optional
-    defaultTag: String, // optional
-    tenant: String // optional
-  ) returns LargeBinary;
-}