@sap/cds-dk 7.5.1 → 7.6.1

package/lib/import/common.js

@@ -148,30 +148,11 @@ async function _copyToSrvExternal(file, dst, cwd) {
     return file;
 }
 
-async function isValidJsonObject(options){
-    let config;
-    try {
-        if (options.config) {
-            config = JSON.parse(options.config);
-            return config;
-        }
-    } catch (error) {
-        throw new Error(messages.SPECIFY_CONFIG);
-    }
-} 
-
 async function preProcess(file, options, cwd) {
     let srcFilePath = await isValidInputFile(path.resolve(cwd, file));
     if (options.as && !_supportedAsFormats().includes(options.as))
         throw new Error(messages.INVALID_AS_OPTION);
-
-    const external = path.resolve(cwd, 'srv/external');
-    const destFilePath = path.join(external, path.basename(srcFilePath));
-
-    if (!options.dry && !options.no_copy)
-        srcFilePath = await _copyToSrvExternal(srcFilePath, destFilePath, cwd);
-
-    return [srcFilePath, destFilePath];
+    return srcFilePath;
 }
 
 async function processOptions(cliOptions, odataOptions) {
@@ -359,14 +340,28 @@ async function _updatePackageJson(dest, services, kind, cwd, config) {
     }
 }
 
+function _parseValidJsonConfig(config) {
+    try {
+        if (config) {
+            return JSON.parse(config);
+        }
+    } catch (error) {
+        throw new Error(messages.SPECIFY_CONFIG);
+    }
+}
+
 async function postProcess(filePath, options, csn, cwd) {
     const services = _getServiceNames(csn);
-    let config = await isValidJsonObject(options);
-    if (options.out) options.out = _validateAndComputeOutputFilePath(options.out, options.as, filePath);
+    let config = _parseValidJsonConfig(options.config);
+    const external = path.resolve(cwd, 'srv/external');
+    const destFilePath = path.join(external, path.basename(filePath));
+    if (options.out) options.out = _validateAndComputeOutputFilePath(options.out, options.as, destFilePath);
     const kind = options.inputFileKind;
-    const result = await _getResult(csn, options.as, options.out || filePath.replace(/\.[^.]+$/, ''), options.force, kind);
+    const result = await _getResult(csn, options.as, options.out || destFilePath.replace(/\.[^.]+$/, ''), options.force, kind);
     const written = options.dry || await _write(result, services, cwd);
     const registered = options.dry || options.no_save || await _updatePackageJson(result[1].replace(/\.[^.]+$/, ''), services, kind, cwd, config);
+    if (!options.dry && !options.no_copy)
+        await _copyToSrvExternal(filePath, destFilePath, cwd);
     if (options.dry) return console.log(result[0]);
     return Promise.all([written, registered]);
 }

package/lib/import/odata/metadataconverter/MetadataConverter.js

@@ -1025,7 +1025,6 @@ MetadataConverter.Context = Context;
 * @param {Object} result The metadata abstract syntax tree of the depended metadata document
 */
 
-
 /**
 * This callback is displayed as part of the DefaultXmlStrategy class.
 * This factory is called when the converter can not find a needed type within the current metadata document.
@@ -1073,7 +1072,6 @@ The result must be returned via 'return' statement.
 * @returns {Expression} The expression to interpret the current element node
 */
 
-
 /**
 * This callback is displayed as part of the DefaultXmlStrategy class.
 * This callback is called on finishing a strategy.
@@ -1083,7 +1081,6 @@ The result must be returned via 'return' statement.
 * @param {Any} result The output of the Strategy
 */
 
