@sap/cds-dk 9.4.3 → 9.6.0

package/lib/init/template/html5-repo/files/app-package.json.hbs

@@ -3,18 +3,12 @@
   "version": "1.0.0",
   "main": "webapp/index.html",
   "scripts": {
-    "build": "ui5 build preload --clean-dest --config ui5-deploy.yaml",
-    "build-local": "ui5 build preload --clean-dest",
+    "build": "ui5 build preload --clean-dest",
     "start": "ui5 serve"
   },
   "devDependencies": {
     "@ui5/cli": "^4",
     "ui5-task-zipper": "^3"
-  },
-  "ui5": {
-    "dependencies": [
-      "ui5-task-zipper"
-    ]
   }
   {{/hasUI5}}
 }

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

@@ -1,6 +1,26 @@
 ---
 # yaml-language-server: $schema=https://sap.github.io/ui5-tooling/schema/ui5.yaml.json
-specVersion: '3.1'
+specVersion: '4.0'
 metadata:
   name: {{app}}
 type: application
+resources:
+  configuration:
+    propertiesFileSourceEncoding: UTF-8
+builder:
+  resources:
+    excludes:
+      - "/test/**"
+      - "/localService/**"
+  customTasks:
+    - name: ui5-task-zipper
+      afterTask: generateVersionInfo
+      configuration:
+        archiveName: {{app}}
+        relativePaths: true
+        additionalFiles:
+          - xs-app.json
+    {{#isTypescript}}
+    - name: ui5-tooling-transpile-task
+      afterTask: replaceVersion
+    {{/isTypescript}}

package/lib/init/template/html5-repo/index.js

@@ -9,8 +9,8 @@ const { renderAndCopy } = require('../../template')
 module.exports = class Html5RepoTemplate extends require('../../plugin') {
 
     requires() {
-        const { hasHelm, hasHelmUnifiedRuntime } = readProject()
-        if (hasHelm || hasHelmUnifiedRuntime) return ['destination']
+        const { hasKyma } = readProject()
+        if (hasKyma) return ['destination']
     }
 
     static help() {
@@ -37,8 +37,8 @@ module.exports = class Html5RepoTemplate extends require('../../plugin') {
         const project = readProject()
         const {
             isJava, srvPath, appPath, apps,
-            hasApprouter, addApprouter, addContainerize,  addMultitenancy, addWorkzoneStandard,
-            addSample, hasMta, addMta, hasXsuaa, hasMultitenancy, hasWorkzoneStandard, addHelm, addHelmUnifiedRuntime, hasUI5
+            hasApprouter, addApprouter, addContainerize, addKyma, addHelm, addHelmUnifiedRuntime,  addMultitenancy, addWorkzoneStandard, addXsuaa,
+            addSample, hasMta, addMta, hasXsuaa, hasMultitenancy, hasUI5
         } = project
 
         await Promise.all(apps.map(async ({ app }) => {
@@ -59,17 +59,13 @@ module.exports = class Html5RepoTemplate extends require('../../plugin') {
                 project.app = app
                 await merge(__dirname, 'files/ui5.yaml.hbs').into(join(appPath, app, 'ui5.yaml'), { project })
             }
-            for (const { app } of apps) {
-                project.app = app
-                await merge(__dirname, 'files/ui5-deploy.yaml.hbs').into(join(appPath, app, 'ui5-deploy.yaml'), { project })
-            }
         }
 
         if (addMultitenancy) {
             await merge({ cds: { requires: { 'html5-repo': true } } }).into('mtx/sidecar/package.json')
         }
 
-        if (addMta || (addApprouter || addWorkzoneStandard || addMultitenancy || addSample) && hasMta) {
+        if (addMta || (addXsuaa || addApprouter || addWorkzoneStandard || addMultitenancy || addSample) && hasMta) {
             const srv = srv4(srvPath)
             project.apps = apps
             const relationships = [{
@@ -79,18 +75,12 @@ module.exports = class Html5RepoTemplate extends require('../../plugin') {
             const appModules = []
             for (const { app } of project.apps) {
                 const html5App = { in: 'modules', where: { type: 'html5', path: `${appPath}${app}` } }
-                appModules.push(html5App)
                 relationships.push({
                     insert: [html5App],
                     into: [appDeployer, 'build-parameters.requires'],
                 })
             }
-            const additions = [srv, appDeployer, html5RepoHost, ...appModules]
-            if (hasApprouter || hasWorkzoneStandard || hasMultitenancy) {
-                additions.push(html5Runtime)
-            }
             if (hasApprouter) {
-                additions.push(approuter)
                 relationships.push({
                     insert: [html5Runtime, 'name'],
                     into: [approuter, 'requires', 'name'],
@@ -101,6 +91,10 @@ module.exports = class Html5RepoTemplate extends require('../../plugin') {
                     insert: [html5Runtime, 'name'],
                     into: [isJava ? srv : mtxSidecar4('gen/mtx/sidecar'), 'requires', 'name']
                 })
+                relationships.push({
+                    insert: [html5RepoHost, 'name'],
+                    into: [isJava ? srv : mtxSidecar4('gen/mtx/sidecar'), 'requires', 'name']
+                })
             }
             if (hasXsuaa) {
                 relationships.push({
@@ -110,12 +104,14 @@ module.exports = class Html5RepoTemplate extends require('../../plugin') {
             }
             await merge(__dirname, 'files/mta.yaml.hbs').into('mta.yaml', {
                 with: project,
-                additions,
+                additions: [srv, appDeployer, html5RepoHost, ...appModules],
                 relationships
             })
         }
 
-        if (addContainerize) {
+        // cds10
+        // needed because of adding kyma to cli options in case of helm
+        if (addContainerize || (addKyma && !addHelm && !addHelmUnifiedRuntime)) {
             const additions = [{
                 in: 'modules',
                 where: { name: `${project.appName}-html5-deployer` }
@@ -123,7 +119,7 @@ module.exports = class Html5RepoTemplate extends require('../../plugin') {
             await merge(__dirname, '/files/containerize.yaml.hbs').into('containerize.yaml', { with: project, additions })
         }
 
-        if (addHelm || addHelmUnifiedRuntime) {
+        if (addKyma) {
             await renderAndCopy(join(__dirname, 'files/html5-deployer.package.json.hbs'), 'app/html5-deployer/package.json', project)
             await merge(__dirname, 'files/values.yaml.hbs').into('chart/values.yaml', { with: project })
         }

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

@@ -1,7 +1,7 @@
 {{#hasMultitenancy}}
 sidecar:
   expose:
-    gateway: default/kyma-mtls-gateway
+    gateway: {{#literal}}"{{ .Release.Namespace }}/kyma-mtls-gateway"{{/literal}}
     host: {{#literal}}"{{ .Release.Name }}-sidecar-{{ .Release.Namespace }}.cert"{{/literal}}
   bindings:
     auth:
@@ -13,18 +13,18 @@ sidecar:
 {{#hasApprouter}}
 approuter:
   expose:
-    gateway: default/kyma-mtls-gateway
+    gateway: {{#literal}}"{{ .Release.Namespace }}/kyma-mtls-gateway"{{/literal}}
     host: {{#literal}}"{{ .Release.Name }}-approuter-{{ .Release.Namespace }}.cert"{{/literal}}
   bindings:
     auth:
       serviceInstanceName: identity
-        parameters:
-          credential-type: X509_GENERATED
-          app-identifier: approuter
+      parameters:
+        credential-type: X509_GENERATED
+        app-identifier: approuter
 {{/hasApprouter}}
 srv:
   expose:
-    gateway: default/kyma-mtls-gateway
+    gateway: {{#literal}}"{{ .Release.Namespace }}/kyma-mtls-gateway"{{/literal}}
     host: {{#literal}}"{{ .Release.Name }}-srv-{{ .Release.Namespace }}.cert"{{/literal}}
   bindings:
     auth:

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

@@ -1,8 +1,7 @@
 const { readProject } = require('../../projectReader')
 const { merge, sort } = require('../../merge')
 const { srv4, approuter, ias, mtxSidecar4 } = require('../../registries/mta')
-const cds = require('../../../cds')
-const { exists, read } = cds.utils
+const { exists, read } = require('../../../cds').utils
 
 module.exports = class IasTemplate extends require('../../plugin') {
 
@@ -11,10 +10,7 @@ module.exports = class IasTemplate extends require('../../plugin') {
     }
 
     static hasInProduction(env) {
-        // REVISIT: Ugly, find more generic solution
-        return env.requires?.auth?.kind === 'ias' ||
-               cds.cli.argv?.[0]?.includes('ias') || cds.cli.argv?.[0]?.includes('ams') ||
-               cds.cli.options?.add?.has('ias') || cds.cli.options?.add?.has('ams') || false
+        return env.requires?.auth?.kind === 'ias'
     }
 
     async run() {
@@ -28,7 +24,7 @@ module.exports = class IasTemplate extends require('../../plugin') {
 
     async combine() {
         const project = readProject()
-        const { isJava, addMta, hasMta, addCfManifest, addHelm, addHelmUnifiedRuntime, addApprouter, addMultitenancy, srvPath } = project
+        const { isJava, addMta, hasMta, addCfManifest, addKyma, addMultitenancy, hasApprouter, hasMultitenancy, srvPath } = project
 
         if (addMultitenancy) {
             const conf = exists('mtx/sidecar/package.json') ? await read('mtx/sidecar/package.json') : {}
@@ -43,14 +39,14 @@ module.exports = class IasTemplate extends require('../../plugin') {
             await merge(__dirname, 'files/sidecar.package.json.hbs').into('mtx/sidecar/package.json')
         }
 
-        if (addMta || (addApprouter || addMultitenancy) && hasMta) {
+        if (addMta || (hasApprouter || hasMultitenancy) && hasMta) {
             const srv = srv4(srvPath)
             const srvIdentityBinding = { in: [srv, 'requires'], where: { 'parameters.config.app-identifier': 'srv' } }
             const srvCertUrlApi = { in: [srv, 'provides'], where: { 'name': 'srv-api' } }
             const additions = [srv, ias, srvIdentityBinding, srvCertUrlApi]
             const overwrites = []
 
-            if (addApprouter) {
+            if (hasApprouter) {
                 additions.push(approuter)
                 additions.push({ in: [approuter, 'requires'], where: { 'parameters.config.app-identifier': 'approuter' }})
                 const approuterSrvApi = { in: [approuter, 'requires'], where: { 'name': 'srv-api' } }
@@ -59,7 +55,7 @@ module.exports = class IasTemplate extends require('../../plugin') {
                 overwrites.push({ item: [approuterSrvApi, 'properties.forwardAuthCertificates'], withValue: true })
                 overwrites.push({ item: [approuterSrvApi, 'properties.strictSSL'], withValue: true })
             }
-            if (addMultitenancy) {
+            if (hasMultitenancy) {
                 const mtxSidecar = mtxSidecar4(isJava ? 'mtx/sidecar' : 'gen/mtx/sidecar')
                 const mtxIdentityBinding = { in: [mtxSidecar, 'requires'], where: { 'parameters.config.app-identifier': 'mtx' } }
                 additions.push(mtxSidecar, mtxIdentityBinding)
@@ -67,23 +63,19 @@ module.exports = class IasTemplate extends require('../../plugin') {
             await merge(__dirname, 'files/mta.yaml.hbs').into('mta.yaml', { project, additions, overwrites })
         }
 
-        if (addHelm || addHelmUnifiedRuntime) {
+        if (addKyma) {
             const identity = { in: 'dependencies', where: { 'alias': 'identity' } }
             await merge(__dirname, 'files/Chart.yaml.hbs').into('chart/Chart.yaml', { project, additions: [identity] })
             await merge(__dirname, 'files/values.yaml.hbs').into('chart/values.yaml', { project })
         }
 
         if (addCfManifest) {
-            await this.#combineWithCfManifest(project) // REVISIT: we shouldn't overly promote cf-manifest
-        }
-    }
+            const srv = { in: 'applications', where: { 'name': `${project.appName}-srv` } }
+            const identityBinding = { in: 'services', where: { 'parameters.app-identifier': 'srv' } }
+            await merge(__dirname, 'files/manifest.yml.hbs').into('manifest.yml', { project, additions: [srv, identityBinding] })
 
-    async #combineWithCfManifest(project) {
-        const srv = { in: 'applications', where: { 'name': `${project.appName}-srv` } }
-        const identityBinding = { in: 'services', where: { 'parameters.app-identifier': 'srv' } }
-        await merge(__dirname, 'files/manifest.yml.hbs').into('manifest.yml', { project, additions: [srv, identityBinding] })
-
-        const identity = { in: 'create-services', where: { 'broker': 'identity' } }
-        await merge(__dirname, 'files/services-manifest.yml.hbs').into('services-manifest.yml', { project, additions: [identity] })
+            const identity = { in: 'create-services', where: { 'broker': 'identity' } }
+            await merge(__dirname, 'files/services-manifest.yml.hbs').into('services-manifest.yml', { project, additions: [identity] })
+        }
     }
 }

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

@@ -3,6 +3,7 @@ const cds = require('../../../cds')
 const { exists, copy, rimraf, fs:{promises:{ mkdtemp }}, path } = cds.utils, { join } = path
 const cmd = require('../../../util/command')
 const mvn = require('../../mvn')
+const { merge } = require('../../merge')
 const { bold, info, link } = require('../../../util/term')
 const { URLS, OPTIONS: { NODEJS, JAVA }, COMMAND_ADD } = require('../../constants')
 const { command, options } = cds.cli
@@ -33,9 +34,22 @@ module.exports = class JavaTemplate extends require('../../plugin') {
         console.log(`using Maven archetype version ${archetypeVersion}`)
 
         const temp = await mkdtemp(join(os.tmpdir(), `${path.basename(cds.root)}_`))
+        // preserve existing package.json (if any)
+        let preservedPackageJsonPath
+        if (exists('package.json')) {
+            preservedPackageJsonPath = join(temp, 'package.json')
+            await copy('package.json').to(preservedPackageJsonPath)
+        }
         try {
             await cmd.spawnCommand('mvn', params, { cwd: temp })
             await copy(join(temp, artifactId)).to(cds.root)
+            if (preservedPackageJsonPath) {
+                // merge template package.json into preserved one
+                // (not the other way around)
+                // to give preserved values precedence
+                await merge('package.json').into(preservedPackageJsonPath)
+                await copy(preservedPackageJsonPath).to('package.json')
+            }
         } catch (err) {
             if (err.code === 'ENOENT' && err.path === 'mvn') {
                 throw `Maven executable 'mvn' not found. Follow ${info(URLS.MAVEN_INSTALL_HELP)} and install Maven on your machine.`

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

@@ -4,6 +4,7 @@ const { readProject } = require('../../projectReader')
 const { merge } = require('../../merge')
 const { srv4, kafkaMessaging } = require('../../registries/mta')
 const mvn = require('../../mvn')
+const KymaTemplate = require('../kyma')
 
 module.exports = class KafkaTemplate extends require('../../plugin') {
 
@@ -28,7 +29,7 @@ module.exports = class KafkaTemplate extends require('../../plugin') {
 
   async combine() {
     const project = readProject()
-    const { addMta, srvPath, addHelm, addHelmUnifiedRuntime } = project
+    const { addMta, srvPath, addKyma } = project
 
     if (addMta) {
       const srv = srv4(srvPath)
@@ -42,8 +43,9 @@ module.exports = class KafkaTemplate extends require('../../plugin') {
       })
     }
 
-    if (addHelm || addHelmUnifiedRuntime) {
+    if (addKyma) {
       await merge(__dirname, 'files/values.yaml').into('chart/values.yaml')
+      await KymaTemplate.mergeDependency("service-instance", "kafka")
     }
   }
 }

package/lib/init/template/{containerize → kyma}/files/containerize.yaml.hbs

@@ -2,10 +2,25 @@
 _schema-version: '1.0'
 repository: {{& imageRegistry}}
 tag: latest
-  {{#isJava}}
+{{#hasHelmUnifiedRuntime}}
+{{#isJava}}
 before-all:
+  - helm dependency update ./gen/chart
   - mvn clean package -DskipTests=true --batch-mode
-  {{/isJava}}
+{{/isJava}}
+{{/hasHelmUnifiedRuntime}}
+{{^hasJava}}
+{{#hasHelmUnifiedRuntime}}
+before-all:
+  - helm dependency update ./gen/chart
+{{/hasHelmUnifiedRuntime}}
+{{/hasJava}}
+{{^hasHelmUnifiedRuntime}}
+{{#hasJava}}
+before-all:
+  - mvn clean package -DskipTests=true --batch-mode
+{{/hasJava}}
+{{/hasHelmUnifiedRuntime}}
 modules:
   - name: {{appName}}-srv
     build-parameters:

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

@@ -1,10 +1,134 @@
-module.exports = class extends require('../../plugin') {
+const { join } = require('path')
+const cds = require('../../../cds')
+const { exists, rimraf, copy, yaml } = cds.utils
+const { readProject } = require('../../projectReader')
+const { merge } = require('../../merge')
+const { ask4 } = require('../../../util/question')
+const { execSync } = require('child_process')
+const { mvn } = require('../../add')
 
-    static help() {
-      return 'helm + containerize'
+module.exports = class KymaTemplate extends require('../../plugin') {
+
+    static hasInProduction() {
+        return exists('chart/Chart.yaml')
+    }
+
+  async canRun() {
+    const hasInProduction = KymaTemplate.hasInProduction()
+    if (cds.cli.options.force) {
+      await rimraf(join('chart'))
+      await rimraf('containerize.yaml')
+      return true
+    } else if (hasInProduction) {
+      throw `Chart already exists. Use --force to overwrite.`
     }
+    return true
+  }
+
+  static help() {
+    return 'Kyma deployment using Helm charts'
+  }
+
+  async run() {
+    const project = readProject()
+
+    let imagePullSecret, 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 */ }
+
+      //REVISIT: remove cds10 
+      if (exists('containerize.yaml')) {
+        const { repository: r, tag: t } = yaml.parse(join(cds.root, 'containerize.yaml'))
+        if (r) registry = r
+        if (t) tag = t
+      }
+      if (!cds.cli.options.y && !cds.cli.options.force) {
+        registry ??= await ask4([`registry server: `])
+        domain ??= await ask4([`cluster domain: `])
+      }
+    }
+    project.registry = registry ?? '<registry-server>'
+    project.domain = domain ?? '<cluster-domain>'
+    project.imagePullSecret = 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 })
+    await merge(__dirname, 'files/values.yaml.hbs').into('chart/values.yaml', { with: project })
+    await merge(__dirname, '/files/containerize.yaml.hbs').into('containerize.yaml', { with: project })
+    await KymaTemplate.mergeDependency('web-application', 'srv')
+    if (project.isJava) await mvn.add('k8s')
+
+  }
 
-    requires() {
-      return ['helm', 'containerize']
+  options() {
+    return {
+      'unified-runtime': {
+        type: 'boolean'
+      },
+      'y': {
+        type: 'boolean',
+      }
     }
+  }
+
+  async combine() {
+    // REVISIT: This must be moved to the respective plugins
+    const {
+      addHana, addMultitenancy, addXsuaa,
+      addApprouter, addIas, addAms, hasXsuaa, hasMultitenancy,
+      addHtml5Repo, hasHtml5Repo,
+    } = readProject()
+
+    if (addHtml5Repo || addApprouter && hasHtml5Repo) {
+      if (addHtml5Repo) {
+        await KymaTemplate.mergeDependency('service-instance', 'html5-apps-repo-host')
+        await KymaTemplate.mergeDependency('content-deployment', 'html5-apps-deployer')
+      }
+      if (addApprouter) {
+        await KymaTemplate.mergeDependency('service-instance', 'html5-apps-repo-runtime')
+      }
+    }
+    if (addMultitenancy || addXsuaa || addIas || addAms) {
+      if (addMultitenancy) {
+        await KymaTemplate.mergeDependency('web-application', 'sidecar')
+      }
+      if (hasXsuaa && hasMultitenancy) {
+        await KymaTemplate.mergeDependency('service-instance', 'saas-registry')
+      } else if (hasMultitenancy) {
+        await KymaTemplate.mergeDependency('service-instance', 'subscription-manager')
+      }
+    }
+    if (addHana || addMultitenancy) {
+      if (hasMultitenancy) {
+        await KymaTemplate.mergeDependency('service-instance', 'service-manager')
+      } else {
+        await KymaTemplate.mergeDependency('service-instance', 'hana')
+        await KymaTemplate.mergeDependency('content-deployment', 'hana-deployer')
+      }
+    }
+  }
+
+  static async mergeDependency(name, alias) {
+    const project = readProject()
+
+    await merge({
+      dependencies: [{
+        name,
+        alias,
+        version: '>0.0.0',
+        ...((cds.cli.options["unified-runtime"] || project.hasHelmUnifiedRuntime) && { repository: 'https://int.repositories.cloud.sap/artifactory/virtual-unified-runtime-helm-dmz' })
+      }]
+    }).into('chart/Chart.yaml', {
+      with: project,
+      additions: [{
+        in: 'dependencies',
+        where: { alias }
+      }]}
+    )
+
+  }
 }

package/lib/init/template/malware-scanner/files/mta.yaml.hbs

@@ -11,4 +11,6 @@ resources:
     type: org.cloudfoundry.managed-service
     parameters:
       service: malware-scanner
-      service-plan: clamav
+      service-plan: clamav
+      config:
+        auth: mTLS

package/lib/init/template/malware-scanner/files/values.yaml

@@ -4,4 +4,6 @@ srv:
       serviceInstanceName: malware-scanner
 malware-scanner:
   serviceOfferingName: malware-scanner
-  servicePlanName: clamav
+  servicePlanName: clamav
+  parameters:
+    auth: mTLS

package/lib/init/template/malware-scanner/index.js

@@ -1,6 +1,7 @@
 const { readProject } = require('../../projectReader')
 const { merge } = require('../../merge')
 const { srv4, malwareScanner } = require('../../registries/mta')
+const KymaTemplate = require('../kyma')
 
 module.exports = class MalwareScannerTemplate extends require('../../plugin') {
 
@@ -22,7 +23,7 @@ module.exports = class MalwareScannerTemplate extends require('../../plugin') {
 
     async combine() {
         const project = readProject()
-        const { addMta, addHelm, addHelmUnifiedRuntime, srvPath } = project
+        const { addMta, addKyma, srvPath } = project
 
         if (addMta) {
             const srv = srv4(srvPath)
@@ -36,8 +37,9 @@ module.exports = class MalwareScannerTemplate extends require('../../plugin') {
             })
         }
 
-        if (addHelm || addHelmUnifiedRuntime) {
+        if (addKyma) {
             await merge(__dirname, 'files', 'values.yaml').into('chart/values.yaml')
+            await KymaTemplate.mergeDependency('service-instance', 'malware-scanner')
         }
     }
 }

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

@@ -8,7 +8,7 @@ modules:
         {{#isJava}}
       - name: mtx-api
         properties:
-          CDS_MULTITENANCY_SIDECAR_URL: ~{mtx-url}
+          CDS_MULTITENANCY_SIDECAR_URL: {{^hasIas}}~{mtx-url}{{/hasIas}}{{#hasIas}}~{mtx-cert-url}{{/hasIas}}
         {{/isJava}}
     provides:
       - name: srv-api # required by consumers of CAP services (e.g. approuter)
@@ -93,7 +93,6 @@ resources:
           onUpdateDependenciesAsync: true
           callbackTimeoutMillis: 300000 # Increase if your deployments are taking longer than that
 
-  {{#hasIas}}
   - name: {{appName}}-sms
     type: org.cloudfoundry.managed-service
     parameters:
@@ -119,4 +118,3 @@ resources:
     requires:
       - name: {{#isJava}}srv-api{{/isJava}}{{^isJava}}mtx-api{{/isJava}}
     processed-after: [{{#hasXsuaa}}{{appName}}-registry, {{/hasXsuaa}}{{appName}}-ias]
-  {{/hasIas}}

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

@@ -49,10 +49,18 @@ subscription-manager:
   servicePlanName: provider
   parameters:
     appCallbacks:
+      {{#isNodejs}}
       dependenciesCallbacks:
         {{#literal}}url: https://{{ .Release.Name }}-sidecar-{{ .Release.Namespace }}.cert.{{ .Values.global.domain }}/-/cds/sms-provisioning/dependencies/{app_tid}{{/literal}}
       subscriptionCallbacks:
         {{#literal}}url: https://{{ .Release.Name }}-sidecar-{{ .Release.Namespace }}.cert.{{ .Values.global.domain }}/-/cds/sms-provisioning/tenant/{app_tid}{{/literal}}
+      {{/isNodejs}}
+      {{#isJava}}
+      dependenciesCallbacks:
+        {{#literal}}url: https://{{ .Release.Name }}-srv-{{ .Release.Namespace }}.cert.{{ .Values.global.domain }}/mt/sms/subscriptions/tenants/{app_tid}/dependencies{{/literal}}
+      subscriptionCallbacks:
+        {{#literal}}url: https://{{ .Release.Name }}-srv-{{ .Release.Namespace }}.cert.{{ .Values.global.domain }}/mt/sms/subscriptions/tenants/{app_tid}{{/literal}}
+      {{/isJava}}
     appName: {{appName}}
     applicationType: application
     category: "CAP Application"

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

@@ -30,6 +30,7 @@ module.exports = class MultitenancyTemplate extends require('../../plugin') {
     if (isJava) {
       const packageJson = await read('package.json')
       packageJson.workspaces = ['mtx/sidecar']
+      packageJson.devDependencies ??= {}
       packageJson.devDependencies['@sap/cds-mtxs'] ??= '^3'
       await write('package.json', packageJson, { spaces: 2 })
       await sort('package.json', 'devDependencies')
@@ -42,8 +43,8 @@ module.exports = class MultitenancyTemplate extends require('../../plugin') {
   async combine() {
     const project = readProject()
     const {
-      isNodejs, isJava, addMta, hasMta, addHelm, addHelmUnifiedRuntime,
-      addXsuaa, hasXsuaa, addIas, hasIas, hasHana, addContainerize, hasApprouter,
+      isNodejs, isJava, addMta, hasMta,
+      addXsuaa, hasXsuaa, addIas, hasIas, hasHana, addContainerize, addKyma, addHelm, addHelmUnifiedRuntime, hasApprouter,
       srvPath, appName
     } = project
 
@@ -55,10 +56,13 @@ module.exports = class MultitenancyTemplate extends require('../../plugin') {
       if (hasIas) services.push(subscriptionManager)
       if (!hasIas || hasXsuaa) services.push(saasRegistry)
       const apis = [srvApi4(srv), providedMtxApiSidecar4(mtxSidecar)]
-      if (isJava) apis.push(requiredMtxSidecarApi4(srv))
+      if (isJava) {
+        const name = hasIas ? '~{mtx-cert-url}' : '~{mtx-url}'
+        apis.push(requiredMtxSidecarApi4(srv, name))
+      }
       const additions = [...modules, ...services, ...apis]
       const relationships = []
-      if (addXsuaa) {
+      if (hasXsuaa) {
         relationships.push({
           insert: [saasRegistry, 'name'],
           into: [isJava ? srv : mtxSidecar, 'requires', 'name']
@@ -80,7 +84,7 @@ module.exports = class MultitenancyTemplate extends require('../../plugin') {
       await merge(templateMtaPath).into('mta.yaml', { with: project, additions, relationships })
     }
 
-    if (addHelm || addHelmUnifiedRuntime) {
+    if (addKyma) {
       await merge(__dirname, 'files/values.yaml.hbs').into('chart/values.yaml', { with: project })
       const applicationWorkload = hasApprouter ? 'approuter' : 'srv'
       await merge({
@@ -89,12 +93,16 @@ module.exports = class MultitenancyTemplate extends require('../../plugin') {
         }}},
         ...(isJava) && { srv: { env: {
           CDS_MULTITENANCY_APPUI_URL: `https://{{ .Release.Name }}-${applicationWorkload}-{{ .Release.Namespace }}.{{ .Values.global.domain }}`,
-          CDS_MULTITENANCY_SIDECAR_URL: `https://{{ .Release.Name }}-sidecar-{{ .Release.Namespace }}.{{ .Values.global.domain }}`
+          CDS_MULTITENANCY_SIDECAR_URL: hasIas ?
+            `https://{{ .Release.Name }}-sidecar-{{ .Release.Namespace }}.cert.{{ .Values.global.domain }}` :
+            `https://{{ .Release.Name }}-sidecar-{{ .Release.Namespace }}.{{ .Values.global.domain }}`
         }}}
       }).into('chart/values.yaml',{ forceOverwrite: true })
     }
 
-    if (addContainerize) {
+    // cds10 move to if above
+    // needed because of adding kyma to cli options in case of helm
+    if (addContainerize || (addKyma && !addHelm && !addHelmUnifiedRuntime)) {
       const deletions = []
       if (hasHana) {
         deletions.push({

package/lib/init/template/nodejs/files/.vscode/extensions.json

@@ -5,8 +5,5 @@
 		"mechatroner.rainbow-csv",
 		"qwtel.sqlite-viewer",
 		"humao.rest-client"
-	],
-	"unwantedRecommendations": [
-
 	]
 }

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

@@ -13,4 +13,4 @@
     "start": "cds-serve"
   },
   "private": true
-}
+}