@sap/cds-dk 7.8.0 → 7.8.2

package/bin/add.js

@@ -120,12 +120,10 @@ ${Object.entries(conf).sort(([a], [b]) => a.localeCompare(b)).flatMap(([pluginNa
 
 `})
 
-async function add(features) {
-  await cds.plugins
+async function add(args) {
+  // await cds.plugins
   const CDSGenerator = require('../lib/init')
   const generator = new CDSGenerator()
-
-  const args = features.map(f => f.split(/[,\s+]/)).flat()
-
-  await generator.add(args)
+  const features = args.map(f => f.split(/[,\s+]/)).flat()
+  await generator.add(features)
 }

package/bin/cds.js

@@ -43,6 +43,14 @@ const cli = {
           appendArgs = argv.slice(endOfOptions + 1)
           argv = argv.slice(0, endOfOptions)
         }
+        // REVISIT: Have to do it here to allow custom flags for plugins!
+        if (cmd === 'add') {
+          await cds.plugins
+          for (const [_, Plugin] of cds.add.registered) {
+            task.options.push(...Object.keys((new Plugin).options()).map(key => '--'+key))
+          }
+        }
+
         const args = this.args(task, argv)
         args[0].push(...appendArgs)
         cds.cli = {
@@ -122,6 +130,7 @@ async function _resolveBindings(options) {
   const bindingEnv = await bindingManager.bindingEnv()
   Object.assign(process.env, bindingEnv)
   cds.env = cds.env.for('cds') // reload env // FIXME: This is too early!
+  cds.requires = cds.env.requires // REVISIT: We should clean this up!
 }
 
 function _local (id, _else) {

package/lib/build/provider/internalBuildTaskProvider.js

@@ -309,6 +309,8 @@ Upgrade to @sap/cds-mtxs following the migration guide https://cap.cloud.sap/doc
 
     static async _setDefaultModel(task) {
         const ws = hasOptionValue(task.options?.[CONTENT_WS], true) || cds.cli.options?.ws
+        // REVISIT: filter nodejs bootstrap service models for Java - issues/12770#issuecomment-1805719
+        const filter = this._hasJavaNature() ? (m) => !NODEJS_MODEL_EXCLUDE_LIST.includes(m) : null
         let taskModelPaths = task.options?.model
         if (taskModelPaths && !Array.isArray(taskModelPaths)) {
             taskModelPaths = [taskModelPaths]
@@ -318,21 +320,17 @@ Upgrade to @sap/cds-mtxs following the migration guide https://cap.cloud.sap/doc
         let defaultModelPaths = []
         if (taskModelPaths?.length) {
             if (!hasOptionValue(task.options?.[IGNORE_DEFAULT_MODELS], true)) {
-                defaultModelPaths = await getDefaultModelOptions(ws)
+                defaultModelPaths = await getDefaultModelOptions(ws, filter)
                 defaultModelPaths = defaultModelPaths.filter(p => p.match(allowList))
             }
         } else {
-            defaultModelPaths = await getDefaultModelOptions(ws)
+            defaultModelPaths = await getDefaultModelOptions(ws, filter)
             defaultModelPaths.push(task.src)
             if (hasOptionValue(task.options?.[IGNORE_DEFAULT_MODELS], true)) {
                 // all default models except the built-in models
                 defaultModelPaths = defaultModelPaths.filter(p => !p.match(allowList))
             }
         }
-        // REVISIT: filter nodejs bootstrap service models for Java - issues/12770#issuecomment-1805719
-        if (this._hasJavaNature()) {
-            defaultModelPaths = defaultModelPaths.filter(p => !NODEJS_MODEL_EXCLUDE_LIST.includes(p))
-        }
         if (defaultModelPaths.length) {
             task.options.model = [...new Set(taskModelPaths?.length ? taskModelPaths.concat(defaultModelPaths) : defaultModelPaths)]
         }

package/lib/build/util.js

@@ -117,10 +117,10 @@ function resolveRequiredSapModels(modelPaths) {
     })
 }
 
-async function getDefaultModelOptions(ws = false) {
+async function getDefaultModelOptions(ws = false, filter) {
     // Note: requires.toggles holds the actual kind representation and not the value 'true'
     const wildcards = cds.env.requires.toggles && cds.env.features.folders ? ['*', cds.env.features.folders] : '*'
-    let paths = _filterModelPaths(cds.resolve(wildcards, false))
+    let paths = _filterModelPaths(cds.resolve(wildcards, false), filter)
 
     if (ws) {
         const workspaces = await getWorkspaces()
@@ -130,7 +130,7 @@ async function getDefaultModelOptions(ws = false) {
             workspaces.forEach(workspace => {
                 cds.root = path.join(root, workspace)
                 cds.env = cds.env.for('cds', cds.root)
-                paths = paths.concat(_filterModelPaths(cds.resolve(cds.env.requires.toggles ? wildcards : '*', false)).map(p => path.join(workspace, p)))
+                paths = paths.concat(_filterModelPaths(cds.resolve(cds.env.requires.toggles ? wildcards : '*', false), filter).map(p => path.join(workspace, p)))
             })
         } finally {
             cds.root = root
@@ -254,10 +254,10 @@ function _validateWsDependencies(wsRoot, dependencies, devDependencies) {
 
 /**
  * Returns a flat array of existing files and folders, trailing '/' or '\\' characters have been removed.
- * @param  {...any} modelPaths array of files and folders - optionally nested
+ * @param  {Array} modelPaths array of files and folders - optionally nested
  * @returns 
  */
-function _filterModelPaths(...modelPaths) {
+function _filterModelPaths(modelPaths, filter) {
     const model = new Set()
     // may contain nested arrays
     modelPaths = flatten(modelPaths)
@@ -277,7 +277,7 @@ function _filterModelPaths(...modelPaths) {
             }
         }
     })
-    return [...model].map(m => normalizePath(m))
+    return [...model].filter(m => filter ? filter(m) : true).map(m => normalizePath(m))
 }
 
 /**

package/lib/compile/openapi/csdl2openapi.js

@@ -2267,6 +2267,10 @@ see [Expand](http://docs.oasis-open.org/odata/odata/v4.01/odata-v4.01-part1-prot
             s.description = element[voc.Core.LongDescription];
         }
 
+        if (element['@ODM.oidReference']?.entityName) {
+            s['x-sap-odm-oid-reference-entity-name'] = element['@ODM.oidReference'].entityName
+        }
+
         return s;
     }
 

package/lib/init/constants.js

@@ -4,7 +4,7 @@ module.exports = {
     COMMAND_INIT: 'init',
     COMMAND_ADD: 'add',
 
-    MAVEN_ARCHETYPE_VERSION: '2.7.1',
+    MAVEN_ARCHETYPE_VERSION: '2.8.1',
 
     OPTIONS: Object.freeze({
         JAVA: 'java',
@@ -57,7 +57,7 @@ module.exports = {
         PIPELINE_HELP: 'https://sap.github.io/jenkins-library/',
         SAMPLES: 'https://github.com/SAP-samples/cloud-cap-samples',
         CAPIRE: 'https://cap.cloud.sap',
-        MAVEN_ARCHETYPE_HELP: `https://cap.cloud.sap/docs/java/development/#the-maven-archetype`,
+        MAVEN_ARCHETYPE_HELP: `https://cap.cloud.sap/docs/java/developing-applications/building#the-maven-archetype`,
         MAVEN_INSTALL_HELP: `https://maven.apache.org/install.html`
     }),
 

package/lib/init/template/approuter/files/values.yaml.hbs

@@ -15,6 +15,12 @@ approuter:
   image:
     repository: <your-container-registry>/{{appName}}-approuter
     tag: latest
+{{#hasMultitenancy}}
+{{=<% %>=}}
+  env:
+    TENANT_HOST_PATTERN: ^(.*)-{{ .Release.Name }}-approuter-{{ .Release.Namespace }}.{{ .Values.global.domain }} # change if expose.host is set
+<%={{ }}=%>
+{{/hasMultitenancy}}
   resources:
     limits:
       ephemeral-storage: 1G

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

@@ -63,13 +63,7 @@ module.exports = class ApprouterTemplate extends require('../../plugin') {
                 }
             }]}}).into('chart/values.yaml', { with: project })
 
