@sap/cds-dk 10.0.6 → 10.1.0

package/lib/init/template/hana-serverless/files/src/.hdiconfig

@@ -0,0 +1,139 @@
+{
+    "file_suffixes": {
+        "csv": {
+            "plugin_name": "com.sap.hana.di.tabledata.source"
+        },
+        "hdbafllangprocedure": {
+            "plugin_name": "com.sap.hana.di.afllangprocedure"
+        },
+        "hdbanalyticprivilege": {
+            "plugin_name": "com.sap.hana.di.analyticprivilege"
+        },
+        "hdbcalculationview": {
+            "plugin_name": "com.sap.hana.di.calculationview"
+        },
+        "hdbcollection": {
+            "plugin_name": "com.sap.hana.di.collection"
+        },
+        "hdbconstraint": {
+            "plugin_name": "com.sap.hana.di.constraint"
+        },
+        "hdbdropcreatetable": {
+            "plugin_name": "com.sap.hana.di.dropcreatetable"
+        },
+        "hdbflowgraph": {
+            "plugin_name": "com.sap.hana.di.flowgraph"
+        },
+        "hdbfunction": {
+            "plugin_name": "com.sap.hana.di.function"
+        },
+        "hdbgraphworkspace": {
+            "plugin_name": "com.sap.hana.di.graphworkspace"
+        },
+        "hdbhadoopmrjob": {
+            "plugin_name": "com.sap.hana.di.virtualfunctionpackage.hadoop"
+        },
+        "hdbindex": {
+            "plugin_name": "com.sap.hana.di.index"
+        },
+        "hdblibrary": {
+            "plugin_name": "com.sap.hana.di.library"
+        },
+        "hdbmigrationtable": {
+            "plugin_name": "com.sap.hana.di.table.migration"
+        },
+        "hdbprocedure": {
+            "plugin_name": "com.sap.hana.di.procedure"
+        },
+        "hdbprojectionview": {
+            "plugin_name": "com.sap.hana.di.projectionview"
+        },
+        "hdbprojectionviewconfig": {
+            "plugin_name": "com.sap.hana.di.projectionview.config"
+        },
+        "hdbreptask": {
+            "plugin_name": "com.sap.hana.di.reptask"
+        },
+        "hdbresultcache": {
+            "plugin_name": "com.sap.hana.di.resultcache"
+        },
+        "hdbrole": {
+            "plugin_name": "com.sap.hana.di.role"
+        },
+        "hdbroleconfig": {
+            "plugin_name": "com.sap.hana.di.role.config"
+        },
+        "hdbsearchruleset": {
+            "plugin_name": "com.sap.hana.di.searchruleset"
+        },
+        "hdbsequence": {
+            "plugin_name": "com.sap.hana.di.sequence"
+        },
+        "hdbstatistics": {
+            "plugin_name": "com.sap.hana.di.statistics"
+        },
+        "hdbstructuredprivilege": {
+            "plugin_name": "com.sap.hana.di.structuredprivilege"
+        },
+        "hdbsynonym": {
+            "plugin_name": "com.sap.hana.di.synonym"
+        },
+        "hdbsynonymconfig": {
+            "plugin_name": "com.sap.hana.di.synonym.config"
+        },
+        "hdbsystemversioning": {
+            "plugin_name": "com.sap.hana.di.systemversioning"
+        },
+        "hdbtable": {
+            "plugin_name": "com.sap.hana.di.table"
+        },
+        "hdbtabledata": {
+            "plugin_name": "com.sap.hana.di.tabledata"
+        },
+        "hdbtabletype": {
+            "plugin_name": "com.sap.hana.di.tabletype"
+        },
+        "hdbtrigger": {
+            "plugin_name": "com.sap.hana.di.trigger"
+        },
+        "hdbview": {
+            "plugin_name": "com.sap.hana.di.view"
+        },
+        "hdbvirtualfunction": {
+            "plugin_name": "com.sap.hana.di.virtualfunction"
+        },
+        "hdbvirtualfunctionconfig": {
+            "plugin_name": "com.sap.hana.di.virtualfunction.config"
+        },
+        "hdbvirtualpackagehadoop": {
+            "plugin_name": "com.sap.hana.di.virtualpackage.hadoop"
+        },
+        "hdbvirtualpackagesparksql": {
+            "plugin_name": "com.sap.hana.di.virtualpackage.sparksql"
+        },
+        "hdbvirtualprocedure": {
+            "plugin_name": "com.sap.hana.di.virtualprocedure"
+        },
+        "hdbvirtualprocedureconfig": {
+            "plugin_name": "com.sap.hana.di.virtualprocedure.config"
+        },
+        "hdbvirtualtable": {
+            "plugin_name": "com.sap.hana.di.virtualtable"
+        },
+        "hdbvirtualtableconfig": {
+            "plugin_name": "com.sap.hana.di.virtualtable.config"
+        },
+        "properties": {
+            "plugin_name": "com.sap.hana.di.tabledata.properties"
+        },
+        "tags": {
+            "plugin_name": "com.sap.hana.di.tabledata.properties"
+        },
+        "txt": {
+            "plugin_name": "com.sap.hana.di.copyonly"
+        },
+        "hdbeshconfig": {
+           "plugin_name": "com.sap.hana.di.eshconfig"
+        }
+    }
+}

