@sap/cds-dk 4.7.3 → 4.8.0

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

@@ -1,6 +1,6 @@
 const path = require('path')
 const TemplateBase = require('../templateBase');
-const ProjectReader = require('../mta/projectReader')
+const ProjectReader = require('../../util/projectReader');
 
 const { OPTION_CF_MANIFEST } = require('../../constants')
 const MANIFEST = 'manifest'

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

@@ -0,0 +1,42 @@
+---
+modules:
+  - name: {{cap.appName}}-srv
+    type: {{cap.pLanguage}}
+    requires:
+      - name: {{cap.appName}}-db
+
+{{^cap.isMultitenant}}
+  - name: {{cap.appName}}-db-deployer
+    type: hdb
+    path: {{& cap.db.0.path}}
+    parameters:
+      buildpack: nodejs_buildpack
+    requires:
+      - name: {{cap.appName}}-db
+{{/cap.isMultitenant}}
+
+{{#cap.hasRequires}}
+resources:
+{{#cap.requires}}
+{{#resource.isHana}}
+ - name: {{cap.appName}}-db
+{{#resource.isPlainHana}}
+   type: com.sap.xs.hdi-container
+   parameters:
+     service: {{resource.service}} # or 'hanatrial' on trial landscapes
+{{/resource.isPlainHana}}
+{{#resource.isManagedHana}} {{! enable automatic switching to 'hanatrial' on trial accounts}}
+   type: org.cloudfoundry.managed-service
+   parameters:
+     service: {{resource.service}}
+{{/resource.isManagedHana}}
+     service-plan: {{resource.vcap.plan}}
+{{#resource.vcap.name}}
+     service-name: {{resource.vcap.name}}
+{{/resource.vcap.name}}
+   properties:
+     hdi-service-name: ${service-name}
+{{/resource.isHana}}
+
+{{/cap.requires}}
+{{/cap.hasRequires}}

package/lib/init/template/hana/files/nodejs/dependencies.package.json

@@ -0,0 +1,5 @@
+{
+    "dependencies": {
+        "hdb": "^0.18.3"
+    }
+}

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

@@ -1,34 +1,22 @@
 const path = require('path');
 
+const { fse } = require('@sap/cds-foss');
+
 const commandUtil = require('../../util/commandUtil');
 const mvnArchetypes = require('../../util/mvnArchetypeUtil');
 const term = require('../../../util/term');
+const ProjectReader = require('../../util/projectReader');
 
 const TemplateBase = require('../templateBase');
 
 const { PROJECT_TYPE, OPTION_JAVA, KIND_SQL, URLS, KIND_HANA } = require('../../constants');
 const { nullLogger } = require('../../util/logger');
-
+const { srvNode, srvJava, hdbDeployer, serviceManager, hdiContainer } = require('../_merging/existences');
 
 module.exports = class HanaTemplate extends TemplateBase {
     constructor(projectPath, generator) {
         super(projectPath, generator, __dirname);
-    }
-
-    async checkEnabled() {
-        if (this.options.force) {
-            return true;
-        }
-
-        const env = await this.getEnv();
-
-        await Promise.all(['src/.hdiconfig', 'undeploy.json'].map(async(filePath) => {
-            if (await this.fsUtil.pathExists(path.join(this.projectPath, env.folders.db, filePath))) {
-                throw new Error(`File ${path.join(env.folders.db, filePath)} already exists. Use --force to overwrite.`);
-            }
-        }))
-
-        return true;
+        this.projectReader = new ProjectReader(this);
     }
 
     // read env from project
@@ -42,28 +30,69 @@ module.exports = class HanaTemplate extends TemplateBase {
         }
     }
 
+    async runMTAMerging() {
+        const projectDescriptor = await this.projectReader.read(this.options);
+
+        const mtaYAMLPath = path.join(this.projectPath, 'mta.yaml');
+        if (!fse.existsSync(mtaYAMLPath)) {
+            console.warn(`There is no MTA file in your project. Run \`cds add mta\` to add an MTA file or create the HANA services yourself.`)
+            return;
+        }
+        const srv = projectDescriptor.cap.isNodejs ? srvNode : srvJava
+        const deployer = projectDescriptor.cap.isMultitenant ? null : hdbDeployer
+        const db = projectDescriptor.cap.isMultitenant ? serviceManager : hdiContainer
+        await this.templateUtil.mergeYAML(
+            mtaYAMLPath,
+            `${__dirname}/files/mta.yaml.hbs`,
+            projectDescriptor,
+            {
+                existences: [srv, deployer, db],
+                relationships: [{
+                    in: srv.ref,
+                    inKeyPath: ["requires"],
+                    into: "name",
+                    existences: [db.ref],
+                    existenceKeyPath: ["name"],
+                },
+                !projectDescriptor.cap.isMultitenant && projectDescriptor.cap.isNodejs ?
+                {
+                    in: deployer.ref,
+                    inKeyPath: ["requires"],
+                    into: "name",
+                    existences: [db.ref],
+                    existenceKeyPath: ["name"],
+                } : null],
+            }
+        );
+    }
+
     async run() {
         const env = await this.getEnv();
 
-        await this.templateUtil.copyFiles('common', path.join(this.projectPath, env.folders.db), {
-            projectName: this.projectName
-        }, this.options.force);
+        const hdiConfigPath = path.join(this.projectPath, env.folders.db, 'src', '.hdiconfig');
+        const hdiConfigTemplatePath = path.join(__dirname, 'files', 'common', 'src', '.hdiconfig');
+        await this.templateUtil.mergeJSON(hdiConfigPath, hdiConfigTemplatePath);
+
+        const undeployJSONPath = path.join(this.projectPath, env.folders.db, 'undeploy.json');
+        const undeployJSONTemplatePath = path.join(__dirname, 'files', 'common', 'undeploy.json');
+        await this.templateUtil.mergeJSON(undeployJSONPath, undeployJSONTemplatePath);
 
-        const cdsrcJsonPath = path.join(this.projectPath, '.cdsrc.json');
         const projectType = await this.getProjectType();
         switch (projectType) {
-            case PROJECT_TYPE.java:
+            case PROJECT_TYPE.java: {
                 await this.templateUtil.copyFiles('java', path.join(this.projectPath, env.folders.db), {}, this.options.force);
                 await this._updatePomXml();
+                const cdsrcJsonPath = path.join(this.projectPath, '.cdsrc.json');
                 await this._updateCdsrcJson(cdsrcJsonPath, env.folders.db, env);
                 break;
-
+            }
             case PROJECT_TYPE.nodejs:
                 await this._updatePackageJson(path.join(this.projectPath, 'package.json'), env.folders.db, env);
                 break;
 
             default: break;
         }
+        await this.runMTAMerging()
     }
 
     async _updatePomXml() {
@@ -158,6 +187,6 @@ module.exports = class HanaTemplate extends TemplateBase {
     }
 
     _isUsingHana(db, env) {
-        return env.get(`requires.${db}.kind`) === KIND_HANA || env.get(`requires.${db}.dialect`) === KIND_HANA || env.get(`requires.${db}.use`) === KIND_HANA;
+        return [`kind`, `dialect`, `use`].map(p => env.get(`requires.${db}.${p}`)).includes(KIND_HANA)
     }
 }

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

@@ -9,7 +9,7 @@ const mvnArchetypeUtil = require('../../util/mvnArchetypeUtil');
 const term = require('../../../util/term');
 
 const TemplateBase = require('../templateBase');
-const { COMMAND_ADD, URLS, OPTION_JAVA, OPTION_NODEJS, OPTION_MTX } = require('../../constants');
+const { COMMAND_ADD, URLS, OPTION_JAVA, OPTION_NODEJS } = require('../../constants');
 const { nullLogger } = require('../../util/logger');
 
 
@@ -27,10 +27,6 @@ module.exports = class JavaTemplate extends TemplateBase {
             throw new Error(`Only one runtime per project is supported. Specify either ${OPTION_JAVA} or ${OPTION_NODEJS}.`);
         }
 
-        if (this.options.add.has(OPTION_MTX)) {
-            throw new Error(`The '${OPTION_MTX}' option can only be used for Node.js projects as of yet.`);
-        }
-
         return true;
     }
 

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

@@ -1,239 +1,43 @@
-## Generated mta.yaml based on template version 0.4.0
-## appName = {{cap.appName}}
-## language={{cap.pLanguage}}; multitenant={{cap.isMultitenant}}
-## approuter={{ui.approuter}}
+---
 _schema-version: '3.1'
 ID: {{cap.appId}}
 version: {{cap.appVersion}}
 description: "{{cap.appDescription}}"
 parameters:
   enable-parallel-deployments: true
-  {{#ui.approuter}}tenant-delimiter: "{{ui.tenantDelimiter}}" {{/ui.approuter}} {{~! ui.* context is an experimental feature }}
 build-parameters:
   before-all:
-   - builder: custom
-     commands:
+    - builder: custom
+      commands:
 {{#cap.isNodejs}}
-      - npm ci
+        - npm ci
 {{/cap.isNodejs}}
 {{#cap.isJava}}
-      - npm install --production
+        - npm install --production
 {{/cap.isJava}}
-      - npx -p @sap/cds-dk cds build --production
+        - npx -p @sap/cds-dk cds build --production
 
-{{! This template creates one or two deployable modules:
-    Java project, non-multitenant:    Java server module + Node.js hdi deployer module
-    Java project, multitenant:        Java server module + Node.js cds-mtx module
-    Node.js project, non-multitenant: Node.js server module + Node.js hdi deployer module
-    Node.js project, multitenant:     Node.js server module including cds-mtx }}
 modules:
- # --------------------- SERVER MODULE ------------------------
- - name: {{cap.appName}}-srv
- # ------------------------------------------------------------
-   type: {{cap.pLanguage}}
-   path: {{& cap.srv.path}}
+  - name: {{cap.appName}}-srv
+    type: {{cap.pLanguage}}
+    path: {{& cap.srv.path}}
 {{#cap.isNodejs}}
-   parameters:
-     buildpack: nodejs_buildpack
-   build-parameters:
-     builder: npm-ci
+    parameters:
+      buildpack: nodejs_buildpack
+    build-parameters:
+      builder: npm-ci
 {{/cap.isNodejs}}
 {{#cap.isJava}}
-   parameters:
-     buildpack: java_buildpack
+    parameters:
+      buildpack: java_buildpack
+    properties:
+      SPRING_PROFILES_ACTIVE: cloud
+    build-parameters:
+      builder: custom
+      commands: [ mvn clean package ]
+      build-result: "target/*-exec.[wj]ar"
 {{/cap.isJava}}
-{{#cap.isJava}}
-{{#cap.isMultitenant}}
-   properties:
-     SPRING_PROFILES_ACTIVE: cloud
-{{/cap.isMultitenant}}
-{{^cap.isMultitenant}}
-   properties:
-     SPRING_PROFILES_ACTIVE: cloud
-{{/cap.isMultitenant}}
-   build-parameters:
-     builder: custom
-     commands: [ mvn clean package ]
-     build-result: "target/*-exec.[wj]ar"
-{{/cap.isJava}}
-{{#cap.hasRequires}}
-   requires:
-{{#cap.isJava}}
-{{#cap.isMultitenant}}
-    - name: mtx-api      # mtx sidecar binding
-      properties:
-        CDS_MTX_SDC_URL: ~{mtx-url}
-{{/cap.isMultitenant}}
-{{/cap.isJava}}
-    # Resources extracted from CAP configuration
-{{#cap.requires}}
-    - name: {{resource.name}}
-{{#cap.isJava}}
-{{/cap.isJava}}
-{{/cap.requires}}
-{{#cap.isMultitenant}}
-{{#cap.isNodejs}}
-    - name: {{cap.appName}}-registry
-{{/cap.isNodejs}}
-{{/cap.isMultitenant}}
-{{/cap.hasRequires}}
-   provides:
-    - name: srv-api      # required by consumers of CAP services (e.g. approuter)
-      properties:
-        srv-url: ${default-url}
-{{#cap.isNodejs}}
-{{#cap.isMultitenant}}
-    - name: mtx-api      # potentially required by approuter
-      properties:
-        mtx-url: ${default-url}
-{{/cap.isMultitenant}}
-{{/cap.isNodejs}}
-
-{{#cap.needsSidecar}}
- # -------------------- SIDECAR MODULE ------------------------
- - name: {{cap.appName}}-{{cap.db.0.name}}-deployer
- # ------------------------------------------------------------
-{{#cap.isMultitenant}}
-   type: nodejs
-{{/cap.isMultitenant}}
-{{^cap.isMultitenant}}
-   type: hdb
-{{/cap.isMultitenant}}
-   path: {{& cap.db.0.path}}  {{! Only consider one module for now }}
-   parameters:
-     buildpack: nodejs_buildpack
-{{#cap.hasRequires}}
-   requires:
-    # 'hana' and 'xsuaa' resources extracted from CAP configuration
-{{#cap.requires}}
-{{#resource.isHana}}
-    - name: {{resource.name}}
-{{/resource.isHana}}
-{{#resource.isXsuaa}}
-    - name: {{resource.name}}
-{{/resource.isXsuaa}}
-{{/cap.requires}}
-{{/cap.hasRequires}}
-{{#cap.isJava}}
-{{#cap.isMultitenant}}
-   provides:
-    - name: mtx-api      # required by java server and potentially approuter
-      properties:
-        mtx-url: ${default-url}
-{{/cap.isMultitenant}}
-{{/cap.isJava}}
-{{/cap.needsSidecar}}
-
-{{#ui.approuter}}
- # ---------------------- APPROUTER ---------------------------
- - name: {{cap.appName}}
- # ------------------------------------------------------------
-   type: approuter.nodejs
-   path: {{& ui.appPath}}     # from cds.env.folders. Consider also cds.env.build.target --> gen/app
-   parameters:
-     disk-quota: 256M        # default in Web IDE
-     memory: 256M            # default in Web IDE
-     hosts:                  # additional tenant specific hostnames (only for Canary)
-      ## the developer will do this via an extension descriptor:
-      # - <paas-subdomain >${tenant-delimiter}${host}
-      # - <saas-subdomain1>${tenant-delimiter}${host}
-      # - ...
-   properties:
-     TENANT_HOST_PATTERN: ^(.*)${tenant-delimiter}${default-uri}  # only relevant for multiTenant
-   requires:
-    - name: uaa              # binding to uaa
-    - name: srv-api      # binding to srv module
-      group: destinations
-      properties:
-        name: srv-api        # this is a name which must be used in xs-app.json as well !!!
-        url: ~{srv-url}
-        forwardAuthToken: true
-    - name: mtx-api      # in here always, but really used only if mtx client is used (our recommendation is that they contact cds-mtx via the approuter)
-      group: destinations
-      properties:
-        name: mtx-api        # this is a name which must be used in xs-app.json as well !!!
-        url: ~{mtx-url}
-{{/ui.approuter}}
-
-{{#cap.hasRequires}}
-resources:
- # services extracted from CAP configuration
- # 'service-plan' can be configured via 'cds.requires.<name>.vcap.plan'
-{{#cap.requires}}
-# ------------------------------------------------------------
- - name: {{resource.name}}
-# ------------------------------------------------------------
-{{#resource.isHana}}
-{{#resource.isPlainHana}}
-   type: com.sap.xs.hdi-container
-   parameters:
-     service: {{resource.service}}  # or 'hanatrial' on trial landscapes
-{{/resource.isPlainHana}}
-{{#resource.isManagedHana}} {{! enable automatic switching to 'hanatrial' on trial accounts}}
-   type: org.cloudfoundry.managed-service
-   parameters:
-     service: {{resource.service}}
-{{/resource.isManagedHana}}
-     service-plan: {{resource.vcap.plan}}
-{{#resource.vcap.name}}
-     service-name: {{resource.vcap.name}}
-{{/resource.vcap.name}}
-   properties:
-     hdi-service-name: ${service-name}
-{{/resource.isHana}}
-{{^resource.isHana}}
-   type: org.cloudfoundry.managed-service
-   parameters:
-{{#resource.isXsuaa}}
-     service: xsuaa
-     service-plan: application  {{! This logic might be added to transformation coding. There are cases with two xsuaa}}
-{{#cap.isMultitenant}}
-     path: ./xs-security.json
-{{/cap.isMultitenant}}
-{{#resource.vcap.name}}
-     service-name: {{resource.vcap.name}}
-{{/resource.vcap.name}}
-     config:
-       xsappname: {{cap.appName}}-${space}    #  name + space dependency
-       tenant-mode: {{#cap.isMultitenant}}shared{{/cap.isMultitenant}}{{^cap.isMultitenant}}dedicated{{/cap.isMultitenant}}
-{{/resource.isXsuaa}}
-{{^resource.isXsuaa}}
-     service: {{resource.service}}
-     service-plan: {{resource.vcap.plan}}
-{{#resource.vcap.name}}
-     service-name: {{resource.vcap.name}}
-{{/resource.vcap.name}}
-{{/resource.isXsuaa}}
-{{/resource.isHana}}
-{{/cap.requires}}
-{{/cap.hasRequires}}
-
-{{#cap.isMultitenant}}
-{{#cap.isNodejs}}
- - name: {{cap.appName}}-registry
-   type: org.cloudfoundry.managed-service
-   requires:
-      - name: {{cap.appName}}-uaa-mt
-      - name: mtx-api
+    provides:
+      - name: srv-api # required by consumers of CAP services (e.g. approuter)
         properties:
-           prop: ~{mtx-url}
-        parameters:
-           param: ~{mtx-url}
-   parameters:
-      service: saas-registry
-      service-plan: application
-      config:
-         xsappname: {{cap.appName}}-${space}
-         appName: {{cap.appName}}
-         displayName: {{cap.appName}}
-         description: {{cap.appDescription}}
-         #category: 'Category'
-         appUrls:
-            onSubscription: ~{mtx-api/mtx-url}/mtx/v1/provisioning/tenant/{tenantId}
-            onSubscriptionAsync: false
-            onUnSubscriptionAsync: false
-            callbackTimeoutMillis: 300000
-{{/cap.isNodejs}}
-{{/cap.isMultitenant}}
-
- {{! consider vcap.tag as well}}
+          srv-url: ${default-url}

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

@@ -1,28 +1,36 @@
-const path = require('path')
+const path = require('path');
 const TemplateBase = require('../templateBase');
-const ProjectReader = require('../mta/projectReader')
-
+const ProjectReader = require('../../util/projectReader');
 
 module.exports = class MtaTemplate extends TemplateBase {
     constructor(projectPath, generator) {
         super(projectPath, generator, __dirname);
-        this.projectReader = new ProjectReader(this)
+        this.projectReader = new ProjectReader(this);
     }
 
-    async checkEnabled() {
-        if (this.options.force) {
-            return true;
+    async run() {
+        const projectDescriptor = await this.projectReader.read();
+        if (!await this.fsUtil.pathExists(path.join(this.projectPath, 'mta.yaml'))) {
+            await this.templateUtil.copyFiles('.', this.projectPath, projectDescriptor);
         }
 
-        if (await this.fsUtil.pathExists(path.join(this.projectPath, 'mta.yaml'))) {
-            throw new Error(`File mta.yaml already exists in current folder. Use --force to overwrite.`);
+        // Re-applying the merging part of `cds add xsuaa`, `cds add hana`, and `cds add mtx`, if necessary.
+        // TODO: Find a generic solution for situation like these. Probably involves some restructuring in the
+        // project reader, so that there's a logical mapping from hasX to XTemplate.
+        if (projectDescriptor.cap.hasHana) {
+            const HanaTemplate = require(`../hana`)
+            const template = new HanaTemplate(this.projectPath, this.generator)
+            await template.runMTAMerging()
+        }
+        if (projectDescriptor.cap.hasXsuaa) {
+            const XsuaaTemplate = require(`../xsuaa`)
+            const template = new XsuaaTemplate(this.projectPath, this.generator)
+            await template.runMTAMerging()
+        }
+        if (projectDescriptor.cap.isMultitenant) {
+            const MtxTemplate = require(`../mtx`)
+            const template = new MtxTemplate(this.projectPath, this.generator)
+            await template.runMTAMerging()
         }
-
-        return true;
-    }
-
-    async run() {
-        const projectDescriptor = await this.projectReader.read()
-        await this.templateUtil.copyFiles('.', this.projectPath, projectDescriptor, this.options.force);
     }
-}
+};

package/lib/init/template/mtx/files/cds.package.json

@@ -0,0 +1,24 @@
+{
+  "cds": {
+    "requires": {
+      "auth": {
+        "strategy": "JWT"
+      },
+      "db": {
+        "kind": { "#overwrite": "hana" },
+        "vcap": {
+          "label": "service-manager"
+        }
+      },
+      "multitenancy": true
+    },
+    "hana": {
+      "deploy-format": "hdbtable"
+    },
+    "mtx": {
+      "element-prefix": "Z_",
+      "namespace-blocklist": [],
+      "extension-allowlist": []
+    }
+  }
+}

package/lib/init/template/mtx/files/dependencies.package.json

@@ -0,0 +1,5 @@
+{
+  "dependencies": {
+    "@sap/cds-mtx": "^2"
+  }
+}

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

@@ -0,0 +1,74 @@
+---
+modules:
+  - name: {{cap.appName}}-srv
+    type: {{cap.pLanguage}}
+    path: {{& cap.srv.path}}
+{{#cap.isNodejs}}
+    properties:
+      SUBSCRIPTION_URL: ${protocol}://\${tenant_subdomain}-${default-uri}
+      SUBSCRIPTION_URL_REPLACEMENT_RULES: [['-srv', '']]
+{{/cap.isNodejs}}
+    requires:
+      - name: {{cap.appName}}-registry
+{{#cap.isJava}}
+      - name: sidecar
+        properties:
+          CDS_MULTITENANCY_SIDECAR_URL: ~{url}
+{{/cap.isJava}}
+    provides:
+      - 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
+    type: nodejs
+    path: mtx-sidecar
+    parameters:
+      memory: 256M
+      disk-quota: 512M
+    requires:
+      - name: bookshop-db
+      - name: bookshop-uaa
+    provides:
+      - name: sidecar
+        properties:
+          url: ${default-url}
+{{/cap.isJava}}
+
+resources:
+  - name: {{cap.appName}}-registry
+    type: org.cloudfoundry.managed-service
+    requires:
+{{#cap.isNodejs}}
+      - name: mtx-api
+{{/cap.isNodejs}}
+{{#cap.isJava}}
+      - name: srv-api
+{{/cap.isJava}}
+    parameters:
+      service: saas-registry
+      service-plan: application
+      config:
+        xsappname: {{cap.appName}}-${org}-${space}
+        appName: {{cap.appName}}-${org}-${space}
+        displayName: {{cap.appName}}
+        description: A simple CAP project.
+        category: 'Category'
+        appUrls:
+{{#cap.isNodejs}}
+          getDependencies: ~{mtx-api/mtx-url}/mtx/v1/provisioning/dependencies
+          onSubscription: ~{mtx-api/mtx-url}/mtx/v1/provisioning/tenant/{tenantId}
+{{/cap.isNodejs}}
+{{#cap.isJava}}
+          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

package/lib/init/template/mtx/files/xs-security.json.hbs

@@ -1,14 +1,28 @@
 {
-  "xsappname": "{{cap.appName}}-${space}",
-  "tenant-mode": "shared",
   "scopes": [
-    { "name": "$XSAPPNAME.ExtendCDS", "description": "Extend CDS application" },
-    { "name": "$XSAPPNAME.ExtendCDSdelete", "description": "Extend CDS application with undeploy" },
-    { "name": "$XSAPPNAME.MtxDiagnose", "description": "Diagnose MTX sidecar" },
-    { "name": "$XSAPPNAME.mtdeployment", "description": "Deploy applications" },
-    { "name": "$XSAPPNAME.mtcallback", "description": "Subscribe to applications", "grant-as-authority-to-apps": [
-      "$XSAPPNAME(application,sap-provisioning,tenant-onboarding)"
-    ]}
+    {
+      "name": "$XSAPPNAME.ExtendCDS",
+      "description": "Extend CDS applications"
+    },
+    {
+      "name": "$XSAPPNAME.ExtendCDSdelete",
+      "description": "Extend CDS applications with undeployments"
+    },
+    {
+      "name": "$XSAPPNAME.MtxDiagnose",
+      "description": "Diagnose MTX"
+    },
+    {
+      "name": "$XSAPPNAME.mtdeployment",
+      "description": "Deploy applications"
+    },
+    {
+      "name": "$XSAPPNAME.mtcallback",
+      "description": "Subscribe to applications",
+      "grant-as-authority-to-apps": [
+        "$XSAPPNAME(application,sap-provisioning,tenant-onboarding)"
+      ]
+    }
   ],
   "authorities": [
     "$XSAPPNAME.MtxDiagnose",