-            const fileName = hasMultitenancy ? 'approuter-mtxs-configmap.yaml' : 'approuter-configmap.yaml'
-            await copy(join(__dirname, 'files', fileName)).to('chart', 'templates', 'approuter-configmap.yaml')
-
-            if (hasMultitenancy) {
-                const mtxsConfigMapFileName = isNodejs ? 'mtxs-configmap-nodejs.yaml' : 'mtxs-configmap-java.yaml'
-                await copy(join(__dirname, 'files', mtxsConfigMapFileName)).to('chart', 'templates', 'mtxs-configmap.yaml')
-            }
+            await copy(join(__dirname, 'files/approuter-configmap.yaml')).to('chart', 'templates', 'approuter-configmap.yaml')
         }
 
         const xsAppPath = join(approuterPath, 'xs-app.json')

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

@@ -74,7 +74,8 @@ module.exports = class DataTemplate extends require('../../plugin') {
 
     if (contentType === 'csv') {
       const headerOnly = !cds.cli.options['records'] // compat to old behavior which only creates headers
-      await asCsv(data, csn, Object.assign({ headerOnly }, dataForParams))
+      const queries = false // old behavior excluded queries
+      await asCsv(data, csn, Object.assign({ headerOnly, queries }, dataForParams))
     }
 
     // write files

package/lib/init/template/enterprise-messaging/files/package.json.hbs

@@ -7,7 +7,8 @@
       "[{{profile}}]": {
       {{/profile}}
         "messaging": {
-          "kind": "enterprise-messaging"
+          "kind": "enterprise-messaging"{{#cloudevents}},
+          "format": "cloudevents"{{/cloudevents}}
         }
       {{#profile}}
       }

package/lib/init/template/enterprise-messaging/index.js

@@ -7,6 +7,16 @@ const { srv4, enterpriseMessaging } = require('../../registries/mta')
 
 module.exports = class EnterpriseMessagingTemplate extends require('../../plugin') {
 
+  options() {
+    return {
+      'cloudevents': {
+        type: 'boolean',
+        short: 'c',
+        help: 'Use CloudEvents formatting',
+      }
+    }
+  }
+
   async canRun() {
     const { isJava } = readProject()
     if (isJava) throw `'cds add enterprise-messaging' is not available for Java yet`
@@ -19,9 +29,12 @@ module.exports = class EnterpriseMessagingTemplate extends require('../../plugin
 
   async run() {
     const project = readProject()
-    const { configFile } = project
-    await merge(__dirname, 'files/package.json.hbs').into(configFile, { with: project })
-    await merge(__dirname, 'files/event-mesh.json.hbs').into('event-mesh.json', { with: project })
+    const { configFile, isNodejs } = project
+    if (isNodejs) {
+      project.cloudevents = cds.cli.options.cloudevents
+      await merge(__dirname, 'files/package.json.hbs').into(configFile, { with: project })
+    }
+    await merge(__dirname, 'files/event-mesh.json.hbs').into('event-mesh.json', { project })
   }
 
   async combine() {

package/lib/init/template/enterprise-messaging-shared/files/package.json.hbs

@@ -10,7 +10,8 @@
       "[{{profile}}]": {
       {{/profile}}
         "messaging": {
-          "kind": "enterprise-messaging-shared"
+          "kind": "enterprise-messaging-shared"{{#cloudevents}},
+          "format": "cloudevents"{{/cloudevents}}
         }
       {{#profile}}
       }

package/lib/init/template/enterprise-messaging-shared/index.js

@@ -6,6 +6,16 @@ const { srv4, enterpriseMessaging } = require('../../registries/mta')
 
 module.exports = class EnterpriseMessagingSharedTemplate extends require('../../plugin') {
 
+  options() {
+    return {
+      'cloudevents': {
+        type: 'boolean',
+        short: 'c',
+        help: 'Use CloudEvents formatting',
+      }
+    }
+  }
+
   async canRun() {
     const { isJava } = readProject()
     if (isJava) throw `'cds add enterprise-messaging-shared' is not available for Java yet`
@@ -18,9 +28,12 @@ module.exports = class EnterpriseMessagingSharedTemplate extends require('../../
 
   async run() {
     const project = readProject()
-    const { configFile } = project
-    project.shortcut = !(await read(configFile)).cds?.requires?.messaging?.kind
-    await merge(__dirname, 'files/package.json.hbs').into(configFile, { project })
+    const { configFile, isNodejs } = project
+    if (isNodejs) {
+      project.shortcut = !(await read(configFile)).cds?.requires?.messaging?.kind
+      project.cloudevents = cds.cli.options.cloudevents
+      await merge(__dirname, 'files/package.json.hbs').into(configFile, { with: project })
+    }
     await merge(__dirname, 'files/event-mesh.json.hbs').into('event-mesh.json', { project })
   }
 

package/lib/init/template/helm/files/web-application/Chart.yaml

@@ -5,4 +5,4 @@ name: web-application
 sources:
 - https://github.tools.sap/unified-runtime/web-application
 type: application
-version: 1.12.0
+version: 1.13.1

package/lib/init/template/helm/files/web-application/templates/_helpers.tpl

@@ -189,3 +189,26 @@ If release name contains chart name it will be used as service instance name.
 {{- $_ := set $result "vars" $variables }}
 {{- (fromYaml (tpl (toYaml $result) .context)) | mustToJson }}
 {{- end }}
+
+{{- define "web-application.internal.healthCheck" }}
+{{ .checkName }}:
+{{- if .checkValues.path }}
+  httpGet:
+    path: {{ .checkValues.path }}
+    port: http
+{{- else }}
+  tcpSocket:
+    port: {{ .context.Values.port }}
+{{- end }}
+{{- if eq .checkName "startupProbe" }}
+  periodSeconds: 2
+  failureThreshold: {{ div (add1  .context.Values.startupTimeoutSeconds) 2 }}
+{{- else }}
+{{- if .checkValues.periodSeconds }}
+  periodSeconds: {{ .checkValues.periodSeconds }}
+{{- end }}
+{{- if .checkValues.failureThreshold }}
+  failureThreshold: {{ .checkValues.failureThreshold }}
+{{- end }}
+{{- end }}
+{{- end }}

package/lib/init/template/helm/files/web-application/templates/deployment.yaml

@@ -71,35 +71,9 @@ spec:
         {{- if not (eq (len $envVars.vars) 0) }}
         {{- $envVars.vars | toYaml | nindent 8}}
         {{- end }}
-        livenessProbe:
-        {{- if .Values.health.liveness.path }}
-          httpGet:
-            path: {{ .Values.health.liveness.path }}
-            port: http
-        {{- else }}
-          tcpSocket:
-            port: {{ .Values.port }}
-        {{- end }}
-        readinessProbe:
-        {{- if .Values.health.readiness.path }}
-          httpGet:
-            path: {{ .Values.health.readiness.path }}
-            port: http
-        {{- else }}
-          tcpSocket:
-            port: {{ .Values.port }}
-        {{- end }}
-        startupProbe:
-        {{- if .Values.health.liveness.path }}
-          httpGet:
-            path: {{ .Values.health.liveness.path }}
-            port: http
-        {{- else }}
-          tcpSocket:
-            port: {{ .Values.port }}
-        {{- end }}
-          failureThreshold: {{ div (add1  .Values.startupTimeoutSeconds) 2 }}
-          periodSeconds: 2
+        {{ include "web-application.internal.healthCheck" (dict "checkName" "livenessProbe" "checkValues" .Values.health.liveness "context" $) | nindent 8}}
+        {{ include "web-application.internal.healthCheck" (dict "checkName" "readinessProbe" "checkValues" .Values.health.readiness "context" $) | nindent 8}}
+        {{ include "web-application.internal.healthCheck" (dict "checkName" "startupProbe" "checkValues" .Values.health.liveness "context" $) | nindent 8}}
         volumeMounts:
         - name: tmp
           mountPath: /tmp

package/lib/init/template/helm/files/web-application/values.schema.json

@@ -354,6 +354,14 @@
                         "path": {
                             "type": "string",
                             "default": "/healthz"
+                        },
+                        "periodSeconds": {
+                            "type": "integer",
+                            "minimum": 1
+                        },
+                        "failureThreshold": {
+                            "type": "integer",
+                            "minimum": 1
                         }
                     }
                 },
@@ -365,6 +373,14 @@
                         "path": {
                             "type": "string",
                             "default": "/healthz"
+                        },
+                        "periodSeconds": {
+                            "type": "integer",
+                            "minimum": 1
+                        },
+                        "failureThreshold": {
+                            "type": "integer",
+                            "minimum": 1
                         }
                     }
                 }
@@ -599,7 +615,7 @@
                 "gateway": {
                     "$id": "#/properties/expose/properties/gateway",
                     "type": "string",
-                    "default": "kyma-gateway.kyma-system.svc.cluster.local"
+                    "default": "kyma-system/kyma-gateway"
                 },
                 "tenantGateway": {
                     "$id": "#/properties/expose/properties/gateway",

package/lib/init/template/helm/files/web-application/values.yaml

@@ -15,7 +15,7 @@ global:
     _internal:
       web-application:
         versions:
-          1.12.0: true
+          1.13.1: true
 ## Will be used instead of the `.Chart.Name`, e.g. when generating the Deployment name.
 # nameOverride: name
 
@@ -97,10 +97,18 @@ health:
   liveness:
     # HTTP path used by Kubernetes, to perform liveness-probe calls.
     path: /healthz
+    ## How often (in seconds) to perform the probe.
+    # periodSeconds: 3
+    ## Number of probes to fail in a row, in order to consider the check failed.
+    # failureThreshold: 5
   # Readiness-probe configuration.
   readiness:
     # HTTP path used by Kubernetes, to perform readiness-probe calls.
     path: /healthz
+    ## How often (in seconds) to perform the probe.
+    # periodSeconds: 3
+    ## Number of probes to fail in a row, in order to consider the check failed.
+    # failureThreshold: 5
 # Initial timeout in seconds, during which the app must start giving the response to the liveness-probe.
 startupTimeoutSeconds: 30
 ## Use read only filesystem for the Deployment.
@@ -141,7 +149,7 @@ expose:
   # Expose the application to the internet.
   enabled: true
   # Use this istio gateway for incoming traffic.
-  gateway: kyma-gateway.kyma-system.svc.cluster.local
+  gateway: kyma-system/kyma-gateway
   ## Custom Istio Gateway to use with the VirtualService created using the TENANT_HOST_PATTERN.
   ## If your TENANT_HOST_PATTERN uses top level domain for the tenants (like tenant-name.<provider>.<cluster-domain>), you need to create custom Certificate and Gateway since the default Kyma Gateway will not work.
   # tenantGateway: tenants-gateway.my-ns.svc.cluster.local

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

@@ -31,10 +31,10 @@ module.exports = class HelmTemplate extends require('../../plugin') {
     }
 
     async combine() {
-        const { hasDestination, hasEnterpriseMessaging, hasHana, hasMultitenancy, hasXsuaa, hasHtml5Repo, hasApprouter } = readProject()
+        const { hasDestination, hasEnterpriseMessaging, hasHana, hasMultitenancy, hasXsuaa, hasHtml5Repo, hasApprouter, hasKafka } = readProject()
         let hasContentDeployment = false
 
-        if (!exists('chart/charts/service-instance') && (hasHtml5Repo || hasMultitenancy || hasDestination || hasEnterpriseMessaging || hasXsuaa || hasHana)) {
+        if (!exists('chart/charts/service-instance') && (hasHtml5Repo || hasMultitenancy || hasDestination || hasEnterpriseMessaging || hasXsuaa || hasHana || hasKafka)) {
             await copy(join(__dirname, 'files', 'service-instance')).to('chart/charts/service-instance')
         }
         if (hasApprouter) {
@@ -71,6 +71,9 @@ module.exports = class HelmTemplate extends require('../../plugin') {
                 await this._mergeDependency('content-deployment', 'hana-deployer')
             }
         }
+        if (hasKafka) {
+            await this._mergeDependency('service-instance', 'kafka')
+        }
         if(!exists('chart/charts/content-deployment') && hasContentDeployment) {
             await copy(join(__dirname, 'files', 'content-deployment')).to('chart/charts/content-deployment')
         }

package/lib/init/template/helm-unified-runtime/files/templates/NOTES.txt

@@ -6,7 +6,9 @@ Your services are available at:
 {{- $root := . }}
 {{- range $name := include "cap.deploymentNames" . | split ";" }}
   {{- $deployment := (get $root.Values $name) }}
+  {{- if $deployment.expose.enabled }}
   {{- $ := merge (dict "name" $name "deployment" $deployment) $root }}
   {{- $url := include "cap.deploymentHostFull" $ }}
   {{ printf "%s - https://%s" $name $url }}
+  {{- end -}}
 {{- end }}

package/lib/init/template/helm-unified-runtime/files/templates/_deployment_helpers.tpl

@@ -51,7 +51,11 @@ copied from web-application: web-application.fullname
 Get FQDN of a deployment
 */}}
 {{- define "cap.deploymentHostFull" -}}
-{{ include "cap.deploymentHost" $ }}.{{ $.Values.global.domain }}
+{{- if not .deployment.expose.enabled }}
+{{- printf "%s-%s.%s.svc.cluster.local:8080" .Release.Name .name .Release.Namespace }}
+{{- else }}
+{{- include "cap.deploymentHost" $ }}.{{ $.Values.global.domain }}
+{{- end -}}
 {{- end -}}
 
 {{/*
@@ -73,7 +77,11 @@ Backend Destinations
     {{- $deployment := (get $root.Values $destination.service) -}}
     {{- $srv := merge (dict "name" $destination.service "destination" $destination "deployment" $deployment) $root -}}
     {{- $destinationHost := include "cap.deploymentHostFull" $srv -}}
-    {{- $currentDestination := dict $nameKey $destination.name $urlKey (print  "https://" $destinationHost ) -}}
+    {{- $protocol := "https" -}}
+    {{- if not $deployment.expose.enabled }}
+    {{- $protocol = "http" -}}
+    {{- end -}}
+    {{- $currentDestination := dict $nameKey $destination.name $urlKey (print  $protocol "://" $destinationHost ) -}}
     {{- $currentDestination := merge $currentDestination $.defaultParameters -}}
     {{- $destinations = (append $destinations $currentDestination) -}}
 {{- end -}}

package/lib/init/template/helm-unified-runtime/index.js

@@ -40,7 +40,7 @@ module.exports = class HelmUnifiedRuntimeTemplate extends require('../../plugin'
   }
 
   async combine() {
-    const { hasDestination, hasEnterpriseMessaging, hasHana, hasMultitenancy, hasXsuaa, hasHtml5Repo, hasApprouter } = readProject()
+    const { hasDestination, hasEnterpriseMessaging, hasHana, hasMultitenancy, hasXsuaa, hasHtml5Repo, hasApprouter, hasKafka } = readProject()
 
     if (hasApprouter) {
       await this._mergeDependency('web-application', 'approuter')
@@ -65,6 +65,9 @@ module.exports = class HelmUnifiedRuntimeTemplate extends require('../../plugin'
     if (hasXsuaa) {
       await this._mergeDependency('service-instance', 'xsuaa')
     }
+    if (hasKafka) {
+      await this._mergeDependency('service-instance', 'kafka')
+    }
     if (hasHana) {
       if (hasMultitenancy) {
         await this._mergeDependency('service-instance', 'service-manager')

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

@@ -57,7 +57,6 @@ module.exports = class Html5RepoTemplate extends require('../../plugin') {
                 into: [appContent, 'requires', 'name'],
             }]
             if (hasApprouter) {
-                console.log('aaddd')
                 additions.push(approuter, html5Runtime)
                 relationships.push({
                     insert: [html5Runtime, 'name'],

package/lib/init/template/kafka/files/values.yaml

@@ -0,0 +1,10 @@
+srv:
+  bindings:
+    kafka:
+      serviceInstanceName: kafka
+kafka:
+  serviceOfferingName: kafka
+  servicePlanName: standard
+  parameters:
+    public_ip: true
+    allow_access: []

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

@@ -6,7 +6,7 @@ const mvn = require('../../mvn')
 module.exports = class KafkaTemplate extends require('../../plugin') {
 
   static hasInProduction(env) {
-    return !!env.requires?.messaging?.kind === 'kafka'
+    return !!(env.requires?.messaging?.kind === 'kafka')
   }
 
   async run() {
@@ -18,7 +18,7 @@ module.exports = class KafkaTemplate extends require('../../plugin') {
 
   async combine() {
     const project = readProject()
-    const { hasMta, srvPath } = project
+    const { hasMta, srvPath, hasHelm, hasHelmUnifiedRuntime } = project
 
     if (hasMta) {
       const srv = srv4(srvPath)
@@ -32,9 +32,8 @@ module.exports = class KafkaTemplate extends require('../../plugin') {
       })
     }
 
-    // REVISIT: Helm support
-    // if (hasHelm || hasHelmUnifiedRuntime) {
-    //   await merge(__dirname, 'files', 'values.yaml').into('chart/values.yaml')
-    // }
+    if (hasHelm || hasHelmUnifiedRuntime) {
+      await merge(__dirname, 'files/values.yaml').into('chart/values.yaml')
+    }
   }
 }

package/lib/init/template/multitenancy/files/mtxs-configmap-java.yaml

@@ -1,6 +1,6 @@
 # Please do not modify this file. This file may be overwritten.
 
-{{- $ := merge (dict "name" "approuter" "deployment" .Values.srv ) . }}
+{{- $ := merge (dict "name" "srv" "deployment" .Values.srv ) . }}
 {{- $srvUrl := (include "cap.deploymentHostFull" $ )}}
 
 {{- $ = merge (dict "name" "sidecar" "deployment" .Values.sidecar ) . }}

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

@@ -36,7 +36,7 @@ module.exports = class MultitenancyTemplate extends require('../../plugin') {
 
   async combine() {
     const project = readProject()
-    const { isNodejs, isJava, hasMta, hasHelm, hasHelmUnifiedRuntime, hasXsuaa, hasHana, srvPath } = project
+    const { isNodejs, isJava, hasMta, hasHelm, hasHelmUnifiedRuntime, hasXsuaa, hasHana, srvPath, hasApprouter } = project
 
     if (hasMta) {
       const srv = srv4(srvPath)
@@ -103,8 +103,8 @@ module.exports = class MultitenancyTemplate extends require('../../plugin') {
         }}).into('chart/values.yaml', { with: project })
 
         await removeFromYAML(join('chart', 'values.yaml'), ['srv.expose', 'srv.networkSecurity'])
-        await copy(join(__dirname, 'files', `mtxs-configmap-${isJava ? 'java' : 'nodejs'}.yaml`)).to('chart', 'templates', 'mtxs-configmap.yaml') // REVISIT: Move to build task
-      await copy(join(__dirname, 'files', 'saas-registry-secret.yaml')).to('chart', 'templates', 'saas-registry-secret.yaml') // REVISIT: Move to build task
+        await copy(join(__dirname, 'files', `mtxs-configmap-${isJava ? 'java' : 'nodejs'}${hasApprouter ? '-approuter' : ''}.yaml`)).to('chart', 'templates', 'mtxs-configmap.yaml') // REVISIT: Move to build task
+        await copy(join(__dirname, 'files', 'saas-registry-secret.yaml')).to('chart', 'templates', 'saas-registry-secret.yaml') // REVISIT: Move to build task
     }
 
     if (hasXsuaa) {

package/lib/util/fs.js

@@ -28,7 +28,7 @@ module.exports = new class FsUtil {
     }
 
     async writeYAML(dst, yaml) {
-        const content = YAML.stringify(yaml, { collectionStyle: 'block' })
+        const content = YAML.stringify(yaml, { collectionStyle: 'block', lineWidth: 120 })
         await write(content).to(dst)
     }
 

package/npm-shrinkwrap.json

@@ -1,12 +1,12 @@
 {
   "name": "@sap/cds-dk",
-  "version": "7.8.0",
+  "version": "7.8.2",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@sap/cds-dk",
-      "version": "7.8.0",
+      "version": "7.8.2",
       "license": "SEE LICENSE IN LICENSE",
       "dependencies": {
         "@sap/cds": "^7",
@@ -161,7 +161,7 @@
       }
     },
     "node_modules/@humanwhocodes/object-schema": {
-      "version": "2.0.2",
+      "version": "2.0.3",
       "license": "BSD-3-Clause"
     },
     "node_modules/@nodelib/fs.scandir": {
@@ -215,7 +215,7 @@
       }
     },
     "node_modules/@sap/cds": {
-      "version": "7.8.0",
+      "version": "7.8.1",
       "license": "SEE LICENSE IN LICENSE",
       "dependencies": {
         "@cap-js/cds-types": "<1",
@@ -280,7 +280,7 @@
       }
     },
     "node_modules/@sap/eslint-plugin-cds": {
-      "version": "2.6.7",
+      "version": "2.7.0",
       "license": "See LICENSE file",
       "dependencies": {
         "@sap/cds": ">=5.6.0",
@@ -294,7 +294,7 @@
       }
     },
     "node_modules/@sap/hana-client": {
-      "version": "2.19.21",
+      "version": "2.20.15",
       "hasInstallScript": true,
       "license": "SEE LICENSE IN developer-license-3_1.txt",
       "dependencies": {
@@ -327,10 +327,10 @@
       }
     },
     "node_modules/@sap/hdi-deploy": {
-      "version": "4.9.2",
+      "version": "4.9.4",
       "license": "See LICENSE file",
       "dependencies": {
-        "@sap/hana-client": "2.19.21",
+        "@sap/hana-client": "2.20.15",
         "@sap/hdi": "4.5.2",
         "@sap/xsenv": "4.2.0",
         "async": "3.2.3",
@@ -2221,7 +2221,7 @@
       "license": "MIT"
     },
     "node_modules/node-abi": {
-      "version": "3.56.0",
+      "version": "3.57.0",
       "license": "MIT",
       "optional": true,
       "dependencies": {
@@ -2886,7 +2886,7 @@
       }
     },
     "node_modules/socks": {
-      "version": "2.8.1",
+      "version": "2.8.3",
       "license": "MIT",
       "optional": true,
       "dependencies": {

package/package.json

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

package/lib/init/template/approuter/files/approuter-mtxs-configmap.yaml

@@ -1,19 +0,0 @@
-# Please do not modify this file. This file may be overwritten.
-
-{{- $deployment := .Values.approuter }}
-{{- $ := merge (dict "name" "approuter" "deployment" $deployment) . }}
-{{- $approuterUrl := (include "cap.deploymentHostFull" $ )}}
-
-
-{{- $defaultParameters :=  dict "forwardAuthToken" true }}
-{{- $destinations := dict "root" . "defaultParameters" $defaultParameters }}
-
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: "{{ .Release.Name }}-approuter-configmap"
-  namespace: "{{ .Release.Namespace }}"
-data:
-  destinations: >
-    {{ include "cap.backendDestinations" $destinations }}
-  TENANT_HOST_PATTERN: {{ printf "^(.*)-%s" $approuterUrl }}