@sap/cds-dk 9.4.3 → 9.6.0

package/lib/import/odata/v4parser.js

@@ -262,8 +262,8 @@ function _captureAnnotationInCSN(targetString, annotationObject, csnDefsTargetOb
     }
 
     /**
-     * Annotations need to be flattened in CSN. E.g. 
-     * 
+     * Annotations need to be flattened in CSN. E.g.
+     *
      * @Core.ContentDisposition : {
      *  Type    : 'inline',
      *  Filename: typedImageFileName
@@ -426,7 +426,7 @@ function _validateAnnotationNamespace(annotationTerm, vocabNamespaceToAlias) {
     if (aliasOrNamespace === "cds") {
         return
     }
-    
+
     for (let alias of Object.values(known_vocabularies)) {
         if (alias === aliasOrNamespace) {
             return;
@@ -462,7 +462,7 @@ function _resolveAnnotationTerm(schemaDataAnnotation, parserContext) {
         }
     }
     /**
-     * Case 3: Namespace doesn't have edmx:Reference. But it is present in known_vocabularies. 
+     * Case 3: Namespace doesn't have edmx:Reference. But it is present in known_vocabularies.
      *         Replacing it with standard alias.
      */
     for (const [namespace, alias] of Object.entries(known_vocabularies)) {
@@ -634,7 +634,7 @@ function _generateStructuredDataTypeCsn(dataType, propertyObject, isPrimaryKey,
 
 function _parseAssociationProperty(foreignReference, associationNode, parserContext) {
     const associationProperty = {};
-    associationProperty.type = (associationNode.$OnDelete === 'Cascade') ? 'cds.Composition' : 'cds.Association';
+    associationProperty.type = (associationNode.$OnDelete === 'Cascade' || associationNode.$ContainsTarget) ? 'cds.Composition' : 'cds.Association';
 
     let schemaName = associationNode.$Type.substring(0, associationNode.$Type.lastIndexOf('.'));
 
@@ -642,6 +642,11 @@ function _parseAssociationProperty(foreignReference, associationNode, parserCont
         schemaName = parserContext.schemaAliasToNamespace[schemaName];
     }
 
+    if (associationNode.$ContainsTarget) {
+        parserContext.schemaDetails[schemaName] ??= {}
+        parserContext.schemaDetails[schemaName].containment = true
+    }
+
     let resolvedEntityName;
     let entityTypeMapping = (
         parserContext.entityToEntitySetMap?.get(associationNode.$Type) ||
@@ -676,9 +681,18 @@ function _parseAssociationProperty(foreignReference, associationNode, parserCont
     } else {
         associationProperty.cardinality.max = 1;
     }
-    // Convert managed associations and compositions in unmanaged with empty key to avoid
+
+    // Generate on condition in case $Partner exists, as that indicates a backlink with which the
+    // condition can be generated.
+    // If not given convert managed associations and compositions in unmanaged with empty key to avoid
     // "generation" of keys, that do not exist in the external service.
-    if (common.checkForEmptyKeys(associationProperty, "V4")) {
+    if (associationNode.$Partner && associationProperty.type === 'cds.Composition') {
+        associationProperty.on = [
+            {ref: [foreignReference, associationNode.$Partner]},
+            '=',
+            {ref: ['$self']}
+        ]
+    } else if (common.checkForEmptyKeys(associationProperty, "V4")) {
         associationProperty.keys = [];
     }
     _captureAnnotationWithinElement(associationNode, associationProperty, parserContext);
@@ -928,21 +942,10 @@ function _generateCSNForBoundActionFunction(actionFunctionObject, kind, parserCo
         csnObj.params = {};
 
         for (let index = 0; index < parameters.length; index++) {
-            let isCollection = parameters[index].$Collection;
-            csnObj.params[parameters[index].$Name] = _parseParameterAndReturnTypeContent(parameters[index], parserContext);
-            /**
-             * binding parameter handling - only first parameter will contain the binding
-             * parameter information, so only make change to the first parameter information.
-             * NOTE: Edm.Stream can act as the binding parameter for action/function
-             * We don't have any example for it, so not handled as of now
-             */
-            if (isBound && index === 0) {
-                if (isCollection) {
-                    csnObj.params[parameters[index].$Name].items.type = '$self';
-                }
-                else {
-                    csnObj.params[parameters[index].$Name].type = '$self';
-                }
+            // skip the first parameter for bound actions, which is the $self parameter
+            // that is only implicit in CSN
+            if (!isBound || index > 0) {
+                csnObj.params[parameters[index].$Name] = _parseParameterAndReturnTypeContent(parameters[index], parserContext);
             }
         }
     }
@@ -1335,7 +1338,7 @@ function _parseEntityContainer(csnDefs, entityContainerElements, parserContext)
                 Object.keys(parserContext.entityContainerAnnotations[annotationTarget]).length > 0
             ) {
                 entityContainerAnnotations[annotationTarget] = Object.assign(
-                    entityContainerAnnotations[annotationTarget], 
+                    entityContainerAnnotations[annotationTarget],
                     possibleAnnotations
                 );
             }
@@ -1438,7 +1441,7 @@ function _collectBoundActionFunction(isAction, currNamespace, elementName, eleme
 
         // binding parameter type should be within the available namespaces in the scope of a document.
         if (entityTypeNamespace !== schemaName && entityTypeNamespace !== parserContext.schemaAliasToNamespace[schemaName]) {
-            
+
             // checking if the namespace is available in other schema of the document
             if (parserContext.schemaToSchemaDataIndex.hasOwnProperty(schemaName)) {
                 entityTypeNamespace = schemaName;
@@ -1653,12 +1656,41 @@ function _generateCSN(edmxAsJson, ignorePersistenceSkip, parserContext, importer
         csn.definitions[parserContext.primarySchema].kind = 'service';
         csn.definitions[parserContext.primarySchema]['@cds.external'] = true;
 
+        if (parserContext.schemaDetails[parserContext.primarySchema]?.containment) {
+            csn.definitions[parserContext.primarySchema]['@odata.containment'] = true;
+        }
+
         // Step 8: parse entity container contents and their annotations
         let schemaData = schemaDataList[parserContext.schemaToSchemaDataIndex[parserContext.primarySchema]];
         let entityContainerElements = schemaData[parserContext.entityContainerName];
         csn.definitions = Object.assign(_parseEntityContainer(csn.definitions, entityContainerElements, parserContext), csn.definitions);
     }
 
+
+    // Step 9: 2. Step for generating $ContainsTarget & $Partner links
+    // The containing composition is already generated. Now the Keys: [] has to be removed
+    // on the backlink association because per OData spec, OData does not expose the foreign key fields
+    // used by the backlink and thus it is save to assume they must be generated for proper mocking
+    //
+    // This happens after Step 8 because that adjusts the names of entity container entities where
+    // entity type and entity set differ in naming
+    for (const [eName, entity] of Object.entries(csn.definitions)) {
+        if (entity.kind !== 'entity') continue;
+        const containingCompositions = Object.keys(entity.elements).filter(e =>
+            entity.elements[e].type === 'cds.Composition' &&
+            entity.elements[e].on
+        );
+        for (const comp of containingCompositions) {
+            const compTarget = csn.definitions[entity.elements[comp].target];
+            const backLink = Object.keys(compTarget.elements).find(e =>
+                compTarget.elements[e].type === 'cds.Association' &&
+                compTarget.elements[e].target === eName
+            )
+            if (compTarget.elements[backLink]?.keys) {
+                delete compTarget.elements[backLink].keys
+            }
+        }
+    }
     return JSON.stringify(csn, null, 4);
 }
 
@@ -1670,7 +1702,7 @@ function _generateEDMX2JSON(edmx, name_space) {
             const v4Conv = MetadataConverterFactory.createEdmxV40XmlToV40Json(name_space);
             v4Conv.execute(inputBuffer, (error, json, missingReferencedDocuments) => {
                 if (missingReferencedDocuments?.length > 0) {
-                    console.log(missingReferencedDocuments);  
+                    console.log(missingReferencedDocuments);
                 }
 
                 if (json) {

package/lib/import/openapi/importOpenAPI.js

@@ -4,6 +4,8 @@ const {
   pathAndMethod,
   serviceName,
 } = require("./utilities");
+const cds = require('../../cds');
+
 
 module.exports = { importOpenAPI };
 
@@ -32,7 +34,10 @@ function importOpenAPI(input) {
   };
 
   const context = {
-    serviceName: serviceName(input.info?.title || "TODO.service"),
+    serviceName: serviceName(cds.cli.options["into-namespace"]
+      ?? input.info?.title
+      ?? "TODO.service"
+    ),
     oasVersion: input.openapi || input.swagger,
     v3: !!input.openapi,
     schemas: input.openapi ? input.components?.schemas : input.definitions,

package/lib/init/constants.js

@@ -5,7 +5,7 @@ module.exports = {
     COMMAND_ADD: 'add',
 
     JAVA_LTS_VERSIONS: [17, 21],
-    MAVEN_ARCHETYPE_VERSION: '4.4.1',
+    MAVEN_ARCHETYPE_VERSION: '4.6.0',
 
     OPTIONS: Object.freeze({
         COMPLETION: 'completion',

package/lib/init/index.js

@@ -230,18 +230,32 @@ module.exports = class CDSGenerator {
     async _fillTemplateList(plugins) {
         const templates = new Map
         for (let plugin of plugins) {
+            // cds 10 remove
+            if(plugin === "helm" || plugin === "helm-unified-runtime") {
+                cds.cli.options.add?.add("kyma")
+                cds.cli.argv[0] += ",kyma"
+            }
             // Compat
-            if (plugin === 'appfront') plugin = 'app-front'
             if (plugin === 'helm' && cds.cli.options['internal-unified-runtime-charts']) {
+                console.warn(term.warn('"--internal-unified-runtime-charts" is deprecated, please use "cds add kyma --unified-runtime" instead'))
                 plugin = 'helm-unified-runtime'
                 cds.cli.options.add?.delete('helm')
                 cds.cli.options.add?.add('helm-unified-runtime')
             }
-            if (plugin === 'sample-tiny') plugin = 'tiny-sample'
-            if (plugin in { 'kibana-logging': 1, 'kibana': 1 }) plugin = 'application-logging'
-            if (plugin === 'postgresql') plugin = 'postgres'
-            if (plugin === 'gha') plugin = 'github-actions'
-            if (plugin === 'app-front') plugin = 'app-frontend'
+            const _alias = (alias, preferred) => {
+                if (plugin === alias) {
+                    plugin = preferred
+                    cds.cli.options.add?.delete(alias)
+                    cds.cli.options.add?.add(preferred)
+                    cds.cli.argv[0] = cds.cli.argv[0].replace(alias, preferred)
+                }
+            }
+            _alias('appfront', 'app-frontend')
+            _alias('app-front', 'app-frontend')
+            _alias('gha', 'github-actions')
+            _alias('postgresql', 'postgres')
+            _alias('kibana', 'application-logging')
+            _alias('kibana-logging', 'application-logging')
 
             if (!templates.has(plugin)) {
                 const template = await this._createTemplate(plugin)

package/lib/init/merge.js

@@ -106,6 +106,9 @@ async function _mergeYAML(into, from, project, semantics = {}) {
             if (project) await writeYAML(into, source)
             else await copy(from, into)
             return source
+        } else if (typeof into === 'string') {
+            await writeYAML(into, source)
+            return source
         }
         throw new Error(`Target YAML doesn't exist`)
     }
@@ -113,6 +116,19 @@ async function _mergeYAML(into, from, project, semantics = {}) {
     const entryMap = new Map, templateEntryMap = new Map
 
     const { additions, overwrites, deletions, relationships } = semantics
+    if (relationships && Array.isArray(relationships)) {
+        semantics.additions ??= []
+        const add = semantics.additions
+
+        for (const rel of relationships) {
+            for (const ins of (Array.isArray(rel.insert) ? rel.insert : [rel.insert])) {
+                if (!add.includes(ins)) add.push(ins)
+            }
+            const base = rel.into?.[0]
+            if (base && !add.includes(base)) add.push(base)
+        }
+    }
+
     for (const entry of additions ?? []) {
         entryMap.set(entry, undefined)
         templateEntryMap.set(entry, undefined)

package/lib/init/projectReader.js

@@ -123,16 +123,19 @@ module.exports = new class ProjectReader {
                     const inbounds = manifest?.['sap.app']?.crossNavigation?.inbounds
                     const [firstInbound] = Object.values(inbounds ?? { intent: { semanticObject: 'Books', action: 'display' } })
                     const vizId = firstInbound.semanticObject + '-' + firstInbound.action
-                    // Try to read archiveName from ui5-deploy.yaml if it exists
+                    // Try to read archiveName from ui5.yaml if it exists
                     let archiveName = ''
-                    const ui5DeployPath = path.resolve(cds.root, cds.env.folders.app, app, 'ui5-deploy.yaml')
-                    if (exists(ui5DeployPath)) {
-                        const ui5Deploy = cds.load.yaml(ui5DeployPath)
-                        const customTasks = ui5Deploy?.builder?.customTasks
-                        if (Array.isArray(customTasks)) {
-                            const zipperTask = customTasks.find(t => t.name === 'ui5-task-zipper')
+                    const ui5YamlPaths = [
+                        path.resolve(cds.root, cds.env.folders.app, app, 'ui5-deploy.yaml'),
+                        path.resolve(cds.root, cds.env.folders.app, app, 'ui5.yaml')
+                    ]
+                    for (const yamlPath of ui5YamlPaths) {
+                        if (exists(yamlPath)) {
+                            const ui5Deploy = cds.load.yaml(yamlPath)
+                            const zipperTask = ui5Deploy?.builder?.customTasks?.find?.(t => t.name === 'ui5-task-zipper')
                             if (zipperTask?.configuration?.archiveName) {
                                 archiveName = `${zipperTask.configuration.archiveName}.zip`
+                                break
                             }
                         }
                     }
@@ -159,6 +162,7 @@ module.exports = new class ProjectReader {
             hasUIEmbedded: _uiEmbedded,
             hasUIModule: _uiModule,
             hasUI: () => _uiEmbedded() || _uiModule(),
+            hasUI5: () => _uiEmbedded() || _uiModule(),
             literal: () => () => text => text,
             hasMTXRoute: () => _inProd('extensibility') || (_inProd('multitenancy') && !_isJava()),
             hasMTXRouteJava: () => (_inProd('helm-unified-runtime') || _inProd('helm')) && _isJava() && _inProd('multitenancy'),
@@ -175,7 +179,28 @@ module.exports = new class ProjectReader {
                 return this.npmWorkspaceRoot() !== cds.root
             },
             hasRoles: () => { }, roles: () => { }, // for xs-security generation
-            hasCustomRoleCollections: () => exists('xs-security.json') && !!JSON.parse(fs.readFileSync(path.join(cds.root, 'xs-security.json')))['role-collections']
+            hasCustomRoleCollections: () => exists('xs-security.json') && !!JSON.parse(fs.readFileSync(path.join(cds.root, 'xs-security.json')))['role-collections'],
+            k8s: () => {
+                if (!exists('chart/values.yaml')) return {}
+
+                const values = cds.load.yaml(join(cds.root, 'chart/values.yaml'))
+
+                let containerize = {}
+                if (exists('containerize.yaml'))
+                    containerize = cds.load.yaml(join(cds.root, 'containerize.yaml'))
+
+                return {
+                    values: values ?? {},
+                    containerize: containerize ?? {}
+                }
+            },
+            hasHelmUnifiedRuntime: () =>
+                exists(join(cds.root, 'chart', 'Chart.yaml')) &&
+                    (() => {
+                        const chartYaml = cds.load.yaml(join(cds.root, 'chart', 'Chart.yaml'))
+                        return chartYaml.annotations?.['app.kubernetes.io/managed-by'] === 'cds-dk/helm'
+                            && chartYaml.dependencies?.find(dep => dep.name === 'web-application')?.repository !== undefined
+                    })()
         }
 
         // Automatically creates availability checks for `cds add` commands.
@@ -287,6 +312,7 @@ function _normalizeSpringBootCfg(obj) {
  * @property {boolean} hasTyper Indicates if code supports CDS typer.
  * @property {boolean} hasHelmUnifiedRuntime Indicates if the project uses Unified Runtime Helm deployment.
  * @property {boolean} hasHelm Indicates if the project uses CAP Helm deployment.
+ * @property {boolean} hasKyma Indicates if the project uses Kyma.
  * @property {boolean} hasMta Indicates if the project uses MTA deployment.
  * @property {boolean} hasConnectivity Indicates if the project uses connectivity.
  * @property {boolean} hasMultitenancy Indicates if the project is multitenant.

package/lib/init/registries/mta.js

@@ -152,9 +152,9 @@ const requiredAppApi4 = module => ({
     where: { name: 'app-api' }
 })
 
-const requiredMtxSidecarApi4 = srv => ({
+const requiredMtxSidecarApi4 = (srv, name) => ({
     in: [srv, 'requires'],
-    where: { 'properties.CDS_MULTITENANCY_SIDECAR_URL': '~{mtx-url}' }
+    where: { 'properties.CDS_MULTITENANCY_SIDECAR_URL': name }
 })
 
 const requiredJavaApprouterApi4 = srv => ({

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

@@ -15,7 +15,7 @@ module.exports = class AmsTemplate extends require('../../plugin') {
 
     static hasInProduction(env) {
         const { dependencies, devDependencies } = readProject()
-        return env.requires?.auth?.ams || devDependencies?.['@sap/ams-dev'] || dependencies?.['@sap/ams']
+        return env.requires?.auth?.ams || devDependencies?.['@sap/ams-dev'] || devDependencies?.['@sap/ams'] || dependencies?.['@sap/ams']
     }
 
     async run() {
@@ -28,7 +28,7 @@ module.exports = class AmsTemplate extends require('../../plugin') {
 
     async combine() {
         const project = readProject()
-        const { addMta, addCfManifest, addHelm, addHelmUnifiedRuntime, addContainerize } = project
+        const { addMta, addCfManifest, addContainerize, addKyma } = project
 
         if (addMta) {
             await this.#combineWithMta(project)
@@ -38,7 +38,7 @@ module.exports = class AmsTemplate extends require('../../plugin') {
             await this.#combineWithCfManifest(project)
         }
 
-        if (addHelm || addHelmUnifiedRuntime) {
+        if (addKyma) {
             await this.#combineWithHelm(project)
         }
 

package/lib/init/template/app-frontend/files/app-package.json.hbs

@@ -3,18 +3,12 @@
   "version": "1.0.0",
   "main": "webapp/index.html",
   "scripts": {
-    "build": "ui5 build preload --clean-dest --config ui5-deploy.yaml",
-    "build-local": "ui5 build preload --clean-dest",
+    "build": "ui5 build preload --clean-dest",
     "start": "ui5 serve"
   },
   "devDependencies": {
     "@ui5/cli": "^4",
     "ui5-task-zipper": "^3"
-  },
-  "ui5": {
-    "dependencies": [
-      "ui5-task-zipper"
-    ]
   }
   {{/hasUI5}}
 }

package/lib/init/template/app-frontend/files/ui5.yaml.hbs

@@ -1,6 +1,26 @@
 ---
 # yaml-language-server: $schema=https://sap.github.io/ui5-tooling/schema/ui5.yaml.json
-specVersion: '3.1'
+specVersion: '4.0'
 metadata:
   name: {{app}}
 type: application
+resources:
+  configuration:
+    propertiesFileSourceEncoding: UTF-8
+builder:
+  resources:
+    excludes:
+      - "/test/**"
+      - "/localService/**"
+  customTasks:
+    - name: ui5-task-zipper
+      afterTask: generateVersionInfo
+      configuration:
+        archiveName: {{app}}
+        relativePaths: true
+        additionalFiles:
+          - xs-app.json
+    {{#isTypescript}}
+    - name: ui5-tooling-transpile-task
+      afterTask: replaceVersion
+    {{/isTypescript}}

package/lib/init/template/app-frontend/index.js

@@ -26,10 +26,6 @@ module.exports = class extends require('../../plugin') {
                 project.app = app
                 await merge(__dirname, 'files/ui5.yaml.hbs').into(join(appPath, app, 'ui5.yaml'), { project })
             }
-            for (const { app } of apps) {
-                project.app = app
-                await merge(__dirname, 'files/ui5-deploy.yaml.hbs').into(join(appPath, app, 'ui5-deploy.yaml'), { project })
-            }
         }
 
         for (const { app } of apps) {
@@ -83,14 +79,14 @@ module.exports = class extends require('../../plugin') {
         }
 
         // When Helm support is added
-        // if (hasContainerize) {
+        // if (hasContainerize || hasKyma) {
         //     const additions = [{
         //         in: 'modules',
         //         where: { name: `${project.appName}-content-deployer` }
         //     }]
         //     await merge(__dirname, '/files/containerize.yaml.hbs').into('containerize.yaml', { with: project, additions })
         // }
-        // if (hasHelm || hasHelmUnifiedRuntime) {
+        // if (hasKyma) {
         //     await renderAndCopy(join(__dirname, 'files/ui-resources'), 'ui-resources', project)
         //     await merge(__dirname, 'files/values.yaml.hbs').into('chart/values.yaml', { with: project })
         // }

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

@@ -14,8 +14,8 @@ module.exports = class ApplicationLoggingTemplate extends require('../../plugin'
     }
 
     async canRun() {
-        const { hasMta, hasHelm, hasHelmUnifiedRuntime } = readProject()
-        if ((hasHelmUnifiedRuntime || hasHelm) && !hasMta) throw `'cds add application-logging' is not available for Kyma yet`
+        const { hasMta, hasKyma } = readProject()
+        if (hasKyma && !hasMta) throw `'cds add application-logging' is not available for Kyma yet`
         return true
     }
 
@@ -28,28 +28,23 @@ module.exports = class ApplicationLoggingTemplate extends require('../../plugin'
 
     async combine() {
         const project = readProject()
-        const { addMta, addApprouter, isJava, addMultitenancy, srvPath } = project
+        const { addMta, hasMta, hasApprouter, isJava, addMultitenancy, hasMultitenancy, srvPath } = project
 
-        if (addMta || addMultitenancy) {
+        if (addMta || (addMultitenancy && hasMta)) {
             const additions = [], relationships = []
-            if (addMta) {
-                const srv = srv4(srvPath)
-                additions.push(srv, applicationLogging)
-                relationships.push({
-                    insert: [applicationLogging, 'name'],
-                    into: [srv, 'requires', 'name']
-                })
-            }
-            if (addMultitenancy) {
+            const srv = srv4(srvPath)
+            relationships.push({
+                insert: [applicationLogging, 'name'],
+                into: [srv, 'requires', 'name']
+            })
+            if (hasMultitenancy) {
                 const mtxSidecar = mtxSidecar4(isJava ? 'mtx/sidecar' : 'gen/mtx/sidecar')
-                additions.push(mtxSidecar)
                 relationships.push({
                     insert: [applicationLogging, 'name'],
                     into: [mtxSidecar, 'requires', 'name']
                 })
             }
-            if (addApprouter) {
-                additions.push(approuter)
+            if (hasApprouter) {
                 relationships.push({
                     insert: [applicationLogging, 'name'],
                     into: [approuter, 'requires', 'name']

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

@@ -57,7 +57,6 @@ modules:
           url: ${default-url}
     {{/isJava}}
 
-  {{#hasMultitenancy}}
   - name: {{appName}}-mtx
     type: nodejs
     path: {{#isNodejs}}gen/{{/isNodejs}}mtx/sidecar{{#isNodejs}}
@@ -66,7 +65,6 @@ modules:
         properties:
           SUBSCRIPTION_URL: ~{app-protocol}://\${tenant_subdomain}-~{app-uri}
     {{/isNodejs}}
-  {{/hasMultitenancy}}
 
 resources:
   - name: {{appName}}-auth

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

@@ -11,6 +11,7 @@ const {
     approuterMTXRoute,
     approuterMTXRouteJava // xs-app.json config
 } = require('../../registries/mta')
+const KymaTemplate = require('../kyma')
 
 module.exports = class ApprouterTemplate extends require('../../plugin') {
 
@@ -35,30 +36,28 @@ module.exports = class ApprouterTemplate extends require('../../plugin') {
         const {
             isNodejs, isJava,
             addIas, addXsuaa, hasXsuaa, hasIas, addMultitenancy, hasMTXRoute, hasMTXRouteJava,
-            addMta, addHelm, addHelmUnifiedRuntime, hasMta, hasHelm, hasHelmUnifiedRuntime,
-            addContainerize, srvPath, approuterPath
+            addMta, hasMta, hasMultitenancy,
+            addContainerize, addKyma, hasKyma, srvPath, approuterPath
         } = project
 
 
         if (addMta || (addMultitenancy || addXsuaa || addIas) && hasMta) {
             const srv = srv4(srvPath)
-            const apis = isJava && addMultitenancy ? [requiredJavaApprouterApi4(srv), providedJavaApprouterApi] : []
+            const apis = isJava && hasMultitenancy ? [requiredJavaApprouterApi4(srv), providedJavaApprouterApi] : []
             const mtxSidecar = mtxSidecar4(isJava ? 'mtx/sidecar' : 'gen/mtx/sidecar')
-            if (isNodejs && addMultitenancy) apis.push(requiredMtxApi, requiredAppApi4(mtxSidecar), providedAppApi)
-            if (isJava && addMultitenancy) apis.push(requiredMtxApi)
+            if (isNodejs && hasMultitenancy) apis.push(requiredMtxApi, requiredAppApi4(mtxSidecar), providedAppApi)
+            if (isJava && hasMultitenancy) apis.push(requiredMtxApi)
             const modules = [srv, approuter]
-            if (addMultitenancy) modules.push(mtxSidecar)
+            if (hasMultitenancy) modules.push(mtxSidecar)
             const additions = [...modules, ...apis]
             const relationships = []
             if (hasXsuaa) {
-                additions.push(xsuaa)
                 relationships.push({
                     insert: [xsuaa, 'name'],
                     into: [approuter, 'requires', 'name']
                 })
             }
             if (hasIas) {
-                additions.push(ias)
                 relationships.push({
                     insert: [ias, 'name'],
                     into: [approuter, 'requires', 'name']
@@ -69,11 +68,15 @@ module.exports = class ApprouterTemplate extends require('../../plugin') {
             })
         }
 
-        if (addHelm || addHelmUnifiedRuntime || addMultitenancy && (hasHelm || hasHelmUnifiedRuntime)) {
+        if(addKyma) {
+          await KymaTemplate.mergeDependency('web-application', 'approuter')
+        }
+
+        if (addKyma || (addMultitenancy && hasKyma)) {
             await merge(__dirname, 'files', 'values.yaml.hbs').into('chart/values.yaml', { with: project })
         }
 
-        if (addContainerize) {
+        if (addContainerize || addKyma) {
             const additions = [{
                 in: 'modules',
                 where: { name: `${project.appName}-approuter` }

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

@@ -2,6 +2,7 @@ const { readProject } = require('../../projectReader')
 const { merge } = require('../../merge')
 const { srv4, attachments } = require('../../registries/mta')
 const { mvn } = require('../../add')
+const KymaTemplate = require('../kyma')
 
 module.exports = class AttachmentsTemplate extends require('../../plugin') {
 
@@ -26,7 +27,7 @@ module.exports = class AttachmentsTemplate extends require('../../plugin') {
 
     async combine() {
         const project = readProject()
-        const { addMta, addHelm, addHelmUnifiedRuntime, srvPath } = project
+        const { addMta, addKyma, srvPath } = project
 
         if (addMta) {
             const srv = srv4(srvPath)
@@ -40,8 +41,9 @@ module.exports = class AttachmentsTemplate extends require('../../plugin') {
             })
         }
 
-        if (addHelm || addHelmUnifiedRuntime) {
+        if (addKyma) {
             await merge(__dirname, 'files', 'values.yaml').into('chart/values.yaml')
+            await KymaTemplate.mergeDependency('service-instance', 'attachments')
         }
     }
 }

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

@@ -4,6 +4,7 @@ const { readProject } = require('../../projectReader')
 const { merge } = require('../../merge')
 const { srv4, auditlog } = require('../../registries/mta')
 const mvn = require('../../mvn')
+const KymaTemplate = require('../kyma')
 
 module.exports = class AuditLoggingTemplate extends require('../../plugin') {
 
@@ -33,7 +34,7 @@ module.exports = class AuditLoggingTemplate extends require('../../plugin') {
 
   async combine() {
     const project = readProject()
-    const { addMta, addHelm, addHelmUnifiedRuntime, addMultitenancy, srvPath } = project
+    const { addMta, addKyma, addMultitenancy, srvPath } = project
     const { plan = 'premium' } = cds.cli.options
     project.servicePlan = plan
 
@@ -53,7 +54,7 @@ module.exports = class AuditLoggingTemplate extends require('../../plugin') {
         ]
       })
     }
-    if (addHelm || addHelmUnifiedRuntime) {
+    if (addKyma) {
       await merge({
         srv: { bindings: { auditlog: { serviceInstanceName: 'auditlog' }}},
         auditlog: {
@@ -61,6 +62,7 @@ module.exports = class AuditLoggingTemplate extends require('../../plugin') {
           servicePlanName: plan
         }
       }).into('chart/values.yaml')
+      await KymaTemplate.mergeDependency('service-instance', 'auditlog')
     }
   }
 }