@sap/cds-dk 6.8.3 → 7.0.0

package/lib/init/template/helm/subcharts/web-application/values.schema.json

@@ -668,6 +668,13 @@
                 "allowNamespaceInternal": {
                     "type": "boolean"
                 },
+                "additionalPorts": {
+                    "type": "array",
+                    "default": [],
+                    "items": {
+                        "type": "integer"
+                    }
+                },
                 "ingress": {
                     "type": "array",
                     "default": [],

package/lib/init/template/helm/subcharts/web-application/values.yaml

@@ -106,6 +106,7 @@ expose:
 networkSecurity:
   enabled: true
   # allowNamespaceInternal: true
+  additionalPorts: []
   ingress: []
   #   - namespace: my-namespace
   #     podLabelsSelector:

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

@@ -3,18 +3,18 @@ const { exists } = require('../../../cds').utils
 const { readProject } = require('../../util/projectReader')
 const { mergeYAML } = require('../../util/merge')
 const { copyAndTrack, parseMd5File, writeMd5File } = require('../../util/md5')
-const { OPTION_DESTINATIONS } = require('../../constants')
+const { DESTINATION } = require('../../constants').OPTIONS
 
 module.exports = class Html5RepoTemplate extends require('../templateBase') {
 
 
     getDependencies() {
-        return [OPTION_DESTINATIONS]
+        return [DESTINATION]
     }
 
     async canRun() {
         const projectDescriptor = await readProject(this.options)
-        const { hasMta, hasHelm } = projectDescriptor.cap
+        const { hasMta, hasHelm } = projectDescriptor
         if (!hasHelm && hasMta) {
             throw `'cds add html5-repo' is not available for Cloud Foundry yet`
         }
@@ -31,8 +31,7 @@ module.exports = class Html5RepoTemplate extends require('../templateBase') {
     }
 
     async runDependentMerging(context = {}) {
-        const projectDescriptor = await readProject(this.options)
-        const { appName, hasHelm } = projectDescriptor.cap
+        const { appName, hasHelm } = await readProject(this.options)
 
         if (hasHelm) {
             //in case facet is being added to the already exisiting charts folder

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

@@ -6,10 +6,10 @@ const commandUtil = require('../../../util/command');
 const mvnArchetypeUtil = require('../../util/mvn');
 const term = require('../../../util/term');
 const cds = require('../../../cds')
-const { exists, copy } = cds.utils
+const { exists, copy, rimraf } = cds.utils
 const LOG = console
 
-const { COMMAND_ADD, URLS, OPTION_JAVA, OPTION_NODEJS } = require('../../constants');
+const { COMMAND_ADD, URLS, OPTIONS: { NODEJS, JAVA } } = require('../../constants');
 
 module.exports = class JavaTemplate extends require('../templateBase') {
 
@@ -22,8 +22,8 @@ module.exports = class JavaTemplate extends require('../templateBase') {
             throw new Error(`You can't change the type of an existing project.`);
         }
 
-        if (this.options.add.has(OPTION_NODEJS)) {
-            throw new Error(`Only one runtime per project is supported. Specify either ${OPTION_JAVA} or ${OPTION_NODEJS}.`);
+        if (this.options.add.has(NODEJS)) {
+            throw new Error(`Only one runtime per project is supported. Specify either ${JAVA} or ${NODEJS}.`);
         }
 
         return true;
@@ -48,7 +48,7 @@ module.exports = class JavaTemplate extends require('../templateBase') {
             }
             throw err;
         } finally {
-            await fs.rm(tempFolder, { force: true, recursive: true });
+            await rimraf(tempFolder);
         }
     }
 

package/lib/init/template/kibana-logging/files/mta.yaml.hbs

@@ -1,13 +1,13 @@
 ---
 modules:
-  - name: {{cap.appName}}-srv
-    type: {{cap.language}}
-    path: {{& cap.srvPath}}
+  - name: {{appName}}-srv
+    type: {{language}}
+    path: {{& srvPath}}
     requires:
-      - name: {{cap.appName}}-cf-logging
+      - name: {{appName}}-cf-logging
 
 resources:
-  - name: {{cap.appName}}-cf-logging
+  - name: {{appName}}-cf-logging
     type: org.cloudfoundry.managed-service
     parameters:
       service: application-logs

package/lib/init/template/kibana-logging/files/package.json.hbs

@@ -1,17 +1,17 @@
 {
-  {{#cap.isNodejs}}
+  {{#isNodejs}}
   "cds": {
-  {{/cap.isNodejs}}
+  {{/isNodejs}}
     "features": {
-      {{#cap.for}}
-      "[{{cap.for}}]": {
-      {{/cap.for}}
+      {{#profile}}
+      "[{{profile}}]": {
+      {{/profile}}
         "kibana_formatter": true
-      {{#cap.for}}
+      {{#profile}}
       }
-      {{/cap.for}}
+      {{/profile}}
     }
-  {{#cap.isNodejs}}
+  {{#isNodejs}}
   }
-  {{/cap.isNodejs}}
+  {{/isNodejs}}
 }

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

@@ -7,8 +7,7 @@ const { srvNode4, srvJava4, kibanaLogging } = require('../_merging/registry-mta'
 module.exports = class KibanaLoggingTemplate extends require('../templateBase') {
 
     async canRun() {
-        const projectDescriptor = await readProject(this.options)
-        const { hasMta, hasHelm } = projectDescriptor.cap
+        const { hasMta, hasHelm } = await readProject(this.options)
         if (hasHelm && !hasMta) {
             throw `'cds add kibana-logging' is not available for Kyma yet`
         }
@@ -17,7 +16,7 @@ module.exports = class KibanaLoggingTemplate extends require('../templateBase')
 
     async run() {
         const projectDescriptor = await readProject(this.options)
-        const { isJava } = projectDescriptor.cap
+        const { isJava } = projectDescriptor
         if (isJava) cds.error(`kibana-logging is not implemented for project type Java yet`)
         await mergeJSON('package.json', join(__dirname, 'files', 'package.json.hbs'), projectDescriptor)
         await this.runDependentMerging()
@@ -25,7 +24,7 @@ module.exports = class KibanaLoggingTemplate extends require('../templateBase')
 
     async runDependentMerging() {
         const projectDescriptor = await readProject(this.options)
-        const { hasMta, isNodejs, srvPath } = projectDescriptor.cap
+        const { hasMta, isNodejs, srvPath } = projectDescriptor
 
         if (hasMta) {
             const srv = (isNodejs ? srvNode4 : srvJava4)(srvPath)

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

@@ -6,7 +6,7 @@ const checks = require("../../../lint/checks");
 const io = require("../../../lint/io");
 const readline = require("readline");
 const { copyFiles } = require('../../util/template')
-const { OPTION_LINT_DEV, OPTION_LINT_GLOBAL } = require("../../constants");
+const { LINT_DEV, LINT_GLOBAL } = require("../../constants").OPTIONS;
 const { getConfigPath, getFileExtensions } = require("@sap/eslint-plugin-cds/lib/api");
 const cds = require("../../../cds");
 const { mkdirp, exists } = cds.utils;
@@ -35,10 +35,10 @@ module.exports = class LintTemplate extends require('../templateBase') {
     if (this.options.lint) {
       // If custom rule example is requested, also trigger
       // "custom" rule type of setup
-      if (this.options.lint.has(OPTION_LINT_DEV)) {
+      if (this.options.lint.has(LINT_DEV)) {
         this.customRuleExample = true;
       }
-      if (this.options.lint.has(OPTION_LINT_GLOBAL)) {
+      if (this.options.lint.has(LINT_GLOBAL)) {
         this.lintType = "global";
       }
     }

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

@@ -1,28 +1,28 @@
 ---
 _schema-version: '3.1'
-ID: {{cap.appId}}
-version: {{cap.appVersion}}
-description: "{{cap.appDescription}}"
+ID: {{appId}}
+version: {{appVersion}}
+description: "{{appDescription}}"
 parameters:
   enable-parallel-deployments: true
-{{#cap.isNodejs}}
+{{#isNodejs}}
 build-parameters:
   before-all:
     - builder: custom
       commands:
-        - npx -p @sap/cds-dk cds build --production
-{{/cap.isNodejs}}
+        - npx cds build --production
+{{/isNodejs}}
 modules:
-  - name: {{cap.appName}}-srv
-    type: {{cap.language}}
-    path: {{& cap.srvPath}}
-{{#cap.isNodejs}}
+  - name: {{appName}}-srv
+    type: {{language}}
+    path: {{& srvPath}}
+{{#isNodejs}}
     parameters:
       buildpack: nodejs_buildpack
     build-parameters:
-      builder: npm-ci
-{{/cap.isNodejs}}
-{{#cap.isJava}}
+      builder: npm
+{{/isNodejs}}
+{{#isJava}}
     parameters:
       buildpack: sap_java_buildpack
     properties:
@@ -34,7 +34,7 @@ modules:
       commands:
         - mvn clean package -DskipTests=true
       build-result: target/*-exec.jar
-{{/cap.isJava}}
+{{/isJava}}
     provides:
       - name: srv-api # required by consumers of CAP services (e.g. approuter)
         properties:

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

@@ -0,0 +1,5 @@
+{
+  "devDependencies": {
+    "@sap/cds-dk": "^7"
+  }
+}

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

@@ -1,8 +1,9 @@
-const { join } = require('path');
+const { join } = require('path')
 const cds = require('../../../cds')
 const { exists } = cds.utils
-const { copyFiles } = require('../../util/template')
-const { readProject } = require('../../util/projectReader');
+const { copyRenderedYAML } = require('../../../util/fs')
+const { readProject } = require('../../util/projectReader')
+const { mergeJSON, sort } = require('../../util/merge')
 
 module.exports = class MtaTemplate extends require('../templateBase') {
 
@@ -11,18 +12,16 @@ module.exports = class MtaTemplate extends require('../templateBase') {
         return exists('mta.yaml')
     }
 
+    getRelatedFacets() {
+        return ['approuter', 'xsuaa', 'multitenancy', 'hana', 'extensibility', 'enterprise-messaging', 'enterprise-messaging-shared', 'redis-messaging', 'connectivity', 'destination']
+    }
+
     async run() {
-        const projectDescriptor = await readProject()
+        const project = await readProject(this.options)
         if (!exists('mta.yaml')) {
-            await copyFiles(join(__dirname, 'files'), cds.root, projectDescriptor);
-        }
-
-        // Re-applying the dependent merging part of other facets if necessary.
-        const dependentFacets = ['approuter', 'hana', 'xsuaa', 'multitenancy', 'extensibility', 'enterprise-messaging', 'enterprise-messaging-shared', 'redis-messaging']
-        for (const facet of dependentFacets) {
-            const Template = require('../'+facet)
-            const template = new Template(this.generator)
-            if (Template.hasFacet(await this.getEnv(), this.options)) await template.runDependentMerging()
+            await copyRenderedYAML(join(__dirname, 'files', 'mta.yaml.hbs'), 'mta.yaml', project)
         }
+        await mergeJSON('package.json', join(__dirname, 'files', 'package.json'))
+        await sort('package.json', 'devDependencies')
     }
 }

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

@@ -1,8 +1,8 @@
-const { OPTION_MULTITENANCY, OPTION_TOGGLES, OPTION_EXTENSIBILITY } = require('../../constants')
+const { MULTITENANCY, TOGGLES, EXTENSIBILITY } = require('../../constants').OPTIONS
 
 module.exports = class MtxTemplate extends require('../templateBase') {
 
     getDependencies() {
-        return [OPTION_MULTITENANCY, OPTION_TOGGLES, OPTION_EXTENSIBILITY]
+        return [MULTITENANCY, TOGGLES, EXTENSIBILITY]
     }
 }

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

@@ -1,35 +1,37 @@
 ---
 modules:
-  - name: {{cap.appName}}-srv
-    type: {{cap.language}}
-    path: {{& cap.srvPath}}
+  - name: {{appName}}-srv
+    type: {{language}}
+    path: {{& srvPath}}
     requires:
-      - name: {{cap.appName}}-registry
-        {{#cap.isJava}}
+      - name: {{appName}}-registry
+        {{#isJava}}
       - name: mtx-api
         properties:
           CDS_MULTITENANCY_MTXS_ENABLED: true
           CDS_MULTITENANCY_SIDECAR_URL: ~{mtx-url}
-        {{/cap.isJava}}
+        {{/isJava}}
     provides:
       - name: srv-api # required by consumers of CAP services (e.g. approuter)
         properties:
           srv-url: ${default-url}
 
-  - name: {{cap.appName}}-mtx
+  - name: {{appName}}-mtx
     type: nodejs
-    path: {{#cap.isNodejs}}gen/{{/cap.isNodejs}}mtx/sidecar
-    {{#cap.isNodejs}}
+    path: {{#isNodejs}}gen/{{/isNodejs}}mtx/sidecar
+    {{#isNodejs}}
     build-parameters:
       builder: npm-ci
-    {{/cap.isNodejs}}
-    {{#cap.isJava}}
+    {{/isNodejs}}
+    {{#isJava}}
     build-parameters:
       builder: custom
       build-result: gen
       commands:
         - npm run build
-    {{/cap.isJava}}
+      requires:
+        []
+    {{/isJava}}
     parameters:
       memory: 256M
       disk-quota: 512M
@@ -37,39 +39,39 @@ modules:
       - name: mtx-api
         properties:
           mtx-url: ${default-url}
-    {{#cap.hasXsuaa}}
+    {{#hasXsuaa}}
     requires:
-      - name: {{cap.appName}}-auth
-    {{/cap.hasXsuaa}}
+      - name: {{appName}}-auth
+    {{/hasXsuaa}}
 
 resources:
-  - name: {{cap.appName}}-registry
+  - name: {{appName}}-registry
     type: org.cloudfoundry.managed-service
     requires:
-    {{#cap.isNodejs}}
+    {{#isNodejs}}
       - name: mtx-api
-    {{/cap.isNodejs}}
-    {{#cap.isJava}}
+    {{/isNodejs}}
+    {{#isJava}}
       - name: srv-api
-    {{/cap.isJava}}
+    {{/isJava}}
     parameters:
       service: saas-registry
       service-plan: application
       config:
-        xsappname: {{cap.appName}}-${org}-${space}
-        appName: {{cap.appName}}-${org}-${space}
-        displayName: {{cap.appName}}
+        xsappname: {{appName}}-${org}-${space}
+        appName: {{appName}}-${org}-${space}
+        displayName: {{appName}}
         description: A simple CAP project.
         category: 'Category'
         appUrls:
-          {{#cap.isNodejs}}
+          {{#isNodejs}}
           getDependencies: ~{mtx-api/mtx-url}/-/cds/saas-provisioning/dependencies
           onSubscription: ~{mtx-api/mtx-url}/-/cds/saas-provisioning/tenant/{tenantId}
-          {{/cap.isNodejs}}
-          {{#cap.isJava}}
+          {{/isNodejs}}
+          {{#isJava}}
           getDependencies: ~{srv-api/srv-url}/mt/v1.0/subscriptions/dependencies
           onSubscription: ~{srv-api/srv-url}/mt/v1.0/subscriptions/tenants/{tenantId}
-          {{/cap.isJava}}
+          {{/isJava}}
           onSubscriptionAsync: true
           onUnSubscriptionAsync: true
           onUpdateDependenciesAsync: true

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

@@ -1,29 +1,32 @@
 {
-  {{#cap.isNodejs}}
+  {{#isNodejs}}
   "dependencies": {
-    "@sap/cds-mtxs": "^1"
+    "@sap/cds-mtxs": "^1.9"
   },
+  {{#cap.isJava}}
+  "workspaces": [ "mtx/sidecar" ],
+  {{/cap.isJava}}
   "cds": {
-  {{/cap.isNodejs}}
-    {{#cap.isJava}}
+  {{/isNodejs}}
+    {{#isJava}}
     "profiles": ["with-mtx-sidecar", "java"],
     "build": {
       "target": "."
     },
-    {{/cap.isJava}}
-    {{#cap.isNodejs}}
+    {{/isJava}}
+    {{#isNodejs}}
     "profile": "with-mtx-sidecar",
-    {{/cap.isNodejs}}
+    {{/isNodejs}}
     "requires": {
-      {{#cap.for}}
-      "[{{cap.for}}]": {
-      {{/cap.for}}
+      {{#profile}}
+      "[{{profile}}]": {
+      {{/profile}}
         "multitenancy": true
-      {{#cap.for}}
+      {{#profile}}
       }
-      {{/cap.for}}
+      {{/profile}}
     }
-  {{#cap.isNodejs}}
+  {{#isNodejs}}
   }
-  {{/cap.isNodejs}}
+  {{/isNodejs}}
 }

package/lib/init/template/multitenancy/files/package.sidecar.json.hbs

@@ -1,19 +1,19 @@
 {
-  "name": "{{cap.appName}}-mtx",
+  "name": "{{appName}}-mtx",
   "dependencies": {
-    "@sap/cds": "^6",
-    "@sap/cds-mtxs": "^1",
+    "@sap/cds": "^7",
+    "@sap/cds-hana": "^2",
+    "@sap/cds-mtxs": "^1.9",
     "@sap/xssec": "^3",
     "express": "^4",
-    "hdb": "^0",
-    "passport": "^0.6.0"
+    "passport": ">=0.6.0"
   },
   "devDependencies": {
     "sqlite3": "^5"
   },
   "scripts": {
-    "start": "cds-serve"{{#cap.isJava}},
-    "build": "npm ci && npx -p @sap/cds-dk@^6 cds build ../.. --for mtx-sidecar --production && cd gen && npm ci"{{/cap.isJava}}
+    "start": "cds-serve"{{#isJava}},
+    "build": "cds build ../.. --for mtx-sidecar --production && cd gen && npm ci"{{/isJava}}
   },
   "cds": {
     "profile": "mtx-sidecar"

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

@@ -1,17 +1,17 @@
 ---
 srv:
   bindings:
-    {{#cap.isJava}}
+    {{#isJava}}
     saas-registry:
       serviceInstanceName: saas-registry
-    {{/cap.isJava}}
+    {{/isJava}}
     service-manager:
       serviceInstanceName: service-manager
-{{#cap.hasXsuaa}}
+{{#hasXsuaa}}
 xsuaa:
   parameters:
     tenant-mode: shared
-{{/cap.hasXsuaa}}
+{{/hasXsuaa}}
 service-manager:
   serviceOfferingName: service-manager
   servicePlanName: container
@@ -19,41 +19,41 @@ saas-registry:
   serviceOfferingName: saas-registry
   servicePlanName: application
 saasRegistryParameters:
-  xsappname: {{cap.appName}}
-  appName: {{cap.appName}}
-  displayName: {{cap.appName}}
-  description: {{cap.appDescription}}
+  xsappname: {{appName}}
+  appName: {{appName}}
+  displayName: {{appName}}
+  description: {{appDescription}}
   category: "CAP Application"
-{{#cap.isNodejs}}
+{{#isNodejs}}
   bindSidecar: true
-{{/cap.isNodejs}}
+{{/isNodejs}}
   appUrls:
-    {{#cap.isNodejs}}
+    {{#isNodejs}}
     getDependencies: "/-/cds/saas-provisioning/dependencies"
     onSubscription: "/-/cds/saas-provisioning/tenant/{tenantId}"
-    {{/cap.isNodejs}}
-    {{#cap.isJava}}
+    {{/isNodejs}}
+    {{#isJava}}
     getDependencies: "/mt/v1.0/subscriptions/dependencies"
     onSubscription: "/mt/v1.0/subscriptions/tenants/{tenantId}"
-    {{/cap.isJava}}
+    {{/isJava}}
     onSubscriptionAsync: true
     onUnSubscriptionAsync: true
     onUpdateDependenciesAsync: true
     callbackTimeoutMillis: 300000
 sidecar:
   bindings:
-    {{#cap.hasXsuaa}}
+    {{#hasXsuaa}}
     auth:
       serviceInstanceName: xsuaa
-    {{/cap.hasXsuaa}}
-    {{#cap.isNodejs}}
+    {{/hasXsuaa}}
+    {{#isNodejs}}
     saas-registry:
       serviceInstanceName: saas-registry
-    {{/cap.isNodejs}}
+    {{/isNodejs}}
     service-manager:
       serviceInstanceName: service-manager
   image:
-    repository: <your-container-registry>/{{cap.appName}}-sidecar
+    repository: <your-container-registry>/{{appName}}-sidecar
     tag: latest
   resources:
     limits:

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

@@ -2,7 +2,7 @@ const { join } = require('path')
 const cds = require('../../../cds')
 const { exists } = cds.utils
 const { readProject } = require('../../util/projectReader')
-const { mergeJSON, mergeYAML, sortDependencies } = require('../../util/merge')
+const { mergeJSON, mergeYAML, sort } = require('../../util/merge')
 const { copyAndTrack, parseMd5File, writeMd5File } = require('../../util/md5')
 const { copyRenderedJSON } = require('../../../util/fs')
 const {
@@ -21,18 +21,22 @@ module.exports = class MultitenancyTemplate extends require('../templateBase') {
            exists(join('mtx', 'sidecar')) || false
   }
 
+  getRelatedFacets() {
+    return ['approuter', 'hana']
+  }
+
   async run() {
     const projectDescriptor = await readProject(this.options)
-    const { isNodejs, configFile } = projectDescriptor.cap
+    const { isNodejs, configFile } = projectDescriptor
     await mergeJSON(configFile, join(__dirname, 'files', `package.json.hbs`), projectDescriptor)
-    if (isNodejs) await sortDependencies('package.json')
+    if (isNodejs) await sort('package.json', 'dependencies')
     await copyRenderedJSON(join(__dirname, 'files', 'package.sidecar.json.hbs'), join('mtx', 'sidecar', 'package.json'), projectDescriptor)
     await this.runDependentMerging()
   }
 
   async runDependentMerging(context = {}) {
     const projectDescriptor = await readProject(this.options)
-    const { isNodejs, isJava, hasMta, hasHelm, hasApprouter, hasXsuaa, hasHana, srvPath } = projectDescriptor.cap
+    const { isNodejs, isJava, hasMta, hasHelm, hasXsuaa, hasHana, srvPath } = projectDescriptor
 
     if (hasMta) {
       const srv = (isNodejs ? srvNode4 : srvJava4)(srvPath)
@@ -50,6 +54,12 @@ module.exports = class MultitenancyTemplate extends require('../templateBase') {
         insert: [saasRegistry, 'name'],
         into: [isJava ? srv : mtxSidecar, 'requires', 'name']
       }]
+      if (isJava) {
+        relationships.push({
+          insert: [srv, 'name'],
+          into: [mtxSidecar, 'build-parameters.requires', 'name']
+        })
+      }
       if (hasXsuaa) {
         relationships.push({
           insert: [xsuaa, 'name'],
@@ -142,18 +152,6 @@ module.exports = class MultitenancyTemplate extends require('../templateBase') {
       if (isIndependentCommand) await writeMd5File(join('chart', '.cds-add-helm-files.md5'), context.newTrackingData)
     }
 
-    if (hasApprouter) {
-      const ApprouterTemplate = require(`../approuter`)
-      const template = new ApprouterTemplate(this.generator)
-      await template.runDependentMerging(context)
-    }
-
-    if (hasHana) {
-      const HanaTemplate = require(`../hana`)
-      const template = new HanaTemplate(this.generator)
-      await template.runDependentMerging(context)
-    }
-
     if (hasXsuaa) {
       await mergeJSON(
         'xs-security.json',

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

@@ -6,7 +6,7 @@
   "license": "UNLICENSED",
   "private": true,
   "dependencies": {
-    "@sap/cds": "^6",
+    "@sap/cds": "^7",
     "express": "^4"
   },
   "devDependencies": {