@sap/cds-dk 6.7.2 → 6.8.1

package/lib/init/template/extensibility/files/package.json.hbs

@@ -0,0 +1,20 @@
+{
+  {{#cap.isNodejs}}
+  "dependencies": {
+    "@sap/cds-mtxs": "^1"
+  },
+  "cds": {
+  {{/cap.isNodejs}}
+    "requires": {
+      {{#cap.for}}
+      "[{{cap.for}}]": {
+      {{/cap.for}}
+        "extensibility": true
+      {{#cap.for}}
+      }
+      {{/cap.for}}
+    }
+  {{#cap.isNodejs}}
+  }
+  {{/cap.isNodejs}}
+}

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

@@ -1,5 +1,5 @@
 const cds = require('../../../cds')
-const { read, write, exists } = cds.utils
+const { exists } = cds.utils
 const { join } = require('path')
 const { readProject } = require('../../util/projectReader')
 const { mergeJSON } = require('../../util/merge')
@@ -18,25 +18,13 @@ module.exports = class ExtensibilityTemplate extends require('../templateBase')
 
   async run() {
     const projectDescriptor = await readProject(this.options)
-    const { for: forProfile, isJava, hasSidecar } = projectDescriptor.cap
-    const cdsConfigPath = isJava ? '.cdsrc.json' : 'package.json'
-    const cdsTemplateFile = forProfile ? (isJava ? 'cdsrc.json.hbs' : 'cds.package.json.hbs') : (isJava ? 'cdsrc.json' : 'cds.package.json')
-    await mergeJSON(cdsConfigPath, join(__dirname, 'files', cdsTemplateFile), projectDescriptor)
-    if (hasSidecar) {
-      const out = join('mtx', 'sidecar', 'package.json')
-      const config = await read(out)
-      if (!config.cds) config.cds = {}
-      if (!config.cds.requires) config.cds.requires = {}
-      if (!('cds.xt.ExtensibilityService' in config.cds.requires)) {
-        config.cds.requires['cds.xt.ExtensibilityService'] = true
-        await write(out, config, { spaces: 2 })
-      }
-    }
+    const { configFile } = projectDescriptor.cap
+    await mergeJSON(configFile, join(__dirname, 'files', 'package.json.hbs'), projectDescriptor)
     await this.runDependentMerging()
   }
 
   async runDependentMerging() {
-    const projectDescriptor = await readProject()
+    const projectDescriptor = await readProject(this.options)
     const { hasXsuaa, hasApprouter } = projectDescriptor.cap
     if (hasXsuaa) {
       await mergeJSON(

package/lib/init/template/file-based-messaging/files/package.json.hbs

@@ -0,0 +1,19 @@
+{
+  {{#cap.isNodejs}}
+  "cds": {
+  {{/cap.isNodejs}}
+    "requires": {
+      {{#cap.for}}
+      "[{{cap.for}}]": {
+      {{/cap.for}}
+        "messaging": {
+          "kind": "file-based-messaging"
+        }
+      {{#cap.for}}
+      }
+      {{/cap.for}}
+    }
+  {{#cap.isNodejs}}
+  }
+  {{/cap.isNodejs}}
+}

package/lib/init/template/file-based-messaging/index.js

@@ -0,0 +1,25 @@
+const { join } = require('path')
+const cds = require('../../../cds'), { read } = cds.utils
+const { readProject } = require('../../util/projectReader')
+const { mergeJSON } = require('../../util/merge')
+
+module.exports = class FileBasedMessagingTemplate extends require('../templateBase') {
+
+  async canRun() {
+    const projectDescriptor = await readProject(this.options)
+    const { isJava } = projectDescriptor.cap
+    if (isJava) throw `'cds add file-based-messaging' is not available for Java yet`
+    return true
+  }
+
+  static hasFacet(env) {
+    return env.requires?.messaging?.kind === 'file-based-messaging'
+  }
+
+  async run() {
+    const projectDescriptor = await readProject(this.options)
+    const { configFile } = projectDescriptor.cap
+    projectDescriptor.cap.shortcut = !(await read(configFile)).cds?.requires?.messaging?.kind
+    await mergeJSON(configFile, join(__dirname, 'files', 'package.json.hbs'), projectDescriptor)
+  }
+}

package/lib/init/template/hana/files/package.json.hbs

@@ -0,0 +1,33 @@
+{
+  {{#cap.isNodejs}}
+  "dependencies": {
+      "hdb": "^0.19.0"
+  },
+  "cds": {
+  {{/cap.isNodejs}}
+    "requires": {
+      {{#cap.for}}
+      "[{{cap.for}}]": {
+        {{#cap.shortcut}}
+        "db": "hana-cloud"
+        {{/cap.shortcut}}
+        {{^cap.shortcut}}
+        "db": {
+          "kind": "hana-cloud"
+        }
+        {{/cap.shortcut}}
+      },
+      {{/cap.for}}
+      {{#cap.shortcut}}
+      "db": "{{^cap.for}}hana-cloud{{/cap.for}}{{#cap.for}}sql{{/cap.for}}"
+      {{/cap.shortcut}}
+      {{^cap.shortcut}}
+      "db": {
+        "kind": "sql"
+      }
+      {{/cap.shortcut}}
+    }
+  {{#cap.isNodejs}}
+  }
+  {{/cap.isNodejs}}
+}

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

@@ -1,18 +1,17 @@
 const { join } = require('path');
 const cds = require('../../../cds')
 const { read, write, exists, rmdir } = cds.utils
-const commandUtil = require('../../util/commandUtil');
-const mvnArchetypes = require('../../util/mvnArchetypeUtil');
+const commandUtil = require('../../../util/command');
+const mvnArchetypes = require('../../util/mvn');
 const term = require('../../../util/term');
 const { mergeJSON, mergeYAML, removeFromYAML, removeFromYAMLArray } = require('../../util/merge')
-const { parseMd5File, writeMd5File } = require('../../util/md5Tracking')
-const { copyFiles } = require('../../util/templateUtil')
+const { parseMd5File, writeMd5File } = require('../../util/md5')
+const { copyFiles } = require('../../util/template')
 const { readProject } = require('../../util/projectReader');
-const versionCompare = require('../../util/versionCompare');
 
-const { PROJECT_TYPE, OPTION_JAVA, URLS } = require('../../constants');
+const { OPTION_JAVA, URLS } = require('../../constants');
 
-const { srvNode, srvJava, hdbDeployer, serviceManager, hdiContainer, mtxSidecar4 } = require('../_merging/registry-mta');
+const { srvNode4, srvJava4, hdbDeployer, serviceManager, hdiContainer, mtxSidecar4 } = require('../_merging/registry-mta');
 
 module.exports = class HanaTemplate extends require('../templateBase') {
 
@@ -20,38 +19,44 @@ module.exports = class HanaTemplate extends require('../templateBase') {
         return env.requires?.db?.kind === 'hana'
     }
 
+    // REVISIT: Remove with CDS 7
     async canRun() {
         const cds = require('../../../cds')
-        if (versionCompare(cds.version, '5.9.0') < 0) {
+        const [major, minor] = cds.version.split('.').map(Number)
+        if (major < 5 || major === 5 && minor < 9) {
             cds.error('The added configuration requires @sap/cds 5.9.0 or higher. Please update @sap/cds to the latest version and run \x1b[1mcds add hana\x1b[0m again.')
         }
         return true
     }
 
     async run() {
-        const env = await this.getEnv();
-
-        const hdiConfigPath = join(env.folders.db, 'src', '.hdiconfig');
-        const hdiConfigTemplatePath = join(__dirname, 'files', 'common', 'src', '.hdiconfig');
-        await mergeJSON(hdiConfigPath, hdiConfigTemplatePath);
-
-        const undeployJSONPath = join(env.folders.db, 'undeploy.json');
-        const undeployJSONTemplatePath = join(__dirname, 'files', 'common', 'undeploy.json');
-        await mergeJSON(undeployJSONPath, undeployJSONTemplatePath);
-
-        const projectType = this.getProjectType();
-        switch (projectType) {
-            case PROJECT_TYPE.java: {
-                await copyFiles(join(__dirname, 'files', 'java', 'db'), join(env.folders.db), {}, this.options.force);
-                await this._updatePomXml();
-                await this._updateCdsConfiguration();
-                break;
-            }
-            case PROJECT_TYPE.nodejs: {
-                await this._updatePackageJson()
-                break;
-            }
-            default: break;
+        const projectDescriptor = await readProject(this.options)
+        const { isJava, configFile } = projectDescriptor.cap
+        projectDescriptor.cap.shortcut = !(await read(configFile)).cds?.requires?.db?.kind
+
+        const env = await this.getEnv() // REVISIT: Get info from projectDescriptor
+
+        // REVISIT: Let cds build generate by default
+        const hdiConfigPath = join(env.folders.db, 'src', '.hdiconfig')
+        const hdiConfigTemplatePath = join(__dirname, 'files', 'src', '.hdiconfig')
+        await mergeJSON(hdiConfigPath, hdiConfigTemplatePath)
+
+        // REVISIT: Let csd build generate by default
+        const undeployJSONPath = join(env.folders.db, 'undeploy.json')
+        const undeployJSONTemplatePath = join(__dirname, 'files', 'undeploy.json')
+        await mergeJSON(undeployJSONPath, undeployJSONTemplatePath)
+
+        if (isJava) {
+            await copyFiles(join(__dirname, 'files', 'db'), env.folders.db, {}, this.options.force)
+            await this._updatePomXml()
+        }
+
+        await mergeJSON(configFile, join(__dirname, 'files', 'package.json.hbs'), projectDescriptor, { forceOverwrite: true })
+
+        const packageJson = exists('package.json') ? await read('package.json') : undefined
+        if (packageJson?.dependencies) {
+            delete packageJson.dependencies['@sap/hana-client']
+            await write('package.json', packageJson, { spaces: 2 })
         }
         await this.runDependentMerging()
     }
@@ -74,12 +79,9 @@ module.exports = class HanaTemplate extends require('../templateBase') {
         const projectDescriptor = await readProject(this.options)
         const { hasMta, hasHelm, hasHtml5Repo, isJava, isMultitenant, srvPath } = projectDescriptor.cap
 
-        if (isMultitenant) {
-            await this._updateCdsConfiguration()
-        }
 
         if (hasMta) {
-            const srv = (isJava ? srvJava : srvNode)(srvPath)
+            const srv = (isJava ? srvJava4 : srvNode4)(srvPath)
             const db = isMultitenant ? serviceManager : hdiContainer
             const deletions = isMultitenant ? [{
                 item: hdbDeployer,
@@ -210,6 +212,7 @@ module.exports = class HanaTemplate extends require('../templateBase') {
                     cwd: cds.root
                 });
             } catch (err) {
+                // REVISIT: This should not have to be checked and tested in a facet implementation, move to Maven util
                 if (err.code === 'ENOENT' && err.path === 'mvn') {
                     throw new Error(`Maven executable 'mvn' not found, follow ${term.info(URLS.MAVEN_INSTALL_HELP)} and install Maven on your machine.`);
                 }
@@ -217,34 +220,4 @@ module.exports = class HanaTemplate extends require('../templateBase') {
             }
         }
     }
-
-    async _updatePackageJson() {
-        const packageJsonPath = join('package.json')
-        const dependenciesTemplatePath = join(__dirname, 'files', 'nodejs', 'dependencies.package.json');
-        await mergeJSON(packageJsonPath, dependenciesTemplatePath);
-
-        const packageJson = await read(packageJsonPath);
-        if ('@sap/hana-client' in packageJson.dependencies) {
-            delete packageJson.dependencies['@sap/hana-client'];
-            await write(packageJsonPath, packageJson, { spaces: 2 });
-        }
-
-        await this._updateCdsConfiguration()
-    }
-
-    async _updateCdsConfiguration(configPath) {
-        const projectType = this.getProjectType();
-        const configFile = projectType === PROJECT_TYPE.nodejs ? 'package.json' : '.cdsrc.json';
-        configPath = configPath ?? configFile
-        const projectDescriptor = await readProject(this.options);
-        const { for: forProfile } = projectDescriptor.cap;
-        let json; try { json = await read(configPath, 'utf8') } catch { /* ignore */ }
-        const _cds = projectType === PROJECT_TYPE.nodejs ? json?.cds : json;
-        const shortcut = typeof _cds?.requires?.db === 'string' || !json ? 'shortcut.' : '';
-        const profile = forProfile ? 'profile.' : '';
-        const cdsTemplateFile = `cds.${shortcut}${profile}json.hbs`
-        const { language } = projectDescriptor.cap;
-        const cdsTemplatePath = join(__dirname, 'files', language, cdsTemplateFile);
-        await mergeJSON(configPath, cdsTemplatePath, projectDescriptor, { forceOverwrite: true })
-    }
 }

package/lib/init/template/helm/chart/templates/_deployment_helpers.tpl

@@ -1,15 +1,3 @@
-{{/*
-Add custom env variables 
-*/}}
-{{- define "cap.env" -}}
-    {{- if . -}}
-        {{- range $name, $value := . }}
-- name: {{ $name | quote }}
-  value: {{ $value | quote }}
-        {{- end -}}
-    {{- end -}}
-{{- end -}}
-
 {{/*
 Get list of deployment names
 */}}

package/lib/init/template/helm/chart/templates/_helpers.tpl

@@ -1,24 +1,3 @@
-{{/*
-Check for mandatory configuration options
-*/}}
-{{- define "cap.expect" -}}
-{{-   $root := first . -}}
-{{-   $vars := rest . -}}
-{{-   range $path := $vars -}}
-{{-     $var := $root.Values -}}
-{{-     $segments := regexSplit "\\." $path -1 -}}
-{{-     $context := (dict "var" $var) -}}
-{{-     range $segment := $segments -}}
-{{-       $var := (get $context "var") -}}
-{{-       $var := get $var $segment -}}
-{{-       if empty $var -}}
-{{-         fail (join "" (list "Expect .Values." $path)) -}}
-{{-       end -}}
-{{-       $context := set $context "var" $var -}}
-{{-     end -}}
-{{-   end -}}
-{{- end -}}
-
 {{/*
 Labels for a component
 */}}
@@ -33,105 +12,6 @@ app.kubernetes.io/version: {{ .Chart.AppVersion }}
 {{- end }}
 {{- end -}}
 
-{{/*
-Labels to select a component
-*/}}
-{{- define "cap.selectorLabels" -}}
-app.kubernetes.io/name: {{ .name }}
-app.kubernetes.io/instance: {{ .Release.Name }}
-{{- end -}}
-
-{{/*
-Image
-*/}}
-{{- define "cap.image" -}}
-    {{- if .image.tag -}}
-{{ .image.repository }}:{{ .image.tag }}
-    {{- else -}}
-{{ .image.repository }}
-    {{- end -}}
-{{- end -}}
-
-{{/*
-Image Pull Policy
-*/}}
-{{- define "cap.imagePullPolicy" -}}
-    {{- if and (.image.tag) (ne .image.tag "latest") -}}
-IfNotPresent
-    {{- else -}}
-Always
-    {{- end -}}
-{{- end -}}
-
-{{/*
-Image Pull Secrets
-*/}}
-{{- define "cap.imagePullSecrets" -}}
-    {{- if (and .Values.global.imagePullSecret .Values.global.imagePullSecret.name) }}
-imagePullSecrets:
-- name: {{ .Values.global.imagePullSecret.name | quote }}
-    {{- end -}}
-{{- end -}}
-
-{{/*
-Service Instance NEW
-ternary dict ($.Files.Get $.service.config | fromJson)
-*/}}
-{{- define "cap.service-instance" -}}
-{{- $key := .Template.Name | lower | regexFind "[a-zA-Z0-9_-]+.yaml" | replace ".yaml" "" | replace "-" "_" }}
-{{- $service := get .Values $key }}
-{{- if $service }}
-{{- if or (not (hasKey $service "enabled")) $service.enabled }}
-{{- $name := $key | replace "_" "-" }}
-{{- $serviceParameters := $service.parameters | default (dict) }}
-{{- $configParameters := (dict) }}
-{{- if $service.config }}
-    {{- $configString := $.Files.Get $service.config }}
-    {{- if not $configString }}
-        {{- fail (print "Config file " $service.config " not found") }}
-    {{- end }}
-    {{- $_ := merge $configParameters (fromJson $configString) }}
-{{- end }}
-{{- $defaultParameters := $.defaultParameters | default dict }}
-{{ $parameters := merge $serviceParameters $configParameters $defaultParameters }}
-apiVersion: services.cloud.sap.com/v1alpha1
-kind: ServiceInstance
-metadata:
-  name: {{ include "cap.service-instance.serviceInstanceName" (dict "root" . "name" $name "service" $service) }}
-  namespace: {{ .Release.Namespace }}
-  labels: {{- include "cap.labels" (merge (dict "name" $name) .) | nindent 4 }}
-spec:
-  serviceOfferingName: {{ $service.serviceOfferingName }}
-  servicePlanName: {{ $service.servicePlanName }}
-  externalName: {{ .Release.Namespace }}-{{ include "cap.service-instance.serviceInstanceName" (dict "root" . "name" $name "service" $service) }}
-  parameters:
-{{ toYaml $parameters | indent 4 }}
-{{- end -}}
-{{- end -}}
-{{- end -}}
-
-{{/*
-    Service Instance
-    from web-application helm chart
-*/}}
-{{- define "cap.service-instance.serviceInstanceName" -}}
-  {{- if .service.fullnameOverride }}
-    {{- if gt (len .service.fullnameOverride) 63 }}
-      {{- fail (printf "name exceeds 63 characters: '%s'" .service.fullnameOverride) }}
-    {{- end }}
-    {{- .service.fullnameOverride }}
-  {{- else }}
-    {{- $name := .name }}
-    {{- if not (hasPrefix .root.Release.Name $name)}}
-      {{- $name = printf "%s-%s" .root.Release.Name $name }}
-    {{- end }}
-    {{- if gt (len $name) 63 }}
-      {{- fail (printf "name exceeds 63 characters: '%s'" $name) }}
-    {{- end }}
-    {{- $name }}
-  {{- end }}
-{{- end }}
-
 {{/*
     Saas Registry Parameters
 */}}
@@ -145,4 +25,4 @@ spec:
   {{- $_ := set $appUrls "getDependencies" (printf "https://%s%s" $srvHostFull $appUrls.getDependencies) }}
   {{- $_ := set $appUrls "onSubscription" (printf "https://%s%s" $srvHostFull $appUrls.onSubscription) }}
   {{- $parameters | mustToJson }}
-{{- end }}
+{{- end }}

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

@@ -2,7 +2,7 @@ const { join } = require('path');
 const { exists, rimraf } = require('../../../cds').utils;
 const { readProject } = require('../../util/projectReader');
 const { mergeYAML } = require('../../util/merge')
-const { parseMd5File, writeMd5File, copyAndTrack } = require('../../util/md5Tracking')
+const { parseMd5File, writeMd5File, copyAndTrack } = require('../../util/md5')
 
 module.exports = class HelmTemplate extends require('../templateBase') {
     constructor(generator, oldTrackingData = undefined, newTrackingData = {}) {

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

@@ -2,7 +2,7 @@ const { join } = require('path')
 const { exists } = require('../../../cds').utils
 const { readProject } = require('../../util/projectReader')
 const { mergeYAML } = require('../../util/merge')
-const { copyAndTrack, parseMd5File, writeMd5File } = require('../../util/md5Tracking')
+const { copyAndTrack, parseMd5File, writeMd5File } = require('../../util/md5')
 const { OPTION_DESTINATIONS } = require('../../constants')
 
 module.exports = class Html5RepoTemplate extends require('../templateBase') {

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

@@ -2,8 +2,8 @@ const fs = require('fs').promises;
 const os = require('os');
 const { join, relative } = require('path');
 
-const commandUtil = require('../../util/commandUtil');
-const mvnArchetypeUtil = require('../../util/mvnArchetypeUtil');
+const commandUtil = require('../../../util/command');
+const mvnArchetypeUtil = require('../../util/mvn');
 const term = require('../../../util/term');
 const cds = require('../../../cds')
 const { exists, copy } = cds.utils

package/lib/init/template/kibana-logging/files/package.json.hbs

@@ -0,0 +1,17 @@
+{
+  {{#cap.isNodejs}}
+  "cds": {
+  {{/cap.isNodejs}}
+    "features": {
+      {{#cap.for}}
+      "[{{cap.for}}]": {
+      {{/cap.for}}
+        "kibana_formatter": true
+      {{#cap.for}}
+      }
+      {{/cap.for}}
+    }
+  {{#cap.isNodejs}}
+  }
+  {{/cap.isNodejs}}
+}

package/lib/init/template/kibana-logging/index.js

@@ -2,8 +2,7 @@ const { join } = require('path')
 const cds = require('../../../cds')
 const { readProject } = require('../../util/projectReader')
 const { mergeJSON, mergeYAML } = require('../../util/merge')
-const { PROJECT_TYPE } = require('../../constants')
-const { srvNode, srvJava, kibanaLogging } = require('../_merging/registry-mta')
+const { srvNode4, srvJava4, kibanaLogging } = require('../_merging/registry-mta')
 
 module.exports = class KibanaLoggingTemplate extends require('../templateBase') {
 
@@ -17,22 +16,10 @@ module.exports = class KibanaLoggingTemplate extends require('../templateBase')
     }
 
     async run() {
-        const projectType = this.getProjectType()
-
-        switch (projectType) {
-            case PROJECT_TYPE.java:
-            default:
-                cds.error(`kibana-logging is not implemented for project type '${projectType}' yet`)
-                // TODO: implement
-                break
-            case PROJECT_TYPE.nodejs: {
-                const projectDescriptor = await readProject(this.options);
-                const { for: forProfile } = projectDescriptor.cap
-                const cdsTemplateFile = forProfile ? 'cds.profile.package.json.hbs' : 'cds.package.json'
-                const cdsTemplatePath = join(__dirname, 'files', cdsTemplateFile)
-                await mergeJSON('package.json', cdsTemplatePath, projectDescriptor)
-            }
-        }
+        const projectDescriptor = await readProject(this.options)
+        const { isJava } = projectDescriptor.cap
+        if (isJava) cds.error(`kibana-logging is not implemented for project type Java yet`)
+        await mergeJSON('package.json', join(__dirname, 'files', 'package.json.hbs'), projectDescriptor)
         await this.runDependentMerging()
     }
 
@@ -41,7 +28,7 @@ module.exports = class KibanaLoggingTemplate extends require('../templateBase')
         const { hasMta, isNodejs, srvPath } = projectDescriptor.cap
 
         if (hasMta) {
-            const srv = (isNodejs ? srvNode : srvJava)(srvPath)
+            const srv = (isNodejs ? srvNode4 : srvJava4)(srvPath)
             await mergeYAML(
                 'mta.yaml',
                 join(__dirname, 'files', 'mta.yaml.hbs'),

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

@@ -5,7 +5,7 @@ const term = require("../../../util/term");
 const checks = require("../../../lint/checks");
 const io = require("../../../lint/io");
 const readline = require("readline");
-const { copyFiles } = require('../../util/templateUtil')
+const { copyFiles } = require('../../util/template')
 const { OPTION_LINT_DEV, OPTION_LINT_GLOBAL } = require("../../constants");
 const { getConfigPath, getFileExtensions } = require("@sap/eslint-plugin-cds/lib/api");
 const cds = require("../../../cds");

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

@@ -1,7 +1,7 @@
 const { join } = require('path');
 const cds = require('../../../cds')
 const { exists } = cds.utils
-const { copyFiles } = require('../../util/templateUtil')
+const { copyFiles } = require('../../util/template')
 const { readProject } = require('../../util/projectReader');
 
 module.exports = class MtaTemplate extends require('../templateBase') {
@@ -18,7 +18,7 @@ module.exports = class MtaTemplate extends require('../templateBase') {
         }
 
         // Re-applying the dependent merging part of other facets if necessary.
-        const dependentFacets = ['approuter', 'hana', 'xsuaa', 'multitenancy', 'extensibility', 'enterprise-messaging']
+        const dependentFacets = ['approuter', 'hana', 'xsuaa', 'multitenancy', 'extensibility', 'enterprise-messaging', 'enterprise-messaging-shared', 'redis-messaging']
         for (const facet of dependentFacets) {
             const Template = require('../'+facet)
             const template = new Template(this.generator)

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

@@ -1,10 +1,8 @@
 # Please do not modify this file. This file may be overwritten.
 
-{{- $approuterDeployment := .Values.approuter }}
-{{- $ := merge (dict "name" "approuter" "deployment" .Values.approuter ) . }}
-{{- $approuterUrl := (include "cap.deploymentHostFull" $ )}}
+{{- $ := merge (dict "name" "approuter" "deployment" .Values.srv ) . }}
+{{- $srvUrl := (include "cap.deploymentHostFull" $ )}}
 
-{{- $sidecarDeployment := .Values.sidecar }}
 {{- $ = merge (dict "name" "sidecar" "deployment" .Values.sidecar ) . }}
 {{- $sidecarUrl := (include "cap.deploymentHostFull" $ )}}
 
@@ -15,6 +13,6 @@ metadata:
   namespace: "{{ .Release.Namespace }}"
 data:
   CDS_MULTITENANCY_APPUI_TENANTSEPARATOR: "-"
+  CDS_MULTITENANCY_APPUI_URL: {{ printf "https://%s" $srvUrl }}
   CDS_MULTITENANCY_MTXS_ENABLED: "true"
-  CDS_MULTITENANCY_APPUI_URL: {{ printf "https://%s" $approuterUrl }}
   CDS_MULTITENANCY_SIDECAR_URL: {{ printf "https://%s" $sidecarUrl }}

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

@@ -1,12 +1,7 @@
 # Please do not modify this file. This file may be overwritten.
 
-{{- $approuterDeployment := .Values.approuter }}
-{{- $ := merge (dict "name" "approuter" "deployment" .Values.approuter ) . }}
-{{- $approuterUrl := (include "cap.deploymentHostFull" $ )}}
-
-{{- $sidecarDeployment := .Values.sidecar }}
-{{- $ = merge (dict "name" "sidecar" "deployment" .Values.sidecar ) . }}
-{{- $sidecarUrl := (include "cap.deploymentHostFull" $ )}}
+{{- $ := merge (dict "name" "srv" "deployment" .Values.srv ) . }}
+{{- $srvUrl := (include "cap.deploymentHostFull" $ )}}
 
 apiVersion: v1
 kind: ConfigMap
@@ -14,6 +9,4 @@ metadata:
   name: "{{ .Release.Name }}-mtxs-configmap"
   namespace: "{{ .Release.Namespace }}"
 data:
-  CDS_MULTITENANCY_APPUI_TENANTSEPARATOR: "-"
-  CDS_MULTITENANCY_APPUI_URL: {{ printf "https://%s" $approuterUrl }}
-  SUBSCRIPTION_URL: {{ printf "https://${tenant_subdomain}-%s" $approuterUrl }}
+  SUBSCRIPTION_URL: {{ printf "https://${tenant_subdomain}-%s" $srvUrl }}

package/lib/init/template/multitenancy/files/package.json.hbs

@@ -3,8 +3,8 @@
   "dependencies": {
     "@sap/cds-mtxs": "^1"
   },
-  {{/cap.isNodejs}}
   "cds": {
+  {{/cap.isNodejs}}
     {{#cap.isJava}}
     "profiles": ["with-mtx-sidecar", "java"],
     "build": {
@@ -17,12 +17,13 @@
     "requires": {
       {{#cap.for}}
       "[{{cap.for}}]": {
+      {{/cap.for}}
         "multitenancy": true
+      {{#cap.for}}
       }
       {{/cap.for}}
-      {{^cap.for}}
-      "multitenancy": true
-      {{/cap.for}}
     }
+  {{#cap.isNodejs}}
   }
+  {{/cap.isNodejs}}
 }