package/lib/init/template/hana-serverless/files/undeploy.json

@@ -0,0 +1,7 @@
+[
+    "src/gen/**/*.hdbview",
+    "src/gen/**/*.hdbindex",
+    "src/gen/**/*.hdbconstraint",
+    "src/gen/**/*_drafts.hdbtable",
+    "src/gen/**/*.hdbcalculationview"
+]

package/lib/init/template/hana-serverless/files/values.yaml.hbs

@@ -0,0 +1,18 @@
+---
+srv:
+  bindings:
+    db:
+      serviceInstanceName: db
+{{#hasMultitenancy}}
+sidecar:
+  bindings:
+    db:
+      serviceInstanceName: db
+{{/hasMultitenancy}}
+db:
+  serviceOfferingName: hana-cloud
+  servicePlanName: serverless
+  parameters:
+    auto_subscription:
+      type: subscription-manager
+    subscribe_with_consuming_app: true

package/lib/init/template/hana-serverless/index.js

@@ -0,0 +1,184 @@
+const { join } = require('path')
+const cds = require('../../../cds')
+const { read, write, exists, copy } = cds.utils
+const { readProject } = require('../../projectReader')
+const { merge, sort } = require('../../merge')
+const mvn = require('../../mvn')
+
+const { srv4, hdbDeployer, mtxSidecar4 } = require('../../registries/mta')
+
+const serverlessDb = {
+    in: 'resources',
+    where: { type: 'org.cloudfoundry.managed-service', 'parameters.service': 'hana-cloud', 'parameters.service-plan': 'serverless' }
+}
+
+const identity = {
+    in: 'resources',
+    where: { type: 'org.cloudfoundry.managed-service', 'parameters.service': 'identity' }
+}
+
+module.exports = class HanaServerlessTemplate extends require('../../plugin') {
+
+    static help() {
+        return 'database support for SAP HANA Cloud serverless'
+    }
+
+    static hasInProduction(env) {
+        return cds.cli.options?.add?.has('hana-serverless')
+            || env.requires?.db?.kind === 'hana-serverless'
+            || env.requires?.db?.serverless
+    }
+
+    async run() {
+        const project = readProject()
+        const { isJava, configFile, db } = project
+        project.shortcut = !exists(configFile) || typeof (await read(configFile)).cds?.requires?.db !== 'object'
+
+        if (isJava) {
+            await copy(join(__dirname, 'files', 'db')).to(db.folder)
+            await mvn.add('hana')
+        }
+
+        await merge(__dirname, 'files/package.json.hbs').into(configFile, { with: project, forceOverwrite: true })
+
+        const packageJson = exists('package.json') ? await read('package.json') : null
+        if (packageJson?.dependencies) {
+            delete packageJson.dependencies['@sap/hana-client']
+            await write('package.json', packageJson, { spaces: 2 })
+        }
+        await sort('package.json', 'dependencies')
+    }
+
+    async combine(facet) {
+        const project = readProject(facet)
+        const { addMta, hasMta, addMultitenancy, addKyma, isJava, hasMultitenancy, srv } = project
+
+        if (addMta || addMultitenancy && hasMta) {
+            const existingIdentity = await this._existingIdentityName()
+            const srvModule = srv4(srv.path)
+
+            const relationships = [{
+                insert: [serverlessDb, 'name'],
+                into: [srvModule, 'requires', 'name']
+            }]
+            if (!existingIdentity) relationships.push({
+                insert: [identity, 'name'],
+                into: [srvModule, 'requires', 'name']
+            })
+
+            if (hasMultitenancy) {
+                const sidecar = mtxSidecar4(isJava ? 'mtx/sidecar' : 'gen/mtx/sidecar')
+                relationships.push({
+                    insert: [serverlessDb, 'name'],
+                    into: [sidecar, 'requires', 'name']
+                })
+                if (!existingIdentity) relationships.push({
+                    insert: [identity, 'name'],
+                    into: [sidecar, 'requires', 'name']
+                })
+            } else {
+                relationships.push({
+                    insert: [serverlessDb, 'name'],
+                    into: [hdbDeployer, 'requires', 'name']
+                })
+                if (!existingIdentity) relationships.push({
+                    insert: [identity, 'name'],
+                    into: [hdbDeployer, 'requires', 'name']
+                })
+            }
+
+            const modules = hasMultitenancy ? [srvModule] : [srvModule, hdbDeployer]
+            const additions = [...modules, serverlessDb]
+            if (!existingIdentity) additions.push(identity)
+            await merge(__dirname, 'files/mta.yaml.hbs').into('mta.yaml', {
+                with: project, additions, relationships
+            })
+
+            if (existingIdentity) await this._consumeServerlessFrom(existingIdentity)
+
+            if (hasMultitenancy) await this._alignSidecarDbKind()
+        }
+
+        if (addKyma) {
+            const KymaTemplate = require('../kyma')
+            const existingIdentity = await this._existingIdentityInChart()
+
+            await merge(__dirname, 'files/values.yaml.hbs').into('chart/values.yaml', { with: project })
+
+            if (existingIdentity) {
+                await this._consumeServerlessInChart(existingIdentity)
+            } else {
+                await merge(__dirname, 'files/identity.values.yaml.hbs').into('chart/values.yaml', { with: project })
+                await KymaTemplate.mergeDependency('service-instance', 'identity')
+            }
+
+            if (hasMultitenancy) await this._alignSidecarDbKind()
+        }
+    }
+
+    async _existingIdentityInChart() {
+        const { readYAML } = require('../../../util/fs')
+        const doc = await readYAML('chart/values.yaml')
+        if (!doc) return undefined
+        const js = doc.toJS?.() ?? doc
+        const identity = js?.identity
+        if (identity && identity.serviceOfferingName === 'identity') return 'identity'
+        return undefined
+    }
+
+    async _consumeServerlessInChart(identityKey) {
+        const { readYAML, writeYAML } = require('../../../util/fs')
+        const doc = await readYAML('chart/values.yaml')
+        if (!doc) return
+        const js = doc.toJS()
+        const identity = js[identityKey]
+        if (!identity) return
+        const parameters = (identity.parameters ??= {})
+        const consumed = (parameters['consumed-services'] ??= [])
+        const dbName = `${readProject().appName}-db`
+        if (!consumed.some(c => c?.['service-instance-name'] === dbName)) {
+            consumed.push({ 'service-instance-name': dbName })
+        }
+        await writeYAML('chart/values.yaml', js)
+    }
+
+    async _existingIdentityName() {
+        const { readYAML } = require('../../../util/fs')
+        const doc = await readYAML('mta.yaml')
+        if (!doc) return undefined
+        const js = doc.toJS?.() ?? doc
+        const resources = js?.resources || []
+        const found = resources.find(r => r?.parameters?.service === 'identity')
+        return found?.name
+    }
+
+    async _consumeServerlessFrom(identityName) {
+        const { readYAML, writeYAML } = require('../../../util/fs')
+        const doc = await readYAML('mta.yaml')
+        if (!doc) return
+        const js = doc.toJS()
+        const resource = (js.resources || []).find(r => r.name === identityName)
+        if (!resource) return
+        const config = ((resource.parameters ??= {}).config ??= {})
+        const consumed = (config['consumed-services'] ??= [])
+        const dbName = `${readProject().appName}-db`
+        if (!consumed.some(c => c?.['service-instance-name'] === dbName)) {
+            consumed.push({ 'service-instance-name': dbName })
+        }
+        const after = (resource['processed-after'] ??= [])
+        if (!after.includes(dbName)) after.push(dbName)
+        await writeYAML('mta.yaml', js)
+    }
+
+    async _alignSidecarDbKind() {
+        const sidecarPackageJson = join('mtx', 'sidecar', 'package.json')
+        if (!exists(sidecarPackageJson)) return
+        const packageJson = await read(sidecarPackageJson)
+        const requires = ((packageJson.cds ??= {}).requires ??= {})
+        const profile = (requires['[production]'] ??= {})
+        profile.db = 'hana-serverless'
+        const mt = (requires.multitenancy ??= {})
+        mt.serverless = { ...mt.serverless, autoSubscription: true }
+        await write(sidecarPackageJson, packageJson, { spaces: 2 })
+    }
+}

package/lib/init/template/html5-repo/files/containerize.yaml.hbs

@@ -7,7 +7,7 @@ modules:
         builder: proxy-unified-runtime-dmz.int.repositories.cloud.sap/builder/noble
         {{/hasKymaUnifiedRuntime}}
         {{^hasKymaUnifiedRuntime}}
-        type: sapse/application-content-deployer-buildpack:1.4.0
+        type: sapse/application-content-deployer-buildpack:1.5.0
         builder: builder-jammy-base
         {{/hasKymaUnifiedRuntime}}
-        path: app/html5-deployer
+        path: {{& html5DeployerPath}}

package/lib/init/template/html5-repo/files/mta.yaml.hbs

@@ -63,11 +63,16 @@ modules:
     type: html5
     path: {{& appPath}}{{app}}
     build-parameters:
+      {{#isStatic}}
+      build-result: .
+      {{/isStatic}}
+      {{^isStatic}}
       build-result: dist
       builder: custom
       commands:
         - npm ci
         - npm run build
+      {{/isStatic}}
       supported-platforms: []
   {{/apps}}
 

package/lib/init/template/html5-repo/index.js

@@ -2,7 +2,7 @@ const { join } = require('path')
 const { readProject } = require('../../projectReader')
 const { merge } = require('../../merge')
 const { srv4, html5RepoHost, html5Runtime, xsuaa, appDeployer, approuter, mtxSidecar4 } = require('../../registries/mta')
-const { odataApi, html5RepoApi } = require('../../registries/xs-app')
+const { srvApi, html5RepoApi } = require('../../registries/xs-app')
 const { exists, read } = require('../../../cds').utils
 
 module.exports = class Html5RepoTemplate extends require('../../plugin') {
@@ -22,18 +22,18 @@ module.exports = class Html5RepoTemplate extends require('../../plugin') {
 
     async run() {
         const project = readProject()
-        const { appUIPaths, appPath, configFile } = project
+        const { apps, appPath, configFile } = project
         await merge(__dirname, 'files/package.json.hbs').into(configFile, { project })
 
-        // app deployer requires a manifest.json
-        await Promise.all(appUIPaths.map(p =>
+        // Fiori/UI5 apps deploy a manifest.json; static apps (plain index.html) don't
+        await Promise.all(apps.filter(a => !a.isStatic).map(({ app }) =>
             merge(__dirname, 'files/manifest.json')
-                .into(join(appPath, p, 'webapp/manifest.json'), { project })
+                .into(join(appPath, app, 'webapp/manifest.json'), { project })
         ))
     }
 
-    async combine() {
-        const project = readProject()
+    async combine(facet) {
+        const project = readProject(facet)
         const {
             isJava, srv, appPath, apps,
             hasApprouter, hasMta, addMta, hasKyma, hasXsuaa, hasMultitenancy, hasUI5,
@@ -43,7 +43,7 @@ module.exports = class Html5RepoTemplate extends require('../../plugin') {
         await Promise.all(apps.map(async ({ app }) => {
             project.app = app
             project.hasIndexHtml = exists(join(appPath, app, 'webapp/index.html'))
-            const additions = [odataApi, html5RepoApi]
+            const additions = [srvApi, html5RepoApi]
             await merge(__dirname, 'files/xs-app.json.hbs').into(join(appPath, app, 'xs-app.json'), { with: project, additions })
             const pJsonPath = join(appPath, app, 'package.json')
             const pJson = exists(pJsonPath) ? await read(pJsonPath) : {}
@@ -73,10 +73,14 @@ module.exports = class Html5RepoTemplate extends require('../../plugin') {
         if (addMta || affected && hasMta) {
             const srvModule = srv4(srv.path)
             project.apps = apps
-            const relationships = [{
-                insert: [html5RepoHost, 'name'],
-                into: [appDeployer, 'requires', 'name'],
-            }]
+            const hasApps = apps.length > 0
+            const relationships = []
+            if (hasApps) {
+                relationships.push({
+                    insert: [html5RepoHost, 'name'],
+                    into: [appDeployer, 'requires', 'name'],
+                })
+            }
             const appModules = []
             for (const { app } of project.apps) {
                 const html5App = { in: 'modules', where: { type: 'html5', path: `${appPath}${app}` } }
@@ -101,7 +105,7 @@ module.exports = class Html5RepoTemplate extends require('../../plugin') {
                     into: [isJava ? srvModule : mtxSidecar4('gen/mtx/sidecar'), 'requires', 'name']
                 })
             }
-            if (hasXsuaa) {
+            if (hasXsuaa && hasApps) {
                 relationships.push({
                     insert: [xsuaa, 'name'],
                     into: [appDeployer, 'requires']
@@ -109,7 +113,7 @@ module.exports = class Html5RepoTemplate extends require('../../plugin') {
             }
             await merge(__dirname, 'files/mta.yaml.hbs').into('mta.yaml', {
                 with: project,
-                additions: [srvModule, appDeployer, html5RepoHost, ...appModules],
+                additions: [srvModule, ...(hasApps ? [appDeployer] : []), html5RepoHost, ...appModules],
                 relationships
             })
         }