@sap/cds-dk 8.9.4 → 9.0.4

package/lib/import/odata/v2parser.js

@@ -709,11 +709,42 @@ function _getServiceComplexTypes(parserContext) {
 		complexTypeKey = complexTypesKeys[i];
 		complexType = parserContext.allComplexTypes[complexTypeKey].Property;
 		isOpenType = parserContext.allComplexTypes[complexTypeKey].open;
-		complexTypeCSN = complexTypeCSN + _getServiceComplexType(complexTypeKey, complexType, parserContext, isOpenType);
+
+		//S4 might have actions or functions which return a complex type named like the action or function. In this case the complex type must be renamed as else a compile error happens as the result type cannot be found / is a function.
+		if (parserContext.allFunctionImports.some(fi => fi[0] === complexTypeKey)) {
+			const originalName = complexTypeKey;
+			const functionImport = parserContext.allFunctionImports.find(fi => fi[0] === complexTypeKey);
+			complexTypeKey = functionImport[0] + 'ReturnType';
+			let i = 1;
+			while (
+				parserContext.allFunctionImports.some(fi => fi[0] === complexTypeKey) ||
+				parserContext.allEntitySetMapMC[complexTypeKey] ||
+				parserContext.allEntitySetMap[_extractEntityFromNamespace(complexTypeKey)] ||
+				parserContext.allEntities.includes(_extractEntityFromNamespace(complexTypeKey))
+			) {
+				if (i > 1) {
+					complexTypeKey = complexTypeKey.slice(0, complexTypeKey.length-1)
+				}
+				complexTypeKey += i;
+				i++;
+			}
+			
+			//Rename complexType in parserContext for downstream FunctionImport logic
+			parserContext.allComplexTypes[complexTypeKey] = parserContext.allComplexTypes[originalName];
+			parserContext.allComplexTypes[complexTypeKey]['_attributes'].Name = complexTypeKey
+			delete parserContext.allComplexTypes[originalName]
+			//Correct Return Type of affected FunctionImports
+			const functionImportsWithWrongReturnType = parserContext.allFunctionImports.filter(fi => fi[2] === originalName || fi[2] === `Collection(${originalName})`);
+			for (const functionImport of functionImportsWithWrongReturnType)  {
+				functionImport[2] = functionImport[2].replace(originalName, complexTypeKey);
+			}
+		}
+
+		complexTypeCSN += _getServiceComplexType(complexTypeKey, complexType, parserContext, isOpenType);
 		if (i !== complexTypesKeys.length - 1) {
-			complexTypeCSN = complexTypeCSN + ",\n";
+			complexTypeCSN += ",\n";
 		} else {
-			complexTypeCSN = complexTypeCSN + "\n";
+			complexTypeCSN += "\n";
 		}
 	}
 	return complexTypeCSN;

package/lib/import/openapi/importOpenAPI.js

@@ -685,6 +685,10 @@ function structElements(context, type, schema) {
     //TODO: check if property "name" already exists and has identical cdsType, warn otherwise
     type.elements[name] = cdsType(context, propSchema);
     if (name !== prop) type.elements[name]["@openapi.name"] = prop;
+    // Add @mandatory if the property is in the required array
+    if (schema.required && schema.required.includes(prop)) {
+      type.elements[name]["@mandatory"] = true;
+    }
   }
 }
 

package/lib/index.js

@@ -35,10 +35,11 @@ class CdsDk {
   }
 }
 
