@sap/cds-dk 6.5.2 → 6.6.1

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

@@ -1,22 +1,19 @@
 const { join } = require('path')
 const { exists } = require('../../../cds').utils
-const ProjectReader = require('../../util/projectReader')
+const { readProject } = require('../../util/projectReader')
 const { mergeYAML } = require('../../util/merge')
 const { copyAndTrack, parseMd5File, writeMd5File } = require('../../util/md5Tracking')
 const { OPTION_DESTINATIONS } = require('../../constants')
 
 module.exports = class Html5RepoTemplate extends require('../templateBase') {
-    constructor(projectPath, generator) {
-        super(projectPath, generator, __dirname)
-        this.projectReader = new ProjectReader(projectPath)
-    }
+
 
     getDependencies() {
         return [OPTION_DESTINATIONS]
     }
 
     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 html5-repo' is not available for Cloud Foundry yet`
@@ -24,9 +21,9 @@ module.exports = class Html5RepoTemplate extends require('../templateBase') {
         return true
     }
 
-    static hasFacet(_, projectPath) {
+    static hasFacet() {
         // REVISIT: Should be detectable without helm charts
-        return exists(join(projectPath, 'chart', 'templates', 'html5-apps-repo-host.yaml'))
+        return exists(join('chart', 'templates', 'html5-apps-deployer-configmap.yaml'))
     }
 
     async run() {
@@ -34,7 +31,7 @@ module.exports = class Html5RepoTemplate extends require('../templateBase') {
     }
 
     async runDependentMerging(context = {}) {
-        const projectDescriptor = await this.projectReader.read(this.options)
+        const projectDescriptor = await readProject(this.options)
         const { appName, hasHelm } = projectDescriptor.cap
 
         if (hasHelm) {
@@ -48,7 +45,7 @@ module.exports = class Html5RepoTemplate extends require('../templateBase') {
             await mergeYAML(
                 join(this.projectPath, 'chart', 'values.yaml'),
                 {
-                    html5_apps_repo_host: {
+                    'html5-apps-repo-host': {
                         serviceOfferingName: 'html5-apps-repo',
                         servicePlanName: 'app-host'
                     },
@@ -59,8 +56,7 @@ module.exports = class Html5RepoTemplate extends require('../templateBase') {
                         envFrom: [
                             {
                               configMapRef: {
-                                name: "{{ .Release.Name }}-html5-apps-deployer-configmap",
-                                tpl: true
+                                name: "{{ .Release.Name }}-html5-apps-deployer-configmap"
                               }
                             }
                         ],
@@ -81,21 +77,18 @@ module.exports = class Html5RepoTemplate extends require('../templateBase') {
                     backendDestinations: {},
                 }
             )
-            
+
             // copy content deployment chart if it is not present
-            const contentDeploymentSubchartPath = join(this.projectPath, 'chart', 'charts', 'content-deployment');
-            if(!exists(contentDeploymentSubchartPath)) {
-                const contentDeploymentResourcePath = join(__dirname, '..', 'helm', 'subcharts', 'content-deployment');
-                await copyAndTrack(contentDeploymentResourcePath, contentDeploymentSubchartPath, context);
-            }
+            const HelmTemplate = require(`../helm`);
+            const helmTemplate = new HelmTemplate(this.generator, context.oldTrackingData, context.newTrackingData);
+            isIndependentCommand = isIndependentCommand | await helmTemplate.addSubChart('content-deployment');
 
             // add dependency entry in chart.yaml
             await mergeYAML(
                 join(this.projectPath, 'chart', 'Chart.yaml'),
-                join(__dirname, 'files', 'chart.yaml'),
+                join(__dirname, 'files', 'html5-apps-deployer.yaml'),
                 projectDescriptor,
                 { additions: [{
-                    ref: `content-deployment-html5-apps-deployer`,
                     in: `dependencies`,
                     where: [{
                         property: 'alias',
@@ -104,8 +97,24 @@ module.exports = class Html5RepoTemplate extends require('../templateBase') {
                 }]}
             )
 
+            // copy service-instance chart
+            isIndependentCommand = isIndependentCommand | await helmTemplate.addSubChart('service-instance');
+
+            // add dependency entry in chart.yaml
+            await mergeYAML(
+                join(this.projectPath, 'chart', 'Chart.yaml'),
+                join(__dirname, 'files', 'html5-apps-repo-host.yaml'),
+                projectDescriptor,
+                { additions: [{
+                    in: `dependencies`,
+                    where: [{
+                        property: 'alias',
+                        isEqualTo: 'html5-apps-repo-host'
+                    }]
+                }]}
+            )
+
             await copyAndTrack(join(__dirname, 'files', 'html5-apps-deployer-configmap.yaml'), join(this.projectPath, 'chart', 'templates', 'html5-apps-deployer-configmap.yaml'), context)
-            await copyAndTrack(join(__dirname, 'files', 'html5-apps-repo-host.yaml'), join(this.projectPath, 'chart', 'templates', 'html5-apps-repo-host.yaml'), context)
             if(isIndependentCommand) await writeMd5File(join(this.projectPath, 'chart', '.cds-add-helm-files.md5'), context.newTrackingData)
         }
     }

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

@@ -12,12 +12,9 @@ const LOG = console
 const { COMMAND_ADD, URLS, OPTION_JAVA, OPTION_NODEJS } = require('../../constants');
 
 module.exports = class JavaTemplate extends require('../templateBase') {
-    constructor(projectPath, generator) {
-        super(projectPath, generator, __dirname);
-    }
 
-    static hasFacet(_, projectPath) {
-        return exists(join(projectPath, 'pom.xml'))
+    static hasFacet() {
+        return exists('pom.xml')
     }
 
     async canRun() {
@@ -33,7 +30,7 @@ module.exports = class JavaTemplate extends require('../templateBase') {
     }
 
     async run() {
-        const mvnCmdArgs = mvnArchetypeUtil.getGenerateCmdArgs(this.projectName, this.options);
+        const mvnCmdArgs = await mvnArchetypeUtil.getGenerateCmdArgs(this.projectName, this.options);
         const { cmdLine, artifactId, archetypeVersion } = mvnCmdArgs
 
         LOG.info(`Using Maven archetype version ${archetypeVersion}`);

package/lib/init/template/kibana-logging/index.js

@@ -1,18 +1,15 @@
 const { join } = require('path')
 const cds = require('../../../cds')
-const ProjectReader = require('../../util/projectReader')
+const { readProject } = require('../../util/projectReader')
 const { mergeJSON, mergeYAML } = require('../../util/merge')
 const { PROJECT_TYPE, } = require('../../constants')
 const { srvNode, srvJava, kibanaLogging } = require('../_merging/registry-mta')
 
-module.exports = class KibanaTemplate extends require('../templateBase') {
-    constructor(projectPath, generator) {
-        super(projectPath, generator, __dirname)
-        this.projectReader = new ProjectReader(projectPath)
-    }
+module.exports = class KibanaLoggingTemplate extends require('../templateBase') {
+
 
     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 kibana-logging' is not available for Kyma yet`
@@ -21,7 +18,7 @@ module.exports = class KibanaTemplate extends require('../templateBase') {
     }
 
     async run() {
-        const projectType = await this.getProjectType()
+        const projectType = this.getProjectType()
 
         switch (projectType) {
             case PROJECT_TYPE.java:
@@ -30,7 +27,7 @@ module.exports = class KibanaTemplate extends require('../templateBase') {
                 // TODO: implement
                 break
             case PROJECT_TYPE.nodejs: {
-                const projectDescriptor = await this.projectReader.read(this.options);
+                const projectDescriptor = await readProject(this.options);
                 const { for: forProfile } = projectDescriptor.cap
                 const cdsTemplateFile = forProfile ? 'cds.profile.package.json.hbs' : 'cds.package.json'
                 const cdsTemplatePath = join(__dirname, 'files', cdsTemplateFile)
@@ -41,7 +38,7 @@ module.exports = class KibanaTemplate extends require('../templateBase') {
     }
 
     async runDependentMerging() {
-        const projectDescriptor = await this.projectReader.read(this.options)
+        const projectDescriptor = await readProject(this.options)
         const { hasMta, isNodejs } = projectDescriptor.cap
 
         if (hasMta) {

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

@@ -19,9 +19,8 @@ const VSCODE_FILE_ASSOCIATIONS = {
 }
 
 module.exports = class LintTemplate extends require('../templateBase') {
-  constructor(projectPath, generator) {
-    super(projectPath, generator, __dirname);
-    this.projectPath = projectPath;
+  constructor(generator) {
+    super(generator);
     this.customPath = path.join(this.projectPath, ".eslint");
     this.docsPath = path.join(this.customPath, "docs");
     this.rulesPath = path.join(this.customPath, "rules");

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

@@ -24,9 +24,11 @@ modules:
 {{/cap.isNodejs}}
 {{#cap.isJava}}
     parameters:
-      buildpack: java_buildpack
+      buildpack: sap_java_buildpack
     properties:
-      SPRING_PROFILES_ACTIVE: cloud
+      SPRING_PROFILES_ACTIVE: cloud,sandbox
+      JBP_CONFIG_COMPONENTS: "jres: ['com.sap.xs.java.buildpack.jre.SAPMachineJRE']"
+      JBP_CONFIG_SAP_MACHINE_JRE: '{ use_offline_repository: false, version: 17.+ }'
     build-parameters:
       builder: custom
       commands:

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

@@ -1,22 +1,18 @@
 const { join } = require('path');
 const { exists } = require('../../../cds').utils
 const { copyFiles } = require('../../util/templateUtil')
-const ProjectReader = require('../../util/projectReader');
+const { readProject } = require('../../util/projectReader');
 
 module.exports = class MtaTemplate extends require('../templateBase') {
-    constructor(projectPath, generator) {
-        super(projectPath, generator, __dirname);
-        this.projectReader = new ProjectReader(projectPath);
-    }
 
-    static hasFacet(_, projectPath, options) {
+    static hasFacet(_, options) {
         if (!options?.add.has('mta') && options?.add.has('helm')) return false
-        return exists(join(projectPath, 'mta.yaml'))
+        return exists('mta.yaml')
     }
 
     async run() {
-        const projectDescriptor = await this.projectReader.read()
-        if (!exists(join(this.projectPath, 'mta.yaml'))) {
+        const projectDescriptor = await readProject()
+        if (!exists('mta.yaml')) {
             await copyFiles(join(__dirname, 'files'), this.projectPath, projectDescriptor);
         }
 
@@ -24,8 +20,8 @@ module.exports = class MtaTemplate extends require('../templateBase') {
         const dependentFacets = ['approuter', 'hana', 'xsuaa', 'multitenancy', 'extensibility', 'enterprise-messaging']
         for (const facet of dependentFacets) {
             const Template = require('../'+facet)
-            const template = new Template(this.projectPath, this.generator)
-            if (Template.hasFacet(await this.getEnv(), this.projectPath, this.options)) await template.runDependentMerging()
+            const template = new Template(this.generator)
+            if (Template.hasFacet(await this.getEnv(), this.options)) await template.runDependentMerging()
         }
     }
 }

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

@@ -1,11 +1,6 @@
-const ProjectReader = require('../../util/projectReader')
 const { OPTION_MULTITENANCY, OPTION_TOGGLES, OPTION_EXTENSIBILITY } = require('../../constants')
 
 module.exports = class MtxTemplate extends require('../templateBase') {
-    constructor(projectPath, generator) {
-        super(projectPath, generator, __dirname)
-        this.projectReader = new ProjectReader(projectPath)
-    }
 
     getDependencies() {
         return [OPTION_MULTITENANCY, OPTION_TOGGLES, OPTION_EXTENSIBILITY]

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

@@ -1,21 +1,30 @@
 {
   "name": "cap-mtx-sidecar",
   "dependencies": {
-    "@sap/cds": "^6.3.1",
-    "@sap/cds-mtxs": "^1.3.1",
-    "@sap/hdi-deploy": "^4.5.1",
-    "@sap/xssec": "^3.2.14",
-    "express": "^4.18.2",
-    "hdb": "^0.19.5",
+    "@sap/cds": "^6",
+    "@sap/cds-mtxs": "^1",
+    "@sap/xssec": "^3",
+    "express": "^4",
+    "hdb": "^0",
     "passport": "^0.6.0"
   },
+  "devDependencies": {
+    "sqlite3": "^5"
+  },
   "scripts": {
     "start": "cds run",
     "build": "npm ci && npx -p @sap/cds-dk@^6 cds build ../.. --for mtx-sidecar --production && cd gen && npm ci"
   },
   "cds": {
     "requires": {
-      "db": "sql-mt",
+      "[production]": {
+        "db": "hana-mt",
+        "auth": "xsuaa"
+      },
+      "[development]": {
+        "db": "sqlite",
+        "auth": "dummy"
+      },
       "cds.xt.ModelProviderService": "in-sidecar",
       "cds.xt.DeploymentService": true,
       "cds.xt.SaasProvisioningService": true

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

@@ -15,9 +15,11 @@ modules:
       - name: srv-api # required by consumers of CAP services (e.g. approuter)
         properties:
           srv-url: ${default-url}
+{{#cap.isNodejs}}
       - name: mtx-api # potentially required by approuter
         properties:
           mtx-url: ${default-url}
+{{/cap.isNodejs}}
 
 {{#cap.isJava}}
   - name: {{cap.appName}}-mtx-sidecar
@@ -35,6 +37,11 @@ modules:
       - name: mtx-sidecar
         properties:
           url: ${default-url}
+{{#cap.isJava}}
+      - name: mtx-api # potentially required by approuter
+        properties:
+          mtx-url: ${default-url}
+{{/cap.isJava}}
 {{#cap.hasXsuaa}}
     requires:
       - name: {{cap.appName}}-auth
@@ -69,6 +76,7 @@ resources:
           getDependencies: ~{srv-api/srv-url}/mt/v1.0/subscriptions/dependencies
           onSubscription: ~{srv-api/srv-url}/mt/v1.0/subscriptions/tenants/{tenantId}
 {{/cap.isJava}}
-          onSubscriptionAsync: false
-          onUnSubscriptionAsync: false
-          callbackTimeoutMillis: 300000
+          onSubscriptionAsync: true
+          onUnSubscriptionAsync: true
+          onUpdateDependenciesAsync: true
+          callbackTimeoutMillis: 300000 # Increase if your deployments are taking longer than that

package/lib/init/template/multitenancy/files/saas-registry-secret.yaml

@@ -0,0 +1,9 @@
+apiVersion: v1
+kind: Secret
+metadata:
+  name: "{{ .Release.Name }}-saas-registry-secret"
+  namespace: "{{ .Release.Namespace }}"
+type: Opaque
+stringData:
+  parameters: >
+    {{ include "cap.service-instance.saasRegistryParameters" . }}

package/lib/init/template/multitenancy/files/saas-registry.yaml

@@ -1,17 +1,4 @@
-{{- $srvHostFull := include "cap.deploymentHostFull" (merge (dict "name" "srv" "deployment" .Values.srv) . ) }}
-{{- $defaultAppUrls := dict
-  "getDependencies" (printf "https://%s%s" $srvHostFull .Values.saas_registry.parameters.getDependencies)
-  "onSubscription" (printf "https://%s%s" $srvHostFull .Values.saas_registry.parameters.onSubscription)
-  "onSubscriptionAsync" false
-  "onUnSubscriptionAsync" false
-  "callbackTimeoutMillis" 300000
-}}
-{{- $defaultParameters := dict
-    "xsappname" .Values.xsuaa.parameters.xsappname
-    "appName" .Values.xsuaa.parameters.xsappname
-    "displayName" .Chart.Name
-    "description" .Chart.Description
-    "category" "CAP Application"
-    "appUrls" $defaultAppUrls
-}}
-{{- include "cap.service-instance" (merge (dict "defaultParameters" $defaultParameters ) .) }}
+dependencies:
+  - name: service-instance
+    alias: saas-registry
+    version: 0.1.0

package/lib/init/template/multitenancy/files/service-manager.yaml

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

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

@@ -10,13 +10,19 @@ xsuaa:
   parameters:
     tenant-mode: shared
 {{/cap.hasXsuaa}}
-service_manager:
+service-manager:
   serviceOfferingName: service-manager
   servicePlanName: container
-saas_registry:
+saas-registry:
   serviceOfferingName: saas-registry
   servicePlanName: application
-  parameters:
+saasRegistryParameters:
+  xsappname: {{cap.appName}}
+  appName: {{cap.appName}}
+  displayName: {{cap.appName}}
+  description: {{cap.appDescription}}
+  category: "CAP Application"
+  appUrls:
 {{#cap.isNodejs}}
     getDependencies: "/-/cds/saas-provisioning/dependencies"
     onSubscription: "/-/cds/saas-provisioning/tenant/{tenantId}"
@@ -24,6 +30,12 @@ saas_registry:
 {{#cap.isJava}}
     getDependencies: "/mt/v1.0/subscriptions/dependencies"
     onSubscription: "/mt/v1.0/subscriptions/tenants/{tenantId}"
+{{/cap.isJava}}
+    onSubscriptionAsync: true
+    onUnSubscriptionAsync: true
+    onUpdateDependenciesAsync: true
+    callbackTimeoutMillis: 300000
+{{#cap.isJava}}
 sidecar:
   bindings:
 {{#cap.hasXsuaa}}

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

@@ -1,31 +1,27 @@
 const { join } = require('path')
 const cds = require('../../../cds')
 const { copy, exists } = cds.utils
-const ProjectReader = require('../../util/projectReader')
+const { readProject } = require('../../util/projectReader')
 const { mergeJSON, mergeYAML, sortDependencies } = require('../../util/merge')
 const { copyAndTrack, parseMd5File, writeMd5File } = require('../../util/md5Tracking')
 const {
   srvNode, srvJava, // Server
   mtxSidecar, // Additional Modules
   saasRegistry, serviceManager, xsuaa, // BTP Services
-  providedMtxAPI, srvAPI, providedMtxSidecarAPI, requiredMtxSidecarAPI // APIs
+  providedMtxAPISrv, providedMtxAPISidecar, srvAPI, providedMtxSidecarAPI, requiredMtxSidecarAPI // APIs
 } = require('../_merging/registry-mta');
 
 module.exports = class MultitenancyTemplate extends require('../templateBase') {
-  constructor(projectPath, generator) {
-    super(projectPath, generator, __dirname)
-    this.projectReader = new ProjectReader(projectPath)
-  }
 
-  static hasFacet(env, projectPath, options) {
+  static hasFacet(env, options) {
     // REVISIT: Check if this can be simplified
     return options?.add?.has('mtx') || options?.add?.has('multitenancy') ||
            !!env.requires?.multitenancy || !!env.requires?.db?.multiTenant ||
-           this.isJava && exists(join(projectPath, 'mtx', 'sidecar')) || false
+           this.isJava && exists(join('mtx', 'sidecar')) || false
   }
 
   async run() {
-    const projectDescriptor = await this.projectReader.read(this.options)
+    const projectDescriptor = await readProject(this.options)
     const { for: forProfile, isNodejs, isJava } = projectDescriptor.cap
     if (isNodejs) {
       const packageJSONPath = join(this.projectPath, 'package.json')
@@ -42,7 +38,7 @@ module.exports = class MultitenancyTemplate extends require('../templateBase') {
   }
 
   async runDependentMerging(context = {}) {
-    const projectDescriptor = await this.projectReader.read()
+    const projectDescriptor = await readProject()
     const { isNodejs, isJava, hasMta, hasHelm, hasApprouter, hasXsuaa, hasHana } = projectDescriptor.cap
 
     if (hasMta) {
@@ -50,7 +46,7 @@ module.exports = class MultitenancyTemplate extends require('../templateBase') {
       const srv = isNodejs ? srvNode : srvJava
       const services = [saasRegistry]
       if (hasXsuaa) services.push(xsuaa)
-      const apis = isNodejs ? [providedMtxAPI] : [srvAPI, providedMtxAPI, providedMtxSidecarAPI, requiredMtxSidecarAPI]
+      const apis = isNodejs ? [providedMtxAPISrv] : [srvAPI, providedMtxAPISidecar, providedMtxSidecarAPI, requiredMtxSidecarAPI]
       const additions = [...modules, ...services, ...apis]
 
       const overwrites = hasXsuaa ? [{ item: [xsuaa, 'parameters.config.tenant-mode'], withValue: 'shared'}] : []
@@ -106,6 +102,16 @@ module.exports = class MultitenancyTemplate extends require('../templateBase') {
                 }
               }
             ]
+          },
+          "saas-registry": {
+            parametersFrom: [
+              {
+                secretKeyRef: {
+                  name: "{{ .Release.Name }}-saas-registry-secret",
+                  key: "parameters"
+                }
+              }
+            ]
           }
         },
         projectDescriptor
@@ -114,11 +120,10 @@ module.exports = class MultitenancyTemplate extends require('../templateBase') {
       if (isJava) {
         await mergeYAML(
           join(this.projectPath, 'chart', 'Chart.yaml'),
-          join(__dirname, 'files', 'chart.yaml'),
+          join(__dirname, 'files', 'sidecar.yaml'),
           projectDescriptor,
           {
             additions: [{
-              ref: `web-application-sidecar`,
               in: `dependencies`,
               where: [{
                 property: 'alias',
@@ -129,6 +134,38 @@ module.exports = class MultitenancyTemplate extends require('../templateBase') {
         )
       }
 
+      // copy service-instance chart
+      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', 'saas-registry.yaml'),
+        projectDescriptor,
+        { additions: [{
+            in: `dependencies`,
+            where: [{
+                property: 'alias',
+                isEqualTo: 'saas-registry'
+            }]
+        }]}
+      );
+
+      await mergeYAML(
+        join(this.projectPath, 'chart', 'Chart.yaml'),
+        join(__dirname, 'files', 'service-manager.yaml'),
+        projectDescriptor,
+        { additions: [{
+            in: `dependencies`,
+            where: [{
+                property: 'alias',
+                isEqualTo: 'service-manager'
+            }]
+        }]}
+      );
+
       const mtxsConfigmapPath = isNodejs
                                 ? join(__dirname, 'files', 'mtxs-configmap.yaml')
                                 : join(__dirname, 'files', 'java', 'mtxs-configmap.yaml');
@@ -140,29 +177,25 @@ module.exports = class MultitenancyTemplate extends require('../templateBase') {
         context
       )
 
+      // add saas registry secret
       await copyAndTrack(
-        join(__dirname, 'files', 'service-manager.yaml'),
-        join(this.projectPath, 'chart', 'templates', 'service-manager.yaml'),
+        join(__dirname, 'files', 'saas-registry-secret.yaml'),
+        join(this.projectPath, 'chart', 'templates', 'saas-registry-secret.yaml'),
         context
-      )
+      );
 
-      await copyAndTrack(
-        join(__dirname, 'files', 'saas-registry.yaml'),
-        join(this.projectPath, 'chart', 'templates', 'saas-registry.yaml'),
-        context
-      )
       if (isIndependentCommand) await writeMd5File(join(this.projectPath, 'chart', '.cds-add-helm-files.md5'), context.newTrackingData)
     }
 
     if (hasApprouter) {
       const ApprouterTemplate = require(`../approuter`)
-      const template = new ApprouterTemplate(this.projectPath, this.generator)
+      const template = new ApprouterTemplate(this.generator)
       await template.runDependentMerging(context)
     }
 
     if (hasHana) {
       const HanaTemplate = require(`../hana`)
-      const template = new HanaTemplate(this.projectPath, this.generator)
+      const template = new HanaTemplate(this.generator)
       await template.runDependentMerging(context)
     }
 
@@ -173,7 +206,6 @@ module.exports = class MultitenancyTemplate extends require('../templateBase') {
         projectDescriptor,
         {
           additions: [{
-            ref: 'scope-mtcallback',
             in: 'scopes',
             where: [{ property: 'name', isEqualTo: '$XSAPPNAME.mtcallback' }],
           }]
@@ -182,13 +214,6 @@ module.exports = class MultitenancyTemplate extends require('../templateBase') {
     }
 
     if (hasXsuaa && hasHelm) {
-      // REVISIT: Shared xs-security.json location for Helm and MTA?
-      await copyAndTrack(
-        join(this.projectPath, 'xs-security.json'),
-        join(this.projectPath, 'chart', 'xs-security.json'),
-        context
-      )
-
       await mergeYAML(
           join(this.projectPath, 'chart', 'values.yaml'),
           {

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

@@ -4,10 +4,7 @@ const { COMMAND_ADD, OPTION_JAVA, OPTION_NODEJS, URLS } = require('../../constan
 const { copyFiles } = require('../../util/templateUtil')
 const LOG = console
 
-module.exports = class NodeJSTemplate extends require('../templateBase') {
-    constructor(projectPath, generator) {
-        super(projectPath, generator, __dirname);
-    }
+module.exports = class NodejsTemplate extends require('../templateBase') {
 
     static hasFacet() {
         // TODO: Implement
@@ -31,9 +28,9 @@ module.exports = class NodeJSTemplate extends require('../templateBase') {
         const { projectPath, projectName } = this
         await copyFiles(join(__dirname, 'files'), projectPath, { projectName }, this.options.force)
 
-        await mkdirp(projectPath, env.folders.db);
-        await mkdirp(projectPath, env.folders.srv);
-        await mkdirp(projectPath, env.folders.app);
+        await mkdirp(env.folders.db);
+        await mkdirp(env.folders.srv);
+        await mkdirp(env.folders.app);
     }
 
     async finalize() {

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

@@ -1,9 +1,7 @@
 const term = require('../../../util/term');
 
 module.exports = class NotebookTemplate extends require('../templateBase') {
-    constructor(projectPath, generator) {
-        super(projectPath, generator, __dirname);
-    }
+
 
     async canRun() {
         console.log(term.warn('CAP Jupyter Notebooks have been replaced by Custom CAP Notebooks for VS Code!'));

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

@@ -5,17 +5,14 @@ const { URLS } = require('../../constants')
 const LOG = console
 
 module.exports = class PipelineTemplate extends require('../templateBase') {
-    constructor(projectPath, generator) {
-        super(projectPath, generator, __dirname);
-    }
+
 
     async canRun() {
         if (this.options.force) {
             return true;
         }
 
-        if (exists(join(this.projectPath, 'Jenkinsfile')) ||
-            exists(join(this.projectPath, '.pipeline/config.yml'))) {
+        if (exists('Jenkinsfile') || exists(join('.pipeline', 'config.yml'))) {
             throw new Error(`Pipeline support file exists. Use --force to overwrite.`);
         }