@sap/cds-dk 9.8.4 → 9.9.0

package/lib/build/plugins/hana/index.js

@@ -9,6 +9,7 @@ const DEFAULT_COMPILE_DEST_FOLDER = path.normalize("src/gen")
 const FILE_EXT_CSV = ".csv"
 const FILE_EXT_HDBTABLEDATA = ".hdbtabledata"
 const FILE_EXT_HDBTABLE = ".hdbtable"
+const FILE_EXT_HDBSYNONYMCONFIG = ".hdbsynonymconfig"
 const FILE_EXT_HDBMIGRATIONTABLE = ".hdbmigrationtable"
 const FILE_NAME_HDICONFIG = ".hdiconfig"
 const FILE_NAME_HDINAMESPACE = ".hdinamespace"
@@ -70,7 +71,8 @@ module.exports = class HanaBuildPlugin extends require('../internal') {
             await this._writeHdiConfig(hdiPlugins)
             await this._writeHdiNamespace()
 
-            // TODO disabled as this contradicts the MTX domain concept which allows partial app deployments
+            // cds10: disabled as it did not work with MTX domain concept which allows partial app deployments
+            // consider enabling this in cds10
             //await this._writeUndeployJson()
 
             if (!this.hasBuildOption(CONTENT_HDBTABLEDATA, false)) {
@@ -100,6 +102,13 @@ module.exports = class HanaBuildPlugin extends require('../internal') {
                     })
                 )
             }
+
+            // relocate .hdbsynonymconfig files containing *.configure properties to cfg/ folder
+            // HDI's template mechanism for configuration files only works from the cfg/ folder
+            if (this.isStagingBuild()) {
+                const relocatedDirs = await this._relocateSynonymConfigsToCfg()
+                await this._writeCfgHdiConfig(relocatedDirs)
+            }
         }
     }
 
@@ -561,7 +570,6 @@ module.exports = class HanaBuildPlugin extends require('../internal') {
                 if (!this.hasBuildOption(CONTINUE_UNRESOLVED_SCHEMA_CHANGES, true)) {
                     throw new BuildError('Current model changes require manual resolution', resolutionMessages)
                 }
-                // adding to the task's message list
                 resolutionMessages.forEach(m => this._messages.push(m))
             }
         }
@@ -605,6 +613,117 @@ module.exports = class HanaBuildPlugin extends require('../internal') {
 
         return workspaceFiles
     }
