@sap/cds-dk 6.6.2 → 6.7.1

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

@@ -225,19 +225,6 @@
                 }
             }
         },
-        "ha": {
-            "$id": "#/properties/ha",
-            "title": "High Availability configuration",
-            "type": "object",
-            "additionalProperties": false,
-            "properties": {
-                "enabled": {
-                    "$id": "#/properties/ha/properties/enabled",
-                    "description": "[Deprecated: Will be always enabled in future] Enables additional high-availability related configuration, like Pod Disruption Budget and Topology Spread Constraints.",
-                    "type": "boolean"
-                }
-            }
-        },
         "resources": {
             "$id": "#/properties/resources",
             "title": "Pod resources configuration",
@@ -301,39 +288,6 @@
                 }
             }
         },
-        "health_check": {
-            "$id": "#/properties/health_check",
-            "title": "Health-check configuration",
-            "description": "[Deprecated] Use health instead",
-            "type": "object",
-            "additionalProperties": false,
-            "properties": {
-                "liveness": {
-                    "$id": "#/properties/health_check/properties/liveness",
-                    "description": "Liveness-probe configuration.",
-                    "type": "object",
-                    "additionalProperties": false,
-                    "properties": {
-                        "path": {
-                            "description": "HTTP path used by Kubernetes, to perform health-check calls.",
-                            "type": "string"
-                        }
-                    }
-                },
-                "readiness": {
-                    "$id": "#/properties/health_check/properties/readiness",
-                    "description": "Readiness-probe configuration.",
-                    "type": "object",
-                    "additionalProperties": false,
-                    "properties": {
-                        "path": {
-                            "description": "HTTP path used by Kubernetes, to perform health-check calls.",
-                            "type": "string"
-                        }
-                    }
-                }
-            }
-        },
         "availability": {
             "$id": "#/properties/availability",
             "title": "Availability related configuration",
@@ -419,12 +373,6 @@
                 }
             }
         },
-        "startupTimeout": {
-            "$id": "#/properties/startupTimeout",
-            "description": "[Deprecated] use startupTimeoutSeconds instead",
-            "type": "integer",
-            "minimum": 1
-        },
         "startupTimeoutSeconds": {
             "$id": "#/properties/startupTimeoutSeconds",
             "description": "Initial timeout in seconds, during which the app must start giving the response to the liveness-probe.",
@@ -432,6 +380,11 @@
             "minimum": 1,
             "default": 30
         },
+        "readOnlyRootFilesystem": {
+            "$id": "#/properties/readOnlyRootFilesystem",
+            "description": "Use read only filesystem for the Deployment.",
+            "type": "boolean"
+        },
         "terminationGracePeriodSeconds": {
             "$id": "#/properties/terminationGracePeriodSeconds",
             "description": "Time in seconds after which the pod will be forcefully stopped after receiving SIGTERM.",
@@ -603,15 +556,6 @@
             ],
             "default": {}
         },
-        "envSecretNames": {
-            "$id": "#/properties/envSecretNames",
-            "description": "[Deprecated] Use `envFrom` instead",
-            "type": "array",
-            "uniqueItems": true,
-            "items": {
-                "$ref": "#/definitions/KubernetesName"
-            }
-        },
         "envFrom": {
             "$id": "#/properties/envFrom",
             "description": "List of sources to populate environment variables in the pod.",
@@ -681,6 +625,71 @@
                     "description": "Use this istio gateway for incoming traffic.",
                     "type": "string",
                     "default": "kyma-gateway.kyma-system.svc.cluster.local"
+                },
+                "rules": {
+                    "$id": "#/properties/expose/properties/rules",
+                    "description": "Rules represents collection of Rule to apply.",
+                    "type": "array",
+                    "items": {
+                        "description": "A rule to apply.",
+                        "type": "object"
+                    },
+                    "default": [
+                        {
+                          "accessStrategies": [
+                            {
+                              "handler": "allow"
+                            }
+                          ],
+                          "methods": [
+                            "GET",
+                            "POST",
+                            "PUT",
+                            "PATCH",
+                            "DELETE",
+                            "HEAD"
+                          ],
+                          "path": "/.*"
+                        }
+                    ]
+                }
+            }
+        },
+        "networkSecurity": {
+            "$id": "#/properties/bindings",
+            "title": "Network Security configuration",
+            "type": "object",
+            "additionalProperties": false,
+            "properties": {
+                "enabled": {
+                    "type": "boolean",
+                    "default": true
+                },
+                "allowNamespaceInternal": {
+                    "type": "boolean"
+                },
+                "ingress": {
+                    "type": "array",
+                    "default": [],
+                    "items": {
+                        "type": "object",
+                        "minProperties": 1,
+                        "additionalProperties": false,
+                        "properties": {
+                            "namespace": {
+                                "type": "string"
+                            },
+                            "podLabelsSelector": {
+                                "type": "object",
+                                "minProperties": 1,
+                                "patternProperties": {
+                                    "^.*$": {
+                                        "type": "string"
+                                    }
+                                }
+                            }
+                        }
+                    }
                 }
             }
         },
