@sap/cds-dk 6.5.1 → 6.6.0

package/lib/init/template/_merging/registry-mta.js

@@ -1,7 +1,6 @@
 // Registry of sequence matchers in mta.yaml files
 
 const srvNode = {
-    ref: 'srv',
     in: 'modules',
     where: [{
         property: 'type',
@@ -10,7 +9,6 @@ const srvNode = {
 }
 
 const srvJava = {
-    ref: 'srv',
     in: 'modules',
     where: [{
         property: 'type',
@@ -19,7 +17,6 @@ const srvJava = {
 }
 
 const approuter = {
-    ref: 'approuter',
     in: 'modules',
     where: [{
         property: 'type',
@@ -28,7 +25,6 @@ const approuter = {
 }
 
 const xsuaa = {
-    ref: 'uaa-resource',
     in: 'resources',
     where: [{
         property: 'type',
@@ -43,7 +39,6 @@ const xsuaa = {
 }
 
 const auditlog = {
-    ref: 'auditlog-resource',
     in: 'resources',
     where: [{
         property: 'type',
@@ -55,7 +50,6 @@ const auditlog = {
 }
 
 const enterpriseMessaging = {
-    ref: 'enterprise-messaging-resource',
     in: 'resources',
     where: [{
         property: 'type',
@@ -67,7 +61,6 @@ const enterpriseMessaging = {
 }
 
 const kibanaLogging = {
-    ref: 'cf-logging',
     in: 'resources',
     where: [{
         property: 'type',
@@ -82,7 +75,6 @@ const kibanaLogging = {
 }
 
 const hdbDeployer = {
-    ref: 'deployer',
     in: 'modules',
     where: [{
         property: 'type',
@@ -91,7 +83,6 @@ const hdbDeployer = {
 }
 
 const hdiContainer = {
-    ref: 'hdi-container-resource',
     in: 'resources',
     where: [{
         property: 'type',
@@ -100,7 +91,6 @@ const hdiContainer = {
 }
 
 const serviceManager = {
-    ref: 'service-manager-resource',
     in: 'resources',
     where: [{
         property: 'type',
@@ -115,7 +105,6 @@ const serviceManager = {
 }
 
 const saasRegistry = {
-    ref: 'registry-resource',
     in: 'resources',
     where: [{
         property: 'type',
@@ -127,7 +116,6 @@ const saasRegistry = {
 }
 
 const srvAPI = {
-    ref: 'srvAPI',
     in: 'provides',
     where: [{
         property: 'name',
@@ -139,7 +127,6 @@ const srvAPI = {
 }
 
 const mtxSidecar = {
-    ref: 'sidecar',
     in: 'modules',
     where: [{
         property: 'type',
@@ -150,9 +137,19 @@ const mtxSidecar = {
     }]
 }
 
-const providedMtxAPI = {
-    ref: 'provided-mtx-api',
-    in: 'provides',
+const providedMtxAPISrv = {
+    in: [srvNode, 'provides'],
+    where: [{
+        property: 'name',
+        isEqualTo: 'mtx-api'
+    }, {
+        property: 'properties.mtx-url',
+        isEqualTo: '${default-url}'
+    }]
+}
+
+const providedMtxAPISidecar = {
+    in: [mtxSidecar, 'provides'],
     where: [{
         property: 'name',
         isEqualTo: 'mtx-api'
@@ -163,7 +160,6 @@ const providedMtxAPI = {
 }
 
 const requiredMtxAPI = {
-    ref: 'required-mtx-api',
     in: [approuter, 'requires'],
     where: [{
         property: 'properties.name',
@@ -175,7 +171,6 @@ const requiredMtxAPI = {
 }
 
 const providedAppAPI = {
-    ref: 'provided-app-api',
     in: [approuter, 'provides'],
     where: [{
         property: 'name',
@@ -190,7 +185,6 @@ const providedAppAPI = {
 }
 
 const requiredAppAPI = {
-    ref: 'required-app-api',
     in: [srvNode, 'requires'],
     where: [{
         property: 'name',
@@ -202,7 +196,6 @@ const requiredAppAPI = {
 }
 
 const providedMtxSidecarAPI = {
-    ref: 'provided-mtx-sidecar-api',
     in: [mtxSidecar, 'provides'],
     where: [{
         property: 'properties.url',
@@ -211,7 +204,6 @@ const providedMtxSidecarAPI = {
 }
 
 const requiredMtxSidecarAPI = {
-    ref: 'required-mtx-sidecar-api',
     in: [srvJava, 'requires'],
     where: [{
         property: 'properties.CDS_MULTITENANCY_SIDECAR_URL',
@@ -220,7 +212,6 @@ const requiredMtxSidecarAPI = {
 }
 
 const requiredJavaApprouterAPI = {
-    ref: 'required-java-approuter-api',
     in: [srvJava, 'requires'],
     where: [{
         property: 'properties.CDS_MULTITENANCY_APPUI_URL',
@@ -229,7 +220,6 @@ const requiredJavaApprouterAPI = {
 }
 
 const providedJavaApprouterAPI = {
-    ref: 'provided-java-approuter-api',
     in: [approuter, 'requires'],
     where: [{
         property: 'properties.url',
@@ -238,7 +228,6 @@ const providedJavaApprouterAPI = {
 }
 
 const approuterExtensibility = {
-    ref: 'approuter-extensibility',
     in: 'routes',
     where: [{
         property: 'source',
@@ -253,7 +242,6 @@ const approuterExtensibility = {
 }
 
 const approuterExtensibilityJava = {
-    ref: 'approuter-extensibility-java',
     in: 'routes',
     where: [{
         property: 'source',
@@ -280,7 +268,8 @@ module.exports = {
     saasRegistry,
     srvAPI,
     mtxSidecar,
-    providedMtxAPI,
+    providedMtxAPISrv,
+    providedMtxAPISidecar,
     requiredMtxAPI,
     providedMtxSidecarAPI,
     requiredMtxSidecarAPI,

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

@@ -1,10 +1,10 @@
 {
   "name": "approuter",
   "dependencies": {
-    "@sap/approuter": "^13.0.0"
+    "@sap/approuter": "^14.0.0"
   },
   "engines": {
-    "node": "^16"
+    "node": "^18.0.0"
   },
   "scripts": {
     "start": "node node_modules/@sap/approuter/approuter.js"

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

@@ -1,5 +1,5 @@
 const { join } = require('path')
-const ProjectReader = require('../../util/projectReader')
+const { readProject } = require('../../util/projectReader')
 const { mergeJSON, mergeYAML, sortDependencies } = require('../../util/merge')
 const { OPTION_XSUAA, PROJECT_TYPE } = require('../../constants')
 const {
@@ -13,11 +13,6 @@ const { copyAndTrack, parseMd5File, writeMd5File } = require('../../util/md5Trac
 
 module.exports = class ApprouterTemplate extends require('../templateBase') {
 
-    constructor(projectPath, generator) {
-        super(projectPath, generator, __dirname)
-        this.projectReader = new ProjectReader(projectPath)
-    }
-
     static hasFacet(env) {
         return !!env.requires?.approuter
     }
@@ -27,9 +22,9 @@ module.exports = class ApprouterTemplate extends require('../templateBase') {
     }
 
     async run() {
-        const projectDescriptor = await this.projectReader.read(this.options)
+        const projectDescriptor = await readProject(this.options)
         const { for: forProfile } = projectDescriptor.cap
-        const appPath = join(this.projectPath, projectDescriptor.ui.appPath || 'app')
+        const appPath = join(this.projectPath, projectDescriptor.ui.appPath ?? 'app')
         const appPackageJSONPath = join(appPath, 'package.json')
 
         await mergeJSON(appPackageJSONPath, join(__dirname, 'files', 'package.json'))
@@ -37,7 +32,7 @@ module.exports = class ApprouterTemplate extends require('../templateBase') {
 
         await mergeJSON(join(appPath, 'default-env.json'), join(__dirname, 'files', 'default-env.json'))
 
-        const projectType = await this.getProjectType()
+        const projectType = this.getProjectType()
         switch (projectType) {
             case PROJECT_TYPE.java: {
                 const cdsrcJSONPath = join(this.projectPath, '.cdsrc.json')
@@ -59,7 +54,7 @@ module.exports = class ApprouterTemplate extends require('../templateBase') {
     }
 
     async runDependentMerging(context = {}) {
-        const projectDescriptor = await this.projectReader.read(this.options)
+        const projectDescriptor = await readProject(this.options)
         const { isNodejs, isJava, isExtensible, isMultitenant, hasMta, hasHelm } = projectDescriptor.cap
 
         if (hasMta) {
@@ -100,7 +95,6 @@ module.exports = class ApprouterTemplate extends require('../templateBase') {
                 join(__dirname, 'files', 'chart.yaml'),
                 projectDescriptor,
                 { additions: [{
-                    ref: `web-application-approuter`,
                     in: `dependencies`,
                     where: [{
                         property: 'alias',
@@ -136,7 +130,7 @@ module.exports = class ApprouterTemplate extends require('../templateBase') {
             if (isIndependentCommand) await writeMd5File(join(this.projectPath, 'chart', '.cds-add-helm-files.md5'), context.newTrackingData);
         }
 
-        const appPath = join(this.projectPath, projectDescriptor.ui.appPath || 'app')
+        const appPath = join(this.projectPath, projectDescriptor.ui.appPath ?? 'app')
         const additions = isExtensible && isJava ? [{ ...approuterExtensibilityJava, at: 0 }] :
                           isExtensible && isNodejs ? [{ ...approuterExtensibility, at: 0 }] : []
         await mergeJSON(join(appPath, 'xs-app.json'), join(__dirname, 'files', 'xs-app.json.hbs'), projectDescriptor, { additions })

package/lib/init/template/auditlog/files/auditlog.yaml

@@ -1 +1,4 @@
-{{- include "cap.service-instance" . }}
+dependencies:
+  - name: service-instance
+    alias: auditlog
+    version: 0.1.0

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

@@ -1,14 +1,10 @@
 const { join } = require('path')
-const ProjectReader = require('../../util/projectReader')
+const { readProject } = require('../../util/projectReader')
 const { mergeYAML } = require('../../util/merge')
-const { copyAndTrack, parseMd5File, writeMd5File } = require('../../util/md5Tracking')
+const { parseMd5File, writeMd5File } = require('../../util/md5Tracking')
 const { srvNode, srvJava, auditlog } = require('../_merging/registry-mta')
 
 module.exports = class AuditlogTemplate extends require('../templateBase') {
-    constructor(projectPath, generator) {
-        super(projectPath, generator, __dirname)
-        this.projectReader = new ProjectReader(projectPath)
-    }
 
     static hasFacet() {
         return false // TODO: Need a `cds.requires.auditlog` or some other way to detect if enabled.
@@ -19,7 +15,7 @@ module.exports = class AuditlogTemplate extends require('../templateBase') {
     }
 
     async runDependentMerging(context = {}) {
-        const projectDescriptor = await this.projectReader.read(this.options)
+        const projectDescriptor = await readProject(this.options)
         const { isNodejs, hasMta, hasHelm } = projectDescriptor.cap
 
         if (hasMta) {
@@ -60,7 +56,26 @@ module.exports = class AuditlogTemplate extends require('../templateBase') {
                     }
                 }
             )
-            await copyAndTrack(join(__dirname, 'files', 'auditlog.yaml'), join(this.projectPath, 'chart', 'templates', 'auditlog.yaml'), context)
+            
+            // copy service instance chart if it is not present
+            const HelmTemplate = require(`../helm`);
+            const helmTemplate = new HelmTemplate(this.generator, context.oldTrackingData, context.newTrackingData);
+            isIndependentCommand = isIndependentCommand | await helmTemplate.addSubChart('service-instance');
+
+            // add dependency entry in chart.yaml
+            await mergeYAML(
+                join(this.projectPath, 'chart', 'Chart.yaml'),
+                join(__dirname, 'files', 'auditlog.yaml'),
+                projectDescriptor,
+                { additions: [{
+                    in: `dependencies`,
+                    where: [{
+                        property: 'alias',
+                        isEqualTo: 'auditlog'
+                    }]
+                }]}
+            )
+
             if(isIndependentCommand) await writeMd5File(join(this.projectPath, 'chart', '.cds-add-helm-files.md5'), context.newTrackingData)
         }
     }

package/lib/init/template/cf-manifest/index.js

@@ -1,34 +1,24 @@
 const { join } = require('path')
 const { exists } = require('../../../cds').utils
-const ProjectReader = require('../../util/projectReader');
+const { readProject } = require('../../util/projectReader')
 const { copyFiles } = require('../../util/templateUtil')
-const { OPTION_CF_MANIFEST } = require('../../constants')
 const MANIFEST_FILE = 'manifest.yml'
 const SERVICES_MANIFEST_FILE = 'services-manifest.yml'
 
-module.exports = class ManifestTemplate extends require('../templateBase') {
-    constructor(projectPath, generator) {
-        super(projectPath, generator, __dirname)
-        this.projectReader = new ProjectReader(projectPath)
-    }
+module.exports = class CfManifestTemplate extends require('../templateBase') {
 
     async canRun() {
-        if (!this.options.add.has(OPTION_CF_MANIFEST)) {
-            return false;
-        }
-
         if (this.options.force) {
             return true;
         }
-
-        if (exists(join(this.projectPath, MANIFEST_FILE)) || exists(join(this.projectPath, SERVICES_MANIFEST_FILE))) {
+        if (exists(MANIFEST_FILE) || exists(SERVICES_MANIFEST_FILE)) {
             throw new Error(`File ${MANIFEST_FILE} or ${SERVICES_MANIFEST_FILE} already exist in current folder. Use --force to overwrite.`);
         }
         return true;
     }
 
     async run() {
-        const projectDescriptor = await this.projectReader.read()
+        const projectDescriptor = await readProject()
         await copyFiles(join(__dirname, 'files'), this.projectPath, projectDescriptor, this.options.force);
     }
 }

package/lib/init/template/connectivity/files/connectivity-proxy-info.yaml

@@ -1,10 +1,8 @@
-{{- if .Values.connectivity }}
-  {{- if or (not (hasKey .Values.connectivity "enabled")) .Values.connectivity.enabled }}
-    {{- $ := merge (dict "name" "connectivity-proxy-info") . }}
+{{- $ := merge (dict "name" "connectivity-proxy-info") . }}
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: {{ .Values.connectivity.configMapName }}
+  name: {{ .Release.Name }}-connectivity-proxy-info
   namespace: {{ .Release.Namespace }}
   labels: {{- include "cap.labels" $ | nindent 4 }}
 data:
@@ -16,5 +14,3 @@ data:
   onpremise_proxy_port: "20003"
   onpremise_proxy_rfc_port: "20001"
   onpremise_socks5_proxy_port: "20004"
-  {{- end }}
-{{- end }}

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

@@ -8,19 +8,16 @@ srv:
     projected:
       sources:
         - secret:
-            name: {{cap.appName}}-connectivity-binding
+            name: <your-connectivity-binding>
             optional: false
         - secret:
-            name: {{cap.appName}}-connectivity-binding
+            name: <your-connectivity-binding>
             optional: false
             items:
               - key: token_service_url
                 path: url
+{{=<% %>=}}
         - configMap:
-            name: {{cap.appName}}-connectivity-proxy-info
+            name: "{{ .Release.Name }}-connectivity-proxy-info"
             optional: false
-connectivity:
-  serviceOfferingName: connectivity
-  servicePlanName: connectivity_proxy
-  secretName: {{cap.appName}}-connectivity-binding
-  configMapName: {{cap.appName}}-connectivity-proxy-info
+<%={{ }}=%>

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

@@ -1,20 +1,16 @@
 const { join } = require('path')
-const ProjectReader = require('../../util/projectReader')
+const { readProject } = require('../../util/projectReader')
 const { mergeYAML } = require('../../util/merge')
 const { copyAndTrack, parseMd5File, writeMd5File } = require('../../util/md5Tracking')
 
 module.exports = class ConnectivityTemplate extends require('../templateBase') {
-    constructor(projectPath, generator) {
-        super(projectPath, generator, __dirname)
-        this.projectReader = new ProjectReader(projectPath)
-    }
 
     async run() {
         await this.runDependentMerging()
     }
 
     async runDependentMerging(context = {}) {
-        const projectDescriptor = await this.projectReader.read(this.options)
+        const projectDescriptor = await readProject(this.options)
         const { hasHelm } = projectDescriptor.cap
 
         if (hasHelm) {
@@ -31,7 +27,6 @@ module.exports = class ConnectivityTemplate extends require('../templateBase') {
                 join(__dirname, 'files', 'values.yaml.hbs'),
                 projectDescriptor,
                 { additions: [{
-                    ref: `srv-additional-volumes`,
                     in: `srv.additionalVolumes`,
                     where: [{
                         property: 'name',
@@ -41,9 +36,7 @@ module.exports = class ConnectivityTemplate extends require('../templateBase') {
             )
             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/data/index.js

@@ -6,9 +6,6 @@ const LOG = console
 const DEBUG = /\b(y|all|cli)\b/.test(process.env.DEBUG) && console.debug
 
 module.exports = class DataTemplate extends require('../templateBase') {
-  constructor(projectPath, generator) {
-    super(projectPath, generator, __dirname);
-  }
 
   async run() {
     const env = await this.getEnv();
@@ -21,7 +18,6 @@ module.exports = class DataTemplate extends require('../templateBase') {
     const nameFilter = asRegex(this.options['data:for'] || this.options.for)
     const force = this.options.force;
 
-    cds.root = this.projectPath;
     let csn = await cds.compile.to.csn(cds.env.roots); // normal CSN
 
     // Also include 'external' entities w/ cds.persistence.skip (similar to 'mocked' option of serve).

package/lib/init/template/destinations/files/destination.yaml

@@ -1 +1,4 @@
-{{- include "cap.service-instance" . }}
+dependencies:
+  - name: service-instance
+    alias: destination
+    version: 0.1.0

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

@@ -1,16 +1,12 @@
 const { join } = require('path')
-const ProjectReader = require('../../util/projectReader')
+const { readProject } = require('../../util/projectReader')
 const { mergeYAML } = require('../../util/merge')
-const { copyAndTrack, parseMd5File, writeMd5File } = require('../../util/md5Tracking')
+const { parseMd5File, writeMd5File } = require('../../util/md5Tracking')
 
 module.exports = class DestinationsTemplate extends require('../templateBase') {
-    constructor(projectPath, generator) {
-        super(projectPath, generator, __dirname)
-        this.projectReader = new ProjectReader(projectPath)
-    }
 
     async canRun() {
-        const projectDescriptor = await this.projectReader.read(this.options)
+        const projectDescriptor = await readProject(this.options)
         const { hasMta, hasHelm } = projectDescriptor.cap
         if (!hasHelm && hasMta) {
             throw `'cds add destinations' is not available for Cloud Foundry yet`
@@ -28,12 +24,12 @@ module.exports = class DestinationsTemplate extends require('../templateBase') {
     }
 
     async runDependentMerging(context = {}) {
-        const projectDescriptor = await this.projectReader.read(this.options)
+        const projectDescriptor = await readProject(this.options)
         const { hasHelm, hasDestination, hasHtml5Repo } = projectDescriptor.cap
 
         if (hasHelm) {
             //const env = await this.getEnv()
-            const binding = hasDestination && { srv: { bindings: { destination: { serviceInstanceName: 'destinations' }}}}
+            const binding = hasDestination && { srv: { bindings: { destination: { serviceInstanceName: 'destination' }}}}
             const html5Binding = hasHtml5Repo && { 'html5-apps-deployer': { bindings: { destination: { serviceInstanceName: 'destination' }}}}
 
             //in case facet is being added to the already exisiting charts folder
@@ -58,7 +54,26 @@ module.exports = class DestinationsTemplate extends require('../templateBase') {
                     }
                 }
             )
-            await copyAndTrack(join(__dirname, 'files', 'destination.yaml'), join(this.projectPath, 'chart', 'templates', 'destination.yaml'), context)
+            
+            // copy service instance chart if it is not present
+            const HelmTemplate = require(`../helm`);
+            const helmTemplate = new HelmTemplate(this.generator, context.oldTrackingData, context.newTrackingData);
+            isIndependentCommand = isIndependentCommand | await helmTemplate.addSubChart('service-instance');
+
+            // add dependency entry in chart.yaml
+            await mergeYAML(
+                join(this.projectPath, 'chart', 'Chart.yaml'),
+                join(__dirname, 'files', 'destination.yaml'),
+                projectDescriptor,
+                { additions: [{
+                    in: `dependencies`,
+                    where: [{
+                        property: 'alias',
+                        isEqualTo: 'destination'
+                    }]
+                }]}
+            )
+
             if(isIndependentCommand) await writeMd5File(join(this.projectPath, 'chart', '.cds-add-helm-files.md5'), context.newTrackingData)
         }
     }

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

@@ -1 +1,4 @@
-{{- include "cap.service-instance" . }}
+dependencies:
+  - name: service-instance
+    alias: event-mesh
+    version: 0.1.0

package/lib/init/template/enterprise-messaging/files/values.yaml

@@ -2,7 +2,6 @@ srv:
   bindings:
     messaging:
       serviceInstanceName: event-mesh
-event_mesh:
+event-mesh:
   serviceOfferingName: enterprise-messaging
   servicePlanName: default
-  config: event-mesh.json

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

@@ -1,39 +1,36 @@
 const { join } = require('path')
-const ProjectReader = require('../../util/projectReader')
+const { readProject } = require('../../util/projectReader')
 const { mergeJSON, mergeYAML } = require('../../util/merge')
-const { copyAndTrack, parseMd5File, writeMd5File } = require('../../util/md5Tracking')
+const { parseMd5File, writeMd5File } = require('../../util/md5Tracking')
 const { srvNode, srvJava, enterpriseMessaging } = require('../_merging/registry-mta')
 
 module.exports = class EnterpriseMessagingTemplate extends require('../templateBase') {
-  constructor(projectPath, generator) {
-    super(projectPath, generator, __dirname)
-    this.projectReader = new ProjectReader(projectPath)
-  }
+
 
   static hasFacet(env) {
-    return env.requires?.messaging === 'enterprise-messaging'
+    return env.requires?.messaging?.kind === 'enterprise-messaging-http'
   }
 
   async run() {
-    const projectDescriptor = await this.projectReader.read(this.options)
+    const projectDescriptor = await readProject(this.options)
     const { for: forProfile, isNodejs } = projectDescriptor.cap
     const templatePath = join(__dirname, 'files')
     const cdsTemplateFile = (isNodejs ? 'cds.package.json' : 'cdsrc.json') + (forProfile ? '.hbs' : '')
     const cdsTemplatePath = join(templatePath, cdsTemplateFile)
     const configPath = join(this.projectPath, isNodejs ? 'package.json' : '.cdsrc.json')
     await mergeJSON(configPath, cdsTemplatePath, projectDescriptor)
+    await mergeJSON('event-mesh.json', join(__dirname, 'files', 'event-mesh.json.hbs'), projectDescriptor)
     await this.runDependentMerging()
   }
 
   async runDependentMerging(context = {}) {
-    const projectDescriptor = await this.projectReader.read(this.options)
+    const projectDescriptor = await readProject(this.options)
     const { hasHelm, hasMta, isNodejs } = projectDescriptor.cap
 
     if (hasMta) {
-      const mtaYAMLPath = join(this.projectPath, 'mta.yaml')
       const srv = isNodejs ? srvNode : srvJava
       await mergeYAML(
-          mtaYAMLPath,
+          'mta.yaml',
           join(__dirname, 'files', 'mta.yaml.hbs'),
           projectDescriptor,
           {
@@ -44,11 +41,6 @@ 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) {
@@ -59,15 +51,31 @@ module.exports = class EnterpriseMessagingTemplate extends require('../templateB
           context.projectPath = this.projectPath
           context.oldTrackingData = context.newTrackingData = await parseMd5File(join(this.projectPath, 'chart', '.cds-add-helm-files.md5'))
       }
+
       await mergeYAML(
         join(this.projectPath, 'chart', 'values.yaml'),
         join(__dirname, 'files', 'values.yaml')
       )
-      await copyAndTrack(
-         join(__dirname, 'files', 'event-mesh.yaml'),
-         join(this.projectPath, 'chart', 'templates', 'event-mesh.yaml'),
-         context
+
+      // copy service instance chart if it is not present
+      const HelmTemplate = require(`../helm`);
+      const helmTemplate = new HelmTemplate(this.generator, context.oldTrackingData, context.newTrackingData);
+      isIndependentCommand = isIndependentCommand | await helmTemplate.addSubChart('service-instance');
+
+      // add dependency entry in chart.yaml
+      await mergeYAML(
+        join(this.projectPath, 'chart', 'Chart.yaml'),
+        join(__dirname, 'files', 'event-mesh.yaml'),
+        projectDescriptor,
+        { additions: [{
+            in: `dependencies`,
+            where: [{
+                property: 'alias',
+                isEqualTo: 'event-mesh'
+            }]
+        }]}
       )
+
       if(isIndependentCommand) await writeMd5File(join(this.projectPath, 'chart', '.cds-add-helm-files.md5'), context.newTrackingData)
     }
   }