-const REQUIRED_CDS_MAJOR = 7, REQUIRED_CDS_MINOR = 2
+const REQUIRED_CDS_MAJOR = 8, REQUIRED_CDS_MINOR = 3
 const [major, minor] = cds.version.split('.').map(Number)
 if (major < REQUIRED_CDS_MAJOR || major === REQUIRED_CDS_MAJOR && minor < REQUIRED_CDS_MINOR) {
   const [dkVersion] = require('../package.json').version.split('.')
+
   console.error(`
   This application uses '@sap/cds' version ${major}.${minor}, which is not compatible with the installed '@sap/cds-dk' version ${dkVersion}.
   You can either:
@@ -48,16 +49,6 @@ if (major < REQUIRED_CDS_MAJOR || major === REQUIRED_CDS_MAJOR && minor < REQUIR
   process.exit(1)
 }
 
-const EXCLUDED_CDS_MAJOR = 9
-if (major >= EXCLUDED_CDS_MAJOR) {
-  const [dkVersion] = require('../package.json').version.split('.')
-  console.error(`
-  This application uses '@sap/cds' version ${major}, which is not compatible with the installed '@sap/cds-dk' version ${dkVersion}.
-  Update '@sap/cds-dk' to the latest version.
-`)
-  process.exit(1)
-}
-
 cds.extend (cds.constructor) .with (CdsDk)
 
 class CdsDkAdd {

package/lib/init/constants.js

@@ -61,7 +61,6 @@ module.exports = {
         DATA: 'data',
         HTTP: 'http',
         LINT: 'lint',
-        LINT_GLOBAL: 'lint:global',
         LINT_DEV: 'lint:dev',
         PIPELINE: 'pipeline',
     }),

package/lib/init/merge.js

@@ -1,7 +1,8 @@
 const { EOL } = require('node:os')
 const { inspect } = require('node:util')
 const cds = require('../cds')
-const { copy, read, write, exists, path: {resolve, join}, yaml: YAML } = cds.utils
+const YAML = require('yaml')
+const { copy, read, write, exists, path: {resolve, join} } = cds.utils
 const { readYAML, writeYAML, readJSON } = require('../util/fs')
 const { detectIndent } = require('./indent')
 const { colors } = require('../util/term')
@@ -50,43 +51,7 @@ module.exports.mergeGitignore = async function(into, from) {
     const enhanced = target.concat(source.filter(line => !target.includes(line)))
     await write(into, enhanced.join(EOL))
     return enhanced
-  }
-
-/**
- * @typedef {Object} MatchedNode
- * @property {string | MatchedNode} in - key path or matched node to start search from
- * @property {Object} where - list of constraints
- */
-
-/**
- * @typedef {Object} Overwrites
- * @property {(string | MatchedNode)[]} item - path to item to be overwritten
- * @property {string} withValue - replacement string
- */
-
-/**
- * @typedef {Object} Deletion
- * @property {MatchedNode} item - matched node to delete
- * @property {MatchedNode} [key] - key path to property to delete in node (optional)
- * @property {Object[]} [relationships] - list of relationships to delete
- * @property {string} relationships[].removeProperty - key path to to-be-removed property
- * @property {string[]} relationships[].allWithin - key path to relationship
- */
-
-/**
- * @typedef {Object} Relationship
- * @property {(string | MatchedNode)[]} insert - source path to matched node
- * @property {(string | MatchedNode)[]} into - target path for inserted relationship
- */
-
-/**
- * @typedef {Object} MergingSemantics
- * @property {boolean} [forceOverwrite] - overwrite values for existing keys
- * @property {MatchedNode[]} [additions] - matched nodes to be added from source template
- * @property {Overwrites[]} [overwrites] - matched keys to be overwritten with given string
- * @property {Deletion[]} [deletions] - matched nodes to be deleted
- * @property {Relationship[]} [relationships] - relationships to be inserted
- */
+}
 
 /**
  * @param {string | JSON} into - file path or JSON to merge into
@@ -121,8 +86,8 @@ async function _mergeJSON(into, from, project, semantics) {
 }
 
 /**
- * @param {string | YAML.Document} into - file path or YAML to merge into
- * @param {string | YAML.Document} from - file path or YAML to merge from
+ * @param {string | YAML.Document | object} into - file path or YAML to merge into
+ * @param {string | YAML.Document | object} from - file path or YAML to merge from
  * @param {Object} [project] - project descriptor used for Mustache replacements
  * @param {MergingSemantics} [semantics] - merging algorithm semantics
  * @returns {Promise<YAML.Document>} - merged YAML
@@ -169,11 +134,14 @@ async function _mergeYAML(into, from, project, semantics = {}) {
 
     const _validateWhere = (node, dict, index) => {
         const _addToMap = entries => entries?.filter(entry => {
-                if (typeof entry.in === 'string') return true // just a key path on the document root
-                const neededParent = dict.get(entry.in[0])?.node
-                return collectionStack.includes(neededParent) // lookbehind in parent collection stack
-                // REVISIT: Only look behind until sequence is reached?
+            if (typeof entry.in === 'string') return true
+            if (typeof entry === 'string' && !entry.where) return false  // no random access caching needed for pure key paths
+            if (Array.isArray(entry)) entry = entry[0]
+            const neededParent = dict.get(entry.in[0])?.node
+            return collectionStack.includes(neededParent) // lookbehind in parent collection stack
+            // REVISIT: Only look behind until sequence is reached?
         }).forEach(item => {
+            if (Array.isArray(item)) item = item[0]
             const json = JSON.parse(String(node))
             const whereFulfilled = Object.entries(item.where).every(([key, value]) =>
                 _getProperty(json, key) === value
@@ -186,7 +154,7 @@ async function _mergeYAML(into, from, project, semantics = {}) {
         if (additions) _addToMap(additions)
         if (deletions) _addToMap(deletions.map(deletion => deletion.item))
         if (relationships) _addToMap(relationships?.map(({into: [entry]}) => entry).filter(e => e))
-        if (overwrites) _addToMap(overwrites.map(overwrite => overwrite.item[0]))
+        if (overwrites) _addToMap(overwrites.map(overwrite => overwrite.item))
     }
 
     function _traverseYAMLNode(node, index, actions, templateNode) {
@@ -284,11 +252,23 @@ async function _mergeYAML(into, from, project, semantics = {}) {
     overwrites?.forEach(({ item, withValue }) => {
         const keyPath = Array.isArray(item) && typeof item[0] === 'string' ? item[0] : typeof item === 'string' ? item : item[1]
         const inEntry = Array.isArray(item) && typeof item[0] === 'object' ? item[0] : typeof item === 'object' ? item : item[1]
-        const node = inEntry && entryMap.get(inEntry) ? entryMap.get(inEntry).node : collectionStack[collectionStack.length - 1]
+        let node
+        if (inEntry && entryMap.get(inEntry)) {
+            node = entryMap.get(inEntry).node // starting from item found in nested array cache
+        } else {
+            node = collectionStack[collectionStack.length - 1] // starting from root
+        }
         const keys = keyPath.split('.')
-        if (!node.getIn(keys)) return
-        _getYAMLProperty(node, keys.slice(0, keys.length - 1).join('.'))
-            .set(keys[keys.length - 1], withValue)
+        for (const key of keys.slice(0, -1)) {
+            if (!node?.get(key) && typeof inEntry === 'string') return // node doesn't exist, will be added by template
+            node = node?.get(key) ?? node
+        }
+        const tail = keys.pop()
+        if (!node.get(tail)) {
+            node.add({ key: tail, value: withValue })
+        } else {
+            node.set(tail, withValue)
+        }
     })
 
     // 4. Delete entries from the project (e.g. separate deployer module when adding mtx)
@@ -335,7 +315,7 @@ async function _mergeYAML(into, from, project, semantics = {}) {
                     })
                     .filter(item => !entryMap.get(item))
                     .forEach(item => {
-                        if (!templateEntryMap.get(item)) throw 'Error: did not find entry in template for ' + inspect(item, { colors, depth:11 }) + ' in ' + from
+                        if (!templateEntryMap.get(item)) throw 'Error: did not find entry in template for ' + inspect(item, { colors, depth:11 }) + ' in \n' + from
                         const templateNode = templateEntryMap.get(item).node
                         item.at !== undefined ? targetNode.items.splice(item.at, 0, templateNode) : targetNode.add(templateNode)
                     })
@@ -352,36 +332,42 @@ async function _mergeYAML(into, from, project, semantics = {}) {
     // 7. Create missing relationships
     _traverseYAMLNode(target.contents, null, {
         mergeCollection: (targetNode, templateNode) => {
-          if (YAML.isSeq(templateNode)) {
+            if (!YAML.isSeq(templateNode)) return
             const targetJSON = YAML.parse(String(targetNode))
-            const relationships = semantics.relationships?.filter(relationship => {
-              const [entry, keyPath] = relationship.into
-              if (!entryMap.get(entry)) return false
-              const existingNode = _getYAMLProperty(entryMap.get(entry).node, keyPath)
-              return targetNode === existingNode
-            }) ?? []
-
-            for (const { into, insert } of relationships) {
-              const intoKey = into[into.length - 1]
-              const [insEntry, entryKeyPath] = insert
-              const missingPairs = [insEntry]
-                .filter(item => {
-                  if (!entryMap.get(item)) {
-                    const spec = inspect(item, { colors, depth:11 })
-                    throw new Error(`Did not find entry in template for ${spec} in ${from}:\n${source}`)
-                  }
-                  return !targetJSON.some(targetItem =>
-                    _getProperty(entryMap.get(item).json, entryKeyPath) === targetItem[intoKey]
-                 )
-                })
-                .map(item => entryMap.get(item).node.get(intoKey))
-              for (const pair of missingPairs) {
-                targetNode.add({ [intoKey]: pair })
-              }
+            for (const { insert, into } of semantics.relationships ?? []) {
+                const [first, ...rest] = into
+                const seqPath = rest.find(x => typeof x === 'string') || ''
+                const keyPath = rest.length > 1 ? rest.at(-1) : null
+                const base = entryMap.get(first)
+                if (!base) continue
+                const seqNode = seqPath ? _getYAMLProperty(base.node, seqPath) : base.node
+                if (seqNode !== targetNode) continue
+                const inserts = Array.isArray(insert) ? insert : [insert]
+                for (const ins of inserts) {
+                    const insEntry = entryMap.get(ins)
+                    if (!insEntry) continue
+                    const srcNode = insEntry.node, srcJson = insEntry.json
+                    let key = keyPath
+                    if (!key && srcNode.get && srcNode.get('name')) key = 'name'
+                    let cand, duplicate
+                    if (key) {
+                        const val = _getProperty(srcJson, key)
+                        cand = templateNode.items.find(i => YAML.isMap(i) && i.get(key) === val) || { [key]: val }
+                        duplicate = targetJSON.some(t => t?.[key] === val)
+                    } else {
+                        cand = templateNode.items.find(i => JSON.stringify(YAML.parse(String(i))) === JSON.stringify(YAML.parse(String(srcNode)))) || srcNode
+                        const srcObj = YAML.parse(String(cand))
+                        duplicate = targetJSON.some(t => JSON.stringify(t) === JSON.stringify(srcObj))
+                    }
+                    if (!duplicate) {
+                        const clone = YAML.parse(YAML.stringify(cand))
+                        targetNode.add(clone)
+                        targetJSON.push(clone)
+                    }
+                }
             }
-          }
         }
-      }, source.contents)
+    }, source.contents)
 
     typeof into === 'string' && await writeYAML(into, target)
     return target
@@ -456,3 +442,41 @@ module.exports.merge = (...src) => {
     }
   }
 }
+
+
+/**
+ * @typedef {Object} MatchedNode
+ * @property {string | MatchedNode} in - key path or matched node to start search from
+ * @property {Object} where - list of constraints
+ */
+
+/**
+ * @typedef {Object} Overwrites
+ * @property {(string | MatchedNode)[]} item - path to item to be overwritten
+ * @property {string} withValue - replacement string
+ */
+
+/**
+ * @typedef {Object} Deletion
+ * @property {MatchedNode} item - matched node to delete
+ * @property {MatchedNode} [key] - key path to property to delete in node (optional)
+ * @property {Object[]} [relationships] - list of relationships to delete
+ * @property {string} relationships[].removeProperty - key path to to-be-removed property
+ * @property {string[]} relationships[].allWithin - key path to relationship
+ */
+
+/**
+ * @typedef {Object} Relationship
+ * @property {(string | MatchedNode)[]} insert - source path to matched node
+ * @property {(string | MatchedNode)[]} into - target path for inserted relationship
+ */
+
+/**
+ * @typedef {Object} MergingSemantics
+ * @property {boolean} [forceOverwrite] - overwrite values for existing keys
+ * @property {MatchedNode[]} [additions] - matched nodes to be added from source template
+ * @property {Overwrites[]} [overwrites] - matched keys to be overwritten with given string
+ * @property {Deletion[]} [deletions] - matched nodes to be deleted
+ * @property {Relationship[]} [relationships] - relationships to be inserted
+ */
+

package/lib/init/mvn.js

@@ -156,15 +156,15 @@ function _scan(mvnParams) {
     //          a=[x,y,z]   => a:x,y,z
     const quoteRegex = /([\w\-.]+)=([\w\-.]+|\[([\w.\-,]+)\])/g
     return [...mvnParams.matchAll(quoteRegex)].map(([,key,value,listValues]) => {
-        key = key.startsWith('-D') ? key : `-D${key}`
+        key = key.startsWith('-') ? key : `-${key}`
         return [key, listValues || value]
     })
 }
 
 function _finalize(params) {
     params.set(`-Dstyle.color`, `always`)
-    if (LOG._debug) params.set('-X')
-    if (LOG._debug) params.set('-e')
+    if (LOG._debug && !params.has('-X')) params.set('-X')
+    if (LOG._debug && !params.has('-e')) params.set('-e')
     if (process.env.CI) params.set('--batch-mode')
     const final = Array.from(params, ([arg, val]) => val !== null && val !== undefined ? `${arg}=${val}` : arg)
     DEBUG?.(term.highlight('mvn ' + final.join(' ')))

package/lib/init/projectReader.js

@@ -194,7 +194,7 @@ module.exports = new class ProjectReader {
             hasUI5: _ui5,
             hasMTXRoute: () => _inProd('extensibility') || (_inProd('multitenancy') && !_isJava()),
             hasMTXRouteJava: () => (_inProd('helm-unified-runtime') || _inProd('helm')) && _isJava() && _inProd('multitenancy'),
-            imageRegistry: () => exists('chart/values.yaml') ? cds.load.yaml(join(cds.root, 'chart/values.yaml')).global?.image?.registry ?? '<your-container-registry>' : '<your-container-registry>',
+            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,
         }
 

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

@@ -10,7 +10,12 @@ modules:
   - name: {{appName}}-ams-policies-deployer
     type: javascript.nodejs
     {{#isJava}}
-    path: srv/src/gen/policies
+    path: .
+    build-parameters:
+      builder: custom
+      commands:
+        - npx cds build --for ams
+      build-result: srv/src/gen/policies
     {{/isJava}}
     {{^isJava}}
     path: gen/policies

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

@@ -1,7 +1,7 @@
 {
   {{#isNodejs}}
   "dependencies": {
-    "@sap/ams": "^2"
+    "@sap/ams": "^3"
   },
   "devDependencies": {
     "@sap/ams-dev": "^2"

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

@@ -72,6 +72,8 @@ modules:
 resources:
   - name: {{appName}}-auth
     type: org.cloudfoundry.managed-service
+    requires:
+      - name: app-api
     parameters:
       service: xsuaa
       service-plan: application
@@ -79,3 +81,6 @@ resources:
       config:
         xsappname: {{appName}}-${org}-${space}
         tenant-mode: {{#hasMultitenancy}}shared{{/hasMultitenancy}}{{^hasMultitenancy}}dedicated{{/hasMultitenancy}}
+        oauth2-configuration:
+          redirect-uris:
+            - https://~{app-api/app-uri}/**

package/lib/init/template/cf-manifest/files/manifest.yml.hbs

@@ -17,7 +17,7 @@ applications:
 {{#isJava}}
   path: {{& srvPath}}/target/{{archiveName}}
   memory: 1G
-  disk_quota: 512M
+  disk_quota: 1G
   env:
     SPRING_PROFILES_ACTIVE: cloud
     JBP_CONFIG_COMPONENTS: "jres: ['com.sap.xs.java.buildpack.jdk.SAPMachineJDK']"

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

@@ -2,9 +2,9 @@
   "dependencies": {
     "@cap-js/telemetry": ">=0",
     "@grpc/grpc-js": "^1",
-    "@opentelemetry/exporter-trace-otlp-grpc": "^0",
-    "@opentelemetry/exporter-metrics-otlp-grpc": "^0",
-    "@opentelemetry/host-metrics": "^0"
+    "@opentelemetry/exporter-trace-otlp-grpc": "<0.200",
+    "@opentelemetry/exporter-metrics-otlp-grpc": "<0.200",
+    "@opentelemetry/host-metrics": "<0.200"
   },
   "cds": {
     "requires": {

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

@@ -37,4 +37,4 @@ resources:
       service: dynatrace
       service-plan: environment
       config:
-        environment_name: {{appName}}
+        environment_name: {{uppercaseStrippedAppName}}

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

@@ -1,8 +1,8 @@
 {
   "dependencies": {
     "@cap-js/telemetry": ">=0",
-    "@opentelemetry/exporter-metrics-otlp-proto": "^0"{{#hasHelm}},
-    "@opentelemetry/host-metrics": "^0"
+    "@opentelemetry/exporter-metrics-otlp-proto": "<0.200"{{#hasHelm}},
+    "@opentelemetry/host-metrics": "<0.200"
     {{/hasHelm}}
   },
   "cds": {

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

@@ -24,7 +24,7 @@ module.exports = class extends require('../../plugin') {
 
   async combine() {
     const project = readProject()
-    const { hasMta, hasHelm, hasHelmUnifiedRuntime, isJava, hasMultitenancy, srvPath } = project
+    const { appName, hasMta, hasHelm, hasHelmUnifiedRuntime, isJava, hasMultitenancy, srvPath } = project
 
     if (hasMta) {
       const dynatrace = {
@@ -48,6 +48,7 @@ module.exports = class extends require('../../plugin') {
           into: [mtxSidecar, 'requires', 'name']
         })
       }
+      project.uppercaseStrippedAppName = appName.replace(/-/g, '').toUpperCase().slice(0, 16),
       await merge(__dirname, 'files/mta.yaml.hbs').into('mta.yaml', {
         with: project, additions, relationships
       })

package/lib/init/template/enterprise-messaging/files/mta.yaml.hbs

@@ -13,3 +13,9 @@ resources:
       service: enterprise-messaging
       service-plan: default
       path: ./event-mesh.json
+  - type: org.cloudfoundry.managed-service
+    parameters:
+      service: xsuaa
+      service-plan: application
+    processed-after:
+      - {{appName}}-messaging

package/lib/init/template/enterprise-messaging/index.js

@@ -2,7 +2,7 @@ const cds = require('../../../cds')
 const { read, yaml: YAML } = cds.utils
 const { readProject } = require('../../projectReader')
 const { merge } = require('../../merge')
-const { srv4, enterpriseMessaging } = require('../../registries/mta')
+const { srv4, enterpriseMessaging, xsuaa } = require('../../registries/mta')
 
 module.exports = class EnterpriseMessagingTemplate extends require('../../plugin') {
 
@@ -58,6 +58,10 @@ module.exports = class EnterpriseMessagingTemplate extends require('../../plugin
 
     if (hasXsuaa) {
       if (hasMta) {
+        await merge(__dirname, 'files/mta.yaml.hbs').into('mta.yaml', {
+          project,
+          additions: [xsuaa]
+        })
         project['em-service-name'] = YAML.parse(await read('mta.yaml'))?.resources?.find(r => r?.parameters?.service === 'enterprise-messaging')?.name
       } else {
         project['em-service-name'] = `${appName}-messaging`

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

@@ -1,7 +1,7 @@
 {
   {{#isNodejs}}
   "dependencies": {
-    "@sap/cds-mtxs": "^2"
+    "@sap/cds-mtxs": "^3"
   },
   "cds": {
   {{/isNodejs}}

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

@@ -8,7 +8,7 @@
     "node": "^22.0.0"
   },
   "scripts": {
-    "start": "node node_modules/@sap/hdi-deploy/deploy.js --use-hdb",
+    "start": "node node_modules/@sap/hdi-deploy/deploy.js --use-hdb --parameter com.sap.hana.di.table/try_fast_table_migration=true",
     "build": "npm i && npx cds build .. --for hana --production"
   }
 }

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

@@ -1,12 +1,10 @@
 {
   {{#isNodejs}}
   "dependencies": {
-    "@cap-js/hana": "^1"
+    "@cap-js/hana": "^2"
   },
   "cds": {
-    "sql": {
-      "native_hana_associations": false
-    }{{#profile}},
+    {{#profile}}
     "requires": {
       "[{{profile}}]": {
       {{#shortcut}}

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

@@ -1,6 +1,7 @@
 const { join } = require('path')
+const yaml = require('yaml')
 const cds = require('../../../cds')
-const { exists, rimraf, copy, readFileSync, yaml } = cds.utils
+const { exists, rimraf, copy, readFileSync } = cds.utils
 const { readProject } = require('../../projectReader')
 const { merge } = require('../../merge')
 const { ask4 } = require('../../../util/question')
@@ -46,43 +47,33 @@ module.exports = class HelmTemplate extends require('../../plugin') {
     async run() {
         const project = readProject()
         project.domain = 'abc.com'
-        project.registry = 'registry-name'
+        project.registry = 'registry-server'
         project.imagePullSecret = 'docker-registry'
         project.tag = 'latest'
 
-        if (cds.cli.command == 'add' && !HelmTemplate.hasInProduction()) {
-            let registry = 'registry-name', tag = 'latest', domain = 'abc.com'
+        if (cds.cli.command === 'add' && !HelmTemplate.hasInProduction()) {
+            let registry = 'registry-server', tag = 'latest', domain = 'abc.com'
 
-            // read domain using kubectl
             try {
-                const domainCmd = execSync(`kubectl config view --minify --output jsonpath="{.clusters[*].cluster.server}"`, { stdio: "pipe" }).toString()
-                const domainStartIndex = domainCmd.indexOf('api.')
-                if (domainStartIndex !== -1) {
-                    domain = domainCmd.substring(domainStartIndex + 4)
-                }
-            } catch (error) {
-                // ignore
-            }
+                const domainGuess = execSync(`kubectl config view --minify --output jsonpath="{.clusters[*].cluster.server}"`, { stdio: "pipe" }).toString()
+                const domainStartIndex = domainGuess.indexOf('api.')
+                if (domainStartIndex !== -1) domain = domainGuess.substring(domainStartIndex + 4)
+            } catch (error) { /* ignore */ }
 
             // read project.registry
             if (exists('containerize.yaml')) {
                 const containerizeYamlFile = readFileSync(join(cds.root, 'containerize.yaml'), 'utf8')
-                const containerizYaml = yaml.parseDocument(containerizeYamlFile).toJS()
-                registry = containerizYaml.repository
-                tag = containerizYaml.tag
+                const containerizeYaml = yaml.parseDocument(containerizeYamlFile).toJS()
+                registry = containerizeYaml.repository
+                tag = containerizeYaml.tag
             }
 
-            let imagePullSecretInput = 'docker-registry'
             if (!cds.cli.options['y']) {
-                const [domainAns, imagePullSecretAns, registryAns] = await ask4(`domain: (${domain}) `, 'imagePullSecret: (docker-registry) ', `registry: (${registry}) `)
-
-                domain = domainAns || domain
-                imagePullSecretInput = imagePullSecretAns || imagePullSecretInput
+                const [registryAns] = await ask4(`registry server (${registry}): `)
                 registry = registryAns || registry
             }
 
             project.domain = domain
-            project.imagePullSecret = imagePullSecretInput
             project.registry = registry
             project.tag = tag
         }

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

@@ -1,5 +1,6 @@
 const cds = require('../../..')
-const { rimraf, exists, readFileSync, yaml } = cds.utils
+const yaml = require('yaml')
+const { rimraf, exists, readFileSync } = cds.utils
 const { join } = require('path')
 
 const { readProject } = require('../../projectReader')

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

@@ -5,11 +5,22 @@ html5-apps-repo-host:
 html5-apps-deployer:
   env:
     SAP_CLOUD_SERVICE: {{strippedAppName}}.service
+    {{#hasIas}}
+    IAS_DEPENDENCY_NAME: {{appName}}-ias-dependency
+    {{/hasIas}}
   image:
     repository: {{appName}}-html5-deployer
   bindings:
+    {{#hasXsuaa}}
     xsuaa:
       serviceInstanceName: xsuaa
+    {{/hasXsuaa}}
+    {{#hasIas}}
+    ias:
+      serviceInstanceName: identity
+      parameters:
+        credential-type: X509_GENERATED
+    {{/hasIas}}
     destination:
       serviceInstanceName: destination
     html5-apps-repo:
@@ -26,7 +37,7 @@ html5-apps-deployer:
     - configMapRef:
         name: "{{ .Release.Name }}-html5-apps-deployer-configmap"
 <%={{ }}=%>
-backendDestinations: 
+backendDestinations:
   srv-api:
     service: srv
 destination: