Update @sap/cds-dk to 6.8.1 (#224)

Aligned MTA deployment files and MTX Sidecar configuration with best practices

Author: beckermarc

.cdsrc.json

@@ -5,20 +5,10 @@
         "toggles": true
     },
     "build": {
-        "target": ".",
-        "tasks": [
-            {
-                "for": "java"
-            },
-            {
-                "for": "mtx-sidecar"
-            },
-            {
-                "for": "hana"
-            }
-        ]
+        "target": "."
     },
-    "hana": {
-        "deploy-format": "hdbtable"
-    }
+    "profiles": [
+        "with-mtx-sidecar",
+        "java"
+    ]
 }

integration-tests/pom.xml

@@ -118,4 +118,4 @@
 			</plugin>
 		</plugins>
 	</build>
-</project>
+</project>

mta-multi-tenant.yaml

@@ -28,17 +28,17 @@ modules:
       - name: bookshop-mt-service-manager
       - name: bookshop-mt-uaa
       - name: bookshop-mt-saas-registry
-      - name: sidecar
+      - name: mtx-api
         properties:
-          CDS_MULTITENANCY_SIDECAR_URL: ~{url}
-      - name: app
+          CDS_MULTITENANCY_SIDECAR_URL: ~{mtx-url}
+      - name: app-api
         properties:
-          CDS_MULTITENANCY_APPUI_URL: ~{url}
+          CDS_MULTITENANCY_APPUI_URL: ~{app-url}
       - name: cf-logging
     provides:
-      - name: srv
+      - name: srv-api
         properties:
-          url: '${default-url}'
+          srv-url: '${default-url}'
 # --------------------- SIDECAR MODULE -----------------------
   - name: bookshop-mt-sidecar
 # ------------------------------------------------------------
@@ -59,40 +59,41 @@ modules:
       - name: bookshop-mt-uaa
       - name: cf-logging
     provides:
-      - name: sidecar
+      - name: mtx-api
         properties:
-          url: ${default-url}
+          mtx-url: ${default-url}
 # --------------------- APPROUTER MODULE ---------------------
   - name: bookshop-mt-app
 # ------------------------------------------------------------
-    type: nodejs
+    type: approuter.nodejs
     path: app
     parameters:
       memory: 256M
       disk-quota: 512M
+      keep-existing-routes: true
     properties:
       TENANT_HOST_PATTERN: ^(.*)-${default-uri}
     requires:
-    - name: srv
+    - name: srv-api
       group: destinations
       properties:
         name: backend
-        url: ~{url}
+        url: ~{srv-url}
         forwardAuthToken: true
         strictSSL: true
     - name: bookshop-mt-uaa
     provides:
-      - name: app
+      - name: app-api
         properties:
-          url: '${default-url}'
+          app-url: '${default-url}'
 # --------------------- RESOURCES ---------------------
 resources:
 # -----------------------------------------------------
   - name: bookshop-mt-uaa
-    type: com.sap.xs.uaa
+    type: org.cloudfoundry.managed-service
     parameters:
       service: xsuaa
-      service-plan: broker
+      service-plan: application
       path: ./xs-security-mt.json
       config: # override xsappname as it needs to be unique
         xsappname: bookshop-mt-${org}-${space}
@@ -107,17 +108,20 @@ resources:
       service: saas-registry
       service-plan: application
       config:
-         appName: bookshop-mt-${org}-${space} # this is the text on the tile
-         xsappname: bookshop-mt-${org}-${space} # this is the value from xsuaa.parameters.config.xsappname
-         appUrls:
-           getDependencies: ~{srv/url}/mt/v1.0/subscriptions/dependencies
-           onSubscription: ~{srv/url}/mt/v1.0/subscriptions/tenants/{tenantId}
-           onSubscriptionAsync: true
-           onUnSubscriptionAsync: true
-           onUpdateDependenciesAsync: true
-           callbackTimeoutMillis: 3600000
+        appName: bookshop-mt-${org}-${space} # this is the text on the tile
+        xsappname: bookshop-mt-${org}-${space} # this is the value from xsuaa.parameters.config.xsappname
+        appUrls:
+          getDependencies: ~{srv-api/srv-url}/mt/v1.0/subscriptions/dependencies
+          onSubscription: ~{srv-api/srv-url}/mt/v1.0/subscriptions/tenants/{tenantId}
+          onSubscriptionAsync: true
+          onUnSubscriptionAsync: true
+          onUpdateDependenciesAsync: true
+          callbackTimeoutMillis: 3600000
+        displayName: bookshop-java
+        description: A simple CAP Java project.
+        category: 'Category'
     requires:
-      - name: srv
+      - name: srv-api
   - name: cf-logging
     type: org.cloudfoundry.managed-service
     parameters:

mta-single-tenant.yaml

@@ -28,9 +28,9 @@ modules:
       - name: bookshop-uaa
       - name: cf-logging
     provides:
-      - name: srv
+      - name: srv-api
         properties:
-          url: '${default-url}'
+          srv-url: '${default-url}'
 # --------------------- DB MODULE ---------------------------
   - name: bookshop-db
 # -----------------------------------------------------------
@@ -49,32 +49,28 @@ modules:
 # --------------------- APPROUTER MODULE ---------------------
   - name: bookshop-app
 # ------------------------------------------------------------
-    type: nodejs
+    type: approuter.nodejs
     path: app
     parameters:
       memory: 256M
       disk-quota: 512M
     requires:
-    - name: srv
+    - name: srv-api
       group: destinations
       properties:
         name: backend
-        url: ~{url}
+        url: ~{srv-url}
         forwardAuthToken: true
         strictSSL: true
     - name: bookshop-uaa
-    provides:
-      - name: app
-        properties:
-          url: '${default-url}'
 # --------------------- RESOURCES ---------------------
 resources:
 # -----------------------------------------------------
   - name: bookshop-uaa
-    type: com.sap.xs.uaa
+    type: org.cloudfoundry.managed-service
     parameters:
       service: xsuaa
-      service-plan: broker
+      service-plan: application
       path: ./xs-security.json
       config: # override xsappname as it needs to be unique
         xsappname: bookshop-${org}-${space}

mtx/sidecar/package.json

@@ -2,26 +2,10 @@
   "dependencies": {
     "@sap/cds": "^6",
     "@sap/cds-mtxs": "^1",
+    "@sap/xssec": "^3",
     "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
-    }
+    "passport": "^0"
   },
   "devDependencies": {
     "sqlite3": "^5",
@@ -30,8 +14,11 @@
   "engines": {
     "node": "^16"
   },
+  "cds": {
+    "profile": "mtx-sidecar"
+  },
   "scripts": {
     "start": "cds-serve",
-    "build": "npm install && npx cds build ../.. --for mtx-sidecar && cd gen && npm install"
+    "build": "cds build ../.. --for mtx-sidecar --production && cd gen && npm install"
   }
 }

pom.xml

@@ -21,7 +21,7 @@
 		<cloud.sdk.version>4.12.0</cloud.sdk.version>
 		<xsuaa.version>2.13.9</xsuaa.version>
 		<cf-java-logging-support.version>3.7.0</cf-java-logging-support.version>
-		<cds.install-cdsdk.version>6.7.2</cds.install-cdsdk.version>
+		<cds.install-cdsdk.version>6.8.1</cds.install-cdsdk.version>
 	</properties>
 
 	<modules>

requests.http

@@ -8,7 +8,7 @@ Authorization: Basic authenticated:
 
 ### Subscribe t1 tenant, in local-mtxs
 
-POST http://localhost:4004/-/cds/deployment/subscribe HTTP/1.1
+POST http://localhost:4005/-/cds/deployment/subscribe HTTP/1.1
 Content-Type: application/json
 
 {

srv/src/main/resources/application.yaml

@@ -99,7 +99,7 @@ cds:
 spring:
   config.activate.on-profile: ft
 cds:
-  model.provider.url: http://localhost:4004
+  model.provider.url: http://localhost:4005
   security.mock.users:
     admin:
       features:
@@ -113,7 +113,7 @@ cds:
 spring:
   config.activate.on-profile: local-mtxs
 cds:
-  multi-tenancy.sidecar.url: http://localhost:4004
+  multi-tenancy.sidecar.url: http://localhost:4005
   security.mock.users:
     admin:
       tenant: t1