@sap/cds-dk 6.3.2 → 6.4.0

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

@@ -1,7 +1,7 @@
-const path = require('path')
+const { join } = require('path')
 const ProjectReader = require('../../util/projectReader')
 const { mergeYAML } = require('../../util/merge')
-const cds = require('../../../cds'), { copy } = cds.utils
+const { copyAndTrack, parseMd5File, writeMd5File } = require('../../util/md5Tracking')
 
 module.exports = class ConnectivityTemplate extends require('../templateBase') {
     constructor(projectPath, generator) {
@@ -13,14 +13,22 @@ module.exports = class ConnectivityTemplate extends require('../templateBase') {
         await this.runDependentMerging()
     }
 
-    async runDependentMerging() {
+    async runDependentMerging(context = {}) {
         const projectDescriptor = await this.projectReader.read(this.options)
         const { hasHelm } = projectDescriptor.cap
 
         if (hasHelm) {
+            //in case facet is being added to the already exisiting charts folder
+            let isIndependentCommand = false
+            if(Object.keys(context).length == 0){
+                isIndependentCommand = true
+                context.projectPath = this.projectPath
+                context.oldTrackingData = context.newTrackingData = await parseMd5File(join(this.projectPath, 'chart', '.cds-add-helm-files.md5'))
+            }
+
             await mergeYAML(
-                path.join(this.projectPath, 'chart', 'values.yaml'),
-                path.join(__dirname, 'files', 'values.yaml.hbs'),
+                join(this.projectPath, 'chart', 'values.yaml'),
+                join(__dirname, 'files', 'values.yaml.hbs'),
                 projectDescriptor,
                 { additions: [{
                     ref: `srv-additional-volumes`,
@@ -31,11 +39,12 @@ module.exports = class ConnectivityTemplate extends require('../templateBase') {
                     }]
                 }]}
             )
-            const filesPath = path.join(__dirname, 'files')
-            const templatesPath = path.join(this.projectPath, 'chart', 'templates')
-            await copy(path.join(filesPath, 'connectivity-binding.yaml'), path.join(templatesPath, 'connectivity-binding.yaml'))
-            await copy(path.join(filesPath, 'connectivity-proxy-info.yaml'), path.join(templatesPath, 'connectivity-proxy-info.yaml'))
-            await copy(path.join(filesPath, 'connectivity.yaml'), path.join(templatesPath, 'connectivity.yaml'))
+            const filesPath = join(__dirname, 'files')
+            const templatesPath = join(this.projectPath, 'chart', 'templates')
+            await copyAndTrack(join(filesPath, 'connectivity-binding.yaml'), join(templatesPath, 'connectivity-binding.yaml'), context)
+            await copyAndTrack(join(filesPath, 'connectivity-proxy-info.yaml'), join(templatesPath, 'connectivity-proxy-info.yaml'), context)
+            await copyAndTrack(join(filesPath, 'connectivity.yaml'), join(templatesPath, 'connectivity.yaml'), context)
+            if(isIndependentCommand) await writeMd5File(join(this.projectPath, 'chart', '.cds-add-helm-files.md5'), context.newTrackingData)
         }
     }
 }

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

@@ -1,7 +1,7 @@
-const path = require('path')
+const { join } = require('path')
 const ProjectReader = require('../../util/projectReader')
 const { mergeYAML } = require('../../util/merge')
-const { copy } = require('../../../cds').utils
+const { copyAndTrack, parseMd5File, writeMd5File } = require('../../util/md5Tracking')
 
 module.exports = class DestinationsTemplate extends require('../templateBase') {
     constructor(projectPath, generator) {
@@ -9,6 +9,15 @@ module.exports = class DestinationsTemplate extends require('../templateBase') {
         this.projectReader = new ProjectReader(projectPath)
     }
 
+    async canRun() {
+        const projectDescriptor = await this.projectReader.read(this.options)
+        const { hasMta, hasHelm } = projectDescriptor.cap
+        if (!hasHelm && hasMta) {
+            throw `'cds add destinations' is not available for Cloud Foundry yet`
+        }
+        return true
+    }
+
     static hasFacet(env) {
         const kinds = { odata: 1, 'odata-v2': 1, 'odata-v4': 1, rest: 1 }
         return Object.entries(env.requires).some(([service, require]) => !kinds[service] && kinds[require.kind])
@@ -18,7 +27,7 @@ module.exports = class DestinationsTemplate extends require('../templateBase') {
         await this.runDependentMerging()
     }
 
-    async runDependentMerging() {
+    async runDependentMerging(context = {}) {
         const projectDescriptor = await this.projectReader.read(this.options)
         const { hasHelm, hasDestination, hasHtml5Repo } = projectDescriptor.cap
 
@@ -27,8 +36,15 @@ module.exports = class DestinationsTemplate extends require('../templateBase') {
             const binding = hasDestination && { srv: { bindings: { destination: { serviceInstanceName: 'destinations' }}}}
             const html5Binding = hasHtml5Repo && { html5_apps_deployer: { bindings: { destination: { serviceInstanceName: 'destination' }}}}
 
+            //in case facet is being added to the already exisiting charts folder
+            let isIndependentCommand = false
+            if(Object.keys(context).length == 0){
+                isIndependentCommand = true
+                context.projectPath = this.projectPath
+                context.oldTrackingData = context.newTrackingData = await parseMd5File(join(this.projectPath, 'chart', '.cds-add-helm-files.md5'))
+            }
             await mergeYAML(
-                path.join(this.projectPath, 'chart', 'values.yaml'),
+                join(this.projectPath, 'chart', 'values.yaml'),
                 {
                     ...binding,
                     ...html5Binding,
@@ -40,10 +56,10 @@ module.exports = class DestinationsTemplate extends require('../templateBase') {
                             ...(hasHtml5Repo) && { HTML5Runtime_enabled: true }
                         }
                     }
-                },
-                null, { forceOverwrite: true }
+                }
             )
-            await copy(path.join(__dirname, 'files', 'destination.yaml'), path.join(this.projectPath, 'chart', 'templates', 'destination.yaml'))
+            await copyAndTrack(join(__dirname, 'files', 'destination.yaml'), join(this.projectPath, 'chart', 'templates', 'destination.yaml'), context)
+            if(isIndependentCommand) await writeMd5File(join(this.projectPath, 'chart', '.cds-add-helm-files.md5'), context.newTrackingData)
         }
     }
 }

package/lib/init/template/enterprise-messaging/files/cds.package.json

@@ -2,8 +2,7 @@
   "cds": {
     "requires": {
       "messaging": {
-        "kind": "enterprise-messaging",
-        "format": "cloudevents"
+        "kind": "enterprise-messaging"
       }
     }
   }

package/lib/init/template/enterprise-messaging/files/cds.profile.package.json.hbs

@@ -3,8 +3,7 @@
     "requires": {
       "[{{cap.for}}]": {
         "messaging": {
-          "kind": "enterprise-messaging",
-          "format": "cloudevents"
+          "kind": "enterprise-messaging"
         }
       }
     }

package/lib/init/template/enterprise-messaging/files/cdsrc.json

@@ -1,8 +1,7 @@
 {
   "requires": {
     "messaging": {
-      "kind": "enterprise-messaging",
-      "format": "cloudevents"
+      "kind": "enterprise-messaging"
     }
   }
 }

package/lib/init/template/enterprise-messaging/files/cdsrc.json.hbs

@@ -2,8 +2,7 @@
   "requires": {
     "[{{cap.for}}]": {
       "messaging": {
-        "kind": "enterprise-messaging",
-        "format": "cloudevents"
+        "kind": "enterprise-messaging"
       }
     }
   }

package/lib/init/template/enterprise-messaging/files/event-mesh.json.hbs

@@ -0,0 +1,31 @@
+{
+  "emname": "{{cap.appName}}-emname",
+  "version": "1.1.0",
+  "namespace": "default/sap.myapp/1",
+  "options": {
+    "management": true,
+    "messagingrest": true,
+    "messaging": true
+  },
+  "rules": {
+    "topicRules": {
+      "publishFilter": [
+        "${namespace}/sample"
+      ],
+      "subscribeFilter": [
+        "*"
+      ]
+    },
+    "queueRules": {
+      "publishFilter": [
+          "${namespace}/*"
+      ],
+      "subscribeFilter": [
+          "${namespace}/*"
+      ]
+    }
+  },
+  "authorities": [
+    "$ACCEPT_GRANTED_AUTHORITIES"
+  ]
+}

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

@@ -11,3 +11,4 @@ resources:
     parameters:
       service: enterprise-messaging
       service-plan: default
+      path: ./event-mesh.json

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

@@ -1,7 +1,7 @@
-const path = require('path')
-const { copy } = require('../../../cds').utils
+const { join } = require('path')
 const ProjectReader = require('../../util/projectReader')
 const { mergeJSON, mergeYAML } = require('../../util/merge')
+const { copyAndTrack, parseMd5File, writeMd5File } = require('../../util/md5Tracking')
 const { srvNode, srvJava, enterpriseMessaging } = require('../_merging/registry-mta')
 
 module.exports = class EnterpriseMessagingTemplate extends require('../templateBase') {
@@ -17,20 +17,20 @@ module.exports = class EnterpriseMessagingTemplate extends require('../templateB
   async run() {
     const projectDescriptor = await this.projectReader.read(this.options)
     const { for: forProfile, isNodejs } = projectDescriptor.cap
-    const templatePath = path.join(__dirname, 'files')
+    const templatePath = join(__dirname, 'files')
     const cdsTemplateFile = (isNodejs ? 'cds.package.json' : 'cdsrc.json') + (forProfile ? '.hbs' : '')
-    const cdsTemplatePath = path.join(templatePath, cdsTemplateFile)
-    const configPath = path.join(this.projectPath, isNodejs ? 'package.json' : '.cdsrc.json')
+    const cdsTemplatePath = join(templatePath, cdsTemplateFile)
+    const configPath = join(this.projectPath, isNodejs ? 'package.json' : '.cdsrc.json')
     await mergeJSON(configPath, cdsTemplatePath, projectDescriptor)
     await this.runDependentMerging()
   }
 
-  async runDependentMerging() {
+  async runDependentMerging(context = {}) {
     const projectDescriptor = await this.projectReader.read(this.options)
     const { hasHelm, hasMta, isNodejs } = projectDescriptor.cap
 
     if (hasMta) {
-      const mtaYAMLPath = path.join(this.projectPath, 'mta.yaml')
+      const mtaYAMLPath = join(this.projectPath, 'mta.yaml')
       const srv = isNodejs ? srvNode : srvJava
       await mergeYAML(
           mtaYAMLPath,
@@ -44,18 +44,31 @@ module.exports = class EnterpriseMessagingTemplate extends require('../templateB
               }]
           }
       )
+      await mergeJSON(
+        join(this.projectPath, 'event-mesh.json'),
+        join(__dirname, 'files', 'event-mesh.json.hbs'),
+        projectDescriptor
+      )
     }
 
     if (hasHelm) {
+      //in case facet is being added to the already exisiting charts folder
+      let isIndependentCommand = false
+      if(Object.keys(context).length == 0){
+          isIndependentCommand = true
+          context.projectPath = this.projectPath
+          context.oldTrackingData = context.newTrackingData = await parseMd5File(join(this.projectPath, 'chart', '.cds-add-helm-files.md5'))
+      }
       await mergeYAML(
-        path.join(this.projectPath, 'chart', 'values.yaml'),
-        path.join(__dirname, 'files', 'values.yaml'),
-        null, { forceOverwrite: true }
+        join(this.projectPath, 'chart', 'values.yaml'),
+        join(__dirname, 'files', 'values.yaml')
       )
-      await copy(
-         path.join(__dirname, 'files', 'event-mesh.yaml'),
-         path.join(this.projectPath, 'chart', 'templates', 'event-mesh.yaml')
+      await copyAndTrack(
+         join(__dirname, 'files', 'event-mesh.yaml'),
+         join(this.projectPath, 'chart', 'templates', 'event-mesh.yaml'),
+         context
       )
+      if(isIndependentCommand) await writeMd5File(join(this.projectPath, 'chart', '.cds-add-helm-files.md5'), context.newTrackingData)
     }
   }
 }

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

@@ -1,7 +1,7 @@
-const cds = require('../../../cds')
-const { copy, path } = cds.utils
+const { join } = require('path')
 const ProjectReader = require('../../util/projectReader')
 const { mergeJSON } = require('../../util/merge')
+const { copyAndTrack, parseMd5File, writeMd5File } = require('../../util/md5Tracking')
 
 module.exports = class ExtensibilityTemplate extends require('../templateBase') {
   constructor(projectPath, generator) {
@@ -16,19 +16,19 @@ module.exports = class ExtensibilityTemplate extends require('../templateBase')
   async run() {
     const projectDescriptor = await this.projectReader.read(this.options)
     const { for: forProfile, isJava } = projectDescriptor.cap
-    const cdsConfigPath = path.join(this.projectPath, isJava ? '.cdsrc.json' : 'package.json')
+    const cdsConfigPath = join(this.projectPath, isJava ? '.cdsrc.json' : 'package.json')
     const cdsTemplateFile = forProfile ? (isJava ? 'cdsrc.json.hbs' : 'cds.package.json.hbs') : (isJava ? 'cdsrc.json' : 'cds.package.json')
-    await mergeJSON(cdsConfigPath, path.join(__dirname, 'files', cdsTemplateFile), projectDescriptor)
+    await mergeJSON(cdsConfigPath, join(__dirname, 'files', cdsTemplateFile), projectDescriptor)
     await this.runDependentMerging()
   }
 
-  async runDependentMerging() {
+  async runDependentMerging(context = {}) {
     const projectDescriptor = await this.projectReader.read()
     const { hasXsuaa, hasHelm } = projectDescriptor.cap
     if (hasXsuaa) {
       await mergeJSON(
-        path.join(this.projectPath, 'xs-security.json'),
-        path.join(__dirname, 'files', 'xs-security.json.hbs'),
+        join(this.projectPath, 'xs-security.json'),
+        join(__dirname, 'files', 'xs-security.json.hbs'),
         projectDescriptor,
         {
           additions: [{
@@ -48,11 +48,20 @@ module.exports = class ExtensibilityTemplate extends require('../templateBase')
       )
     }
     if (hasXsuaa && hasHelm) {
+      //in case facet is being added to the already exisiting charts folder
+      let isIndependentCommand = false
+      if(Object.keys(context).length == 0){
+          isIndependentCommand = true
+          context.projectPath = this.projectPath
+          context.oldTrackingData = context.newTrackingData = await parseMd5File(join(this.projectPath, 'chart', '.cds-add-helm-files.md5'))
+      }
       // REVISIT: Shared xs-security.json location for Helm and MTA?
-      await copy(
-        path.join(this.projectPath, 'xs-security.json'),
-        path.join(this.projectPath, 'chart', 'xs-security.json')
+      await copyAndTrack(
+        join(this.projectPath, 'xs-security.json'),
+        join(this.projectPath, 'chart', 'xs-security.json'),
+        context
       )
+      if(isIndependentCommand) await writeMd5File(join(this.projectPath, 'chart', '.cds-add-helm-files.md5'), context.newTrackingData)
     }
   }
 }

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

@@ -45,7 +45,3 @@ resources:
       service: service-manager
       service-plan: container
     {{/cap.isMultitenant}}
-    {{#cap.isJava}}
-    properties:
-      hdi-service-name: ${service-name}
-    {{/cap.isJava}}

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

@@ -1,10 +1,11 @@
-const path = require('path');
+const { join } = require('path');
 const cds = require('../../../cds')
-const { fs, read, write } = cds.utils
+const { read, write, exists, rm } = cds.utils
 const commandUtil = require('../../util/commandUtil');
 const mvnArchetypes = require('../../util/mvnArchetypeUtil');
 const term = require('../../../util/term');
-const { mergeJSON, mergeYAML } = require('../../util/merge')
+const { mergeJSON, mergeYAML, removeFromYAML } = require('../../util/merge')
+const { copyAndTrack, parseMd5File, writeMd5File } = require('../../util/md5Tracking')
 const { copyFiles } = require('../../util/templateUtil')
 const ProjectReader = require('../../util/projectReader');
 const versionCompare = require('../../util/versionCompare');
@@ -34,18 +35,18 @@ module.exports = class HanaTemplate extends require('../templateBase') {
     async run() {
         const env = await this.getEnv();
 
-        const hdiConfigPath = path.join(this.projectPath, env.folders.db, 'src', '.hdiconfig');
-        const hdiConfigTemplatePath = path.join(__dirname, 'files', 'common', 'src', '.hdiconfig');
+        const hdiConfigPath = join(this.projectPath, env.folders.db, 'src', '.hdiconfig');
+        const hdiConfigTemplatePath = join(__dirname, 'files', 'common', 'src', '.hdiconfig');
         await mergeJSON(hdiConfigPath, hdiConfigTemplatePath);
 
-        const undeployJSONPath = path.join(this.projectPath, env.folders.db, 'undeploy.json');
-        const undeployJSONTemplatePath = path.join(__dirname, 'files', 'common', 'undeploy.json');
+        const undeployJSONPath = join(this.projectPath, env.folders.db, 'undeploy.json');
+        const undeployJSONTemplatePath = join(__dirname, 'files', 'common', 'undeploy.json');
         await mergeJSON(undeployJSONPath, undeployJSONTemplatePath);
 
         const projectType = await this.getProjectType();
         switch (projectType) {
             case PROJECT_TYPE.java: {
-                await copyFiles(path.join(__dirname, 'files', 'java', 'db'), path.join(this.projectPath, env.folders.db), {}, this.options.force);
+                await copyFiles(join(__dirname, 'files', 'java', 'db'), join(this.projectPath, env.folders.db), {}, this.options.force);
                 await this._updatePomXml();
                 await this._updateCdsConfiguration();
                 break;
@@ -60,7 +61,7 @@ module.exports = class HanaTemplate extends require('../templateBase') {
     }
 
 
-    async runDependentMerging() {
+    async runDependentMerging(context = {}) {
         const projectDescriptor = await this.projectReader.read(this.options)
         const { hasMta, hasHelm, isNodejs, isJava, isMultitenant } = projectDescriptor.cap
 
@@ -85,7 +86,7 @@ module.exports = class HanaTemplate extends require('../templateBase') {
                 }]
             }] : []
 
-            const mtaYAMLPath = path.join(this.projectPath, 'mta.yaml')
+            const mtaYAMLPath = join(this.projectPath, 'mta.yaml')
 
             const relationships = [{
                 insert: [db, 'name'],
@@ -117,14 +118,49 @@ module.exports = class HanaTemplate extends require('../templateBase') {
         }
 
         if (hasHelm) {
-            await mergeYAML(
-                path.join(this.projectPath, 'chart', 'values.yaml'),
-                path.join(__dirname, 'files', 'values.yaml.hbs'),
-                projectDescriptor, { forceOverwrite: true })
-            await fs.copy(
-                path.join(__dirname, 'files', 'hana-deployer-job.yaml'),
-                path.join(this.projectPath, 'chart', 'templates', 'hana-deployer-job.yaml')
-            )
+            //in case facet is being added to the already exisiting charts folder
+            let shouldUpdateTrackingFile = false;
+            if(Object.keys(context).length == 0){
+                shouldUpdateTrackingFile = true;
+                context.projectPath = this.projectPath;
+                context.oldTrackingData = context.newTrackingData = await parseMd5File(join(this.projectPath, 'chart', '.cds-add-helm-files.md5'));
+            }
+
+            if(isMultitenant){
+                shouldUpdateTrackingFile = true;
+                const key = "templates/hana-deployer-job.yaml";
+
+                // remove entry from oldTrackingData
+                if(context.oldTrackingData !== undefined && context.oldTrackingData[key] !== undefined) {
+                    delete context.oldTrackingData[key];
+                }
+
+                // remove entry from newTrackingData
+                if(context.newTrackingData !== undefined && context.newTrackingData[key] !== undefined) {
+                    delete context.newTrackingData[key];
+                }
+                
+                // remove hana entries from values.yaml
+                await removeFromYAML(join(this.projectPath, 'chart', 'values.yaml'), ['hana_deployer', 'srv.bindings.db']);
+
+                const hanaDeployerPath = join(this.projectPath, 'chart', 'templates', 'hana-deployer-job.yaml');
+                if(exists(hanaDeployerPath)) {
+                    await rm(hanaDeployerPath, { force: true });
+                }
+            }
+            else{
+                await mergeYAML(
+                    join(this.projectPath, 'chart', 'values.yaml'),
+                    join(__dirname, 'files', 'values.yaml.hbs'),
+                    projectDescriptor
+                )
+                await copyAndTrack(
+                    join(__dirname, 'files', 'hana-deployer-job.yaml'),
+                    join(this.projectPath, 'chart', 'templates', 'hana-deployer-job.yaml'),
+                    context
+                )
+            }
+            if(shouldUpdateTrackingFile) await writeMd5File(join(this.projectPath, 'chart', '.cds-add-helm-files.md5'), context.newTrackingData);
         }
     }
 
@@ -146,8 +182,8 @@ module.exports = class HanaTemplate extends require('../templateBase') {
     }
 
     async _updatePackageJson() {
-        const packageJsonPath = path.join(this.projectPath, 'package.json')
-        const dependenciesTemplatePath = path.join(__dirname, 'files', 'nodejs', 'dependencies.package.json');
+        const packageJsonPath = join(this.projectPath, 'package.json')
+        const dependenciesTemplatePath = join(__dirname, 'files', 'nodejs', 'dependencies.package.json');
         await mergeJSON(packageJsonPath, dependenciesTemplatePath);
 
         const packageJson = await read(packageJsonPath);
@@ -162,7 +198,7 @@ module.exports = class HanaTemplate extends require('../templateBase') {
     async _updateCdsConfiguration(configPath) {
         const projectType = await this.getProjectType();
         const configFile = projectType === PROJECT_TYPE.nodejs ? 'package.json' : '.cdsrc.json';
-        configPath = configPath ?? path.join(this.projectPath, configFile)
+        configPath = configPath ?? join(this.projectPath, configFile)
         const projectDescriptor = await this.projectReader.read(this.options);
         const { for: forProfile } = projectDescriptor.cap;
         let json; try { json = await read(configPath, 'utf8') } catch { /* ignore */ }
@@ -171,7 +207,7 @@ module.exports = class HanaTemplate extends require('../templateBase') {
         const profile = forProfile ? 'profile.' : '';
         const cdsTemplateFile = `cds.${shortcut}${profile}json.hbs`
         const { pLanguage } = projectDescriptor.cap;
-        const cdsTemplatePath = path.join(__dirname, 'files', pLanguage, cdsTemplateFile);
+        const cdsTemplatePath = join(__dirname, 'files', pLanguage, cdsTemplateFile);
         await mergeJSON(configPath, cdsTemplatePath, projectDescriptor, { forceOverwrite: true })
     }
 }

package/lib/init/template/helm/chart/templates/NOTES.txt

@@ -1,11 +1,12 @@
-Thank you for installing {{ .Chart.Name }} version {{ .Chart.Version }}.
+{{- printf "Thank you for installing %s version %s." .Chart.Name .Chart.Version }}
 
-The release "{{ .Release.Name }}" is installed in namespace "{{ .Release.Namespace }}".
+{{ printf "The release %s is installed in namespace %s." .Release.Name .Release.Namespace }}
 
 Your services are available at:
 {{- $root := . }}
 {{- range $name := include "cap.deploymentNames" . | split ";" }}
   {{- $deployment := (get $root.Values $name) }}
   {{- $ := merge (dict "name" $name "deployment" $deployment) $root }}
-  - https://{{ include "cap.deploymentHostFull" $ }}
+  {{- $url := include "cap.deploymentHostFull" $ }}
+  {{ printf "%s - https://%s" $name $url }}
 {{- end }}

package/lib/init/template/helm/chart/templates/_deployment_helpers.tpl

@@ -14,9 +14,13 @@ Add custom env variables
 Get list of deployment names
 */}}
 {{- define "cap.deploymentNames" -}}
+{{- $ := . -}}
 {{- $defaultDeployments := (list "srv") -}}
-  {{- if .mtx -}}
-{{-   $_ := (append $defaultDeployments "mtx") -}}
+  {{- if $.Values.sidecar -}}
+{{-   $defaultDeployments = (append $defaultDeployments "sidecar") -}}
+  {{- end -}}
+  {{- if $.Values.approuter -}}
+{{-   $defaultDeployments = (append $defaultDeployments "approuter") -}}
   {{- end -}}
 {{ .deploymentNames | default $defaultDeployments | join ";" }}
 {{- end -}}
@@ -60,4 +64,23 @@ Get FQDN of a deployment
 */}}
 {{- define "cap.deploymentHostFull" -}}
 {{ include "cap.deploymentHost" $ }}.{{ $.Values.global.domain }}
+{{- end -}}
+
+{{/*
+Backend Destinations
+*/}}
+{{- define "cap.approuterDestinations" -}}
+{{- $ := . -}}
+{{- if $.Values.approuterDestinations }}
+{{- $destinations := list -}}
+{{- range $destinationName, $destination := $.Values.approuterDestinations -}}
+    {{- $destination := merge (dict "name" $destinationName) $destination -}}
+    {{- $deployment := (get $.Values $destination.service) -}}
+    {{- $srv := merge (dict "name" $destination.service "destination" $destination "deployment" $deployment) $ -}}
+    {{- $destinationHost := include "cap.deploymentHostFull" $srv -}}
+    {{- $currentDestination := dict "name" $destination.name "forwardAuthToken" true "url" (print  "https://" $destinationHost ) -}}
+    {{- $destinations = (append $destinations $currentDestination) -}}
+{{- end -}}
+{{- $destinations | toJson }}
+{{- end -}}
 {{- end -}}

package/lib/init/template/helm/chart/values.root.schema.json

@@ -6,6 +6,11 @@
             "$id": "#/properties/srv",
             "description": "Deployment",
             "$ref": "./charts/web-application/values.schema.json"
+        },
+        "approuter": {
+            "$id": "#/properties/approuter",
+            "description": "Deployment",
+            "$ref": "./charts/web-application/values.schema.json"
         }
     }
 }

package/lib/init/template/helm/chart/values.schema.json

@@ -42,6 +42,33 @@
             "$id": "#/properties/srv",
             "description": "Deployment"
         },
+        "approuter": {
+            "$id": "#/properties/approuter",
+            "description": "Deployment"
+        },
+        "approuterDestinations": {
+            "$id": "#/properties/approuterDestinations",
+            "title": "Backend Destinations for Approuter",
+            "type": "object",
+            "patternProperties": {
+                "^[-._a-zA-Z][-._a-zA-Z0-9]*$": {
+                    "description": "Name of the backend Destination",
+                    "required": [
+                        "service"
+                    ],
+                    "properties": {
+                        "service": {
+                            "type": "string",
+                            "description": "Target Kubernetes service"
+                        },
+                        "path": {
+                            "type": "string",
+                            "description": "This path will be appended to the URL"
+                        }
+                    }
+                }
+            }
+        },
         "auditlog": {
             "$id": "#/properties/auditlog",
             "$ref": "#/definitions/ServiceInstance"

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

@@ -19,7 +19,7 @@ srv:
       ephemeral-storage: 1G
       cpu: {{#cap.isJava}}1000m{{/cap.isJava}}{{^cap.isJava}}500m{{/cap.isJava}}
       memory: {{#cap.isJava}}1G{{/cap.isJava}}{{^cap.isJava}}500M{{/cap.isJava}}
-  health_check:
+  health:
     liveness:
       path: /
     readiness: