@sap/cds-dk 9.4.2 → 9.5.0

package/lib/import/odata/v4parser.js

@@ -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);
@@ -1653,12 +1667,43 @@ 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 entity in csn.definitions) {
+        if (entity.type !== 'entity') continue;
+
+        const containingCompositions = Object.keys(csn.definitions[entity].elements).filter(e => 
+            csn.definitions[entity].elements[e].type === 'cds.Composition' && 
+            csn.definitions[entity].elements[e].on
+        );
+        for (const comp of containingCompositions) {
+            const compTarget = csn.definitions[csn.definitions[entity].elements[comp].target];
+            const backLink = Object.keys(compTarget.elements).find(e => 
+                compTarget.elements[e].type === 'cds.Association' && 
+                compTarget.elements[e].target === entity
+            )
+            if (compTarget.elements[backLink].keys) {
+                delete compTarget.elements[backLink].keys
+            }
+        }
+    }
+
     return JSON.stringify(csn, null, 4);
 }
 

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.4.2',
 
     OPTIONS: Object.freeze({
         COMPLETION: 'completion',

package/lib/init/index.js

@@ -231,17 +231,26 @@ module.exports = class CDSGenerator {
         const templates = new Map
         for (let plugin of plugins) {
             // 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

@@ -15,7 +15,7 @@ module.exports = new class ProjectReader {
 
     #setPackageInfo() {
         this.isJava = (exists('pom.xml') || cds.cli.options?.add?.has('java'))
-                        && !cds.env.for('cds').profiles.includes('node') // opt-out for hybrid projects like sflight
+            && !cds.env.for('cds').profiles.includes('node') // opt-out for hybrid projects like sflight
 
         // 1. Use project name and static default values
         this.appVersion = this.isJava ? '1.0.0-SNAPSHOT' : '1.0.0'
@@ -32,7 +32,7 @@ module.exports = new class ProjectReader {
             const v = version?.[0] === '${revision}' ? properties?.[0]?.revision[0] : version?.[0] ?? '1.0.0-SNAPSHOT'
             if (v && REGEX_JAVA_VERSION.test(v)) this.appVersion = v
             this.jdkVersion = properties?.[0]?.['jdk.version']?.[0]?._text?.[0] ?? JAVA_LTS_VERSIONS[JAVA_LTS_VERSIONS.length - 1]
-            if (artifactId?.[0])  this.appName = this.appId = artifactId?.[0]?.split(/-parent/)[0]
+            if (artifactId?.[0]) this.appName = this.appId = artifactId?.[0]?.split(/-parent/)[0]
             if (description?.[0]) this.appDescription = description[0]
         }
         else if (exists('package.json')) {
@@ -73,9 +73,9 @@ module.exports = new class ProjectReader {
         TRACE?.({ env })
 
         const pkgJson = () => exists('package.json') ? JSON.parse(fs.readFileSync(join(cds.root, 'package.json'))) : {}
-        const _isESM        = () => pkgJson().type === 'module'
+        const _isESM = () => pkgJson().type === 'module'
         const _isTypescript = () => !!pkgJson().dependencies?.typescript || !!pkgJson().devDependencies?.typescript
-        const _hasTyper     = () => !!pkgJson().dependencies?.['@cap-js/cds-typer'] || !!pkgJson().devDependencies?.['@cap-js/cds-typer']
+        const _hasTyper = () => !!pkgJson().dependencies?.['@cap-js/cds-typer'] || !!pkgJson().devDependencies?.['@cap-js/cds-typer']
         const _inProd = plugin => require(`./template/${plugin}`).hasInProduction(env) || cds.cli.argv[0]?.includes(plugin) || cds.cli.options.add?.has(plugin)
         const _uiEmbedded = () => exists(join(env.folders.app, 'xs-app.json'))
         const _uiModule = () => !_uiEmbedded() && isdir(env.folders.app) && fs.readdirSync(resolve(cds.root, env.folders.app)).length > 0
@@ -121,9 +121,22 @@ module.exports = new class ProjectReader {
                     const manifestPath = path.resolve(cds.root, cds.env.folders.app, app, 'webapp/manifest.json')
                     const manifest = exists(manifestPath) ? JSON.parse(fs.readFileSync(manifestPath, 'utf-8')) : {}
                     const inbounds = manifest?.['sap.app']?.crossNavigation?.inbounds
-                    const [firstInbound] = Object.values(inbounds ?? { intent: { semanticObject: 'Books', action: 'display' }})
+                    const [firstInbound] = Object.values(inbounds ?? { intent: { semanticObject: 'Books', action: 'display' } })
                     const vizId = firstInbound.semanticObject + '-' + firstInbound.action
-                    return { app, strippedApp: app.replace(/-/g, ''), vizId, isNotLast: i < apps.length - 1, manifestAppId: manifest?.['sap.app']?.id ?? app}
+                    // Try to read archiveName from ui5.yaml if it exists
+                    let archiveName = ''
+                    const ui5DeployPath = path.resolve(cds.root, cds.env.folders.app, app, 'ui5.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')
+                            if (zipperTask?.configuration?.archiveName) {
+                                archiveName = `${zipperTask.configuration.archiveName}.zip`
+                            }
+                        }
+                    }
+                    return { app, strippedApp: app.replace(/-/g, ''), vizId, isNotLast: i < apps.length - 1, manifestAppId: manifest?.['sap.app']?.id ?? app, archiveName }
                 })
             },
             appUIPaths: () => {
@@ -133,7 +146,7 @@ module.exports = new class ProjectReader {
                     isdir(path.join(cds.root, cds.env.folders.app, e)) && isApp(e)
                 )
             },
-            hasIndexHtml: () => {},
+            hasIndexHtml: () => { },
             appPath: () => env.folders.app,
             appVersion: () => appVersion,
             jdkVersion: () => jdkVersion,
@@ -146,12 +159,14 @@ 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'),
             sap: () => cds.cli.options.sap,
             imageRegistry: () => exists('chart/values.yaml') ? cds.load.yaml(join(cds.root, 'chart/values.yaml')).global?.image?.registry ?? '<your-container-registry-server>' : '<your-container-registry-server>',
             extendsApp: _extends,
+            isBas: () => Object.entries(process.env).some(([key, value]) => key === 'WS_BASE_URL' && value.includes('applicationstudio') || /THEIA_(DEFAULT_)?PLUGINS/.test(key)),
             npmWorkspaceRoot: () => {
                 if (this.cachedWorkspaceRoot) return this.cachedWorkspaceRoot
                 this.cachedWorkspaceRoot = execSync('npm prefix', { encoding: 'utf8', cwd: cds.root, stdio: 'pipe' }).trim()
@@ -160,8 +175,22 @@ module.exports = new class ProjectReader {
             isMonorepoMicroservice: function () {
                 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']
+            hasRoles: () => { }, roles: () => { }, // for xs-security generation
+            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 ?? {}
+                }
+            }
         }
 
         // Automatically creates availability checks for `cds add` commands.
@@ -169,7 +198,8 @@ module.exports = new class ProjectReader {
         // E.g. `cds add hana` can be checked using `hasHana` or `isHana`
         const project = (() => {
             const defined = {}
-            const _get = property => { const p = property
+            const _get = property => {
+                const p = property
                 if (p in reserved) return reserved[p]()
                 for (const prefix of ['has', 'is', 'add']) if (p.startsWith(prefix) && p.length > prefix.length) {
                     const facet = p.slice(prefix.length).replace(/([a-z0-9])([A-Z])/g, '$1-$2').toLowerCase()
@@ -200,23 +230,23 @@ module.exports = new class ProjectReader {
  * @param {string[]?} roots array of directories to search for application.yaml, like `srv`
  * @returns {Promise<object[]>} array of objects with `cds` property
  */
-module.exports._readSpringBootConfig = async function (roots=[cds.env.folders.srv]) {
+module.exports._readSpringBootConfig = async function (roots = [cds.env.folders.srv]) {
     const configNodes = []
     const rootDirs = roots.map(d => join(cds.root, d))
     for (let r of rootDirs) {
-      const file = isfile (join (r,'./src/main/resources/application.yaml'))
-      if (file) {
-        const yaml = cds.load.yaml(file)
-        for (let yamlDoc of Array.isArray(yaml) ? yaml : [yaml]) {
-          let cds = yamlDoc?.cds;
-          if (!cds)   continue
-          cds = _normalizeSpringBootCfg(cds)
-          configNodes.push({cds})
+        const file = isfile(join(r, './src/main/resources/application.yaml'))
+        if (file) {
+            const yaml = cds.load.yaml(file)
+            for (let yamlDoc of Array.isArray(yaml) ? yaml : [yaml]) {
+                let cds = yamlDoc?.cds;
+                if (!cds) continue
+                cds = _normalizeSpringBootCfg(cds)
+                configNodes.push({ cds })
+            }
         }
-      }
     }
     return configNodes
-  }
+}
 
 /**
  * Normalize SpringBoot's dots in keys to express nested objects
@@ -226,7 +256,7 @@ module.exports._readSpringBootConfig = async function (roots=[cds.env.folders.sr
  * @returns {object}
  */
 function _normalizeSpringBootCfg(obj) {
-    if (typeof obj !== 'object')  return obj
+    if (typeof obj !== 'object') return obj
     Object.keys(obj).forEach(k => {
         const prop = k.split('.')
         const last = prop.pop()
@@ -239,7 +269,7 @@ function _normalizeSpringBootCfg(obj) {
         // recursively normalize
         _normalizeSpringBootCfg(obj[k])
         // delete the original property from object if it was rewritten
-        if (prop.length)  delete obj[k]
+        if (prop.length) delete obj[k]
     })
     return obj
 }
@@ -296,4 +326,4 @@ function _normalizeSpringBootCfg(obj) {
  * @property {String} githubSlug GitHub org/repo.
  * @property {boolean} isMonorepoMicroservice Indicates if the project is a monorepo microservice.
  * @property {String} npmWorkspaceRoot The root path of the monorepo workspace.
- */
+ */

package/lib/init/registries/mta.js

@@ -15,6 +15,8 @@ const appFront = {
     where: { type: 'org.cloudfoundry.managed-service', 'parameters.service': 'app-front' }
 }
 
+const ias = { in: 'resources', where: { 'parameters.service': 'identity' } }
+
 const xsuaa = {
     in: 'resources',
     where: { type: 'org.cloudfoundry.managed-service', 'parameters.service': 'xsuaa', 'parameters.service-plan': 'application' }
@@ -150,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 => ({
@@ -208,6 +210,7 @@ const auditlog = {
 module.exports = {
     srv4,
     approuter,
+    ias,
     xsuaa,
     xsuaa4,
     destination,

package/lib/init/registries/xs-app.js

@@ -5,6 +5,12 @@ const odataApi = {
   where: { target: '/odata/$1' }
 }
 
+const html5RepoApi = {
+  in: 'routes',
+  where: { service: 'html5-apps-repo-rt' }
+}
+
 module.exports = {
-  odataApi
+  odataApi,
+  html5RepoApi
 }

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() {

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,25 @@
 ---
 # 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}}
+        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) {

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

@@ -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
@@ -83,3 +81,10 @@ resources:
         oauth2-configuration:
           redirect-uris:
             - https://*~{app-api/app-uri}/**
+
+  - name: {{appName}}-ias
+    type: org.cloudfoundry.managed-service
+    requires:
+      - name: app-api
+    parameters:
+      service: identity

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

@@ -5,7 +5,7 @@ const { readProject } = require('../../projectReader')
 const { sort, merge } = require('../../merge')
 const {
     srv4, mtxSidecar4, approuter, // Modules
-    xsuaa, // BTP Services
+    xsuaa, ias, // BTP Services
     requiredMtxApi, requiredJavaApprouterApi4, providedJavaApprouterApi, // APIs
     requiredAppApi4, providedAppApi,
     approuterMTXRoute,
@@ -34,30 +34,35 @@ module.exports = class ApprouterTemplate extends require('../../plugin') {
         const project = readProject()
         const {
             isNodejs, isJava,
-            addXsuaa, hasXsuaa, addMultitenancy, hasMTXRoute, hasMTXRouteJava,
-            addMta, addHelm, addHelmUnifiedRuntime, hasMta, hasHelm, hasHelmUnifiedRuntime,
+            addIas, addXsuaa, hasXsuaa, hasIas, addMultitenancy, hasMTXRoute, hasMTXRouteJava,
+            addMta, addHelm, addHelmUnifiedRuntime,
+            hasMta, hasHelm, hasHelmUnifiedRuntime, hasMultitenancy,
             addContainerize, srvPath, approuterPath
         } = project
 
 
-        if (addMta || (addMultitenancy || addXsuaa) && hasMta) {
+        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]
-            if (hasXsuaa) additions.push(xsuaa)
             const relationships = []
-            if (hasXsuaa) relationships.push({
-                insert: [xsuaa, 'name'],
-                into: [srv, 'requires', 'name']
-            }, {
-                insert: [xsuaa, 'name'],
-                into: [approuter, 'requires', 'name']
-            })
+            if (hasXsuaa) {
+                relationships.push({
+                    insert: [xsuaa, 'name'],
+                    into: [approuter, 'requires', 'name']
+                })
+            }
+            if (hasIas) {
+                relationships.push({
+                    insert: [ias, 'name'],
+                    into: [approuter, 'requires', 'name']
+                })
+            }
             await merge(__dirname, 'files/mta.yaml.hbs').into('mta.yaml', {
                 with: project, additions, relationships,
             })

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

@@ -33,7 +33,7 @@ module.exports = class AuditLoggingTemplate extends require('../../plugin') {
 
   async combine() {
     const project = readProject()
-    const { addMta, addHelm, addMultitenancy, srvPath } = project
+    const { addMta, addHelm, addHelmUnifiedRuntime, addMultitenancy, srvPath } = project
     const { plan = 'premium' } = cds.cli.options
     project.servicePlan = plan
 
@@ -53,7 +53,7 @@ module.exports = class AuditLoggingTemplate extends require('../../plugin') {
         ]
       })
     }
-    if (addHelm) {
+    if (addHelm || addHelmUnifiedRuntime) {
       await merge({
         srv: { bindings: { auditlog: { serviceInstanceName: 'auditlog' }}},
         auditlog: {

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

@@ -1,6 +1,7 @@
 const cds = require('../../../cds')
 const { merge, sort } = require('../../merge')
 
+const mvn = require('../../mvn')
 const { readProject } = require('../../projectReader')
 const { srv4, mtxSidecar4, approuter } = require('../../registries/mta')
 
@@ -32,6 +33,7 @@ module.exports = class extends require('../../plugin') {
       await sort('package.json', 'dependencies')
     } else if (isJava) {
       await merge(__dirname, 'files/java-cdsrc.json.hbs').into('.cdsrc.json', { with: project })
+      await mvn.add('APPLICATION_LOGGING')
     }
   }
 
@@ -50,7 +52,6 @@ module.exports = class extends require('../../plugin') {
       const additions = [cloudLogging], relationships = []
       const srv = srv4(srvPath)
       if (addMta) {
-        additions.push(srv)
         relationships.push({
           insert: [cloudLogging, 'name'],
           into: [srv, 'requires', 'name']
@@ -58,14 +59,12 @@ module.exports = class extends require('../../plugin') {
       }
       if (addMultitenancy) {
         const mtxSidecar = mtxSidecar4(isJava ? 'mtx/sidecar' : 'gen/mtx/sidecar')
-        additions.push(mtxSidecar)
         relationships.push({
           insert: [cloudLogging, 'name'],
           into: [mtxSidecar, 'requires', 'name']
         })
       }
       if (addApprouter) {
-        additions.push(approuter)
         relationships.push({
           insert: [cloudLogging, 'name'],
           into: [approuter, 'requires', 'name']