@sap/cds-dk 9.4.1 → 9.4.3

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')) {
@@ -60,58 +60,6 @@ module.exports = new class ProjectReader {
         }
     }
 
-    /**
-     * @typedef {Object} ProjectConfig
-     * @property {string} appVersion The version of the application.
-     * @property {string} appName The name of the application.
-     * @property {string} appId The ID of the application.
-     * @property {string} appDescription The description of the application.
-     * @property {'java' | 'nodejs'} language The programming language of the project.
-     * @property {string} srvPath The path to the server module.
-     * @property {string} archiveName The name of the archive.
-     * @property {Object} db Database configuration.
-     * @property {string} configFile The name of the configuration file. This is typically the `package.json` for Node.js and `.cdsrc.json` for Java.
-     * @property {string} appPath The path to the app folder.
-     * @property {string} approuterPath The path to the approuter folder.
-     * @property {boolean} hasUIEmbedded Indicates if the project uses an embedded UI.
-     * @property {boolean} hasUIModule Indicates if the project is using a modular UI.
-     * @property {boolean} hasUI Indicates if the project has a UI.
-     * @property {boolean} hasUI5 Indicates if the project is a UI5 project.
-     * @property {boolean} isUI5 Indicates if the project is a UI5 project.
-     * @property {boolean} isJava Indicates if the project is using Java.
-     * @property {boolean} isNodejs Indicates if the project is using Node.js.
-     * @property {boolean} isESM Indicates if the project is an ESM project (type 'module')
-     * @property {boolean} hasEsmStyle Indicates if code supports ESM-style imports and exports. This is true for ESM and Typescript projects.
-     * @property {boolean} isTypescript Indicates if the project is a Typescript project.
-     * @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} 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.
-     * @property {boolean} hasToggles Indicates if the project uses feature toggles.
-     * @property {boolean} hasExtensibility Indicates if the project is extensible.
-     * @property {boolean} hasXsuaa Indicates if the project uses XSUAA.
-     * @property {boolean} hasHana Indicates if the project uses HANA.
-     * @property {boolean} hasPostgres Indicates if the project uses PostgreSQL.
-     * @property {boolean} hasEnterpriseMessaging Indicates if the project uses SAP BTP Event Mesh.
-     * @property {boolean} hasAttachments Indicates if the project uses SAP BTP Object Store Service.
-     * @property {boolean} hasApprouter Indicates if the project uses the SAP Application Router.
-     * @property {boolean} hasHtml5Repo Indicates if the project uses the SAP BTP HTML5 Application Repository.
-     * @property {boolean} hasPortal Indicates if the project uses the SAP Cloud Portal service.
-     * @property {boolean} hasWorkzoneStandard Indicates if the project uses the SAP Build Work Zone, Standard Edition service.
-     * @property {boolean} hasDestination Indicates if the project uses the SAP BTP Destination service.
-     * @property {boolean} hasMTXRoute Indicates if the approuter should have a multitenant route.
-     * @property {boolean} hasMTXRouteJava Indicates if the approuter should have a multitenant subscription route (java).
-     * @property {boolean} hasMalwareScanner Indicates if the project uses the SAP Malware Scanning service.
-     * @property {boolean} hasDynatrace Indicates if the project uses Dynatrace.
-     * @property {boolean} hasCloudLogging Indicates if the project uses Cloud Logging.
-     * @property {String} extendsApp Indicates which project is extended if any.
-     * @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.
-     */
-
     /**
      * Reads the project configuration and constructs a project object.
      * This function dynamically resolves project properties and returns an object with these properties.
@@ -125,10 +73,10 @@ 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 _inProd = plugin => require(`./template/${plugin}`).hasInProduction(env) || cds.cli.argv.includes(plugin) || cds.cli.options.add?.has(plugin)
+        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
         const _isJava = () => this.isJava
@@ -173,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-deploy.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')
+                            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: () => {
@@ -185,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,
@@ -204,6 +165,7 @@ module.exports = new class ProjectReader {
             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()
@@ -212,7 +174,7 @@ module.exports = new class ProjectReader {
             isMonorepoMicroservice: function () {
                 return this.npmWorkspaceRoot() !== cds.root
             },
-            hasRoles: () => {}, roles: () => {}, // for xs-security generation
+            hasRoles: () => { }, roles: () => { }, // for xs-security generation
             hasCustomRoleCollections: () => exists('xs-security.json') && !!JSON.parse(fs.readFileSync(path.join(cds.root, 'xs-security.json')))['role-collections']
         }
 
@@ -221,10 +183,18 @@ 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']) if (p.startsWith(prefix) && p.length > prefix.length) {
-                    return _inProd(p.slice(prefix.length).replace(/([a-z0-9])([A-Z])/g, '$1-$2').toLowerCase())
+                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()
+                    const inProd = _inProd(facet)
+                    if (prefix === 'add') {
+                        const adding = facet => cds.cli.argv[0]?.includes(facet) || cds.cli.options.add?.has(facet)
+                        const caller = new Error().stack.split('\n')[3].replace(/\\/g, '/').match(/lib\/init\/template\/([^/]+)\/index\.js/)[1]
+                        return inProd && (adding(facet) || adding(caller))
+                    }
+                    return inProd
                 }
             }
             return new Proxy({}, {
@@ -245,23 +215,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
@@ -271,7 +241,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()
@@ -284,7 +254,61 @@ 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
 }
+
+/* Types */
+
+/**
+ * @typedef {Object} ProjectConfig
+ * @property {string} appVersion The version of the application.
+ * @property {string} appName The name of the application.
+ * @property {string} appId The ID of the application.
+ * @property {string} appDescription The description of the application.
+ * @property {'java' | 'nodejs'} language The programming language of the project.
+ * @property {string} srvPath The path to the server module.
+ * @property {string} archiveName The name of the archive.
+ * @property {Object} db Database configuration.
+ * @property {string} configFile The name of the configuration file. This is typically the `package.json` for Node.js and `.cdsrc.json` for Java.
+ * @property {string} appPath The path to the app folder.
+ * @property {string} approuterPath The path to the approuter folder.
+ * @property {boolean} hasUIEmbedded Indicates if the project uses an embedded UI.
+ * @property {boolean} hasUIModule Indicates if the project is using a modular UI.
+ * @property {boolean} hasUI Indicates if the project has a UI.
+ * @property {boolean} hasUI5 Indicates if the project is a UI5 project.
+ * @property {boolean} isUI5 Indicates if the project is a UI5 project.
+ * @property {boolean} isJava Indicates if the project is using Java.
+ * @property {boolean} isNodejs Indicates if the project is using Node.js.
+ * @property {boolean} isESM Indicates if the project is an ESM project (type 'module')
+ * @property {boolean} hasEsmStyle Indicates if code supports ESM-style imports and exports. This is true for ESM and Typescript projects.
+ * @property {boolean} isTypescript Indicates if the project is a Typescript project.
+ * @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} 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.
+ * @property {boolean} hasToggles Indicates if the project uses feature toggles.
+ * @property {boolean} hasExtensibility Indicates if the project is extensible.
+ * @property {boolean} hasXsuaa Indicates if the project uses XSUAA.
+ * @property {boolean} hasHana Indicates if the project uses HANA.
+ * @property {boolean} hasPostgres Indicates if the project uses PostgreSQL.
+ * @property {boolean} hasEnterpriseMessaging Indicates if the project uses SAP BTP Event Mesh.
+ * @property {boolean} hasAttachments Indicates if the project uses SAP BTP Object Store Service.
+ * @property {boolean} hasApprouter Indicates if the project uses the SAP Application Router.
+ * @property {boolean} hasHtml5Repo Indicates if the project uses the SAP BTP HTML5 Application Repository.
+ * @property {boolean} hasPortal Indicates if the project uses the SAP Cloud Portal service.
+ * @property {boolean} hasWorkzoneStandard Indicates if the project uses the SAP Build Work Zone, Standard Edition service.
+ * @property {boolean} hasDestination Indicates if the project uses the SAP BTP Destination service.
+ * @property {boolean} hasMTXRoute Indicates if the approuter should have a multitenant route.
+ * @property {boolean} hasMTXRouteJava Indicates if the approuter should have a multitenant subscription route (java).
+ * @property {boolean} hasMalwareScanner Indicates if the project uses the SAP Malware Scanning service.
+ * @property {boolean} hasDynatrace Indicates if the project uses Dynatrace.
+ * @property {boolean} hasCloudLogging Indicates if the project uses Cloud Logging.
+ * @property {String} extendsApp Indicates which project is extended if any.
+ * @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' }
@@ -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

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

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

@@ -29,13 +29,6 @@ modules:
       {{#hasXsuaa}}
       - name: {{appName}}-auth
       {{/hasXsuaa}}
-      {{#hasIas}}
-      - name: {{appName}}-ias
-        parameters:
-          config:
-            credential-type: X509_GENERATED
-            app-identifier: app-deployer
-      {{/hasIas}}
       - name: {{appName}}-app-front
         parameters:
           content-target: true

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

@@ -49,7 +49,7 @@ module.exports = class extends require('../../plugin') {
 
     async combine() {
         const project = readProject()
-        const { srvPath, appPath, hasMta, apps } = project
+        const { srvPath, appPath, addMta, apps } = project
 
         await Promise.all(apps.map(async ({ app }) => {
             project.app = app
@@ -63,7 +63,7 @@ module.exports = class extends require('../../plugin') {
         //  await merge({ cds: { requires: { 'app-front':true } } }).into('mtx/sidecar/package.json')
         // }
 
-        if (hasMta) {
+        if (addMta) {
             const srv = srv4(srvPath)
             project.apps = apps
             const appModules = project.apps.map(app => ({

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

@@ -28,16 +28,19 @@ module.exports = class ApplicationLoggingTemplate extends require('../../plugin'
 
     async combine() {
         const project = readProject()
-        const { hasMta, hasApprouter, isJava, hasMultitenancy, srvPath } = project
+        const { addMta, addApprouter, isJava, addMultitenancy, srvPath } = project
 
-        if (hasMta) {
-            const srv = srv4(srvPath)
-            const additions = [srv, applicationLogging]
-            const relationships = [{
-                insert: [applicationLogging, 'name'],
-                into: [srv, 'requires', 'name']
-            }]
-            if (hasMultitenancy) {
+        if (addMta || addMultitenancy) {
+            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 mtxSidecar = mtxSidecar4(isJava ? 'mtx/sidecar' : 'gen/mtx/sidecar')
                 additions.push(mtxSidecar)
                 relationships.push({
@@ -45,7 +48,7 @@ module.exports = class ApplicationLoggingTemplate extends require('../../plugin'
                     into: [mtxSidecar, 'requires', 'name']
                 })
             }
-            if (hasApprouter) {
+            if (addApprouter) {
                 additions.push(approuter)
                 relationships.push({
                     insert: [applicationLogging, 'name'],

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

@@ -83,3 +83,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,
@@ -31,37 +31,49 @@ module.exports = class ApprouterTemplate extends require('../../plugin') {
     }
 
     async combine() {
-        const project = readProject(this.options)
-        const { isNodejs, isJava, hasMTXRoute, hasMultitenancy, hasXsuaa, hasMta, hasHelm, hasHelmUnifiedRuntime, hasMTXRouteJava, hasContainerize, srvPath, approuterPath } = project
+        const project = readProject()
+        const {
+            isNodejs, isJava,
+            addIas, addXsuaa, hasXsuaa, hasIas, addMultitenancy, hasMTXRoute, hasMTXRouteJava,
+            addMta, addHelm, addHelmUnifiedRuntime, hasMta, hasHelm, hasHelmUnifiedRuntime,
+            addContainerize, srvPath, approuterPath
+        } = project
 
-        if (hasMta) {
+
+        if (addMta || (addMultitenancy || addXsuaa || addIas) && hasMta) {
             const srv = srv4(srvPath)
-            const apis = isJava && hasMultitenancy ? [requiredJavaApprouterApi4(srv), providedJavaApprouterApi] : []
+            const apis = isJava && addMultitenancy ? [requiredJavaApprouterApi4(srv), providedJavaApprouterApi] : []
             const mtxSidecar = mtxSidecar4(isJava ? 'mtx/sidecar' : 'gen/mtx/sidecar')
-            if (isNodejs && hasMultitenancy) apis.push(requiredMtxApi, requiredAppApi4(mtxSidecar), providedAppApi)
-            if (isJava && hasMultitenancy) apis.push(requiredMtxApi)
+            if (isNodejs && addMultitenancy) apis.push(requiredMtxApi, requiredAppApi4(mtxSidecar), providedAppApi)
+            if (isJava && addMultitenancy) apis.push(requiredMtxApi)
             const modules = [srv, approuter]
-            if (hasMultitenancy) modules.push(mtxSidecar)
+            if (addMultitenancy) 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) {
+                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']
+                })
+            }
             await merge(__dirname, 'files/mta.yaml.hbs').into('mta.yaml', {
                 with: project, additions, relationships,
             })
         }
 
-        if (hasHelm || hasHelmUnifiedRuntime) {
+        if (addHelm || addHelmUnifiedRuntime || addMultitenancy && (hasHelm || hasHelmUnifiedRuntime)) {
             await merge(__dirname, 'files', 'values.yaml.hbs').into('chart/values.yaml', { with: project })
         }
 
-        if (hasContainerize) {
+        if (addContainerize) {
             const additions = [{
                 in: 'modules',
                 where: { name: `${project.appName}-approuter` }

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

@@ -26,9 +26,9 @@ module.exports = class AttachmentsTemplate extends require('../../plugin') {
 
     async combine() {
         const project = readProject()
-        const { hasMta, hasHelm, hasHelmUnifiedRuntime, srvPath } = project
+        const { addMta, addHelm, addHelmUnifiedRuntime, srvPath } = project
 
-        if (hasMta) {
+        if (addMta) {
             const srv = srv4(srvPath)
             const additions = [srv, attachments]
             const relationships = [{
@@ -40,7 +40,7 @@ module.exports = class AttachmentsTemplate extends require('../../plugin') {
             })
         }
 
-        if (hasHelm || hasHelmUnifiedRuntime) {
+        if (addHelm || addHelmUnifiedRuntime) {
             await merge(__dirname, 'files', 'values.yaml').into('chart/values.yaml')
         }
     }

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

@@ -33,15 +33,15 @@ module.exports = class AuditLoggingTemplate extends require('../../plugin') {
 
   async combine() {
     const project = readProject()
-    const { hasMta, hasHelm, hasMultitenancy, srvPath } = project
+    const { addMta, addHelm, addHelmUnifiedRuntime, addMultitenancy, srvPath } = project
     const { plan = 'premium' } = cds.cli.options
     project.servicePlan = plan
 
-    if (hasMultitenancy) {
+    if (addMultitenancy) {
       await merge(__dirname, 'files/package.sidecar.json').into('mtx/sidecar/package.json')
     }
 
-    if (hasMta) {
+    if (addMta) {
       const srv = srv4(srvPath)
       await merge(join(__dirname, 'files/mta.yaml.hbs')).into('mta.yaml', {
         with: project,
@@ -53,7 +53,7 @@ module.exports = class AuditLoggingTemplate extends require('../../plugin') {
         ]
       })
     }
-    if (hasHelm) {
+    if (addHelm || addHelmUnifiedRuntime) {
       await merge({
         srv: { bindings: { auditlog: { serviceInstanceName: 'auditlog' }}},
         auditlog: {

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

@@ -37,9 +37,9 @@ module.exports = class extends require('../../plugin') {
 
   async combine() {
     const project = readProject()
-    const { hasMta, hasHelm, hasHelmUnifiedRuntime, hasApprouter, isJava, hasMultitenancy, srvPath } = project
+    const { hasMta, addMta, addHelm, addHelmUnifiedRuntime, addApprouter, isJava, addMultitenancy, srvPath } = project
 
-    if (hasMta) {
+    if (addMta || (addMultitenancy || addApprouter) && hasMta) {
       const cloudLogging = {
         in: 'resources',
         where: {
@@ -47,13 +47,16 @@ module.exports = class extends require('../../plugin') {
           'parameters.service': 'cloud-logging'
         }
       }
+      const additions = [cloudLogging], relationships = []
       const srv = srv4(srvPath)
-      const additions = [srv, cloudLogging]
-      const relationships = [{
-        insert: [cloudLogging, 'name'],
-        into: [srv, 'requires', 'name']
-      }]
-      if (hasMultitenancy) {
+      if (addMta) {
+        additions.push(srv)
+        relationships.push({
+          insert: [cloudLogging, 'name'],
+          into: [srv, 'requires', 'name']
+        })
+      }
+      if (addMultitenancy) {
         const mtxSidecar = mtxSidecar4(isJava ? 'mtx/sidecar' : 'gen/mtx/sidecar')
         additions.push(mtxSidecar)
         relationships.push({
@@ -61,7 +64,7 @@ module.exports = class extends require('../../plugin') {
           into: [mtxSidecar, 'requires', 'name']
         })
       }
-      if (hasApprouter) {
+      if (addApprouter) {
         additions.push(approuter)
         relationships.push({
           insert: [cloudLogging, 'name'],
@@ -74,7 +77,7 @@ module.exports = class extends require('../../plugin') {
         with: project, additions, relationships
       })
     }
-    if (hasHelm || hasHelmUnifiedRuntime) {
+    if (addHelm || addHelmUnifiedRuntime) {
       await merge(__dirname, 'files/values.yaml.hbs').into('chart/values.yaml')
     }
   }

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

@@ -20,9 +20,9 @@ module.exports = class ConnectivityTemplate extends require('../../plugin') {
 
     async combine() {
         const project = readProject()
-        const { srvPath, hasHelm, hasHelmUnifiedRuntime, hasMta } = project
+        const { srvPath, addHelm, addHelmUnifiedRuntime, addMta } = project
 
-        if (hasMta) {
+        if (addMta) {
             const srv = srv4(srvPath)
             const additions = [srv, connectivity]
             const relationships = [{
@@ -32,7 +32,7 @@ module.exports = class ConnectivityTemplate extends require('../../plugin') {
             await merge(__dirname, 'files/mta.yaml.hbs').into('mta.yaml', { project, additions, relationships })
         }
 
-        if (hasHelm || hasHelmUnifiedRuntime) {
+        if (addHelm || addHelmUnifiedRuntime) {
             await merge(__dirname, 'files/values.yaml.hbs').into('chart/values.yaml', {
                 project,
                 additions: [{

package/lib/init/template/containerize/files/containerize.yaml.hbs

@@ -2,9 +2,8 @@
 _schema-version: '1.0'
 repository: {{& imageRegistry}}
 tag: latest
-before-all:
-  - npx cds build --production
   {{#isJava}}
+before-all:
   - mvn clean package -DskipTests=true --batch-mode
   {{/isJava}}
 modules: