@sap/cds-dk 6.4.0 → 6.5.0

package/lib/init/template/helm/{subchart → subcharts/web-application}/values.schema.json

@@ -106,12 +106,7 @@
             "$id": "#/properties/serviceAccountName",
             "title": "Service Account name",
             "description": "Name of the Service Account assigned to pods.",
-            "default": "default",
-            "allOf": [
-                {
-                    "$ref": "#/definitions/KubernetesName"
-                }
-            ]
+            "type": "string"
         },
         "image": {
             "$id": "#/properties/image",
@@ -238,9 +233,8 @@
             "properties": {
                 "enabled": {
                     "$id": "#/properties/ha/properties/enabled",
-                    "description": "Enables additional high-availability related configuration, like Pod Disruption Budget and Topology Spread Constraints.",
-                    "type": "boolean",
-                    "default": true
+                    "description": "[Deprecated: Will be always enabled in future] Enables additional high-availability related configuration, like Pod Disruption Budget and Topology Spread Constraints.",
+                    "type": "boolean"
                 }
             }
         },
@@ -340,6 +334,57 @@
                 }
             }
         },
+        "availability": {
+            "$id": "#/properties/availability",
+            "title": "Availability related configuration",
+            "type": "object",
+            "additionalProperties": false,
+            "properties": {
+                "podDisruptionBudget": {
+                    "$id": "#/properties/availability/properties/podDisruptionBudget",
+                    "description": "The max disruption to the pods.",
+                    "type": "object",
+                    "additionalProperties": false,
+                    "properties": {
+                        "maxUnavailable": {
+                            "description": "An eviction is allowed if this maximum of pods are unavailable.",
+                            "type": "string",
+                            "default": "10%"
+                        }
+                    }
+                },
+                "topologySpreadConstraints": {
+                    "$id": "#/properties/availability/properties/topologySpreadConstraints",
+                    "description": "How pods ought to spread across topology domains.",
+                    "uniqueItems": true,
+                    "items": {
+                        "type": "object",
+                        "additionalProperties": false,
+                        "required": ["topologyKey", "maxSkew", "whenUnsatisfiable"],
+                        "properties": {
+                            "topologyKey": {
+                                "type": "string",
+                                "description": "Nodes that have a label with this key and identical values are considered to be in the same topology."
+                            },
+                            "maxSkew": {
+                                "type": "integer",
+                                "description": "Describes the degree to which pods may be unevenly distributed.",
+                                "minimum": 1
+                            },
+                            "whenUnsatisfiable": {
+                                "type": "string",
+                                "description": "Indicates how to deal with a pod if it doesn't satisfy the spread constraint.",
+                                "enum": ["ScheduleAnyway", "DoNotSchedule"]
+                            }
+                        }
+                    },
+                    "default": [
+                        {"maxSkew":1, "topologyKey":"topology.kubernetes.io/zone", "whenUnsatisfiable":"ScheduleAnyway"},
+                        {"maxSkew":1, "topologyKey":"kubernetes.io/hostname", "whenUnsatisfiable":"ScheduleAnyway"}
+                    ]
+                }
+            }
+        },
         "health": {
             "$id": "#/properties/health",
             "title": "Health-check configuration",
@@ -376,11 +421,24 @@
         },
         "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.",
             "type": "integer",
             "minimum": 1,
             "default": 30
         },