+
+    /**
+     * Relocates .hdbsynonymconfig files containing *.configure properties (e.g. schema.configure,
+     * database.configure) from the dest src/ folder to the dest cfg/ folder.
+     * HDI's template mechanism for configuration files only works when the config files reside
+     * in the cfg/ folder. The HDI deployer scans cfg/ at startup, detects *.configure markers,
+     * and applies runtime substitution from bound service credentials.
+     */
+    async _relocateSynonymConfigsToCfg() {
+        const destSrcDir = path.join(this.task.dest, 'src')
+        const destCfgDir = path.join(this.task.dest, 'cfg')
+
+        const synonymConfigFiles = await find(destSrcDir, { filter: (entry) => {
+            if (isdir(entry)) {
+                return true
+            }
+            return path.extname(entry) === FILE_EXT_HDBSYNONYMCONFIG
+        }})
+
+        // Track which directories under cfg/ received relocated files and their extensions
+        const relocatedDirs = new Map() // dir -> Set of file extensions
+        await Promise.all(synonymConfigFiles.map(async (file) => {
+            if (await _hasConfigureProperties(file)) {
+                const relPath = path.relative(destSrcDir, file)
+                const cfgDest = path.join(destCfgDir, relPath)
+                DEBUG?.(`relocating ${path.relative(this.task.dest, file)} to cfg/ folder (contains .configure properties)`)
+                await fs.promises.mkdir(path.dirname(cfgDest), { recursive: true })
+                await fs.promises.rename(file, cfgDest)
+                this.pushFile(cfgDest)
+
+                const cfgDestDir = path.dirname(cfgDest)
+                if (!relocatedDirs.has(cfgDestDir)) {
+                    relocatedDirs.set(cfgDestDir, new Set())
+                }
+                relocatedDirs.get(cfgDestDir).add(path.extname(file))
+            }
+        }))
+        return relocatedDirs
+    }
+
+    /**
+     * Create .hdiconfig files in cfg/ subdirectories that received relocated config files.
+     * This ensures that the HDI deployer can recognize the file types in those directories.
+     * Only creates .hdiconfig in directories where one does not already exist.
+     * @param {Map<string, Set<string>>} relocatedDirs Map of directory paths to Sets of file extensions
+     */
+    async _writeCfgHdiConfig(relocatedDirs) {
+        if (!relocatedDirs || relocatedDirs.size === 0) {
+            return
+        }
+        // Collect all relocated file extensions across all directories
+        const allExtensions = new Set()
+        for (const extensions of relocatedDirs.values()) {
+            for (const ext of extensions) {
+                allExtensions.add(ext)
+            }
+        }
+
+        const template = await _readTemplateAsJson('.hdiconfig-all')
+        const content = { 'file_suffixes': {} }
+        for (const key in template['file_suffixes']) {
+            if (allExtensions.has('.' + key)) {
+                content['file_suffixes'][key] = template['file_suffixes'][key]
+            }
+        }
+        if (Object.keys(content['file_suffixes']).length === 0) {
+            return
+        }
+
+        // Write .hdiconfig to each distinct directory under cfg/ that received relocated files,
+        // but only if one does not already exist
+        for (const dir of relocatedDirs.keys()) {
+            const hdiConfigPath = path.join(dir, FILE_NAME_HDICONFIG)
+            if (!fs.existsSync(hdiConfigPath)) {
+                await this.write(content).to(hdiConfigPath)
+            }
+        }
+    }
+}
+
+/**
+ * Checks whether an .hdbsynonymconfig file contains any *.configure properties.
+ * These are HDI template markers (e.g. schema.configure, database.configure) that
+ * require the file to be placed in the cfg/ folder for HDI's runtime substitution.
+ * @param {string} file - absolute path to the .hdbsynonymconfig file
+ * @returns {Promise<boolean>} true if the file contains .configure properties
+ */
+async function _hasConfigureProperties(file) {
+    try {
+        const content = JSON.parse((await fs.promises.readFile(file, 'utf-8')).toString())
+        return _objectHasConfigureProperty(content)
+    // eslint-disable-next-line no-unused-vars
+    } catch (e) {
+        // if the file cannot be parsed, leave it in place
+        return false
+    }
+}
+
+function _objectHasConfigureProperty(obj) {
+    if (obj === null || typeof obj !== 'object') {
+        return false
+    }
+    for (const key of Object.keys(obj)) {
+        if (key.endsWith('.configure')) {
+            return true
+        }
+        if (typeof obj[key] === 'object' && _objectHasConfigureProperty(obj[key])) {
+            return true
+        }
+    }
+    return false
 }
 
 async function _readTemplateAsJson(template) {

package/lib/build/plugins/helm/files/subcharts/content-deployment/Chart.yaml

@@ -4,4 +4,4 @@ name: content-deployment
 sources:
 - https://github.tools.sap/unified-runtime/content-deployment
 type: application
-version: 1.9.0
+version: 1.10.0

package/lib/build/plugins/helm/files/subcharts/content-deployment/templates/job.yaml

@@ -71,7 +71,7 @@ spec:
           {{- if .Values.runAsUser }}
           runAsUser: {{ .Values.runAsUser }}
           {{- end }}
-          readOnlyRootFilesystem: false
+          readOnlyRootFilesystem: {{ $.Values.readOnlyRootFilesystem | default false }}
           appArmorProfile:
             type: RuntimeDefault
         volumeMounts:

package/lib/build/plugins/helm/files/subcharts/content-deployment/values.schema.json

@@ -67,6 +67,10 @@
             "type": "integer",
             "minimum": 1
         },