@@ -733,58 +742,29 @@
                                     "description": "List of sources to populate parameters.",
                                     "type": "array",
                                     "items": {
-                                        "anyOf": [
-                                            {
-                                                "type": "object",
-                                                "description": "Kubernetes Secret as a parameters source.",
-                                                "additionalProperties": false,
-                                                "properties": {
-                                                    "secretKeyRef": {
-                                                        "type": "object",
-                                                        "additionalProperties": false,
-                                                        "required": [
-                                                            "name",
-                                                            "key"
-                                                        ],
-                                                        "properties": {
-                                                            "name": {
-                                                                "description": "Name of a Secret.",
-                                                                "type": "string"
-                                                            },
-                                                            "key": {
-                                                                "description": "Key in that Secret, which contains a string that represents the json to include in the set of parameters to be sent to the broker.",
-                                                                "type": "string"
-                                                            }
-                                                        }
-                                                    }
-                                                }
-                                            },
-                                            {
+                                        "type": "object",
+                                        "description": "Kubernetes Secret as a parameters source.",
+                                        "additionalProperties": false,
+                                        "properties": {
+                                            "secretKeyRef": {
                                                 "type": "object",
-                                                "description": "Kubernetes Config Map as a parameters source.",
                                                 "additionalProperties": false,
+                                                "required": [
+                                                    "name",
+                                                    "key"
+                                                ],
                                                 "properties": {
-                                                    "configMapKeyRef": {
-                                                        "type": "object",
-                                                        "additionalProperties": false,
-                                                        "required": [
-                                                            "name",
-                                                            "key"
-                                                        ],
-                                                        "properties": {
-                                                            "name": {
-                                                                "description": "Name of a Config Map",
-                                                                "$ref": "#/definitions/KubernetesName"
-                                                            },
-                                                            "key": {
-                                                                "description": "Key in that Config Map, which contains a string that represents the json to include in the set of parameters to be sent to the broker.",
-                                                                "type": "string"
-                                                            }
-                                                        }
+                                                    "name": {
+                                                        "description": "Name of a Secret.",
+                                                        "type": "string"
+                                                    },
+                                                    "key": {
+                                                        "description": "Key in that Secret, which contains a string that represents the json to include in the set of parameters to be sent to the broker.",
+                                                        "type": "string"
                                                     }
                                                 }
                                             }
-                                        ]
+                                        }
                                     }
                                 },
                                 "credentialsRotationPolicy": {

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

@@ -57,6 +57,7 @@ health:
   readiness:
     path: /healthz
 
+# readOnlyRootFilesystem: false
 terminationGracePeriodSeconds: 30
 startupTimeoutSeconds: 30
 
@@ -90,8 +91,33 @@ expose:
   enabled: true
   gateway: kyma-gateway.kyma-system.svc.cluster.local
   # host: ""
+  rules:
+  - accessStrategies:
+    - handler: allow
+    methods:
+    - GET
+    - POST
+    - PUT
+    - PATCH
+    - DELETE
+    - HEAD
+    path: /.*
+
+networkSecurity:
+  enabled: true
+  # allowNamespaceInternal: true
+  ingress: []
+  #   - namespace: my-namespace
+  #     podLabelsSelector:
+  #       app: my-app
+
+bindings:
+  defaultProperties:
+    credentialsRotationPolicy:
+      enabled: false
+      rotationFrequency: "720h"
+      rotatedBindingTTL: "24h"
 
-# bindings:
 #   ui5-repo-servicerepo:
 #     serviceInstanceName: ui5-repo-instance
 #     externalName: ui5-kyma-binding
@@ -103,7 +129,7 @@ expose:
 #           key: test
 #           name: test
 #     credentialsRotationPolicy:
-#       enabled: true
+#       enabled: false
 #   hana:
 #     serviceInstanceName: hana-manual
 #   portal:

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

@@ -39,11 +39,10 @@ module.exports = class Html5RepoTemplate extends require('../templateBase') {
             let isIndependentCommand = false
             if(Object.keys(context).length == 0){
                 isIndependentCommand = true
-                context.projectPath = this.projectPath
-                context.oldTrackingData = context.newTrackingData = await parseMd5File(join(this.projectPath, 'chart', '.cds-add-helm-files.md5'))
+                context.oldTrackingData = context.newTrackingData = await parseMd5File(join('chart', '.cds-add-helm-files.md5'))
             }
             await mergeYAML(
-                join(this.projectPath, 'chart', 'values.yaml'),
+                join('chart', 'values.yaml'),
                 {
                     'html5-apps-repo-host': {
                         serviceOfferingName: 'html5-apps-repo',
@@ -84,38 +83,16 @@ module.exports = class Html5RepoTemplate extends require('../templateBase') {
             isIndependentCommand = isIndependentCommand | await helmTemplate.addSubChart('content-deployment');
 
             // add dependency entry in chart.yaml
-            await mergeYAML(
-                join(this.projectPath, 'chart', 'Chart.yaml'),
-                join(__dirname, 'files', 'html5-apps-deployer.yaml'),
-                projectDescriptor,
-                { additions: [{
-                    in: `dependencies`,
-                    where: [{
-                        property: 'alias',
-                        isEqualTo: 'html5-apps-deployer'
-                    }]
-                }]}
-            )
+            await helmTemplate.addDependency('content-deployment', 'html5-apps-deployer');
 
             // 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 helmTemplate.addDependency('service-instance', '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)
-            if(isIndependentCommand) await writeMd5File(join(this.projectPath, 'chart', '.cds-add-helm-files.md5'), context.newTrackingData)
+            await copyAndTrack(join(__dirname, 'files', 'html5-apps-deployer-configmap.yaml'), join('chart', 'templates', 'html5-apps-deployer-configmap.yaml'), context)
+            if(isIndependentCommand) await writeMd5File(join('chart', '.cds-add-helm-files.md5'), context.newTrackingData)
         }
     }
 }

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

@@ -53,7 +53,7 @@ module.exports = class JavaTemplate extends require('../templateBase') {
     }
 
     async finalize() {
-        const relativeProjectPath = relative(this.cwd, this.projectPath);
+        const relativeProjectPath = relative(this.cwd, cds.root);
         if (relativeProjectPath && relativeProjectPath !== '.') {
             LOG.info(`Continue with 'cd ${relativeProjectPath}'`);
         }

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

@@ -1,7 +1,8 @@
 ---
 modules:
   - name: {{cap.appName}}-srv
-    type: {{cap.pLanguage}}
+    type: {{cap.language}}
+    path: {{& cap.srvPath}}
     requires:
       - name: {{cap.appName}}-cf-logging
 

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

@@ -2,12 +2,11 @@ const { join } = require('path')
 const cds = require('../../../cds')
 const { readProject } = require('../../util/projectReader')
 const { mergeJSON, mergeYAML } = require('../../util/merge')
-const { PROJECT_TYPE, } = require('../../constants')
+const { PROJECT_TYPE } = require('../../constants')
 const { srvNode, srvJava, 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
@@ -31,7 +30,7 @@ module.exports = class KibanaLoggingTemplate extends require('../templateBase')
                 const { for: forProfile } = projectDescriptor.cap
                 const cdsTemplateFile = forProfile ? 'cds.profile.package.json.hbs' : 'cds.package.json'
                 const cdsTemplatePath = join(__dirname, 'files', cdsTemplateFile)
-                await mergeJSON(join(this.projectPath, 'package.json'), cdsTemplatePath, projectDescriptor)
+                await mergeJSON('package.json', cdsTemplatePath, projectDescriptor)
             }
         }
         await this.runDependentMerging()
@@ -39,14 +38,12 @@ module.exports = class KibanaLoggingTemplate extends require('../templateBase')
 
     async runDependentMerging() {
         const projectDescriptor = await readProject(this.options)
-        const { hasMta, isNodejs } = projectDescriptor.cap
+        const { hasMta, isNodejs, srvPath } = projectDescriptor.cap
 
         if (hasMta) {
-            const srv = isNodejs ? srvNode : srvJava
-
-            const mtaYAMLPath = join(this.projectPath, 'mta.yaml')
+            const srv = (isNodejs ? srvNode : srvJava)(srvPath)
             await mergeYAML(
-                mtaYAMLPath,
+                'mta.yaml',
                 join(__dirname, 'files', 'mta.yaml.hbs'),
                 projectDescriptor,
                 {

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

@@ -21,7 +21,7 @@ const VSCODE_FILE_ASSOCIATIONS = {
 module.exports = class LintTemplate extends require('../templateBase') {
   constructor(generator) {
     super(generator);
-    this.customPath = path.join(this.projectPath, ".eslint");
+    this.customPath = path.join(cds.root, ".eslint");
     this.docsPath = path.join(this.customPath, "docs");
     this.rulesPath = path.join(this.customPath, "rules");
     this.testsPath = path.join(this.customPath, "tests");
@@ -81,8 +81,8 @@ module.exports = class LintTemplate extends require('../templateBase') {
         }
       });
       await io.sanitizeVscodeSettings(
-        this.projectPath,
-        path.join(this.projectPath, ".vscode/settings.json"),
+        cds.root,
+        path.join(cds.root, ".vscode/settings.json"),
         this.lintType,
         extensions,
         this.customRuleExample
@@ -123,7 +123,7 @@ module.exports = class LintTemplate extends require('../templateBase') {
   }
 
   _checkEslint() {
-    const eslintCmd = checks.resolveEslint(this.projectPath, '');
+    const eslintCmd = checks.resolveEslint(cds.root, '');
     if (!eslintCmd) {
       this.missingNpmDependencies["names"].push("eslint");
       this.missingNpmDependencies["msgs"].push("ESLint v>=7.0.0");
@@ -134,7 +134,7 @@ module.exports = class LintTemplate extends require('../templateBase') {
   _checkEslintPlugin() {
     const eslintPluginLocal = checks.resolvePlugin(
       "@sap/eslint-plugin-cds",
-      this.projectPath
+      cds.root
     );
     // Require locally installed ESLint CDS plugin
     if (!eslintPluginLocal) {
@@ -155,9 +155,9 @@ module.exports = class LintTemplate extends require('../templateBase') {
   }
 
   async _addEslintPluginConfig() {
-    let configPath = getConfigPath(this.projectPath);
+    let configPath = getConfigPath(cds.root);
     if (!configPath) {
-      configPath = path.join(this.projectPath, ".eslintrc.json");
+      configPath = path.join(cds.root, ".eslintrc.json");
     }
     await io.sanitizeEslintConfig(configPath, this.customRuleExample);
     return;
@@ -207,7 +207,7 @@ module.exports = class LintTemplate extends require('../templateBase') {
     let doneTask = true;
     try {
       cp.execSync(task, {
-        cwd: this.projectPath,
+        cwd: cds.root,
         shell: IS_WIN,
         stdio: "inherit",
       });

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

@@ -14,8 +14,8 @@ build-parameters:
 {{/cap.isNodejs}}
 modules:
   - name: {{cap.appName}}-srv
-    type: {{cap.pLanguage}}
-    path: {{& cap.srv.path}}
+    type: {{cap.language}}
+    path: {{& cap.srvPath}}
 {{#cap.isNodejs}}
     parameters:
       buildpack: nodejs_buildpack
@@ -39,3 +39,4 @@ modules:
       - name: srv-api # required by consumers of CAP services (e.g. approuter)
         properties:
           srv-url: ${default-url}
+    requires: []

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

@@ -1,5 +1,6 @@
 const { join } = require('path');
-const { exists } = require('../../../cds').utils
+const cds = require('../../../cds')
+const { exists } = cds.utils
 const { copyFiles } = require('../../util/templateUtil')
 const { readProject } = require('../../util/projectReader');
 
@@ -13,7 +14,7 @@ module.exports = class MtaTemplate extends require('../templateBase') {
     async run() {
         const projectDescriptor = await readProject()
         if (!exists('mta.yaml')) {
-            await copyFiles(join(__dirname, 'files'), this.projectPath, projectDescriptor);
+            await copyFiles(join(__dirname, 'files'), cds.root, projectDescriptor);
         }
 
         // Re-applying the dependent merging part of other facets if necessary.

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

@@ -1,63 +1,57 @@
 ---
 modules:
   - name: {{cap.appName}}-srv
-    type: {{cap.pLanguage}}
-    path: {{& cap.srv.path}}
+    type: {{cap.language}}
+    path: {{& cap.srvPath}}
     requires:
       - name: {{cap.appName}}-registry
-{{#cap.isJava}}
-      - name: mtx-sidecar
+        {{#cap.isJava}}
+      - name: mtx-api
         properties:
           CDS_MULTITENANCY_MTXS_ENABLED: true
-          CDS_MULTITENANCY_SIDECAR_URL: ~{url}
-{{/cap.isJava}}
+          CDS_MULTITENANCY_SIDECAR_URL: ~{mtx-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
+  - name: {{cap.appName}}-mtx
     type: nodejs
-    path: mtx/sidecar
+    path: {{#cap.isNodejs}}gen/{{/cap.isNodejs}}mtx/sidecar
+    {{#cap.isNodejs}}
+    build-parameters:
+      builder: npm-ci
+    {{/cap.isNodejs}}
+    {{#cap.isJava}}
     build-parameters:
       builder: custom
       build-result: gen
       commands:
         - npm run build
+    {{/cap.isJava}}
     parameters:
       memory: 256M
       disk-quota: 512M
     provides:
-      - name: mtx-sidecar
-        properties:
-          url: ${default-url}
-{{#cap.isJava}}
-      - name: mtx-api # potentially required by approuter
+      - name: mtx-api
         properties:
           mtx-url: ${default-url}
-{{/cap.isJava}}
-{{#cap.hasXsuaa}}
+    {{#cap.hasXsuaa}}
     requires:
       - name: {{cap.appName}}-auth
-{{/cap.hasXsuaa}}
-{{/cap.isJava}}
+    {{/cap.hasXsuaa}}
 
 resources:
   - name: {{cap.appName}}-registry
     type: org.cloudfoundry.managed-service
     requires:
-{{#cap.isNodejs}}
+    {{#cap.isNodejs}}
       - name: mtx-api
-{{/cap.isNodejs}}
-{{#cap.isJava}}
+    {{/cap.isNodejs}}
+    {{#cap.isJava}}
       - name: srv-api
-{{/cap.isJava}}
+    {{/cap.isJava}}
     parameters:
       service: saas-registry
       service-plan: application
@@ -68,14 +62,14 @@ resources:
         description: A simple CAP project.
         category: 'Category'
         appUrls:
-{{#cap.isNodejs}}
+          {{#cap.isNodejs}}
           getDependencies: ~{mtx-api/mtx-url}/-/cds/saas-provisioning/dependencies
           onSubscription: ~{mtx-api/mtx-url}/-/cds/saas-provisioning/tenant/{tenantId}
-{{/cap.isNodejs}}
-{{#cap.isJava}}
+          {{/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}}
+          {{/cap.isJava}}
           onSubscriptionAsync: true
           onUnSubscriptionAsync: true
           onUpdateDependenciesAsync: true

package/lib/init/template/multitenancy/files/{java/mtxs-configmap.yaml → mtxs-configmap-java.yaml}

@@ -17,4 +17,4 @@ data:
   CDS_MULTITENANCY_APPUI_TENANTSEPARATOR: "-"
   CDS_MULTITENANCY_MTXS_ENABLED: "true"
   CDS_MULTITENANCY_APPUI_URL: {{ printf "https://%s" $approuterUrl }}
-  CDS_MULTITENANCY_SIDECAR_URL: {{ printf "https://%s" $sidecarUrl }}
+  CDS_MULTITENANCY_SIDECAR_URL: {{ printf "https://%s" $sidecarUrl }}

package/lib/init/template/multitenancy/files/{mtxs-configmap.yaml → mtxs-configmap-nodejs.yaml}

@@ -4,6 +4,10 @@
 {{- $ := merge (dict "name" "approuter" "deployment" .Values.approuter ) . }}
 {{- $approuterUrl := (include "cap.deploymentHostFull" $ )}}
 
+{{- $sidecarDeployment := .Values.sidecar }}
+{{- $ = merge (dict "name" "sidecar" "deployment" .Values.sidecar ) . }}
+{{- $sidecarUrl := (include "cap.deploymentHostFull" $ )}}
+
 apiVersion: v1
 kind: ConfigMap
 metadata:
@@ -12,4 +16,4 @@ metadata:
 data:
   CDS_MULTITENANCY_APPUI_TENANTSEPARATOR: "-"
   CDS_MULTITENANCY_APPUI_URL: {{ printf "https://%s" $approuterUrl }}
-  SUBSCRIPTION_URL: {{ printf "https://${tenant_subdomain}-%s" $approuterUrl }}
+  SUBSCRIPTION_URL: {{ printf "https://${tenant_subdomain}-%s" $approuterUrl }}