+        "terminationGracePeriodSeconds": {
+            "$id": "#/properties/terminationGracePeriodSeconds",
+            "description": "Time in seconds after which the pod will be forcefully stopped after receiving SIGTERM.",
+            "type": "integer",
+            "minimum": 0,
+            "default": 30
+        },
         "env": {
             "$id": "#/properties/env",
             "description": "Key-value map of environment variables, which should be added to the Pod spec.",
@@ -408,7 +466,7 @@
                                             "properties": {
                                                 "name": {
                                                     "description": "Name of a ConfigMap.",
-                                                    "$ref": "#/definitions/KubernetesName"
+                                                    "type": "string"
                                                 },
                                                 "key": {
                                                     "description": "Key in that ConfigMap, which value will be used.",
@@ -423,7 +481,7 @@
                                             "properties": {
                                                 "name": {
                                                     "description": "Name of a Secret.",
-                                                    "$ref": "#/definitions/KubernetesName"
+                                                    "type": "string"
                                                 },
                                                 "key": {
                                                     "description": "Key in that Secret, which value will be used.",
@@ -490,7 +548,7 @@
                                 "properties": {
                                     "name": {
                                         "description": "Name of a ConfigMap.",
-                                        "$ref": "#/definitions/KubernetesName"
+                                        "type": "string"
                                     },
                                     "key": {
                                         "description": "Key in that ConfigMap, which value will be used.",
@@ -505,7 +563,7 @@
                                 "properties": {
                                     "name": {
                                         "description": "Name of a Secret.",
-                                        "$ref": "#/definitions/KubernetesName"
+                                        "type": "string"
                                     },
                                     "key": {
                                         "description": "Key in that Secret, which value will be used.",
@@ -571,11 +629,6 @@
                                     "name": {
                                         "description": "Name of a ConfigMap.",
                                         "type": "string"
-                                    },
-                                    "tpl": {
-                                        "description": "Flag which tells whether the name is a template string or not.",
-                                        "type": "boolean",
-                                        "default": false
                                     }
                                 },
                                 "required": [ "name" ],
@@ -594,11 +647,6 @@
                                     "name": {
                                         "description": "Name of a Secret.",
                                         "type": "string"
-                                    },
-                                    "tpl": {
-                                        "description": "Flag which tells whether the name is a template string or not.",
-                                        "type": "boolean",
-                                        "default": false
                                     }
                                 },
                                 "required": [ "name" ],
@@ -627,6 +675,12 @@
                     "description": "Expose the application to the internet.",
                     "type": "boolean",
                     "default": true
+                },
+                "gateway": {
+                    "$id": "#/properties/expose/properties/gateway",
+                    "description": "Use this istio gateway for incoming traffic.",
+                    "type": "string",
+                    "default": "kyma-gateway.kyma-system.svc.cluster.local"
                 }
             }
         },
@@ -647,7 +701,7 @@
                             "properties": {
                                 "fromSecret": {
                                     "description": "Name of a Kubernetes Secret, with the binding content, compliant to the SAP Kubernetes Service Binding spec https://github.tools.sap/Kubernetes-Service-Bindings/doc/",
-                                    "$ref": "#/definitions/KubernetesName"
+                                    "type": "string"
                                 }
                             }
                         },
@@ -657,11 +711,11 @@
                             "properties": {
                                 "serviceInstanceName": {
                                     "description": "Name of a BTP Operator Service Instance, created by the `service-instance` Helm chart. Can't be used with the `serviceInstanceFullname` option.",
-                                    "$ref": "#/definitions/KubernetesName"
+                                    "type": "string"
                                 },
                                 "serviceInstanceFullname": {
                                     "description": "Full name of a BTP Operator Service Instance. Can't be used with the `serviceInstanceName` option.",
-                                    "$ref": "#/definitions/KubernetesName"
+                                    "type": "string"
                                 },
                                 "externalName": {
                                     "description": "The name for the service binding in SAP BTP",
@@ -669,7 +723,7 @@
                                 },
                                 "secretName": {
                                     "description": "The name of the secret where the credentials are stored.",
-                                    "$ref": "#/definitions/KubernetesName"
+                                    "type": "string"
                                 },
                                 "parameters": {
                                     "description": "Some services support the provisioning of additional configuration parameters during the bind request. For the list of supported parameters, check the documentation of the particular service offering.",
@@ -695,7 +749,7 @@
                                                         "properties": {
                                                             "name": {
                                                                 "description": "Name of a Secret.",
-                                                                "$ref": "#/definitions/KubernetesName"
+                                                                "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.",

package/lib/init/template/helm/{subchart → subcharts/web-application}/values.yaml

@@ -8,7 +8,7 @@ global:
 
 replicaCount: 1
 port: 8080
-serviceAccountName: default
+#serviceAccountName: my-serviceaccount
 
   # To use a digest, change those values like that
   # repository: nginx@sha256
@@ -30,9 +30,6 @@ additionalVolumes: []
 #     mountPath: /etc/mysecret
 #     readOnly: true
 
-ha:
-  enabled: true
-
 # resources:
 #   limits:
 #     cpu: 100m
@@ -43,13 +40,25 @@ ha:
 #     ephemeral-storage: 1G
 #     memory: 1G
 
+availability:
+  podDisruptionBudget:
+    maxUnavailable: 10%
+  topologySpreadConstraints:
+  - topologyKey: topology.kubernetes.io/zone
+    maxSkew: 1
+    whenUnsatisfiable: ScheduleAnyway
+  - topologyKey: kubernetes.io/hostname
+    maxSkew: 1
+    whenUnsatisfiable: ScheduleAnyway
+
 health:
   liveness:
     path: /healthz
   readiness:
     path: /healthz
 
-startupTimeout: 30
+terminationGracePeriodSeconds: 30
+startupTimeoutSeconds: 30
 
 envFrom: []
 # - configMapRef:
@@ -79,6 +88,7 @@ env: {}
 
 expose:
   enabled: true
+  gateway: kyma-gateway.kyma-system.svc.cluster.local
   # host: ""
 
 # bindings:

package/lib/init/template/html5-repo/files/chart.yaml

@@ -0,0 +1,4 @@
+dependencies:
+  - name: content-deployment
+    alias: html5-apps-deployer
+    version: 0.1.0

package/lib/init/template/html5-repo/files/html5-apps-deployer-configmap.yaml

@@ -0,0 +1,14 @@
+# Please do not modify this file. This file may be overwritten.
+
+{{- $cloudService := index .Values "html5-apps-deployer.env.SAP_CLOUD_SERVICE" -}}
+{{- $defaultParameters :=  dict "Type" "HTTP" "ProxyType" "Internet" "Authentication" "NoAuthentication" "sap.cloud.service" "sap.fe.cap.sflight" "HTML5.forwardAuthToken" "true" }}
+{{- $ := dict "root" . "defaultParameters" $defaultParameters "html5" true }}
+
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: "{{ .Release.Name }}-html5-apps-deployer-configmap"
+  namespace: "{{ .Release.Namespace }}"
+data:
+  BACKEND_DESTINATIONS: >
+    {{ include "cap.backendDestinations" $ }}

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

@@ -52,9 +52,18 @@ module.exports = class Html5RepoTemplate extends require('../templateBase') {
                         serviceOfferingName: 'html5-apps-repo',
                         servicePlanName: 'app-host'
                     },
-                    html5_apps_deployer: {
-                        cloudService: null,
-                        backendDestinations: {},
+                    'html5-apps-deployer': {
+                        env: {
+                            SAP_CLOUD_SERVICE: null
+                        },
+                        envFrom: [
+                            {
+                              configMapRef: {
+                                name: "{{ .Release.Name }}-html5-apps-deployer-configmap",
+                                tpl: true
+                              }
+                            }
+                        ],
                         image: {
                             repository: `<your-container-registry>/${appName}-html5-deployer`,
                             tag: 'latest'
@@ -62,17 +71,40 @@ module.exports = class Html5RepoTemplate extends require('../templateBase') {
                         bindings: {
                             xsuaa:           { serviceInstanceName: 'xsuaa' },
                             destination:     { serviceInstanceName: 'destination' },
-                            html5_apps_repo: { serviceInstanceName: 'html5-apps-repo-host' }
+                            'html5-apps-repo': { serviceInstanceName: 'html5-apps-repo-host' }
                         },
                         resources: {
                             limits:   { cpu: '2000m', memory: '1G' },
                             requests: { cpu: '1000m', memory: '1G' }
                         }
-                    }
+                    },
+                    backendDestinations: {},
                 }
             )
-            await copyAndTrack(join(__dirname, 'files', '_html5_deployment_helpers.tpl'), join(this.projectPath, 'chart', 'templates', '_html5_deployment_helpers.tpl'), context)
-            await copyAndTrack(join(__dirname, 'files', 'html5-apps-deployer-job.yaml'), join(this.projectPath, 'chart', 'templates', 'html5-apps-deployer-job.yaml'), context)
+            
+            // copy content deployment chart if it is not present
+            const contentDeploymentSubchartPath = join(this.projectPath, 'chart', 'charts', 'content-deployment');
+            if(!exists(contentDeploymentSubchartPath)) {
+                const contentDeploymentResourcePath = join(__dirname, '..', 'helm', 'subcharts', 'content-deployment');
+                await copyAndTrack(contentDeploymentResourcePath, contentDeploymentSubchartPath, context);
+            }
+
+            // add dependency entry in chart.yaml
+            await mergeYAML(
+                join(this.projectPath, 'chart', 'Chart.yaml'),
+                join(__dirname, 'files', 'chart.yaml'),
+                projectDescriptor,
+                { additions: [{
+                    ref: `content-deployment-html5-apps-deployer`,
+                    in: `dependencies`,
+                    where: [{
+                        property: 'alias',
+                        isEqualTo: 'html5-apps-deployer'
+                    }]
+                }]}
+            )
+
+            await copyAndTrack(join(__dirname, 'files', 'html5-apps-deployer-configmap.yaml'), join(this.projectPath, 'chart', 'templates', 'html5-apps-deployer-configmap.yaml'), context)
             await copyAndTrack(join(__dirname, 'files', 'html5-apps-repo-host.yaml'), join(this.projectPath, 'chart', 'templates', 'html5-apps-repo-host.yaml'), context)
             if(isIndependentCommand) await writeMd5File(join(this.projectPath, 'chart', '.cds-add-helm-files.md5'), context.newTrackingData)
         }

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

@@ -50,7 +50,7 @@ module.exports = class KibanaTemplate extends require('../templateBase') {
             const mtaYAMLPath = join(this.projectPath, 'mta.yaml')
             await mergeYAML(
                 mtaYAMLPath,
-                `${__dirname}/files/mta.yaml.hbs`,
+                join(__dirname, 'files', 'mta.yaml.hbs'),
                 projectDescriptor,
                 {
                     additions: [srv, kibanaLogging],

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

@@ -158,7 +158,7 @@ module.exports = class LintTemplate extends require('../templateBase') {
   async _addEslintPluginConfig() {
     let configPath = getConfigPath(this.projectPath);
     if (!configPath) {
-      configPath = path.join(this.projectPath, ".eslintrc");
+      configPath = path.join(this.projectPath, ".eslintrc.json");
     }
     await io.sanitizeEslintConfig(configPath, this.customRuleExample);
     return;

package/lib/init/template/multitenancy/files/saas-registry.yaml

@@ -1,7 +1,7 @@
 {{- $srvHostFull := include "cap.deploymentHostFull" (merge (dict "name" "srv" "deployment" .Values.srv) . ) }}
 {{- $defaultAppUrls := dict
-  "getDependencies" (printf "https://%s%s" $srvHostFull .Values.saas_registry.getDependencies)
-  "onSubscription" (printf "https://%s%s" $srvHostFull .Values.saas_registry.onSubscription)
+  "getDependencies" (printf "https://%s%s" $srvHostFull .Values.saas_registry.parameters.getDependencies)
+  "onSubscription" (printf "https://%s%s" $srvHostFull .Values.saas_registry.parameters.onSubscription)
   "onSubscriptionAsync" false
   "onUnSubscriptionAsync" false
   "callbackTimeoutMillis" 300000

package/lib/init/template/multitenancy/files/service-manager.yaml

@@ -0,0 +1 @@
+{{- include "cap.service-instance" . }}

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

@@ -4,22 +4,26 @@ srv:
     saas-registry:
       serviceInstanceName: saas-registry
     service-manager:
-      fromSecret: null
+      serviceInstanceName: service-manager
 {{#cap.hasXsuaa}}
 xsuaa:
   parameters:
     tenant-mode: shared
 {{/cap.hasXsuaa}}
+service_manager:
+  serviceOfferingName: service-manager
+  servicePlanName: container
 saas_registry:
   serviceOfferingName: saas-registry
   servicePlanName: application
+  parameters:
 {{#cap.isNodejs}}
-  getDependencies: "/-/cds/saas-provisioning/dependencies"
-  onSubscription: "/-/cds/saas-provisioning/tenant/{tenantId}"
+    getDependencies: "/-/cds/saas-provisioning/dependencies"
+    onSubscription: "/-/cds/saas-provisioning/tenant/{tenantId}"
 {{/cap.isNodejs}}
 {{#cap.isJava}}
-  getDependencies: "/mt/v1.0/subscriptions/dependencies"
-  onSubscription: "/mt/v1.0/subscriptions/tenants/{tenantId}"
+    getDependencies: "/mt/v1.0/subscriptions/dependencies"
+    onSubscription: "/mt/v1.0/subscriptions/tenants/{tenantId}"
 sidecar:
   bindings:
 {{#cap.hasXsuaa}}
@@ -27,7 +31,7 @@ sidecar:
       serviceInstanceName: xsuaa
 {{/cap.hasXsuaa}}
     service-manager:
-      fromSecret: null
+      serviceInstanceName: service-manager
   image:
     repository: <your-container-registry>/{{cap.appName}}-sidecar
     tag: latest

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

@@ -102,8 +102,7 @@ module.exports = class MultitenancyTemplate extends require('../templateBase') {
             envFrom: [
               {
                 configMapRef: {
-                  name: "{{ .Release.Name }}-mtxs-configmap",
-                  tpl: true
+                  name: "{{ .Release.Name }}-mtxs-configmap"
                 }
               }
             ]
@@ -118,7 +117,7 @@ module.exports = class MultitenancyTemplate extends require('../templateBase') {
           join(__dirname, 'files', 'chart.yaml'),
           projectDescriptor,
           {
-            additions: [{  
+            additions: [{
               ref: `web-application-sidecar`,
               in: `dependencies`,
               where: [{
@@ -141,6 +140,12 @@ module.exports = class MultitenancyTemplate extends require('../templateBase') {
         context
       )
 
+      await copyAndTrack(
+        join(__dirname, 'files', 'service-manager.yaml'),
+        join(this.projectPath, 'chart', 'templates', 'service-manager.yaml'),
+        context
+      )
+
       await copyAndTrack(
         join(__dirname, 'files', 'saas-registry.yaml'),
         join(this.projectPath, 'chart', 'templates', 'saas-registry.yaml'),
@@ -183,6 +188,19 @@ module.exports = class MultitenancyTemplate extends require('../templateBase') {
         join(this.projectPath, 'chart', 'xs-security.json'),
         context
       )
+
+      await mergeYAML(
+          join(this.projectPath, 'chart', 'values.yaml'),
+          {
+              xsuaa: {
+                  parameters: {
+                      'tenant-mode': 'shared'
+                  }
+              }
+          },
+          null,
+          { forceOverwrite: true }
+      )
       if (isIndependentCommand) await writeMd5File(join(this.projectPath, 'chart', '.cds-add-helm-files.md5'), context.newTrackingData)
     }
   }

package/lib/init/util/commandUtil.js

@@ -1,7 +1,7 @@
 const cp = require('child_process');
 const os = require('os');
-const cds = require('../../cds')
-const LOG = cds.log('cds')
+const DEBUG = /\b(y|all|cli)\b/.test(process.env.DEBUG) && console.debug
+
 
 const { IS_WIN } = require('../constants');
 
@@ -21,21 +21,21 @@ class CommandUtil {
     async spawnCommand(cmd, args, options = {}, collectResult = false) {
         args = this._sanitizeArgs(args);
         return new Promise((resolve, reject) => {
-            LOG.debug(`[spawn] ${cmd} ${args.join(' ')}`);
+            DEBUG && console.debug(`[spawn] ${cmd} ${args.join(' ')}`);
 
             options.env = options.env || process.env;
 
             const child = this._getChildProcess(cmd, args, options);
 
             // use inplace methods to ensure logger is called in context
-            const stdLogBuffer = new LogBuffer((chunk) => LOG.info(chunk), collectResult);
+            const stdLogBuffer = new LogBuffer((chunk) => console.log(chunk), collectResult);
             child.stdout.on('data', (chunk) => {
                 stdLogBuffer.handleChunk(chunk);
             });
 
             // use inplace methods to ensure logger is called in context
             // collect error log in case of Win to handle command not found (ENOENT),
-            const errLogBuffer = new LogBuffer((chunk) => LOG.error(chunk), (IS_WIN || collectResult));
+            const errLogBuffer = new LogBuffer((chunk) => console.error(chunk), (IS_WIN || collectResult));
             child.stderr.on('data', (chunk) => {
                 errLogBuffer.handleChunk(chunk);
             });

package/lib/init/util/merge.js

@@ -328,9 +328,35 @@ async function removeFromYAML(name, keyPaths) {
     await writeYAML(name, yaml)
 }
 
+async function removeFromYAMLArray(name, keyPath, aliasToRemove) {
+    const yaml = await readYAML(name)
+
+    let node = yaml
+    // traverse to the array node
+    const keys = keyPath.split('.')
+    for (const key of keys) {
+        node = node.get(key)
+    }
+
+    // find index of array entry with aliasToRemove entry
+    let index = 0;
+    let entryNode = node.getIn([index])
+    while(entryNode !== undefined) {
+        if(entryNode.toJSON().alias === aliasToRemove) {
+            node.deleteIn([index])
+            break;
+        }
+        index++;
+        entryNode = node.getIn([index])
+    }
+
+    await writeYAML(name, yaml)
+}
+
 module.exports = {
   sortDependencies,
   mergeJSON,
   mergeYAML,
-  removeFromYAML
+  removeFromYAML,
+  removeFromYAMLArray
 }

package/lib/init/util/mvnArchetypeUtil.js

@@ -5,7 +5,7 @@ const { MAVEN_ARCHETYPE_VERSION, OPTION_JAVA_MVN,
 const DEFAULT_GROUP_ID = 'customer';
 
 const LOG = console
-const DEBUG = /\bcli\b/.test(process.env.DEBUG) && console.debug
+const DEBUG = /\b(y|all|cli)\b/.test(process.env.DEBUG) && console.debug
 
 class MvnArchetypeUtil {
 

package/lib/init/util/projectReader.js

@@ -13,7 +13,7 @@ const BUILD_TASK_HANA = "hana"
 const BUILD_TASK_FIORI = "fiori"
 const BUILD_TASK_MTX = "mtx"
 const BUILD_TASK_MTX_SIDECAR = "mtx-sidecar"
-const DEBUG = /\b(cli)\b/.test(process.env.DEBUG) && console.debug
+const DEBUG = /\b(y|all|cli)\b/.test(process.env.DEBUG) && console.debug
 const LOG = console
 
 module.exports = class ProjectReader {
@@ -90,7 +90,7 @@ module.exports = class ProjectReader {
         cds.env = env
 
         const nullLogger = { debug: () => { }, log: () => { }, warn: () => { }, error: () => { }, write: () => { } }
-        
+
         // no file path resolving as the directories might not exist - e.g. cds add will create the mtx/sidecar folder
         const buildTasks = await new BuildTaskFactory(nullLogger, cds).getTasks({ root: this.projectPath, resolve: false, mta: false })
 

package/lib/util/exec.js

@@ -156,7 +156,7 @@ function executeSync(options = {}, command, ...args) {
     log.debug(`exec: ${command} ${args.map( v => v.match(/\s/) ? `"${v}"` : v ).join(' ')}`);
     const result = spawnSync(command, args, execOptions);
 
-    if (acceptStatuses !== '*' && acceptStatuses.indexOf(result.status) === -1) throw new Error(`Command returned with status code ${result.status}`);
+    if (acceptStatuses !== '*' && acceptStatuses.indexOf(result.status) === -1) throw new Error(`Command '${command} ${args.join(' ')}' returned with status code ${result.status}`);
     return processResult(result, options);
 }
 
@@ -185,7 +185,7 @@ async function executeAsync(options = {}, command, ...args) {
         }
 
         const exit = status => {
-            if (acceptStatuses !== '*' && acceptStatuses.indexOf(status) === -1) reject(new Error(`Command returned with status code ${status}`))
+            if (acceptStatuses !== '*' && acceptStatuses.indexOf(status) === -1) reject(new Error(`Command '${command} ${args.join(' ')}' returned with status code ${status}`))
             else resolve({
                 status,
                 stdout: child.stdout ? Buffer.concat(stdoutChunks).toString("utf-8") : undefined,
@@ -207,4 +207,4 @@ module.exports = {
     exec,
     execSync,
     $ : execSync
-}
+}

package/lib/util/term.js

@@ -1,5 +1,5 @@
 // FIXME: Nicht gut, das wir das zweimal redundant haben!
-const debug = process.env.DEBUG
+const DEBUG = /\b(y|all|cli)\b/.test(process.env.DEBUG) && console.debug
 
 // https://docs.microsoft.com/en-us/windows/console/console-virtual-terminal-sequences
 const t = module.exports.codes = {
@@ -18,9 +18,9 @@ const as = module.exports.as = (codes, o) => {
   return module.exports.isTTY ? (codes + o + t.reset) : ('' + o)
 }
 
-const asErr = module.exports.error = o => debug ? o : as(t.red + t.bold, o)
-const asWarn = module.exports.warn = o => debug ? o : as(t.orange + t.bold, o)
-const asInfo = module.exports.info = o => debug ? o : as(t.green + t.bold, o)
+const asErr = module.exports.error = o => DEBUG ? o : as(t.red + t.bold, o)
+const asWarn = module.exports.warn = o => DEBUG ? o : as(t.orange + t.bold, o)
+const asInfo = module.exports.info = o => DEBUG ? o : as(t.green + t.bold, o)
 module.exports.warn  = o => as(t.orange, o)
 module.exports.info  = o => as(t.green, o)
 module.exports.link  = o => as(t.link, o)
@@ -39,14 +39,14 @@ const format = module.exports.format = (o, severity='Error', asInternalError=fal
 // 'Error: foo'  ->  '[ERROR] foo'  (Maven-like, allows for better grepping in logs)
 Object.assign (format, {
   error: (o, asInternalError, withStack) => {
-    if (debug)  return o
+    if (DEBUG)  return o
     if (asInternalError) {
       return `[${asErr('INTERNAL ERROR')}] ${o.stack || o.toString()}\nPlease report this error.\n`
     }
     return `[${asErr('ERROR')}] ${toString(o, 'Error', withStack)}`
   },
-  warn: o => debug ? o : `[${asWarn('WARNING')}] ${toString(o, 'Warning')}`,
-  info: o => debug ? o : `[${asInfo('INFO')}] ${toString(o, 'Info')}`,
+  warn: o => DEBUG ? o : `[${asWarn('WARNING')}] ${toString(o, 'Warning')}`,
+  info: o => DEBUG ? o : `[${asInfo('INFO')}] ${toString(o, 'Info')}`,
 
   poorMarkdown: (md) => {  return md
     .replace(/\n# ([^\n]*)\n/g, `\n${as(t.bold, '$1')}\n`)