+        "readOnlyRootFilesystem": {
+          "$id": "#/properties/readOnlyRootFilesystem",
+          "type": "boolean"
+        },
         "image": {
             "$id": "#/properties/image",
             "title": "Image configuration",

package/lib/build/plugins/helm/files/subcharts/content-deployment/values.yaml

@@ -14,8 +14,8 @@ global:
     _internal:
       content-deployment:
         versions:
-          1.9.0: true
-# Will be used instead of the `.Chart.Name`, e.g. when generating the Deployment name.
+          1.10.0: true
+# Will be used instead of the `.Chart.Name`, e.g. when generating the Job name.
 # nameOverride: name
 
 # Will be used as an override for the `.fullname` helper function (i.e. `.Release.Name-.Chart.Name`).
@@ -26,6 +26,9 @@ global:
 
 # The UID to run the entrypoint of the container process. Defaults to user specified in image metadata if unspecified.
 # runAsUser: 1000
+
+# Use read only filesystem for the Job.
+# readOnlyRootFilesystem: false
 image: {}
 # Should also include the image name (i.e. everything before the `:` sign).
 # repository: repo/image

package/lib/build/plugins/internal.js

@@ -9,7 +9,7 @@ const TRACE = cds.debug('trace')
 module.exports = class InternalBuildPlugin extends require('./plugin') {
 
     init() {
-        // REVISIT: no default gen folder for now
+        // no default gen folder
     }
 
     async clean() {

package/lib/build/plugins/mtx-extension/index.js

@@ -26,7 +26,6 @@ module.exports = class MtxExtensionBuildPlugin extends require('../internal') {
         let model
         let extensionModel
 
-        // REVISIT: check existence of SaaS app package folder only
         // cds.resolve will fail as no index.csn file exists in this folder for the extension migration use case
         // a compilation error is thrown anyhow if any base model refs cannot be resolved
 
@@ -134,7 +133,6 @@ module.exports = class MtxExtensionBuildPlugin extends require('../internal') {
 
         const messages = linter.lint(extModel, model, env)
         if (messages.length) {
-            // REVISIT: lint messages can be passed as is with cds-mtxs version >= 1.7
             throw new BuildError('SaaS extension point restrictions violated. Check the concrete restrictions defined by the SaaS app provider.',
                 messages.map(f => new BuildMessage(f.message, f.severity, f.location || f.element?.$location)))
         }

package/lib/deploy/index.js

@@ -1,5 +1,25 @@
 module.exports = {
-    options:  /** @type{const} */(['--to', '--for', '--out', '--on', '--tunnel-address', '--vcap-file', '--delta-from']),
-    flags:  /** @type{const} */(['--no-save', '--auto-undeploy', '--dry', '--xdry', '--with-mocks', '--store-credentials', '--no-build', '--model-only', '--script', '--with-auto-schema-evolution', '--resolve-bindings']),
-    shortcuts: ['-2', '-4', '-o', '-n']
+    options:  /** @type{const} */([
+        '--to',
+        '--for',
+        '--out',
+        '--on',
+        '--tunnel-address',
+        '--vcap-file',
+        '--delta-from'
+    ]),
+    flags:  /** @type{const} */([
+        '--resolve-bindings',
+        '--no-save',
+        '--auto-undeploy',
+        '--dry',
+        '--xdry',
+        '--with-mocks',
+        '--store-credentials',
+        '--no-build',
+        '--model-only',
+        '--script',
+        '--with-auto-schema-evolution'
+    ]),
+    shortcuts: ['-2', '-4', '-o', '-n', '', '', '', '-b']
 }

package/lib/deploy/to-hana/hana.js

@@ -51,6 +51,27 @@ module.exports = new class HanaDeployer {
     return result;
   }
 
+  _applyServiceKeyToVcap(base, cfServiceInstanceName, serviceKey) {
+    const hanas = Array.isArray(base.hana) ? base.hana : [];
+    const hanaTagged = hanas.filter(s => s?.name === cfServiceInstanceName);
+    if (hanaTagged.length === 0) {
+      const allHanaTagged = hanas.filter(s => Array.isArray(s?.tags) && s.tags.includes('hana'));
+      const entry = allHanaTagged.length === 1
+        ? allHanaTagged[0]
+        : { name: cfServiceInstanceName, label: 'hana', tags: ['hana'], credentials: {} };
+      if (!hanas.includes(entry)) {
+        hanas.push(entry);
+      }
+      hanaTagged.push(entry);
+    }
+    for (const entry of hanaTagged) {
+      entry.name ??= cfServiceInstanceName;
+      entry.tags = Array.from(new Set([...entry.tags || [], 'hana']));
+      entry.credentials = { ...(entry.credentials || {}), ...serviceKey };
+    }
+    return { ...base, hana: hanas };
+  }
+
   async deploy(options = {}) {
     if (options['store-credentials']) {
       console.warn(warn('The option \'--store-credentials\' has been deprecated and will be removed with the next major release. Use command \'cds bind\' instead.'));
@@ -214,21 +235,9 @@ spec:
         serviceKeyName ??= cfServiceInstanceKeyName
         if (!vcapEnv.VCAP_SERVICES || serviceName) {
           const base = process.env.VCAP_SERVICES ? JSON.parse(process.env.VCAP_SERVICES) : (vcapEnv.VCAP_SERVICES ?? {});
-          const hanas = Array.isArray(base.hana) ? base.hana : [];
-          let hanaTagged = hanas.filter(s => s?.name === cfServiceInstanceName || (Array.isArray(s?.tags) && s.tags.includes('hana')));
-          if (hanaTagged.length === 0) {
-            const entry = { name: cfServiceInstanceName, label: 'hana', tags: ['hana'], credentials: {} };
-            hanas.push(entry);
-            hanaTagged = [entry];
-          }
-          for (const entry of hanaTagged) {
-            entry.name ??= cfServiceInstanceName;
-            entry.tags = Array.from(new Set([...entry.tags || [], 'hana']));
-            entry.credentials = { ...(entry.credentials || {}), ...serviceKey };
-          }
-          base.hana = hanas;
-          vcapEnv.VCAP_SERVICES = base;
-          process.env.VCAP_SERVICES = JSON.stringify(base);
+          const result = this._applyServiceKeyToVcap(base, cfServiceInstanceName, serviceKey);
+          vcapEnv.VCAP_SERVICES = result;
+          process.env.VCAP_SERVICES = JSON.stringify(result);
         }
 
         if (!hasVCAPEnv) {

package/lib/import/common.js

@@ -4,7 +4,7 @@
 /** @type { import('@sap/cds') } */
 const cds = require('../cds');
 let convert = require('xml-js');
-let axios = require('axios');
+
 const messages = require("./message").getMessages();
 const { fs, path, write, mkdirp, exists, read } = cds.utils;
 const cdsCompiler = require('..').compile.to;
@@ -101,8 +101,11 @@ async function getContentFromFile(path) {
 
 async function getContentFromURL(url) {
     let edmx;
-    const response = await axios.get(url);
-    edmx = response["data"];
+    const response = await fetch(url);
+    if (!response.ok) {
+        throw new Error(`${response.status} ${response.statusText}: while fetching ${url}`);
+    }
+    edmx = await response.text();
     if (edmx && (await _isValidXML(edmx))) {
         return edmx;
     } else {

package/lib/init/constants.js

@@ -5,7 +5,7 @@ module.exports = {
     COMMAND_ADD: 'add',
 
     JAVA_LTS_VERSIONS: [17, 21],
-    MAVEN_ARCHETYPE_VERSION: '4.8.0',
+    MAVEN_ARCHETYPE_VERSION: '4.8.1',
 
     OPTIONS: Object.freeze({
         COMPLETION: 'completion',
@@ -64,6 +64,8 @@ module.exports = {
         WORKZONE: 'workzone',
         WORKZONE_STANDARD: 'workzone-standard',
         UI5: 'ui5',
+        VUE: 'vue',
+        REACT: 'react',
         DATA: 'data',
         HTTP: 'http',
         LINT: 'lint',

package/lib/init/indent.js

@@ -21,7 +21,6 @@ function gcd (xs) {
  * Once that has been determined, it derives the spacing by calculating the gcd of all relevant lines.
  * I.e. if there are lines indented with 2, 4, or 8 spaces, it will find '  ' as indent.
  * If lines are indented using 1 or 2 tabs, '\t' will be returned.
- * TODO: filter out outliers, i.e. if the user used three spaces in one line, should ' ' space be used for spacing? Or should that be ignored?
  * @param {string[]} file - lines of a file.
  * @returns {string | null} - the string used to space (e.g. 2 spaces, 4 spaces, 1 tab, etc.) or null if the file was empty.
  */

package/lib/init/merge.js

@@ -155,7 +155,6 @@ async function _mergeYAML(into, from, project, semantics = {}) {
             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))

package/lib/init/mvn.js

@@ -16,8 +16,10 @@ module.exports.add = async function (feature, featureOptions={}) {
 
     params.set(`com.sap.cds:cds-maven-plugin:${archetypeVersion}:add`)
 
-    if (feature === HANA) { // REVISIT: compat for HANA until -Dfeature HANA is provided by Java
-        feature = `CF` // REVISIT: Should get rid of CF dependency for Kyma scenarios
+    if (feature === HANA) {
+        // REVISIT: compat for HANA until -Dfeature HANA is provided by Java
+        // Should get rid of CF dependency for Kyma scenarios
+        feature = `CF`
     }
     params.set(`-Dfeature`, feature)
 

package/lib/init/projectReader.js

@@ -163,7 +163,6 @@ 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'),

package/lib/init/registries/mta.js

@@ -3,8 +3,10 @@ const cds = require('../../cds')
 const srvNode4 = path => ({ in: 'modules', where: { type: 'nodejs', path } })
 const srvJava4 = path => ({ in: 'modules', where: { type: 'java', path } })
 
-// REVISIT: Clean up
-const isJava = process.argv[process.argv.indexOf('--add') + 1].split(/[,\s+]/).includes('java') || cds.env['project-nature'] === 'java' || cds.cli.options?.add?.has('java') || process.argv.includes('--java')
+const isJava = process.argv[process.argv.indexOf('--add') + 1].split(/[,\s+]/).includes('java') ||
+               cds.env['project-nature'] === 'java' ||
+               cds.cli.options?.add?.has('java') ||
+               process.argv.includes('--java')
 
 const srv4 = isJava ? srvJava4 : srvNode4
 

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

@@ -1,10 +1,9 @@
-const { join } = require('node:path')
 const { readProject } = require('../../projectReader')
 const { merge } = require('../../merge')
 const { srv4, appDeployer, appFront, xsuaa } = require('../../registries/mta')
 const { odataApi } = require('../../registries/xs-app')
 const { renderAndCopy } = require('../../template')
-const { exists } = require('../../../cds').utils
+const { sh:$, path:{join}, fs:{promises:{rename}}, write, read, exists } = require('../../../cds').utils
 
 module.exports = class extends require('../../plugin') {
 
@@ -37,17 +36,26 @@ module.exports = class extends require('../../plugin') {
         }
 
         // app deployer requires a manifest.json
+        const manifestRoot = hasUI5 ? 'webapp' : 'public'
         await Promise.all(appUIPaths.map(p =>
             merge(__dirname, 'files/manifest.json')
-                .into(join(appPath, p, 'webapp/manifest.json'), { project })
+                .into(join(appPath, p, manifestRoot, 'manifest.json'), { project })
         ))
+        // manifest.json IDs must be unique -> otherwise deployment failures on conflicts
+        await Promise.all(project.appUIPaths.map(async p => {
+            const manifest = await read(join(appPath, p, manifestRoot, 'manifest.json'))
+            manifest['sap.app'].id = project.appName + '.' + p
+            await write(join(appPath, p, manifestRoot, 'manifest.json'), manifest, { spaces: 2 })
+        }))
+
     }
 
     async combine() {
         const project = readProject()
         const {
             srvPath, appPath, apps,
-            hasMta, addMta, hasXsuaa, addSample, addApprouter, addWorkzoneStandard, addXsuaa, addIas
+            hasMta, addMta, hasXsuaa, addSample, addApprouter, addWorkzoneStandard, addXsuaa, addIas,
+            addVue, addReact, addAppFrontend
         } = project
 
         await Promise.all(apps.map(async ({ app }) => {
@@ -91,6 +99,33 @@ module.exports = class extends require('../../plugin') {
             })
         }
 
+        // Vue + React
+        const promises = []
+        const cds = require('../../../cds')
+        if (addAppFrontend || addVue || addReact) {
+            for (const { app } of apps) {
+                const appPath =  join(cds.root, cds.env.folders.app, app)
+                const pJson = await read(join(appPath, 'package.json'))
+                if (!pJson.devDependencies?.vite) continue
+                const addVite = cds.cli.argv[0] === 'react' || cds.cli.argv[0] === 'vue'
+                if (addVite && cds.cli.options.into !== app) continue
+
+                // Move xs-app.json and manifest.json to /public to be included in /dist
+                const fromXsApp = join(appPath, 'xs-app.json')
+                const toXsApp = join(appPath, 'public/xs-app.json')
+                if (exists(fromXsApp) && !exists(toXsApp)) {
+                    promises.push(rename(fromXsApp, toXsApp))
+                }
+                const fromManifest = join(appPath, 'webapp/manifest.json')
+                const toManifest = join(appPath, 'public/manifest.json')
+                if (exists(fromManifest) && !exists(toManifest)) {
+                    promises.push(rename(fromManifest, toManifest))
+                }
+                $`npm install --prefix ${appPath} adm-zip --save-dev` // required for zipping /dist in the Vite build step
+            }
+        }
+        await Promise.all(promises)
+
         // When Helm support is added
         // if (hasContainerize || hasKyma) {
         //     const additions = [{

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

@@ -60,6 +60,8 @@ module.exports = async (data={}, csn, { headerOnly=false, separator=',' }={}) =>
       if (!headerOnly)
         res += '\n' + records.join('\n')
 
+      if (!res.endsWith('\n')) res += '\n'
+
       data[entity.name] = res
 
     })

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

@@ -1,3 +1,4 @@
+const { NODEJS } = require('../../constants').OPTIONS
 const { readProject } = require('../../projectReader')
 const { merge } = require('../../merge')
 
@@ -7,6 +8,10 @@ module.exports = class EsmTemplate extends require('../../plugin') {
     return 'ESM-compatible Node.js project'
   }
 
+  requires() {
+    return [ NODEJS ]
+  }
+
   async run() {
     const project = readProject()
     const { configFile } = project

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

@@ -11,7 +11,7 @@ module.exports = class ExtensibilityTemplate extends require('../../plugin') {
   }
 
   requires() {
-    return exists('pom.xml') ? [MULTITENANCY] : [] // REVISIT: Remove this dependency
+    return exists('pom.xml') ? [MULTITENANCY] : []
   }
 
   static hasInProduction(env) {

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

@@ -31,7 +31,7 @@ module.exports = class HanaTemplate extends require('../../plugin') {
             await mvn.add('hana')
         }
 
-        await merge(__dirname, 'files/package.json.hbs').into(configFile, { with: project, forceOverwrite: true }) // REVISIT: forceOverwrite: true as default?
+        await merge(__dirname, 'files/package.json.hbs').into(configFile, { with: project, forceOverwrite: true })
 
         const packageJson = exists('package.json') ? await read('package.json') : null
         if (packageJson?.dependencies) {

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

@@ -45,28 +45,17 @@ modules:
             HTML5Runtime_enabled: true{{#hasIas}}
             IASDependencyName: {{appName}}-ias-api{{/hasIas}}
     {{#hasWorkzoneStandard}}
-    {{#hasMultitenancy}}
     parameters:
       config:
-        HTML5Runtime_enabled: true
-        init_data:
-          instance:
-            existing_destinations_policy: update
-            destinations:
-              - Name: srv-api
-                URL: ~{srv-api/srv-url}
-                Authentication: NoAuthentication
-                Type: HTTP
-                ProxyType: Internet
-                HTML5.ForwardAuthToken: true
-                HTML5.DynamicDestination: true
-                {{#hasIas}}HTML5.IASDependencyName: {{appName}}-ias-api{{/hasIas}}
-              - Name: ui5
-                URL: https://ui5.sap.com
-                Authentication: NoAuthentication
-                Type: HTTP
-                ProxyType: Internet
-    {{/hasMultitenancy}}
+        destinations:
+          - Name: srv-api
+            URL: ~{srv-api/srv-url}
+            Authentication: NoAuthentication
+            Type: HTTP
+            ProxyType: Internet
+            HTML5.ForwardAuthToken: true
+            HTML5.DynamicDestination: true
+            {{#hasIas}}HTML5.IASDependencyName: {{appName}}-ias-api{{/hasIas}}
     {{/hasWorkzoneStandard}}
 
   {{#apps}}

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

@@ -1,5 +1,4 @@
 const https = require('node:https')
-const axios = require('axios')
 const asJson = require("../data/as-json")
 const cds = require('../../../cds')
 const cf = require('../../../util/cf')
@@ -255,13 +254,42 @@ module.exports = class HttpTemplate extends require('../../plugin') {
       const { url, clientid, clientsecret, certurl, certificate, key } = credentials
       if (!url) throw new Error('No authentication service found in the environment of ' + app)
 
-      const auth = certificate ? { maxRedirects: 0, httpsAgent: new https.Agent({ cert: certificate, key }) }
-                               : { auth: { username: clientid, password: clientsecret } }
       const suffix = xsuaa ? 'oauth/token' : 'oauth2/token'
-      const authUrl = `${certurl ?? url}/${suffix}`
+      const authUrl = new URL(`${certurl ?? url}/${suffix}`)
       const data = `grant_type=client_credentials&client_id=${encodeURI(clientid)}`
-      const config = { method: 'POST', timeout: 5000, data, ...auth }
-      const { access_token } = (await axios(authUrl, config)).data
+      const headers = { 'Content-Type': 'application/x-www-form-urlencoded' }
+      let access_token
+      if (certificate) {
+        const raw = await new Promise((resolve, reject) => {
+          const req = https.request({
+            hostname: authUrl.hostname,
+            port: authUrl.port || 443,
+            path: authUrl.pathname + authUrl.search,
+            cert: certificate, key,
+            method: 'POST',
+            headers
+          }, res => {
+            const chunks = []
+            res.on('data', x => chunks.push(x))
+            res.on('end', () => {
+              if (res.statusCode >= 200 && res.statusCode < 300) resolve(Buffer.concat(chunks).toString())
+              else reject(new Error(`Failed to fetch access token: ${res.statusCode}`))
+            })
+          })
+          req.on('error', reject)
+          req.end(data)
+        });
+        ({ access_token } = JSON.parse(raw))
+      } else {
+        headers['Authorization'] = 'Basic ' + Buffer.from(`${clientid}:${clientsecret}`).toString('base64')
+        const response = await fetch(authUrl.toString(), {
+          method: 'POST',
+          headers,
+          body: data
+        })
+        if (!response.ok) throw new Error(`Failed to fetch access token: ${response.status} ${response.statusText}`)
+        ;({ access_token } = await response.json())
+      }
       const approuterAuth = `x-approuter-authorization: bearer ${access_token}`
       return [hostname, approuterAuth]
     }

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

@@ -16,6 +16,7 @@ module.exports = class KymaTemplate extends require('../../plugin') {
       },
       'y': {
         type: 'boolean',
+        help: 'Skip interactive prompts.'
       }
     }
   }

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

@@ -3,7 +3,7 @@ srv:
   bindings:
     postgres:
       serviceInstanceName: postgres
-postgres-db-deployer:
+postgres-deployer:
   image:
     repository: {{appName}}-postgres-deployer
   bindings: