Make streamlined MTX new default (#189)

Author: beckermarc

.cdsrc.json

@@ -1,14 +1,17 @@
 {
+    "requires": {
+        "multitenancy": true,
+        "extensibility": true,
+        "toggles": true
+    },
     "build": {
         "target": ".",
         "tasks": [
             {
                 "for": "java"
             },
             {
-                "for": "mtx",
-                "src": ".",
-                "dest": "mtx-sidecar"
+                "for": "mtx-sidecar"
             },
             {
                 "for": "hana"

.gitignore

@@ -32,7 +32,8 @@ hs_err*
 .DS_Store
 
 *.db
+*.sqlite
 
 .cdsrc-private.json
 
-/chart/
+/chart/

README.md

@@ -45,6 +45,8 @@ Although CAP provides generic **event handlers** to serve most CRUD requests out
 
 A SAP Fiori UI is added using predefined SAP Fiori elements templates. **[SAP Fiori annotations](https://cap.cloud.sap/docs/advanced/fiori#fiori-annotations)** add information to the service definitions, on how to render the data.
 
+CAP provides built-in multitenancy support with out-of-the box tenant isolation. The sample application demonstrates usage of MTX sidecar based on [streamlined MTX](https://cap.cloud.sap/docs/guides/deployment/as-saas?impl-variant=java) and can be deployed as multitenant application. The [deprecated classic MTX](https://cap.cloud.sap/docs/java/multitenancy) setup is shown in the [mtx-classic branch](https://github.com/SAP-samples/cloud-cap-samples-java/tree/mtx-classic) for reference.
+
 ## Demonstrated Features
 
 Framework and Infrastructure related Features:

mta-multi-tenant.yaml

@@ -4,12 +4,6 @@ version: 1.0.0
 description: "Multitenant Bookshop CAP Java Project with UI"
 parameters:
   enable-parallel-deployments: true
-build-parameters:
-  before-all:
-   - builder: custom
-     commands:
-      - npm install --production
-      - npx -p @sap/cds-dk cds build --production
 modules:
 # --------------------- SERVER MODULE ------------------------
   - name: bookshop-mt-srv
@@ -49,10 +43,17 @@ modules:
   - name: bookshop-mt-sidecar
 # ------------------------------------------------------------
     type: nodejs
-    path: mtx-sidecar
+    path: mtx/sidecar
     parameters:
       memory: 256M
       disk-quota: 1024M
+    build-parameters:
+      builder: custom
+      build-result: gen
+      commands:
+        - npm run build
+      requires:
+        - name: bookshop-mt-srv
     requires:
       - name: bookshop-mt-service-manager
       - name: bookshop-mt-uaa

mta-single-tenant.yaml

@@ -81,7 +81,7 @@ resources:
   - name: bookshop-hdi-container
     type: org.cloudfoundry.managed-service
     parameters:
-      service: hanatrial
+      service: hana
       service-plan: hdi-shared
   - name: cf-logging
     type: org.cloudfoundry.managed-service

mtx-sidecar/.cdsrc.json

@@ -0,0 +1,36 @@
+{
+  "dependencies": {
+    "@sap/cds": "^6",
+    "@sap/cds-mtxs": "^1",
+    "express": "^4",
+    "hdb": "^0",
+    "passport": "^0",
+    "@sap/xssec": "^3"
+  },
+  "cds": {
+    "requires": {
+      "[production]": {
+        "db": "hana-mt",
+        "auth": "xsuaa"
+      },
+      "[development]": {
+        "db": "sqlite",
+        "auth": "dummy"
+      },
+      "cds.xt.ModelProviderService": "in-sidecar",
+      "cds.xt.DeploymentService": true,
+      "cds.xt.SaasProvisioningService": true,
+      "cds.xt.ExtensibilityService": true
+    }
+  },
+  "devDependencies": {
+    "sqlite3": "^5"
+  },
+  "engines": {
+    "node": "^16"
+  },
+  "scripts": {
+    "start": "cds run",
+    "build": "npm install && npx cds build ../.. --for mtx-sidecar && cd gen && npm install"
+  }
+}

mtx-sidecar/package.json

@@ -0,0 +1,16 @@
+### Trigger BusinessPartner.Changed event through S/4 mock
+
+PATCH http://localhost:8080/api/API_BUSINESS_PARTNER/A_BusinessPartnerAddress(BusinessPartner='10401010',AddressID='200')
+Content-Type: application/json
+Authorization: Basic authenticated:
+
+{"HouseNumber": "30"}
+
+### Subscribe t1 tenant, in local-mtxs
+
+POST http://localhost:4004/-/cds/deployment/subscribe HTTP/1.1
+Content-Type: application/json
+
+{
+  "tenant": "t1"
+}