@sap/cds-dk 9.7.2 → 9.8.1

package/lib/import/odata/v2parser.js

@@ -40,7 +40,7 @@ const edmxncdsdatatype = {
 };
 
 const extendedPrimitiveTypes = [
-    "Edm.Duration",
+  "Edm.Duration",
 	"Edm.Geography",
 	"Edm.GeographyPoint",
 	"Edm.GeographyLineString",
@@ -84,7 +84,7 @@ function _initialize(parserContext) {
 function namespaceAttributeFilter(attributes, parserContext) {
 	let namespaceAttributes = parserContext.allowAllNamespaces
 		? Object.keys(attributes).filter((attr) => attr.includes(':'))
-		: Object.keys(attributes).filter((attr) => 
+		: Object.keys(attributes).filter((attr) =>
 			attr.includes(':') && parserContext.allowedNamespaces.includes(attr.split(':')[0]));
 
 
@@ -104,7 +104,7 @@ function namespaceAttributeFilter(attributes, parserContext) {
 	return namespaceAttributes;
 }
 
-//Function to generate CSN for namespace attributes 
+//Function to generate CSN for namespace attributes
 function _generateNamespaceAttributes(attributes, isBefore) {
 	let csn = "";
 	attributes.forEach((attr) => {
@@ -309,7 +309,7 @@ function _extractFunctionImport(functionImport, parserContext) {
 	Object.keys(functionImport).forEach((key) => {
 		if (key === "_attributes") {
 			if (functionImport[key]["sap:action-for"]) {
-				//storing bound function imports 
+				//storing bound function imports
 				entityName = _extractEntityFromNamespace(functionImport[key]["sap:action-for"]);
 				boundFunctionImports = (parserContext.allFunctionImportsMap[entityName])
 					? parserContext.allFunctionImportsMap[entityName] : [];
@@ -338,7 +338,7 @@ function _checkFunctionImports(functionImports, parserContext) {
 			throw new Error(messages.UNRESOLVED_TYPE + `'${functionImports._attributes.EntitySet}'`);
 		}
 	}
-} 
+}
 
 //extracting the function imports from the metadata
 function _extractAllFunctionImports(functionImports, parserContext) {
@@ -554,9 +554,9 @@ function _getServiceEntityProperty(
 		}
 		// if annotations to be added
 		if (edmxncdsdatatype[dataType + "_a"] && cdsDataType != "cds.Date") {
-			if (dataType === 'Edm.Stream') 
+			if (dataType === 'Edm.Stream')
 				propertyJson = propertyJson + ',\n"@Core.MediaType": "application/octet-stream"';
-			else 
+			else
 				propertyJson = propertyJson + ',\n"@odata.Type": "' + dataType + '"';
 		}
 
@@ -732,7 +732,7 @@ function _getServiceComplexTypes(parserContext) {
 				complexTypeKey += i;
 				i++;
 			}
-			
+
 			//Rename complexType in parserContext for downstream FunctionImport logic
 			parserContext.allComplexTypes[complexTypeKey] = parserContext.allComplexTypes[originalName];
 			parserContext.allComplexTypes[complexTypeKey]['_attributes'].Name = complexTypeKey
@@ -763,7 +763,7 @@ function _parseParameter(parameter, parserContext) {
 	let namespaceAttributes = namespaceAttributeFilter(parameter._attributes, parserContext);
 	const parameterNamespaceAttributes = namespaceAttributes.length ? namespaceAttributes : -1;
 
-	csn = csn + 
+	csn = csn +
 		_getServiceEntityProperty(
 			parameter["_attributes"].Name,
 			parameter["_attributes"].Type,
@@ -796,7 +796,7 @@ function _parseParametersFunctionImport(parameters, entityKeysList, parserContex
 	if (parameters.length) {
 		for (let i = 0; i < parameters.length; i++) {
 			// check if the parameter is a key of the entity type or not
-			// If yes then that paramater is ignored in CSN 
+			// If yes then that paramater is ignored in CSN
 			let isKey = _checkParameterKey(parameters[i], entityKeysList);
 			if (isKey == false) {
 				parameterCsn = _parseParameter(parameters[i], parserContext);
@@ -822,7 +822,6 @@ function _parseParametersFunctionImport(parameters, entityKeysList, parserContex
 }
 
 function _getFunctionImport(functionImport, isBound, entityKeysList, parserContext) {
-	let noValue;
 	let csn = "";
 	csn = csn + '"' + functionImport[0] + '": { \n';
 	csn = csn + '"kind": "';
@@ -832,7 +831,7 @@ function _getFunctionImport(functionImport, isBound, entityKeysList, parserConte
 	} else if (functionImport[1] === "POST") {
 		csn = csn + "action";
 	} else {
-		let message = functionImport[0].substring(functionImport[0].lastIndexOf(".") + 1) + " has kind " + 
+		let message = functionImport[0].substring(functionImport[0].lastIndexOf(".") + 1) + " has kind " +
 			functionImport[1] + " which is not supported.";
 		console.log(warn(message));
 		return "";
@@ -853,9 +852,10 @@ function _getFunctionImport(functionImport, isBound, entityKeysList, parserConte
 	}
 	// if return type exist
 	if (functionImport[2] !== -1) {
-		let returnValue = _getServiceEntityProperty(noValue, functionImport[2], noValue, noValue, noValue, noValue, 
+		let noValue = undefined
+		let returnValue = _getServiceEntityProperty(noValue, functionImport[2], noValue, noValue, noValue, noValue,
 			noValue, noValue, noValue, noValue, -1, noValue, parserContext);
-		
+
 		if (returnValue !== "") {
 			csn = csn + ", \n";
 			csn = csn + '"returns": { \n';
@@ -982,7 +982,7 @@ function _getPropertyAttributes(propAttributes, parserContext) {
 	} else {
 		propOthers.push("true");
 	}
-	
+
 	if (propAttributes.DefaultValue) {
 		propOthers.push(propAttributes.DefaultValue);
 	} else {
@@ -1178,7 +1178,7 @@ function _getCSNMultiplicity(associationEnds, toRole, entityName, parserContext)
 					toRole === attributes.Role &&
 					entityName === attributes.Type
 				) {
-					 
+
 					multiplicity = attributes.Multiplicity;
 					stop = true;
 				}
@@ -1233,7 +1233,7 @@ function _getCSNAssociatedEntitySet(
 	let associationName = relationshipName.replace(parserContext.serviceNamespace + '.', '');
 	let association = parserContext.allAssociations[associationName];
 	let isAssociationSetMissing = false;
-	
+
 	// if association set is missing, use association to extract the informations
 	if (associationSet === undefined) {
 		isAssociationSetMissing = true;
@@ -1272,7 +1272,7 @@ function _findAssociationType(relationshipName, fromRole, parserContext) {
 	const associationName = relationshipName.replace(parserContext.serviceNamespace + '.', '');
 	const association = parserContext.allAssociations[associationName];
 	if (association === undefined)	throw new Error(`'${associationName}' ` + messages.MISSING_ASSOCIATION);
-	
+
 	const associationEnds = association.End;
 	let associationType;
 
@@ -1398,7 +1398,7 @@ function _constructServiceEntity(
 	let csnProperties;
 	let hasProperties;
 	csnEntity = csnEntity + '"kind": "entity",\n';
-	csnEntity = csnEntity + '"@cds.external": true,\n'; 
+	csnEntity = csnEntity + '"@cds.external": true,\n';
 	if (ignorePersistenceSkip === false) {
 		csnEntity = csnEntity + '"@cds.persistence.skip": true,\n';
 	}
@@ -1474,10 +1474,10 @@ function _constructServiceEntity(
 		}
 	}
 
-	// if the function import is bound to entitySet 
-	if (parserContext.allFunctionImportsMap[entityName]) {	
+	// if the function import is bound to entitySet
+	if (parserContext.allFunctionImportsMap[entityName]) {
 		csnEntity = csnEntity + ', \n "actions": {\n';
-		csnEntity = csnEntity + 
+		csnEntity = csnEntity +
 			_getAllFunctionImports(parserContext.allFunctionImportsMap[entityName],
 				1, entityKeysList, parserContext
 			);
@@ -1545,7 +1545,7 @@ function _parseServiceEntity(entityName, entity, ignorePersistenceSkip, parserCo
 	// adding blob element if entity has m:HasStream as true
 	const checkProperty = entityAttributes["allowedNamespaceAttributes"].filter(e => e["m.HasStream"] === 'true');
 	if (checkProperty.length === 1) _addBlobElement(entityPropertiesMap);
-	
+
 	return _constructServiceEntity(
 		entityName,
 		entityKeysList,
@@ -1686,7 +1686,7 @@ function _generateEDMXJSON2CSN(jsonObj, ignorePersistenceSkip, parserContext) {
 
 	// Construct CSN entity based on EDMX entity
 	let entityJson = jsonObj["edmx:Edmx"]["edmx:DataServices"].Schema.EntityType;
-	// if entityJson exists(ignoring the case of no entity) and is not an array, convert it to an array to handle the case of single entity	
+	// if entityJson exists(ignoring the case of no entity) and is not an array, convert it to an array to handle the case of single entity
 	if (entityJson && !Array.isArray(entityJson)) entityJson = [entityJson];
 	const definitions = [];
 
@@ -1734,7 +1734,7 @@ function _generateEDMXJSON2CSN(jsonObj, ignorePersistenceSkip, parserContext) {
 
 	// if there are unbound function imports
 	if (Object.keys(parserContext.allFunctionImports).length > 0) {
-		// passing 0 for unbound actions/functions and 0 for entityKeysList 
+		// passing 0 for unbound actions/functions and 0 for entityKeysList
 		definitions.push(
 			_getAllFunctionImports(parserContext.allFunctionImports, 0, 0, parserContext)
 		);
@@ -1743,7 +1743,7 @@ function _generateEDMXJSON2CSN(jsonObj, ignorePersistenceSkip, parserContext) {
 	try {
 		csn.definitions = JSON.parse(`{${definitions.join(",")}}`);
 		return JSON.stringify(csn, null, 4);
-	} catch (error) {
+	} catch {
 		throw new Error("Unable to convert to csn file.");
 	}
 }
@@ -1755,7 +1755,7 @@ function getEdmxv2CSN(edmx2jsonModel, ignorePersistenceSkip, mockServerUc, conte
 	const parserContext = {};
 	_initialize(parserContext);
 	parserContext.mockServerUc = mockServerUc
-	
+
 	if (!context.include_all_namespaces && context.namespaces.length) {
 		parserContext.allowedNamespaces = parserContext.allowedNamespaces.concat(context.namespaces)
 	}
@@ -1771,7 +1771,7 @@ function getEdmxv2CSN(edmx2jsonModel, ignorePersistenceSkip, mockServerUc, conte
 		let namespaceAlias = edmx2jsonModel["edmx:Edmx"]["edmx:DataServices"].Schema._attributes.Alias;
 		// replace the namespace alias value with original namespace value
 		if (namespaceAlias) {
-			edmx2jsonModel = common.replaceAliasValue(JSON.stringify(edmx2jsonModel), 
+			edmx2jsonModel = common.replaceAliasValue(JSON.stringify(edmx2jsonModel),
 			parserContext.serviceNamespace, namespaceAlias);
 		}
 		csnDataModel = _generateEDMXJSON2CSN(

package/lib/import/odata/v4parser.js

@@ -88,7 +88,7 @@ function _isJson(edmx) {
     try {
         JSON.parse(edmx);
         isJson = true;
-    } catch (err) {
+    } catch {
         isJson = false;
     }
     return isJson;
@@ -792,7 +792,7 @@ function _parsePropertyContent(csnObj, elementObj, parserContext) {
 
                         if (['EnumType', 'TypeDefinition'].includes(dataKind)) {
                             csnObj.elements[objKey] = _generateStructuredDataTypeCsn(dataType, contentObj,
-                                (keySet.includes(dataType) ? isPrimaryKey : !isPrimaryKey),
+                                (keySet.includes(objKey) ? isPrimaryKey : !isPrimaryKey),
                                 dataKind, 'property', parserContext
                             );
                         }
@@ -1713,6 +1713,41 @@ function _generateCSN(edmxAsJson, ignorePersistenceSkip, parserContext, importer
             if (compTarget.elements[backLink]?.keys && !entityKeys.some(key => compTarget.elements[backLink + '_' + key])) {
                 delete compTarget.elements[backLink].keys
             }
+
+            // 3. View with parameters handling. In OData if the entity has a Composition Set with a backlink Parameters and every
+            // other element is a key, its a View with Parameters. Import it as such to ensure proper outbound handling
+            if (
+                comp === 'Set' && backLink === 'Parameters' && 
+                Object.keys(entity.elements).filter(e => entity.elements[e].key).length + 1 === Object.keys(entity.elements).length
+            ) {
+                const actualEntity = csn.definitions[entity.elements[comp].target];
+                const actualEntityName = entity.elements[comp].target
+                // Adjust entity so that the current elements are parameters, remove Set, remove key flags
+                delete entity.elements[comp];
+                entity.params = {}
+                for (const ele in entity.elements) {
+                    delete entity.elements[ele].key;
+                    entity.params[ele] = entity.elements[ele];
+                }
+                delete entity.elements
+                // Move compTarget out of service
+                // Get rid of service prefix
+                let nameWithoutService = eName.split(parserContext.primarySchema).pop();
+                // Get rid of leading dot
+                nameWithoutService = nameWithoutService.substring(1, nameWithoutService.length)
+                csn.definitions[nameWithoutService] = actualEntity;
+                delete csn.definitions[actualEntityName];
+                delete csn.definitions[nameWithoutService].elements['Parameters'];
+                // Adjust entity to * query from compTarget
+                entity.query = {
+                    SELECT: {
+                        from: {
+                            ref: [nameWithoutService]
+                        },
+                        columns: ["*"]
+                    }
+                }
+            }
         }
     }
     return JSON.stringify(csn, null, 4);

package/lib/import/openapi/index.js

@@ -8,7 +8,7 @@ function openAPI2csn(source) {
     try {
         const fileContentToJSON = JSON.parse(source);
         csn = importOpenAPI(fileContentToJSON);
-    } catch (e) {
+    } catch {
         throw new Error(messages.INVALID_OPENAPI_FILE);
     }
     return csn;

package/lib/init/constants.js

@@ -5,7 +5,7 @@ module.exports = {
     COMMAND_ADD: 'add',
 
     JAVA_LTS_VERSIONS: [17, 21],
-    MAVEN_ARCHETYPE_VERSION: '4.7.0',
+    MAVEN_ARCHETYPE_VERSION: '4.8.0',
 
     OPTIONS: Object.freeze({
         COMPLETION: 'completion',
@@ -67,7 +67,6 @@ module.exports = {
         DATA: 'data',
         HTTP: 'http',
         LINT: 'lint',
-        LINT_DEV: 'lint:dev',
         PIPELINE: 'pipeline',
         GITHUB_ACTIONS: 'github-actions',
     }),

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

@@ -9,7 +9,7 @@ const { exists } = require('../../../cds').utils
 module.exports = class extends require('../../plugin') {
 
     static help() {
-        return 'SAP BTP AppFront service' // TODO: Product name?
+        return 'SAP BTP Application Frontend service'
     }
 
     static hasInProduction(env) {

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

@@ -1,7 +1,7 @@
 {
   "name": "approuter",
   "dependencies": {
-    "@sap/approuter": "^20.0.0"
+    "@sap/approuter": "^21.0.0"
   },
   "scripts": {
     "start": "node node_modules/@sap/approuter/approuter.js"

package/lib/init/template/completion/completionSetup.js

@@ -166,7 +166,7 @@ fi
         let profileFileExists = true;
         try {
             profile = await fsp.readFile(profileFile, 'utf8');
-        } catch (err) {
+        } catch {
             profileFileExists = false;
             await fsp.mkdir(path.dirname(profileFile), { recursive: true });
         }

package/lib/init/template/data/as-csv.js

@@ -13,7 +13,7 @@ module.exports = async (data={}, csn, { headerOnly=false, separator=',' }={}) =>
   // So loop as long as there is some non-string data left.
   while (Object.values(data).some(d => typeof d === 'object')) {
     Object.entries(data)
-    .filter(([_, value]) => typeof value === 'object')
+    .filter(([, value]) => typeof value === 'object')
     .map(([name]) => csn.definitions[name])
     .forEach(entity => {
       const entityData = data[entity.name]

package/lib/init/template/github-actions/index.js

@@ -39,7 +39,7 @@ module.exports = class GitHubActionTemplate extends require('../../plugin') {
       let githubSlug
       try {
           githubSlug = execSync('git remote get-url origin', { stdio: 'pipe' }).toString().split('/').slice(-2).join('/').trim().replace(/\.git$/, '')
-      } catch (error) {
+      } catch {
         githubSlug = '<org/repo>'
         // console.log(`\ncould not determine GitHub URL for the project – replace '<org/repo>' in ${release}`, DEBUG ? error : '')
       }

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

@@ -162,7 +162,7 @@ async function loadModel() {
   }
 }
 
-// TODO remove w/ cds 10, copied from cds-utils.js
+// cds10: remove, copied from cds-utils.js
 /**
  * Polyfill for cds.utils.merge
  * Simple helper to deep-merge two or more objects.

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

@@ -40,15 +40,15 @@ module.exports = class HelmTemplate extends require('../../plugin') {
     }
 
     async run() {
-        console.warn(term.warn(`The "cds add helm" command is deprecated and will be removed in the next major release. Please use the "cds add kyma" command instead.`))
+        console.log(term.warn(`The "cds add helm" command is deprecated and will be removed in the next major release. Please use the "cds add kyma" command instead.`))
         const project = readProject()
-        let imagePullSecret, registry, domain, tag
+        let registry, domain, tag
         if (!HelmTemplate.hasInProduction() && !project.isBas /* don't run this for the BAS Yeoman generator */) {
             try {
                 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 */ }
+            } catch { /* ignore */ }
 
             if (exists('containerize.yaml')) {
                 const { repository: r, tag: t } = yaml.parse(join(cds.root, 'containerize.yaml'))
@@ -62,7 +62,7 @@ module.exports = class HelmTemplate extends require('../../plugin') {
         }
         project.registry = registry ?? '<your-container-registry-server>'
         project.domain = domain ?? '<cluster-domain>'
-        project.imagePullSecret = imagePullSecret ?? 'docker-registry'
+        project.imagePullSecret = 'docker-registry'
         project.tag = tag ?? 'latest'
         await copy(join(__dirname, '../kyma/files/values.schema.json')).to('chart/values.schema.json')
         await merge(__dirname, '../kyma/files/Chart.yaml.hbs').into('chart/Chart.yaml', { with: project })

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

@@ -46,13 +46,13 @@ module.exports = class KymaTemplate extends require('../../plugin') {
 
   async run() {
     const project = readProject()
-    let imagePullSecret, registry, domain, tag
+    let registry, domain, tag
     if (!KymaTemplate.hasInProduction() && !project.isBas /* don't run this for the BAS Yeoman generator */) {
       try {
         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 */ }
+      } catch { /* ignore */ }
 
       // cds10: remove
       if (exists('containerize.yaml')) {
@@ -67,7 +67,7 @@ module.exports = class KymaTemplate extends require('../../plugin') {
     }
     project.registry = registry ?? '<your-container-registry-server>'
     project.domain = domain ?? '<cluster-domain>'
-    project.imagePullSecret = imagePullSecret ?? 'docker-registry'
+    project.imagePullSecret = 'docker-registry'
     project.tag = tag ?? 'latest'
     await copy(join(__dirname, 'files', 'values.schema.json')).to('chart/values.schema.json')
     await merge(__dirname, 'files/Chart.yaml.hbs').into('chart/Chart.yaml', { with: project })

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

@@ -18,7 +18,7 @@ const ESLINT_LANGS_FOR_FILE_TYPE = {
  * Searches for ESLint config file types (in order or precedence)
  * and returns corresponding directory (usually project's root dir)
  * https://eslint.org/docs/user-guide/configuring#configuration-file-formats
- * @param {string} currentDir start here and search until root dir
+ * @param {string} currentDir start here
  * @returns {string} dir containing ESLint config file (empty if not exists)
  */
 function getConfigPath(currentDir = '.') {
@@ -27,15 +27,11 @@ function getConfigPath(currentDir = '.') {
     'eslint.config.cjs',
     'eslint.config.mjs'
   ]
-  let configDir = path.resolve(currentDir)
-  while (configDir !== path.resolve(configDir, '..')) {
-    for (const configFile of configFiles) {
-      const configPath = path.join(configDir, configFile)
-      if (fs.existsSync(configPath) && fs.statSync(configPath).isFile()) {
-        return configPath
-      }
+  for (const configFile of configFiles) {
+    const configPath = path.join(currentDir, configFile)
+    if (fs.existsSync(configPath) && fs.statSync(configPath).isFile()) {
+      return configPath
     }
-    configDir = path.join(configDir, '..')
   }
   return ''
 }
@@ -46,14 +42,6 @@ module.exports = class LintTemplate extends require('../../plugin') {
     return 'configure cds lint'
   }
 
-  constructor() {
-    super()
-    const customPath = path.join(cds.root, '.eslint')
-    this.docsPath = path.join(customPath, 'docs')
-    this.rulesPath = path.join(customPath, 'rules')
-    this.testsPath = path.join(customPath, 'tests')
-  }
-
   async run() {
     // Require local ESLint plugin installation and corresponding config
     await this.#addEslintPluginConfig()
@@ -62,8 +50,7 @@ module.exports = class LintTemplate extends require('../../plugin') {
     const extensions = new Set(Object.values(ESLINT_LANGS_FOR_FILE_TYPE).flat())
     await io.sanitizeVscodeSettings(
       path.join(cds.root, '.vscode/settings.json'),
-      Array.from(extensions),
-      this.customRuleExample
+      Array.from(extensions)
     )
 
     await merge(path.join(__dirname, 'files', 'package.json')).into('package.json')
@@ -72,8 +59,7 @@ module.exports = class LintTemplate extends require('../../plugin') {
   }
 
   async #addEslintPluginConfig() {
-    const configPath = getConfigPath(cds.root)
-      ?? path.join(cds.root, 'eslint.config.mjs')
+    const configPath = getConfigPath(cds.root) || path.join(cds.root, 'eslint.config.mjs')
     await io.sanitizeEslintConfig(configPath)
   }
 }

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

@@ -5,12 +5,7 @@
   },
   "cds": {
   {{/isNodejs}}
-    {{#isJava}}
-    "profiles": ["with-mtx-sidecar", "java"],
-    {{/isJava}}
-    {{#isNodejs}}
     "profile": "with-mtx-sidecar",
-    {{/isNodejs}}
     "requires": {
       {{#profile}}
       "[{{profile}}]": {

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

@@ -0,0 +1,15 @@
+---
+modules:
+  - name: {{appName}}-postgres-deployer
+    build-parameters:
+      buildpack:
+        {{#hasHelmUnifiedRuntime}}
+        builder: proxy-unified-runtime-dmz.int.repositories.cloud.sap/builder/noble
+        {{/hasHelmUnifiedRuntime}}
+        {{^hasHelmUnifiedRuntime}}
+        type: nodejs
+        builder: builder-jammy-base
+        {{/hasHelmUnifiedRuntime}}
+        path: gen/pg
+        env:
+          BP_NODE_RUN_SCRIPTS: ""

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

@@ -1,5 +1,40 @@
 {
+  {{#isNodejs}}
   "dependencies": {
     "@cap-js/postgres": "^2"
+  }{{#profile}},
+  "cds": {
+    "requires": {
+      "[{{profile}}]": {
+      {{#shortcut}}
+        "db": "postgres"
+      {{/shortcut}}
+      {{^shortcut}}
+        "db": {
+          "kind": "postgres"
+        }
+      {{/shortcut}}
+      }
+    }
   }
+  {{/profile}}
+  {{/isNodejs}}
+  {{#isJava}}
+  "requires": {
+    {{#profile}}
+    "[{{profile}}]": {
+    {{/profile}}
+    {{#shortcut}}
+      "db": "postgres"
+    {{/shortcut}}
+    {{^shortcut}}
+      "db": {
+        "kind": "postgres"
+      }
+    {{/shortcut}}
+    {{#profile}}
+    }
+    {{/profile}}
+  }
+  {{/isJava}}
 }

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

@@ -0,0 +1,23 @@
+---
+srv:
+  bindings:
+    postgres:
+      serviceInstanceName: postgres
+postgres-db-deployer:
+  image:
+    repository: {{appName}}-postgres-deployer
+  bindings:
+    postgres:
+      serviceInstanceName: postgres
+  resources:
+    limits:
+      cpu: 2000m
+      memory: 1G
+    requests:
+      cpu: 1000m
+      memory: 1G
+postgres:
+  serviceOfferingName: postgresql-db
+  servicePlanName: standard
+  parameters:
+    allow_access: "{{KYMA_GATEWAY_IP}}"

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

@@ -1,9 +1,11 @@
 const cds = require('../../../cds')
 const { read, exists } = cds.utils
 const { readProject } = require('../../projectReader')
-const { merge } = require('../../merge')
+const { merge, sort } = require('../../merge')
 const mvn = require('../../mvn')
 const { srv4, postgres, postgresDeployer } = require('../../registries/mta')
+const KymaTemplate = require('../kyma')
+const { execSync } = require('child_process')
 
 module.exports = class PostgresTemplate extends require('../../plugin') {
 
@@ -11,12 +13,6 @@ module.exports = class PostgresTemplate extends require('../../plugin') {
     return 'database support for PostgreSQL'
   }
 
-  async canRun() {
-    const { hasMta, hasKyma } = readProject()
-    if (hasKyma && !hasMta) throw `'cds add postgres' is not available for Kyma yet`
-    return true
-  }
-
   static hasInProduction(env) {
     return env.requires?.db?.kind === 'postgres' || readProject().dependencies?.['@cap-js/postgres']
   }
@@ -25,13 +21,15 @@ module.exports = class PostgresTemplate extends require('../../plugin') {
     const project = readProject()
     const { configFile, isJava } = project
     project.shortcut = !exists(configFile) || typeof (await read(configFile)).cds?.requires?.db !== 'object'
-    await merge(__dirname, 'files/package.json.hbs').into('package.json', { project })
+    await merge(__dirname, 'files/package.json.hbs').into(configFile, { with: project, forceOverwrite: true }) // REVISIT: forceOverwrite: true as default?
     if (isJava) await mvn.add('postgresql')
+
+    await sort('package.json', 'dependencies')
   }
 
   async combine() {
     const project = readProject()
-    const { addMta, srvPath } = project
+    const { addMta, srvPath, hasMultitenancy, addKyma, hasKyma, addMultitenancy } = project
 
     if (addMta) {
       const srv = srv4(srvPath)
@@ -47,5 +45,32 @@ module.exports = class PostgresTemplate extends require('../../plugin') {
         }]
       })
     }
+
+    if (!hasMultitenancy && addKyma) {
+      const clusterIPGuess = execSync(`kubectl --namespace kyma-system get configmap kyma-info -o json | jq -r '.data["cloud.natGatewayIps"]'`, { stdio: "pipe" }).toString()
+      project['KYMA_GATEWAY_IP'] = clusterIPGuess.replace(/\n/g, '')
+      await merge(__dirname, 'files', 'values.yaml.hbs').into('chart/values.yaml', { with: project })
+      await KymaTemplate.mergeDependency('service-instance', 'postgres')
+      await KymaTemplate.mergeDependency('content-deployment', 'postgres-deployer')
+    }
+
+    if (addMultitenancy && hasKyma) {
+      await merge('chart/values.yaml')
+        .remove(['postgres-deployer', 'srv.bindings.db', 'postgres'])
+
+      await merge('chart/Chart.yaml')
+        .remove([
+            { dependencies: { alias: 'postgres' } },
+            { dependencies: { alias: 'postgres-deployer' } }
+        ])
+    }
+
+     if (addKyma && !hasMultitenancy) {
+      const additions = [{
+          in: 'modules',
+          where: { name: `${project.appName}-postgres-deployer` }
+      }]
+      await merge(__dirname, '/files/containerize.yaml.hbs').into('containerize.yaml', { with: project, additions })
+    }
   }
 }