-
 class DefaultXmlStrategy extends Strategy {
     constructor(options) {
         super(undefined, options);
@@ -1243,7 +1240,6 @@ class DefaultXmlStrategy extends Strategy {
 }
 MetadataConverter.DefaultXmlStrategy = DefaultXmlStrategy;
 
-
 class EdmxRootExpression extends Expression {
     constructor(element, expression, context) { super(element, expression, context); }
     interpret() {
@@ -1441,7 +1437,6 @@ class AbstractLogicalExpression extends Expression {
     }
 }
 
-
 class AndExpression extends AbstractLogicalExpression {
     constructor(element, expression, context) { super(element, expression, context, '$And'); }
 }
@@ -1671,8 +1666,18 @@ class PropertyValueExpression extends Expression {
         this.setTarget(target);
         this.buildTypeCollectionAndFacets('$Type');
 
+        /**
+         * We can have instances of EDMX where we see value for a particular attribute as:
+         * AnnotationPath="part/icipants/@UI.LineItem" or Path="SAP__Messages/random”, etc
+         * 
+         * In such cases we need to replace '/' with '.' and only then the CSN generated will
+         * be treated correctly in the later steps.
+         * * For now this is only done for AnnotationPath value in #1680 to resolve an issue
+         * * TODO: In future we might have to do it for many such value.
+         */
         if (element.attributes.Path) target[name] = { "=": element.attributes.Path };
         if (element.attributes.PropertyPath) target[name] = { "=": element.attributes.PropertyPath };
+        if (element.attributes.AnnotationPath) target[name] = { "=": (element.attributes.AnnotationPath).replaceAll('/', '.') };
         if (element.attributes.EnumMember) target[name] = { "#": element.attributes.EnumMember.substring(element.attributes.EnumMember.lastIndexOf('/') + 1) };
         if (element.attributes.NavigationPropertyPath) target[name] = { "=": element.attributes.NavigationPropertyPath };
         if (element.attributes.String) target[name] = element.attributes.String;
@@ -1684,8 +1689,8 @@ class PropertyValueExpression extends Expression {
         if (element.attributes.Bool) target[name] = element.attributes.Bool === 'true';
         /**
          * If the property valus is of type `Date`, import it as a string itself
-         * <PropertyValue Property="Date" Date="2021-08-24" />
-         * We might have to have a strict check in the futore.. 'YYYY-MM_DD`
+         * <PropertyValue Property="Date" Date="2021-08-24"/>
+         * We might have to have a strict check in the future.. 'YYYY-MM_DD`
          */
         if (element.attributes.Date) target[name] = element.attributes.Date;
 
@@ -2411,7 +2416,6 @@ class OnDeleteExpression extends Expression {
 
 }
 
-
 MetadataConverter.createOdataV4MetadataXmlToOdataV4CsdlStrategy = (name_space) => {
     MetadataConverter.custom_namespace = name_space;
     return new MetadataConverter.DefaultXmlStrategy()

package/lib/import/odata/v4parser.js

@@ -426,8 +426,8 @@ function _parseAnnotationTerms(annotationTerm, annotationTermObject, csnDefsTarg
 function _resolveAnotationTerm(schemaDataAnnotation, parserContext) {
     // Case 1: We have the Namespace and Alias for the vocabulary
     for (const [alias, namespace] of Object.entries(parserContext.vocabAliasToNamespace)) {
-        if (schemaDataAnnotation.includes('@' + alias)) {
-            schemaDataAnnotation = schemaDataAnnotation.split('@' + alias).join('@' + known_vocabularies[namespace]);
+        if (schemaDataAnnotation.includes('@' + alias + '.')) {
+            schemaDataAnnotation = schemaDataAnnotation.split('@' + alias + '.').join('@' + known_vocabularies[namespace] + '.');
         }
     }
     /**
@@ -1225,6 +1225,15 @@ function _addSuffixForCollisionTypes(fqName, suffix) {
 function _parseEntityContainer(csnDefs, entityContainerElements, parserContext) {
     const entityContainerElementNames = Object.keys(entityContainerElements);
     const redundantElementNames = [];
+    let possibleAnnotations = {};
+
+    // filter entries starting with '@', they can be possible annotation
+    entityContainerElementNames.filter(
+        elementName => elementName.startsWith('@')
+    ).forEach(elementName => {
+        possibleAnnotations[elementName] = entityContainerElements[elementName];
+        delete entityContainerElements[elementName];
+    });
 
     entityContainerElementNames.forEach(ecElement => {
         if (entityContainerElements[ecElement] instanceof Object) {
@@ -1294,6 +1303,49 @@ function _parseEntityContainer(csnDefs, entityContainerElements, parserContext)
         delete csnDefs[name];
     });
 
+    // check for possible annotations present within the entity container
+    if (Object.keys(possibleAnnotations).length > 0) {
+        let entityContainerAnnotations = {};
+        let annotationTarget = parserContext.primarySchema + '.' + parserContext.entityContainerName;
+        possibleAnnotations = _resolveAnotationTerm(
+            JSON.stringify(possibleAnnotations), parserContext
+        );
+        /**
+         * If the same annotation target already exists because of the annotation present outside
+         * of the EntityContainer, then append the possible annotations to it and parse all of them.
+         * Few exact same annotation term if exists, will result in information being overwritten
+         * by the annotation term present within the EntityContainer.
+         */
+        if (Object.keys(parserContext.entityContainerAnnotations).length > 0) {
+            entityContainerAnnotations = parserContext.entityContainerAnnotations;
+            /**
+             * When the parserContext.entityContainerAnnotations contains the annotation target,
+             * and we have unique information present within EntityContainer as well as indipendent
+             * annotation, we have to merge them.
+             */
+            if (parserContext.entityContainerAnnotations[annotationTarget] &&
+                Object.keys(parserContext.entityContainerAnnotations[annotationTarget]).length > 0
+            ) {
+                entityContainerAnnotations[annotationTarget] = Object.assign(
+                    entityContainerAnnotations[annotationTarget], 
+                    possibleAnnotations
+                );
+            }
+            /**
+             * If the annotation target name is different, we can expand all of the information
+             * into a single object itself
+             */
+            else {
+                entityContainerAnnotations[annotationTarget] = possibleAnnotations;
+            }
+        }
+        // Simply add the possible annotations to the object with the target
+        else {
+            entityContainerAnnotations[annotationTarget] = possibleAnnotations;
+        }
+        parserContext.entityContainerAnnotations = entityContainerAnnotations;
+    }
+
     // parse all the entity container annotations
     if (parserContext.entityContainerAnnotations) {
         _parseAnnotations(parserContext.entityContainerAnnotations, csnDefs, parserContext);
@@ -1450,6 +1502,17 @@ function _collectSchemaElements(edmxAsJson, schemaDataList, parserContext) {
 
     _collectUnboundedActionFunction(schemaDataList, parserContext);
 
+    // capture all the references
+    if (edmxAsJson.$Reference) {
+        Object.entries(edmxAsJson.$Reference).forEach(ref => {
+            if (ref[1].$Include[0].$Alias &&
+                known_vocabularies.hasOwnProperty(ref[1].$Include[0].$Namespace)
+            ) {
+                parserContext.vocabAliasToNamespace[ref[1].$Include[0].$Alias] = ref[1].$Include[0].$Namespace;
+            }
+        });
+    }
+
     // collect entityType, enumType, complexType, typeDefinition, bounded action/function, annotations
     for (let schemaData of schemaDataList) {
         let currNamespace = schemaData.$SchemaNamespace;
@@ -1472,15 +1535,6 @@ function _collectSchemaElements(edmxAsJson, schemaDataList, parserContext) {
                 }
                 // annotations
                 else if (elementName === '$Annotations') {
-                    if (edmxAsJson.$Reference) {
-                        Object.entries(edmxAsJson.$Reference).forEach(ref => {
-                            if (ref[1].$Include[0].$Alias &&
-                                known_vocabularies.hasOwnProperty(ref[1].$Include[0].$Namespace)
-                            ) {
-                                parserContext.vocabAliasToNamespace[ref[1].$Include[0].$Alias] = ref[1].$Include[0].$Namespace;
-                            }
-                        });
-                    }
                     schemaData.$Annotations = _resolveAnotationTerm(JSON.stringify(schemaData.$Annotations), parserContext);
                     /**
                      * collect entity container annotations with the assumption that
@@ -1552,7 +1606,8 @@ function _preProcess(edmxAsJson, parserContext, importerContext) {
         parserContext.entityToEntitySetMap._.size === 0 &&
         parserContext.entityToSingletonMap._.size === 0 &&
         parserContext.actionToActionImportMap._.size === 0 &&
-        parserContext.functionToFunctionImportMap._.size === 0) {
+        parserContext.functionToFunctionImportMap._.size === 0)
+    {
         parserContext.mockServerUc = false;
     }
 

package/lib/init/constants.js

@@ -4,7 +4,7 @@ module.exports = {
     COMMAND_INIT: 'init',
     COMMAND_ADD: 'add',
 
-    MAVEN_ARCHETYPE_VERSION: '2.4.1',
+    MAVEN_ARCHETYPE_VERSION: '2.5.0',
 
     OPTIONS: Object.freeze({
         JAVA: 'java',
@@ -57,9 +57,7 @@ module.exports = {
         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_INSTALL_HELP: `https://maven.apache.org/install.html`,
-        VSCODE: 'https://code.visualstudio.com/',
-        VSCODE_ESLINT: 'https://marketplace.visualstudio.com/items?itemName=dbaeumer.vscode-eslint'
+        MAVEN_INSTALL_HELP: `https://maven.apache.org/install.html`
     }),
 
     PROJECT_FILES: ['package.json', 'pom.xml', '.cdsrc.json']

package/lib/init/merge.js

@@ -234,7 +234,7 @@ async function _mergeYAML(into, from, project, semantics = {}) {
             if (!templateCollection) _traverseYAMLNode(node, i, actions)
         })
 
-        if (!templateCollection) return
+        if (!templateCollection?.items) return
 
         templateCollection.items.forEach((templateNode, templateIndex) => {
             if (YAML.isScalar(templateNode)) {
@@ -381,6 +381,7 @@ async function removeFromYAML(name, keyPaths) {
                 node.delete(key)
             } else {
                 node = node.get(key)
+                if(node === undefined) break;
             }
         }
     }

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

@@ -9,9 +9,8 @@ module.exports = class ApplicationLoggingTemplate extends require('../../plugin'
     }
 
     async canRun() {
-        const { hasMta, hasHelm, hasHelmUnifiedRuntime, isJava } = readProject()
+        const { hasMta, hasHelm, hasHelmUnifiedRuntime } = readProject()
         if ((hasHelmUnifiedRuntime || hasHelm) && !hasMta) throw `'cds add application-logging' is not available for Kyma yet`
-        if (isJava) throw `'cds add application-logging' is not available for Java yet`
         return true
     }
 

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

@@ -62,10 +62,12 @@ modules:
   - name: {{appName}}-mtx
     type: nodejs
     path: {{#isNodejs}}gen/{{/isNodejs}}mtx/sidecar
+    {{#isNodejs}}
     requires:
       - name: app-api
         properties:
           SUBSCRIPTION_URL: ~{app-protocol}://\${tenant_subdomain}-~{app-uri}
+    {{/isNodejs}}
   {{/hasMultitenancy}}
 
 resources:

package/lib/init/template/approuter/files/package.json

@@ -1,7 +1,7 @@
 {
   "name": "approuter",
   "dependencies": {
-    "@sap/approuter": "^14.0.0"
+    "@sap/approuter": "^16.0.0"
   },
   "engines": {
     "node": "^20.0.0"

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

@@ -28,4 +28,11 @@ approuter:
       path: /
     readiness:
       path: /
-backendDestinations: {}
+backendDestinations: {}
+{{^hasMultitenancy}}
+srv:
+  expose:
+    enabled: false
+  networkSecurity:
+    allowNamespaceInternal: true
+{{/hasMultitenancy}}

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

@@ -1,5 +1,6 @@
 [
     "src/gen/**/*.hdbview",
     "src/gen/**/*.hdbindex",
-    "src/gen/**/*.hdbconstraint"
-]
+    "src/gen/**/*.hdbconstraint",
+    "src/gen/**/*_drafts.hdbtable"
+]

package/lib/init/template/helm/files/chart/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/files/chart/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/files/content-deployment/Chart.yaml

@@ -4,4 +4,4 @@ name: content-deployment
 sources:
 - https://github.tools.sap/unified-runtime/content-deployment
 type: application
-version: 1.3.0
+version: 1.4.0

package/lib/init/template/helm/files/content-deployment/templates/_helpers.tpl

@@ -2,7 +2,7 @@
 Expand the name of the chart.
 */}}
 {{- define "content-deployment.internal.name" -}}
-{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" }}
+{{- tpl (default .Chart.Name .Values.nameOverride) . | trunc 63 | trimSuffix "-" }}
 {{- end }}
 
 {{/*
@@ -12,12 +12,13 @@ If release name contains chart name it will be used as a full name.
 */}}
 {{- define "content-deployment.internal.fullname" -}}
   {{- if .Values.fullnameOverride }}
-    {{- if gt (len .Values.fullnameOverride) 63 }}
-      {{- fail (printf "name exceeds 63 characters: '%s'" .Values.fullnameOverride) }}
+    {{- $name := tpl .Values.fullnameOverride . }}
+    {{- if gt (len $name) 63 }}
+      {{- fail (printf "name exceeds 63 characters: '%s'" $name) }}
     {{- end }}
-    {{- .Values.fullnameOverride }}
+    {{- $name }}
   {{- else }}
-    {{- $name := default .Chart.Name .Values.nameOverride }}
+    {{- $name := tpl (default .Chart.Name .Values.nameOverride) . }}
     {{- if not (eq .Release.Name $name)}}
       {{- $name = printf "%s-%s" .Release.Name $name }}
     {{- end }}

package/lib/init/template/helm/files/content-deployment/values.yaml

@@ -15,7 +15,7 @@ global:
     _internal:
       content-deployment:
         versions:
-          1.3.0: true
+          1.4.0: true
 # Will be used instead of the `.Chart.Name`, e.g. when generating the Deployment name.
 # nameOverride: name
 

package/lib/init/template/helm/files/service-instance/Chart.yaml

@@ -4,4 +4,4 @@ name: service-instance
 sources:
 - https://github.tools.sap/unified-runtime/service-instance
 type: application
-version: 1.1.1
+version: 1.2.0

package/lib/init/template/helm/files/service-instance/templates/_helpers.tpl

@@ -2,7 +2,7 @@
 Expand the name of the chart.
 */}}
 {{- define "service-instance.internal.name" -}}
-{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" }}
+{{- tpl (default .Chart.Name .Values.nameOverride) . | trunc 63 | trimSuffix "-" }}
 {{- end }}
 
 {{/*
@@ -12,12 +12,13 @@ If release name contains chart name it will be used as a full name.
 */}}
 {{- define "service-instance.internal.fullname" -}}
   {{- if .Values.fullnameOverride }}
-    {{- if gt (len .Values.fullnameOverride) 63 }}
-      {{- fail (printf "name exceeds 63 characters: '%s'" .Values.fullnameOverride) }}
+    {{- $name := tpl .Values.fullnameOverride . }}
+    {{- if gt (len $name) 63 }}
+      {{- fail (printf "name exceeds 63 characters: '%s'" $name) }}
     {{- end }}
-    {{- .Values.fullnameOverride }}
+    {{- $name }}
   {{- else }}
-    {{- $name := default .Chart.Name .Values.nameOverride }}
+    {{- $name := tpl (default .Chart.Name .Values.nameOverride) . }}
     {{- if not (eq .Release.Name $name)}}
       {{- $name = printf "%s-%s" .Release.Name $name }}
     {{- end }}

package/lib/init/template/helm/files/service-instance/values.yaml

@@ -40,4 +40,4 @@ global:
     _internal:
       service-instance:
         versions:
-          1.1.1: true
+          1.2.0: true

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.9.0
+version: 1.10.0

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

@@ -2,7 +2,7 @@
 Expand the name of the chart.
 */}}
 {{- define "web-application.name" -}}
-{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" }}
+{{- tpl (default .Chart.Name .Values.nameOverride) . | trunc 63 | trimSuffix "-" }}
 {{- end }}
 
 {{/*
@@ -12,12 +12,13 @@ If release name contains chart name it will be used as a full name.
 */}}
 {{- define "web-application.fullname" -}}
   {{- if .Values.fullnameOverride }}
-    {{- if gt (len .Values.fullnameOverride) 63 }}
-      {{- fail (printf "name exceeds 63 characters: '%s'" .Values.fullnameOverride) }}
+    {{- $name := tpl .Values.fullnameOverride . }}
+    {{- if gt (len $name) 63 }}
+      {{- fail (printf "name exceeds 63 characters: '%s'" $name) }}
     {{- end }}
-    {{- .Values.fullnameOverride }}
+    {{- $name }}
   {{- else }}
-    {{- $name := default .Chart.Name .Values.nameOverride }}
+    {{- $name := tpl (default .Chart.Name .Values.nameOverride) . }}
     {{- if not (eq .Release.Name $name)}}
       {{- $name = printf "%s-%s" .Release.Name $name }}
     {{- end }}

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

@@ -15,7 +15,7 @@ global:
     _internal:
       web-application:
         versions:
-          1.9.0: true
+          1.10.0: true
 ## Will be used instead of the `.Chart.Name`, e.g. when generating the Deployment name.
 # nameOverride: name
 

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

@@ -14,6 +14,7 @@ module.exports = class HelmTemplate extends require('../../plugin') {
         return true
     }
 
+    // Won't need this any more with plugin approach: package not there -> plugin not pulled
     static hasInProduction() {
         const { add } = cds.cli.options
         return exists(join('chart', 'charts', 'web-application')) && exists(join('chart', 'values.yaml') || add.has('helm'))
@@ -44,20 +45,8 @@ module.exports = class HelmTemplate extends require('../../plugin') {
             hasContentDeployment = true
             await this._mergeDependency('service-instance', 'html5-apps-repo-host')
             await this._mergeDependency('content-deployment', 'html5-apps-deployer')
-
             if (hasApprouter) {
                 await this._mergeDependency('service-instance', 'html5-apps-repo-runtime')
-                await merge({
-                    'html5-apps-repo-runtime': {
-                        serviceOfferingName: 'html5-apps-repo',
-                        servicePlanName: 'app-runtime'
-                    },
-                    approuter: {
-                        bindings: {
-                            'html5-apps-repo-runtime': { serviceInstanceName: 'html5-apps-repo-runtime' }
-                        }
-                    },
-                }).into('chart/values.yaml')
             }
         }
         if (hasMultitenancy) {

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

@@ -1,5 +1,5 @@
 const cds = require('../../..')
-const { copy, rimraf, exists } = cds.utils
+const { copy, rimraf, exists, fs } = cds.utils
 const { join } = require('path')
 
 // cds.build?.register('helm-unified-runtime', {
@@ -19,7 +19,8 @@ module.exports = class HelmUnifiedRuntimeTemplate extends cds.add.Plugin {
   }
 
   static hasInProduction() {
-      return exists(join('chart', 'values.yaml')) && !exists(join('chart', 'charts', 'web-application')) || cds.cli.options.add.has('helm-unified-runtime')
+      const chart = exists(join('chart/Chart.yaml')) ? fs.readFileSync(join(cds.root, 'chart/Chart.yaml'), 'utf8') : ''
+      return chart.includes('https://int.repositories.cloud.sap/artifactory/virtual-unified-runtime-helm-dmz') || cds.cli.options.add.has('helm-unified-runtime')
   }
 
   async run() {

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

@@ -26,3 +26,12 @@ backendDestinations: {}
 destination:
   parameters:
     HTML5Runtime_enabled: true
+{{#hasApprouter}}
+html5-apps-repo-runtime:
+  serviceOfferingName: html5-apps-repo
+  servicePlanName: app-runtime
+approuter:
+  bindings:
+    html5-apps-repo-runtime:
+      serviceInstanceName: 'html5-apps-repo-runtime'
+{{/hasApprouter}}

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

@@ -5,8 +5,7 @@
     "@sap/cds-hana": "^2",
     "@sap/cds-mtxs": "^1.9",
     "@sap/xssec": "^3",
-    "express": "^4",
-    "passport": ">=0.6.0"
+    "express": "^4"
   },
   "devDependencies": {
     "@cap-js/sqlite": "^1"

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

@@ -3,7 +3,7 @@ const cds = require('../../../cds')
 const { read, write, copy } = cds.utils
 const mvn = require('../../mvn')
 const { readProject } = require('../../projectReader')
-const { merge, sort } = require('../../merge')
+const { merge, sort, removeFromYAML } = require('../../merge')
 const { copyRenderedJSON } = require('../../../util/fs')
 const {
   srv4, // Server
@@ -102,7 +102,8 @@ module.exports = class MultitenancyTemplate extends require('../../plugin') {
           ]
         }}).into('chart/values.yaml', { with: project })
 
-      await copy(join(__dirname, 'files', `mtxs-configmap-${isJava ? 'java' : 'nodejs'}.yaml`)).to('chart', 'templates', 'mtxs-configmap.yaml') // REVISIT: Move to build task
+        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
     }
 

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

@@ -1,8 +1,7 @@
 {
   {{#isNodejs}}
   "dependencies": {
-    "@sap/xssec": "^3",
-    "passport": "^0"
+    "@sap/xssec": "^3"
   },
   "cds": {
   {{/isNodejs}}

package/lib/lint/Linter.js

@@ -38,7 +38,7 @@ class Linter {
   /**
    * Initializes `cds lint` call and generates the required content
    * object for `cds` executable
-   * @returns object continaing help, options, flags and shortcuts
+   * @returns object containing help, options, flags and shortcuts
    */
   init(help = "", options = [], flags = [], shortcuts = []) {
     this.eslintCmd = checks.resolveEslint(this.cdsdkPath, this.globalPath);
@@ -56,7 +56,7 @@ class Linter {
 
   /**
    * Runner for 'cds lint' which is a wrapper for eslint cmd calls
-   * that detecs and adds the required cmd line arguments
+   * that detects and adds the required cmd line arguments
    * @param {*} args files/globs for eslint to lint
    * @param {*} options options/flag passed by user
    */